Merge tag 'l10n-2.13.0-rnd2.1' of git://github.com/git-l10n/git-po
l10n for Git 2.13.0 round 2.1
* tag 'l10n-2.13.0-rnd2.1' of git://github.com/git-l10n/git-po:
l10n: zh_CN: for git v2.13.0 l10n round 2
l10n: sv.po: Update Swedish translation (3195t0f0u)
l10n: zh_CN: review for git v2.13.0 l10n round 1
l10n: Update Catalan translation
l10n: bg.po: Updated Bulgarian translation (3195t)
l10n: fr.po v2.13 rnd 2
l10n: de.po: translate 4 new messages
l10n: de.po: update German translation
l10n: de.po: lower case after semi-colon
l10n: vi.po(3195t): Update translation for v2.13.0 round 2
l10n: git.pot: v2.13.0 round 2 (4 new, 7 removed)
l10n: zh_CN: for git v2.13.0 l10n round 1
l10n: fr.po v2.13 round 1
l10n: pt_PT: update Portuguese translation
l10n: bg.po: Updated Bulgarian translation (3201t)
l10n: vi.po(3198t): Updated Vietnamese translation for v2.13.0-rc0
l10n: sv.po: Update Swedish translation (3199t0f0u)
l10n: git.pot: v2.13.0 round 1 (96 new, 37 removed)
diff --git a/po/bg.po b/po/bg.po
index 148862d..66e2b7e 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -9,7 +9,12 @@
# range диапазон
# unreachable object недостижим обект
# dangling objects обект извън клон
-# fast-forward тривиално сливане
+# fast-forward превъртане
+# tree-level merge тривиално сливане (различни файлове са променяни, слива се като дърво)
+# automatic merge автоманично сливаве (еднакви файлове са променяни, но в неприпокриващи се части)
+# real merge същинско сливане (а не превъртане)
+# three-way merge тройно сливане
+# octopus merge множествено сливане
# stale remote старо хранилище
# rebase пребазирам
# force (push) принудително изтласквам
@@ -44,7 +49,6 @@
# topic branch тематичен клон
# empty head връх без история
# tree-ish указател към дърво
-# three-way merge тройно сливане
# dirty нечист, мръсен (файл, индекс)
# fallback резервен вариант
# pathspec magic опция за магически пътища
@@ -53,6 +57,7 @@
# plumbing команди от системно ниво
# porcelain команди от потребителско ниво
# pack [noun] пакетен файл - fixme in glossary
+# repack препакетирам
# mainline базово подаване - при cherry-pick на merge - към коя версия да се изчислява разликата
# token лексема
# trailer епилог/завършек на съобщение
@@ -73,9 +78,9 @@
# binary patch двоична кръпка
# reverse-apply прилагам в обратна посока
# todo file команден файл
-# octopus merge множествено сливане
# alternate алтернативен източник
# superproject обхващащ проект
+# split index разделяне на индекса
# ----
# „$var“ - може да не сработва за shell има gettext и eval_gettext - проверка - намират се лесно по „$
# ========================
@@ -110,8 +115,8 @@
msgstr ""
"Project-Id-Version: git master\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2016-11-25 22:50+0800\n"
-"PO-Revision-Date: 2017-01-28 19:34+0200\n"
+"POT-Creation-Date: 2017-05-05 09:35+0800\n"
+"PO-Revision-Date: 2017-05-07 09:24+0200\n"
"Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
"Language: bg\n"
@@ -150,7 +155,6 @@
msgid "It is not possible to %s because you have unmerged files."
msgstr "Действието „%s“ е блокирано от неслети файлове."
-# TRANSFER
#: advice.c:101
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
@@ -163,7 +167,7 @@
msgid "Exiting because of an unresolved conflict."
msgstr "Изход от програмата заради некоригиран конфликт."
-#: advice.c:114 builtin/merge.c:1181
+#: advice.c:114 builtin/merge.c:1185
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Не сте завършили сливане. (Указателят „MERGE_HEAD“ съществува)."
@@ -351,22 +355,22 @@
msgid "patch with only garbage at line %d"
msgstr "кръпката е с изцяло повредени данни на ред %d"
-#: apply.c:2274
+#: apply.c:2265
#, c-format
msgid "unable to read symlink %s"
msgstr "символната връзка „%s“ не може да бъде прочетена"
-#: apply.c:2278
+#: apply.c:2269
#, c-format
msgid "unable to open or read %s"
msgstr "файлът „%s“ не може да бъде отворен или прочетен"
-#: apply.c:2931
+#: apply.c:2922
#, c-format
msgid "invalid start of line: '%c'"
msgstr "неправилно начало на ред: „%c“"
-#: apply.c:3050
+#: apply.c:3041
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
@@ -375,13 +379,13 @@
msgstr[1] ""
"%d-то парче код бе успешно приложено на ред %d (отместване от %d реда)."
-#: apply.c:3062
+#: apply.c:3053
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr ""
"Контекстът е намален на (%ld/%ld) за прилагането на парчето код на ред %d"
-#: apply.c:3068
+#: apply.c:3059
#, c-format
msgid ""
"while searching for:\n"
@@ -390,316 +394,316 @@
"при търсене за:\n"
"%.*s"
-#: apply.c:3090
+#: apply.c:3081
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "липсват данните за двоичната кръпка за „%s“"
-#: apply.c:3098
+#: apply.c:3089
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
"двоичната кръпка не може да се приложи в обратна посока, когато обратното "
"парче за „%s“ липсва"
-#: apply.c:3144
+#: apply.c:3135
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr "към „%s“ не може да се приложи двоична кръпка без пълен индекс"
-#: apply.c:3154
+#: apply.c:3145
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr "кръпката съответства на „%s“ (%s), който не съвпада по съдържание."
-#: apply.c:3162
+#: apply.c:3153
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "кръпката съответства на „%s“, който трябва да е празен, но не е"
-#: apply.c:3180
+#: apply.c:3171
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr ""
"необходимият резултат след операцията — „%s“ за „%s“ не може да бъде "
"прочетен"
-#: apply.c:3193
+#: apply.c:3184
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "двоичната кръпка не може да бъде приложена върху „%s“"
-#: apply.c:3199
+#: apply.c:3190
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"двоичната кръпка за „%s“ води до неправилни резултати (очакваше се: „%s“, а "
"бе получено: „%s“)"
-#: apply.c:3220
+#: apply.c:3211
#, c-format
msgid "patch failed: %s:%ld"
msgstr "неуспешно прилагане на кръпка: „%s:%ld“"
-#: apply.c:3342
+#: apply.c:3333
#, c-format
msgid "cannot checkout %s"
msgstr "„%s“ не може да се изтегли"
-#: apply.c:3390 apply.c:3401 apply.c:3447 setup.c:248
+#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:253
#, c-format
msgid "failed to read %s"
msgstr "файлът „%s“ не може да бъде прочетен"
-#: apply.c:3398
+#: apply.c:3389
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "изчитане на „%s“ след проследяване на символна връзка"
-#: apply.c:3427 apply.c:3667
+#: apply.c:3418 apply.c:3658
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "обектът с път „%s“ е преименуван или изтрит"
-#: apply.c:3510 apply.c:3681
+#: apply.c:3501 apply.c:3672
#, c-format
msgid "%s: does not exist in index"
msgstr "„%s“ не съществува в индекса"
-#: apply.c:3519 apply.c:3689
+#: apply.c:3510 apply.c:3680
#, c-format
msgid "%s: does not match index"
msgstr "„%s“ не съответства на индекса"
-#: apply.c:3554
+#: apply.c:3545
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr ""
"в хранилището липсват необходимите обекти BLOB, за да се премине към тройно "
"сливане."
-#: apply.c:3557
+#: apply.c:3548
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr "Преминаване към тройно сливане…\n"
-#: apply.c:3573 apply.c:3577
+#: apply.c:3564 apply.c:3568
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "текущото съдържание на „%s“ не може да бъде прочетено"
-#: apply.c:3589
+#: apply.c:3580
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr "Неуспешно преминаване към тройно сливане…\n"
-#: apply.c:3603
+#: apply.c:3594
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "Конфликти при прилагането на кръпката към „%s“.\n"
-#: apply.c:3608
+#: apply.c:3599
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "Кръпката бе приложена чисто към „%s“.\n"
-#: apply.c:3634
+#: apply.c:3625
msgid "removal patch leaves file contents"
msgstr "изтриващата кръпка оставя файла непразен"
-#: apply.c:3706
+#: apply.c:3697
#, c-format
msgid "%s: wrong type"
msgstr "„%s“: неправилен вид"
-#: apply.c:3708
+#: apply.c:3699
#, c-format
msgid "%s has type %o, expected %o"
msgstr "„%s“ е от вид „%o“, а се очакваше „%o“"
-#: apply.c:3859 apply.c:3861
+#: apply.c:3850 apply.c:3852
#, c-format
msgid "invalid path '%s'"
msgstr "неправилен път: „%s“"
-#: apply.c:3917
+#: apply.c:3908
#, c-format
msgid "%s: already exists in index"
msgstr "„%s“: вече съществува в индекса"
-#: apply.c:3920
+#: apply.c:3911
#, c-format
msgid "%s: already exists in working directory"
msgstr "„%s“: вече съществува в работното дърво"
-#: apply.c:3940
+#: apply.c:3931
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "новите права за достъп (%o) на „%s“ не съвпадат със старите (%o)"
-#: apply.c:3945
+#: apply.c:3936
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
"новите права за достъп (%o) на „%s“ не съвпадат със старите (%o) на „%s“"
-#: apply.c:3965
+#: apply.c:3956
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "засегнатият файл „%s“ е след символна връзка"
-#: apply.c:3969
+#: apply.c:3960
#, c-format
msgid "%s: patch does not apply"
msgstr "Кръпката „%s“ не може да бъде приложена"
-#: apply.c:3984
+#: apply.c:3975
#, c-format
msgid "Checking patch %s..."
msgstr "Проверяване на кръпката „%s“…"
-#: apply.c:4075
+#: apply.c:4066
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr ""
"информацията за сумата по SHA1 за подмодула липсва или не е достатъчна (%s)."
-#: apply.c:4082
+#: apply.c:4073
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "смяна на режима на достъпа на „%s“, който не е в текущия връх „HEAD“"
-#: apply.c:4085
+#: apply.c:4076
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "информацията за сумата по SHA1 липсва или не е достатъчна (%s)."
-#: apply.c:4090 builtin/checkout.c:233 builtin/reset.c:135
+#: apply.c:4081 builtin/checkout.c:252 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "неуспешно създаване на запис в кеша чрез „make_cache_entry“ за „%s“"
-#: apply.c:4094
+#: apply.c:4085
#, c-format
msgid "could not add %s to temporary index"
msgstr "„%s“ не може да се добави към временния индекс"
-#: apply.c:4104
+#: apply.c:4095
#, c-format
msgid "could not write temporary index to %s"
msgstr "временният индекс не може да се запази в „%s“"
-#: apply.c:4242
+#: apply.c:4233
#, c-format
msgid "unable to remove %s from index"
msgstr "„%s“ не може да се извади от индекса"
-#: apply.c:4277
+#: apply.c:4268
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "повредена кръпка за модула „%s“"
-#: apply.c:4283
+#: apply.c:4274
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr ""
"не може да се получи информация чрез „stat“ за новосъздадения файл „%s“"
-#: apply.c:4291
+#: apply.c:4282
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
"не може да се за създаде мястото за съхранение на новосъздадения файл „%s“"
-#: apply.c:4297 apply.c:4441
+#: apply.c:4288 apply.c:4432
#, c-format
msgid "unable to add cache entry for %s"
msgstr "не може да се добави запис в кеша за „%s“"
-#: apply.c:4338
+#: apply.c:4329
#, c-format
msgid "failed to write to '%s'"
msgstr "в „%s“ не може да се пише"
-#: apply.c:4342
+#: apply.c:4333
#, c-format
msgid "closing file '%s'"
msgstr "затваряне на файла „%s“"
-#: apply.c:4412
+#: apply.c:4403
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "файлът „%s“ не може да се запише с режим на достъп „%o“"
-#: apply.c:4510
+#: apply.c:4501
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Кръпката „%s“ бе приложена чисто."
-#: apply.c:4518
+#: apply.c:4509
msgid "internal error"
msgstr "вътрешна грешка"
-#: apply.c:4521
+#: apply.c:4512
#, 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:4532
+#: apply.c:4523
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "съкращаване на името на файла с отхвърлените парчета на „ %.*s.rej“"
-#: apply.c:4540 builtin/fetch.c:740 builtin/fetch.c:989
+#: apply.c:4531 builtin/fetch.c:739 builtin/fetch.c:988
#, c-format
msgid "cannot open %s"
msgstr "„%s“ не може да бъде отворен"
-#: apply.c:4554
+#: apply.c:4545
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "%d-то парче бе успешно приложено."
-#: apply.c:4558
+#: apply.c:4549
#, c-format
msgid "Rejected hunk #%d."
msgstr "%d-то парче бе отхвърлено."
-#: apply.c:4668
+#: apply.c:4659
#, c-format
msgid "Skipped patch '%s'."
msgstr "Пропусната кръпка: „%s“"
-#: apply.c:4676
+#: apply.c:4667
msgid "unrecognized input"
msgstr "непознат вход"
-#: apply.c:4695
+#: apply.c:4686
msgid "unable to read index file"
msgstr "индексът не може да бъде записан"
-#: apply.c:4833
+#: apply.c:4823
#, c-format
msgid "can't open patch '%s': %s"
msgstr "кръпката „%s“ не може да бъде отворена: %s"
-#: apply.c:4858
+#: apply.c:4850
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "пренебрегната е %d грешка в знаците за интервали"
msgstr[1] "пренебрегнати са %d грешки в знаците за интервали"
-#: apply.c:4864 apply.c:4879
+#: apply.c:4856 apply.c:4871
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d ред добавя грешки в знаците за интервали."
msgstr[1] "%d реда добавят грешки в знаците за интервали."
-#: apply.c:4872
+#: apply.c:4864
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
@@ -708,137 +712,138 @@
msgstr[1] ""
"Добавени са %d реда след корекцията на грешките в знаците за интервали."
-#: apply.c:4888 builtin/add.c:463 builtin/mv.c:286 builtin/rm.c:431
+#: apply.c:4880 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391
msgid "Unable to write new index file"
msgstr "Новият индекс не може да бъде записан"
-#: apply.c:4919 apply.c:4922 builtin/am.c:2277 builtin/am.c:2280
-#: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180
-#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:407
-#: builtin/submodule--helper.c:589 builtin/submodule--helper.c:592
-#: builtin/submodule--helper.c:944 builtin/submodule--helper.c:947
+#: 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
msgid "path"
msgstr "път"
-#: apply.c:4920
+#: apply.c:4912
msgid "don't apply changes matching the given path"
msgstr "без прилагане на промените напасващи на дадения път"
-#: apply.c:4923
+#: apply.c:4915
msgid "apply changes matching the given path"
msgstr "прилагане на промените напасващи на дадения път"
-#: apply.c:4925 builtin/am.c:2286
+#: apply.c:4917 builtin/am.c:2285
msgid "num"
msgstr "БРОЙ"
-#: apply.c:4926
+#: apply.c:4918
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "премахване на този БРОЙ водещи елементи от пътищата в разликата"
-#: apply.c:4929
+#: apply.c:4921
msgid "ignore additions made by the patch"
msgstr "игнориране на редовете добавени от тази кръпка"
-#: apply.c:4931
+#: apply.c:4923
msgid "instead of applying the patch, output diffstat for the input"
msgstr "извеждане на статистика на промените без прилагане на кръпката"
-#: apply.c:4935
+#: apply.c:4927
msgid "show number of added and deleted lines in decimal notation"
msgstr "извеждане на броя на добавените и изтритите редове"
-#: apply.c:4937
+#: apply.c:4929
msgid "instead of applying the patch, output a summary for the input"
msgstr "извеждане на статистика на входните данни без прилагане на кръпката"
-#: apply.c:4939
+#: apply.c:4931
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "проверка дали кръпката може да се приложи, без действително прилагане"
-#: apply.c:4941
+#: apply.c:4933
msgid "make sure the patch is applicable to the current index"
msgstr "проверка дали кръпката може да бъде приложена към текущия индекс"
-#: apply.c:4943
+#: apply.c:4935
msgid "apply a patch without touching the working tree"
msgstr "прилагане на кръпката без промяна на работното дърво"
-#: apply.c:4945
+#: apply.c:4937
msgid "accept a patch that touches outside the working area"
msgstr "прилагане на кръпка, която променя и файлове извън работното дърво"
-#: apply.c:4947
+#: apply.c:4939
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
"кръпката да бъде приложена. Опцията се комбинира с „--check“/„--stat“/„--"
"summary“"
-#: apply.c:4949
+#: apply.c:4941
msgid "attempt three-way merge if a patch does not apply"
msgstr "пробване с тройно сливане, ако кръпката не може да се приложи директно"
-#: apply.c:4951
+#: apply.c:4943
msgid "build a temporary index based on embedded index information"
msgstr ""
"създаване на временен индекс на база на включената информация за индекса"
-#: apply.c:4954 builtin/checkout-index.c:169 builtin/ls-files.c:505
+#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:515
msgid "paths are separated with NUL character"
msgstr "разделяне на пътищата с нулевия знак „NUL“"
-#: apply.c:4956
+#: apply.c:4948
msgid "ensure at least <n> lines of context match"
msgstr "да се осигури контекст от поне такъв БРОЙ съвпадащи редове"
-#: apply.c:4957 builtin/am.c:2265
+#: apply.c:4949 builtin/am.c:2264
msgid "action"
msgstr "действие"
-#: apply.c:4958
+#: apply.c:4950
msgid "detect new or modified lines that have whitespace errors"
msgstr "засичане на нови или променени редове с грешки в знаците за интервали"
-#: apply.c:4961 apply.c:4964
+#: apply.c:4953 apply.c:4956
msgid "ignore changes in whitespace when finding context"
msgstr ""
"игнориране на промените в знаците за интервали при откриване на контекста"
-#: apply.c:4967
+#: apply.c:4959
msgid "apply the patch in reverse"
msgstr "прилагане на кръпката в обратна посока"
-#: apply.c:4969
+#: apply.c:4961
msgid "don't expect at least one line of context"
msgstr "без изискване на дори и един ред контекст"
-#: apply.c:4971
+#: apply.c:4963
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "оставяне на отхвърлените парчета във файлове с разширение „.rej“"
-#: apply.c:4973
+#: apply.c:4965
msgid "allow overlapping hunks"
msgstr "позволяване на застъпващи се парчета"
-#: apply.c:4974 builtin/add.c:267 builtin/check-ignore.c:19
-#: builtin/commit.c:1339 builtin/count-objects.c:94 builtin/fsck.c:593
-#: builtin/log.c:1860 builtin/mv.c:110 builtin/read-tree.c:114
+#: 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
msgid "be verbose"
msgstr "повече подробности"
-#: apply.c:4976
+#: apply.c:4968
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "пренебрегване на неправилно липсващ знак за нов ред в края на файл"
-#: apply.c:4979
+#: apply.c:4971
msgid "do not trust the line counts in the hunk headers"
msgstr "без доверяване на номерата на редовете в заглавните части на парчетата"
-#: apply.c:4981 builtin/am.c:2274
+#: apply.c:4973 builtin/am.c:2273
msgid "root"
msgstr "НАЧАЛНА_ДИРЕКТОРИЯ"
-#: apply.c:4982
+#: apply.c:4974
msgid "prepend <root> to all filenames"
msgstr "добавяне на тази НАЧАЛНА_ДИРЕКТОРИЯ към имената на всички файлове"
@@ -861,103 +866,108 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote ХРАНИЛИЩЕ [--exec КОМАНДА] --list"
-#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:327
+#: archive.c:332 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "пътят „%s“ не съвпада с никой файл"
-#: archive.c:429
+#: archive.c:417
msgid "fmt"
msgstr "ФОРМАТ"
-#: archive.c:429
+#: archive.c:417
msgid "archive format"
msgstr "ФОРМАТ на архива"
-#: archive.c:430 builtin/log.c:1429
+#: archive.c:418 builtin/log.c:1436
msgid "prefix"
msgstr "ПРЕФИКС"
-#: archive.c:431
+#: archive.c:419
msgid "prepend prefix to each pathname in the archive"
msgstr "добавяне на този ПРЕФИКС към всеки път в архива"
-#: archive.c:432 builtin/blame.c:2603 builtin/blame.c:2604 builtin/config.c:59
-#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:723
-#: builtin/hash-object.c:101 builtin/ls-files.c:539 builtin/ls-files.c:542
-#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109
+#: 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
msgid "file"
msgstr "ФАЙЛ"
-#: archive.c:433 builtin/archive.c:89
+#: archive.c:421 builtin/archive.c:89
msgid "write the archive to this file"
msgstr "запазване на архива в този ФАЙЛ"
-#: archive.c:435
+#: archive.c:423
msgid "read .gitattributes in working directory"
msgstr "изчитане на „.gitattributes“ в работната директория"
-#: archive.c:436
+#: archive.c:424
msgid "report archived files on stderr"
msgstr "извеждане на архивираните файлове на стандартната грешка"
-#: archive.c:437
+#: archive.c:425
msgid "store only"
msgstr "само съхранение без компресиране"
-#: archive.c:438
+#: archive.c:426
msgid "compress faster"
msgstr "бързо компресиране"
-#: archive.c:446
+#: archive.c:434
msgid "compress better"
msgstr "добро компресиране"
-#: archive.c:449
+#: archive.c:437
msgid "list supported archive formats"
msgstr "извеждане на списъка с поддържаните формати"
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88
-#: builtin/submodule--helper.c:601 builtin/submodule--helper.c:953
+#: archive.c:439 builtin/archive.c:90 builtin/clone.c:103 builtin/clone.c:106
+#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
msgid "repo"
msgstr "хранилище"
-#: archive.c:452 builtin/archive.c:91
+#: archive.c:440 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr "изтегляне на архива от отдалеченото ХРАНИЛИЩЕ"
-#: archive.c:453 builtin/archive.c:92 builtin/notes.c:485
+#: archive.c:441 builtin/archive.c:92 builtin/notes.c:485
msgid "command"
msgstr "команда"
-#: archive.c:454 builtin/archive.c:93
+#: archive.c:442 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr "път към отдалечената команда „git-upload-archive“"
-#: archive.c:461
+#: archive.c:449
msgid "Unexpected option --remote"
msgstr "Неочаквана опция „--remote“"
-#: archive.c:463
+#: archive.c:451
msgid "Option --exec can only be used together with --remote"
msgstr "Опцията „--exec“ изисква „--remote“"
-#: archive.c:465
+#: archive.c:453
msgid "Unexpected option --output"
msgstr "Неочаквана опция „--output“"
-#: archive.c:487
+#: archive.c:475
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Непознат формат на архив: „%s“"
-#: archive.c:494
+#: archive.c:482
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Аргументът не се поддържа за форма̀та „%s“: -%d"
-#: attr.c:263
+#: attr.c:212
+#, c-format
+msgid "%.*s is not a valid attribute name"
+msgstr "„%.*s“ е неправилно име за атрибут"
+
+#: attr.c:408
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -965,27 +975,27 @@
"Отрицателните шаблони се игнорират в атрибутите на git.\n"
"Ако ви трябва начална удивителна, ползвайте „\\!“."
-#: bisect.c:441
+#: bisect.c:444
#, c-format
msgid "Could not open file '%s'"
msgstr "Файлът „%s“ не може да се отвори"
-#: bisect.c:446
+#: bisect.c:449
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "Неправилно цитирано съдържание във файла „%s“: %s"
-#: bisect.c:655
+#: bisect.c:657
#, c-format
msgid "We cannot bisect more!\n"
msgstr "Повече не може да се търси двоично!\n"
-#: bisect.c:708
+#: bisect.c:710
#, c-format
msgid "Not a valid commit name %s"
msgstr "Неправилно име на подаване „%s“"
-#: bisect.c:732
+#: bisect.c:734
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -994,7 +1004,7 @@
"Неправилна база за сливане: %s.\n"
"Следователно грешката е коригирана между „%s“ и [%s].\n"
-#: bisect.c:737
+#: bisect.c:739
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -1003,7 +1013,7 @@
"Нова база за сливане: %s.\n"
"Свойството е променено между „%s“ и [%s].\n"
-#: bisect.c:742
+#: bisect.c:744
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -1012,10 +1022,10 @@
"Базата за сливане „%s“ е %s.\n"
"Следователно първото %s подаване е между „%s“ и [%s].\n"
-#: bisect.c:750
+#: bisect.c:752
#, c-format
msgid ""
-"Some %s revs are not ancestor of the %s rev.\n"
+"Some %s revs are not ancestors of the %s rev.\n"
"git bisect cannot work properly in this case.\n"
"Maybe you mistook %s and %s revs?\n"
msgstr ""
@@ -1023,7 +1033,7 @@
"Двоичното търсене с git bisect няма да работи правилно.\n"
"Дали не сте объркали указателите „%s“ и „%s“?\n"
-#: bisect.c:763
+#: bisect.c:765
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1034,36 +1044,36 @@
"Не може да сме сигурни, че първото %s подаване е между „%s“ и „%s“.\n"
"Двоичното търсене продължава."
-#: bisect.c:798
+#: bisect.c:800
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "Двоично търсене: трябва да се провери база за сливане\n"
-#: bisect.c:849
+#: bisect.c:851
#, c-format
msgid "a %s revision is needed"
msgstr "необходима е версия „%s“"
-#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248
+#: bisect.c:868 builtin/notes.c:174 builtin/tag.c:255
#, c-format
msgid "could not create file '%s'"
msgstr "файлът „%s“ не може да бъде създаден"
-#: bisect.c:917
+#: bisect.c:919
#, c-format
msgid "could not read file '%s'"
msgstr "файлът „%s“ не може да бъде прочетен"
-#: bisect.c:947
+#: bisect.c:949
msgid "reading bisect refs failed"
msgstr "неуспешно прочитане на указателите за двоично търсене"
-#: bisect.c:967
+#: bisect.c:969
#, c-format
msgid "%s was both %s and %s\n"
msgstr "„%s“ e както „%s“, така и „%s“\n"
-#: bisect.c:975
+#: bisect.c:977
#, c-format
msgid ""
"No testable commit found.\n"
@@ -1072,7 +1082,7 @@
"Липсва подходящо за тестване подаване.\n"
"Проверете параметрите за пътищата.\n"
-#: bisect.c:994
+#: bisect.c:996
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1081,7 +1091,7 @@
#. TRANSLATORS: the last %s will be replaced with
#. "(roughly %d steps)" translation
-#: bisect.c:998
+#: bisect.c:1000
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
@@ -1222,7 +1232,7 @@
msgid "'%s' is already checked out at '%s'"
msgstr "„%s“ вече е изтеглен в „%s“"
-#: branch.c:363
+#: branch.c:364
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "Указателят „HEAD“ на работното дърво „%s“ не е обновен"
@@ -1237,7 +1247,7 @@
msgid "unrecognized header: %s%s (%d)"
msgstr "непозната заглавна част: %s%s (%d)"
-#: bundle.c:87 sequencer.c:963 builtin/commit.c:777
+#: bundle.c:87 sequencer.c:1341 sequencer.c:1767 builtin/commit.c:777
#, c-format
msgid "could not open '%s'"
msgstr "„%s“ не може да се отвори"
@@ -1246,10 +1256,10 @@
msgid "Repository lacks these prerequisite commits:"
msgstr "В хранилището липсват следните необходими подавания:"
-#: bundle.c:163 ref-filter.c:1462 sequencer.c:830 sequencer.c:1374
-#: builtin/blame.c:2814 builtin/commit.c:1061 builtin/log.c:348
-#: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909
-#: builtin/merge.c:356 builtin/shortlog.c:170
+#: 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 "неуспешно настройване на обхождането на версиите"
@@ -1289,7 +1299,7 @@
msgstr ""
"указателят „%s“ не е бил включен поради опциите зададени на „git rev-list“"
-#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:273
+#: bundle.c:443 builtin/log.c:170 builtin/log.c:1579 builtin/shortlog.c:281
#, c-format
msgid "unrecognized argument: %s"
msgstr "непознат аргумент: %s"
@@ -1307,13 +1317,13 @@
msgid "index-pack died"
msgstr "Командата „git index-pack“ не завърши успешно"
-#: color.c:290
+#: color.c:300
#, c-format
msgid "invalid color value: %.*s"
msgstr "неправилна стойност за цвят: %.*s"
-#: commit.c:40 builtin/am.c:421 builtin/am.c:457 builtin/am.c:1493
-#: builtin/am.c:2127
+#: commit.c:40 sequencer.c:1579 builtin/am.c:419 builtin/am.c:455
+#: builtin/am.c:1489 builtin/am.c:2126
#, c-format
msgid "could not parse %s"
msgstr "„%s“ не може да се анализира"
@@ -1323,7 +1333,7 @@
msgid "%s %s is not a commit!"
msgstr "%s %s не е подаване!"
-#: commit.c:1514
+#: commit.c:1511
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
@@ -1337,123 +1347,156 @@
msgid "memory exhausted"
msgstr "паметта свърши"
-#: config.c:516
+#: config.c:191
+msgid "relative config include conditionals must come from files"
+msgstr "относителните условни изрази за вмъкване трябва да идват от файлове"
+
+#: config.c:711
#, c-format
msgid "bad config line %d in blob %s"
msgstr "неправилен ред за настройки %d в BLOB „%s“"
-#: config.c:520
+#: config.c:715
#, c-format
msgid "bad config line %d in file %s"
msgstr "неправилен ред за настройки %d във файла „%s“"
-#: config.c:524
+#: config.c:719
#, c-format
msgid "bad config line %d in standard input"
msgstr "неправилен ред за настройки %d на стандартния вход"
-#: config.c:528
+#: config.c:723
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "неправилен ред за настройки %d в BLOB за подмодул „%s“"
-#: config.c:532
+#: config.c:727
#, c-format
msgid "bad config line %d in command line %s"
msgstr "неправилен ред за настройки %d на командния ред „%s“"
-#: config.c:536
+#: config.c:731
#, c-format
msgid "bad config line %d in %s"
msgstr "неправилен ред за настройки %d в „%s“"
-#: config.c:655
+#: config.c:859
msgid "out of range"
msgstr "извън диапазона"
-#: config.c:655
+#: config.c:859
msgid "invalid unit"
msgstr "неправилна мерна единица"
-#: config.c:661
+#: config.c:865
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "неправилна числова стойност „%s“ за „%s“: %s"
-#: config.c:666
+#: config.c:870
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr "неправилна числова стойност „%s“ за „%s“ в BLOB „%s“: %s"
-#: config.c:669
+#: config.c:873
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr "неправилна числова стойност „%s“ за „%s“ във файла „%s“: %s"
-#: config.c:672
+#: config.c:876
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr "неправилна числова стойност „%s“ за „%s“ на стандартния вход: %s"
-#: config.c:675
+#: config.c:879
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr "неправилна числова стойност „%s“ за „%s“ в BLOB от подмодул „%s“: %s"
-#: config.c:678
+#: config.c:882
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr "неправилна числова стойност „%s“ за „%s“ на командния ред „%s“: %s"
-#: config.c:681
+#: config.c:885
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "неправилна числова стойност „%s“ за „%s“ в %s: %s"
-#: config.c:768
+#: config.c:980
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "домашната папка на потребителя не може да бъде открита: „%s“"
-#: config.c:852 config.c:863
+#: config.c:1075 config.c:1086
#, c-format
msgid "bad zlib compression level %d"
msgstr "неправилно ниво на компресиране: %d"
-#: config.c:978
+#: config.c:1203
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "неправилен режим за създаването на обекти: %s"
-#: config.c:1312
+#: config.c:1359
+#, c-format
+msgid "bad pack compression level %d"
+msgstr "неправилно ниво на компресиране при пакетиране: %d"
+
+#: config.c:1557
msgid "unable to parse command-line config"
msgstr "неправилни настройки от командния ред"
-#: config.c:1362
+#: config.c:1611
msgid "unknown error occurred while reading the configuration files"
msgstr "неочаквана грешка при изчитането на конфигурационните файлове"
-#: config.c:1716
+#: config.c:1970
+#, c-format
+msgid "Invalid %s: '%s'"
+msgstr "Неправилен %s: „%s“"
+
+#: config.c:1991
+#, c-format
+msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
+msgstr ""
+"непозната стойност „%s“ за настройката „core.untrackedCache“. Ще се ползва "
+"стандартната стойност „keep“ (запазване)"
+
+#: config.c:2017
+#, c-format
+msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
+msgstr ""
+"стойността на „splitIndex.maxPercentChange“ трябва да е между 1 и 100, а не "
+"%d"
+
+#: config.c:2028
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "неразпозната стойност „%s“ от командния ред"
-#: config.c:1718
+#: config.c:2030
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "неправилна настройка „%s“ във файла „%s“ на ред №%d"
-#: config.c:1777
+#: config.c:2089
#, c-format
msgid "%s has multiple values"
msgstr "зададени са няколко стойности за „%s“"
-#: config.c:2311
+#: config.c:2423 config.c:2648
+#, c-format
+msgid "fstat on %s failed"
+msgstr "неуспешно изпълнение на „fstat“ върху „%s“"
+
+#: config.c:2541
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "„%s“ не може да се зададе да е „%s“"
-#: config.c:2313
+#: config.c:2543 builtin/remote.c:774
#, c-format
msgid "could not unset '%s'"
msgstr "„%s“ не може да се премахне"
@@ -1474,7 +1517,7 @@
"Проверете дали то съществува и дали имате права\n"
"за достъп."
-#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140
+#: connected.c:63 builtin/fsck.c:190 builtin/prune.c:140
msgid "Checking connectivity"
msgstr "Проверка на връзката"
@@ -1616,12 +1659,12 @@
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Непознат параметър „%s“ за статистиката по директории'\n"
-#: diff.c:283
+#: diff.c:281
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "Непозната стойност „%s“ за настройката „diff.submodule“"
-#: diff.c:346
+#: diff.c:344
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -1630,23 +1673,23 @@
"Грешки в настройката „diff.dirstat“:\n"
"%s"
-#: diff.c:3087
+#: diff.c:3102
#, c-format
msgid "external diff died, stopping at %s"
msgstr ""
"външната програма за разлики завърши неуспешно. Спиране на работата при „%s“"
-#: diff.c:3412
+#: diff.c:3428
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr ""
"Опциите „--name-only“, „--name-status“, „--check“ и „-s“ са несъвместими "
"една с друга"
-#: diff.c:3502
+#: diff.c:3518
msgid "--follow requires exactly one pathspec"
msgstr "Опцията „--follow“ изисква точно един път"
-#: diff.c:3665
+#: diff.c:3681
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -1655,204 +1698,234 @@
"Неразпознат параметър към опцията „--dirstat/-X“:\n"
"%s"
-#: diff.c:3679
+#: diff.c:3695
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "Неразпознат параметър към опцията „--submodule“: „%s“"
-#: diff.c:4700
+#: diff.c:4719
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
"търсенето на преименувания на обекти съчетани с промени се прескача поради "
"многото файлове."
-#: diff.c:4703
+#: diff.c:4722
msgid "only found copies from modified paths due to too many files."
msgstr ""
"установени са точните копия на променените пътища поради многото файлове."
-#: diff.c:4706
+#: diff.c:4725
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr "задайте променливата „%s“ да е поне %d и отново изпълнете командата."
-#: dir.c:1866
+#: dir.c:1899
msgid "failed to get kernel name and information"
msgstr "името и версията на ядрото не бяха получени"
-#: dir.c:1985
+#: dir.c:2018
msgid "Untracked cache is disabled on this system or location."
msgstr ""
"Кеша за неследените файлове е изключен на тази система или местоположение."
-#: fetch-pack.c:213
+#: dir.c:2776 dir.c:2781
+#, c-format
+msgid "could not create directories for %s"
+msgstr "директориите за „%s“ не може да бъдат създадени"
+
+#: dir.c:2806
+#, c-format
+msgid "could not migrate git directory from '%s' to '%s'"
+msgstr "директорията на git не може да се мигрира от „%s“ до „%s“"
+
+#: entry.c:280
+#, c-format
+msgid "could not stat file '%s'"
+msgstr "неуспешно изпълнение на „stat“ върху файла „%s“"
+
+#: fetch-pack.c:249
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: очаква се плитък списък"
-#: fetch-pack.c:225
+#: fetch-pack.c:261
msgid "git fetch-pack: expected ACK/NAK, got EOF"
msgstr "git fetch-pack: очакваше се „ACK“/„NAK“, а бе получен „EOF“"
-#: fetch-pack.c:243
+#: fetch-pack.c:280 builtin/archive.c:63
+#, c-format
+msgid "remote error: %s"
+msgstr "отдалечена грешка: %s"
+
+#: fetch-pack.c:281
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: очакваше се „ACK“/„NAK“, а бе получен „%s“"
-#: fetch-pack.c:295
+#: fetch-pack.c:333
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "опцията „--stateless-rpc“ изисква „multi_ack_detailed“"
-#: fetch-pack.c:381
+#: fetch-pack.c:419
#, c-format
msgid "invalid shallow line: %s"
msgstr "неправилен плитък ред: „%s“"
-#: fetch-pack.c:387
+#: fetch-pack.c:425
#, c-format
msgid "invalid unshallow line: %s"
msgstr "неправилен неплитък ред: „%s“"
-#: fetch-pack.c:389
+#: fetch-pack.c:427
#, c-format
msgid "object not found: %s"
msgstr "обектът „%s“ липсва"
-#: fetch-pack.c:392
+#: fetch-pack.c:430
#, c-format
msgid "error in object: %s"
msgstr "грешка в обекта: „%s“"
-#: fetch-pack.c:394
+#: fetch-pack.c:432
#, c-format
msgid "no shallow found: %s"
msgstr "не е открит плитък обект: %s"
-#: fetch-pack.c:397
+#: fetch-pack.c:435
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "очаква се плитък или не обект, а бе получено: %s"
-#: fetch-pack.c:436
+#: fetch-pack.c:474
#, c-format
msgid "got %s %d %s"
msgstr "получено бе %s %d %s"
-#: fetch-pack.c:450
+#: fetch-pack.c:488
#, c-format
msgid "invalid commit %s"
msgstr "неправилно подаване: „%s“"
-#: fetch-pack.c:483
+#: fetch-pack.c:521
msgid "giving up"
msgstr "преустановяване"
-#: fetch-pack.c:493 progress.c:235
+#: fetch-pack.c:531 progress.c:235
msgid "done"
msgstr "действието завърши"
-#: fetch-pack.c:505
+#: fetch-pack.c:543
#, c-format
msgid "got %s (%d) %s"
msgstr "получено бе %s (%d) %s"
-#: fetch-pack.c:551
+#: fetch-pack.c:589
#, c-format
msgid "Marking %s as complete"
msgstr "Отбелязване на „%s“ като пълно"
-#: fetch-pack.c:697
+#: fetch-pack.c:737
#, c-format
msgid "already have %s (%s)"
msgstr "вече има „%s“ (%s)"
-#: fetch-pack.c:735
+#: fetch-pack.c:775
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack: не може да се създаде процес за демултиплексора"
-#: fetch-pack.c:743
+#: fetch-pack.c:783
msgid "protocol error: bad pack header"
msgstr "протоколна грешка: неправилна заглавна част на пакет"
-#: fetch-pack.c:799
+#: fetch-pack.c:839
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: не може да се създаде процес за „%s“"
-#: fetch-pack.c:815
+#: fetch-pack.c:855
#, c-format
msgid "%s failed"
msgstr "неуспешно изпълнение на „%s“"
-#: fetch-pack.c:817
+#: fetch-pack.c:857
msgid "error in sideband demultiplexer"
msgstr "грешка в демултиплексора"
-#: fetch-pack.c:844
+#: fetch-pack.c:884
msgid "Server does not support shallow clients"
msgstr "Сървърът не поддържа плитки клиенти"
-#: fetch-pack.c:848
+#: fetch-pack.c:888
msgid "Server supports multi_ack_detailed"
msgstr "Сървърът поддържа „multi_ack_detailed“"
-#: fetch-pack.c:851
+#: fetch-pack.c:891
msgid "Server supports no-done"
msgstr "Сървърът поддържа „no-done“"
-#: fetch-pack.c:857
+#: fetch-pack.c:897
msgid "Server supports multi_ack"
msgstr "Сървърът поддържа „multi_ack“"
-#: fetch-pack.c:861
+#: fetch-pack.c:901
msgid "Server supports side-band-64k"
msgstr "Сървърът поддържа „side-band-64k“"
-#: fetch-pack.c:865
+#: fetch-pack.c:905
msgid "Server supports side-band"
msgstr "Сървърът поддържа „side-band“"
-#: fetch-pack.c:869
+#: fetch-pack.c:909
msgid "Server supports allow-tip-sha1-in-want"
msgstr "Сървърът поддържа „allow-tip-sha1-in-want“"
-#: fetch-pack.c:873
+#: fetch-pack.c:913
msgid "Server supports allow-reachable-sha1-in-want"
msgstr "Сървърът поддържа „allow-reachable-sha1-in-want“"
-#: fetch-pack.c:883
+#: fetch-pack.c:923
msgid "Server supports ofs-delta"
msgstr "Сървърът поддържа „ofs-delta“"
-#: fetch-pack.c:890
+#: fetch-pack.c:930
#, c-format
msgid "Server version is %.*s"
msgstr "Версията на сървъра е: %.*s"
-#: fetch-pack.c:896
+#: fetch-pack.c:936
msgid "Server does not support --shallow-since"
msgstr "Сървърът не поддържа опцията „--shallow-since“"
-#: fetch-pack.c:900
+#: fetch-pack.c:940
msgid "Server does not support --shallow-exclude"
msgstr "Сървърът не поддържа опцията „--shallow-exclude“"
-#: fetch-pack.c:902
+#: fetch-pack.c:942
msgid "Server does not support --deepen"
msgstr "Сървърът не поддържа опцията „--deepen“"
-#: fetch-pack.c:913
+#: fetch-pack.c:953
msgid "no common commits"
msgstr "няма общи подавания"
-#: fetch-pack.c:925
+#: fetch-pack.c:965
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: неуспешно доставяне."
-#: fetch-pack.c:1087
+#: fetch-pack.c:1127
msgid "no matching remote head"
msgstr "не може да бъде открит подходящ връх от отдалеченото хранилище"
+#: fetch-pack.c:1149
+#, c-format
+msgid "no such remote ref %s"
+msgstr "такъв отдалечен указател няма: %s"
+
+#: fetch-pack.c:1152
+#, c-format
+msgid "Server does not allow request for unadvertised object %s"
+msgstr "Сървърът не позволява заявка за необявен „%s“"
+
#: gpg-interface.c:185
msgid "gpg failed to sign the data"
msgstr "Програмата „gpg“ не подписа данните."
@@ -1866,35 +1939,40 @@
msgid "failed writing detached signature to '%s'"
msgstr "Програмата не успя да запише самостоятелния подпис в „%s“"
-#: grep.c:1782
+#: graph.c:96
+#, c-format
+msgid "ignore invalid color '%.*s' in log.graphColors"
+msgstr "прескачане на неправилния цвят „%.*s“ в „log.graphColors“"
+
+#: grep.c:1796
#, c-format
msgid "'%s': unable to read %s"
msgstr "„%s“: файлът сочен от „%s“ не може да бъде прочетен"
-#: grep.c:1799 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:155
+#: grep.c:1813 builtin/clone.c:399 builtin/diff.c:81 builtin/rm.c:133
#, c-format
msgid "failed to stat '%s'"
msgstr "не може да бъде получена информация чрез „stat“ за „%s“"
-#: grep.c:1810
+#: grep.c:1824
#, c-format
msgid "'%s': short read"
msgstr "„%s“: изчитането върна по-малко байтове от заявените"
-#: help.c:203
+#: help.c:218
#, c-format
msgid "available git commands in '%s'"
msgstr "налични команди на git от „%s“"
-#: help.c:210
+#: help.c:225
msgid "git commands available from elsewhere on your $PATH"
msgstr "команди на git от други директории от „$PATH“"
-#: help.c:241
+#: help.c:256
msgid "These are common Git commands used in various situations:"
msgstr "Това са най-често използваните команди на Git:"
-#: help.c:306
+#: help.c:321
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -1903,11 +1981,11 @@
"Изглежда, че „%s“ е команда на git, но тя не може да\n"
"бъде изпълнена. Вероятно пакетът „git-%s“ е повреден."
-#: help.c:361
+#: help.c:376
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "Странно, изглежда, че на системата ви няма нито една команда на git."
-#: help.c:383
+#: help.c:398
#, c-format
msgid ""
"WARNING: You called a Git command named '%s', which does not exist.\n"
@@ -1918,17 +1996,17 @@
"съществува. Изпълнението автоматично продължава, като се счита, че имате "
"предвид „%s“"
-#: help.c:388
+#: help.c:403
#, c-format
msgid "in %0.1f seconds automatically..."
msgstr "след %0.1f секунди…"
-#: help.c:395
+#: help.c:410
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git: „%s“ не е команда на git. Погледнете изхода от „git --help“."
-#: help.c:399 help.c:465
+#: help.c:414 help.c:480
msgid ""
"\n"
"Did you mean this?"
@@ -1942,12 +2020,12 @@
"\n"
"Команди с подобно име са:"
-#: help.c:461
+#: help.c:476
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s — %s"
-#: ident.c:334
+#: ident.c:343
msgid ""
"\n"
"*** Please tell me who you are.\n"
@@ -1974,6 +2052,41 @@
"хранилище.\n"
"\n"
+#: ident.c:367
+msgid "no email was given and auto-detection is disabled"
+msgstr "липсва адрес за е-поща, а автоматичното отгатване е изключено"
+
+#: ident.c:372
+#, c-format
+msgid "unable to auto-detect email address (got '%s')"
+msgstr ""
+"адресът за е-поща не може да бъде отгатнат (най-доброто предположение бе "
+"„%s“)"
+
+#: ident.c:382
+msgid "no name was given and auto-detection is disabled"
+msgstr "липсва име, а автоматичното отгатване е изключено"
+
+#: ident.c:388
+#, c-format
+msgid "unable to auto-detect name (got '%s')"
+msgstr "името не може да бъде отгатнато (най-доброто предположение бе „%s“)"
+
+#: ident.c:396
+#, c-format
+msgid "empty ident name (for <%s>) not allowed"
+msgstr "не може да се ползва празно име като идентификатор (за <%s>)"
+
+#: ident.c:402
+#, c-format
+msgid "name consists only of disallowed characters: %s"
+msgstr "името съдържа само непозволени знаци: „%s“"
+
+#: ident.c:417 builtin/commit.c:611
+#, c-format
+msgid "invalid date format: %s"
+msgstr "неправилен формат на дата: %s"
+
#: lockfile.c:152
#, c-format
msgid ""
@@ -2002,8 +2115,8 @@
msgid "failed to read the cache"
msgstr "кешът не може да бъде прочетен"
-#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374
-#: builtin/checkout.c:588 builtin/clone.c:731
+#: merge.c:96 builtin/am.c:1999 builtin/am.c:2034 builtin/checkout.c:393
+#: builtin/checkout.c:607 builtin/clone.c:749
msgid "unable to write new index file"
msgstr "неуспешно записване на новия индекс"
@@ -2011,71 +2124,71 @@
msgid "(bad commit)\n"
msgstr "(лошо подаване)\n"
-#: merge-recursive.c:231
+#: merge-recursive.c:231 merge-recursive.c:239
#, c-format
msgid "addinfo_cache failed for path '%s'"
msgstr "неуспешно изпълнение на „addinfo_cache“ за пътя „%s“"
-#: merge-recursive.c:301
+#: merge-recursive.c:303
msgid "error building trees"
msgstr "грешка при изграждане на дърветата"
-#: merge-recursive.c:720
+#: merge-recursive.c:727
#, c-format
msgid "failed to create path '%s'%s"
msgstr "грешка при създаването на пътя „%s“%s"
-#: merge-recursive.c:731
+#: merge-recursive.c:738
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "Изтриване на „%s“, за да се освободи място за поддиректория\n"
-#: merge-recursive.c:745 merge-recursive.c:764
+#: merge-recursive.c:752 merge-recursive.c:771
msgid ": perhaps a D/F conflict?"
msgstr ": възможно е да има конфликт директория/файл."
-#: merge-recursive.c:754
+#: merge-recursive.c:761
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr ""
"преустановяване на действието, за да не се изтрие неследеният файл „%s“"
-#: merge-recursive.c:796 builtin/cat-file.c:34
+#: merge-recursive.c:803 builtin/cat-file.c:34
#, c-format
msgid "cannot read object %s '%s'"
msgstr "обектът „%s“ (%s) не може да бъде прочетен"
-#: merge-recursive.c:798
+#: merge-recursive.c:805
#, c-format
msgid "blob expected for %s '%s'"
msgstr "обектът „%s“ (%s) се очакваше да е BLOB, а не е"
-#: merge-recursive.c:822
+#: merge-recursive.c:829
#, c-format
msgid "failed to open '%s': %s"
msgstr "„%s“ не може да се отвори: %s"
-#: merge-recursive.c:833
+#: merge-recursive.c:840
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "неуспешно създаване на символната връзка „%s“: %s"
-#: merge-recursive.c:838
+#: merge-recursive.c:845
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr ""
"не е ясно какво да се прави с обекта „%2$s“ (%3$s) с права за достъп „%1$06o“"
-#: merge-recursive.c:978
+#: merge-recursive.c:985
msgid "Failed to execute internal merge"
msgstr "Неуспешно вътрешно сливане"
-#: merge-recursive.c:982
+#: merge-recursive.c:989
#, c-format
msgid "Unable to add %s to database"
msgstr "„%s“ не може да се добави в базата с данни"
-#: merge-recursive.c:1081 merge-recursive.c:1095
+#: merge-recursive.c:1092
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2084,7 +2197,16 @@
"КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s. Версия %s на „%s“ "
"е оставена в дървото."
-#: merge-recursive.c:1087 merge-recursive.c:1100
+#: merge-recursive.c:1097
+#, 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
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2093,6 +2215,15 @@
"КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s. Версия %s на „%s“ "
"е оставена в дървото: %s."
+#: merge-recursive.c:1109
+#, 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
msgid "rename"
msgstr "преименуване"
@@ -2131,123 +2262,123 @@
msgid "Renaming %s to %s and %s to %s instead"
msgstr "Преименуване на „%s“ на „%s“, а „%s“ на „%s“"
-#: merge-recursive.c:1531
+#: merge-recursive.c:1528
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr ""
"КОНФЛИКТ (преименуване/добавяне): „%s“ е преименуван на „%s“ в клон „%s“, а "
"„%s“ е добавен в „%s“"
-#: merge-recursive.c:1546
+#: merge-recursive.c:1543
#, c-format
msgid "Adding merged %s"
msgstr "Добавяне на слетия „%s“"
-#: merge-recursive.c:1553 merge-recursive.c:1766
+#: merge-recursive.c:1550 merge-recursive.c:1780
#, c-format
msgid "Adding as %s instead"
msgstr "Добавяне като „%s“"
-#: merge-recursive.c:1610
+#: merge-recursive.c:1607
#, c-format
msgid "cannot read object %s"
msgstr "обектът „%s“ не може да се прочете"
-#: merge-recursive.c:1613
+#: merge-recursive.c:1610
#, c-format
msgid "object %s is not a blob"
msgstr "обектът „%s“ не е BLOB"
-#: merge-recursive.c:1666
+#: merge-recursive.c:1679
msgid "modify"
msgstr "промяна"
-#: merge-recursive.c:1666
+#: merge-recursive.c:1679
msgid "modified"
msgstr "променен"
-#: merge-recursive.c:1676
+#: merge-recursive.c:1689
msgid "content"
msgstr "съдържание"
-#: merge-recursive.c:1683
+#: merge-recursive.c:1696
msgid "add/add"
msgstr "добавяне/добавяне"
-#: merge-recursive.c:1718
+#: merge-recursive.c:1732
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "Прескачане на „%s“ (слетият резултат е идентичен със сегашния)"
-#: merge-recursive.c:1732
+#: merge-recursive.c:1746
#, c-format
msgid "Auto-merging %s"
msgstr "Автоматично сливане на „%s“"
-#: merge-recursive.c:1736 git-submodule.sh:924
+#: merge-recursive.c:1750 git-submodule.sh:944
msgid "submodule"
msgstr "ПОДМОДУЛ"
-#: merge-recursive.c:1737
+#: merge-recursive.c:1751
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "КОНФЛИКТ (%s): Конфликт при сливане на „%s“"
-#: merge-recursive.c:1831
+#: merge-recursive.c:1845
#, c-format
msgid "Removing %s"
msgstr "Изтриване на „%s“"
-#: merge-recursive.c:1857
+#: merge-recursive.c:1871
msgid "file/directory"
msgstr "файл/директория"
-#: merge-recursive.c:1863
+#: merge-recursive.c:1877
msgid "directory/file"
msgstr "директория/файл"
-#: merge-recursive.c:1868
+#: merge-recursive.c:1883
#, 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:1877
+#: merge-recursive.c:1892
#, c-format
msgid "Adding %s"
msgstr "Добавяне на „%s“"
-#: merge-recursive.c:1914
+#: merge-recursive.c:1929
msgid "Already up-to-date!"
msgstr "Вече е обновено!"
-#: merge-recursive.c:1923
+#: merge-recursive.c:1938
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "неуспешно сливане на дърветата „%s“ и „%s“"
-#: merge-recursive.c:2006
+#: merge-recursive.c:2021
msgid "Merging:"
msgstr "Сливане:"
-#: merge-recursive.c:2019
+#: merge-recursive.c:2034
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "открит е %u общ предшественик:"
msgstr[1] "открити са %u общи предшественици:"
-#: merge-recursive.c:2058
+#: merge-recursive.c:2073
msgid "merge returned no commit"
msgstr "сливането не върна подаване"
-#: merge-recursive.c:2121
+#: merge-recursive.c:2136
#, c-format
msgid "Could not parse object '%s'"
msgstr "Неуспешен анализ на обекта „%s“"
-#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788
+#: merge-recursive.c:2150 builtin/merge.c:645 builtin/merge.c:792
msgid "Unable to write index."
msgstr "Индексът не може да бъде прочетен"
@@ -2262,11 +2393,11 @@
"съществува).\n"
"За да завършите предишното сливане, изпълнете:\n"
"\n"
-" git notes merge --commit\n"
+" git notes merge --commit\n"
"\n"
"За да отмените предишното сливане, изпълнете:\n"
"\n"
-" git notes merge --abort"
+" git notes merge --abort"
#: notes-merge.c:280
#, c-format
@@ -2297,7 +2428,7 @@
msgid "Bad %s value: '%s'"
msgstr "Зададена е лоша стойност на променливата „%s“: „%s“"
-#: object.c:242
+#: object.c:240
#, c-format
msgid "unable to parse object: %s"
msgstr "обектът „%s“ не може да бъде анализиран"
@@ -2332,16 +2463,34 @@
msgid "malformed object name '%s'"
msgstr "неправилно име на обект „%s“"
-#: path.c:826
+#: path.c:810
#, c-format
msgid "Could not make %s writable by group"
msgstr "Не могат да се дадат права за запис в директорията „%s“ на групата"
-#: pathspec.c:133
+#: pathspec.c:125
+msgid "Escape character '\\' not allowed as last character in attr value"
+msgstr ""
+"Екраниращият знак „\\“не може да е последен знак в стойността на атрибут"
+
+#: pathspec.c:143
+msgid "Only one 'attr:' specification is allowed."
+msgstr "Позволено е само едно указване на „attr:“."
+
+#: pathspec.c:146
+msgid "attr spec must not be empty"
+msgstr "„attr:“ трябва да указва стойност"
+
+#: pathspec.c:189
+#, c-format
+msgid "invalid attribute name %s"
+msgstr "неправилно име на атрибут: „%s“"
+
+#: pathspec.c:254
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr "глобалните настройки за пътища „glob“ и „noglob“ са несъвместими"
-#: pathspec.c:143
+#: pathspec.c:261
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
@@ -2349,46 +2498,51 @@
"глобалната настройка за дословни пътища „literal“ е несъвместима с всички "
"други глобални настройки за пътища"
-#: pathspec.c:177
+#: pathspec.c:301
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr "неправилен параметър за опцията за магически пътища „prefix“"
-#: pathspec.c:183
+#: pathspec.c:322
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr "Неправилна стойност за опцията за магически пътища „%.*s“ в „%s“"
-#: pathspec.c:187
+#: pathspec.c:327
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr "Знакът „)“ липсва в опцията за магически пътища в „%s“"
-#: pathspec.c:205
+#: pathspec.c:365
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr "Магическите пътища „%c“ са без реализация за „%s“"
-#: pathspec.c:230
-#, c-format
-msgid "%s: 'literal' and 'glob' are incompatible"
-msgstr "%s: опциите „literal“ и „glob“ са несъвместими"
-
-#: pathspec.c:241
-#, c-format
-msgid "%s: '%s' is outside repository"
-msgstr "%s: „%s“ е извън хранилището"
-
-#: pathspec.c:291
+#: pathspec.c:421 pathspec.c:443
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "Пътят „%s“ е в подмодула „%.*s“"
-#: pathspec.c:353
+#: pathspec.c:483
+#, c-format
+msgid "%s: 'literal' and 'glob' are incompatible"
+msgstr "%s: опциите „literal“ и „glob“ са несъвместими"
+
+#: pathspec.c:496
+#, c-format
+msgid "%s: '%s' is outside repository"
+msgstr "%s: „%s“ е извън хранилището"
+
+#: pathspec.c:584
+#, c-format
+msgid "'%s' (mnemonic: '%c')"
+msgstr "„%s“ (клавиш: „%c“)"
+
+#: pathspec.c:594
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr "%s: магическите пътища не се поддържат от командата „%s“"
-#: pathspec.c:408
+#: pathspec.c:644
msgid ""
"empty strings as pathspecs will be made invalid in upcoming releases. please "
"use . instead if you meant to match all paths"
@@ -2397,24 +2551,16 @@
"следващи версии на Git. Ако искате съвпадение с всички пътища, използвайте: "
"„.“"
-#: pathspec.c:440
+#: pathspec.c:668
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "пътят „%s“ е след символна връзка"
-#: pathspec.c:449
-msgid ""
-"There is nothing to exclude from by :(exclude) patterns.\n"
-"Perhaps you forgot to add either ':/' or '.' ?"
-msgstr ""
-"Нищо не се изключва от шаблоните за изключване.\n"
-"Това често се случва, ако сте забравили да добавите „:/“ или „.“."
-
-#: pretty.c:971
+#: pretty.c:982
msgid "unable to parse --pretty format"
msgstr "аргументът към опцията „--pretty“ не може да се анализира"
-#: read-cache.c:1315
+#: read-cache.c:1442
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -2423,7 +2569,7 @@
"Зададена е неправилна стойност на настройката „index.version“.\n"
"Ще се ползва версия %i"
-#: read-cache.c:1325
+#: read-cache.c:1452
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -2433,263 +2579,373 @@
"„GIT_INDEX_VERSION“.\n"
"Ще се ползва версия %i"
-#: refs.c:576 builtin/merge.c:840
+#: read-cache.c:2375 sequencer.c:1350 sequencer.c:2048
+#, c-format
+msgid "could not stat '%s'"
+msgstr "неуспешно изпълнение на „stat“ върху „%s“"
+
+#: read-cache.c:2388
+#, c-format
+msgid "unable to open git dir: %s"
+msgstr "не може да се отвори директорията на git: %s"
+
+#: read-cache.c:2400
+#, c-format
+msgid "unable to unlink: %s"
+msgstr "неуспешно изтриване на „%s“"
+
+#: refs.c:620 builtin/merge.c:844
#, c-format
msgid "Could not open '%s' for writing"
msgstr "„%s“ не може да бъде отворен за запис"
-#: refs/files-backend.c:2481
+#: refs.c:1667
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "обновяванията на указатели са забранени в среди под карантина"
+
+#: refs/files-backend.c:1631
#, c-format
msgid "could not delete reference %s: %s"
msgstr "Указателят „%s“ не може да бъде изтрит: %s"
-#: refs/files-backend.c:2484
+#: refs/files-backend.c:1634
#, c-format
msgid "could not delete references: %s"
msgstr "Указателите не може да бъдат изтрити: %s"
-#: refs/files-backend.c:2493
+#: refs/files-backend.c:1643
#, c-format
msgid "could not remove reference %s"
msgstr "Указателят „%s“ не може да бъде изтрит"
-#: ref-filter.c:55
+#: ref-filter.c:35 wt-status.c:1780
+msgid "gone"
+msgstr "изтрит"
+
+#: ref-filter.c:36
+#, c-format
+msgid "ahead %d"
+msgstr "напред с %d"
+
+#: ref-filter.c:37
+#, c-format
+msgid "behind %d"
+msgstr "назад с %d"
+
+#: ref-filter.c:38
+#, c-format
+msgid "ahead %d, behind %d"
+msgstr "напред с %d, назад с %d"
+
+#: ref-filter.c:104
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "очакван формат: %%(color:ЦВЯТ)"
-#: ref-filter.c:57
+#: ref-filter.c:106
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "непознат цвят: %%(color:%s)"
-#: ref-filter.c:71
+#: ref-filter.c:120
#, c-format
-msgid "unrecognized format: %%(%s)"
-msgstr "непознат формат: %%(%s)"
+msgid "Integer value expected refname:lstrip=%s"
+msgstr "очаква се цяло число за „refname:lstrip=%s“"
-#: ref-filter.c:77
+#: ref-filter.c:124
+#, c-format
+msgid "Integer value expected refname:rstrip=%s"
+msgstr "очаква се цяло число за „refname:rstrip=%s“"
+
+#: ref-filter.c:126
+#, c-format
+msgid "unrecognized %%(%s) argument: %s"
+msgstr "непознат аргумент за „%%(%s)“: %s"
+
+#: ref-filter.c:166
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) не приема аргументи"
-#: ref-filter.c:84
+#: ref-filter.c:173
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "%%(subject) не приема аргументи"
-#: ref-filter.c:101
+#: ref-filter.c:180
+#, c-format
+msgid "%%(trailers) does not take arguments"
+msgstr "%%(trailers) не приема аргументи"
+
+#: ref-filter.c:199
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "очаква се положителна стойност за „contents:lines=%s“"
-#: ref-filter.c:103
+#: ref-filter.c:201
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "непознат аргумент за %%(contents): %s"
-#: ref-filter.c:113
+#: ref-filter.c:214
+#, c-format
+msgid "positive value expected objectname:short=%s"
+msgstr "очаква се положителна стойност за „objectname:short=%s“"
+
+#: ref-filter.c:218
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "непознат аргумент за %%(objectname): %s"
-#: ref-filter.c:135
+#: ref-filter.c:245
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "очакван формат: %%(align:ШИРОЧИНА,ПОЗИЦИЯ)"
-#: ref-filter.c:147
+#: ref-filter.c:257
#, c-format
msgid "unrecognized position:%s"
msgstr "непозната позиция: %s"
-#: ref-filter.c:151
+#: ref-filter.c:261
#, c-format
msgid "unrecognized width:%s"
msgstr "непозната широчина: %s"
-#: ref-filter.c:157
+#: ref-filter.c:267
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "непознат аргумент за %%(align): %s"
-#: ref-filter.c:161
+#: ref-filter.c:271
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "очаква се положителна широчина с лексемата „%%(align)“"
-#: ref-filter.c:244
+#: ref-filter.c:286
+#, c-format
+msgid "unrecognized %%(if) argument: %s"
+msgstr "непознат аргумент за „%%(if)“: %s"
+
+#: ref-filter.c:371
#, c-format
msgid "malformed field name: %.*s"
msgstr "неправилно име на обект: „%.*s“"
-#: ref-filter.c:270
+#: ref-filter.c:397
#, c-format
msgid "unknown field name: %.*s"
msgstr "непознато име на обект: „%.*s“"
-#: ref-filter.c:372
+#: ref-filter.c:501
+#, c-format
+msgid "format: %%(if) atom used without a %%(then) atom"
+msgstr "формат: лексемата %%(if) е използвана без съответната ѝ %%(then)"
+
+#: ref-filter.c:561
+#, c-format
+msgid "format: %%(then) atom used without an %%(if) atom"
+msgstr "формат: лексемата %%(then) е използвана без съответната ѝ %%(if)"
+
+#: ref-filter.c:563
+#, c-format
+msgid "format: %%(then) atom used more than once"
+msgstr "формат: лексемата %%(then) е използвана повече от един път"
+
+#: ref-filter.c:565
+#, c-format
+msgid "format: %%(then) atom used after %%(else)"
+msgstr "формат: лексемата %%(then) е използвана след %%(else)"
+
+#: ref-filter.c:591
+#, c-format
+msgid "format: %%(else) atom used without an %%(if) atom"
+msgstr "формат: лексемата %%(else) е използвана без съответната ѝ %%(if)"
+
+#: ref-filter.c:593
+#, c-format
+msgid "format: %%(else) atom used without a %%(then) atom"
+msgstr "формат: лексемата %%(else) е използвана без съответната ѝ %%(then)"
+
+#: ref-filter.c:595
+#, c-format
+msgid "format: %%(else) atom used more than once"
+msgstr "формат: лексемата %%(else) е използвана повече от един път"
+
+#: ref-filter.c:608
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
-msgstr "грешка във форма̀та: лексемата %%(end) е използвана без съответната ѝ"
+msgstr "формат: лексемата %%(end) е използвана без съответната ѝ"
-#: ref-filter.c:424
+#: ref-filter.c:663
#, c-format
msgid "malformed format string %s"
msgstr "неправилен низ за форматиране „%s“"
-#: ref-filter.c:878
-msgid ":strip= requires a positive integer argument"
-msgstr "„:strip=“ изисква аргумент цяло, положително число"
-
-#: ref-filter.c:883
+#: ref-filter.c:1247
#, c-format
-msgid "ref '%s' does not have %ld components to :strip"
-msgstr "указателят „%s“ не разполага с %ld компоненти за премахване (:strip)"
+msgid "(no branch, rebasing %s)"
+msgstr "(извън клон, пребазиране на „%s“)"
-#: ref-filter.c:1046
+#: ref-filter.c:1250
#, c-format
-msgid "unknown %.*s format %s"
-msgstr "непознато „%.*s“, формат „%s“"
+msgid "(no branch, bisect started on %s)"
+msgstr "(извън клон, двоично търсене от „%s“)"
-#: ref-filter.c:1066 ref-filter.c:1097
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached at " in wt-status.c
+#: ref-filter.c:1256
+#, 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
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr "Указателят „HEAD“ не е свързан и е отделѐн от „%s“"
+
+#: ref-filter.c:1265
+msgid "(no branch)"
+msgstr "(извън клон)"
+
+#: ref-filter.c:1420 ref-filter.c:1451
#, c-format
msgid "missing object %s for %s"
msgstr "обектът „%s“ липсва за „%s“"
-#: ref-filter.c:1069 ref-filter.c:1100
+#: ref-filter.c:1423 ref-filter.c:1454
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "неуспешно анализиране чрез „parse_object_buffer“ на „%s“ за „%s“"
-#: ref-filter.c:1311
+#: ref-filter.c:1692
#, c-format
msgid "malformed object at '%s'"
msgstr "обект със сгрешен формат при „%s“"
-#: ref-filter.c:1373
+#: ref-filter.c:1759
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "игнориране на указателя с грешно име „%s“"
-#: ref-filter.c:1378
+#: ref-filter.c:1764
#, c-format
msgid "ignoring broken ref %s"
msgstr "игнориране на повредения указател „%s“"
-#: ref-filter.c:1633
+#: ref-filter.c:2028
#, c-format
msgid "format: %%(end) atom missing"
msgstr "грешка във форма̀та: липсва лексемата %%(end)"
-#: ref-filter.c:1687
+#: ref-filter.c:2109
#, c-format
msgid "malformed object name %s"
msgstr "неправилно име на обект „%s“"
-#: remote.c:746
+#: remote.c:754
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "Невъзможно е да се доставят едновременно и „%s“, и „%s“ към „%s“"
-#: remote.c:750
+#: remote.c:758
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "„%s“ обикновено следи „%s“, а не „%s“"
-#: remote.c:754
+#: remote.c:762
#, c-format
msgid "%s tracks both %s and %s"
msgstr "„%s“ следи както „%s“, така и „%s“"
-#: remote.c:762
+#: remote.c:770
msgid "Internal error"
msgstr "Вътрешна грешка"
-#: remote.c:1677 remote.c:1720
+#: remote.c:1685 remote.c:1787
msgid "HEAD does not point to a branch"
msgstr "Указателят „HEAD“ не сочи към клон"
-#: remote.c:1686
+#: remote.c:1694
#, c-format
msgid "no such branch: '%s'"
msgstr "няма клон на име „%s“"
-#: remote.c:1689
+#: remote.c:1697
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "не е зададен клон-източник за клона „%s“"
-#: remote.c:1695
+#: remote.c:1703
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "клонът-източник „%s“ не е съхранен като следящ клон"
-#: remote.c:1710
+#: remote.c:1718
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
"липсва локален следящ клон за местоположението за изтласкване „%s“ в "
"хранилището „%s“"
-#: remote.c:1725
+#: remote.c:1730
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "няма информация клонът „%s“ да следи някой друг"
-#: remote.c:1736
+#: remote.c:1741
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "указателят за изтласкване на „%s“ не включва „%s“"
-#: remote.c:1749
+#: remote.c:1754
msgid "push has no destination (push.default is 'nothing')"
msgstr "указателят за изтласкване не включва цел („push.default“ е „nothing“)"
-#: remote.c:1771
+#: remote.c:1776
msgid "cannot resolve 'simple' push to a single destination"
msgstr "простото (simple) изтласкване не съответства на една цел"
-#: remote.c:2073
+#: remote.c:2081
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "Този клон следи „%s“, но следеният клон е изтрит.\n"
-#: remote.c:2077
+#: remote.c:2085
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (за да коригирате това, използвайте „git branch --unset-upstream“)\n"
-#: remote.c:2080
+#: remote.c:2088
#, c-format
msgid "Your branch is up-to-date with '%s'.\n"
msgstr "Клонът е актуализиран към „%s“.\n"
-#: remote.c:2084
+#: remote.c:2092
#, 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] "Клонът ви е с %2$d подаване пред „%1$s“.\n"
msgstr[1] "Клонът ви е с %2$d подавания пред „%1$s“.\n"
-#: remote.c:2090
+#: remote.c:2098
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (публикувайте локалните си промени чрез „git push“)\n"
-#: remote.c:2093
+#: remote.c:2101
#, 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] ""
-"Клонът ви е с %2$d подаване зад „%1$s“ и може да бъде тривиално слят.\n"
-msgstr[1] ""
-"Клонът ви е с %2$d подавания зад „%1$s“ и може да бъде тривиално слят.\n"
+msgstr[0] "Клонът ви е с %2$d подаване зад „%1$s“ и може да бъде превъртян.\n"
+msgstr[1] "Клонът ви е с %2$d подавания зад „%1$s“ и може да бъде превъртян.\n"
-#: remote.c:2101
+#: remote.c:2109
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (обновете локалния си клон чрез „git pull“)\n"
-#: remote.c:2104
+#: remote.c:2112
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -2704,7 +2960,7 @@
"Текущият клон се е отделил от „%s“,\n"
"двата имат съответно по %d и %d несъвпадащи подавания.\n"
-#: remote.c:2114
+#: remote.c:2122
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (слейте отдалечения клон в локалния чрез „git pull“)\n"
@@ -2721,24 +2977,35 @@
msgid "--first-parent is incompatible with --bisect"
msgstr "опциите „--first-parent“ и „--bisect“ са несъвместими"
-#: run-command.c:106
+#: run-command.c:125
msgid "open /dev/null failed"
msgstr "неуспешно отваряне на „/dev/null“"
-#: run-command.c:108
+#: run-command.c:127
#, c-format
msgid "dup2(%d,%d) failed"
msgstr "неуспешно изпълнение на dup2(%d,%d)"
-#: send-pack.c:297
+#: send-pack.c:150
+#, c-format
+msgid "unable to parse remote unpack status: %s"
+msgstr ""
+"състоянието от отдалеченото разпакетиране не може да бъде анализирано: %s"
+
+#: send-pack.c:152
+#, c-format
+msgid "remote unpack failed: %s"
+msgstr "неуспешно отдалечено разпакетиране: %s"
+
+#: send-pack.c:315
msgid "failed to sign the push certificate"
msgstr "сертификатът за изтласкване не може да бъде подписан"
-#: send-pack.c:410
+#: send-pack.c:428
msgid "the receiving end does not support --signed push"
msgstr "отсрещната страна не поддържа изтласкване с опцията „--signed“"
-#: send-pack.c:412
+#: send-pack.c:430
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -2746,23 +3013,32 @@
"отсрещната страна не поддържа изтласкване с опцията „--signed“, затова не се "
"използва сертификат"
-#: send-pack.c:424
+#: send-pack.c:442
msgid "the receiving end does not support --atomic push"
msgstr "получаващата страна не поддържа изтласкване с опцията „--atomic“"
-#: send-pack.c:429
+#: send-pack.c:447
msgid "the receiving end does not support push options"
msgstr "отсрещната страна не поддържа опции при изтласкване"
-#: sequencer.c:171
+#: sequencer.c:215
msgid "revert"
msgstr "отмяна"
-#: sequencer.c:171
+#: sequencer.c:217
msgid "cherry-pick"
msgstr "отбиране"
-#: sequencer.c:228
+#: sequencer.c:219
+msgid "rebase -i"
+msgstr "rebase -i"
+
+#: sequencer.c:221
+#, c-format
+msgid "Unknown action: %d"
+msgstr "Неизвестно действие: %d"
+
+#: sequencer.c:278
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -2770,7 +3046,7 @@
"след коригирането на конфликтите, отбележете съответните\n"
"пътища с „git add ПЪТ…“ или „git rm ПЪТ…“."
-#: sequencer.c:231
+#: sequencer.c:281
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
@@ -2780,61 +3056,63 @@
"пътища с „git add ПЪТ…“ или „git rm ПЪТ…“, след което\n"
"подайте резултата с командата „git commit'“."
-#: sequencer.c:244 sequencer.c:1209
+#: sequencer.c:294 sequencer.c:1682
#, c-format
msgid "could not lock '%s'"
msgstr "„%s“ не може да се заключи"
-#: sequencer.c:247 sequencer.c:1125 sequencer.c:1214
+#: sequencer.c:297 sequencer.c:1560 sequencer.c:1687 sequencer.c:1701
#, c-format
msgid "could not write to '%s'"
msgstr "в „%s“ не може да се пише"
-# FIXME - must be the same as Could not write to '%s' above
-#: sequencer.c:251
+#: sequencer.c:301
#, c-format
msgid "could not write eol to '%s'"
msgstr "краят на ред не може да се запише в „%s“"
-#: sequencer.c:255 sequencer.c:1130 sequencer.c:1216
+#: sequencer.c:305 sequencer.c:1565 sequencer.c:1689
#, c-format
msgid "failed to finalize '%s'."
msgstr "„%s“ не може да се завърши."
-#: sequencer.c:279 builtin/am.c:259 builtin/commit.c:749 builtin/merge.c:1032
+#: sequencer.c:329 sequencer.c:814 sequencer.c:1586 builtin/am.c:257
+#: builtin/commit.c:749 builtin/merge.c:1018
#, c-format
msgid "could not read '%s'"
msgstr "файлът „%s“ не може да бъде прочетен"
-#: sequencer.c:305
+#: sequencer.c:355
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "локалните ви промени ще бъдат презаписани при %s."
-#: sequencer.c:309
+#: sequencer.c:359
msgid "commit your changes or stash them to proceed."
msgstr "подайте или скатайте промените, за да продължите"
-#: sequencer.c:324
+#: sequencer.c:388
#, c-format
msgid "%s: fast-forward"
-msgstr "%s: тривиално сливане"
+msgstr "%s: превъртане"
-#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:399
+#. TRANSLATORS: %s will be "revert", "cherry-pick" or
+#. * "rebase -i".
+#.
+#: sequencer.c:470
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: новият индекс не може да бъде запазен"
-#: sequencer.c:418
+#: sequencer.c:489
msgid "could not resolve HEAD commit\n"
msgstr "подаването сочено от указателя „HEAD“ не може да бъде открито\n"
-#: sequencer.c:438
+#: sequencer.c:509
msgid "unable to update cache tree\n"
msgstr "дървото на кеша не може да бъде обновено\n"
-#: sequencer.c:483
+#: sequencer.c:592
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -2853,193 +3131,416 @@
"в това работно дърво има скатани промени.\n"
"Ако искате да ги слеете с предишното подаване, изпълнете:\n"
"\n"
-" git commit --amend %s\n"
+" git commit --amend %s\n"
"\n"
"Ако искате да създадете ново подаване, изпълнете:\n"
"\n"
-" git commit %s\n"
+" git commit %s\n"
"\n"
"И в двата случая продължавате след това с командата:\n"
"\n"
-" git rebase --continue\n"
+" git rebase --continue\n"
-#: sequencer.c:567
+#: sequencer.c:694
#, c-format
msgid "could not parse commit %s\n"
msgstr "подаването „%s“ не може да бъде анализирано\n"
-#: sequencer.c:572
+#: sequencer.c:699
#, c-format
msgid "could not parse parent commit %s\n"
msgstr "родителското подаване „%s“ не може да бъде анализирано\n"
-#: sequencer.c:656
+#: sequencer.c:821
+#, c-format
+msgid ""
+"unexpected 1st line of squash message:\n"
+"\n"
+"\t%.*s"
+msgstr ""
+"неочакван първи ред на съобщението при смачкване:\n"
+"\n"
+" %.*s"
+
+#: sequencer.c:827
+#, c-format
+msgid ""
+"invalid 1st line of squash message:\n"
+"\n"
+"\t%.*s"
+msgstr ""
+"неправилен първи ред на съобщението при смачкване:\n"
+"\n"
+" %.*s"
+
+#: sequencer.c:833 sequencer.c:858
+#, c-format
+msgid "This is a combination of %d commits."
+msgstr "Това е обединение от %d подавания"
+
+#: sequencer.c:842
+msgid "need a HEAD to fixup"
+msgstr "За смачкване ви трябва указател „HEAD“"
+
+#: sequencer.c:844
+msgid "could not read HEAD"
+msgstr "указателят „HEAD“ не може да се прочете"
+
+#: sequencer.c:846
+msgid "could not read HEAD's commit message"
+msgstr ""
+"съобщението за подаване към указателя „HEAD“ не може да бъде прочетено: %s"
+
+#: sequencer.c:852
+#, c-format
+msgid "cannot write '%s'"
+msgstr "„%s“ не може да се запази"
+
+#: sequencer.c:861 git-rebase--interactive.sh:445
+msgid "This is the 1st commit message:"
+msgstr "Това е 1-то съобщение при подаване:"
+
+#: sequencer.c:869
+#, c-format
+msgid "could not read commit message of %s"
+msgstr "съобщението за подаване към „%s“ не може да бъде прочетено"
+
+#: sequencer.c:876
+#, c-format
+msgid "This is the commit message #%d:"
+msgstr "Това е съобщение при подаване №${%d}:"
+
+#: sequencer.c:881
+#, c-format
+msgid "The commit message #%d will be skipped:"
+msgstr "Съобщение при подаване №${%d} ще бъде прескочено:"
+
+#: sequencer.c:886
+#, c-format
+msgid "unknown command: %d"
+msgstr "непозната команда: %d"
+
+#: sequencer.c:952
msgid "your index file is unmerged."
msgstr "индексът не е слят."
-#: sequencer.c:675
+#: sequencer.c:970
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "подаването „%s“ е сливане, но не е дадена опцията „-m“"
-#: sequencer.c:683
+#: sequencer.c:978
#, c-format
msgid "commit %s does not have parent %d"
msgstr "подаването „%s“ няма родител %d"
-#: sequencer.c:687
+#: sequencer.c:982
#, c-format
msgid "mainline was specified but commit %s is not a merge."
msgstr "указано е базово подаване, но подаването „%s“ не е сливане."
-#. TRANSLATORS: The first %s will be a "todo" command like
-#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:700
-#, c-format
-msgid "%s: cannot parse parent commit %s"
-msgstr "%s: неразпозната стойност за родителското подаване „%s“"
-
-#: sequencer.c:705
+#: sequencer.c:988
#, c-format
msgid "cannot get commit message for %s"
msgstr "неуспешно извличане на съобщението за подаване на „%s“"
-#: sequencer.c:797
+#. TRANSLATORS: The first %s will be a "todo" command like
+#. "revert" or "pick", the second %s a SHA1.
+#: sequencer.c:1009
+#, c-format
+msgid "%s: cannot parse parent commit %s"
+msgstr "%s: неразпозната стойност за родителското подаване „%s“"
+
+#: sequencer.c:1071 sequencer.c:1827
+#, c-format
+msgid "could not rename '%s' to '%s'"
+msgstr "„%s“ не може да се преименува на „%s“"
+
+#: sequencer.c:1122
#, c-format
msgid "could not revert %s... %s"
msgstr "подаването „%s“… не може да бъде отменено: „%s“"
-#: sequencer.c:798
+#: sequencer.c:1123
#, c-format
msgid "could not apply %s... %s"
msgstr "подаването „%s“… не може да бъде приложено: „%s“"
-#: sequencer.c:833
+#: sequencer.c:1165
msgid "empty commit set passed"
msgstr "зададено е празно множество от подавания"
-#: sequencer.c:843
+#: sequencer.c:1175
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: неуспешно изчитане на индекса"
-#: sequencer.c:850
+#: sequencer.c:1182
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: неуспешно обновяване на индекса"
-#: sequencer.c:944
+#: sequencer.c:1303
#, c-format
msgid "invalid line %d: %.*s"
msgstr "неправилен ред %d: %.*s"
-#: sequencer.c:950
-msgid "no commits parsed."
-msgstr "никое от подаванията не може да се разпознае."
+#: sequencer.c:1311
+#, c-format
+msgid "cannot '%s' without a previous commit"
+msgstr "Без предишно подаване не може да се изпълни „%s“"
-#: sequencer.c:966
+#: sequencer.c:1344
#, c-format
msgid "could not read '%s'."
msgstr "от „%s“ не може да се чете."
-#: sequencer.c:972
+#: sequencer.c:1356
+msgid "please fix this using 'git rebase --edit-todo'."
+msgstr "коригирайте това чрез „git rebase --edit-todo“."
+
+#: sequencer.c:1358
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "неизползваем файл с описание на предстоящите действия: „%s“"
-#: sequencer.c:983
+#: sequencer.c:1363
+msgid "no commits parsed."
+msgstr "никое от подаванията не може да се разпознае."
+
+#: sequencer.c:1374
msgid "cannot cherry-pick during a revert."
msgstr ""
"по време на отмяна на подаване не може да се извърши отбиране на подаване."
-#: sequencer.c:985
+#: sequencer.c:1376
msgid "cannot revert during a cherry-pick."
msgstr "по време на отбиране не може да се извърши отмяна на подаване."
-#: sequencer.c:1028
+#: sequencer.c:1439
#, c-format
msgid "invalid key: %s"
msgstr "неправилен ключ: „%s“"
-#: sequencer.c:1031
+#: sequencer.c:1442
#, c-format
msgid "invalid value for %s: %s"
msgstr "неправилна стойност за „%s“: „%s“"
-#: sequencer.c:1063
+#: sequencer.c:1499
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "неправилен файл с опции: „%s“"
-#: sequencer.c:1101
+#: sequencer.c:1537
msgid "a cherry-pick or revert is already in progress"
msgstr ""
"в момента вече се извършва отбиране на подавания или пребазиране на клона"
-#: sequencer.c:1102
+#: sequencer.c:1538
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "използвайте „git cherry-pick (--continue | --quit | --abort)“"
-#: sequencer.c:1106
+#: sequencer.c:1541
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "директорията за секвенсора „%s“ не може да бъде създадена"
-#: sequencer.c:1120
+#: sequencer.c:1555
msgid "could not lock HEAD"
msgstr "указателят „HEAD“ не може да се заключи"
-#: sequencer.c:1151 sequencer.c:1289
+#: sequencer.c:1611 sequencer.c:2181
msgid "no cherry-pick or revert in progress"
msgstr ""
"в момента не се извършва отбиране на подавания или пребазиране на клона"
-#: sequencer.c:1153
+#: sequencer.c:1613
msgid "cannot resolve HEAD"
msgstr "Подаването сочено от указателя „HEAD“ не може да бъде открито"
-#: sequencer.c:1155 sequencer.c:1189
+#: sequencer.c:1615 sequencer.c:1649
msgid "cannot abort from a branch yet to be born"
msgstr ""
"действието не може да бъде преустановено, когато сте на клон, който тепърва "
"предстои да бъде създаден"
-#: sequencer.c:1175 builtin/grep.c:578
+#: sequencer.c:1635 builtin/grep.c:910
#, c-format
msgid "cannot open '%s'"
msgstr "„%s“ не може да бъде отворен"
-#: sequencer.c:1177
+#: sequencer.c:1637
#, c-format
msgid "cannot read '%s': %s"
msgstr "„%s“ не може да бъде прочетен: %s"
-#: sequencer.c:1178
+#: sequencer.c:1638
msgid "unexpected end of file"
msgstr "неочакван край на файл"
-#: sequencer.c:1184
+#: sequencer.c:1644
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
"запазеният преди започването на отбирането файл за указателя „HEAD“ — „%s“ е "
"повреден"
-#: sequencer.c:1354
+#: sequencer.c:1655
+msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
+msgstr ""
+"Изглежда указателят „HEAD“ е променен. Проверете към какво сочи.\n"
+"Не се правят промени."
+
+#: sequencer.c:1792 sequencer.c:2080
+msgid "cannot read HEAD"
+msgstr "указателят „HEAD“ не може да бъде прочетен"
+
+#: sequencer.c:1832 builtin/difftool.c:616
+#, c-format
+msgid "could not copy '%s' to '%s'"
+msgstr "„%s“ не може да се копира като „%s“"
+
+#: sequencer.c:1848
+msgid "could not read index"
+msgstr "индексът не може да бъде прочетен"
+
+#: sequencer.c:1853
+#, c-format
+msgid ""
+"execution failed: %s\n"
+"%sYou can fix the problem, and then run\n"
+"\n"
+" git rebase --continue\n"
+"\n"
+msgstr ""
+"неуспешно изпълнение: %s\n"
+"%sМоже да коригирате проблема, след което изпълнете:\n"
+"\n"
+" git rebase --continue\n"
+"\n"
+
+#: sequencer.c:1859
+msgid "and made changes to the index and/or the working tree\n"
+msgstr "и промени индекса и/или работното дърво\n"
+
+#: sequencer.c:1865
+#, c-format
+msgid ""
+"execution succeeded: %s\n"
+"but left changes to the index and/or the working tree\n"
+"Commit or stash your changes, and then run\n"
+"\n"
+" git rebase --continue\n"
+"\n"
+msgstr ""
+"Успешно изпълнение: %s\n"
+"Остават още промени в индекса или работното дърво.\n"
+"Трябва да ги подадете или скатаете и след това изпълнете:\n"
+"\n"
+" git rebase --continue\n"
+"\n"
+
+#: sequencer.c:1920 git-rebase.sh:169
+#, c-format
+msgid "Applied autostash."
+msgstr "Автоматично скатаното е приложено."
+
+#: sequencer.c:1932
+#, c-format
+msgid "cannot store %s"
+msgstr "„%s“ не може да бъде запазен"
+
+#: sequencer.c:1934 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"
+"надеждно скатани. Можете да пробвате да ги приложите чрез „git stash pop“\n"
+"или да ги изхвърлите чрез „git stash drop“, когато поискате.\n"
+
+#: sequencer.c:2016
+#, c-format
+msgid "Stopped at %s... %.*s\n"
+msgstr "Спиране при „%s“… %.*s\n"
+
+#: sequencer.c:2058
+#, c-format
+msgid "unknown command %d"
+msgstr "непозната команда %d"
+
+#: sequencer.c:2088
+msgid "could not read orig-head"
+msgstr "указателят за „orig-head“ не може да се прочете"
+
+#: sequencer.c:2092
+msgid "could not read 'onto'"
+msgstr "указателят за „onto“ не може да се прочете"
+
+#: sequencer.c:2099
+#, c-format
+msgid "could not update %s"
+msgstr "„%s“ не може да се обнови"
+
+#: sequencer.c:2106
+#, c-format
+msgid "could not update HEAD to %s"
+msgstr "„HEAD“ не може да бъде обновен до „%s“"
+
+#: sequencer.c:2190
+msgid "cannot rebase: You have unstaged changes."
+msgstr "не може да пребазирате, защото има промени, които не са в индекса."
+
+#: sequencer.c:2195
+msgid "could not remove CHERRY_PICK_HEAD"
+msgstr "указателят „CHERRY_PICK_HEAD“ не може да бъде изтрит"
+
+#: sequencer.c:2204
+msgid "cannot amend non-existing commit"
+msgstr "несъществуващо подаване не може да се поправи"
+
+#: sequencer.c:2206
+#, c-format
+msgid "invalid file: '%s'"
+msgstr "неправилен файл: „%s“"
+
+#: sequencer.c:2208
+#, c-format
+msgid "invalid contents: '%s'"
+msgstr "неправилно съдържание: „%s“"
+
+#: sequencer.c:2211
+msgid ""
+"\n"
+"You have uncommitted changes in your working tree. Please, commit them\n"
+"first and then run 'git rebase --continue' again."
+msgstr ""
+"\n"
+"В работното дърво има неподадени промени. Първо ги подайте, а след това\n"
+"отново изпълнете „git rebase --continue“."
+
+#: sequencer.c:2221
+msgid "could not commit staged changes."
+msgstr "промените в индекса не могат да бъдат подадени."
+
+#: sequencer.c:2301
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: не може да се отбере „%s“"
-#: sequencer.c:1358
+#: sequencer.c:2305
#, c-format
msgid "%s: bad revision"
msgstr "%s: неправилна версия"
-#: sequencer.c:1391
+#: sequencer.c:2338
msgid "can't revert as initial commit"
msgstr "първоначалното подаване не може да бъде отменено"
-#: setup.c:160
+#: setup.c:165
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
@@ -3048,9 +3549,9 @@
"%s: в това работно дърво няма такъв път.\n"
"За да указвате пътища, които локално не съществуват, използвайте:\n"
"\n"
-" git КОМАНДА -- ПЪТ…"
+" git КОМАНДА -- ПЪТ…"
-#: setup.c:173
+#: setup.c:178
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -3061,9 +3562,9 @@
"дърво.\n"
"Разделяйте пътищата от версиите с „--“, ето така:\n"
"\n"
-" git КОМАНДА [ВЕРСИЯ…] -- [ФАЙЛ…]"
+" git КОМАНДА [ВЕРСИЯ…] -- [ФАЙЛ…]"
-#: setup.c:223
+#: setup.c:228
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
@@ -3073,33 +3574,38 @@
"нееднозначен аргумент „%s: както версия, така и път.\n"
"Разделяйте пътищата от версиите с „--“, ето така:\n"
"\n"
-" git КОМАНДА [ВЕРСИЯ…] -- [ФАЙЛ…]"
+" git КОМАНДА [ВЕРСИЯ…] -- [ФАЙЛ…]"
-#: setup.c:468
+#: setup.c:475
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "Очаква се версия на хранилището на git <= %d, а не %d"
-#: setup.c:476
+#: setup.c:483
msgid "unknown repository extensions found:"
msgstr "открити са непознати разширения в хранилището:"
-#: setup.c:762
+#: setup.c:776
#, c-format
msgid "Not a git repository (or any of the parent directories): %s"
msgstr ""
"Нито тази, нито която и да е от по-горните директории, не е хранилище на "
"git: %s"
-#: setup.c:764 setup.c:915 builtin/index-pack.c:1641
+#: setup.c:778 builtin/index-pack.c:1646
msgid "Cannot come back to cwd"
msgstr "Процесът не може да се върне към предишната работна директория"
-#: setup.c:845
+#: setup.c:1010
msgid "Unable to read current working directory"
msgstr "Текущата работна директория не може да бъде прочетена"
-#: setup.c:920
+#: setup.c:1022 setup.c:1028
+#, c-format
+msgid "Cannot change to '%s'"
+msgstr "Не може да се влезе в директорията „%s“"
+
+#: setup.c:1041
#, c-format
msgid ""
"Not a git repository (or any parent up to mount point %s)\n"
@@ -3110,12 +3616,7 @@
"Git работи в рамките на една файлова система, защото променливата на средата "
"„GIT_DISCOVERY_ACROSS_FILESYSTEM“ не е зададена."
-#: setup.c:927
-#, c-format
-msgid "Cannot change to '%s/..'"
-msgstr "Не може да се влезе в директорията „%s“"
-
-#: setup.c:989
+#: setup.c:1106
#, c-format
msgid ""
"Problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -3125,60 +3626,60 @@
"(0%.3o).\n"
"Собственикът на файла трябва да има права за писане и четене."
-#: sha1_file.c:473
+#: sha1_file.c:559
#, c-format
msgid "path '%s' does not exist"
msgstr "пътят „%s“ не съществува."
-#: sha1_file.c:499
+#: sha1_file.c:585
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr "все още не се поддържа еталонно хранилище „%s“ като свързано."
-#: sha1_file.c:505
+#: sha1_file.c:591
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "еталонното хранилище „%s“ не е локално"
-#: sha1_file.c:511
+#: sha1_file.c:597
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "еталонното хранилище „%s“ е плитко"
-#: sha1_file.c:519
+#: sha1_file.c:605
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "еталонното хранилище „%s“ е с присаждане"
-#: sha1_file.c:1159
+#: sha1_file.c:1245
msgid "offset before end of packfile (broken .idx?)"
msgstr ""
"отместване преди края на пакетния файл (възможно е индексът да е повреден)"
-#: sha1_file.c:2592
+#: sha1_file.c:2721
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
"отместване преди началото на индекса на пакетния файл „%s“ (възможно е "
"индексът да е повреден)"
-#: sha1_file.c:2596
+#: sha1_file.c:2725
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
"отместване преди края на индекса на пакетния файл „%s“ (възможно е индексът "
"да е отрязан)"
-#: sha1_name.c:407
+#: sha1_name.c:409
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr "късият SHA1 „%s“ не е еднозначен"
-#: sha1_name.c:418
+#: sha1_name.c:420
msgid "The candidates are:"
msgstr "Възможностите са:"
-#: sha1_name.c:578
+#: sha1_name.c:580
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"
@@ -3202,90 +3703,158 @@
"спрете това съобщение като изпълните командата:\n"
"„git config advice.objectNameWarning false“"
-#: submodule.c:64 submodule.c:98
+#: submodule.c:67 submodule.c:101
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
"Неслетите файлове „.gitmodules“ не могат да бъдат променяни. Първо "
"коригирайте конфликтите"
-#: submodule.c:68 submodule.c:102
+#: submodule.c:71 submodule.c:105
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "Във файла „.gitmodules“ липсва раздел за директория „path=%s“"
-#: submodule.c:76
+#: submodule.c:79
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "Записът „%s“ във файла „.gitmodules“ не може да бъде променен"
-#: submodule.c:109
+#: submodule.c:112
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "Записът „%s“ във файла „.gitmodules“ не може да бъде изтрит"
-#: submodule.c:120
+#: submodule.c:123
msgid "staging updated .gitmodules failed"
msgstr "неуспешно добавяне на променения файл „.gitmodules“ в индекса"
-#: submodule.c:158
+#: submodule.c:161
msgid "negative values not allowed for submodule.fetchJobs"
msgstr "Настройката „submodule.fetchJobs“ не приема отрицателни стойности"
-#: submodule-config.c:358
+#: submodule.c:1194
+#, c-format
+msgid "'%s' not recognized as a git repository"
+msgstr "„%s“ не е хранилище на git"
+
+#: submodule.c:1332
+#, c-format
+msgid "could not start 'git status' in submodule '%s'"
+msgstr "командата „git status“ не може да се изпълни в подмодула „%s“"
+
+#: submodule.c:1345
+#, c-format
+msgid "could not run 'git status' in submodule '%s'"
+msgstr "командата „git status“ не може да се изпълни в подмодула „%s“"
+
+#: submodule.c:1421
+#, c-format
+msgid "submodule '%s' has dirty index"
+msgstr "индексът на подмодула „%s“ не е чист"
+
+#: submodule.c:1678
+#, 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
+#, c-format
+msgid "could not lookup name for submodule '%s'"
+msgstr "името на подмодула „%s“ не може да бъде намерено"
+
+#: submodule.c:1694 builtin/submodule--helper.c:678
+#: builtin/submodule--helper.c:688
+#, c-format
+msgid "could not create directory '%s'"
+msgstr "Директорията „%s“ не може да бъде създадена"
+
+#: submodule.c:1697
+#, c-format
+msgid ""
+"Migrating git directory of '%s%s' from\n"
+"'%s' to\n"
+"'%s'\n"
+msgstr ""
+"Мигриране на директорията на git — „%s%s“ от:\n"
+"„%s“ към\n"
+"„%s“\n"
+
+#: submodule.c:1781
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr "неуспешна обработка на поддиректориите в подмодула „%s“"
+
+#: submodule.c:1825
+msgid "could not start ls-files in .."
+msgstr "„ls-stat“ не може да се стартира в „..“"
+
+#: submodule.c:1845
+msgid "BUG: returned path string doesn't match cwd?"
+msgstr "ГРЕШКА: полученият низ за пътя не съвпада с върнатото от „cwd“"
+
+#: submodule.c:1864
+#, c-format
+msgid "ls-tree returned unexpected return code %d"
+msgstr "„ls-tree“ завърши с неочакван изходен код: %d"
+
+#: submodule-config.c:380
#, c-format
msgid "invalid value for %s"
msgstr "Неправилна стойност за „%s“"
-#: trailer.c:238
+#: trailer.c:240
#, c-format
msgid "running trailer command '%s' failed"
msgstr "неуспешно изпълнение на завършващата команда „%s“"
-#: trailer.c:471 trailer.c:475 trailer.c:479 trailer.c:533 trailer.c:537
-#: trailer.c:541
+#: trailer.c:473 trailer.c:477 trailer.c:481 trailer.c:535 trailer.c:539
+#: trailer.c:543
#, c-format
msgid "unknown value '%s' for key '%s'"
-msgstr "неправилна стойност „%s“ за настройката „%s“"
+msgstr "непозната стойност „%s“ за настройката „%s“"
-#: trailer.c:523 trailer.c:528 builtin/remote.c:289
+#: trailer.c:525 trailer.c:530 builtin/remote.c:289
#, c-format
msgid "more than one %s"
msgstr "стойността „%s“ се повтаря в настройките"
-#: trailer.c:672
+#: trailer.c:702
#, c-format
msgid "empty trailer token in trailer '%.*s'"
msgstr "празна завършваща лексема в епилога „%.*s“"
-#: trailer.c:695
+#: trailer.c:722
#, c-format
msgid "could not read input file '%s'"
msgstr "входният файл „%s“ не може да бъде прочетен"
-#: trailer.c:698
+#: trailer.c:725
msgid "could not read from stdin"
msgstr "от стандартния вход не може да се чете"
-#: trailer.c:929 builtin/am.c:44
+#: trailer.c:949 builtin/am.c:44
#, c-format
msgid "could not stat %s"
msgstr "Не може да се получи информация чрез „stat“ за „%s“"
-#: trailer.c:931
+#: trailer.c:951
#, c-format
msgid "file %s is not a regular file"
msgstr "„%s“ не е обикновен файл"
-#: trailer.c:933
+#: trailer.c:953
#, c-format
msgid "file %s is not writable by user"
msgstr "„%s“: няма права за записване на файла"
-#: trailer.c:945
+#: trailer.c:965
msgid "could not open temporary file"
msgstr "временният файл не може да се отвори"
-#: trailer.c:983
+#: trailer.c:1001
#, c-format
msgid "could not rename temporary file to %s"
msgstr "временният файл не може да се преименува на „%s“"
@@ -3300,7 +3869,7 @@
msgid "transport: invalid depth option '%s'"
msgstr "transport: неправилна опция за дълбочина: %s"
-#: transport.c:817
+#: transport.c:889
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -3309,7 +3878,7 @@
"Следните пътища за подмодули съдържат промени,\n"
"които липсват от всички отдалечени хранилища:\n"
-#: transport.c:821
+#: transport.c:893
#, c-format
msgid ""
"\n"
@@ -3327,18 +3896,18 @@
"\n"
"Пробвайте да ги изтласкате чрез командата:\n"
"\n"
-" git push --recurse-submodules=on-demand\n"
+" git push --recurse-submodules=on-demand\n"
"\n"
"или отидете в съответната директория и изпълнете:\n"
"\n"
-" git push\n"
+" git push\n"
"\n"
-#: transport.c:829
+#: transport.c:901
msgid "Aborting."
msgstr "Преустановяване на действието."
-#: transport-helper.c:1075
+#: transport-helper.c:1080
#, c-format
msgid "Could not read ref %s"
msgstr "Указателят „%s“ не може да се прочете."
@@ -3359,7 +3928,7 @@
msgid "too-short tree file"
msgstr "прекалено кратък файл-дърво"
-#: unpack-trees.c:64
+#: unpack-trees.c:104
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -3368,7 +3937,7 @@
"Изтеглянето ще презапише локалните промени на тези файлове:\n"
"%%sПодайте или скатайте промените, за да преминете към нов клон."
-#: unpack-trees.c:66
+#: unpack-trees.c:106
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -3377,7 +3946,7 @@
"Изтеглянето ще презапише локалните промени на тези файлове:\n"
"%%s"
-#: unpack-trees.c:69
+#: unpack-trees.c:109
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -3386,7 +3955,7 @@
"Сливането ще презапише локалните промени на тези файлове:\n"
"%%sПодайте или скатайте промените, за да слеете."
-#: unpack-trees.c:71
+#: unpack-trees.c:111
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -3395,7 +3964,7 @@
"Сливането ще презапише локалните промени на тези файлове:\n"
"%%s"
-#: unpack-trees.c:74
+#: unpack-trees.c:114
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -3404,7 +3973,7 @@
"„%s“ ще презапише локалните промени на тези файлове:\n"
"%%sПодайте или скатайте промените, за да извършите „%s“."
-#: unpack-trees.c:76
+#: unpack-trees.c:116
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -3413,16 +3982,16 @@
"„%s“ ще презапише локалните промени на тези файлове:\n"
"%%s"
-#: unpack-trees.c:81
+#: unpack-trees.c:121
#, c-format
msgid ""
-"Updating the following directories would lose untracked files in it:\n"
+"Updating the following directories would lose untracked files in them:\n"
"%s"
msgstr ""
-"Обновяването на тези директории ще изтрие неследените файлове в тях:\n"
+"Обновяването на следните директории ще изтрие неследените файлове в тях:\n"
"%s"
-#: unpack-trees.c:85
+#: unpack-trees.c:125
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -3431,7 +4000,7 @@
"Изтеглянето ще изтрие тези неследени файлове в работното дърво:\n"
"%%sПреместете ги или ги изтрийте, за да преминете на друг клон."
-#: unpack-trees.c:87
+#: unpack-trees.c:127
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -3440,7 +4009,7 @@
"Изтеглянето ще изтрие тези неследени файлове в работното дърво:\n"
"%%s"
-#: unpack-trees.c:90
+#: unpack-trees.c:130
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -3449,7 +4018,7 @@
"Сливането ще изтрие тези неследени файлове в работното дърво:\n"
"%%sПреместете ги или ги изтрийте, за да слеете."
-#: unpack-trees.c:92
+#: unpack-trees.c:132
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -3458,7 +4027,7 @@
"Сливането ще изтрие тези неследени файлове в работното дърво:\n"
"%%s"
-#: unpack-trees.c:95
+#: unpack-trees.c:135
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -3467,7 +4036,7 @@
"„%s“ ще изтрие тези неследени файлове в работното дърво:\n"
"%%sПреместете ги или ги изтрийте, за да извършите „%s“."
-#: unpack-trees.c:97
+#: unpack-trees.c:137
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -3476,7 +4045,7 @@
"„%s“ ще изтрие тези неследени файлове в работното дърво:\n"
"%%s"
-#: unpack-trees.c:102
+#: unpack-trees.c:142
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -3486,7 +4055,7 @@
"Изтеглянето ще презапише тези неследени файлове в работното дърво:\n"
"%%sПреместете ги или ги изтрийте, за да смените клон."
-#: unpack-trees.c:104
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -3496,7 +4065,7 @@
"Изтеглянето ще презапише тези неследени файлове в работното дърво:\n"
"%%s"
-#: unpack-trees.c:107
+#: unpack-trees.c:147
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -3505,7 +4074,7 @@
"Сливането ще презапише тези неследени файлове в работното дърво:\n"
"%%sПреместете ги или ги изтрийте, за да слеете."
-#: unpack-trees.c:109
+#: unpack-trees.c:149
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -3514,7 +4083,7 @@
"Сливането ще презапише тези неследени файлове в работното дърво:\n"
"%%s"
-#: unpack-trees.c:112
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -3523,7 +4092,7 @@
"„%s“ ще презапише тези неследени файлове в работното дърво:\n"
"%%sПреместете ги или ги изтрийте, за да извършите „%s“."
-#: unpack-trees.c:114
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -3532,12 +4101,12 @@
"„%s“ ще презапише тези неследени файлове в работното дърво:\n"
"%%s"
-#: unpack-trees.c:121
+#: unpack-trees.c:161
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "Записът за „%s“ съвпада с този за „%s“. Не може да се присвои."
-#: unpack-trees.c:124
+#: unpack-trees.c:164
#, c-format
msgid ""
"Cannot update sparse checkout: the following entries are not up-to-date:\n"
@@ -3547,7 +4116,7 @@
"актуални:\n"
"%s"
-#: unpack-trees.c:126
+#: unpack-trees.c:166
#, c-format
msgid ""
"The following working tree files would be overwritten by sparse checkout "
@@ -3558,7 +4127,7 @@
"дърво:\n"
"%s"
-#: unpack-trees.c:128
+#: unpack-trees.c:168
#, c-format
msgid ""
"The following working tree files would be removed by sparse checkout "
@@ -3569,45 +4138,59 @@
"дърво:\n"
"%s"
-#: unpack-trees.c:205
+#: unpack-trees.c:170
+#, c-format
+msgid ""
+"Cannot update submodule:\n"
+"%s"
+msgstr ""
+"Подмодулът не може да бъде обновен:\n"
+"„%s“"
+
+#: unpack-trees.c:247
#, c-format
msgid "Aborting\n"
msgstr "Преустановяване на действието\n"
-#: unpack-trees.c:237
+#: unpack-trees.c:272
+#, c-format
+msgid "submodule update strategy not supported for submodule '%s'"
+msgstr "подмодулът „%s“ не поддържа стратегията за обновяване като подмодул"
+
+#: unpack-trees.c:340
msgid "Checking out files"
msgstr "Изтегляне на файлове"
-#: urlmatch.c:120
+#: urlmatch.c:163
msgid "invalid URL scheme name or missing '://' suffix"
msgstr "неправилна схема за адрес или суфиксът „://“ липсва"
-#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
+#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
#, c-format
msgid "invalid %XX escape sequence"
msgstr "неправилна екранираща последователност „%XX“"
-#: urlmatch.c:172
+#: urlmatch.c:215
msgid "missing host and scheme is not 'file:'"
msgstr "не е указана машина, а схемата не е „file:“"
-#: urlmatch.c:189
+#: urlmatch.c:232
msgid "a 'file:' URL may not have a port number"
msgstr "при схема „file:“ не можете да указвате номер на порт"
-#: urlmatch.c:199
+#: urlmatch.c:247
msgid "invalid characters in host name"
msgstr "неправилни знаци в името на машина"
-#: urlmatch.c:244 urlmatch.c:255
+#: urlmatch.c:292 urlmatch.c:303
msgid "invalid port number"
msgstr "неправилен номер на порт"
-#: urlmatch.c:322
+#: urlmatch.c:371
msgid "invalid '..' path segment"
msgstr "неправилна част от пътя „..“"
-#: worktree.c:282
+#: worktree.c:285
#, c-format
msgid "failed to read '%s'"
msgstr "„%s“ не може да бъде прочетен"
@@ -3622,29 +4205,28 @@
msgid "could not open '%s' for writing"
msgstr "„%s“ не може да бъде отворен за запис"
-#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759
-#: builtin/am.c:847 builtin/commit.c:1705 builtin/merge.c:1029
+#: 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
#, c-format
msgid "could not open '%s' for reading"
msgstr "файлът не може да бъде прочетен: „%s“"
-#: wrapper.c:605 wrapper.c:626
+#: wrapper.c:581 wrapper.c:602
#, c-format
msgid "unable to access '%s'"
msgstr "няма достъп до „%s“"
-#: wrapper.c:634
+#: wrapper.c:610
msgid "unable to get current working directory"
msgstr "текущата работна директория е недостъпна"
-# FIXME - must be the same as Could not write to '%s' above
-#: wrapper.c:658
+#: wrapper.c:634
#, c-format
msgid "could not write to %s"
msgstr "„%s“ не може да бъде записан"
-#: wrapper.c:660
+#: wrapper.c:636
#, c-format
msgid "could not close %s"
msgstr "„%s“ не може да се затвори"
@@ -3679,11 +4261,11 @@
msgstr ""
" (използвайте „git rm ФАЙЛ…“, за да укажете разрешаването на конфликта)"
-#: wt-status.c:199 wt-status.c:945
+#: wt-status.c:199 wt-status.c:958
msgid "Changes to be committed:"
msgstr "Промени, които ще бъдат подадени:"
-#: wt-status.c:217 wt-status.c:954
+#: wt-status.c:217 wt-status.c:967
msgid "Changes not staged for commit:"
msgstr "Промени, които не са в индекса за подаване:"
@@ -3788,15 +4370,15 @@
msgid "untracked content, "
msgstr "неследено съдържание, "
-#: wt-status.c:818
+#: wt-status.c:831
msgid "Submodules changed but not updated:"
msgstr "Подмодулите са променени, но не са обновени:"
-#: wt-status.c:820
+#: wt-status.c:833
msgid "Submodule changes to be committed:"
msgstr "Промени в подмодулите за подаване:"
-#: wt-status.c:901
+#: wt-status.c:914
msgid ""
"Do not touch the line above.\n"
"Everything below will be removed."
@@ -3804,233 +4386,237 @@
"Не променяйте горния ред.\n"
"Всичко отдолу ще бъде изтрито."
-#: wt-status.c:1013
+#: wt-status.c:1026
msgid "You have unmerged paths."
msgstr "Някои пътища не са слети."
-#: wt-status.c:1016
+#: wt-status.c:1029
msgid " (fix conflicts and run \"git commit\")"
msgstr " (коригирайте конфликтите и изпълнете „git commit“)"
-#: wt-status.c:1018
+#: wt-status.c:1031
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (използвайте „git merge --abort“, за да преустановите сливането)"
-#: wt-status.c:1023
+#: wt-status.c:1036
msgid "All conflicts fixed but you are still merging."
msgstr "Всички конфликти са решени, но продължавате сливането."
-#: wt-status.c:1026
+#: wt-status.c:1039
msgid " (use \"git commit\" to conclude merge)"
msgstr " (използвайте „git commit“, за да завършите сливането)"
-#: wt-status.c:1036
+#: wt-status.c:1049
msgid "You are in the middle of an am session."
msgstr "В момента прилагате поредица от кръпки чрез „git am“."
-#: wt-status.c:1039
+#: wt-status.c:1052
msgid "The current patch is empty."
msgstr "Текущата кръпка е празна."
-#: wt-status.c:1043
+#: wt-status.c:1056
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (коригирайте конфликтите и изпълнете „git am --continue“)"
-#: wt-status.c:1045
+#: wt-status.c:1058
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (използвайте „git am --skip“, за да пропуснете тази кръпка)"
-#: wt-status.c:1047
+#: wt-status.c:1060
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
" (използвайте „git am --abort“, за да възстановите първоначалния клон)"
-#: wt-status.c:1172
+#: wt-status.c:1189
+msgid "git-rebase-todo is missing."
+msgstr "„git-rebase-todo“ липсва."
+
+#: wt-status.c:1191
msgid "No commands done."
msgstr "Не са изпълнени команди."
-#: wt-status.c:1175
+#: wt-status.c:1194
#, 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:1186
+#: wt-status.c:1205
#, c-format
msgid " (see more in file %s)"
msgstr " повече информация има във файла „%s“)"
-#: wt-status.c:1191
+#: wt-status.c:1210
msgid "No commands remaining."
msgstr "Не остават повече команди."
-#: wt-status.c:1194
+#: wt-status.c:1213
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
msgstr[0] "Следваща команда за изпълнение (остава още %d команда):"
msgstr[1] "Следваща команда за изпълнение (остават още %d команди):"
-#: wt-status.c:1202
+#: wt-status.c:1221
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr ""
" (използвайте „git rebase --edit-todo“, за да разгледате и редактирате)"
-#: wt-status.c:1215
+#: wt-status.c:1234
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "В момента пребазирате клона „%s“ върху „%s“."
-#: wt-status.c:1220
+#: wt-status.c:1239
msgid "You are currently rebasing."
msgstr "В момента пребазирате."
-#: wt-status.c:1234
+#: wt-status.c:1253
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (коригирайте конфликтите и използвайте „git rebase --continue“)"
-#: wt-status.c:1236
+#: wt-status.c:1255
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (използвайте „git rebase --skip“, за да пропуснете тази кръпка)"
-#: wt-status.c:1238
+#: wt-status.c:1257
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
" (използвайте „git rebase --abort“, за да възстановите първоначалния клон)"
-#: wt-status.c:1244
+#: wt-status.c:1263
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (всички конфликти са коригирани: изпълнете „git rebase --continue“)"
-#: wt-status.c:1248
+#: wt-status.c:1267
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr "В момента разделяте подаване докато пребазирате клона „%s“ върху „%s“."
-#: wt-status.c:1253
+#: wt-status.c:1272
msgid "You are currently splitting a commit during a rebase."
msgstr "В момента разделяте подаване докато пребазирате."
-#: wt-status.c:1256
+#: wt-status.c:1275
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
" (След като работното ви дърво стане чисто, използвайте „git rebase --"
"continue“)"
-#: wt-status.c:1260
+#: wt-status.c:1279
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"В момента редактирате подаване докато пребазирате клона „%s“ върху „%s“."
-#: wt-status.c:1265
+#: wt-status.c:1284
msgid "You are currently editing a commit during a rebase."
msgstr "В момента редактирате подаване докато пребазирате."
-#: wt-status.c:1268
+#: wt-status.c:1287
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
" (използвайте „git commit --amend“, за да редактирате текущото подаване)"
-#: wt-status.c:1270
+#: wt-status.c:1289
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
" (използвайте „git rebase --continue“, след като завършите промените си)"
-#: wt-status.c:1280
+#: wt-status.c:1299
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "В момента отбирате подаването „%s“."
-#: wt-status.c:1285
+#: wt-status.c:1304
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (коригирайте конфликтите и изпълнете „git cherry-pick --continue“)"
-#: wt-status.c:1288
+#: wt-status.c:1307
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (всички конфликти са коригирани, изпълнете „git cherry-pick --continue“)"
-#: wt-status.c:1290
+#: wt-status.c:1309
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
" (използвайте „git cherry-pick --abort“, за да отмените всички действия с "
"отбиране)"
-#: wt-status.c:1299
+#: wt-status.c:1318
#, c-format
msgid "You are currently reverting commit %s."
msgstr "В момента отменяте подаване „%s“."
-#: wt-status.c:1304
+#: wt-status.c:1323
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (коригирайте конфликтите и изпълнете „git revert --continue“)"
-#: wt-status.c:1307
+#: wt-status.c:1326
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (всички конфликти са коригирани, изпълнете „git revert --continue“)"
-#: wt-status.c:1309
+#: wt-status.c:1328
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
" (използвайте „git revert --abort“, за да преустановите отмяната на "
"подаване)"
-#: wt-status.c:1320
+#: wt-status.c:1339
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "В момента търсите двоично, като сте стартирали от клон „%s“."
-#: wt-status.c:1324
+#: wt-status.c:1343
msgid "You are currently bisecting."
msgstr "В момента търсите двоично."
-#: wt-status.c:1327
+#: wt-status.c:1346
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
" (използвайте „git bisect reset“, за да се върнете към първоначалното "
"състояние и клон)"
-#: wt-status.c:1524
+#: wt-status.c:1543
msgid "On branch "
msgstr "На клон "
-#: wt-status.c:1530
+#: wt-status.c:1549
msgid "interactive rebase in progress; onto "
msgstr "извършвате интерактивно пребазиране върху "
-#: wt-status.c:1532
+#: wt-status.c:1551
msgid "rebase in progress; onto "
msgstr "извършвате пребазиране върху "
-#: wt-status.c:1537
+#: wt-status.c:1556
msgid "HEAD detached at "
msgstr "Указателят „HEAD“ не е свързан и е при "
-#: wt-status.c:1539
+#: wt-status.c:1558
msgid "HEAD detached from "
msgstr "Указателят „HEAD“ не е свързан и е отделѐн от "
-#: wt-status.c:1542
+#: wt-status.c:1561
msgid "Not currently on any branch."
msgstr "Извън всички клони."
-#: wt-status.c:1560
+#: wt-status.c:1579
msgid "Initial commit"
msgstr "Първоначално подаване"
-#: wt-status.c:1574
+#: wt-status.c:1593
msgid "Untracked files"
msgstr "Неследени файлове"
-#: wt-status.c:1576
+#: wt-status.c:1595
msgid "Ignored files"
msgstr "Игнорирани файлове"
-#: wt-status.c:1580
+#: wt-status.c:1599
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -4042,32 +4628,32 @@
"изпълнението, но не трябва да забравяте ръчно да добавяте новите файлове.\n"
"За повече подробности погледнете „git status help“."
-#: wt-status.c:1586
+#: wt-status.c:1605
#, c-format
msgid "Untracked files not listed%s"
msgstr "Неследените файлове не са изведени%s"
-#: wt-status.c:1588
+#: wt-status.c:1607
msgid " (use -u option to show untracked files)"
msgstr " (използвайте опцията „-u“, за да изведете неследените файлове)"
-#: wt-status.c:1594
+#: wt-status.c:1613
msgid "No changes"
msgstr "Няма промени"
-#: wt-status.c:1599
+#: wt-status.c:1618
#, 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:1602
+#: wt-status.c:1621
#, c-format
msgid "no changes added to commit\n"
msgstr "към индекса за подаване не са добавени промени\n"
-#: wt-status.c:1605
+#: wt-status.c:1624
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -4076,71 +4662,67 @@
"към индекса за подаване не са добавени промени, но има нови файлове "
"(използвайте „git add“, за да започне тяхното следене)\n"
-#: wt-status.c:1608
+#: wt-status.c:1627
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "към индекса за подаване не са добавени промени, но има нови файлове\n"
-#: wt-status.c:1611
+#: wt-status.c:1630
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"липсват каквито и да е промени (създайте или копирайте файлове и използвайте "
"„git add“, за да започне тяхното следене)\n"
-#: wt-status.c:1614 wt-status.c:1619
+#: wt-status.c:1633 wt-status.c:1638
#, c-format
msgid "nothing to commit\n"
msgstr "липсват каквито и да е промени\n"
-#: wt-status.c:1617
+#: wt-status.c:1636
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
"липсват каквито и да е промени (използвайте опцията „-u“, за да се изведат и "
"неследените файлове)\n"
-#: wt-status.c:1621
+#: wt-status.c:1640
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "липсват каквито и да е промени, работното дърво е чисто\n"
-#: wt-status.c:1728
+#: wt-status.c:1749
msgid "Initial commit on "
msgstr "Първоначално подаване на клон"
-#: wt-status.c:1732
+#: wt-status.c:1753
msgid "HEAD (no branch)"
msgstr "HEAD (извън клон)"
-#: wt-status.c:1761
-msgid "gone"
-msgstr "изтрит"
-
-#: wt-status.c:1763 wt-status.c:1771
+#: wt-status.c:1782 wt-status.c:1790
msgid "behind "
msgstr "назад с "
-#: wt-status.c:1766 wt-status.c:1769
+#: wt-status.c:1785 wt-status.c:1788
msgid "ahead "
msgstr "напред с "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2270
+#: wt-status.c:2280
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "не може да извършите „%s“, защото има промени, които не са в индекса."
-#: wt-status.c:2276
+#: wt-status.c:2286
msgid "additionally, your index contains uncommitted changes."
msgstr "освен това в индекса има неподадени промени."
-#: wt-status.c:2278
+#: wt-status.c:2288
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "не може да извършите „%s“, защото в индекса има неподадени промени."
-#: compat/precompose_utf8.c:57 builtin/clone.c:414
+#: compat/precompose_utf8.c:57 builtin/clone.c:432
#, c-format
msgid "failed to unlink '%s'"
msgstr "неуспешно изтриване на „%s“"
@@ -4167,7 +4749,7 @@
msgid "Unstaged changes after refreshing the index:"
msgstr "Промени, които и след обновяването на индекса не са добавени към него:"
-#: builtin/add.c:209 builtin/rev-parse.c:840
+#: builtin/add.c:209 builtin/rev-parse.c:872
msgid "Could not read the index"
msgstr "Индексът не може да бъде прочетен"
@@ -4203,9 +4785,9 @@
msgstr ""
"Следните пътища ще бъдат игнорирани според някой от файловете „.gitignore“:\n"
-#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:111
-#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:521
-#: builtin/remote.c:1326 builtin/rm.c:268 builtin/send-pack.c:162
+#: 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
msgid "dry run"
msgstr "пробно изпълнение"
@@ -4213,7 +4795,7 @@
msgid "interactive picking"
msgstr "интерактивно отбиране на промени"
-#: builtin/add.c:270 builtin/checkout.c:1156 builtin/reset.c:286
+#: builtin/add.c:270 builtin/checkout.c:1177 builtin/reset.c:286
msgid "select hunks interactively"
msgstr "интерактивен избор на парчета код"
@@ -4258,11 +4840,11 @@
"проверка, че при пробно изпълнение всички файлове, дори и изтритите, се "
"игнорират"
-#: builtin/add.c:283 builtin/update-index.c:947
+#: builtin/add.c:283 builtin/update-index.c:951
msgid "(+/-)x"
msgstr "(+/-)x"
-#: builtin/add.c:283 builtin/update-index.c:948
+#: builtin/add.c:283 builtin/update-index.c:952
msgid "override the executable bit of the listed files"
msgstr "изрично задаване на стойността на флага дали файлът е изпълним"
@@ -4298,115 +4880,115 @@
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:279
-#: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350
-#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
+#: 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/submodule--helper.c:244
msgid "index file corrupt"
msgstr "файлът с индекса е повреден"
-#: builtin/am.c:414
+#: builtin/am.c:412
msgid "could not parse author script"
msgstr "скриптът за автор не може да се анализира"
-#: builtin/am.c:491
+#: builtin/am.c:489
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "„%s“ бе изтрит от куката „applypatch-msg“"
-#: builtin/am.c:532
+#: builtin/am.c:530
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Даденият входен ред е с неправилен формат: „%s“."
-#: builtin/am.c:569
+#: builtin/am.c:567
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Бележката не може да се копира от „%s“ към „%s“"
-#: builtin/am.c:595
+#: builtin/am.c:593
msgid "fseek failed"
msgstr "неуспешно изпълнение на „fseek“"
-#: builtin/am.c:775
+#: builtin/am.c:777
#, c-format
msgid "could not parse patch '%s'"
msgstr "кръпката „%s“ не може да се анализира"
-#: builtin/am.c:840
+#: builtin/am.c:842
msgid "Only one StGIT patch series can be applied at once"
msgstr ""
"Само една серия кръпки от „StGIT“ може да бъде прилагана в даден момент"
-#: builtin/am.c:887
+#: builtin/am.c:889
msgid "invalid timestamp"
msgstr "неправилна стойност за време"
-#: builtin/am.c:890 builtin/am.c:898
+#: builtin/am.c:892 builtin/am.c:900
msgid "invalid Date line"
msgstr "неправилен ред за дата „Date“"
-#: builtin/am.c:895
+#: builtin/am.c:897
msgid "invalid timezone offset"
msgstr "неправилно отместване на часовия пояс"
-#: builtin/am.c:984
+#: builtin/am.c:986
msgid "Patch format detection failed."
msgstr "Форматът на кръпката не може да бъде определен."
-#: builtin/am.c:989 builtin/clone.c:379
+#: builtin/am.c:991 builtin/clone.c:397
#, c-format
msgid "failed to create directory '%s'"
msgstr "директорията „%s“ не може да бъде създадена"
-#: builtin/am.c:993
+#: builtin/am.c:995
msgid "Failed to split patches."
msgstr "Кръпките не могат да бъдат разделени."
-#: builtin/am.c:1125 builtin/commit.c:376
+#: builtin/am.c:1127 builtin/commit.c:376
msgid "unable to write index file"
msgstr "индексът не може да бъде записан"
-#: builtin/am.c:1176
+#: builtin/am.c:1178
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "След коригирането на този проблем изпълнете „%s --continue“."
-#: builtin/am.c:1177
+#: builtin/am.c:1179
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "Ако предпочитате да прескочите тази кръпка, изпълнете „%s --skip“."
-#: builtin/am.c:1178
+#: builtin/am.c:1180
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr "За да се върнете към първоначалното състояние, изпълнете „%s --abort“."
-#: builtin/am.c:1316
+#: builtin/am.c:1315
msgid "Patch is empty. Was it split wrong?"
msgstr "Празна кръпка. Дали не е разделена погрешно?"
-#: builtin/am.c:1390 builtin/log.c:1550
+#: builtin/am.c:1386 builtin/log.c:1557
#, c-format
msgid "invalid ident line: %s"
msgstr "грешна идентичност: %s"
-#: builtin/am.c:1417
+#: builtin/am.c:1413
#, c-format
msgid "unable to parse commit %s"
msgstr "подаването не може да бъде анализирано: %s"
-#: builtin/am.c:1610
+#: builtin/am.c:1606
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
"В хранилището липсват необходимите обекти BLOB, за да се премине към тройно "
"сливане."
-#: builtin/am.c:1612
+#: builtin/am.c:1608
msgid "Using index info to reconstruct a base tree..."
msgstr "Базовото дърво се реконструира от информацията в индекса…"
-#: builtin/am.c:1631
+#: builtin/am.c:1627
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -4414,39 +4996,39 @@
"Кръпката не може да се приложи към обектите BLOB в индекса.\n"
"Да не би да сте я редактирали на ръка?"
-#: builtin/am.c:1637
+#: builtin/am.c:1633
msgid "Falling back to patching base and 3-way merge..."
msgstr "Преминаване към прилагане на кръпка към базата и тройно сливане…"
-#: builtin/am.c:1662
+#: builtin/am.c:1658
msgid "Failed to merge in the changes."
msgstr "Неуспешно сливане на промените."
-#: builtin/am.c:1686 builtin/merge.c:628
+#: builtin/am.c:1682 builtin/merge.c:631
msgid "git write-tree failed to write a tree"
msgstr "Командата „git write-tree“ не успя да запише обект-дърво"
-#: builtin/am.c:1693
+#: builtin/am.c:1689
msgid "applying to an empty history"
msgstr "прилагане върху празна история"
-#: builtin/am.c:1706 builtin/commit.c:1769 builtin/merge.c:798
-#: builtin/merge.c:823
+#: builtin/am.c:1702 builtin/commit.c:1764 builtin/merge.c:802
+#: builtin/merge.c:827
msgid "failed to write commit object"
msgstr "обектът за подаването не може да бъде записан"
-#: builtin/am.c:1739 builtin/am.c:1743
+#: builtin/am.c:1735 builtin/am.c:1739
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "не може да се продължи — „%s“ не съществува."
-#: builtin/am.c:1759
+#: builtin/am.c:1755
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
"За интерактивно изпълнение е необходимо стандартният\n"
"изход да е свързан с терминал, а в момента не е."
-#: builtin/am.c:1764
+#: builtin/am.c:1760
msgid "Commit Body is:"
msgstr "Тялото на кръпката за прилагане е:"
@@ -4454,38 +5036,38 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1774
+#: builtin/am.c:1770
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
"Прилагане? „y“ — да/„n“ — не/„e“ — редактиране/„v“ — преглед/„a“ — приемане "
"на всичко:"
-#: builtin/am.c:1824
+#: builtin/am.c:1820
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr ""
"Индексът не е чист: кръпките не могат да бъдат приложени (замърсени са: %s)"
-#: builtin/am.c:1861 builtin/am.c:1933
+#: builtin/am.c:1860 builtin/am.c:1932
#, c-format
msgid "Applying: %.*s"
msgstr "Прилагане: %.*s"
-#: builtin/am.c:1877
+#: builtin/am.c:1876
msgid "No changes -- Patch already applied."
msgstr "Без промени — кръпката вече е приложена."
-#: builtin/am.c:1885
+#: builtin/am.c:1884
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Неуспешно прилагане на кръпка при %s %.*s“"
-#: builtin/am.c:1891
+#: builtin/am.c:1890
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "Дубликат на проблемната кръпка се намира в: %s"
-#: builtin/am.c:1936
+#: builtin/am.c:1935
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -4495,7 +5077,7 @@
"Ако няма друга промяна за включване в индекса, най-вероятно някоя друга\n"
"кръпка е довела до същите промени и в такъв случай просто пропуснете тази."
-#: builtin/am.c:1943
+#: builtin/am.c:1942
msgid ""
"You still have unmerged paths in your index.\n"
"Did you forget to use 'git add'?"
@@ -4503,17 +5085,17 @@
"Индексът все още съдържа неслети промени.\n"
"Възможно е да не сте изпълнили „git add“."
-#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308
+#: builtin/am.c:2050 builtin/am.c:2054 builtin/am.c:2066 builtin/reset.c:308
#: builtin/reset.c:316
#, c-format
msgid "Could not parse object '%s'."
msgstr "„%s“ не е разпознат като обект."
-#: builtin/am.c:2103
+#: builtin/am.c:2102
msgid "failed to clean index"
msgstr "индексът не може да бъде изчистен"
-#: builtin/am.c:2137
+#: builtin/am.c:2136
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -4524,138 +5106,138 @@
"сочи към\n"
"„ORIG_HEAD“"
-#: builtin/am.c:2200
+#: builtin/am.c:2199
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Неправилна стойност за „--patch-format“: „%s“"
-#: builtin/am.c:2233
+#: builtin/am.c:2232
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [ОПЦИЯ…] [(ФАЙЛ_С_ПОЩА|ДИРЕКТОРИЯ_С_ПОЩА)…]"
-#: builtin/am.c:2234
+#: builtin/am.c:2233
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [ОПЦИЯ…] (--continue | --quit | --abort)"
-#: builtin/am.c:2240
+#: builtin/am.c:2239
msgid "run interactively"
msgstr "интерактивна работа"
-#: builtin/am.c:2242
+#: builtin/am.c:2241
msgid "historical option -- no-op"
msgstr "изоставена опция, съществува по исторически причини, нищо не прави"
-#: builtin/am.c:2244
+#: builtin/am.c:2243
msgid "allow fall back on 3way merging if needed"
msgstr "да се преминава към тройно сливане при нужда."
-#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57
-#: builtin/repack.c:172
+#: builtin/am.c:2244 builtin/init-db.c:483 builtin/prune-packed.c:57
+#: builtin/repack.c:178
msgid "be quiet"
msgstr "без извеждане на информация"
-#: builtin/am.c:2247
+#: builtin/am.c:2246
msgid "add a Signed-off-by line to the commit message"
msgstr "добавяне на ред за подпис „Signed-off-by“ в съобщението за подаване"
-#: builtin/am.c:2250
+#: builtin/am.c:2249
msgid "recode into utf8 (default)"
msgstr "прекодиране в UTF-8 (стандартно)"
-#: builtin/am.c:2252
+#: builtin/am.c:2251
msgid "pass -k flag to git-mailinfo"
msgstr "подаване на опцията „-k“ на командата „git-mailinfo“"
-#: builtin/am.c:2254
+#: builtin/am.c:2253
msgid "pass -b flag to git-mailinfo"
msgstr "подаване на опцията „-b“ на командата „git-mailinfo“"
-#: builtin/am.c:2256
+#: builtin/am.c:2255
msgid "pass -m flag to git-mailinfo"
msgstr "подаване на опцията „-m“ на командата „git-mailinfo“"
-#: builtin/am.c:2258
+#: builtin/am.c:2257
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr ""
"подаване на опцията „--keep-cr“ на командата „git-mailsplit“ за формат „mbox“"
-#: builtin/am.c:2261
+#: builtin/am.c:2260
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"без подаване на опцията „--keep-cr“ на командата „git-mailsplit“ независимо "
"от „am.keepcr“"
-#: builtin/am.c:2264
+#: builtin/am.c:2263
msgid "strip everything before a scissors line"
msgstr "пропускане на всичко преди реда за отрязване"
-#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
-#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287
-#: builtin/am.c:2293
+#: 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
msgid "pass it through git-apply"
msgstr "прекарване през „git-apply“"
-#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
-#: builtin/grep.c:707 builtin/merge.c:200 builtin/pull.c:135 builtin/pull.c:194
-#: builtin/repack.c:181 builtin/repack.c:185 builtin/show-branch.c:644
-#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
-#: parse-options.h:134 parse-options.h:245
+#: 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
msgid "n"
msgstr "БРОЙ"
-#: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438
-#: builtin/tag.c:372
+#: 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
msgid "format"
msgstr "ФОРМАТ"
-#: builtin/am.c:2290
+#: builtin/am.c:2289
msgid "format the patch(es) are in"
msgstr "формат на кръпките"
-#: builtin/am.c:2296
+#: builtin/am.c:2295
msgid "override error message when patch failure occurs"
msgstr "избрано от вас съобщение за грешка при прилагане на кръпки"
-#: builtin/am.c:2298
+#: builtin/am.c:2297
msgid "continue applying patches after resolving a conflict"
msgstr "продължаване на прилагането на кръпки след коригирането на конфликт"
-#: builtin/am.c:2301
+#: builtin/am.c:2300
msgid "synonyms for --continue"
msgstr "синоними на „--continue“"
-#: builtin/am.c:2304
+#: builtin/am.c:2303
msgid "skip the current patch"
msgstr "прескачане на текущата кръпка"
-#: builtin/am.c:2307
+#: builtin/am.c:2306
msgid "restore the original branch and abort the patching operation."
msgstr ""
"възстановяване на първоначалното състояние на клона и преустановяване на "
"прилагането на кръпката."
-#: builtin/am.c:2311
+#: builtin/am.c:2310
msgid "lie about committer date"
msgstr "дата за подаване различна от първоначалната"
-#: builtin/am.c:2313
+#: builtin/am.c:2312
msgid "use current timestamp for author date"
msgstr "използване на текущото време като това за автор"
-#: builtin/am.c:2315 builtin/commit.c:1605 builtin/merge.c:229
-#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:355
+#: builtin/am.c:2314 builtin/commit.c:1600 builtin/merge.c:232
+#: builtin/pull.c:165 builtin/revert.c:111 builtin/tag.c:413
msgid "key-id"
msgstr "ИДЕНТИФИКАТОР_НА_КЛЮЧ"
-#: builtin/am.c:2316
+#: builtin/am.c:2315
msgid "GPG-sign commits"
msgstr "подписване на подаванията с GPG"
-#: builtin/am.c:2319
+#: builtin/am.c:2318
msgid "(internal use for git-rebase)"
msgstr "(ползва се вътрешно за „git-rebase“)"
-#: builtin/am.c:2334
+#: builtin/am.c:2333
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."
@@ -4663,18 +5245,18 @@
"Опциите „-b“/„--binary“ отдавна не правят нищо и\n"
"ще бъдат премахнати в бъдеще. Не ги ползвайте."
-#: builtin/am.c:2341
+#: builtin/am.c:2340
msgid "failed to read the index"
msgstr "неуспешно изчитане на индекса"
-#: builtin/am.c:2356
+#: builtin/am.c:2355
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
"предишната директория за пребазиране „%s“ все още съществува, а е зададен "
"файл „mbox“."
-#: builtin/am.c:2380
+#: builtin/am.c:2379
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -4683,7 +5265,7 @@
"Открита е излишна директория „%s“.\n"
"Можете да я изтриете с командата „git am --abort“."
-#: builtin/am.c:2386
+#: builtin/am.c:2385
msgid "Resolve operation not in progress, we are not resuming."
msgstr "В момента не тече операция по коригиране и няма как да се продължи."
@@ -4713,11 +5295,6 @@
msgid "git archive: NACK %s"
msgstr "git archive: получен е „NACK“ — %s"
-#: builtin/archive.c:63
-#, c-format
-msgid "remote error: %s"
-msgstr "отдалечена грешка: %s"
-
#: builtin/archive.c:64
msgid "git archive: protocol error"
msgstr "git archive: протоколна грешка"
@@ -4747,135 +5324,129 @@
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "ОПЦИИте_ЗА_ВЕРСИЯТА са документирани в ръководството git-rev-list(1)"
-#: builtin/blame.c:1781
+#: builtin/blame.c:1777
msgid "Blaming lines"
msgstr "Анотирани редове"
-#: builtin/blame.c:2577
+#: builtin/blame.c:2573
msgid "Show blame entries as we find them, incrementally"
msgstr "Извеждане на анотациите с намирането им, последователно"
-#: builtin/blame.c:2578
+#: builtin/blame.c:2574
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
"Извеждане на празни суми по SHA1 за граничните подавания (стандартно опцията "
"е изключена)"
-#: builtin/blame.c:2579
+#: builtin/blame.c:2575
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
"Началните подавания да не се считат за гранични (стандартно опцията е "
"изключена)"
-#: builtin/blame.c:2580
+#: builtin/blame.c:2576
msgid "Show work cost statistics"
msgstr "Извеждане на статистика за извършените действия"
-#: builtin/blame.c:2581
+#: builtin/blame.c:2577
msgid "Force progress reporting"
msgstr "Принудително извеждане на напредъка"
-#: builtin/blame.c:2582
+#: builtin/blame.c:2578
msgid "Show output score for blame entries"
msgstr "Извеждане на допълнителна информация за определянето на анотациите"
-#: builtin/blame.c:2583
+#: builtin/blame.c:2579
msgid "Show original filename (Default: auto)"
msgstr ""
"Извеждане на първоначалното име на файл (стандартно това е автоматично)"
-#: builtin/blame.c:2584
+#: builtin/blame.c:2580
msgid "Show original linenumber (Default: off)"
msgstr ""
"Извеждане на първоначалният номер на ред (стандартно опцията е изключена)"
-#: builtin/blame.c:2585
+#: builtin/blame.c:2581
msgid "Show in a format designed for machine consumption"
msgstr "Извеждане във формат за по-нататъшна обработка"
-#: builtin/blame.c:2586
+#: builtin/blame.c:2582
msgid "Show porcelain format with per-line commit information"
msgstr ""
"Извеждане във формат за команди от потребителско ниво с информация на всеки "
"ред"
-#: builtin/blame.c:2587
+#: builtin/blame.c:2583
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
"Използване на същия формат като „git-annotate“ (стандартно опцията е "
"изключена)"
-#: builtin/blame.c:2588
+#: builtin/blame.c:2584
msgid "Show raw timestamp (Default: off)"
msgstr "Извеждане на неформатирани времена (стандартно опцията е изключена)"
-#: builtin/blame.c:2589
+#: builtin/blame.c:2585
msgid "Show long commit SHA1 (Default: off)"
msgstr "Извеждане на пълните суми по SHA1 (стандартно опцията е изключена)"
-#: builtin/blame.c:2590
+#: builtin/blame.c:2586
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Без име на автор и време на промяна (стандартно опцията е изключена)"
-#: builtin/blame.c:2591
+#: builtin/blame.c:2587
msgid "Show author email instead of name (Default: off)"
msgstr ""
"Извеждане на е-пощата на автора, а не името му (стандартно опцията е "
"изключена)"
-#: builtin/blame.c:2592
+#: builtin/blame.c:2588
msgid "Ignore whitespace differences"
msgstr "Без разлики в знаците за интервали"
-#: builtin/blame.c:2599
-msgid "Use an experimental indent-based heuristic to improve diffs"
-msgstr "Подобряване на разликите чрез експериментална евристика според отстъпа"
+#: builtin/blame.c:2595
+msgid "Use an experimental heuristic to improve diffs"
+msgstr "Подобряване на разликите чрез експериментална евристика"
-#: builtin/blame.c:2600
-msgid "Use an experimental blank-line-based heuristic to improve diffs"
-msgstr ""
-"Подобряване на разликите чрез експериментална евристика според празните "
-"редове"
-
-#: builtin/blame.c:2602
+#: builtin/blame.c:2597
msgid "Spend extra cycles to find better match"
msgstr "Допълнителни изчисления за по-добри резултати"
-#: builtin/blame.c:2603
+#: builtin/blame.c:2598
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "Изчитане на версиите от ФАЙЛ, а не чрез изпълнение на „git-rev-list“"
-#: builtin/blame.c:2604
+#: builtin/blame.c:2599
msgid "Use <file>'s contents as the final image"
msgstr "Използване на съдържанието на ФАЙЛа като крайно положение"
-#: builtin/blame.c:2605 builtin/blame.c:2606
+#: builtin/blame.c:2600 builtin/blame.c:2601
msgid "score"
msgstr "напасване на редовете"
-#: builtin/blame.c:2605
+#: builtin/blame.c:2600
msgid "Find line copies within and across files"
msgstr ""
"Търсене на копирани редове както в рамките на един файл, така и от един файл "
"към друг"
-#: builtin/blame.c:2606
+#: builtin/blame.c:2601
msgid "Find line movements within and across files"
msgstr ""
"Търсене на преместени редове както в рамките на един файл, така и от един "
"файл към друг"
-#: builtin/blame.c:2607
+#: builtin/blame.c:2602
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2607
+#: builtin/blame.c:2602
msgid "Process only line range n,m, counting from 1"
msgstr ""
"Информация само за редовете в диапазона от n до m включително. Броенето "
"започва от 1"
-#: builtin/blame.c:2654
+#: builtin/blame.c:2649
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
"опцията „--progress“ е несъвместима с „--incremental“ и форма̀та на командите "
@@ -4887,42 +5458,42 @@
#. 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:2700
+#: builtin/blame.c:2697
msgid "4 years, 11 months ago"
msgstr "преди 4 години и 11 месеца"
-#: builtin/blame.c:2780
+#: builtin/blame.c:2777
msgid "--contents and --reverse do not blend well."
msgstr "Опциите „--contents“ и „--reverse“ са несъвместими"
-#: builtin/blame.c:2800
+#: builtin/blame.c:2797
msgid "cannot use --contents with final commit object name"
msgstr "Опцията „--contents“ е несъвместима с име на обект от крайно подаване"
-#: builtin/blame.c:2805
+#: builtin/blame.c:2802
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
"Едновременното задаване на опциите „--reverse“ и „--first-parent“ изисква "
"указването на крайно подаване"
-#: builtin/blame.c:2832
+#: builtin/blame.c:2829
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
"Едновременното задаване на опциите „--reverse“ и „--first-parent“ изисква "
"указването на диапазон по веригата на първите наследници"
-#: builtin/blame.c:2843
+#: builtin/blame.c:2840
#, c-format
msgid "no such path %s in %s"
msgstr "няма път на име „%s“ в „%s“"
-#: builtin/blame.c:2854
+#: builtin/blame.c:2851
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "обектът BLOB „%s“ в пътя %s не може да бъде прочетен"
-#: builtin/blame.c:2873
+#: builtin/blame.c:2870
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
@@ -4949,30 +5520,34 @@
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [ОПЦИЯ…] [-r | -a] [--points-at]"
-#: builtin/branch.c:143
+#: builtin/branch.c:31
+msgid "git branch [<options>] [-r | -a] [--format]"
+msgstr "git branch [ОПЦИЯ…] [-r | -a] [--format]"
+
+#: builtin/branch.c:144
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
" '%s', but not yet merged to HEAD."
msgstr ""
"изтриване на клона „%s“, който е слят към „%s“,\n"
-" но още не е слят към върха „HEAD“."
+" но още не е слят към върха „HEAD“."
-#: builtin/branch.c:147
+#: builtin/branch.c:148
#, 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“."
+" „%s“, но е слят към върха „HEAD“."
-#: builtin/branch.c:161
+#: builtin/branch.c:162
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Обектът-подаване за „%s“ не може да бъде открит"
-#: builtin/branch.c:165
+#: builtin/branch.c:166
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -4981,164 +5556,92 @@
"Клонът „%s“ не е слят напълно. Ако сте сигурни, че искате\n"
"да го изтриете, изпълнете „git branch -D %s“."
-#: builtin/branch.c:178
+#: builtin/branch.c:179
msgid "Update of config-file failed"
msgstr "Неуспешно обновяване на конфигурационния файл"
-#: builtin/branch.c:206
+#: builtin/branch.c:210
msgid "cannot use -a with -d"
msgstr "Опцията „-a“ е несъвместима с опцията „-d“"
-#: builtin/branch.c:212
+#: builtin/branch.c:216
msgid "Couldn't look up commit object for HEAD"
msgstr "Обектът-подаване, сочен от указателя „HEAD“, не може да бъде открит"
-#: builtin/branch.c:226
+#: builtin/branch.c:230
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "Не можете да изтриете клона „%s“, който е изтеглен в пътя „%s“"
-#: builtin/branch.c:241
+#: builtin/branch.c:245
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "следящият клон „%s“ не може да бъде открит."
-#: builtin/branch.c:242
+#: builtin/branch.c:246
#, c-format
msgid "branch '%s' not found."
msgstr "клонът „%s“ не може да бъде открит."
-#: builtin/branch.c:257
+#: builtin/branch.c:261
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Грешка при изтриването на следящия клон „%s“"
-#: builtin/branch.c:258
+#: builtin/branch.c:262
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Грешка при изтриването на клона „%s“"
-#: builtin/branch.c:265
+#: builtin/branch.c:269
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Изтрит следящ клон „%s“ (той сочеше към „%s“).\n"
-#: builtin/branch.c:266
+#: builtin/branch.c:270
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Изтрит клон „%s“ (той сочеше към „%s“).\n"
-#: builtin/branch.c:312
-#, c-format
-msgid "[%s: gone]"
-msgstr "[%s: изтрит]"
-
-#: builtin/branch.c:317
-#, c-format
-msgid "[%s]"
-msgstr "[%s]"
-
-#: builtin/branch.c:322
-#, c-format
-msgid "[%s: behind %d]"
-msgstr "[%s: назад с %d]"
-
-#: builtin/branch.c:324
-#, c-format
-msgid "[behind %d]"
-msgstr "[назад с %d]"
-
-#: builtin/branch.c:328
-#, c-format
-msgid "[%s: ahead %d]"
-msgstr "[%s: напред с %d]"
-
-#: builtin/branch.c:330
-#, c-format
-msgid "[ahead %d]"
-msgstr "[напред с %d]"
-
-#: builtin/branch.c:333
-#, c-format
-msgid "[%s: ahead %d, behind %d]"
-msgstr "[%s: напред с %d, назад с %d]"
-
-#: builtin/branch.c:336
-#, c-format
-msgid "[ahead %d, behind %d]"
-msgstr "[напред с %d, назад с %d]"
-
-#: builtin/branch.c:349
-msgid " **** invalid ref ****"
-msgstr " ●●● неправилен указател ●●●"
-
-#: builtin/branch.c:375
-#, c-format
-msgid "(no branch, rebasing %s)"
-msgstr "(извън клон, пребазиране на „%s“)"
-
-#: builtin/branch.c:378
-#, c-format
-msgid "(no branch, bisect started on %s)"
-msgstr "(извън клон, двоично търсене от „%s“)"
-
-#. TRANSLATORS: make sure this matches
-#. "HEAD detached at " in wt-status.c
-#: builtin/branch.c:384
-#, c-format
-msgid "(HEAD detached at %s)"
-msgstr "(Указателят „HEAD“ не е свързан и е при „%s“)"
-
-#. TRANSLATORS: make sure this matches
-#. "HEAD detached from " in wt-status.c
-#: builtin/branch.c:389
-#, c-format
-msgid "(HEAD detached from %s)"
-msgstr "Указателят „HEAD“ не е свързан и е отделѐн от „%s“"
-
-#: builtin/branch.c:393
-msgid "(no branch)"
-msgstr "(извън клон)"
-
-#: builtin/branch.c:544
+#: builtin/branch.c:441
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Клонът „%s“ се пребазира върху „%s“"
-#: builtin/branch.c:548
+#: builtin/branch.c:445
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Търси се двоично в клона „%s“ при „%s“"
-#: builtin/branch.c:563
+#: builtin/branch.c:460
msgid "cannot rename the current branch while not on any."
msgstr ""
"не можете да преименувате текущия клон, защото сте извън който и да е клон"
-#: builtin/branch.c:573
+#: builtin/branch.c:470
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Неправилно име на клон: „%s“"
-#: builtin/branch.c:590
+#: builtin/branch.c:487
msgid "Branch rename failed"
msgstr "Неуспешно преименуване на клон"
-#: builtin/branch.c:594
+#: builtin/branch.c:490
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "На клона с неправилно име „%s“ е дадено служебно име"
-#: builtin/branch.c:597
+#: builtin/branch.c:493
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Клонът е преименуван на „%s“, но указателят „HEAD“ не е обновен"
-#: builtin/branch.c:604
+#: builtin/branch.c:502
msgid "Branch is renamed, but update of config-file failed"
msgstr "Клонът е преименуван, но конфигурационният файл не е обновен"
-#: builtin/branch.c:620
+#: builtin/branch.c:518
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -5149,166 +5652,179 @@
" %s\n"
"Редовете, които започват с „%c“, ще бъдат пропуснати.\n"
-#: builtin/branch.c:651
+#: builtin/branch.c:551
msgid "Generic options"
msgstr "Общи настройки"
-#: builtin/branch.c:653
+#: builtin/branch.c:553
msgid "show hash and subject, give twice for upstream branch"
msgstr ""
"извеждане на хеша и темата. Повтарянето на опцията прибавя отдалечените "
"клони"
-#: builtin/branch.c:654
+#: builtin/branch.c:554
msgid "suppress informational messages"
msgstr "без информационни съобщения"
-#: builtin/branch.c:655
+#: builtin/branch.c:555
msgid "set up tracking mode (see git-pull(1))"
msgstr "задаване на режима на следене (виж git-pull(1))"
-#: builtin/branch.c:657
+#: builtin/branch.c:557
msgid "change upstream info"
msgstr "смяна на следения клон"
-#: builtin/branch.c:659
+#: builtin/branch.c:559
msgid "upstream"
msgstr "клон-източник"
-#: builtin/branch.c:659
+#: builtin/branch.c:559
msgid "change the upstream info"
msgstr "смяна на клона-източник"
-#: builtin/branch.c:660
+#: builtin/branch.c:560
msgid "Unset the upstream info"
msgstr "без клон-източник"
-#: builtin/branch.c:661
+#: builtin/branch.c:561
msgid "use colored output"
msgstr "цветен изход"
-#: builtin/branch.c:662
+#: builtin/branch.c:562
msgid "act on remote-tracking branches"
msgstr "действие върху следящите клони"
-#: builtin/branch.c:664 builtin/branch.c:665
+#: builtin/branch.c:564 builtin/branch.c:566
msgid "print only branches that contain the commit"
msgstr "извеждане само на клоните, които съдържат това ПОДАВАНЕ"
-#: builtin/branch.c:668
+#: builtin/branch.c:565 builtin/branch.c:567
+msgid "print only branches that don't contain the commit"
+msgstr "извеждане само на клоните, които не съдържат това ПОДАВАНЕ"
+
+#: builtin/branch.c:570
msgid "Specific git-branch actions:"
msgstr "Специални действия на „git-branch“:"
-#: builtin/branch.c:669
+#: builtin/branch.c:571
msgid "list both remote-tracking and local branches"
msgstr "извеждане както на следящите, така и на локалните клони"
-#: builtin/branch.c:671
+#: builtin/branch.c:573
msgid "delete fully merged branch"
msgstr "изтриване на клони, които са напълно слети"
-#: builtin/branch.c:672
+#: builtin/branch.c:574
msgid "delete branch (even if not merged)"
msgstr "изтриване и на клони, които не са напълно слети"
-#: builtin/branch.c:673
+#: builtin/branch.c:575
msgid "move/rename a branch and its reflog"
msgstr ""
"преместване/преименуване на клон и принадлежащият му журнал на указателите"
-#: builtin/branch.c:674
+#: builtin/branch.c:576
msgid "move/rename a branch, even if target exists"
msgstr "преместване/преименуване на клон, дори ако има вече клон с такова име"
-#: builtin/branch.c:675
+#: builtin/branch.c:577
msgid "list branch names"
msgstr "извеждане на имената на клоните"
-#: builtin/branch.c:676
+#: builtin/branch.c:578
msgid "create the branch's reflog"
msgstr "създаване на журнала на указателите на клона"
-#: builtin/branch.c:678
+#: builtin/branch.c:580
msgid "edit the description for the branch"
msgstr "редактиране на описанието на клона"
-#: builtin/branch.c:679
+#: builtin/branch.c:581
msgid "force creation, move/rename, deletion"
msgstr "принудително създаване, преместване, преименуване, изтриване"
-#: builtin/branch.c:680
+#: builtin/branch.c:582
msgid "print only branches that are merged"
msgstr "извеждане само на слетите клони"
-#: builtin/branch.c:681
+#: builtin/branch.c:583
msgid "print only branches that are not merged"
msgstr "извеждане само на неслетите клони"
-#: builtin/branch.c:682
+#: builtin/branch.c:584
msgid "list branches in columns"
msgstr "извеждане по колони"
-#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366
+#: builtin/branch.c:585 builtin/for-each-ref.c:38 builtin/tag.c:426
msgid "key"
msgstr "КЛЮЧ"
-#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367
+#: builtin/branch.c:586 builtin/for-each-ref.c:39 builtin/tag.c:427
msgid "field name to sort on"
msgstr "име на полето, по което да е подредбата"
-#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:404
+#: 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:369
+#: builtin/tag.c:429
msgid "object"
msgstr "ОБЕКТ"
-#: builtin/branch.c:687
+#: builtin/branch.c:589
msgid "print only branches of the object"
msgstr "извеждане само на клоните на ОБЕКТА"
-#: builtin/branch.c:705
+#: builtin/branch.c:591 builtin/for-each-ref.c:47 builtin/tag.c:434
+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
+msgid "format to use for the output"
+msgstr "ФОРМАТ за изхода"
+
+#: builtin/branch.c:611
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Не може да се открие към какво сочи указателят „HEAD“"
-#: builtin/branch.c:709 builtin/clone.c:706
+#: builtin/branch.c:615 builtin/clone.c:724
msgid "HEAD not found below refs/heads!"
msgstr "В директорията „refs/heads“ липсва файл „HEAD“"
-#: builtin/branch.c:729
+#: builtin/branch.c:638
msgid "--column and --verbose are incompatible"
msgstr "Опциите „--column“ и „--verbose“ са несъвместими"
-#: builtin/branch.c:740 builtin/branch.c:782
+#: builtin/branch.c:649 builtin/branch.c:701
msgid "branch name required"
msgstr "Необходимо е име на клон"
-#: builtin/branch.c:758
+#: builtin/branch.c:677
msgid "Cannot give description to detached HEAD"
msgstr "Не може да зададете описание на несвързан „HEAD“"
-#: builtin/branch.c:763
+#: builtin/branch.c:682
msgid "cannot edit description of more than one branch"
msgstr "Не може да редактирате описанието на повече от един клон едновременно"
-#: builtin/branch.c:770
+#: builtin/branch.c:689
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "В клона „%s“ все още няма подавания."
-#: builtin/branch.c:773
+#: builtin/branch.c:692
#, c-format
msgid "No branch named '%s'."
msgstr "Липсва клон на име „%s“."
-#: builtin/branch.c:788
+#: builtin/branch.c:707
msgid "too many branches for a rename operation"
msgstr "Прекалено много клони за преименуване"
-#: builtin/branch.c:793
+#: builtin/branch.c:712
msgid "too many branches to set new upstream"
msgstr "Зададени са прекалено много клони за следене"
-#: builtin/branch.c:797
+#: builtin/branch.c:716
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -5316,39 +5832,39 @@
"Следеното от „HEAD“ не може да се зададе да е „%s“, защото то не сочи към "
"никой клон."
-#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843
+#: builtin/branch.c:719 builtin/branch.c:741 builtin/branch.c:762
#, c-format
msgid "no such branch '%s'"
msgstr "Няма клон на име „%s“."
-#: builtin/branch.c:804
+#: builtin/branch.c:723
#, c-format
msgid "branch '%s' does not exist"
msgstr "Не съществува клон на име „%s“."
-#: builtin/branch.c:816
+#: builtin/branch.c:735
msgid "too many branches to unset upstream"
msgstr "Прекалено много клони за махане на следене"
-#: builtin/branch.c:820
+#: builtin/branch.c:739
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"Следеното от „HEAD“ не може да махне, защото то не сочи към никой клон."
-#: builtin/branch.c:826
+#: builtin/branch.c:745
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Няма информация клонът „%s“ да следи някой друг"
-#: builtin/branch.c:840
+#: builtin/branch.c:759
msgid "it does not make sense to create 'HEAD' manually"
msgstr "Няма никакъв смисъл ръчно да създавате „HEAD“."
-#: builtin/branch.c:846
+#: builtin/branch.c:765
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr "Опциите „-a“ и „-r“ на „git branch“ са несъвместими с име на клон"
-#: builtin/branch.c:849
+#: builtin/branch.c:768
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
@@ -5357,7 +5873,7 @@
"Опцията „--set-upstream“ вече е остаряла и предстои да бъде махната. "
"Използвайте „--track“ или „--set-upstream-to“\n"
-#: builtin/branch.c:866
+#: builtin/branch.c:785
#, c-format
msgid ""
"\n"
@@ -5368,16 +5884,16 @@
"За да накарате „%s“ да следи „%s“, изпълнете следната команда:\n"
"\n"
-#: builtin/bundle.c:51
+#: builtin/bundle.c:45
#, c-format
msgid "%s is okay\n"
msgstr "Пратката „%s“ е наред\n"
-#: builtin/bundle.c:64
+#: builtin/bundle.c:58
msgid "Need a repository to create a bundle."
msgstr "За създаването на пратка е необходимо хранилище."
-#: builtin/bundle.c:68
+#: builtin/bundle.c:62
msgid "Need a repository to unbundle."
msgstr "За приемането на пратка е необходимо хранилище."
@@ -5430,7 +5946,7 @@
msgstr ""
"да се стартират програмите за преобразуване на съдържанието на обектите BLOB"
-#: builtin/cat-file.c:561 git-submodule.sh:923
+#: builtin/cat-file.c:561 git-submodule.sh:943
msgid "blob"
msgstr "обект BLOB"
@@ -5489,7 +6005,7 @@
msgid "terminate input and output records by a NUL character"
msgstr "разделяне на входните и изходните записи с нулевия знак „NUL“"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1137 builtin/gc.c:325
+#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:356
msgid "suppress progress reporting"
msgstr "без показване на напредъка"
@@ -5579,9 +6095,9 @@
msgstr "записване на съдържанието във временни файлове"
#: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:595 builtin/submodule--helper.c:598
-#: builtin/submodule--helper.c:604 builtin/submodule--helper.c:951
-#: builtin/worktree.c:469
+#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
+#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
+#: builtin/worktree.c:477
msgid "string"
msgstr "НИЗ"
@@ -5593,114 +6109,114 @@
msgid "copy out the files from named stage"
msgstr "копиране на файловете от това състояние на сливане"
-#: builtin/checkout.c:25
+#: builtin/checkout.c:27
msgid "git checkout [<options>] <branch>"
msgstr "git checkout [ОПЦИЯ…] КЛОН"
-#: builtin/checkout.c:26
+#: builtin/checkout.c:28
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [ОПЦИЯ…] [КЛОН] -- ФАЙЛ…"
-#: builtin/checkout.c:134 builtin/checkout.c:167
+#: builtin/checkout.c:153 builtin/checkout.c:186
#, c-format
msgid "path '%s' does not have our version"
msgstr "вашата версия липсва в пътя „%s“"
-#: builtin/checkout.c:136 builtin/checkout.c:169
+#: builtin/checkout.c:155 builtin/checkout.c:188
#, c-format
msgid "path '%s' does not have their version"
msgstr "чуждата версия липсва в пътя „%s“"
-#: builtin/checkout.c:152
+#: builtin/checkout.c:171
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "някоя от необходимите версии липсва в пътя „%s“"
-#: builtin/checkout.c:196
+#: builtin/checkout.c:215
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "някоя от необходимите версии липсва в пътя „%s“"
-#: builtin/checkout.c:213
+#: builtin/checkout.c:232
#, c-format
msgid "path '%s': cannot merge"
msgstr "пътят „%s“ не може да бъде слян"
-#: builtin/checkout.c:230
+#: builtin/checkout.c:249
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Резултатът за „%s“ не може да бъде слян"
-#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
-#: builtin/checkout.c:259
+#: builtin/checkout.c:269 builtin/checkout.c:272 builtin/checkout.c:275
+#: builtin/checkout.c:278
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "Опцията „%s“ е несъвместима с обновяването на пътища"
-#: builtin/checkout.c:262 builtin/checkout.c:265
+#: builtin/checkout.c:281 builtin/checkout.c:284
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "Опцията „%s“ е несъвместима с „%s“"
-#: builtin/checkout.c:268
+#: builtin/checkout.c:287
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
"Невъзможно е едновременно да обновявате пътища и да преминете към клона „%s“."
-#: builtin/checkout.c:339 builtin/checkout.c:346
+#: builtin/checkout.c:358 builtin/checkout.c:365
#, c-format
msgid "path '%s' is unmerged"
msgstr "пътят „%s“ не е слят"
-#: builtin/checkout.c:494
+#: builtin/checkout.c:513
msgid "you need to resolve your current index first"
msgstr "първо трябва да коригирате индекса си"
-#: builtin/checkout.c:624
+#: builtin/checkout.c:644
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Журналът на указателите за „%s“ не може да се проследи: %s\n"
-#: builtin/checkout.c:663
+#: builtin/checkout.c:685
msgid "HEAD is now at"
msgstr "Указателят „HEAD“ в момента сочи към"
-#: builtin/checkout.c:667 builtin/clone.c:660
+#: builtin/checkout.c:689 builtin/clone.c:678
msgid "unable to update HEAD"
msgstr "Указателят „HEAD“ не може да бъде обновен"
-#: builtin/checkout.c:671
+#: builtin/checkout.c:693
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Зануляване на клона „%s“\n"
-#: builtin/checkout.c:674
+#: builtin/checkout.c:696
#, c-format
msgid "Already on '%s'\n"
msgstr "Вече сте на „%s“\n"
-#: builtin/checkout.c:678
+#: builtin/checkout.c:700
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Преминаване към клона „%s“ и зануляване на промените\n"
-#: builtin/checkout.c:680 builtin/checkout.c:1069
+#: builtin/checkout.c:702 builtin/checkout.c:1090
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Преминахте към новия клон „%s“\n"
-#: builtin/checkout.c:682
+#: builtin/checkout.c:704
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Преминахте към клона „%s“\n"
-#: builtin/checkout.c:733
+#: builtin/checkout.c:755
#, c-format
msgid " ... and %d more.\n"
msgstr "… и още %d.\n"
-#: builtin/checkout.c:739
+#: builtin/checkout.c:761
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -5722,7 +6238,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:758
+#: builtin/checkout.c:780
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -5749,154 +6265,154 @@
" git branch ИМЕ_НА_НОВИЯ_КЛОН %s\n"
"\n"
-#: builtin/checkout.c:794
+#: builtin/checkout.c:816
msgid "internal error in revision walk"
msgstr "вътрешна грешка при обхождането на версиите"
-#: builtin/checkout.c:798
+#: builtin/checkout.c:820
msgid "Previous HEAD position was"
msgstr "Преди това „HEAD“ сочеше към"
-#: builtin/checkout.c:825 builtin/checkout.c:1064
+#: builtin/checkout.c:847 builtin/checkout.c:1085
msgid "You are on a branch yet to be born"
msgstr "В момента сте на клон, който предстои да бъде създаден"
-#: builtin/checkout.c:970
+#: builtin/checkout.c:991
#, c-format
msgid "only one reference expected, %d given."
msgstr "очакваше се един указател, а сте подали %d."
-#: builtin/checkout.c:1010 builtin/worktree.c:214
+#: builtin/checkout.c:1031 builtin/worktree.c:214
#, c-format
msgid "invalid reference: %s"
msgstr "неправилен указател: %s"
-#: builtin/checkout.c:1039
+#: builtin/checkout.c:1060
#, c-format
msgid "reference is not a tree: %s"
msgstr "указателят не сочи към обект-дърво: %s"
-#: builtin/checkout.c:1078
+#: builtin/checkout.c:1099
msgid "paths cannot be used with switching branches"
msgstr "задаването на път е несъвместимо с преминаването от един клон към друг"
-#: builtin/checkout.c:1081 builtin/checkout.c:1085
+#: builtin/checkout.c:1102 builtin/checkout.c:1106
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "опцията „%s“ е несъвместима с преминаването от един клон към друг"
-#: builtin/checkout.c:1089 builtin/checkout.c:1092 builtin/checkout.c:1097
-#: builtin/checkout.c:1100
+#: builtin/checkout.c:1110 builtin/checkout.c:1113 builtin/checkout.c:1118
+#: builtin/checkout.c:1121
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "опцията „%s“ е несъвместима с „%s“"
-#: builtin/checkout.c:1105
+#: builtin/checkout.c:1126
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr ""
"За да преминете към клон, подайте указател, който сочи към подаване. „%s“ "
"не е такъв"
-#: builtin/checkout.c:1138 builtin/checkout.c:1140 builtin/clone.c:93
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324
-#: builtin/worktree.c:326
+#: 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
msgid "branch"
msgstr "клон"
-#: builtin/checkout.c:1139
+#: builtin/checkout.c:1160
msgid "create and checkout a new branch"
msgstr "създаване и преминаване към нов клон"
-#: builtin/checkout.c:1141
+#: builtin/checkout.c:1162
msgid "create/reset and checkout a branch"
msgstr "създаване/зануляване на клон и преминаване към него"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1163
msgid "create reflog for new branch"
msgstr "създаване на журнал на указателите за нов клон"
-#: builtin/checkout.c:1143 builtin/worktree.c:328
+#: builtin/checkout.c:1164 builtin/worktree.c:333
msgid "detach HEAD at named commit"
msgstr "отделяне на указателя „HEAD“ към указаното подаване"
-#: builtin/checkout.c:1144
+#: builtin/checkout.c:1165
msgid "set upstream info for new branch"
msgstr "задаване на кой клон бива следен при създаването на новия клон"
-#: builtin/checkout.c:1146
+#: builtin/checkout.c:1167
msgid "new-branch"
msgstr "НОВ_КЛОН"
-#: builtin/checkout.c:1146
+#: builtin/checkout.c:1167
msgid "new unparented branch"
msgstr "нов клон без родител"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1168
msgid "checkout our version for unmerged files"
msgstr "изтегляне на вашата версия на неслетите файлове"
-#: builtin/checkout.c:1149
+#: builtin/checkout.c:1170
msgid "checkout their version for unmerged files"
msgstr "изтегляне на чуждата версия на неслетите файлове"
-#: builtin/checkout.c:1151
+#: builtin/checkout.c:1172
msgid "force checkout (throw away local modifications)"
msgstr "принудително изтегляне (вашите промени ще бъдат занулени)"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1173
msgid "perform a 3-way merge with the new branch"
msgstr "извършване на тройно сливане с новия клон"
-#: builtin/checkout.c:1153 builtin/merge.c:231
+#: builtin/checkout.c:1174 builtin/merge.c:234
msgid "update ignored files (default)"
msgstr "обновяване на игнорираните файлове (стандартно)"
-#: builtin/checkout.c:1154 builtin/log.c:1466 parse-options.h:251
+#: builtin/checkout.c:1175 builtin/log.c:1473 parse-options.h:251
msgid "style"
msgstr "СТИЛ"
-#: builtin/checkout.c:1155
+#: builtin/checkout.c:1176
msgid "conflict style (merge or diff3)"
msgstr "действие при конфликт (сливане или тройна разлика)"
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1179
msgid "do not limit pathspecs to sparse entries only"
msgstr "без ограничаване на изброените пътища само до частично изтеглените"
-#: builtin/checkout.c:1160
+#: builtin/checkout.c:1181
msgid "second guess 'git checkout <no-such-branch>'"
msgstr ""
"опит за отгатване на име на клон след неуспешен опит с „git checkout "
"НЕСЪЩЕСТВУВАЩ_КЛОН“"
-#: builtin/checkout.c:1162
+#: builtin/checkout.c:1183
msgid "do not check if another worktree is holding the given ref"
msgstr "без проверка дали друго работно дърво държи указателя"
-#: builtin/checkout.c:1163 builtin/clone.c:63 builtin/fetch.c:119
-#: builtin/merge.c:228 builtin/pull.c:117 builtin/push.c:536
-#: builtin/send-pack.c:168
+#: 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
msgid "force progress reporting"
msgstr "извеждане на напредъка"
-#: builtin/checkout.c:1194
+#: builtin/checkout.c:1224
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "Опциите „-b“, „-B“ и „--orphan“ са несъвместими една с друга"
-#: builtin/checkout.c:1211
+#: builtin/checkout.c:1241
msgid "--track needs a branch name"
msgstr "опцията „--track“ изисква име на клон"
-#: builtin/checkout.c:1216
+#: builtin/checkout.c:1246
msgid "Missing branch name; try -b"
msgstr "Липсва име на клон, използвайте опцията „-b“"
-#: builtin/checkout.c:1252
+#: builtin/checkout.c:1282
msgid "invalid path specification"
msgstr "указан е неправилен път"
-#: builtin/checkout.c:1259
+#: builtin/checkout.c:1289
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
@@ -5905,12 +6421,12 @@
"Не можете едновременно да обновявате пътища и да преминете към клона „%s“.\n"
"Дали не искате да изтеглите „%s“, който не сочи към подаване?"
-#: builtin/checkout.c:1264
+#: builtin/checkout.c:1294
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: опцията „--detach“ не приема аргумент-път „%s“"
-#: builtin/checkout.c:1268
+#: builtin/checkout.c:1298
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -5948,19 +6464,21 @@
msgid "failed to remove %s"
msgstr "файлът „%s“ не може да бъде изтрит"
-#: builtin/clean.c:291
+#: builtin/clean.c:297 git-add--interactive.perl:614
+#, c-format
msgid ""
"Prompt help:\n"
"1 - select a numbered item\n"
"foo - select item based on unique prefix\n"
-" - (empty) select nothing"
+" - (empty) select nothing\n"
msgstr ""
"Подсказка:\n"
"1 — избор на обект според реда\n"
"ПРЕФИКС — избор на единствен обект по този уникален префикс\n"
-" — (празно) нищо да не се избира"
+" — (празно) нищо да не се избира\n"
-#: builtin/clean.c:295
+#: builtin/clean.c:301 git-add--interactive.perl:623
+#, c-format
msgid ""
"Prompt help:\n"
"1 - select a single item\n"
@@ -5969,48 +6487,50 @@
"foo - select item based on unique prefix\n"
"-... - unselect specified items\n"
"* - choose all items\n"
-" - (empty) finish selecting"
+" - (empty) finish selecting\n"
msgstr ""
"Подсказка:\n"
"1 — избор на един обект\n"
"3-5 — диапазон за избор на обекти\n"
-"2-3,6-9 — множество диапазон за избор на обекти\n"
+"2-3,6-9 — множество диапазони за избор на обекти\n"
"ПРЕФИКС — избор на единствен обект по този уникален префикс\n"
"-… — отмяна на избора на обекти\n"
"* — избиране на всички обекти\n"
-" — (празно) завършване на избирането"
+" — (празно) завършване на избирането\n"
-#: builtin/clean.c:511
-#, c-format
-msgid "Huh (%s)?"
-msgstr "Неправилен избор (%s). Изберете отново."
+#: builtin/clean.c:517 git-add--interactive.perl:589
+#: git-add--interactive.perl:594
+#, c-format, perl-format
+msgid "Huh (%s)?\n"
+msgstr "Неправилен избор (%s).\n"
-#: builtin/clean.c:653
+#: builtin/clean.c:659
#, c-format
msgid "Input ignore patterns>> "
msgstr "Шаблони за игнорирани елементи≫ "
-#: builtin/clean.c:690
+#: builtin/clean.c:696
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "ПРЕДУПРЕЖДЕНИЕ: Никой обект не напасва на „%s“"
-#: builtin/clean.c:711
+#: builtin/clean.c:717
msgid "Select items to delete"
msgstr "Избиране на обекти за изтриване"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:752
+#: builtin/clean.c:758
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Да се изтрие ли „%s“? „y“ — да, „N“ — НЕ"
#
-#: builtin/clean.c:777
-msgid "Bye."
-msgstr "Изход."
+#: builtin/clean.c:783 git-add--interactive.perl:1660
+#, c-format
+msgid "Bye.\n"
+msgstr "Изход.\n"
-#: builtin/clean.c:785
+#: builtin/clean.c:791
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -6028,62 +6548,63 @@
"help — този край\n"
"? — подсказка за шаблоните"
-#: builtin/clean.c:812
+#: builtin/clean.c:818 git-add--interactive.perl:1736
msgid "*** Commands ***"
msgstr "●●● Команди ●●●"
-#: builtin/clean.c:813
+#: builtin/clean.c:819 git-add--interactive.perl:1733
msgid "What now"
msgstr "Избор на следващо действие"
-#: builtin/clean.c:821
+#: builtin/clean.c:827
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Следният обект ще бъде изтрит:"
msgstr[1] "Следните обекти ще бъдат изтрити:"
-#: builtin/clean.c:838
+#: builtin/clean.c:844
msgid "No more files to clean, exiting."
msgstr "Файловете за изчистване свършиха. Изход от програмата."
-#: builtin/clean.c:869
+#: builtin/clean.c:875
msgid "do not print names of files removed"
msgstr "без извеждане на имената на файловете, които ще бъдат изтрити"
-#: builtin/clean.c:871
+#: builtin/clean.c:877
msgid "force"
msgstr "принудително изтриване"
-#: builtin/clean.c:872
+#: builtin/clean.c:878
msgid "interactive cleaning"
msgstr "интерактивно изтриване"
-#: builtin/clean.c:874
+#: builtin/clean.c:880
msgid "remove whole directories"
msgstr "изтриване на цели директории"
-#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:725
-#: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:182
+#: 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
msgid "pattern"
msgstr "ШАБЛОН"
-#: builtin/clean.c:876
+#: builtin/clean.c:882
msgid "add <pattern> to ignore rules"
msgstr "добавяне на ШАБЛОН от файлове, които да не се трият"
-#: builtin/clean.c:877
+#: builtin/clean.c:883
msgid "remove ignored files, too"
msgstr "изтриване и на игнорираните файлове"
-#: builtin/clean.c:879
+#: builtin/clean.c:885
msgid "remove only ignored files"
msgstr "изтриване само на игнорирани файлове"
-#: builtin/clean.c:897
+#: builtin/clean.c:903
msgid "-x and -X cannot be used together"
msgstr "опциите „-x“ и „-X“ са несъвместими"
-#: builtin/clean.c:901
+#: builtin/clean.c:907
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -6091,7 +6612,7 @@
"Настройката „clean.requireForce“ е зададена като истина, което изисква някоя "
"от опциите „-i“, „-n“ или „-f“. Няма да се извърши изчистване"
-#: builtin/clean.c:904
+#: builtin/clean.c:910
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -6104,132 +6625,137 @@
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [ОПЦИЯ…] [--] ХРАНИЛИЩЕ [ДИРЕКТОРИЯ]"
-#: builtin/clone.c:65
+#: builtin/clone.c:80
msgid "don't create a checkout"
msgstr "без създаване на работно дърво"
-#: builtin/clone.c:66 builtin/clone.c:68 builtin/init-db.c:478
+#: builtin/clone.c:81 builtin/clone.c:83 builtin/init-db.c:478
msgid "create a bare repository"
msgstr "създаване на голо хранилище"
-#: builtin/clone.c:70
+#: builtin/clone.c:85
msgid "create a mirror repository (implies bare)"
msgstr ""
"създаване на хранилище-огледало (включва опцията „--bare“ за голо хранилище)"
-#: builtin/clone.c:72
+#: builtin/clone.c:87
msgid "to clone from a local repository"
msgstr "клониране от локално хранилище"
-#: builtin/clone.c:74
+#: builtin/clone.c:89
msgid "don't use local hardlinks, always copy"
msgstr "без твърди връзки, файловете винаги да се копират"
-#: builtin/clone.c:76
+#: builtin/clone.c:91
msgid "setup as shared repository"
msgstr "настройване за споделено хранилище"
-#: builtin/clone.c:78 builtin/clone.c:80
+#: builtin/clone.c:93 builtin/clone.c:97
+msgid "pathspec"
+msgstr "път"
+
+#: builtin/clone.c:93 builtin/clone.c:97
msgid "initialize submodules in the clone"
msgstr "инициализиране на подмодулите при това клониране"
-#: builtin/clone.c:82
+#: builtin/clone.c:100
msgid "number of submodules cloned in parallel"
msgstr "брой подмодули, клонирани паралелно"
-#: builtin/clone.c:83 builtin/init-db.c:475
+#: builtin/clone.c:101 builtin/init-db.c:475
msgid "template-directory"
msgstr "директория с шаблони"
-#: builtin/clone.c:84 builtin/init-db.c:476
+#: builtin/clone.c:102 builtin/init-db.c:476
msgid "directory from which templates will be used"
msgstr "директория, която съдържа шаблоните, които да се ползват"
-#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:602
-#: builtin/submodule--helper.c:954
+#: builtin/clone.c:104 builtin/clone.c:106 builtin/submodule--helper.c:642
+#: builtin/submodule--helper.c:983
msgid "reference repository"
msgstr "еталонно хранилище"
-#: builtin/clone.c:90
+#: builtin/clone.c:108
msgid "use --reference only while cloning"
msgstr "опцията „--reference“ може да се използва само при клониране"
-#: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:109 builtin/column.c:26 builtin/merge-file.c:43
msgid "name"
msgstr "ИМЕ"
-#: builtin/clone.c:92
+#: builtin/clone.c:110
msgid "use <name> instead of 'origin' to track upstream"
msgstr "използване на това ИМЕ вместо „origin“ при проследяване на клони"
-#: builtin/clone.c:94
+#: builtin/clone.c:112
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "изтегляне на този КЛОН, а не соченият от отдалечения указател „HEAD“"
-#: builtin/clone.c:96
+#: builtin/clone.c:114
msgid "path to git-upload-pack on the remote"
msgstr "път към командата „git-upload-pack“ на отдалеченото хранилище"
-#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668 builtin/pull.c:202
+#: builtin/clone.c:115 builtin/fetch.c:120 builtin/grep.c:1006
+#: builtin/pull.c:202
msgid "depth"
msgstr "ДЪЛБОЧИНА"
-#: builtin/clone.c:98
+#: builtin/clone.c:116
msgid "create a shallow clone of that depth"
msgstr "плитко клониране до тази ДЪЛБОЧИНА"
-#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2848
+#: builtin/clone.c:117 builtin/fetch.c:122 builtin/pack-objects.c:2918
#: parse-options.h:142
msgid "time"
msgstr "ВРЕМЕ"
-#: builtin/clone.c:100
+#: builtin/clone.c:118
msgid "create a shallow clone since a specific time"
msgstr "плитко клониране до момент във времето"
-#: builtin/clone.c:101 builtin/fetch.c:124
+#: builtin/clone.c:119 builtin/fetch.c:124
msgid "revision"
msgstr "версия"
-#: builtin/clone.c:102 builtin/fetch.c:125
-msgid "deepen history of shallow clone by excluding rev"
+#: builtin/clone.c:120 builtin/fetch.c:125
+msgid "deepen history of shallow clone, excluding rev"
msgstr "задълбочаване на историята на плитко хранилище до изключващ указател"
-#: builtin/clone.c:104
+#: builtin/clone.c:122
msgid "clone only one branch, HEAD or --branch"
msgstr ""
"клониране само на един клон — или сочения от отдалечения „HEAD“, или изрично "
"зададения с „--branch“"
-#: builtin/clone.c:106
+#: builtin/clone.c:124
msgid "any cloned submodules will be shallow"
msgstr "всички клонирани подмодули ще са плитки"
-#: builtin/clone.c:107 builtin/init-db.c:484
+#: builtin/clone.c:125 builtin/init-db.c:484
msgid "gitdir"
msgstr "СЛУЖЕБНА_ДИРЕКТОРИЯ"
-#: builtin/clone.c:108 builtin/init-db.c:485
+#: builtin/clone.c:126 builtin/init-db.c:485
msgid "separate git dir from working tree"
msgstr "отделна СЛУЖЕБНА_ДИРЕКТОРИЯ за git извън работното дърво"
-#: builtin/clone.c:109
+#: builtin/clone.c:127
msgid "key=value"
msgstr "КЛЮЧ=СТОЙНОСТ"
-#: builtin/clone.c:110
+#: builtin/clone.c:128
msgid "set config inside the new repository"
msgstr "задаване на настройките на новото хранилище"
-#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:547
+#: builtin/clone.c:129 builtin/fetch.c:140 builtin/push.c:550
msgid "use IPv4 addresses only"
msgstr "само адреси IPv4"
-#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:549
+#: builtin/clone.c:131 builtin/fetch.c:142 builtin/push.c:552
msgid "use IPv6 addresses only"
msgstr "само адреси IPv6"
-#: builtin/clone.c:250
+#: builtin/clone.c:268
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
@@ -6237,43 +6763,43 @@
"Името на директорията не може да бъде отгатнато.\n"
"Задайте директорията изрично на командния ред"
-#: builtin/clone.c:303
+#: builtin/clone.c:321
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr ""
"ПРЕДУПРЕЖДЕНИЕ: не може да се добави алтернативен източник на „%s“: %s\n"
-#: builtin/clone.c:375
+#: builtin/clone.c:393
#, c-format
msgid "failed to open '%s'"
msgstr "директорията „%s“ не може да бъде отворена"
-#: builtin/clone.c:383
+#: builtin/clone.c:401
#, c-format
msgid "%s exists and is not a directory"
msgstr "„%s“ съществува и не е директория"
-#: builtin/clone.c:397
+#: builtin/clone.c:415
#, c-format
msgid "failed to stat %s\n"
msgstr "не може да бъде получена информация чрез „stat“ за „%s“\n"
-#: builtin/clone.c:419
+#: builtin/clone.c:437
#, c-format
msgid "failed to create link '%s'"
msgstr "връзката „%s“ не може да бъде създадена"
-#: builtin/clone.c:423
+#: builtin/clone.c:441
#, c-format
msgid "failed to copy file to '%s'"
msgstr "файлът не може да бъде копиран като „%s“"
-#: builtin/clone.c:448
+#: builtin/clone.c:466
#, c-format
msgid "done.\n"
msgstr "действието завърши.\n"
-#: builtin/clone.c:460
+#: builtin/clone.c:478
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -6284,104 +6810,103 @@
"клон в момента са изтеглени с командата „git status“. Можете да\n"
"завършите изтеглянето на клона с командата „git checkout -f HEAD“.\n"
-#: builtin/clone.c:537
+#: builtin/clone.c:555
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr ""
"Клонът „%s“ от отдалеченото хранилище, което клонирате,\n"
"и който следва да бъде изтеглен, не съществува."
-#: builtin/clone.c:632
+#: builtin/clone.c:650
msgid "remote did not send all necessary objects"
msgstr "отдалеченото хранилище не изпрати всички необходими обекти."
-# FIXME merge with next?
-#: builtin/clone.c:648
+#: builtin/clone.c:666
#, c-format
msgid "unable to update %s"
msgstr "обектът „%s“ не може да бъде обновен"
-#: builtin/clone.c:697
+#: builtin/clone.c:715
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"указателят „HEAD“ от отдалеченото хранилище сочи към нещо,\n"
"което не съществува. Не може да се изтегли определен клон.\n"
-#: builtin/clone.c:728
+#: builtin/clone.c:746
msgid "unable to checkout working tree"
msgstr "работното дърво не може да бъде подготвено"
-#: builtin/clone.c:768
+#: builtin/clone.c:786
msgid "unable to write parameters to config file"
msgstr "настройките не могат да бъдат записани в конфигурационния файл"
-#: builtin/clone.c:831
+#: builtin/clone.c:849
msgid "cannot repack to clean up"
msgstr "не може да се извърши пакетиране за изчистване на файловете"
-#: builtin/clone.c:833
+#: builtin/clone.c:851
msgid "cannot unlink temporary alternates file"
msgstr "временният файл за алтернативни обекти не може да бъде изтрит"
-#: builtin/clone.c:866 builtin/receive-pack.c:1895
+#: builtin/clone.c:884 builtin/receive-pack.c:1900
msgid "Too many arguments."
msgstr "Прекалено много аргументи."
-#: builtin/clone.c:870
+#: builtin/clone.c:888
msgid "You must specify a repository to clone."
msgstr "Трябва да укажете кое хранилище искате да клонирате."
-#: builtin/clone.c:883
+#: builtin/clone.c:901
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "опциите „--bare“ и „--origin %s“ са несъвместими."
-#: builtin/clone.c:886
+#: builtin/clone.c:904
msgid "--bare and --separate-git-dir are incompatible."
msgstr "опциите „--bare“ и „--separate-git-dir“ са несъвместими."
-#: builtin/clone.c:899
+#: builtin/clone.c:917
#, c-format
msgid "repository '%s' does not exist"
msgstr "не съществува хранилище „%s“"
-#: builtin/clone.c:905 builtin/fetch.c:1338
+#: builtin/clone.c:923 builtin/fetch.c:1337
#, c-format
msgid "depth %s is not a positive number"
msgstr "дълбочината трябва да е положително цяло число, а не „%s“"
-#: builtin/clone.c:915
+#: builtin/clone.c:933
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "целевият път „%s“ съществува и не е празна директория."
-#: builtin/clone.c:925
+#: builtin/clone.c:943
#, c-format
msgid "working tree '%s' already exists."
msgstr "в „%s“ вече съществува работно дърво."
-#: builtin/clone.c:940 builtin/clone.c:951 builtin/submodule--helper.c:657
-#: builtin/worktree.c:222 builtin/worktree.c:249
+#: builtin/clone.c:958 builtin/clone.c:969 builtin/difftool.c:252
+#: builtin/worktree.c:221 builtin/worktree.c:251
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "родителските директории на „%s“ не могат да бъдат създадени"
-#: builtin/clone.c:943
+#: builtin/clone.c:961
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "работното дърво в „%s“ не може да бъде създадено."
-#: builtin/clone.c:955
+#: builtin/clone.c:973
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Клониране и създаване на голо хранилище в „%s“…\n"
-#: builtin/clone.c:957
+#: builtin/clone.c:975
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Клониране и създаване на хранилище в „%s“…\n"
-#: builtin/clone.c:963
+#: builtin/clone.c:999
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
@@ -6389,43 +6914,43 @@
"Опцията „--recursive“ е несъвместима с опциите „--reference“ и „--reference-"
"if-able“"
-#: builtin/clone.c:1019
+#: builtin/clone.c:1055
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
"При локално клониране опцията „--depth“ се прескача. Ползвайте схемата "
"„file://“."
-#: builtin/clone.c:1021
+#: builtin/clone.c:1057
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
"При локално клониране опцията „--shallow-since“ се прескача. Ползвайте "
"схемата „file://“."
-#: builtin/clone.c:1023
+#: builtin/clone.c:1059
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
"При локално клониране опцията „--shallow-exclude“ се прескача. Ползвайте "
"схемата „file://“."
-#: builtin/clone.c:1026
+#: builtin/clone.c:1062
msgid "source repository is shallow, ignoring --local"
msgstr "клонираното хранилище е плитко, затова опцията „--local“ се прескача"
-#: builtin/clone.c:1031
+#: builtin/clone.c:1067
msgid "--local is ignored"
msgstr "опцията „--local“ се прескача"
-#: builtin/clone.c:1035
+#: builtin/clone.c:1071
#, c-format
msgid "Don't know how to clone %s"
msgstr "Не се поддържа клониране на връзки от вида „%s“ "
-#: builtin/clone.c:1090 builtin/clone.c:1098
+#: builtin/clone.c:1126 builtin/clone.c:1134
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Отдалеченият клон „%s“ липсва в клонираното хранилище „%s“"
-#: builtin/clone.c:1101
+#: builtin/clone.c:1137
msgid "You appear to have cloned an empty repository."
msgstr "Изглежда клонирахте празно хранилище."
@@ -6623,11 +7148,6 @@
msgid "malformed --author parameter"
msgstr "неправилен параметър към опцията „--author“"
-#: builtin/commit.c:611
-#, c-format
-msgid "invalid date format: %s"
-msgstr "неправилен формат на дата: %s"
-
#: builtin/commit.c:655
msgid ""
"unable to select a comment character that is not used\n"
@@ -6641,7 +7161,7 @@
msgid "could not lookup commit %s"
msgstr "следното подаване не може да бъде открито: %s"
-#: builtin/commit.c:704 builtin/shortlog.c:286
+#: builtin/commit.c:704 builtin/shortlog.c:294
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(изчитане на съобщението за подаване от стандартния вход)\n"
@@ -6741,7 +7261,7 @@
msgid "Error building trees"
msgstr "Грешка при изграждане на дърветата"
-#: builtin/commit.c:969 builtin/tag.c:266
+#: builtin/commit.c:968 builtin/tag.c:273
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Подайте съобщението с някоя от опциите „-m“ или „-F“.\n"
@@ -6753,7 +7273,7 @@
"Опцията „--author '%s'“ не отговаря на форма̀та „Име <е-поща>“ и не съвпада с "
"никой автор"
-#: builtin/commit.c:1086 builtin/commit.c:1327
+#: builtin/commit.c:1086 builtin/commit.c:1325
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Неправилна стойност за неследените файлове: „%s“"
@@ -6807,75 +7327,67 @@
msgstr "Опциите „--include“ и „--only“ изискват аргументи."
#: builtin/commit.c:1212
-msgid "Clever... amending the last one with dirty index."
-msgstr ""
-"Чудесно сте се сетили как да поправите съобщението на последното подаване "
-"при\n"
-"променен индекс. Споделете и с друг потребител трика с „git commit --amend -"
-"o“."
-
-#: builtin/commit.c:1214
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr ""
"Зададени са изрични пътища без опциите „-i“ или „-o“. Приема се, че все "
"едно сте\n"
"ползвали опцията „--only“ с ПЪТища…"
-#: builtin/commit.c:1226 builtin/tag.c:474
+#: builtin/commit.c:1224 builtin/tag.c:551
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Несъществуващ режим на изчистване „%s“"
-#: builtin/commit.c:1231
+#: builtin/commit.c:1229
msgid "Paths with -a does not make sense."
msgstr "Опцията „-a“ е несъвместима със задаването на пътища."
-#: builtin/commit.c:1341 builtin/commit.c:1617
+#: builtin/commit.c:1339 builtin/commit.c:1612
msgid "show status concisely"
msgstr "кратка информация за състоянието"
-#: builtin/commit.c:1343 builtin/commit.c:1619
+#: builtin/commit.c:1341 builtin/commit.c:1614
msgid "show branch information"
msgstr "информация за клоните"
-#: builtin/commit.c:1345
+#: builtin/commit.c:1343
msgid "version"
msgstr "версия"
-#: builtin/commit.c:1345 builtin/commit.c:1621 builtin/push.c:522
-#: builtin/worktree.c:440
+#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525
+#: builtin/worktree.c:448
msgid "machine-readable output"
msgstr "формат на изхода за четене от програма"
-#: builtin/commit.c:1348 builtin/commit.c:1623
+#: builtin/commit.c:1346 builtin/commit.c:1618
msgid "show status in long format (default)"
msgstr "подробна информация за състоянието (стандартно)"
-#: builtin/commit.c:1351 builtin/commit.c:1626
+#: builtin/commit.c:1349 builtin/commit.c:1621
msgid "terminate entries with NUL"
msgstr "разделяне на елементите с нулевия знак „NUL“"
-#: builtin/commit.c:1353 builtin/commit.c:1629 builtin/fast-export.c:981
-#: builtin/fast-export.c:984 builtin/tag.c:353
+#: builtin/commit.c:1351 builtin/commit.c:1624 builtin/fast-export.c:981
+#: builtin/fast-export.c:984 builtin/tag.c:411
msgid "mode"
msgstr "РЕЖИМ"
-#: builtin/commit.c:1354 builtin/commit.c:1629
+#: builtin/commit.c:1352 builtin/commit.c:1624
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"извеждане на неследените файлове. Възможните РЕЖИМи са „all“ (подробна "
"информация), „normal“ (кратка информация), „no“ (без неследените файлове). "
"Стандартният РЕЖИМ е: „all“."
-#: builtin/commit.c:1357
+#: builtin/commit.c:1355
msgid "show ignored files"
msgstr "извеждане на игнорираните файлове"
-#: builtin/commit.c:1358 parse-options.h:155
+#: builtin/commit.c:1356 parse-options.h:155
msgid "when"
msgstr "КОГА"
-#: builtin/commit.c:1359
+#: builtin/commit.c:1357
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -6884,205 +7396,205 @@
"една от „all“ (всички), „dirty“ (тези с неподадени промени), "
"„untracked“ (неследени)"
-#: builtin/commit.c:1361
+#: builtin/commit.c:1359
msgid "list untracked files in columns"
msgstr "извеждане на неследените файлове в колони"
-#: builtin/commit.c:1437
+#: builtin/commit.c:1435
msgid "couldn't look up newly created commit"
msgstr "току що създаденото подаване не може да бъде открито"
-#: builtin/commit.c:1439
+#: builtin/commit.c:1437
msgid "could not parse newly created commit"
msgstr "току що създаденото подаване не може да бъде анализирано"
-#: builtin/commit.c:1484
+#: builtin/commit.c:1482
msgid "detached HEAD"
msgstr "несвързан връх „HEAD“"
-#: builtin/commit.c:1487
+#: builtin/commit.c:1485
msgid " (root-commit)"
msgstr " (начално подаване)"
-#: builtin/commit.c:1587
+#: builtin/commit.c:1582
msgid "suppress summary after successful commit"
msgstr "без информация след успешно подаване"
-#: builtin/commit.c:1588
+#: builtin/commit.c:1583
msgid "show diff in commit message template"
msgstr "добавяне на разликата към шаблона за съобщението при подаване"
-#: builtin/commit.c:1590
+#: builtin/commit.c:1585
msgid "Commit message options"
msgstr "Опции за съобщението при подаване"
-#: builtin/commit.c:1591 builtin/tag.c:351
+#: builtin/commit.c:1586 builtin/tag.c:409
msgid "read message from file"
msgstr "взимане на съобщението от ФАЙЛ"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1587
msgid "author"
msgstr "АВТОР"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1587
msgid "override author for commit"
msgstr "задаване на АВТОР за подаването"
-#: builtin/commit.c:1593 builtin/gc.c:326
+#: builtin/commit.c:1588 builtin/gc.c:357
msgid "date"
msgstr "ДАТА"
-#: builtin/commit.c:1593
+#: builtin/commit.c:1588
msgid "override date for commit"
msgstr "задаване на ДАТА за подаването"
-#: builtin/commit.c:1594 builtin/merge.c:220 builtin/notes.c:398
-#: builtin/notes.c:561 builtin/tag.c:349
+#: builtin/commit.c:1589 builtin/merge.c:221 builtin/notes.c:398
+#: builtin/notes.c:561 builtin/tag.c:407
msgid "message"
msgstr "СЪОБЩЕНИЕ"
-#: builtin/commit.c:1594
+#: builtin/commit.c:1589
msgid "commit message"
msgstr "СЪОБЩЕНИЕ при подаване"
-#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
-#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:79
+#: builtin/commit.c:1590 builtin/commit.c:1591 builtin/commit.c:1592
+#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:77
msgid "commit"
msgstr "ПОДАВАНЕ"
-#: builtin/commit.c:1595
+#: builtin/commit.c:1590
msgid "reuse and edit message from specified commit"
msgstr "преизползване и редактиране на съобщението от указаното ПОДАВАНЕ"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1591
msgid "reuse message from specified commit"
msgstr "преизползване на съобщението от указаното ПОДАВАНЕ"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1592
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"използване на автоматичното съобщение при смачкване за вкарване на указаното "
"ПОДАВАНЕ в предното без следа"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1593
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"използване на автоматичното съобщение при смачкване за смачкване на "
"указаното ПОДАВАНЕ в предното"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1594
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
"смяна на автора да съвпада с подаващия (използва се с „-C“/„-c“/„--amend“)"
-#: builtin/commit.c:1600 builtin/log.c:1413 builtin/revert.c:86
+#: builtin/commit.c:1595 builtin/log.c:1420 builtin/revert.c:104
msgid "add Signed-off-by:"
msgstr "добавяне на поле за подпис — „Signed-off-by:“"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1596
msgid "use specified template file"
msgstr "използване на указания шаблонен ФАЙЛ"
-#: builtin/commit.c:1602
+#: builtin/commit.c:1597
msgid "force edit of commit"
msgstr "редактиране на подаване"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1598
msgid "default"
msgstr "стандартно"
-#: builtin/commit.c:1603 builtin/tag.c:354
+#: builtin/commit.c:1598 builtin/tag.c:412
msgid "how to strip spaces and #comments from message"
msgstr "кои празни знаци и #коментари да се махат от съобщенията"
-#: builtin/commit.c:1604
+#: builtin/commit.c:1599
msgid "include status in commit message template"
msgstr "вмъкване на състоянието в шаблона за съобщението при подаване"
-#: builtin/commit.c:1606 builtin/merge.c:230 builtin/pull.c:166
-#: builtin/revert.c:93
+#: builtin/commit.c:1601 builtin/merge.c:233 builtin/pull.c:166
+#: builtin/revert.c:112
msgid "GPG sign commit"
msgstr "подписване на подаването с GPG"
-#: builtin/commit.c:1609
+#: builtin/commit.c:1604
msgid "Commit contents options"
msgstr "Опции за избор на файлове при подаване"
-#: builtin/commit.c:1610
+#: builtin/commit.c:1605
msgid "commit all changed files"
msgstr "подаване на всички променени файлове"
-#: builtin/commit.c:1611
+#: builtin/commit.c:1606
msgid "add specified files to index for commit"
msgstr "добавяне на указаните файлове към индекса за подаване"
-#: builtin/commit.c:1612
+#: builtin/commit.c:1607
msgid "interactively add files"
msgstr "интерактивно добавяне на файлове"
-#: builtin/commit.c:1613
+#: builtin/commit.c:1608
msgid "interactively add changes"
msgstr "интерактивно добавяне на промени"
-#: builtin/commit.c:1614
+#: builtin/commit.c:1609
msgid "commit only specified files"
msgstr "подаване само на указаните файлове"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1610
msgid "bypass pre-commit and commit-msg hooks"
msgstr ""
"без изпълнение на куките преди подаване и при промяна на съобщението за "
"подаване (pre-commit и commit-msg)"
-#: builtin/commit.c:1616
+#: builtin/commit.c:1611
msgid "show what would be committed"
msgstr "отпечатване на това, което би било подадено"
-#: builtin/commit.c:1627
+#: builtin/commit.c:1622
msgid "amend previous commit"
msgstr "поправяне на предишното подаване"
-#: builtin/commit.c:1628
+#: builtin/commit.c:1623
msgid "bypass post-rewrite hook"
msgstr "без изпълнение на куката след презаписване (post-rewrite)"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1628
msgid "ok to record an empty change"
msgstr "позволяване на празни подавания"
-#: builtin/commit.c:1635
+#: builtin/commit.c:1630
msgid "ok to record a change with an empty message"
msgstr "позволяване на подавания с празни съобщения"
-#: builtin/commit.c:1664
+#: builtin/commit.c:1659
msgid "could not parse HEAD commit"
msgstr "върховото подаване „HEAD“ не може да бъде прочетено"
-#: builtin/commit.c:1712
+#: builtin/commit.c:1707
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Повреден файл за върха за сливането „MERGE_HEAD“ (%s)"
-#: builtin/commit.c:1719
+#: builtin/commit.c:1714
msgid "could not read MERGE_MODE"
msgstr "режимът на сливане „MERGE_MODE“ не може да бъде прочетен"
-#: builtin/commit.c:1738
+#: builtin/commit.c:1733
#, c-format
msgid "could not read commit message: %s"
msgstr "съобщението за подаване не може да бъде прочетено: %s"
-#: builtin/commit.c:1749
+#: builtin/commit.c:1744
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Неизвършване на подаване поради нередактирано съобщение.\n"
-#: builtin/commit.c:1754
+#: builtin/commit.c:1749
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Неизвършване на подаване поради празно съобщение.\n"
-#: builtin/commit.c:1802
+#: builtin/commit.c:1797
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -7096,146 +7608,146 @@
msgid "git config [<options>]"
msgstr "git config [ОПЦИЯ…]"
-#: builtin/config.c:55
+#: builtin/config.c:56
msgid "Config file location"
msgstr "Местоположение на конфигурационния файл"
-#: builtin/config.c:56
+#: builtin/config.c:57
msgid "use global config file"
msgstr "използване на глобалния конфигурационен файл"
-#: builtin/config.c:57
+#: builtin/config.c:58
msgid "use system config file"
msgstr "използване на системния конфигурационен файл"
-#: builtin/config.c:58
+#: builtin/config.c:59
msgid "use repository config file"
msgstr "използване на конфигурационния файл на хранилището"
-#: builtin/config.c:59
+#: builtin/config.c:60
msgid "use given config file"
msgstr "използване на зададения конфигурационен ФАЙЛ"
-#: builtin/config.c:60
+#: builtin/config.c:61
msgid "blob-id"
msgstr "ИДЕНТИФИКАТОР"
-#: builtin/config.c:60
+#: builtin/config.c:61
msgid "read config from given blob object"
msgstr ""
"изчитане на конфигурацията от BLOB с този ИДЕНТИФИКАТОР на съдържанието"
-#: builtin/config.c:61
+#: builtin/config.c:62
msgid "Action"
msgstr "Действие"
-#: builtin/config.c:62
+#: builtin/config.c:63
msgid "get value: name [value-regex]"
msgstr "извеждане на стойност: ИМЕ [РЕГУЛЯРЕН_ИЗРАЗ_ЗА_СТОЙНОСТТА]"
-#: builtin/config.c:63
+#: builtin/config.c:64
msgid "get all values: key [value-regex]"
msgstr "извеждане на всички стойности: ключ [РЕГУЛЯРЕН_ИЗРАЗ_ЗА_СТОЙНОСТТА]"
-#: builtin/config.c:64
+#: builtin/config.c:65
msgid "get values for regexp: name-regex [value-regex]"
msgstr ""
"извеждане на стойностите за РЕГУЛЯРНия_ИЗРАЗ: РЕГУЛЯРЕН_ИЗРАЗ_ЗА_ИМЕТО "
"[РЕГУЛЯРЕН_ИЗРАЗ_ЗА_СТОЙНОСТТА]"
-#: builtin/config.c:65
+#: builtin/config.c:66
msgid "get value specific for the URL: section[.var] URL"
msgstr "извеждане на стойността за указания адрес: РАЗДЕЛ[.ПРОМЕНЛИВА] АДРЕС"
-#: builtin/config.c:66
+#: builtin/config.c:67
msgid "replace all matching variables: name value [value_regex]"
msgstr ""
"замяна на всички съвпадащи променливи: ИМЕ СТОЙНОСТ "
"[РЕГУЛЯРЕН_ИЗРАЗ_ЗА_СТОЙНОСТТА]"
-#: builtin/config.c:67
+#: builtin/config.c:68
msgid "add a new variable: name value"
msgstr "добавяне на нова променлива: ИМЕ СТОЙНОСТ"
-#: builtin/config.c:68
+#: builtin/config.c:69
msgid "remove a variable: name [value-regex]"
msgstr "изтриване на променлива: ИМЕ [РЕГУЛЯРЕН_ИЗРАЗ_ЗА_СТОЙНОСТТА]"
-#: builtin/config.c:69
+#: builtin/config.c:70
msgid "remove all matches: name [value-regex]"
msgstr "изтриване на всички съвпадащи: ИМЕ [РЕГУЛЯРЕН_ИЗРАЗ_ЗА_СТОЙНОСТТА]"
-#: builtin/config.c:70
+#: builtin/config.c:71
msgid "rename section: old-name new-name"
msgstr "преименуване на раздел: СТАРО_ИМЕ НОВО_ИМЕ"
-#: builtin/config.c:71
+#: builtin/config.c:72
msgid "remove a section: name"
msgstr "изтриване на раздел: ИМЕ"
-#: builtin/config.c:72
+#: builtin/config.c:73
msgid "list all"
msgstr "изброяване на всички"
-#: builtin/config.c:73
+#: builtin/config.c:74
msgid "open an editor"
msgstr "отваряне на редактор"
-#: builtin/config.c:74
+#: builtin/config.c:75
msgid "find the color configured: slot [default]"
msgstr "извеждане на зададения цвят: номер [стандартно]"
-#: builtin/config.c:75
+#: builtin/config.c:76
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "извеждане на зададения цвят: номер [стандартният изход е терминал]"
-#: builtin/config.c:76
+#: builtin/config.c:77
msgid "Type"
msgstr "Вид"
-#: builtin/config.c:77
+#: builtin/config.c:78
msgid "value is \"true\" or \"false\""
msgstr "СТОЙНОСТТА е „true“ (истина) или „false“ (лъжа)"
-#: builtin/config.c:78
+#: builtin/config.c:79
msgid "value is decimal number"
msgstr "СТОЙНОСТТА е цяло, десетично число"
-#: builtin/config.c:79
+#: builtin/config.c:80
msgid "value is --bool or --int"
msgstr "СТОЙНОСТТА е „--bool“ (булева) или „--int“ (десетично цяло число)"
-#: builtin/config.c:80
+#: builtin/config.c:81
msgid "value is a path (file or directory name)"
msgstr "СТОЙНОСТТА е път (до файл или директория)"
-#: builtin/config.c:81
+#: builtin/config.c:82
msgid "Other"
msgstr "Други"
-#: builtin/config.c:82
+#: builtin/config.c:83
msgid "terminate values with NUL byte"
msgstr "разделяне на стойностите с нулевия знак „NUL“"
-#: builtin/config.c:83
+#: builtin/config.c:84
msgid "show variable names only"
msgstr "извеждане на имената на променливите"
-#: builtin/config.c:84
+#: builtin/config.c:85
msgid "respect include directives on lookup"
msgstr "при търсене да се уважат и директивите за включване"
-#: builtin/config.c:85
+#: builtin/config.c:86
msgid "show origin of config (file, standard input, blob, command line)"
msgstr ""
"извеждане на мястото на задаване на настройката (файл, стандартен вход, "
"обект BLOB, команден ред)"
-#: builtin/config.c:327
+#: builtin/config.c:328
msgid "unable to parse default color value"
msgstr "неразпозната стойност на стандартния цвят"
-#: builtin/config.c:471
+#: builtin/config.c:472
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -7250,19 +7762,19 @@
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:613
+#: builtin/config.c:615
#, c-format
msgid "cannot create configuration file %s"
msgstr "конфигурационният файл „%s“ не може да бъде създаден"
-#: builtin/config.c:625
+#: builtin/config.c:627
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
" Use a regexp, --add or --replace-all to change %s."
msgstr ""
"множество стойности не могат да се заменят с една.\n"
-"За да промените „%s“, ползвайте регулярен израз или оциите „--add“ и „--"
+"За да промените „%s“, ползвайте регулярен израз или опциите „--add“ и „--"
"replace-all“."
#: builtin/count-objects.c:86
@@ -7273,55 +7785,67 @@
msgid "print sizes in human readable format"
msgstr "извеждане на размерите на обектите във формат лесно четим от хора"
-#: builtin/describe.c:17
+#: builtin/describe.c:18
msgid "git describe [<options>] [<commit-ish>...]"
msgstr "git describe [ОПЦИЯ…] УКАЗАТЕЛ_КЪМ_ПОДАВАНЕ…"
-#: builtin/describe.c:18
+#: builtin/describe.c:19
msgid "git describe [<options>] --dirty"
msgstr "git describe [ОПЦИЯ…] --dirty"
-#: builtin/describe.c:217
+#: builtin/describe.c:53
+msgid "head"
+msgstr "основно"
+
+#: builtin/describe.c:53
+msgid "lightweight"
+msgstr "кратко"
+
+#: builtin/describe.c:53
+msgid "annotated"
+msgstr "анотирано"
+
+#: builtin/describe.c:250
#, c-format
msgid "annotated tag %s not available"
msgstr "не съществува анотиран етикет „%s“"
-#: builtin/describe.c:221
+#: builtin/describe.c:254
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr "в анотирания етикет „%s“ липсва вградено име"
-#: builtin/describe.c:223
+#: builtin/describe.c:256
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr "етикетът „%s“ тук е всъщност „%s“"
-#: builtin/describe.c:250 builtin/log.c:480
+#: builtin/describe.c:283 builtin/log.c:487
#, c-format
msgid "Not a valid object name %s"
msgstr "Неправилно име на обект „%s“"
-#: builtin/describe.c:253
+#: builtin/describe.c:286
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "„%s“ е неправилен обект „%s“"
-#: builtin/describe.c:270
+#: builtin/describe.c:303
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "никой етикет не напасва точно „%s“"
-#: builtin/describe.c:272
+#: builtin/describe.c:305
#, c-format
msgid "searching to describe %s\n"
msgstr "търсене за описание на „%s“\n"
-#: builtin/describe.c:319
+#: builtin/describe.c:352
#, c-format
msgid "finished search at %s\n"
msgstr "търсенето приключи при „%s“\n"
-#: builtin/describe.c:346
+#: builtin/describe.c:379
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
@@ -7330,7 +7854,7 @@
"Никой анотиран етикет не описва „%s“.\n"
"Съществуват и неанотирани етикети. Пробвайте с опцията „--tags“."
-#: builtin/describe.c:350
+#: builtin/describe.c:383
#, c-format
msgid ""
"No tags can describe '%s'.\n"
@@ -7339,13 +7863,12 @@
"Никой етикет не описва „%s“.\n"
"Пробвайте с опцията „--always“ или създайте етикети."
-# FIXME - plural
-#: builtin/describe.c:371
+#: builtin/describe.c:413
#, c-format
msgid "traversed %lu commits\n"
msgstr "претърсени са %lu подавания\n"
-#: builtin/describe.c:374
+#: builtin/describe.c:416
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
@@ -7354,97 +7877,214 @@
"открити са над %i етикета, изведени са последните %i,\n"
"търсенето бе прекратено при „%s“.\n"
-#: builtin/describe.c:396
+#: builtin/describe.c:438
msgid "find the tag that comes after the commit"
msgstr "откриване на етикета, който следва подаване"
-#: builtin/describe.c:397
+#: builtin/describe.c:439
msgid "debug search strategy on stderr"
msgstr ""
"извеждане на информация за трасиране на стратегията за търсене на "
"стандартната грешка"
-#: builtin/describe.c:398
+#: builtin/describe.c:440
msgid "use any ref"
msgstr "използване на произволен указател"
-#: builtin/describe.c:399
+#: builtin/describe.c:441
msgid "use any tag, even unannotated"
msgstr "използване на всеки етикет — включително и неанотираните"
-#: builtin/describe.c:400
+#: builtin/describe.c:442
msgid "always use long format"
msgstr "винаги да се ползва дългият формат"
-#: builtin/describe.c:401
+#: builtin/describe.c:443
msgid "only follow first parent"
msgstr "проследяване само на първия родител"
-#: builtin/describe.c:404
+#: builtin/describe.c:446
msgid "only output exact matches"
msgstr "извеждане само на точните съвпадения"
-#: builtin/describe.c:406
+#: builtin/describe.c:448
msgid "consider <n> most recent tags (default: 10)"
msgstr "да се търси само в този БРОЙ последни етикети (стандартно: 10)"
-#: builtin/describe.c:408
+#: builtin/describe.c:450
msgid "only consider tags matching <pattern>"
msgstr "да се търси само измежду етикетите напасващи този ШАБЛОН"
-#: builtin/describe.c:410 builtin/name-rev.c:320
+#: builtin/describe.c:452
+msgid "do not consider tags matching <pattern>"
+msgstr "да не се търси измежду етикетите напасващи този ШАБЛОН"
+
+#: builtin/describe.c:454 builtin/name-rev.c:357
msgid "show abbreviated commit object as fallback"
msgstr "извеждане на съкратено име на обект като резервен вариант"
-#: builtin/describe.c:411
+#: builtin/describe.c:455 builtin/describe.c:458
msgid "mark"
msgstr "МАРКЕР"
-#: builtin/describe.c:412
+#: builtin/describe.c:456
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr "добавяне на такъв МАРКЕР на работното дърво (стандартно е „-dirty“)"
-#: builtin/describe.c:430
+#: builtin/describe.c:459
+msgid "append <mark> on broken working tree (default: \"-broken\")"
+msgstr ""
+"добавяне на такъв МАРКЕР на счупеното работно дърво (стандартно е „-broken“)"
+
+#: builtin/describe.c:477
msgid "--long is incompatible with --abbrev=0"
msgstr "Опциите „--long“ и „--abbrev=0“ са несъвместими"
-#: builtin/describe.c:456
+#: builtin/describe.c:506
msgid "No names found, cannot describe anything."
msgstr "Не са открити имена — нищо не може да бъде описано."
-#: builtin/describe.c:476
+#: builtin/describe.c:549
msgid "--dirty is incompatible with commit-ishes"
msgstr "опцията „--dirty“ е несъвместима с указател към подаване"
-#: builtin/diff.c:86
+#: builtin/describe.c:551
+msgid "--broken is incompatible with commit-ishes"
+msgstr "опцията „--broken“ е несъвместима с указател към подаване"
+
+#: builtin/diff.c:83
#, c-format
msgid "'%s': not a regular file or symlink"
msgstr "„%s“: не е нито обикновен файл, нито символна връзка"
-#: builtin/diff.c:237
+#: builtin/diff.c:234
#, c-format
msgid "invalid option: %s"
msgstr "неправилна опция: %s"
-#: builtin/diff.c:361
+#: builtin/diff.c:358
msgid "Not a git repository"
msgstr "Не е хранилище на Git"
-#: builtin/diff.c:404
+#: builtin/diff.c:401
#, c-format
msgid "invalid object '%s' given."
msgstr "зададен е неправилен обект „%s“."
-#: builtin/diff.c:413
+#: builtin/diff.c:410
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "зададени са повече от 2 обекта BLOB: „%s“"
-#: builtin/diff.c:420
+#: builtin/diff.c:417
#, c-format
msgid "unhandled object '%s' given."
msgstr "зададен е неподдържан обект „%s“."
+#: builtin/difftool.c:28
+msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
+msgstr "git difftool [ОПЦИЯ…] [ПОДАВАНЕ [ПОДАВАНЕ]] [[--] ПЪТ…]"
+
+#: builtin/difftool.c:241
+#, c-format
+msgid "failed: %d"
+msgstr "неуспешно действие с изходен код: %d"
+
+#: builtin/difftool.c:283
+#, c-format
+msgid "could not read symlink %s"
+msgstr "символната връзка „%s“ не може да бъде прочетена"
+
+#: builtin/difftool.c:285
+#, c-format
+msgid "could not read symlink file %s"
+msgstr "файлът, сочен от символната връзка „%s“, не може да бъде прочетен"
+
+#: builtin/difftool.c:293
+#, c-format
+msgid "could not read object %s for symlink %s"
+msgstr "обектът „%s“ за символната връзка „%s“ не може да бъде прочетен"
+
+#: builtin/difftool.c:395
+msgid ""
+"combined diff formats('-c' and '--cc') are not supported in\n"
+"directory diff mode('-d' and '--dir-diff')."
+msgstr ""
+"комбинираните формати на разликите („-c“ и „--cc“) не се поддържат\n"
+"в режима за разлики върху директории („-d“ и „--dir-diff“)."
+
+#: builtin/difftool.c:609
+#, c-format
+msgid "both files modified: '%s' and '%s'."
+msgstr "и двата файла са променени: „%s“ и „%s“."
+
+#: builtin/difftool.c:611
+msgid "working tree file has been left."
+msgstr "работното дърво е изоставено."
+
+#: builtin/difftool.c:622
+#, c-format
+msgid "temporary files exist in '%s'."
+msgstr "в „%s“ има временни файлове."
+
+#: builtin/difftool.c:623
+msgid "you may want to cleanup or recover these."
+msgstr "възможно е да ги изчистите или възстановите"
+
+#: builtin/difftool.c:669
+msgid "use `diff.guitool` instead of `diff.tool`"
+msgstr "използвайте „diff.guitool“ вместо „diff.tool“"
+
+#: builtin/difftool.c:671
+msgid "perform a full-directory diff"
+msgstr "разлика по директории"
+
+#: builtin/difftool.c:673
+msgid "do not prompt before launching a diff tool"
+msgstr "стартиране на ПРОГРАМАта за разлики без предупреждение"
+
+#: builtin/difftool.c:679
+msgid "use symlinks in dir-diff mode"
+msgstr "следване на символните връзки при разлика по директории"
+
+#: builtin/difftool.c:680
+msgid "<tool>"
+msgstr "ПРОГРАМА"
+
+#: builtin/difftool.c:681
+msgid "use the specified diff tool"
+msgstr "използване на указаната ПРОГРАМА"
+
+#: builtin/difftool.c:683
+msgid "print a list of diff tools that may be used with `--tool`"
+msgstr ""
+"извеждане на списък с всички ПРОГРАМи, които може да се ползват с опцията „--"
+"tool“"
+
+#: builtin/difftool.c:686
+msgid ""
+"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"code"
+msgstr ""
+"„git-difftool“ да спре работа, когато стартираната ПРОГРАМА завърши с "
+"ненулев код"
+
+#: builtin/difftool.c:688
+msgid "<command>"
+msgstr "КОМАНДА"
+
+#: builtin/difftool.c:689
+msgid "specify a custom command for viewing diffs"
+msgstr "команда за разглеждане на разлики"
+
+#: builtin/difftool.c:713
+msgid "no <tool> given for --tool=<tool>"
+msgstr "не е зададена програма за „--tool=ПРОГРАМА“"
+
+#: builtin/difftool.c:720
+msgid "no <cmd> given for --extcmd=<cmd>"
+msgstr "не е зададена команда за „--extcmd=КОМАНДА“"
+
#: builtin/fast-export.c:25
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [ОПЦИИ_ЗА_СПИСЪКА_С_ВЕРСИИ]"
@@ -7577,7 +8217,7 @@
msgid "convert to a complete repository"
msgstr "превръщане в пълно хранилище"
-#: builtin/fetch.c:131 builtin/log.c:1433
+#: builtin/fetch.c:131 builtin/log.c:1440
msgid "dir"
msgstr "директория"
@@ -7601,79 +8241,79 @@
msgid "specify fetch refmap"
msgstr "указване на КАРТАта_С_УКАЗАТЕЛИ за доставяне"
-#: builtin/fetch.c:398
+#: builtin/fetch.c:395
msgid "Couldn't find remote ref HEAD"
msgstr "Указателят „HEAD“ в отдалеченото хранилище не може да бъде открит"
-#: builtin/fetch.c:514
+#: builtin/fetch.c:513
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "настройката „fetch.output“ е с неправилна стойност „%s“"
-#: builtin/fetch.c:607
+#: builtin/fetch.c:606
#, c-format
msgid "object %s not found"
msgstr "обектът „%s“ липсва"
-#: builtin/fetch.c:611
+#: builtin/fetch.c:610
msgid "[up to date]"
msgstr "[актуализиран]"
-#: builtin/fetch.c:624 builtin/fetch.c:704
+#: builtin/fetch.c:623 builtin/fetch.c:703
msgid "[rejected]"
msgstr "[отхвърлен]"
-#: builtin/fetch.c:625
+#: builtin/fetch.c:624
msgid "can't fetch in current branch"
msgstr "в текущия клон не може да се доставя"
-#: builtin/fetch.c:634
+#: builtin/fetch.c:633
msgid "[tag update]"
msgstr "[обновяване на етикетите]"
-#: builtin/fetch.c:635 builtin/fetch.c:668 builtin/fetch.c:684
-#: builtin/fetch.c:699
+#: builtin/fetch.c:634 builtin/fetch.c:667 builtin/fetch.c:683
+#: builtin/fetch.c:698
msgid "unable to update local ref"
msgstr "локален указател не може да бъде обновен"
-#: builtin/fetch.c:654
+#: builtin/fetch.c:653
msgid "[new tag]"
msgstr "[нов етикет]"
-#: builtin/fetch.c:657
+#: builtin/fetch.c:656
msgid "[new branch]"
msgstr "[нов клон]"
-#: builtin/fetch.c:660
+#: builtin/fetch.c:659
msgid "[new ref]"
msgstr "[нов указател]"
-#: builtin/fetch.c:699
+#: builtin/fetch.c:698
msgid "forced update"
msgstr "принудително обновяване"
-#: builtin/fetch.c:704
+#: builtin/fetch.c:703
msgid "non-fast-forward"
-msgstr "сливането не е тривиално"
+msgstr "същинско сливане"
-#: builtin/fetch.c:749
+#: builtin/fetch.c:748
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "хранилището „%s“ не изпрати всички необходими обекти\n"
-#: builtin/fetch.c:769
+#: builtin/fetch.c:768
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
"отхвърляне на върха „%s“, защото плитките хранилища не могат да бъдат "
"обновявани"
-#: builtin/fetch.c:856 builtin/fetch.c:952
+#: builtin/fetch.c:855 builtin/fetch.c:951
#, c-format
msgid "From %.*s\n"
msgstr "От %.*s\n"
-#: builtin/fetch.c:867
+#: builtin/fetch.c:866
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -7683,55 +8323,55 @@
"„git remote prune %s“, за да премахнете остарелите клони, които\n"
"предизвикват конфликта"
-#: builtin/fetch.c:922
+#: builtin/fetch.c:921
#, c-format
msgid " (%s will become dangling)"
msgstr " (обектът „%s“ ще се окаже извън клон)"
-#: builtin/fetch.c:923
+#: builtin/fetch.c:922
#, c-format
msgid " (%s has become dangling)"
msgstr " (обектът „%s“ вече е извън клон)"
-#: builtin/fetch.c:955
+#: builtin/fetch.c:954
msgid "[deleted]"
msgstr "[изтрит]"
-#: builtin/fetch.c:956 builtin/remote.c:1020
+#: builtin/fetch.c:955 builtin/remote.c:1022
msgid "(none)"
msgstr "(нищо)"
-#: builtin/fetch.c:979
+#: builtin/fetch.c:978
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Не може да доставите в текущия клон „%s“ на хранилище, което не е голо"
-#: builtin/fetch.c:998
+#: builtin/fetch.c:997
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "Стойността „%2$s“ за опцията „%1$s“ не е съвместима с „%3$s“"
-#: builtin/fetch.c:1001
+#: builtin/fetch.c:1000
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Опцията „%s“ се прескача при „%s“\n"
-#: builtin/fetch.c:1077
+#: builtin/fetch.c:1076
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "Не се поддържа доставяне от „%s“"
-#: builtin/fetch.c:1237
+#: builtin/fetch.c:1236
#, c-format
msgid "Fetching %s\n"
msgstr "Доставяне на „%s“\n"
-#: builtin/fetch.c:1239 builtin/remote.c:96
+#: builtin/fetch.c:1238 builtin/remote.c:96
#, c-format
msgid "Could not fetch %s"
msgstr "„%s“ не може да се достави"
-#: builtin/fetch.c:1257
+#: builtin/fetch.c:1256
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -7739,41 +8379,41 @@
"Не сте указали отдалечено хранилище. Задайте или адрес, или име\n"
"на отдалечено хранилище, откъдето да се доставят новите версии."
-#: builtin/fetch.c:1280
+#: builtin/fetch.c:1279
msgid "You need to specify a tag name."
msgstr "Трябва да укажете име на етикет."
-#: builtin/fetch.c:1322
+#: builtin/fetch.c:1321
msgid "Negative depth in --deepen is not supported"
msgstr "Отрицателна дълбочина като аргумент на „--deepen“ не се поддържа"
-#: builtin/fetch.c:1324
+#: builtin/fetch.c:1323
msgid "--deepen and --depth are mutually exclusive"
msgstr "Опциите „--deepen“ и „--depth“ са несъвместими една с друга"
-#: builtin/fetch.c:1329
+#: builtin/fetch.c:1328
msgid "--depth and --unshallow cannot be used together"
msgstr "опциите „--depth“ и „--unshallow“ са несъвместими"
-#: builtin/fetch.c:1331
+#: builtin/fetch.c:1330
msgid "--unshallow on a complete repository does not make sense"
msgstr "не можете да използвате опцията „--unshallow“ върху пълно хранилище"
-#: builtin/fetch.c:1353
+#: builtin/fetch.c:1352
msgid "fetch --all does not take a repository argument"
msgstr "към „git fetch --all“ не можете да добавите аргумент — хранилище"
-#: builtin/fetch.c:1355
+#: builtin/fetch.c:1354
msgid "fetch --all does not make sense with refspecs"
msgstr ""
"към „git fetch --all“ не можете да добавите аргумент — указател на версия"
-#: builtin/fetch.c:1366
+#: builtin/fetch.c:1365
#, c-format
msgid "No such remote or remote group: %s"
msgstr "Няма нито отдалечено хранилище, нито група от хранилища на име „%s“"
-#: builtin/fetch.c:1374
+#: builtin/fetch.c:1373
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Указването на група и указването на версия са несъвместими"
@@ -7814,12 +8454,12 @@
msgstr "git for-each-ref [--points ОБЕКТ]"
#: builtin/for-each-ref.c:11
-msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"
-msgstr "git for-each-ref[(--merged | --no-merged) [ОБЕКТ]]"
+msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
+msgstr "git for-each-ref[(--merged | --no-merged) [ПОДАВАНЕ]]"
#: builtin/for-each-ref.c:12
-msgid "git for-each-ref [--contains [<object>]]"
-msgstr "git for-each-ref [--contains ОБЕКТ]"
+msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
+msgstr "git for-each-ref [--contains [ПОДАВАНЕ]] [--no-contains [ПОДАВАНЕ]]"
#: builtin/for-each-ref.c:27
msgid "quote placeholders suitably for shells"
@@ -7841,10 +8481,6 @@
msgid "show only <n> matched refs"
msgstr "извеждане само на този БРОЙ напаснати указатели"
-#: builtin/for-each-ref.c:37 builtin/tag.c:372
-msgid "format to use for the output"
-msgstr "ФОРМАТ за изхода"
-
#: builtin/for-each-ref.c:41
msgid "print only refs which points at the given object"
msgstr "извеждане само на указателите, сочещи към ОБЕКТА"
@@ -7861,64 +8497,68 @@
msgid "print only refs which contain the commit"
msgstr "извеждане само на указателите, които съдържат това ПОДАВАНЕ"
-#: builtin/fsck.c:519
+#: builtin/for-each-ref.c:46
+msgid "print only refs which don't contain the commit"
+msgstr "извеждане само на указателите, които не съдържат това ПОДАВАНЕ"
+
+#: builtin/fsck.c:554
msgid "Checking object directories"
msgstr "Проверка на директориите с обекти"
-#: builtin/fsck.c:588
+#: builtin/fsck.c:646
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [ОПЦИЯ…] [ОБЕКТ…]"
-#: builtin/fsck.c:594
+#: builtin/fsck.c:652
msgid "show unreachable objects"
msgstr "показване на недостижимите обекти"
-#: builtin/fsck.c:595
+#: builtin/fsck.c:653
msgid "show dangling objects"
msgstr "показване на обектите извън клоните"
-#: builtin/fsck.c:596
+#: builtin/fsck.c:654
msgid "report tags"
msgstr "показване на етикетите"
-#: builtin/fsck.c:597
+#: builtin/fsck.c:655
msgid "report root nodes"
msgstr "показване на кореновите възли"
-#: builtin/fsck.c:598
+#: builtin/fsck.c:656
msgid "make index objects head nodes"
msgstr "задаване на обекти от индекса да са коренови"
# FIXME bad message
-#: builtin/fsck.c:599
+#: builtin/fsck.c:657
msgid "make reflogs head nodes (default)"
msgstr "проследяване на указателите от журнала като глави (стандартно)"
-#: builtin/fsck.c:600
+#: builtin/fsck.c:658
msgid "also consider packs and alternate objects"
msgstr "допълнително да се проверяват пакетите и алтернативните обекти"
-#: builtin/fsck.c:601
+#: builtin/fsck.c:659
msgid "check only connectivity"
msgstr "проверка само на връзката"
-#: builtin/fsck.c:602
+#: builtin/fsck.c:660
msgid "enable more strict checking"
msgstr "по-строги проверки"
-#: builtin/fsck.c:604
+#: builtin/fsck.c:662
msgid "write dangling objects in .git/lost-found"
msgstr "запазване на обектите извън клоните в директорията „.git/lost-found“"
-#: builtin/fsck.c:605 builtin/prune.c:107
+#: builtin/fsck.c:663 builtin/prune.c:107
msgid "show progress"
msgstr "показване на напредъка"
-#: builtin/fsck.c:606
+#: builtin/fsck.c:664
msgid "show verbose names for reachable objects"
msgstr "показване на подробни имена на достижимите обекти"
-#: builtin/fsck.c:665
+#: builtin/fsck.c:725
msgid "Checking objects"
msgstr "Проверка на обектите"
@@ -7926,17 +8566,17 @@
msgid "git gc [<options>]"
msgstr "git gc [ОПЦИЯ…]"
-#: builtin/gc.c:72
+#: builtin/gc.c:78
#, c-format
-msgid "Invalid %s: '%s'"
-msgstr "Неправилен %s: „%s“"
+msgid "Failed to fstat %s: %s"
+msgstr "Неуспешно изпълнение на „fstat“ върху „%s“: %s"
-#: builtin/gc.c:139
+#: builtin/gc.c:310
#, c-format
-msgid "insanely long object directory %.*s"
-msgstr "прекалено дълга директория с обекти „%.*s“"
+msgid "Can't stat %s"
+msgstr "Неуспешно изпълнение на „stat“ върху „%s“"
-#: builtin/gc.c:290
+#: builtin/gc.c:319
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@ -7953,44 +8593,49 @@
"\n"
"%s"
-#: builtin/gc.c:327
+#: builtin/gc.c:358
msgid "prune unreferenced objects"
msgstr "окастряне на обектите, към които нищо не сочи"
-#: builtin/gc.c:329
+#: builtin/gc.c:360
msgid "be more thorough (increased runtime)"
msgstr "изчерпателно търсене на боклука (за сметка на повече време работа)"
-#: builtin/gc.c:330
+#: builtin/gc.c:361
msgid "enable auto-gc mode"
msgstr "включване на автоматичното събиране на боклука (auto-gc)"
-#: builtin/gc.c:331
+#: builtin/gc.c:362
msgid "force running gc even if there may be another gc running"
msgstr ""
"изрично стартиране на събирането на боклука, дори и ако вече работи друго "
"събиране"
-#: builtin/gc.c:373
+#: builtin/gc.c:379
+#, c-format
+msgid "Failed to parse gc.logexpiry value %s"
+msgstr "Неразпозната стойност на „gc.logexpiry“: %s"
+
+#: builtin/gc.c:407
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
"Автоматично пакетиране на заден фон на хранилището за по-добра "
"производителност.\n"
-#: builtin/gc.c:375
+#: builtin/gc.c:409
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "Автоматично пакетиране на хранилището за по-добра производителност.\n"
-#: builtin/gc.c:376
+#: builtin/gc.c:410
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr ""
"Погледнете ръководството за повече информация как да изпълните „git help "
"gc“.\n"
-#: builtin/gc.c:397
+#: builtin/gc.c:431
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -7999,255 +8644,275 @@
"процеса: %<PRIuMAX> (ако сте сигурни, че това не е вярно, това използвайте\n"
"опцията „--force“)"
-#: builtin/gc.c:441
+#: builtin/gc.c:475
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
"Има прекалено много недостижими, непакетирани обекти.\n"
"Използвайте „git prune“, за да ги окастрите."
-#: builtin/grep.c:23
+#: builtin/grep.c:25
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [ОПЦИЯ…] [-e] ШАБЛОН [ВЕРСИЯ…] [[--] ПЪТ…]"
-#: builtin/grep.c:219
+#: builtin/grep.c:232
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: неуспешно създаване на нишка: %s"
-#: builtin/grep.c:277
+#: builtin/grep.c:290
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "зададен е неправилен брой нишки (%d) за %s"
-#: builtin/grep.c:453 builtin/grep.c:488
+#: builtin/grep.c:769 builtin/grep.c:810
#, c-format
msgid "unable to read tree (%s)"
msgstr "дървото не може да бъде прочетено (%s)"
-#: builtin/grep.c:503
+#: builtin/grep.c:829
#, c-format
msgid "unable to grep from object of type %s"
msgstr "не може да се изпълни „grep“ от обект от вида %s"
-#: builtin/grep.c:561
+#: builtin/grep.c:893
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "опцията „%c“ очаква число за аргумент"
-#: builtin/grep.c:647
+#: builtin/grep.c:980
msgid "search in index instead of in the work tree"
msgstr "търсене в индекса, а не в работното дърво"
-#: builtin/grep.c:649
+#: builtin/grep.c:982
msgid "find in contents not managed by git"
msgstr "търсене и във файловете, които не са под управлението на git"
-#: builtin/grep.c:651
+#: builtin/grep.c:984
msgid "search in both tracked and untracked files"
msgstr "търсене и в следените, и в неследените файлове"
-#: builtin/grep.c:653
+#: builtin/grep.c:986
msgid "ignore files specified via '.gitignore'"
msgstr "игнориране на файловете указани в „.gitignore“"
-#: builtin/grep.c:656
+#: builtin/grep.c:988
+msgid "recursively search in each submodule"
+msgstr "рекурсивно търсене във всички подмодули"
+
+#: builtin/grep.c:990
+msgid "basename"
+msgstr "ОСНОВНО ИМЕ"
+
+#: builtin/grep.c:991
+msgid "prepend parent project's basename to output"
+msgstr "добавяне на ОСНОВНОто ИМЕ на проекта към изхода"
+
+#: builtin/grep.c:994
msgid "show non-matching lines"
msgstr "извеждане на редовете, които не съвпадат"
-#: builtin/grep.c:658
+#: builtin/grep.c:996
msgid "case insensitive matching"
msgstr "без значение на регистъра на буквите (главни/малки)"
-#: builtin/grep.c:660
+#: builtin/grep.c:998
msgid "match patterns only at word boundaries"
msgstr "напасване на шаблоните само по границите на думите"
-#: builtin/grep.c:662
+#: builtin/grep.c:1000
msgid "process binary files as text"
msgstr "обработване на двоичните файлове като текстови"
-#: builtin/grep.c:664
+#: builtin/grep.c:1002
msgid "don't match patterns in binary files"
msgstr "прескачане на двоичните файлове"
-#: builtin/grep.c:667
+#: builtin/grep.c:1005
msgid "process binary files with textconv filters"
msgstr ""
"обработване на двоичните файлове чрез филтри за преобразуване към текст"
-#: builtin/grep.c:669
+#: builtin/grep.c:1007
msgid "descend at most <depth> levels"
msgstr "навлизане максимално на тази ДЪЛБОЧИНА в дървото"
-#: builtin/grep.c:673
+#: builtin/grep.c:1011
msgid "use extended POSIX regular expressions"
msgstr "разширени регулярни изрази по POSIX"
-#: builtin/grep.c:676
+#: builtin/grep.c:1014
msgid "use basic POSIX regular expressions (default)"
msgstr "основни регулярни изрази по POSIX (стандартно)"
-#: builtin/grep.c:679
+#: builtin/grep.c:1017
msgid "interpret patterns as fixed strings"
msgstr "шаблоните са дословни низове"
-#: builtin/grep.c:682
+#: builtin/grep.c:1020
msgid "use Perl-compatible regular expressions"
msgstr "регулярни изрази на Perl"
-#: builtin/grep.c:685
+#: builtin/grep.c:1023
msgid "show line numbers"
msgstr "извеждане на номерата на редовете"
-#: builtin/grep.c:686
+#: builtin/grep.c:1024
msgid "don't show filenames"
msgstr "без извеждане на имената на файловете"
-#: builtin/grep.c:687
+#: builtin/grep.c:1025
msgid "show filenames"
msgstr "извеждане на имената на файловете"
-#: builtin/grep.c:689
+#: builtin/grep.c:1027
msgid "show filenames relative to top directory"
msgstr ""
"извеждане на относителните имена на файловете спрямо основната директория на "
"хранилището"
-#: builtin/grep.c:691
+#: builtin/grep.c:1029
msgid "show only filenames instead of matching lines"
msgstr "извеждане само на имената на файловете без напасващите редове"
-#: builtin/grep.c:693
+#: builtin/grep.c:1031
msgid "synonym for --files-with-matches"
msgstr "синоним на „--files-with-matches“"
-#: builtin/grep.c:696
+#: builtin/grep.c:1034
msgid "show only the names of files without match"
msgstr ""
"извеждане само на имената на файловете, които не съдържат ред, напасващ на "
"шаблона"
-#: builtin/grep.c:698
+#: builtin/grep.c:1036
msgid "print NUL after filenames"
msgstr "извеждане на нулевия знак „NUL“ след всяко име на файл"
-#: builtin/grep.c:700
+#: builtin/grep.c:1038
msgid "show the number of matches instead of matching lines"
msgstr "извеждане на броя на съвпаденията вместо напасващите редове"
-#: builtin/grep.c:701
+#: builtin/grep.c:1039
msgid "highlight matches"
msgstr "оцветяване на напасванията"
-#: builtin/grep.c:703
+#: builtin/grep.c:1041
msgid "print empty line between matches from different files"
msgstr "извеждане на празен ред между напасванията от различни файлове"
-#: builtin/grep.c:705
+#: builtin/grep.c:1043
msgid "show filename only once above matches from same file"
msgstr ""
"извеждане на името на файла само веднъж за всички напасвания от този файл"
-#: builtin/grep.c:708
+#: builtin/grep.c:1046
msgid "show <n> context lines before and after matches"
msgstr "извеждане на такъв БРОЙ редове преди и след напасванията"
-#: builtin/grep.c:711
+#: builtin/grep.c:1049
msgid "show <n> context lines before matches"
msgstr "извеждане на такъв БРОЙ редове преди напасванията"
-#: builtin/grep.c:713
+#: builtin/grep.c:1051
msgid "show <n> context lines after matches"
msgstr "извеждане на такъв БРОЙ редове след напасванията"
-#: builtin/grep.c:715
+#: builtin/grep.c:1053
msgid "use <n> worker threads"
msgstr "използване на такъв БРОЙ работещи нишки"
-#: builtin/grep.c:716
+#: builtin/grep.c:1054
msgid "shortcut for -C NUM"
msgstr "синоним на „-C БРОЙ“"
-#: builtin/grep.c:719
+#: builtin/grep.c:1057
msgid "show a line with the function name before matches"
msgstr "извеждане на ред с името на функцията, в която е напаснат шаблона"
-#: builtin/grep.c:721
+#: builtin/grep.c:1059
msgid "show the surrounding function"
msgstr "извеждане на обхващащата функция"
-#: builtin/grep.c:724
+#: builtin/grep.c:1062
msgid "read patterns from file"
msgstr "изчитане на шаблоните от ФАЙЛ"
-#: builtin/grep.c:726
+#: builtin/grep.c:1064
msgid "match <pattern>"
msgstr "напасване на ШАБЛОН"
-#: builtin/grep.c:728
+#: builtin/grep.c:1066
msgid "combine patterns specified with -e"
msgstr "комбиниране на шаблоните указани с опцията „-e“"
-#: builtin/grep.c:740
+#: builtin/grep.c:1078
msgid "indicate hit with exit status without output"
msgstr ""
"без извеждане на стандартния изход. Изходният код указва наличието на "
"напасване"
-#: builtin/grep.c:742
+#: builtin/grep.c:1080
msgid "show only matches from files that match all patterns"
msgstr ""
"извеждане на редове само от файловете, които напасват на всички шаблони"
-#: builtin/grep.c:744
+#: builtin/grep.c:1082
msgid "show parse tree for grep expression"
msgstr "извеждане на дървото за анализ на регулярния израз"
-#: builtin/grep.c:748
+#: builtin/grep.c:1086
msgid "pager"
msgstr "програма за преглед по страници"
-#: builtin/grep.c:748
+#: builtin/grep.c:1086
msgid "show matching files in the pager"
msgstr "извеждане на съвпадащите файлове в програма за преглед по страници"
-#: builtin/grep.c:751
+#: builtin/grep.c:1089
msgid "allow calling of grep(1) (ignored by this build)"
msgstr ""
"позволяване на стартирането на grep(1) (текущият компилат пренебрегва тази "
"опция)"
-#: builtin/grep.c:814
+#: builtin/grep.c:1153
msgid "no pattern given."
msgstr "липсва шаблон."
-#: builtin/grep.c:846 builtin/index-pack.c:1480
+#: builtin/grep.c:1189
+msgid "--no-index or --untracked cannot be used with revs"
+msgstr "опциите „--cached“ и „--untracked“ са несъвместими с версии."
+
+#: builtin/grep.c:1195
+#, c-format
+msgid "unable to resolve revision: %s"
+msgstr "версията „%s“ не може бъде открита"
+
+#: builtin/grep.c:1228 builtin/index-pack.c:1485
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "зададен е неправилен брой нишки: %d"
-#: builtin/grep.c:876
+#: builtin/grep.c:1251
msgid "--open-files-in-pager only works on the worktree"
msgstr ""
"опцията „--open-files-in-pager“ е съвместима само с търсене в работното дърво"
-#: builtin/grep.c:902
+#: builtin/grep.c:1274
+msgid "option not supported with --recurse-submodules."
+msgstr "опцията е несъвместима с „--recurse-submodules“."
+
+#: builtin/grep.c:1280
msgid "--cached or --untracked cannot be used with --no-index."
msgstr "опциите „--cached“ и „--untracked“ са несъвместими с „--no-index“."
-#: builtin/grep.c:907
-msgid "--no-index or --untracked cannot be used with revs."
-msgstr ""
-"опциите „--cached“ и „--untracked“ са несъвместими с търсене във версии."
-
-#: builtin/grep.c:910
+#: builtin/grep.c:1286
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr ""
"опциите „--(no-)exclude-standard“ са несъвместими с търсене по следени "
"файлове."
-#: builtin/grep.c:918
+#: builtin/grep.c:1294
msgid "both --cached and trees are given."
msgstr "опцията „--cached“ е несъвместима със задаване на дърво."
@@ -8424,7 +9089,6 @@
msgid "usage: %s%s"
msgstr "употреба: %s%s"
-# FIXME merge with next?
#: builtin/index-pack.c:154
#, c-format
msgid "unable to open %s"
@@ -8477,193 +9141,197 @@
msgid "unable to create '%s'"
msgstr "пакетният файл „%s“ не може да бъде създаден"
-#: builtin/index-pack.c:322
+#: builtin/index-pack.c:323
#, c-format
msgid "cannot open packfile '%s'"
msgstr "пакетният файл „%s“ не може да бъде отворен"
-#: builtin/index-pack.c:336
+#: builtin/index-pack.c:337
msgid "pack signature mismatch"
msgstr "несъответствие в подписа към пакетния файл"
-#: builtin/index-pack.c:338
+#: builtin/index-pack.c:339
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "не се поддържа пакетиране вeрсия „%<PRIu32>“"
-#: builtin/index-pack.c:356
+#: builtin/index-pack.c:357
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "повреден обект в пакетния файл при отместване %<PRIuMAX>: %s"
-#: builtin/index-pack.c:478
+#: builtin/index-pack.c:479
#, c-format
msgid "inflate returned %d"
msgstr "декомпресирането с „inflate“ върна %d"
-#: builtin/index-pack.c:527
+#: builtin/index-pack.c:528
msgid "offset value overflow for delta base object"
msgstr "стойността на отместването за обекта-разлика води до препълване"
-#: builtin/index-pack.c:535
+#: builtin/index-pack.c:536
msgid "delta base offset is out of bound"
msgstr "стойността на отместването за обекта-разлика е извън диапазона"
-#: builtin/index-pack.c:543
+#: builtin/index-pack.c:544
#, c-format
msgid "unknown object type %d"
msgstr "непознат вид обект %d"
-#: builtin/index-pack.c:574
+#: builtin/index-pack.c:575
msgid "cannot pread pack file"
msgstr "пакетният файл не може да бъде прочетен"
-#: builtin/index-pack.c:576
+#: builtin/index-pack.c:577
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "неочакван край на файл, липсва %<PRIuMAX> байт"
msgstr[1] "неочакван край на файл, липсват %<PRIuMAX> байта"
-#: builtin/index-pack.c:602
+#: builtin/index-pack.c:603
msgid "serious inflate inconsistency"
msgstr "сериозна грешка при декомпресиране с „inflate“"
-#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
-#: builtin/index-pack.c:811 builtin/index-pack.c:820
+#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
+#: builtin/index-pack.c:816 builtin/index-pack.c:825
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr ""
"СЪВПАДЕНИЕ НА СТОЙНОСТИТЕ ЗА СУМИТЕ ЗА SHA1: „%s“ НА ДВА РАЗЛИЧНИ ОБЕКТА!"
-# FIXME merge with next?
-#: builtin/index-pack.c:751 builtin/pack-objects.c:166
-#: builtin/pack-objects.c:258
+#: builtin/index-pack.c:752 builtin/pack-objects.c:164
+#: builtin/pack-objects.c:257
#, c-format
msgid "unable to read %s"
msgstr "обектът „%s“ не може да бъде прочетен"
-#: builtin/index-pack.c:817
+#: builtin/index-pack.c:814
+#, c-format
+msgid "cannot read existing object info %s"
+msgstr "съществуващият обект в „%s“ не може да бъде прочетен"
+
+#: builtin/index-pack.c:822
#, c-format
msgid "cannot read existing object %s"
msgstr "съществуващият обект „%s“ не може да бъде прочетен"
-#: builtin/index-pack.c:831
+#: builtin/index-pack.c:836
#, c-format
msgid "invalid blob object %s"
msgstr "неправилен обект BLOB „%s“"
# FIXME perhaps invalid object
-#: builtin/index-pack.c:845
+#: builtin/index-pack.c:850
#, c-format
msgid "invalid %s"
msgstr "неправилен обект „%s“"
-#: builtin/index-pack.c:848
+#: builtin/index-pack.c:853
msgid "Error in object"
msgstr "Грешка в обекта"
-#: builtin/index-pack.c:850
+#: builtin/index-pack.c:855
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Някои обекти, наследници на „%s“, не могат да бъдат достигнати"
-#: builtin/index-pack.c:922 builtin/index-pack.c:953
+#: builtin/index-pack.c:927 builtin/index-pack.c:958
msgid "failed to apply delta"
msgstr "разликата не може да бъде приложена"
-#: builtin/index-pack.c:1123
+#: builtin/index-pack.c:1128
msgid "Receiving objects"
msgstr "Получаване на обекти"
-#: builtin/index-pack.c:1123
+#: builtin/index-pack.c:1128
msgid "Indexing objects"
msgstr "Индексиране на обекти"
-#: builtin/index-pack.c:1155
+#: builtin/index-pack.c:1160
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "пакетният файл е повреден (нееднакви суми по SHA1)"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1165
msgid "cannot fstat packfile"
msgstr "не може да се получи информация за пакетния файл с „fstat“"
-#: builtin/index-pack.c:1163
+#: builtin/index-pack.c:1168
msgid "pack has junk at the end"
msgstr "в края на пакетния файл има повредени данни"
-#: builtin/index-pack.c:1174
+#: builtin/index-pack.c:1179
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr ""
"фатална грешка във функцията „parse_pack_objects“. Това е грешка в Git, "
"докладвайте я на разработчиците, като пратите е-писмо на адрес: „git@vger."
"kernel.org“."
-#: builtin/index-pack.c:1197
+#: builtin/index-pack.c:1202
msgid "Resolving deltas"
msgstr "Откриване на съответните разлики"
-#: builtin/index-pack.c:1208
+#: builtin/index-pack.c:1213
#, c-format
msgid "unable to create thread: %s"
msgstr "не може да се създаде нишка: %s"
-#: builtin/index-pack.c:1250
+#: builtin/index-pack.c:1255
msgid "confusion beyond insanity"
msgstr ""
"фатална грешка във функцията „conclude_pack“. Това е грешка в Git, "
"докладвайте я на разработчиците, като пратите е-писмо на адрес: „git@vger."
"kernel.org“."
-#: builtin/index-pack.c:1256
+#: builtin/index-pack.c:1261
#, 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:1268
+#: builtin/index-pack.c:1273
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr ""
"Неочаквана последваща сума за грешки за „%s“ (причината може да е грешка в "
"диска)"
-#: builtin/index-pack.c:1272
+#: builtin/index-pack.c:1277
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "в пакета има %d ненапасваща разлика"
msgstr[1] "в пакета има %d ненапасващи разлики"
-#: builtin/index-pack.c:1296
+#: builtin/index-pack.c:1301
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "добавеният обект не може да се компресира с „deflate“: %d"
-#: builtin/index-pack.c:1372
+#: builtin/index-pack.c:1377
#, c-format
msgid "local object %s is corrupt"
msgstr "локалният обект „%s“ е повреден"
-#: builtin/index-pack.c:1396
+#: builtin/index-pack.c:1403
msgid "error while closing pack file"
msgstr "грешка при затварянето на пакетния файл"
-#: builtin/index-pack.c:1409
+#: builtin/index-pack.c:1415
#, c-format
msgid "cannot write keep file '%s'"
msgstr ""
"грешка при записването на файла „%s“, осигуряващ запазване на директория"
-#: builtin/index-pack.c:1417
+#: builtin/index-pack.c:1423
#, c-format
msgid "cannot close written keep file '%s'"
msgstr ""
"грешка при затварянето на записания файл „%s“, осигуряващ запазване на "
"директория"
-#: builtin/index-pack.c:1430
+#: builtin/index-pack.c:1433
msgid "cannot store pack file"
msgstr "пакетният файл не може да бъде запазен"
@@ -8671,56 +9339,60 @@
msgid "cannot store index file"
msgstr "файлът за индекса не може да бъде съхранен"
-#: builtin/index-pack.c:1474
+#: builtin/index-pack.c:1479
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "зададена е неправилна версия пакетиране: „pack.indexversion=%<PRIu32>“"
-#: builtin/index-pack.c:1484 builtin/index-pack.c:1681
+#: builtin/index-pack.c:1489 builtin/index-pack.c:1686
#, c-format
msgid "no threads support, ignoring %s"
msgstr "липсва поддръжка за нишки. „%s“ ще се пренебрегне"
-#: builtin/index-pack.c:1542
+#: builtin/index-pack.c:1547
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Съществуващият пакетен файл „%s“ не може да бъде отворен"
-#: builtin/index-pack.c:1544
+#: builtin/index-pack.c:1549
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Съществуващият индекс за пакетния файл „%s“ не може да бъде отворен"
-#: builtin/index-pack.c:1591
+#: builtin/index-pack.c:1596
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "%d обект не е разлика"
msgstr[1] "%d обекта не са разлика"
-#: builtin/index-pack.c:1598
+#: builtin/index-pack.c:1603
#, 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:1611
+#: builtin/index-pack.c:1616
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "името на пакетния файл „%s“ не завършва на „.pack“"
-#: builtin/index-pack.c:1693 builtin/index-pack.c:1696
-#: builtin/index-pack.c:1712 builtin/index-pack.c:1716
+#: builtin/index-pack.c:1698 builtin/index-pack.c:1701
+#: builtin/index-pack.c:1717 builtin/index-pack.c:1721
#, c-format
msgid "bad %s"
msgstr "неправилна стойност „%s“"
-#: builtin/index-pack.c:1732
+#: builtin/index-pack.c:1737
msgid "--fix-thin cannot be used without --stdin"
msgstr "опцията „--fix-thin“ изисква „--stdin“"
-#: builtin/index-pack.c:1740
+#: builtin/index-pack.c:1739
+msgid "--stdin requires a git repository"
+msgstr "„--stdin“ изисква хранилище на git"
+
+#: builtin/index-pack.c:1747
msgid "--verify with no packfile name given"
msgstr "опцията „--verify“ изисква име на пакетен файл"
@@ -8883,108 +9555,108 @@
msgid "git show [<options>] <object>..."
msgstr "git show [ОПЦИЯ…] ОБЕКТ…"
-#: builtin/log.c:84
+#: builtin/log.c:89
#, c-format
msgid "invalid --decorate option: %s"
msgstr "неправилна опция „--decorate“: %s"
-#: builtin/log.c:139
+#: builtin/log.c:144
msgid "suppress diff output"
msgstr "без извеждане на разликите"
-#: builtin/log.c:140
+#: builtin/log.c:145
msgid "show source"
msgstr "извеждане на изходния код"
-#: builtin/log.c:141
+#: builtin/log.c:146
msgid "Use mail map file"
msgstr ""
"Използване на файл за съответствията на имената и адресите на е-поща („."
"mailmap“)"
-#: builtin/log.c:142
+#: builtin/log.c:147
msgid "decorate options"
msgstr "настройки на форма̀та на извежданата информация"
-#: builtin/log.c:145
+#: builtin/log.c:150
msgid "Process line range n,m in file, counting from 1"
msgstr ""
"Обработване само на редовете във файла в диапазона от n до m включително. "
"Броенето започва от 1"
-#: builtin/log.c:241
+#: builtin/log.c:246
#, c-format
msgid "Final output: %d %s\n"
msgstr "Резултат: %d %s\n"
-#: builtin/log.c:486
+#: builtin/log.c:493
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: повреден файл"
-#: builtin/log.c:500 builtin/log.c:594
+#: builtin/log.c:507 builtin/log.c:601
#, c-format
msgid "Could not read object %s"
msgstr "Обектът не може да бъде прочетен: %s"
-#: builtin/log.c:618
+#: builtin/log.c:625
#, c-format
msgid "Unknown type: %d"
msgstr "Неизвестен вид: %d"
-#: builtin/log.c:739
+#: builtin/log.c:746
msgid "format.headers without value"
msgstr "не е зададена стойност на „format.headers“"
-#: builtin/log.c:839
+#: builtin/log.c:846
msgid "name of output directory is too long"
msgstr "прекалено дълго име на директорията за изходната информация"
-#: builtin/log.c:854
+#: builtin/log.c:861
#, c-format
msgid "Cannot open patch file %s"
msgstr "Файлът-кръпка „%s“ не може да бъде отворен"
-#: builtin/log.c:868
+#: builtin/log.c:875
msgid "Need exactly one range."
msgstr "Трябва да зададете точно един диапазон."
-#: builtin/log.c:878
+#: builtin/log.c:885
msgid "Not a range."
msgstr "Не е диапазон."
-#: builtin/log.c:984
+#: builtin/log.c:991
msgid "Cover letter needs email format"
msgstr "Придружаващото писмо трябва да е форматирано като е-писмо"
-#: builtin/log.c:1063
+#: builtin/log.c:1071
#, c-format
msgid "insane in-reply-to: %s"
msgstr "неправилен формат на заглавната част за отговор „in-reply-to“: %s"
-#: builtin/log.c:1091
+#: builtin/log.c:1098
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [ОПЦИЯ…] [ОТ | ДИАПАЗОН_НА_ВЕРСИИТЕ]"
-#: builtin/log.c:1141
+#: builtin/log.c:1148
msgid "Two output directories?"
msgstr "Можете да укажете максимум една директория за изход."
-#: builtin/log.c:1248 builtin/log.c:1891 builtin/log.c:1893 builtin/log.c:1905
+#: builtin/log.c:1255 builtin/log.c:1898 builtin/log.c:1900 builtin/log.c:1912
#, c-format
msgid "Unknown commit %s"
msgstr "Непознато подаване „%s“"
-#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:455
+#: builtin/log.c:1265 builtin/notes.c:883 builtin/tag.c:532
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Не може да се открие към какво сочи „%s“."
-#: builtin/log.c:1263
+#: builtin/log.c:1270
msgid "Could not find exact merge base."
msgstr "Точната база за сливане не може да се открие."
-#: builtin/log.c:1267
+#: builtin/log.c:1274
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"
@@ -8994,221 +9666,221 @@
"зададете, използвайте „git branch --set-upstream-to“.\n"
"Можете ръчно да зададете базово подаване чрез „--base=<base-commit-id>“."
-#: builtin/log.c:1287
+#: builtin/log.c:1294
msgid "Failed to find exact merge base"
msgstr "Точната база при сливане не може да бъде открита"
-#: builtin/log.c:1298
+#: builtin/log.c:1305
msgid "base commit should be the ancestor of revision list"
msgstr "базовото подаване трябва да е предшественикът на списъка с версиите"
-#: builtin/log.c:1302
+#: builtin/log.c:1309
msgid "base commit shouldn't be in revision list"
msgstr "базовото подаване не може да е в списъка с версиите"
-#: builtin/log.c:1351
+#: builtin/log.c:1358
msgid "cannot get patch id"
msgstr "идентификаторът на кръпката не може да бъде получен"
-#: builtin/log.c:1408
+#: builtin/log.c:1415
msgid "use [PATCH n/m] even with a single patch"
msgstr "номерация „[PATCH n/m]“ дори и при единствена кръпка"
-#: builtin/log.c:1411
+#: builtin/log.c:1418
msgid "use [PATCH] even with multiple patches"
msgstr "номерация „[PATCH]“ дори и при множество кръпки"
-#: builtin/log.c:1415
+#: builtin/log.c:1422
msgid "print patches to standard out"
msgstr "извеждане на кръпките на стандартния изход"
-#: builtin/log.c:1417
+#: builtin/log.c:1424
msgid "generate a cover letter"
msgstr "създаване на придружаващо писмо"
-#: builtin/log.c:1419
+#: builtin/log.c:1426
msgid "use simple number sequence for output file names"
msgstr "проста числова последователност за имената на файловете-кръпки"
-#: builtin/log.c:1420
+#: builtin/log.c:1427
msgid "sfx"
msgstr "ЗНАЦИ"
-#: builtin/log.c:1421
+#: builtin/log.c:1428
msgid "use <sfx> instead of '.patch'"
msgstr "използване на тези ЗНАЦИ за суфикс вместо „.patch“"
-#: builtin/log.c:1423
+#: builtin/log.c:1430
msgid "start numbering patches at <n> instead of 1"
msgstr "номерирането на кръпките да започва от този БРОЙ, а не с 1"
-#: builtin/log.c:1425
+#: builtin/log.c:1432
msgid "mark the series as Nth re-roll"
msgstr "отбелязване, че това е N-тата поредна редакция на поредицата от кръпки"
-#: builtin/log.c:1427
+#: builtin/log.c:1434
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "Използване на „[RFC PATCH]“ вместо „[PATCH]“"
-#: builtin/log.c:1430
+#: builtin/log.c:1437
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Използване на този „[ПРЕФИКС]“ вместо „[PATCH]“"
-#: builtin/log.c:1433
+#: builtin/log.c:1440
msgid "store resulting files in <dir>"
msgstr "запазване на изходните файлове в тази ДИРЕКТОРИЯ"
-#: builtin/log.c:1436
+#: builtin/log.c:1443
msgid "don't strip/add [PATCH]"
msgstr "без добавяне/махане на префикса „[PATCH]“"
-#: builtin/log.c:1439
+#: builtin/log.c:1446
msgid "don't output binary diffs"
msgstr "без извеждане на разлики между двоични файлове"
-#: builtin/log.c:1441
+#: builtin/log.c:1448
msgid "output all-zero hash in From header"
msgstr "в заглавната част „From:“ (от) хешът да е само от нули"
-#: builtin/log.c:1443
+#: builtin/log.c:1450
msgid "don't include a patch matching a commit upstream"
msgstr "да не се включват кръпки, които присъстват в следения клон"
-#: builtin/log.c:1445
+#: builtin/log.c:1452
msgid "show patch format instead of default (patch + stat)"
msgstr ""
"извеждане във формат за кръпки, а на в стандартния (кръпка и статистика)"
-#: builtin/log.c:1447
+#: builtin/log.c:1454
msgid "Messaging"
msgstr "Опции при изпращане"
-#: builtin/log.c:1448
+#: builtin/log.c:1455
msgid "header"
msgstr "ЗАГЛАВНА_ЧАСТ"
-#: builtin/log.c:1449
+#: builtin/log.c:1456
msgid "add email header"
msgstr "добавяне на тази ЗАГЛАВНА_ЧАСТ"
-#: builtin/log.c:1450 builtin/log.c:1452
+#: builtin/log.c:1457 builtin/log.c:1459
msgid "email"
msgstr "Е-ПОЩА"
-#: builtin/log.c:1450
+#: builtin/log.c:1457
msgid "add To: header"
msgstr "добавяне на заглавна част „To:“ (до)"
-#: builtin/log.c:1452
+#: builtin/log.c:1459
msgid "add Cc: header"
msgstr "добавяне на заглавна част „Cc:“ (и до)"
-#: builtin/log.c:1454
+#: builtin/log.c:1461
msgid "ident"
msgstr "ИДЕНТИЧНОСТ"
-#: builtin/log.c:1455
+#: builtin/log.c:1462
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"задаване на адреса в заглавната част „From“ (от) да е тази ИДЕНТИЧНОСТ. Ако "
"не е зададена такава, се взима адреса на подаващия"
-#: builtin/log.c:1457
+#: builtin/log.c:1464
msgid "message-id"
msgstr "ИДЕНТИФИКАТОР_НА_СЪОБЩЕНИЕ"
-#: builtin/log.c:1458
+#: builtin/log.c:1465
msgid "make first mail a reply to <message-id>"
msgstr ""
"първото съобщение да е в отговор на е-писмото с този "
"ИДЕНТИФИКАТОР_НА_СЪОБЩЕНИЕ"
-#: builtin/log.c:1459 builtin/log.c:1462
+#: builtin/log.c:1466 builtin/log.c:1469
msgid "boundary"
msgstr "граница"
-#: builtin/log.c:1460
+#: builtin/log.c:1467
msgid "attach the patch"
msgstr "прикрепяне на кръпката"
-#: builtin/log.c:1463
+#: builtin/log.c:1470
msgid "inline the patch"
msgstr "включване на кръпката в текста на писмата"
-#: builtin/log.c:1467
+#: builtin/log.c:1474
msgid "enable message threading, styles: shallow, deep"
msgstr ""
"използване на нишки за съобщенията. СТИЛът е „shallow“ (плитък) или "
"„deep“ (дълбок)"
-#: builtin/log.c:1469
+#: builtin/log.c:1476
msgid "signature"
msgstr "подпис"
-#: builtin/log.c:1470
+#: builtin/log.c:1477
msgid "add a signature"
msgstr "добавяне на поле за подпис"
-#: builtin/log.c:1471
+#: builtin/log.c:1478
msgid "base-commit"
msgstr "БАЗОВО_ПОДАВАНЕ"
-#: builtin/log.c:1472
+#: builtin/log.c:1479
msgid "add prerequisite tree info to the patch series"
msgstr "добавяне на необходимото БАЗово дърво към серията кръпки"
-#: builtin/log.c:1474
+#: builtin/log.c:1481
msgid "add a signature from a file"
msgstr "добавяне на подпис от файл"
-#: builtin/log.c:1475
+#: builtin/log.c:1482
msgid "don't print the patch filenames"
msgstr "без извеждане на имената на кръпките"
-#: builtin/log.c:1565
+#: builtin/log.c:1572
msgid "-n and -k are mutually exclusive."
msgstr "опциите „-n“ и „-k“ са несъвместими."
-#: builtin/log.c:1567
+#: builtin/log.c:1574
msgid "--subject-prefix/--rfc and -k are mutually exclusive."
msgstr "опциите „--subject-prefix“/„-rfc“ и „-k“ са несъвместими."
-#: builtin/log.c:1575
+#: builtin/log.c:1582
msgid "--name-only does not make sense"
msgstr "опцията „--name-only“ е несъвместима с генерирането на кръпки"
-#: builtin/log.c:1577
+#: builtin/log.c:1584
msgid "--name-status does not make sense"
msgstr "опцията „--name-status“ е несъвместима с генерирането на кръпки"
-#: builtin/log.c:1579
+#: builtin/log.c:1586
msgid "--check does not make sense"
msgstr "опцията „--check“ е несъвместима с генерирането на кръпки"
-#: builtin/log.c:1609
+#: builtin/log.c:1616
msgid "standard output, or directory, which one?"
msgstr ""
"изходът може да или стандартният, или да е в директория, но не и двете."
-#: builtin/log.c:1611
+#: builtin/log.c:1618
#, c-format
msgid "Could not create directory '%s'"
msgstr "Директорията „%s“ не може да бъде създадена"
-#: builtin/log.c:1705
+#: builtin/log.c:1712
#, c-format
msgid "unable to read signature file '%s'"
msgstr "файлът „%s“ с подпис не може да бъде прочетен"
-#: builtin/log.c:1777
+#: builtin/log.c:1784
msgid "Failed to create output files"
msgstr "Изходните файлове не могат да бъдат създадени"
-#: builtin/log.c:1826
+#: builtin/log.c:1833
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [ОТДАЛЕЧЕН_КЛОН [ВРЪХ [ПРЕДЕЛ]]]"
-#: builtin/log.c:1880
+#: builtin/log.c:1887
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -9216,106 +9888,105 @@
"Следеният отдалечен клон не бе открит, затова изрично задайте "
"ОТДАЛЕЧЕН_КЛОН.\n"
-#: builtin/ls-files.c:458
+#: builtin/ls-files.c:468
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [ОПЦИЯ…] [ФАЙЛ…]"
-#: builtin/ls-files.c:507
+#: builtin/ls-files.c:517
msgid "identify the file status with tags"
msgstr "извеждане на състоянието на файловете с еднобуквени флагове"
-#: builtin/ls-files.c:509
+#: builtin/ls-files.c:519
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "малки букви за файловете, които да се счетат за непроменени"
-#: builtin/ls-files.c:511
+#: builtin/ls-files.c:521
msgid "show cached files in the output (default)"
msgstr "извеждане на кешираните файлове (стандартно)"
-#: builtin/ls-files.c:513
+#: builtin/ls-files.c:523
msgid "show deleted files in the output"
msgstr "извеждане на изтритите файлове"
-#: builtin/ls-files.c:515
+#: builtin/ls-files.c:525
msgid "show modified files in the output"
msgstr "извеждане на променените файлове"
-#: builtin/ls-files.c:517
+#: builtin/ls-files.c:527
msgid "show other files in the output"
msgstr "извеждане на другите файлове"
-#: builtin/ls-files.c:519
+#: builtin/ls-files.c:529
msgid "show ignored files in the output"
msgstr "извеждане на игнорираните файлове"
-#: builtin/ls-files.c:522
+#: builtin/ls-files.c:532
msgid "show staged contents' object name in the output"
msgstr "извеждане на името на обекта за съдържанието на индекса"
-#: builtin/ls-files.c:524
+#: builtin/ls-files.c:534
msgid "show files on the filesystem that need to be removed"
msgstr "извеждане на файловете, които трябва да бъдат изтрити"
-#: builtin/ls-files.c:526
+#: builtin/ls-files.c:536
msgid "show 'other' directories' names only"
msgstr "извеждане само на името на другите (неследените) директории"
-#: builtin/ls-files.c:528
+#: builtin/ls-files.c:538
msgid "show line endings of files"
msgstr "извеждане на знаците за край на ред във файловете"
-#: builtin/ls-files.c:530
+#: builtin/ls-files.c:540
msgid "don't show empty directories"
msgstr "без извеждане на празните директории"
-#: builtin/ls-files.c:533
+#: builtin/ls-files.c:543
msgid "show unmerged files in the output"
msgstr "извеждане на неслетите файлове"
-# FIXME not clear about what this option does
-#: builtin/ls-files.c:535
+#: builtin/ls-files.c:545
msgid "show resolve-undo information"
msgstr "извеждане на информацията за отмяна на разрешените подавания"
-#: builtin/ls-files.c:537
+#: builtin/ls-files.c:547
msgid "skip files matching pattern"
msgstr "прескачане на файловете напасващи ШАБЛОНа"
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:550
msgid "exclude patterns are read from <file>"
msgstr "шаблоните за игнориране да се прочетат от този ФАЙЛ"
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:553
msgid "read additional per-directory exclude patterns in <file>"
msgstr ""
"изчитане на допълнителните шаблони за игнориране по директория от този ФАЙЛ"
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:555
msgid "add the standard git exclusions"
msgstr "добавяне на стандартно игнорираните от Git файлове"
-#: builtin/ls-files.c:548
+#: builtin/ls-files.c:558
msgid "make the output relative to the project top directory"
msgstr "пътищата да са относителни спрямо основната директория на проекта"
-#: builtin/ls-files.c:551
+#: builtin/ls-files.c:561
msgid "recurse through submodules"
msgstr "рекурсивно обхождане подмодулите"
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:563
msgid "if any <file> is not in the index, treat this as an error"
msgstr "грешка, ако някой от тези ФАЙЛове не е в индекса"
-#: builtin/ls-files.c:554
+#: builtin/ls-files.c:564
msgid "tree-ish"
msgstr "УКАЗАТЕЛ_КЪМ_ДЪРВО"
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:565
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
"считане, че пътищата изтрити след УКАЗАТЕЛя_КЪМ_ДЪРВО все още съществуват"
-#: builtin/ls-files.c:557
+#: builtin/ls-files.c:567
msgid "show debugging data"
msgstr "извеждане на информацията за изчистване на грешки"
@@ -9329,39 +10000,39 @@
" [-q | --quiet] [--exit-code] [--get-url]\n"
" [--symref] [ХРАНИЛИЩЕ [УКАЗАТЕЛ…]]"
-#: builtin/ls-remote.c:50
+#: builtin/ls-remote.c:52
msgid "do not print remote URL"
msgstr "без извеждане на адресите на отдалечените хранилища"
-#: builtin/ls-remote.c:51 builtin/ls-remote.c:53
+#: builtin/ls-remote.c:53 builtin/ls-remote.c:55
msgid "exec"
msgstr "КОМАНДА"
-#: builtin/ls-remote.c:52 builtin/ls-remote.c:54
+#: builtin/ls-remote.c:54 builtin/ls-remote.c:56
msgid "path of git-upload-pack on the remote host"
msgstr "път към командата „git-upload-pack“ на отдалечената машина"
-#: builtin/ls-remote.c:56
+#: builtin/ls-remote.c:58
msgid "limit to tags"
msgstr "само етикетите"
-#: builtin/ls-remote.c:57
+#: builtin/ls-remote.c:59
msgid "limit to heads"
msgstr "само върховете"
-#: builtin/ls-remote.c:58
+#: builtin/ls-remote.c:60
msgid "do not show peeled tags"
msgstr "без извеждане на проследените етикети"
-#: builtin/ls-remote.c:60
+#: builtin/ls-remote.c:62
msgid "take url.<base>.insteadOf into account"
msgstr "взимане предвид на „url.БАЗА.insteadOf“"
-#: builtin/ls-remote.c:62
+#: builtin/ls-remote.c:64
msgid "exit with exit code 2 if no matching refs are found"
msgstr "изход с код 2, ако не се открият съвпадащи указатели"
-#: builtin/ls-remote.c:64
+#: builtin/ls-remote.c:66
msgid "show underlying ref in addition to the object pointed by it"
msgstr "извеждане на указателя заедно с обекта сочен от него"
@@ -9369,35 +10040,35 @@
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
msgstr "git ls-tree [ОПЦИЯ…] УКАЗАТЕЛ_КЪМ_ДЪРВО [ПЪТ…]"
-#: builtin/ls-tree.c:128
+#: builtin/ls-tree.c:126
msgid "only show trees"
msgstr "извеждане само на дървета"
-#: builtin/ls-tree.c:130
+#: builtin/ls-tree.c:128
msgid "recurse into subtrees"
msgstr "рекурсивно обхождане поддърветата"
-#: builtin/ls-tree.c:132
+#: builtin/ls-tree.c:130
msgid "show trees when recursing"
msgstr "извеждане на дърветата при рекурсивното обхождане"
-#: builtin/ls-tree.c:135
+#: builtin/ls-tree.c:133
msgid "terminate entries with NUL byte"
msgstr "разделяне на обектите с нулевия знак „NUL“"
-#: builtin/ls-tree.c:136
+#: builtin/ls-tree.c:134
msgid "include object size"
msgstr "извеждане на размера на обекта"
-#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
+#: builtin/ls-tree.c:136 builtin/ls-tree.c:138
msgid "list only filenames"
msgstr "извеждане само имената на файловете"
-#: builtin/ls-tree.c:143
+#: builtin/ls-tree.c:141
msgid "use full path names"
msgstr "използване на пълните имена на пътищата"
-#: builtin/ls-tree.c:145
+#: builtin/ls-tree.c:143
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr ""
"извеждане на цялото дърво, не само на текущата директория (включва опцията "
@@ -9408,172 +10079,176 @@
msgstr "git merge [ОПЦИЯ…] [ПОДАВАНЕ…]"
#: builtin/merge.c:47
-msgid "git merge [<options>] <msg> HEAD <commit>"
-msgstr "git merge [ОПЦИЯ…] СЪОБЩЕНИЕ HEAD ПОДАВАНЕ"
-
-#: builtin/merge.c:48
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:102
+#: builtin/merge.c:48
+msgid "git merge --continue"
+msgstr "git merge --continue"
+
+#: builtin/merge.c:103
msgid "switch `m' requires a value"
msgstr "опцията „-m“ изисква стойност"
-#: builtin/merge.c:139
+#: builtin/merge.c:140
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Няма такава стратегия за сливане: „%s“.\n"
-#: builtin/merge.c:140
+#: builtin/merge.c:141
#, c-format
msgid "Available strategies are:"
msgstr "Наличните стратегии са:"
-#: builtin/merge.c:145
+#: builtin/merge.c:146
#, c-format
msgid "Available custom strategies are:"
msgstr "Допълнителните стратегии са:"
-#: builtin/merge.c:195 builtin/pull.c:127
+#: builtin/merge.c:196 builtin/pull.c:127
msgid "do not show a diffstat at the end of the merge"
msgstr "без извеждане на статистиката след завършване на сливане"
-#: builtin/merge.c:198 builtin/pull.c:130
+#: builtin/merge.c:199 builtin/pull.c:130
msgid "show a diffstat at the end of the merge"
msgstr "извеждане на статистиката след завършване на сливане"
-#: builtin/merge.c:199 builtin/pull.c:133
+#: builtin/merge.c:200 builtin/pull.c:133
msgid "(synonym to --stat)"
msgstr "(синоним на „--stat“)"
-#: builtin/merge.c:201 builtin/pull.c:136
+#: builtin/merge.c:202 builtin/pull.c:136
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"добавяне (на максимум такъв БРОЙ) записи от съкратения журнал в съобщението "
"за подаване"
-#: builtin/merge.c:204 builtin/pull.c:139
+#: builtin/merge.c:205 builtin/pull.c:139
msgid "create a single commit instead of doing a merge"
msgstr "създаване на едно подаване вместо извършване на сливане"
-#: builtin/merge.c:206 builtin/pull.c:142
+#: builtin/merge.c:207 builtin/pull.c:142
msgid "perform a commit if the merge succeeds (default)"
msgstr "извършване на подаване при успешно сливане (стандартно действие)"
-#: builtin/merge.c:208 builtin/pull.c:145
+#: builtin/merge.c:209 builtin/pull.c:145
msgid "edit message before committing"
msgstr "редактиране на съобщението преди подаване"
-#: builtin/merge.c:209
+#: builtin/merge.c:210
msgid "allow fast-forward (default)"
-msgstr "позволяване на тривиално сливане (стандартно действие)"
+msgstr "позволяване на превъртане (стандартно действие)"
-#: builtin/merge.c:211 builtin/pull.c:151
+#: builtin/merge.c:212 builtin/pull.c:151
msgid "abort if fast-forward is not possible"
-msgstr "преустановяване, ако сливането не е тривиално"
+msgstr "преустановяване, ако превъртането е невъзможно"
-#: builtin/merge.c:215 builtin/pull.c:154
+#: builtin/merge.c:216 builtin/pull.c:154
msgid "verify that the named commit has a valid GPG signature"
msgstr "Проверка, че указаното подаване е с правилен подпис на GPG"
-#: builtin/merge.c:216 builtin/notes.c:774 builtin/pull.c:158
-#: builtin/revert.c:89
+#: builtin/merge.c:217 builtin/notes.c:773 builtin/pull.c:158
+#: builtin/revert.c:108
msgid "strategy"
msgstr "СТРАТЕГИЯ"
-#: builtin/merge.c:217 builtin/pull.c:159
+#: builtin/merge.c:218 builtin/pull.c:159
msgid "merge strategy to use"
msgstr "СТРАТЕГИЯ за сливане, която да се ползва"
-#: builtin/merge.c:218 builtin/pull.c:162
+#: builtin/merge.c:219 builtin/pull.c:162
msgid "option=value"
msgstr "ОПЦИЯ=СТОЙНОСТ"
-#: builtin/merge.c:219 builtin/pull.c:163
+#: builtin/merge.c:220 builtin/pull.c:163
msgid "option for selected merge strategy"
msgstr "ОПЦИЯ за избраната стратегия за сливане"
-#: builtin/merge.c:221
+#: builtin/merge.c:222
msgid "merge commit message (for a non-fast-forward merge)"
-msgstr "СЪОБЩЕНИЕ при подаването със сливане (при нетривиални сливания)"
+msgstr "СЪОБЩЕНИЕ при подаването със сливане (при същински сливания)"
-#: builtin/merge.c:225
+#: builtin/merge.c:226
msgid "abort the current in-progress merge"
msgstr "преустановяване на текущото сливане"
-#: builtin/merge.c:227 builtin/pull.c:170
+#: builtin/merge.c:228
+msgid "continue the current in-progress merge"
+msgstr "продължаване на текущото сливане"
+
+#: builtin/merge.c:230 builtin/pull.c:170
msgid "allow merging unrelated histories"
msgstr "позволяване на сливане на независими истории"
-#: builtin/merge.c:255
+#: builtin/merge.c:258
msgid "could not run stash."
msgstr "не може да се извърши скатаване"
-#: builtin/merge.c:260
+#: builtin/merge.c:263
msgid "stash failed"
msgstr "неуспешно скатаване"
-#: builtin/merge.c:265
+#: builtin/merge.c:268
#, c-format
msgid "not a valid object: %s"
msgstr "неправилен обект: „%s“"
-#: builtin/merge.c:284 builtin/merge.c:301
+#: builtin/merge.c:287 builtin/merge.c:304
msgid "read-tree failed"
msgstr "неуспешно прочитане на обект-дърво"
-#: builtin/merge.c:331
+#: builtin/merge.c:334
msgid " (nothing to squash)"
msgstr " (няма какво да се смачка)"
-#: builtin/merge.c:342
+#: builtin/merge.c:345
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Подаване със смачкване — указателят „HEAD“ няма да бъде обновен\n"
-#: builtin/merge.c:392
+#: builtin/merge.c:395
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr ""
"Липсва съобщение при подаване — указателят „HEAD“ няма да бъде обновен\n"
-#: builtin/merge.c:443
+#: builtin/merge.c:446
#, c-format
msgid "'%s' does not point to a commit"
msgstr "„%s“ не сочи към подаване"
-#: builtin/merge.c:533
+#: builtin/merge.c:536
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Неправилен низ за настройката „branch.%s.mergeoptions“: „%s“"
-#: builtin/merge.c:652
+#: builtin/merge.c:656
msgid "Not handling anything other than two heads merge."
msgstr "Поддържа се само сливане на точно две истории."
-#: builtin/merge.c:666
+#: builtin/merge.c:670
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Непозната опция за рекурсивното сливане „merge-recursive“: „-X%s“"
-#: builtin/merge.c:681
+#: builtin/merge.c:685
#, c-format
msgid "unable to write %s"
msgstr "„%s“ не може да бъде записан"
-#: builtin/merge.c:733
+#: builtin/merge.c:737
#, c-format
msgid "Could not read from '%s'"
msgstr "От „%s“ не може да се чете"
-#: builtin/merge.c:742
+#: builtin/merge.c:746
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"Сливането няма да бъде подадено. За завършването му и подаването му "
"използвайте командата „git commit“.\n"
-#: builtin/merge.c:748
+#: builtin/merge.c:752
#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
@@ -9588,68 +10263,77 @@
"Редовете, които започват с „%c“ ще бъдат пропуснати, а празно съобщение\n"
"преустановява подаването.\n"
-#: builtin/merge.c:772
+#: builtin/merge.c:776
msgid "Empty commit message."
msgstr "Празно съобщение при подаване."
-#: builtin/merge.c:792
+#: builtin/merge.c:796
#, c-format
msgid "Wonderful.\n"
-msgstr "Първият етап на тривиалното сливане завърши.\n"
+msgstr "Първият етап на сливането завърши.\n"
-#: builtin/merge.c:847
+#: builtin/merge.c:851
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
-msgstr "Неуспешно сливане — коригирайте конфликтите и подайте резултата.\n"
+msgstr ""
+"Неуспешно автоматично сливане — коригирайте конфликтите и подайте "
+"резултата.\n"
-#: builtin/merge.c:863
-#, c-format
-msgid "'%s' is not a commit"
-msgstr "„%s“ не е подаване"
-
-#: builtin/merge.c:904
+#: builtin/merge.c:890
msgid "No current branch."
msgstr "Няма текущ клон."
-#: builtin/merge.c:906
+#: builtin/merge.c:892
msgid "No remote for the current branch."
msgstr "Текущият клон не следи никой."
-#: builtin/merge.c:908
+#: builtin/merge.c:894
msgid "No default upstream defined for the current branch."
msgstr "Текущият клон не следи никой клон."
-#: builtin/merge.c:913
+#: builtin/merge.c:899
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Никой клон не следи клона „%s“ от хранилището „%s“"
-#: builtin/merge.c:960
+#: builtin/merge.c:946
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Неправилна стойност „%s“ в средата „%s“"
-#: builtin/merge.c:1034
+#: builtin/merge.c:1020
#, c-format
msgid "could not close '%s'"
msgstr "„%s“ не може да се затвори"
-#: builtin/merge.c:1061
+#: builtin/merge.c:1047
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "не може да се слее в „%s“: %s"
-#: builtin/merge.c:1095
+#: builtin/merge.c:1081
msgid "not something we can merge"
msgstr "не може да се слее"
-#: builtin/merge.c:1162
+#: builtin/merge.c:1146
+msgid "--abort expects no arguments"
+msgstr "опцията „--abort“ не приема аргументи"
+
+#: builtin/merge.c:1150
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr ""
"Не може да преустановите сливане, защото в момента не се извършва такова "
"(липсва указател „MERGE_HEAD“)."
-#: builtin/merge.c:1178
+#: builtin/merge.c:1162
+msgid "--continue expects no arguments"
+msgstr "опцията „--continue“ не приема аргументи"
+
+#: builtin/merge.c:1166
+msgid "There is no merge in progress (MERGE_HEAD missing)."
+msgstr "В момента не се извършва сливане (липсва указател „MERGE_HEAD“)."
+
+#: builtin/merge.c:1182
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -9657,7 +10341,7 @@
"Не сте завършили сливане. (Указателят „MERGE_HEAD“ съществува).\n"
"Подайте промените си, преди да започнете ново сливане."
-#: builtin/merge.c:1185
+#: builtin/merge.c:1189
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -9665,122 +10349,121 @@
"Не сте завършили отбиране на подаване (указателят „CHERRY_PICK_HEAD“\n"
"съществува). Подайте промените си, преди да започнете ново сливане."
-#: builtin/merge.c:1188
+#: builtin/merge.c:1192
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr ""
"Не сте завършили отбиране на подаване (указателят „CHERRY_PICK_HEAD“\n"
"съществува)."
-#: builtin/merge.c:1197
+#: builtin/merge.c:1201
msgid "You cannot combine --squash with --no-ff."
msgstr "Опцията „--squash“ е несъвместима с „--no-ff“."
-#: builtin/merge.c:1205
+#: builtin/merge.c:1209
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
"Не е указано подаване и настройката „merge.defaultToUpstream“ не е зададена."
-#: builtin/merge.c:1222
+#: builtin/merge.c:1226
msgid "Squash commit into empty head not supported yet"
msgstr "Подаване със смачкване във връх без история все още не се поддържа"
-#: builtin/merge.c:1224
+#: builtin/merge.c:1228
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
-"Понеже върхът е без история, всички сливания са тривиални, не може да се "
-"извърши нетривиално сливане изисквано от опцията „--no-ff“"
+"Понеже върхът е без история, всички сливания са превъртания, не може да се "
+"извърши същинско сливане изисквано от опцията „--no-ff“"
-#: builtin/merge.c:1229
+#: builtin/merge.c:1233
#, c-format
msgid "%s - not something we can merge"
msgstr "„%s“ — не е нещо, което може да се слее"
-#: builtin/merge.c:1231
+#: builtin/merge.c:1235
msgid "Can merge only exactly one commit into empty head"
msgstr "Можете да слеете точно едно подаване във връх без история"
-#: builtin/merge.c:1287
+#: builtin/merge.c:1269
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
"Подаването „%s“ е с недоверен подпис от GPG, който твърди, че е на „%s“."
-#: builtin/merge.c:1290
+#: builtin/merge.c:1272
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
"Подаването „%s“ е с неправилен подпис от GPG, който твърди, че е на „%s“."
-#: builtin/merge.c:1293
+#: builtin/merge.c:1275
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Подаването „%s“ е без подпис от GPG."
-#: builtin/merge.c:1296
+#: builtin/merge.c:1278
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "Подаването „%s“ е с коректен подпис от GPG на „%s“.\n"
-#: builtin/merge.c:1358
+#: builtin/merge.c:1340
msgid "refusing to merge unrelated histories"
msgstr "независими истории не може да се слеят"
-#: builtin/merge.c:1367
+#: builtin/merge.c:1349
msgid "Already up-to-date."
msgstr "Вече е обновено."
-#: builtin/merge.c:1377
+#: builtin/merge.c:1359
#, c-format
msgid "Updating %s..%s\n"
msgstr "Обновяване „%s..%s“\n"
-#: builtin/merge.c:1418
+#: builtin/merge.c:1400
#, c-format
msgid "Trying really trivial in-index merge...\n"
-msgstr "Проба с най-тривиалното сливане в рамките на индекса…\n"
+msgstr "Проба със сливане в рамките на индекса…\n"
-#: builtin/merge.c:1425
+#: builtin/merge.c:1407
#, c-format
msgid "Nope.\n"
msgstr "Неуспешно сливане.\n"
-#: builtin/merge.c:1450
+#: builtin/merge.c:1432
msgid "Already up-to-date. Yeeah!"
msgstr "Вече е обновено!"
-#: builtin/merge.c:1456
+#: builtin/merge.c:1438
msgid "Not possible to fast-forward, aborting."
-msgstr ""
-"Не може да се извърши тривиално сливане, преустановяване на действието."
+msgstr "Не може да се извърши превъртане, преустановяване на действието."
-#: builtin/merge.c:1479 builtin/merge.c:1558
+#: builtin/merge.c:1461 builtin/merge.c:1540
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Привеждане на дървото към първоначалното…\n"
-#: builtin/merge.c:1483
+#: builtin/merge.c:1465
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Пробване със стратегията за сливане „%s“…\n"
-#: builtin/merge.c:1549
+#: builtin/merge.c:1531
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Никоя стратегия за сливане не може да извърши сливането.\n"
-#: builtin/merge.c:1551
+#: builtin/merge.c:1533
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Неуспешно сливане със стратегия „%s“.\n"
-#: builtin/merge.c:1560
+#: builtin/merge.c:1542
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr ""
"Ползва се стратегията „%s“, която ще подготви дървото за коригиране на "
"ръка.\n"
-#: builtin/merge.c:1572
+#: builtin/merge.c:1554
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -9836,35 +10519,35 @@
"git merge-file [ОПЦИЯ…] [-L ИМЕ_1 [-L ОРИГИНАЛ [-L ИМЕ_2]]] ФАЙЛ_1 ОРИГ_ФАЙЛ "
"ФАЙЛ_2"
-#: builtin/merge-file.c:33
+#: builtin/merge-file.c:32
msgid "send results to standard output"
msgstr "извеждане на резултатите на стандартния изход"
-#: builtin/merge-file.c:34
+#: builtin/merge-file.c:33
msgid "use a diff3 based merge"
msgstr "сливане на базата на „diff3“"
-#: builtin/merge-file.c:35
+#: builtin/merge-file.c:34
msgid "for conflicts, use our version"
msgstr "при конфликти да се ползва локалната версия"
-#: builtin/merge-file.c:37
+#: builtin/merge-file.c:36
msgid "for conflicts, use their version"
msgstr "при конфликти да се ползва чуждата версия"
-#: builtin/merge-file.c:39
+#: builtin/merge-file.c:38
msgid "for conflicts, use a union version"
msgstr "при конфликти да се ползва обединена версия"
-#: builtin/merge-file.c:42
+#: builtin/merge-file.c:41
msgid "for conflicts, use this marker size"
msgstr "при конфликти да се ползва маркер с такъв БРОЙ знаци"
-#: builtin/merge-file.c:43
+#: builtin/merge-file.c:42
msgid "do not warn about conflicts"
msgstr "без предупреждения при конфликти"
-#: builtin/merge-file.c:45
+#: builtin/merge-file.c:44
msgid "set labels for file1/orig-file/file2"
msgstr "задаване на етикети за ФАЙЛ_1/ОРИГИНАЛ/ФАЙЛ_2"
@@ -9915,139 +10598,143 @@
msgid "allow creation of more than one tree"
msgstr "разрешаване на създаването на повече от едно дърво"
-#: builtin/mv.c:15
+#: builtin/mv.c:16
msgid "git mv [<options>] <source>... <destination>"
msgstr "git mv [ОПЦИЯ…] ОБЕКТ… ЦЕЛ"
-#: builtin/mv.c:70
+#: builtin/mv.c:82
#, c-format
msgid "Directory %s is in index and no submodule?"
msgstr "Директорията „%s“ е в индекса, но не е подмодул"
-#: builtin/mv.c:72 builtin/rm.c:317
+#: builtin/mv.c:84 builtin/rm.c:290
msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"За да продължите, или вкарайте промените по файла „.gitmodules“ в индекса,\n"
"или ги скатайте"
-#: builtin/mv.c:90
+#: builtin/mv.c:102
#, c-format
msgid "%.*s is in index"
msgstr "„%.*s“ вече е в индекса"
-#: builtin/mv.c:112
+#: builtin/mv.c:124
msgid "force move/rename even if target exists"
msgstr "принудително преместване/преименуване дори целта да съществува"
-#: builtin/mv.c:113
+#: builtin/mv.c:125
msgid "skip move/rename errors"
msgstr "прескачане на грешките при преместване/преименуване"
-#: builtin/mv.c:155
+#: builtin/mv.c:167
#, c-format
msgid "destination '%s' is not a directory"
msgstr "целта „%s“ съществува и не е директория"
-#: builtin/mv.c:166
+#: builtin/mv.c:178
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "Проверка на преименуването на обект от „%s“ на „%s“\n"
-#: builtin/mv.c:170
+#: builtin/mv.c:182
msgid "bad source"
msgstr "неправилен обект"
-#: builtin/mv.c:173
+#: builtin/mv.c:185
msgid "can not move directory into itself"
msgstr "директория не може да се премести в себе си"
-#: builtin/mv.c:176
+#: builtin/mv.c:188
msgid "cannot move directory over file"
msgstr "директория не може да се премести върху файл"
-#: builtin/mv.c:185
+#: builtin/mv.c:197
msgid "source directory is empty"
msgstr "първоначалната директория е празна"
-#: builtin/mv.c:210
+#: builtin/mv.c:222
msgid "not under version control"
msgstr "не е под контрола на Git"
-#: builtin/mv.c:213
+#: builtin/mv.c:225
msgid "destination exists"
msgstr "целта съществува"
-#: builtin/mv.c:221
+#: builtin/mv.c:233
#, c-format
msgid "overwriting '%s'"
msgstr "презаписване на „%s“"
-#: builtin/mv.c:224
+#: builtin/mv.c:236
msgid "Cannot overwrite"
msgstr "Презаписването е невъзможно"
-#: builtin/mv.c:227
+#: builtin/mv.c:239
msgid "multiple sources for the same target"
msgstr "множество източници за една цел"
-#: builtin/mv.c:229
+#: builtin/mv.c:241
msgid "destination directory does not exist"
msgstr "целевата директория не съществува"
-#: builtin/mv.c:236
+#: builtin/mv.c:248
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, обект: „%s“, цел: „%s“"
-#: builtin/mv.c:257
+#: builtin/mv.c:269
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Преименуване на „%s“ на „%s“\n"
-#: builtin/mv.c:263 builtin/remote.c:710 builtin/repack.c:375
+#: builtin/mv.c:275 builtin/remote.c:710 builtin/repack.c:384
#, c-format
msgid "renaming '%s' failed"
msgstr "неуспешно преименуване на „%s“"
-#: builtin/name-rev.c:257
+#: builtin/name-rev.c:289
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [ОПЦИЯ…] ПОДАВАНЕ…"
-#: builtin/name-rev.c:258
+#: builtin/name-rev.c:290
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [ОПЦИЯ…] --all"
-#: builtin/name-rev.c:259
+#: builtin/name-rev.c:291
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [ОПЦИЯ…] --stdin"
-#: builtin/name-rev.c:311
+#: builtin/name-rev.c:346
msgid "print only names (no SHA-1)"
msgstr "извеждане само на имената (без сумите по SHA1)"
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:347
msgid "only use tags to name the commits"
msgstr "използване само на етикетите за именуване на подаванията"
-#: builtin/name-rev.c:314
+#: builtin/name-rev.c:349
msgid "only use refs matching <pattern>"
msgstr "използване само на указателите напасващи на ШАБЛОНа"
-#: builtin/name-rev.c:316
+#: builtin/name-rev.c:351
+msgid "ignore refs matching <pattern>"
+msgstr "игнориране на указателите напасващи на ШАБЛОНа"
+
+#: builtin/name-rev.c:353
msgid "list all commits reachable from all refs"
msgstr ""
"извеждане на всички подавания, които могат да бъдат достигнати от всички "
"указатели"
-#: builtin/name-rev.c:317
+#: builtin/name-rev.c:354
msgid "read from stdin"
msgstr "четене от стандартния вход"
-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:355
msgid "allow to print `undefined` names (default)"
msgstr "да се извеждат и недефинираните имена (стандартна стойност на опцията)"
-#: builtin/name-rev.c:324
+#: builtin/name-rev.c:361
msgid "dereference tags in the input (internal use)"
msgstr "извеждане на идентификаторите на обекти-етикети (за вътрешни нужди)"
@@ -10194,19 +10881,19 @@
msgid "the note contents have been left in %s"
msgstr "съдържанието на бележката е във файла „%s“"
-#: builtin/notes.c:233 builtin/tag.c:439
+#: builtin/notes.c:233 builtin/tag.c:516
#, c-format
msgid "cannot read '%s'"
msgstr "файлът „%s“ не може да бъде прочетен"
-#: builtin/notes.c:235 builtin/tag.c:442
+#: builtin/notes.c:235 builtin/tag.c:519
#, 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:659
+#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:658
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr "не може да се открие към какво сочи „%s“."
@@ -10242,12 +10929,12 @@
"notes/“."
#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496
-#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:652
-#: builtin/notes.c:802 builtin/notes.c:949 builtin/notes.c:970
+#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:651
+#: builtin/notes.c:801 builtin/notes.c:948 builtin/notes.c:969
msgid "too many parameters"
msgstr "прекалено много параметри"
-#: builtin/notes.c:378 builtin/notes.c:665
+#: builtin/notes.c:378 builtin/notes.c:664
#, c-format
msgid "no note found for object %s."
msgstr "няма бележки за обекта „%s“."
@@ -10290,7 +10977,7 @@
msgid "Overwriting existing notes for object %s\n"
msgstr "Презаписване на съществуващите бележки за обекта „%s“\n"
-#: builtin/notes.c:463 builtin/notes.c:624 builtin/notes.c:889
+#: builtin/notes.c:463 builtin/notes.c:623 builtin/notes.c:888
#, c-format
msgid "Removing note for object %s\n"
msgstr "Изтриване на бележката за обекта „%s“\n"
@@ -10334,52 +11021,52 @@
"Вместо това ги използвайте с подкомандата „add“: „git notes add -f -m/-F/-c/-"
"C“.\n"
-#: builtin/notes.c:685
+#: builtin/notes.c:684
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "указателят „NOTES_MERGE_PARTIAL“ не може да бъде изтрит"
-#: builtin/notes.c:687
+#: builtin/notes.c:686
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "указателят „NOTES_MERGE_REF“ не може да бъде изтрит"
-#: builtin/notes.c:689
+#: builtin/notes.c:688
msgid "failed to remove 'git notes merge' worktree"
msgstr "работната директория на „git notes merge“ не може да бъде изтрита"
-#: builtin/notes.c:709
+#: builtin/notes.c:708
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "указателят „NOTES_MERGE_PARTIAL“ не може да бъде прочетен"
-#: builtin/notes.c:711
+#: builtin/notes.c:710
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "подаването от „NOTES_MERGE_PARTIAL“ не може да се открие."
-#: builtin/notes.c:713
+#: builtin/notes.c:712
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "подаването от „NOTES_MERGE_PARTIAL“ не може да се анализира."
-#: builtin/notes.c:726
+#: builtin/notes.c:725
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "не може да се открие към какво сочи „NOTES_MERGE_REF“"
-#: builtin/notes.c:729
+#: builtin/notes.c:728
msgid "failed to finalize notes merge"
msgstr "неуспешно сливане на бележките"
-#: builtin/notes.c:755
+#: builtin/notes.c:754
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "непозната стратегия за сливане на бележки „%s“"
-#: builtin/notes.c:771
+#: builtin/notes.c:770
msgid "General options"
msgstr "Общи опции"
-#: builtin/notes.c:773
+#: builtin/notes.c:772
msgid "Merge options"
msgstr "Опции при сливане"
-#: builtin/notes.c:775
+#: builtin/notes.c:774
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -10389,46 +11076,46 @@
"„union“ (обединяване), „cat_sort_uniq“ (обединяване, подреждане, уникални "
"резултати)"
-#: builtin/notes.c:777
+#: builtin/notes.c:776
msgid "Committing unmerged notes"
msgstr "Подаване на неслети бележки"
-#: builtin/notes.c:779
+#: builtin/notes.c:778
msgid "finalize notes merge by committing unmerged notes"
msgstr "завършване на сливането чрез подаване на неслети бележки"
-#: builtin/notes.c:781
+#: builtin/notes.c:780
msgid "Aborting notes merge resolution"
msgstr "Преустановяване на корекцията при сливането на бележки"
-#: builtin/notes.c:783
+#: builtin/notes.c:782
msgid "abort notes merge"
msgstr "преустановяване на сливането на бележки"
-#: builtin/notes.c:794
+#: builtin/notes.c:793
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "опциите „--commit“, „--abort“ и „-s“/„--strategy“ са несъвместими"
-#: builtin/notes.c:799
+#: builtin/notes.c:798
msgid "must specify a notes ref to merge"
msgstr "трябва да укажете указател към бележка за сливане."
-#: builtin/notes.c:823
+#: builtin/notes.c:822
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "неизвестна стратегия към опцията „-s“/„--strategy“: „%s“"
-#: builtin/notes.c:860
+#: builtin/notes.c:859
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "в момента се извършва сливане на бележките в „%s“ при „%s“"
-#: builtin/notes.c:863
+#: builtin/notes.c:862
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr "не може да се запази връзка към указателя на текущата бележка („%s“)."
-#: builtin/notes.c:865
+#: builtin/notes.c:864
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -10439,36 +11126,36 @@
"резултата с „git notes merge --commit“ или преустановете сливането с "
"командата „git notes merge --abort“.\n"
-#: builtin/notes.c:887
+#: builtin/notes.c:886
#, c-format
msgid "Object %s has no note\n"
msgstr "Няма бележки за обекта „%s“\n"
-#: builtin/notes.c:899
+#: builtin/notes.c:898
msgid "attempt to remove non-existent note is not an error"
msgstr "опитът за изтриването на несъществуваща бележка не се счита за грешка"
-#: builtin/notes.c:902
+#: builtin/notes.c:901
msgid "read object names from the standard input"
msgstr "изчитане на имената на обектите от стандартния вход"
-#: builtin/notes.c:940 builtin/prune.c:105 builtin/worktree.c:127
+#: builtin/notes.c:939 builtin/prune.c:105 builtin/worktree.c:127
msgid "do not remove, show only"
msgstr "само извеждане без действително окастряне"
-#: builtin/notes.c:941
+#: builtin/notes.c:940
msgid "report pruned notes"
msgstr "докладване на окастрените обекти"
-#: builtin/notes.c:983
+#: builtin/notes.c:982
msgid "notes-ref"
msgstr "УКАЗАТЕЛ_ЗА_БЕЛЕЖКА"
-#: builtin/notes.c:984
+#: builtin/notes.c:983
msgid "use notes from <notes-ref>"
msgstr "да се използва бележката сочена от този УКАЗАТЕЛ_ЗА_БЕЛЕЖКА"
-#: builtin/notes.c:1019
+#: builtin/notes.c:1018
#, c-format
msgid "unknown subcommand: %s"
msgstr "непозната подкоманда: %s"
@@ -10486,192 +11173,192 @@
"git pack-objects [ОПЦИЯ…] ПРЕФИКС_НА_ИМЕТО [< СПИСЪК_С_УКАЗАТЕЛИ | < "
"СПИСЪК_С_ОБЕКТИ]"
-#: builtin/pack-objects.c:179 builtin/pack-objects.c:182
+#: builtin/pack-objects.c:177 builtin/pack-objects.c:180
#, c-format
msgid "deflate error (%d)"
msgstr "грешка при декомпресиране с „deflate“ (%d)"
-#: builtin/pack-objects.c:768
+#: builtin/pack-objects.c:770
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
"изключване на записването на битовата маска, пакетите са разделени поради "
"стойността на „pack.packSizeLimit“"
-#: builtin/pack-objects.c:781
+#: builtin/pack-objects.c:783
msgid "Writing objects"
msgstr "Записване на обектите"
-#: builtin/pack-objects.c:1070
+#: builtin/pack-objects.c:1063
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
"изключване на записването на битовата маска, защото някои обекти няма да се "
"пакетират"
-#: builtin/pack-objects.c:2346
+#: builtin/pack-objects.c:2426
msgid "Compressing objects"
msgstr "Компресиране на обектите"
-#: builtin/pack-objects.c:2759
+#: builtin/pack-objects.c:2829
#, c-format
msgid "unsupported index version %s"
msgstr "неподдържана версия на индекса „%s“"
-#: builtin/pack-objects.c:2763
+#: builtin/pack-objects.c:2833
#, c-format
msgid "bad index version '%s'"
msgstr "неправилна версия на индекса „%s“"
-#: builtin/pack-objects.c:2793
+#: builtin/pack-objects.c:2863
msgid "do not show progress meter"
msgstr "без извеждане на напредъка"
-#: builtin/pack-objects.c:2795
+#: builtin/pack-objects.c:2865
msgid "show progress meter"
msgstr "извеждане на напредъка"
-#: builtin/pack-objects.c:2797
+#: builtin/pack-objects.c:2867
msgid "show progress meter during object writing phase"
msgstr "извеждане на напредъка във фазата на запазване на обектите"
-#: builtin/pack-objects.c:2800
+#: builtin/pack-objects.c:2870
msgid "similar to --all-progress when progress meter is shown"
msgstr ""
"същото действие като опцията „--all-progress“ при извеждането на напредъка"
-#: builtin/pack-objects.c:2801
+#: builtin/pack-objects.c:2871
msgid "version[,offset]"
msgstr "ВЕРСИЯ[,ОТМЕСТВАНЕ]"
-#: builtin/pack-objects.c:2802
+#: builtin/pack-objects.c:2872
msgid "write the pack index file in the specified idx format version"
msgstr ""
"запазване на индекса на пакетните файлове във форма̀та с указаната версия"
-#: builtin/pack-objects.c:2805
+#: builtin/pack-objects.c:2875
msgid "maximum size of each output pack file"
msgstr "максимален размер на всеки пакетен файл"
-#: builtin/pack-objects.c:2807
+#: builtin/pack-objects.c:2877
msgid "ignore borrowed objects from alternate object store"
msgstr "игнориране на обектите заети от други хранилища на обекти"
-#: builtin/pack-objects.c:2809
+#: builtin/pack-objects.c:2879
msgid "ignore packed objects"
msgstr "игнориране на пакетираните обекти"
-#: builtin/pack-objects.c:2811
+#: builtin/pack-objects.c:2881
msgid "limit pack window by objects"
msgstr "ограничаване на прозореца за пакетиране по брой обекти"
-#: builtin/pack-objects.c:2813
+#: builtin/pack-objects.c:2883
msgid "limit pack window by memory in addition to object limit"
msgstr ""
"ограничаване на прозореца за пакетиране и по памет освен по брой обекти"
-#: builtin/pack-objects.c:2815
+#: builtin/pack-objects.c:2885
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
"максимална дължина на веригата от разлики, която е позволена в пакетния файл"
-#: builtin/pack-objects.c:2817
+#: builtin/pack-objects.c:2887
msgid "reuse existing deltas"
msgstr "преизползване на съществуващите разлики"
-#: builtin/pack-objects.c:2819
+#: builtin/pack-objects.c:2889
msgid "reuse existing objects"
msgstr "преизползване на съществуващите обекти"
-#: builtin/pack-objects.c:2821
+#: builtin/pack-objects.c:2891
msgid "use OFS_DELTA objects"
msgstr "използване на обекти „OFS_DELTA“"
-#: builtin/pack-objects.c:2823
+#: builtin/pack-objects.c:2893
msgid "use threads when searching for best delta matches"
msgstr ""
"стартиране на нишки за претърсване на най-добрите съвпадения на разликите"
-#: builtin/pack-objects.c:2825
+#: builtin/pack-objects.c:2895
msgid "do not create an empty pack output"
msgstr "без създаване на празен пакетен файл"
-#: builtin/pack-objects.c:2827
+#: builtin/pack-objects.c:2897
msgid "read revision arguments from standard input"
msgstr "изчитане на версиите от стандартния вход"
-#: builtin/pack-objects.c:2829
+#: builtin/pack-objects.c:2899
msgid "limit the objects to those that are not yet packed"
msgstr "ограничаване до все още непакетираните обекти"
-#: builtin/pack-objects.c:2832
+#: builtin/pack-objects.c:2902
msgid "include objects reachable from any reference"
msgstr ""
"включване на всички обекти, които могат да се достигнат от произволен "
"указател"
-#: builtin/pack-objects.c:2835
+#: builtin/pack-objects.c:2905
msgid "include objects referred by reflog entries"
msgstr "включване и на обектите сочени от записите в журнала на указателите"
-#: builtin/pack-objects.c:2838
+#: builtin/pack-objects.c:2908
msgid "include objects referred to by the index"
msgstr "включване и на обектите сочени от индекса"
-#: builtin/pack-objects.c:2841
+#: builtin/pack-objects.c:2911
msgid "output pack to stdout"
msgstr "извеждане на пакета на стандартния изход"
-#: builtin/pack-objects.c:2843
+#: builtin/pack-objects.c:2913
msgid "include tag objects that refer to objects to be packed"
msgstr ""
"включване и на обектите-етикети, които сочат към обектите, които ще бъдат "
"пакетирани"
-#: builtin/pack-objects.c:2845
+#: builtin/pack-objects.c:2915
msgid "keep unreachable objects"
msgstr "запазване на недостижимите обекти"
-#: builtin/pack-objects.c:2847
+#: builtin/pack-objects.c:2917
msgid "pack loose unreachable objects"
msgstr "пакетиране и на недостижимите обекти"
-#: builtin/pack-objects.c:2849
+#: builtin/pack-objects.c:2919
msgid "unpack unreachable objects newer than <time>"
msgstr "разпакетиране на недостижимите обекти, които са по-нови от това ВРЕМЕ"
-#: builtin/pack-objects.c:2852
+#: builtin/pack-objects.c:2922
msgid "create thin packs"
msgstr "създаване на съкратени пакети"
-#: builtin/pack-objects.c:2854
+#: builtin/pack-objects.c:2924
msgid "create packs suitable for shallow fetches"
msgstr "пакетиране подходящо за плитко доставяне"
-#: builtin/pack-objects.c:2856
+#: builtin/pack-objects.c:2926
msgid "ignore packs that have companion .keep file"
msgstr "игнориране на пакетите, които са придружени от файл „.keep“"
-#: builtin/pack-objects.c:2858
+#: builtin/pack-objects.c:2928
msgid "pack compression level"
msgstr "ниво на компресиране при пакетиране"
-#: builtin/pack-objects.c:2860
+#: builtin/pack-objects.c:2930
msgid "do not hide commits by grafts"
msgstr ""
"извеждане на всички родители — дори и тези, които нормално са скрити при "
"присажданията"
-#: builtin/pack-objects.c:2862
+#: builtin/pack-objects.c:2932
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
"използване на съществуващи индекси на база битови маски за ускоряване на "
"преброяването на обектите"
-#: builtin/pack-objects.c:2864
+#: builtin/pack-objects.c:2934
msgid "write a bitmap index together with the pack index"
msgstr ""
"запазване и на индекс на база побитова маска, заедно с индекса за пакета"
-#: builtin/pack-objects.c:2993
+#: builtin/pack-objects.c:3061
msgid "Counting objects"
msgstr "Преброяване на обектите"
@@ -10699,11 +11386,11 @@
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--expire ВРЕМЕ] [--] [ВРЪХ…]"
-#: builtin/prune.c:106 builtin/worktree.c:128
+#: builtin/prune.c:106
msgid "report pruned objects"
msgstr "информация за окастрените обекти"
-#: builtin/prune.c:109 builtin/worktree.c:130
+#: builtin/prune.c:109
msgid "expire objects older than <time>"
msgstr "окастряне на обектите по-стари от това ВРЕМЕ"
@@ -10728,9 +11415,9 @@
msgid "incorporate changes by rebasing rather than merging"
msgstr "внасяне на промените чрез пребазиране, а не чрез сливане"
-#: builtin/pull.c:148 builtin/revert.c:101
+#: builtin/pull.c:148 builtin/rebase--helper.c:18 builtin/revert.c:120
msgid "allow fast-forward"
-msgstr "позволяване на тривиални сливания"
+msgstr "позволяване на превъртания"
#: builtin/pull.c:157
msgid "automatically stash/stash pop before and after rebase"
@@ -10804,7 +11491,7 @@
msgid "<remote>"
msgstr "ОТДАЛЕЧЕНО_ХРАНИЛИЩЕ"
-#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:451
+#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:456
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "КЛОН"
@@ -10857,7 +11544,7 @@
"commit %s."
msgstr ""
"доставянето обнови върха на текущия клон. Работното\n"
-"ви копие бе тривиално слято от подаване „%s“."
+"ви копие бе превъртяно от подаване „%s“."
#: builtin/pull.c:843
#, c-format
@@ -10869,7 +11556,7 @@
"$ git reset --hard\n"
"to recover."
msgstr ""
-"Работното ви копие не може да бъде тривиално слято.\n"
+"Работното ви копие не може да бъде превъртяно.\n"
"След като запазите всичко необходимо посочено от командата:\n"
" $ git diff %s\n"
"изпълнете:\n"
@@ -10977,14 +11664,14 @@
"Трябва да укажете коя версия да се изтласка, за обновяване на отдалечения "
"клон."
-#: builtin/push.c:242
+#: builtin/push.c:245
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
"Не сте указали версия за подаване, а настройката „push.default“ е "
"„nothing“ (нищо без изрично указана версия да не се изтласква)"
-#: builtin/push.c:249
+#: builtin/push.c:252
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -10998,7 +11685,7 @@
"преди отново да изтласкате промените. За повече информация вижте раздела\n"
"„Note about fast-forwards“ в страницата от ръководството „git push --help“."
-#: builtin/push.c:255
+#: builtin/push.c:258
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"
@@ -11011,7 +11698,7 @@
"информация погледнете раздела „Note about fast-forwards“ в страницата от\n"
"ръководството „git push --help“."
-#: builtin/push.c:261
+#: builtin/push.c:264
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"
@@ -11030,14 +11717,14 @@
"страницата\n"
"от ръководството „git push --help“."
-#: builtin/push.c:268
+#: builtin/push.c:271
msgid "Updates were rejected because the tag already exists in the remote."
msgstr ""
"Изтласкването е отхвърлено, защото в отдалеченото хранилище съществува "
"етикет,\n"
"който ще припокриете с етикет от вашето хранилище."
-#: builtin/push.c:271
+#: builtin/push.c:274
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"
@@ -11047,22 +11734,22 @@
"указател, който вече сочи към обект, който не е подаване, както и тепърва\n"
"да го промените да сочи към подобен обект.\n"
-#: builtin/push.c:331
+#: builtin/push.c:334
#, c-format
msgid "Pushing to %s\n"
msgstr "Изтласкване към „%s“\n"
-#: builtin/push.c:335
+#: builtin/push.c:338
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "част от указателите не бяха изтласкани към „%s“"
-#: builtin/push.c:366
+#: builtin/push.c:369
#, c-format
msgid "bad repository '%s'"
msgstr "неправилно указано хранилище „%s“"
-#: builtin/push.c:367
+#: builtin/push.c:370
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -11084,120 +11771,119 @@
"\n"
" git push ИМЕ\n"
-#: builtin/push.c:385
+#: builtin/push.c:388
msgid "--all and --tags are incompatible"
msgstr "опциите „--all“ и „--tags“ са несъвместими"
-#: builtin/push.c:386
+#: builtin/push.c:389
msgid "--all can't be combined with refspecs"
msgstr "опцията „--all“ е несъвместима с указването на версия"
-#: builtin/push.c:391
+#: builtin/push.c:394
msgid "--mirror and --tags are incompatible"
msgstr "опциите „--mirror“ и „--tags“ са несъвместими"
-#: builtin/push.c:392
+#: builtin/push.c:395
msgid "--mirror can't be combined with refspecs"
msgstr "опцията „--mirror“ е несъвместима с указването на версия"
-#: builtin/push.c:397
+#: builtin/push.c:400
msgid "--all and --mirror are incompatible"
msgstr "опциите „--all“ и „--mirror“ са несъвместими"
-#: builtin/push.c:515
+#: builtin/push.c:518
msgid "repository"
msgstr "хранилище"
-#: builtin/push.c:516 builtin/send-pack.c:161
+#: builtin/push.c:519 builtin/send-pack.c:162
msgid "push all refs"
msgstr "изтласкване на всички указатели"
-#: builtin/push.c:517 builtin/send-pack.c:163
+#: builtin/push.c:520 builtin/send-pack.c:164
msgid "mirror all refs"
msgstr "огледално копие на всички указатели"
-#: builtin/push.c:519
+#: builtin/push.c:522
msgid "delete refs"
msgstr "изтриване на указателите"
-#: builtin/push.c:520
+#: builtin/push.c:523
msgid "push tags (can't be used with --all or --mirror)"
msgstr "изтласкване на етикетите (несъвместимо с опциите „--all“ и „--mirror“)"
-#: builtin/push.c:523 builtin/send-pack.c:164
+#: builtin/push.c:526 builtin/send-pack.c:165
msgid "force updates"
msgstr "принудително обновяване"
-# FIXME double check this
-#: builtin/push.c:525 builtin/send-pack.c:175
+#: builtin/push.c:528 builtin/send-pack.c:179
msgid "refname>:<expect"
msgstr "УКАЗАТЕЛ>:<ОЧАКВАНА_СТОЙНОСТ"
-#: builtin/push.c:526 builtin/send-pack.c:176
+#: builtin/push.c:529 builtin/send-pack.c:180
msgid "require old value of ref to be at this value"
msgstr "УКАЗАТЕЛят трябва първоначално да е с тази ОЧАКВАНА_СТОЙНОСТ"
-#: builtin/push.c:529
+#: builtin/push.c:532
msgid "control recursive pushing of submodules"
msgstr "управление на рекурсивното изтласкване на подмодулите"
-#: builtin/push.c:531 builtin/send-pack.c:169
+#: builtin/push.c:534 builtin/send-pack.c:173
msgid "use thin pack"
msgstr "използване на съкратени пакети"
-#: builtin/push.c:532 builtin/push.c:533 builtin/send-pack.c:158
-#: builtin/send-pack.c:159
+#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:159
+#: builtin/send-pack.c:160
msgid "receive pack program"
msgstr "програма за получаването на пакети"
-#: builtin/push.c:534
+#: builtin/push.c:537
msgid "set upstream for git pull/status"
msgstr "задаване на отдалеченото хранилище за командите „git pull/status“"
-#: builtin/push.c:537
+#: builtin/push.c:540
msgid "prune locally removed refs"
msgstr "окастряне на указателите, които са премахнати от локалното хранилище"
-#: builtin/push.c:539
+#: builtin/push.c:542
msgid "bypass pre-push hook"
msgstr "без изпълнение на куката преди изтласкване (pre-push)"
-#: builtin/push.c:540
+#: builtin/push.c:543
msgid "push missing but relevant tags"
msgstr ""
"изтласкване на липсващите в отдалеченото хранилище, но свързани с текущото "
"изтласкване, етикети"
-#: builtin/push.c:543 builtin/send-pack.c:166
+#: builtin/push.c:546 builtin/send-pack.c:167
msgid "GPG sign the push"
msgstr "подписване на изтласкването с GPG"
-#: builtin/push.c:545 builtin/send-pack.c:170
+#: builtin/push.c:548 builtin/send-pack.c:174
msgid "request atomic transaction on remote side"
msgstr "изискване на атомарни операции от отсрещната страна"
-#: builtin/push.c:546
+#: builtin/push.c:549 builtin/send-pack.c:170
msgid "server-specific"
msgstr "специфични за сървъра"
-#: builtin/push.c:546
+#: builtin/push.c:549 builtin/send-pack.c:171
msgid "option to transmit"
msgstr "опция за пренос"
-#: builtin/push.c:560
+#: builtin/push.c:563
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr ""
"опцията „--delete“ е несъвместима с опциите „--all“, „--mirror“ и „--tags“"
-#: builtin/push.c:562
+#: builtin/push.c:565
msgid "--delete doesn't make sense without any refs"
msgstr "опцията „--delete“ изисква поне един указател на версия"
-#: builtin/push.c:579
+#: builtin/push.c:584
msgid "push options must not have new line characters"
-msgstr "опциите за изтласкване не трябва да съдържат знок за нов ред"
+msgstr "опциите за изтласкване не трябва да съдържат знак за нов ред"
-#: builtin/read-tree.c:37
+#: builtin/read-tree.c:40
msgid ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
@@ -11208,83 +11894,95 @@
"checkout] [--index-output=ФАЙЛ] (--empty | УКАЗАТЕЛ_КЪМ_ДЪРВО_1 "
"[УКАЗАТЕЛ_КЪМ_ДЪРВО_2 [УКАЗАТЕЛ_КЪМ_ДЪРВО_3]])"
-#: builtin/read-tree.c:110
+#: builtin/read-tree.c:130
msgid "write resulting index to <file>"
msgstr "запазване на индекса в този ФАЙЛ"
-#: builtin/read-tree.c:113
+#: builtin/read-tree.c:133
msgid "only empty the index"
msgstr "само зануляване на индекса"
-#: builtin/read-tree.c:115
+#: builtin/read-tree.c:135
msgid "Merging"
msgstr "Сливане"
-#: builtin/read-tree.c:117
+#: builtin/read-tree.c:137
msgid "perform a merge in addition to a read"
msgstr "да се извърши и сливане след освен изчитането"
-#: builtin/read-tree.c:119
+#: builtin/read-tree.c:139
msgid "3-way merge if no file level merging required"
msgstr "тройно сливане, ако не се налага пофайлово сливане"
-#: builtin/read-tree.c:121
+#: builtin/read-tree.c:141
msgid "3-way merge in presence of adds and removes"
msgstr "тройно сливане при добавяне на добавяне и изтриване на файлове"
-#: builtin/read-tree.c:123
+#: builtin/read-tree.c:143
msgid "same as -m, but discard unmerged entries"
msgstr "същото като опцията „-m“, но неслетите обекти се пренебрегват"
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:144
msgid "<subdirectory>/"
msgstr "ПОДДИРЕКТОРИЯ/"
-#: builtin/read-tree.c:125
+#: builtin/read-tree.c:145
msgid "read the tree into the index under <subdirectory>/"
msgstr "изчитане на дървото към индекса като да е в тази ПОДДИРЕКТОРИЯ/"
-#: builtin/read-tree.c:128
+#: builtin/read-tree.c:148
msgid "update working tree with merge result"
msgstr "обновяване на работното дърво с резултата от сливането"
-#: builtin/read-tree.c:130
+#: builtin/read-tree.c:150
msgid "gitignore"
msgstr "ФАЙЛ_С_ИЗКЛЮЧЕНИЯ"
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:151
msgid "allow explicitly ignored files to be overwritten"
msgstr "позволяване на презаписването на изрично пренебрегваните файлове"
-#: builtin/read-tree.c:134
+#: builtin/read-tree.c:154
msgid "don't check the working tree after merging"
msgstr "без проверка на работното дърво след сливането"
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:155
msgid "don't update the index or the work tree"
msgstr "без обновяване и на индекса, и на работното дърво"
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:157
msgid "skip applying sparse checkout filter"
msgstr "без прилагане на филтъра за частично изтегляне"
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:159
msgid "debug unpack-trees"
msgstr "изчистване на грешки в командата „unpack-trees“"
-#: builtin/receive-pack.c:26
+#: builtin/rebase--helper.c:7
+msgid "git rebase--helper [<options>]"
+msgstr "git rebase--helper [ОПЦИЯ…]"
+
+#: builtin/rebase--helper.c:19
+msgid "continue rebase"
+msgstr "продължаване на пребазирането"
+
+#: builtin/rebase--helper.c:21
+msgid "abort rebase"
+msgstr "преустановяване на пребазирането"
+
+#: builtin/receive-pack.c:27
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack ДИРЕКТОРИЯ_НА_GIT"
-#: builtin/receive-pack.c:793
+#: builtin/receive-pack.c:795
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"
"with what you pushed, and will require 'git reset --hard' to match\n"
"the work tree to HEAD.\n"
"\n"
-"You can set 'receive.denyCurrentBranch' configuration variable to\n"
-"'ignore' or 'warn' in the remote repository to allow pushing into\n"
+"You can set the 'receive.denyCurrentBranch' configuration variable\n"
+"to 'ignore' or 'warn' in the remote repository to allow pushing into\n"
"its current branch; however, this is not recommended unless you\n"
"arranged to update its work tree to match what you pushed in some\n"
"other way.\n"
@@ -11297,7 +11995,7 @@
"това, което сте изтласкали и за да приведете дървото към „HEAD“ ще трябва\n"
"да изпълните:\n"
"\n"
-" git reset --hard\n"
+" git reset --hard\n"
"\n"
"\n"
"За да позволите подобно изтласкване, в отдалеченото хранилище следва да\n"
@@ -11309,7 +12007,7 @@
"За да заглушите това съобщение, като запазите стандартното поведение,\n"
"задайте настройката „receive.denyCurrentBranch“ да е „refuse“ (отказ)."
-#: builtin/receive-pack.c:813
+#: builtin/receive-pack.c:815
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"
@@ -11330,11 +12028,11 @@
"За да заглушите това съобщение, задайте настройката\n"
"„receive.denyDeleteCurrent“ да е „refuse“ (отказ)."
-#: builtin/receive-pack.c:1883
+#: builtin/receive-pack.c:1888
msgid "quiet"
msgstr "без извеждане на информация"
-#: builtin/receive-pack.c:1897
+#: builtin/receive-pack.c:1902
msgid "You must specify a directory."
msgstr "Трябва да укажете директория."
@@ -11436,7 +12134,6 @@
msgid "Updating %s"
msgstr "Обновяване на „%s“"
-# FIXME tabulator
#: builtin/remote.c:126
msgid ""
"--mirror is dangerous and deprecated; please\n"
@@ -11518,7 +12215,7 @@
msgid "(delete)"
msgstr "(за изтриване)"
-#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:854
+#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:856
#, c-format
msgid "No such remote: %s"
msgstr "Такова отдалечено хранилище няма: %s"
@@ -11528,7 +12225,6 @@
msgid "Could not rename config section '%s' to '%s'"
msgstr "Разделът „%s“ в настройките не може да бъде преименуван на „%s“"
-# FIXME tabulator
#: builtin/remote.c:659
#, c-format
msgid ""
@@ -11550,7 +12246,7 @@
msgid "creating '%s' failed"
msgstr "неуспешно създаване на „%s“"
-#: builtin/remote.c:792
+#: builtin/remote.c:794
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -11564,141 +12260,140 @@
"Бележка: Няколко клона извън йерархията „refs/remotes/“ не бяха изтрити.\n"
"Изтрийте ги чрез командата:"
-#: builtin/remote.c:806
+#: builtin/remote.c:808
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Разделът „%s“ в настройките не може да бъде изтрит"
-#: builtin/remote.c:907
+#: builtin/remote.c:909
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " нов (следващото доставяне ще го разположи в „remotes/%s“)"
-#: builtin/remote.c:910
+#: builtin/remote.c:912
msgid " tracked"
msgstr " следен"
-#: builtin/remote.c:912
+#: builtin/remote.c:914
msgid " stale (use 'git remote prune' to remove)"
msgstr " стар (изтрийте чрез „git remote prune“)"
-#: builtin/remote.c:914
+#: builtin/remote.c:916
msgid " ???"
msgstr " неясно състояние"
# CHECK
-#: builtin/remote.c:955
+#: builtin/remote.c:957
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr ""
"неправилен клон за сливане „%s“. Невъзможно е да пребазирате върху повече "
"от 1 клон"
-#: builtin/remote.c:963
+#: builtin/remote.c:965
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "интерактивно пребазиране върху отдалечения клон „%s“"
-#: builtin/remote.c:964
+#: builtin/remote.c:966
#, c-format
msgid "rebases onto remote %s"
msgstr "пребазиране върху отдалечения клон „%s“"
-#: builtin/remote.c:967
+#: builtin/remote.c:969
#, c-format
msgid " merges with remote %s"
msgstr " сливане с отдалечения клон „%s“"
-#: builtin/remote.c:970
+#: builtin/remote.c:972
#, c-format
msgid "merges with remote %s"
msgstr "сливане с отдалечения клон „%s“"
-#: builtin/remote.c:973
+#: builtin/remote.c:975
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s и с отдалечения клон „%s“\n"
-#: builtin/remote.c:1016
+#: builtin/remote.c:1018
msgid "create"
msgstr "създаден"
-#: builtin/remote.c:1019
+#: builtin/remote.c:1021
msgid "delete"
msgstr "изтрит"
-#: builtin/remote.c:1023
+#: builtin/remote.c:1025
msgid "up to date"
msgstr "актуален"
-#: builtin/remote.c:1026
+#: builtin/remote.c:1028
msgid "fast-forwardable"
-msgstr "може да се слее тривиално"
+msgstr "може да се превърти"
-#: builtin/remote.c:1029
+#: builtin/remote.c:1031
msgid "local out of date"
msgstr "локалният е изостанал"
-#: builtin/remote.c:1036
+#: builtin/remote.c:1038
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s принудително изтласква към %-*s (%s)"
-#: builtin/remote.c:1039
+#: builtin/remote.c:1041
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s изтласква към %-*s (%s)"
-#: builtin/remote.c:1043
+#: builtin/remote.c:1045
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s принудително изтласква към %s"
-#: builtin/remote.c:1046
+#: builtin/remote.c:1048
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s изтласква към %s"
-#: builtin/remote.c:1114
+#: builtin/remote.c:1116
msgid "do not query remotes"
msgstr "без заявки към отдалечените хранилища"
-#: builtin/remote.c:1141
+#: builtin/remote.c:1143
#, c-format
msgid "* remote %s"
msgstr "● отдалечено хранилище „%s“"
-#: builtin/remote.c:1142
+#: builtin/remote.c:1144
#, c-format
msgid " Fetch URL: %s"
msgstr " Адрес за доставяне: %s"
-#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1295
+#: builtin/remote.c:1145 builtin/remote.c:1158 builtin/remote.c:1297
msgid "(no URL)"
msgstr "(без адрес)"
-# FIXME spaces betwen Push and URL
#. TRANSLATORS: the colon ':' should align with
#. the one in " Fetch URL: %s" translation
-#: builtin/remote.c:1154 builtin/remote.c:1156
+#: builtin/remote.c:1156 builtin/remote.c:1158
#, c-format
msgid " Push URL: %s"
msgstr " Адрес за изтласкване: %s"
-#: builtin/remote.c:1158 builtin/remote.c:1160 builtin/remote.c:1162
+#: builtin/remote.c:1160 builtin/remote.c:1162 builtin/remote.c:1164
#, c-format
msgid " HEAD branch: %s"
msgstr " клон сочен от HEAD: %s"
-#: builtin/remote.c:1158
+#: builtin/remote.c:1160
msgid "(not queried)"
msgstr "(без проверка)"
-#: builtin/remote.c:1160
+#: builtin/remote.c:1162
msgid "(unknown)"
msgstr "(непознат)"
-#: builtin/remote.c:1164
+#: builtin/remote.c:1166
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
@@ -11707,162 +12402,161 @@
"хранилище\n"
" не е еднозначен и е някой от следните):\n"
-#: builtin/remote.c:1176
+#: builtin/remote.c:1178
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Отдалечен клон:%s"
msgstr[1] " Отдалечени клони:%s"
-#: builtin/remote.c:1179 builtin/remote.c:1205
+#: builtin/remote.c:1181 builtin/remote.c:1207
msgid " (status not queried)"
msgstr " (състоянието не бе проверено)"
-#: builtin/remote.c:1188
+#: builtin/remote.c:1190
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:1196
+#: builtin/remote.c:1198
msgid " Local refs will be mirrored by 'git push'"
msgstr " Локалните указатели ще бъдат пренесени чрез „ push“"
-#: builtin/remote.c:1202
+#: builtin/remote.c:1204
#, 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:1223
+#: builtin/remote.c:1225
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "задаване на refs/remotes/ИМЕ/HEAD според отдалеченото хранилище"
-#: builtin/remote.c:1225
+#: builtin/remote.c:1227
msgid "delete refs/remotes/<name>/HEAD"
msgstr "изтриване на refs/remotes/ИМЕ/HEAD"
-#: builtin/remote.c:1240
+#: builtin/remote.c:1242
msgid "Cannot determine remote HEAD"
msgstr "Не може да се установи отдалеченият връх"
-#: builtin/remote.c:1242
+#: builtin/remote.c:1244
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
"Множество клони с върхове. Изберете изрично някой от тях чрез командата:"
-#: builtin/remote.c:1252
+#: builtin/remote.c:1254
#, c-format
msgid "Could not delete %s"
msgstr "„%s“ не може да бъде изтрит"
-#: builtin/remote.c:1260
+#: builtin/remote.c:1262
#, c-format
msgid "Not a valid ref: %s"
msgstr "Неправилен указател: %s"
-#: builtin/remote.c:1262
+#: builtin/remote.c:1264
#, c-format
msgid "Could not setup %s"
msgstr "„%s“ не може да се настрои"
-#: builtin/remote.c:1280
+#: builtin/remote.c:1282
#, c-format
msgid " %s will become dangling!"
msgstr "„%s“ ще се превърне в обект извън клоните!"
-#: builtin/remote.c:1281
+#: builtin/remote.c:1283
#, c-format
msgid " %s has become dangling!"
msgstr "„%s“ се превърна в обект извън клоните!"
-#: builtin/remote.c:1291
+#: builtin/remote.c:1293
#, c-format
msgid "Pruning %s"
msgstr "Окастряне на „%s“"
-#: builtin/remote.c:1292
+#: builtin/remote.c:1294
#, c-format
msgid "URL: %s"
msgstr "адрес: %s"
-#: builtin/remote.c:1308
+#: builtin/remote.c:1310
#, c-format
msgid " * [would prune] %s"
msgstr " ● [ще бъде окастрено] %s"
-#: builtin/remote.c:1311
+#: builtin/remote.c:1313
#, c-format
msgid " * [pruned] %s"
msgstr " ● [окастрено] %s"
-#: builtin/remote.c:1356
+#: builtin/remote.c:1358
msgid "prune remotes after fetching"
msgstr "окастряне на огледалата на отдалечените хранилища след доставяне"
-#: builtin/remote.c:1419 builtin/remote.c:1473 builtin/remote.c:1541
+#: builtin/remote.c:1421 builtin/remote.c:1475 builtin/remote.c:1543
#, c-format
msgid "No such remote '%s'"
msgstr "Няма отдалечено хранилище на име „%s“"
-#: builtin/remote.c:1435
+#: builtin/remote.c:1437
msgid "add branch"
msgstr "добавяне на клон"
-#: builtin/remote.c:1442
+#: builtin/remote.c:1444
msgid "no remote specified"
msgstr "не е указано отдалечено хранилище"
-#: builtin/remote.c:1459
+#: builtin/remote.c:1461
msgid "query push URLs rather than fetch URLs"
msgstr "запитване към адресите за изтласкване, а не за доставяне"
-#: builtin/remote.c:1461
+#: builtin/remote.c:1463
msgid "return all URLs"
msgstr "извеждане на всички адреси"
-#: builtin/remote.c:1489
+#: builtin/remote.c:1491
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "не е зададен адрес за отдалеченото хранилище „%s“"
-#: builtin/remote.c:1515
+#: builtin/remote.c:1517
msgid "manipulate push URLs"
msgstr "промяна на адресите за изтласкване"
-#: builtin/remote.c:1517
+#: builtin/remote.c:1519
msgid "add URL"
msgstr "добавяне на адреси"
-#: builtin/remote.c:1519
+#: builtin/remote.c:1521
msgid "delete URLs"
msgstr "изтриване на адреси"
-#: builtin/remote.c:1526
+#: builtin/remote.c:1528
msgid "--add --delete doesn't make sense"
msgstr "опциите „--add“ и „--delete“ са несъвместими"
-#: builtin/remote.c:1567
+#: builtin/remote.c:1569
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Неправилен (стар) формат за адрес: %s"
-#: builtin/remote.c:1575
+#: builtin/remote.c:1577
#, c-format
msgid "No such URL found: %s"
msgstr "Такъв адрес не е открит: %s"
-# FIXME CHECK MEANING
-#: builtin/remote.c:1577
+#: builtin/remote.c:1579
msgid "Will not delete all non-push URLs"
msgstr "Никой от адресите, които не са за изтласкване, няма да се изтрие"
-#: builtin/remote.c:1591
+#: builtin/remote.c:1593
msgid "be verbose; must be placed before a subcommand"
msgstr "повече подробности. Поставя се пред подкоманда"
-#: builtin/remote.c:1622
+#: builtin/remote.c:1624
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Непозната подкоманда: %s"
@@ -11871,92 +12565,101 @@
msgid "git repack [<options>]"
msgstr "git repack [ОПЦИЯ…]"
-#: builtin/repack.c:160
+#: builtin/repack.c:22
+msgid ""
+"Incremental repacks are incompatible with bitmap indexes. Use\n"
+"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
+msgstr ""
+"Постепенното препакетиране е несъвместимо с индекси на база битови маски. \n"
+"Ползвайте опцията --no-write-bitmap-index или изключете настройката\n"
+"„pack.writebitmaps“."
+
+#: builtin/repack.c:166
msgid "pack everything in a single pack"
msgstr "пакетиране на всичко в пакет"
-#: builtin/repack.c:162
+#: builtin/repack.c:168
msgid "same as -a, and turn unreachable objects loose"
msgstr ""
"същото като опцията „-a“. Допълнително — недостижимите обекти да станат "
"непакетирани"
-#: builtin/repack.c:165
+#: builtin/repack.c:171
msgid "remove redundant packs, and run git-prune-packed"
msgstr ""
"премахване на ненужните пакетирани файлове и изпълнение на командата „git-"
"prune-packed“"
-#: builtin/repack.c:167
+#: builtin/repack.c:173
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "подаване на опцията „--no-reuse-delta“ на командата „git-pack-objects“"
-#: builtin/repack.c:169
+#: builtin/repack.c:175
msgid "pass --no-reuse-object to git-pack-objects"
msgstr ""
"подаване на опцията „--no-reuse-object“ на командата „git-pack-objects“"
-#: builtin/repack.c:171
+#: builtin/repack.c:177
msgid "do not run git-update-server-info"
msgstr "без изпълнение на командата „git-update-server-info“"
-#: builtin/repack.c:174
+#: builtin/repack.c:180
msgid "pass --local to git-pack-objects"
msgstr "подаване на опцията „--local“ на командата „git-pack-objects“"
-#: builtin/repack.c:176
+#: builtin/repack.c:182
msgid "write bitmap index"
msgstr "създаване и записване на индекси на база битови маски"
-#: builtin/repack.c:177
+#: builtin/repack.c:183
msgid "approxidate"
msgstr "евристична дата"
-#: builtin/repack.c:178
+#: builtin/repack.c:184
msgid "with -A, do not loosen objects older than this"
msgstr ""
"при комбинирането с опцията „-A“ — без разпакетиране на обектите по стари от "
"това"
-#: builtin/repack.c:180
+#: builtin/repack.c:186
msgid "with -a, repack unreachable objects"
msgstr "с „-a“ — препакетиране на недостижимите обекти"
-#: builtin/repack.c:182
+#: builtin/repack.c:188
msgid "size of the window used for delta compression"
msgstr "размер на прозореца за делта компресията"
-#: builtin/repack.c:183 builtin/repack.c:187
+#: builtin/repack.c:189 builtin/repack.c:193
msgid "bytes"
msgstr "байтове"
-#: builtin/repack.c:184
+#: builtin/repack.c:190
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
"същото като горната опция, но ограничението да е по размер на паметта, а не "
"по броя на обектите"
-#: builtin/repack.c:186
+#: builtin/repack.c:192
msgid "limits the maximum delta depth"
msgstr "ограничаване на максималната дълбочина на делтата"
-#: builtin/repack.c:188
+#: builtin/repack.c:194
msgid "maximum size of each packfile"
msgstr "максимален размер на всеки пакет"
-#: builtin/repack.c:190
+#: builtin/repack.c:196
msgid "repack objects in packs marked with .keep"
msgstr "препакетиране на обектите в пакети белязани с „.keep“"
-#: builtin/repack.c:200
+#: builtin/repack.c:206
msgid "cannot delete packs in a precious-objects repo"
msgstr "пакетите в хранилище с важни обекти не може да се трият"
-#: builtin/repack.c:204
+#: builtin/repack.c:210
msgid "--keep-unreachable and -A are incompatible"
msgstr "Опциите „--keep-unreachable“ и „-A“ са несъвместими"
-#: builtin/repack.c:391 builtin/worktree.c:115
+#: builtin/repack.c:400 builtin/worktree.c:115
#, c-format
msgid "failed to remove '%s'"
msgstr "директорията „%s“ не може да бъде изтрита"
@@ -11981,22 +12684,22 @@
msgid "git replace [--format=<format>] [-l [<pattern>]]"
msgstr "git replace [--format=ФОРМАТ] [-l [ШАБЛОН]]"
-#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
+#: builtin/replace.c:330 builtin/replace.c:368 builtin/replace.c:396
#, c-format
msgid "Not a valid object name: '%s'"
msgstr "Неправилно име на обект: „%s“"
-#: builtin/replace.c:355
+#: builtin/replace.c:360
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "етикетът при сливане в подаването „%s“ e неправилен"
-#: builtin/replace.c:357
+#: builtin/replace.c:362
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr "етикетът при сливане в подаването „%s“ e неправилен"
-#: builtin/replace.c:368
+#: builtin/replace.c:373
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -12005,45 +12708,45 @@
"Първоначалното подаване „%s“ съдържа етикета при сливане „%s“, който е "
"изхвърлен, затова използвайте опцията „--edit“, а не „--graft“."
-#: builtin/replace.c:401
+#: builtin/replace.c:406
#, c-format
msgid "the original commit '%s' has a gpg signature."
msgstr "Първоначалното подаване „%s“ е с подпис на GPG."
-#: builtin/replace.c:402
+#: builtin/replace.c:407
msgid "the signature will be removed in the replacement commit!"
msgstr "Подписът ще бъде премахнат в заменящото подаване!"
-#: builtin/replace.c:408
+#: builtin/replace.c:413
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr "заменящото подаване за „%s“ не може да бъде записано"
-#: builtin/replace.c:432
+#: builtin/replace.c:437
msgid "list replace refs"
msgstr "извеждане на списъка с указателите за замяна"
-#: builtin/replace.c:433
+#: builtin/replace.c:438
msgid "delete replace refs"
msgstr "изтриване на указателите за замяна"
-#: builtin/replace.c:434
+#: builtin/replace.c:439
msgid "edit existing object"
msgstr "редактиране на съществуващ обект"
-#: builtin/replace.c:435
+#: builtin/replace.c:440
msgid "change a commit's parents"
msgstr "смяна на родителите на подаване"
-#: builtin/replace.c:436
+#: builtin/replace.c:441
msgid "replace the ref if it exists"
msgstr "замяна на указателя, ако съществува"
-#: builtin/replace.c:437
+#: builtin/replace.c:442
msgid "do not pretty-print contents for --edit"
msgstr "без форматирано извеждане на съдържанието — за опцията „--edit“"
-#: builtin/replace.c:438
+#: builtin/replace.c:443
msgid "use this format"
msgstr "използване на този ФОРМАТ"
@@ -12124,12 +12827,10 @@
msgid "reset only HEAD"
msgstr "само указателя „HEAD“, без индекса и работното дърво"
-# FIXME vs man page
#: builtin/reset.c:281 builtin/reset.c:283
msgid "reset HEAD, index and working tree"
msgstr "указателя „HEAD“, индекса и работното дърво"
-# FIXME vs man page
#: builtin/reset.c:285
msgid "reset HEAD but keep local changes"
msgstr "зануляване на указателя „HEAD“, но запазване на локалните промени"
@@ -12191,23 +12892,23 @@
msgid "rev-list does not support display of notes"
msgstr "командата „rev-list“ не поддържа извеждането на бележки"
-#: builtin/rev-parse.c:386
+#: builtin/rev-parse.c:393
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [ОПЦИЯ…] -- [АРГУМЕНТ…]"
-#: builtin/rev-parse.c:391
+#: builtin/rev-parse.c:398
msgid "keep the `--` passed as an arg"
msgstr "зададеният низ „--“ да се тълкува като аргумент"
-#: builtin/rev-parse.c:393
+#: builtin/rev-parse.c:400
msgid "stop parsing after the first non-option argument"
msgstr "спиране на анализа след първия аргумент, който не е опция"
-#: builtin/rev-parse.c:396
+#: builtin/rev-parse.c:403
msgid "output in stuck long form"
msgstr "изход в дългия формат"
-#: builtin/rev-parse.c:527
+#: builtin/rev-parse.c:534
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
@@ -12238,68 +12939,72 @@
msgid "git cherry-pick <subcommand>"
msgstr "git cherry-pick ПОДКОМАНДА"
-#: builtin/revert.c:71
+#: builtin/revert.c:89
#, c-format
msgid "%s: %s cannot be used with %s"
msgstr "%s: опцията „%s“ е несъвместима с „%s“"
-#: builtin/revert.c:80
+#: builtin/revert.c:98
msgid "end revert or cherry-pick sequence"
msgstr "завършване на поредица от отбирания или отмени на подавания"
-#: builtin/revert.c:81
+#: builtin/revert.c:99
msgid "resume revert or cherry-pick sequence"
msgstr "продължаване на поредица от отбирания или отмени на подавания"
-#: builtin/revert.c:82
+#: builtin/revert.c:100
msgid "cancel revert or cherry-pick sequence"
msgstr "отмяна на поредица от отбирания или отмени на подавания"
-#: builtin/revert.c:83
+#: builtin/revert.c:101
msgid "don't automatically commit"
msgstr "без автоматично подаване"
-#: builtin/revert.c:84
+#: builtin/revert.c:102
msgid "edit the commit message"
msgstr "редактиране на съобщението при подаване"
-#: builtin/revert.c:87
-msgid "parent number"
+#: builtin/revert.c:105
+msgid "parent-number"
msgstr "номер на родителя"
-#: builtin/revert.c:89
+#: builtin/revert.c:106
+msgid "select mainline parent"
+msgstr "избор на основния родител"
+
+#: builtin/revert.c:108
msgid "merge strategy"
msgstr "стратегия на сливане"
-#: builtin/revert.c:90
+#: builtin/revert.c:109
msgid "option"
msgstr "опция"
-#: builtin/revert.c:91
+#: builtin/revert.c:110
msgid "option for merge strategy"
msgstr "опция за стратегията на сливане"
-#: builtin/revert.c:100
+#: builtin/revert.c:119
msgid "append commit name"
msgstr "добавяне на името на подаването"
-#: builtin/revert.c:102
+#: builtin/revert.c:121
msgid "preserve initially empty commits"
msgstr "запазване на първоначално празните подавания"
-#: builtin/revert.c:103
+#: builtin/revert.c:122
msgid "allow commits with empty messages"
msgstr "позволяване на празни съобщения при подаване"
-#: builtin/revert.c:104
+#: builtin/revert.c:123
msgid "keep redundant, empty commits"
msgstr "запазване на излишните, празни подавания"
-#: builtin/revert.c:192
+#: builtin/revert.c:211
msgid "revert failed"
msgstr "неуспешна отмяна"
-#: builtin/revert.c:205
+#: builtin/revert.c:224
msgid "cherry-pick failed"
msgstr "неуспешно отбиране"
@@ -12307,31 +13012,7 @@
msgid "git rm [<options>] [--] <file>..."
msgstr "git rm [ОПЦИЯ…] [--] ФАЙЛ…"
-#: builtin/rm.c:65
-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] ""
-"следният подмодул или някой от неговите подмодули използват директория на "
-"име\n"
-"„.git“:"
-msgstr[1] ""
-"следните подмодули или някои от техните подмодули използват директория на "
-"име\n"
-"„.git“:"
-
-#: builtin/rm.c:71
-msgid ""
-"\n"
-"(use 'rm -rf' if you really want to remove it including all of its history)"
-msgstr ""
-"\n"
-"(ако искате да ги изтриете заедно с цялата им история, използвайте „rm -rf“)"
-
-#: builtin/rm.c:230
+#: builtin/rm.c:205
msgid ""
"the following file has staged content different from both the\n"
"file and the HEAD:"
@@ -12347,7 +13028,7 @@
"съдържание и\n"
"различно от съответстващото на HEAD:"
-#: builtin/rm.c:235
+#: builtin/rm.c:210
msgid ""
"\n"
"(use -f to force removal)"
@@ -12355,13 +13036,13 @@
"\n"
"(за принудително изтриване използвайте опцията „-f“)"
-#: builtin/rm.c:239
+#: builtin/rm.c:214
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:243 builtin/rm.c:254
+#: builtin/rm.c:218 builtin/rm.c:227
msgid ""
"\n"
"(use --cached to keep the file, or -f to force removal)"
@@ -12370,44 +13051,49 @@
"(за запазване на файла използвайте опцията „--cached“, а за принудително\n"
"изтриване — „-f“)"
-#: builtin/rm.c:251
+#: builtin/rm.c:224
msgid "the following file has local modifications:"
msgid_plural "the following files have local modifications:"
msgstr[0] "следният файл е с променено съдържание"
msgstr[1] "следните файлове са с променено съдържание"
-#: builtin/rm.c:269
+#: builtin/rm.c:242
msgid "do not list removed files"
msgstr "да не се извеждат изтритите файлове"
-#: builtin/rm.c:270
+#: builtin/rm.c:243
msgid "only remove from the index"
msgstr "изтриване само от индекса"
-#: builtin/rm.c:271
+#: builtin/rm.c:244
msgid "override the up-to-date check"
msgstr "въпреки проверката за актуалността на съдържанието"
-#: builtin/rm.c:272
+#: builtin/rm.c:245
msgid "allow recursive removal"
msgstr "рекурсивно изтриване"
-#: builtin/rm.c:274
+#: builtin/rm.c:247
msgid "exit with a zero status even if nothing matched"
msgstr ""
"изходният код да е 0, дори ако никой файл нe e напаснал с шаблона за "
"изтриване"
-#: builtin/rm.c:335
+#: builtin/rm.c:308
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "без използването на опцията „-r“ „%s“ няма да се изтрие рекурсивно"
-#: builtin/rm.c:374
+#: builtin/rm.c:347
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm: „%s“ не може да се изтрие"
+#: builtin/rm.c:370
+#, c-format
+msgid "could not remove '%s'"
+msgstr "„%s“ не може да бъде изтрит"
+
#: builtin/send-pack.c:18
msgid ""
"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
@@ -12419,19 +13105,19 @@
"pack=ПАКЕТ] [--verbose] [--thin] [--atomic] [ХОСТ:]ДИРЕКТОРИЯ [УКАЗАТЕЛ…]\n"
" опцията „--all“ и изричното посочване на УКАЗАТЕЛ са взаимно несъвместими."
-#: builtin/send-pack.c:160
+#: builtin/send-pack.c:161
msgid "remote name"
msgstr "име на отдалечено хранилище"
-#: builtin/send-pack.c:171
+#: builtin/send-pack.c:175
msgid "use stateless RPC protocol"
msgstr "използване на протокол без запазване на състоянието за RPC"
-#: builtin/send-pack.c:172
+#: builtin/send-pack.c:176
msgid "read refs from stdin"
msgstr "четене на указателите от стандартния вход"
-#: builtin/send-pack.c:173
+#: builtin/send-pack.c:177
msgid "print status from remote helper"
msgstr "извеждане на състоянието от отдалечената помощна функция"
@@ -12439,23 +13125,27 @@
msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
msgstr "git shortlog [ОПЦИЯ…] [ДИАПАЗОН_НА_ВЕРСИИТЕ] [[--] [ПЪТ…]]"
-#: builtin/shortlog.c:242
+#: builtin/shortlog.c:248
+msgid "Group by committer rather than author"
+msgstr "Групиране по подаващ, а не по автор"
+
+#: builtin/shortlog.c:250
msgid "sort output according to the number of commits per author"
msgstr "подредба на подаванията по броя подавания от автор"
-#: builtin/shortlog.c:244
+#: builtin/shortlog.c:252
msgid "Suppress commit descriptions, only provides commit count"
msgstr "Без описания на подаванията — да се показва само броя подавания"
-#: builtin/shortlog.c:246
+#: builtin/shortlog.c:254
msgid "Show the email address of each author"
msgstr "Извеждане на адреса на е-поща за всеки автор"
-#: builtin/shortlog.c:247
+#: builtin/shortlog.c:255
msgid "w[,i1[,i2]]"
msgstr "ШИРОЧИНА[,ОТСТЪП_1[,ОТСТЪП_2]]"
-#: builtin/shortlog.c:248
+#: builtin/shortlog.c:256
msgid "Linewrap output"
msgstr ""
"Пренасяне на редовете до тази обща ШИРОЧИНА (76), с ОТСТЪП_1 (6) за първия "
@@ -12477,124 +13167,124 @@
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr "git show-branch (-g | --reflog)[=БРОЙ[,БАЗА]] [--list] [УКАЗАТЕЛ]"
-#: builtin/show-branch.c:375
+#: builtin/show-branch.c:374
#, 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:541
+#: builtin/show-branch.c:536
#, c-format
msgid "no matching refs with %s"
msgstr "никой указател не съвпада с „%s“"
-#: builtin/show-branch.c:639
+#: builtin/show-branch.c:632
msgid "show remote-tracking and local branches"
msgstr "извеждане на следящите и локалните клони"
-#: builtin/show-branch.c:641
+#: builtin/show-branch.c:634
msgid "show remote-tracking branches"
msgstr "извеждане на следящите клони"
-#: builtin/show-branch.c:643
+#: builtin/show-branch.c:636
msgid "color '*!+-' corresponding to the branch"
msgstr "оцветяване на „*!+-“ според клоните"
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:638
msgid "show <n> more commits after the common ancestor"
msgstr "извеждане на такъв БРОЙ подавания от общия предшественик"
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:640
msgid "synonym to more=-1"
msgstr "синоним на „more=-1“"
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:641
msgid "suppress naming strings"
msgstr "без низове за имената на клоните"
-#: builtin/show-branch.c:650
+#: builtin/show-branch.c:643
msgid "include the current branch"
msgstr "включване и на текущия клон"
-#: builtin/show-branch.c:652
+#: builtin/show-branch.c:645
msgid "name commits with their object names"
msgstr "именуване на подаванията с имената им на обекти"
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:647
msgid "show possible merge bases"
msgstr "извеждане на възможните бази за сливания"
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:649
msgid "show refs unreachable from any other ref"
msgstr "извеждане на недостижимите указатели"
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:651
msgid "show commits in topological order"
msgstr "извеждане на подаванията в топологическа подредба"
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:654
msgid "show only commits not on the first branch"
msgstr "извеждане само на подаванията, които не са от първия клон"
-#: builtin/show-branch.c:663
+#: builtin/show-branch.c:656
msgid "show merges reachable from only one tip"
msgstr "извеждане на сливанията, които могат да се достигнат само от един връх"
-#: builtin/show-branch.c:665
+#: builtin/show-branch.c:658
msgid "topologically sort, maintaining date order where possible"
msgstr ""
"топологическа подредба, при запазване на подредбата по дата, доколкото е\n"
"възможно"
-#: builtin/show-branch.c:668
+#: builtin/show-branch.c:661
msgid "<n>[,<base>]"
msgstr "БРОЙ[,БАЗА]"
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:662
msgid "show <n> most recent ref-log entries starting at base"
msgstr "показване на най-много БРОЙ журнални записа с начало съответната БАЗА"
-#: builtin/show-branch.c:703
+#: builtin/show-branch.c:696
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr ""
"опцията „--reflog“ е несъвместима с опциите „--all“, „--remotes“, „--"
"independent“ и „--merge-base“"
-#: builtin/show-branch.c:727
+#: builtin/show-branch.c:720
msgid "no branches given, and HEAD is not valid"
msgstr "не е зададен клон, а указателят „HEAD“ е неправилен"
-#: builtin/show-branch.c:730
+#: builtin/show-branch.c:723
msgid "--reflog option needs one branch name"
msgstr "опцията „--track“ изисква точно едно име на клон"
-#: builtin/show-branch.c:733
+#: builtin/show-branch.c:726
#, 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:737
+#: builtin/show-branch.c:730
#, c-format
msgid "no such ref %s"
msgstr "такъв указател няма: %s"
-#: builtin/show-branch.c:829
+#: builtin/show-branch.c:814
#, 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:833
+#: builtin/show-branch.c:818
#, c-format
msgid "'%s' is not a valid ref."
msgstr "„%s“ е неправилен указател."
-#: builtin/show-branch.c:836
+#: builtin/show-branch.c:821
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "подаването „%s“ (%s) липсва"
@@ -12611,37 +13301,37 @@
msgid "git show-ref --exclude-existing[=<pattern>]"
msgstr "git show-ref --exclude-existing[=ШАБЛОН]"
-#: builtin/show-ref.c:165
+#: builtin/show-ref.c:159
msgid "only show tags (can be combined with heads)"
msgstr "извеждане на етикетите (може да се комбинира с върховете)"
-#: builtin/show-ref.c:166
+#: builtin/show-ref.c:160
msgid "only show heads (can be combined with tags)"
msgstr "извеждане на върховете (може да се комбинира с етикетите)"
-#: builtin/show-ref.c:167
+#: builtin/show-ref.c:161
msgid "stricter reference checking, requires exact ref path"
msgstr "строга проверка на указателите, изисква се указател с пълен път"
-#: builtin/show-ref.c:170 builtin/show-ref.c:172
+#: builtin/show-ref.c:164 builtin/show-ref.c:166
msgid "show the HEAD reference, even if it would be filtered out"
msgstr "задължително извеждане и на указателя HEAD"
-#: builtin/show-ref.c:174
+#: builtin/show-ref.c:168
msgid "dereference tags into object IDs"
msgstr "да се извеждат идентификаторите на обектите-етикети"
-#: builtin/show-ref.c:176
+#: builtin/show-ref.c:170
msgid "only show SHA1 hash using <n> digits"
msgstr "извеждане само на този БРОЙ цифри от всяка сума по SHA1"
-#: builtin/show-ref.c:180
+#: builtin/show-ref.c:174
msgid "do not print results to stdout (useful with --verify)"
msgstr ""
"без извеждане на резултатите на стандартния вход (полезно с опцията „--"
"verify“)"
-#: builtin/show-ref.c:182
+#: builtin/show-ref.c:176
msgid "show refs from stdin that aren't in local repository"
msgstr ""
"извеждане на указателите приети от стандартния вход, които липсват в "
@@ -12663,12 +13353,12 @@
msgid "prepend comment character and space to each line"
msgstr "добавяне на „# “ в началото на всеки ред"
-#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1046
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1075
#, c-format
msgid "No such ref: %s"
msgstr "Такъв указател няма: %s"
-#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1055
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1084
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Очаква се пълно име на указател, а не „%s“"
@@ -12678,95 +13368,103 @@
msgid "cannot strip one component off url '%s'"
msgstr "не може да се махне компонент от адреса „%s“"
-#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:408
-#: builtin/submodule--helper.c:590
+#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630
msgid "alternative anchor for relative paths"
msgstr "директория за определянето на относителните пътища"
-#: builtin/submodule--helper.c:287
+#: builtin/submodule--helper.c:310
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=ПЪТ] [ПЪТ…]"
-#: builtin/submodule--helper.c:329 builtin/submodule--helper.c:343
+#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "Във файла „.gitmodules“ не е открит адрес за пътя към подмодул „%s“"
-#: builtin/submodule--helper.c:369
+#: builtin/submodule--helper.c:395
+#, c-format
+msgid ""
+"could not lookup configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr ""
+"настройката „%s“ липсва. Приема се, че това хранилище е правилният източник "
+"за себе си."
+
+#: builtin/submodule--helper.c:406
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Неуспешно регистриране на адрес за пътя към подмодул „%s“"
-#: builtin/submodule--helper.c:373
+#: builtin/submodule--helper.c:410
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Регистриран е подмодул „%s“ (%s) за пътя към подмодул „%s“\n"
-#: builtin/submodule--helper.c:383
+#: builtin/submodule--helper.c:420
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "ПРЕДУПРЕЖДЕНИЕ: препоръчва се режим на обновяване за подмодула „%s“\n"
-#: builtin/submodule--helper.c:390
+#: builtin/submodule--helper.c:427
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
"Неуспешно регистриране на режима на обновяване за пътя към подмодул „%s“"
-#: builtin/submodule--helper.c:409
+#: builtin/submodule--helper.c:443
msgid "Suppress output for initializing a submodule"
msgstr "Без извеждане на информация при инициализирането на подмодул"
-#: builtin/submodule--helper.c:414
+#: builtin/submodule--helper.c:448
msgid "git submodule--helper init [<path>]"
msgstr "git submodule--helper name [ПЪТ]"
-#: builtin/submodule--helper.c:435
+#: builtin/submodule--helper.c:476
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name ПЪТ"
-#: builtin/submodule--helper.c:441
+#: builtin/submodule--helper.c:482
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "Във файла „.gitmodules“ липсва информация за пътя „%s“"
-#: builtin/submodule--helper.c:524 builtin/submodule--helper.c:527
+#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "към подмодула „%s“ не може да се добави алтернативен източник: %s"
-#: builtin/submodule--helper.c:563
+#: builtin/submodule--helper.c:604
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr ""
"Непозната стойност „%s“ за настройката „submodule.alternateErrorStrategy“"
-#: builtin/submodule--helper.c:570
+#: builtin/submodule--helper.c:611
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "Непозната стойност „%s“ за настройката „submodule.alternateLocation“"
-#: builtin/submodule--helper.c:593
+#: builtin/submodule--helper.c:633
msgid "where the new submodule will be cloned to"
msgstr "къде да се клонира новият подмодул"
-#: builtin/submodule--helper.c:596
+#: builtin/submodule--helper.c:636
msgid "name of the new submodule"
msgstr "име на новия подмодул"
-#: builtin/submodule--helper.c:599
+#: builtin/submodule--helper.c:639
msgid "url where to clone the submodule from"
msgstr "адрес, от който да се клонира новият подмодул"
-#: builtin/submodule--helper.c:605
+#: builtin/submodule--helper.c:645
msgid "depth for shallow clones"
msgstr "дълбочина на плитките хранилища"
-#: builtin/submodule--helper.c:608 builtin/submodule--helper.c:964
+#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993
msgid "force cloning progress"
msgstr "извеждане на напредъка на клонирането"
-#: builtin/submodule--helper.c:613
+#: builtin/submodule--helper.c:653
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -12774,99 +13472,85 @@
"git submodule--helper clone [--prefix=ПЪТ] [--quiet] [--reference ХРАНИЛИЩЕ] "
"[--name ИМЕ] [--depth ДЪЛБОЧИНА] --url АДРЕС --path ПЪТ…"
-#: builtin/submodule--helper.c:638 builtin/submodule--helper.c:648
-#, c-format
-msgid "could not create directory '%s'"
-msgstr "Директорията „%s“ не може да бъде създадена"
-
-#: builtin/submodule--helper.c:644
+#: builtin/submodule--helper.c:684
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "Неуспешно клониране на адреса „%s“ в пътя „%s“ като подмодул"
-#: builtin/submodule--helper.c:660
-#, c-format
-msgid "cannot open file '%s'"
-msgstr "файлът „%s“ не може да бъде отворен"
-
-#: builtin/submodule--helper.c:665
-#, c-format
-msgid "could not close file %s"
-msgstr "файлът „%s“ не може да се затвори"
-
-#: builtin/submodule--helper.c:672
+#: builtin/submodule--helper.c:699
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "директорията на подмодула „%s“ не може да бъде получена"
-#: builtin/submodule--helper.c:726
+#: builtin/submodule--helper.c:764
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Пътят на подмодула „%s“ не е инициализиран"
-#: builtin/submodule--helper.c:730
+#: builtin/submodule--helper.c:768
msgid "Maybe you want to use 'update --init'?"
msgstr "Вероятно искахте да използвате „update --init“?"
-#: builtin/submodule--helper.c:756
+#: builtin/submodule--helper.c:793
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Прескачане на неслетия подмодул „%s“"
-#: builtin/submodule--helper.c:777
+#: builtin/submodule--helper.c:814
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Прескачане на подмодула „%s“"
-#: builtin/submodule--helper.c:913
+#: builtin/submodule--helper.c:942
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Неуспешен опит за клониране на „%s“. Насрочен е втори опит"
-#: builtin/submodule--helper.c:924
+#: builtin/submodule--helper.c:953
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
-msgstr "Втори неуспешен опит за клониране на „%s“. Действието се отказва"
+msgstr ""
+"Втори неуспешен опит за клониране на „%s“. Действието се преустановява"
-#: builtin/submodule--helper.c:945
+#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162
msgid "path into the working tree"
msgstr "път към работното дърво"
-#: builtin/submodule--helper.c:948
+#: builtin/submodule--helper.c:977
msgid "path into the working tree, across nested submodule boundaries"
msgstr "път към работното дърво, през границите на вложените подмодули"
-#: builtin/submodule--helper.c:952
+#: builtin/submodule--helper.c:981
msgid "rebase, merge, checkout or none"
msgstr ""
"„rebase“ (пребазиране), „merge“ (сливане), „checkout“ (изтегляне) или "
"„none“ (нищо да не се прави)"
-#: builtin/submodule--helper.c:956
+#: builtin/submodule--helper.c:985
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr "Плитко клониране, ограничено до указания брой версии"
-#: builtin/submodule--helper.c:959
+#: builtin/submodule--helper.c:988
msgid "parallel jobs"
msgstr "брой паралелни процеси"
-#: builtin/submodule--helper.c:961
+#: builtin/submodule--helper.c:990
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "дали първоначалното клониране да е плитко, както се препоръчва"
-#: builtin/submodule--helper.c:962
+#: builtin/submodule--helper.c:991
msgid "don't print cloning progress"
msgstr "без извеждане на напредъка на клонирането"
-#: builtin/submodule--helper.c:969
+#: builtin/submodule--helper.c:998
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=ПЪТ] [ПЪТ…]"
-#: builtin/submodule--helper.c:979
+#: builtin/submodule--helper.c:1008
msgid "bad value for update parameter"
msgstr "неправилен параметър към опцията „--update“"
-#: builtin/submodule--helper.c:1050
+#: builtin/submodule--helper.c:1079
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -12875,11 +13559,24 @@
"Клонът на подмодула „%s“ е настроен да наследява клона от обхващащия проект, "
"но той не е на никой клон"
-#: builtin/submodule--helper.c:1100
+#: builtin/submodule--helper.c:1163
+msgid "recurse into submodules"
+msgstr "рекурсивно обхождане подмодулите"
+
+#: builtin/submodule--helper.c:1169
+msgid "git submodule--helper embed-git-dir [<path>...]"
+msgstr "git submodule--helper name 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:1107
+#: builtin/submodule--helper.c:1233
+#, c-format
+msgid "%s doesn't support --super-prefix"
+msgstr "„%s“ не поддържа опцията „--super-prefix“"
+
+#: builtin/submodule--helper.c:1239
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "„%s“ не е подкоманда на „submodule--helper“"
@@ -12924,35 +13621,30 @@
msgid "git tag -d <tagname>..."
msgstr "git tag -d ЕТИКЕТ…"
-# FIXME tabulator
#: builtin/tag.c:25
msgid ""
-"git tag -l [-n[<num>]] [--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БРОЙ] [--contains ПОДАВАНЕ] [--points-at ОБЕКТ]\n"
+"git tag -l [-n[БРОЙ]] [--contains ПОДАВАНЕ] [--points-at ОБЕКТ]\n"
" [--format=ФОРМАТ] [--[no-]merged [ПОДАВАНЕ]] [ШАБЛОН…]"
#: builtin/tag.c:27
-msgid "git tag -v <tagname>..."
-msgstr "git tag -v ЕТИКЕТ…"
+msgid "git tag -v [--format=<format>] <tagname>..."
+msgstr "git tag -v [--format=ФОРМАТ] ЕТИКЕТ…"
-#: builtin/tag.c:81
-#, c-format
-msgid "tag name too long: %.*s..."
-msgstr "името на етикета е твърде дълго: „%.*s“…"
-
-#: builtin/tag.c:86
+#: builtin/tag.c:83
#, c-format
msgid "tag '%s' not found."
msgstr "етикетът „%s“ не е открит."
-#: builtin/tag.c:101
+#: builtin/tag.c:99
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Изтрит е етикетът „%s“ (бе „%s“)\n"
-#: builtin/tag.c:117
+#: builtin/tag.c:128
#, c-format
msgid ""
"\n"
@@ -12965,7 +13657,7 @@
" %s\n"
"Редовете, които започват с „%c“, ще бъдат пропуснати.\n"
-#: builtin/tag.c:121
+#: builtin/tag.c:132
#, c-format
msgid ""
"\n"
@@ -12980,138 +13672,142 @@
"Редовете, които започват с „%c“, също ще бъдат включени — може да ги "
"изтриете вие.\n"
-#: builtin/tag.c:199
+#: builtin/tag.c:210
msgid "unable to sign the tag"
msgstr "етикетът не може да бъде подписан"
-#: builtin/tag.c:201
+#: builtin/tag.c:212
msgid "unable to write tag file"
msgstr "файлът за етикета не може да бъде запазен"
-#: builtin/tag.c:226
+#: builtin/tag.c:236
msgid "bad object type."
msgstr "неправилен вид обект."
-#: builtin/tag.c:239
-msgid "tag header too big."
-msgstr "заглавната част на етикета е прекалено дълга."
-
-#: builtin/tag.c:275
+#: builtin/tag.c:282
msgid "no tag message?"
msgstr "липсва съобщение за етикета"
-#: builtin/tag.c:281
+#: builtin/tag.c:289
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Съобщението за етикета е запазено във файла „%s“\n"
-#: builtin/tag.c:339
+#: builtin/tag.c:397
msgid "list tag names"
msgstr "извеждане на имената на етикетите"
-#: builtin/tag.c:341
+#: builtin/tag.c:399
msgid "print <n> lines of each tag message"
msgstr "извеждане на този БРОЙ редове от всяко съобщение за етикет"
-#: builtin/tag.c:343
+#: builtin/tag.c:401
msgid "delete tags"
msgstr "изтриване на етикети"
-#: builtin/tag.c:344
+#: builtin/tag.c:402
msgid "verify tags"
msgstr "проверка на етикети"
-#: builtin/tag.c:346
+#: builtin/tag.c:404
msgid "Tag creation options"
msgstr "Опции при създаването на етикети"
-#: builtin/tag.c:348
+#: builtin/tag.c:406
msgid "annotated tag, needs a message"
msgstr "анотирането на етикети изисква съобщение"
-#: builtin/tag.c:350
+#: builtin/tag.c:408
msgid "tag message"
msgstr "СЪОБЩЕНИЕ за етикет"
-#: builtin/tag.c:352
+#: builtin/tag.c:410
msgid "annotated and GPG-signed tag"
msgstr "анотиран етикет с подпис по GPG"
-#: builtin/tag.c:356
+#: builtin/tag.c:414
msgid "use another key to sign the tag"
msgstr "използване на друг ключ за подписването на етикет"
-#: builtin/tag.c:357
+#: builtin/tag.c:415
msgid "replace the tag if exists"
msgstr "замяна на етикета, ако съществува"
-#: builtin/tag.c:358 builtin/update-ref.c:368
+#: builtin/tag.c:416 builtin/update-ref.c:368
msgid "create a reflog"
msgstr "създаване на журнал на указателите"
-#: builtin/tag.c:360
+#: builtin/tag.c:418
msgid "Tag listing options"
msgstr "Опции за извеждането на етикети"
-#: builtin/tag.c:361
+#: builtin/tag.c:419
msgid "show tag list in columns"
msgstr "извеждане на списъка на етикетите по колони"
-#: builtin/tag.c:362 builtin/tag.c:363
+#: builtin/tag.c:420 builtin/tag.c:422
msgid "print only tags that contain the commit"
msgstr "извеждане само на етикетите, които съдържат подаването"
-#: builtin/tag.c:364
+#: builtin/tag.c:421 builtin/tag.c:423
+msgid "print only tags that don't contain the commit"
+msgstr "извеждане само на етикетите, които не съдържат подаването"
+
+#: builtin/tag.c:424
msgid "print only tags that are merged"
msgstr "извеждане само на слетите етикети"
-#: builtin/tag.c:365
+#: builtin/tag.c:425
msgid "print only tags that are not merged"
msgstr "извеждане само на неслетите етикети"
-#: builtin/tag.c:370
+#: builtin/tag.c:430
msgid "print only tags of the object"
msgstr "извеждане само на етикетите на ОБЕКТА"
-#: builtin/tag.c:399
+#: builtin/tag.c:469
msgid "--column and -n are incompatible"
msgstr "Опциите „--column“ и „-n“ са несъвместими"
-#: builtin/tag.c:419
-msgid "-n option is only allowed with -l."
-msgstr "Опцията „-n“ изисква опцията „-l“."
+#: builtin/tag.c:491
+msgid "-n option is only allowed in list mode"
+msgstr "Опцията „-n“ изисква режим на списък."
-#: builtin/tag.c:421
-msgid "--contains option is only allowed with -l."
-msgstr "Опцията „-contains“ изисква опцията „-l“."
+#: builtin/tag.c:493
+msgid "--contains option is only allowed in list mode"
+msgstr "Опцията „-contains“ изисква режим на списък."
-#: builtin/tag.c:423
-msgid "--points-at option is only allowed with -l."
-msgstr "Опцията „-points-at“ изисква опцията „-l“."
+#: builtin/tag.c:495
+msgid "--no-contains option is only allowed in list mode"
+msgstr "Опцията „-contains“ изисква режим на списък."
-#: builtin/tag.c:425
-msgid "--merged and --no-merged option are only allowed with -l"
-msgstr "Опциите „--merged“ и „--no-merged“ изискват опцията „-l“."
+#: builtin/tag.c:497
+msgid "--points-at option is only allowed in list mode"
+msgstr "Опцията „-points-at“ изисква режим на списък."
-#: builtin/tag.c:433
+#: builtin/tag.c:499
+msgid "--merged and --no-merged options are only allowed in list mode"
+msgstr "Опциите „--merged“ и „--no-merged“ изискват режим на списък."
+
+#: builtin/tag.c:510
msgid "only one -F or -m option is allowed."
msgstr "Опциите „-F“ и „-m“ са несъвместими."
-#: builtin/tag.c:452
+#: builtin/tag.c:529
msgid "too many params"
msgstr "Прекалено много аргументи"
-#: builtin/tag.c:458
+#: builtin/tag.c:535
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "„%s“ е неправилно име за етикет."
-#: builtin/tag.c:463
+#: builtin/tag.c:540
#, c-format
msgid "tag '%s' already exists"
msgstr "етикетът „%s“ вече съществува"
-#: builtin/tag.c:491
+#: builtin/tag.c:570
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Обновен етикет „%s“ (бе „%s“)\n"
@@ -13140,187 +13836,203 @@
msgid "failed to delete file %s"
msgstr "файлът „%s“ не може да бъде изтрит"
-#: builtin/update-index.c:110 builtin/update-index.c:212
+#: builtin/update-index.c:110 builtin/update-index.c:216
#, c-format
msgid "failed to delete directory %s"
msgstr "директорията „%s“ не може да бъде изтрита"
-#: builtin/update-index.c:133
+#: builtin/update-index.c:135
#, c-format
msgid "Testing mtime in '%s' "
msgstr "Проверка на времето на промяна (mtime) на файла „%s“"
-#: builtin/update-index.c:145
+#: builtin/update-index.c:149
msgid "directory stat info does not change after adding a new file"
msgstr ""
"информацията получена чрез „stat“ за директорията не се променя след "
"добавянето на нов файл"
-#: builtin/update-index.c:158
+#: builtin/update-index.c:162
msgid "directory stat info does not change after adding a new directory"
msgstr ""
"информацията получена чрез „stat“ за директорията не се променя след "
"добавянето на нова директория"
-#: builtin/update-index.c:171
+#: builtin/update-index.c:175
msgid "directory stat info changes after updating a file"
msgstr ""
"информацията получена чрез „stat“ за директорията се променя след "
"обновяването на нов файл"
-#: builtin/update-index.c:182
+#: builtin/update-index.c:186
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
"информацията получена чрез „stat“ за директорията се променя след добавянето "
"на файл в поддиректория"
-#: builtin/update-index.c:193
+#: builtin/update-index.c:197
msgid "directory stat info does not change after deleting a file"
msgstr ""
"информацията получена чрез „stat“ за директорията не се променя след "
"изтриването на файл"
-#: builtin/update-index.c:206
+#: builtin/update-index.c:210
msgid "directory stat info does not change after deleting a directory"
msgstr ""
"информацията получена чрез „stat“ за директорията не се променя след "
"изтриването на директория"
-#: builtin/update-index.c:213
+#: builtin/update-index.c:217
msgid " OK"
msgstr " Добре"
-#: builtin/update-index.c:564
+#: builtin/update-index.c:568
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [ОПЦИЯ…] [--] [ФАЙЛ…]"
-#: builtin/update-index.c:919
+#: builtin/update-index.c:923
msgid "continue refresh even when index needs update"
msgstr ""
"продължаване с обновяването, дори когато индексът трябва да бъде обновен"
-#: builtin/update-index.c:922
+#: builtin/update-index.c:926
msgid "refresh: ignore submodules"
msgstr "подмодулите да се игнорират при обновяването"
-#: builtin/update-index.c:925
+#: builtin/update-index.c:929
msgid "do not ignore new files"
msgstr "новите файлове да не се игнорират"
-#: builtin/update-index.c:927
+#: builtin/update-index.c:931
msgid "let files replace directories and vice-versa"
msgstr "файлове да могат да заменят директории и обратно"
-#: builtin/update-index.c:929
+#: builtin/update-index.c:933
msgid "notice files missing from worktree"
msgstr "предупреждаване при липсващи в работното дърво файлове"
-#: builtin/update-index.c:931
+#: builtin/update-index.c:935
msgid "refresh even if index contains unmerged entries"
msgstr "обновяване дори и индексът да съдържа неслети обекти"
-#: builtin/update-index.c:934
+#: builtin/update-index.c:938
msgid "refresh stat information"
msgstr "обновяване на информацията от функцията „stat“"
-#: builtin/update-index.c:938
+#: builtin/update-index.c:942
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr ""
"като опцията „--refresh“, но да се проверят и обектите, които са били приети "
"за непроменени"
-#: builtin/update-index.c:942
+#: builtin/update-index.c:946
msgid "<mode>,<object>,<path>"
msgstr "РЕЖИМ,ОБЕКТ,ПЪТ"
-#: builtin/update-index.c:943
+#: builtin/update-index.c:947
msgid "add the specified entry to the index"
msgstr "добавяне на изброените обекти към индекса"
-#: builtin/update-index.c:952
+#: builtin/update-index.c:956
msgid "mark files as \"not changing\""
msgstr "задаване на флаг, че файлът не се променя"
-#: builtin/update-index.c:955
+#: builtin/update-index.c:959
msgid "clear assumed-unchanged bit"
msgstr "изчистване на флага, че файлът не се променя"
-#: builtin/update-index.c:958
+#: builtin/update-index.c:962
msgid "mark files as \"index-only\""
msgstr "задаване на флаг, че файловете са само за индекса"
-#: builtin/update-index.c:961
+#: builtin/update-index.c:965
msgid "clear skip-worktree bit"
msgstr "изчистване на флага, че файловете са само за индекса"
-#: builtin/update-index.c:964
+#: builtin/update-index.c:968
msgid "add to index only; do not add content to object database"
msgstr "добавяне само към индекса без добавяне към базата от данни за обектите"
-#: builtin/update-index.c:966
+#: builtin/update-index.c:970
msgid "remove named paths even if present in worktree"
msgstr "изтриване на указаните пътища, дори и да съществуват в работното дърво"
-#: builtin/update-index.c:968
+#: builtin/update-index.c:972
msgid "with --stdin: input lines are terminated by null bytes"
msgstr ""
"при комбиниране с опцията „--stdin“ — входните редове са разделени с нулевия "
"байт"
-#: builtin/update-index.c:970
+#: builtin/update-index.c:974
msgid "read list of paths to be updated from standard input"
msgstr "изчитане на списъка с пътища за обновяване от стандартния вход"
-#: builtin/update-index.c:974
+#: builtin/update-index.c:978
msgid "add entries from standard input to the index"
msgstr "добавяне на елементите от стандартния вход към индекса"
-#: builtin/update-index.c:978
+#: builtin/update-index.c:982
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr ""
"възстановяване на състоянието преди сливане или нужда от обновяване за "
"изброените пътища"
-#: builtin/update-index.c:982
+#: builtin/update-index.c:986
msgid "only update entries that differ from HEAD"
msgstr "добавяне само на съдържанието, което се различава от това в „HEAD“"
-#: builtin/update-index.c:986
+#: builtin/update-index.c:990
msgid "ignore files missing from worktree"
msgstr "игнориране на файловете, които липсват в работното дърво"
-#: builtin/update-index.c:989
+#: builtin/update-index.c:993
msgid "report actions to standard output"
msgstr "извеждане на действията на стандартния изход"
-#: builtin/update-index.c:991
+#: builtin/update-index.c:995
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr ""
"забравяне на записаната информация за неразрешени конфликти — за командите "
"от потребителско ниво"
-#: builtin/update-index.c:995
+#: builtin/update-index.c:999
msgid "write index in this format"
msgstr "записване на индекса в този формат"
-#: builtin/update-index.c:997
+#: builtin/update-index.c:1001
msgid "enable or disable split index"
msgstr "включване или изключване на разделянето на индекса"
-#: builtin/update-index.c:999
+#: builtin/update-index.c:1003
msgid "enable/disable untracked cache"
msgstr "включване/изключване на кеша за неследените файлове"
-#: builtin/update-index.c:1001
+#: builtin/update-index.c:1005
msgid "test if the filesystem supports untracked cache"
msgstr "проверка дали файловата система поддържа кеш за неследени файлове"
-#: builtin/update-index.c:1003
+#: builtin/update-index.c:1007
msgid "enable untracked cache without testing the filesystem"
msgstr ""
"включване на кеша за неследените файлове без проверка на файловата система"
-#: builtin/update-index.c:1119
+#: builtin/update-index.c:1107
+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
+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
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
@@ -13328,11 +14040,11 @@
"Настройката „core.untrackedCache“ е зададена на „true“ (истина). Сменете я "
"или я изтрийте, за да изключите кеша за неследените файлове"
-#: builtin/update-index.c:1123
+#: builtin/update-index.c:1131
msgid "Untracked cache disabled"
msgstr "Кешът за неследените файлове е изключен"
-#: builtin/update-index.c:1131
+#: builtin/update-index.c:1139
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
@@ -13340,7 +14052,7 @@
"Настройката „core.untrackedCache“ е зададена на „false“ (лъжа). Сменете я "
"или я изтрийте, за да включите кеша за неследените файлове"
-#: builtin/update-index.c:1135
+#: builtin/update-index.c:1143
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "Кешът за неследените файлове е включен за „%s“"
@@ -13391,7 +14103,7 @@
msgid "print commit contents"
msgstr "извеждане на съдържанието на подаването"
-#: builtin/verify-commit.c:73 builtin/verify-tag.c:35
+#: builtin/verify-commit.c:73 builtin/verify-tag.c:37
msgid "print raw gpg status output"
msgstr "извеждане на необработения изход от състоянието на „gpg“"
@@ -13407,11 +14119,11 @@
msgid "show statistics only"
msgstr "извеждане само на статистиката"
-#: builtin/verify-tag.c:17
-msgid "git verify-tag [-v | --verbose] <tag>..."
-msgstr "git verify-tag [-v | --verbose] ЕТИКЕТ…"
+#: builtin/verify-tag.c:18
+msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
+msgstr "git verify-tag [-v | --verbose] [--format=ФОРМАТ] ЕТИКЕТ…"
-#: builtin/verify-tag.c:34
+#: builtin/verify-tag.c:36
msgid "print tag contents"
msgstr "извеждане на съдържанието на ЕТИКЕТи"
@@ -13435,93 +14147,105 @@
msgid "git worktree unlock <path>"
msgstr "git worktree unlock [ПЪТ]"
-#: builtin/worktree.c:42
+#: builtin/worktree.c:43
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Изтриване на „worktrees/%s“: не е правилна поддиректория"
-#: builtin/worktree.c:48
+#: builtin/worktree.c:49
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Изтриване на „worktrees/%s“: файлът „gitdir“ не съществува"
-#: builtin/worktree.c:53
+#: builtin/worktree.c:54
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr ""
"Изтриване на „worktrees/%s“: файлът „gitdir“ (%s) не може да бъде прочетен"
-#: builtin/worktree.c:64
+#: builtin/worktree.c:65
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Изтриване на „worktrees/%s“: неправилен файл „gitdir“"
-#: builtin/worktree.c:80
+#: builtin/worktree.c:81
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr ""
"Изтриване на „worktrees/%s“: файлът „gitdir“ сочи несъществуващо "
"местоположение"
+#: builtin/worktree.c:128
+msgid "report pruned working trees"
+msgstr "докладване на окастрените работни дървета"
+
+#: builtin/worktree.c:130
+msgid "expire working trees older than <time>"
+msgstr "обявяване на работните копия по-стари от това ВРЕМЕ за остарели"
+
#: builtin/worktree.c:204
#, c-format
msgid "'%s' already exists"
msgstr "„%s“ вече съществува"
-#: builtin/worktree.c:236
+#: builtin/worktree.c:235
#, c-format
msgid "could not create directory of '%s'"
msgstr "директорията „%s“ не може да бъде създадена"
-#: builtin/worktree.c:272
+#: builtin/worktree.c:274
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "Подготвяне на %s (идентификатор %s)"
-#: builtin/worktree.c:323
+#: builtin/worktree.c:328
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "Изтегляне КЛОНа, дори и да е изтеглен в друго работно дърво"
-#: builtin/worktree.c:325
+#: builtin/worktree.c:330
msgid "create a new branch"
msgstr "създаване на нов клон"
-#: builtin/worktree.c:327
+#: builtin/worktree.c:332
msgid "create or reset a branch"
msgstr "създаване или зануляване на клони"
-#: builtin/worktree.c:329
+#: builtin/worktree.c:334
msgid "populate the new working tree"
msgstr "подготвяне на новото работно дърво"
-#: builtin/worktree.c:337
+#: builtin/worktree.c:335
+msgid "keep the new working tree locked"
+msgstr "новото работно дърво да остане заключено"
+
+#: builtin/worktree.c:343
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "Опциите „-b“, „-B“ и „--detach“ са несъвместими една с друга"
-#: builtin/worktree.c:470
+#: builtin/worktree.c:478
msgid "reason for locking"
msgstr "причина за заключване"
-#: builtin/worktree.c:482 builtin/worktree.c:515
+#: builtin/worktree.c:490 builtin/worktree.c:523
#, c-format
msgid "'%s' is not a working tree"
msgstr "„%s“ не е работно дърво"
-#: builtin/worktree.c:484 builtin/worktree.c:517
+#: builtin/worktree.c:492 builtin/worktree.c:525
msgid "The main working tree cannot be locked or unlocked"
msgstr "Основното дърво не може да се отключи или заключи"
-#: builtin/worktree.c:489
+#: builtin/worktree.c:497
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "„%s“ вече е заключено, защото „%s“"
-#: builtin/worktree.c:491
+#: builtin/worktree.c:499
#, c-format
msgid "'%s' is already locked"
msgstr "„%s“ вече е заключено"
-#: builtin/worktree.c:519
+#: builtin/worktree.c:527
#, c-format
msgid "'%s' is not locked"
msgstr "„%s“ не е заключено"
@@ -13546,20 +14270,20 @@
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-repack [ОПЦИЯ…] ДИРЕКТОРИЯ"
-#: upload-pack.c:1028
+#: upload-pack.c:1040
msgid "quit after a single request/response exchange"
msgstr "изход след първоначалната размяна на заявка и отговор"
-#: upload-pack.c:1030
+#: upload-pack.c:1042
msgid "exit immediately after initial ref advertisement"
msgstr "изход след първоначалната обява на указатели"
-#: upload-pack.c:1032
+#: upload-pack.c:1044
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr ""
"да не се търси „ДИРЕКТОРИЯ/.git/“, ако ДИРЕКТОРИЯта не е под контрола на Git"
-#: upload-pack.c:1034
+#: upload-pack.c:1046
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "трансферът да се преустанови след този БРОЙ секунди"
@@ -13576,7 +14300,7 @@
"другите потребители могат да получат достъп до кешираните ви пароли. За да\n"
"коригирате това, изпълнете:\n"
"\n"
-" chmod 0700 %s"
+" chmod 0700 %s"
#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
@@ -13592,16 +14316,41 @@
"наличните\n"
"ръководства. За помощ за специфична КОМАНДА ползвайте „git help КОМАНДА“, а "
"за\n"
-"някое определено ПОНЯТИЕ използвайте „git help ПОНЯТИЕ“."
+"някое определено ПОНЯТИЕ използвайте „git help ПОНЯТИЕ“.\n"
+"\n"
+"Български превод на книгата „Pro Git“ от Чакън и Страуб:\n"
+"http://i-can.eu/progit2-bg/progit.html"
-#: http.c:342
+#: http.c:336
+#, c-format
+msgid "negative value for http.postbuffer; defaulting to %d"
+msgstr ""
+"отрицателна стойност за „http.postbuffer“. Ще се ползва стандартната: %d"
+
+#: http.c:357
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "Управлението на делегирането не се поддържа от cURL < 7.22.0"
-#: http.c:351
+#: http.c:366
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "Задаването на постоянен публичен ключ не се поддържа от cURL < 7.44.0"
+#: http.c:1766
+#, c-format
+msgid ""
+"unable to update url base from redirection:\n"
+" asked for: %s\n"
+" redirect: %s"
+msgstr ""
+"базовият адрес не може да се обнови след пренасочване:\n"
+" ● заявен адрес: %s\n"
+" ● пренасочване: %s"
+
+#: remote-curl.c:323
+#, c-format
+msgid "redirecting to %s"
+msgstr "пренасочване към „%s“"
+
#: common-cmds.h:9
msgid "start a working area (see also: git help tutorial)"
msgstr "създаване на работно дърво (погледнете: „git help tutorial“)"
@@ -13969,7 +14718,7 @@
#: git-merge-octopus.sh:89
#, sh-format
msgid "Fast-forwarding to: $pretty_name"
-msgstr "Тривиално сливане до „$pretty_name“"
+msgstr "Превъртане до „$pretty_name“"
#: git-merge-octopus.sh:97
#, sh-format
@@ -13980,7 +14729,7 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr "Простото сливане не сработи, пробва се автоматично сливане."
-#: git-rebase.sh:56
+#: 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"
@@ -13992,54 +14741,40 @@
"За да откажете пребазирането и да се върнете към първоначалното състояние,\n"
"изпълнете „git rebase --abort“."
-#: git-rebase.sh:156 git-rebase.sh:395
+#: git-rebase.sh:158 git-rebase.sh:397
#, sh-format
msgid "Could not move back to $head_name"
msgstr "Връщането към „${head_name}“ е невъзможно"
-#: git-rebase.sh:167
-msgid "Applied autostash."
-msgstr "Автоматично скатаното е приложено."
-
-#: git-rebase.sh:170
+#: git-rebase.sh:172
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "„${stash_sha1}“ не може да бъде запазен"
-#: git-rebase.sh:171
-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"
-"надеждно скатани. Можете да пробвате да ги приложите чрез „git stash pop“\n"
-"или да ги изхвърлите чрез „git stash drop“, когато поискате.\n"
-
-#: git-rebase.sh:210
+#: git-rebase.sh:212
msgid "The pre-rebase hook refused to rebase."
msgstr "Куката за изпълнение преди пребазиране отхвърли пребазирането."
-#: git-rebase.sh:215
+#: git-rebase.sh:217
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr ""
"Изглежда, че сега се прилагат кръпки чрез командата „git-am“. Не може да "
"пребазирате в момента."
-#: git-rebase.sh:356
+#: git-rebase.sh:358
msgid "No rebase in progress?"
msgstr "Изглежда в момента не тече пребазиране"
-#: git-rebase.sh:367
+#: git-rebase.sh:369
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"Опцията „--edit-todo“ е достъпна само по време на интерактивно пребазиране."
-#: git-rebase.sh:374
+#: git-rebase.sh:376
msgid "Cannot read HEAD"
msgstr "Указателят „HEAD“ не може да бъде прочетен"
-#: git-rebase.sh:377
+#: git-rebase.sh:379
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -14047,7 +14782,7 @@
"Трябва да редактирате всички конфликти при сливането. След това\n"
"отбележете коригирането им чрез командата „git add“"
-#: git-rebase.sh:414
+#: git-rebase.sh:419
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -14068,106 +14803,106 @@
"за\n"
"да не загубите случайно промени."
-#: git-rebase.sh:465
+#: git-rebase.sh:470
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "неправилна основа за сравнение „${upstream_name}“"
-#: git-rebase.sh:489
+#: git-rebase.sh:494
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr ""
"указателят „${onto_name}“ може да сочи към повече от една основа за "
"пребазирането"
-#: git-rebase.sh:492 git-rebase.sh:496
+#: git-rebase.sh:497 git-rebase.sh:501
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "указателят „${onto_name}“ не сочи към никаква основа за пребазирането"
-#: git-rebase.sh:501
+#: git-rebase.sh:506
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "Указателят „${onto_name}“ не сочи към подаване"
-#: git-rebase.sh:524
+#: git-rebase.sh:529
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "ФАТАЛНА ГРЕШКА: не съществува клон „${branch_name}“"
-#: git-rebase.sh:557
+#: git-rebase.sh:562
msgid "Cannot autostash"
msgstr "Не може да се скатае автоматично"
-#: git-rebase.sh:562
+#: git-rebase.sh:567
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "Автоматично скатано: „${stash_abbrev}“"
-#: git-rebase.sh:566
+#: git-rebase.sh:571
msgid "Please commit or stash them."
msgstr "Промените трябва или да се подадат, или да се скатаят."
-#: git-rebase.sh:586
+#: git-rebase.sh:591
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "Текущият клон „${branch_name}“ е напълно актуален."
-#: git-rebase.sh:590
+#: git-rebase.sh:595
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr ""
"Текущият клон „${branch_name}“ е напълно актуален. Пребазирането е "
"принудително."
-#: git-rebase.sh:601
+#: git-rebase.sh:606
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Промените от „${mb}“ към „${onto}“:"
-#: git-rebase.sh:610
+#: git-rebase.sh:615
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
"Първо, указателят „HEAD“ започва да сочи към базата, върху която пребазирате…"
-#: git-rebase.sh:620
+#: git-rebase.sh:625
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
-msgstr "Тривиално сливане на „${branch_name}“ върху „${onto_name}“."
+msgstr "Превъртане на „${branch_name}“ върху „${onto_name}“."
-#: git-stash.sh:50
+#: git-stash.sh:53
msgid "git stash clear with parameters is unimplemented"
msgstr "Командата „git stash clear“ не поддържа аргументи"
-#: git-stash.sh:73
+#: git-stash.sh:94
msgid "You do not have the initial commit yet"
msgstr "Все още липсва първоначално подаване"
-#: git-stash.sh:88
+#: git-stash.sh:109
msgid "Cannot save the current index state"
msgstr "Състоянието на текущия индекс не може да бъде запазено"
-#: git-stash.sh:103
+#: git-stash.sh:124
msgid "Cannot save the untracked files"
msgstr "Неследените файлове не могат да се запазят"
-#: git-stash.sh:123 git-stash.sh:136
+#: git-stash.sh:144 git-stash.sh:157
msgid "Cannot save the current worktree state"
msgstr "Състоянието на работното дърво не може да бъде запазено"
-#: git-stash.sh:140
+#: git-stash.sh:161
msgid "No changes selected"
msgstr "Не са избрани никакви промени"
-#: git-stash.sh:143
+#: git-stash.sh:164
msgid "Cannot remove temporary index (can't happen)"
msgstr "Временният индекс не може да бъде изтрит"
-#: git-stash.sh:156
+#: git-stash.sh:177
msgid "Cannot record working tree state"
msgstr "Състоянието на работното дърво не може да бъде запазено"
-#: git-stash.sh:188
+#: git-stash.sh:209
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr ""
@@ -14183,7 +14918,7 @@
#. $ 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:238
+#: git-stash.sh:265
#, sh-format
msgid ""
"error: unknown option for 'stash save': $option\n"
@@ -14192,132 +14927,137 @@
"грешка: командата „git stash save“ не поддържа опция „${option}“\n"
" За да зададете съобщение, изпълнете „git stash save -- '${option}'“"
-#: git-stash.sh:251
+#: git-stash.sh:278
msgid "Can't use --patch and --include-untracked or --all at the same time"
-msgstr "Опциията „--patch“ е несъвместима с „--include-untracked“ и „--all“"
+msgstr "Опцията „--patch“ е несъвместима с „--include-untracked“ и „--all“"
-#: git-stash.sh:259
+#: git-stash.sh:286
msgid "No local changes to save"
msgstr "Няма никакви локални промени за скатаване"
-#: git-stash.sh:263
+#: git-stash.sh:291
msgid "Cannot initialize stash"
msgstr "Скатаването не може да стартира"
-#: git-stash.sh:267
+#: git-stash.sh:295
msgid "Cannot save the current status"
msgstr "Текущото състояние не може да бъде запазено"
-#: git-stash.sh:268
+#: git-stash.sh:296
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr ""
"Състоянието на работната директория и индекса са запазени: „$stash_msg“"
-#: git-stash.sh:285
+#: git-stash.sh:323
msgid "Cannot remove worktree changes"
msgstr "Промените в работното дърво не могат да бъдат занулени"
-#: git-stash.sh:403
+#: git-stash.sh:471
#, sh-format
msgid "unknown option: $opt"
msgstr "непозната опция: ${opt}"
-#: git-stash.sh:416
+#: git-stash.sh:484
msgid "No stash found."
msgstr "Не е открито нищо скатано."
-#: git-stash.sh:423
+#: git-stash.sh:491
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "Указани са прекалено много версии: „${REV}“"
-#: git-stash.sh:438
+#: git-stash.sh:506
#, sh-format
msgid "$reference is not a valid reference"
msgstr "Указателят „${reference}“ е грешен"
-#: git-stash.sh:466
+#: git-stash.sh:534
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "„${args}“ не е подаване, приличащо на нещо скатано"
-#: git-stash.sh:477
+#: git-stash.sh:545
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "„${args}“ не е указател към нещо скатано"
-#: git-stash.sh:485
+#: git-stash.sh:553
msgid "unable to refresh index"
msgstr "индексът не може да бъде обновен"
-#: git-stash.sh:489
+#: git-stash.sh:557
msgid "Cannot apply a stash in the middle of a merge"
msgstr "По време на сливане не може да приложите нещо скатано"
-#: git-stash.sh:497
+#: git-stash.sh:565
msgid "Conflicts in index. Try without --index."
msgstr ""
"В индекса има конфликти. Пробвайте да изпълните командата без опцията „--"
"index“."
-#: git-stash.sh:499
+#: git-stash.sh:567
msgid "Could not save index tree"
msgstr "Дървото сочено от индекса не може да бъде запазено"
-#: git-stash.sh:508
+#: git-stash.sh:576
msgid "Could not restore untracked files from stash"
msgstr "Неследени файлове не могат да се възстановят от индекса"
-#: git-stash.sh:533
+#: git-stash.sh:601
msgid "Cannot unstage modified files"
msgstr "Променените файлове не могат да бъдат извадени от индекса"
-#: git-stash.sh:548
+#: git-stash.sh:616
msgid "Index was not unstashed."
msgstr "Индексът не е скатан."
-#: git-stash.sh:562
+#: git-stash.sh:630
msgid "The stash is kept in case you need it again."
msgstr "Скатаното е запазено в случай, че ви потрябва отново"
-#: git-stash.sh:571
+#: git-stash.sh:639
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "Изтрито е скатаното „${REV}“ ($s)"
-#: git-stash.sh:572
+#: git-stash.sh:640
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "Скатаното „${REV}“ не може да бъде изтрито"
-#: git-stash.sh:580
+#: git-stash.sh:648
msgid "No branch name specified"
msgstr "Не е указано име на клон"
-#: git-stash.sh:652
+#: git-stash.sh:727
msgid "(To restore them type \"git stash apply\")"
msgstr "(За да ги възстановите, изпълнете командата „git stash apply“)"
-#: git-submodule.sh:184
+#: git-submodule.sh:181
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
"Относителен път може да се ползва само от основната директория на работното "
"дърво"
-#: git-submodule.sh:194
+#: git-submodule.sh:191
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr ""
"адрес на хранилище: „${repo}“ трябва или да е абсолютен, или да започва с "
"„./“ или „../“"
-#: git-submodule.sh:211
+#: git-submodule.sh:210
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "„${sm_path}“ вече съществува в индекса"
-#: git-submodule.sh:215
+#: git-submodule.sh:213
+#, sh-format
+msgid "'$sm_path' already exists in the index and is not a submodule"
+msgstr "„${sm_path}“ вече съществува в индекса и не е подмодул"
+
+#: git-submodule.sh:218
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -14328,24 +15068,24 @@
"${sm_path}\n"
"Използвайте опцията „-f“, ако за да го добавите наистина."
-#: git-submodule.sh:233
+#: git-submodule.sh:236
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "Добавяне на съществуващото хранилище в „${sm_path}“ към индекса"
-#: git-submodule.sh:235
+#: git-submodule.sh:238
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "„${sm_path}“ съществува, а не е хранилище на Git"
-#: git-submodule.sh:243
+#: git-submodule.sh:246
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
"Открита е локална директория на Git — „${sm_name}“, която сочи към "
"отдалечените хранилища:"
-#: git-submodule.sh:245
+#: git-submodule.sh:248
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
@@ -14357,53 +15097,53 @@
msgstr ""
"Ако искате да преизползвате тази директория на git, вместо да клонирате "
"отново\n"
-" $realrepo\n"
+" $realrepo\n"
"използвайте опцията „--force“. Ако локалната директория на git не е за\n"
"правилното хранилище или ако не знаете какво означава това, използвайте\n"
"друго име като аргумент към опцията „--name“."
-#: git-submodule.sh:251
+#: git-submodule.sh:254
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "Активиране на локалното хранилище за подмодула „${sm_name}“ наново."
-#: git-submodule.sh:263
+#: git-submodule.sh:266
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "Подмодулът „${sm_path}“ не може да бъде изтеглен"
-#: git-submodule.sh:268
+#: git-submodule.sh:271
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Неуспешно добавяне на подмодула „${sm_path}“"
-#: git-submodule.sh:277
+#: git-submodule.sh:280
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Неуспешно регистриране на подмодула „${sm_path}“"
-#: git-submodule.sh:324
+#: git-submodule.sh:341
#, sh-format
msgid "Entering '$displaypath'"
msgstr "Влизане в „${displaypath}“"
-#: git-submodule.sh:344
+#: git-submodule.sh:361
#, sh-format
msgid "Stopping at '$displaypath'; script returned non-zero status."
msgstr ""
"Спиране при „${displaypath}“ — изходният код от скрипта бе различен от 0."
-#: git-submodule.sh:415
+#: git-submodule.sh:432
#, sh-format
msgid "pathspec and --all are incompatible"
msgstr "указването на път е несъвместимо с опцията „--all“"
-#: git-submodule.sh:420
+#: git-submodule.sh:437
#, sh-format
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "Използвайте „--all“, за да премахнете всички подмодули"
-#: git-submodule.sh:440
+#: git-submodule.sh:457
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains a .git directory\n"
@@ -14412,51 +15152,51 @@
"Работното дърво на подмодул „${displaypath}“ съдържа директория „.git“.\n"
"(ако искате да ги изтриете заедно с цялата им история, използвайте „rm -rf“)"
-#: git-submodule.sh:448
+#: git-submodule.sh:465
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
"discard them"
msgstr ""
"Работното дърво на подмодул „${displaypath}“ съдържа локални промени. "
-"Можете да ги пренебрегнете и отмените с опцията „-f“"
+"Можете да го отхвърлите с опцията „-f“"
-#: git-submodule.sh:451
+#: git-submodule.sh:468
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "Директорията „${displaypath}“ е изчистена"
-#: git-submodule.sh:452
+#: git-submodule.sh:469
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr ""
"Директорията към работното дърво на подмодула „${displaypath}“ не може да "
"бъде изтрита"
-#: git-submodule.sh:455
+#: git-submodule.sh:472
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr ""
"Празната директория за подмодула „${displaypath}“ не може да бъде създадена"
-#: git-submodule.sh:464
+#: git-submodule.sh:481
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr ""
"Премахната е регистрацията на подмодул „${name}“, сочещ към адрес „${url}“, "
"за пътя „${displaypath}“"
-#: git-submodule.sh:617
+#: git-submodule.sh:637
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "Текущата версия за подмодула в „${displaypath}“ липсва"
-#: git-submodule.sh:627
+#: git-submodule.sh:647
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Неуспешно доставяне в пътя към подмодул „${sm_path}“"
-#: git-submodule.sh:632
+#: git-submodule.sh:652
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -14465,107 +15205,107 @@
"Текущата версия „${remote_name}/${branch}“ в пътя към подмодул „${sm_path}“ "
"липсва"
-#: git-submodule.sh:650
+#: git-submodule.sh:670
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "Неуспешно доставяне в пътя към подмодул „${displaypath}“"
-#: git-submodule.sh:656
+#: git-submodule.sh:676
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
"Direct fetching of that commit failed."
msgstr ""
-"Подмодулът в пътя „$displaypath“ е достанен, но не съдържа обекта със сума\n"
+"Подмодулът в пътя „$displaypath“ е доставен, но не съдържа обекта със сума\n"
"„$sha1“. Директното доставяне на това подаване е неуспешно."
-#: git-submodule.sh:663
+#: git-submodule.sh:683
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr ""
"Неуспешно изтегляне на версия „${sha1}“ в пътя към подмодул „${displaypath}“'"
-#: git-submodule.sh:664
+#: git-submodule.sh:684
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Път към подмодул „${displaypath}“: изтеглена е версия „${sha1}“"
-#: git-submodule.sh:668
+#: git-submodule.sh:688
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
"Неуспешно пребазиране на версия „${sha1}“ в пътя към подмодул "
"„${displaypath}“"
-#: git-submodule.sh:669
+#: git-submodule.sh:689
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Път към подмодул „${displaypath}“: пребазиране върху версия „${sha1}“"
-#: git-submodule.sh:674
+#: git-submodule.sh:694
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr ""
"Неуспешно сливане на версия „${sha1}“ в пътя към подмодул „${displaypath}“"
-#: git-submodule.sh:675
+#: git-submodule.sh:695
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Път към подмодул „${displaypath}“: сливане с версия „${sha1}“"
-#: git-submodule.sh:680
+#: git-submodule.sh:700
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
"Неуспешно изпълнение на командата „${command} ${sha1}“ в пътя към подмодул "
"„${displaypath}“"
-#: git-submodule.sh:681
+#: git-submodule.sh:701
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Път към подмодул „${displaypath}“: „${command} ${sha1}“"
-#: git-submodule.sh:712
+#: git-submodule.sh:732
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr ""
"Неуспешна обработка на поддиректориите в пътя към подмодул „${displaypath}“"
-#: git-submodule.sh:820
+#: git-submodule.sh:840
msgid "The --cached option cannot be used with the --files option"
msgstr "Опциите „--cached“ и „--files“ са несъвместими"
-#: git-submodule.sh:872
+#: git-submodule.sh:892
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "неочакван режим „${mod_dst}“"
-#: git-submodule.sh:892
+#: git-submodule.sh:912
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr ""
" ПРЕДУПРЕЖДЕНИЕ: „${display_name}“ не съдържа подаването „${sha1_src}“"
-#: git-submodule.sh:895
+#: git-submodule.sh:915
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr ""
" ПРЕДУПРЕЖДЕНИЕ: „${display_name}“ не съдържа подаването „${sha1_dst}“"
-#: git-submodule.sh:898
+#: git-submodule.sh:918
#, 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:1045
+#: git-submodule.sh:1064
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr ""
"Неуспешна обработка на поддиректориите в пътя към подмодул „${sm_path}“"
-#: git-submodule.sh:1112
+#: git-submodule.sh:1136
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Синхронизиране на адреса за пътя към подмодул „${displaypath}“"
@@ -14638,11 +15378,11 @@
msgstr ""
"Може да промените подаването с командата:\n"
"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
+" git commit --amend $gpg_sign_opt_quoted\n"
"\n"
"След като привършите, продължете с командата:\n"
"\n"
-" git rebase --continue"
+" git rebase --continue"
#: git-rebase--interactive.sh:236
#, sh-format
@@ -14662,12 +15402,12 @@
#: git-rebase--interactive.sh:369
#, sh-format
msgid "Fast-forward to $sha1"
-msgstr "Тривиално сливане до „$sha1“"
+msgstr "Превъртане до „$sha1“"
#: git-rebase--interactive.sh:371
#, sh-format
msgid "Cannot fast-forward to $sha1"
-msgstr "Не може да се слее тривиално до „$sha1“"
+msgstr "Не може да се превърти до „$sha1“"
#: git-rebase--interactive.sh:380
#, sh-format
@@ -14684,7 +15424,6 @@
msgid "Error redoing merge $sha1"
msgstr "Грешка при повтарянето на сливането на „$sha1“"
-# FIXME Could not open %s. - full stop for consistence with next message
#: git-rebase--interactive.sh:407
#, sh-format
msgid "Could not pick $sha1"
@@ -14707,26 +15446,22 @@
msgstr[0] "Това е обединение от $count подаване."
msgstr[1] "Това е обединение от $count подавания."
-#: git-rebase--interactive.sh:440
+#: git-rebase--interactive.sh:441
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr "Новото съобщение при подаване „$fixup_msg“ не може да бъде запазено"
-#: git-rebase--interactive.sh:443
+#: git-rebase--interactive.sh:444
msgid "This is a combination of 2 commits."
msgstr "Това е обединение от 2 подавания"
-#: git-rebase--interactive.sh:444
-msgid "This is the 1st commit message:"
-msgstr "Това е 1-то съобщение при подаване:"
-
-#: git-rebase--interactive.sh:484 git-rebase--interactive.sh:527
-#: git-rebase--interactive.sh:530
+#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528
+#: git-rebase--interactive.sh:531
#, sh-format
msgid "Could not apply $sha1... $rest"
msgstr "Не може да се подаде $sha1… $rest"
-#: git-rebase--interactive.sh:558
+#: git-rebase--interactive.sh:559
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
@@ -14742,31 +15477,31 @@
"коригирате,\n"
"преди да можете да промените подаването."
-#: git-rebase--interactive.sh:573
+#: git-rebase--interactive.sh:574
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr "Спиране при „$sha1_abbrev…“ $rest"
-#: git-rebase--interactive.sh:588
+#: git-rebase--interactive.sh:589
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr "Без предишно подаване не може да се изпълни „$squash_style“"
-#: git-rebase--interactive.sh:630
+#: git-rebase--interactive.sh:631
#, sh-format
msgid "Executing: $rest"
msgstr "В момента се изпълнява: $rest"
-#: git-rebase--interactive.sh:638
+#: git-rebase--interactive.sh:639
#, sh-format
msgid "Execution failed: $rest"
msgstr "Неуспешно изпълнение: $rest"
-#: git-rebase--interactive.sh:640
+#: git-rebase--interactive.sh:641
msgid "and made changes to the index and/or the working tree"
msgstr "и промени индекса и/или работното дърво"
-#: git-rebase--interactive.sh:642
+#: git-rebase--interactive.sh:643
msgid ""
"You can fix the problem, and then run\n"
"\n"
@@ -14777,7 +15512,7 @@
" git rebase --continue"
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:655
+#: git-rebase--interactive.sh:656
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
@@ -14790,27 +15525,27 @@
"Остават още промени в индекса или работното дърво.\n"
"Трябва да ги подадете или скатаете и след това изпълнете:\n"
"\n"
-"\tgit rebase --continue"
+" git rebase --continue"
-#: git-rebase--interactive.sh:666
+#: git-rebase--interactive.sh:667
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr "Непозната команда: $command $sha1 $rest"
-#: git-rebase--interactive.sh:667
+#: git-rebase--interactive.sh:668
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr "Коригирайте това чрез „git rebase --edit-todo“."
-#: git-rebase--interactive.sh:702
+#: git-rebase--interactive.sh:703
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr "Успешно пребазиране и обновяване на „$head_name“."
-#: git-rebase--interactive.sh:749
+#: git-rebase--interactive.sh:750
msgid "Could not skip unnecessary pick commands"
msgstr "Излишните команди да отбиране не могат да бъдат прескочени"
-#: git-rebase--interactive.sh:907
+#: git-rebase--interactive.sh:908
#, sh-format
msgid ""
"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
@@ -14820,7 +15555,7 @@
" - $line\n"
" липсва или не е представлява подаване"
-#: git-rebase--interactive.sh:940
+#: git-rebase--interactive.sh:941
#, sh-format
msgid ""
"Warning: the command isn't recognized in the following line:\n"
@@ -14829,11 +15564,11 @@
"Предупреждение: непозната команда на ред:\n"
" - $line"
-#: git-rebase--interactive.sh:979
+#: git-rebase--interactive.sh:980
msgid "could not detach HEAD"
msgstr "указателят „HEAD“ не може да се отдели"
-#: git-rebase--interactive.sh:1017
+#: git-rebase--interactive.sh:1018
msgid ""
"Warning: some commits may have been dropped accidentally.\n"
"Dropped commits (newer to older):"
@@ -14842,7 +15577,7 @@
"\n"
"Пропуснати подавания (новите са най-отгоре):"
-#: git-rebase--interactive.sh:1025
+#: git-rebase--interactive.sh:1026
msgid ""
"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
"\n"
@@ -14857,7 +15592,7 @@
"предупреждение)\n"
"или „error“ (считане за грешка)."
-#: git-rebase--interactive.sh:1036
+#: git-rebase--interactive.sh:1037
#, sh-format
msgid ""
"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
@@ -14867,7 +15602,7 @@
"missingCommitsCheck“.\n"
"Настройката се прескача."
-#: git-rebase--interactive.sh:1053
+#: git-rebase--interactive.sh:1054
msgid ""
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
"continue'."
@@ -14875,16 +15610,16 @@
"Можете да промените това с командите „git rebase --edit-todo“ и „git rebase "
"--continue“ след това."
-#: git-rebase--interactive.sh:1054
+#: git-rebase--interactive.sh:1055
msgid "Or you can abort the rebase with 'git rebase --abort'."
msgstr ""
"Може и да преустановите пребазирането с командата „git rebase --abort“."
-#: git-rebase--interactive.sh:1078
+#: git-rebase--interactive.sh:1083
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "Указателят „CHERRY_PICK_HEAD“ не може да бъде изтрит"
-#: git-rebase--interactive.sh:1083
+#: git-rebase--interactive.sh:1088
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
@@ -14914,11 +15649,11 @@
"\n"
" git rebase --continue\n"
-#: git-rebase--interactive.sh:1100
+#: git-rebase--interactive.sh:1105
msgid "Error trying to find the author identity to amend commit"
msgstr "Не може да бъде открит автор за поправянето на подаването"
-#: git-rebase--interactive.sh:1105
+#: git-rebase--interactive.sh:1110
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
@@ -14926,11 +15661,11 @@
"В работното дърво има неподадени промени. Първо ги подайте, а след това\n"
"отново изпълнете „git rebase --continue“."
-#: git-rebase--interactive.sh:1110 git-rebase--interactive.sh:1114
+#: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119
msgid "Could not commit staged changes."
msgstr "Промените в индекса не могат да бъдат подадени."
-#: git-rebase--interactive.sh:1138
+#: git-rebase--interactive.sh:1147
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -14944,33 +15679,33 @@
" git rebase --continue\n"
"\n"
-#: git-rebase--interactive.sh:1146 git-rebase--interactive.sh:1304
+#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313
msgid "Could not execute editor"
msgstr "Текстовият редактор не може да бъде стартиран"
-#: git-rebase--interactive.sh:1159
+#: git-rebase--interactive.sh:1168
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "„$switch_to“ не може да се изтегли"
-#: git-rebase--interactive.sh:1164
+#: git-rebase--interactive.sh:1173
msgid "No HEAD?"
msgstr "Липсва указател „HEAD“"
-#: git-rebase--interactive.sh:1165
+#: git-rebase--interactive.sh:1174
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "Временната директория „$state_dir“ не може да бъде създадена"
-#: git-rebase--interactive.sh:1167
+#: git-rebase--interactive.sh:1176
msgid "Could not mark as interactive"
msgstr "Пребазирането не е интерактивно"
-#: git-rebase--interactive.sh:1177 git-rebase--interactive.sh:1182
+#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191
msgid "Could not init rewritten commits"
msgstr "Списъкът с презаписаните подавания не може да бъде създаден"
-#: git-rebase--interactive.sh:1282
+#: git-rebase--interactive.sh:1291
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
@@ -14979,7 +15714,7 @@
msgstr[1] ""
"Пребазиране на $shortrevisions върху $shortonto ($todocount команди)"
-#: git-rebase--interactive.sh:1287
+#: git-rebase--interactive.sh:1296
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -14989,7 +15724,7 @@
"Ако изтриете всичко, пребазирането ще бъде преустановено.\n"
"\n"
-#: git-rebase--interactive.sh:1294
+#: git-rebase--interactive.sh:1303
msgid "Note that empty commits are commented out"
msgstr "Празните подавания са коментирани"
@@ -15059,3 +15794,907 @@
#: git-sh-setup.sh:377
msgid "Unable to determine absolute path of git directory"
msgstr "Абсолютният път на работното дърво не може да се определи"
+
+#. TRANSLATORS: you can adjust this to align "git add -i" status menu
+#: git-add--interactive.perl:238
+#, perl-format
+msgid "%12s %12s %s"
+msgstr "%14s %14s %s"
+
+#: git-add--interactive.perl:239
+msgid "staged"
+msgstr "в индекса"
+
+#: git-add--interactive.perl:239
+msgid "unstaged"
+msgstr "извън индекса"
+
+#: git-add--interactive.perl:288 git-add--interactive.perl:313
+msgid "binary"
+msgstr "двоично"
+
+#: git-add--interactive.perl:297 git-add--interactive.perl:351
+msgid "nothing"
+msgstr "нищо"
+
+#: git-add--interactive.perl:333 git-add--interactive.perl:348
+msgid "unchanged"
+msgstr "няма промени"
+
+#: git-add--interactive.perl:644
+#, 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
+#, 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
+#, 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
+#, 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
+msgid "Update"
+msgstr "Обновяване"
+
+#: git-add--interactive.perl:674
+msgid "Revert"
+msgstr "Отмяна"
+
+#: git-add--interactive.perl:697
+#, perl-format
+msgid "note: %s is untracked now.\n"
+msgstr "БЕЛЕЖКА: „%s“ вече не се следи.\n"
+
+#: git-add--interactive.perl:708
+msgid "Add untracked"
+msgstr "Добавяне на неследени"
+
+#: git-add--interactive.perl:714
+msgid "No untracked files.\n"
+msgstr "Няма неследени файлове.\n"
+
+#: git-add--interactive.perl:1030
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for staging."
+msgstr ""
+"Ако кръпката може да се приложи чисто, редактираното парче ще бъде "
+"незабавно\n"
+"добавено към индекса"
+
+#: git-add--interactive.perl:1033
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for stashing."
+msgstr ""
+"Ако кръпката може да се приложи чисто, редактираното парче ще бъде "
+"незабавно\n"
+"скътано"
+
+#: git-add--interactive.perl:1036
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for unstaging."
+msgstr ""
+"Ако кръпката може да се приложи чисто, редактираното парче ще бъде "
+"незабавно\n"
+"извадено от индекса."
+
+#: git-add--interactive.perl:1039 git-add--interactive.perl:1048
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for applying."
+msgstr ""
+"Ако кръпката може да се приложи чисто, редактираното парче ще бъде "
+"незабавно\n"
+"набелязано за прилагане."
+
+#: git-add--interactive.perl:1042 git-add--interactive.perl:1045
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for discarding."
+msgstr ""
+"Ако кръпката може да се приложи чисто, редактираното парче ще бъде "
+"незабавно\n"
+"набелязано за зануляване."
+
+#: git-add--interactive.perl:1058
+#, perl-format
+msgid "failed to open hunk edit file for writing: %s"
+msgstr "файлът за редактиране на парчето код не може да бъде отворен: „%s“"
+
+#: git-add--interactive.perl:1059
+msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
+msgstr "Ръчно редактиране на парчета код — отдолу има подсказка.\n"
+
+#: git-add--interactive.perl:1065
+#, perl-format
+msgid ""
+"---\n"
+"To remove '%s' lines, make them ' ' lines (context).\n"
+"To remove '%s' lines, delete them.\n"
+"Lines starting with %s will be removed.\n"
+msgstr ""
+"———\n"
+"За да пропуснете редовете започващи с „%s“ — заменете знака със „ “ (стават "
+"контекст)\n"
+"За да пропуснете редовете започващи с „%s“ — изтрийте ги.\n"
+"Редовете, които започват с „%s“ ще бъдат пропуснати.\n"
+
+#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
+#: git-add--interactive.perl:1073
+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"
+
+#: git-add--interactive.perl:1087
+#, perl-format
+msgid "failed to open hunk edit file for reading: %s"
+msgstr ""
+"файлът за редактиране на парчето код не може да бъде отворен за четене: „%s“"
+
+#. TRANSLATORS: do not translate [y/n]
+#. The program will only accept that input
+#. at this point.
+#. 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 ""
+"Редактираното парче не може да се приложи. Да се продължи ли с "
+"редактирането? (текущите редакции ще се отменят при отказ!): „y“ (да)/ "
+"„n“ (не)? "
+
+#: git-add--interactive.perl:1187
+msgid ""
+"y - stage this hunk\n"
+"n - do not stage this hunk\n"
+"q - quit; do not stage this hunk or any of the remaining ones\n"
+"a - stage this hunk and all later hunks in the file\n"
+"d - do not stage this hunk or any of the later hunks in the file"
+msgstr ""
+"y — добавяне на парчето в индекса\n"
+"n — без добавяне на парчето в индекса\n"
+"q — изход, без добавяне на това и всички оставащи парчета от файла\n"
+"a — добавяне на това и всички следващи парчета от файла в индекса\n"
+"d — без добавяне на това и всички следващи парчета от файла в индекса"
+
+#: git-add--interactive.perl:1193
+msgid ""
+"y - stash this hunk\n"
+"n - do not stash this hunk\n"
+"q - quit; do not stash this hunk or any of the remaining ones\n"
+"a - stash this hunk and all later hunks in the file\n"
+"d - do not stash this hunk or any of the later hunks in the file"
+msgstr ""
+"y — скатаване на парчето\n"
+"n — без скатаване на парчето\n"
+"q — изход, без скатаване на това и всички оставащи парчета\n"
+"a — скатаване на това и всички следващи парчета от файла\n"
+"d — без скатаване на това и всички следващи парчета от файла"
+
+#: git-add--interactive.perl:1199
+msgid ""
+"y - unstage this hunk\n"
+"n - do not unstage this hunk\n"
+"q - quit; do not unstage this hunk or any of the remaining ones\n"
+"a - unstage this hunk and all later hunks in the file\n"
+"d - do not unstage this hunk or any of the later hunks in the file"
+msgstr ""
+"y — изваждане на парчето от индекса\n"
+"n — без изваждане на парчето от индекса\n"
+"q — изход, без изваждане на това и всички оставащи парчета от индекса\n"
+"a — изваждане на това и всички следващи парчета от файла от индекса\n"
+"d — без изваждане на това и всички следващи парчета от файла от индекса"
+
+#: git-add--interactive.perl:1205
+msgid ""
+"y - apply this hunk to index\n"
+"n - do not apply this hunk to index\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+"y — прилагане на парчето към индекса\n"
+"n — без прилагане на парчето към индекса\n"
+"q — изход, без прилагане на това и всички оставащи парчета към индекса\n"
+"a — прилагане на това и всички следващи парчета от файла към индекса\n"
+"d — без прилагане на това и всички следващи парчета от файла към индекса"
+
+#: git-add--interactive.perl:1211
+msgid ""
+"y - discard this hunk from worktree\n"
+"n - do not discard this hunk from worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file"
+msgstr ""
+"y — премахване на парчето от работното дърво\n"
+"n — без премахване на парчето от работното дърво\n"
+"q — изход, без премахване на това и всички оставащи парчета от работното "
+"дърво\n"
+"a — премахване на това и всички следващи парчета от файла от работното "
+"дърво\n"
+"d — без премахване на това и всички следващи парчета от файла от работното "
+"дърво"
+
+#: git-add--interactive.perl:1217
+msgid ""
+"y - discard this hunk from index and worktree\n"
+"n - do not discard this hunk from index and worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file"
+msgstr ""
+"y — премахване на парчето от индекса и работното дърво\n"
+"n — без премахване на парчето от индекса и работното дърво\n"
+"q — изход, без премахване на това и всички оставащи парчета от индекса и "
+"работното дърво\n"
+"a — премахване на това и всички следващи парчета от файла от индекса и "
+"работното дърво\n"
+"d — без премахване на това и всички следващи парчета от файла от индекса и "
+"работното дърво"
+
+#: git-add--interactive.perl:1223
+msgid ""
+"y - apply this hunk to index and worktree\n"
+"n - do not apply this hunk to index and worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+"y — прилагане на парчето от индекса и работното дърво\n"
+"n — без прилагане на парчето от индекса и работното дърво\n"
+"q — изход, без прилагане на това и всички оставащи парчета от индекса и "
+"работното дърво\n"
+"a — прилагане на това и всички следващи парчета от файла от индекса и "
+"работното дърво\n"
+"d — без прилагане на това и всички следващи парчета от файла от индекса и "
+"работното дърво"
+
+#: git-add--interactive.perl:1232
+msgid ""
+"g - select a hunk to go to\n"
+"/ - search for a hunk matching the given regex\n"
+"j - leave this hunk undecided, see next undecided hunk\n"
+"J - leave this hunk undecided, see next hunk\n"
+"k - leave this hunk undecided, see previous undecided hunk\n"
+"K - leave this hunk undecided, see previous hunk\n"
+"s - split the current hunk into smaller hunks\n"
+"e - manually edit the current hunk\n"
+"? - print help\n"
+msgstr ""
+"g — избор към кое парче да се премине\n"
+"/ — търсене на парче, напасващо към даден регулярен израз\n"
+"j — без решение за парчето, към следващото парче без решение\n"
+"J — без решение за парчето, към следващото парче\n"
+"k — без решение за парчето, към предишното парче без решение\n"
+"K — без решение за парчето, към предишното парче\n"
+"s — разделяне на текущото парче на по-малки\n"
+"e — ръчно редактиране на текущото парче\n"
+"? — извеждане не помощта\n"
+
+#: git-add--interactive.perl:1263
+msgid "The selected hunks do not apply to the index!\n"
+msgstr "Избраните парчета не могат да се добавят в индекса!\n"
+
+#: git-add--interactive.perl:1264
+msgid "Apply them to the worktree anyway? "
+msgstr "Да се приложат ли към работното дърво? "
+
+#: git-add--interactive.perl:1267
+msgid "Nothing was applied.\n"
+msgstr "Нищо не е приложено.\n"
+
+#: git-add--interactive.perl:1278
+#, perl-format
+msgid "ignoring unmerged: %s\n"
+msgstr "пренебрегване на неслятото: „%s“\n"
+
+#: git-add--interactive.perl:1287
+msgid "Only binary files changed.\n"
+msgstr "Само двоични файлове са променени.\n"
+
+#: git-add--interactive.perl:1289
+msgid "No changes.\n"
+msgstr "Няма промени.\n"
+
+#: git-add--interactive.perl:1297
+msgid "Patch update"
+msgstr "Обновяване на кръпка"
+
+#: git-add--interactive.perl:1349
+#, perl-format
+msgid "Stage mode change [y,n,q,a,d,/%s,?]? "
+msgstr "Добавяне на промяната на правата за достъп [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1350
+#, perl-format
+msgid "Stage deletion [y,n,q,a,d,/%s,?]? "
+msgstr "Добавяне на изтриването [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1351
+#, perl-format
+msgid "Stage this hunk [y,n,q,a,d,/%s,?]? "
+msgstr "Добавяне на това парче [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1354
+#, perl-format
+msgid "Stash mode change [y,n,q,a,d,/%s,?]? "
+msgstr "Скатаване на промяната на правата за достъп [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1355
+#, perl-format
+msgid "Stash deletion [y,n,q,a,d,/%s,?]? "
+msgstr "Скатаване на изтриването [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1356
+#, perl-format
+msgid "Stash this hunk [y,n,q,a,d,/%s,?]? "
+msgstr "Скатаване на това парче [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1359
+#, perl-format
+msgid "Unstage mode change [y,n,q,a,d,/%s,?]? "
+msgstr "Изваждане на промяната на правата за достъп [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1360
+#, perl-format
+msgid "Unstage deletion [y,n,q,a,d,/%s,?]? "
+msgstr "Изваждане на изтриването [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1361
+#, perl-format
+msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? "
+msgstr "Изваждане на това парче [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1364
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+msgid "go to which hunk (<ret> to see more)? "
+msgstr "към кое парче да се придвижи (за повече варианти натиснете „enter“)? "
+
+#: git-add--interactive.perl:1486
+msgid "go to which hunk? "
+msgstr "към кое парче да се придвижи? "
+
+#: git-add--interactive.perl:1495
+#, perl-format
+msgid "Invalid number: '%s'\n"
+msgstr "Неправилен номер: „%s“\n"
+
+#: git-add--interactive.perl:1500
+#, 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
+msgid "search for regex? "
+msgstr "да се търси с регулярен израз? "
+
+#: git-add--interactive.perl:1539
+#, perl-format
+msgid "Malformed search regexp %s: %s\n"
+msgstr "Сгрешен регулярен израз „%s“: %s\n"
+
+#: git-add--interactive.perl:1549
+msgid "No hunk matches the given pattern\n"
+msgstr "Никое парче не напасва на регулярния израз\n"
+
+#: git-add--interactive.perl:1561 git-add--interactive.perl:1583
+msgid "No previous hunk\n"
+msgstr "Няма друго парче преди това\n"
+
+#: git-add--interactive.perl:1570 git-add--interactive.perl:1589
+msgid "No next hunk\n"
+msgstr "Няма друго парче след това\n"
+
+#: git-add--interactive.perl:1597
+#, 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
+msgid "Review diff"
+msgstr "Преглед на разликата"
+
+#. TRANSLATORS: please do not translate the command names
+#. 'status', 'update', 'revert', etc.
+#: git-add--interactive.perl:1668
+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"
+msgstr ""
+"status — извеждане на пътищата с промените\n"
+"update — добавяне на състоянието на работното дърво към промените в\n"
+" индекса\n"
+"revert — отмяна на промените в индекса към състоянието сочено от "
+"„HEAD“\n"
+"patch — избиране на парчета код и обновяване поединично\n"
+"diff — извеждане на разликата между състоянието на соченото от "
+"„HEAD“\n"
+" и индекса\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
+msgid "missing --"
+msgstr "„--“ липсва"
+
+#: git-add--interactive.perl:1706
+#, perl-format
+msgid "unknown --patch mode: %s"
+msgstr "неизвестна стратегия за прилагане на кръпка: „%s“"
+
+#: git-add--interactive.perl:1712 git-add--interactive.perl:1718
+#, perl-format
+msgid "invalid argument %s, expecting --"
+msgstr "указан е неправилен аргумент „%s“, а се очаква „--“."
+
+#: git-send-email.perl:121
+msgid "local zone differs from GMT by a non-minute interval\n"
+msgstr ""
+"разликата между местния часови пояс и GMT съдържа дробна част от минута\n"
+"\n"
+
+#: git-send-email.perl:128 git-send-email.perl:134
+msgid "local time offset greater than or equal to 24 hours\n"
+msgstr "разликата между местния часовия пояс и GMT е 24 часа или повече\n"
+
+#: git-send-email.perl:202 git-send-email.perl:208
+msgid "the editor exited uncleanly, aborting everything"
+msgstr ""
+"текстовият редактор приключи работата с грешка, всичко се преустановява"
+
+#: git-send-email.perl:282
+#, perl-format
+msgid ""
+"'%s' contains an intermediate version of the email you were composing.\n"
+msgstr "„%s“ съдържа временна версия на подготвяното е-писмо.\n"
+
+#: git-send-email.perl:287
+#, perl-format
+msgid "'%s.final' contains the composed email.\n"
+msgstr "„%s.final“ съдържа подготвеното е-писмо.\n"
+
+#: git-send-email.perl:305
+msgid "--dump-aliases incompatible with other options\n"
+msgstr "опцията „--dump-aliases“ е несъвместима с другите опции\n"
+
+#: git-send-email.perl:368 git-send-email.perl:623
+msgid "Cannot run git format-patch from outside a repository\n"
+msgstr "Командата „git format-patch“ не може да се изпълни извън хранилище\n"
+
+#: git-send-email.perl:437
+#, perl-format
+msgid "Unknown --suppress-cc field: '%s'\n"
+msgstr "Непознато поле за опцията „--suppress-cc“: „%s“\n"
+
+#: git-send-email.perl:466
+#, perl-format
+msgid "Unknown --confirm setting: '%s'\n"
+msgstr "Непозната стойност за „--confirm“: %s\n"
+
+#: git-send-email.perl:498
+#, perl-format
+msgid "warning: sendmail alias with quotes is not supported: %s\n"
+msgstr ""
+"ПРЕДУПРЕЖДЕНИЕ: синоними за sendmail съдържащи кавички („\"“) не се "
+"поддържат: %s\n"
+
+#: git-send-email.perl:500
+#, perl-format
+msgid "warning: `:include:` not supported: %s\n"
+msgstr "ПРЕДУПРЕЖДЕНИЕ: „:include:“ не се поддържа: %s\n"
+
+#: git-send-email.perl:502
+#, perl-format
+msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
+msgstr ""
+"ПРЕДУПРЕЖДЕНИЕ: пренасочвания „/file“ или „|pipe“ не се поддържат: %s\n"
+
+#: git-send-email.perl:507
+#, perl-format
+msgid "warning: sendmail line is not recognized: %s\n"
+msgstr "ПРЕДУПРЕЖДЕНИЕ: редът за „sendmail“ не е разпознат: %s\n"
+
+#: git-send-email.perl:589
+#, perl-format
+msgid ""
+"File '%s' exists but it could also be the range of commits\n"
+"to produce patches for. Please disambiguate by...\n"
+"\n"
+" * Saying \"./%s\" if you mean a file; or\n"
+" * Giving --format-patch option if you mean a range.\n"
+msgstr ""
+"Файлът „%s“ съществува, но името може да означава и диапазон от подавания,\n"
+"за който да се създадат кръпки. Може изрично да укажете значението като:\n"
+"\n"
+" ● укажете „./%s“ за файл;\n"
+" ● използвате опцията „--format-patch“ за диапазон.\n"
+
+#: git-send-email.perl:610
+#, perl-format
+msgid "Failed to opendir %s: %s"
+msgstr "Директорията „%s“ не може да се отвори: %s"
+
+#: git-send-email.perl:634
+#, perl-format
+msgid ""
+"fatal: %s: %s\n"
+"warning: no patches were sent\n"
+msgstr ""
+"ФАТАЛНА ГРЕШКА: %s: %s\n"
+"ПРЕДУПРЕЖДЕНИЕ: не са пратени никакви кръпки\n"
+
+#: git-send-email.perl:645
+msgid ""
+"\n"
+"No patch files specified!\n"
+"\n"
+msgstr ""
+"\n"
+"Не са указани кръпки!\n"
+"\n"
+
+#: git-send-email.perl:658
+#, perl-format
+msgid "No subject line in %s?"
+msgstr "В „%s“ липсва тема"
+
+#: git-send-email.perl:668
+#, perl-format
+msgid "Failed to open for writing %s: %s"
+msgstr "„%s“ не може да се отвори за запис: %s"
+
+#: git-send-email.perl:678
+msgid ""
+"Lines beginning in \"GIT:\" will be removed.\n"
+"Consider including an overall diffstat or table of contents\n"
+"for the patch you are writing.\n"
+"\n"
+"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
+#, perl-format
+msgid "Failed to open %s.final: %s"
+msgstr "„%s.final“ не може да се отвори: %s"
+
+#: git-send-email.perl:704
+#, perl-format
+msgid "Failed to open %s: %s"
+msgstr "„%s“ не може да се отвори: %s"
+
+#: git-send-email.perl:739
+msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
+msgstr ""
+"Полетата „To“/„Cc“/„Bcc“ все още не се интерпретират. Те бяха прескочени\n"
+
+#: git-send-email.perl:748
+msgid "Summary email is empty, skipping it\n"
+msgstr "Обобщаващото писмо е празно и се прескача\n"
+
+#. TRANSLATORS: please keep [y/N] as is.
+#: git-send-email.perl:780
+#, perl-format
+msgid "Are you sure you want to use <%s> [y/N]? "
+msgstr "Сигурни ли сте, че искате да ползвате „%s“ [y/N]? "
+
+#: git-send-email.perl:809
+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
+msgid "Which 8bit encoding should I declare [UTF-8]? "
+msgstr "Кое 8 битово кодиране се ползва [стандартно: UTF-8]? "
+
+#: git-send-email.perl:822
+#, 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"
+msgstr ""
+"Нищо няма да се прати, защото кръпката\n"
+" %s\n"
+"все още е с шаблонното заглавие „*** SUBJECT HERE ***“. Ползвайте опцията\n"
+"„--force“, ако сте сигурни, че точно това искате да изпратите.\n"
+
+#: git-send-email.perl:841
+msgid "To whom should the emails be sent (if anyone)?"
+msgstr "На кой да се пратят е-писмата (незадължително поле)"
+
+#: git-send-email.perl:859
+#, perl-format
+msgid "fatal: alias '%s' expands to itself\n"
+msgstr "ФАТАЛНА ГРЕШКА: „%s“ е синоним на себе си\n"
+
+#: git-send-email.perl:871
+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
+#, perl-format
+msgid "error: unable to extract a valid address from: %s\n"
+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
+msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
+msgstr ""
+"Какво да се направи с този адрес? „q“ (спиране), „d“ (изтриване), "
+"„e“ (редактиране): "
+
+#: git-send-email.perl:1234
+#, perl-format
+msgid "CA path \"%s\" does not exist"
+msgstr "Пътят към сертификат „%s“ не съществува."
+
+#: git-send-email.perl:1309
+msgid ""
+" The Cc list above has been expanded by additional\n"
+" addresses found in the patch commit message. By default\n"
+" send-email prompts before sending whenever this occurs.\n"
+" This behavior is controlled by the sendemail.confirm\n"
+" configuration setting.\n"
+"\n"
+" For additional information, run 'git send-email --help'.\n"
+" To retain the current behavior, but squelch this message,\n"
+" run 'git config --global sendemail.confirm auto'.\n"
+"\n"
+msgstr ""
+" Към списъка с получателите („Cc“) са добавени и другите\n"
+" адреси на е-поща, които са упоменати в съобщението за\n"
+" подаване на кръпката. Стандартно командата „send-email“\n"
+" пита за това преди изпращане. Можете да премените това\n"
+" поведение чрез настройката „sendemail.confirm“.\n"
+"\n"
+" Командата „git send-email --help“ предоставя още\n"
+" информация. За да запазите текущото поведение и да не\n"
+" получавате повече това съобщение, изпълнете:\n"
+" „git config --global sendemail.confirm auto“.\n"
+"\n"
+
+#. 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
+msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
+msgstr ""
+"Изпращане на е-писмото? „y“ (да), „n“ (не), „q“ (изход), „a“ (всичко): "
+
+#: git-send-email.perl:1327
+msgid "Send this email reply required"
+msgstr "Изискване на отговор към това е-писмо"
+
+#: git-send-email.perl:1353
+msgid "The required SMTP server is not properly defined."
+msgstr "Сървърът за SMTP не е настроен правилно."
+
+#: git-send-email.perl:1397
+#, perl-format
+msgid "Server does not support STARTTLS! %s"
+msgstr "Сървърът не поддържа „STARTTLS“! %s"
+
+#: git-send-email.perl:1403
+msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
+msgstr ""
+"Подсистемата за SMTP не може да се инициализира. Проверете настройките и "
+"използвайте опцията: „--smtp-debug“."
+
+#: git-send-email.perl:1421
+#, perl-format
+msgid "Failed to send %s\n"
+msgstr "„%s“ не може да бъде изпратен\n"
+
+#: git-send-email.perl:1424
+#, perl-format
+msgid "Dry-Sent %s\n"
+msgstr "Проба за изпращане на „%s“\n"
+
+#: git-send-email.perl:1424
+#, perl-format
+msgid "Sent %s\n"
+msgstr "Изпращане на „%s“\n"
+
+#: git-send-email.perl:1426
+msgid "Dry-OK. Log says:\n"
+msgstr "Успех при пробата. От журнала:\n"
+
+#: git-send-email.perl:1426
+msgid "OK. Log says:\n"
+msgstr "Успех. От журнала:\n"
+
+#: git-send-email.perl:1438
+msgid "Result: "
+msgstr "Резултат: "
+
+#: git-send-email.perl:1441
+msgid "Result: OK\n"
+msgstr "Резултат: успех\n"
+
+#: git-send-email.perl:1454
+#, perl-format
+msgid "can't open file %s"
+msgstr "файлът „%s“ не може да бъде отворен"
+
+#: git-send-email.perl:1501 git-send-email.perl:1521
+#, perl-format
+msgid "(mbox) Adding cc: %s from line '%s'\n"
+msgstr "(mbox) Добавяне на „як: %s“ от ред „%s“\n"
+
+#: git-send-email.perl:1507
+#, perl-format
+msgid "(mbox) Adding to: %s from line '%s'\n"
+msgstr "(mbox) Добавяне на „до: %s“ от ред „%s“\n"
+
+#: git-send-email.perl:1555
+#, perl-format
+msgid "(non-mbox) Adding cc: %s from line '%s'\n"
+msgstr "(не-mbox) Добавяне на „як: %s“ от ред „%s“\n"
+
+#: git-send-email.perl:1578
+#, perl-format
+msgid "(body) Adding cc: %s from line '%s'\n"
+msgstr "(тяло) Добавяне на „як: %s“ от ред „%s“\n"
+
+#: git-send-email.perl:1676
+#, perl-format
+msgid "(%s) Could not execute '%s'"
+msgstr "(%s) Не може да бъде се изпълни „%s“"
+
+#: git-send-email.perl:1683
+#, perl-format
+msgid "(%s) Adding %s: %s from: '%s'\n"
+msgstr "(%s) Добавяне на „%s: %s“ от: „%s“\n"
+
+#: git-send-email.perl:1687
+#, perl-format
+msgid "(%s) failed to close pipe to '%s'"
+msgstr "(%s) програмният канал не може да се затвори за изпълнението на „%s“"
+
+#: git-send-email.perl:1714
+msgid "cannot send message as 7bit"
+msgstr "съобщението не може да се изпрати чрез 7 битови знаци"
+
+#: git-send-email.perl:1722
+msgid "invalid transfer encoding"
+msgstr "неправилно кодиране за пренос"
+
+#: git-send-email.perl:1741 git-send-email.perl:1792 git-send-email.perl:1802
+#, perl-format
+msgid "unable to open %s: %s\n"
+msgstr "„%s“ не може да се отвори: %s\n"
+
+#: git-send-email.perl:1744
+#, perl-format
+msgid "%s: patch contains a line longer than 998 characters"
+msgstr "„%s“: кръпката съдържа ред с над 988 знака"
+
+#: git-send-email.perl:1760
+#, 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
+#, perl-format
+msgid "Do you really want to send %s? [y|N]: "
+msgstr "Наистина ли искате да изпратите „%s“? [y|N]: "
diff --git a/po/ca.po b/po/ca.po
index 1b48a9e..40c5159 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,4 +1,3 @@
-
# Catalan translations for Git.
# Copyright (C) 2014 Alex Henrie <alexhenrie24@gmail.com>
# This file is distributed under the same license as the Git package.
@@ -9,8 +8,10 @@
#
# Anglès | Català
# -----------------+---------------------------------
+# ahead | davant per
# amend | esmenar
# broken | malmès
+# delta | diferència
# dry | simulació
# deprecated | en desús
# hunk | tros
@@ -36,15 +37,12 @@
# stage | «stage»
# squash | «squash»
# unstage | «unstage»
-
-
-
msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-02-18 01:00+0800\n"
-"PO-Revision-Date: 2017-02-16 19:55+0100\n"
+"POT-Creation-Date: 2017-05-05 09:35+0800\n"
+"PO-Revision-Date: 2017-05-07 19:55+0100\n"
"Last-Translator: Jordi Mas <jmas@softcatala.org>\n"
"Language-Team: Catalan\n"
"Language: ca\n"
@@ -97,7 +95,7 @@
msgid "Exiting because of an unresolved conflict."
msgstr "S'està sortint a causa d'un conflicte no resolt."
-#: advice.c:114 builtin/merge.c:1206
+#: advice.c:114 builtin/merge.c:1185
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "No heu conclòs la vostra fusió (MERGE_HEAD existeix)."
@@ -369,7 +367,7 @@
msgid "cannot checkout %s"
msgstr "no es pot agafar %s"
-#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:248
+#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:253
#, c-format
msgid "failed to read %s"
msgstr "s'ha produït un error en llegir %s"
@@ -493,7 +491,7 @@
msgid "sha1 information is lacking or useless (%s)."
msgstr "falta informació sha1 o és inútil (%s)."
-#: apply.c:4081 builtin/checkout.c:233 builtin/reset.c:135
+#: apply.c:4081 builtin/checkout.c:252 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry ha fallat per al camí '%s'"
@@ -571,7 +569,7 @@
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:737 builtin/fetch.c:986
+#: apply.c:4531 builtin/fetch.c:739 builtin/fetch.c:988
#, c-format
msgid "cannot open %s"
msgstr "no es pot obrir %s"
@@ -599,26 +597,26 @@
msgid "unable to read index file"
msgstr "no es pot llegir el fitxer d'índex"
-#: apply.c:4824
+#: apply.c:4823
#, c-format
msgid "can't open patch '%s': %s"
msgstr "no es pot obrir el pedaç '%s': %s"
-#: apply.c:4849
+#: apply.c:4850
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "s'ha omès %d error d'espai en blanc"
msgstr[1] "s'han omès %d errors d'espai en blanc"
-#: apply.c:4855 apply.c:4870
+#: apply.c:4856 apply.c:4871
#, 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:4863
+#: apply.c:4864
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
@@ -627,138 +625,138 @@
msgstr[1] ""
"S'han aplicat %d línies després d'arreglar els errors d'espai en blanc."
-#: apply.c:4879 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391
+#: apply.c:4880 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391
msgid "Unable to write new index file"
msgstr "No s'ha pogut escriure un fitxer d'índex nou"
-#: apply.c:4910 apply.c:4913 builtin/am.c:2277 builtin/am.c:2280
-#: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180
-#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:591
-#: builtin/submodule--helper.c:594 builtin/submodule--helper.c:960
-#: builtin/submodule--helper.c:963 builtin/submodule--helper.c:1104
+#: 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
msgid "path"
msgstr "camí"
-#: apply.c:4911
+#: apply.c:4912
msgid "don't apply changes matching the given path"
msgstr "no apliquis els canvis que coincideixin amb el camí donat"
-#: apply.c:4914
+#: apply.c:4915
msgid "apply changes matching the given path"
msgstr "aplica els canvis que coincideixin amb el camí donat"
-#: apply.c:4916 builtin/am.c:2286
+#: apply.c:4917 builtin/am.c:2285
msgid "num"
msgstr "número"
-#: apply.c:4917
+#: apply.c:4918
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
"elimina <nombre> barres obliqües inicials dels camins de diferència "
"tradicionals"
-#: apply.c:4920
+#: apply.c:4921
msgid "ignore additions made by the patch"
msgstr "ignora afegiments fets pel pedaç"
-#: apply.c:4922
+#: apply.c:4923
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"
-#: apply.c:4926
+#: apply.c:4927
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:4928
+#: apply.c:4929
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:4930
+#: apply.c:4931
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:4932
+#: apply.c:4933
msgid "make sure the patch is applicable to the current index"
msgstr "assegura que el pedaç sigui aplicable a l'índex actual"
-#: apply.c:4934
+#: apply.c:4935
msgid "apply a patch without touching the working tree"
msgstr "aplica un pedaç sense tocar l'arbre de treball"
-#: apply.c:4936
+#: apply.c:4937
msgid "accept a patch that touches outside the working area"
msgstr "accepta un pedaç que toqui fora de l'àrea de treball"
-#: apply.c:4938
+#: apply.c:4939
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "aplica el pedaç també (useu amb --stat/--summary/--check)"
-#: apply.c:4940
+#: apply.c:4941
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:4942
+#: apply.c:4943
msgid "build a temporary index based on embedded index information"
msgstr "construeix un índex temporal basat en la informació d'índex incrustada"
-#: apply.c:4945 builtin/checkout-index.c:169 builtin/ls-files.c:507
+#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:515
msgid "paths are separated with NUL character"
msgstr "els camins se separen amb el caràcter NUL"
-#: apply.c:4947
+#: apply.c:4948
msgid "ensure at least <n> lines of context match"
msgstr "assegura't que almenys <n> línies de context coincideixin"
-#: apply.c:4948 builtin/am.c:2265
+#: apply.c:4949 builtin/am.c:2264
msgid "action"
msgstr "acció"
-#: apply.c:4949
+#: apply.c:4950
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"
-#: apply.c:4952 apply.c:4955
+#: apply.c:4953 apply.c:4956
msgid "ignore changes in whitespace when finding context"
msgstr "ignora els canvis d'espai en blanc en cercar context"
-#: apply.c:4958
+#: apply.c:4959
msgid "apply the patch in reverse"
msgstr "aplica el pedaç al revés"
-#: apply.c:4960
+#: apply.c:4961
msgid "don't expect at least one line of context"
msgstr "no esperis almenys una línia de context"
-#: apply.c:4962
+#: apply.c:4963
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "deixa els trossos rebutjats en fitxers *.rej corresponents"
-#: apply.c:4964
+#: apply.c:4965
msgid "allow overlapping hunks"
msgstr "permet trossos encavalcants"
-#: apply.c:4965 builtin/add.c:267 builtin/check-ignore.c:19
+#: 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:1860 builtin/mv.c:122 builtin/read-tree.c:114
+#: builtin/log.c:1867 builtin/mv.c:122 builtin/read-tree.c:134
msgid "be verbose"
msgstr "sigues detallat"
-#: apply.c:4967
+#: apply.c:4968
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:4970
+#: apply.c:4971
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:4972 builtin/am.c:2274
+#: apply.c:4973 builtin/am.c:2273
msgid "root"
msgstr "arrel"
-#: apply.c:4973
+#: apply.c:4974
msgid "prepend <root> to all filenames"
msgstr "anteposa <arrel> a tots els noms de fitxer"
@@ -781,103 +779,108 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <dipòsit> [--exec <ordre>] --list"
-#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300
+#: archive.c:332 builtin/add.c:152 builtin/add.c:442 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:429
+#: archive.c:417
msgid "fmt"
msgstr "format"
-#: archive.c:429
+#: archive.c:417
msgid "archive format"
msgstr "format d'arxiu"
-#: archive.c:430 builtin/log.c:1429
+#: archive.c:418 builtin/log.c:1436
msgid "prefix"
msgstr "prefix"
-#: archive.c:431
+#: archive.c:419
msgid "prepend prefix to each pathname in the archive"
msgstr "anteposa el prefix a cada nom de camí en l'arxiu"
-#: archive.c:432 builtin/blame.c:2607 builtin/blame.c:2608 builtin/config.c:59
-#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1054
-#: builtin/hash-object.c:101 builtin/ls-files.c:541 builtin/ls-files.c:544
-#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109
+#: 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
msgid "file"
msgstr "fitxer"
-#: archive.c:433 builtin/archive.c:89
+#: archive.c:421 builtin/archive.c:89
msgid "write the archive to this file"
msgstr "escriu l'arxiu a aquest fitxer"
-#: archive.c:435
+#: archive.c:423
msgid "read .gitattributes in working directory"
msgstr "llegeix .gitattributes en el directori de treball"
-#: archive.c:436
+#: archive.c:424
msgid "report archived files on stderr"
msgstr "informa de fitxers arxivats en stderr"
-#: archive.c:437
+#: archive.c:425
msgid "store only"
msgstr "només emmagatzema"
-#: archive.c:438
+#: archive.c:426
msgid "compress faster"
msgstr "comprimeix més ràpidament"
-#: archive.c:446
+#: archive.c:434
msgid "compress better"
msgstr "comprimeix millor"
-#: archive.c:449
+#: archive.c:437
msgid "list supported archive formats"
msgstr "llista els formats d'arxiu admesos"
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88
-#: builtin/submodule--helper.c:603 builtin/submodule--helper.c:969
+#: archive.c:439 builtin/archive.c:90 builtin/clone.c:103 builtin/clone.c:106
+#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
msgid "repo"
msgstr "dipòsit"
-#: archive.c:452 builtin/archive.c:91
+#: archive.c:440 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr "recupera l'arxiu del dipòsit remot <dipòsit>"
-#: archive.c:453 builtin/archive.c:92 builtin/notes.c:485
+#: archive.c:441 builtin/archive.c:92 builtin/notes.c:485
msgid "command"
msgstr "ordre"
-#: archive.c:454 builtin/archive.c:93
+#: archive.c:442 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr "camí a l'ordre git-upload-archive remota"
-#: archive.c:461
+#: archive.c:449
msgid "Unexpected option --remote"
msgstr "Opció inesperada --remote"
-#: archive.c:463
+#: archive.c:451
msgid "Option --exec can only be used together with --remote"
msgstr "L'opció --exec només es pot usar junt amb --remote"
-#: archive.c:465
+#: archive.c:453
msgid "Unexpected option --output"
msgstr "Opció inesperada --output"
-#: archive.c:487
+#: archive.c:475
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Format d'arxiu desconegut '%s'"
-#: archive.c:494
+#: archive.c:482
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Paràmetre no admès per al format '%s': -%d"
-#: attr.c:263
+#: attr.c:212
+#, , c-format
+msgid "%.*s is not a valid attribute name"
+msgstr "%.*s no és un nom d'atribut vàlid"
+
+#: attr.c:408
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -885,27 +888,27 @@
"Els patrons negatius s'ignoren en els atributs de git\n"
"Useu '\\!' per exclamació capdavantera literal."
-#: bisect.c:441
+#: bisect.c:444
#, c-format
msgid "Could not open file '%s'"
msgstr "No s'ha pogut obrir el fitxer '%s'"
-#: bisect.c:446
+#: bisect.c:449
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "Comentari amb cometes errònies en el fitxer '%s': %s"
-#: bisect.c:655
+#: bisect.c:657
#, c-format
msgid "We cannot bisect more!\n"
msgstr "No podem bisecar més!\n"
-#: bisect.c:708
+#: bisect.c:710
#, c-format
msgid "Not a valid commit name %s"
msgstr "No és un nom de comissió vàlid %s"
-#: bisect.c:732
+#: bisect.c:734
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -914,7 +917,7 @@
"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:737
+#: bisect.c:739
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -923,7 +926,7 @@
"La base de fusió %s és nova.\n"
"La propietat s'ha canviat entre %s i [%s].\n"
-#: bisect.c:742
+#: bisect.c:744
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -932,7 +935,7 @@
"La base de fusió %s és %s.\n"
"Això vol dir que la primera comissió '%s' és entre %s i [%s].\n"
-#: bisect.c:750
+#: bisect.c:752
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -943,7 +946,7 @@
"git bisect no pot funcionar correctament en aquest cas.\n"
"Potser heu confós les revisions %s i %s?\n"
-#: bisect.c:763
+#: bisect.c:765
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -955,45 +958,45 @@
"i %s.\n"
"Continuem de totes maneres."
-#: bisect.c:798
+#: bisect.c:800
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "Bisecant: s'ha de provar una base de fusió\n"
-#: bisect.c:849
+#: bisect.c:851
#, c-format
msgid "a %s revision is needed"
msgstr "es necessita una revisió %s"
-#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:262
+#: bisect.c:868 builtin/notes.c:174 builtin/tag.c:255
#, c-format
msgid "could not create file '%s'"
msgstr "no s'ha pogut crear el fitxer '%s'"
-#: bisect.c:917
+#: bisect.c:919
#, c-format
msgid "could not read file '%s'"
msgstr "no s'ha pogut llegir el fitxer '%s'"
-#: bisect.c:947
+#: bisect.c:949
msgid "reading bisect refs failed"
msgstr "la lectura de les referències de bisecció ha fallat"
-#: bisect.c:967
+#: bisect.c:969
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s era ambdós %s i %s\n"
-#: bisect.c:975
+#: bisect.c:977
#, c-format
msgid ""
"No testable commit found.\n"
"Maybe you started with bad path parameters?\n"
msgstr ""
-"No s'ha trobat cap comissió probable.\n"
+"No s'ha trobat cap comissió comprovable.\n"
"Potser heu començat amb paràmetres de camí dolents?\n"
-#: bisect.c:994
+#: bisect.c:996
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1002,7 +1005,7 @@
#. TRANSLATORS: the last %s will be replaced with
#. "(roughly %d steps)" translation
-#: bisect.c:998
+#: bisect.c:1000
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
@@ -1150,7 +1153,7 @@
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' ja s'ha agafat a '%s'"
-#: branch.c:363
+#: branch.c:364
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "La HEAD de l'arbre de treball %s no està actualitzat"
@@ -1165,7 +1168,7 @@
msgid "unrecognized header: %s%s (%d)"
msgstr "capçalera no reconeguda: %s%s (%d)"
-#: bundle.c:87 sequencer.c:1331 sequencer.c:1752 builtin/commit.c:777
+#: bundle.c:87 sequencer.c:1341 sequencer.c:1767 builtin/commit.c:777
#, c-format
msgid "could not open '%s'"
msgstr "no s'ha pogut obrir '%s'"
@@ -1174,10 +1177,10 @@
msgid "Repository lacks these prerequisite commits:"
msgstr "Al dipòsit li manquen aquestes comissions prerequisits:"
-#: bundle.c:163 ref-filter.c:1499 sequencer.c:1154 sequencer.c:2290
-#: builtin/blame.c:2820 builtin/commit.c:1061 builtin/log.c:348
-#: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909
-#: builtin/merge.c:360 builtin/shortlog.c:177
+#: 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"
@@ -1216,7 +1219,7 @@
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:165 builtin/log.c:1572 builtin/shortlog.c:282
+#: bundle.c:443 builtin/log.c:170 builtin/log.c:1579 builtin/shortlog.c:281
#, c-format
msgid "unrecognized argument: %s"
msgstr "paràmetre no reconegut: %s"
@@ -1239,8 +1242,8 @@
msgid "invalid color value: %.*s"
msgstr "valor de color no vàlid: %.*s"
-#: commit.c:40 sequencer.c:1564 builtin/am.c:421 builtin/am.c:457
-#: builtin/am.c:1493 builtin/am.c:2127
+#: commit.c:40 sequencer.c:1579 builtin/am.c:419 builtin/am.c:455
+#: builtin/am.c:1489 builtin/am.c:2126
#, c-format
msgid "could not parse %s"
msgstr "no s'ha pogut analitzar %s"
@@ -1250,7 +1253,7 @@
msgid "%s %s is not a commit!"
msgstr "%s %s no és una comissió!"
-#: commit.c:1514
+#: commit.c:1511
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
@@ -1265,138 +1268,157 @@
msgid "memory exhausted"
msgstr "memòria esgotada"
-#: config.c:518
+#: config.c:191
+msgid "relative config include conditionals must come from files"
+msgstr ""
+
+#: config.c:711
#, c-format
msgid "bad config line %d in blob %s"
msgstr "línia de configuració %d errònia en el blob %s"
-#: config.c:522
+#: config.c:715
#, c-format
msgid "bad config line %d in file %s"
msgstr "línia de configuració %d errònia en el fitxer %s"
-#: config.c:526
+#: config.c:719
#, 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:530
+#: config.c:723
#, 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:534
+#: config.c:727
#, 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:538
+#: config.c:731
#, c-format
msgid "bad config line %d in %s"
msgstr "línia de configuració %d errònia en %s"
-#: config.c:657
+#: config.c:859
msgid "out of range"
msgstr "fora de rang"
-#: config.c:657
+#: config.c:859
msgid "invalid unit"
msgstr "unitat no vàlida"
-#: config.c:663
+#: config.c:865
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "valor de configuració numèric erroni '%s' per '%s': %s"
-#: config.c:668
+#: config.c:870
#, 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:671
+#: config.c:873
#, 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:674
+#: config.c:876
#, 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"
-#: config.c:677
+#: config.c:879
#, 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"
-#: config.c:680
+#: config.c:882
#, 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"
-#: config.c:683
+#: config.c:885
#, 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:770
+#: config.c:980
#, 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:865 config.c:876
+#: config.c:1075 config.c:1086
#, c-format
msgid "bad zlib compression level %d"
msgstr "nivell de compressió de zlib dolent %d"
-#: config.c:993
+#: config.c:1203
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "mode de creació d'objecte no vàlid: %s"
-#: config.c:1149
+#: config.c:1359
#, c-format
msgid "bad pack compression level %d"
msgstr "nivell de compressió de paquet %d Erroni"
-#: config.c:1339
+#: config.c:1557
msgid "unable to parse command-line config"
msgstr "no s'ha pogut analitzar la configuració de la línia d'ordres"
-#: config.c:1389
+#: config.c:1611
msgid "unknown error occurred while reading the configuration files"
msgstr "un error desconegut ha ocorregut en llegir els fitxers de configuració"
-#: config.c:1743
+#: config.c:1970
+#, c-format
+msgid "Invalid %s: '%s'"
+msgstr "%s no vàlid: %s"
+
+#: config.c:1991
+#, c-format
+msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
+msgstr ""
+
+#: config.c:2017
+#, c-format
+msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
+msgstr ""
+
+#: config.c:2028
#, 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:1745
+#: config.c:2030
#, 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:1804
+#: config.c:2089
#, c-format
msgid "%s has multiple values"
msgstr "%s té múltiples valors"
-#: config.c:2225 config.c:2450
+#: config.c:2423 config.c:2648
#, c-format
msgid "fstat on %s failed"
msgstr "ha fallat fstat a %s"
-#: config.c:2343
+#: config.c:2541
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "no s'ha pogut establir '%s' a '%s'"
-#: config.c:2345
+#: config.c:2543 builtin/remote.c:774
#, c-format
msgid "could not unset '%s'"
msgstr "no s'ha pogut desestablir '%s'"
@@ -1572,20 +1594,20 @@
"S'han trobat errors en la variable de configuració 'diff.dirstat':\n"
"%s"
-#: diff.c:3085
+#: diff.c:3102
#, c-format
msgid "external diff died, stopping at %s"
msgstr "el diff external s'ha mort, s'està aturant a %s"
-#: diff.c:3411
+#: diff.c:3428
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:3501
+#: diff.c:3518
msgid "--follow requires exactly one pathspec"
msgstr "--follow requereix exactament una especificació de camí"
-#: diff.c:3664
+#: diff.c:3681
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -1594,22 +1616,22 @@
"S'ha produït un error en analitzar el paràmetre d'opció de --dirstat/-X:\n"
"%s"
-#: diff.c:3678
+#: diff.c:3695
#, 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'"
-#: diff.c:4696
+#: diff.c:4719
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:4699
+#: diff.c:4722
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."
-#: diff.c:4702
+#: diff.c:4725
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -1617,187 +1639,212 @@
"potser voleu establir la vostra variable %s a almenys %d i tornar a intentar "
"l'ordre."
-#: dir.c:1862
+#: dir.c:1899
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:1981
+#: dir.c:2018
msgid "Untracked cache is disabled on this system or location."
msgstr ""
"La memòria cau no seguida està inhabilitada en aquest sistema o ubicació."
-#: dir.c:2759
+#: dir.c:2776 dir.c:2781
+#, c-format
+msgid "could not create directories for %s"
+msgstr "no s'ha pogut crear directoris per %s"
+
+#: dir.c:2806
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "no s'ha pogut migrar el directori de '%s' a '%s'"
-#: fetch-pack.c:213
+#: entry.c:280
+#, c-format
+msgid "could not stat file '%s'"
+msgstr "no s'ha pogut fer «stat» sobre el fitxer '%s'"
+
+#: fetch-pack.c:249
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: llista superficial esperada"
-#: fetch-pack.c:225
+#: fetch-pack.c:261
msgid "git fetch-pack: expected ACK/NAK, got EOF"
msgstr "git fetch-pack: ACK/NAK esperat, EOF rebut"
-#: fetch-pack.c:243
+#: fetch-pack.c:280 builtin/archive.c:63
+#, c-format
+msgid "remote error: %s"
+msgstr "error remot: %s"
+
+#: fetch-pack.c:281
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: ACK/NAK esperat, '%s' rebut"
-#: fetch-pack.c:295
+#: fetch-pack.c:333
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc requereix multi_ack_detailed"
-#: fetch-pack.c:381
+#: fetch-pack.c:419
#, c-format
msgid "invalid shallow line: %s"
msgstr "línia de shallow no vàlida: %s"
-#: fetch-pack.c:387
+#: fetch-pack.c:425
#, c-format
msgid "invalid unshallow line: %s"
msgstr "línia d'unshallow no vàlida: %s"
-#: fetch-pack.c:389
+#: fetch-pack.c:427
#, c-format
msgid "object not found: %s"
msgstr "objecte no trobat: %s"
-#: fetch-pack.c:392
+#: fetch-pack.c:430
#, c-format
msgid "error in object: %s"
msgstr "error en objecte: %s"
-#: fetch-pack.c:394
+#: fetch-pack.c:432
#, c-format
msgid "no shallow found: %s"
msgstr "no s'ha trobat cap shallow: %s"
-#: fetch-pack.c:397
+#: fetch-pack.c:435
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "s'esperava shallow/unshallow, s'ha rebut %s"
-#: fetch-pack.c:436
+#: fetch-pack.c:474
#, c-format
msgid "got %s %d %s"
msgstr "%s %d %s rebut"
-#: fetch-pack.c:450
+#: fetch-pack.c:488
#, c-format
msgid "invalid commit %s"
msgstr "comissió no vàlida %s"
-#: fetch-pack.c:483
+#: fetch-pack.c:521
msgid "giving up"
msgstr "s'està rendint"
-#: fetch-pack.c:493 progress.c:235
+#: fetch-pack.c:531 progress.c:235
msgid "done"
msgstr "fet"
-#: fetch-pack.c:505
+#: fetch-pack.c:543
#, c-format
msgid "got %s (%d) %s"
msgstr "s'ha rebut %s (%d) %s"
-#: fetch-pack.c:551
+#: fetch-pack.c:589
#, c-format
msgid "Marking %s as complete"
msgstr "S'està marcant %s com a complet"
-#: fetch-pack.c:697
+#: fetch-pack.c:737
#, c-format
msgid "already have %s (%s)"
msgstr "ja es té %s (%s)"
-#: fetch-pack.c:735
+#: fetch-pack.c:775
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack: no s'ha pogut bifurcar del demultiplexor de banda lateral"
-#: fetch-pack.c:743
+#: fetch-pack.c:783
msgid "protocol error: bad pack header"
msgstr "error de protocol: capçalera de paquet errònia"
-#: fetch-pack.c:799
+#: fetch-pack.c:839
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: no es pot bifurcar de %s"
-#: fetch-pack.c:815
+#: fetch-pack.c:855
#, c-format
msgid "%s failed"
msgstr "%s ha fallat"
-#: fetch-pack.c:817
+#: fetch-pack.c:857
msgid "error in sideband demultiplexer"
msgstr "error en demultiplexor de banda lateral"
-#: fetch-pack.c:844
+#: fetch-pack.c:884
msgid "Server does not support shallow clients"
msgstr "El servidor no permet clients superficials"
-#: fetch-pack.c:848
+#: fetch-pack.c:888
msgid "Server supports multi_ack_detailed"
msgstr "El servidor accepta multi_ack_detailed"
-#: fetch-pack.c:851
+#: fetch-pack.c:891
msgid "Server supports no-done"
msgstr "El servidor accepta no-done"
-#: fetch-pack.c:857
+#: fetch-pack.c:897
msgid "Server supports multi_ack"
msgstr "El servidor accepta multi_ack"
-#: fetch-pack.c:861
+#: fetch-pack.c:901
msgid "Server supports side-band-64k"
msgstr "El servidor accepta side-band-64k"
-#: fetch-pack.c:865
+#: fetch-pack.c:905
msgid "Server supports side-band"
msgstr "El servidor accepta banda lateral"
-#: fetch-pack.c:869
+#: fetch-pack.c:909
msgid "Server supports allow-tip-sha1-in-want"
msgstr "El servidor accepta allow-tip-sha1-in-want"
-#: fetch-pack.c:873
+#: fetch-pack.c:913
msgid "Server supports allow-reachable-sha1-in-want"
msgstr "El servidor accepta allow-reachable-sha1-in-want"
-#: fetch-pack.c:883
+#: fetch-pack.c:923
msgid "Server supports ofs-delta"
msgstr "El servidor accepta ofs-delta"
-#: fetch-pack.c:890
+#: fetch-pack.c:930
#, c-format
msgid "Server version is %.*s"
msgstr "La versió del servidor és %.*s"
-#: fetch-pack.c:896
+#: fetch-pack.c:936
msgid "Server does not support --shallow-since"
msgstr "El servidor no admet --shallow-since"
-#: fetch-pack.c:900
+#: fetch-pack.c:940
msgid "Server does not support --shallow-exclude"
msgstr "El servidor no admet --shallow-exclude"
-#: fetch-pack.c:902
+#: fetch-pack.c:942
msgid "Server does not support --deepen"
msgstr "El servidor no admet --deepen"
-#: fetch-pack.c:913
+#: fetch-pack.c:953
msgid "no common commits"
msgstr "cap comissió en comú"
-#: fetch-pack.c:925
+#: fetch-pack.c:965
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: l'obtenció ha fallat."
-#: fetch-pack.c:1087
+#: fetch-pack.c:1127
msgid "no matching remote head"
msgstr "no hi ha cap HEAD remot coincident"
+#: fetch-pack.c:1149
+#, c-format
+msgid "no such remote ref %s"
+msgstr "no existeix la referència remota %s"
+
+#: fetch-pack.c:1152
+#, 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
msgid "gpg failed to sign the data"
msgstr "gpg ha fallat en signar les dades"
@@ -1816,17 +1863,17 @@
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "ignora el color invàlid '%.*s' en log.graphColors"
-#: grep.c:1794
+#: grep.c:1796
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s': no s'ha pogut llegir %s"
-#: grep.c:1811 builtin/clone.c:381 builtin/diff.c:81 builtin/rm.c:133
+#: grep.c:1813 builtin/clone.c:399 builtin/diff.c:81 builtin/rm.c:133
#, c-format
msgid "failed to stat '%s'"
msgstr "s'ha produït un error en fer stat a '%s'"
-#: grep.c:1822
+#: grep.c:1824
#, c-format
msgid "'%s': short read"
msgstr "'%s': lectura curta"
@@ -1842,7 +1889,8 @@
#: help.c:256
msgid "These are common Git commands used in various situations:"
-msgstr "Aquestes són ordres del Git comunament usades en diverses situacions:"
+msgstr ""
+"Aquestes són ordres del Git habitualment usades en diverses situacions:"
#: help.c:321
#, c-format
@@ -1896,7 +1944,7 @@
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: ident.c:334
+#: ident.c:343
msgid ""
"\n"
"*** Please tell me who you are.\n"
@@ -1921,6 +1969,39 @@
"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
+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"
+
+#: ident.c:372
+#, 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)"
+
+#: ident.c:382
+msgid "no name was given and auto-detection is disabled"
+msgstr "no s'ha proporcionat cap nom i la detecció automàtica està inhabilitada"
+
+#: ident.c:388
+#, 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
+#, c-format
+msgid "empty ident name (for <%s>) not allowed"
+msgstr ""
+
+#: ident.c:402
+#, c-format
+msgid "name consists only of disallowed characters: %s"
+msgstr ""
+
+#: ident.c:417 builtin/commit.c:611
+#, c-format
+msgid "invalid date format: %s"
+msgstr "format de data no vàlid: %s"
+
#: lockfile.c:152
#, c-format
msgid ""
@@ -1950,8 +2031,8 @@
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:2000 builtin/am.c:2035 builtin/checkout.c:374
-#: builtin/checkout.c:588 builtin/clone.c:731
+#: merge.c:96 builtin/am.c:1999 builtin/am.c:2034 builtin/checkout.c:393
+#: builtin/checkout.c:607 builtin/clone.c:749
msgid "unable to write new index file"
msgstr "no s'ha pogut escriure un fitxer d'índex nou"
@@ -2021,7 +2102,7 @@
msgid "Unable to add %s to database"
msgstr "No s'ha pogut afegir %s a la base de dades"
-#: merge-recursive.c:1088 merge-recursive.c:1102
+#: merge-recursive.c:1092
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2030,7 +2111,16 @@
"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:1094 merge-recursive.c:1107
+#: merge-recursive.c:1097
+#, c-format
+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."
+
+#: merge-recursive.c:1104
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2039,20 +2129,29 @@
"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:1150
+#: merge-recursive.c:1109
+#, 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 ""
+"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
msgid "rename"
msgstr "canvi de nom"
-#: merge-recursive.c:1150
+#: merge-recursive.c:1143
msgid "renamed"
msgstr "canviat de nom"
-#: merge-recursive.c:1207
+#: merge-recursive.c:1200
#, 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:1232
+#: merge-recursive.c:1225
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -2061,139 +2160,139 @@
"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:1237
+#: merge-recursive.c:1230
msgid " (left unresolved)"
msgstr " (deixat sense resolució)"
-#: merge-recursive.c:1299
+#: merge-recursive.c:1292
#, 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"
-#: merge-recursive.c:1332
+#: merge-recursive.c:1325
#, 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:1535
+#: merge-recursive.c:1528
#, 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"
-#: merge-recursive.c:1550
+#: merge-recursive.c:1543
#, c-format
msgid "Adding merged %s"
msgstr "S'està afegint %s fusionat"
-#: merge-recursive.c:1557 merge-recursive.c:1771
+#: merge-recursive.c:1550 merge-recursive.c:1780
#, c-format
msgid "Adding as %s instead"
msgstr "S'està afegint com a %s en lloc d'això"
-#: merge-recursive.c:1614
+#: merge-recursive.c:1607
#, c-format
msgid "cannot read object %s"
msgstr "no es pot llegir l'objecte %s"
-#: merge-recursive.c:1617
+#: merge-recursive.c:1610
#, c-format
msgid "object %s is not a blob"
msgstr "l'objecte %s no és un blob"
-#: merge-recursive.c:1670
+#: merge-recursive.c:1679
msgid "modify"
msgstr "modificació"
-#: merge-recursive.c:1670
+#: merge-recursive.c:1679
msgid "modified"
msgstr "modificat"
-#: merge-recursive.c:1680
+#: merge-recursive.c:1689
msgid "content"
msgstr "contingut"
-#: merge-recursive.c:1687
+#: merge-recursive.c:1696
msgid "add/add"
msgstr "afegiment/afegiment"
-#: merge-recursive.c:1723
+#: merge-recursive.c:1732
#, 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:1737
+#: merge-recursive.c:1746
#, c-format
msgid "Auto-merging %s"
msgstr "S'està autofusionant %s"
-#: merge-recursive.c:1741 git-submodule.sh:930
+#: merge-recursive.c:1750 git-submodule.sh:944
msgid "submodule"
msgstr "submòdul"
-#: merge-recursive.c:1742
+#: merge-recursive.c:1751
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "CONFLICTE (%s): Conflicte de fusió en %s"
-#: merge-recursive.c:1836
+#: merge-recursive.c:1845
#, c-format
msgid "Removing %s"
msgstr "S'està eliminant %s"
-#: merge-recursive.c:1862
+#: merge-recursive.c:1871
msgid "file/directory"
msgstr "fitxer/directori"
-#: merge-recursive.c:1868
+#: merge-recursive.c:1877
msgid "directory/file"
msgstr "directori/fitxer"
-#: merge-recursive.c:1874
+#: merge-recursive.c:1883
#, 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"
-#: merge-recursive.c:1883
+#: merge-recursive.c:1892
#, c-format
msgid "Adding %s"
msgstr "S'està afegint %s"
-#: merge-recursive.c:1920
+#: merge-recursive.c:1929
msgid "Already up-to-date!"
msgstr "Ja està al dia!"
-#: merge-recursive.c:1929
+#: merge-recursive.c:1938
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "la fusió dels arbres %s i %s ha fallat"
-#: merge-recursive.c:2012
+#: merge-recursive.c:2021
msgid "Merging:"
msgstr "Fusionant:"
-#: merge-recursive.c:2025
+#: merge-recursive.c:2034
#, 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:2064
+#: merge-recursive.c:2073
msgid "merge returned no commit"
msgstr "la fusió no ha retornat cap comissió"
-#: merge-recursive.c:2127
+#: merge-recursive.c:2136
#, c-format
msgid "Could not parse object '%s'"
msgstr "No s'ha pogut analitzar l'objecte '%s'"
-#: merge-recursive.c:2141 builtin/merge.c:645 builtin/merge.c:792
+#: merge-recursive.c:2150 builtin/merge.c:645 builtin/merge.c:792
msgid "Unable to write index."
msgstr "No s'ha pogut escriure l'índex."
@@ -2269,18 +2368,35 @@
msgid "malformed object name '%s'"
msgstr "nom d'objecte mal format '%s'"
-#: path.c:826
+#: path.c:810
#, c-format
msgid "Could not make %s writable by group"
msgstr "No s'ha pogut fer %s escrivible pel grup"
-#: pathspec.c:142
+#: pathspec.c:125
+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"
+
+#: pathspec.c:143
+msgid "Only one 'attr:' specification is allowed."
+msgstr "només es permet una especificació 'attr:'."
+
+#: pathspec.c:146
+msgid "attr spec must not be empty"
+msgstr "una especificació d'atribut no pot estar buida"
+
+#: pathspec.c:189
+#, c-format
+msgid "invalid attribute name %s"
+msgstr "nom d'atribut no vàlid %s"
+
+#: pathspec.c:254
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
"els ajusts d'especificació de camí 'glob' i 'noglob' globals són "
"incompatibles"
-#: pathspec.c:149
+#: pathspec.c:261
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
@@ -2288,52 +2404,52 @@
"l'ajust d'especificació de camí 'literal' global és incompatible amb tots "
"els altres ajusts d'especificació de camí globals"
-#: pathspec.c:188
+#: pathspec.c:301
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:201
+#: pathspec.c:322
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr "Màgia d'especificació de camí no vàlida '%.*s' en '%s'"
-#: pathspec.c:206
+#: pathspec.c:327
#, 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:238
+#: pathspec.c:365
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr "Màgia d'especificació de camí no implementada '%c' en '%s'"
-#: pathspec.c:293 pathspec.c:315
+#: 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:350
+#: pathspec.c:483
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s: 'literal' i 'glob' són incompatibles"
-#: pathspec.c:363
+#: pathspec.c:496
#, c-format
msgid "%s: '%s' is outside repository"
msgstr "%s: '%s' és fora del dipòsit"
-#: pathspec.c:451
+#: pathspec.c:584
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "'%s' (mnemònic: '%c')"
-#: pathspec.c:461
+#: pathspec.c:594
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr ""
-"%s: aquesta ordre no és compatible amb la màgia d'especificació de camí: %s"
+"%s: aquesta ordre no està admesa amb la màgia d'especificació de camí: %s"
-#: pathspec.c:511
+#: pathspec.c:644
msgid ""
"empty strings as pathspecs will be made invalid in upcoming releases. please "
"use . instead if you meant to match all paths"
@@ -2342,24 +2458,16 @@
"versions futures. Si us plau, useu . en lloc d'això si volíeu coincidir amb "
"tots els camins"
-#: pathspec.c:535
+#: pathspec.c:668
#, 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"
-#: pathspec.c:544
-msgid ""
-"There is nothing to exclude from by :(exclude) patterns.\n"
-"Perhaps you forgot to add either ':/' or '.' ?"
-msgstr ""
-"No hi ha res a excloure per patrons :(exclusió).\n"
-"Potser heu oblidat afegir o ':/' o '.' ?"
-
#: pretty.c:982
msgid "unable to parse --pretty format"
msgstr "no s'ha pogut analitzar el format --pretty"
-#: read-cache.c:1307
+#: read-cache.c:1442
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -2368,7 +2476,7 @@
"index.version està establerta, però el valor no és vàlid.\n"
"S'està usant la versió %i"
-#: read-cache.c:1317
+#: read-cache.c:1452
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -2377,161 +2485,268 @@
"GIT_INDEX_VERSION està establerta, però el valor no és vàlid.\n"
"S'està usant la versió %i"
-#: refs.c:576 builtin/merge.c:844
+#: read-cache.c:2375 sequencer.c:1350 sequencer.c:2048
+#, c-format
+msgid "could not stat '%s'"
+msgstr "no s'ha pogut fer stat a '%s'"
+
+#: read-cache.c:2388
+#, c-format
+msgid "unable to open git dir: %s"
+msgstr "no s'ha pogut obrir el directori git: %s"
+
+#: read-cache.c:2400
+#, c-format
+msgid "unable to unlink: %s"
+msgstr "no s'ha pogut desenllaçar: %s"
+
+#: refs.c:620 builtin/merge.c:844
#, c-format
msgid "Could not open '%s' for writing"
msgstr "No s'ha pogut obrir '%s' per a escriptura"
-#: refs/files-backend.c:2481
+#: refs.c:1667
+msgid "ref updates forbidden inside quarantine environment"
+msgstr ""
+
+#: refs/files-backend.c:1631
#, c-format
msgid "could not delete reference %s: %s"
msgstr "no s'ha pogut suprimir la referència %s: %s"
-#: refs/files-backend.c:2484
+#: refs/files-backend.c:1634
#, c-format
msgid "could not delete references: %s"
msgstr "no s'ha pogut suprimir les referències: %s"
-#: refs/files-backend.c:2493
+#: refs/files-backend.c:1643
#, c-format
msgid "could not remove reference %s"
msgstr "no s'ha pogut eliminar la referència %s"
-#: ref-filter.c:56
+#: ref-filter.c:35 wt-status.c:1780
+msgid "gone"
+msgstr "no hi és"
+
+#: ref-filter.c:36
+#, c-format
+msgid "ahead %d"
+msgstr "davant per %d"
+
+#: ref-filter.c:37
+#, c-format
+msgid "behind %d"
+msgstr "darrere per %d"
+
+#: ref-filter.c:38
+#, c-format
+msgid "ahead %d, behind %d"
+msgstr "davant per %d, darrere per %d"
+
+#: ref-filter.c:104
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "format esperat: %%(color:<color>)"
-#: ref-filter.c:58
+#: ref-filter.c:106
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "color no reconegut: %%(color:%s)"
-#: ref-filter.c:72
-#, c-format
-msgid "unrecognized format: %%(%s)"
-msgstr "format no reconegut: %%(%s)"
+#: ref-filter.c:120
+#, e, c-format
+msgid "Integer value expected refname:lstrip=%s"
+msgstr "valor enter esperat pel nom de referència:lstrip=%s"
-#: ref-filter.c:78
+#: ref-filter.c:124
+#, c-format
+msgid "Integer value expected refname:rstrip=%s"
+msgstr "valor enter esperat pel nom de referència:rstrip=%s"
+
+#: ref-filter.c:126
+#, c-format
+msgid "unrecognized %%(%s) argument: %s"
+msgstr "paràmetre %%(%s) desconegut: %s"
+
+#: ref-filter.c:166
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) no accepta paràmetres"
-#: ref-filter.c:85
+#: ref-filter.c:173
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "%%(subject) no accepta paràmetres"
-#: ref-filter.c:92
+#: ref-filter.c:180
#, c-format
msgid "%%(trailers) does not take arguments"
msgstr "%%(trailers) no accepta paràmetres"
-#: ref-filter.c:111
+#: ref-filter.c:199
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "valor positiu esperat conté:lines=%s"
-#: ref-filter.c:113
+#: ref-filter.c:201
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "paràmetre %%(contents) no reconegut: %s"
-#: ref-filter.c:123
+#: ref-filter.c:214
+#, fuzzy, c-format
+msgid "positive value expected objectname:short=%s"
+msgstr "valor positiu esperat conté:lines=%s"
+
+#: ref-filter.c:218
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "paràmetre %%(objectname) no reconegut: %s"
-#: ref-filter.c:145
+#: ref-filter.c:245
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "format esperat: %%(align:<amplada>,<posició>)"
-#: ref-filter.c:157
+#: ref-filter.c:257
#, c-format
msgid "unrecognized position:%s"
msgstr "posició no reconeguda:%s"
-#: ref-filter.c:161
+#: ref-filter.c:261
#, c-format
msgid "unrecognized width:%s"
msgstr "amplada no reconeguda:%s"
-#: ref-filter.c:167
+#: ref-filter.c:267
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "paràmetre %%(align) no reconegut: %s"
-#: ref-filter.c:171
+#: ref-filter.c:271
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "amplada positiva esperada amb l'àtom %%(align)"
-#: ref-filter.c:255
+#: ref-filter.c:286
+#, c-format
+msgid "unrecognized %%(if) argument: %s"
+msgstr "paràmetre %%(if) no reconegut: %s"
+
+#: ref-filter.c:371
#, c-format
msgid "malformed field name: %.*s"
msgstr "nom de camp mal format: %.*s"
-#: ref-filter.c:281
+#: ref-filter.c:397
#, c-format
msgid "unknown field name: %.*s"
msgstr "nom de camp desconegut: %.*s"
-#: ref-filter.c:383
+#: ref-filter.c:501
+#, fuzzy, c-format
+msgid "format: %%(if) atom used without a %%(then) atom"
+msgstr "format: s'ha usat l'àtom %%(end) sense l'àtom corresponent"
+
+#: ref-filter.c:561
+#, fuzzy, c-format
+msgid "format: %%(then) atom used without an %%(if) atom"
+msgstr "format: s'ha usat l'àtom %%(end) sense l'àtom corresponent"
+
+#: ref-filter.c:563
+#, fuzzy, c-format
+msgid "format: %%(then) atom used more than once"
+msgstr "format: s'ha usat l'àtom %%(end) sense l'àtom corresponent"
+
+#: ref-filter.c:565
+#, fuzzy, c-format
+msgid "format: %%(then) atom used after %%(else)"
+msgstr "format: manca l'àtom %%(end)"
+
+#: ref-filter.c:591
+#, fuzzy, c-format
+msgid "format: %%(else) atom used without an %%(if) atom"
+msgstr "format: s'ha usat l'àtom %%(end) sense l'àtom corresponent"
+
+#: ref-filter.c:593
+#, fuzzy, c-format
+msgid "format: %%(else) atom used without a %%(then) atom"
+msgstr "format: s'ha usat l'àtom %%(end) sense l'àtom corresponent"
+
+#: ref-filter.c:595
+#, fuzzy, c-format
+msgid "format: %%(else) atom used more than once"
+msgstr "format: s'ha usat l'àtom %%(end) sense l'àtom corresponent"
+
+#: ref-filter.c:608
#, 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:435
+#: ref-filter.c:663
#, c-format
msgid "malformed format string %s"
msgstr "cadena de format mal format %s"
-#: ref-filter.c:898
-msgid ":strip= requires a positive integer argument"
-msgstr ":strip= requereix un paràmetre enter positiu"
-
-#: ref-filter.c:903
+#: ref-filter.c:1247
#, c-format
-msgid "ref '%s' does not have %ld components to :strip"
-msgstr "la referència '%s' no té %ld components per a :strip"
+msgid "(no branch, rebasing %s)"
+msgstr "(cap branca, s'està rebasant %s)"
-#: ref-filter.c:1066
+#: ref-filter.c:1250
#, c-format
-msgid "unknown %.*s format %s"
-msgstr "format de %.*s desconegut %s"
+msgid "(no branch, bisect started on %s)"
+msgstr "(cap branca, bisecció començada en %s)"
-#: ref-filter.c:1086 ref-filter.c:1117
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached at " in wt-status.c
+#: ref-filter.c:1256
+#, 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
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr "(HEAD separat de %s)"
+
+#: ref-filter.c:1265
+msgid "(no branch)"
+msgstr "(cap branca)"
+
+#: ref-filter.c:1420 ref-filter.c:1451
#, c-format
msgid "missing object %s for %s"
msgstr "manca l'objecte %s per a %s"
-#: ref-filter.c:1089 ref-filter.c:1120
+#: ref-filter.c:1423 ref-filter.c:1454
#, 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:1343
+#: ref-filter.c:1692
#, c-format
msgid "malformed object at '%s'"
msgstr "objecte mal format a '%s'"
-#: ref-filter.c:1410
+#: ref-filter.c:1759
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "s'està ignorant la referència amb nom malmès %s"
-#: ref-filter.c:1415
+#: ref-filter.c:1764
#, c-format
msgid "ignoring broken ref %s"
msgstr "s'està ignorant la referència trencada %s"
-#: ref-filter.c:1670
+#: ref-filter.c:2028
#, c-format
msgid "format: %%(end) atom missing"
msgstr "format: manca l'àtom %%(end)"
-#: ref-filter.c:1734
+#: ref-filter.c:2109
#, c-format
msgid "malformed object name %s"
msgstr "nom d'objecte %s mal format"
@@ -2680,15 +2895,25 @@
msgid "dup2(%d,%d) failed"
msgstr "dup2(%d,%d) ha fallat"
-#: send-pack.c:297
+#: send-pack.c:150
+#, 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
+#, c-format
+msgid "remote unpack failed: %s"
+msgstr "s'ha produït un error en el desempaquetament remot: %s"
+
+#: send-pack.c:315
msgid "failed to sign the push certificate"
msgstr "s'ha produït un error en signar el certificat de pujada"
-#: send-pack.c:410
+#: send-pack.c:428
msgid "the receiving end does not support --signed push"
msgstr "el destí receptor no admet pujar --signed"
-#: send-pack.c:412
+#: send-pack.c:430
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -2696,11 +2921,11 @@
"no s'està enviant una certificació de pujada perquè el destí receptor no "
"admet pujar --signed"
-#: send-pack.c:424
+#: send-pack.c:442
msgid "the receiving end does not support --atomic push"
msgstr "el destí receptor no admet pujar --atomic"
-#: send-pack.c:429
+#: send-pack.c:447
msgid "the receiving end does not support push options"
msgstr "el destí receptor no admet opcions de pujada"
@@ -2739,12 +2964,12 @@
"corregits amb 'git add <camins>' o 'git rm <camins>'\n"
"i cometeu el resultat amb 'git commit'"
-#: sequencer.c:294 sequencer.c:1667
+#: sequencer.c:294 sequencer.c:1682
#, c-format
msgid "could not lock '%s'"
msgstr "no s'ha pogut bloquejar '%s'"
-#: sequencer.c:297 sequencer.c:1545 sequencer.c:1672 sequencer.c:1686
+#: sequencer.c:297 sequencer.c:1560 sequencer.c:1687 sequencer.c:1701
#, c-format
msgid "could not write to '%s'"
msgstr "no s'ha pogut escriure a '%s'"
@@ -2754,13 +2979,13 @@
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:1550 sequencer.c:1674
+#: sequencer.c:305 sequencer.c:1565 sequencer.c:1689
#, c-format
msgid "failed to finalize '%s'."
msgstr "s'ha produït un error en finalitzar '%s'."
-#: sequencer.c:329 sequencer.c:808 sequencer.c:1571 builtin/am.c:259
-#: builtin/commit.c:749 builtin/merge.c:1036
+#: sequencer.c:329 sequencer.c:814 sequencer.c:1586 builtin/am.c:257
+#: builtin/commit.c:749 builtin/merge.c:1018
#, c-format
msgid "could not read '%s'"
msgstr "no s'ha pogut llegir '%s'"
@@ -2812,7 +3037,8 @@
" 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"
@@ -2824,17 +3050,17 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:688
+#: sequencer.c:694
#, c-format
msgid "could not parse commit %s\n"
msgstr "no s'ha pogut analitzar la comissió %s\n"
-#: sequencer.c:693
+#: sequencer.c:699
#, c-format
msgid "could not parse parent commit %s\n"
-msgstr "no s'ha pogut analitzar la comissió mare %s\n"
+msgstr "no s'ha pogut analitzar la comissió pare %s\n"
-#: sequencer.c:815
+#: sequencer.c:821
#, c-format
msgid ""
"unexpected 1st line of squash message:\n"
@@ -2845,7 +3071,7 @@
"\n"
"\t%.*s"
-#: sequencer.c:821
+#: sequencer.c:827
#, c-format
msgid ""
"invalid 1st line of squash message:\n"
@@ -2856,230 +3082,230 @@
"\n"
"\t%.*s"
-#: sequencer.c:827 sequencer.c:852
+#: sequencer.c:833 sequencer.c:858
#, c-format
msgid "This is a combination of %d commits."
msgstr "Això és una combinació de %d comissions."
-#: sequencer.c:836
+#: sequencer.c:842
msgid "need a HEAD to fixup"
msgstr "cal un HEAD per reparar-ho"
-#: sequencer.c:838
+#: sequencer.c:844
msgid "could not read HEAD"
msgstr "no s'ha pogut llegir HEAD"
-#: sequencer.c:840
+#: sequencer.c:846
msgid "could not read HEAD's commit message"
msgstr "no s'ha pogut llegir el missatge de comissió de HEAD"
-#: sequencer.c:846
+#: sequencer.c:852
#, c-format
msgid "cannot write '%s'"
msgstr "no es pot escriure '%s'"
-#: sequencer.c:855 git-rebase--interactive.sh:445
+#: sequencer.c:861 git-rebase--interactive.sh:445
msgid "This is the 1st commit message:"
msgstr "Aquest és el 1r missatge de comissió:"
-#: sequencer.c:863
+#: sequencer.c:869
#, c-format
msgid "could not read commit message of %s"
msgstr "no s'ha pogut llegir el missatge de comissió: %s"
-#: sequencer.c:870
+#: sequencer.c:876
#, c-format
msgid "This is the commit message #%d:"
msgstr "Aquest és el missatge de comissió #%d:"
-#: sequencer.c:875
+#: sequencer.c:881
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "El missatge de comissió núm. #%d s'ometrà:"
-#: sequencer.c:880
+#: sequencer.c:886
#, c-format
msgid "unknown command: %d"
msgstr "ordre desconeguda: %d"
-#: sequencer.c:946
+#: sequencer.c:952
msgid "your index file is unmerged."
msgstr "el vostre fitxer d'índex està sense fusionar."
-#: sequencer.c:964
+#: sequencer.c:970
#, 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:972
+#: sequencer.c:978
#, c-format
msgid "commit %s does not have parent %d"
-msgstr "la comissió %s no té mare %d"
+msgstr "la comissió %s no té pare %d"
-#: sequencer.c:976
+#: sequencer.c:982
#, 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ó."
-#: sequencer.c:982
+#: sequencer.c:988
#, 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:1001
+#: sequencer.c:1009
#, c-format
msgid "%s: cannot parse parent commit %s"
-msgstr "%s: no es pot analitzar la comissió mare %s"
+msgstr "%s: no es pot analitzar la comissió pare %s"
-#: sequencer.c:1063 sequencer.c:1812
+#: sequencer.c:1071 sequencer.c:1827
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "no s'ha pogut canviar el nom '%s' a '%s'"
-#: sequencer.c:1114
+#: sequencer.c:1122
#, c-format
msgid "could not revert %s... %s"
msgstr "no s'ha pogut revertir %s... %s"
-#: sequencer.c:1115
+#: sequencer.c:1123
#, c-format
msgid "could not apply %s... %s"
msgstr "no s'ha pogut aplicar %s... %s"
-#: sequencer.c:1157
+#: sequencer.c:1165
msgid "empty commit set passed"
msgstr "conjunt de comissions buit passat"
-#: sequencer.c:1167
+#: sequencer.c:1175
#, 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:1174
+#: sequencer.c:1182
#, 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:1294
+#: sequencer.c:1303
#, c-format
msgid "invalid line %d: %.*s"
msgstr "línia no vàlida %d: %.*s"
-#: sequencer.c:1302
+#: sequencer.c:1311
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "No es pot '%s' sense una comissió prèvia"
-#: sequencer.c:1334
+#: sequencer.c:1344
#, c-format
msgid "could not read '%s'."
msgstr "no s'ha pogut llegir '%s'."
-#: sequencer.c:1341
+#: sequencer.c:1356
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "si us plau, corregiu-ho això usant 'git rebase --edit-todo'."
-#: sequencer.c:1343
+#: sequencer.c:1358
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "full d'instruccions inusable: '%s'"
-#: sequencer.c:1348
+#: sequencer.c:1363
msgid "no commits parsed."
msgstr "no s'ha analitzat cap comissió."
-#: sequencer.c:1359
+#: sequencer.c:1374
msgid "cannot cherry-pick during a revert."
msgstr "no es pot fer «cherry pick» durant una reversió."
-#: sequencer.c:1361
+#: sequencer.c:1376
msgid "cannot revert during a cherry-pick."
msgstr "no es pot revertir durant un «cherry pick»."
-#: sequencer.c:1424
+#: sequencer.c:1439
#, c-format
msgid "invalid key: %s"
msgstr "clau no vàlida: %s"
-#: sequencer.c:1427
+#: sequencer.c:1442
#, c-format
msgid "invalid value for %s: %s"
msgstr "valor no vàlid per a %s: %s"
-#: sequencer.c:1484
+#: sequencer.c:1499
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "full d'opcions mal format: '%s'"
-#: sequencer.c:1522
+#: sequencer.c:1537
msgid "a cherry-pick or revert is already in progress"
msgstr "un «cherry pick» o una reversió ja està en curs"
-#: sequencer.c:1523
+#: sequencer.c:1538
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "intenteu \"git cherry-pick (--continue | --quit | --abort)\""
-#: sequencer.c:1526
+#: sequencer.c:1541
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "no s'ha pogut crear el directori de seqüenciador '%s'"
-#: sequencer.c:1540
+#: sequencer.c:1555
msgid "could not lock HEAD"
msgstr "no s'ha pogut bloquejar HEAD"
-#: sequencer.c:1596 sequencer.c:2150
+#: sequencer.c:1611 sequencer.c:2181
msgid "no cherry-pick or revert in progress"
msgstr "ni hi ha cap «cherry pick» ni cap reversió en curs"
-#: sequencer.c:1598
+#: sequencer.c:1613
msgid "cannot resolve HEAD"
msgstr "no es pot resoldre HEAD"
-#: sequencer.c:1600 sequencer.c:1634
+#: sequencer.c:1615 sequencer.c:1649
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:1620 builtin/grep.c:904
+#: sequencer.c:1635 builtin/grep.c:910
#, c-format
msgid "cannot open '%s'"
msgstr "no es pot obrir '%s'"
-#: sequencer.c:1622
+#: sequencer.c:1637
#, c-format
msgid "cannot read '%s': %s"
msgstr "no es pot llegir '%s': %s"
-#: sequencer.c:1623
+#: sequencer.c:1638
msgid "unexpected end of file"
msgstr "final de fitxer inesperat"
-#: sequencer.c:1629
+#: sequencer.c:1644
#, 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:1640
+#: sequencer.c:1655
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:1777 sequencer.c:2049
+#: sequencer.c:1792 sequencer.c:2080
msgid "cannot read HEAD"
msgstr "No es pot llegir HEAD"
-#: sequencer.c:1817 builtin/difftool.c:574
+#: sequencer.c:1832 builtin/difftool.c:616
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "no s'ha pogut copiar '%s' a '%s'"
-#: sequencer.c:1833
+#: sequencer.c:1848
msgid "could not read index"
msgstr "no s'ha pogut llegir l'índex"
-#: sequencer.c:1838
+#: sequencer.c:1853
#, c-format
msgid ""
"execution failed: %s\n"
@@ -3094,11 +3320,11 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:1844
+#: sequencer.c:1859
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:1850
+#: sequencer.c:1865
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -3114,17 +3340,17 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:1905 git-rebase.sh:168
+#: sequencer.c:1920 git-rebase.sh:169
#, c-format
msgid "Applied autostash."
msgstr "S'ha aplicat el magatzem automàtic."
-#: sequencer.c:1917
+#: sequencer.c:1932
#, c-format
msgid "cannot store %s"
msgstr "no es pot emmagatzemar %s"
-#: sequencer.c:1919 git-rebase.sh:172
+#: sequencer.c:1934 git-rebase.sh:173
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
@@ -3135,57 +3361,57 @@
"Els vostres canvis estan segurs en el magatzem.\n"
"Podeu executar \"git stash pop\" o \"git stash drop\" en qualsevol moment.\n"
-#: sequencer.c:2000
+#: sequencer.c:2016
#, c-format
-msgid "stopped at %s... %.*s"
-msgstr "aturat a %s... %.*s"
+msgid "Stopped at %s... %.*s\n"
+msgstr "Aturat a %s... %.*s\n"
-#: sequencer.c:2027
+#: sequencer.c:2058
#, c-format
msgid "unknown command %d"
msgstr "ordre %d desconeguda"
-#: sequencer.c:2057
+#: sequencer.c:2088
msgid "could not read orig-head"
msgstr "No s'ha pogut llegir orig-head"
-#: sequencer.c:2061
+#: sequencer.c:2092
msgid "could not read 'onto'"
msgstr "no s'ha pogut llegir 'onto'"
-#: sequencer.c:2068
+#: sequencer.c:2099
#, c-format
msgid "could not update %s"
msgstr "no s'ha pogut analitzar %s"
-#: sequencer.c:2075
+#: sequencer.c:2106
#, c-format
msgid "could not update HEAD to %s"
msgstr "no s'ha pogut actualitzar HEAD a %s"
-#: sequencer.c:2159
+#: sequencer.c:2190
msgid "cannot rebase: You have unstaged changes."
msgstr "No es pot rebasar: Teniu canvis «unstaged»."
-#: sequencer.c:2164
+#: sequencer.c:2195
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "No s'ha pogut eliminar CHERRY_PICK_HEAD"
-#: sequencer.c:2173
+#: sequencer.c:2204
msgid "cannot amend non-existing commit"
msgstr "no es pot esmenar una comissió no existent"
-#: sequencer.c:2175
+#: sequencer.c:2206
#, c-format
msgid "invalid file: '%s'"
msgstr "fitxer no vàlid: '%s'"
-#: sequencer.c:2177
+#: sequencer.c:2208
#, c-format
msgid "invalid contents: '%s'"
msgstr "contingut no vàlid: '%s'"
-#: sequencer.c:2180
+#: sequencer.c:2211
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -3195,25 +3421,25 @@
"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:2190
+#: sequencer.c:2221
msgid "could not commit staged changes."
msgstr "No s'ha pogut cometre els canvis «staged»."
-#: sequencer.c:2270
+#: sequencer.c:2301
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: no es pot fer «cherry pick» a %s"
-#: sequencer.c:2274
+#: sequencer.c:2305
#, c-format
msgid "%s: bad revision"
msgstr "%s: revisió dolenta"
-#: sequencer.c:2307
+#: sequencer.c:2338
msgid "can't revert as initial commit"
msgstr "no es pot revertir com a comissió inicial"
-#: setup.c:160
+#: setup.c:165
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
@@ -3223,7 +3449,7 @@
"Useu 'git <ordre> -- <camí>...' per a especificar camins que no existeixin "
"localment."
-#: setup.c:173
+#: setup.c:178
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -3234,7 +3460,7 @@
"Useu '--' per a separar els camins de les revisions, com això:\n"
"'git <ordre> [<revisió>...] -- [<fitxer>...]'"
-#: setup.c:223
+#: setup.c:228
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
@@ -3245,29 +3471,34 @@
"Useu '--' per a separar els camins de les revisions, com això:\n"
"'git <ordre> [<revisió>...] -- [<fitxer>...]'"
-#: setup.c:470
+#: setup.c:475
#, 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:478
+#: setup.c:483
msgid "unknown repository extensions found:"
msgstr "s'han trobat extensions de dipòsit desconegudes:"
-#: setup.c:768
+#: setup.c:776
#, 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:770 setup.c:922 builtin/index-pack.c:1643
+#: setup.c:778 builtin/index-pack.c:1646
msgid "Cannot come back to cwd"
msgstr "No es pot tornar al directori de treball actual"
-#: setup.c:852
+#: setup.c:1010
msgid "Unable to read current working directory"
msgstr "No s'ha pogut llegir el directori de treball actual"
-#: setup.c:927
+#: setup.c:1022 setup.c:1028
+#, c-format
+msgid "Cannot change to '%s'"
+msgstr "No es pot canviar a '%s'"
+
+#: setup.c:1041
#, c-format
msgid ""
"Not a git repository (or any parent up to mount point %s)\n"
@@ -3277,12 +3508,7 @@
"S'atura a la frontera de sistema de fitxers (GIT_DISCOVERY_ACROSS_FILESYSTEM "
"no està establert)."
-#: setup.c:934
-#, c-format
-msgid "Cannot change to '%s/..'"
-msgstr "No es pot canviar a '%s/..'"
-
-#: setup.c:996
+#: setup.c:1106
#, c-format
msgid ""
"Problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -3293,58 +3519,58 @@
"El propietari dels fitxers sempre ha de tenir permisos de lectura i "
"escriptura."
-#: sha1_file.c:490
+#: sha1_file.c:559
#, c-format
msgid "path '%s' does not exist"
msgstr "el camí '%s' no existeix"
-#: sha1_file.c:516
+#: sha1_file.c:585
#, 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."
-#: sha1_file.c:522
+#: sha1_file.c:591
#, 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:528
+#: sha1_file.c:597
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "el dipòsit de referència '%s' és superficial"
-#: sha1_file.c:536
+#: sha1_file.c:605
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "el dipòsit de referència '%s' és empeltat"
-#: sha1_file.c:1176
+#: sha1_file.c:1245
msgid "offset before end of packfile (broken .idx?)"
msgstr "desplaçament abans de la fi del fitxer de paquet (.idx trencat?)"
-#: sha1_file.c:2637
+#: sha1_file.c:2721
#, 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?)"
-#: sha1_file.c:2641
+#: sha1_file.c:2725
#, 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?)"
-#: sha1_name.c:407
+#: sha1_name.c:409
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr "l'SHA1 %s curt és ambigu"
-#: sha1_name.c:418
+#: sha1_name.c:420
msgid "The candidates are:"
msgstr "Els candidats són:"
-#: sha1_name.c:578
+#: sha1_name.c:580
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"
@@ -3368,64 +3594,75 @@
"suprimiu-les. Desactiveu aquest missatge executant\n"
"\"git config advice.objectNameWarning false\""
-#: submodule.c:65 submodule.c:99
+#: submodule.c:67 submodule.c:101
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
"No es pot canviar un .gitmodules no fusionat, primer resoleu els conflictes "
"de fusió"
-#: submodule.c:69 submodule.c:103
+#: submodule.c:71 submodule.c:105
#, 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:77
+#: submodule.c:79
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "No s'ha pogut actualitzar l'entrada de .gitmodules %s"
-#: submodule.c:110
+#: submodule.c:112
#, 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:121
+#: submodule.c:123
msgid "staging updated .gitmodules failed"
msgstr "l'allistament del .gitmodules actualitzat ha fallat"
-#: submodule.c:159
+#: submodule.c:161
msgid "negative values not allowed for submodule.fetchJobs"
msgstr "no es permeten els valors negatius a submodule.fetchJobs"
-#: submodule.c:1184
+#: submodule.c:1194
#, c-format
-msgid "could not start 'git status in submodule '%s'"
-msgstr "no s'ha pogut iniciar 'git status in submodule '%s'"
+msgid "'%s' not recognized as a git repository"
+msgstr "'%s' no reconegut com un dipòsit git"
-#: submodule.c:1197
+#: submodule.c:1332
#, c-format
-msgid "could not run 'git status in submodule '%s'"
-msgstr "no s'ha pogut executar 'git status in submodule '%s'"
+msgid "could not start 'git status' in submodule '%s'"
+msgstr "no s'ha pogut iniciar 'git status' al submòdul '%s'"
-#: submodule.c:1398
+#: submodule.c:1345
+#, 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
+#, c-format
+msgid "submodule '%s' has dirty index"
+msgstr "el submòdul '%s' té l'índex brut"
+
+#: submodule.c:1678
#, 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"
+"no està admès relocate_gitdir per al submòdul '%s' amb més d'un arbre de "
+"treball"
-#: submodule.c:1410 submodule.c:1471
+#: submodule.c:1690 submodule.c:1746
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "no s'ha trobat el nom pel submòdul '%s'"
-#: submodule.c:1414 submodule.c:1474 builtin/submodule--helper.c:640
-#: builtin/submodule--helper.c:650
+#: submodule.c:1694 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:1420
+#: submodule.c:1697
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -3436,12 +3673,25 @@
"'%s' a\n"
"'%s'\n"
-#: submodule.c:1512
+#: submodule.c:1781
#, 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'"
+msgstr "s'ha produït un error en cercar recursivament al camí de submòdul '%s'"
-#: submodule-config.c:360
+#: submodule.c:1825
+msgid "could not start ls-files in .."
+msgstr "no s'ha pogut iniciar ls-files a .."
+
+#: submodule.c:1845
+msgid "BUG: returned path string doesn't match cwd?"
+msgstr "ERRADA: la cadena del camí retornada no coincideix amb cwd?"
+
+#: submodule.c:1864
+#, 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
#, c-format
msgid "invalid value for %s"
msgstr "valor no vàlid per a %s"
@@ -3510,7 +3760,7 @@
msgid "transport: invalid depth option '%s'"
msgstr "transport: opció de profunditat no vàlida '%s'"
-#: transport.c:885
+#: transport.c:889
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -3519,7 +3769,7 @@
"Els camins de submòdul següents contenen canvis que no\n"
"es poden trobar en cap remot:\n"
-#: transport.c:889
+#: transport.c:893
#, c-format
msgid ""
"\n"
@@ -3545,11 +3795,11 @@
"\n"
"per a pujar-los a un remot.\n"
-#: transport.c:897
+#: transport.c:901
msgid "Aborting."
msgstr "S'està avortant."
-#: transport-helper.c:1082
+#: transport-helper.c:1080
#, c-format
msgid "Could not read ref %s"
msgstr "No s'ha pogut llegir la referència %s"
@@ -3570,7 +3820,7 @@
msgid "too-short tree file"
msgstr "fitxer d'arbre massa curt"
-#: unpack-trees.c:99
+#: unpack-trees.c:104
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -3581,7 +3831,7 @@
"%%sSi us plau, cometeu els vostres canvis o emmagatzemeu-los abans de "
"canviar de branca."
-#: unpack-trees.c:101
+#: unpack-trees.c:106
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -3591,7 +3841,7 @@
"agafar:\n"
"%%s"
-#: unpack-trees.c:104
+#: unpack-trees.c:109
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -3602,7 +3852,7 @@
"%%sSi us plau, cometeu els vostres canvis o emmagatzemeu-los abans de "
"fusionar."
-#: unpack-trees.c:106
+#: unpack-trees.c:111
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -3612,7 +3862,7 @@
"fusionar:\n"
"%%s"
-#: unpack-trees.c:109
+#: unpack-trees.c:114
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -3621,7 +3871,7 @@
"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:111
+#: unpack-trees.c:116
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -3630,7 +3880,7 @@
"Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n"
"%%s"
-#: unpack-trees.c:116
+#: unpack-trees.c:121
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -3639,7 +3889,7 @@
"En actualitzar els directoris següents perdria fitxers no seguits en el:\n"
"%s"
-#: unpack-trees.c:120
+#: unpack-trees.c:125
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -3649,7 +3899,7 @@
"agafar:\n"
"%%sSi us plau, moveu-los o elimineu-los abans de canviar de branca."
-#: unpack-trees.c:122
+#: unpack-trees.c:127
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -3659,36 +3909,36 @@
"agafar:\n"
"%%s"
-#: unpack-trees.c:125
-#, 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"
-"%%sSi us plau, moveu-los o elimineu-los abans de fusionar."
-
-#: unpack-trees.c:127
-#, 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"
-"%%s"
-
#: unpack-trees.c:130
#, 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"
+"%%sSi us plau, moveu-los o elimineu-los abans de fusionar."
+
+#: unpack-trees.c:132
+#, 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"
+"%%s"
+
+#: unpack-trees.c:135
+#, c-format
+msgid ""
"The following untracked working tree files would be removed by %s:\n"
"%%sPlease move or remove them before you %s."
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:132
+#: unpack-trees.c:137
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -3697,7 +3947,7 @@
"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n"
"%%s"
-#: unpack-trees.c:137
+#: unpack-trees.c:142
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -3708,7 +3958,7 @@
"agafar:\n"
"%%sSi us plau, moveu-los o elimineu-los abans de canviar de branca."
-#: unpack-trees.c:139
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -3719,7 +3969,7 @@
"agafar:\n"
"%%s"
-#: unpack-trees.c:142
+#: unpack-trees.c:147
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -3729,7 +3979,7 @@
"fusionar:\n"
"%%sSi us plau, moveu-los o elimineu-los abans de fusionar."
-#: unpack-trees.c:144
+#: unpack-trees.c:149
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -3739,7 +3989,7 @@
"fusionar:\n"
"%%s"
-#: unpack-trees.c:147
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -3749,7 +3999,7 @@
"%s:\n"
"%%sSi us plau, moveu-los o elimineu-los abans de %s."
-#: unpack-trees.c:149
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -3759,12 +4009,12 @@
"%s:\n"
"%%s"
-#: unpack-trees.c:156
+#: unpack-trees.c:161
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "L'entrada '%s' encavalca amb '%s'. No es pot vincular."
-#: unpack-trees.c:159
+#: unpack-trees.c:164
#, c-format
msgid ""
"Cannot update sparse checkout: the following entries are not up-to-date:\n"
@@ -3774,7 +4024,7 @@
"dia:\n"
"%s"
-#: unpack-trees.c:161
+#: unpack-trees.c:166
#, c-format
msgid ""
"The following working tree files would be overwritten by sparse checkout "
@@ -3785,7 +4035,7 @@
"actualitzar l'agafament parcial:\n"
"%s"
-#: unpack-trees.c:163
+#: unpack-trees.c:168
#, c-format
msgid ""
"The following working tree files would be removed by sparse checkout "
@@ -3796,45 +4046,59 @@
"l'agafament parcial:\n"
"%s"
-#: unpack-trees.c:240
+#: unpack-trees.c:170
+#, c-format
+msgid ""
+"Cannot update submodule:\n"
+"%s"
+msgstr ""
+"No es pot actualitzar el submòdul:\n"
+"%s"
+
+#: unpack-trees.c:247
#, c-format
msgid "Aborting\n"
msgstr "S'està avortant\n"
-#: unpack-trees.c:270
+#: unpack-trees.c:272
+#, 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
msgid "Checking out files"
msgstr "S'estan agafant fitxers"
-#: urlmatch.c:120
+#: urlmatch.c:163
msgid "invalid URL scheme name or missing '://' suffix"
msgstr "l'esquema d'URL no és vàlid o li manca el sufix '://'"
-#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
+#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
#, c-format
msgid "invalid %XX escape sequence"
msgstr "seqüència d'escapament %XX no vàlida"
-#: urlmatch.c:172
+#: urlmatch.c:215
msgid "missing host and scheme is not 'file:'"
msgstr "manca la màquina i l'esquema no és 'file:'"
-#: urlmatch.c:189
+#: urlmatch.c:232
msgid "a 'file:' URL may not have a port number"
msgstr "un URL 'file:' no pot tenir número de port"
-#: urlmatch.c:199
+#: urlmatch.c:247
msgid "invalid characters in host name"
msgstr "hi ha caràcters no vàlids en el nom de màquina"
-#: urlmatch.c:244 urlmatch.c:255
+#: urlmatch.c:292 urlmatch.c:303
msgid "invalid port number"
msgstr "número de port no vàlid"
-#: urlmatch.c:322
+#: urlmatch.c:371
msgid "invalid '..' path segment"
msgstr "segment de camí '..' no vàlid"
-#: worktree.c:282
+#: worktree.c:285
#, c-format
msgid "failed to read '%s'"
msgstr "s'ha produït un error en llegir '%s'"
@@ -3849,28 +4113,28 @@
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:320 builtin/am.c:759
-#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1033
+#: 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
#, c-format
msgid "could not open '%s' for reading"
msgstr "no s'ha pogut obrir '%s' per a lectura"
-#: wrapper.c:605 wrapper.c:626
+#: wrapper.c:581 wrapper.c:602
#, c-format
msgid "unable to access '%s'"
msgstr "no s'ha pogut accedir a '%s'"
-#: wrapper.c:634
+#: wrapper.c:610
msgid "unable to get current working directory"
msgstr "no s'ha pogut obtenir el directori de treball actual"
-#: wrapper.c:658
+#: wrapper.c:634
#, c-format
msgid "could not write to %s"
msgstr "no s'ha pogut escriure a %s"
-#: wrapper.c:660
+#: wrapper.c:636
#, c-format
msgid "could not close %s"
msgstr "no s'ha pogut tancar %s"
@@ -3902,11 +4166,11 @@
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (useu \"git rm <fitxer>...\" per a senyalar resolució)"
-#: wt-status.c:199 wt-status.c:945
+#: wt-status.c:199 wt-status.c:958
msgid "Changes to be committed:"
msgstr "Canvis a cometre:"
-#: wt-status.c:217 wt-status.c:954
+#: wt-status.c:217 wt-status.c:967
msgid "Changes not staged for commit:"
msgstr "Canvis no «stage» per a cometre:"
@@ -3933,7 +4197,7 @@
#: wt-status.c:238
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
-msgstr " (useu \"git %s <fitxer>...\" per a incloure-ho en què es cometrà)"
+msgstr " (useu \"git %s <fitxer>...\" per a incloure-ho en el què es cometrà)"
#: wt-status.c:253
msgid "both deleted:"
@@ -4007,15 +4271,15 @@
msgid "untracked content, "
msgstr "contingut no seguit, "
-#: wt-status.c:818
+#: wt-status.c:831
msgid "Submodules changed but not updated:"
msgstr "Submòduls canviats però no actualitzats:"
-#: wt-status.c:820
+#: wt-status.c:833
msgid "Submodule changes to be committed:"
msgstr "Canvis de submòdul a cometre:"
-#: wt-status.c:901
+#: wt-status.c:914
msgid ""
"Do not touch the line above.\n"
"Everything below will be removed."
@@ -4023,237 +4287,237 @@
"No toqueu la línia a dalt.\n"
"Tot el que hi ha a sota s'eliminarà."
-#: wt-status.c:1013
+#: wt-status.c:1026
msgid "You have unmerged paths."
msgstr "Teniu camins sense fusionar."
-#: wt-status.c:1016
+#: wt-status.c:1029
msgid " (fix conflicts and run \"git commit\")"
msgstr " (arregleu els conflictes i executeu \"git commit\")"
-#: wt-status.c:1018
+#: wt-status.c:1031
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (useu \"git merge --abort\" per a avortar la fusió)"
-#: wt-status.c:1023
+#: wt-status.c:1036
msgid "All conflicts fixed but you are still merging."
msgstr "Tots els conflictes estan arreglats però encara esteu fusionant."
-#: wt-status.c:1026
+#: wt-status.c:1039
msgid " (use \"git commit\" to conclude merge)"
msgstr " (useu \"git commit\" per a concloure la fusió)"
-#: wt-status.c:1036
+#: wt-status.c:1049
msgid "You are in the middle of an am session."
msgstr "Esteu enmig d'una sessió am."
-#: wt-status.c:1039
+#: wt-status.c:1052
msgid "The current patch is empty."
msgstr "El pedaç actual està buit."
-#: wt-status.c:1043
+#: wt-status.c:1056
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (arregleu els conflictes i després executeu \"git am --continue\")"
-#: wt-status.c:1045
+#: wt-status.c:1058
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (useu \"git am --skip\" per a ometre aquest pedaç)"
-#: wt-status.c:1047
+#: wt-status.c:1060
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (useu \"git am --abort\" per a restaurar la branca original)"
-#: wt-status.c:1176
+#: wt-status.c:1189
msgid "git-rebase-todo is missing."
msgstr "Manca git-rebase-todo."
-#: wt-status.c:1178
+#: wt-status.c:1191
msgid "No commands done."
msgstr "No s'ha fet cap ordre."
-#: wt-status.c:1181
+#: wt-status.c:1194
#, 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:1192
+#: wt-status.c:1205
#, c-format
msgid " (see more in file %s)"
msgstr " (vegeu més en el fitxer %s)"
-#: wt-status.c:1197
+#: wt-status.c:1210
msgid "No commands remaining."
msgstr "No manca cap ordre."
-#: wt-status.c:1200
+#: wt-status.c:1213
#, 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:1208
+#: wt-status.c:1221
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (useu \"git rebase --edit-todo\" per a veure i editar)"
-#: wt-status.c:1221
+#: wt-status.c:1234
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Actualment esteu rebasant la branca '%s' en '%s'."
-#: wt-status.c:1226
+#: wt-status.c:1239
msgid "You are currently rebasing."
msgstr "Actualment esteu rebasant."
-#: wt-status.c:1240
+#: wt-status.c:1253
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
" (arregleu els conflictes i després executeu \"git rebase --continue\")"
-#: wt-status.c:1242
+#: wt-status.c:1255
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (useu \"git rebase --skip\" per a ometre aquest pedaç)"
-#: wt-status.c:1244
+#: wt-status.c:1257
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:1250
+#: wt-status.c:1263
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
" (tots els conflictes estan arreglats: executeu \"git rebase --continue\")"
-#: wt-status.c:1254
+#: wt-status.c:1267
#, 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'."
-#: wt-status.c:1259
+#: wt-status.c:1272
msgid "You are currently splitting a commit during a rebase."
msgstr "Actualment esteu dividint una comissió durant un rebasament."
-#: wt-status.c:1262
+#: wt-status.c:1275
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\")"
-#: wt-status.c:1266
+#: wt-status.c:1279
#, 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'."
-#: wt-status.c:1271
+#: wt-status.c:1284
msgid "You are currently editing a commit during a rebase."
msgstr "Actualment esteu editant una comissió durant un «rebase»."
-#: wt-status.c:1274
+#: wt-status.c:1287
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (useu \"git commit --amend\" per a esmenar la comissió actual)"
-#: wt-status.c:1276
+#: 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:1286
+#: wt-status.c:1299
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Actualment esteu fent «cherry pick» a la comissió %s."
-#: wt-status.c:1291
+#: wt-status.c:1304
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (arregleu els conflictes i executeu \"git cherry-pick --continue\")"
-#: wt-status.c:1294
+#: wt-status.c:1307
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (tots els conflictes estan arreglats: executeu \"git cherry-pick --continue"
"\")"
-#: wt-status.c:1296
+#: wt-status.c:1309
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»)"
-#: wt-status.c:1305
+#: wt-status.c:1318
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Actualment esteu revertint la comissió %s."
-#: wt-status.c:1310
+#: wt-status.c:1323
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (arregleu els conflictes i executeu \"git revert --continue\")"
-#: wt-status.c:1313
+#: wt-status.c:1326
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
" (tots els conflictes estan arreglats: executeu \"git revert --continue\")"
-#: wt-status.c:1315
+#: wt-status.c:1328
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
" (useu \"git revert --abort\" per a cancel·lar l'operació de reversió)"
-#: wt-status.c:1326
+#: wt-status.c:1339
#, 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:1330
+#: wt-status.c:1343
msgid "You are currently bisecting."
msgstr "Actualment esteu bisecant."
-#: wt-status.c:1333
+#: wt-status.c:1346
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:1530
+#: wt-status.c:1543
msgid "On branch "
msgstr "En la branca "
-#: wt-status.c:1536
+#: wt-status.c:1549
msgid "interactive rebase in progress; onto "
msgstr "«rebase» interactiu en progrés; sobre "
-#: wt-status.c:1538
+#: wt-status.c:1551
msgid "rebase in progress; onto "
msgstr "«rebase» en progrés; sobre "
-#: wt-status.c:1543
+#: wt-status.c:1556
msgid "HEAD detached at "
msgstr "HEAD separat a "
-#: wt-status.c:1545
+#: wt-status.c:1558
msgid "HEAD detached from "
msgstr "HEAD separat de "
-#: wt-status.c:1548
+#: wt-status.c:1561
msgid "Not currently on any branch."
msgstr "Actualment no s'és en cap branca."
-#: wt-status.c:1566
+#: wt-status.c:1579
msgid "Initial commit"
msgstr "Comissió inicial"
-#: wt-status.c:1580
+#: wt-status.c:1593
msgid "Untracked files"
msgstr "Fitxers no seguits"
-#: wt-status.c:1582
+#: wt-status.c:1595
msgid "Ignored files"
msgstr "Fitxers ignorats"
-#: wt-status.c:1586
+#: wt-status.c:1599
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -4265,103 +4529,99 @@
"oblidar-vos d'afegir fitxers nous vosaltres mateixos (vegeu\n"
"'git help status')."
-#: wt-status.c:1592
+#: wt-status.c:1605
#, c-format
msgid "Untracked files not listed%s"
msgstr "Els fitxers no seguits no estan llistats%s"
-#: wt-status.c:1594
+#: wt-status.c:1607
msgid " (use -u option to show untracked files)"
msgstr " (useu l'opció -u per a mostrar els fitxers no seguits)"
-#: wt-status.c:1600
+#: wt-status.c:1613
msgid "No changes"
msgstr "Sense canvis"
-#: wt-status.c:1605
+#: wt-status.c:1618
#, 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"
-#: wt-status.c:1608
+#: wt-status.c:1621
#, c-format
msgid "no changes added to commit\n"
msgstr "no hi ha canvis afegits a cometre\n"
-#: wt-status.c:1611
+#: wt-status.c:1624
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr ""
-"no hi ha res afegit a cometre però fitxers no seguits estan presents (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:1614
+#: wt-status.c:1627
#, c-format
msgid "nothing added to commit but untracked files present\n"
-msgstr "no hi ha res afegit a cometre però fitxers no seguits estan presents\n"
+msgstr "no hi ha res afegit a cometre però existeixen fitxer no seguits\n"
-#: wt-status.c:1617
+#: wt-status.c:1630
#, 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"
-#: wt-status.c:1620 wt-status.c:1625
+#: wt-status.c:1633 wt-status.c:1638
#, c-format
msgid "nothing to commit\n"
msgstr "no hi ha res a cometre\n"
-#: wt-status.c:1623
+#: wt-status.c:1636
#, 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"
-#: wt-status.c:1627
+#: wt-status.c:1640
#, 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:1734
+#: wt-status.c:1749
msgid "Initial commit on "
msgstr "Comissió inicial en "
-#: wt-status.c:1738
+#: wt-status.c:1753
msgid "HEAD (no branch)"
msgstr "HEAD (sense branca)"
-#: wt-status.c:1767
-msgid "gone"
-msgstr "no hi és"
-
-#: wt-status.c:1769 wt-status.c:1777
+#: wt-status.c:1782 wt-status.c:1790
msgid "behind "
msgstr "darrere "
-#: wt-status.c:1772 wt-status.c:1775
+#: wt-status.c:1785 wt-status.c:1788
msgid "ahead "
msgstr "davant per "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2277
+#: wt-status.c:2280
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "no es pot %s: Teniu canvis «unstaged»."
-#: wt-status.c:2283
+#: wt-status.c:2286
msgid "additionally, your index contains uncommitted changes."
msgstr "addicionalment, el vostre índex conté canvis sense cometre."
-#: wt-status.c:2285
+#: wt-status.c:2288
#, 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:414
+#: compat/precompose_utf8.c:57 builtin/clone.c:432
#, c-format
msgid "failed to unlink '%s'"
msgstr "s'ha produït un error en desenllaçar '%s'"
@@ -4388,7 +4648,7 @@
msgid "Unstaged changes after refreshing the index:"
msgstr "Canvis «unstaged» després d'actualitzar l'índex:"
-#: builtin/add.c:209 builtin/rev-parse.c:845
+#: builtin/add.c:209 builtin/rev-parse.c:872
msgid "Could not read the index"
msgstr "No s'ha pogut llegir l'índex"
@@ -4424,9 +4684,9 @@
msgstr ""
"Els camins següents s'ignoren per un dels vostres fitxers .gitignore:\n"
-#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:123
+#: 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:1326 builtin/rm.c:241 builtin/send-pack.c:162
+#: builtin/remote.c:1328 builtin/rm.c:241 builtin/send-pack.c:163
msgid "dry run"
msgstr "marxa en sec"
@@ -4434,7 +4694,7 @@
msgid "interactive picking"
msgstr "recull interactiu"
-#: builtin/add.c:270 builtin/checkout.c:1159 builtin/reset.c:286
+#: builtin/add.c:270 builtin/checkout.c:1177 builtin/reset.c:286
msgid "select hunks interactively"
msgstr "selecciona els trossos interactivament"
@@ -4476,11 +4736,11 @@
msgstr ""
"comproveu si els fitxers - fins i tot els absents - s'ignoren en marxa en sec"
-#: builtin/add.c:283 builtin/update-index.c:947
+#: builtin/add.c:283 builtin/update-index.c:951
msgid "(+/-)x"
msgstr "(+/-)x"
-#: builtin/add.c:283 builtin/update-index.c:948
+#: builtin/add.c:283 builtin/update-index.c:952
msgid "override the executable bit of the listed files"
msgstr "passa per alt el bit executable dels fitxers llistats"
@@ -4516,117 +4776,117 @@
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:279
-#: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350
+#: 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/submodule--helper.c:244
msgid "index file corrupt"
msgstr "fitxer d'índex malmès"
-#: builtin/am.c:414
+#: builtin/am.c:412
msgid "could not parse author script"
msgstr "no s'ha pogut analitzar l'script d'autor"
-#: builtin/am.c:491
+#: builtin/am.c:489
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "s'ha suprimit '%s' pel ganxo applypatch-msg"
-#: builtin/am.c:532
+#: builtin/am.c:530
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Línia d'entrada mal formada: '%s'."
-#: builtin/am.c:569
+#: builtin/am.c:567
#, 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'"
-#: builtin/am.c:595
+#: builtin/am.c:593
msgid "fseek failed"
msgstr "fseek ha fallat"
-#: builtin/am.c:775
+#: builtin/am.c:777
#, c-format
msgid "could not parse patch '%s'"
msgstr "no s'ha pogut analitzar el pedaç '%s'"
-#: builtin/am.c:840
+#: builtin/am.c:842
msgid "Only one StGIT patch series can be applied at once"
msgstr "Només una sèrie de pedaços StGIT es pot aplicar a la vegada"
-#: builtin/am.c:887
+#: builtin/am.c:889
msgid "invalid timestamp"
msgstr "marca de temps no vàlida"
-#: builtin/am.c:890 builtin/am.c:898
+#: builtin/am.c:892 builtin/am.c:900
msgid "invalid Date line"
msgstr "línia Date no vàlida"
-#: builtin/am.c:895
+#: builtin/am.c:897
msgid "invalid timezone offset"
msgstr "desplaçament de zona de temps no vàlid"
-#: builtin/am.c:984
+#: builtin/am.c:986
msgid "Patch format detection failed."
msgstr "La detecció de format de pedaç ha fallat."
-#: builtin/am.c:989 builtin/clone.c:379
+#: builtin/am.c:991 builtin/clone.c:397
#, c-format
msgid "failed to create directory '%s'"
msgstr "s'ha produït un error en crear el directori '%s'"
-#: builtin/am.c:993
+#: builtin/am.c:995
msgid "Failed to split patches."
msgstr "S'ha produït un error en dividir els pedaços."
-#: builtin/am.c:1125 builtin/commit.c:376
+#: builtin/am.c:1127 builtin/commit.c:376
msgid "unable to write index file"
msgstr "no s'ha pogut escriure el fitxer d'índex"
-#: builtin/am.c:1176
+#: builtin/am.c:1178
#, 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:1177
+#: builtin/am.c:1179
#, 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ò."
-#: builtin/am.c:1178
+#: builtin/am.c:1180
#, 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"
"\"."
-#: builtin/am.c:1316
+#: builtin/am.c:1315
msgid "Patch is empty. Was it split wrong?"
msgstr "El pedaç és buit. S'ha dividit malament?"
-#: builtin/am.c:1390 builtin/log.c:1550
+#: builtin/am.c:1386 builtin/log.c:1557
#, c-format
msgid "invalid ident line: %s"
msgstr "línia d'identitat no vàlida: %s"
-#: builtin/am.c:1417
+#: builtin/am.c:1413
#, c-format
msgid "unable to parse commit %s"
msgstr "no s'ha pogut analitzar la comissió %s"
-#: builtin/am.c:1610
+#: builtin/am.c:1606
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."
-#: builtin/am.c:1612
+#: builtin/am.c:1608
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:1631
+#: builtin/am.c:1627
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -4634,38 +4894,38 @@
"Heu editat el vostre pedaç a mà?\n"
"No s'aplica als blobs recordats en el seu índex."
-#: builtin/am.c:1637
+#: builtin/am.c:1633
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:1662
+#: builtin/am.c:1658
msgid "Failed to merge in the changes."
msgstr "S'ha produït un error en fusionar els canvis."
-#: builtin/am.c:1686 builtin/merge.c:632
+#: builtin/am.c:1682 builtin/merge.c:631
msgid "git write-tree failed to write a tree"
msgstr "git write-tree ha fallat en escriure un arbre"
-#: builtin/am.c:1693
+#: builtin/am.c:1689
msgid "applying to an empty history"
msgstr "s'està aplicant a una història buida"
-#: builtin/am.c:1706 builtin/commit.c:1764 builtin/merge.c:802
+#: builtin/am.c:1702 builtin/commit.c:1764 builtin/merge.c:802
#: builtin/merge.c:827
msgid "failed to write commit object"
msgstr "s'ha produït un error en escriure l'objecte de comissió"
-#: builtin/am.c:1739 builtin/am.c:1743
+#: builtin/am.c:1735 builtin/am.c:1739
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "no es pot reprendre: %s no existeix."
-#: builtin/am.c:1759
+#: builtin/am.c:1755
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
"no es pot ser interactiu sense que stdin estigui connectada a un terminal."
-#: builtin/am.c:1764
+#: builtin/am.c:1760
msgid "Commit Body is:"
msgstr "El cos de la comissió és:"
@@ -4673,37 +4933,37 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1774
+#: builtin/am.c:1770
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: "
-#: builtin/am.c:1824
+#: builtin/am.c:1820
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Índex brut: no es poden aplicar pedaços (bruts: %s)"
-#: builtin/am.c:1861 builtin/am.c:1933
+#: builtin/am.c:1860 builtin/am.c:1932
#, c-format
msgid "Applying: %.*s"
msgstr "S'està aplicant: %.*s"
-#: builtin/am.c:1877
+#: builtin/am.c:1876
msgid "No changes -- Patch already applied."
msgstr "Sense canvis -- El pedaç ja s'ha aplicat."
-#: builtin/am.c:1885
+#: builtin/am.c:1884
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "El pedaç ha fallat a %s %.*s"
-#: builtin/am.c:1891
+#: builtin/am.c:1890
#, 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:1936
+#: builtin/am.c:1935
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -4713,7 +4973,7 @@
"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:1943
+#: builtin/am.c:1942
msgid ""
"You still have unmerged paths in your index.\n"
"Did you forget to use 'git add'?"
@@ -4721,17 +4981,17 @@
"Encara teniu camins sense fusionar en el vostre índex.\n"
"Heu oblidat d'usar 'git add'?"
-#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308
+#: builtin/am.c:2050 builtin/am.c:2054 builtin/am.c:2066 builtin/reset.c:308
#: builtin/reset.c:316
#, c-format
msgid "Could not parse object '%s'."
msgstr "No s'ha pogut analitzar l'objecte '%s'."
-#: builtin/am.c:2103
+#: builtin/am.c:2102
msgid "failed to clean index"
msgstr "s'ha produït un error en netejar l'índex"
-#: builtin/am.c:2137
+#: builtin/am.c:2136
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -4739,135 +4999,135 @@
"Sembla que heu mogut HEAD després de l'última fallada de 'am'.\n"
"No s'està rebobinant a ORIG_HEAD"
-#: builtin/am.c:2200
+#: builtin/am.c:2199
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Valor no vàlid per a --patch-format: %s"
-#: builtin/am.c:2233
+#: builtin/am.c:2232
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<opcions>] [(<bústia> | <directori-de-correu>)...]"
-#: builtin/am.c:2234
+#: builtin/am.c:2233
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<opcions>] (--continue | --skip | --abort)"
-#: builtin/am.c:2240
+#: builtin/am.c:2239
msgid "run interactively"
msgstr "executa interactivament"
-#: builtin/am.c:2242
+#: builtin/am.c:2241
msgid "historical option -- no-op"
msgstr "opció històrica -- no-op"
-#: builtin/am.c:2244
+#: builtin/am.c:2243
msgid "allow fall back on 3way merging if needed"
msgstr "permet retrocedir a una fusió de 3 vies si és necessari"
-#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57
+#: builtin/am.c:2244 builtin/init-db.c:483 builtin/prune-packed.c:57
#: builtin/repack.c:178
msgid "be quiet"
msgstr "silenciós"
-#: builtin/am.c:2247
+#: builtin/am.c:2246
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:2250
+#: builtin/am.c:2249
msgid "recode into utf8 (default)"
msgstr "recodifica en utf8 (per defecte)"
-#: builtin/am.c:2252
+#: builtin/am.c:2251
msgid "pass -k flag to git-mailinfo"
msgstr "passa la bandera -k al git-mailinfo"
-#: builtin/am.c:2254
+#: builtin/am.c:2253
msgid "pass -b flag to git-mailinfo"
msgstr "passa la bandera -b al git-mailinfo"
-#: builtin/am.c:2256
+#: builtin/am.c:2255
msgid "pass -m flag to git-mailinfo"
msgstr "passa la bandera -m al git-mailinfo"
-#: builtin/am.c:2258
+#: builtin/am.c:2257
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:2261
+#: builtin/am.c:2260
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"
-#: builtin/am.c:2264
+#: builtin/am.c:2263
msgid "strip everything before a scissors line"
msgstr "elimina tot abans d'una línia de tisores"
-#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
-#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287
-#: builtin/am.c:2293
+#: 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
msgid "pass it through git-apply"
msgstr "passa-ho a través del git-apply"
-#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
-#: builtin/grep.c:1038 builtin/merge.c:202 builtin/pull.c:135
+#: 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:644 builtin/show-ref.c:169 builtin/tag.c:355
+#: 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
msgid "n"
msgstr "n"
-#: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438
-#: builtin/tag.c:387 builtin/verify-tag.c:38
+#: 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
msgid "format"
msgstr "format"
-#: builtin/am.c:2290
+#: builtin/am.c:2289
msgid "format the patch(es) are in"
msgstr "el format en el qual estan els pedaços"
-#: builtin/am.c:2296
+#: builtin/am.c:2295
msgid "override error message when patch failure occurs"
msgstr ""
"passa per alt el missatge d'error quan s'ocorre una fallada en apedaçar"
-#: builtin/am.c:2298
+#: builtin/am.c:2297
msgid "continue applying patches after resolving a conflict"
msgstr "segueix aplicant pedaços després de resoldre un conflicte"
-#: builtin/am.c:2301
+#: builtin/am.c:2300
msgid "synonyms for --continue"
msgstr "sinònims de --continue"
-#: builtin/am.c:2304
+#: builtin/am.c:2303
msgid "skip the current patch"
msgstr "omet el pedaç actual"
-#: builtin/am.c:2307
+#: builtin/am.c:2306
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:2311
+#: builtin/am.c:2310
msgid "lie about committer date"
msgstr "menteix sobre la data del comitent"
-#: builtin/am.c:2313
+#: builtin/am.c:2312
msgid "use current timestamp for author date"
msgstr "usa el marc de temps actual per la data d'autor"
-#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:233
-#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:370
+#: builtin/am.c:2314 builtin/commit.c:1600 builtin/merge.c:232
+#: builtin/pull.c:165 builtin/revert.c:111 builtin/tag.c:413
msgid "key-id"
msgstr "ID de clau"
-#: builtin/am.c:2316
+#: builtin/am.c:2315
msgid "GPG-sign commits"
msgstr "signa les comissions amb GPG"
-#: builtin/am.c:2319
+#: builtin/am.c:2318
msgid "(internal use for git-rebase)"
msgstr "(ús intern per al git-rebase)"
-#: builtin/am.c:2334
+#: builtin/am.c:2333
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."
@@ -4875,18 +5135,18 @@
"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:2341
+#: builtin/am.c:2340
msgid "failed to read the index"
msgstr "S'ha produït un error en llegir l'índex"
-#: builtin/am.c:2356
+#: builtin/am.c:2355
#, 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."
-#: builtin/am.c:2380
+#: builtin/am.c:2379
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -4895,7 +5155,7 @@
"S'ha trobat un directori %s extraviat.\n"
"Useu \"git am --abort\" per a eliminar-lo."
-#: builtin/am.c:2386
+#: builtin/am.c:2385
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Una operació de resolució no està en curs; no reprenem."
@@ -4925,11 +5185,6 @@
msgid "git archive: NACK %s"
msgstr "git archive: %s NACK"
-#: builtin/archive.c:63
-#, c-format
-msgid "remote error: %s"
-msgstr "error remot: %s"
-
#: builtin/archive.c:64
msgid "git archive: protocol error"
msgstr "git archive: error de protocol"
@@ -4958,117 +5213,117 @@
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:1786
+#: builtin/blame.c:1777
msgid "Blaming lines"
msgstr "S'està fent un «blame»"
-#: builtin/blame.c:2582
+#: builtin/blame.c:2573
msgid "Show blame entries as we find them, incrementally"
msgstr "Mostra les entrades «blame» mentre les trobem, incrementalment"
-#: builtin/blame.c:2583
+#: builtin/blame.c:2574
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)"
-#: builtin/blame.c:2584
+#: builtin/blame.c:2575
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
"No tractis les comissions d'arrel com a límits (Per defecte: desactivat)"
-#: builtin/blame.c:2585
+#: builtin/blame.c:2576
msgid "Show work cost statistics"
msgstr "Mostra les estadístiques de preu de treball"
-#: builtin/blame.c:2586
+#: builtin/blame.c:2577
msgid "Force progress reporting"
msgstr "Força l'informe de progrés"
-#: builtin/blame.c:2587
+#: builtin/blame.c:2578
msgid "Show output score for blame entries"
msgstr "Mostra la puntuació de sortida de les entrades «blame»"
-#: builtin/blame.c:2588
+#: builtin/blame.c:2579
msgid "Show original filename (Default: auto)"
msgstr "Mostra el nom de fitxer original (Per defecte: automàtic)"
-#: builtin/blame.c:2589
+#: builtin/blame.c:2580
msgid "Show original linenumber (Default: off)"
msgstr "Mostra el número de línia original (Per defecte: desactivat)"
-#: builtin/blame.c:2590
+#: builtin/blame.c:2581
msgid "Show in a format designed for machine consumption"
msgstr "Presenta en un format dissenyat per consumpció per màquina"
-#: builtin/blame.c:2591
+#: builtin/blame.c:2582
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:2592
+#: builtin/blame.c:2583
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
"Usa el mateix mode de sortida que git-annotate (Per defecte: desactivat)"
-#: builtin/blame.c:2593
+#: builtin/blame.c:2584
msgid "Show raw timestamp (Default: off)"
msgstr "Mostra la marca de temps crua (Per defecte: desactivat)"
-#: builtin/blame.c:2594
+#: builtin/blame.c:2585
msgid "Show long commit SHA1 (Default: off)"
msgstr "Mostra l'SHA1 de comissió llarg (Per defecte: desactivat)"
-#: builtin/blame.c:2595
+#: builtin/blame.c:2586
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:2596
+#: builtin/blame.c:2587
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)"
-#: builtin/blame.c:2597
+#: builtin/blame.c:2588
msgid "Ignore whitespace differences"
msgstr "Ignora les diferències d'espai en blanc"
-#: builtin/blame.c:2604
+#: builtin/blame.c:2595
msgid "Use an experimental heuristic to improve diffs"
msgstr "Usa un heurístic experimental per a millorar les diferències"
-#: builtin/blame.c:2606
+#: builtin/blame.c:2597
msgid "Spend extra cycles to find better match"
msgstr "Gasta cicles extres per a trobar una coincidència millor"
-#: builtin/blame.c:2607
+#: builtin/blame.c:2598
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:2608
+#: builtin/blame.c:2599
msgid "Use <file>'s contents as the final image"
msgstr "Usa els continguts de <fitxer> com a la imatge final"
-#: builtin/blame.c:2609 builtin/blame.c:2610
+#: builtin/blame.c:2600 builtin/blame.c:2601
msgid "score"
msgstr "puntuació"
-#: builtin/blame.c:2609
+#: builtin/blame.c:2600
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:2610
+#: builtin/blame.c:2601
msgid "Find line movements within and across files"
msgstr "Troba moviments de línia dins i a través dels fitxers"
-#: builtin/blame.c:2611
+#: builtin/blame.c:2602
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2611
+#: builtin/blame.c:2602
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:2658
+#: builtin/blame.c:2649
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
"no es pot usar --progress amb els formats --incremental o de porcellana"
@@ -5079,42 +5334,42 @@
#. 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:2706
+#: builtin/blame.c:2697
msgid "4 years, 11 months ago"
msgstr "fa 4 anys i 11 mesos"
-#: builtin/blame.c:2786
+#: builtin/blame.c:2777
msgid "--contents and --reverse do not blend well."
msgstr "--contents i --reverse no funcionen bé juntes."
-#: builtin/blame.c:2806
+#: 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:2811
+#: 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:2838
+#: 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:2849
+#: 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:2860
+#: 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:2879
+#: builtin/blame.c:2870
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
@@ -5141,7 +5396,11 @@
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [<opcions>] [-r | -a] [--points-at]"
-#: builtin/branch.c:143
+#: builtin/branch.c:31
+msgid "git branch [<options>] [-r | -a] [--format]"
+msgstr "git branch [<opcions>] [-r | -a] [--format]"
+
+#: builtin/branch.c:144
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -5151,7 +5410,7 @@
" fusionat a '%s', però encara no\n"
" s'ha fusionat a HEAD."
-#: builtin/branch.c:147
+#: builtin/branch.c:148
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -5161,12 +5420,12 @@
" s'ha fusionat a '%s', encara que està\n"
" fusionada a HEAD."
-#: builtin/branch.c:161
+#: builtin/branch.c:162
#, 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:165
+#: builtin/branch.c:166
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -5175,165 +5434,93 @@
"La branca '%s' no està totalment fusionada.\n"
"Si esteu segur que la voleu suprimir, executeu 'git branch -D %s'."
-#: builtin/branch.c:178
+#: builtin/branch.c:179
msgid "Update of config-file failed"
msgstr "L'actualització del fitxer de configuració ha fallat"
-#: builtin/branch.c:206
+#: builtin/branch.c:210
msgid "cannot use -a with -d"
msgstr "no es pot usar -a amb -d"
-#: builtin/branch.c:212
+#: builtin/branch.c:216
msgid "Couldn't look up commit object for HEAD"
msgstr "No s'ha pogut trobar l'objecte de comissió de HEAD"
-#: builtin/branch.c:226
+#: builtin/branch.c:230
#, 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:241
+#: builtin/branch.c:245
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "no s'ha trobat la branca amb seguiment remot '%s'."
-#: builtin/branch.c:242
+#: builtin/branch.c:246
#, c-format
msgid "branch '%s' not found."
msgstr "no s'ha trobat la branca '%s'."
-#: builtin/branch.c:257
+#: builtin/branch.c:261
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Error en suprimir la branca amb seguiment remot '%s'"
-#: builtin/branch.c:258
+#: builtin/branch.c:262
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Error en suprimir la branca '%s'"
-#: builtin/branch.c:265
+#: builtin/branch.c:269
#, 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:266
+#: builtin/branch.c:270
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "S'ha suprimit la branca %s (era %s).\n"
-#: builtin/branch.c:312
-#, c-format
-msgid "[%s: gone]"
-msgstr "[%s: no hi és]"
-
-#: builtin/branch.c:317
-#, c-format
-msgid "[%s]"
-msgstr "[%s]"
-
-#: builtin/branch.c:322
-#, c-format
-msgid "[%s: behind %d]"
-msgstr "[%s: darrere per %d]"
-
-#: builtin/branch.c:324
-#, c-format
-msgid "[behind %d]"
-msgstr "[darrere de %d]"
-
-#: builtin/branch.c:328
-#, c-format
-msgid "[%s: ahead %d]"
-msgstr "[%s: davant per %d]"
-
-#: builtin/branch.c:330
-#, c-format
-msgid "[ahead %d]"
-msgstr "[davant de %d]"
-
-#: builtin/branch.c:333
-#, c-format
-msgid "[%s: ahead %d, behind %d]"
-msgstr "[%s: davant per %d, darrere per %d]"
-
-#: builtin/branch.c:336
-#, c-format
-msgid "[ahead %d, behind %d]"
-msgstr "[davant %d, darrere %d]"
-
-#: builtin/branch.c:349
-msgid " **** invalid ref ****"
-msgstr " **** referència no vàlida ****"
-
-#: builtin/branch.c:375
-#, c-format
-msgid "(no branch, rebasing %s)"
-msgstr "(cap branca, s'està rebasant %s)"
-
-#: builtin/branch.c:378
-#, 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
-#: builtin/branch.c:384
-#, c-format
-msgid "(HEAD detached at %s)"
-msgstr "(HEAD separat a %s)"
-
-#. TRANSLATORS: make sure this matches
-#. "HEAD detached from " in wt-status.c
-#: builtin/branch.c:389
-#, c-format
-msgid "(HEAD detached from %s)"
-msgstr "(HEAD separat de %s)"
-
-#: builtin/branch.c:393
-msgid "(no branch)"
-msgstr "(cap branca)"
-
-#: builtin/branch.c:535
+#: builtin/branch.c:441
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "S'està fent «rebase» en la branca %s a %s"
-#: builtin/branch.c:539
+#: builtin/branch.c:445
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "La branca %s s'està bisecant a %s"
-#: builtin/branch.c:554
+#: builtin/branch.c:460
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:564
+#: builtin/branch.c:470
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Nom de branca no vàlid: '%s'"
-#: builtin/branch.c:581
+#: builtin/branch.c:487
msgid "Branch rename failed"
msgstr "El canvi de nom de branca ha fallat"
-#: builtin/branch.c:585
+#: builtin/branch.c:490
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "S'ha canviat el nom de la branca mal anomenada '%s'"
-#: builtin/branch.c:588
+#: builtin/branch.c:493
#, 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:595
+#: builtin/branch.c:502
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"
-#: builtin/branch.c:611
+#: builtin/branch.c:518
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -5344,207 +5531,216 @@
" %s\n"
"S'eliminaran les línies que comencin amb '%c'.\n"
-#: builtin/branch.c:643
+#: builtin/branch.c:551
msgid "Generic options"
msgstr "Opcions genèriques"
-#: builtin/branch.c:645
+#: builtin/branch.c:553
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:646
+#: builtin/branch.c:554
msgid "suppress informational messages"
msgstr "omet els missatges informatius"
-#: builtin/branch.c:647
+#: builtin/branch.c:555
msgid "set up tracking mode (see git-pull(1))"
msgstr "configura el mode de seguiment (vegeu git-pull(1))"
-#: builtin/branch.c:649
+#: builtin/branch.c:557
msgid "change upstream info"
msgstr "canvia la informació de font"
-#: builtin/branch.c:651
+#: builtin/branch.c:559
msgid "upstream"
msgstr "font"
-#: builtin/branch.c:651
+#: builtin/branch.c:559
msgid "change the upstream info"
msgstr "canvia la informació de font"
-#: builtin/branch.c:652
+#: builtin/branch.c:560
msgid "Unset the upstream info"
msgstr "Desestableix la informació de font"
-#: builtin/branch.c:653
+#: builtin/branch.c:561
msgid "use colored output"
msgstr "usa sortida colorada"
-#: builtin/branch.c:654
+#: builtin/branch.c:562
msgid "act on remote-tracking branches"
msgstr "actua en branques amb seguiment remot"
-#: builtin/branch.c:656 builtin/branch.c:657
+#: builtin/branch.c:564 builtin/branch.c:566
msgid "print only branches that contain the commit"
msgstr "imprimeix només les branques que continguin la comissió"
-#: builtin/branch.c:660
+#: builtin/branch.c:565 builtin/branch.c:567
+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
msgid "Specific git-branch actions:"
msgstr "Accions de git-branch específiques:"
-#: builtin/branch.c:661
+#: builtin/branch.c:571
msgid "list both remote-tracking and local branches"
msgstr "llista les branques amb seguiment remot i les locals"
-#: builtin/branch.c:663
+#: builtin/branch.c:573
msgid "delete fully merged branch"
msgstr "suprimeix la branca si està completament fusionada"
-#: builtin/branch.c:664
+#: builtin/branch.c:574
msgid "delete branch (even if not merged)"
msgstr "suprimeix la branca (encara que no estigui fusionada)"
-#: builtin/branch.c:665
+#: builtin/branch.c:575
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:666
+#: builtin/branch.c:576
msgid "move/rename a branch, even if target exists"
msgstr "mou/canvia de nom una branca, encara que el destí existeixi"
-#: builtin/branch.c:667
+#: builtin/branch.c:577
msgid "list branch names"
msgstr "llista els noms de branca"
-#: builtin/branch.c:668
+#: builtin/branch.c:578
msgid "create the branch's reflog"
msgstr "crea el registre de referència de la branca"
-#: builtin/branch.c:670
+#: builtin/branch.c:580
msgid "edit the description for the branch"
msgstr "edita la descripció de la branca"
-#: builtin/branch.c:671
+#: builtin/branch.c:581
msgid "force creation, move/rename, deletion"
msgstr "força creació, moviment/canvi de nom, supressió"
-#: builtin/branch.c:672
+#: builtin/branch.c:582
msgid "print only branches that are merged"
msgstr "imprimeix només les branques que s'han fusionat"
-#: builtin/branch.c:673
+#: builtin/branch.c:583
msgid "print only branches that are not merged"
msgstr "imprimeix només les branques que no s'han fusionat"
-#: builtin/branch.c:674
+#: builtin/branch.c:584
msgid "list branches in columns"
msgstr "llista les branques en columnes"
-#: builtin/branch.c:675 builtin/for-each-ref.c:38 builtin/tag.c:381
+#: builtin/branch.c:585 builtin/for-each-ref.c:38 builtin/tag.c:426
msgid "key"
msgstr "clau"
-#: builtin/branch.c:676 builtin/for-each-ref.c:39 builtin/tag.c:382
+#: builtin/branch.c:586 builtin/for-each-ref.c:39 builtin/tag.c:427
msgid "field name to sort on"
msgstr "nom del camp en el qual ordenar"
-#: builtin/branch.c:678 builtin/for-each-ref.c:41 builtin/notes.c:404
+#: 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:384
+#: builtin/tag.c:429
msgid "object"
msgstr "objecte"
-#: builtin/branch.c:679
+#: builtin/branch.c:589
msgid "print only branches of the object"
msgstr "imprimeix només les branques de l'objecte"
-#: builtin/branch.c:681 builtin/for-each-ref.c:46 builtin/tag.c:388
+#: builtin/branch.c:591 builtin/for-each-ref.c:47 builtin/tag.c:434
msgid "sorting and filtering are case insensitive"
msgstr "l'ordenació i el filtratge distingeixen entre majúscules i minúscules"
-#: builtin/branch.c:698
+#: builtin/branch.c:592 builtin/for-each-ref.c:37 builtin/tag.c:433
+#: builtin/verify-tag.c:38
+msgid "format to use for the output"
+msgstr "format a usar en la sortida"
+
+#: builtin/branch.c:611
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:702 builtin/clone.c:706
+#: builtin/branch.c:615 builtin/clone.c:724
msgid "HEAD not found below refs/heads!"
msgstr "HEAD no trobat sota refs/heads!"
-#: builtin/branch.c:724
+#: builtin/branch.c:638
msgid "--column and --verbose are incompatible"
msgstr "--column i --verbose són incompatibles"
-#: builtin/branch.c:735 builtin/branch.c:787
+#: builtin/branch.c:649 builtin/branch.c:701
msgid "branch name required"
msgstr "cal el nom de branca"
-#: builtin/branch.c:763
+#: builtin/branch.c:677
msgid "Cannot give description to detached HEAD"
msgstr "No es pot donar descripció a un HEAD separat"
-#: builtin/branch.c:768
+#: builtin/branch.c:682
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:775
+#: builtin/branch.c:689
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Encara no hi ha cap comissió en la branca '%s'."
-#: builtin/branch.c:778
+#: builtin/branch.c:692
#, c-format
msgid "No branch named '%s'."
msgstr "No hi ha branca amb nom '%s'."
-#: builtin/branch.c:793
+#: builtin/branch.c:707
msgid "too many branches for a rename operation"
msgstr "hi ha massa branques per a una operació de canvi de nom"
-#: builtin/branch.c:798
+#: builtin/branch.c:712
msgid "too many branches to set new upstream"
msgstr "hi ha massa branques per a establir una nova font"
-#: builtin/branch.c:802
+#: builtin/branch.c:716
#, 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."
-#: builtin/branch.c:805 builtin/branch.c:827 builtin/branch.c:848
+#: builtin/branch.c:719 builtin/branch.c:741 builtin/branch.c:762
#, c-format
msgid "no such branch '%s'"
msgstr "no hi ha tal branca '%s'"
-#: builtin/branch.c:809
+#: builtin/branch.c:723
#, c-format
msgid "branch '%s' does not exist"
msgstr "la branca '%s' no existeix"
-#: builtin/branch.c:821
+#: builtin/branch.c:735
msgid "too many branches to unset upstream"
msgstr "hi ha massa branques per a desestablir la font"
-#: builtin/branch.c:825
+#: builtin/branch.c:739
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."
-#: builtin/branch.c:831
+#: builtin/branch.c:745
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "La branca '%s' no té informació de font"
-#: builtin/branch.c:845
+#: builtin/branch.c:759
msgid "it does not make sense to create 'HEAD' manually"
msgstr "no té sentit crear 'HEAD' manualment"
-#: builtin/branch.c:851
+#: builtin/branch.c:765
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"
-#: builtin/branch.c:854
+#: builtin/branch.c:768
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
@@ -5553,7 +5749,7 @@
"La bandera --set-upstream està en desús i s'eliminarà. Considereu usar --"
"track o --set-upstream-to\n"
-#: builtin/branch.c:871
+#: builtin/branch.c:785
#, c-format
msgid ""
"\n"
@@ -5564,16 +5760,16 @@
"Si volíeu fer '%s' seguir '%s', feu això:\n"
"\n"
-#: builtin/bundle.c:51
+#: builtin/bundle.c:45
#, c-format
msgid "%s is okay\n"
msgstr "%s està bé\n"
-#: builtin/bundle.c:64
+#: builtin/bundle.c:58
msgid "Need a repository to create a bundle."
msgstr "Cal un dipòsit per a fer un farcell."
-#: builtin/bundle.c:68
+#: builtin/bundle.c:62
msgid "Need a repository to unbundle."
msgstr "Cal un dipòsit per a desfer un farcell."
@@ -5622,7 +5818,7 @@
msgstr ""
"en els objectes de blob, executa els filtres en el contingut de l'objecte"
-#: builtin/cat-file.c:561 git-submodule.sh:929
+#: builtin/cat-file.c:561 git-submodule.sh:943
msgid "blob"
msgstr "blob"
@@ -5680,7 +5876,7 @@
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:1140 builtin/gc.c:332
+#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:356
msgid "suppress progress reporting"
msgstr "omet els informes de progrés"
@@ -5771,9 +5967,9 @@
msgstr "escriu el contingut a fitxers temporals"
#: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:597 builtin/submodule--helper.c:600
-#: builtin/submodule--helper.c:606 builtin/submodule--helper.c:967
-#: builtin/worktree.c:471
+#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
+#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
+#: builtin/worktree.c:477
msgid "string"
msgstr "cadena"
@@ -5785,114 +5981,114 @@
msgid "copy out the files from named stage"
msgstr "copia els fitxers des de «stage» amb nom"
-#: builtin/checkout.c:25
+#: builtin/checkout.c:27
msgid "git checkout [<options>] <branch>"
msgstr "git checkout [<opcions>] <branca>"
-#: builtin/checkout.c:26
+#: builtin/checkout.c:28
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<opcions>] [<branca>] -- <fitxer>..."
-#: builtin/checkout.c:134 builtin/checkout.c:167
+#: builtin/checkout.c:153 builtin/checkout.c:186
#, c-format
msgid "path '%s' does not have our version"
msgstr "el camí '%s' no té la nostra versió"
-#: builtin/checkout.c:136 builtin/checkout.c:169
+#: builtin/checkout.c:155 builtin/checkout.c:188
#, c-format
msgid "path '%s' does not have their version"
msgstr "el camí '%s' no té la seva versió"
-#: builtin/checkout.c:152
+#: builtin/checkout.c:171
#, 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:196
+#: builtin/checkout.c:215
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "el camí '%s' no té les versions necessàries"
-#: builtin/checkout.c:213
+#: builtin/checkout.c:232
#, c-format
msgid "path '%s': cannot merge"
msgstr "camí '%s': no es pot fusionar"
-#: builtin/checkout.c:230
+#: builtin/checkout.c:249
#, 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:250 builtin/checkout.c:253 builtin/checkout.c:256
-#: builtin/checkout.c:259
+#: builtin/checkout.c:269 builtin/checkout.c:272 builtin/checkout.c:275
+#: builtin/checkout.c:278
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' no es pot usar amb actualització de camins"
-#: builtin/checkout.c:262 builtin/checkout.c:265
+#: builtin/checkout.c:281 builtin/checkout.c:284
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' no es pot usar amb %s"
-#: builtin/checkout.c:268
+#: builtin/checkout.c:287
#, 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."
-#: builtin/checkout.c:339 builtin/checkout.c:346
+#: builtin/checkout.c:358 builtin/checkout.c:365
#, c-format
msgid "path '%s' is unmerged"
msgstr "el camí '%s' està sense fusionar"
-#: builtin/checkout.c:494
+#: builtin/checkout.c:513
msgid "you need to resolve your current index first"
msgstr "heu de primer resoldre el vostre índex actual"
-#: builtin/checkout.c:625
+#: builtin/checkout.c:644
#, 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:666
+#: builtin/checkout.c:685
msgid "HEAD is now at"
msgstr "HEAD ara és a"
-#: builtin/checkout.c:670 builtin/clone.c:660
+#: builtin/checkout.c:689 builtin/clone.c:678
msgid "unable to update HEAD"
msgstr "no s'ha pogut actualitzar HEAD"
-#: builtin/checkout.c:674
+#: builtin/checkout.c:693
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Restableix la branca '%s'\n"
-#: builtin/checkout.c:677
+#: builtin/checkout.c:696
#, c-format
msgid "Already on '%s'\n"
msgstr "Ja en '%s'\n"
-#: builtin/checkout.c:681
+#: builtin/checkout.c:700
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "S'ha canviat i restablert a la branca '%s'\n"
-#: builtin/checkout.c:683 builtin/checkout.c:1072
+#: builtin/checkout.c:702 builtin/checkout.c:1090
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "S'ha canviat a la branca nova '%s'\n"
-#: builtin/checkout.c:685
+#: builtin/checkout.c:704
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "S'ha canviat a la branca '%s'\n"
-#: builtin/checkout.c:736
+#: builtin/checkout.c:755
#, c-format
msgid " ... and %d more.\n"
msgstr " ... i %d més.\n"
-#: builtin/checkout.c:742
+#: builtin/checkout.c:761
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -5915,7 +6111,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:761
+#: builtin/checkout.c:780
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -5942,150 +6138,150 @@
" git branch <nom-de-branca-nova> %s\n"
"\n"
-#: builtin/checkout.c:797
+#: builtin/checkout.c:816
msgid "internal error in revision walk"
msgstr "error intern en el passeig per revisions"
-#: builtin/checkout.c:801
+#: builtin/checkout.c:820
msgid "Previous HEAD position was"
msgstr "La posició de HEAD anterior era"
-#: builtin/checkout.c:828 builtin/checkout.c:1067
+#: builtin/checkout.c:847 builtin/checkout.c:1085
msgid "You are on a branch yet to be born"
msgstr "Sou en una branca que encara ha de néixer"
-#: builtin/checkout.c:973
+#: builtin/checkout.c:991
#, c-format
msgid "only one reference expected, %d given."
msgstr "s'esperava només una referència, s'han donat %d."
-#: builtin/checkout.c:1013 builtin/worktree.c:214
+#: builtin/checkout.c:1031 builtin/worktree.c:214
#, c-format
msgid "invalid reference: %s"
msgstr "referència no vàlida: %s"
-#: builtin/checkout.c:1042
+#: builtin/checkout.c:1060
#, c-format
msgid "reference is not a tree: %s"
msgstr "la referència no és un arbre: %s"
-#: builtin/checkout.c:1081
+#: builtin/checkout.c:1099
msgid "paths cannot be used with switching branches"
msgstr "els camins no es poden usar amb canvi de branca"
-#: builtin/checkout.c:1084 builtin/checkout.c:1088
+#: builtin/checkout.c:1102 builtin/checkout.c:1106
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' no es pot usar amb canvi de branca"
-#: builtin/checkout.c:1092 builtin/checkout.c:1095 builtin/checkout.c:1100
-#: builtin/checkout.c:1103
+#: builtin/checkout.c:1110 builtin/checkout.c:1113 builtin/checkout.c:1118
+#: builtin/checkout.c:1121
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' no es pot usar amb '%s'"
-#: builtin/checkout.c:1108
+#: builtin/checkout.c:1126
#, 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:1141 builtin/checkout.c:1143 builtin/clone.c:93
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324
-#: builtin/worktree.c:326
+#: 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
msgid "branch"
msgstr "branca"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1160
msgid "create and checkout a new branch"
msgstr "crea i agafa una branca nova"
-#: builtin/checkout.c:1144
+#: builtin/checkout.c:1162
msgid "create/reset and checkout a branch"
msgstr "crea/restableix i agafa una branca"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1163
msgid "create reflog for new branch"
msgstr "crea un registre de referència per a la branca nova"
-#: builtin/checkout.c:1146 builtin/worktree.c:328
+#: builtin/checkout.c:1164 builtin/worktree.c:333
msgid "detach HEAD at named commit"
msgstr "separa HEAD a la comissió anomenada"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1165
msgid "set upstream info for new branch"
msgstr "estableix la informació de font de la branca nova"
-#: builtin/checkout.c:1149
+#: builtin/checkout.c:1167
msgid "new-branch"
msgstr "branca-nova"
-#: builtin/checkout.c:1149
+#: builtin/checkout.c:1167
msgid "new unparented branch"
msgstr "branca òrfena nova"
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1168
msgid "checkout our version for unmerged files"
msgstr "agafa la versió nostra dels fitxers sense fusionar"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1170
msgid "checkout their version for unmerged files"
msgstr "agafa la versió seva dels fitxers sense fusionar"
-#: builtin/checkout.c:1154
+#: builtin/checkout.c:1172
msgid "force checkout (throw away local modifications)"
msgstr "agafa a la força (descarta qualsevol modificació local)"
-#: builtin/checkout.c:1155
+#: builtin/checkout.c:1173
msgid "perform a 3-way merge with the new branch"
msgstr "realitza una fusió de 3 vies amb la branca nova"
-#: builtin/checkout.c:1156 builtin/merge.c:235
+#: builtin/checkout.c:1174 builtin/merge.c:234
msgid "update ignored files (default)"
msgstr "actualitza els fitxers ignorats (per defecte)"
-#: builtin/checkout.c:1157 builtin/log.c:1466 parse-options.h:251
+#: builtin/checkout.c:1175 builtin/log.c:1473 parse-options.h:251
msgid "style"
msgstr "estil"
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1176
msgid "conflict style (merge or diff3)"
msgstr "estil de conflicte (fusió o diff3)"
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1179
msgid "do not limit pathspecs to sparse entries only"
msgstr "no limitis les especificacions de camí només a entrades disperses"
-#: builtin/checkout.c:1163
+#: builtin/checkout.c:1181
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "dubta 'git checkout <cap-branca-així>'"
-#: builtin/checkout.c:1165
+#: builtin/checkout.c:1183
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:1166 builtin/clone.c:63 builtin/fetch.c:119
-#: builtin/merge.c:232 builtin/pull.c:117 builtin/push.c:539
-#: builtin/send-pack.c:168
+#: 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
msgid "force progress reporting"
msgstr "força l'informe de progrés"
-#: builtin/checkout.c:1197
+#: builtin/checkout.c:1224
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B i --orphan són mutualment exclusius"
-#: builtin/checkout.c:1214
+#: builtin/checkout.c:1241
msgid "--track needs a branch name"
msgstr "--track necessita un nom de branca"
-#: builtin/checkout.c:1219
+#: builtin/checkout.c:1246
msgid "Missing branch name; try -b"
msgstr "Manca el nom de branca; proveu -b"
-#: builtin/checkout.c:1255
+#: builtin/checkout.c:1282
msgid "invalid path specification"
msgstr "especificació de camí no vàlida"
-#: builtin/checkout.c:1262
+#: builtin/checkout.c:1289
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
@@ -6094,12 +6290,12 @@
"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:1267
+#: builtin/checkout.c:1294
#, 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:1271
+#: builtin/checkout.c:1298
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -6138,7 +6334,7 @@
msgid "failed to remove %s"
msgstr "s'ha produït un error en eliminar %s"
-#: builtin/clean.c:291 git-add--interactive.perl:623
+#: builtin/clean.c:297 git-add--interactive.perl:614
#, c-format
msgid ""
"Prompt help:\n"
@@ -6151,7 +6347,7 @@
"foo - selecciona un ítem basat en un prefix únic\n"
" - (buit) no seleccionis res\n"
-#: builtin/clean.c:295 git-add--interactive.perl:632
+#: builtin/clean.c:301 git-add--interactive.perl:623
#, c-format
msgid ""
"Prompt help:\n"
@@ -6172,38 +6368,38 @@
"* - tria tots els ítems\n"
" - (buit) finalitza la selecció\n"
-#: builtin/clean.c:511 git-add--interactive.perl:598
-#: git-add--interactive.perl:603
+#: builtin/clean.c:517 git-add--interactive.perl:589
+#: git-add--interactive.perl:594
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Perdó (%s)?\n"
-#: builtin/clean.c:653
+#: builtin/clean.c:659
#, c-format
msgid "Input ignore patterns>> "
msgstr "Introduïu els patrons a ignorar>> "
-#: builtin/clean.c:690
+#: builtin/clean.c:696
#, 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:711
+#: builtin/clean.c:717
msgid "Select items to delete"
msgstr "Selecciona els ítems a suprimir"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:752
+#: builtin/clean.c:758
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Voleu eliminar %s [y/N]? "
-#: builtin/clean.c:777 git-add--interactive.perl:1669
+#: builtin/clean.c:783 git-add--interactive.perl:1660
#, c-format
msgid "Bye.\n"
msgstr "Adéu.\n"
-#: builtin/clean.c:785
+#: builtin/clean.c:791
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -6221,62 +6417,63 @@
"help - aquesta pantalla\n"
"? - ajuda de selecció de l'avís"
-#: builtin/clean.c:812 git-add--interactive.perl:1745
+#: builtin/clean.c:818 git-add--interactive.perl:1736
msgid "*** Commands ***"
msgstr "*** Ordres ***"
-#: builtin/clean.c:813 git-add--interactive.perl:1742
+#: builtin/clean.c:819 git-add--interactive.perl:1733
msgid "What now"
msgstr "I ara què"
-#: builtin/clean.c:821
+#: builtin/clean.c:827
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Eliminaria l'ítem següent:"
msgstr[1] "Eliminaria els ítems següents:"
-#: builtin/clean.c:838
+#: builtin/clean.c:844
msgid "No more files to clean, exiting."
msgstr "No hi ha més fitxers a netejar; s'està sortint."
-#: builtin/clean.c:869
+#: builtin/clean.c:875
msgid "do not print names of files removed"
msgstr "no imprimeixis els noms dels fitxers eliminats"
-#: builtin/clean.c:871
+#: builtin/clean.c:877
msgid "force"
msgstr "força"
-#: builtin/clean.c:872
+#: builtin/clean.c:878
msgid "interactive cleaning"
msgstr "neteja interactiva"
-#: builtin/clean.c:874
+#: builtin/clean.c:880
msgid "remove whole directories"
msgstr "elimina directoris sencers"
-#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:1056
-#: builtin/ls-files.c:538 builtin/name-rev.c:313 builtin/show-ref.c:176
+#: 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
msgid "pattern"
msgstr "patró"
-#: builtin/clean.c:876
+#: builtin/clean.c:882
msgid "add <pattern> to ignore rules"
msgstr "afegiu <patró> per a ignorar les regles"
-#: builtin/clean.c:877
+#: builtin/clean.c:883
msgid "remove ignored files, too"
msgstr "elimina els fitxers ignorats, també"
-#: builtin/clean.c:879
+#: builtin/clean.c:885
msgid "remove only ignored files"
msgstr "elimina només els fitxers ignorats"
-#: builtin/clean.c:897
+#: builtin/clean.c:903
msgid "-x and -X cannot be used together"
msgstr "-x i -X no es poden usar junts"
-#: builtin/clean.c:901
+#: builtin/clean.c:907
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -6284,7 +6481,7 @@
"clean.requireForce està establerta a veritat i ni -i, -n ni -f s'han "
"indicat; refusant netejar"
-#: builtin/clean.c:904
+#: builtin/clean.c:910
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -6296,129 +6493,134 @@
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<opcions>] [--] <dipòsit> [<directori>]"
-#: builtin/clone.c:65
+#: builtin/clone.c:80
msgid "don't create a checkout"
msgstr "no facis cap agafament"
-#: builtin/clone.c:66 builtin/clone.c:68 builtin/init-db.c:478
+#: builtin/clone.c:81 builtin/clone.c:83 builtin/init-db.c:478
msgid "create a bare repository"
msgstr "crea un dipòsit nu"
-#: builtin/clone.c:70
+#: builtin/clone.c:85
msgid "create a mirror repository (implies bare)"
msgstr "crea un dipòsit mirall (implica bare)"
-#: builtin/clone.c:72
+#: builtin/clone.c:87
msgid "to clone from a local repository"
msgstr "per a clonar des d'un dipòsit local"
-#: builtin/clone.c:74
+#: builtin/clone.c:89
msgid "don't use local hardlinks, always copy"
msgstr "no usis enllaços durs locals, sempre copia"
-#: builtin/clone.c:76
+#: builtin/clone.c:91
msgid "setup as shared repository"
msgstr "configura com a dipòsit compartit"
-#: builtin/clone.c:78 builtin/clone.c:80
+#: builtin/clone.c:93 builtin/clone.c:97
+msgid "pathspec"
+msgstr "especificació de camí"
+
+#: builtin/clone.c:93 builtin/clone.c:97
msgid "initialize submodules in the clone"
msgstr "inicialitza els submòduls en el clon"
-#: builtin/clone.c:82
+#: builtin/clone.c:100
msgid "number of submodules cloned in parallel"
msgstr "nombre de submòduls clonats en paral·lel"
-#: builtin/clone.c:83 builtin/init-db.c:475
+#: builtin/clone.c:101 builtin/init-db.c:475
msgid "template-directory"
msgstr "directori-de-plantilla"
-#: builtin/clone.c:84 builtin/init-db.c:476
+#: builtin/clone.c:102 builtin/init-db.c:476
msgid "directory from which templates will be used"
msgstr "directori des del qual s'usaran les plantilles"
-#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:604
-#: builtin/submodule--helper.c:970
+#: builtin/clone.c:104 builtin/clone.c:106 builtin/submodule--helper.c:642
+#: builtin/submodule--helper.c:983
msgid "reference repository"
msgstr "dipòsit de referència"
-#: builtin/clone.c:90
+#: builtin/clone.c:108
msgid "use --reference only while cloning"
msgstr "usa --reference només en clonar"
-#: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:109 builtin/column.c:26 builtin/merge-file.c:43
msgid "name"
msgstr "nom"
-#: builtin/clone.c:92
+#: builtin/clone.c:110
msgid "use <name> instead of 'origin' to track upstream"
msgstr "usa <nom> en lloc de 'origin' per a seguir la font"
-#: builtin/clone.c:94
+#: builtin/clone.c:112
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "agafa <branca> en lloc del HEAD del remot"
-#: builtin/clone.c:96
+#: builtin/clone.c:114
msgid "path to git-upload-pack on the remote"
msgstr "camí a git-upload-pack en el remot"
-#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:999 builtin/pull.c:202
+#: builtin/clone.c:115 builtin/fetch.c:120 builtin/grep.c:1006
+#: builtin/pull.c:202
msgid "depth"
msgstr "profunditat"
-#: builtin/clone.c:98
+#: builtin/clone.c:116
msgid "create a shallow clone of that depth"
msgstr "crea un clon superficial de tal profunditat"
-#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2836
+#: builtin/clone.c:117 builtin/fetch.c:122 builtin/pack-objects.c:2918
#: parse-options.h:142
msgid "time"
msgstr "hora"
-#: builtin/clone.c:100
+#: builtin/clone.c:118
msgid "create a shallow clone since a specific time"
msgstr "crea un clon superficial des d'una hora específica"
-#: builtin/clone.c:101 builtin/fetch.c:124
+#: builtin/clone.c:119 builtin/fetch.c:124
msgid "revision"
msgstr "revisió"
-#: builtin/clone.c:102 builtin/fetch.c:125
+#: builtin/clone.c:120 builtin/fetch.c:125
msgid "deepen history of shallow clone, excluding rev"
msgstr "aprofundeix la història d'un clon superficial, excloent una revisió"
-#: builtin/clone.c:104
+#: builtin/clone.c:122
msgid "clone only one branch, HEAD or --branch"
msgstr "clona només una branca, HEAD o --branch"
-#: builtin/clone.c:106
+#: builtin/clone.c:124
msgid "any cloned submodules will be shallow"
msgstr "qualsevol submòdul clonat serà superficial"
-#: builtin/clone.c:107 builtin/init-db.c:484
+#: builtin/clone.c:125 builtin/init-db.c:484
msgid "gitdir"
msgstr "directori de git"
-#: builtin/clone.c:108 builtin/init-db.c:485
+#: builtin/clone.c:126 builtin/init-db.c:485
msgid "separate git dir from working tree"
msgstr "separa el directori de git de l'arbre de treball"
-#: builtin/clone.c:109
+#: builtin/clone.c:127
msgid "key=value"
msgstr "clau=valor"
-#: builtin/clone.c:110
+#: builtin/clone.c:128
msgid "set config inside the new repository"
msgstr "estableix la configuració dins del dipòsit nou"
-#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:550
+#: builtin/clone.c:129 builtin/fetch.c:140 builtin/push.c:550
msgid "use IPv4 addresses only"
msgstr "usa només adreces IPv4"
-#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:552
+#: builtin/clone.c:131 builtin/fetch.c:142 builtin/push.c:552
msgid "use IPv6 addresses only"
msgstr "usa només adreces IPv6"
-#: builtin/clone.c:250
+#: builtin/clone.c:268
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
@@ -6426,42 +6628,42 @@
"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:303
+#: builtin/clone.c:321
#, 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:375
+#: builtin/clone.c:393
#, c-format
msgid "failed to open '%s'"
msgstr "s'ha produït un error en obrir '%s'"
-#: builtin/clone.c:383
+#: builtin/clone.c:401
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existeix i no és directori"
-#: builtin/clone.c:397
+#: builtin/clone.c:415
#, c-format
msgid "failed to stat %s\n"
msgstr "s'ha produït un error en fer stat a '%s'\n"
-#: builtin/clone.c:419
+#: builtin/clone.c:437
#, c-format
msgid "failed to create link '%s'"
msgstr "s'ha produït un error en crear l'enllaç '%s'"
-#: builtin/clone.c:423
+#: builtin/clone.c:441
#, 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:448
+#: builtin/clone.c:466
#, c-format
msgid "done.\n"
msgstr "fet.\n"
-#: builtin/clone.c:460
+#: builtin/clone.c:478
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -6472,102 +6674,101 @@
"'git status' i tornar a intentar l'agafament amb\n"
"'git checkout -f HEAD'\n"
-#: builtin/clone.c:537
+#: builtin/clone.c:555
#, 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:632
+#: builtin/clone.c:650
msgid "remote did not send all necessary objects"
msgstr "el remot no ha enviat tots els objectes necessaris"
-#: builtin/clone.c:648
+#: builtin/clone.c:666
#, c-format
msgid "unable to update %s"
msgstr "no s'ha pogut actualitzar %s"
-#: builtin/clone.c:697
+#: builtin/clone.c:715
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"
-#: builtin/clone.c:728
+#: builtin/clone.c:746
msgid "unable to checkout working tree"
msgstr "no s'ha pogut agafar l'arbre de treball"
-#: builtin/clone.c:768
+#: builtin/clone.c:786
msgid "unable to write parameters to config file"
msgstr "no s'ha pogut escriure els paràmetres al fitxer de configuració"
-#: builtin/clone.c:831
+#: builtin/clone.c:849
msgid "cannot repack to clean up"
msgstr "no es pot reempaquetar per a netejar"
-#: builtin/clone.c:833
+#: builtin/clone.c:851
msgid "cannot unlink temporary alternates file"
msgstr "no es pot desenllaçar el fitxer d'alternatives temporal"
-#: builtin/clone.c:866 builtin/receive-pack.c:1895
+#: builtin/clone.c:884 builtin/receive-pack.c:1900
msgid "Too many arguments."
msgstr "Hi ha massa paràmetres."
-#: builtin/clone.c:870
+#: builtin/clone.c:888
msgid "You must specify a repository to clone."
msgstr "Heu d'especificar un dipòsit per a clonar."
-#: builtin/clone.c:883
+#: builtin/clone.c:901
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "les opcions --bare i --origin %s són incompatibles."
-#: builtin/clone.c:886
+#: builtin/clone.c:904
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare i --separate-git-dir són incompatibles."
-#: builtin/clone.c:899
+#: builtin/clone.c:917
#, c-format
msgid "repository '%s' does not exist"
msgstr "el dipòsit '%s' no existeix"
-#: builtin/clone.c:905 builtin/fetch.c:1335
+#: builtin/clone.c:923 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:915
+#: builtin/clone.c:933
#, 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:925
+#: builtin/clone.c:943
#, c-format
msgid "working tree '%s' already exists."
msgstr "l'arbre de treball '%s' ja existeix."
-#: builtin/clone.c:940 builtin/clone.c:951 builtin/difftool.c:252
-#: builtin/submodule--helper.c:659 builtin/worktree.c:222
-#: builtin/worktree.c:249
+#: builtin/clone.c:958 builtin/clone.c:969 builtin/difftool.c:252
+#: builtin/worktree.c:221 builtin/worktree.c:251
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "no s'han pogut crear els directoris inicials de '%s'"
-#: builtin/clone.c:943
+#: builtin/clone.c:961
#, 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:955
+#: builtin/clone.c:973
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "S'està clonant al dipòsit nu '%s'...\n"
-#: builtin/clone.c:957
+#: builtin/clone.c:975
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "S'està clonant a '%s'...\n"
-#: builtin/clone.c:963
+#: builtin/clone.c:999
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
@@ -6575,39 +6776,39 @@
"clone --recursive no és compatible amb ambdós --reference i --reference-if-"
"able"
-#: builtin/clone.c:1019
+#: builtin/clone.c:1055
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:1021
+#: builtin/clone.c:1057
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ò."
-#: builtin/clone.c:1023
+#: builtin/clone.c:1059
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ò."
-#: builtin/clone.c:1026
+#: builtin/clone.c:1062
msgid "source repository is shallow, ignoring --local"
msgstr "el dipòsit font és superficial, s'està ignorant --local"
-#: builtin/clone.c:1031
+#: builtin/clone.c:1067
msgid "--local is ignored"
msgstr "--local s'ignora"
-#: builtin/clone.c:1035
+#: builtin/clone.c:1071
#, c-format
msgid "Don't know how to clone %s"
msgstr "No se sap com clonar %s"
-#: builtin/clone.c:1090 builtin/clone.c:1098
+#: builtin/clone.c:1126 builtin/clone.c:1134
#, 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:1101
+#: builtin/clone.c:1137
msgid "You appear to have cloned an empty repository."
msgstr "Sembla que heu clonat un dipòsit buit."
@@ -6803,11 +7004,6 @@
msgid "malformed --author parameter"
msgstr "paràmetre --author mal format"
-#: builtin/commit.c:611
-#, c-format
-msgid "invalid date format: %s"
-msgstr "format de data no vàlid: %s"
-
#: builtin/commit.c:655
msgid ""
"unable to select a comment character that is not used\n"
@@ -6821,7 +7017,7 @@
msgid "could not lookup commit %s"
msgstr "no s'ha pogut trobar la comissió %s"
-#: builtin/commit.c:704 builtin/shortlog.c:295
+#: builtin/commit.c:704 builtin/shortlog.c:294
#, 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"
@@ -6921,7 +7117,7 @@
msgid "Error building trees"
msgstr "Error en construir arbres"
-#: builtin/commit.c:968 builtin/tag.c:280
+#: builtin/commit.c:968 builtin/tag.c:273
#, 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"
@@ -6988,7 +7184,7 @@
"S'han especificat camins explícits sense -i o -o; s'està presumint --only "
"camins..."
-#: builtin/commit.c:1224 builtin/tag.c:495
+#: builtin/commit.c:1224 builtin/tag.c:551
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Mode de neteja no vàlid %s"
@@ -7010,7 +7206,7 @@
msgstr "versió"
#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525
-#: builtin/worktree.c:442
+#: builtin/worktree.c:448
msgid "machine-readable output"
msgstr "sortida llegible per màquina"
@@ -7023,7 +7219,7 @@
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:368
+#: builtin/fast-export.c:984 builtin/tag.c:411
msgid "mode"
msgstr "mode"
@@ -7081,7 +7277,7 @@
msgid "Commit message options"
msgstr "Opcions de missatge de comissió"
-#: builtin/commit.c:1586 builtin/tag.c:366
+#: builtin/commit.c:1586 builtin/tag.c:409
msgid "read message from file"
msgstr "llegiu el missatge des d'un fitxer"
@@ -7093,7 +7289,7 @@
msgid "override author for commit"
msgstr "autor corregit de la comissió"
-#: builtin/commit.c:1588 builtin/gc.c:333
+#: builtin/commit.c:1588 builtin/gc.c:357
msgid "date"
msgstr "data"
@@ -7101,8 +7297,8 @@
msgid "override date for commit"
msgstr "data corregida de la comissió"
-#: builtin/commit.c:1589 builtin/merge.c:222 builtin/notes.c:398
-#: builtin/notes.c:561 builtin/tag.c:364
+#: builtin/commit.c:1589 builtin/merge.c:221 builtin/notes.c:398
+#: builtin/notes.c:561 builtin/tag.c:407
msgid "message"
msgstr "missatge"
@@ -7111,7 +7307,7 @@
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:81
+#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:77
msgid "commit"
msgstr "comissió"
@@ -7139,7 +7335,7 @@
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:1413 builtin/revert.c:86
+#: builtin/commit.c:1595 builtin/log.c:1420 builtin/revert.c:104
msgid "add Signed-off-by:"
msgstr "afegeix Signed-off-by:"
@@ -7155,7 +7351,7 @@
msgid "default"
msgstr "per defecte"
-#: builtin/commit.c:1598 builtin/tag.c:369
+#: builtin/commit.c:1598 builtin/tag.c:412
msgid "how to strip spaces and #comments from message"
msgstr "com suprimir els espais i #comentaris del missatge"
@@ -7163,8 +7359,8 @@
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:234 builtin/pull.c:166
-#: builtin/revert.c:93
+#: builtin/commit.c:1601 builtin/merge.c:233 builtin/pull.c:166
+#: builtin/revert.c:112
msgid "GPG sign commit"
msgstr "signa la comissió amb GPG"
@@ -7259,142 +7455,142 @@
msgid "git config [<options>]"
msgstr "git config [<opcions>]"
-#: builtin/config.c:55
+#: builtin/config.c:56
msgid "Config file location"
msgstr "Ubicació del fitxer de configuració"
-#: builtin/config.c:56
+#: builtin/config.c:57
msgid "use global config file"
msgstr "usa el fitxer de configuració global"
-#: builtin/config.c:57
+#: builtin/config.c:58
msgid "use system config file"
msgstr "usa el fitxer de configuració del sistema"
-#: builtin/config.c:58
+#: builtin/config.c:59
msgid "use repository config file"
msgstr "usa el fitxer de configuració del dipòsit"
-#: builtin/config.c:59
+#: builtin/config.c:60
msgid "use given config file"
msgstr "usa el fitxer de configuració donat"
-#: builtin/config.c:60
+#: builtin/config.c:61
msgid "blob-id"
msgstr "ID de blob"
-#: builtin/config.c:60
+#: builtin/config.c:61
msgid "read config from given blob object"
msgstr "llegeix la configuració de l'objecte de blob donat"
-#: builtin/config.c:61
+#: builtin/config.c:62
msgid "Action"
msgstr "Acció"
-#: builtin/config.c:62
+#: builtin/config.c:63
msgid "get value: name [value-regex]"
msgstr "obtén valor: nom [regex-de-valors]"
-#: builtin/config.c:63
+#: builtin/config.c:64
msgid "get all values: key [value-regex]"
msgstr "obtén tots els valors: clau [regex-de-valors]"
-#: builtin/config.c:64
+#: builtin/config.c:65
msgid "get values for regexp: name-regex [value-regex]"
msgstr "obtén valors de regexp: regex-de-noms [regex-de-valors]"
-#: builtin/config.c:65
+#: builtin/config.c:66
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:66
+#: builtin/config.c:67
msgid "replace all matching variables: name value [value_regex]"
msgstr ""
"reemplaça totes les variables que coincideixen: nom valor [regex_de_valors]"
-#: builtin/config.c:67
+#: builtin/config.c:68
msgid "add a new variable: name value"
msgstr "afegeix una variable nova: nom valor"
-#: builtin/config.c:68
+#: builtin/config.c:69
msgid "remove a variable: name [value-regex]"
msgstr "elimina una variable: nom [regex-de-valors]"
-#: builtin/config.c:69
+#: builtin/config.c:70
msgid "remove all matches: name [value-regex]"
msgstr "elimina totes les coincidències: nom [regex-de-valors]"
-#: builtin/config.c:70
+#: builtin/config.c:71
msgid "rename section: old-name new-name"
msgstr "canvia el nom de secció: nom-antic nom-nou"
-#: builtin/config.c:71
+#: builtin/config.c:72
msgid "remove a section: name"
msgstr "elimina una secció: nom"
-#: builtin/config.c:72
+#: builtin/config.c:73
msgid "list all"
msgstr "llista tots"
-#: builtin/config.c:73
+#: builtin/config.c:74
msgid "open an editor"
msgstr "obre un editor"
-#: builtin/config.c:74
+#: builtin/config.c:75
msgid "find the color configured: slot [default]"
msgstr "troba el color configurat: ranura [per defecte]"
-#: builtin/config.c:75
+#: builtin/config.c:76
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "troba l'ajust de color: ranura [stdout-és-tty]"
-#: builtin/config.c:76
+#: builtin/config.c:77
msgid "Type"
msgstr "Tipus"
-#: builtin/config.c:77
+#: builtin/config.c:78
msgid "value is \"true\" or \"false\""
msgstr "el valor és \"true\" o \"false\""
-#: builtin/config.c:78
+#: builtin/config.c:79
msgid "value is decimal number"
msgstr "el valor és un nombre decimal"
-#: builtin/config.c:79
+#: builtin/config.c:80
msgid "value is --bool or --int"
msgstr "el valor és --bool o --int"
-#: builtin/config.c:80
+#: builtin/config.c:81
msgid "value is a path (file or directory name)"
msgstr "el valor és un camí (nom de fitxer o directori)"
-#: builtin/config.c:81
+#: builtin/config.c:82
msgid "Other"
msgstr "Altre"
-#: builtin/config.c:82
+#: builtin/config.c:83
msgid "terminate values with NUL byte"
msgstr "acaba els valors amb un octet NUL"
-#: builtin/config.c:83
+#: builtin/config.c:84
msgid "show variable names only"
msgstr "mostra només els noms de variable"
-#: builtin/config.c:84
+#: builtin/config.c:85
msgid "respect include directives on lookup"
msgstr "respecta les directives d'inclusió en cercar"
-#: builtin/config.c:85
+#: builtin/config.c:86
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)"
-#: builtin/config.c:327
+#: builtin/config.c:328
msgid "unable to parse default color value"
msgstr "no s'ha pogut analitzar el valor de color per defecte"
-#: builtin/config.c:471
+#: builtin/config.c:472
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -7409,12 +7605,12 @@
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:613
+#: builtin/config.c:615
#, c-format
msgid "cannot create configuration file %s"
msgstr "no es pot crear el fitxer de configuració '%s'"
-#: builtin/config.c:625
+#: builtin/config.c:627
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
@@ -7431,55 +7627,67 @@
msgid "print sizes in human readable format"
msgstr "imprimeix les mides en un format llegible pels humans"
-#: builtin/describe.c:17
+#: builtin/describe.c:18
msgid "git describe [<options>] [<commit-ish>...]"
msgstr "git describe [<opcions>] [<comissió>...]"
-#: builtin/describe.c:18
+#: builtin/describe.c:19
msgid "git describe [<options>] --dirty"
msgstr "git describe [<opcions>] --dirty"
-#: builtin/describe.c:217
+#: builtin/describe.c:53
+msgid "head"
+msgstr "davant per"
+
+#: builtin/describe.c:53
+msgid "lightweight"
+msgstr "lleuger"
+
+#: builtin/describe.c:53
+msgid "annotated"
+msgstr "anotat"
+
+#: builtin/describe.c:250
#, c-format
msgid "annotated tag %s not available"
msgstr "l'etiqueta anotada %s no és disponible"
-#: builtin/describe.c:221
+#: builtin/describe.c:254
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr "l'etiqueta anotada %s no té nom incrustat"
-#: builtin/describe.c:223
+#: builtin/describe.c:256
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr "l'etiqueta '%s' realment és '%s' aquí"
-#: builtin/describe.c:250 builtin/log.c:480
+#: builtin/describe.c:283 builtin/log.c:487
#, c-format
msgid "Not a valid object name %s"
msgstr "%s no és un nom d'objecte vàlid"
-#: builtin/describe.c:253
+#: builtin/describe.c:286
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s no és un objecte de '%s' vàlid"
-#: builtin/describe.c:270
+#: builtin/describe.c:303
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "cap etiqueta coincideix exactament amb '%s'"
-#: builtin/describe.c:272
+#: builtin/describe.c:305
#, c-format
msgid "searching to describe %s\n"
msgstr "s'està cercant per a descriure %s\n"
-#: builtin/describe.c:319
+#: builtin/describe.c:352
#, c-format
msgid "finished search at %s\n"
msgstr "s'ha finalitzat la cerca a %s\n"
-#: builtin/describe.c:346
+#: builtin/describe.c:379
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
@@ -7488,7 +7696,7 @@
"Cap etiqueta anotada pot descriure '%s'.\n"
"No obstant, hi havia etiquetes no anotades: proveu --tags."
-#: builtin/describe.c:350
+#: builtin/describe.c:383
#, c-format
msgid ""
"No tags can describe '%s'.\n"
@@ -7497,12 +7705,12 @@
"Cap etiqueta pot descriure '%s'.\n"
"Proveu --always, o creeu algunes etiquetes."
-#: builtin/describe.c:371
+#: builtin/describe.c:413
#, c-format
msgid "traversed %lu commits\n"
msgstr "%lu comissions travessades\n"
-#: builtin/describe.c:374
+#: builtin/describe.c:416
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
@@ -7511,66 +7719,78 @@
"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:396
+#: builtin/describe.c:438
msgid "find the tag that comes after the commit"
msgstr "troba l'etiqueta que vingui després de la comissió"
-#: builtin/describe.c:397
+#: builtin/describe.c:439
msgid "debug search strategy on stderr"
msgstr "estratègia de cerca de depuració en stderr"
-#: builtin/describe.c:398
+#: builtin/describe.c:440
msgid "use any ref"
msgstr "usa qualsevol referència"
-#: builtin/describe.c:399
+#: builtin/describe.c:441
msgid "use any tag, even unannotated"
msgstr "usa qualsevol etiqueta, fins i tot aquelles sense anotar"
-#: builtin/describe.c:400
+#: builtin/describe.c:442
msgid "always use long format"
msgstr "sempre usa el format llarg"
-#: builtin/describe.c:401
+#: builtin/describe.c:443
msgid "only follow first parent"
msgstr "només segueix la primera mare"
-#: builtin/describe.c:404
+#: builtin/describe.c:446
msgid "only output exact matches"
msgstr "emet només coincidències exactes"
-#: builtin/describe.c:406
+#: builtin/describe.c:448
msgid "consider <n> most recent tags (default: 10)"
msgstr "considera les <n> etiquetes més recents (per defecte: 10)"
-#: builtin/describe.c:408
+#: builtin/describe.c:450
msgid "only consider tags matching <pattern>"
msgstr "només considera les etiquetes que coincideixen amb <patró>"
-#: builtin/describe.c:410 builtin/name-rev.c:320
+#: builtin/describe.c:452
+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
msgid "show abbreviated commit object as fallback"
msgstr "mostra l'objecte de comissió abreviat com a sistema alternatiu"
-#: builtin/describe.c:411
+#: builtin/describe.c:455 builtin/describe.c:458
msgid "mark"
msgstr "marca"
-#: builtin/describe.c:412
+#: builtin/describe.c:456
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr "annexa <marca> en l'arbre de treball brut (per defecte: \"-dirty\")"
-#: builtin/describe.c:430
+#: builtin/describe.c:459
+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
msgid "--long is incompatible with --abbrev=0"
msgstr "--long és incompatible amb --abbrev=0"
-#: builtin/describe.c:456
+#: builtin/describe.c:506
msgid "No names found, cannot describe anything."
msgstr "No s'ha trobat cap nom, no es pot descriure res."
-#: builtin/describe.c:476
+#: builtin/describe.c:549
msgid "--dirty is incompatible with commit-ishes"
msgstr "--dirty és incompatible amb les comissions"
+#: builtin/describe.c:551
+msgid "--broken is incompatible with commit-ishes"
+msgstr "--broken és incompatible amb les comissions"
+
#: builtin/diff.c:83
#, c-format
msgid "'%s': not a regular file or symlink"
@@ -7605,82 +7825,97 @@
msgstr "git difftool [<opcions>] [<commit> [<commit>]] [--] [<camí>...]"
#: builtin/difftool.c:241
-#, c-format
+#, c-format
msgid "failed: %d"
msgstr "ha fallat: %d"
-#: builtin/difftool.c:342
+#: builtin/difftool.c:283
+#, c-format
+msgid "could not read symlink %s"
+msgstr "no s'ha pogut llegir l'enllaç simbòlic %s"
+
+#: builtin/difftool.c:285
+#, 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
+#, 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
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
msgstr ""
-#: builtin/difftool.c:567
+#: builtin/difftool.c:609
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "s'han modificat ambdós fitxers: '%s' i '%s'."
-#: builtin/difftool.c:569
+#: builtin/difftool.c:611
msgid "working tree file has been left."
msgstr "s'ha deixat un fitxer de l'arbre de treball."
-#: builtin/difftool.c:580
+#: builtin/difftool.c:622
#, c-format
msgid "temporary files exist in '%s'."
msgstr "existeix un fitxer temporal a %s'."
-#: builtin/difftool.c:581
+#: builtin/difftool.c:623
msgid "you may want to cleanup or recover these."
-msgstr "podeu voleu netejar o recuperar-los."
+msgstr "podeu netejar o recuperar-los."
-#: builtin/difftool.c:626
+#: builtin/difftool.c:669
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "utilitza `diff.guitool` en comptes de `diff.tool`"
-#: builtin/difftool.c:628
+#: builtin/difftool.c:671
msgid "perform a full-directory diff"
msgstr "fes un diff de tot el directori"
-#: builtin/difftool.c:630
+#: builtin/difftool.c:673
msgid "do not prompt before launching a diff tool"
msgstr "no preguntis abans d'executar l'eina diff"
-#: builtin/difftool.c:636
+#: builtin/difftool.c:679
msgid "use symlinks in dir-diff mode"
msgstr "utilitza enllaços simbòlics en mode dir-diff"
-#: builtin/difftool.c:637
+#: builtin/difftool.c:680
msgid "<tool>"
msgstr "<tool>"
-#: builtin/difftool.c:638
+#: builtin/difftool.c:681
msgid "use the specified diff tool"
msgstr "utilitza l'eina de diff especificada"
-#: builtin/difftool.c:640
+#: builtin/difftool.c:683
msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
"imprimeix una llista de totes les eines diff que es podeu usar amb `--tool`"
-#: builtin/difftool.c:643
+#: builtin/difftool.c:686
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
msgstr ""
-#: builtin/difftool.c:645
+#: builtin/difftool.c:688
msgid "<command>"
msgstr "<command>"
-#: builtin/difftool.c:646
+#: builtin/difftool.c:689
msgid "specify a custom command for viewing diffs"
msgstr "especifiqueu una ordre personalitzada per veure diffs"
-#: builtin/difftool.c:670
+#: builtin/difftool.c:713
msgid "no <tool> given for --tool=<tool>"
msgstr "no s'ha proporcionat <tool> per --tool=<tool>"
-#: builtin/difftool.c:677
+#: builtin/difftool.c:720
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "no s'ha proporcionat <cmd> per --extcmd=<cmd>"
@@ -7816,7 +8051,7 @@
msgid "convert to a complete repository"
msgstr "converteix en un dipòsit complet"
-#: builtin/fetch.c:131 builtin/log.c:1433
+#: builtin/fetch.c:131 builtin/log.c:1440
msgid "dir"
msgstr "directori"
@@ -7844,74 +8079,74 @@
msgid "Couldn't find remote ref HEAD"
msgstr "No s'ha pogut trobar la referència HEAD remota"
-#: builtin/fetch.c:511
+#: builtin/fetch.c:513
#, 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:604
+#: builtin/fetch.c:606
#, c-format
msgid "object %s not found"
msgstr "objecte %s no trobat"
-#: builtin/fetch.c:608
+#: builtin/fetch.c:610
msgid "[up to date]"
msgstr "[al dia]"
-#: builtin/fetch.c:621 builtin/fetch.c:701
+#: builtin/fetch.c:623 builtin/fetch.c:703
msgid "[rejected]"
msgstr "[rebutjat]"
-#: builtin/fetch.c:622
+#: builtin/fetch.c:624
msgid "can't fetch in current branch"
msgstr "no es pot obtenir en la branca actual"
-#: builtin/fetch.c:631
+#: builtin/fetch.c:633
msgid "[tag update]"
msgstr "[actualització d'etiqueta]"
-#: builtin/fetch.c:632 builtin/fetch.c:665 builtin/fetch.c:681
-#: builtin/fetch.c:696
+#: builtin/fetch.c:634 builtin/fetch.c:667 builtin/fetch.c:683
+#: builtin/fetch.c:698
msgid "unable to update local ref"
msgstr "no s'ha pogut actualitzar la referència local"
-#: builtin/fetch.c:651
+#: builtin/fetch.c:653
msgid "[new tag]"
msgstr "[etiqueta nova]"
-#: builtin/fetch.c:654
+#: builtin/fetch.c:656
msgid "[new branch]"
msgstr "[branca nova]"
-#: builtin/fetch.c:657
+#: builtin/fetch.c:659
msgid "[new ref]"
msgstr "[referència nova]"
-#: builtin/fetch.c:696
+#: builtin/fetch.c:698
msgid "forced update"
msgstr "actualització forçada"
-#: builtin/fetch.c:701
+#: builtin/fetch.c:703
msgid "non-fast-forward"
msgstr "sense avanç ràpid"
-#: builtin/fetch.c:746
+#: builtin/fetch.c:748
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s no ha enviat tots els objectes necessaris\n"
-#: builtin/fetch.c:766
+#: builtin/fetch.c:768
#, 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"
-#: builtin/fetch.c:853 builtin/fetch.c:949
+#: builtin/fetch.c:855 builtin/fetch.c:951
#, c-format
msgid "From %.*s\n"
msgstr "De %.*s\n"
-#: builtin/fetch.c:864
+#: builtin/fetch.c:866
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -7921,55 +8156,55 @@
" intenteu executar 'git remote prune %s' per a eliminar\n"
" qualsevol branca antiga o conflictiva"
-#: builtin/fetch.c:919
+#: builtin/fetch.c:921
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s es tornarà penjant)"
-#: builtin/fetch.c:920
+#: builtin/fetch.c:922
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s s'ha tornat penjant)"
-#: builtin/fetch.c:952
+#: builtin/fetch.c:954
msgid "[deleted]"
msgstr "[suprimit]"
-#: builtin/fetch.c:953 builtin/remote.c:1020
+#: builtin/fetch.c:955 builtin/remote.c:1022
msgid "(none)"
msgstr "(cap)"
-#: builtin/fetch.c:976
+#: builtin/fetch.c:978
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "S'està refusant obtenir en la branca actual %s d'un dipòsit no nu"
-#: builtin/fetch.c:995
+#: builtin/fetch.c:997
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "L'opció \"%s\" amb valor \"%s\" no és vàlida per a %s"
-#: builtin/fetch.c:998
+#: builtin/fetch.c:1000
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "S'ignora l'opció \"%s\" per a %s\n"
-#: builtin/fetch.c:1074
+#: builtin/fetch.c:1076
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "No se sap com obtenir de %s"
-#: builtin/fetch.c:1234
+#: builtin/fetch.c:1236
#, c-format
msgid "Fetching %s\n"
msgstr "S'està obtenint %s\n"
-#: builtin/fetch.c:1236 builtin/remote.c:96
+#: builtin/fetch.c:1238 builtin/remote.c:96
#, c-format
msgid "Could not fetch %s"
msgstr "No s'ha pogut obtenir %s"
-#: builtin/fetch.c:1254
+#: builtin/fetch.c:1256
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -7977,40 +8212,40 @@
"Cap dipòsit remot especificat. Si us plau, especifiqueu un URL o\n"
"un nom remot del qual es deuen obtenir les revisions noves."
-#: builtin/fetch.c:1277
+#: builtin/fetch.c:1279
msgid "You need to specify a tag name."
msgstr "Necessiteu especificar un nom d'etiqueta."
-#: builtin/fetch.c:1319
+#: builtin/fetch.c:1321
msgid "Negative depth in --deepen is not supported"
msgstr "No s'admet una profunditat negativa en --deepen"
-#: builtin/fetch.c:1321
+#: builtin/fetch.c:1323
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen i --depth són mutualment exclusius"
-#: builtin/fetch.c:1326
+#: builtin/fetch.c:1328
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth i --unshallow no es poden usar junts"
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1330
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow en un dipòsit complet no té sentit"
-#: builtin/fetch.c:1350
+#: builtin/fetch.c:1352
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all no accepta un paràmetre de dipòsit"
-#: builtin/fetch.c:1352
+#: builtin/fetch.c:1354
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all no té sentit amb especificacions de referència"
-#: builtin/fetch.c:1363
+#: builtin/fetch.c:1365
#, c-format
msgid "No such remote or remote group: %s"
msgstr "No hi ha tal remot ni tal grup remot: %s"
-#: builtin/fetch.c:1371
+#: builtin/fetch.c:1373
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Obtenir un grup i especificar referències no té sentit"
@@ -8049,17 +8284,17 @@
msgstr "git for-each-ref [--points-at <objecte>]"
#: builtin/for-each-ref.c:11
-msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"
-msgstr "git for-each-ref [(--merged | --no-merged) [<objecte>]]"
+msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
+msgstr "git for-each-ref [(--merged | --no-merged) [<comissió>]]"
#: builtin/for-each-ref.c:12
-msgid "git for-each-ref [--contains [<object>]]"
-msgstr "git for-each-ref [--contains [<objecte>]]"
+msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
+msgstr "git for-each-ref [--contains [<comissió>]] [--no-contains [<comissió>]]"
#: builtin/for-each-ref.c:27
msgid "quote placeholders suitably for shells"
msgstr ""
-"posa els marcadors de posició entre cometes de forma adequada per a "
+"posa els marcadors de posició de forma adequada per a "
"intèrprets d'ordres"
#: builtin/for-each-ref.c:29
@@ -8078,10 +8313,6 @@
msgid "show only <n> matched refs"
msgstr "mostra només <n> referències coincidents"
-#: builtin/for-each-ref.c:37 builtin/tag.c:387 builtin/verify-tag.c:38
-msgid "format to use for the output"
-msgstr "format a usar en la sortida"
-
#: builtin/for-each-ref.c:41
msgid "print only refs which points at the given object"
msgstr "imprimeix només les referències que assenyalin l'objecte donat"
@@ -8098,6 +8329,10 @@
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
+msgid "print only refs which don't contain the commit"
+msgstr "imprimeix només les referències que no continguin la comissió"
+
#: builtin/fsck.c:554
msgid "Checking object directories"
msgstr "S'estan comprovant els directoris d'objecte"
@@ -8162,17 +8397,17 @@
msgid "git gc [<options>]"
msgstr "git gc [<opcions>]"
-#: builtin/gc.c:72
-#, c-format
-msgid "Invalid %s: '%s'"
-msgstr "%s no vàlid: %s"
+#: builtin/gc.c:78
+#, , c-format
+msgid "Failed to fstat %s: %s"
+msgstr "S'ha produït un error en fer fstat %s: %s"
-#: builtin/gc.c:139
+#: builtin/gc.c:310
#, c-format
-msgid "insanely long object directory %.*s"
-msgstr "directori d'objectes increïblement llarg %.*s"
+msgid "Can't stat %s"
+msgstr "No es pot fer stat en %s"
-#: builtin/gc.c:297
+#: builtin/gc.c:319
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@ -8187,47 +8422,52 @@
"\n"
"%s"
-#: builtin/gc.c:334
+#: builtin/gc.c:358
msgid "prune unreferenced objects"
msgstr "poda objectes sense referència"
-#: builtin/gc.c:336
+#: builtin/gc.c:360
msgid "be more thorough (increased runtime)"
msgstr "sigues més exhaustiu (el temps d'execució augmenta)"
-#: builtin/gc.c:337
+#: builtin/gc.c:361
msgid "enable auto-gc mode"
msgstr "habilita el mode de recollida d'escombraries automàtica"
-#: builtin/gc.c:338
+#: builtin/gc.c:362
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:380
+#: builtin/gc.c:379
+#, 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
#, 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"
-#: builtin/gc.c:382
+#: builtin/gc.c:409
#, 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:383
+#: builtin/gc.c:410
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "Vegeu \"git help gc\" per neteja manual.\n"
-#: builtin/gc.c:404
+#: builtin/gc.c:431
#, 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)"
-#: builtin/gc.c:448
+#: builtin/gc.c:475
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
@@ -8248,239 +8488,244 @@
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:763 builtin/grep.c:804
+#: builtin/grep.c:769 builtin/grep.c:810
#, c-format
msgid "unable to read tree (%s)"
msgstr "no s'ha pogut llegir l'arbre (%s)"
-#: builtin/grep.c:823
+#: builtin/grep.c:829
#, 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:887
+#: builtin/grep.c:893
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "l'opció `%c' espera un valor numèric"
-#: builtin/grep.c:973
+#: builtin/grep.c:980
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:975
+#: builtin/grep.c:982
msgid "find in contents not managed by git"
msgstr "cerca en continguts no gestionats per git"
-#: builtin/grep.c:977
+#: builtin/grep.c:984
msgid "search in both tracked and untracked files"
msgstr "cerca tant en fitxers seguits com en no seguits"
-#: builtin/grep.c:979
+#: builtin/grep.c:986
msgid "ignore files specified via '.gitignore'"
msgstr "ignora els fitxers especificats mitjançant '.gitignore'"
-#: builtin/grep.c:981
-msgid "recursivley search in each submodule"
+#: builtin/grep.c:988
+msgid "recursively search in each submodule"
msgstr "cerca recursivament a cada submòdul"
-#: builtin/grep.c:983
+#: builtin/grep.c:990
msgid "basename"
msgstr "nom base"
-#: builtin/grep.c:984
+#: builtin/grep.c:991
msgid "prepend parent project's basename to output"
msgstr "anteposa això a la sortida del nom base del projecte pare"
-#: builtin/grep.c:987
+#: builtin/grep.c:994
msgid "show non-matching lines"
msgstr "mostra les línies no coincidents"
-#: builtin/grep.c:989
+#: builtin/grep.c:996
msgid "case insensitive matching"
msgstr "coincidència insensible a majúscula i minúscula"
-#: builtin/grep.c:991
+#: builtin/grep.c:998
msgid "match patterns only at word boundaries"
msgstr "coincideix amb els patrons només als límits de paraula"
-#: builtin/grep.c:993
+#: builtin/grep.c:1000
msgid "process binary files as text"
msgstr "processa els fitxers binaris com a text"
-#: builtin/grep.c:995
+#: builtin/grep.c:1002
msgid "don't match patterns in binary files"
msgstr "no coincideixis amb els patrons en els fitxers binaris"
-#: builtin/grep.c:998
+#: builtin/grep.c:1005
msgid "process binary files with textconv filters"
msgstr "processa els fitxers binaris amb filtres de textconv"
-#: builtin/grep.c:1000
+#: builtin/grep.c:1007
msgid "descend at most <depth> levels"
msgstr "descendeix com a màxim <profunditat> nivells"
-#: builtin/grep.c:1004
+#: builtin/grep.c:1011
msgid "use extended POSIX regular expressions"
msgstr "usa les expressions regulars POSIX esteses"
-#: builtin/grep.c:1007
+#: builtin/grep.c:1014
msgid "use basic POSIX regular expressions (default)"
msgstr "usa les expressions regulars POSIX bàsiques (per defecte)"
-#: builtin/grep.c:1010
+#: builtin/grep.c:1017
msgid "interpret patterns as fixed strings"
msgstr "interpreta els patrons com a cadenes fixes"
-#: builtin/grep.c:1013
+#: builtin/grep.c:1020
msgid "use Perl-compatible regular expressions"
msgstr "usa les expressions regulars compatibles amb Perl"
-#: builtin/grep.c:1016
+#: builtin/grep.c:1023
msgid "show line numbers"
msgstr "mostra els números de línia"
-#: builtin/grep.c:1017
+#: builtin/grep.c:1024
msgid "don't show filenames"
msgstr "no mostris els noms de fitxer"
-#: builtin/grep.c:1018
+#: builtin/grep.c:1025
msgid "show filenames"
msgstr "mostra els noms de fitxer"
-#: builtin/grep.c:1020
+#: builtin/grep.c:1027
msgid "show filenames relative to top directory"
msgstr "mostra els noms de fitxer relatius al directori superior"
-#: builtin/grep.c:1022
+#: builtin/grep.c:1029
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:1024
+#: builtin/grep.c:1031
msgid "synonym for --files-with-matches"
msgstr "sinònim de --files-with-matches"
-#: builtin/grep.c:1027
+#: builtin/grep.c:1034
msgid "show only the names of files without match"
msgstr "mostra només els noms dels fitxers sense coincidència"
-#: builtin/grep.c:1029
+#: builtin/grep.c:1036
msgid "print NUL after filenames"
msgstr "imprimeix NUL després dels noms de fitxer"
-#: builtin/grep.c:1031
+#: builtin/grep.c:1038
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:1032
+#: builtin/grep.c:1039
msgid "highlight matches"
msgstr "ressalta les coincidències"
-#: builtin/grep.c:1034
+#: builtin/grep.c:1041
msgid "print empty line between matches from different files"
msgstr "imprimeix una línia buida entre coincidències de fitxers distints"
-#: builtin/grep.c:1036
+#: builtin/grep.c:1043
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"
-#: builtin/grep.c:1039
+#: builtin/grep.c:1046
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:1042
+#: builtin/grep.c:1049
msgid "show <n> context lines before matches"
msgstr "mostra <n> línies de context abans d'una coincidència"
-#: builtin/grep.c:1044
+#: builtin/grep.c:1051
msgid "show <n> context lines after matches"
msgstr "mostra <n> línies de context després d'una coincidència"
-#: builtin/grep.c:1046
+#: builtin/grep.c:1053
msgid "use <n> worker threads"
msgstr "usa <n> fils de treball"
-#: builtin/grep.c:1047
+#: builtin/grep.c:1054
msgid "shortcut for -C NUM"
msgstr "drecera per -C NUM"
-#: builtin/grep.c:1050
+#: builtin/grep.c:1057
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:1052
+#: builtin/grep.c:1059
msgid "show the surrounding function"
msgstr "mostra la funció circumdant"
-#: builtin/grep.c:1055
+#: builtin/grep.c:1062
msgid "read patterns from file"
msgstr "llegeix els patrons des d'un fitxer"
-#: builtin/grep.c:1057
+#: builtin/grep.c:1064
msgid "match <pattern>"
msgstr "coincideix amb <patró>"
-#: builtin/grep.c:1059
+#: builtin/grep.c:1066
msgid "combine patterns specified with -e"
msgstr "combina els patrons especificats amb -e"
-#: builtin/grep.c:1071
+#: builtin/grep.c:1078
msgid "indicate hit with exit status without output"
msgstr "indica coincidència amb estat de sortida sense sortida textual"
-#: builtin/grep.c:1073
+#: builtin/grep.c:1080
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"
-#: builtin/grep.c:1075
+#: builtin/grep.c:1082
msgid "show parse tree for grep expression"
msgstr "mostra l'arbre d'anàlisis de l'expressió de grep"
-#: builtin/grep.c:1079
+#: builtin/grep.c:1086
msgid "pager"
msgstr "paginador"
-#: builtin/grep.c:1079
+#: builtin/grep.c:1086
msgid "show matching files in the pager"
msgstr "mostra els fitxers coincidents en el paginador"
-#: builtin/grep.c:1082
+#: builtin/grep.c:1089
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "permet la invocació de grep(1) (ignorat per aquesta compilació)"
-#: builtin/grep.c:1146
+#: builtin/grep.c:1153
msgid "no pattern given."
msgstr "cap patró donat."
-#: builtin/grep.c:1178 builtin/index-pack.c:1482
+#: builtin/grep.c:1189
+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
+#, 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
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "s'ha especificat un nombre de fils no vàlid (%d)"
-#: builtin/grep.c:1215
+#: builtin/grep.c:1251
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:1238
+#: builtin/grep.c:1274
msgid "option not supported with --recurse-submodules."
msgstr "opció no admesa amb --recurse-submodules."
-#: builtin/grep.c:1244
+#: builtin/grep.c:1280
msgid "--cached or --untracked cannot be used with --no-index."
msgstr "--cached o --untracked no es pot usar amb --no-index."
-#: builtin/grep.c:1249
-msgid "--no-index or --untracked cannot be used with revs."
-msgstr "--no-index o --untracked no es pot usar amb revisions."
-
-#: builtin/grep.c:1252
+#: builtin/grep.c:1286
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:1260
+#: builtin/grep.c:1294
msgid "both --cached and trees are given."
msgstr "s'han donat ambdós --caches i arbres."
@@ -8707,48 +8952,49 @@
msgid "unable to create '%s'"
msgstr "no s'ha pogut crear '%s'"
-#: builtin/index-pack.c:322
+#: builtin/index-pack.c:323
#, c-format
msgid "cannot open packfile '%s'"
msgstr "no es pot obrir el fitxer de paquet '%s'"
-#: builtin/index-pack.c:336
+#: builtin/index-pack.c:337
msgid "pack signature mismatch"
msgstr "hi ha una discordança de signatura de paquet"
-#: builtin/index-pack.c:338
+#: builtin/index-pack.c:339
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "la versió de paquet %<PRIu32> no és compatible"
-#: builtin/index-pack.c:356
+#: builtin/index-pack.c:357
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "el paquet té un objecte dolent a la posició %<PRIuMAX>: %s"
-#: builtin/index-pack.c:478
+#: builtin/index-pack.c:479
#, c-format
msgid "inflate returned %d"
msgstr "la inflació ha retornat %d"
-#: builtin/index-pack.c:527
+#: 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 delta"
+msgstr ""
+"desbordament de valor de desplaçament per a l'objecte base de diferències"
-#: builtin/index-pack.c:535
+#: builtin/index-pack.c:536
msgid "delta base offset is out of bound"
-msgstr "el desplaçament de base de delta està fora de límits"
+msgstr "el desplaçament de base de diferències està fora de límits"
-#: builtin/index-pack.c:543
+#: builtin/index-pack.c:544
#, c-format
msgid "unknown object type %d"
msgstr "tipus d'objecte desconegut %d"
-#: builtin/index-pack.c:574
+#: builtin/index-pack.c:575
msgid "cannot pread pack file"
msgstr "no es pot fer pread en el fitxer de paquet"
-#: builtin/index-pack.c:576
+#: builtin/index-pack.c:577
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
@@ -8756,192 +9002,197 @@
msgstr[1] ""
"el final del fitxer de paquet és prematur, manquen %<PRIuMAX> octets"
-#: builtin/index-pack.c:602
+#: builtin/index-pack.c:603
msgid "serious inflate inconsistency"
msgstr "hi ha una inconsistència seriosa d'inflació"
-#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
-#: builtin/index-pack.c:813 builtin/index-pack.c:822
+#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
+#: 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:751 builtin/pack-objects.c:164
-#: builtin/pack-objects.c:256
+#: builtin/index-pack.c:752 builtin/pack-objects.c:164
+#: builtin/pack-objects.c:257
#, c-format
msgid "unable to read %s"
msgstr "no s'ha pogut llegir %s"
-#: builtin/index-pack.c:819
+#: builtin/index-pack.c:814
+#, c-format
+msgid "cannot read existing object info %s"
+msgstr "no es pot llegir la informació de objecte existent %s"
+
+#: builtin/index-pack.c:822
#, c-format
msgid "cannot read existing object %s"
msgstr "no es pot llegir l'objecte existent %s"
-#: builtin/index-pack.c:833
+#: builtin/index-pack.c:836
#, c-format
msgid "invalid blob object %s"
msgstr "objecte de blob no vàlid %s"
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:850
#, c-format
msgid "invalid %s"
msgstr "%s no vàlid"
-#: builtin/index-pack.c:850
+#: builtin/index-pack.c:853
msgid "Error in object"
msgstr "Error en objecte"
-#: builtin/index-pack.c:852
+#: builtin/index-pack.c:855
#, 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:924 builtin/index-pack.c:955
+#: builtin/index-pack.c:927 builtin/index-pack.c:958
msgid "failed to apply delta"
-msgstr "s'ha produït un error en aplicar la delta"
+msgstr "s'ha produït un error en aplicar la diferència"
-#: builtin/index-pack.c:1125
+#: builtin/index-pack.c:1128
msgid "Receiving objects"
msgstr "S'estan rebent objectes"
-#: builtin/index-pack.c:1125
+#: builtin/index-pack.c:1128
msgid "Indexing objects"
msgstr "S'estan indexant objectes"
-#: builtin/index-pack.c:1157
+#: builtin/index-pack.c:1160
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "el paquet és malmès (discordança SHA1)"
-#: builtin/index-pack.c:1162
+#: builtin/index-pack.c:1165
msgid "cannot fstat packfile"
msgstr "no es pot fer fstat en el fitxer de paquet"
-#: builtin/index-pack.c:1165
+#: builtin/index-pack.c:1168
msgid "pack has junk at the end"
msgstr "el paquet té brossa al seu final"
-#: builtin/index-pack.c:1176
+#: builtin/index-pack.c:1179
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "confusió més enllà de la bogeria en parse_pack_objects()"
-#: builtin/index-pack.c:1199
+#: builtin/index-pack.c:1202
msgid "Resolving deltas"
-msgstr "S'estan resolent les deltes"
+msgstr "S'estan resolent les diferències"
-#: builtin/index-pack.c:1210
+#: builtin/index-pack.c:1213
#, c-format
msgid "unable to create thread: %s"
msgstr "no s'ha pogut crear fil: %s"
-#: builtin/index-pack.c:1252
+#: builtin/index-pack.c:1255
msgid "confusion beyond insanity"
msgstr "confusió més enllà de la bogeria"
-#: builtin/index-pack.c:1258
+#: builtin/index-pack.c:1261
#, 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:1270
+#: builtin/index-pack.c:1273
#, 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:1274
+#: builtin/index-pack.c:1277
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
-msgstr[0] "El paquet té %d delta no resolta"
-msgstr[1] "El paquet té %d deltes no resoltes"
+msgstr[0] "El paquet té %d diferència no resolta"
+msgstr[1] "El paquet té %d diferències no resoltes"
-#: builtin/index-pack.c:1298
+#: builtin/index-pack.c:1301
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "no s'ha pogut desinflar l'objecte annexat (%d)"
-#: builtin/index-pack.c:1374
+#: builtin/index-pack.c:1377
#, c-format
msgid "local object %s is corrupt"
msgstr "l'objecte local %s és malmès"
-#: builtin/index-pack.c:1398
+#: builtin/index-pack.c:1403
msgid "error while closing pack file"
msgstr "error en tancar el fitxer de paquet"
-#: builtin/index-pack.c:1411
+#: builtin/index-pack.c:1415
#, c-format
msgid "cannot write keep file '%s'"
msgstr "no es pot escriure el fitxer a retenir '%s'"
-#: builtin/index-pack.c:1419
+#: builtin/index-pack.c:1423
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "no es pot tancar el fitxer escrit a retenir '%s'"
-#: builtin/index-pack.c:1432
+#: builtin/index-pack.c:1433
msgid "cannot store pack file"
msgstr "no es pot emmagatzemar el fitxer de paquet"
-#: builtin/index-pack.c:1443
+#: builtin/index-pack.c:1441
msgid "cannot store index file"
msgstr "no es pot emmagatzemar el fitxer d'índex"
-#: builtin/index-pack.c:1476
+#: builtin/index-pack.c:1479
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "pack.indexversion=%<PRIu32> dolent"
-#: builtin/index-pack.c:1486 builtin/index-pack.c:1683
+#: 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:1544
+#: builtin/index-pack.c:1547
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "No es pot obrir el fitxer de paquet existent '%s'"
-#: builtin/index-pack.c:1546
+#: builtin/index-pack.c:1549
#, 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:1593
+#: builtin/index-pack.c:1596
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
-msgstr[0] "sense delta: %d objecte"
-msgstr[1] "sense delta: %d objectes"
+msgstr[0] "sense diferències: %d objecte"
+msgstr[1] "sense diferències: %d objectes"
-#: builtin/index-pack.c:1600
+#: builtin/index-pack.c:1603
#, 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:1613
+#: builtin/index-pack.c:1616
#, 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:1695 builtin/index-pack.c:1698
-#: builtin/index-pack.c:1714 builtin/index-pack.c:1718
+#: builtin/index-pack.c:1698 builtin/index-pack.c:1701
+#: builtin/index-pack.c:1717 builtin/index-pack.c:1721
#, c-format
msgid "bad %s"
msgstr "%s dolent"
-#: builtin/index-pack.c:1734
+#: builtin/index-pack.c:1737
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin no es pot usar sense --stdin"
-#: builtin/index-pack.c:1736
+#: builtin/index-pack.c:1739
msgid "--stdin requires a git repository"
msgstr "--stdin requereix d'un dipòsit git"
-#: builtin/index-pack.c:1744
+#: builtin/index-pack.c:1747
msgid "--verify with no packfile name given"
msgstr "s'ha donat --verify sense nom de fitxer de paquet"
@@ -9101,104 +9352,104 @@
msgid "git show [<options>] <object>..."
msgstr "git show [<opcions>] <objecte>..."
-#: builtin/log.c:84
+#: builtin/log.c:89
#, c-format
msgid "invalid --decorate option: %s"
msgstr "opció --decorate no vàlida: %s"
-#: builtin/log.c:139
+#: builtin/log.c:144
msgid "suppress diff output"
msgstr "omet la sortida de diferències"
-#: builtin/log.c:140
+#: builtin/log.c:145
msgid "show source"
msgstr "mostra la font"
-#: builtin/log.c:141
+#: builtin/log.c:146
msgid "Use mail map file"
msgstr "Usa el fitxer de mapa de correu"
-#: builtin/log.c:142
+#: builtin/log.c:147
msgid "decorate options"
msgstr "opcions de decoració"
-#: builtin/log.c:145
+#: builtin/log.c:150
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:241
+#: builtin/log.c:246
#, c-format
msgid "Final output: %d %s\n"
msgstr "Sortida final: %d %s\n"
-#: builtin/log.c:486
+#: builtin/log.c:493
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: fitxer dolent"
-#: builtin/log.c:500 builtin/log.c:594
+#: builtin/log.c:507 builtin/log.c:601
#, c-format
msgid "Could not read object %s"
msgstr "No es pot llegir l'objecte %s"
-#: builtin/log.c:618
+#: builtin/log.c:625
#, c-format
msgid "Unknown type: %d"
msgstr "Tipus desconegut: %d"
-#: builtin/log.c:739
+#: builtin/log.c:746
msgid "format.headers without value"
msgstr "format.headers sense valor"
-#: builtin/log.c:839
+#: builtin/log.c:846
msgid "name of output directory is too long"
msgstr "el nom del directori de sortida és massa llarg"
-#: builtin/log.c:854
+#: builtin/log.c:861
#, c-format
msgid "Cannot open patch file %s"
msgstr "No es pot obrir el fitxer de pedaç %s"
-#: builtin/log.c:868
+#: builtin/log.c:875
msgid "Need exactly one range."
msgstr "Cal exactament un rang."
-#: builtin/log.c:878
+#: builtin/log.c:885
msgid "Not a range."
msgstr "No és un rang."
-#: builtin/log.c:984
+#: builtin/log.c:991
msgid "Cover letter needs email format"
msgstr "La carta de presentació necessita el format de correu electrònic"
-#: builtin/log.c:1063
+#: builtin/log.c:1071
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to boig: %s"
-#: builtin/log.c:1091
+#: builtin/log.c:1098
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<opcions>] [<des-de> | <rang-de-revisions>]"
-#: builtin/log.c:1141
+#: builtin/log.c:1148
msgid "Two output directories?"
msgstr "Hi ha dos directoris de sortida?"
-#: builtin/log.c:1248 builtin/log.c:1891 builtin/log.c:1893 builtin/log.c:1905
+#: builtin/log.c:1255 builtin/log.c:1898 builtin/log.c:1900 builtin/log.c:1912
#, c-format
msgid "Unknown commit %s"
msgstr "Comissió desconeguda %s"
-#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:476
+#: builtin/log.c:1265 builtin/notes.c:883 builtin/tag.c:532
#, 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:1263
+#: builtin/log.c:1270
msgid "Could not find exact merge base."
msgstr "No s'ha pogut trobar la base exacta de fusió."
-#: builtin/log.c:1267
+#: builtin/log.c:1274
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"
@@ -9210,215 +9461,215 @@
"seguir una branca remot. O podeu especificar la comissió base manualment\n"
"amb --base=<id-de-comissió-base>."
-#: builtin/log.c:1287
+#: builtin/log.c:1294
msgid "Failed to find exact merge base"
msgstr "S'ha produït un error en trobar la base exacta de fusió."
-#: builtin/log.c:1298
+#: builtin/log.c:1305
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:1302
+#: builtin/log.c:1309
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:1351
+#: builtin/log.c:1358
msgid "cannot get patch id"
msgstr "no es pot obtenir l'id del pedaç"
-#: builtin/log.c:1408
+#: builtin/log.c:1415
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:1411
+#: builtin/log.c:1418
msgid "use [PATCH] even with multiple patches"
msgstr "usa [PATCH] fins i tot amb múltiples pedaços"
-#: builtin/log.c:1415
+#: builtin/log.c:1422
msgid "print patches to standard out"
msgstr "imprimeix els pedaços a la sortida estàndard"
-#: builtin/log.c:1417
+#: builtin/log.c:1424
msgid "generate a cover letter"
msgstr "genera una carta de presentació"
-#: builtin/log.c:1419
+#: builtin/log.c:1426
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:1420
+#: builtin/log.c:1427
msgid "sfx"
msgstr "sufix"
-#: builtin/log.c:1421
+#: builtin/log.c:1428
msgid "use <sfx> instead of '.patch'"
msgstr "usa <sufix> en lloc de '.patch'"
-#: builtin/log.c:1423
+#: builtin/log.c:1430
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:1425
+#: builtin/log.c:1432
msgid "mark the series as Nth re-roll"
msgstr "marca la sèrie com a l'enèsima llançada"
-#: builtin/log.c:1427
+#: builtin/log.c:1434
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "Usa [RFC PATCH] en lloc de [PATCH]"
-#: builtin/log.c:1430
+#: builtin/log.c:1437
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Usa [<prefix>] en lloc de [PATCH]"
-#: builtin/log.c:1433
+#: builtin/log.c:1440
msgid "store resulting files in <dir>"
msgstr "emmagatzema els fitxers resultants a <directori>"
-#: builtin/log.c:1436
+#: builtin/log.c:1443
msgid "don't strip/add [PATCH]"
msgstr "no despullis/afegeixis [PATCH]"
-#: builtin/log.c:1439
+#: builtin/log.c:1446
msgid "don't output binary diffs"
msgstr "no emetis diferències binàries"
-#: builtin/log.c:1441
+#: builtin/log.c:1448
msgid "output all-zero hash in From header"
msgstr "emet un hash de tots zeros en la capçalera From"
-#: builtin/log.c:1443
+#: builtin/log.c:1450
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:1445
+#: builtin/log.c:1452
msgid "show patch format instead of default (patch + stat)"
msgstr ""
"mostra el format de pedaç en lloc del per defecte (pedaç + estadístiques)"
-#: builtin/log.c:1447
+#: builtin/log.c:1454
msgid "Messaging"
msgstr "Missatgeria"
-#: builtin/log.c:1448
+#: builtin/log.c:1455
msgid "header"
msgstr "capçalera"
-#: builtin/log.c:1449
+#: builtin/log.c:1456
msgid "add email header"
msgstr "afegeix una capçalera de correu electrònic"
-#: builtin/log.c:1450 builtin/log.c:1452
+#: builtin/log.c:1457 builtin/log.c:1459
msgid "email"
msgstr "correu electrònic"
-#: builtin/log.c:1450
+#: builtin/log.c:1457
msgid "add To: header"
msgstr "afegeix la capçalera To:"
-#: builtin/log.c:1452
+#: builtin/log.c:1459
msgid "add Cc: header"
msgstr "afegeix la capçalera Cc:"
-#: builtin/log.c:1454
+#: builtin/log.c:1461
msgid "ident"
msgstr "identitat"
-#: builtin/log.c:1455
+#: builtin/log.c:1462
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)"
-#: builtin/log.c:1457
+#: builtin/log.c:1464
msgid "message-id"
msgstr "ID de missatge"
-#: builtin/log.c:1458
+#: builtin/log.c:1465
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:1459 builtin/log.c:1462
+#: builtin/log.c:1466 builtin/log.c:1469
msgid "boundary"
msgstr "límit"
-#: builtin/log.c:1460
+#: builtin/log.c:1467
msgid "attach the patch"
msgstr "ajunta el pedaç"
-#: builtin/log.c:1463
+#: builtin/log.c:1470
msgid "inline the patch"
msgstr "posa el pedaç en el cos"
-#: builtin/log.c:1467
+#: builtin/log.c:1474
msgid "enable message threading, styles: shallow, deep"
msgstr "habilita l'enfilada de missatges, estils: shallow, deep"
-#: builtin/log.c:1469
+#: builtin/log.c:1476
msgid "signature"
msgstr "signatura"
-#: builtin/log.c:1470
+#: builtin/log.c:1477
msgid "add a signature"
msgstr "afegeix una signatura"
-#: builtin/log.c:1471
+#: builtin/log.c:1478
msgid "base-commit"
msgstr "comissió base"
-#: builtin/log.c:1472
+#: builtin/log.c:1479
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:1474
+#: builtin/log.c:1481
msgid "add a signature from a file"
msgstr "afegeix una signatura des d'un fitxer"
-#: builtin/log.c:1475
+#: builtin/log.c:1482
msgid "don't print the patch filenames"
msgstr "no imprimeixis els noms de fitxer del pedaç"
-#: builtin/log.c:1565
+#: builtin/log.c:1572
msgid "-n and -k are mutually exclusive."
msgstr "-n i -k són mutualment exclusius."
-#: builtin/log.c:1567
+#: builtin/log.c:1574
msgid "--subject-prefix/--rfc and -k are mutually exclusive."
msgstr "--subject-prefix/--rfc i -k són mutualment exclusius."
-#: builtin/log.c:1575
+#: builtin/log.c:1582
msgid "--name-only does not make sense"
msgstr "--name-only no té sentit"
-#: builtin/log.c:1577
+#: builtin/log.c:1584
msgid "--name-status does not make sense"
msgstr "--name-status no té sentit"
-#: builtin/log.c:1579
+#: builtin/log.c:1586
msgid "--check does not make sense"
msgstr "--check no té sentit"
-#: builtin/log.c:1609
+#: builtin/log.c:1616
msgid "standard output, or directory, which one?"
msgstr "sortida estàndard o directori, quin dels dos?"
-#: builtin/log.c:1611
+#: builtin/log.c:1618
#, c-format
msgid "Could not create directory '%s'"
msgstr "No s'ha pogut crear el directori '%s'"
-#: builtin/log.c:1705
+#: builtin/log.c:1712
#, c-format
msgid "unable to read signature file '%s'"
msgstr "no s'ha pogut llegir el fitxer de signatura '%s'"
-#: builtin/log.c:1777
+#: builtin/log.c:1784
msgid "Failed to create output files"
msgstr "S'ha produït un error en crear els fitxers de sortida"
-#: builtin/log.c:1826
+#: builtin/log.c:1833
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<font> [<cap> [<límit>]]]"
-#: builtin/log.c:1880
+#: builtin/log.c:1887
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -9426,105 +9677,105 @@
"No s'ha pogut trobar una branca remota seguida. Si us plau, especifiqueu "
"<font> manualment.\n"
-#: builtin/ls-files.c:460
+#: builtin/ls-files.c:468
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<opcions>] [<fitxer>...]"
-#: builtin/ls-files.c:509
+#: builtin/ls-files.c:517
msgid "identify the file status with tags"
msgstr "identifica l'estat de fitxer amb etiquetes"
-#: builtin/ls-files.c:511
+#: builtin/ls-files.c:519
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "usa lletres minúscules per als fitxers 'assume unchanged'"
-#: builtin/ls-files.c:513
+#: 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)"
-#: builtin/ls-files.c:515
+#: builtin/ls-files.c:523
msgid "show deleted files in the output"
msgstr "mostra en la sortida els fitxers suprimits"
-#: builtin/ls-files.c:517
+#: builtin/ls-files.c:525
msgid "show modified files in the output"
msgstr "mostra en la sortida els fitxers modificats"
-#: builtin/ls-files.c:519
+#: builtin/ls-files.c:527
msgid "show other files in the output"
msgstr "mostra en la sortida els altres fitxers"
-#: builtin/ls-files.c:521
+#: builtin/ls-files.c:529
msgid "show ignored files in the output"
msgstr "mostra en la sortida els fitxers ignorats"
-#: builtin/ls-files.c:524
+#: builtin/ls-files.c:532
msgid "show staged contents' object name in the output"
msgstr "mostra en la sortida el nom d'objecte dels continguts «stage»"
-#: builtin/ls-files.c:526
+#: builtin/ls-files.c:534
msgid "show files on the filesystem that need to be removed"
msgstr "mostra els fitxers en el sistema de fitxers que s'han d'eliminar"
-#: builtin/ls-files.c:528
+#: builtin/ls-files.c:536
msgid "show 'other' directories' names only"
msgstr "mostra només els noms dels directoris 'other'"
-#: builtin/ls-files.c:530
+#: builtin/ls-files.c:538
msgid "show line endings of files"
msgstr "mostra els terminadors de línia dels fitxers"
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:540
msgid "don't show empty directories"
msgstr "no mostris els directoris buits"
-#: builtin/ls-files.c:535
+#: builtin/ls-files.c:543
msgid "show unmerged files in the output"
msgstr "mostra en la sortida els fitxers sense fusionar"
-#: builtin/ls-files.c:537
+#: builtin/ls-files.c:545
msgid "show resolve-undo information"
msgstr "mostra la informació de resolució de desfet"
-#: builtin/ls-files.c:539
+#: builtin/ls-files.c:547
msgid "skip files matching pattern"
msgstr "omet els fitxers coincidents amb el patró"
-#: builtin/ls-files.c:542
+#: builtin/ls-files.c:550
msgid "exclude patterns are read from <file>"
msgstr "els patrons d'exclusió es llegeixen de <fitxer>"
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:553
msgid "read additional per-directory exclude patterns in <file>"
msgstr "llegeix els patrons addicionals d'exclusió per directori en <fitxer>"
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:555
msgid "add the standard git exclusions"
msgstr "afegeix les exclusions estàndards de git"
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:558
msgid "make the output relative to the project top directory"
msgstr "fes que la sortida sigui relativa al directori superior del projecte"
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:561
msgid "recurse through submodules"
msgstr "inclou recursivament als submòduls"
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:563
msgid "if any <file> is not in the index, treat this as an error"
msgstr "si qualsevol <fitxer> no és en l'índex, tracta-ho com a error"
-#: builtin/ls-files.c:556
+#: builtin/ls-files.c:564
msgid "tree-ish"
msgstr "arbre"
-#: builtin/ls-files.c:557
+#: 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"
-#: builtin/ls-files.c:559
+#: builtin/ls-files.c:567
msgid "show debugging data"
msgstr "mostra les dades de depuració"
@@ -9539,39 +9790,39 @@
" [--exit-code] [--get-url] [--symref]\n"
" [<dipòsit> [<referències>...]]"
-#: builtin/ls-remote.c:50
+#: builtin/ls-remote.c:52
msgid "do not print remote URL"
msgstr "no imprimeixis l'URL remot"
-#: builtin/ls-remote.c:51 builtin/ls-remote.c:53
+#: builtin/ls-remote.c:53 builtin/ls-remote.c:55
msgid "exec"
msgstr "executable"
-#: builtin/ls-remote.c:52 builtin/ls-remote.c:54
+#: builtin/ls-remote.c:54 builtin/ls-remote.c:56
msgid "path of git-upload-pack on the remote host"
msgstr "camí a git-upload-pack en la màquina remota"
-#: builtin/ls-remote.c:56
+#: builtin/ls-remote.c:58
msgid "limit to tags"
msgstr "limita a etiquetes"
-#: builtin/ls-remote.c:57
+#: builtin/ls-remote.c:59
msgid "limit to heads"
msgstr "limita a caps"
-#: builtin/ls-remote.c:58
+#: builtin/ls-remote.c:60
msgid "do not show peeled tags"
msgstr "no mostris les etiquetes pelades"
-#: builtin/ls-remote.c:60
+#: builtin/ls-remote.c:62
msgid "take url.<base>.insteadOf into account"
msgstr "tingues en compte url.<base>.insteadOf"
-#: builtin/ls-remote.c:62
+#: builtin/ls-remote.c:64
msgid "exit with exit code 2 if no matching refs are found"
msgstr "surt amb codi de sortida 2 si no es troba cap referència coincident"
-#: builtin/ls-remote.c:64
+#: builtin/ls-remote.c:66
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"
@@ -9617,148 +9868,144 @@
msgstr "git merge [<opcions>] [<comissió>...]"
#: builtin/merge.c:47
-msgid "git merge [<options>] <msg> HEAD <commit>"
-msgstr "git merge [<opcions>] <missatge> HEAD <comissió>"
-
-#: builtin/merge.c:48
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:49
+#: builtin/merge.c:48
msgid "git merge --continue"
msgstr "git merge --continue"
-#: builtin/merge.c:104
+#: builtin/merge.c:103
msgid "switch `m' requires a value"
msgstr "l'opció `m' requereix un valor"
-#: builtin/merge.c:141
+#: builtin/merge.c:140
#, 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:142
+#: builtin/merge.c:141
#, c-format
msgid "Available strategies are:"
msgstr "Les estratègies disponibles són:"
-#: builtin/merge.c:147
+#: builtin/merge.c:146
#, c-format
msgid "Available custom strategies are:"
msgstr "Les estratègies personalitzades disponibles són:"
-#: builtin/merge.c:197 builtin/pull.c:127
+#: builtin/merge.c:196 builtin/pull.c:127
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:200 builtin/pull.c:130
+#: builtin/merge.c:199 builtin/pull.c:130
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:201 builtin/pull.c:133
+#: builtin/merge.c:200 builtin/pull.c:133
msgid "(synonym to --stat)"
msgstr "(sinònim de --stat)"
-#: builtin/merge.c:203 builtin/pull.c:136
+#: builtin/merge.c:202 builtin/pull.c:136
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ó"
-#: builtin/merge.c:206 builtin/pull.c:139
+#: builtin/merge.c:205 builtin/pull.c:139
msgid "create a single commit instead of doing a merge"
msgstr "crea una única comissió en lloc de fusionar"
-#: builtin/merge.c:208 builtin/pull.c:142
+#: builtin/merge.c:207 builtin/pull.c:142
msgid "perform a commit if the merge succeeds (default)"
msgstr "realitza una comissió si la fusió té èxit (per defecte)"
-#: builtin/merge.c:210 builtin/pull.c:145
+#: builtin/merge.c:209 builtin/pull.c:145
msgid "edit message before committing"
msgstr "edita el missatge abans de cometre"
-#: builtin/merge.c:211
+#: builtin/merge.c:210
msgid "allow fast-forward (default)"
msgstr "permet l'avanç ràpid (per defecte)"
-#: builtin/merge.c:213 builtin/pull.c:151
+#: builtin/merge.c:212 builtin/pull.c:151
msgid "abort if fast-forward is not possible"
msgstr "avorta si l'avanç ràpid no és possible"
-#: builtin/merge.c:217 builtin/pull.c:154
+#: builtin/merge.c:216 builtin/pull.c:154
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:218 builtin/notes.c:774 builtin/pull.c:158
-#: builtin/revert.c:89
+#: builtin/merge.c:217 builtin/notes.c:773 builtin/pull.c:158
+#: builtin/revert.c:108
msgid "strategy"
msgstr "estratègia"
-#: builtin/merge.c:219 builtin/pull.c:159
+#: builtin/merge.c:218 builtin/pull.c:159
msgid "merge strategy to use"
msgstr "estratègia de fusió a usar"
-#: builtin/merge.c:220 builtin/pull.c:162
+#: builtin/merge.c:219 builtin/pull.c:162
msgid "option=value"
msgstr "opció=valor"
-#: builtin/merge.c:221 builtin/pull.c:163
+#: builtin/merge.c:220 builtin/pull.c:163
msgid "option for selected merge strategy"
msgstr "opció per a l'estratègia de fusió seleccionada"
-#: builtin/merge.c:223
+#: builtin/merge.c:222
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:227
+#: builtin/merge.c:226
msgid "abort the current in-progress merge"
msgstr "avorta la fusió en curs actual"
-#: builtin/merge.c:229
+#: builtin/merge.c:228
msgid "continue the current in-progress merge"
msgstr "continua la fusió en curs actual"
-#: builtin/merge.c:231 builtin/pull.c:170
+#: builtin/merge.c:230 builtin/pull.c:170
msgid "allow merging unrelated histories"
msgstr "permet fusionar històries no relacionades"
-#: builtin/merge.c:259
+#: builtin/merge.c:258
msgid "could not run stash."
msgstr "no s'ha pogut executar stash."
-#: builtin/merge.c:264
+#: builtin/merge.c:263
msgid "stash failed"
msgstr "l'emmagatzemament ha fallat"
-#: builtin/merge.c:269
+#: builtin/merge.c:268
#, c-format
msgid "not a valid object: %s"
msgstr "no és un objecte vàlid: %s"
-#: builtin/merge.c:288 builtin/merge.c:305
+#: builtin/merge.c:287 builtin/merge.c:304
msgid "read-tree failed"
msgstr "read-tree ha fallat"
-#: builtin/merge.c:335
+#: builtin/merge.c:334
msgid " (nothing to squash)"
msgstr " (res a fer «squash»)"
-#: builtin/merge.c:346
+#: builtin/merge.c:345
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Comissió «squash» -- no s'està actualitzant HEAD\n"
-#: builtin/merge.c:396
+#: builtin/merge.c:395
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Cap missatge de fusió -- no s'està actualitzant HEAD\n"
-#: builtin/merge.c:447
+#: builtin/merge.c:446
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' no assenyala una comissió"
-#: builtin/merge.c:537
+#: builtin/merge.c:536
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Cadena branch.%s.mergeoptions dolenta: %s"
@@ -9820,64 +10067,59 @@
"La fusió automàtica ha fallat; arregleu els conflictes i després cometeu el "
"resultat.\n"
-#: builtin/merge.c:867
-#, c-format
-msgid "'%s' is not a commit"
-msgstr "'%s' no és una comissió"
-
-#: builtin/merge.c:908
+#: builtin/merge.c:890
msgid "No current branch."
msgstr "No hi ha cap branca actual."
-#: builtin/merge.c:910
+#: builtin/merge.c:892
msgid "No remote for the current branch."
msgstr "No hi ha cap remot per a la branca actual."
-#: builtin/merge.c:912
+#: builtin/merge.c:894
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:917
+#: builtin/merge.c:899
#, 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:964
+#: builtin/merge.c:946
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Valor dolent '%s' en l'entorn '%s'"
-#: builtin/merge.c:1038
+#: builtin/merge.c:1020
#, c-format
msgid "could not close '%s'"
msgstr "no s'ha pogut tancar '%s'"
-#: builtin/merge.c:1065
+#: builtin/merge.c:1047
#, c-format
msgid "not something we can merge in %s: %s"
-msgstr "no és cosa que puguem fusionar en %s: %s"
+msgstr "no és quelcom que puguem fusionar en %s: %s"
-#: builtin/merge.c:1099
+#: builtin/merge.c:1081
msgid "not something we can merge"
-msgstr "no és cosa que puguem fusionar"
+msgstr "no és quelcom que puguem fusionar"
-#: builtin/merge.c:1167
+#: builtin/merge.c:1146
msgid "--abort expects no arguments"
msgstr "--abort no accepta paràmetres"
-#: builtin/merge.c:1171
+#: builtin/merge.c:1150
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "No hi ha fusió a avortar (manca MERGE_HEAD)."
-#: builtin/merge.c:1183
+#: builtin/merge.c:1162
msgid "--continue expects no arguments"
msgstr "--continue no accepta paràmetres"
-#: builtin/merge.c:1187
+#: builtin/merge.c:1166
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "No hi ha fusió en progrés (manca MERGE_HEAD)."
-#: builtin/merge.c:1203
+#: builtin/merge.c:1182
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -9885,7 +10127,7 @@
"No heu conclòs la vostra fusió (MERGE_HEAD existeix).\n"
"Si us plau, cometeu els vostres canvis abans de fusionar."
-#: builtin/merge.c:1210
+#: builtin/merge.c:1189
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -9893,114 +10135,114 @@
"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:1213
+#: builtin/merge.c:1192
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:1222
+#: builtin/merge.c:1201
msgid "You cannot combine --squash with --no-ff."
msgstr "No podeu combinar --squash amb --no-ff."
-#: builtin/merge.c:1230
+#: builtin/merge.c:1209
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
"No hi ha una comissió especificada i merge.defaultToUpstream no està "
"establert."
-#: builtin/merge.c:1247
+#: builtin/merge.c:1226
msgid "Squash commit into empty head not supported yet"
msgstr "Una comissió «squash» a un HEAD buit encara no es permet"
-#: builtin/merge.c:1249
+#: builtin/merge.c:1228
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:1254
+#: builtin/merge.c:1233
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - no és una cosa que puguem fusionar"
-#: builtin/merge.c:1256
+#: builtin/merge.c:1235
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:1312
+#: builtin/merge.c:1269
#, 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:1315
+#: builtin/merge.c:1272
#, 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:1318
+#: builtin/merge.c:1275
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "La comissió %s no té signatura GPG."
-#: builtin/merge.c:1321
+#: builtin/merge.c:1278
#, 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:1383
+#: builtin/merge.c:1340
msgid "refusing to merge unrelated histories"
msgstr "s'està refusant fusionar històries no relacionades"
-#: builtin/merge.c:1392
+#: builtin/merge.c:1349
msgid "Already up-to-date."
msgstr "Ja està al dia."
-#: builtin/merge.c:1402
+#: builtin/merge.c:1359
#, c-format
msgid "Updating %s..%s\n"
msgstr "S'estan actualitzant %s..%s\n"
-#: builtin/merge.c:1443
+#: builtin/merge.c:1400
#, 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:1450
+#: builtin/merge.c:1407
#, c-format
msgid "Nope.\n"
msgstr "No.\n"
-#: builtin/merge.c:1475
+#: builtin/merge.c:1432
msgid "Already up-to-date. Yeeah!"
msgstr "Ja està al dia. Estupend!"
-#: builtin/merge.c:1481
+#: builtin/merge.c:1438
msgid "Not possible to fast-forward, aborting."
msgstr "No és possible avançar ràpidament, s'està avortant."
-#: builtin/merge.c:1504 builtin/merge.c:1583
+#: builtin/merge.c:1461 builtin/merge.c:1540
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "S'està rebobinant l'arbre a la pristina...\n"
-#: builtin/merge.c:1508
+#: builtin/merge.c:1465
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "S'està intentant l'estratègia de fusió %s...\n"
-#: builtin/merge.c:1574
+#: builtin/merge.c:1531
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Cap estratègia de fusió ha gestionat la fusió.\n"
-#: builtin/merge.c:1576
+#: builtin/merge.c:1533
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "L'estratègia de fusió %s ha fallat.\n"
-#: builtin/merge.c:1585
+#: builtin/merge.c:1542
#, 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:1597
+#: builtin/merge.c:1554
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -10056,35 +10298,35 @@
"git merge-file [<opcions>] [-L <nom1> [-L <original> [-L <nom2>]]] <fitxer1> "
"<fitxer-original> <fitxer2>"
-#: builtin/merge-file.c:33
+#: builtin/merge-file.c:32
msgid "send results to standard output"
msgstr "envia els resultats a la sortida estàndard"
-#: builtin/merge-file.c:34
+#: builtin/merge-file.c:33
msgid "use a diff3 based merge"
msgstr "usa una fusió basada en diff3"
-#: builtin/merge-file.c:35
+#: builtin/merge-file.c:34
msgid "for conflicts, use our version"
msgstr "en conflictes, usa la nostra versió"
-#: builtin/merge-file.c:37
+#: builtin/merge-file.c:36
msgid "for conflicts, use their version"
msgstr "en conflictes, usa la seva versió"
-#: builtin/merge-file.c:39
+#: builtin/merge-file.c:38
msgid "for conflicts, use a union version"
msgstr "en conflictes, usa una versió d'unió"
-#: builtin/merge-file.c:42
+#: builtin/merge-file.c:41
msgid "for conflicts, use this marker size"
msgstr "en conflictes, usa aquesta mida de marcador"
-#: builtin/merge-file.c:43
+#: builtin/merge-file.c:42
msgid "do not warn about conflicts"
msgstr "no avisis de conflictes"
-#: builtin/merge-file.c:45
+#: builtin/merge-file.c:44
msgid "set labels for file1/orig-file/file2"
msgstr "estableix les etiquetes per a fitxer1/fitxer-original/fitxer2"
@@ -10229,43 +10471,47 @@
msgid "renaming '%s' failed"
msgstr "el canvi del nom de '%s' ha fallat"
-#: builtin/name-rev.c:257
+#: builtin/name-rev.c:289
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<opcions>] <comissió>..."
-#: builtin/name-rev.c:258
+#: builtin/name-rev.c:290
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<opcions>] --all"
-#: builtin/name-rev.c:259
+#: builtin/name-rev.c:291
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<opcions>] --stdin"
-#: builtin/name-rev.c:311
+#: builtin/name-rev.c:346
msgid "print only names (no SHA-1)"
msgstr "imprimeix només els noms (sense SHA-1)"
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:347
msgid "only use tags to name the commits"
msgstr "només usa les etiquetes per a anomenar les comissions"
-#: builtin/name-rev.c:314
+#: builtin/name-rev.c:349
msgid "only use refs matching <pattern>"
msgstr "només usa les referències que coincideixin amb <patró>"
-#: builtin/name-rev.c:316
+#: builtin/name-rev.c:351
+msgid "ignore refs matching <pattern>"
+msgstr "ignora les referències que coincideixin amb <patró>"
+
+#: builtin/name-rev.c:353
msgid "list all commits reachable from all refs"
msgstr "llista totes les comissions abastables de totes les referències"
-#: builtin/name-rev.c:317
+#: builtin/name-rev.c:354
msgid "read from stdin"
msgstr "llegeix d'stdin"
-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:355
msgid "allow to print `undefined` names (default)"
msgstr "permet imprimir els noms `undefined` (per defecte)"
-#: builtin/name-rev.c:324
+#: builtin/name-rev.c:361
msgid "dereference tags in the input (internal use)"
msgstr "dereferencia les etiquetes en l'entrada (ús intern)"
@@ -10340,7 +10586,7 @@
#: builtin/notes.c:51
msgid "git notes copy [<options>] <from-object> <to-object>"
-msgstr "git notes copy [<options>] <d'objecte> <a-objecte>"
+msgstr "git notes copy [<opcions>] <d'objecte> <a-objecte>"
#: builtin/notes.c:52
msgid "git notes copy --stdin [<from-object> <to-object>]..."
@@ -10415,19 +10661,19 @@
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:460
+#: builtin/notes.c:233 builtin/tag.c:516
#, c-format
msgid "cannot read '%s'"
msgstr "no es pot llegir '%s'"
-#: builtin/notes.c:235 builtin/tag.c:463
+#: builtin/notes.c:235 builtin/tag.c:519
#, 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:659
+#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:658
#, 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."
@@ -10460,12 +10706,12 @@
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:652
-#: builtin/notes.c:802 builtin/notes.c:949 builtin/notes.c:970
+#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:651
+#: builtin/notes.c:801 builtin/notes.c:948 builtin/notes.c:969
msgid "too many parameters"
msgstr "massa paràmetres"
-#: builtin/notes.c:378 builtin/notes.c:665
+#: builtin/notes.c:378 builtin/notes.c:664
#, c-format
msgid "no note found for object %s."
msgstr "no s'ha trobat cap nota per a l'objecte %s."
@@ -10508,7 +10754,7 @@
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:624 builtin/notes.c:889
+#: builtin/notes.c:463 builtin/notes.c:623 builtin/notes.c:888
#, c-format
msgid "Removing note for object %s\n"
msgstr "S'està eliminant la nota de l'objecte %s\n"
@@ -10549,53 +10795,53 @@
"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:685
+#: builtin/notes.c:684
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:687
+#: builtin/notes.c:686
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:689
+#: builtin/notes.c:688
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'"
-#: builtin/notes.c:709
+#: builtin/notes.c:708
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:711
+#: builtin/notes.c:710
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "no s'ha pogut trobar cap comissió de NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:713
+#: builtin/notes.c:712
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "no s'ha pogut analitzar la comissió de NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:726
+#: builtin/notes.c:725
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "s'ha produït un error en resoldre NOTES_MERGE_REF"
-#: builtin/notes.c:729
+#: builtin/notes.c:728
msgid "failed to finalize notes merge"
msgstr "s'ha produït un error en finalitzar la fusió de notes"
-#: builtin/notes.c:755
+#: builtin/notes.c:754
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "estratègia de fusió de notes desconeguda %s"
-#: builtin/notes.c:771
+#: builtin/notes.c:770
msgid "General options"
msgstr "Opcions generals"
-#: builtin/notes.c:773
+#: builtin/notes.c:772
msgid "Merge options"
msgstr "Opcions de fusió"
-#: builtin/notes.c:775
+#: builtin/notes.c:774
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -10603,48 +10849,48 @@
"resol els conflictes de nota usant l'estratègia donada (manual/ours/theirs/"
"union/cat_sort_uniq)"
-#: builtin/notes.c:777
+#: builtin/notes.c:776
msgid "Committing unmerged notes"
msgstr "S'estan cometent les notes sense fusionar"
-#: builtin/notes.c:779
+#: builtin/notes.c:778
msgid "finalize notes merge by committing unmerged notes"
msgstr "finalitza la fusió de notes cometent les notes sense fusionar"
-#: builtin/notes.c:781
+#: builtin/notes.c:780
msgid "Aborting notes merge resolution"
msgstr "S'està avortant la resolució de fusió de notes"
-#: builtin/notes.c:783
+#: builtin/notes.c:782
msgid "abort notes merge"
msgstr "avorta la fusió de notes"
-#: builtin/notes.c:794
+#: builtin/notes.c:793
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "no es pot combinar --commit, --abort i -s/--strategy"
-#: builtin/notes.c:799
+#: builtin/notes.c:798
msgid "must specify a notes ref to merge"
msgstr "cal especificar una referència de notes a fusionar"
-#: builtin/notes.c:823
+#: builtin/notes.c:822
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "-s/--strategy desconeguda: %s"
-#: builtin/notes.c:860
+#: builtin/notes.c:859
#, 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:863
+#: builtin/notes.c:862
#, 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)"
-#: builtin/notes.c:865
+#: builtin/notes.c:864
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -10655,36 +10901,36 @@
"cometeu el resultat amb 'git notes merge --commit', o avorteu la fusió amb "
"'git notes merge --abort'.\n"
-#: builtin/notes.c:887
+#: builtin/notes.c:886
#, c-format
msgid "Object %s has no note\n"
msgstr "L'objecte %s no té cap nota\n"
-#: builtin/notes.c:899
+#: builtin/notes.c:898
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:902
+#: builtin/notes.c:901
msgid "read object names from the standard input"
msgstr "llegeix els noms d'objecte des de l'entrada estàndard"
-#: builtin/notes.c:940 builtin/prune.c:105 builtin/worktree.c:127
+#: builtin/notes.c:939 builtin/prune.c:105 builtin/worktree.c:127
msgid "do not remove, show only"
msgstr "no eliminis, només mostra"
-#: builtin/notes.c:941
+#: builtin/notes.c:940
msgid "report pruned notes"
msgstr "informa de notes podades"
-#: builtin/notes.c:983
+#: builtin/notes.c:982
msgid "notes-ref"
msgstr "referència de notes"
-#: builtin/notes.c:984
+#: builtin/notes.c:983
msgid "use notes from <notes-ref>"
msgstr "usa les notes de <referència-de-notes>"
-#: builtin/notes.c:1019
+#: builtin/notes.c:1018
#, c-format
msgid "unknown subcommand: %s"
msgstr "subordre desconeguda: %s"
@@ -10708,182 +10954,183 @@
msgid "deflate error (%d)"
msgstr "error de deflació (%d)"
-#: builtin/pack-objects.c:766
+#: builtin/pack-objects.c:770
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"
-#: builtin/pack-objects.c:779
+#: builtin/pack-objects.c:783
msgid "Writing objects"
msgstr "S'estan escrivint els objectes"
-#: builtin/pack-objects.c:1068
+#: builtin/pack-objects.c:1063
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"
-#: builtin/pack-objects.c:2344
+#: builtin/pack-objects.c:2426
msgid "Compressing objects"
msgstr "S'estan comprimint objectes"
-#: builtin/pack-objects.c:2747
+#: builtin/pack-objects.c:2829
#, c-format
msgid "unsupported index version %s"
msgstr "versió d'índex no compatible %s"
-#: builtin/pack-objects.c:2751
+#: builtin/pack-objects.c:2833
#, c-format
msgid "bad index version '%s'"
msgstr "versió d'índex dolenta '%s'"
-#: builtin/pack-objects.c:2781
+#: builtin/pack-objects.c:2863
msgid "do not show progress meter"
msgstr "no mostris l'indicador de progrés"
-#: builtin/pack-objects.c:2783
+#: builtin/pack-objects.c:2865
msgid "show progress meter"
msgstr "mostra l'indicador de progrés"
-#: builtin/pack-objects.c:2785
+#: builtin/pack-objects.c:2867
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:2788
+#: builtin/pack-objects.c:2870
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:2789
+#: builtin/pack-objects.c:2871
msgid "version[,offset]"
msgstr "versió[,desplaçament]"
-#: builtin/pack-objects.c:2790
+#: builtin/pack-objects.c:2872
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"
-#: builtin/pack-objects.c:2793
+#: builtin/pack-objects.c:2875
msgid "maximum size of each output pack file"
msgstr "mida màxima de cada fitxer de paquet de sortida"
-#: builtin/pack-objects.c:2795
+#: builtin/pack-objects.c:2877
msgid "ignore borrowed objects from alternate object store"
msgstr ""
"ignora els objectes prestats d'un emmagatzemament d'objectes alternatiu"
-#: builtin/pack-objects.c:2797
+#: builtin/pack-objects.c:2879
msgid "ignore packed objects"
msgstr "ignora els objectes empaquetats"
-#: builtin/pack-objects.c:2799
+#: builtin/pack-objects.c:2881
msgid "limit pack window by objects"
msgstr "limita la finestra d'empaquetament per objectes"
-#: builtin/pack-objects.c:2801
+#: builtin/pack-objects.c:2883
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"
-#: builtin/pack-objects.c:2803
+#: builtin/pack-objects.c:2885
msgid "maximum length of delta chain allowed in the resulting pack"
-msgstr "longitud màxima de la cadena de deltes permesa en el paquet resultant"
+msgstr ""
+"longitud màxima de la cadena de diferències permesa en el paquet resultant"
-#: builtin/pack-objects.c:2805
+#: builtin/pack-objects.c:2887
msgid "reuse existing deltas"
-msgstr "reusa les deltes existents"
+msgstr "reusa les diferències existents"
-#: builtin/pack-objects.c:2807
+#: builtin/pack-objects.c:2889
msgid "reuse existing objects"
msgstr "reusa els objectes existents"
-#: builtin/pack-objects.c:2809
+#: builtin/pack-objects.c:2891
msgid "use OFS_DELTA objects"
msgstr "usa objectes OFS_DELTA"
-#: builtin/pack-objects.c:2811
+#: builtin/pack-objects.c:2893
msgid "use threads when searching for best delta matches"
-msgstr "usa fils en cercar les millores coincidències de delta"
+msgstr "usa fils en cercar les millores coincidències de diferències"
-#: builtin/pack-objects.c:2813
+#: builtin/pack-objects.c:2895
msgid "do not create an empty pack output"
msgstr "no creïs una emissió de paquet buida"
-#: builtin/pack-objects.c:2815
+#: builtin/pack-objects.c:2897
msgid "read revision arguments from standard input"
msgstr "llegeix els paràmetres de revisió des de l'entrada estàndard"
-#: builtin/pack-objects.c:2817
+#: builtin/pack-objects.c:2899
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:2820
+#: builtin/pack-objects.c:2902
msgid "include objects reachable from any reference"
msgstr "inclou els objectes abastables de qualsevol referència"
-#: builtin/pack-objects.c:2823
+#: builtin/pack-objects.c:2905
msgid "include objects referred by reflog entries"
msgstr ""
"inclou els objectes als quals facin referència les entrades del registre de "
"referències"
-#: builtin/pack-objects.c:2826
+#: builtin/pack-objects.c:2908
msgid "include objects referred to by the index"
msgstr "inclou els objectes als quals faci referència l'índex"
-#: builtin/pack-objects.c:2829
+#: builtin/pack-objects.c:2911
msgid "output pack to stdout"
msgstr "emet el paquet a stdout"
-#: builtin/pack-objects.c:2831
+#: builtin/pack-objects.c:2913
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"
-#: builtin/pack-objects.c:2833
+#: builtin/pack-objects.c:2915
msgid "keep unreachable objects"
msgstr "retén els objectes inabastables"
-#: builtin/pack-objects.c:2835
+#: builtin/pack-objects.c:2917
msgid "pack loose unreachable objects"
msgstr "empaqueta els objectes inabastables solts"
-#: builtin/pack-objects.c:2837
+#: builtin/pack-objects.c:2919
msgid "unpack unreachable objects newer than <time>"
msgstr "desempaqueta els objectes inabastables més nous que <hora>"
-#: builtin/pack-objects.c:2840
+#: builtin/pack-objects.c:2922
msgid "create thin packs"
msgstr "crea paquets prims"
-#: builtin/pack-objects.c:2842
+#: builtin/pack-objects.c:2924
msgid "create packs suitable for shallow fetches"
msgstr "crea paquets adequats per a les obtencions superficials"
-#: builtin/pack-objects.c:2844
+#: builtin/pack-objects.c:2926
msgid "ignore packs that have companion .keep file"
msgstr "ignora els paquets que tinguin un fitxer .keep corresponent"
-#: builtin/pack-objects.c:2846
+#: builtin/pack-objects.c:2928
msgid "pack compression level"
msgstr "nivell de compressió de paquet"
-#: builtin/pack-objects.c:2848
+#: builtin/pack-objects.c:2930
msgid "do not hide commits by grafts"
msgstr "no amaguis les comissions per empelt"
-#: builtin/pack-objects.c:2850
+#: builtin/pack-objects.c:2932
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"
-#: builtin/pack-objects.c:2852
+#: builtin/pack-objects.c:2934
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:2979
+#: builtin/pack-objects.c:3061
msgid "Counting objects"
msgstr "S'estan comptant els objectes"
@@ -10940,7 +11187,7 @@
msgid "incorporate changes by rebasing rather than merging"
msgstr "incorpora els canvis per rebasar en lloc de fusionar"
-#: builtin/pull.c:148 builtin/revert.c:101
+#: builtin/pull.c:148 builtin/rebase--helper.c:18 builtin/revert.c:120
msgid "allow fast-forward"
msgstr "permet l'avanç ràpid"
@@ -11015,7 +11262,7 @@
msgid "<remote>"
msgstr "<remot>"
-#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:455
+#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:456
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<branca>"
@@ -11230,7 +11477,7 @@
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
"S'han rebutjat les actualitzacions perquè el remot conté treball\n"
-"que no teniu localment. Això usualment és causat per un altre dipòsit\n"
+"que no teniu localment. Això acostumar a ser causat per un altre dipòsit\n"
"que ha pujat a la mateixa referència. Pot ser que primer vulgueu\n"
"integrar els canvis remots (per exemple, 'git pull ...') abans de\n"
"pujar de nou.\n"
@@ -11313,11 +11560,11 @@
msgid "repository"
msgstr "dipòsit"
-#: builtin/push.c:519 builtin/send-pack.c:161
+#: builtin/push.c:519 builtin/send-pack.c:162
msgid "push all refs"
msgstr "puja totes les referències"
-#: builtin/push.c:520 builtin/send-pack.c:163
+#: builtin/push.c:520 builtin/send-pack.c:164
msgid "mirror all refs"
msgstr "reflecteix totes les referències"
@@ -11329,15 +11576,15 @@
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:164
+#: builtin/push.c:526 builtin/send-pack.c:165
msgid "force updates"
msgstr "força les actualitzacions"
-#: builtin/push.c:528 builtin/send-pack.c:175
+#: builtin/push.c:528 builtin/send-pack.c:179
msgid "refname>:<expect"
msgstr "nom-de-referència>:<esperat"
-#: builtin/push.c:529 builtin/send-pack.c:176
+#: builtin/push.c:529 builtin/send-pack.c:180
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"
@@ -11345,12 +11592,12 @@
msgid "control recursive pushing of submodules"
msgstr "controla la pujada recursiva dels submòduls"
-#: builtin/push.c:534 builtin/send-pack.c:169
+#: builtin/push.c:534 builtin/send-pack.c:173
msgid "use thin pack"
msgstr "usa el paquet prim"
-#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:158
-#: builtin/send-pack.c:159
+#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:159
+#: builtin/send-pack.c:160
msgid "receive pack program"
msgstr "programa que rep els paquets"
@@ -11370,19 +11617,19 @@
msgid "push missing but relevant tags"
msgstr "puja les etiquetes absents però rellevants"
-#: builtin/push.c:546 builtin/send-pack.c:166
+#: builtin/push.c:546 builtin/send-pack.c:167
msgid "GPG sign the push"
msgstr "signa la pujada amb GPG"
-#: builtin/push.c:548 builtin/send-pack.c:170
+#: builtin/push.c:548 builtin/send-pack.c:174
msgid "request atomic transaction on remote side"
msgstr "demana una transacció atòmica al costat remot"
-#: builtin/push.c:549
+#: builtin/push.c:549 builtin/send-pack.c:170
msgid "server-specific"
msgstr "específic al servidor"
-#: builtin/push.c:549
+#: builtin/push.c:549 builtin/send-pack.c:171
msgid "option to transmit"
msgstr "opció a transmetre"
@@ -11398,7 +11645,7 @@
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:37
+#: builtin/read-tree.c:40
msgid ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
@@ -11408,75 +11655,87 @@
"[-u [--exclude-per-directory=<ignoral-de-git>] | -i]] [--no-sparse-checkout] "
"[--index-output=<fitxer>] (--empty | <arbre1> [<arbre2> [<arbre3>]])"
-#: builtin/read-tree.c:110
+#: builtin/read-tree.c:130
msgid "write resulting index to <file>"
msgstr "escriu l'índex resultant al <fitxer>"
-#: builtin/read-tree.c:113
+#: builtin/read-tree.c:133
msgid "only empty the index"
msgstr "només buida l'índex"
-#: builtin/read-tree.c:115
+#: builtin/read-tree.c:135
msgid "Merging"
msgstr "S'està fusionant"
-#: builtin/read-tree.c:117
+#: builtin/read-tree.c:137
msgid "perform a merge in addition to a read"
msgstr "realitza una fusió a més d'una lectura"
-#: builtin/read-tree.c:119
+#: builtin/read-tree.c:139
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:121
+#: builtin/read-tree.c:141
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:123
+#: builtin/read-tree.c:143
msgid "same as -m, but discard unmerged entries"
msgstr "el mateix que -m, però descarta les entrades no fusionades"
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:144
msgid "<subdirectory>/"
msgstr "<subdirectori>/"
-#: builtin/read-tree.c:125
+#: builtin/read-tree.c:145
msgid "read the tree into the index under <subdirectory>/"
msgstr "llegiu l'arbre a l'índex sota <subdirectori>/"
-#: builtin/read-tree.c:128
+#: builtin/read-tree.c:148
msgid "update working tree with merge result"
msgstr "actualitza l'arbre de treball amb el resultat de fusió"
-#: builtin/read-tree.c:130
+#: builtin/read-tree.c:150
msgid "gitignore"
msgstr "gitignore"
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:151
msgid "allow explicitly ignored files to be overwritten"
msgstr "permet que els fitxers explícitament ignorats se sobreescriguin"
-#: builtin/read-tree.c:134
+#: builtin/read-tree.c:154
msgid "don't check the working tree after merging"
msgstr "no comprovis l'arbre de treball després de fusionar"
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:155
msgid "don't update the index or the work tree"
msgstr "no actualitzis l'índex ni l'arbre de treball"
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:157
msgid "skip applying sparse checkout filter"
msgstr "omet l'aplicació del filtre d'agafament parcial"
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:159
msgid "debug unpack-trees"
msgstr "depura unpack-trees"
-#: builtin/receive-pack.c:26
+#: builtin/rebase--helper.c:7
+msgid "git rebase--helper [<options>]"
+msgstr "git rebase--helper [<opcions>]"
+
+#: builtin/rebase--helper.c:19
+msgid "continue rebase"
+msgstr "continua el «rebase»"
+
+#: builtin/rebase--helper.c:21
+msgid "abort rebase"
+msgstr "avorta el «rebase»"
+
+#: builtin/receive-pack.c:27
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-dir>"
-#: builtin/receive-pack.c:793
+#: builtin/receive-pack.c:795
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"
@@ -11507,7 +11766,7 @@
"predeterminat, establiu la variable de configuració\n"
"'receive.denyCurrentBranch' a 'refuse'."
-#: builtin/receive-pack.c:813
+#: builtin/receive-pack.c:815
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"
@@ -11529,11 +11788,11 @@
"\n"
"Per a silenciar aquest missatge, podeu establir-la a 'refuse'."
-#: builtin/receive-pack.c:1883
+#: builtin/receive-pack.c:1888
msgid "quiet"
msgstr "silenciós"
-#: builtin/receive-pack.c:1897
+#: builtin/receive-pack.c:1902
msgid "You must specify a directory."
msgstr "Heu d'especificar un directori."
@@ -11714,7 +11973,7 @@
msgid "(delete)"
msgstr "(suprimir)"
-#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:854
+#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:856
#, c-format
msgid "No such remote: %s"
msgstr "No hi ha tal remot: %s"
@@ -11746,7 +12005,7 @@
msgid "creating '%s' failed"
msgstr "la creació de '%s' ha fallat"
-#: builtin/remote.c:792
+#: builtin/remote.c:794
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -11761,299 +12020,299 @@
"eliminat;\n"
"per a suprimir-les, useu:"
-#: builtin/remote.c:806
+#: builtin/remote.c:808
#, c-format
msgid "Could not remove config section '%s'"
msgstr "No s'ha pogut eliminar la secció de configuració '%s'"
-#: builtin/remote.c:907
+#: builtin/remote.c:909
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " nou (la pròxima obtenció emmagatzemarà a remotes/%s)"
-#: builtin/remote.c:910
+#: builtin/remote.c:912
msgid " tracked"
msgstr " seguit"
-#: builtin/remote.c:912
+#: builtin/remote.c:914
msgid " stale (use 'git remote prune' to remove)"
msgstr " estancat (useu 'git remote prune' per a eliminar)"
-#: builtin/remote.c:914
+#: builtin/remote.c:916
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:955
+#: builtin/remote.c:957
#, 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:963
+#: builtin/remote.c:965
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "es fa «rebase» interactivament sobre el remot %s"
-#: builtin/remote.c:964
+#: builtin/remote.c:966
#, c-format
msgid "rebases onto remote %s"
msgstr "es fa «rebase» sobre el remot %s"
-#: builtin/remote.c:967
+#: builtin/remote.c:969
#, c-format
msgid " merges with remote %s"
msgstr "es fusiona amb el remot %s"
-#: builtin/remote.c:970
+#: builtin/remote.c:972
#, c-format
msgid "merges with remote %s"
msgstr "es fusiona amb el remot %s"
-#: builtin/remote.c:973
+#: builtin/remote.c:975
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s i amb el remot %s\n"
-#: builtin/remote.c:1016
+#: builtin/remote.c:1018
msgid "create"
msgstr "crea"
-#: builtin/remote.c:1019
+#: builtin/remote.c:1021
msgid "delete"
msgstr "suprimeix"
-#: builtin/remote.c:1023
+#: builtin/remote.c:1025
msgid "up to date"
msgstr "al dia"
-#: builtin/remote.c:1026
+#: builtin/remote.c:1028
msgid "fast-forwardable"
msgstr "avanç ràpid possible"
-#: builtin/remote.c:1029
+#: builtin/remote.c:1031
msgid "local out of date"
msgstr "local no actualitzat"
-#: builtin/remote.c:1036
+#: builtin/remote.c:1038
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s força a %-*s (%s)"
-#: builtin/remote.c:1039
+#: builtin/remote.c:1041
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s puja a %-*s (%s)"
-#: builtin/remote.c:1043
+#: builtin/remote.c:1045
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s força a %s"
-#: builtin/remote.c:1046
+#: builtin/remote.c:1048
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s puja a %s"
-#: builtin/remote.c:1114
+#: builtin/remote.c:1116
msgid "do not query remotes"
msgstr "no consultis els remots"
-#: builtin/remote.c:1141
+#: builtin/remote.c:1143
#, c-format
msgid "* remote %s"
msgstr "* remot %s"
-#: builtin/remote.c:1142
+#: builtin/remote.c:1144
#, c-format
msgid " Fetch URL: %s"
msgstr " URL d'obtenció: %s"
-#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1295
+#: builtin/remote.c:1145 builtin/remote.c:1158 builtin/remote.c:1297
msgid "(no URL)"
msgstr "(sense URL)"
#. TRANSLATORS: the colon ':' should align with
#. the one in " Fetch URL: %s" translation
-#: builtin/remote.c:1154 builtin/remote.c:1156
+#: builtin/remote.c:1156 builtin/remote.c:1158
#, c-format
msgid " Push URL: %s"
msgstr " URL de pujada: %s"
-#: builtin/remote.c:1158 builtin/remote.c:1160 builtin/remote.c:1162
+#: builtin/remote.c:1160 builtin/remote.c:1162 builtin/remote.c:1164
#, c-format
msgid " HEAD branch: %s"
msgstr " Branca de HEAD: %s"
-#: builtin/remote.c:1158
+#: builtin/remote.c:1160
msgid "(not queried)"
msgstr "(no consultat)"
-#: builtin/remote.c:1160
+#: builtin/remote.c:1162
msgid "(unknown)"
msgstr "(desconegut)"
-#: builtin/remote.c:1164
+#: builtin/remote.c:1166
#, 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"
-#: builtin/remote.c:1176
+#: builtin/remote.c:1178
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Branca remota:%s"
msgstr[1] " Branques remotes:%s"
-#: builtin/remote.c:1179 builtin/remote.c:1205
+#: builtin/remote.c:1181 builtin/remote.c:1207
msgid " (status not queried)"
msgstr " (estat no consultat)"
-#: builtin/remote.c:1188
+#: builtin/remote.c:1190
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:1196
+#: builtin/remote.c:1198
msgid " Local refs will be mirrored by 'git push'"
msgstr " 'git push' reflectirà les referències locals"
-#: builtin/remote.c:1202
+#: builtin/remote.c:1204
#, 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:1223
+#: builtin/remote.c:1225
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "estableix refs/remotes/<name>/HEAD segons el remot"
-#: builtin/remote.c:1225
+#: builtin/remote.c:1227
msgid "delete refs/remotes/<name>/HEAD"
msgstr "suprimeix refs/remotes/<name>/HEAD"
-#: builtin/remote.c:1240
+#: builtin/remote.c:1242
msgid "Cannot determine remote HEAD"
msgstr "No es pot determinar el HEAD remot"
-#: builtin/remote.c:1242
+#: builtin/remote.c:1244
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:"
-#: builtin/remote.c:1252
+#: builtin/remote.c:1254
#, c-format
msgid "Could not delete %s"
msgstr "No s'ha pogut suprimir %s"
-#: builtin/remote.c:1260
+#: builtin/remote.c:1262
#, c-format
msgid "Not a valid ref: %s"
msgstr "No és una referència vàlida: %s"
-#: builtin/remote.c:1262
+#: builtin/remote.c:1264
#, c-format
msgid "Could not setup %s"
msgstr "No s'ha pogut configurar %s"
-#: builtin/remote.c:1280
+#: builtin/remote.c:1282
#, c-format
msgid " %s will become dangling!"
msgstr " %s es tornarà penjant!"
-#: builtin/remote.c:1281
+#: builtin/remote.c:1283
#, c-format
msgid " %s has become dangling!"
msgstr " %s s'ha tornat penjant!"
-#: builtin/remote.c:1291
+#: builtin/remote.c:1293
#, c-format
msgid "Pruning %s"
msgstr "S'està podant %s"
-#: builtin/remote.c:1292
+#: builtin/remote.c:1294
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1308
+#: builtin/remote.c:1310
#, c-format
msgid " * [would prune] %s"
msgstr " * [podaria] %s"
-#: builtin/remote.c:1311
+#: builtin/remote.c:1313
#, c-format
msgid " * [pruned] %s"
msgstr " * [podat] %s"
-#: builtin/remote.c:1356
+#: builtin/remote.c:1358
msgid "prune remotes after fetching"
msgstr "poda els remots després d'obtenir-los"
-#: builtin/remote.c:1419 builtin/remote.c:1473 builtin/remote.c:1541
+#: builtin/remote.c:1421 builtin/remote.c:1475 builtin/remote.c:1543
#, c-format
msgid "No such remote '%s'"
msgstr "No hi ha tal remot '%s'"
-#: builtin/remote.c:1435
+#: builtin/remote.c:1437
msgid "add branch"
msgstr "afegeix branca"
-#: builtin/remote.c:1442
+#: builtin/remote.c:1444
msgid "no remote specified"
msgstr "cap remot especificat"
-#: builtin/remote.c:1459
+#: builtin/remote.c:1461
msgid "query push URLs rather than fetch URLs"
msgstr "consulta els URL de pujada en lloc dels URL d'obtenció"
-#: builtin/remote.c:1461
+#: builtin/remote.c:1463
msgid "return all URLs"
msgstr "retorna tots els URL"
-#: builtin/remote.c:1489
+#: builtin/remote.c:1491
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "cap URL configurat per al remot '%s'"
-#: builtin/remote.c:1515
+#: builtin/remote.c:1517
msgid "manipulate push URLs"
msgstr "manipula els URL de pujada"
-#: builtin/remote.c:1517
+#: builtin/remote.c:1519
msgid "add URL"
msgstr "afegeix URL"
-#: builtin/remote.c:1519
+#: builtin/remote.c:1521
msgid "delete URLs"
msgstr "suprimeix URLs"
-#: builtin/remote.c:1526
+#: builtin/remote.c:1528
msgid "--add --delete doesn't make sense"
msgstr "--add --delete no té sentit"
-#: builtin/remote.c:1567
+#: builtin/remote.c:1569
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Patró d'URL antic no vàlid: %s"
-#: builtin/remote.c:1575
+#: builtin/remote.c:1577
#, c-format
msgid "No such URL found: %s"
msgstr "No s'ha trobat tal URL: %s"
-#: builtin/remote.c:1577
+#: builtin/remote.c:1579
msgid "Will not delete all non-push URLs"
msgstr "No se suprimiran tots els URL no de pujada"
-#: builtin/remote.c:1591
+#: builtin/remote.c:1593
msgid "be verbose; must be placed before a subcommand"
msgstr "sigues detallat; s'ha de col·locar abans d'una subordre"
-#: builtin/remote.c:1622
+#: builtin/remote.c:1624
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Subordre desconeguda: %s"
@@ -12114,7 +12373,7 @@
#: builtin/repack.c:188
msgid "size of the window used for delta compression"
-msgstr "mida de la finestra que s'usa per a compressió de deltes"
+msgstr "mida de la finestra que s'usa per a compressió de diferències"
#: builtin/repack.c:189 builtin/repack.c:193
msgid "bytes"
@@ -12128,7 +12387,7 @@
#: builtin/repack.c:192
msgid "limits the maximum delta depth"
-msgstr "limita la profunditat màxima de les deltes"
+msgstr "limita la profunditat màxima de les diferències"
#: builtin/repack.c:194
msgid "maximum size of each packfile"
@@ -12171,22 +12430,22 @@
msgid "git replace [--format=<format>] [-l [<pattern>]]"
msgstr "git replace [--format=<format>] [-l [<patró>]]"
-#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
+#: builtin/replace.c:330 builtin/replace.c:368 builtin/replace.c:396
#, c-format
msgid "Not a valid object name: '%s'"
msgstr "No és un nom d'objecte vàlid: '%s'"
-#: builtin/replace.c:355
+#: builtin/replace.c:360
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "etiqueta de fusió dolenta en la comissió '%s'"
-#: builtin/replace.c:357
+#: builtin/replace.c:362
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr "etiqueta de fusió mal formada en la comissió '%s'"
-#: builtin/replace.c:368
+#: builtin/replace.c:373
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -12195,45 +12454,45 @@
"la comissió original '%s' conté l'etiqueta de fusió '%s' que es descarta; "
"useu --edit en lloc de --graft"
-#: builtin/replace.c:401
+#: builtin/replace.c:406
#, c-format
msgid "the original commit '%s' has a gpg signature."
msgstr "la comissió original '%s' té una signatura gpg."
-#: builtin/replace.c:402
+#: builtin/replace.c:407
msgid "the signature will be removed in the replacement commit!"
msgstr "s'eliminarà la signatura en la comissió de reemplaçament!"
-#: builtin/replace.c:408
+#: builtin/replace.c:413
#, 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:432
+#: builtin/replace.c:437
msgid "list replace refs"
msgstr "llista les referències reemplaçades"
-#: builtin/replace.c:433
+#: builtin/replace.c:438
msgid "delete replace refs"
msgstr "suprimeix les referències reemplaçades"
-#: builtin/replace.c:434
+#: builtin/replace.c:439
msgid "edit existing object"
msgstr "edita un objecte existent"
-#: builtin/replace.c:435
+#: builtin/replace.c:440
msgid "change a commit's parents"
msgstr "canvia les mares d'una comissió"
-#: builtin/replace.c:436
+#: builtin/replace.c:441
msgid "replace the ref if it exists"
msgstr "reemplaça la referència si existeix"
-#: builtin/replace.c:437
+#: builtin/replace.c:442
msgid "do not pretty-print contents for --edit"
msgstr "no imprimeixis bellament els continguts per a --edit"
-#: builtin/replace.c:438
+#: builtin/replace.c:443
msgid "use this format"
msgstr "usa aquest format"
@@ -12377,23 +12636,23 @@
msgid "rev-list does not support display of notes"
msgstr "el rev-list no permet mostrar notes"
-#: builtin/rev-parse.c:391
+#: builtin/rev-parse.c:393
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<opcions>] -- [<paràmetres>...]"
-#: builtin/rev-parse.c:396
+#: builtin/rev-parse.c:398
msgid "keep the `--` passed as an arg"
msgstr "retén el `--` passat com a paràmetre"
-#: builtin/rev-parse.c:398
+#: builtin/rev-parse.c:400
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:401
+#: builtin/rev-parse.c:403
msgid "output in stuck long form"
msgstr "emet en forma llarga enganxada"
-#: builtin/rev-parse.c:532
+#: builtin/rev-parse.c:534
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
@@ -12424,68 +12683,72 @@
msgid "git cherry-pick <subcommand>"
msgstr "git cherry-pick <subordre>"
-#: builtin/revert.c:71
+#: builtin/revert.c:89
#, c-format
msgid "%s: %s cannot be used with %s"
msgstr "%s: %s no es pot usar amb %s"
-#: builtin/revert.c:80
+#: builtin/revert.c:98
msgid "end revert or cherry-pick sequence"
msgstr "acaba la seqüència de reversió o el «cherry pick»"
-#: builtin/revert.c:81
+#: builtin/revert.c:99
msgid "resume revert or cherry-pick sequence"
msgstr "reprèn la seqüència de reversió o el «cherry pick»"
-#: builtin/revert.c:82
+#: builtin/revert.c:100
msgid "cancel revert or cherry-pick sequence"
msgstr "cancel·la la seqüència de reversió o el «cherry pick»"
-#: builtin/revert.c:83
+#: builtin/revert.c:101
msgid "don't automatically commit"
msgstr "no cometis automàticament"
-#: builtin/revert.c:84
+#: builtin/revert.c:102
msgid "edit the commit message"
msgstr "edita el missatge de comissió"
-#: builtin/revert.c:87
-msgid "parent number"
-msgstr "número de mare"
+#: builtin/revert.c:105
+msgid "parent-number"
+msgstr "número del pare"
-#: builtin/revert.c:89
+#: builtin/revert.c:106
+msgid "select mainline parent"
+msgstr "selecciona la línia principal del pare"
+
+#: builtin/revert.c:108
msgid "merge strategy"
msgstr "estratègia de fusió"
-#: builtin/revert.c:90
+#: builtin/revert.c:109
msgid "option"
msgstr "opció"
-#: builtin/revert.c:91
+#: builtin/revert.c:110
msgid "option for merge strategy"
msgstr "opció d'estratègia de fusió"
-#: builtin/revert.c:100
+#: builtin/revert.c:119
msgid "append commit name"
msgstr "nom de la comissió a annexar"
-#: builtin/revert.c:102
+#: builtin/revert.c:121
msgid "preserve initially empty commits"
msgstr "preserva les comissions inicialment buides"
-#: builtin/revert.c:103
+#: builtin/revert.c:122
msgid "allow commits with empty messages"
msgstr "permet les comissions amb missatges buits"
-#: builtin/revert.c:104
+#: builtin/revert.c:123
msgid "keep redundant, empty commits"
msgstr "retén les comissions redundants i buides"
-#: builtin/revert.c:192
+#: builtin/revert.c:211
msgid "revert failed"
msgstr "la reversió ha fallat"
-#: builtin/revert.c:205
+#: builtin/revert.c:224
msgid "cherry-pick failed"
msgstr "el «cherry pick» ha fallat"
@@ -12582,19 +12845,19 @@
"[<màquina>:]<directori> [<referència>...]\n"
" --all i especificació <referència> explícita són mutualment exclusius."
-#: builtin/send-pack.c:160
+#: builtin/send-pack.c:161
msgid "remote name"
msgstr "nom del remot"
-#: builtin/send-pack.c:171
+#: builtin/send-pack.c:175
msgid "use stateless RPC protocol"
msgstr "usa el protocol RPC sense estat"
-#: builtin/send-pack.c:172
+#: builtin/send-pack.c:176
msgid "read refs from stdin"
msgstr "llegeix les referències des d'stdin"
-#: builtin/send-pack.c:173
+#: builtin/send-pack.c:177
msgid "print status from remote helper"
msgstr "imprimeix l'estat des de l'ajudant remot"
@@ -12602,28 +12865,28 @@
msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
msgstr "git shortlog [<opcions>] [<rang-de-revisions>] [[--] [<camí>...]]"
-#: builtin/shortlog.c:249
+#: builtin/shortlog.c:248
msgid "Group by committer rather than author"
msgstr ""
-#: builtin/shortlog.c:251
+#: builtin/shortlog.c:250
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:253
+#: builtin/shortlog.c:252
msgid "Suppress commit descriptions, only provides commit count"
msgstr ""
"Omet les descripcions de comissió, només proveeix el recompte de comissions"
-#: builtin/shortlog.c:255
+#: builtin/shortlog.c:254
msgid "Show the email address of each author"
msgstr "Mostra l'adreça de correu electrònic de cada autor"
-#: builtin/shortlog.c:256
+#: builtin/shortlog.c:255
msgid "w[,i1[,i2]]"
msgstr "w[,i1[,i2]]"
-#: builtin/shortlog.c:257
+#: builtin/shortlog.c:256
msgid "Linewrap output"
msgstr "Ajusta les línies de la sortida"
@@ -12643,121 +12906,121 @@
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:375
+#: builtin/show-branch.c:374
#, 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:541
+#: builtin/show-branch.c:536
#, c-format
msgid "no matching refs with %s"
msgstr "no hi ha referències coincidents amb %s"
-#: builtin/show-branch.c:639
+#: builtin/show-branch.c:632
msgid "show remote-tracking and local branches"
msgstr "mostra les branques amb seguiment remot i les locals"
-#: builtin/show-branch.c:641
+#: builtin/show-branch.c:634
msgid "show remote-tracking branches"
msgstr "mostra les branques amb seguiment remot"
-#: builtin/show-branch.c:643
+#: builtin/show-branch.c:636
msgid "color '*!+-' corresponding to the branch"
msgstr "colora '*!+-' corresponent a la branca"
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:638
msgid "show <n> more commits after the common ancestor"
msgstr "mostra <n> comissions després de l'avantpassat comú"
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:640
msgid "synonym to more=-1"
msgstr "sinònim de more=-1"
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:641
msgid "suppress naming strings"
msgstr "omet l'anomenament de cadenes"
-#: builtin/show-branch.c:650
+#: builtin/show-branch.c:643
msgid "include the current branch"
msgstr "inclou la branca actual"
-#: builtin/show-branch.c:652
+#: builtin/show-branch.c:645
msgid "name commits with their object names"
msgstr "anomena les comissions amb els seus noms d'objecte"
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:647
msgid "show possible merge bases"
msgstr "mostra les bases de fusió possibles"
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:649
msgid "show refs unreachable from any other ref"
msgstr "mostra les referències inabastables de qualsevol altra referència"
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:651
msgid "show commits in topological order"
msgstr "mostra les comissions en ordre topològic"
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:654
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:663
+#: builtin/show-branch.c:656
msgid "show merges reachable from only one tip"
msgstr "mostra les fusions abastables de només una punta"
-#: builtin/show-branch.c:665
+#: builtin/show-branch.c:658
msgid "topologically sort, maintaining date order where possible"
msgstr "ordena topològicament, mantenint l'ordre de dates on sigui possible"
-#: builtin/show-branch.c:668
+#: builtin/show-branch.c:661
msgid "<n>[,<base>]"
msgstr "<n>[,<base>]"
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:662
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:703
+#: 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:727
+#: builtin/show-branch.c:720
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:730
+#: builtin/show-branch.c:723
msgid "--reflog option needs one branch name"
msgstr "l'opció --reflog necessita un nom de branca"
-#: builtin/show-branch.c:733
+#: builtin/show-branch.c:726
#, 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:737
+#: builtin/show-branch.c:730
#, c-format
msgid "no such ref %s"
msgstr "no hi ha tal referència %s"
-#: builtin/show-branch.c:829
+#: builtin/show-branch.c:814
#, 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:833
+#: builtin/show-branch.c:818
#, c-format
msgid "'%s' is not a valid ref."
msgstr "'%s' no és una referència vàlida."
-#: builtin/show-branch.c:836
+#: builtin/show-branch.c:821
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "no es pot trobar la comissió %s (%s)"
@@ -12825,12 +13088,12 @@
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:1062
+#: builtin/submodule--helper.c:24 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:1071
+#: builtin/submodule--helper.c:31 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"
@@ -12840,96 +13103,103 @@
msgid "cannot strip one component off url '%s'"
msgstr "no es pot despullar un component de l'url '%s'"
-#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:592
+#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630
msgid "alternative anchor for relative paths"
msgstr "àncora alternativa per als camins relatius"
-#: builtin/submodule--helper.c:287
+#: builtin/submodule--helper.c:310
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<camí>] [<camí>...]"
-#: builtin/submodule--helper.c:333 builtin/submodule--helper.c:347
+#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "No s'ha trobat cap url per al camí de submòdul '%s' a .gitmodules"
-#: builtin/submodule--helper.c:373
+#: builtin/submodule--helper.c:395
+#, c-format
+msgid ""
+"could not lookup configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr ""
+
+#: builtin/submodule--helper.c:406
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "S'ha produït un error en registrar l'url per al camí de submòdul '%s'"
-#: builtin/submodule--helper.c:377
+#: builtin/submodule--helper.c:410
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "S'ha registrat el submòdul '%s' (%s) per al camí '%s'\n"
-#: builtin/submodule--helper.c:387
+#: 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"
-#: builtin/submodule--helper.c:394
+#: 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'"
-#: builtin/submodule--helper.c:410
+#: builtin/submodule--helper.c:443
msgid "Suppress output for initializing a submodule"
msgstr "Omet la sortida d'inicialitzar un submòdul"
-#: builtin/submodule--helper.c:415
+#: builtin/submodule--helper.c:448
msgid "git submodule--helper init [<path>]"
msgstr "git submodule--helper init [<camí>]"
-#: builtin/submodule--helper.c:436
+#: builtin/submodule--helper.c:476
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <camí>"
-#: builtin/submodule--helper.c:442
+#: builtin/submodule--helper.c:482
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "No s'ha trobat cap mapatge de submòdul a .gitmodules per al camí '%s'"
-#: builtin/submodule--helper.c:525 builtin/submodule--helper.c:528
+#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "el submòdul '%s' no pot afegir un alternatiu: %s"
-#: builtin/submodule--helper.c:564
+#: builtin/submodule--helper.c:604
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "No es reconeix el valor '%s' per a submodule.alternateErrorStrategy"
-#: builtin/submodule--helper.c:571
+#: builtin/submodule--helper.c:611
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "No es reconeix el valor '%s' per a submodule.alternateLocation"
-#: builtin/submodule--helper.c:595
+#: builtin/submodule--helper.c:633
msgid "where the new submodule will be cloned to"
msgstr "a on es clonarà el submòdul nou"
-#: builtin/submodule--helper.c:598
+#: builtin/submodule--helper.c:636
msgid "name of the new submodule"
msgstr "nom del submòdul nou"
-#: builtin/submodule--helper.c:601
+#: builtin/submodule--helper.c:639
msgid "url where to clone the submodule from"
msgstr "url del qual clonar el submòdul"
-#: builtin/submodule--helper.c:607
+#: builtin/submodule--helper.c:645
msgid "depth for shallow clones"
msgstr "profunditat dels clons superficials"
-#: builtin/submodule--helper.c:610 builtin/submodule--helper.c:980
+#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993
msgid "force cloning progress"
msgstr "força el progrés del clonatge"
-#: builtin/submodule--helper.c:615
+#: builtin/submodule--helper.c:653
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -12937,92 +13207,82 @@
"git submodule--helper clone [--prefix=<camí>] [--quiet] [--reference "
"<dipòsit>] [--name <nom>] [--depth <profunditat>] --url <url> --path <camí>"
-#: builtin/submodule--helper.c:646
+#: builtin/submodule--helper.c:684
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "el clonatge de '%s' al camí de submòdul '%s' ha fallat"
-#: builtin/submodule--helper.c:662
-#, c-format
-msgid "cannot open file '%s'"
-msgstr "no es pot obrir el fitxer '%s'"
-
-#: builtin/submodule--helper.c:667
-#, c-format
-msgid "could not close file %s"
-msgstr "no s'ha pogut tancar el fitxer %s"
-
-#: builtin/submodule--helper.c:674
+#: builtin/submodule--helper.c:699
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "no s'ha pogut obtenir el directori de submòdul per a '%s'"
-#: builtin/submodule--helper.c:742
+#: builtin/submodule--helper.c:764
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "El camí de submòdul '%s' no està inicialitzat"
-#: builtin/submodule--helper.c:746
+#: builtin/submodule--helper.c:768
msgid "Maybe you want to use 'update --init'?"
msgstr "Potser voleu usar 'update --init'?"
-#: builtin/submodule--helper.c:772
+#: builtin/submodule--helper.c:793
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "S'està ometent el submòdul no fusionat %s"
-#: builtin/submodule--helper.c:793
+#: builtin/submodule--helper.c:814
#, c-format
msgid "Skipping submodule '%s'"
msgstr "S'està ometent el submòdul '%s'"
-#: builtin/submodule--helper.c:929
+#: builtin/submodule--helper.c:942
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "S'ha produït un error en clonar '%s'. S'ha programat un reintent"
-#: builtin/submodule--helper.c:940
+#: builtin/submodule--helper.c:953
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "S'ha produït un error per segon cop en clonar '%s', s'està avortant"
-#: builtin/submodule--helper.c:961 builtin/submodule--helper.c:1105
+#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162
msgid "path into the working tree"
msgstr "camí a l'arbre de treball"
-#: builtin/submodule--helper.c:964
+#: builtin/submodule--helper.c:977
msgid "path into the working tree, across nested submodule boundaries"
msgstr "camí a l'arbre de treball, a través de fronteres de submòduls niats"
-#: builtin/submodule--helper.c:968
+#: builtin/submodule--helper.c:981
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout o none"
-#: builtin/submodule--helper.c:972
+#: builtin/submodule--helper.c:985
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr "Crea un clon superficial truncat al nombre de revisions especificat"
-#: builtin/submodule--helper.c:975
+#: builtin/submodule--helper.c:988
msgid "parallel jobs"
msgstr "tasques paral·leles"
-#: builtin/submodule--helper.c:977
+#: builtin/submodule--helper.c:990
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "si el clonatge inicial ha de seguir la recomanació de superficialitat"
-#: builtin/submodule--helper.c:978
+#: builtin/submodule--helper.c:991
msgid "don't print cloning progress"
msgstr "no imprimeixis el progrés del clonatge"
-#: builtin/submodule--helper.c:985
+#: builtin/submodule--helper.c:998
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<camí>] [<camí>...]"
-#: builtin/submodule--helper.c:995
+#: builtin/submodule--helper.c:1008
msgid "bad value for update parameter"
msgstr "valor dolent per al paràmetre update"
-#: builtin/submodule--helper.c:1066
+#: builtin/submodule--helper.c:1079
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -13031,24 +13291,24 @@
"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:1106
+#: builtin/submodule--helper.c:1163
msgid "recurse into submodules"
msgstr "inclou recursivament als submòduls"
-#: builtin/submodule--helper.c:1112
+#: builtin/submodule--helper.c:1169
msgid "git submodule--helper embed-git-dir [<path>...]"
msgstr "git submodule--helper embed-git-dir [<camí>]"
-#: builtin/submodule--helper.c:1157
+#: 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:1164
+#: builtin/submodule--helper.c:1233
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s no admet --super-prefix"
-#: builtin/submodule--helper.c:1170
+#: builtin/submodule--helper.c:1239
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' no és una subordre vàlida de submodule--helper"
@@ -13094,8 +13354,10 @@
msgstr "git tag -d <nom-d'etiqueta>..."
#: builtin/tag.c:25
+#, fuzzy
msgid ""
-"git tag -l [-n[<num>]] [--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ó>]\n"
@@ -13106,22 +13368,17 @@
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<format>] <nom-d'etiqueta>..."
-#: builtin/tag.c:82
-#, c-format
-msgid "tag name too long: %.*s..."
-msgstr "nom d'etiqueta massa llarg: %.*s..."
-
-#: builtin/tag.c:87
+#: builtin/tag.c:83
#, c-format
msgid "tag '%s' not found."
msgstr "no s'ha trobat l'etiqueta '%s'."
-#: builtin/tag.c:102
+#: builtin/tag.c:99
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "S'ha suprimit l'etiqueta '%s' (era %s)\n"
-#: builtin/tag.c:131
+#: builtin/tag.c:128
#, c-format
msgid ""
"\n"
@@ -13134,7 +13391,7 @@
" %s\n"
"Les línies que comencin amb '%c' s'ignoraran.\n"
-#: builtin/tag.c:135
+#: builtin/tag.c:132
#, c-format
msgid ""
"\n"
@@ -13149,138 +13406,142 @@
"Les línies que comencin amb '%c' es retindran; podeu eliminar-les per vós "
"mateix si voleu.\n"
-#: builtin/tag.c:213
+#: builtin/tag.c:210
msgid "unable to sign the tag"
msgstr "no s'ha pogut signar l'etiqueta"
-#: builtin/tag.c:215
+#: builtin/tag.c:212
msgid "unable to write tag file"
msgstr "no s'ha pogut escriure el fitxer d'etiqueta"
-#: builtin/tag.c:240
+#: builtin/tag.c:236
msgid "bad object type."
msgstr "el tipus d'objecte és dolent."
-#: builtin/tag.c:253
-msgid "tag header too big."
-msgstr "la capçalera d'etiqueta és massa gran."
-
-#: builtin/tag.c:289
+#: builtin/tag.c:282
msgid "no tag message?"
msgstr "no hi ha cap missatge d'etiqueta?"
-#: builtin/tag.c:295
+#: builtin/tag.c:289
#, 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:354
+#: builtin/tag.c:397
msgid "list tag names"
msgstr "llista els noms d'etiqueta"
-#: builtin/tag.c:356
+#: builtin/tag.c:399
msgid "print <n> lines of each tag message"
msgstr "imprimeix <n> línies de cada missatge d'etiqueta"
-#: builtin/tag.c:358
+#: builtin/tag.c:401
msgid "delete tags"
msgstr "suprimeix les etiquetes"
-#: builtin/tag.c:359
+#: builtin/tag.c:402
msgid "verify tags"
msgstr "verifica les etiquetes"
-#: builtin/tag.c:361
+#: builtin/tag.c:404
msgid "Tag creation options"
msgstr "Opcions de creació d'etiquetes"
-#: builtin/tag.c:363
+#: builtin/tag.c:406
msgid "annotated tag, needs a message"
msgstr "etiqueta anotada, necessita un missatge"
-#: builtin/tag.c:365
+#: builtin/tag.c:408
msgid "tag message"
msgstr "missatge d'etiqueta"
-#: builtin/tag.c:367
+#: builtin/tag.c:410
msgid "annotated and GPG-signed tag"
msgstr "etiqueta anotada i signada per GPG"
-#: builtin/tag.c:371
+#: builtin/tag.c:414
msgid "use another key to sign the tag"
msgstr "usa una altra clau per a signar l'etiqueta"
-#: builtin/tag.c:372
+#: builtin/tag.c:415
msgid "replace the tag if exists"
msgstr "reemplaça l'etiqueta si existeix"
-#: builtin/tag.c:373 builtin/update-ref.c:368
+#: builtin/tag.c:416 builtin/update-ref.c:368
msgid "create a reflog"
msgstr "crea un registre de referències"
-#: builtin/tag.c:375
+#: builtin/tag.c:418
msgid "Tag listing options"
msgstr "Opcions de llistat d'etiquetes"
-#: builtin/tag.c:376
+#: builtin/tag.c:419
msgid "show tag list in columns"
msgstr "mostra la llista d'etiquetes en columnes"
-#: builtin/tag.c:377 builtin/tag.c:378
+#: builtin/tag.c:420 builtin/tag.c:422
msgid "print only tags that contain the commit"
msgstr "imprimeix només les etiquetes que continguin la comissió"
-#: builtin/tag.c:379
+#: builtin/tag.c:421 builtin/tag.c:423
+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
msgid "print only tags that are merged"
msgstr "imprimeix només les etiquetes que s'han fusionat"
-#: builtin/tag.c:380
+#: builtin/tag.c:425
msgid "print only tags that are not merged"
msgstr "imprimeix només les etiquetes que no s'han fusionat"
-#: builtin/tag.c:385
+#: builtin/tag.c:430
msgid "print only tags of the object"
msgstr "imprimeix només les etiquetes de l'objecte"
-#: builtin/tag.c:415
+#: builtin/tag.c:469
msgid "--column and -n are incompatible"
msgstr "--column i -n són incompatibles"
-#: builtin/tag.c:437
-msgid "-n option is only allowed with -l."
-msgstr "es permet l'opció -n només amb -l."
+#: builtin/tag.c:491
+msgid "-n option is only allowed in list mode"
+msgstr "es permet l'opció -n només amb mode llista"
-#: builtin/tag.c:439
-msgid "--contains option is only allowed with -l."
-msgstr "es permet l'opció --contains només amb -l."
+#: builtin/tag.c:493
+msgid "--contains option is only allowed in list mode"
+msgstr "es permet l'opció --contains només amb mode llista"
-#: builtin/tag.c:441
-msgid "--points-at option is only allowed with -l."
-msgstr "es permet --points-at option només amb -l."
+#: builtin/tag.c:495
+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:443
-msgid "--merged and --no-merged option are only allowed with -l"
-msgstr "es permeten les opcions --merged i --no-merged només amb -l"
+#: builtin/tag.c:497
+msgid "--points-at option is only allowed in list mode"
+msgstr "es permet --points-at option només amb mode llista"
-#: builtin/tag.c:454
+#: builtin/tag.c:499
+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
msgid "only one -F or -m option is allowed."
msgstr "només es permet una opció -F o -m."
-#: builtin/tag.c:473
+#: builtin/tag.c:529
msgid "too many params"
msgstr "massa paràmetres"
-#: builtin/tag.c:479
+#: builtin/tag.c:535
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' no és un nom d'etiqueta vàlid."
-#: builtin/tag.c:484
+#: builtin/tag.c:540
#, c-format
msgid "tag '%s' already exists"
msgstr "l'etiqueta '%s' ja existeix"
-#: builtin/tag.c:512
+#: builtin/tag.c:570
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Etiqueta '%s' actualitzada (era %s)\n"
@@ -13309,189 +13570,205 @@
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:212
+#: builtin/update-index.c:110 builtin/update-index.c:216
#, c-format
msgid "failed to delete directory %s"
msgstr "s'ha produït un error en suprimir el directori %s"
-#: builtin/update-index.c:133
+#: builtin/update-index.c:135
#, c-format
msgid "Testing mtime in '%s' "
msgstr "S'està provant mtime en '%s' "
-#: builtin/update-index.c:145
+#: builtin/update-index.c:149
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"
-#: builtin/update-index.c:158
+#: builtin/update-index.c:162
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"
-#: builtin/update-index.c:171
+#: builtin/update-index.c:175
msgid "directory stat info changes after updating a file"
msgstr ""
"la informació d'stat de directori canvia després d'actualitzar un fitxer"
-#: builtin/update-index.c:182
+#: builtin/update-index.c:186
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"
-#: builtin/update-index.c:193
+#: builtin/update-index.c:197
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"
-#: builtin/update-index.c:206
+#: builtin/update-index.c:210
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"
-#: builtin/update-index.c:213
+#: builtin/update-index.c:217
msgid " OK"
msgstr " D'acord"
-#: builtin/update-index.c:564
+#: builtin/update-index.c:568
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<opcions>] [--] [<fitxer>...]"
-#: builtin/update-index.c:919
+#: builtin/update-index.c:923
msgid "continue refresh even when index needs update"
msgstr ""
"continua l'actualització encara que l'índex necessiti una actualització"
-#: builtin/update-index.c:922
+#: builtin/update-index.c:926
msgid "refresh: ignore submodules"
msgstr "actualitza: ignora els submòduls"
-#: builtin/update-index.c:925
+#: builtin/update-index.c:929
msgid "do not ignore new files"
msgstr "no ignoris els fitxers nous"
-#: builtin/update-index.c:927
+#: builtin/update-index.c:931
msgid "let files replace directories and vice-versa"
msgstr "deixa que els fitxers reemplacin els directoris i viceversa"
-#: builtin/update-index.c:929
+#: builtin/update-index.c:933
msgid "notice files missing from worktree"
msgstr "tingues en compte els fitxers absents de l'arbre de treball"
-#: builtin/update-index.c:931
+#: builtin/update-index.c:935
msgid "refresh even if index contains unmerged entries"
msgstr "actualitza encara que l'índex contingui entrades no fusionades"
-#: builtin/update-index.c:934
+#: builtin/update-index.c:938
msgid "refresh stat information"
msgstr "actualitza la informació d'estadístiques"
-#: builtin/update-index.c:938
+#: builtin/update-index.c:942
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "com --refresh, però ignora l'ajust assume-unchanged"
-#: builtin/update-index.c:942
+#: builtin/update-index.c:946
msgid "<mode>,<object>,<path>"
msgstr "<mode>,<objecte>,<camí>"
-#: builtin/update-index.c:943
+#: builtin/update-index.c:947
msgid "add the specified entry to the index"
msgstr "afegeix l'entrada especificada a l'índex"
-#: builtin/update-index.c:952
+#: builtin/update-index.c:956
msgid "mark files as \"not changing\""
msgstr "marca els fitxers com a \"no canviant\""
-#: builtin/update-index.c:955
+#: builtin/update-index.c:959
msgid "clear assumed-unchanged bit"
msgstr "neteja el bit assumed-unchanged"
-#: builtin/update-index.c:958
+#: builtin/update-index.c:962
msgid "mark files as \"index-only\""
msgstr "marca els fitxers com a \"només índex\""
-#: builtin/update-index.c:961
+#: builtin/update-index.c:965
msgid "clear skip-worktree bit"
msgstr "neteja el bit skip-worktree"
-#: builtin/update-index.c:964
+#: builtin/update-index.c:968
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"
-#: builtin/update-index.c:966
+#: builtin/update-index.c:970
msgid "remove named paths even if present in worktree"
msgstr ""
"elimina els camins anomenats encara que estiguin presents en l'arbre de "
"treball"
-#: builtin/update-index.c:968
+#: builtin/update-index.c:972
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:970
+#: builtin/update-index.c:974
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:974
+#: builtin/update-index.c:978
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:978
+#: builtin/update-index.c:982
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:982
+#: builtin/update-index.c:986
msgid "only update entries that differ from HEAD"
msgstr "només actualitza les entrades que difereixin de HEAD"
-#: builtin/update-index.c:986
+#: builtin/update-index.c:990
msgid "ignore files missing from worktree"
msgstr "ignora els fitxers absents de l'arbre de treball"
-#: builtin/update-index.c:989
+#: builtin/update-index.c:993
msgid "report actions to standard output"
msgstr "informa de les accions en la sortida estàndard"
-#: builtin/update-index.c:991
+#: builtin/update-index.c:995
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(per a porcellanes) oblida't dels conflictes no resolts ni desats"
-#: builtin/update-index.c:995
+#: builtin/update-index.c:999
msgid "write index in this format"
msgstr "escriu l'índex en aquest format"
-#: builtin/update-index.c:997
+#: builtin/update-index.c:1001
msgid "enable or disable split index"
msgstr "habilita o inhabilita l'índex dividit"
-#: builtin/update-index.c:999
+#: builtin/update-index.c:1003
msgid "enable/disable untracked cache"
msgstr "habilita/inhabilita la memòria cau no seguida"
-#: builtin/update-index.c:1001
+#: builtin/update-index.c:1005
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:1003
+#: builtin/update-index.c:1007
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:1120
+#: builtin/update-index.c:1107
msgid ""
-"core.untrackedCache is set to true; remove or change it, if you really want "
+"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'index dividit"
+
+#: builtin/update-index.c:1116
+msgid ""
+"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'index dividit"
+
+#: builtin/update-index.c:1127
+msgid ""
+"core.untrackedCache is set to true; remove or change it, if you e want "
"to disable the untracked cache"
msgstr ""
-"core.untrackedCache està establert a veritable; elimineu-lo o canvieu-lo, si "
+"core.untrackedCache està establert a cert; elimineu-lo o canvieu-lo, si "
"realment voleu inhabilitar el cau no seguit"
-#: builtin/update-index.c:1124
+#: builtin/update-index.c:1131
msgid "Untracked cache disabled"
msgstr "La memòria cau no seguida està inhabilitada"
-#: builtin/update-index.c:1132
+#: builtin/update-index.c:1139
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
@@ -13499,7 +13776,7 @@
"core.untrackedCache està establert a fals; elimineu-lo o canviar-lo, si "
"realment voleu habilitar el cau no seguit"
-#: builtin/update-index.c:1136
+#: builtin/update-index.c:1143
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "La memòria cau no seguida està habilitada per a '%s'"
@@ -13593,27 +13870,27 @@
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <camí>"
-#: builtin/worktree.c:42
+#: builtin/worktree.c:43
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Eliminació de worktrees/%s: no és un directori vàlid"
-#: builtin/worktree.c:48
+#: builtin/worktree.c:49
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Eliminació de worktrees/%s: el fitxer gitdir no existeix"
-#: builtin/worktree.c:53
+#: builtin/worktree.c:54
#, 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:64
+#: builtin/worktree.c:65
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Eliminació de worktrees/%s: fitxer gitdir no vàlid"
-#: builtin/worktree.c:80
+#: builtin/worktree.c:81
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr ""
@@ -13633,60 +13910,64 @@
msgid "'%s' already exists"
msgstr "'%s' ja existeix"
-#: builtin/worktree.c:236
+#: builtin/worktree.c:235
#, c-format
msgid "could not create directory of '%s'"
msgstr "no s'ha pogut crear directori de '%s'"
-#: builtin/worktree.c:272
+#: builtin/worktree.c:274
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "S'està preparant %s (identificador %s)"
-#: builtin/worktree.c:323
+#: builtin/worktree.c:328
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:325
+#: builtin/worktree.c:330
msgid "create a new branch"
msgstr "crea una branca nova"
-#: builtin/worktree.c:327
+#: builtin/worktree.c:332
msgid "create or reset a branch"
msgstr "crea o restableix una branca"
-#: builtin/worktree.c:329
+#: builtin/worktree.c:334
msgid "populate the new working tree"
msgstr "emplena l'arbre de treball nou"
-#: builtin/worktree.c:337
+#: builtin/worktree.c:335
+msgid "keep the new working tree locked"
+msgstr "mantén l'arbre de treball nou bloquejat"
+
+#: builtin/worktree.c:343
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B i --detach són mutualment exclusius"
-#: builtin/worktree.c:472
+#: builtin/worktree.c:478
msgid "reason for locking"
msgstr "raó per bloquejar"
-#: builtin/worktree.c:484 builtin/worktree.c:517
+#: builtin/worktree.c:490 builtin/worktree.c:523
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' no és un arbre de treball"
-#: builtin/worktree.c:486 builtin/worktree.c:519
+#: builtin/worktree.c:492 builtin/worktree.c:525
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:491
+#: builtin/worktree.c:497
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' ja està bloquejat, raó: '%s'"
-#: builtin/worktree.c:493
+#: builtin/worktree.c:499
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' ja està bloquejat"
-#: builtin/worktree.c:521
+#: builtin/worktree.c:527
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' no està bloquejat"
@@ -13711,20 +13992,20 @@
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<opcions>] <directori>"
-#: upload-pack.c:1036
+#: upload-pack.c:1040
msgid "quit after a single request/response exchange"
msgstr "surt després d'un sol intercanvi de sol·licitud/resposta"
-#: upload-pack.c:1038
+#: upload-pack.c:1042
msgid "exit immediately after initial ref advertisement"
msgstr "surt immediatament després de l'anunci inicial de referència"
-#: upload-pack.c:1040
+#: upload-pack.c:1044
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"
-#: upload-pack.c:1042
+#: upload-pack.c:1046
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "interromp la transferència després de <n> segons d'inactivitat"
@@ -13756,26 +14037,31 @@
"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:344
+#: http.c:336
+#, c-format
+msgid "negative value for http.postbuffer; defaulting to %d"
+msgstr ""
+
+#: http.c:357
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:353
+#: http.c:366
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:1713
+#: http.c:1766
#, c-format
msgid ""
"unable to update url base from redirection:\n"
" asked for: %s\n"
" redirect: %s"
msgstr ""
-"no s'ha pogut actualitzar la URL base des de la redirecció:\n"
+"no s'ha pogut actualitzar l'URL base des de la redirecció:\n"
" petició: %s\n"
" redirecció: %s"
-#: remote-curl.c:319
+#: remote-curl.c:323
#, c-format
msgid "redirecting to %s"
msgstr "s'està redirigint a %s"
@@ -14151,7 +14437,7 @@
msgstr ""
"La fusió simple no ha funcionat, s'està intentant una fusió automàtica."
-#: git-rebase.sh:57
+#: 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"
@@ -14164,37 +14450,37 @@
"Per a agafar la branca original i deixar de fer «rebase», executeu \"git "
"rebase --abort\"."
-#: git-rebase.sh:157 git-rebase.sh:396
+#: 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:171
+#: git-rebase.sh:172
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "No es pot emmagatzemar $stash_sha1"
-#: git-rebase.sh:211
+#: git-rebase.sh:212
msgid "The pre-rebase hook refused to rebase."
msgstr "El ganxo pre-«rebase» ha refusat a fer «rebase»."
-#: git-rebase.sh:216
+#: git-rebase.sh:217
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr "Sembla que git-am està en curs. No es pot fer «rebase»."
-#: git-rebase.sh:357
+#: git-rebase.sh:358
msgid "No rebase in progress?"
msgstr "No hi ha rebasament en curs?"
-#: git-rebase.sh:368
+#: git-rebase.sh:369
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "L'acció --edit-todo només es pot usar durant un «rebase» interactiu."
-#: git-rebase.sh:375
+#: git-rebase.sh:376
msgid "Cannot read HEAD"
msgstr "No es pot llegir HEAD"
-#: git-rebase.sh:378
+#: git-rebase.sh:379
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -14202,7 +14488,7 @@
"Heu d'editar tots els conflictes de fusió i després\n"
"marcar-los com a resolts fent servir git add"
-#: git-rebase.sh:418
+#: git-rebase.sh:419
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -14223,103 +14509,103 @@
"i executeu-me de nou. M'aturo per si encara hi teniu alguna cosa\n"
"de valor."
-#: git-rebase.sh:469
+#: git-rebase.sh:470
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "font no vàlida $upstream_name"
-#: git-rebase.sh:493
+#: git-rebase.sh:494
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: ja hi ha més d'una base de fusió"
-#: git-rebase.sh:496 git-rebase.sh:500
+#: git-rebase.sh:497 git-rebase.sh:501
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: no hi ha cap base de fusió"
-#: git-rebase.sh:505
+#: git-rebase.sh:506
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "No assenyala una comissió vàlida: $onto_name"
-#: git-rebase.sh:528
+#: git-rebase.sh:529
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "fatal: no hi ha tal branca: $branch_name"
-#: git-rebase.sh:561
+#: git-rebase.sh:562
msgid "Cannot autostash"
msgstr "No es pot emmagatzemar automàticament"
-#: git-rebase.sh:566
+#: git-rebase.sh:567
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "S'ha creat un magatzem automàtic: $stash_abbrev"
-#: git-rebase.sh:570
+#: git-rebase.sh:571
msgid "Please commit or stash them."
msgstr "Si us plau, cometeu-los o emmagatzemeu-los."
-#: git-rebase.sh:590
+#: git-rebase.sh:591
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "La branca actual $branch_name està al dia."
-#: git-rebase.sh:594
+#: git-rebase.sh:595
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "La branca actual $branch_name està al dia; «rebase» forçat."
-#: git-rebase.sh:605
+#: git-rebase.sh:606
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Canvis de $mb a $onto:"
-#: git-rebase.sh:614
+#: 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..."
-#: git-rebase.sh:624
+#: 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:50
+#: git-stash.sh:53
msgid "git stash clear with parameters is unimplemented"
msgstr "git stash clear amb paràmetres no està implementat"
-#: git-stash.sh:73
+#: git-stash.sh:94
msgid "You do not have the initial commit yet"
msgstr "Encara no teniu la comissió inicial"
-#: git-stash.sh:88
+#: git-stash.sh:109
msgid "Cannot save the current index state"
msgstr "No es pot desar l'estat d'índex actual"
-#: git-stash.sh:103
+#: git-stash.sh:124
msgid "Cannot save the untracked files"
msgstr "No es pot desar els fitxers no seguits"
-#: git-stash.sh:123 git-stash.sh:136
+#: git-stash.sh:144 git-stash.sh:157
msgid "Cannot save the current worktree state"
msgstr "No es pot desar l'estat d'arbre de treball actual"
-#: git-stash.sh:140
+#: git-stash.sh:161
msgid "No changes selected"
msgstr "No hi ha canvis seleccionats"
-#: git-stash.sh:143
+#: git-stash.sh:164
msgid "Cannot remove temporary index (can't happen)"
msgstr "No es pot eliminar l'índex temporal (això no pot passar)"
-#: git-stash.sh:156
+#: git-stash.sh:177
msgid "Cannot record working tree state"
msgstr "No es pot registrar l'estat de l'arbre de treball"
-#: git-stash.sh:188
+#: git-stash.sh:209
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr "No es pot actualitzar $ref_stash amb $w_commit"
@@ -14334,7 +14620,7 @@
#. $ 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:238
+#: git-stash.sh:265
#, sh-format
msgid ""
"error: unknown option for 'stash save': $option\n"
@@ -14343,107 +14629,107 @@
"error: opció desconeguda de 'stash save': $option\n"
" Per a proveir un missatge, useu git stash save -- '$option'"
-#: git-stash.sh:251
+#: git-stash.sh:278
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:259
+#: git-stash.sh:286
msgid "No local changes to save"
msgstr "No hi ha canvis locals a desar"
-#: git-stash.sh:263
+#: git-stash.sh:291
msgid "Cannot initialize stash"
msgstr "No es pot inicialitzar el magatzem"
-#: git-stash.sh:267
+#: git-stash.sh:295
msgid "Cannot save the current status"
msgstr "No es pot desar l'estat actual"
-#: git-stash.sh:268
+#: git-stash.sh:296
#, 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:285
+#: git-stash.sh:323
msgid "Cannot remove worktree changes"
msgstr "No es poden eliminar els canvis de l'arbre de treball"
-#: git-stash.sh:403
+#: git-stash.sh:471
#, sh-format
msgid "unknown option: $opt"
msgstr "opció desconeguda: $opt"
-#: git-stash.sh:416
+#: git-stash.sh:484
msgid "No stash found."
msgstr "No s'ha trobat cap magatzem."
-#: git-stash.sh:423
+#: git-stash.sh:491
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "S'han especificat massa revisions: $REV"
-#: git-stash.sh:438
+#: git-stash.sh:506
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference no és una referència vàlida"
-#: git-stash.sh:466
+#: git-stash.sh:534
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' no és una comissió de tipus magatzem"
-#: git-stash.sh:477
+#: git-stash.sh:545
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args' no és una referència de magatzem"
-#: git-stash.sh:485
+#: git-stash.sh:553
msgid "unable to refresh index"
msgstr "no s'ha pogut actualitzar l'índex"
-#: git-stash.sh:489
+#: git-stash.sh:557
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:497
+#: git-stash.sh:565
msgid "Conflicts in index. Try without --index."
msgstr "Hi ha conflictes en l'índex. Proveu-ho sense --index."
-#: git-stash.sh:499
+#: git-stash.sh:567
msgid "Could not save index tree"
msgstr "No s'ha pogut desar l'arbre d'índex"
-#: git-stash.sh:508
+#: git-stash.sh:576
msgid "Could not restore untracked files from stash"
msgstr "No s'ha pogut restaurar els fitxers no seguits des d'emmagatzematge"
-#: git-stash.sh:533
+#: git-stash.sh:601
msgid "Cannot unstage modified files"
msgstr "No es pot fer «unstage» dels fitxers modificats"
-#: git-stash.sh:548
+#: git-stash.sh:616
msgid "Index was not unstashed."
msgstr "L'índex no estava sense emmagatzemar."
-#: git-stash.sh:562
+#: git-stash.sh:630
msgid "The stash is kept in case you need it again."
msgstr "Es conserva el magatzem en cas de que el necessiteu altra vegada."
-#: git-stash.sh:571
+#: git-stash.sh:639
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "${REV} ($s) descartada"
-#: git-stash.sh:572
+#: git-stash.sh:640
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: No s'ha pogut descartar l'entrada de magatzem"
-#: git-stash.sh:580
+#: git-stash.sh:648
msgid "No branch name specified"
msgstr "Cap nom de branca especificat"
-#: git-stash.sh:652
+#: git-stash.sh:727
msgid "(To restore them type \"git stash apply\")"
msgstr "(Per restaurar-les teclegeu \"git stash apply\")"
@@ -14533,28 +14819,28 @@
msgid "Failed to register submodule '$sm_path'"
msgstr "S'ha produït un error en registrar el submòdul '$sm_path'"
-#: git-submodule.sh:327
+#: git-submodule.sh:341
#, sh-format
msgid "Entering '$displaypath'"
msgstr "S'està entrant '$displaypath'"
-#: git-submodule.sh:347
+#: git-submodule.sh:361
#, 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."
-#: git-submodule.sh:418
+#: git-submodule.sh:432
#, sh-format
msgid "pathspec and --all are incompatible"
msgstr "--pathspec i --all són incompatibles"
-#: git-submodule.sh:423
+#: git-submodule.sh:437
#, 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:443
+#: git-submodule.sh:457
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains a .git directory\n"
@@ -14563,7 +14849,7 @@
"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:451
+#: git-submodule.sh:465
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
@@ -14572,38 +14858,38 @@
"L'arbre de treball de submòdul '$displaypath' conté modificacions locals; "
"useu '-f' per a descartar-les"
-#: git-submodule.sh:454
+#: git-submodule.sh:468
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "S'ha netejat el directori '$displaypath'"
-#: git-submodule.sh:455
+#: git-submodule.sh:469
#, 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:458
+#: git-submodule.sh:472
#, 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:467
+#: git-submodule.sh:481
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr "Submòdul '$name' ($url) no registrat per al camí '$displaypath'"
-#: git-submodule.sh:623
+#: git-submodule.sh:637
#, 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'"
-#: git-submodule.sh:633
+#: git-submodule.sh:647
#, 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:638
+#: git-submodule.sh:652
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -14612,12 +14898,12 @@
"No s'ha pogut trobar la revisió actual de ${remote_name}/${branch} en el "
"camí de submòdul '$sm_path'"
-#: git-submodule.sh:656
+#: git-submodule.sh:670
#, 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:662
+#: git-submodule.sh:676
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -14626,87 +14912,87 @@
"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:669
+#: git-submodule.sh:683
#, 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:670
+#: git-submodule.sh:684
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Camí de submòdul '$displaypath': s'ha agafat '$sha1'"
-#: git-submodule.sh:674
+#: git-submodule.sh:688
#, 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'"
-#: git-submodule.sh:675
+#: git-submodule.sh:689
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Camí de submòdul '$displaypath': s'ha fet «rebase» en '$sha1'"
-#: git-submodule.sh:680
+#: git-submodule.sh:694
#, 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:681
+#: git-submodule.sh:695
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Camí de submòdul '$displaypath': s'ha fusionat en '$sha1'"
-#: git-submodule.sh:686
+#: git-submodule.sh:700
#, 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'"
-#: git-submodule.sh:687
+#: git-submodule.sh:701
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Camí de submòdul '$displaypath': '$command $sha1'"
-#: git-submodule.sh:718
+#: git-submodule.sh:732
#, 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'"
-#: git-submodule.sh:826
+#: git-submodule.sh:840
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:878
+#: git-submodule.sh:892
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "mode inesperat $mod_dst"
-#: git-submodule.sh:898
+#: git-submodule.sh:912
#, 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:901
+#: git-submodule.sh:915
#, 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:904
+#: git-submodule.sh:918
#, 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:1051
+#: git-submodule.sh:1064
#, 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'"
-#: git-submodule.sh:1118
+#: git-submodule.sh:1136
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "S'està sincronitzant l'url de submòdul per a '$displaypath'"
@@ -15012,11 +15298,11 @@
msgid "Or you can abort the rebase with 'git rebase --abort'."
msgstr "O podeu avortar el rebasament amb 'git rebase --abort'."
-#: git-rebase--interactive.sh:1079
+#: git-rebase--interactive.sh:1083
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "No s'ha pogut eliminar CHERRY_PICK_HEAD"
-#: git-rebase--interactive.sh:1084
+#: git-rebase--interactive.sh:1088
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
@@ -15047,13 +15333,13 @@
"\n"
" git rebase --continue\n"
-#: git-rebase--interactive.sh:1101
+#: 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ó"
-#: git-rebase--interactive.sh:1106
+#: git-rebase--interactive.sh:1110
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
@@ -15061,11 +15347,11 @@
"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."
-#: git-rebase--interactive.sh:1111 git-rebase--interactive.sh:1115
+#: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119
msgid "Could not commit staged changes."
msgstr "No s'ha pogut cometre els canvis «staged»."
-#: git-rebase--interactive.sh:1139
+#: git-rebase--interactive.sh:1147
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -15079,40 +15365,40 @@
" git rebase --continue\n"
"\n"
-#: git-rebase--interactive.sh:1147 git-rebase--interactive.sh:1305
+#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313
msgid "Could not execute editor"
msgstr "No s'ha pogut executar l'editor"
-#: git-rebase--interactive.sh:1160
+#: git-rebase--interactive.sh:1168
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "No s'ha pogut agafar $switch_to"
-#: git-rebase--interactive.sh:1165
+#: git-rebase--interactive.sh:1173
msgid "No HEAD?"
msgstr "No hi ha cap HEAD?"
-#: git-rebase--interactive.sh:1166
+#: git-rebase--interactive.sh:1174
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "No s'ha pogut crear el $state_dir temporal"
-#: git-rebase--interactive.sh:1168
+#: git-rebase--interactive.sh:1176
msgid "Could not mark as interactive"
msgstr "No s'ha pogut marcar com a interactiu"
-#: git-rebase--interactive.sh:1178 git-rebase--interactive.sh:1183
+#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191
msgid "Could not init rewritten commits"
msgstr "No s'ha pogut iniciar les comissions reescrites"
-#: git-rebase--interactive.sh:1283
+#: git-rebase--interactive.sh:1291
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
msgstr[0] "Rebasa $shortrevisions sobre $shortonto ($todocount ordre)"
msgstr[1] "Rebasa $shortrevisions sobre $shortonto ($todocount ordres)"
-#: git-rebase--interactive.sh:1288
+#: git-rebase--interactive.sh:1296
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -15122,7 +15408,7 @@
"No obstant, si elimineu tot, s'avortarà el rebasament.\n"
"\n"
-#: git-rebase--interactive.sh:1295
+#: git-rebase--interactive.sh:1303
msgid "Note that empty commits are commented out"
msgstr "Nota que les comissions buides estan comentades"
@@ -15167,8 +15453,7 @@
#: 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."
+"No es pot baixar fent «rebase»: El vostre índex conté canvis sense cometre."
#: git-sh-setup.sh:248
#, sh-format
@@ -15202,68 +15487,68 @@
msgid "unstaged"
msgstr "unstaged"
-#: git-add--interactive.perl:297 git-add--interactive.perl:322
+#: git-add--interactive.perl:288 git-add--interactive.perl:313
msgid "binary"
msgstr "binari"
-#: git-add--interactive.perl:306 git-add--interactive.perl:360
+#: git-add--interactive.perl:297 git-add--interactive.perl:351
msgid "nothing"
msgstr "res"
-#: git-add--interactive.perl:342 git-add--interactive.perl:357
+#: git-add--interactive.perl:333 git-add--interactive.perl:348
msgid "unchanged"
msgstr "sense canvis"
-#: git-add--interactive.perl:653
+#: git-add--interactive.perl:644
#, 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:656
+#: git-add--interactive.perl:647
#, 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:659
+#: git-add--interactive.perl:650
#, 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:662
+#: git-add--interactive.perl:653
#, 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:671
+#: git-add--interactive.perl:662
msgid "Update"
msgstr "Actualitza"
-#: git-add--interactive.perl:683
+#: git-add--interactive.perl:674
msgid "Revert"
msgstr "Reverteix"
-#: git-add--interactive.perl:706
+#: git-add--interactive.perl:697
#, perl-format
msgid "note: %s is untracked now.\n"
msgstr "nota: %s està ara sense seguiment.\n"
-#: git-add--interactive.perl:717
+#: git-add--interactive.perl:708
msgid "Add untracked"
msgstr "Afegeix sense seguiment"
-#: git-add--interactive.perl:723
+#: git-add--interactive.perl:714
msgid "No untracked files.\n"
msgstr "Sense fitxers no seguits.\n"
-#: git-add--interactive.perl:1039
+#: git-add--interactive.perl:1030
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
@@ -15271,7 +15556,7 @@
"Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
"per «staging»."
-#: git-add--interactive.perl:1042
+#: git-add--interactive.perl:1033
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
@@ -15279,7 +15564,7 @@
"Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
"per «stashing»."
-#: git-add--interactive.perl:1045
+#: git-add--interactive.perl:1036
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
@@ -15287,7 +15572,7 @@
"Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
"per «unstaging»."
-#: git-add--interactive.perl:1048 git-add--interactive.perl:1057
+#: git-add--interactive.perl:1039 git-add--interactive.perl:1048
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
@@ -15295,15 +15580,7 @@
"Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
"per aplicar-se."
-#: git-add--interactive.perl:1051
-msgid ""
-"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"
-"per descartar-se."
-
-#: git-add--interactive.perl:1054
+#: git-add--interactive.perl:1042 git-add--interactive.perl:1045
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
@@ -15311,17 +15588,17 @@
"Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
"per descartar-se."
-#: git-add--interactive.perl:1067
+#: git-add--interactive.perl:1058
#, 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:1068
+#: git-add--interactive.perl:1059
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"
-#: git-add--interactive.perl:1074
+#: git-add--interactive.perl:1065
#, perl-format
msgid ""
"---\n"
@@ -15335,7 +15612,7 @@
"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:1082
+#: git-add--interactive.perl:1073
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"
@@ -15346,7 +15623,7 @@
"s'avorta\n"
"i el tros es deixa sense cap canvi.\n"
-#: git-add--interactive.perl:1096
+#: git-add--interactive.perl:1087
#, 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"
@@ -15357,14 +15634,14 @@
#. 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:1187
+#: 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'ha aplica. Editeu-lo de nou (si responeu \"no\" es "
"descartarà) [y/n]? "
-#: git-add--interactive.perl:1196
+#: git-add--interactive.perl:1187
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -15378,7 +15655,7 @@
"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:1202
+#: git-add--interactive.perl:1193
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -15392,7 +15669,7 @@
"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:1208
+#: git-add--interactive.perl:1199
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -15406,7 +15683,7 @@
"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:1214
+#: git-add--interactive.perl:1205
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -15415,7 +15692,7 @@
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1220
+#: git-add--interactive.perl:1211
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -15424,7 +15701,7 @@
"d - do not discard this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1226
+#: git-add--interactive.perl:1217
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -15433,7 +15710,7 @@
"d - do not discard this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1232
+#: git-add--interactive.perl:1223
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -15442,7 +15719,7 @@
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1241
+#: git-add--interactive.perl:1232
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
@@ -15455,223 +15732,223 @@
"? - print help\n"
msgstr ""
-#: git-add--interactive.perl:1272
+#: git-add--interactive.perl:1263
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:1273
+#: git-add--interactive.perl:1264
msgid "Apply them to the worktree anyway? "
msgstr "Voleu aplicar-los igualment a l'arbre de treball"
-#: git-add--interactive.perl:1276
+#: git-add--interactive.perl:1267
msgid "Nothing was applied.\n"
msgstr "No s'ha aplicat res.\n"
-#: git-add--interactive.perl:1287
+#: git-add--interactive.perl:1278
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "s'està ignorant %s no fusionat\n"
-#: git-add--interactive.perl:1296
+#: git-add--interactive.perl:1287
msgid "Only binary files changed.\n"
msgstr "Només s'han canviat els fitxers binaris.\n"
-#: git-add--interactive.perl:1298
+#: git-add--interactive.perl:1289
msgid "No changes.\n"
msgstr "Sense canvis.\n"
-#: git-add--interactive.perl:1306
+#: git-add--interactive.perl:1297
msgid "Patch update"
msgstr "Actualització del pedaç"
-#: git-add--interactive.perl:1358
+#: git-add--interactive.perl:1349
#, 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:1359
+#: git-add--interactive.perl:1350
#, perl-format
msgid "Stage deletion [y,n,q,a,d,/%s,?]? "
msgstr "Suprimeix «stage» [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1360
+#: git-add--interactive.perl:1351
#, 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:1363
+#: git-add--interactive.perl:1354
#, 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:1364
+#: git-add--interactive.perl:1355
#, perl-format
msgid "Stash deletion [y,n,q,a,d,/%s,?]? "
msgstr "Suprimeix «stage» [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1365
+#: git-add--interactive.perl:1356
#, 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:1368
+#: git-add--interactive.perl:1359
#, 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:1369
+#: git-add--interactive.perl:1360
#, perl-format
msgid "Unstage deletion [y,n,q,a,d,/%s,?]? "
msgstr "Suprimeix «Unstage» [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1370
+#: git-add--interactive.perl:1361
#, 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:1373
+#: git-add--interactive.perl:1364
#, 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:1374
+#: git-add--interactive.perl:1365
#, 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:1375
+#: git-add--interactive.perl:1366
#, 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:1378
+#: git-add--interactive.perl:1369
#, 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,?]? "
-#: git-add--interactive.perl:1379
+#: git-add--interactive.perl:1370
#, 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:1380
+#: git-add--interactive.perl:1371
#, 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:1383
+#: git-add--interactive.perl:1374
#, 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,?]? "
-#: git-add--interactive.perl:1384
+#: git-add--interactive.perl:1375
#, 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,?]? "
-#: git-add--interactive.perl:1385
+#: git-add--interactive.perl:1376
#, 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,?]? "
-#: git-add--interactive.perl:1388
+#: git-add--interactive.perl:1379
#, 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,?]? "
-#: git-add--interactive.perl:1389
+#: git-add--interactive.perl:1380
#, 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:1390
+#: git-add--interactive.perl:1381
#, 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:1493
+#: git-add--interactive.perl:1484
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:1495
+#: git-add--interactive.perl:1486
msgid "go to which hunk? "
msgstr "vés a quin tros? "
-#: git-add--interactive.perl:1504
+#: git-add--interactive.perl:1495
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "Número no vàlid: '%s'\n"
-#: git-add--interactive.perl:1509
+#: git-add--interactive.perl:1500
#, 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:1535
+#: git-add--interactive.perl:1526
msgid "search for regex? "
msgstr "Cerca per expressió regular? "
-#: git-add--interactive.perl:1548
+#: git-add--interactive.perl:1539
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "Expressió regular de cerca mal formada %s: %s\n"
-#: git-add--interactive.perl:1558
+#: git-add--interactive.perl:1549
msgid "No hunk matches the given pattern\n"
msgstr "No hi ha trossos que coincideixin amb el patró donat\n"
-#: git-add--interactive.perl:1570 git-add--interactive.perl:1592
+#: git-add--interactive.perl:1561 git-add--interactive.perl:1583
msgid "No previous hunk\n"
msgstr "Sense tros previ\n"
-#: git-add--interactive.perl:1579 git-add--interactive.perl:1598
+#: git-add--interactive.perl:1570 git-add--interactive.perl:1589
msgid "No next hunk\n"
msgstr "No hi ha tros següent\n"
-#: git-add--interactive.perl:1606
+#: git-add--interactive.perl:1597
#, 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:1658
+#: git-add--interactive.perl:1649
msgid "Review diff"
msgstr "Reviseu les diferències"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1677
+#: git-add--interactive.perl:1668
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\t - view diff between HEAD and index\n"
+"diff - view diff between HEAD and index\n"
"add untracked - add contents of untracked files to the staged set of "
"changes\n"
msgstr ""
-#: git-add--interactive.perl:1694 git-add--interactive.perl:1699
-#: git-add--interactive.perl:1702 git-add--interactive.perl:1709
-#: git-add--interactive.perl:1713 git-add--interactive.perl:1719
+#: 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
msgid "missing --"
msgstr "manca --"
-#: git-add--interactive.perl:1715
+#: git-add--interactive.perl:1706
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "desconegut --patch mode: %s"
-#: git-add--interactive.perl:1721 git-add--interactive.perl:1727
+#: git-add--interactive.perl:1712 git-add--interactive.perl:1718
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "argument %s no vàlid, s'esperava --"
@@ -15836,7 +16113,7 @@
#: git-send-email.perl:841
msgid "To whom should the emails be sent (if anyone)?"
msgstr ""
-"A quin s'haurien d'enviar els correus electrònics (si s'han d'enviar a algú)?"
+"A qui s'haurien d'enviar els correus electrònics (si s'han d'enviar a algú)?"
#: git-send-email.perl:859
#, perl-format
@@ -15900,7 +16177,9 @@
#: git-send-email.perl:1403
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."
+msgstr ""
+"No s'ha pogut inicialitzar SMTP correctament. Comproveu-ho la configuració i "
+"useu --smtp-debug."
#: git-send-email.perl:1421
#, perl-format
@@ -16002,6 +16281,92 @@
msgid "Do you really want to send %s? [y|N]: "
msgstr "Esteu segur que voleu enviar %s? [y|N]: "
+#, fuzzy
+#~ msgid "object of unknown type"
+#~ msgstr "tipus d'objecte"
+
+#, fuzzy
+#~ msgid "commit object"
+#~ msgstr "Error en objecte"
+
+#, fuzzy
+#~ msgid "tree object"
+#~ msgstr "objecte"
+
+#, fuzzy
+#~ msgid "blob object"
+#~ msgstr "objecte"
+
+#, fuzzy
+#~ msgid "other tag object"
+#~ msgstr "objecte d'arbre massa curt"
+
+#~ msgid ""
+#~ "There is nothing to exclude from by :(exclude) patterns.\n"
+#~ "Perhaps you forgot to add either ':/' or '.' ?"
+#~ msgstr ""
+#~ "No hi ha res a excloure per patrons :(exclusió).\n"
+#~ "Potser heu oblidat afegir o ':/' o '.' ?"
+
+#~ msgid "unrecognized format: %%(%s)"
+#~ msgstr "format no reconegut: %%(%s)"
+
+#~ msgid ":strip= requires a positive integer argument"
+#~ msgstr ":strip= requereix un paràmetre enter positiu"
+
+#~ msgid "ref '%s' does not have %ld components to :strip"
+#~ msgstr "la referència '%s' no té %ld components per a :strip"
+
+#~ msgid "unknown %.*s format %s"
+#~ msgstr "format de %.*s desconegut %s"
+
+#~ msgid "[%s: gone]"
+#~ msgstr "[%s: no hi és]"
+
+#~ msgid "[%s]"
+#~ msgstr "[%s]"
+
+#~ msgid "[%s: behind %d]"
+#~ msgstr "[%s: darrere per %d]"
+
+#~ msgid "[%s: ahead %d]"
+#~ msgstr "[%s: davant per %d]"
+
+#~ msgid "[%s: ahead %d, behind %d]"
+#~ msgstr "[%s: davant per %d, darrere per %d]"
+
+#~ msgid " **** invalid ref ****"
+#~ msgstr " **** referència no vàlida ****"
+
+#~ msgid "insanely long object directory %.*s"
+#~ msgstr "directori d'objectes increïblement llarg %.*s"
+
+#~ msgid "git merge [<options>] <msg> HEAD <commit>"
+#~ msgstr "git merge [<opcions>] <missatge> HEAD <comissió>"
+
+#~ msgid "'%s' is not a commit"
+#~ msgstr "'%s' no és una comissió"
+
+#~ msgid "cannot open file '%s'"
+#~ msgstr "no es pot obrir el fitxer '%s'"
+
+#~ msgid "could not close file %s"
+#~ msgstr "no s'ha pogut tancar el fitxer %s"
+
+#~ msgid "tag name too long: %.*s..."
+#~ msgstr "nom d'etiqueta massa llarg: %.*s..."
+
+#~ msgid "tag header too big."
+#~ msgstr "la capçalera d'etiqueta és massa gran."
+
+#~ msgid ""
+#~ "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"
+#~ "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 "
diff --git a/po/de.po b/po/de.po
index 913db39..679f8f4 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-02-18 01:00+0800\n"
+"POT-Creation-Date: 2017-05-05 09:35+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"
@@ -66,7 +66,7 @@
msgid "Exiting because of an unresolved conflict."
msgstr "Beende wegen unaufgelöstem Konflikt."
-#: advice.c:114 builtin/merge.c:1206
+#: advice.c:114 builtin/merge.c:1185
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert)."
@@ -350,7 +350,7 @@
msgid "cannot checkout %s"
msgstr "kann %s nicht auschecken"
-#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:248
+#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:253
#, c-format
msgid "failed to read %s"
msgstr "Fehler beim Lesen von %s"
@@ -475,7 +475,7 @@
msgid "sha1 information is lacking or useless (%s)."
msgstr "SHA-1 Information fehlt oder ist unbrauchbar (%s)."
-#: apply.c:4081 builtin/checkout.c:233 builtin/reset.c:135
+#: apply.c:4081 builtin/checkout.c:252 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry für Pfad '%s' fehlgeschlagen"
@@ -551,7 +551,7 @@
msgid "truncating .rej filename to %.*s.rej"
msgstr "Verkürze Name von .rej Datei zu %.*s.rej"
-#: apply.c:4531 builtin/fetch.c:737 builtin/fetch.c:986
+#: apply.c:4531 builtin/fetch.c:739 builtin/fetch.c:988
#, c-format
msgid "cannot open %s"
msgstr "kann '%s' nicht öffnen"
@@ -579,174 +579,174 @@
msgid "unable to read index file"
msgstr "Konnte Index-Datei nicht lesen"
-#: apply.c:4824
+#: apply.c:4823
#, c-format
msgid "can't open patch '%s': %s"
msgstr "kann Patch '%s' nicht öffnen: %s"
-#: apply.c:4849
+#: apply.c:4850
#, 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:4855 apply.c:4870
+#: apply.c:4856 apply.c:4871
#, 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:4863
+#: apply.c:4864
#, 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:4879 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391
+#: apply.c:4880 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391
msgid "Unable to write new index file"
msgstr "Konnte neue Index-Datei nicht schreiben."
-#: apply.c:4910 apply.c:4913 builtin/am.c:2277 builtin/am.c:2280
-#: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180
-#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:591
-#: builtin/submodule--helper.c:594 builtin/submodule--helper.c:960
-#: builtin/submodule--helper.c:963 builtin/submodule--helper.c:1104
+#: 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
msgid "path"
msgstr "Pfad"
-#: apply.c:4911
+#: apply.c:4912
msgid "don't apply changes matching the given path"
msgstr "keine Änderungen im angegebenen Pfad anwenden"
-#: apply.c:4914
+#: apply.c:4915
msgid "apply changes matching the given path"
msgstr "Änderungen nur im angegebenen Pfad anwenden"
-#: apply.c:4916 builtin/am.c:2286
+#: apply.c:4917 builtin/am.c:2285
msgid "num"
msgstr "Anzahl"
-#: apply.c:4917
+#: apply.c:4918
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
"<Anzahl> vorangestellte Schrägstriche von herkömmlichen Differenzpfaden "
"entfernen"
-#: apply.c:4920
+#: apply.c:4921
msgid "ignore additions made by the patch"
msgstr "hinzugefügte Zeilen des Patches ignorieren"
-#: apply.c:4922
+#: apply.c:4923
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:4926
+#: apply.c:4927
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
"die Anzahl von hinzugefügten/entfernten Zeilen in Dezimalnotation anzeigen"
-#: apply.c:4928
+#: apply.c:4929
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:4930
+#: apply.c:4931
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:4932
+#: apply.c:4933
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:4934
+#: apply.c:4935
msgid "apply a patch without touching the working tree"
msgstr "Patch anwenden, ohne Änderungen im Arbeitsverzeichnis vorzunehmen"
-#: apply.c:4936
+#: apply.c:4937
msgid "accept a patch that touches outside the working area"
msgstr ""
"Patch anwenden, der Änderungen außerhalb des Arbeitsverzeichnisses vornimmt"
-#: apply.c:4938
+#: apply.c:4939
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "Patch anwenden (Benutzung mit --stat/--summary/--check)"
-#: apply.c:4940
+#: apply.c:4941
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:4942
+#: apply.c:4943
msgid "build a temporary index based on embedded index information"
msgstr ""
"einen temporären Index, basierend auf den integrierten Index-Informationen, "
"erstellen"
-#: apply.c:4945 builtin/checkout-index.c:169 builtin/ls-files.c:507
+#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:515
msgid "paths are separated with NUL character"
msgstr "Pfade sind getrennt durch NUL Zeichen"
-#: apply.c:4947
+#: apply.c:4948
msgid "ensure at least <n> lines of context match"
msgstr ""
"sicher stellen, dass mindestens <n> Zeilen des Kontextes übereinstimmen"
-#: apply.c:4948 builtin/am.c:2265
+#: apply.c:4949 builtin/am.c:2264
msgid "action"
msgstr "Aktion"
-#: apply.c:4949
+#: apply.c:4950
msgid "detect new or modified lines that have whitespace errors"
msgstr "neue oder geänderte Zeilen, die Whitespace-Fehler haben, ermitteln"
-#: apply.c:4952 apply.c:4955
+#: apply.c:4953 apply.c:4956
msgid "ignore changes in whitespace when finding context"
msgstr "Änderungen im Whitespace bei der Suche des Kontextes ignorieren"
-#: apply.c:4958
+#: apply.c:4959
msgid "apply the patch in reverse"
msgstr "den Patch in umgekehrter Reihenfolge anwenden"
-#: apply.c:4960
+#: apply.c:4961
msgid "don't expect at least one line of context"
msgstr "keinen Kontext erwarten"
-#: apply.c:4962
+#: apply.c:4963
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr ""
"zurückgewiesene Patch-Blöcke in entsprechenden *.rej Dateien hinterlassen"
-#: apply.c:4964
+#: apply.c:4965
msgid "allow overlapping hunks"
msgstr "sich überlappende Patch-Blöcke erlauben"
-#: apply.c:4965 builtin/add.c:267 builtin/check-ignore.c:19
+#: 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:1860 builtin/mv.c:122 builtin/read-tree.c:114
+#: builtin/log.c:1867 builtin/mv.c:122 builtin/read-tree.c:134
msgid "be verbose"
msgstr "erweiterte Ausgaben"
-#: apply.c:4967
+#: apply.c:4968
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "fehlerhaft erkannten fehlenden Zeilenumbruch am Dateiende tolerieren"
-#: apply.c:4970
+#: apply.c:4971
msgid "do not trust the line counts in the hunk headers"
msgstr "den Zeilennummern im Kopf des Patch-Blocks nicht vertrauen"
-#: apply.c:4972 builtin/am.c:2274
+#: apply.c:4973 builtin/am.c:2273
msgid "root"
msgstr "Wurzelverzeichnis"
-#: apply.c:4973
+#: apply.c:4974
msgid "prepend <root> to all filenames"
msgstr "<Wurzelverzeichnis> vor alle Dateinamen stellen"
@@ -769,103 +769,108 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <Repository> [--exec <Programm>] --list"
-#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300
+#: archive.c:332 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "Pfadspezifikation '%s' stimmt mit keinen Dateien überein"
-#: archive.c:429
+#: archive.c:417
msgid "fmt"
msgstr "Format"
-#: archive.c:429
+#: archive.c:417
msgid "archive format"
msgstr "Archivformat"
-#: archive.c:430 builtin/log.c:1429
+#: archive.c:418 builtin/log.c:1436
msgid "prefix"
msgstr "Präfix"
-#: archive.c:431
+#: archive.c:419
msgid "prepend prefix to each pathname in the archive"
msgstr "einen Präfix vor jeden Pfadnamen in dem Archiv stellen"
-#: archive.c:432 builtin/blame.c:2607 builtin/blame.c:2608 builtin/config.c:59
-#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1054
-#: builtin/hash-object.c:101 builtin/ls-files.c:541 builtin/ls-files.c:544
-#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109
+#: 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
msgid "file"
msgstr "Datei"
-#: archive.c:433 builtin/archive.c:89
+#: archive.c:421 builtin/archive.c:89
msgid "write the archive to this file"
msgstr "das Archiv in diese Datei schreiben"
-#: archive.c:435
+#: archive.c:423
msgid "read .gitattributes in working directory"
msgstr ".gitattributes aus dem Arbeitsverzeichnis lesen"
-#: archive.c:436
+#: archive.c:424
msgid "report archived files on stderr"
msgstr "archivierte Dateien in der Standard-Fehlerausgabe ausgeben"
-#: archive.c:437
+#: archive.c:425
msgid "store only"
msgstr "nur speichern"
-#: archive.c:438
+#: archive.c:426
msgid "compress faster"
msgstr "schneller komprimieren"
-#: archive.c:446
+#: archive.c:434
msgid "compress better"
msgstr "besser komprimieren"
-#: archive.c:449
+#: archive.c:437
msgid "list supported archive formats"
msgstr "unterstützte Archivformate auflisten"
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88
-#: builtin/submodule--helper.c:603 builtin/submodule--helper.c:969
+#: archive.c:439 builtin/archive.c:90 builtin/clone.c:103 builtin/clone.c:106
+#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
msgid "repo"
msgstr "Repository"
-#: archive.c:452 builtin/archive.c:91
+#: archive.c:440 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr "Archiv vom Remote-Repository <Repository> abrufen"
-#: archive.c:453 builtin/archive.c:92 builtin/notes.c:485
+#: archive.c:441 builtin/archive.c:92 builtin/notes.c:485
msgid "command"
msgstr "Programm"
-#: archive.c:454 builtin/archive.c:93
+#: archive.c:442 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr "Pfad zum externen \"git-upload-archive\"-Programm"
-#: archive.c:461
+#: archive.c:449
msgid "Unexpected option --remote"
msgstr "Unerwartete Option --remote"
-#: archive.c:463
+#: archive.c:451
msgid "Option --exec can only be used together with --remote"
msgstr "Die Option --exec kann nur zusammen mit --remote verwendet werden."
-#: archive.c:465
+#: archive.c:453
msgid "Unexpected option --output"
msgstr "Unerwartete Option --output"
-#: archive.c:487
+#: archive.c:475
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Unbekanntes Archivformat '%s'"
-#: archive.c:494
+#: archive.c:482
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Argument für Format '%s' nicht unterstützt: -%d"
-#: attr.c:263
+#: attr.c:212
+#, c-format
+msgid "%.*s is not a valid attribute name"
+msgstr "%.*s ist kein gültiger Attributname"
+
+#: attr.c:408
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -873,27 +878,27 @@
"Verneinende Muster werden in Git-Attributen ignoriert.\n"
"Benutzen Sie '\\!' für führende Ausrufezeichen."
-#: bisect.c:441
+#: bisect.c:444
#, c-format
msgid "Could not open file '%s'"
msgstr "Konnte Datei '%s' nicht öffnen"
-#: bisect.c:446
+#: bisect.c:449
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "Ungültiger Inhalt bzgl. Anführungsstriche in Datei '%s': %s"
-#: bisect.c:655
+#: bisect.c:657
#, c-format
msgid "We cannot bisect more!\n"
msgstr "Keine binäre Suche mehr möglich!\n"
-#: bisect.c:708
+#: bisect.c:710
#, c-format
msgid "Not a valid commit name %s"
msgstr "%s ist kein gültiger Commit-Name"
-#: bisect.c:732
+#: bisect.c:734
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -902,7 +907,7 @@
"Die Merge-Basis %s ist fehlerhaft.\n"
"Das bedeutet, der Fehler wurde zwischen %s und [%s] behoben.\n"
-#: bisect.c:737
+#: bisect.c:739
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -911,7 +916,7 @@
"Die Merge-Basis %s ist neu.\n"
"Das bedeutet, die Eigenschaft hat sich zwischen %s und [%s] geändert.\n"
-#: bisect.c:742
+#: bisect.c:744
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -920,7 +925,7 @@
"Die Merge-Basis %s ist %s.\n"
"Das bedeutet, der erste '%s' Commit befindet sich zwischen %s und [%s].\n"
-#: bisect.c:750
+#: bisect.c:752
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -931,7 +936,7 @@
"git bisect kann in diesem Fall nicht richtig arbeiten.\n"
"Vielleicht verwechselten Sie %s und %s Commits?\n"
-#: bisect.c:763
+#: bisect.c:765
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -943,36 +948,36 @@
"erste %s Commit zwischen %s und %s befindet.\n"
"Es wird dennoch fortgesetzt."
-#: bisect.c:798
+#: bisect.c:800
#, 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:849
+#: bisect.c:851
#, c-format
msgid "a %s revision is needed"
msgstr "ein %s Commit wird benötigt"
-#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:262
+#: bisect.c:868 builtin/notes.c:174 builtin/tag.c:255
#, c-format
msgid "could not create file '%s'"
msgstr "konnte Datei '%s' nicht erstellen"
-#: bisect.c:917
+#: bisect.c:919
#, c-format
msgid "could not read file '%s'"
msgstr "Konnte Datei '%s' nicht lesen"
-#: bisect.c:947
+#: bisect.c:949
msgid "reading bisect refs failed"
msgstr "Lesen von Referenzen für binäre Suche fehlgeschlagen"
-#: bisect.c:967
+#: bisect.c:969
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s war sowohl %s als auch %s\n"
-#: bisect.c:975
+#: bisect.c:977
#, c-format
msgid ""
"No testable commit found.\n"
@@ -981,7 +986,7 @@
"Kein testbarer Commit gefunden.\n"
"Vielleicht starteten Sie mit falschen Pfad-Parametern?\n"
-#: bisect.c:994
+#: bisect.c:996
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -990,7 +995,7 @@
#. TRANSLATORS: the last %s will be replaced with
#. "(roughly %d steps)" translation
-#: bisect.c:998
+#: bisect.c:1000
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
@@ -1136,7 +1141,7 @@
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' ist bereits in '%s' ausgecheckt"
-#: branch.c:363
+#: branch.c:364
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "HEAD des Arbeitsverzeichnisses %s ist nicht aktualisiert."
@@ -1151,7 +1156,7 @@
msgid "unrecognized header: %s%s (%d)"
msgstr "nicht erkannter Kopfbereich: %s%s (%d)"
-#: bundle.c:87 sequencer.c:1331 sequencer.c:1752 builtin/commit.c:777
+#: bundle.c:87 sequencer.c:1341 sequencer.c:1767 builtin/commit.c:777
#, c-format
msgid "could not open '%s'"
msgstr "Konnte '%s' nicht öffnen"
@@ -1160,10 +1165,10 @@
msgid "Repository lacks these prerequisite commits:"
msgstr "Dem Repository fehlen folgende vorausgesetzte Commits:"
-#: bundle.c:163 ref-filter.c:1499 sequencer.c:1154 sequencer.c:2290
-#: builtin/blame.c:2820 builtin/commit.c:1061 builtin/log.c:348
-#: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909
-#: builtin/merge.c:360 builtin/shortlog.c:177
+#: 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"
@@ -1202,7 +1207,7 @@
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:165 builtin/log.c:1572 builtin/shortlog.c:282
+#: bundle.c:443 builtin/log.c:170 builtin/log.c:1579 builtin/shortlog.c:281
#, c-format
msgid "unrecognized argument: %s"
msgstr "nicht erkanntes Argument: %s"
@@ -1225,8 +1230,8 @@
msgid "invalid color value: %.*s"
msgstr "Ungültiger Farbwert: %.*s"
-#: commit.c:40 sequencer.c:1564 builtin/am.c:421 builtin/am.c:457
-#: builtin/am.c:1493 builtin/am.c:2127
+#: commit.c:40 sequencer.c:1579 builtin/am.c:419 builtin/am.c:455
+#: builtin/am.c:1489 builtin/am.c:2126
#, c-format
msgid "could not parse %s"
msgstr "konnte %s nicht parsen"
@@ -1236,7 +1241,7 @@
msgid "%s %s is not a commit!"
msgstr "%s %s ist kein Commit!"
-#: commit.c:1514
+#: commit.c:1511
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
@@ -1252,144 +1257,169 @@
msgid "memory exhausted"
msgstr "Speicher verbraucht"
-#: config.c:518
+#: config.c:191
+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
#, c-format
msgid "bad config line %d in blob %s"
msgstr "Ungültige Konfigurationszeile %d in Blob %s"
-#: config.c:522
+#: config.c:715
#, c-format
msgid "bad config line %d in file %s"
msgstr "Ungültige Konfigurationszeile %d in Datei %s"
-#: config.c:526
+#: config.c:719
#, c-format
msgid "bad config line %d in standard input"
msgstr "Ungültige Konfigurationszeile %d in Standard-Eingabe"
-#: config.c:530
+#: config.c:723
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "Ungültige Konfigurationszeile %d in Submodul-Blob %s"
-#: config.c:534
+#: config.c:727
#, c-format
msgid "bad config line %d in command line %s"
msgstr "Ungültige Konfigurationszeile %d in Kommandozeile %s"
-#: config.c:538
+#: config.c:731
#, c-format
msgid "bad config line %d in %s"
msgstr "Ungültige Konfigurationszeile %d in %s"
-#: config.c:657
+#: config.c:859
msgid "out of range"
msgstr "Außerhalb des Bereichs"
-#: config.c:657
+#: config.c:859
msgid "invalid unit"
msgstr "Ungültige Einheit"
-#: config.c:663
+#: config.c:865
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s': %s"
-#: config.c:668
+#: config.c:870
#, 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:671
+#: config.c:873
#, 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:674
+#: config.c:876
#, 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:677
+#: config.c:879
#, 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:680
+#: config.c:882
#, 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:683
+#: config.c:885
#, 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:770
+#: config.c:980
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "Fehler beim Erweitern des Nutzerverzeichnisses in: '%s'"
-#: config.c:865 config.c:876
+#: config.c:1075 config.c:1086
#, c-format
msgid "bad zlib compression level %d"
msgstr "ungültiger zlib Komprimierungsgrad %d"
-#: config.c:993
+#: config.c:1203
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "Ungültiger Modus für Objekterstellung: %s"
-#: config.c:1149
+#: config.c:1359
#, c-format
msgid "bad pack compression level %d"
msgstr "ungültiger Komprimierungsgrad (%d) für Paketierung"
-#: config.c:1339
+#: config.c:1557
msgid "unable to parse command-line config"
msgstr ""
"Konnte die über die Befehlszeile angegebene Konfiguration nicht parsen."
-#: config.c:1389
+#: config.c:1611
msgid "unknown error occurred while reading the configuration files"
msgstr ""
"Es trat ein unbekannter Fehler beim Lesen der Konfigurationsdateien auf."
-#: config.c:1743
+#: config.c:1970
+#, c-format
+msgid "Invalid %s: '%s'"
+msgstr "Ungültiger %s: '%s'"
+
+#: config.c:1991
+#, 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
+#, 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
#, 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:1745
+#: config.c:2030
#, 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:1804
+#: config.c:2089
#, c-format
msgid "%s has multiple values"
msgstr "%s hat mehrere Werte"
-#: config.c:2225 config.c:2450
+#: config.c:2423 config.c:2648
#, c-format
msgid "fstat on %s failed"
msgstr "fstat auf %s fehlgeschlagen"
-#: config.c:2343
+#: config.c:2541
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "Konnte '%s' nicht zu '%s' setzen."
-#: config.c:2345
+#: config.c:2543 builtin/remote.c:774
#, c-format
msgid "could not unset '%s'"
msgstr "Konnte '%s' nicht aufheben."
@@ -1564,21 +1594,21 @@
"Fehler in 'diff.dirstat' Konfigurationsvariable gefunden:\n"
"%s"
-#: diff.c:3085
+#: diff.c:3102
#, c-format
msgid "external diff died, stopping at %s"
msgstr "externes Diff-Programm unerwartet beendet, angehalten bei %s"
-#: diff.c:3411
+#: diff.c:3428
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:3501
+#: diff.c:3518
msgid "--follow requires exactly one pathspec"
msgstr "--follow erfordert genau eine Pfadspezifikation"
-#: diff.c:3664
+#: diff.c:3681
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -1587,22 +1617,22 @@
"Fehler beim Parsen des --dirstat/-X Optionsparameters:\n"
"%s"
-#: diff.c:3678
+#: diff.c:3695
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "Fehler beim Parsen des --submodule Optionsparameters: '%s'"
-#: diff.c:4696
+#: diff.c:4719
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:4699
+#: diff.c:4722
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:4702
+#: diff.c:4725
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -1610,188 +1640,213 @@
"Sie könnten die Variable %s auf mindestens %d setzen und den Befehl\n"
"erneut versuchen."
-#: dir.c:1862
+#: dir.c:1899
msgid "failed to get kernel name and information"
msgstr "Fehler beim Sammeln von Namen und Informationen zum Kernel"
-#: dir.c:1981
+#: dir.c:2018
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:2759
+#: dir.c:2776 dir.c:2781
+#, c-format
+msgid "could not create directories for %s"
+msgstr "Konnte Verzeichnisse für '%s' nicht erstellen."
+
+#: dir.c:2806
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "Konnte Git-Verzeichnis nicht von '%s' nach '%s' migrieren."
-#: fetch-pack.c:213
+#: entry.c:280
+#, c-format
+msgid "could not stat file '%s'"
+msgstr "konnte Datei '%s' nicht lesen"
+
+#: fetch-pack.c:249
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: erwartete shallow-Liste"
-#: fetch-pack.c:225
+#: fetch-pack.c:261
msgid "git fetch-pack: expected ACK/NAK, got EOF"
msgstr "git fetch-pack: ACK/NAK erwartet, EOF bekommen"
-#: fetch-pack.c:243
+#: fetch-pack.c:280 builtin/archive.c:63
+#, c-format
+msgid "remote error: %s"
+msgstr "Fehler am anderen Ende: %s"
+
+#: fetch-pack.c:281
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: ACK/NAK erwartet, '%s' bekommen"
-#: fetch-pack.c:295
+#: fetch-pack.c:333
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc benötigt multi_ack_detailed"
-#: fetch-pack.c:381
+#: fetch-pack.c:419
#, c-format
msgid "invalid shallow line: %s"
msgstr "Ungültige shallow-Zeile: %s"
-#: fetch-pack.c:387
+#: fetch-pack.c:425
#, c-format
msgid "invalid unshallow line: %s"
msgstr "Ungültige unshallow-Zeile: %s"
-#: fetch-pack.c:389
+#: fetch-pack.c:427
#, c-format
msgid "object not found: %s"
msgstr "Objekt nicht gefunden: %s"
-#: fetch-pack.c:392
+#: fetch-pack.c:430
#, c-format
msgid "error in object: %s"
msgstr "Fehler in Objekt: %s"
-#: fetch-pack.c:394
+#: fetch-pack.c:432
#, c-format
msgid "no shallow found: %s"
msgstr "Kein shallow-Objekt gefunden: %s"
-#: fetch-pack.c:397
+#: fetch-pack.c:435
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "shallow/unshallow erwartet, %s bekommen"
-#: fetch-pack.c:436
+#: fetch-pack.c:474
#, c-format
msgid "got %s %d %s"
msgstr "%s %d %s bekommen"
-#: fetch-pack.c:450
+#: fetch-pack.c:488
#, c-format
msgid "invalid commit %s"
msgstr "Ungültiger Commit %s"
-#: fetch-pack.c:483
+#: fetch-pack.c:521
msgid "giving up"
msgstr "Gebe auf"
-#: fetch-pack.c:493 progress.c:235
+#: fetch-pack.c:531 progress.c:235
msgid "done"
msgstr "Fertig"
-#: fetch-pack.c:505
+#: fetch-pack.c:543
#, c-format
msgid "got %s (%d) %s"
msgstr "%s (%d) %s bekommen"
-#: fetch-pack.c:551
+#: fetch-pack.c:589
#, c-format
msgid "Marking %s as complete"
msgstr "Markiere %s als vollständig"
-#: fetch-pack.c:697
+#: fetch-pack.c:737
#, c-format
msgid "already have %s (%s)"
msgstr "habe %s (%s) bereits"
-#: fetch-pack.c:735
+#: fetch-pack.c:775
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack: Fehler beim Starten des sideband demultiplexer"
-#: fetch-pack.c:743
+#: fetch-pack.c:783
msgid "protocol error: bad pack header"
msgstr "Protokollfehler: ungültiger Pack-Header"
-#: fetch-pack.c:799
+#: fetch-pack.c:839
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: konnte %s nicht starten"
-#: fetch-pack.c:815
+#: fetch-pack.c:855
#, c-format
msgid "%s failed"
msgstr "%s fehlgeschlagen"
-#: fetch-pack.c:817
+#: fetch-pack.c:857
msgid "error in sideband demultiplexer"
msgstr "Fehler in sideband demultiplexer"
-#: fetch-pack.c:844
+#: fetch-pack.c:884
msgid "Server does not support shallow clients"
msgstr "Server unterstützt keine shallow-Clients"
-#: fetch-pack.c:848
+#: fetch-pack.c:888
msgid "Server supports multi_ack_detailed"
msgstr "Server unterstützt multi_ack_detailed"
-#: fetch-pack.c:851
+#: fetch-pack.c:891
msgid "Server supports no-done"
msgstr "Server unterstützt no-done"
-#: fetch-pack.c:857
+#: fetch-pack.c:897
msgid "Server supports multi_ack"
msgstr "Server unterstützt multi_ack"
-#: fetch-pack.c:861
+#: fetch-pack.c:901
msgid "Server supports side-band-64k"
msgstr "Server unterstützt side-band-64k"
-#: fetch-pack.c:865
+#: fetch-pack.c:905
msgid "Server supports side-band"
msgstr "Server unterstützt side-band"
-#: fetch-pack.c:869
+#: fetch-pack.c:909
msgid "Server supports allow-tip-sha1-in-want"
msgstr "Server unterstützt allow-tip-sha1-in-want"
-#: fetch-pack.c:873
+#: fetch-pack.c:913
msgid "Server supports allow-reachable-sha1-in-want"
msgstr "Server unterstützt allow-reachable-sha1-in-want"
-#: fetch-pack.c:883
+#: fetch-pack.c:923
msgid "Server supports ofs-delta"
msgstr "Server unterstützt ofs-delta"
-#: fetch-pack.c:890
+#: fetch-pack.c:930
#, c-format
msgid "Server version is %.*s"
msgstr "Server-Version ist %.*s"
-#: fetch-pack.c:896
+#: fetch-pack.c:936
msgid "Server does not support --shallow-since"
msgstr "Server unterstützt kein --shallow-since"
-#: fetch-pack.c:900
+#: fetch-pack.c:940
msgid "Server does not support --shallow-exclude"
msgstr "Server unterstützt kein --shallow-exclude"
-#: fetch-pack.c:902
+#: fetch-pack.c:942
msgid "Server does not support --deepen"
msgstr "Server unterstützt kein --deepen"
-#: fetch-pack.c:913
+#: fetch-pack.c:953
msgid "no common commits"
msgstr "keine gemeinsamen Commits"
-#: fetch-pack.c:925
+#: fetch-pack.c:965
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: Abholen fehlgeschlagen."
-#: fetch-pack.c:1087
+#: fetch-pack.c:1127
msgid "no matching remote head"
msgstr "kein übereinstimmender Remote-Branch"
+#: fetch-pack.c:1149
+#, c-format
+msgid "no such remote ref %s"
+msgstr "keine solche Remote-Referenz %s"
+
+#: fetch-pack.c:1152
+#, 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
msgid "gpg failed to sign the data"
msgstr "gpg beim Signieren der Daten fehlgeschlagen"
@@ -1810,17 +1865,17 @@
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "Ignoriere ungültige Farbe '%.*s' in log.graphColors"
-#: grep.c:1794
+#: grep.c:1796
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s': konnte %s nicht lesen"
-#: grep.c:1811 builtin/clone.c:381 builtin/diff.c:81 builtin/rm.c:133
+#: grep.c:1813 builtin/clone.c:399 builtin/diff.c:81 builtin/rm.c:133
#, c-format
msgid "failed to stat '%s'"
msgstr "Konnte '%s' nicht lesen"
-#: grep.c:1822
+#: grep.c:1824
#, c-format
msgid "'%s': short read"
msgstr "'%s': read() zu kurz"
@@ -1889,7 +1944,7 @@
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: ident.c:334
+#: ident.c:343
msgid ""
"\n"
"*** Please tell me who you are.\n"
@@ -1915,6 +1970,39 @@
"Lassen Sie die Option \"--global\" weg, um die Identität nur\n"
"für dieses Repository zu setzen.\n"
+#: ident.c:367
+msgid "no email was given and auto-detection is disabled"
+msgstr "keine E-Mail angegeben und automatische Erkennung ist deaktiviert"
+
+#: ident.c:372
+#, 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
+msgid "no name was given and auto-detection is disabled"
+msgstr "kein Name angegeben und automatische Erkennung ist deaktiviert"
+
+#: ident.c:388
+#, c-format
+msgid "unable to auto-detect name (got '%s')"
+msgstr "konnte Namen nicht automatisch erkennen ('%s' erhalten)"
+
+#: ident.c:396
+#, c-format
+msgid "empty ident name (for <%s>) not allowed"
+msgstr "Leerer Name in Identifikation (für <%s>) nicht erlaubt."
+
+#: ident.c:402
+#, 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
+#, c-format
+msgid "invalid date format: %s"
+msgstr "Ungültiges Datumsformat: %s"
+
#: lockfile.c:152
#, c-format
msgid ""
@@ -1944,8 +2032,8 @@
msgid "failed to read the cache"
msgstr "Lesen des Zwischenspeichers fehlgeschlagen"
-#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374
-#: builtin/checkout.c:588 builtin/clone.c:731
+#: merge.c:96 builtin/am.c:1999 builtin/am.c:2034 builtin/checkout.c:393
+#: builtin/checkout.c:607 builtin/clone.c:749
msgid "unable to write new index file"
msgstr "Konnte neue Index-Datei nicht schreiben."
@@ -2015,7 +2103,7 @@
msgid "Unable to add %s to database"
msgstr "Konnte %s nicht zur Datenbank hinzufügen"
-#: merge-recursive.c:1088 merge-recursive.c:1102
+#: merge-recursive.c:1092
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2024,7 +2112,16 @@
"KONFLIKT (%s/löschen): %s gelöscht in %s und %s in %s. Stand %s von %s wurde "
"im Arbeitsbereich gelassen."
-#: merge-recursive.c:1094 merge-recursive.c:1107
+#: merge-recursive.c:1097
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree."
+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
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2033,20 +2130,29 @@
"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:1150
+#: merge-recursive.c:1109
+#, 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 ""
+"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
msgid "rename"
msgstr "umbenennen"
-#: merge-recursive.c:1150
+#: merge-recursive.c:1143
msgid "renamed"
msgstr "umbenannt"
-#: merge-recursive.c:1207
+#: merge-recursive.c:1200
#, 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:1232
+#: merge-recursive.c:1225
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -2055,139 +2161,139 @@
"KONFLIKT (umbenennen/umbenennen): Benenne um \"%s\"->\"%s\" in Branch \"%s\" "
"und \"%s\"->\"%s\" in Branch \"%s\"%s"
-#: merge-recursive.c:1237
+#: merge-recursive.c:1230
msgid " (left unresolved)"
msgstr " (bleibt unaufgelöst)"
-#: merge-recursive.c:1299
+#: merge-recursive.c:1292
#, 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:1332
+#: merge-recursive.c:1325
#, 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:1535
+#: merge-recursive.c:1528
#, 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:1550
+#: merge-recursive.c:1543
#, c-format
msgid "Adding merged %s"
msgstr "Füge zusammengeführte Datei %s hinzu"
-#: merge-recursive.c:1557 merge-recursive.c:1771
+#: merge-recursive.c:1550 merge-recursive.c:1780
#, c-format
msgid "Adding as %s instead"
msgstr "Füge stattdessen als %s hinzu"
-#: merge-recursive.c:1614
+#: merge-recursive.c:1607
#, c-format
msgid "cannot read object %s"
msgstr "kann Objekt %s nicht lesen"
-#: merge-recursive.c:1617
+#: merge-recursive.c:1610
#, c-format
msgid "object %s is not a blob"
msgstr "Objekt %s ist kein Blob"
-#: merge-recursive.c:1670
+#: merge-recursive.c:1679
msgid "modify"
msgstr "ändern"
-#: merge-recursive.c:1670
+#: merge-recursive.c:1679
msgid "modified"
msgstr "geändert"
-#: merge-recursive.c:1680
+#: merge-recursive.c:1689
msgid "content"
msgstr "Inhalt"
-#: merge-recursive.c:1687
+#: merge-recursive.c:1696
msgid "add/add"
msgstr "hinzufügen/hinzufügen"
-#: merge-recursive.c:1723
+#: merge-recursive.c:1732
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "%s ausgelassen (Ergebnis des Merges existiert bereits)"
-#: merge-recursive.c:1737
+#: merge-recursive.c:1746
#, c-format
msgid "Auto-merging %s"
msgstr "automatischer Merge von %s"
-#: merge-recursive.c:1741 git-submodule.sh:930
+#: merge-recursive.c:1750 git-submodule.sh:944
msgid "submodule"
msgstr "Submodul"
-#: merge-recursive.c:1742
+#: merge-recursive.c:1751
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "KONFLIKT (%s): Merge-Konflikt in %s"
-#: merge-recursive.c:1836
+#: merge-recursive.c:1845
#, c-format
msgid "Removing %s"
msgstr "Entferne %s"
-#: merge-recursive.c:1862
+#: merge-recursive.c:1871
msgid "file/directory"
msgstr "Datei/Verzeichnis"
-#: merge-recursive.c:1868
+#: merge-recursive.c:1877
msgid "directory/file"
msgstr "Verzeichnis/Datei"
-#: merge-recursive.c:1874
+#: merge-recursive.c:1883
#, 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:1883
+#: merge-recursive.c:1892
#, c-format
msgid "Adding %s"
msgstr "Füge %s hinzu"
-#: merge-recursive.c:1920
+#: merge-recursive.c:1929
msgid "Already up-to-date!"
msgstr "Bereits aktuell!"
-#: merge-recursive.c:1929
+#: merge-recursive.c:1938
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "Zusammenführen der \"Tree\"-Objekte %s und %s fehlgeschlagen"
-#: merge-recursive.c:2012
+#: merge-recursive.c:2021
msgid "Merging:"
msgstr "Merge:"
-#: merge-recursive.c:2025
+#: merge-recursive.c:2034
#, 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:2064
+#: merge-recursive.c:2073
msgid "merge returned no commit"
msgstr "Merge hat keinen Commit zurückgegeben"
-#: merge-recursive.c:2127
+#: merge-recursive.c:2136
#, c-format
msgid "Could not parse object '%s'"
msgstr "Konnte Objekt '%s' nicht parsen."
-#: merge-recursive.c:2141 builtin/merge.c:645 builtin/merge.c:792
+#: merge-recursive.c:2150 builtin/merge.c:645 builtin/merge.c:792
msgid "Unable to write index."
msgstr "Konnte Index nicht schreiben."
@@ -2269,18 +2375,35 @@
msgid "malformed object name '%s'"
msgstr "fehlerhafter Objekt-Name '%s'"
-#: path.c:826
+#: path.c:810
#, c-format
msgid "Could not make %s writable by group"
msgstr "Konnte Gruppenschreibrecht für %s nicht setzen."
-#: pathspec.c:142
+#: pathspec.c:125
+msgid "Escape character '\\' not allowed as last character in attr value"
+msgstr "Escape-Zeichen '\\' als letztes Zeichen in Attributwert nicht erlaubt"
+
+#: pathspec.c:143
+msgid "Only one 'attr:' specification is allowed."
+msgstr "Es ist nur eine Angabe von 'attr:' erlaubt."
+
+#: pathspec.c:146
+msgid "attr spec must not be empty"
+msgstr "Angabe von 'attr:' darf nicht leer sein"
+
+#: pathspec.c:189
+#, c-format
+msgid "invalid attribute name %s"
+msgstr "Ungültiger Attributname %s"
+
+#: pathspec.c:254
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
"Globale Einstellungen zur Pfadspezifikation 'glob' und 'noglob' sind "
"inkompatibel."
-#: pathspec.c:149
+#: pathspec.c:261
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
@@ -2288,52 +2411,52 @@
"Globale Einstellung zur Pfadspezifikation 'literal' ist inkompatibel\n"
"mit allen anderen Optionen."
-#: pathspec.c:188
+#: pathspec.c:301
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr "ungültiger Parameter für Pfadspezifikationsangabe 'prefix'"
-#: pathspec.c:201
+#: pathspec.c:322
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr "ungültige Pfadspezifikationsangabe '%.*s' in '%s'"
-#: pathspec.c:206
+#: pathspec.c:327
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr "Fehlendes ')' am Ende der Pfadspezifikationsangabe in '%s'"
-#: pathspec.c:238
+#: pathspec.c:365
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr "nicht unterstützte Pfadspezifikationsangabe '%c' in '%s'"
-#: pathspec.c:293 pathspec.c:315
+#: 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:350
+#: pathspec.c:483
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s: 'literal' und 'glob' sind inkompatibel"
-#: pathspec.c:363
+#: pathspec.c:496
#, c-format
msgid "%s: '%s' is outside repository"
msgstr "%s: '%s' liegt außerhalb des Repositories"
-#: pathspec.c:451
+#: pathspec.c:584
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "'%s' (Kürzel: '%c')"
-#: pathspec.c:461
+#: pathspec.c:594
#, 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:511
+#: pathspec.c:644
msgid ""
"empty strings as pathspecs will be made invalid in upcoming releases. please "
"use . instead if you meant to match all paths"
@@ -2342,24 +2465,16 @@
"ungültig.\n"
"Bitte benutzen Sie stattdessen . wenn Sie alle Pfade meinen."
-#: pathspec.c:535
+#: pathspec.c:668
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "Pfadspezifikation '%s' ist hinter einer symbolischen Verknüpfung"
-#: pathspec.c:544
-msgid ""
-"There is nothing to exclude from by :(exclude) patterns.\n"
-"Perhaps you forgot to add either ':/' or '.' ?"
-msgstr ""
-":(exclude) Muster, aber keine anderen Pfadspezifikationen angegeben.\n"
-"Vielleicht haben Sie vergessen entweder ':/' oder '.' hinzuzufügen?"
-
#: pretty.c:982
msgid "unable to parse --pretty format"
msgstr "Konnte --pretty Format nicht parsen."
-#: read-cache.c:1307
+#: read-cache.c:1442
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -2368,7 +2483,7 @@
"index.version gesetzt, aber Wert ungültig.\n"
"Verwende Version %i"
-#: read-cache.c:1317
+#: read-cache.c:1452
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -2377,161 +2492,268 @@
"GIT_INDEX_VERSION gesetzt, aber Wert ungültig.\n"
"Verwende Version %i"
-#: refs.c:576 builtin/merge.c:844
+#: read-cache.c:2375 sequencer.c:1350 sequencer.c:2048
+#, c-format
+msgid "could not stat '%s'"
+msgstr "Konnte '%s' nicht lesen."
+
+#: read-cache.c:2388
+#, c-format
+msgid "unable to open git dir: %s"
+msgstr "konnte Git-Verzeichnis nicht öffnen: %s"
+
+#: read-cache.c:2400
+#, c-format
+msgid "unable to unlink: %s"
+msgstr "Konnte '%s' nicht entfernen."
+
+#: refs.c:620 builtin/merge.c:844
#, c-format
msgid "Could not open '%s' for writing"
msgstr "Konnte '%s' nicht zum Schreiben öffnen."
-#: refs/files-backend.c:2481
+#: refs.c:1667
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "Aktualisierungen von Referenzen ist innerhalb der Quarantäne-Umgebung verboten."
+
+#: refs/files-backend.c:1631
#, c-format
msgid "could not delete reference %s: %s"
msgstr "Konnte Referenz %s nicht entfernen: %s"
-#: refs/files-backend.c:2484
+#: refs/files-backend.c:1634
#, c-format
msgid "could not delete references: %s"
msgstr "Konnte Referenzen nicht entfernen: %s"
-#: refs/files-backend.c:2493
+#: refs/files-backend.c:1643
#, c-format
msgid "could not remove reference %s"
msgstr "Konnte Referenz %s nicht löschen"
-#: ref-filter.c:56
+#: ref-filter.c:35 wt-status.c:1780
+msgid "gone"
+msgstr "entfernt"
+
+#: ref-filter.c:36
+#, c-format
+msgid "ahead %d"
+msgstr "%d voraus"
+
+#: ref-filter.c:37
+#, c-format
+msgid "behind %d"
+msgstr "%d hinterher"
+
+#: ref-filter.c:38
+#, c-format
+msgid "ahead %d, behind %d"
+msgstr "%d voraus, %d hinterher"
+
+#: ref-filter.c:104
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "Erwartetes Format: %%(color:<Farbe>)"
-#: ref-filter.c:58
+#: ref-filter.c:106
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "nicht erkannte Farbe: %%(color:%s)"
-#: ref-filter.c:72
+#: ref-filter.c:120
#, c-format
-msgid "unrecognized format: %%(%s)"
-msgstr "nicht erkanntes Format: %%(%s)"
+msgid "Integer value expected refname:lstrip=%s"
+msgstr "Positiver Wert erwartet refname:lstrip=%s"
-#: ref-filter.c:78
+#: ref-filter.c:124
+#, c-format
+msgid "Integer value expected refname:rstrip=%s"
+msgstr "Positiver Wert erwartet refname:rstrip=%s"
+
+#: ref-filter.c:126
+#, c-format
+msgid "unrecognized %%(%s) argument: %s"
+msgstr "nicht erkanntes %%(%s) Argument: %s"
+
+#: ref-filter.c:166
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) akzeptiert keine Argumente"
-#: ref-filter.c:85
+#: ref-filter.c:173
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "%%(subject) akzeptiert keine Argumente"
-#: ref-filter.c:92
+#: ref-filter.c:180
#, c-format
msgid "%%(trailers) does not take arguments"
msgstr "%%(trailers) akzeptiert keine Argumente"
-#: ref-filter.c:111
+#: ref-filter.c:199
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "Positiver Wert erwartet contents:lines=%s"
-#: ref-filter.c:113
+#: ref-filter.c:201
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "nicht erkanntes %%(contents) Argument: %s"
-#: ref-filter.c:123
+#: ref-filter.c:214
+#, c-format
+msgid "positive value expected objectname:short=%s"
+msgstr "Positiver Wert erwartet objectname:short=%s"
+
+#: ref-filter.c:218
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "nicht erkanntes %%(objectname) Argument: %s"
-#: ref-filter.c:145
+#: ref-filter.c:245
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "Erwartetes Format: %%(align:<Breite>,<Position>)"
-#: ref-filter.c:157
+#: ref-filter.c:257
#, c-format
msgid "unrecognized position:%s"
msgstr "nicht erkannte Position:%s"
-#: ref-filter.c:161
+#: ref-filter.c:261
#, c-format
msgid "unrecognized width:%s"
msgstr "nicht erkannte Breite:%s"
-#: ref-filter.c:167
+#: ref-filter.c:267
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "nicht erkanntes %%(align) Argument: %s"
-#: ref-filter.c:171
+#: ref-filter.c:271
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "Positive Breitenangabe für %%(align) erwartet"
-#: ref-filter.c:255
+#: ref-filter.c:286
+#, c-format
+msgid "unrecognized %%(if) argument: %s"
+msgstr "nicht erkanntes %%(if) Argument: %s"
+
+#: ref-filter.c:371
#, c-format
msgid "malformed field name: %.*s"
msgstr "Fehlerhafter Feldname: %.*s"
-#: ref-filter.c:281
+#: ref-filter.c:397
#, c-format
msgid "unknown field name: %.*s"
msgstr "Unbekannter Feldname: %.*s"
-#: ref-filter.c:383
+#: ref-filter.c:501
+#, c-format
+msgid "format: %%(if) atom used without a %%(then) atom"
+msgstr "format: %%(if) Atom ohne ein %%(then) Atom verwendet"
+
+#: ref-filter.c:561
+#, c-format
+msgid "format: %%(then) atom used without an %%(if) atom"
+msgstr "format: %%(then) Atom ohne ein %%(if) Atom verwendet"
+
+#: ref-filter.c:563
+#, c-format
+msgid "format: %%(then) atom used more than once"
+msgstr "format: %%(then) Atom mehr als einmal verwendet"
+
+#: ref-filter.c:565
+#, c-format
+msgid "format: %%(then) atom used after %%(else)"
+msgstr "format: %%(then) Atom nach %%(else) verwendet"
+
+#: ref-filter.c:591
+#, c-format
+msgid "format: %%(else) atom used without an %%(if) atom"
+msgstr "format: %%(else) Atom ohne ein %%(if) Atom verwendet"
+
+#: ref-filter.c:593
+#, c-format
+msgid "format: %%(else) atom used without a %%(then) atom"
+msgstr "Format: %%(else) Atom ohne ein %%(then) Atom verwendet"
+
+#: ref-filter.c:595
+#, c-format
+msgid "format: %%(else) atom used more than once"
+msgstr "Format: %%(end) Atom mehr als einmal verwendet"
+
+#: ref-filter.c:608
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "Format: %%(end) Atom ohne zugehöriges Atom verwendet"
-#: ref-filter.c:435
+#: ref-filter.c:663
#, c-format
msgid "malformed format string %s"
msgstr "Fehlerhafter Formatierungsstring %s"
-#: ref-filter.c:898
-msgid ":strip= requires a positive integer argument"
-msgstr ":strip= erfordert eine positive Ganzzahl als Argument"
-
-#: ref-filter.c:903
+#: ref-filter.c:1247
#, c-format
-msgid "ref '%s' does not have %ld components to :strip"
-msgstr "Referenz '%s' hat keine %ld Komponenten für :strip"
+msgid "(no branch, rebasing %s)"
+msgstr "(kein Branch, Rebase von Branch %s im Gange)"
-#: ref-filter.c:1066
+#: ref-filter.c:1250
#, c-format
-msgid "unknown %.*s format %s"
-msgstr "Unbekanntes %.*s Format %s"
+msgid "(no branch, bisect started on %s)"
+msgstr "(kein Branch, binäre Suche begonnen bei %s)"
-#: ref-filter.c:1086 ref-filter.c:1117
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached at " in wt-status.c
+#: ref-filter.c:1256
+#, 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
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr "(HEAD losgelöst von %s)"
+
+#: ref-filter.c:1265
+msgid "(no branch)"
+msgstr "(kein Branch)"
+
+#: ref-filter.c:1420 ref-filter.c:1451
#, c-format
msgid "missing object %s for %s"
msgstr "Objekt %s fehlt für %s"
-#: ref-filter.c:1089 ref-filter.c:1120
+#: ref-filter.c:1423 ref-filter.c:1454
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer bei %s für %s fehlgeschlagen"
-#: ref-filter.c:1343
+#: ref-filter.c:1692
#, c-format
msgid "malformed object at '%s'"
msgstr "fehlerhaftes Objekt bei '%s'"
-#: ref-filter.c:1410
+#: ref-filter.c:1759
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "Ignoriere Referenz mit fehlerhaftem Namen %s"
-#: ref-filter.c:1415
+#: ref-filter.c:1764
#, c-format
msgid "ignoring broken ref %s"
msgstr "Ignoriere fehlerhafte Referenz %s"
-#: ref-filter.c:1670
+#: ref-filter.c:2028
#, c-format
msgid "format: %%(end) atom missing"
msgstr "Format: %%(end) Atom fehlt"
-#: ref-filter.c:1734
+#: ref-filter.c:2109
#, c-format
msgid "malformed object name %s"
msgstr "Missgebildeter Objektname %s"
@@ -2630,8 +2852,10 @@
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] "Ihr Branch ist %2$d Commit hinter '%1$s', und kann vorgespult werden.\n"
-msgstr[1] "Ihr Branch ist %2$d Commits hinter '%1$s', und kann vorgespult werden.\n"
+msgstr[0] ""
+"Ihr Branch ist %2$d Commit hinter '%1$s', und kann vorgespult werden.\n"
+msgstr[1] ""
+"Ihr Branch ist %2$d Commits hinter '%1$s', und kann vorgespult werden.\n"
#: remote.c:2109
msgid " (use \"git pull\" to update your local branch)\n"
@@ -2681,16 +2905,26 @@
msgid "dup2(%d,%d) failed"
msgstr "dup2(%d,%d) fehlgeschlagen"
-#: send-pack.c:297
+#: send-pack.c:150
+#, c-format
+msgid "unable to parse remote unpack status: %s"
+msgstr "Konnte Status des Entpackens der Gegenseite nicht parsen: %s"
+
+#: send-pack.c:152
+#, c-format
+msgid "remote unpack failed: %s"
+msgstr "Entpacken auf der Gegenseite fehlgeschlagen: %s"
+
+#: send-pack.c:315
msgid "failed to sign the push certificate"
msgstr "Fehler beim Signieren des \"push\"-Zertifikates"
-#: send-pack.c:410
+#: send-pack.c:428
msgid "the receiving end does not support --signed push"
msgstr ""
"die Gegenseite unterstützt keinen signierten Versand (\"--signed push\")"
-#: send-pack.c:412
+#: send-pack.c:430
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -2698,11 +2932,11 @@
"kein Versand des \"push\"-Zertifikates, da die Gegenseite keinen signierten\n"
"Versand (\"--signed push\") unterstützt"
-#: send-pack.c:424
+#: send-pack.c:442
msgid "the receiving end does not support --atomic push"
msgstr "die Gegenseite unterstützt keinen atomaren Versand (\"--atomic push\")"
-#: send-pack.c:429
+#: send-pack.c:447
msgid "the receiving end does not support push options"
msgstr "die Gegenseite unterstützt keine Push-Optionen"
@@ -2741,12 +2975,12 @@
"mit 'git add <Pfade>' oder 'git rm <Pfade>'und tragen Sie das Ergebnis mit\n"
"'git commit' ein"
-#: sequencer.c:294 sequencer.c:1667
+#: sequencer.c:294 sequencer.c:1682
#, c-format
msgid "could not lock '%s'"
msgstr "Konnte '%s' nicht sperren"
-#: sequencer.c:297 sequencer.c:1545 sequencer.c:1672 sequencer.c:1686
+#: sequencer.c:297 sequencer.c:1560 sequencer.c:1687 sequencer.c:1701
#, c-format
msgid "could not write to '%s'"
msgstr "Konnte nicht nach '%s' schreiben."
@@ -2756,13 +2990,13 @@
msgid "could not write eol to '%s'"
msgstr "Konnte EOL nicht nach '%s' schreiben."
-#: sequencer.c:305 sequencer.c:1550 sequencer.c:1674
+#: sequencer.c:305 sequencer.c:1565 sequencer.c:1689
#, c-format
msgid "failed to finalize '%s'."
msgstr "Fehler beim Fertigstellen von '%s'."
-#: sequencer.c:329 sequencer.c:808 sequencer.c:1571 builtin/am.c:259
-#: builtin/commit.c:749 builtin/merge.c:1036
+#: sequencer.c:329 sequencer.c:814 sequencer.c:1586 builtin/am.c:257
+#: builtin/commit.c:749 builtin/merge.c:1018
#, c-format
msgid "could not read '%s'"
msgstr "Konnte '%s' nicht lesen"
@@ -2829,17 +3063,17 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:688
+#: sequencer.c:694
#, c-format
msgid "could not parse commit %s\n"
msgstr "Konnte Commit %s nicht parsen\n"
-#: sequencer.c:693
+#: sequencer.c:699
#, c-format
msgid "could not parse parent commit %s\n"
msgstr "Konnte Eltern-Commit %s nicht parsen\n"
-#: sequencer.c:815
+#: sequencer.c:821
#, c-format
msgid ""
"unexpected 1st line of squash message:\n"
@@ -2850,7 +3084,7 @@
"\n"
"\t%.*s"
-#: sequencer.c:821
+#: sequencer.c:827
#, c-format
msgid ""
"invalid 1st line of squash message:\n"
@@ -2861,229 +3095,231 @@
"\n"
"\t%.*s"
-#: sequencer.c:827 sequencer.c:852
+#: sequencer.c:833 sequencer.c:858
#, c-format
msgid "This is a combination of %d commits."
msgstr "Das ist eine Kombination aus %d Commits."
-#: sequencer.c:836
+#: sequencer.c:842
msgid "need a HEAD to fixup"
msgstr "benötige HEAD für fixup"
-#: sequencer.c:838
+#: sequencer.c:844
msgid "could not read HEAD"
msgstr "Konnte HEAD nicht lesen"
-#: sequencer.c:840
+#: sequencer.c:846
msgid "could not read HEAD's commit message"
msgstr "Konnte Commit-Beschreibung von HEAD nicht lesen"
-#: sequencer.c:846
+#: sequencer.c:852
#, c-format
msgid "cannot write '%s'"
msgstr "kann '%s' nicht schreiben"
-#: sequencer.c:855 git-rebase--interactive.sh:445
+#: sequencer.c:861 git-rebase--interactive.sh:445
msgid "This is the 1st commit message:"
msgstr "Das ist die erste Commit-Beschreibung:"
-#: sequencer.c:863
+#: sequencer.c:869
#, c-format
msgid "could not read commit message of %s"
msgstr "Konnte Commit-Beschreibung von %s nicht lesen."
-#: sequencer.c:870
+#: sequencer.c:876
#, c-format
msgid "This is the commit message #%d:"
msgstr "Das ist Commit-Beschreibung #%d:"
-#: sequencer.c:875
+#: sequencer.c:881
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Die Commit-Beschreibung #%d wird ausgelassen:"
-#: sequencer.c:880
+#: sequencer.c:886
#, c-format
msgid "unknown command: %d"
msgstr "Unbekannter Befehl: %d"
-#: sequencer.c:946
+#: sequencer.c:952
msgid "your index file is unmerged."
msgstr "Ihre Index-Datei ist nicht zusammengeführt."
-#: sequencer.c:964
+#: sequencer.c:970
#, 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:972
+#: sequencer.c:978
#, c-format
msgid "commit %s does not have parent %d"
msgstr "Commit %s hat keinen Eltern-Commit %d"
-#: sequencer.c:976
+#: sequencer.c:982
#, 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:982
+#: sequencer.c:988
#, 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:1001
+#: sequencer.c:1009
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: kann Eltern-Commit %s nicht parsen"
-#: sequencer.c:1063 sequencer.c:1812
+#: sequencer.c:1071 sequencer.c:1827
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "Konnte '%s' nicht zu '%s' umbenennen."
-#: sequencer.c:1114
+#: sequencer.c:1122
#, c-format
msgid "could not revert %s... %s"
msgstr "Konnte \"revert\" nicht auf %s... (%s) ausführen"
-#: sequencer.c:1115
+#: sequencer.c:1123
#, c-format
msgid "could not apply %s... %s"
msgstr "Konnte %s... (%s) nicht anwenden"
-#: sequencer.c:1157
+#: sequencer.c:1165
msgid "empty commit set passed"
msgstr "leere Menge von Commits übergeben"
-#: sequencer.c:1167
+#: sequencer.c:1175
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: Fehler beim Lesen des Index"
-#: sequencer.c:1174
+#: sequencer.c:1182
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: Fehler beim Aktualisieren des Index"
-#: sequencer.c:1294
+#: sequencer.c:1303
#, c-format
msgid "invalid line %d: %.*s"
msgstr "Ungültige Zeile %d: %.*s"
-#: sequencer.c:1302
+#: sequencer.c:1311
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "Kann '%s' nicht ohne vorherigen Commit ausführen"
-#: sequencer.c:1334
+#: sequencer.c:1344
#, c-format
msgid "could not read '%s'."
msgstr "Konnte '%s' nicht lesen."
-#: sequencer.c:1341
+#: sequencer.c:1356
msgid "please fix this using 'git rebase --edit-todo'."
-msgstr "Bitte beheben Sie dieses, indem Sie 'git rebase --edit-todo' ausführen."
+msgstr ""
+"Bitte beheben Sie dieses, indem Sie 'git rebase --edit-todo' ausführen."
-#: sequencer.c:1343
+#: sequencer.c:1358
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "Unbenutzbares Instruktionsblatt: '%s'"
-#: sequencer.c:1348
+#: sequencer.c:1363
msgid "no commits parsed."
msgstr "Keine Commits geparst."
-#: sequencer.c:1359
+#: sequencer.c:1374
msgid "cannot cherry-pick during a revert."
msgstr "Kann Cherry-Pick nicht während eines Reverts ausführen."
-#: sequencer.c:1361
+#: sequencer.c:1376
msgid "cannot revert during a cherry-pick."
msgstr "Kann Revert nicht während eines Cherry-Picks ausführen."
-#: sequencer.c:1424
+#: sequencer.c:1439
#, c-format
msgid "invalid key: %s"
msgstr "Ungültiger Schlüssel: %s"
-#: sequencer.c:1427
+#: sequencer.c:1442
#, c-format
msgid "invalid value for %s: %s"
msgstr "Ungültiger Wert für %s: %s"
-#: sequencer.c:1484
+#: sequencer.c:1499
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "Fehlerhaftes Optionsblatt: '%s'"
-#: sequencer.c:1522
+#: sequencer.c:1537
msgid "a cherry-pick or revert is already in progress"
msgstr "\"cherry-pick\" oder \"revert\" ist bereits im Gang"
-#: sequencer.c:1523
+#: sequencer.c:1538
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "versuchen Sie \"git cherry-pick (--continue | --quit | --abort)\""
-#: sequencer.c:1526
+#: sequencer.c:1541
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "Konnte \"sequencer\"-Verzeichnis '%s' nicht erstellen."
-#: sequencer.c:1540
+#: sequencer.c:1555
msgid "could not lock HEAD"
msgstr "Konnte HEAD nicht sperren"
-#: sequencer.c:1596 sequencer.c:2150
+#: sequencer.c:1611 sequencer.c:2181
msgid "no cherry-pick or revert in progress"
msgstr "kein \"cherry-pick\" oder \"revert\" im Gang"
-#: sequencer.c:1598
+#: sequencer.c:1613
msgid "cannot resolve HEAD"
msgstr "kann HEAD nicht auflösen"
-#: sequencer.c:1600 sequencer.c:1634
+#: sequencer.c:1615 sequencer.c:1649
msgid "cannot abort from a branch yet to be born"
msgstr "kann nicht abbrechen: bin auf einem Branch, der noch geboren wird"
-#: sequencer.c:1620 builtin/grep.c:904
+#: sequencer.c:1635 builtin/grep.c:910
#, c-format
msgid "cannot open '%s'"
msgstr "kann '%s' nicht öffnen"
-#: sequencer.c:1622
+#: sequencer.c:1637
#, c-format
msgid "cannot read '%s': %s"
msgstr "Kann '%s' nicht lesen: %s"
-#: sequencer.c:1623
+#: sequencer.c:1638
msgid "unexpected end of file"
msgstr "Unerwartetes Dateiende"
-#: sequencer.c:1629
+#: sequencer.c:1644
#, 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:1640
+#: sequencer.c:1655
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 verschoben zu haben. Keine Zurücksetzung, prüfen Sie HEAD."
-#: sequencer.c:1777 sequencer.c:2049
+#: sequencer.c:1792 sequencer.c:2080
msgid "cannot read HEAD"
msgstr "Kann HEAD nicht lesen"
-#: sequencer.c:1817 builtin/difftool.c:574
+#: sequencer.c:1832 builtin/difftool.c:616
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "Konnte '%s' nicht nach '%s' kopieren."
-#: sequencer.c:1833
+#: sequencer.c:1848
msgid "could not read index"
msgstr "Konnte den Index nicht lesen."
-#: sequencer.c:1838
+#: sequencer.c:1853
#, c-format
msgid ""
"execution failed: %s\n"
@@ -3099,11 +3335,11 @@
"\n"
"ausführen.\n"
-#: sequencer.c:1844
+#: sequencer.c:1859
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:1850
+#: sequencer.c:1865
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -3121,17 +3357,17 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:1905 git-rebase.sh:168
+#: sequencer.c:1920 git-rebase.sh:169
#, c-format
msgid "Applied autostash."
msgstr "Automatischen Stash angewendet."
-#: sequencer.c:1917
+#: sequencer.c:1932
#, c-format
msgid "cannot store %s"
msgstr "kann %s nicht speichern"
-#: sequencer.c:1919 git-rebase.sh:172
+#: sequencer.c:1934 git-rebase.sh:173
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
@@ -3142,59 +3378,59 @@
"Ihre Änderungen sind im Stash sicher.\n"
"Sie können jederzeit \"git stash pop\" oder \"git stash drop\" ausführen.\n"
-#: sequencer.c:2000
+#: sequencer.c:2016
#, c-format
-msgid "stopped at %s... %.*s"
-msgstr "Angehalten bei %s... %.*s"
+msgid "Stopped at %s... %.*s\n"
+msgstr "Angehalten bei %s... %.*s\n"
-#: sequencer.c:2027
+#: sequencer.c:2058
#, c-format
msgid "unknown command %d"
msgstr "Unbekannter Befehl %d"
-#: sequencer.c:2057
+#: sequencer.c:2088
msgid "could not read orig-head"
msgstr "Konnte orig-head nicht lesen."
-#: sequencer.c:2061
+#: sequencer.c:2092
msgid "could not read 'onto'"
msgstr "Konnte 'onto' nicht lesen."
-#: sequencer.c:2068
+#: sequencer.c:2099
#, c-format
msgid "could not update %s"
msgstr "Konnte %s nicht aktualisieren."
-#: sequencer.c:2075
+#: sequencer.c:2106
#, c-format
msgid "could not update HEAD to %s"
msgstr "Konnte HEAD nicht auf %s aktualisieren."
-#: sequencer.c:2159
+#: sequencer.c:2190
msgid "cannot rebase: You have unstaged changes."
msgstr ""
"Rebase nicht möglich: Sie haben Änderungen, die nicht zum Commit\n"
"vorgemerkt sind."
-#: sequencer.c:2164
+#: sequencer.c:2195
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "Konnte CHERRY_PICK_HEAD nicht löschen."
-#: sequencer.c:2173
+#: sequencer.c:2204
msgid "cannot amend non-existing commit"
msgstr "Kann nicht existierenden Commit nicht nachbessern."
-#: sequencer.c:2175
+#: sequencer.c:2206
#, c-format
msgid "invalid file: '%s'"
msgstr "Ungültige Datei: '%s'"
-#: sequencer.c:2177
+#: sequencer.c:2208
#, c-format
msgid "invalid contents: '%s'"
msgstr "Ungültige Inhalte: '%s'"
-#: sequencer.c:2180
+#: sequencer.c:2211
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -3205,25 +3441,25 @@
"committen Sie diese zuerst und führen Sie dann 'git rebase --continue'\n"
"erneut aus."
-#: sequencer.c:2190
+#: sequencer.c:2221
msgid "could not commit staged changes."
msgstr "Konnte Änderungen aus der Staging-Area nicht committen."
-#: sequencer.c:2270
+#: sequencer.c:2301
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: %s kann nicht in \"cherry-pick\" benutzt werden"
-#: sequencer.c:2274
+#: sequencer.c:2305
#, c-format
msgid "%s: bad revision"
msgstr "%s: ungültiger Commit"
-#: sequencer.c:2307
+#: sequencer.c:2338
msgid "can't revert as initial commit"
msgstr "Kann nicht als allerersten Commit einen Revert ausführen."
-#: setup.c:160
+#: setup.c:165
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
@@ -3233,7 +3469,7 @@
"Benutzen Sie 'git <Befehl> -- <Pfad>...' zur Angabe von Pfaden, die lokal\n"
"nicht existieren."
-#: setup.c:173
+#: setup.c:178
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -3245,7 +3481,7 @@
"Benutzen Sie '--', um Pfade und Commits zu trennen, ähnlich wie:\n"
"'git <Befehl> [<Commit>...] -- [<Datei>...]'"
-#: setup.c:223
+#: setup.c:228
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
@@ -3256,29 +3492,34 @@
"Benutzen Sie '--', um Pfade und Commits zu trennen, ähnlich wie:\n"
"'git <Befehl> [<Commit>...] -- [<Datei>...]'"
-#: setup.c:470
+#: setup.c:475
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "Erwartete Git-Repository-Version <= %d, %d gefunden"
-#: setup.c:478
+#: setup.c:483
msgid "unknown repository extensions found:"
msgstr "Unbekannte Repository-Erweiterungen gefunden:"
-#: setup.c:768
+#: setup.c:776
#, c-format
msgid "Not a git repository (or any of the parent directories): %s"
msgstr "Kein Git-Repository (oder irgendein Elternverzeichnis): %s"
-#: setup.c:770 setup.c:922 builtin/index-pack.c:1643
+#: setup.c:778 builtin/index-pack.c:1646
msgid "Cannot come back to cwd"
msgstr "Kann nicht zurück zu Arbeitsverzeichnis wechseln"
-#: setup.c:852
+#: setup.c:1010
msgid "Unable to read current working directory"
msgstr "Konnte aktuelles Arbeitsverzeichnis nicht lesen."
-#: setup.c:927
+#: setup.c:1022 setup.c:1028
+#, c-format
+msgid "Cannot change to '%s'"
+msgstr "Kann nicht nach '%s' wechseln."
+
+#: setup.c:1041
#, c-format
msgid ""
"Not a git repository (or any parent up to mount point %s)\n"
@@ -3288,12 +3529,7 @@
"%s)\n"
"Stoppe bei Dateisystemgrenze (GIT_DISCOVERY_ACROSS_FILESYSTEM nicht gesetzt)."
-#: setup.c:934
-#, c-format
-msgid "Cannot change to '%s/..'"
-msgstr "Kann nicht in Verzeichnis '%s/..' wechseln"
-
-#: setup.c:996
+#: setup.c:1106
#, c-format
msgid ""
"Problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -3302,60 +3538,60 @@
"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:490
+#: sha1_file.c:559
#, c-format
msgid "path '%s' does not exist"
msgstr "Pfad '%s' existiert nicht"
-#: sha1_file.c:516
+#: sha1_file.c:585
#, 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:522
+#: sha1_file.c:591
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "Referenziertes Repository '%s' ist kein lokales Repository."
-#: sha1_file.c:528
+#: sha1_file.c:597
#, c-format
msgid "reference repository '%s' is shallow"
msgstr ""
"Referenziertes Repository '%s' hat eine unvollständige Historie (shallow)."
-#: sha1_file.c:536
+#: sha1_file.c:605
#, c-format
msgid "reference repository '%s' is grafted"
msgstr ""
"Referenziertes Repository '%s' ist mit künstlichen Vorgängern (\"grafts\") "
"eingehängt."
-#: sha1_file.c:1176
+#: sha1_file.c:1245
msgid "offset before end of packfile (broken .idx?)"
msgstr "Offset vor Ende der Packdatei (fehlerhafte Indexdatei?)"
-#: sha1_file.c:2637
+#: sha1_file.c:2721
#, 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:2641
+#: sha1_file.c:2725
#, 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:407
+#: sha1_name.c:409
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr "Kurzer SHA-1 %s ist mehrdeutig."
-#: sha1_name.c:418
+#: sha1_name.c:420
msgid "The candidates are:"
msgstr "Die Kandidaten sind:"
-#: sha1_name.c:578
+#: sha1_name.c:580
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"
@@ -3380,46 +3616,56 @@
"indem Sie \"git config advice.objectNameWarning false\"\n"
"ausführen."
-#: submodule.c:65 submodule.c:99
+#: submodule.c:67 submodule.c:101
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:69 submodule.c:103
+#: submodule.c:71 submodule.c:105
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "Konnte keine Sektion in .gitmodules mit Pfad \"%s\" finden"
-#: submodule.c:77
+#: submodule.c:79
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "Konnte Eintrag '%s' in .gitmodules nicht aktualisieren"
-#: submodule.c:110
+#: submodule.c:112
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "Konnte Eintrag '%s' nicht aus .gitmodules entfernen"
-#: submodule.c:121
+#: submodule.c:123
msgid "staging updated .gitmodules failed"
msgstr "Konnte aktualisierte .gitmodules-Datei nicht zum Commit vormerken"
-#: submodule.c:159
+#: submodule.c:161
msgid "negative values not allowed for submodule.fetchJobs"
msgstr "Negative Werte für submodule.fetchJobs nicht erlaubt"
-#: submodule.c:1184
+#: submodule.c:1194
#, c-format
-msgid "could not start 'git status in submodule '%s'"
+msgid "'%s' not recognized as a git repository"
+msgstr "'%s' nicht als Git-Repository erkannt"
+
+#: submodule.c:1332
+#, c-format
+msgid "could not start 'git status' in submodule '%s'"
msgstr "Konnte 'git status' in Submodul '%s' nicht starten."
-#: submodule.c:1197
+#: submodule.c:1345
#, c-format
-msgid "could not run 'git status in submodule '%s'"
-msgstr "konnte 'git status' in Submodul '%s' nicht ausführen"
+msgid "could not run 'git status' in submodule '%s'"
+msgstr "Konnte 'git status' in Submodul '%s' nicht ausführen."
-#: submodule.c:1398
+#: submodule.c:1421
+#, c-format
+msgid "submodule '%s' has dirty index"
+msgstr "Submodul '%s' hat einen geänderten Index."
+
+#: submodule.c:1678
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -3427,18 +3673,18 @@
"relocate_gitdir für Submodul '%s' mit mehr als einem Arbeitsverzeichnis\n"
"wird nicht unterstützt"
-#: submodule.c:1410 submodule.c:1471
+#: submodule.c:1690 submodule.c:1746
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "konnte Name für Submodul '%s' nicht nachschlagen"
-#: submodule.c:1414 submodule.c:1474 builtin/submodule--helper.c:640
-#: builtin/submodule--helper.c:650
+#: submodule.c:1694 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:1420
+#: submodule.c:1697
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -3449,12 +3695,25 @@
"'%s' nach\n"
"'%s'\n"
-#: submodule.c:1512
+#: submodule.c:1781
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "Fehler bei Rekursion in Submodul-Pfad '%s'"
-#: submodule-config.c:360
+#: submodule.c:1825
+msgid "could not start ls-files in .."
+msgstr "Konnte 'ls-files' nicht in .. starten"
+
+#: submodule.c:1845
+msgid "BUG: returned path string doesn't match cwd?"
+msgstr "FEHLER: zurückgegebene Zeichenkette für Pfad entspricht nicht cwd?"
+
+#: submodule.c:1864
+#, c-format
+msgid "ls-tree returned unexpected return code %d"
+msgstr "ls-tree mit unerwartetem Rückgabewert %d beendet"
+
+#: submodule-config.c:380
#, c-format
msgid "invalid value for %s"
msgstr "Ungültiger Wert für %s"
@@ -3523,7 +3782,7 @@
msgid "transport: invalid depth option '%s'"
msgstr "transport: ungültige --depth Option '%s'"
-#: transport.c:885
+#: transport.c:889
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -3532,7 +3791,7 @@
"Die folgenden Submodul-Pfade enthalten Änderungen, die in keinem\n"
"Remote-Repository gefunden wurden:\n"
-#: transport.c:889
+#: transport.c:893
#, c-format
msgid ""
"\n"
@@ -3559,11 +3818,11 @@
"zum Versenden zu einem Remote-Repository.\n"
"\n"
-#: transport.c:897
+#: transport.c:901
msgid "Aborting."
msgstr "Abbruch."
-#: transport-helper.c:1082
+#: transport-helper.c:1080
#, c-format
msgid "Could not read ref %s"
msgstr "Konnte Referenz %s nicht lesen."
@@ -3584,7 +3843,7 @@
msgid "too-short tree file"
msgstr "zu kurze Tree-Datei"
-#: unpack-trees.c:99
+#: unpack-trees.c:104
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -3595,7 +3854,7 @@
"%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie Branches\n"
"wechseln."
-#: unpack-trees.c:101
+#: unpack-trees.c:106
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -3605,7 +3864,7 @@
"überschrieben werden:\n"
"%%s"
-#: unpack-trees.c:104
+#: unpack-trees.c:109
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -3615,7 +3874,7 @@
"überschrieben werden:\n"
"%%sBitte committen oder stashen Sie Ihre Änderungen, bevor sie mergen."
-#: unpack-trees.c:106
+#: unpack-trees.c:111
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -3625,7 +3884,7 @@
"überschrieben werden:\n"
"%%s"
-#: unpack-trees.c:109
+#: unpack-trees.c:114
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -3635,7 +3894,7 @@
"überschrieben werden:\n"
"%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie %s ausführen."
-#: unpack-trees.c:111
+#: unpack-trees.c:116
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -3644,7 +3903,7 @@
"Ihre lokalen Änderungen würden durch %s überschrieben werden.\n"
"%%s"
-#: unpack-trees.c:116
+#: unpack-trees.c:121
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -3654,7 +3913,7 @@
"Dateien in diesen Verzeichnissen verloren gehen:\n"
"%s"
-#: unpack-trees.c:120
+#: unpack-trees.c:125
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -3664,7 +3923,7 @@
"den Checkout entfernt werden:\n"
"%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln."
-#: unpack-trees.c:122
+#: unpack-trees.c:127
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -3675,7 +3934,7 @@
"Checkout entfernt werden:\n"
"%%s"
-#: unpack-trees.c:125
+#: unpack-trees.c:130
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -3685,7 +3944,7 @@
"den Merge entfernt werden:\n"
"%%sBitte verschieben oder entfernen Sie diese, bevor sie mergen."
-#: unpack-trees.c:127
+#: unpack-trees.c:132
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -3696,7 +3955,7 @@
"Merge entfernt werden:\n"
"%%s"
-#: unpack-trees.c:130
+#: unpack-trees.c:135
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -3706,7 +3965,7 @@
"den %s entfernt werden:\n"
"%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausführen."
-#: unpack-trees.c:132
+#: unpack-trees.c:137
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -3716,7 +3975,7 @@
"den %s entfernt werden:\n"
"%%s"
-#: unpack-trees.c:137
+#: unpack-trees.c:142
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -3727,7 +3986,7 @@
"den Checkout überschrieben werden:\n"
"%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln."
-#: unpack-trees.c:139
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -3739,7 +3998,7 @@
"Checkout überschrieben werden:\n"
"%%s"
-#: unpack-trees.c:142
+#: unpack-trees.c:147
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -3749,7 +4008,7 @@
"den Merge überschrieben werden:\n"
"%%sBitte verschieben oder entfernen Sie diese, bevor Sie mergen."
-#: unpack-trees.c:144
+#: unpack-trees.c:149
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -3759,7 +4018,7 @@
"den Merge überschrieben werden:\n"
"%%s"
-#: unpack-trees.c:147
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -3769,7 +4028,7 @@
"den %s überschrieben werden:\n"
"%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausführen."
-#: unpack-trees.c:149
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -3780,12 +4039,12 @@
"%s überschrieben werden:\n"
"%%s"
-#: unpack-trees.c:156
+#: unpack-trees.c:161
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "Eintrag '%s' überschneidet sich mit '%s'. Kann nicht verbinden."
-#: unpack-trees.c:159
+#: unpack-trees.c:164
#, c-format
msgid ""
"Cannot update sparse checkout: the following entries are not up-to-date:\n"
@@ -3796,7 +4055,7 @@
"aktuell:\n"
"%s"
-#: unpack-trees.c:161
+#: unpack-trees.c:166
#, c-format
msgid ""
"The following working tree files would be overwritten by sparse checkout "
@@ -3807,7 +4066,7 @@
"über einen partiellen Checkout überschrieben werden:\n"
"%s"
-#: unpack-trees.c:163
+#: unpack-trees.c:168
#, c-format
msgid ""
"The following working tree files would be removed by sparse checkout "
@@ -3818,45 +4077,61 @@
"über einen partiellen Checkout entfernt werden:\n"
"%s"
-#: unpack-trees.c:240
+#: unpack-trees.c:170
+#, c-format
+msgid ""
+"Cannot update submodule:\n"
+"%s"
+msgstr ""
+"Kann Submodul nicht aktualisieren:\n"
+"%s"
+
+#: unpack-trees.c:247
#, c-format
msgid "Aborting\n"
msgstr "Abbruch\n"
-#: unpack-trees.c:270
+#: unpack-trees.c:272
+#, 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
msgid "Checking out files"
msgstr "Checke Dateien aus"
-#: urlmatch.c:120
+#: urlmatch.c:163
msgid "invalid URL scheme name or missing '://' suffix"
msgstr "Ungültiges URL-Schema oder Suffix '://' fehlt"
-#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
+#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
#, c-format
msgid "invalid %XX escape sequence"
msgstr "ungültige Escape-Sequenz %XX"
-#: urlmatch.c:172
+#: urlmatch.c:215
msgid "missing host and scheme is not 'file:'"
msgstr "fehlender Host und Schema ist nicht 'file:'"
-#: urlmatch.c:189
+#: urlmatch.c:232
msgid "a 'file:' URL may not have a port number"
msgstr "eine 'file:' URL darf keine Portnummer enthalten"
-#: urlmatch.c:199
+#: urlmatch.c:247
msgid "invalid characters in host name"
msgstr "Hostname enthält ungültige Zeichen"
-#: urlmatch.c:244 urlmatch.c:255
+#: urlmatch.c:292 urlmatch.c:303
msgid "invalid port number"
msgstr "ungültige Portnummer"
-#: urlmatch.c:322
+#: urlmatch.c:371
msgid "invalid '..' path segment"
msgstr "ungültiges '..' Pfadsegment"
-#: worktree.c:282
+#: worktree.c:285
#, c-format
msgid "failed to read '%s'"
msgstr "Fehler beim Lesen von '%s'"
@@ -3871,28 +4146,28 @@
msgid "could not open '%s' for writing"
msgstr "Konnte '%s' nicht zum Schreiben öffnen."
-#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759
-#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1033
+#: 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
#, c-format
msgid "could not open '%s' for reading"
msgstr "Konnte '%s' nicht zum Lesen öffnen."
-#: wrapper.c:605 wrapper.c:626
+#: wrapper.c:581 wrapper.c:602
#, c-format
msgid "unable to access '%s'"
msgstr "konnte nicht auf '%s' zugreifen"
-#: wrapper.c:634
+#: wrapper.c:610
msgid "unable to get current working directory"
msgstr "Konnte aktuelles Arbeitsverzeichnis nicht bekommen."
-#: wrapper.c:658
+#: wrapper.c:634
#, c-format
msgid "could not write to %s"
msgstr "Konnte nicht nach '%s' schreiben."
-#: wrapper.c:660
+#: wrapper.c:636
#, c-format
msgid "could not close %s"
msgstr "Konnte '%s' nicht schließen."
@@ -3930,11 +4205,11 @@
msgstr ""
" (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung zu markieren)"
-#: wt-status.c:199 wt-status.c:945
+#: wt-status.c:199 wt-status.c:958
msgid "Changes to be committed:"
msgstr "zum Commit vorgemerkte Änderungen:"
-#: wt-status.c:217 wt-status.c:954
+#: wt-status.c:217 wt-status.c:967
msgid "Changes not staged for commit:"
msgstr "Änderungen, die nicht zum Commit vorgemerkt sind:"
@@ -4042,15 +4317,15 @@
msgid "untracked content, "
msgstr "unversionierter Inhalt, "
-#: wt-status.c:818
+#: wt-status.c:831
msgid "Submodules changed but not updated:"
msgstr "Submodule geändert, aber nicht aktualisiert:"
-#: wt-status.c:820
+#: wt-status.c:833
msgid "Submodule changes to be committed:"
msgstr "Änderungen in Submodul zum Committen:"
-#: wt-status.c:901
+#: wt-status.c:914
msgid ""
"Do not touch the line above.\n"
"Everything below will be removed."
@@ -4058,114 +4333,114 @@
"Ändern Sie nicht die obige Zeile.\n"
"Alles unterhalb von ihr wird entfernt."
-#: wt-status.c:1013
+#: wt-status.c:1026
msgid "You have unmerged paths."
msgstr "Sie haben nicht zusammengeführte Pfade."
-#: wt-status.c:1016
+#: wt-status.c:1029
msgid " (fix conflicts and run \"git commit\")"
msgstr " (beheben Sie die Konflikte und führen Sie \"git commit\" aus)"
-#: wt-status.c:1018
+#: wt-status.c:1031
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (benutzen Sie \"git merge --abort\", um den Merge abzubrechen)"
-#: wt-status.c:1023
+#: wt-status.c:1036
msgid "All conflicts fixed but you are still merging."
msgstr "Alle Konflikte sind behoben, aber Sie sind immer noch beim Merge."
-#: wt-status.c:1026
+#: wt-status.c:1039
msgid " (use \"git commit\" to conclude merge)"
msgstr " (benutzen Sie \"git commit\", um den Merge abzuschließen)"
-#: wt-status.c:1036
+#: wt-status.c:1049
msgid "You are in the middle of an am session."
msgstr "Eine \"am\"-Sitzung ist im Gange."
-#: wt-status.c:1039
+#: wt-status.c:1052
msgid "The current patch is empty."
msgstr "Der aktuelle Patch ist leer."
-#: wt-status.c:1043
+#: wt-status.c:1056
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:1045
+#: wt-status.c:1058
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (benutzen Sie \"git am --skip\", um diesen Patch auszulassen)"
-#: wt-status.c:1047
+#: wt-status.c:1060
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:1176
+#: wt-status.c:1189
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo fehlt."
-#: wt-status.c:1178
+#: wt-status.c:1191
msgid "No commands done."
msgstr "Keine Befehle ausgeführt."
-#: wt-status.c:1181
+#: wt-status.c:1194
#, 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:1192
+#: wt-status.c:1205
#, c-format
msgid " (see more in file %s)"
msgstr " (mehr Informationen in Datei %s)"
-#: wt-status.c:1197
+#: wt-status.c:1210
msgid "No commands remaining."
msgstr "Keine Befehle verbleibend."
-#: wt-status.c:1200
+#: wt-status.c:1213
#, 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:1208
+#: wt-status.c:1221
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (benutzen Sie \"git rebase --edit-todo\" zum Ansehen und Bearbeiten)"
-#: wt-status.c:1221
+#: wt-status.c:1234
#, 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:1226
+#: wt-status.c:1239
msgid "You are currently rebasing."
msgstr "Sie sind gerade beim Rebase."
-#: wt-status.c:1240
+#: wt-status.c:1253
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:1242
+#: wt-status.c:1255
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (benutzen Sie \"git rebase --skip\", um diesen Patch auszulassen)"
-#: wt-status.c:1244
+#: wt-status.c:1257
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:1250
+#: wt-status.c:1263
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (alle Konflikte behoben: führen Sie \"git rebase --continue\" aus)"
-#: wt-status.c:1254
+#: wt-status.c:1267
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -4173,134 +4448,134 @@
"Sie teilen gerade einen Commit auf, während ein Rebase von Branch '%s' auf "
"'%s' im Gange ist."
-#: wt-status.c:1259
+#: wt-status.c:1272
msgid "You are currently splitting a commit during a rebase."
msgstr "Sie teilen gerade einen Commit während eines Rebase auf."
-#: wt-status.c:1262
+#: wt-status.c:1275
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:1266
+#: wt-status.c:1279
#, 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:1271
+#: wt-status.c:1284
msgid "You are currently editing a commit during a rebase."
msgstr "Sie editieren gerade einen Commit während eines Rebase."
-#: wt-status.c:1274
+#: wt-status.c:1287
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
" (benutzen Sie \"git commit --amend\", um den aktuellen Commit "
"nachzubessern)"
-#: wt-status.c:1276
+#: wt-status.c:1289
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:1286
+#: wt-status.c:1299
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Sie führen gerade \"cherry-pick\" von Commit %s aus."
-#: wt-status.c:1291
+#: wt-status.c:1304
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:1294
+#: wt-status.c:1307
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (alle Konflikte behoben: führen Sie \"git cherry-pick --continue\" aus)"
-#: wt-status.c:1296
+#: wt-status.c:1309
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:1305
+#: wt-status.c:1318
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Sie sind gerade an einem Revert von Commit '%s'."
-#: wt-status.c:1310
+#: wt-status.c:1323
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:1313
+#: wt-status.c:1326
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (alle Konflikte behoben: führen Sie \"git revert --continue\" aus)"
-#: wt-status.c:1315
+#: wt-status.c:1328
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
" (benutzen Sie \"git revert --abort\", um die Revert-Operation abzubrechen)"
-#: wt-status.c:1326
+#: wt-status.c:1339
#, 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:1330
+#: wt-status.c:1343
msgid "You are currently bisecting."
msgstr "Sie sind gerade bei einer binären Suche."
-#: wt-status.c:1333
+#: wt-status.c:1346
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:1530
+#: wt-status.c:1543
msgid "On branch "
msgstr "Auf Branch "
-#: wt-status.c:1536
+#: wt-status.c:1549
msgid "interactive rebase in progress; onto "
msgstr "interaktives Rebase im Gange; auf "
-#: wt-status.c:1538
+#: wt-status.c:1551
msgid "rebase in progress; onto "
msgstr "Rebase im Gange; auf "
-#: wt-status.c:1543
+#: wt-status.c:1556
msgid "HEAD detached at "
msgstr "HEAD losgelöst bei "
-#: wt-status.c:1545
+#: wt-status.c:1558
msgid "HEAD detached from "
msgstr "HEAD losgelöst von "
-#: wt-status.c:1548
+#: wt-status.c:1561
msgid "Not currently on any branch."
msgstr "Im Moment auf keinem Branch."
-#: wt-status.c:1566
+#: wt-status.c:1579
msgid "Initial commit"
msgstr "Initialer Commit"
-#: wt-status.c:1580
+#: wt-status.c:1593
msgid "Untracked files"
msgstr "Unversionierte Dateien"
-#: wt-status.c:1582
+#: wt-status.c:1595
msgid "Ignored files"
msgstr "Ignorierte Dateien"
-#: wt-status.c:1586
+#: wt-status.c:1599
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -4311,32 +4586,32 @@
"'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:1592
+#: wt-status.c:1605
#, c-format
msgid "Untracked files not listed%s"
msgstr "Unversionierte Dateien nicht aufgelistet%s"
-#: wt-status.c:1594
+#: wt-status.c:1607
msgid " (use -u option to show untracked files)"
msgstr " (benutzen Sie die Option -u, um unversionierte Dateien anzuzeigen)"
-#: wt-status.c:1600
+#: wt-status.c:1613
msgid "No changes"
msgstr "Keine Änderungen"
-#: wt-status.c:1605
+#: wt-status.c:1618
#, 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:1608
+#: wt-status.c:1621
#, c-format
msgid "no changes added to commit\n"
msgstr "keine Änderungen zum Commit vorgemerkt\n"
-#: wt-status.c:1611
+#: wt-status.c:1624
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -4345,71 +4620,69 @@
"nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien\n"
"(benutzen Sie \"git add\" zum Versionieren)\n"
-#: wt-status.c:1614
+#: wt-status.c:1627
#, 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:1617
+#: wt-status.c:1630
#, 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:1620 wt-status.c:1625
+#: wt-status.c:1633 wt-status.c:1638
#, c-format
msgid "nothing to commit\n"
msgstr "nichts zu committen\n"
-#: wt-status.c:1623
+#: wt-status.c:1636
#, 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"
+msgstr ""
+"nichts zu committen (benutzen Sie die Option -u, um unversionierte Dateien "
+"anzuzeigen)\n"
-#: wt-status.c:1627
+#: wt-status.c:1640
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "nichts zu committen, Arbeitsverzeichnis unverändert\n"
-#: wt-status.c:1734
+#: wt-status.c:1749
msgid "Initial commit on "
msgstr "Initialer Commit auf "
-#: wt-status.c:1738
+#: wt-status.c:1753
msgid "HEAD (no branch)"
msgstr "HEAD (kein Branch)"
-#: wt-status.c:1767
-msgid "gone"
-msgstr "entfernt"
-
-#: wt-status.c:1769 wt-status.c:1777
+#: wt-status.c:1782 wt-status.c:1790
msgid "behind "
msgstr "hinterher "
-#: wt-status.c:1772 wt-status.c:1775
+#: wt-status.c:1785 wt-status.c:1788
msgid "ahead "
msgstr "voraus "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2277
+#: wt-status.c:2280
#, 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:2283
+#: wt-status.c:2286
msgid "additionally, your index contains uncommitted changes."
msgstr "Zusätzlich enthält die Staging-Area nicht committete Änderungen."
-#: wt-status.c:2285
+#: wt-status.c:2288
#, 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:414
+#: compat/precompose_utf8.c:57 builtin/clone.c:432
#, c-format
msgid "failed to unlink '%s'"
msgstr "Konnte '%s' nicht entfernen."
@@ -4437,7 +4710,7 @@
msgstr ""
"Nicht zum Commit vorgemerkte Änderungen nach Aktualisierung der Staging-Area:"
-#: builtin/add.c:209 builtin/rev-parse.c:845
+#: builtin/add.c:209 builtin/rev-parse.c:872
msgid "Could not read the index"
msgstr "Konnte den Index nicht lesen"
@@ -4474,9 +4747,9 @@
"Die folgenden Pfade werden durch eine Ihrer \".gitignore\" Dateien "
"ignoriert:\n"
-#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:123
+#: 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:1326 builtin/rm.c:241 builtin/send-pack.c:162
+#: builtin/remote.c:1328 builtin/rm.c:241 builtin/send-pack.c:163
msgid "dry run"
msgstr "Probelauf"
@@ -4484,7 +4757,7 @@
msgid "interactive picking"
msgstr "interaktives Auswählen"
-#: builtin/add.c:270 builtin/checkout.c:1159 builtin/reset.c:286
+#: builtin/add.c:270 builtin/checkout.c:1177 builtin/reset.c:286
msgid "select hunks interactively"
msgstr "Blöcke interaktiv auswählen"
@@ -4527,11 +4800,11 @@
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:947
+#: builtin/add.c:283 builtin/update-index.c:951
msgid "(+/-)x"
msgstr "(+/-)x"
-#: builtin/add.c:283 builtin/update-index.c:948
+#: builtin/add.c:283 builtin/update-index.c:952
msgid "override the executable bit of the listed files"
msgstr "das \"ausführbar\"-Bit der aufgelisteten Dateien überschreiben"
@@ -4568,121 +4841,121 @@
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:279
-#: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350
+#: 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/submodule--helper.c:244
msgid "index file corrupt"
msgstr "Index-Datei beschädigt"
-#: builtin/am.c:414
+#: builtin/am.c:412
msgid "could not parse author script"
msgstr "konnte Autor-Skript nicht parsen"
-#: builtin/am.c:491
+#: builtin/am.c:489
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' wurde durch den applypatch-msg Hook entfernt"
-#: builtin/am.c:532
+#: builtin/am.c:530
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Fehlerhafte Eingabezeile: '%s'."
-#: builtin/am.c:569
+#: builtin/am.c:567
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Fehler beim Kopieren der Notizen von '%s' nach '%s'"
-#: builtin/am.c:595
+#: builtin/am.c:593
msgid "fseek failed"
msgstr "\"fseek\" fehlgeschlagen"
-#: builtin/am.c:775
+#: builtin/am.c:777
#, c-format
msgid "could not parse patch '%s'"
msgstr "konnte Patch '%s' nicht parsen"
-#: builtin/am.c:840
+#: builtin/am.c:842
msgid "Only one StGIT patch series can be applied at once"
msgstr "Es kann nur eine StGIT Patch-Serie auf einmal angewendet werden."
-#: builtin/am.c:887
+#: builtin/am.c:889
msgid "invalid timestamp"
msgstr "ungültiger Zeitstempel"
-#: builtin/am.c:890 builtin/am.c:898
+#: builtin/am.c:892 builtin/am.c:900
msgid "invalid Date line"
msgstr "Ungültige \"Date\"-Zeile"
-#: builtin/am.c:895
+#: builtin/am.c:897
msgid "invalid timezone offset"
msgstr "Ungültiger Offset in der Zeitzone"
-#: builtin/am.c:984
+#: builtin/am.c:986
msgid "Patch format detection failed."
msgstr "Patch-Formaterkennung fehlgeschlagen."
-#: builtin/am.c:989 builtin/clone.c:379
+#: builtin/am.c:991 builtin/clone.c:397
#, c-format
msgid "failed to create directory '%s'"
msgstr "Fehler beim Erstellen von Verzeichnis '%s'"
-#: builtin/am.c:993
+#: builtin/am.c:995
msgid "Failed to split patches."
msgstr "Fehler beim Aufteilen der Patches."
-#: builtin/am.c:1125 builtin/commit.c:376
+#: builtin/am.c:1127 builtin/commit.c:376
msgid "unable to write index file"
msgstr "Konnte Index-Datei nicht schreiben."
-#: builtin/am.c:1176
+#: builtin/am.c:1178
#, 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:1177
+#: builtin/am.c:1179
#, 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:1178
+#: builtin/am.c:1180
#, 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:1316
+#: builtin/am.c:1315
msgid "Patch is empty. Was it split wrong?"
msgstr "Patch ist leer. War dessen Aufteilung falsch?"
-#: builtin/am.c:1390 builtin/log.c:1550
+#: builtin/am.c:1386 builtin/log.c:1557
#, c-format
msgid "invalid ident line: %s"
msgstr "Ungültige Identifikationszeile: %s"
-#: builtin/am.c:1417
+#: builtin/am.c:1413
#, c-format
msgid "unable to parse commit %s"
msgstr "Konnte Commit '%s' nicht parsen."
-#: builtin/am.c:1610
+#: builtin/am.c:1606
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:1612
+#: builtin/am.c:1608
msgid "Using index info to reconstruct a base tree..."
msgstr ""
"Verwende Informationen aus der Staging-Area, um ein Basisverzeichnis "
"nachzustellen ..."
-#: builtin/am.c:1631
+#: builtin/am.c:1627
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -4690,39 +4963,39 @@
"Haben Sie den Patch per Hand editiert?\n"
"Er kann nicht auf die Blobs in seiner 'index' Zeile angewendet werden."
-#: builtin/am.c:1637
+#: builtin/am.c:1633
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:1662
+#: builtin/am.c:1658
msgid "Failed to merge in the changes."
msgstr "Merge der Änderungen fehlgeschlagen."
-#: builtin/am.c:1686 builtin/merge.c:632
+#: builtin/am.c:1682 builtin/merge.c:631
msgid "git write-tree failed to write a tree"
msgstr "\"git write-tree\" schlug beim Schreiben eines \"Tree\"-Objektes fehl"
-#: builtin/am.c:1693
+#: builtin/am.c:1689
msgid "applying to an empty history"
msgstr "auf leere Historie anwenden"
-#: builtin/am.c:1706 builtin/commit.c:1764 builtin/merge.c:802
+#: builtin/am.c:1702 builtin/commit.c:1764 builtin/merge.c:802
#: builtin/merge.c:827
msgid "failed to write commit object"
msgstr "Fehler beim Schreiben des Commit-Objektes."
-#: builtin/am.c:1739 builtin/am.c:1743
+#: builtin/am.c:1735 builtin/am.c:1739
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "Kann nicht fortsetzen: %s existiert nicht"
-#: builtin/am.c:1759
+#: builtin/am.c:1755
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:1764
+#: builtin/am.c:1760
msgid "Commit Body is:"
msgstr "Commit-Beschreibung ist:"
@@ -4730,35 +5003,35 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1774
+#: builtin/am.c:1770
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:1824
+#: builtin/am.c:1820
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Geänderter Index: kann Patches nicht anwenden (geändert: %s)"
-#: builtin/am.c:1861 builtin/am.c:1933
+#: builtin/am.c:1860 builtin/am.c:1932
#, c-format
msgid "Applying: %.*s"
msgstr "Wende an: %.*s"
-#: builtin/am.c:1877
+#: builtin/am.c:1876
msgid "No changes -- Patch already applied."
msgstr "Keine Änderungen -- Patches bereits angewendet."
-#: builtin/am.c:1885
+#: builtin/am.c:1884
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Anwendung des Patches fehlgeschlagen bei %s %.*s"
-#: builtin/am.c:1891
+#: builtin/am.c:1890
#, 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:1936
+#: builtin/am.c:1935
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -4769,7 +5042,7 @@
"diese bereits anderweitig eingefügt worden sein; Sie könnten diesen Patch\n"
"auslassen."
-#: builtin/am.c:1943
+#: builtin/am.c:1942
msgid ""
"You still have unmerged paths in your index.\n"
"Did you forget to use 'git add'?"
@@ -4777,17 +5050,17 @@
"Sie haben immer noch nicht zusammengeführte Pfade im Index.\n"
"Haben Sie vergessen 'git add' zu benutzen?"
-#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308
+#: builtin/am.c:2050 builtin/am.c:2054 builtin/am.c:2066 builtin/reset.c:308
#: builtin/reset.c:316
#, c-format
msgid "Could not parse object '%s'."
msgstr "Konnte Objekt '%s' nicht parsen."
-#: builtin/am.c:2103
+#: builtin/am.c:2102
msgid "failed to clean index"
msgstr "Fehler beim Bereinigen des Index"
-#: builtin/am.c:2137
+#: builtin/am.c:2136
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -4795,134 +5068,134 @@
"Sie scheinen seit dem letzten gescheiterten 'am' HEAD geändert zu haben.\n"
"Keine Zurücksetzung zu ORIG_HEAD."
-#: builtin/am.c:2200
+#: builtin/am.c:2199
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Ungültiger Wert für --patch-format: %s"
-#: builtin/am.c:2233
+#: builtin/am.c:2232
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<Optionen>] [(<mbox> | <E-Mail-Verzeichnis>)...]"
-#: builtin/am.c:2234
+#: builtin/am.c:2233
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<Optionen>] (--continue | --skip | --abort)"
-#: builtin/am.c:2240
+#: builtin/am.c:2239
msgid "run interactively"
msgstr "interaktiv ausführen"
-#: builtin/am.c:2242
+#: builtin/am.c:2241
msgid "historical option -- no-op"
msgstr "historische Option -- kein Effekt"
-#: builtin/am.c:2244
+#: builtin/am.c:2243
msgid "allow fall back on 3way merging if needed"
msgstr "erlaube, falls notwendig, das Zurückfallen auf einen 3-Wege-Merge"
-#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57
+#: builtin/am.c:2244 builtin/init-db.c:483 builtin/prune-packed.c:57
#: builtin/repack.c:178
msgid "be quiet"
msgstr "weniger Ausgaben"
-#: builtin/am.c:2247
+#: builtin/am.c:2246
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:2250
+#: builtin/am.c:2249
msgid "recode into utf8 (default)"
msgstr "nach UTF-8 umkodieren (Standard)"
-#: builtin/am.c:2252
+#: builtin/am.c:2251
msgid "pass -k flag to git-mailinfo"
msgstr "-k an git-mailinfo übergeben"
-#: builtin/am.c:2254
+#: builtin/am.c:2253
msgid "pass -b flag to git-mailinfo"
msgstr "-b an git-mailinfo übergeben"
-#: builtin/am.c:2256
+#: builtin/am.c:2255
msgid "pass -m flag to git-mailinfo"
msgstr "-m an git-mailinfo übergeben"
-#: builtin/am.c:2258
+#: builtin/am.c:2257
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:2261
+#: builtin/am.c:2260
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:2264
+#: builtin/am.c:2263
msgid "strip everything before a scissors line"
msgstr "alles vor einer Scheren-Zeile entfernen"
-#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
-#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287
-#: builtin/am.c:2293
+#: 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
msgid "pass it through git-apply"
msgstr "an git-apply übergeben"
-#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
-#: builtin/grep.c:1038 builtin/merge.c:202 builtin/pull.c:135
+#: 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:644 builtin/show-ref.c:169 builtin/tag.c:355
+#: 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
msgid "n"
msgstr "Anzahl"
-#: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438
-#: builtin/tag.c:387 builtin/verify-tag.c:38
+#: 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
msgid "format"
msgstr "Format"
-#: builtin/am.c:2290
+#: builtin/am.c:2289
msgid "format the patch(es) are in"
msgstr "Patch-Format"
-#: builtin/am.c:2296
+#: builtin/am.c:2295
msgid "override error message when patch failure occurs"
msgstr "Meldung bei fehlerhafter Patch-Anwendung überschreiben"
-#: builtin/am.c:2298
+#: builtin/am.c:2297
msgid "continue applying patches after resolving a conflict"
msgstr "Anwendung der Patches nach Auflösung eines Konfliktes fortsetzen"
-#: builtin/am.c:2301
+#: builtin/am.c:2300
msgid "synonyms for --continue"
msgstr "Synonyme für --continue"
-#: builtin/am.c:2304
+#: builtin/am.c:2303
msgid "skip the current patch"
msgstr "den aktuellen Patch auslassen"
-#: builtin/am.c:2307
+#: builtin/am.c:2306
msgid "restore the original branch and abort the patching operation."
msgstr ""
"ursprünglichen Branch wiederherstellen und Anwendung der Patches abbrechen"
-#: builtin/am.c:2311
+#: builtin/am.c:2310
msgid "lie about committer date"
msgstr "Autor-Datum als Commit-Datum verwenden"
-#: builtin/am.c:2313
+#: builtin/am.c:2312
msgid "use current timestamp for author date"
msgstr "aktuellen Zeitstempel als Autor-Datum verwenden"
-#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:233
-#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:370
+#: builtin/am.c:2314 builtin/commit.c:1600 builtin/merge.c:232
+#: builtin/pull.c:165 builtin/revert.c:111 builtin/tag.c:413
msgid "key-id"
msgstr "GPG-Schlüsselkennung"
-#: builtin/am.c:2316
+#: builtin/am.c:2315
msgid "GPG-sign commits"
msgstr "Commits mit GPG signieren"
-#: builtin/am.c:2319
+#: builtin/am.c:2318
msgid "(internal use for git-rebase)"
msgstr "(intern für git-rebase verwendet)"
-#: builtin/am.c:2334
+#: builtin/am.c:2333
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."
@@ -4930,16 +5203,16 @@
"Die -b/--binary Option hat seit Langem keinen Effekt und wird\n"
"entfernt. Bitte verwenden Sie diese nicht mehr."
-#: builtin/am.c:2341
+#: builtin/am.c:2340
msgid "failed to read the index"
msgstr "Fehler beim Lesen des Index"
-#: builtin/am.c:2356
+#: builtin/am.c:2355
#, 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:2380
+#: builtin/am.c:2379
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -4948,7 +5221,7 @@
"Stray %s Verzeichnis gefunden.\n"
"Benutzen Sie \"git am --abort\", um es zu entfernen."
-#: builtin/am.c:2386
+#: builtin/am.c:2385
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Es ist keine Auflösung im Gange, es wird nicht fortgesetzt."
@@ -4978,11 +5251,6 @@
msgid "git archive: NACK %s"
msgstr "git archive: NACK %s"
-#: builtin/archive.c:63
-#, c-format
-msgid "remote error: %s"
-msgstr "Fehler am anderen Ende: %s"
-
#: builtin/archive.c:64
msgid "git archive: protocol error"
msgstr "git archive: Protokollfehler"
@@ -5011,116 +5279,116 @@
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<rev-opts> sind dokumentiert in git-rev-list(1)"
-#: builtin/blame.c:1786
+#: builtin/blame.c:1777
msgid "Blaming lines"
msgstr "Verarbeite Zeilen"
-#: builtin/blame.c:2582
+#: builtin/blame.c:2573
msgid "Show blame entries as we find them, incrementally"
msgstr "\"blame\"-Einträge schrittweise anzeigen, während wir sie generieren"
-#: builtin/blame.c:2583
+#: builtin/blame.c:2574
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "leere SHA-1 für Grenz-Commits anzeigen (Standard: aus)"
-#: builtin/blame.c:2584
+#: builtin/blame.c:2575
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "Ursprungs-Commit nicht als Grenzen behandeln (Standard: aus)"
-#: builtin/blame.c:2585
+#: builtin/blame.c:2576
msgid "Show work cost statistics"
msgstr "Statistiken zum Arbeitsaufwand anzeigen"
-#: builtin/blame.c:2586
+#: builtin/blame.c:2577
msgid "Force progress reporting"
msgstr "Fortschrittsanzeige erzwingen"
-#: builtin/blame.c:2587
+#: builtin/blame.c:2578
msgid "Show output score for blame entries"
msgstr "Ausgabebewertung für \"blame\"-Einträge anzeigen"
-#: builtin/blame.c:2588
+#: builtin/blame.c:2579
msgid "Show original filename (Default: auto)"
msgstr "ursprünglichen Dateinamen anzeigen (Standard: auto)"
-#: builtin/blame.c:2589
+#: builtin/blame.c:2580
msgid "Show original linenumber (Default: off)"
msgstr "ursprüngliche Zeilennummer anzeigen (Standard: aus)"
-#: builtin/blame.c:2590
+#: builtin/blame.c:2581
msgid "Show in a format designed for machine consumption"
msgstr "Anzeige in einem Format für maschinelle Auswertung"
-#: builtin/blame.c:2591
+#: builtin/blame.c:2582
msgid "Show porcelain format with per-line commit information"
msgstr ""
"Anzeige in Format für Fremdprogramme mit Commit-Informationen pro Zeile"
-#: builtin/blame.c:2592
+#: builtin/blame.c:2583
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
"Den gleichen Ausgabemodus benutzen wie \"git-annotate\" (Standard: aus)"
-#: builtin/blame.c:2593
+#: builtin/blame.c:2584
msgid "Show raw timestamp (Default: off)"
msgstr "Unbearbeiteten Zeitstempel anzeigen (Standard: aus)"
-#: builtin/blame.c:2594
+#: builtin/blame.c:2585
msgid "Show long commit SHA1 (Default: off)"
msgstr "Langen Commit-SHA1 anzeigen (Standard: aus)"
-#: builtin/blame.c:2595
+#: builtin/blame.c:2586
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Den Namen des Autors und den Zeitstempel unterdrücken (Standard: aus)"
-#: builtin/blame.c:2596
+#: builtin/blame.c:2587
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:2597
+#: builtin/blame.c:2588
msgid "Ignore whitespace differences"
msgstr "Unterschiede im Whitespace ignorieren"
-#: builtin/blame.c:2604
+#: builtin/blame.c:2595
msgid "Use an experimental heuristic to improve diffs"
msgstr ""
"eine experimentelle Heuristik zur Verbesserung der Darstellung\n"
"von Unterschieden verwenden"
-#: builtin/blame.c:2606
+#: builtin/blame.c:2597
msgid "Spend extra cycles to find better match"
msgstr "Länger arbeiten, um bessere Übereinstimmungen zu finden"
-#: builtin/blame.c:2607
+#: builtin/blame.c:2598
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "Commits von <Datei> benutzen, anstatt \"git-rev-list\" aufzurufen"
-#: builtin/blame.c:2608
+#: builtin/blame.c:2599
msgid "Use <file>'s contents as the final image"
msgstr "Inhalte der <Datei>en als endgültiges Abbild benutzen"
-#: builtin/blame.c:2609 builtin/blame.c:2610
+#: builtin/blame.c:2600 builtin/blame.c:2601
msgid "score"
msgstr "Bewertung"
-#: builtin/blame.c:2609
+#: builtin/blame.c:2600
msgid "Find line copies within and across files"
msgstr "kopierte Zeilen innerhalb oder zwischen Dateien finden"
-#: builtin/blame.c:2610
+#: builtin/blame.c:2601
msgid "Find line movements within and across files"
msgstr "verschobene Zeilen innerhalb oder zwischen Dateien finden"
-#: builtin/blame.c:2611
+#: builtin/blame.c:2602
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2611
+#: builtin/blame.c:2602
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:2658
+#: builtin/blame.c:2649
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
"--progress kann nicht mit --incremental oder Formaten für Fremdprogramme\n"
@@ -5132,44 +5400,44 @@
#. 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:2706
+#: builtin/blame.c:2697
msgid "4 years, 11 months ago"
msgstr "vor 4 Jahren, und 11 Monaten"
-#: builtin/blame.c:2786
+#: builtin/blame.c:2777
msgid "--contents and --reverse do not blend well."
msgstr "--contents und --reverse funktionieren gemeinsam nicht."
-#: builtin/blame.c:2806
+#: 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:2811
+#: 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:2838
+#: 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:2849
+#: builtin/blame.c:2840
#, c-format
msgid "no such path %s in %s"
msgstr "Pfad %s nicht in %s"
-#: builtin/blame.c:2860
+#: builtin/blame.c:2851
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "kann Blob %s für Pfad '%s' nicht lesen"
-#: builtin/blame.c:2879
+#: builtin/blame.c:2870
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
@@ -5196,7 +5464,11 @@
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [<Optionen>] [-r | -a] [--points-at]"
-#: builtin/branch.c:143
+#: builtin/branch.c:31
+msgid "git branch [<options>] [-r | -a] [--format]"
+msgstr "git branch [<Optionen>] [-r | -a] [--format]"
+
+#: builtin/branch.c:144
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -5205,7 +5477,7 @@
"entferne Branch '%s', der zusammengeführt wurde mit\n"
" '%s', aber noch nicht mit HEAD zusammengeführt wurde."
-#: builtin/branch.c:147
+#: builtin/branch.c:148
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -5214,12 +5486,12 @@
"entferne Branch '%s' nicht, der noch nicht zusammengeführt wurde mit\n"
" '%s', obwohl er mit HEAD zusammengeführt wurde."
-#: builtin/branch.c:161
+#: builtin/branch.c:162
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Konnte Commit-Objekt für '%s' nicht nachschlagen."
-#: builtin/branch.c:165
+#: builtin/branch.c:166
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -5229,166 +5501,94 @@
"Wenn Sie sicher sind diesen Branch zu entfernen, führen Sie 'git branch -D "
"%s' aus."
-#: builtin/branch.c:178
+#: builtin/branch.c:179
msgid "Update of config-file failed"
msgstr "Aktualisierung der Konfigurationsdatei fehlgeschlagen."
-#: builtin/branch.c:206
+#: builtin/branch.c:210
msgid "cannot use -a with -d"
msgstr "kann -a nicht mit -d benutzen"
-#: builtin/branch.c:212
+#: builtin/branch.c:216
msgid "Couldn't look up commit object for HEAD"
msgstr "Konnte Commit-Objekt für HEAD nicht nachschlagen."
-#: builtin/branch.c:226
+#: builtin/branch.c:230
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "Kann Branch '%s' nicht entfernen, ausgecheckt in '%s'."
-#: builtin/branch.c:241
+#: builtin/branch.c:245
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "Remote-Tracking-Branch '%s' nicht gefunden"
-#: builtin/branch.c:242
+#: builtin/branch.c:246
#, c-format
msgid "branch '%s' not found."
msgstr "Branch '%s' nicht gefunden."
-#: builtin/branch.c:257
+#: builtin/branch.c:261
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Fehler beim Entfernen des Remote-Tracking-Branches '%s'"
-#: builtin/branch.c:258
+#: builtin/branch.c:262
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Fehler beim Entfernen des Branches '%s'"
-#: builtin/branch.c:265
+#: builtin/branch.c:269
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Remote-Tracking-Branch %s entfernt (war %s).\n"
-#: builtin/branch.c:266
+#: builtin/branch.c:270
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Branch %s entfernt (war %s).\n"
-#: builtin/branch.c:312
-#, c-format
-msgid "[%s: gone]"
-msgstr "[%s: entfernt]"
-
-#: builtin/branch.c:317
-#, c-format
-msgid "[%s]"
-msgstr "[%s]"
-
-#: builtin/branch.c:322
-#, c-format
-msgid "[%s: behind %d]"
-msgstr "[%s: %d hinterher]"
-
-#: builtin/branch.c:324
-#, c-format
-msgid "[behind %d]"
-msgstr "[%d hinterher]"
-
-#: builtin/branch.c:328
-#, c-format
-msgid "[%s: ahead %d]"
-msgstr "[%s: %d voraus]"
-
-#: builtin/branch.c:330
-#, c-format
-msgid "[ahead %d]"
-msgstr "[%d voraus]"
-
-#: builtin/branch.c:333
-#, c-format
-msgid "[%s: ahead %d, behind %d]"
-msgstr "[%s: %d voraus, %d hinterher]"
-
-#: builtin/branch.c:336
-#, c-format
-msgid "[ahead %d, behind %d]"
-msgstr "[%d voraus, %d hinterher]"
-
-#: builtin/branch.c:349
-msgid " **** invalid ref ****"
-msgstr " **** ungültige Referenz ****"
-
-#: builtin/branch.c:375
-#, c-format
-msgid "(no branch, rebasing %s)"
-msgstr "(kein Branch, Rebase von Branch %s im Gange)"
-
-#: builtin/branch.c:378
-#, 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
-#: builtin/branch.c:384
-#, 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
-#: builtin/branch.c:389
-#, c-format
-msgid "(HEAD detached from %s)"
-msgstr "(HEAD losgelöst von %s)"
-
-#: builtin/branch.c:393
-msgid "(no branch)"
-msgstr "(kein Branch)"
-
-#: builtin/branch.c:535
+#: builtin/branch.c:441
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Branch %s wird auf %s umgesetzt"
-#: builtin/branch.c:539
+#: builtin/branch.c:445
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Binäre Suche von Branch %s zu %s im Gange"
-#: builtin/branch.c:554
+#: builtin/branch.c:460
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:564
+#: builtin/branch.c:470
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Ungültiger Branchname: '%s'"
-#: builtin/branch.c:581
+#: builtin/branch.c:487
msgid "Branch rename failed"
msgstr "Umbenennung des Branches fehlgeschlagen"
-#: builtin/branch.c:585
+#: builtin/branch.c:490
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "falsch benannten Branch '%s' umbenannt"
-#: builtin/branch.c:588
+#: builtin/branch.c:493
#, 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:595
+#: builtin/branch.c:502
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
"Branch ist umbenannt, aber die Aktualisierung der Konfigurationsdatei ist "
"fehlgeschlagen."
-#: builtin/branch.c:611
+#: builtin/branch.c:518
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -5399,168 +5599,177 @@
" %s\n"
"Zeilen, die mit '%c' beginnen, werden entfernt.\n"
-#: builtin/branch.c:643
+#: builtin/branch.c:551
msgid "Generic options"
msgstr "Allgemeine Optionen"
-#: builtin/branch.c:645
+#: builtin/branch.c:553
msgid "show hash and subject, give twice for upstream branch"
msgstr "Hash und Betreff anzeigen; -vv: zusätzlich Upstream-Branch"
-#: builtin/branch.c:646
+#: builtin/branch.c:554
msgid "suppress informational messages"
msgstr "Informationsmeldungen unterdrücken"
-#: builtin/branch.c:647
+#: builtin/branch.c:555
msgid "set up tracking mode (see git-pull(1))"
msgstr "den Übernahmemodus einstellen (siehe git-pull(1))"
-#: builtin/branch.c:649
+#: builtin/branch.c:557
msgid "change upstream info"
msgstr "Informationen zum Upstream-Branch ändern"
-#: builtin/branch.c:651
+#: builtin/branch.c:559
msgid "upstream"
msgstr "Upstream"
-#: builtin/branch.c:651
+#: builtin/branch.c:559
msgid "change the upstream info"
msgstr "Informationen zum Upstream-Branch ändern"
-#: builtin/branch.c:652
+#: builtin/branch.c:560
msgid "Unset the upstream info"
msgstr "Informationen zum Upstream-Branch entfernen"
-#: builtin/branch.c:653
+#: builtin/branch.c:561
msgid "use colored output"
msgstr "farbige Ausgaben verwenden"
-#: builtin/branch.c:654
+#: builtin/branch.c:562
msgid "act on remote-tracking branches"
msgstr "auf Remote-Tracking-Branches wirken"
-#: builtin/branch.c:656 builtin/branch.c:657
+#: builtin/branch.c:564 builtin/branch.c:566
msgid "print only branches that contain the commit"
-msgstr "nur Branches ausgeben, welche diesen Commit beinhalten"
+msgstr "nur Branches ausgeben, die diesen Commit enthalten"
-#: builtin/branch.c:660
+#: builtin/branch.c:565 builtin/branch.c:567
+msgid "print only branches that don't contain the commit"
+msgstr "nur Branches ausgeben, die diesen Commit nicht enthalten"
+
+#: builtin/branch.c:570
msgid "Specific git-branch actions:"
msgstr "spezifische Aktionen für \"git-branch\":"
-#: builtin/branch.c:661
+#: builtin/branch.c:571
msgid "list both remote-tracking and local branches"
msgstr "Remote-Tracking und lokale Branches auflisten"
-#: builtin/branch.c:663
+#: builtin/branch.c:573
msgid "delete fully merged branch"
msgstr "vollständig zusammengeführten Branch entfernen"
-#: builtin/branch.c:664
+#: builtin/branch.c:574
msgid "delete branch (even if not merged)"
msgstr "Branch löschen (auch wenn nicht zusammengeführt)"
-#: builtin/branch.c:665
+#: builtin/branch.c:575
msgid "move/rename a branch and its reflog"
msgstr "einen Branch und dessen Reflog verschieben/umbenennen"
-#: builtin/branch.c:666
+#: builtin/branch.c:576
msgid "move/rename a branch, even if target exists"
msgstr ""
"einen Branch verschieben/umbenennen, auch wenn das Ziel bereits existiert"
-#: builtin/branch.c:667
+#: builtin/branch.c:577
msgid "list branch names"
msgstr "Branchnamen auflisten"
-#: builtin/branch.c:668
+#: builtin/branch.c:578
msgid "create the branch's reflog"
msgstr "das Reflog des Branches erzeugen"
-#: builtin/branch.c:670
+#: builtin/branch.c:580
msgid "edit the description for the branch"
msgstr "die Beschreibung für den Branch bearbeiten"
-#: builtin/branch.c:671
+#: builtin/branch.c:581
msgid "force creation, move/rename, deletion"
msgstr "Erstellung, Verschiebung/Umbenennung oder Löschung erzwingen"
-#: builtin/branch.c:672
+#: builtin/branch.c:582
msgid "print only branches that are merged"
msgstr "nur zusammengeführte Branches ausgeben"
-#: builtin/branch.c:673
+#: builtin/branch.c:583
msgid "print only branches that are not merged"
msgstr "nur nicht zusammengeführte Branches ausgeben"
-#: builtin/branch.c:674
+#: builtin/branch.c:584
msgid "list branches in columns"
msgstr "Branches in Spalten auflisten"
-#: builtin/branch.c:675 builtin/for-each-ref.c:38 builtin/tag.c:381
+#: builtin/branch.c:585 builtin/for-each-ref.c:38 builtin/tag.c:426
msgid "key"
msgstr "Schüssel"
-#: builtin/branch.c:676 builtin/for-each-ref.c:39 builtin/tag.c:382
+#: builtin/branch.c:586 builtin/for-each-ref.c:39 builtin/tag.c:427
msgid "field name to sort on"
msgstr "sortiere nach diesem Feld"
-#: builtin/branch.c:678 builtin/for-each-ref.c:41 builtin/notes.c:404
+#: 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:384
+#: builtin/tag.c:429
msgid "object"
msgstr "Objekt"
-#: builtin/branch.c:679
+#: builtin/branch.c:589
msgid "print only branches of the object"
msgstr "nur Branches von diesem Objekt ausgeben"
-#: builtin/branch.c:681 builtin/for-each-ref.c:46 builtin/tag.c:388
+#: builtin/branch.c:591 builtin/for-each-ref.c:47 builtin/tag.c:434
msgid "sorting and filtering are case insensitive"
msgstr "Sortierung und Filterung sind unabhängig von Groß- und Kleinschreibung"
-#: builtin/branch.c:698
+#: builtin/branch.c:592 builtin/for-each-ref.c:37 builtin/tag.c:433
+#: builtin/verify-tag.c:38
+msgid "format to use for the output"
+msgstr "für die Ausgabe zu verwendendes Format"
+
+#: builtin/branch.c:611
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Konnte HEAD nicht als gültige Referenz auflösen."
-#: builtin/branch.c:702 builtin/clone.c:706
+#: builtin/branch.c:615 builtin/clone.c:724
msgid "HEAD not found below refs/heads!"
msgstr "HEAD wurde nicht unter \"refs/heads\" gefunden!"
-#: builtin/branch.c:724
+#: builtin/branch.c:638
msgid "--column and --verbose are incompatible"
msgstr "Die Optionen --column und --verbose sind inkompatibel."
-#: builtin/branch.c:735 builtin/branch.c:787
+#: builtin/branch.c:649 builtin/branch.c:701
msgid "branch name required"
msgstr "Branchname erforderlich"
-#: builtin/branch.c:763
+#: builtin/branch.c:677
msgid "Cannot give description to detached HEAD"
msgstr "zu losgelöstem HEAD kann keine Beschreibung hinterlegt werden"
-#: builtin/branch.c:768
+#: builtin/branch.c:682
msgid "cannot edit description of more than one branch"
msgstr "Beschreibung von mehr als einem Branch kann nicht bearbeitet werden"
-#: builtin/branch.c:775
+#: builtin/branch.c:689
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Noch kein Commit in Branch '%s'."
-#: builtin/branch.c:778
+#: builtin/branch.c:692
#, c-format
msgid "No branch named '%s'."
msgstr "Branch '%s' nicht vorhanden."
-#: builtin/branch.c:793
+#: builtin/branch.c:707
msgid "too many branches for a rename operation"
msgstr "zu viele Branches für eine Umbenennen-Operation angegeben"
-#: builtin/branch.c:798
+#: builtin/branch.c:712
msgid "too many branches to set new upstream"
msgstr "zu viele Branches angegeben, um Upstream-Branch zu setzen"
-#: builtin/branch.c:802
+#: builtin/branch.c:716
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -5568,43 +5777,43 @@
"Konnte keinen neuen Upstream-Branch von HEAD zu %s setzen, da dieser auf\n"
"keinen Branch zeigt."
-#: builtin/branch.c:805 builtin/branch.c:827 builtin/branch.c:848
+#: builtin/branch.c:719 builtin/branch.c:741 builtin/branch.c:762
#, c-format
msgid "no such branch '%s'"
msgstr "Kein solcher Branch '%s'"
-#: builtin/branch.c:809
+#: builtin/branch.c:723
#, c-format
msgid "branch '%s' does not exist"
msgstr "Branch '%s' existiert nicht"
-#: builtin/branch.c:821
+#: builtin/branch.c:735
msgid "too many branches to unset upstream"
msgstr ""
"zu viele Branches angegeben, um Konfiguration zu Upstream-Branch zu entfernen"
-#: builtin/branch.c:825
+#: builtin/branch.c:739
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:831
+#: builtin/branch.c:745
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt"
-#: builtin/branch.c:845
+#: builtin/branch.c:759
msgid "it does not make sense to create 'HEAD' manually"
msgstr "'HEAD' darf nicht manuell erstellt werden"
-#: builtin/branch.c:851
+#: builtin/branch.c:765
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:854
+#: builtin/branch.c:768
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
@@ -5613,7 +5822,7 @@
"Die --set-upstream Option ist veraltet und wird entfernt. Benutzen Sie --"
"track oder --set-upstream-to\n"
-#: builtin/branch.c:871
+#: builtin/branch.c:785
#, c-format
msgid ""
"\n"
@@ -5624,16 +5833,16 @@
"Wenn Sie wollten, dass '%s' den Branch '%s' als Upstream-Branch hat, führen "
"Sie aus:\n"
-#: builtin/bundle.c:51
+#: builtin/bundle.c:45
#, c-format
msgid "%s is okay\n"
msgstr "%s ist in Ordnung\n"
-#: builtin/bundle.c:64
+#: builtin/bundle.c:58
msgid "Need a repository to create a bundle."
msgstr "Um ein Paket zu erstellen wird ein Repository benötigt."
-#: builtin/bundle.c:68
+#: builtin/bundle.c:62
msgid "Need a repository to unbundle."
msgstr "Zum Entpacken wird ein Repository benötigt."
@@ -5681,7 +5890,7 @@
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:929
+#: builtin/cat-file.c:561 git-submodule.sh:943
msgid "blob"
msgstr "Blob"
@@ -5742,7 +5951,7 @@
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:1140 builtin/gc.c:332
+#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:356
msgid "suppress progress reporting"
msgstr "Fortschrittsanzeige unterdrücken"
@@ -5835,9 +6044,9 @@
msgstr "den Inhalt in temporäre Dateien schreiben"
#: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:597 builtin/submodule--helper.c:600
-#: builtin/submodule--helper.c:606 builtin/submodule--helper.c:967
-#: builtin/worktree.c:471
+#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
+#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
+#: builtin/worktree.c:477
msgid "string"
msgstr "Zeichenkette"
@@ -5850,114 +6059,114 @@
msgid "copy out the files from named stage"
msgstr "Dateien von dem benannten Stand kopieren"
-#: builtin/checkout.c:25
+#: builtin/checkout.c:27
msgid "git checkout [<options>] <branch>"
msgstr "git checkout [<Optionen>] <Branch>"
-#: builtin/checkout.c:26
+#: builtin/checkout.c:28
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<Optionen>] [<Branch>] -- <Datei>..."
-#: builtin/checkout.c:134 builtin/checkout.c:167
+#: builtin/checkout.c:153 builtin/checkout.c:186
#, c-format
msgid "path '%s' does not have our version"
msgstr "Pfad '%s' hat nicht unsere Version."
-#: builtin/checkout.c:136 builtin/checkout.c:169
+#: builtin/checkout.c:155 builtin/checkout.c:188
#, c-format
msgid "path '%s' does not have their version"
msgstr "Pfad '%s' hat nicht deren Version."
-#: builtin/checkout.c:152
+#: builtin/checkout.c:171
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "Pfad '%s' hat nicht alle notwendigen Versionen."
-#: builtin/checkout.c:196
+#: builtin/checkout.c:215
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "Pfad '%s' hat nicht die notwendigen Versionen."
-#: builtin/checkout.c:213
+#: builtin/checkout.c:232
#, c-format
msgid "path '%s': cannot merge"
msgstr "Pfad '%s': kann nicht zusammenführen"
-#: builtin/checkout.c:230
+#: builtin/checkout.c:249
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Konnte Merge-Ergebnis von '%s' nicht hinzufügen."
-#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
-#: builtin/checkout.c:259
+#: builtin/checkout.c:269 builtin/checkout.c:272 builtin/checkout.c:275
+#: builtin/checkout.c:278
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' kann nicht mit der Aktualisierung von Pfaden verwendet werden"
-#: builtin/checkout.c:262 builtin/checkout.c:265
+#: builtin/checkout.c:281 builtin/checkout.c:284
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' kann nicht mit '%s' verwendet werden"
-#: builtin/checkout.c:268
+#: builtin/checkout.c:287
#, 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:339 builtin/checkout.c:346
+#: builtin/checkout.c:358 builtin/checkout.c:365
#, c-format
msgid "path '%s' is unmerged"
msgstr "Pfad '%s' ist nicht zusammengeführt."
-#: builtin/checkout.c:494
+#: builtin/checkout.c:513
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:625
+#: builtin/checkout.c:644
#, 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:666
+#: builtin/checkout.c:685
msgid "HEAD is now at"
msgstr "HEAD ist jetzt bei"
-#: builtin/checkout.c:670 builtin/clone.c:660
+#: builtin/checkout.c:689 builtin/clone.c:678
msgid "unable to update HEAD"
msgstr "Konnte HEAD nicht aktualisieren."
-#: builtin/checkout.c:674
+#: builtin/checkout.c:693
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Setze Branch '%s' neu\n"
-#: builtin/checkout.c:677
+#: builtin/checkout.c:696
#, c-format
msgid "Already on '%s'\n"
msgstr "Bereits auf '%s'\n"
-#: builtin/checkout.c:681
+#: builtin/checkout.c:700
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Zu umgesetztem Branch '%s' gewechselt\n"
-#: builtin/checkout.c:683 builtin/checkout.c:1072
+#: builtin/checkout.c:702 builtin/checkout.c:1090
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Zu neuem Branch '%s' gewechselt\n"
-#: builtin/checkout.c:685
+#: builtin/checkout.c:704
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Zu Branch '%s' gewechselt\n"
-#: builtin/checkout.c:736
+#: builtin/checkout.c:755
#, c-format
msgid " ... and %d more.\n"
msgstr " ... und %d weitere.\n"
-#: builtin/checkout.c:742
+#: builtin/checkout.c:761
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -5980,7 +6189,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:761
+#: builtin/checkout.c:780
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -6007,152 +6216,152 @@
" git branch <neuer-Branchname> %s\n"
"\n"
-#: builtin/checkout.c:797
+#: builtin/checkout.c:816
msgid "internal error in revision walk"
msgstr "interner Fehler im Revisionsgang"
-#: builtin/checkout.c:801
+#: builtin/checkout.c:820
msgid "Previous HEAD position was"
msgstr "Vorherige Position von HEAD war"
-#: builtin/checkout.c:828 builtin/checkout.c:1067
+#: builtin/checkout.c:847 builtin/checkout.c:1085
msgid "You are on a branch yet to be born"
msgstr "Sie sind auf einem Branch, der noch geboren wird"
-#: builtin/checkout.c:973
+#: builtin/checkout.c:991
#, c-format
msgid "only one reference expected, %d given."
msgstr "nur eine Referenz erwartet, %d gegeben."
-#: builtin/checkout.c:1013 builtin/worktree.c:214
+#: builtin/checkout.c:1031 builtin/worktree.c:214
#, c-format
msgid "invalid reference: %s"
msgstr "Ungültige Referenz: %s"
-#: builtin/checkout.c:1042
+#: builtin/checkout.c:1060
#, c-format
msgid "reference is not a tree: %s"
msgstr "Referenz ist kein \"Tree\"-Objekt: %s"
-#: builtin/checkout.c:1081
+#: builtin/checkout.c:1099
msgid "paths cannot be used with switching branches"
msgstr "Pfade können nicht beim Wechseln von Branches verwendet werden"
-#: builtin/checkout.c:1084 builtin/checkout.c:1088
+#: builtin/checkout.c:1102 builtin/checkout.c:1106
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' kann nicht beim Wechseln von Branches verwendet werden"
-#: builtin/checkout.c:1092 builtin/checkout.c:1095 builtin/checkout.c:1100
-#: builtin/checkout.c:1103
+#: builtin/checkout.c:1110 builtin/checkout.c:1113 builtin/checkout.c:1118
+#: builtin/checkout.c:1121
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' kann nicht mit '%s' verwendet werden"
-#: builtin/checkout.c:1108
+#: builtin/checkout.c:1126
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Kann Branch nicht zu Nicht-Commit '%s' wechseln"
-#: builtin/checkout.c:1141 builtin/checkout.c:1143 builtin/clone.c:93
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324
-#: builtin/worktree.c:326
+#: 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
msgid "branch"
msgstr "Branch"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1160
msgid "create and checkout a new branch"
msgstr "einen neuen Branch erzeugen und auschecken"
-#: builtin/checkout.c:1144
+#: builtin/checkout.c:1162
msgid "create/reset and checkout a branch"
msgstr "einen Branch erstellen/umsetzen und auschecken"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1163
msgid "create reflog for new branch"
msgstr "das Reflog für den neuen Branch erzeugen"
-#: builtin/checkout.c:1146 builtin/worktree.c:328
+#: builtin/checkout.c:1164 builtin/worktree.c:333
msgid "detach HEAD at named commit"
msgstr "HEAD bei benanntem Commit loslösen"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1165
msgid "set upstream info for new branch"
msgstr "Informationen zum Upstream-Branch für den neuen Branch setzen"
-#: builtin/checkout.c:1149
+#: builtin/checkout.c:1167
msgid "new-branch"
msgstr "neuer Branch"
-#: builtin/checkout.c:1149
+#: builtin/checkout.c:1167
msgid "new unparented branch"
msgstr "neuer Branch ohne Eltern-Commit"
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1168
msgid "checkout our version for unmerged files"
msgstr "unsere Variante für nicht zusammengeführte Dateien auschecken"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1170
msgid "checkout their version for unmerged files"
msgstr "ihre Variante für nicht zusammengeführte Dateien auschecken"
-#: builtin/checkout.c:1154
+#: builtin/checkout.c:1172
msgid "force checkout (throw away local modifications)"
msgstr "Auschecken erzwingen (verwirft lokale Änderungen)"
-#: builtin/checkout.c:1155
+#: builtin/checkout.c:1173
msgid "perform a 3-way merge with the new branch"
msgstr "einen 3-Wege-Merge mit dem neuen Branch ausführen"
-#: builtin/checkout.c:1156 builtin/merge.c:235
+#: builtin/checkout.c:1174 builtin/merge.c:234
msgid "update ignored files (default)"
msgstr "ignorierte Dateien aktualisieren (Standard)"
-#: builtin/checkout.c:1157 builtin/log.c:1466 parse-options.h:251
+#: builtin/checkout.c:1175 builtin/log.c:1473 parse-options.h:251
msgid "style"
msgstr "Stil"
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1176
msgid "conflict style (merge or diff3)"
msgstr "Konfliktstil (merge oder diff3)"
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1179
msgid "do not limit pathspecs to sparse entries only"
msgstr "keine Einschränkung bei Pfadspezifikationen zum partiellen Auschecken"
-#: builtin/checkout.c:1163
+#: builtin/checkout.c:1181
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "second guess 'git checkout <no-such-branch>'"
-#: builtin/checkout.c:1165
+#: builtin/checkout.c:1183
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:1166 builtin/clone.c:63 builtin/fetch.c:119
-#: builtin/merge.c:232 builtin/pull.c:117 builtin/push.c:539
-#: builtin/send-pack.c:168
+#: 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
msgid "force progress reporting"
msgstr "Fortschrittsanzeige erzwingen"
-#: builtin/checkout.c:1197
+#: builtin/checkout.c:1224
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "Die Optionen -b, -B und --orphan schließen sich gegenseitig aus."
-#: builtin/checkout.c:1214
+#: builtin/checkout.c:1241
msgid "--track needs a branch name"
msgstr "Bei der Option --track muss ein Branchname angegeben werden."
-#: builtin/checkout.c:1219
+#: builtin/checkout.c:1246
msgid "Missing branch name; try -b"
msgstr "Vermisse Branchnamen; versuchen Sie -b"
-#: builtin/checkout.c:1255
+#: builtin/checkout.c:1282
msgid "invalid path specification"
msgstr "ungültige Pfadspezifikation"
-#: builtin/checkout.c:1262
+#: builtin/checkout.c:1289
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
@@ -6162,12 +6371,12 @@
"Haben Sie beabsichtigt '%s' auszuchecken, welcher nicht als Commit aufgelöst "
"werden kann?"
-#: builtin/checkout.c:1267
+#: builtin/checkout.c:1294
#, 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:1271
+#: builtin/checkout.c:1298
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -6206,7 +6415,7 @@
msgid "failed to remove %s"
msgstr "Fehler beim Löschen von %s"
-#: builtin/clean.c:291 git-add--interactive.perl:623
+#: builtin/clean.c:297 git-add--interactive.perl:614
#, c-format
msgid ""
"Prompt help:\n"
@@ -6219,7 +6428,7 @@
"foo - Element anhand eines eindeutigen Präfix auswählen\n"
" - (leer) nichts auswählen\n"
-#: builtin/clean.c:295 git-add--interactive.perl:632
+#: builtin/clean.c:301 git-add--interactive.perl:623
#, c-format
msgid ""
"Prompt help:\n"
@@ -6240,38 +6449,38 @@
"* - alle Elemente auswählen\n"
" - (leer) Auswahl beenden\n"
-#: builtin/clean.c:511 git-add--interactive.perl:598
-#: git-add--interactive.perl:603
+#: builtin/clean.c:517 git-add--interactive.perl:589
+#: git-add--interactive.perl:594
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Wie bitte (%s)?\n"
-#: builtin/clean.c:653
+#: builtin/clean.c:659
#, c-format
msgid "Input ignore patterns>> "
msgstr "Ignorier-Muster eingeben>> "
-#: builtin/clean.c:690
+#: builtin/clean.c:696
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "WARNUNG: Kann keine Einträge finden die Muster entsprechen: %s"
-#: builtin/clean.c:711
+#: builtin/clean.c:717
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:752
+#: builtin/clean.c:758
#, c-format
msgid "Remove %s [y/N]? "
msgstr "'%s' löschen [y/N]? "
-#: builtin/clean.c:777 git-add--interactive.perl:1669
+#: builtin/clean.c:783 git-add--interactive.perl:1660
#, c-format
msgid "Bye.\n"
msgstr "Tschüss.\n"
-#: builtin/clean.c:785
+#: builtin/clean.c:791
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -6289,62 +6498,63 @@
"help - diese Meldung anzeigen\n"
"? - Hilfe zur Auswahl mittels Eingabe anzeigen"
-#: builtin/clean.c:812 git-add--interactive.perl:1745
+#: builtin/clean.c:818 git-add--interactive.perl:1736
msgid "*** Commands ***"
msgstr "*** Befehle ***"
-#: builtin/clean.c:813 git-add--interactive.perl:1742
+#: builtin/clean.c:819 git-add--interactive.perl:1733
msgid "What now"
msgstr "Was nun"
-#: builtin/clean.c:821
+#: builtin/clean.c:827
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Würde das folgende Element entfernen:"
msgstr[1] "Würde die folgenden Elemente entfernen:"
-#: builtin/clean.c:838
+#: builtin/clean.c:844
msgid "No more files to clean, exiting."
msgstr "Keine Dateien mehr zum Löschen, beende."
-#: builtin/clean.c:869
+#: builtin/clean.c:875
msgid "do not print names of files removed"
msgstr "keine Namen von gelöschten Dateien ausgeben"
-#: builtin/clean.c:871
+#: builtin/clean.c:877
msgid "force"
msgstr "Aktion erzwingen"
-#: builtin/clean.c:872
+#: builtin/clean.c:878
msgid "interactive cleaning"
msgstr "interaktives Clean"
-#: builtin/clean.c:874
+#: builtin/clean.c:880
msgid "remove whole directories"
msgstr "ganze Verzeichnisse löschen"
-#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:1056
-#: builtin/ls-files.c:538 builtin/name-rev.c:313 builtin/show-ref.c:176
+#: 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
msgid "pattern"
msgstr "Muster"
-#: builtin/clean.c:876
+#: builtin/clean.c:882
msgid "add <pattern> to ignore rules"
msgstr "<Muster> zu den Regeln für ignorierte Pfade hinzufügen"
-#: builtin/clean.c:877
+#: builtin/clean.c:883
msgid "remove ignored files, too"
msgstr "auch ignorierte Dateien löschen"
-#: builtin/clean.c:879
+#: builtin/clean.c:885
msgid "remove only ignored files"
msgstr "nur ignorierte Dateien löschen"
-#: builtin/clean.c:897
+#: builtin/clean.c:903
msgid "-x and -X cannot be used together"
msgstr "Die Optionen -x und -X können nicht gemeinsam verwendet werden."
-#: builtin/clean.c:901
+#: builtin/clean.c:907
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -6352,7 +6562,7 @@
"clean.requireForce auf \"true\" gesetzt und weder -i, -n noch -f gegeben; "
"\"clean\" verweigert"
-#: builtin/clean.c:904
+#: builtin/clean.c:910
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -6364,135 +6574,140 @@
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<Optionen>] [--] <Repository> [<Verzeichnis>]"
-#: builtin/clone.c:65
+#: builtin/clone.c:80
msgid "don't create a checkout"
msgstr "kein Auschecken"
-#: builtin/clone.c:66 builtin/clone.c:68 builtin/init-db.c:478
+#: builtin/clone.c:81 builtin/clone.c:83 builtin/init-db.c:478
msgid "create a bare repository"
msgstr "ein Bare-Repository erstellen"
-#: builtin/clone.c:70
+#: builtin/clone.c:85
msgid "create a mirror repository (implies bare)"
msgstr "ein Spiegelarchiv erstellen (impliziert --bare)"
-#: builtin/clone.c:72
+#: builtin/clone.c:87
msgid "to clone from a local repository"
msgstr "von einem lokalen Repository klonen"
-#: builtin/clone.c:74
+#: builtin/clone.c:89
msgid "don't use local hardlinks, always copy"
msgstr "lokal keine harten Verweise verwenden, immer Kopien"
-#: builtin/clone.c:76
+#: builtin/clone.c:91
msgid "setup as shared repository"
msgstr "als verteiltes Repository einrichten"
-#: builtin/clone.c:78 builtin/clone.c:80
+#: builtin/clone.c:93 builtin/clone.c:97
+msgid "pathspec"
+msgstr "Pfadspezifikation"
+
+#: builtin/clone.c:93 builtin/clone.c:97
msgid "initialize submodules in the clone"
msgstr "Submodule im Klon initialisieren"
-#: builtin/clone.c:82
+#: builtin/clone.c:100
msgid "number of submodules cloned in parallel"
msgstr "Anzahl der parallel zu klonenden Submodule"
-#: builtin/clone.c:83 builtin/init-db.c:475
+#: builtin/clone.c:101 builtin/init-db.c:475
msgid "template-directory"
msgstr "Vorlagenverzeichnis"
-#: builtin/clone.c:84 builtin/init-db.c:476
+#: builtin/clone.c:102 builtin/init-db.c:476
msgid "directory from which templates will be used"
msgstr "Verzeichnis, von welchem die Vorlagen verwendet werden"
-#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:604
-#: builtin/submodule--helper.c:970
+#: builtin/clone.c:104 builtin/clone.c:106 builtin/submodule--helper.c:642
+#: builtin/submodule--helper.c:983
msgid "reference repository"
msgstr "Repository referenzieren"
-#: builtin/clone.c:90
+#: builtin/clone.c:108
msgid "use --reference only while cloning"
msgstr "--reference nur während des Klonens benutzen"
-#: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:109 builtin/column.c:26 builtin/merge-file.c:43
msgid "name"
msgstr "Name"
-#: builtin/clone.c:92
+#: builtin/clone.c:110
msgid "use <name> instead of 'origin' to track upstream"
msgstr "<Name> statt 'origin' für Upstream-Repository verwenden"
-#: builtin/clone.c:94
+#: builtin/clone.c:112
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "<Branch> auschecken, anstatt HEAD des Remote-Repositories"
-#: builtin/clone.c:96
+#: builtin/clone.c:114
msgid "path to git-upload-pack on the remote"
msgstr "Pfad zu \"git-upload-pack\" auf der Gegenseite"
-#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:999 builtin/pull.c:202
+#: builtin/clone.c:115 builtin/fetch.c:120 builtin/grep.c:1006
+#: builtin/pull.c:202
msgid "depth"
msgstr "Tiefe"
-#: builtin/clone.c:98
+#: builtin/clone.c:116
msgid "create a shallow clone of that depth"
msgstr ""
"einen Klon mit unvollständiger Historie (shallow) in dieser Tiefe erstellen"
-#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2836
+#: builtin/clone.c:117 builtin/fetch.c:122 builtin/pack-objects.c:2918
#: parse-options.h:142
msgid "time"
msgstr "Zeit"
-#: builtin/clone.c:100
+#: builtin/clone.c:118
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:101 builtin/fetch.c:124
+#: builtin/clone.c:119 builtin/fetch.c:124
msgid "revision"
msgstr "Commit"
-#: builtin/clone.c:102 builtin/fetch.c:125
+#: builtin/clone.c:120 builtin/fetch.c:125
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:104
+#: builtin/clone.c:122
msgid "clone only one branch, HEAD or --branch"
msgstr "nur einen Branch klonen, HEAD oder --branch"
-#: builtin/clone.c:106
+#: builtin/clone.c:124
msgid "any cloned submodules will be shallow"
msgstr "jedes geklonte Submodul mit unvollständiger Historie (shallow)"
-#: builtin/clone.c:107 builtin/init-db.c:484
+#: builtin/clone.c:125 builtin/init-db.c:484
msgid "gitdir"
msgstr ".git-Verzeichnis"
-#: builtin/clone.c:108 builtin/init-db.c:485
+#: builtin/clone.c:126 builtin/init-db.c:485
msgid "separate git dir from working tree"
msgstr "Git-Verzeichnis vom Arbeitsverzeichnis separieren"
-#: builtin/clone.c:109
+#: builtin/clone.c:127
msgid "key=value"
msgstr "Schlüssel=Wert"
-#: builtin/clone.c:110
+#: builtin/clone.c:128
msgid "set config inside the new repository"
msgstr "Konfiguration innerhalb des neuen Repositories setzen"
-#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:550
+#: builtin/clone.c:129 builtin/fetch.c:140 builtin/push.c:550
msgid "use IPv4 addresses only"
msgstr "nur IPv4-Adressen benutzen"
-#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:552
+#: builtin/clone.c:131 builtin/fetch.c:142 builtin/push.c:552
msgid "use IPv6 addresses only"
msgstr "nur IPv6-Adressen benutzen"
-#: builtin/clone.c:250
+#: builtin/clone.c:268
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
@@ -6500,42 +6715,42 @@
"Konnte keinen Verzeichnisnamen erraten.\n"
"Bitte geben Sie ein Verzeichnis auf der Befehlszeile an."
-#: builtin/clone.c:303
+#: builtin/clone.c:321
#, 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:375
+#: builtin/clone.c:393
#, c-format
msgid "failed to open '%s'"
msgstr "Fehler beim Öffnen von '%s'"
-#: builtin/clone.c:383
+#: builtin/clone.c:401
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existiert und ist kein Verzeichnis"
-#: builtin/clone.c:397
+#: builtin/clone.c:415
#, c-format
msgid "failed to stat %s\n"
msgstr "Konnte %s nicht lesen\n"
-#: builtin/clone.c:419
+#: builtin/clone.c:437
#, c-format
msgid "failed to create link '%s'"
msgstr "Konnte Verweis '%s' nicht erstellen"
-#: builtin/clone.c:423
+#: builtin/clone.c:441
#, c-format
msgid "failed to copy file to '%s'"
msgstr "Konnte Datei nicht nach '%s' kopieren"
-#: builtin/clone.c:448
+#: builtin/clone.c:466
#, c-format
msgid "done.\n"
msgstr "Fertig.\n"
-#: builtin/clone.c:460
+#: builtin/clone.c:478
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -6545,102 +6760,101 @@
"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:537
+#: builtin/clone.c:555
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Konnte zu klonenden Remote-Branch %s nicht finden."
-#: builtin/clone.c:632
+#: builtin/clone.c:650
msgid "remote did not send all necessary objects"
msgstr "Remote-Repository hat nicht alle erforderlichen Objekte gesendet."
-#: builtin/clone.c:648
+#: builtin/clone.c:666
#, c-format
msgid "unable to update %s"
msgstr "kann %s nicht aktualisieren"
-#: builtin/clone.c:697
+#: builtin/clone.c:715
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:728
+#: builtin/clone.c:746
msgid "unable to checkout working tree"
msgstr "Arbeitsverzeichnis konnte nicht ausgecheckt werden"
-#: builtin/clone.c:768
+#: builtin/clone.c:786
msgid "unable to write parameters to config file"
msgstr "konnte Parameter nicht in Konfigurationsdatei schreiben"
-#: builtin/clone.c:831
+#: builtin/clone.c:849
msgid "cannot repack to clean up"
msgstr "Kann \"repack\" zum Aufräumen nicht aufrufen"
-#: builtin/clone.c:833
+#: builtin/clone.c:851
msgid "cannot unlink temporary alternates file"
msgstr "Kann temporäre \"alternates\"-Datei nicht entfernen"
-#: builtin/clone.c:866 builtin/receive-pack.c:1895
+#: builtin/clone.c:884 builtin/receive-pack.c:1900
msgid "Too many arguments."
msgstr "Zu viele Argumente."
-#: builtin/clone.c:870
+#: builtin/clone.c:888
msgid "You must specify a repository to clone."
msgstr "Sie müssen ein Repository zum Klonen angeben."
-#: builtin/clone.c:883
+#: builtin/clone.c:901
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "Die Optionen --bare und --origin %s sind inkompatibel."
-#: builtin/clone.c:886
+#: builtin/clone.c:904
msgid "--bare and --separate-git-dir are incompatible."
msgstr "Die Optionen --bare und --separate-git-dir sind inkompatibel."
-#: builtin/clone.c:899
+#: builtin/clone.c:917
#, c-format
msgid "repository '%s' does not exist"
msgstr "Repository '%s' existiert nicht."
-#: builtin/clone.c:905 builtin/fetch.c:1335
+#: builtin/clone.c:923 builtin/fetch.c:1337
#, c-format
msgid "depth %s is not a positive number"
msgstr "Tiefe %s ist keine positive Zahl"
-#: builtin/clone.c:915
+#: builtin/clone.c:933
#, 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:925
+#: builtin/clone.c:943
#, c-format
msgid "working tree '%s' already exists."
msgstr "Arbeitsverzeichnis '%s' existiert bereits."
-#: builtin/clone.c:940 builtin/clone.c:951 builtin/difftool.c:252
-#: builtin/submodule--helper.c:659 builtin/worktree.c:222
-#: builtin/worktree.c:249
+#: builtin/clone.c:958 builtin/clone.c:969 builtin/difftool.c:252
+#: builtin/worktree.c:221 builtin/worktree.c:251
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen."
-#: builtin/clone.c:943
+#: builtin/clone.c:961
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "Konnte Arbeitsverzeichnis '%s' nicht erstellen"
-#: builtin/clone.c:955
+#: builtin/clone.c:973
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Klone in Bare-Repository '%s' ...\n"
-#: builtin/clone.c:957
+#: builtin/clone.c:975
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Klone nach '%s' ...\n"
-#: builtin/clone.c:963
+#: builtin/clone.c:999
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
@@ -6648,45 +6862,45 @@
"'clone --recursive' ist nicht kompatibel mit --reference und --reference-if-"
"able"
-#: builtin/clone.c:1019
+#: builtin/clone.c:1055
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:1021
+#: builtin/clone.c:1057
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:1023
+#: builtin/clone.c:1059
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:1026
+#: builtin/clone.c:1062
msgid "source repository is shallow, ignoring --local"
msgstr ""
"Quelle ist ein Repository mit unvollständiger Historie (shallow),ignoriere --"
"local"
-#: builtin/clone.c:1031
+#: builtin/clone.c:1067
msgid "--local is ignored"
msgstr "--local wird ignoriert"
-#: builtin/clone.c:1035
+#: builtin/clone.c:1071
#, c-format
msgid "Don't know how to clone %s"
msgstr "Weiß nicht wie %s zu klonen ist."
-#: builtin/clone.c:1090 builtin/clone.c:1098
+#: builtin/clone.c:1126 builtin/clone.c:1134
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Remote-Branch %s nicht im Upstream-Repository %s gefunden"
-#: builtin/clone.c:1101
+#: builtin/clone.c:1137
msgid "You appear to have cloned an empty repository."
msgstr "Sie scheinen ein leeres Repository geklont zu haben."
@@ -6884,11 +7098,6 @@
msgid "malformed --author parameter"
msgstr "Fehlerhafter --author Parameter"
-#: builtin/commit.c:611
-#, c-format
-msgid "invalid date format: %s"
-msgstr "Ungültiges Datumsformat: %s"
-
#: builtin/commit.c:655
msgid ""
"unable to select a comment character that is not used\n"
@@ -6902,7 +7111,7 @@
msgid "could not lookup commit %s"
msgstr "Konnte Commit %s nicht nachschlagen"
-#: builtin/commit.c:704 builtin/shortlog.c:295
+#: builtin/commit.c:704 builtin/shortlog.c:294
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(lese Log-Nachricht von Standard-Eingabe)\n"
@@ -7004,7 +7213,7 @@
msgid "Error building trees"
msgstr "Fehler beim Erzeugen der \"Tree\"-Objekte"
-#: builtin/commit.c:968 builtin/tag.c:280
+#: builtin/commit.c:968 builtin/tag.c:273
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr ""
@@ -7078,7 +7287,7 @@
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:495
+#: builtin/commit.c:1224 builtin/tag.c:551
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Ungültiger \"cleanup\" Modus %s"
@@ -7100,7 +7309,7 @@
msgstr "Version"
#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525
-#: builtin/worktree.c:442
+#: builtin/worktree.c:448
msgid "machine-readable output"
msgstr "maschinenlesbare Ausgabe"
@@ -7113,7 +7322,7 @@
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:368
+#: builtin/fast-export.c:984 builtin/tag.c:411
msgid "mode"
msgstr "Modus"
@@ -7171,7 +7380,7 @@
msgid "Commit message options"
msgstr "Optionen für Commit-Beschreibung"
-#: builtin/commit.c:1586 builtin/tag.c:366
+#: builtin/commit.c:1586 builtin/tag.c:409
msgid "read message from file"
msgstr "Beschreibung von Datei lesen"
@@ -7183,7 +7392,7 @@
msgid "override author for commit"
msgstr "Autor eines Commits überschreiben"
-#: builtin/commit.c:1588 builtin/gc.c:333
+#: builtin/commit.c:1588 builtin/gc.c:357
msgid "date"
msgstr "Datum"
@@ -7191,8 +7400,8 @@
msgid "override date for commit"
msgstr "Datum eines Commits überschreiben"
-#: builtin/commit.c:1589 builtin/merge.c:222 builtin/notes.c:398
-#: builtin/notes.c:561 builtin/tag.c:364
+#: builtin/commit.c:1589 builtin/merge.c:221 builtin/notes.c:398
+#: builtin/notes.c:561 builtin/tag.c:407
msgid "message"
msgstr "Beschreibung"
@@ -7201,7 +7410,7 @@
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:81
+#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:77
msgid "commit"
msgstr "Commit"
@@ -7229,7 +7438,7 @@
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:1413 builtin/revert.c:86
+#: builtin/commit.c:1595 builtin/log.c:1420 builtin/revert.c:104
msgid "add Signed-off-by:"
msgstr "'Signed-off-by:'-Zeile hinzufügen"
@@ -7245,7 +7454,7 @@
msgid "default"
msgstr "Standard"
-#: builtin/commit.c:1598 builtin/tag.c:369
+#: builtin/commit.c:1598 builtin/tag.c:412
msgid "how to strip spaces and #comments from message"
msgstr ""
"wie Leerzeichen und #Kommentare von der Beschreibung getrennt werden sollen"
@@ -7254,8 +7463,8 @@
msgid "include status in commit message template"
msgstr "Status in die Commit-Beschreibungsvorlage einfügen"
-#: builtin/commit.c:1601 builtin/merge.c:234 builtin/pull.c:166
-#: builtin/revert.c:93
+#: builtin/commit.c:1601 builtin/merge.c:233 builtin/pull.c:166
+#: builtin/revert.c:112
msgid "GPG sign commit"
msgstr "Commit mit GPG signieren"
@@ -7350,141 +7559,141 @@
msgid "git config [<options>]"
msgstr "git config [<Optionen>]"
-#: builtin/config.c:55
+#: builtin/config.c:56
msgid "Config file location"
msgstr "Ort der Konfigurationsdatei"
-#: builtin/config.c:56
+#: builtin/config.c:57
msgid "use global config file"
msgstr "globale Konfigurationsdatei verwenden"
-#: builtin/config.c:57
+#: builtin/config.c:58
msgid "use system config file"
msgstr "systemweite Konfigurationsdatei verwenden"
-#: builtin/config.c:58
+#: builtin/config.c:59
msgid "use repository config file"
msgstr "Konfigurationsdatei des Repositories verwenden"
-#: builtin/config.c:59
+#: builtin/config.c:60
msgid "use given config file"
msgstr "die angegebene Konfigurationsdatei verwenden"
-#: builtin/config.c:60
+#: builtin/config.c:61
msgid "blob-id"
msgstr "Blob-Id"
-#: builtin/config.c:60
+#: builtin/config.c:61
msgid "read config from given blob object"
msgstr "Konfiguration von angegebenem Blob-Objekt lesen"
-#: builtin/config.c:61
+#: builtin/config.c:62
msgid "Action"
msgstr "Aktion"
-#: builtin/config.c:62
+#: builtin/config.c:63
msgid "get value: name [value-regex]"
msgstr "Wert zurückgeben: Name [Wert-regex]"
-#: builtin/config.c:63
+#: builtin/config.c:64
msgid "get all values: key [value-regex]"
msgstr "alle Werte zurückgeben: Schlüssel [Wert-regex]"
-#: builtin/config.c:64
+#: builtin/config.c:65
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:65
+#: builtin/config.c:66
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:66
+#: builtin/config.c:67
msgid "replace all matching variables: name value [value_regex]"
msgstr "alle passenden Variablen ersetzen: Name Wert [Wert-regex] "
-#: builtin/config.c:67
+#: builtin/config.c:68
msgid "add a new variable: name value"
msgstr "neue Variable hinzufügen: Name Wert"
-#: builtin/config.c:68
+#: builtin/config.c:69
msgid "remove a variable: name [value-regex]"
msgstr "eine Variable entfernen: Name [Wert-regex]"
-#: builtin/config.c:69
+#: builtin/config.c:70
msgid "remove all matches: name [value-regex]"
msgstr "alle Übereinstimmungen entfernen: Name [Wert-regex]"
-#: builtin/config.c:70
+#: builtin/config.c:71
msgid "rename section: old-name new-name"
msgstr "eine Sektion umbenennen: alter-Name neuer-Name"
-#: builtin/config.c:71
+#: builtin/config.c:72
msgid "remove a section: name"
msgstr "eine Sektion entfernen: Name"
-#: builtin/config.c:72
+#: builtin/config.c:73
msgid "list all"
msgstr "alles auflisten"
-#: builtin/config.c:73
+#: builtin/config.c:74
msgid "open an editor"
msgstr "einen Editor öffnen"
-#: builtin/config.c:74
+#: builtin/config.c:75
msgid "find the color configured: slot [default]"
msgstr "die konfigurierte Farbe finden: Slot [Standard]"
-#: builtin/config.c:75
+#: builtin/config.c:76
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "die Farbeinstellung finden: Slot [Standard-Ausgabe-ist-Terminal]"
-#: builtin/config.c:76
+#: builtin/config.c:77
msgid "Type"
msgstr "Typ"
-#: builtin/config.c:77
+#: builtin/config.c:78
msgid "value is \"true\" or \"false\""
msgstr "Wert ist \"true\" oder \"false\""
-#: builtin/config.c:78
+#: builtin/config.c:79
msgid "value is decimal number"
msgstr "Wert ist eine Dezimalzahl"
-#: builtin/config.c:79
+#: builtin/config.c:80
msgid "value is --bool or --int"
msgstr "Wert ist --bool oder --int"
-#: builtin/config.c:80
+#: builtin/config.c:81
msgid "value is a path (file or directory name)"
msgstr "Wert ist ein Pfad (Datei oder Verzeichnisname)"
-#: builtin/config.c:81
+#: builtin/config.c:82
msgid "Other"
msgstr "Sonstiges"
-#: builtin/config.c:82
+#: builtin/config.c:83
msgid "terminate values with NUL byte"
msgstr "schließt Werte mit NUL-Byte ab"
-#: builtin/config.c:83
+#: builtin/config.c:84
msgid "show variable names only"
msgstr "nur Variablennamen anzeigen"
-#: builtin/config.c:84
+#: builtin/config.c:85
msgid "respect include directives on lookup"
msgstr "beachtet \"include\"-Direktiven beim Nachschlagen"
-#: builtin/config.c:85
+#: builtin/config.c:86
msgid "show origin of config (file, standard input, blob, command line)"
msgstr ""
"Ursprung der Konfiguration anzeigen (Datei, Standard-Eingabe, Blob, "
"Befehlszeile)"
-#: builtin/config.c:327
+#: builtin/config.c:328
msgid "unable to parse default color value"
msgstr "konnte Standard-Farbwert nicht parsen"
-#: builtin/config.c:471
+#: builtin/config.c:472
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -7499,12 +7708,12 @@
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:613
+#: builtin/config.c:615
#, c-format
msgid "cannot create configuration file %s"
msgstr "Konnte Konfigurationsdatei '%s' nicht erstellen."
-#: builtin/config.c:625
+#: builtin/config.c:627
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
@@ -7522,67 +7731,67 @@
msgid "print sizes in human readable format"
msgstr "gibt Größenangaben in menschenlesbaren Format aus"
-#: builtin/describe.c:17
+#: builtin/describe.c:18
msgid "git describe [<options>] [<commit-ish>...]"
msgstr "git describe [<Optionen>] [<Commit-Angabe>...]"
-#: builtin/describe.c:18
+#: builtin/describe.c:19
msgid "git describe [<options>] --dirty"
msgstr "git describe [<Optionen>] --dirty"
-#: builtin/describe.c:52
+#: builtin/describe.c:53
msgid "head"
msgstr "Branch"
-#: builtin/describe.c:52
+#: builtin/describe.c:53
msgid "lightweight"
msgstr "nicht-annotiert"
-#: builtin/describe.c:52
+#: builtin/describe.c:53
msgid "annotated"
msgstr "annotiert"
-#: builtin/describe.c:249
+#: builtin/describe.c:250
#, c-format
msgid "annotated tag %s not available"
msgstr "annotiertes Tag %s ist nicht verfügbar"
-#: builtin/describe.c:221
+#: builtin/describe.c:254
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr "annotiertes Tag %s hat keinen eingebetteten Namen"
-#: builtin/describe.c:223
+#: builtin/describe.c:256
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr "Tag '%s' ist eigentlich '%s' hier"
-#: builtin/describe.c:250 builtin/log.c:480
+#: builtin/describe.c:283 builtin/log.c:487
#, c-format
msgid "Not a valid object name %s"
msgstr "%s ist kein gültiger Objekt-Name"
-#: builtin/describe.c:253
+#: builtin/describe.c:286
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s ist kein gültiges '%s' Objekt"
-#: builtin/describe.c:270
+#: builtin/describe.c:303
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "kein Tag entspricht exakt '%s'"
-#: builtin/describe.c:272
+#: builtin/describe.c:305
#, c-format
msgid "searching to describe %s\n"
msgstr "suche zur Beschreibung von %s\n"
-#: builtin/describe.c:319
+#: builtin/describe.c:352
#, c-format
msgid "finished search at %s\n"
msgstr "beendete Suche bei %s\n"
-#: builtin/describe.c:346
+#: builtin/describe.c:379
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
@@ -7591,7 +7800,7 @@
"Keine annotierten Tags können '%s' beschreiben.\n"
"Jedoch gab es nicht-annotierte Tags: versuchen Sie --tags."
-#: builtin/describe.c:350
+#: builtin/describe.c:383
#, c-format
msgid ""
"No tags can describe '%s'.\n"
@@ -7600,82 +7809,96 @@
"Keine Tags können '%s' beschreiben.\n"
"Versuchen Sie --always oder erstellen Sie einige Tags."
-#: builtin/describe.c:371
+#: builtin/describe.c:413
#, c-format
msgid "traversed %lu commits\n"
msgstr "%lu Commits durchlaufen\n"
-#: builtin/describe.c:374
+#: builtin/describe.c:416
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
"gave up search at %s\n"
msgstr ""
-"mehr als %i Tags gefunden; Führe die ersten %i auf\n"
+"mehr als %i Tags gefunden; führe die ersten %i auf\n"
"Suche bei %s aufgegeben\n"
-#: builtin/describe.c:396
+#: builtin/describe.c:438
msgid "find the tag that comes after the commit"
msgstr "das Tag finden, das nach dem Commit kommt"
-#: builtin/describe.c:397
+#: builtin/describe.c:439
msgid "debug search strategy on stderr"
msgstr "die Suchstrategie in der Standard-Fehlerausgabe protokollieren"
-#: builtin/describe.c:398
+#: builtin/describe.c:440
msgid "use any ref"
msgstr "alle Referenzen verwenden"
-#: builtin/describe.c:399
+#: builtin/describe.c:441
msgid "use any tag, even unannotated"
msgstr "jedes Tag verwenden, auch nicht-annotierte"
-#: builtin/describe.c:400
+#: builtin/describe.c:442
msgid "always use long format"
msgstr "immer langes Format verwenden"
-#: builtin/describe.c:401
+#: builtin/describe.c:443
msgid "only follow first parent"
msgstr "nur erstem Elternteil folgen"
-#: builtin/describe.c:404
+#: builtin/describe.c:446
msgid "only output exact matches"
msgstr "nur exakte Übereinstimmungen ausgeben"
-#: builtin/describe.c:406
+#: builtin/describe.c:448
msgid "consider <n> most recent tags (default: 10)"
msgstr "die jüngsten <n> Tags betrachten (Standard: 10)"
-#: builtin/describe.c:408
+#: builtin/describe.c:450
msgid "only consider tags matching <pattern>"
msgstr "nur Tags, die <Muster> entsprechen, betrachten"
-#: builtin/describe.c:410 builtin/name-rev.c:320
+#: builtin/describe.c:452
+msgid "do not consider tags matching <pattern>"
+msgstr "keine Tags betrachten, die <Muster> entsprechen"
+
+#: builtin/describe.c:454 builtin/name-rev.c:357
msgid "show abbreviated commit object as fallback"
msgstr "gekürztes Commit-Objekt anzeigen, wenn sonst nichts zutrifft"
-#: builtin/describe.c:411
+#: builtin/describe.c:455 builtin/describe.c:458
msgid "mark"
msgstr "Kennzeichen"
-#: builtin/describe.c:412
+#: builtin/describe.c:456
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr ""
-"<Kennzeichen> bei geändertem Arbeitsverzeichnis hinzufügen (Standard: \"-"
-"dirty\")"
+"<Kennzeichen> bei geändertem Arbeitsverzeichnis anhängen (Standard: \"-dirty"
+"\")"
-#: builtin/describe.c:430
+#: builtin/describe.c:459
+msgid "append <mark> on broken working tree (default: \"-broken\")"
+msgstr ""
+"<Kennzeichen> bei defektem Arbeitsverzeichnis anhängen (Standard: \"-broken"
+"\")"
+
+#: builtin/describe.c:477
msgid "--long is incompatible with --abbrev=0"
msgstr "Die Optionen --long und --abbrev=0 sind inkompatibel."
-#: builtin/describe.c:456
+#: builtin/describe.c:506
msgid "No names found, cannot describe anything."
msgstr "Keine Namen gefunden, kann nichts beschreiben."
-#: builtin/describe.c:476
+#: builtin/describe.c:549
msgid "--dirty is incompatible with commit-ishes"
msgstr "Die Option --dirty kann nicht mit Commits verwendet werden."
+#: builtin/describe.c:551
+msgid "--broken is incompatible with commit-ishes"
+msgstr "Die Option --broken kann nicht mit Commits verwendet werden."
+
#: builtin/diff.c:83
#, c-format
msgid "'%s': not a regular file or symlink"
@@ -7714,7 +7937,22 @@
msgid "failed: %d"
msgstr "fehlgeschlagen: %d"
-#: builtin/difftool.c:342
+#: builtin/difftool.c:283
+#, c-format
+msgid "could not read symlink %s"
+msgstr "konnte symbolische Verknüpfung %s nicht lesen"
+
+#: builtin/difftool.c:285
+#, c-format
+msgid "could not read symlink file %s"
+msgstr "Konnte Datei von symbolischer Verknüpfung '%s' nicht lesen."
+
+#: builtin/difftool.c:293
+#, 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
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
@@ -7722,73 +7960,75 @@
"Kombinierte Diff-Formate('-c' und '--cc') werden im Verzeichnis-\n"
"Diff-Modus('-d' und '--dir-diff') nicht unterstützt."
-#: builtin/difftool.c:567
+#: builtin/difftool.c:609
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "beide Dateien geändert: '%s' und '%s'."
-#: builtin/difftool.c:569
+#: builtin/difftool.c:611
msgid "working tree file has been left."
msgstr "Datei im Arbeitsverzeichnis belassen."
-#: builtin/difftool.c:580
+#: builtin/difftool.c:622
#, c-format
msgid "temporary files exist in '%s'."
msgstr "Es existieren temporäre Dateien in '%s'."
-#: builtin/difftool.c:581
+#: builtin/difftool.c:623
msgid "you may want to cleanup or recover these."
msgstr "Sie könnten diese aufräumen oder wiederherstellen."
-#: builtin/difftool.c:626
+#: builtin/difftool.c:669
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "`diff.guitool` anstatt `diff.tool` benutzen"
-#: builtin/difftool.c:628
+#: builtin/difftool.c:671
msgid "perform a full-directory diff"
msgstr "Diff über ganzes Verzeichnis ausführen"
-#: builtin/difftool.c:630
+#: builtin/difftool.c:673
msgid "do not prompt before launching a diff tool"
msgstr "keine Eingabeaufforderung vor Ausführung eines Diff-Tools"
-#: builtin/difftool.c:636
+#: builtin/difftool.c:679
msgid "use symlinks in dir-diff mode"
msgstr "symbolische Verknüpfungen im dir-diff Modus verwenden"
-#: builtin/difftool.c:637
+#: builtin/difftool.c:680
msgid "<tool>"
msgstr "<Tool>"
-#: builtin/difftool.c:638
+#: builtin/difftool.c:681
msgid "use the specified diff tool"
msgstr "das angegebene Diff-Tool benutzen"
-#: builtin/difftool.c:640
+#: builtin/difftool.c:683
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"
+msgstr ""
+"eine Liste mit Diff-Tools darstellen, die mit `--tool` benutzt werden können"
-#: builtin/difftool.c:643
+#: builtin/difftool.c:686
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
msgstr ""
-"'git-difftool' beenden, wenn das aufgerufene Diff-Tool mit einem Rückkehrwert\n"
+"'git-difftool' beenden, wenn das aufgerufene Diff-Tool mit einem "
+"Rückkehrwert\n"
"verschieden 0 ausgeführt wurde"
-#: builtin/difftool.c:645
+#: builtin/difftool.c:688
msgid "<command>"
msgstr "<Programm>"
-#: builtin/difftool.c:646
+#: builtin/difftool.c:689
msgid "specify a custom command for viewing diffs"
msgstr "eigenen Befehl zur Anzeige von Unterschieden angeben"
-#: builtin/difftool.c:670
+#: builtin/difftool.c:713
msgid "no <tool> given for --tool=<tool>"
msgstr "kein <Tool> für --tool=<Tool> angegeben"
-#: builtin/difftool.c:677
+#: builtin/difftool.c:720
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "kein <Programm> für --extcmd=<Programm> angegeben"
@@ -7930,7 +8170,7 @@
msgid "convert to a complete repository"
msgstr "zu einem vollständigen Repository konvertieren"
-#: builtin/fetch.c:131 builtin/log.c:1433
+#: builtin/fetch.c:131 builtin/log.c:1440
msgid "dir"
msgstr "Verzeichnis"
@@ -7958,75 +8198,75 @@
msgid "Couldn't find remote ref HEAD"
msgstr "Konnte Remote-Referenz von HEAD nicht finden."
-#: builtin/fetch.c:511
+#: builtin/fetch.c:513
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "Konfiguration fetch.output enthält ungültigen Wert %s"
-#: builtin/fetch.c:604
+#: builtin/fetch.c:606
#, c-format
msgid "object %s not found"
msgstr "Objekt %s nicht gefunden"
-#: builtin/fetch.c:608
+#: builtin/fetch.c:610
msgid "[up to date]"
msgstr "[aktuell]"
-#: builtin/fetch.c:621 builtin/fetch.c:701
+#: builtin/fetch.c:623 builtin/fetch.c:703
msgid "[rejected]"
msgstr "[zurückgewiesen]"
-#: builtin/fetch.c:622
+#: builtin/fetch.c:624
msgid "can't fetch in current branch"
msgstr "kann \"fetch\" im aktuellen Branch nicht ausführen"
-#: builtin/fetch.c:631
+#: builtin/fetch.c:633
msgid "[tag update]"
msgstr "[Tag Aktualisierung]"
-#: builtin/fetch.c:632 builtin/fetch.c:665 builtin/fetch.c:681
-#: builtin/fetch.c:696
+#: builtin/fetch.c:634 builtin/fetch.c:667 builtin/fetch.c:683
+#: builtin/fetch.c:698
msgid "unable to update local ref"
msgstr "kann lokale Referenz nicht aktualisieren"
-#: builtin/fetch.c:651
+#: builtin/fetch.c:653
msgid "[new tag]"
msgstr "[neues Tag]"
-#: builtin/fetch.c:654
+#: builtin/fetch.c:656
msgid "[new branch]"
msgstr "[neuer Branch]"
-#: builtin/fetch.c:657
+#: builtin/fetch.c:659
msgid "[new ref]"
msgstr "[neue Referenz]"
-#: builtin/fetch.c:696
+#: builtin/fetch.c:698
msgid "forced update"
msgstr "Aktualisierung erzwungen"
-#: builtin/fetch.c:701
+#: builtin/fetch.c:703
msgid "non-fast-forward"
msgstr "kein Vorspulen"
-#: builtin/fetch.c:746
+#: builtin/fetch.c:748
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s hat nicht alle erforderlichen Objekte gesendet\n"
-#: builtin/fetch.c:766
+#: builtin/fetch.c:768
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
"%s wurde zurückgewiesen, da Ursprungs-Commits von Repositoriesmit "
"unvollständiger Historie (shallow) nicht aktualisiert werden dürfen."
-#: builtin/fetch.c:853 builtin/fetch.c:949
+#: builtin/fetch.c:855 builtin/fetch.c:951
#, c-format
msgid "From %.*s\n"
msgstr "Von %.*s\n"
-#: builtin/fetch.c:864
+#: builtin/fetch.c:866
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -8035,57 +8275,57 @@
"Einige lokale Referenzen konnten nicht aktualisiert werden; versuchen Sie\n"
"'git remote prune %s', um jeden älteren, widersprüchlichen Branch zu löschen."
-#: builtin/fetch.c:919
+#: builtin/fetch.c:921
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s wird unreferenziert)"
-#: builtin/fetch.c:920
+#: builtin/fetch.c:922
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s wurde unreferenziert)"
-#: builtin/fetch.c:952
+#: builtin/fetch.c:954
msgid "[deleted]"
msgstr "[gelöscht]"
-#: builtin/fetch.c:953 builtin/remote.c:1020
+#: builtin/fetch.c:955 builtin/remote.c:1022
msgid "(none)"
msgstr "(nichts)"
-#: builtin/fetch.c:976
+#: builtin/fetch.c:978
#, 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 "
"wurde verweigert."
-#: builtin/fetch.c:995
+#: builtin/fetch.c:997
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "Option \"%s\" Wert \"%s\" ist nicht gültig für %s"
-#: builtin/fetch.c:998
+#: builtin/fetch.c:1000
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Option \"%s\" wird ignoriert für %s\n"
-#: builtin/fetch.c:1074
+#: builtin/fetch.c:1076
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "Weiß nicht wie von %s angefordert wird."
-#: builtin/fetch.c:1234
+#: builtin/fetch.c:1236
#, c-format
msgid "Fetching %s\n"
msgstr "Fordere an von %s\n"
-#: builtin/fetch.c:1236 builtin/remote.c:96
+#: builtin/fetch.c:1238 builtin/remote.c:96
#, c-format
msgid "Could not fetch %s"
msgstr "Konnte nicht von %s anfordern"
-#: builtin/fetch.c:1254
+#: builtin/fetch.c:1256
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -8094,43 +8334,43 @@
"oder den Namen des Remote-Repositories an, von welchem neue\n"
"Commits angefordert werden sollen."
-#: builtin/fetch.c:1277
+#: builtin/fetch.c:1279
msgid "You need to specify a tag name."
msgstr "Sie müssen den Namen des Tags angeben."
-#: builtin/fetch.c:1319
+#: builtin/fetch.c:1321
msgid "Negative depth in --deepen is not supported"
msgstr "Negative Tiefe wird von --deepen nicht unterstützt."
-#: builtin/fetch.c:1321
+#: builtin/fetch.c:1323
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen und --depth schließen sich gegenseitig aus"
-#: builtin/fetch.c:1326
+#: builtin/fetch.c:1328
msgid "--depth and --unshallow cannot be used together"
msgstr ""
"Die Optionen --depth und --unshallow können nicht gemeinsam verwendet werden."
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1330
msgid "--unshallow on a complete repository does not make sense"
msgstr ""
"Die Option --unshallow kann nicht in einem Repository mit unvollständiger "
"Historie verwendet werden."
-#: builtin/fetch.c:1350
+#: builtin/fetch.c:1352
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all akzeptiert kein Repository als Argument"
-#: builtin/fetch.c:1352
+#: builtin/fetch.c:1354
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all kann nicht mit Refspecs verwendet werden."
-#: builtin/fetch.c:1363
+#: builtin/fetch.c:1365
#, c-format
msgid "No such remote or remote group: %s"
msgstr "Kein Remote-Repository (einzeln oder Gruppe): %s"
-#: builtin/fetch.c:1371
+#: builtin/fetch.c:1373
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"
@@ -8172,12 +8412,12 @@
msgstr "git for-each-ref [--points-at <Objekt>]"
#: builtin/for-each-ref.c:11
-msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"
-msgstr "git for-each-ref [(--merged | --no-merged) [<Objekt>]]"
+msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
+msgstr "git for-each-ref [(--merged | --no-merged) [<Commit>]]"
#: builtin/for-each-ref.c:12
-msgid "git for-each-ref [--contains [<object>]]"
-msgstr "git for-each-ref [--contains [<Objekt>]]"
+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
msgid "quote placeholders suitably for shells"
@@ -8199,10 +8439,6 @@
msgid "show only <n> matched refs"
msgstr "nur <n> passende Referenzen anzeigen"
-#: builtin/for-each-ref.c:37 builtin/tag.c:387 builtin/verify-tag.c:38
-msgid "format to use for the output"
-msgstr "für die Ausgabe zu verwendendes Format"
-
#: builtin/for-each-ref.c:41
msgid "print only refs which points at the given object"
msgstr "nur auf dieses Objekt zeigende Referenzen ausgeben"
@@ -8219,6 +8455,10 @@
msgid "print only refs which contain the commit"
msgstr "nur Referenzen ausgeben, die diesen Commit enthalten"
+#: builtin/for-each-ref.c:46
+msgid "print only refs which don't contain the commit"
+msgstr "nur Referenzen ausgeben, die diesen Commit nicht enthalten"
+
#: builtin/fsck.c:554
msgid "Checking object directories"
msgstr "Prüfe Objekt-Verzeichnisse"
@@ -8283,17 +8523,17 @@
msgid "git gc [<options>]"
msgstr "git gc [<Optionen>]"
-#: builtin/gc.c:72
+#: builtin/gc.c:78
#, c-format
-msgid "Invalid %s: '%s'"
-msgstr "Ungültiger %s: '%s'"
+msgid "Failed to fstat %s: %s"
+msgstr "Konnte '%s' nicht lesen: %s"
-#: builtin/gc.c:139
+#: builtin/gc.c:310
#, c-format
-msgid "insanely long object directory %.*s"
-msgstr "zu langes Objekt-Verzeichnis %.*s"
+msgid "Can't stat %s"
+msgstr "Kann '%s' nicht lesen."
-#: builtin/gc.c:297
+#: builtin/gc.c:319
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@ -8309,44 +8549,49 @@
"\n"
"%s"
-#: builtin/gc.c:334
+#: builtin/gc.c:358
msgid "prune unreferenced objects"
msgstr "unreferenzierte Objekte entfernen"
-#: builtin/gc.c:336
+#: builtin/gc.c:360
msgid "be more thorough (increased runtime)"
msgstr "mehr Gründlichkeit (erhöht Laufzeit)"
-#: builtin/gc.c:337
+#: builtin/gc.c:361
msgid "enable auto-gc mode"
msgstr "\"auto-gc\" Modus aktivieren"
-#: builtin/gc.c:338
+#: builtin/gc.c:362
msgid "force running gc even if there may be another gc running"
msgstr ""
"Ausführung von \"git gc\" erwzingen, selbst wenn ein anderes\n"
"\"git gc\" bereits ausgeführt wird"
-#: builtin/gc.c:380
+#: builtin/gc.c:379
+#, c-format
+msgid "Failed to parse gc.logexpiry value %s"
+msgstr "Fehler beim Parsen des Wertes '%s' von gc.logexpiry"
+
+#: builtin/gc.c:407
#, 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:382
+#: builtin/gc.c:409
#, 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:383
+#: builtin/gc.c:410
#, 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:404
+#: builtin/gc.c:431
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -8354,7 +8599,7 @@
"\"git gc\" wird bereits auf Maschine '%s' pid %<PRIuMAX> ausgeführt\n"
"(benutzen Sie --force falls nicht)"
-#: builtin/gc.c:448
+#: builtin/gc.c:475
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
@@ -8375,247 +8620,250 @@
msgid "invalid number of threads specified (%d) for %s"
msgstr "ungültige Anzahl von Threads (%d) für %s angegeben"
-#: builtin/grep.c:763 builtin/grep.c:804
+#: builtin/grep.c:769 builtin/grep.c:810
#, c-format
msgid "unable to read tree (%s)"
msgstr "konnte \"Tree\"-Objekt (%s) nicht lesen"
-#: builtin/grep.c:823
+#: builtin/grep.c:829
#, 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:887
+#: builtin/grep.c:893
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "Schalter '%c' erwartet einen numerischen Wert"
-#: builtin/grep.c:973
+#: builtin/grep.c:980
msgid "search in index instead of in the work tree"
msgstr "im Index anstatt im Arbeitsverzeichnis suchen"
-#: builtin/grep.c:975
+#: builtin/grep.c:982
msgid "find in contents not managed by git"
msgstr "auch in Inhalten finden, die nicht von Git verwaltet werden"
-#: builtin/grep.c:977
+#: builtin/grep.c:984
msgid "search in both tracked and untracked files"
msgstr "in versionierten und unversionierten Dateien suchen"
-#: builtin/grep.c:979
+#: builtin/grep.c:986
msgid "ignore files specified via '.gitignore'"
msgstr "Dateien, die über '.gitignore' angegeben sind, ignorieren"
-#: builtin/grep.c:981
-msgid "recursivley search in each submodule"
+#: builtin/grep.c:988
+msgid "recursively search in each submodule"
msgstr "rekursive Suche in jedem Submodul"
-#: builtin/grep.c:983
+#: builtin/grep.c:990
msgid "basename"
msgstr "Basisname"
-#: builtin/grep.c:984
+#: builtin/grep.c:991
msgid "prepend parent project's basename to output"
msgstr "Basisname des Elternprojektes an Ausgaben voranstellen"
-#: builtin/grep.c:987
+#: builtin/grep.c:994
msgid "show non-matching lines"
msgstr "Zeilen ohne Übereinstimmungen anzeigen"
-#: builtin/grep.c:989
+#: builtin/grep.c:996
msgid "case insensitive matching"
msgstr "Übereinstimmungen unabhängig von Groß- und Kleinschreibung finden"
-#: builtin/grep.c:991
+#: builtin/grep.c:998
msgid "match patterns only at word boundaries"
msgstr "nur ganze Wörter suchen"
-#: builtin/grep.c:993
+#: builtin/grep.c:1000
msgid "process binary files as text"
msgstr "binäre Dateien als Text verarbeiten"
-#: builtin/grep.c:995
+#: builtin/grep.c:1002
msgid "don't match patterns in binary files"
msgstr "keine Muster in Binärdateien finden"
-#: builtin/grep.c:998
+#: builtin/grep.c:1005
msgid "process binary files with textconv filters"
msgstr "binäre Dateien mit \"textconv\"-Filtern verarbeiten"
-#: builtin/grep.c:1000
+#: builtin/grep.c:1007
msgid "descend at most <depth> levels"
msgstr "höchstens <Tiefe> Ebenen durchlaufen"
-#: builtin/grep.c:1004
+#: builtin/grep.c:1011
msgid "use extended POSIX regular expressions"
msgstr "erweiterte reguläre Ausdrücke aus POSIX verwenden"
-#: builtin/grep.c:1007
+#: builtin/grep.c:1014
msgid "use basic POSIX regular expressions (default)"
msgstr "grundlegende reguläre Ausdrücke aus POSIX verwenden (Standard)"
-#: builtin/grep.c:1010
+#: builtin/grep.c:1017
msgid "interpret patterns as fixed strings"
msgstr "Muster als feste Zeichenketten interpretieren"
-#: builtin/grep.c:1013
+#: builtin/grep.c:1020
msgid "use Perl-compatible regular expressions"
msgstr "Perl-kompatible reguläre Ausdrücke verwenden"
-#: builtin/grep.c:1016
+#: builtin/grep.c:1023
msgid "show line numbers"
msgstr "Zeilennummern anzeigen"
-#: builtin/grep.c:1017
+#: builtin/grep.c:1024
msgid "don't show filenames"
msgstr "keine Dateinamen anzeigen"
-#: builtin/grep.c:1018
+#: builtin/grep.c:1025
msgid "show filenames"
msgstr "Dateinamen anzeigen"
-#: builtin/grep.c:1020
+#: builtin/grep.c:1027
msgid "show filenames relative to top directory"
msgstr "Dateinamen relativ zum Projektverzeichnis anzeigen"
-#: builtin/grep.c:1022
+#: builtin/grep.c:1029
msgid "show only filenames instead of matching lines"
msgstr "nur Dateinamen anzeigen anstatt übereinstimmende Zeilen"
-#: builtin/grep.c:1024
+#: builtin/grep.c:1031
msgid "synonym for --files-with-matches"
msgstr "Synonym für --files-with-matches"
-#: builtin/grep.c:1027
+#: builtin/grep.c:1034
msgid "show only the names of files without match"
msgstr "nur die Dateinamen ohne Übereinstimmungen anzeigen"
-#: builtin/grep.c:1029
+#: builtin/grep.c:1036
msgid "print NUL after filenames"
msgstr "NUL-Zeichen nach Dateinamen ausgeben"
-#: builtin/grep.c:1031
+#: builtin/grep.c:1038
msgid "show the number of matches instead of matching lines"
msgstr "anstatt der Zeilen, die Anzahl der übereinstimmenden Zeilen anzeigen"
-#: builtin/grep.c:1032
+#: builtin/grep.c:1039
msgid "highlight matches"
msgstr "Übereinstimmungen hervorheben"
-#: builtin/grep.c:1034
+#: builtin/grep.c:1041
msgid "print empty line between matches from different files"
msgstr ""
"eine Leerzeile zwischen Übereinstimmungen in verschiedenen Dateien ausgeben"
-#: builtin/grep.c:1036
+#: builtin/grep.c:1043
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:1039
+#: builtin/grep.c:1046
msgid "show <n> context lines before and after matches"
msgstr "<n> Zeilen vor und nach den Übereinstimmungen anzeigen"
-#: builtin/grep.c:1042
+#: builtin/grep.c:1049
msgid "show <n> context lines before matches"
msgstr "<n> Zeilen vor den Übereinstimmungen anzeigen"
-#: builtin/grep.c:1044
+#: builtin/grep.c:1051
msgid "show <n> context lines after matches"
msgstr "<n> Zeilen nach den Übereinstimmungen anzeigen"
-#: builtin/grep.c:1046
+#: builtin/grep.c:1053
msgid "use <n> worker threads"
msgstr "<n> Threads benutzen"
-#: builtin/grep.c:1047
+#: builtin/grep.c:1054
msgid "shortcut for -C NUM"
msgstr "Kurzform für -C NUM"
-#: builtin/grep.c:1050
+#: builtin/grep.c:1057
msgid "show a line with the function name before matches"
msgstr "eine Zeile mit dem Funktionsnamen vor Übereinstimmungen anzeigen"
-#: builtin/grep.c:1052
+#: builtin/grep.c:1059
msgid "show the surrounding function"
msgstr "die umgebende Funktion anzeigen"
-#: builtin/grep.c:1055
+#: builtin/grep.c:1062
msgid "read patterns from file"
msgstr "Muster von einer Datei lesen"
-#: builtin/grep.c:1057
+#: builtin/grep.c:1064
msgid "match <pattern>"
msgstr "<Muster> finden"
-#: builtin/grep.c:1059
+#: builtin/grep.c:1066
msgid "combine patterns specified with -e"
msgstr "Muster kombinieren, die mit -e angegeben wurden"
-#: builtin/grep.c:1071
+#: builtin/grep.c:1078
msgid "indicate hit with exit status without output"
msgstr "Übereinstimmungen nur durch Beendigungsstatus anzeigen"
-#: builtin/grep.c:1073
+#: builtin/grep.c:1080
msgid "show only matches from files that match all patterns"
msgstr ""
"nur Übereinstimmungen von Dateien anzeigen, die allen Mustern entsprechen"
-#: builtin/grep.c:1075
+#: builtin/grep.c:1082
msgid "show parse tree for grep expression"
msgstr "geparstes Verzeichnis für \"grep\"-Ausdruck anzeigen"
-#: builtin/grep.c:1079
+#: builtin/grep.c:1086
msgid "pager"
msgstr "Anzeigeprogramm"
-#: builtin/grep.c:1079
+#: builtin/grep.c:1086
msgid "show matching files in the pager"
msgstr "Dateien mit Übereinstimmungen im Anzeigeprogramm anzeigen"
-#: builtin/grep.c:1082
+#: builtin/grep.c:1089
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "den Aufruf von grep(1) erlauben (von dieser Programmversion ignoriert)"
-#: builtin/grep.c:1146
+#: builtin/grep.c:1153
msgid "no pattern given."
msgstr "keine Muster angegeben"
-#: builtin/grep.c:1178 builtin/index-pack.c:1482
+#: builtin/grep.c:1189
+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
+#, c-format
+msgid "unable to resolve revision: %s"
+msgstr "Konnte Commit nicht auflösen: %s"
+
+#: builtin/grep.c:1228 builtin/index-pack.c:1485
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "ungültige Anzahl von Threads angegeben (%d)"
-#: builtin/grep.c:1215
+#: builtin/grep.c:1251
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:1238
+#: builtin/grep.c:1274
msgid "option not supported with --recurse-submodules."
msgstr "Option wird mit --recurse-submodules nicht unterstützt."
-#: builtin/grep.c:1244
+#: builtin/grep.c:1280
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:1249
-msgid "--no-index or --untracked cannot be used with revs."
-msgstr ""
-"Die Optionen --no-index und --untracked können nicht mit Commits verwendet "
-"werden."
-
-#: builtin/grep.c:1252
+#: builtin/grep.c:1286
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:1260
+#: builtin/grep.c:1294
msgid "both --cached and trees are given."
msgstr "Die Option --cached kann nicht mit \"Tree\"-Objekten verwendet werden."
@@ -8842,241 +9090,246 @@
msgid "unable to create '%s'"
msgstr "konnte '%s' nicht erstellen"
-#: builtin/index-pack.c:322
+#: builtin/index-pack.c:323
#, c-format
msgid "cannot open packfile '%s'"
msgstr "Kann Paketdatei '%s' nicht öffnen"
-#: builtin/index-pack.c:336
+#: builtin/index-pack.c:337
msgid "pack signature mismatch"
msgstr "Paketsignatur stimmt nicht überein"
-#: builtin/index-pack.c:338
+#: builtin/index-pack.c:339
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "Paketversion %<PRIu32> nicht unterstützt"
-#: builtin/index-pack.c:356
+#: builtin/index-pack.c:357
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "Paket hat ein ungültiges Objekt bei Versatz %<PRIuMAX>: %s"
-#: builtin/index-pack.c:478
+#: builtin/index-pack.c:479
#, c-format
msgid "inflate returned %d"
msgstr "Dekomprimierung gab %d zurück"
-#: builtin/index-pack.c:527
+#: builtin/index-pack.c:528
msgid "offset value overflow for delta base object"
msgstr "Wert für Versatz bei Differenzobjekt übergelaufen"
-#: builtin/index-pack.c:535
+#: builtin/index-pack.c:536
msgid "delta base offset is out of bound"
msgstr ""
"Wert für Versatz bei Differenzobjekt liegt außerhalb des gültigen Bereichs"
-#: builtin/index-pack.c:543
+#: builtin/index-pack.c:544
#, c-format
msgid "unknown object type %d"
msgstr "Unbekannter Objekt-Typ %d"
-#: builtin/index-pack.c:574
+#: builtin/index-pack.c:575
msgid "cannot pread pack file"
msgstr "Kann Paketdatei %s nicht lesen"
-#: builtin/index-pack.c:576
+#: builtin/index-pack.c:577
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "frühzeitiges Ende der Paketdatei, vermisse %<PRIuMAX> Byte"
msgstr[1] "frühzeitiges Ende der Paketdatei, vermisse %<PRIuMAX> Bytes"
-#: builtin/index-pack.c:602
+#: builtin/index-pack.c:603
msgid "serious inflate inconsistency"
msgstr "ernsthafte Inkonsistenz nach Dekomprimierung"
-#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
-#: builtin/index-pack.c:813 builtin/index-pack.c:822
+#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
+#: 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:751 builtin/pack-objects.c:164
-#: builtin/pack-objects.c:256
+#: builtin/index-pack.c:752 builtin/pack-objects.c:164
+#: builtin/pack-objects.c:257
#, c-format
msgid "unable to read %s"
msgstr "kann %s nicht lesen"
-#: builtin/index-pack.c:819
+#: builtin/index-pack.c:814
+#, c-format
+msgid "cannot read existing object info %s"
+msgstr "Kann existierende Informationen zu Objekt %s nicht lesen."
+
+#: builtin/index-pack.c:822
#, c-format
msgid "cannot read existing object %s"
msgstr "Kann existierendes Objekt %s nicht lesen."
-#: builtin/index-pack.c:833
+#: builtin/index-pack.c:836
#, c-format
msgid "invalid blob object %s"
msgstr "ungültiges Blob-Objekt %s"
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:850
#, c-format
msgid "invalid %s"
msgstr "Ungültiger Objekt-Typ %s"
-#: builtin/index-pack.c:850
+#: builtin/index-pack.c:853
msgid "Error in object"
msgstr "Fehler in Objekt"
-#: builtin/index-pack.c:852
+#: builtin/index-pack.c:855
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Nicht alle Kind-Objekte von %s sind erreichbar"
-#: builtin/index-pack.c:924 builtin/index-pack.c:955
+#: builtin/index-pack.c:927 builtin/index-pack.c:958
msgid "failed to apply delta"
msgstr "Konnte Dateiunterschied nicht anwenden"
-#: builtin/index-pack.c:1125
+#: builtin/index-pack.c:1128
msgid "Receiving objects"
msgstr "Empfange Objekte"
-#: builtin/index-pack.c:1125
+#: builtin/index-pack.c:1128
msgid "Indexing objects"
msgstr "Indiziere Objekte"
-#: builtin/index-pack.c:1157
+#: builtin/index-pack.c:1160
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "Paket ist beschädigt (SHA1 unterschiedlich)"
-#: builtin/index-pack.c:1162
+#: builtin/index-pack.c:1165
msgid "cannot fstat packfile"
msgstr "kann Paketdatei nicht lesen"
-#: builtin/index-pack.c:1165
+#: builtin/index-pack.c:1168
msgid "pack has junk at the end"
msgstr "Paketende enthält nicht verwendbaren Inhalt"
-#: builtin/index-pack.c:1176
+#: builtin/index-pack.c:1179
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "Fehler beim Ausführen von \"parse_pack_objects()\""
-#: builtin/index-pack.c:1199
+#: builtin/index-pack.c:1202
msgid "Resolving deltas"
msgstr "Löse Unterschiede auf"
-#: builtin/index-pack.c:1210
+#: builtin/index-pack.c:1213
#, c-format
msgid "unable to create thread: %s"
msgstr "kann Thread nicht erzeugen: %s"
-#: builtin/index-pack.c:1252
+#: builtin/index-pack.c:1255
msgid "confusion beyond insanity"
msgstr "Fehler beim Auflösen der Unterschiede"
-#: builtin/index-pack.c:1258
+#: builtin/index-pack.c:1261
#, 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:1270
+#: builtin/index-pack.c:1273
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Unerwartete Prüfsumme für %s (Festplattenfehler?)"
-#: builtin/index-pack.c:1274
+#: builtin/index-pack.c:1277
#, 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:1298
+#: builtin/index-pack.c:1301
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "Konnte angehängtes Objekt (%d) nicht komprimieren"
-#: builtin/index-pack.c:1374
+#: builtin/index-pack.c:1377
#, c-format
msgid "local object %s is corrupt"
msgstr "lokales Objekt %s ist beschädigt"
-#: builtin/index-pack.c:1398
+#: builtin/index-pack.c:1403
msgid "error while closing pack file"
msgstr "Fehler beim Schließen der Paketdatei"
-#: builtin/index-pack.c:1411
+#: builtin/index-pack.c:1415
#, c-format
msgid "cannot write keep file '%s'"
msgstr "Kann Paketbeschreibungsdatei '%s' nicht schreiben"
-#: builtin/index-pack.c:1419
+#: builtin/index-pack.c:1423
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "Kann eben erstellte Paketbeschreibungsdatei '%s' nicht schließen"
-#: builtin/index-pack.c:1432
+#: builtin/index-pack.c:1433
msgid "cannot store pack file"
msgstr "Kann Paketdatei nicht speichern"
-#: builtin/index-pack.c:1443
+#: builtin/index-pack.c:1441
msgid "cannot store index file"
msgstr "Kann Indexdatei nicht speichern"
-#: builtin/index-pack.c:1476
+#: builtin/index-pack.c:1479
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "\"pack.indexversion=%<PRIu32>\" ist ungültig"
-#: builtin/index-pack.c:1486 builtin/index-pack.c:1683
+#: 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:1544
+#: builtin/index-pack.c:1547
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Kann existierende Paketdatei '%s' nicht öffnen"
-#: builtin/index-pack.c:1546
+#: builtin/index-pack.c:1549
#, 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:1593
+#: builtin/index-pack.c:1596
#, 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:1600
+#: builtin/index-pack.c:1603
#, 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:1613
+#: builtin/index-pack.c:1616
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "Name der Paketdatei '%s' endet nicht mit '.pack'"
-#: builtin/index-pack.c:1695 builtin/index-pack.c:1698
-#: builtin/index-pack.c:1714 builtin/index-pack.c:1718
+#: builtin/index-pack.c:1698 builtin/index-pack.c:1701
+#: builtin/index-pack.c:1717 builtin/index-pack.c:1721
#, c-format
msgid "bad %s"
msgstr "%s ist ungültig"
-#: builtin/index-pack.c:1734
+#: builtin/index-pack.c:1737
msgid "--fix-thin cannot be used without --stdin"
msgstr "Die Option --fix-thin kann nicht ohne --stdin verwendet werden."
-#: builtin/index-pack.c:1736
+#: builtin/index-pack.c:1739
msgid "--stdin requires a git repository"
msgstr "--stdin erfordert ein Git-Repository"
-#: builtin/index-pack.c:1744
+#: builtin/index-pack.c:1747
msgid "--verify with no packfile name given"
msgstr "Die Option --verify wurde ohne Namen der Paketdatei angegeben."
@@ -9236,104 +9489,104 @@
msgid "git show [<options>] <object>..."
msgstr "git show [<Optionen>] <Objekt>..."
-#: builtin/log.c:84
+#: builtin/log.c:89
#, c-format
msgid "invalid --decorate option: %s"
msgstr "Ungültige Option für --decorate: %s"
-#: builtin/log.c:139
+#: builtin/log.c:144
msgid "suppress diff output"
msgstr "Ausgabe der Unterschiede unterdrücken"
-#: builtin/log.c:140
+#: builtin/log.c:145
msgid "show source"
msgstr "Quelle anzeigen"
-#: builtin/log.c:141
+#: builtin/log.c:146
msgid "Use mail map file"
msgstr "\"mailmap\"-Datei verwenden"
-#: builtin/log.c:142
+#: builtin/log.c:147
msgid "decorate options"
msgstr "decorate-Optionen"
-#: builtin/log.c:145
+#: builtin/log.c:150
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:241
+#: builtin/log.c:246
#, c-format
msgid "Final output: %d %s\n"
msgstr "letzte Ausgabe: %d %s\n"
-#: builtin/log.c:486
+#: builtin/log.c:493
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: ungültige Datei"
-#: builtin/log.c:500 builtin/log.c:594
+#: builtin/log.c:507 builtin/log.c:601
#, c-format
msgid "Could not read object %s"
msgstr "Kann Objekt %s nicht lesen."
-#: builtin/log.c:618
+#: builtin/log.c:625
#, c-format
msgid "Unknown type: %d"
msgstr "Unbekannter Typ: %d"
-#: builtin/log.c:739
+#: builtin/log.c:746
msgid "format.headers without value"
msgstr "format.headers ohne Wert"
-#: builtin/log.c:839
+#: builtin/log.c:846
msgid "name of output directory is too long"
msgstr "Name des Ausgabeverzeichnisses ist zu lang."
-#: builtin/log.c:854
+#: builtin/log.c:861
#, c-format
msgid "Cannot open patch file %s"
msgstr "Kann Patch-Datei %s nicht öffnen"
-#: builtin/log.c:868
+#: builtin/log.c:875
msgid "Need exactly one range."
msgstr "Brauche genau einen Commit-Bereich."
-#: builtin/log.c:878
+#: builtin/log.c:885
msgid "Not a range."
msgstr "Kein Commit-Bereich."
-#: builtin/log.c:984
+#: builtin/log.c:991
msgid "Cover letter needs email format"
msgstr "Anschreiben benötigt E-Mail-Format"
-#: builtin/log.c:1063
+#: builtin/log.c:1071
#, c-format
msgid "insane in-reply-to: %s"
msgstr "ungültiges in-reply-to: %s"
-#: builtin/log.c:1091
+#: builtin/log.c:1098
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<Optionen>] [<seit> | <Commitbereich>]"
-#: builtin/log.c:1141
+#: builtin/log.c:1148
msgid "Two output directories?"
msgstr "Zwei Ausgabeverzeichnisse?"
-#: builtin/log.c:1248 builtin/log.c:1891 builtin/log.c:1893 builtin/log.c:1905
+#: builtin/log.c:1255 builtin/log.c:1898 builtin/log.c:1900 builtin/log.c:1912
#, c-format
msgid "Unknown commit %s"
msgstr "Unbekannter Commit %s"
-#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:476
+#: builtin/log.c:1265 builtin/notes.c:883 builtin/tag.c:532
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Konnte '%s' nicht als gültige Referenz auflösen."
-#: builtin/log.c:1263
+#: builtin/log.c:1270
msgid "Could not find exact merge base."
msgstr "Konnte keine exakte Merge-Basis finden."
-#: builtin/log.c:1267
+#: builtin/log.c:1274
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"
@@ -9344,216 +9597,216 @@
"'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:1287
+#: builtin/log.c:1294
msgid "Failed to find exact merge base"
msgstr "Fehler beim Finden einer exakten Merge-Basis."
-#: builtin/log.c:1298
+#: builtin/log.c:1305
msgid "base commit should be the ancestor of revision list"
msgstr "Basis-Commit sollte der Vorgänger der Revisionsliste sein."
-#: builtin/log.c:1302
+#: builtin/log.c:1309
msgid "base commit shouldn't be in revision list"
msgstr "Basis-Commit sollte nicht in der Revisionsliste enthalten sein."
-#: builtin/log.c:1351
+#: builtin/log.c:1358
msgid "cannot get patch id"
msgstr "kann Patch-Id nicht lesen"
-#: builtin/log.c:1408
+#: builtin/log.c:1415
msgid "use [PATCH n/m] even with a single patch"
msgstr "[PATCH n/m] auch mit einzelnem Patch verwenden"
-#: builtin/log.c:1411
+#: builtin/log.c:1418
msgid "use [PATCH] even with multiple patches"
msgstr "[PATCH] auch mit mehreren Patches verwenden"
-#: builtin/log.c:1415
+#: builtin/log.c:1422
msgid "print patches to standard out"
msgstr "Ausgabe der Patches in Standard-Ausgabe"
-#: builtin/log.c:1417
+#: builtin/log.c:1424
msgid "generate a cover letter"
msgstr "ein Deckblatt erzeugen"
-#: builtin/log.c:1419
+#: builtin/log.c:1426
msgid "use simple number sequence for output file names"
msgstr "einfache Nummernfolge für die Namen der Ausgabedateien verwenden"
-#: builtin/log.c:1420
+#: builtin/log.c:1427
msgid "sfx"
msgstr "Dateiendung"
-#: builtin/log.c:1421
+#: builtin/log.c:1428
msgid "use <sfx> instead of '.patch'"
msgstr "<Dateiendung> anstatt '.patch' verwenden"
-#: builtin/log.c:1423
+#: builtin/log.c:1430
msgid "start numbering patches at <n> instead of 1"
msgstr "die Nummerierung der Patches bei <n> anstatt bei 1 beginnen"
-#: builtin/log.c:1425
+#: builtin/log.c:1432
msgid "mark the series as Nth re-roll"
msgstr "die Serie als n-te Fassung kennzeichnen"
-#: builtin/log.c:1427
+#: builtin/log.c:1434
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "[RFC PATCH] anstatt [PATCH] verwenden"
-#: builtin/log.c:1430
+#: builtin/log.c:1437
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "[<Präfix>] anstatt [PATCH] verwenden"
-#: builtin/log.c:1433
+#: builtin/log.c:1440
msgid "store resulting files in <dir>"
msgstr "erzeugte Dateien in <Verzeichnis> speichern"
-#: builtin/log.c:1436
+#: builtin/log.c:1443
msgid "don't strip/add [PATCH]"
msgstr "[PATCH] nicht entfernen/hinzufügen"
-#: builtin/log.c:1439
+#: builtin/log.c:1446
msgid "don't output binary diffs"
msgstr "keine binären Unterschiede ausgeben"
-#: builtin/log.c:1441
+#: builtin/log.c:1448
msgid "output all-zero hash in From header"
msgstr "Hash mit Nullen in \"From\"-Header ausgeben"
-#: builtin/log.c:1443
+#: builtin/log.c:1450
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:1445
+#: builtin/log.c:1452
msgid "show patch format instead of default (patch + stat)"
msgstr "Patchformat anstatt des Standards anzeigen (Patch + Zusammenfassung)"
-#: builtin/log.c:1447
+#: builtin/log.c:1454
msgid "Messaging"
msgstr "E-Mail-Einstellungen"
-#: builtin/log.c:1448
+#: builtin/log.c:1455
msgid "header"
msgstr "Header"
-#: builtin/log.c:1449
+#: builtin/log.c:1456
msgid "add email header"
msgstr "E-Mail-Header hinzufügen"
-#: builtin/log.c:1450 builtin/log.c:1452
+#: builtin/log.c:1457 builtin/log.c:1459
msgid "email"
msgstr "E-Mail"
-#: builtin/log.c:1450
+#: builtin/log.c:1457
msgid "add To: header"
msgstr "\"To:\"-Header hinzufügen"
-#: builtin/log.c:1452
+#: builtin/log.c:1459
msgid "add Cc: header"
msgstr "\"Cc:\"-Header hinzufügen"
-#: builtin/log.c:1454
+#: builtin/log.c:1461
msgid "ident"
msgstr "Ident"
-#: builtin/log.c:1455
+#: builtin/log.c:1462
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:1457
+#: builtin/log.c:1464
msgid "message-id"
msgstr "message-id"
-#: builtin/log.c:1458
+#: builtin/log.c:1465
msgid "make first mail a reply to <message-id>"
msgstr "aus erster E-Mail eine Antwort zu <message-id> machen"
-#: builtin/log.c:1459 builtin/log.c:1462
+#: builtin/log.c:1466 builtin/log.c:1469
msgid "boundary"
msgstr "Grenze"
-#: builtin/log.c:1460
+#: builtin/log.c:1467
msgid "attach the patch"
msgstr "den Patch anhängen"
-#: builtin/log.c:1463
+#: builtin/log.c:1470
msgid "inline the patch"
msgstr "den Patch direkt in die Nachricht einfügen"
-#: builtin/log.c:1467
+#: builtin/log.c:1474
msgid "enable message threading, styles: shallow, deep"
msgstr "Nachrichtenverkettung aktivieren, Stile: shallow, deep"
-#: builtin/log.c:1469
+#: builtin/log.c:1476
msgid "signature"
msgstr "Signatur"
-#: builtin/log.c:1470
+#: builtin/log.c:1477
msgid "add a signature"
msgstr "eine Signatur hinzufügen"
-#: builtin/log.c:1471
+#: builtin/log.c:1478
msgid "base-commit"
msgstr "Basis-Commit"
-#: builtin/log.c:1472
+#: builtin/log.c:1479
msgid "add prerequisite tree info to the patch series"
msgstr "erforderliche Revisions-Informationen der Patch-Serie hinzufügen"
-#: builtin/log.c:1474
+#: builtin/log.c:1481
msgid "add a signature from a file"
msgstr "eine Signatur aus einer Datei hinzufügen"
-#: builtin/log.c:1475
+#: builtin/log.c:1482
msgid "don't print the patch filenames"
msgstr "keine Dateinamen der Patches anzeigen"
-#: builtin/log.c:1565
+#: builtin/log.c:1572
msgid "-n and -k are mutually exclusive."
msgstr "Die Optionen -n und -k schließen sich gegenseitig aus."
-#: builtin/log.c:1567
+#: builtin/log.c:1574
msgid "--subject-prefix/--rfc and -k are mutually exclusive."
msgstr "--subject-prefix/--rfc und -k schließen sich gegenseitig aus."
-#: builtin/log.c:1575
+#: builtin/log.c:1582
msgid "--name-only does not make sense"
msgstr "Die Option --name-only kann nicht verwendet werden."
-#: builtin/log.c:1577
+#: builtin/log.c:1584
msgid "--name-status does not make sense"
msgstr "Die Option --name-status kann nicht verwendet werden."
-#: builtin/log.c:1579
+#: builtin/log.c:1586
msgid "--check does not make sense"
msgstr "Die Option --check kann nicht verwendet werden."
-#: builtin/log.c:1609
+#: builtin/log.c:1616
msgid "standard output, or directory, which one?"
msgstr "Standard-Ausgabe oder Verzeichnis, welches von beidem?"
-#: builtin/log.c:1611
+#: builtin/log.c:1618
#, c-format
msgid "Could not create directory '%s'"
msgstr "Konnte Verzeichnis '%s' nicht erstellen."
-#: builtin/log.c:1705
+#: builtin/log.c:1712
#, c-format
msgid "unable to read signature file '%s'"
msgstr "Konnte Signatur-Datei '%s' nicht lesen"
-#: builtin/log.c:1777
+#: builtin/log.c:1784
msgid "Failed to create output files"
msgstr "Fehler beim Erstellen der Ausgabedateien."
-#: builtin/log.c:1826
+#: builtin/log.c:1833
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<Upstream> [<Branch> [<Limit>]]]"
-#: builtin/log.c:1880
+#: builtin/log.c:1887
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -9561,108 +9814,108 @@
"Konnte gefolgten Remote-Branch nicht finden, bitte geben Sie <Upstream> "
"manuell an.\n"
-#: builtin/ls-files.c:460
+#: builtin/ls-files.c:468
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<Optionen>] [<Datei>...]"
-#: builtin/ls-files.c:509
+#: builtin/ls-files.c:517
msgid "identify the file status with tags"
msgstr "den Dateistatus mit Tags anzeigen"
-#: builtin/ls-files.c:511
+#: builtin/ls-files.c:519
msgid "use lowercase letters for 'assume unchanged' files"
msgstr ""
"Kleinbuchstaben für Dateien mit 'assume unchanged' Markierung verwenden"
-#: builtin/ls-files.c:513
+#: builtin/ls-files.c:521
msgid "show cached files in the output (default)"
msgstr "zwischengespeicherte Dateien in der Ausgabe anzeigen (Standard)"
-#: builtin/ls-files.c:515
+#: builtin/ls-files.c:523
msgid "show deleted files in the output"
msgstr "entfernte Dateien in der Ausgabe anzeigen"
-#: builtin/ls-files.c:517
+#: builtin/ls-files.c:525
msgid "show modified files in the output"
msgstr "geänderte Dateien in der Ausgabe anzeigen"
-#: builtin/ls-files.c:519
+#: builtin/ls-files.c:527
msgid "show other files in the output"
msgstr "sonstige Dateien in der Ausgabe anzeigen"
-#: builtin/ls-files.c:521
+#: builtin/ls-files.c:529
msgid "show ignored files in the output"
msgstr "ignorierte Dateien in der Ausgabe anzeigen"
-#: builtin/ls-files.c:524
+#: builtin/ls-files.c:532
msgid "show staged contents' object name in the output"
msgstr ""
"Objektnamen von Inhalten, die zum Commit vorgemerkt sind, in der Ausgabe "
"anzeigen"
-#: builtin/ls-files.c:526
+#: builtin/ls-files.c:534
msgid "show files on the filesystem that need to be removed"
msgstr "Dateien im Dateisystem, die gelöscht werden müssen, anzeigen"
-#: builtin/ls-files.c:528
+#: builtin/ls-files.c:536
msgid "show 'other' directories' names only"
msgstr "nur Namen von 'sonstigen' Verzeichnissen anzeigen"
-#: builtin/ls-files.c:530
+#: builtin/ls-files.c:538
msgid "show line endings of files"
msgstr "Zeilenenden von Dateien anzeigen"
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:540
msgid "don't show empty directories"
msgstr "keine leeren Verzeichnisse anzeigen"
-#: builtin/ls-files.c:535
+#: builtin/ls-files.c:543
msgid "show unmerged files in the output"
msgstr "nicht zusammengeführte Dateien in der Ausgabe anzeigen"
-#: builtin/ls-files.c:537
+#: builtin/ls-files.c:545
msgid "show resolve-undo information"
msgstr "'resolve-undo' Informationen anzeigen"
-#: builtin/ls-files.c:539
+#: builtin/ls-files.c:547
msgid "skip files matching pattern"
msgstr "Dateien auslassen, die einem Muster entsprechen"
-#: builtin/ls-files.c:542
+#: builtin/ls-files.c:550
msgid "exclude patterns are read from <file>"
msgstr "Muster, gelesen von <Datei>, ausschließen"
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:553
msgid "read additional per-directory exclude patterns in <file>"
msgstr "zusätzliche pro-Verzeichnis Auschlussmuster aus <Datei> auslesen"
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:555
msgid "add the standard git exclusions"
msgstr "die standardmäßigen Git-Ausschlüsse hinzufügen"
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:558
msgid "make the output relative to the project top directory"
msgstr "Ausgabe relativ zum Projektverzeichnis"
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:561
msgid "recurse through submodules"
msgstr "Rekursion in Submodulen durchführen"
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:563
msgid "if any <file> is not in the index, treat this as an error"
msgstr "als Fehler behandeln, wenn sich eine <Datei> nicht im Index befindet"
-#: builtin/ls-files.c:556
+#: builtin/ls-files.c:564
msgid "tree-ish"
msgstr "Commit-Referenz"
-#: builtin/ls-files.c:557
+#: builtin/ls-files.c:565
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
"vorgeben, dass Pfade, die seit <Commit-Referenz> gelöscht wurden, immer noch "
"vorhanden sind"
-#: builtin/ls-files.c:559
+#: builtin/ls-files.c:567
msgid "show debugging data"
msgstr "Ausgaben zur Fehlersuche anzeigen"
@@ -9676,41 +9929,41 @@
" [-q | --quiet] [--exit-code] [--get-url]\n"
" [--symref] [<Repository> [<Referenzen>...]]"
-#: builtin/ls-remote.c:50
+#: builtin/ls-remote.c:52
msgid "do not print remote URL"
msgstr "URL des Remote-Repositories nicht ausgeben"
-#: builtin/ls-remote.c:51 builtin/ls-remote.c:53
+#: builtin/ls-remote.c:53 builtin/ls-remote.c:55
msgid "exec"
msgstr "Programm"
-#: builtin/ls-remote.c:52 builtin/ls-remote.c:54
+#: builtin/ls-remote.c:54 builtin/ls-remote.c:56
msgid "path of git-upload-pack on the remote host"
msgstr "Pfad zu \"git-upload-pack\" auf der Gegenseite"
-#: builtin/ls-remote.c:56
+#: builtin/ls-remote.c:58
msgid "limit to tags"
msgstr "auf Tags einschränken"
-#: builtin/ls-remote.c:57
+#: builtin/ls-remote.c:59
msgid "limit to heads"
msgstr "auf Branches einschränken"
-#: builtin/ls-remote.c:58
+#: builtin/ls-remote.c:60
msgid "do not show peeled tags"
msgstr "keine Tags anzeigen, die andere Tags enthalten"
-#: builtin/ls-remote.c:60
+#: builtin/ls-remote.c:62
msgid "take url.<base>.insteadOf into account"
msgstr "url.<Basis>.insteadOf berücksichtigen"
-#: builtin/ls-remote.c:62
+#: builtin/ls-remote.c:64
msgid "exit with exit code 2 if no matching refs are found"
msgstr ""
"mit Rückkehrwert 2 beenden, wenn keine übereinstimmenden Referenzen\n"
"gefunden wurden"
-#: builtin/ls-remote.c:64
+#: 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"
@@ -9757,149 +10010,145 @@
msgstr "git merge [<Optionen>] [<Commit>...]"
#: builtin/merge.c:47
-msgid "git merge [<options>] <msg> HEAD <commit>"
-msgstr "git merge [<Optionen>] <Beschreibung> HEAD <Commit>"
-
-#: builtin/merge.c:48
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:49
+#: builtin/merge.c:48
msgid "git merge --continue"
msgstr "git merge --continue"
-#: builtin/merge.c:104
+#: builtin/merge.c:103
msgid "switch `m' requires a value"
msgstr "Schalter 'm' erfordert einen Wert."
-#: builtin/merge.c:141
+#: builtin/merge.c:140
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Konnte Merge-Strategie '%s' nicht finden.\n"
-#: builtin/merge.c:142
+#: builtin/merge.c:141
#, c-format
msgid "Available strategies are:"
msgstr "Verfügbare Strategien sind:"
-#: builtin/merge.c:147
+#: builtin/merge.c:146
#, c-format
msgid "Available custom strategies are:"
msgstr "Verfügbare benutzerdefinierte Strategien sind:"
-#: builtin/merge.c:197 builtin/pull.c:127
+#: builtin/merge.c:196 builtin/pull.c:127
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:200 builtin/pull.c:130
+#: builtin/merge.c:199 builtin/pull.c:130
msgid "show a diffstat at the end of the merge"
msgstr "eine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen"
-#: builtin/merge.c:201 builtin/pull.c:133
+#: builtin/merge.c:200 builtin/pull.c:133
msgid "(synonym to --stat)"
msgstr "(Synonym für --stat)"
-#: builtin/merge.c:203 builtin/pull.c:136
+#: builtin/merge.c:202 builtin/pull.c:136
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:206 builtin/pull.c:139
+#: builtin/merge.c:205 builtin/pull.c:139
msgid "create a single commit instead of doing a merge"
msgstr "einen einzelnen Commit anstatt eines Merges erzeugen"
-#: builtin/merge.c:208 builtin/pull.c:142
+#: builtin/merge.c:207 builtin/pull.c:142
msgid "perform a commit if the merge succeeds (default)"
msgstr "einen Commit durchführen, wenn der Merge erfolgreich war (Standard)"
-#: builtin/merge.c:210 builtin/pull.c:145
+#: builtin/merge.c:209 builtin/pull.c:145
msgid "edit message before committing"
msgstr "Bearbeitung der Beschreibung vor dem Commit"
-#: builtin/merge.c:211
+#: builtin/merge.c:210
msgid "allow fast-forward (default)"
msgstr "Vorspulen erlauben (Standard)"
-#: builtin/merge.c:213 builtin/pull.c:151
+#: builtin/merge.c:212 builtin/pull.c:151
msgid "abort if fast-forward is not possible"
msgstr "abbrechen, wenn kein Vorspulen möglich ist"
-#: builtin/merge.c:217 builtin/pull.c:154
+#: builtin/merge.c:216 builtin/pull.c:154
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:218 builtin/notes.c:774 builtin/pull.c:158
-#: builtin/revert.c:89
+#: builtin/merge.c:217 builtin/notes.c:773 builtin/pull.c:158
+#: builtin/revert.c:108
msgid "strategy"
msgstr "Strategie"
-#: builtin/merge.c:219 builtin/pull.c:159
+#: builtin/merge.c:218 builtin/pull.c:159
msgid "merge strategy to use"
msgstr "zu verwendende Merge-Strategie"
-#: builtin/merge.c:220 builtin/pull.c:162
+#: builtin/merge.c:219 builtin/pull.c:162
msgid "option=value"
msgstr "Option=Wert"
-#: builtin/merge.c:221 builtin/pull.c:163
+#: builtin/merge.c:220 builtin/pull.c:163
msgid "option for selected merge strategy"
msgstr "Option für ausgewählte Merge-Strategie"
-#: builtin/merge.c:223
+#: builtin/merge.c:222
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:227
+#: builtin/merge.c:226
msgid "abort the current in-progress merge"
msgstr "den sich im Gange befindlichen Merge abbrechen"
-#: builtin/merge.c:229
+#: builtin/merge.c:228
msgid "continue the current in-progress merge"
msgstr "den sich im Gange befindlichen Merge fortsetzen"
-#: builtin/merge.c:231 builtin/pull.c:170
+#: builtin/merge.c:230 builtin/pull.c:170
msgid "allow merging unrelated histories"
msgstr "erlaube das Zusammenführen von nicht zusammenhängenden Historien"
-#: builtin/merge.c:259
+#: builtin/merge.c:258
msgid "could not run stash."
msgstr "Konnte \"stash\" nicht ausführen."
-#: builtin/merge.c:264
+#: builtin/merge.c:263
msgid "stash failed"
msgstr "\"stash\" fehlgeschlagen"
-#: builtin/merge.c:269
+#: builtin/merge.c:268
#, c-format
msgid "not a valid object: %s"
msgstr "kein gültiges Objekt: %s"
-#: builtin/merge.c:288 builtin/merge.c:305
+#: builtin/merge.c:287 builtin/merge.c:304
msgid "read-tree failed"
msgstr "read-tree fehlgeschlagen"
-#: builtin/merge.c:335
+#: builtin/merge.c:334
msgid " (nothing to squash)"
msgstr " (nichts zu quetschen)"
-#: builtin/merge.c:346
+#: builtin/merge.c:345
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Quetsche Commit -- HEAD wird nicht aktualisiert\n"
-#: builtin/merge.c:396
+#: builtin/merge.c:395
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Keine Merge-Commit-Beschreibung -- HEAD wird nicht aktualisiert\n"
-#: builtin/merge.c:447
+#: builtin/merge.c:446
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' zeigt auf keinen Commit"
-#: builtin/merge.c:537
+#: builtin/merge.c:536
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Ungültiger branch.%s.mergeoptions String: %s"
@@ -9962,65 +10211,60 @@
"Automatischer Merge fehlgeschlagen; beheben Sie die Konflikte und committen "
"Sie dann das Ergebnis.\n"
-#: builtin/merge.c:867
-#, c-format
-msgid "'%s' is not a commit"
-msgstr "'%s' ist kein Commit"
-
-#: builtin/merge.c:908
+#: builtin/merge.c:890
msgid "No current branch."
msgstr "Sie befinden sich auf keinem Branch."
-#: builtin/merge.c:910
+#: builtin/merge.c:892
msgid "No remote for the current branch."
msgstr "Kein Remote-Repository für den aktuellen Branch."
-#: builtin/merge.c:912
+#: builtin/merge.c:894
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:917
+#: builtin/merge.c:899
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Kein Remote-Tracking-Branch für %s von %s"
-#: builtin/merge.c:964
+#: builtin/merge.c:946
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Fehlerhafter Wert '%s' in Umgebungsvariable '%s'"
-#: builtin/merge.c:1038
+#: builtin/merge.c:1020
#, c-format
msgid "could not close '%s'"
msgstr "Konnte '%s' nicht schließen"
-#: builtin/merge.c:1065
+#: builtin/merge.c:1047
#, 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:1099
+#: builtin/merge.c:1081
msgid "not something we can merge"
msgstr "nichts was wir zusammenführen können"
-#: builtin/merge.c:1167
+#: builtin/merge.c:1146
msgid "--abort expects no arguments"
msgstr "--abort akzeptiert keine Argumente"
-#: builtin/merge.c:1171
+#: builtin/merge.c:1150
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "Es gibt keinen Merge zum Abbrechen (MERGE_HEAD fehlt)"
-#: builtin/merge.c:1183
+#: builtin/merge.c:1162
msgid "--continue expects no arguments"
msgstr "--continue erwartet keine Argumente"
-#: builtin/merge.c:1187
+#: builtin/merge.c:1166
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "Es ist keine Merge im Gange (MERGE_HEAD fehlt)."
-#: builtin/merge.c:1203
+#: builtin/merge.c:1182
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -10028,7 +10272,7 @@
"Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert).\n"
"Bitte committen Sie Ihre Änderungen, bevor Sie den Merge ausführen."
-#: builtin/merge.c:1210
+#: builtin/merge.c:1189
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -10036,117 +10280,117 @@
"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:1213
+#: builtin/merge.c:1192
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:1222
+#: builtin/merge.c:1201
msgid "You cannot combine --squash with --no-ff."
msgstr "Sie können --squash nicht mit --no-ff kombinieren."
-#: builtin/merge.c:1230
+#: builtin/merge.c:1209
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "Kein Commit angegeben und merge.defaultToUpstream ist nicht gesetzt."
-#: builtin/merge.c:1247
+#: builtin/merge.c:1226
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:1249
+#: builtin/merge.c:1228
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:1254
+#: builtin/merge.c:1233
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - nichts was wir zusammenführen können"
-#: builtin/merge.c:1256
+#: builtin/merge.c:1235
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:1312
+#: builtin/merge.c:1269
#, 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:1315
+#: builtin/merge.c:1272
#, 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:1318
+#: builtin/merge.c:1275
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Commit %s hat keine GPG-Signatur."
-#: builtin/merge.c:1321
+#: builtin/merge.c:1278
#, 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:1383
+#: builtin/merge.c:1340
msgid "refusing to merge unrelated histories"
msgstr "Verweigere den Merge von nicht zusammenhängenden Historien."
-#: builtin/merge.c:1392
+#: builtin/merge.c:1349
msgid "Already up-to-date."
msgstr "Bereits aktuell."
-#: builtin/merge.c:1402
+#: builtin/merge.c:1359
#, c-format
msgid "Updating %s..%s\n"
msgstr "Aktualisiere %s..%s\n"
-#: builtin/merge.c:1443
+#: builtin/merge.c:1400
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Probiere wirklich trivialen \"in-index\"-Merge ...\n"
-#: builtin/merge.c:1450
+#: builtin/merge.c:1407
#, c-format
msgid "Nope.\n"
msgstr "Nein.\n"
-#: builtin/merge.c:1475
+#: builtin/merge.c:1432
msgid "Already up-to-date. Yeeah!"
msgstr "Bereits aktuell."
-#: builtin/merge.c:1481
+#: builtin/merge.c:1438
msgid "Not possible to fast-forward, aborting."
msgstr "Vorspulen nicht möglich, breche ab."
-#: builtin/merge.c:1504 builtin/merge.c:1583
+#: builtin/merge.c:1461 builtin/merge.c:1540
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Rücklauf des Verzeichnisses bis zum Ursprung ...\n"
-#: builtin/merge.c:1508
+#: builtin/merge.c:1465
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Probiere Merge-Strategie %s ...\n"
-#: builtin/merge.c:1574
+#: builtin/merge.c:1531
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Keine Merge-Strategie behandelt diesen Merge.\n"
-#: builtin/merge.c:1576
+#: builtin/merge.c:1533
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Merge mit Strategie %s fehlgeschlagen.\n"
-#: builtin/merge.c:1585
+#: builtin/merge.c:1542
#, 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:1597
+#: builtin/merge.c:1554
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -10200,35 +10444,35 @@
"git merge-file [<Optionen>] [-L <Name1> [-L <orig> [-L <Name2>]]] <Datei1> "
"<orig-Datei> <Datei2>"
-#: builtin/merge-file.c:33
+#: builtin/merge-file.c:32
msgid "send results to standard output"
msgstr "Ergebnisse zur Standard-Ausgabe senden"
-#: builtin/merge-file.c:34
+#: builtin/merge-file.c:33
msgid "use a diff3 based merge"
msgstr "einen diff3 basierten Merge verwenden"
-#: builtin/merge-file.c:35
+#: builtin/merge-file.c:34
msgid "for conflicts, use our version"
msgstr "bei Konflikten unsere Variante verwenden"
-#: builtin/merge-file.c:37
+#: builtin/merge-file.c:36
msgid "for conflicts, use their version"
msgstr "bei Konflikten ihre Variante verwenden"
-#: builtin/merge-file.c:39
+#: builtin/merge-file.c:38
msgid "for conflicts, use a union version"
msgstr "bei Konflikten eine gemeinsame Variante verwenden"
-#: builtin/merge-file.c:42
+#: builtin/merge-file.c:41
msgid "for conflicts, use this marker size"
msgstr "bei Konflikten diese Kennzeichnungslänge verwenden"
-#: builtin/merge-file.c:43
+#: builtin/merge-file.c:42
msgid "do not warn about conflicts"
msgstr "keine Warnung bei Konflikten"
-#: builtin/merge-file.c:45
+#: builtin/merge-file.c:44
msgid "set labels for file1/orig-file/file2"
msgstr "Beschriftung für Datei1/orig-Datei/Datei2 setzen"
@@ -10374,43 +10618,47 @@
msgid "renaming '%s' failed"
msgstr "Umbenennung von '%s' fehlgeschlagen"
-#: builtin/name-rev.c:257
+#: builtin/name-rev.c:289
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<Optionen>] <Commit>..."
-#: builtin/name-rev.c:258
+#: builtin/name-rev.c:290
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<Optionen>] --all"
-#: builtin/name-rev.c:259
+#: builtin/name-rev.c:291
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<Optionen>] --stdin"
-#: builtin/name-rev.c:311
+#: builtin/name-rev.c:346
msgid "print only names (no SHA-1)"
msgstr "nur Namen anzeigen (keine SHA-1)"
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:347
msgid "only use tags to name the commits"
msgstr "nur Tags verwenden, um die Commits zu benennen"
-#: builtin/name-rev.c:314
+#: builtin/name-rev.c:349
msgid "only use refs matching <pattern>"
msgstr "nur Referenzen verwenden die <Muster> entsprechen"
-#: builtin/name-rev.c:316
+#: builtin/name-rev.c:351
+msgid "ignore refs matching <pattern>"
+msgstr "ignoriere Referenzen die <Muster> entsprechen"
+
+#: builtin/name-rev.c:353
msgid "list all commits reachable from all refs"
msgstr "alle Commits auflisten, die von allen Referenzen erreichbar sind"
-#: builtin/name-rev.c:317
+#: builtin/name-rev.c:354
msgid "read from stdin"
msgstr "von der Standard-Eingabe lesen"
-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:355
msgid "allow to print `undefined` names (default)"
msgstr "Ausgabe von `undefinierten` Namen erlauben (Standard)"
-#: builtin/name-rev.c:324
+#: builtin/name-rev.c:361
msgid "dereference tags in the input (internal use)"
msgstr "Tags in der Eingabe dereferenzieren (interne Verwendung)"
@@ -10558,19 +10806,19 @@
msgid "the note contents have been left in %s"
msgstr "Die Notiz-Inhalte wurden in %s belassen."
-#: builtin/notes.c:233 builtin/tag.c:460
+#: builtin/notes.c:233 builtin/tag.c:516
#, c-format
msgid "cannot read '%s'"
msgstr "kann '%s' nicht lesen"
-#: builtin/notes.c:235 builtin/tag.c:463
+#: builtin/notes.c:235 builtin/tag.c:519
#, 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:659
+#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:658
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr "Konnte '%s' nicht als gültige Referenz auflösen."
@@ -10605,12 +10853,12 @@
"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:652
-#: builtin/notes.c:802 builtin/notes.c:949 builtin/notes.c:970
+#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:651
+#: builtin/notes.c:801 builtin/notes.c:948 builtin/notes.c:969
msgid "too many parameters"
msgstr "zu viele Parameter"
-#: builtin/notes.c:378 builtin/notes.c:665
+#: builtin/notes.c:378 builtin/notes.c:664
#, c-format
msgid "no note found for object %s."
msgstr "Keine Notiz für Objekt %s gefunden."
@@ -10653,7 +10901,7 @@
msgid "Overwriting existing notes for object %s\n"
msgstr "Überschreibe existierende Notizen für Objekt %s\n"
-#: builtin/notes.c:463 builtin/notes.c:624 builtin/notes.c:889
+#: builtin/notes.c:463 builtin/notes.c:623 builtin/notes.c:888
#, c-format
msgid "Removing note for object %s\n"
msgstr "Entferne Notiz für Objekt %s\n"
@@ -10695,52 +10943,52 @@
"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:685
+#: builtin/notes.c:684
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "Fehler beim Löschen der Referenz NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:687
+#: builtin/notes.c:686
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "Fehler beim Löschen der Referenz NOTES_MERGE_REF"
-#: builtin/notes.c:689
+#: builtin/notes.c:688
msgid "failed to remove 'git notes merge' worktree"
msgstr "Fehler beim Löschen des Arbeitsverzeichnisses von 'git notes merge'."
-#: builtin/notes.c:709
+#: builtin/notes.c:708
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "Fehler beim Lesen der Referenz NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:711
+#: builtin/notes.c:710
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "Konnte Commit von NOTES_MERGE_PARTIAL nicht finden."
-#: builtin/notes.c:713
+#: builtin/notes.c:712
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "Konnte Commit von NOTES_MERGE_PARTIAL nicht parsen."
-#: builtin/notes.c:726
+#: builtin/notes.c:725
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "Fehler beim Auflösen von NOTES_MERGE_REF"
-#: builtin/notes.c:729
+#: builtin/notes.c:728
msgid "failed to finalize notes merge"
msgstr "Fehler beim Abschließen der Zusammenführung der Notizen."
-#: builtin/notes.c:755
+#: builtin/notes.c:754
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "unbekannte Merge-Strategie '%s' für Notizen"
-#: builtin/notes.c:771
+#: builtin/notes.c:770
msgid "General options"
msgstr "Allgemeine Optionen"
-#: builtin/notes.c:773
+#: builtin/notes.c:772
msgid "Merge options"
msgstr "Merge-Optionen"
-#: builtin/notes.c:775
+#: builtin/notes.c:774
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -10748,49 +10996,49 @@
"löst Konflikte bei Notizen mit der angegebenen Strategie auf (manual/ours/"
"theirs/union/cat_sort_uniq)"
-#: builtin/notes.c:777
+#: builtin/notes.c:776
msgid "Committing unmerged notes"
msgstr "nicht zusammengeführte Notizen eintragen"
-#: builtin/notes.c:779
+#: builtin/notes.c:778
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:781
+#: builtin/notes.c:780
msgid "Aborting notes merge resolution"
msgstr "Konfliktauflösung beim Merge von Notizen abbrechen"
-#: builtin/notes.c:783
+#: builtin/notes.c:782
msgid "abort notes merge"
msgstr "Merge von Notizen abbrechen"
-#: builtin/notes.c:794
+#: builtin/notes.c:793
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "Kann --commit, --abort oder -s/--strategy nicht kombinieren."
-#: builtin/notes.c:799
+#: builtin/notes.c:798
msgid "must specify a notes ref to merge"
msgstr "Sie müssen eine Notiz-Referenz zum Mergen angeben."
-#: builtin/notes.c:823
+#: builtin/notes.c:822
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "Unbekannter Wert für -s/--strategy: %s"
-#: builtin/notes.c:860
+#: builtin/notes.c:859
#, 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:863
+#: builtin/notes.c:862
#, 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:865
+#: builtin/notes.c:864
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -10802,36 +11050,36 @@
"commit',\n"
"oder brechen Sie den Merge mit 'git notes merge --abort' ab.\n"
-#: builtin/notes.c:887
+#: builtin/notes.c:886
#, c-format
msgid "Object %s has no note\n"
msgstr "Objekt %s hat keine Notiz\n"
-#: builtin/notes.c:899
+#: builtin/notes.c:898
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:902
+#: builtin/notes.c:901
msgid "read object names from the standard input"
msgstr "Objektnamen von der Standard-Eingabe lesen"
-#: builtin/notes.c:940 builtin/prune.c:105 builtin/worktree.c:127
+#: builtin/notes.c:939 builtin/prune.c:105 builtin/worktree.c:127
msgid "do not remove, show only"
msgstr "nicht löschen, nur anzeigen"
-#: builtin/notes.c:941
+#: builtin/notes.c:940
msgid "report pruned notes"
msgstr "gelöschte Notizen melden"
-#: builtin/notes.c:983
+#: builtin/notes.c:982
msgid "notes-ref"
msgstr "Notiz-Referenz"
-#: builtin/notes.c:984
+#: builtin/notes.c:983
msgid "use notes from <notes-ref>"
msgstr "Notizen von <Notiz-Referenz> verwenden"
-#: builtin/notes.c:1019
+#: builtin/notes.c:1018
#, c-format
msgid "unknown subcommand: %s"
msgstr "Unbekannter Unterbefehl: %s"
@@ -10855,183 +11103,183 @@
msgid "deflate error (%d)"
msgstr "Fehler beim Komprimieren (%d)"
-#: builtin/pack-objects.c:766
+#: builtin/pack-objects.c:770
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:779
+#: builtin/pack-objects.c:783
msgid "Writing objects"
msgstr "Schreibe Objekte"
-#: builtin/pack-objects.c:1068
+#: builtin/pack-objects.c:1063
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:2344
+#: builtin/pack-objects.c:2426
msgid "Compressing objects"
msgstr "Komprimiere Objekte"
-#: builtin/pack-objects.c:2747
+#: builtin/pack-objects.c:2829
#, c-format
msgid "unsupported index version %s"
msgstr "Nicht unterstützte Index-Version %s"
-#: builtin/pack-objects.c:2751
+#: builtin/pack-objects.c:2833
#, c-format
msgid "bad index version '%s'"
msgstr "Ungültige Index-Version '%s'"
-#: builtin/pack-objects.c:2781
+#: builtin/pack-objects.c:2863
msgid "do not show progress meter"
msgstr "keine Fortschrittsanzeige anzeigen"
-#: builtin/pack-objects.c:2783
+#: builtin/pack-objects.c:2865
msgid "show progress meter"
msgstr "Fortschrittsanzeige anzeigen"
-#: builtin/pack-objects.c:2785
+#: builtin/pack-objects.c:2867
msgid "show progress meter during object writing phase"
msgstr ""
"Forschrittsanzeige während der Phase des Schreibens der Objekte anzeigen"
-#: builtin/pack-objects.c:2788
+#: builtin/pack-objects.c:2870
msgid "similar to --all-progress when progress meter is shown"
msgstr "ähnlich zu --all-progress wenn Fortschrittsanzeige darstellt wird"
-#: builtin/pack-objects.c:2789
+#: builtin/pack-objects.c:2871
msgid "version[,offset]"
msgstr "version[,offset]"
-#: builtin/pack-objects.c:2790
+#: builtin/pack-objects.c:2872
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:2793
+#: builtin/pack-objects.c:2875
msgid "maximum size of each output pack file"
msgstr "maximale Größe für jede ausgegebene Paketdatei"
-#: builtin/pack-objects.c:2795
+#: builtin/pack-objects.c:2877
msgid "ignore borrowed objects from alternate object store"
msgstr "geliehene Objekte von alternativem Objektspeicher ignorieren"
-#: builtin/pack-objects.c:2797
+#: builtin/pack-objects.c:2879
msgid "ignore packed objects"
msgstr "gepackte Objekte ignorieren"
-#: builtin/pack-objects.c:2799
+#: builtin/pack-objects.c:2881
msgid "limit pack window by objects"
msgstr "Paketfenster durch Objekte begrenzen"
-#: builtin/pack-objects.c:2801
+#: builtin/pack-objects.c:2883
msgid "limit pack window by memory in addition to object limit"
msgstr ""
"Paketfenster, zusätzlich zur Objektbegrenzung, durch Speicher begrenzen"
-#: builtin/pack-objects.c:2803
+#: builtin/pack-objects.c:2885
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:2805
+#: builtin/pack-objects.c:2887
msgid "reuse existing deltas"
msgstr "existierende Unterschiede wiederverwenden"
-#: builtin/pack-objects.c:2807
+#: builtin/pack-objects.c:2889
msgid "reuse existing objects"
msgstr "existierende Objekte wiederverwenden"
-#: builtin/pack-objects.c:2809
+#: builtin/pack-objects.c:2891
msgid "use OFS_DELTA objects"
msgstr "OFS_DELTA Objekte verwenden"
-#: builtin/pack-objects.c:2811
+#: builtin/pack-objects.c:2893
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:2813
+#: builtin/pack-objects.c:2895
msgid "do not create an empty pack output"
msgstr "keine leeren Pakete erzeugen"
-#: builtin/pack-objects.c:2815
+#: builtin/pack-objects.c:2897
msgid "read revision arguments from standard input"
msgstr "Argumente bezüglich Commits von der Standard-Eingabe lesen"
-#: builtin/pack-objects.c:2817
+#: builtin/pack-objects.c:2899
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:2820
+#: builtin/pack-objects.c:2902
msgid "include objects reachable from any reference"
msgstr "Objekte einschließen, die von jeder Referenz erreichbar sind"
-#: builtin/pack-objects.c:2823
+#: builtin/pack-objects.c:2905
msgid "include objects referred by reflog entries"
msgstr ""
"Objekte einschließen, die von Einträgen des Reflogs referenziert werden"
-#: builtin/pack-objects.c:2826
+#: builtin/pack-objects.c:2908
msgid "include objects referred to by the index"
msgstr "Objekte einschließen, die vom Index referenziert werden"
-#: builtin/pack-objects.c:2829
+#: builtin/pack-objects.c:2911
msgid "output pack to stdout"
msgstr "Paket in die Standard-Ausgabe schreiben"
-#: builtin/pack-objects.c:2831
+#: builtin/pack-objects.c:2913
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:2833
+#: builtin/pack-objects.c:2915
msgid "keep unreachable objects"
msgstr "nicht erreichbare Objekte behalten"
-#: builtin/pack-objects.c:2835
+#: builtin/pack-objects.c:2917
msgid "pack loose unreachable objects"
msgstr "nicht erreichbare lose Objekte packen"
-#: builtin/pack-objects.c:2837
+#: builtin/pack-objects.c:2919
msgid "unpack unreachable objects newer than <time>"
msgstr "nicht erreichbare Objekte entpacken, die neuer als <Zeit> sind"
-#: builtin/pack-objects.c:2840
+#: builtin/pack-objects.c:2922
msgid "create thin packs"
msgstr "dünnere Pakete erzeugen"
-#: builtin/pack-objects.c:2842
+#: builtin/pack-objects.c:2924
msgid "create packs suitable for shallow fetches"
msgstr ""
"Pakete geeignet für Abholung mit unvollständiger Historie (shallow) erzeugen"
-#: builtin/pack-objects.c:2844
+#: builtin/pack-objects.c:2926
msgid "ignore packs that have companion .keep file"
msgstr "Pakete ignorieren, die .keep Dateien haben"
-#: builtin/pack-objects.c:2846
+#: builtin/pack-objects.c:2928
msgid "pack compression level"
msgstr "Komprimierungsgrad für Paketierung"
-#: builtin/pack-objects.c:2848
+#: builtin/pack-objects.c:2930
msgid "do not hide commits by grafts"
msgstr "keine künstlichen Vorgänger-Commits (\"grafts\") verbergen"
-#: builtin/pack-objects.c:2850
+#: builtin/pack-objects.c:2932
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:2852
+#: builtin/pack-objects.c:2934
msgid "write a bitmap index together with the pack index"
msgstr "Bitmap-Index zusammen mit Pack-Index schreiben"
-#: builtin/pack-objects.c:2979
+#: builtin/pack-objects.c:3061
msgid "Counting objects"
msgstr "Zähle Objekte"
@@ -11088,7 +11336,7 @@
msgid "incorporate changes by rebasing rather than merging"
msgstr "Integration von Änderungen durch Rebase statt Merge"
-#: builtin/pull.c:148 builtin/revert.c:101
+#: builtin/pull.c:148 builtin/rebase--helper.c:18 builtin/revert.c:120
msgid "allow fast-forward"
msgstr "Vorspulen erlauben"
@@ -11167,7 +11415,7 @@
msgid "<remote>"
msgstr "<Remote-Repository>"
-#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:455
+#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:456
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<Branch>"
@@ -11475,11 +11723,11 @@
msgid "repository"
msgstr "Repository"
-#: builtin/push.c:519 builtin/send-pack.c:161
+#: builtin/push.c:519 builtin/send-pack.c:162
msgid "push all refs"
msgstr "alle Referenzen versenden"
-#: builtin/push.c:520 builtin/send-pack.c:163
+#: builtin/push.c:520 builtin/send-pack.c:164
msgid "mirror all refs"
msgstr "alle Referenzen spiegeln"
@@ -11491,15 +11739,15 @@
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:164
+#: builtin/push.c:526 builtin/send-pack.c:165
msgid "force updates"
msgstr "Aktualisierung erzwingen"
-#: builtin/push.c:528 builtin/send-pack.c:175
+#: builtin/push.c:528 builtin/send-pack.c:179
msgid "refname>:<expect"
msgstr "Referenzname>:<Erwartungswert"
-#: builtin/push.c:529 builtin/send-pack.c:176
+#: builtin/push.c:529 builtin/send-pack.c:180
msgid "require old value of ref to be at this value"
msgstr "Referenz muss sich auf dem angegebenen Wert befinden"
@@ -11507,12 +11755,12 @@
msgid "control recursive pushing of submodules"
msgstr "rekursiven \"push\" von Submodulen steuern"
-#: builtin/push.c:534 builtin/send-pack.c:169
+#: builtin/push.c:534 builtin/send-pack.c:173
msgid "use thin pack"
msgstr "kleinere Pakete verwenden"
-#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:158
-#: builtin/send-pack.c:159
+#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:159
+#: builtin/send-pack.c:160
msgid "receive pack program"
msgstr "'receive pack' Programm"
@@ -11532,19 +11780,19 @@
msgid "push missing but relevant tags"
msgstr "fehlende, aber relevante Tags versenden"
-#: builtin/push.c:546 builtin/send-pack.c:166
+#: builtin/push.c:546 builtin/send-pack.c:167
msgid "GPG sign the push"
msgstr "signiert \"push\" mit GPG"
-#: builtin/push.c:548 builtin/send-pack.c:170
+#: builtin/push.c:548 builtin/send-pack.c:174
msgid "request atomic transaction on remote side"
msgstr "Referenzen atomar versenden"
-#: builtin/push.c:549
+#: builtin/push.c:549 builtin/send-pack.c:170
msgid "server-specific"
msgstr "serverspezifisch"
-#: builtin/push.c:549
+#: builtin/push.c:549 builtin/send-pack.c:171
msgid "option to transmit"
msgstr "Option übertragen"
@@ -11560,7 +11808,7 @@
msgid "push options must not have new line characters"
msgstr "Push-Optionen dürfen keine Zeilenvorschubzeichen haben"
-#: builtin/read-tree.c:37
+#: builtin/read-tree.c:40
msgid ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
@@ -11571,75 +11819,87 @@
"index-output=<Datei>] (--empty | <Commit-Referenz1> [<Commit-Referenz2> "
"[<Commit-Referenz3>]])"
-#: builtin/read-tree.c:110
+#: builtin/read-tree.c:130
msgid "write resulting index to <file>"
msgstr "resultierenden Index nach <Datei> schreiben"
-#: builtin/read-tree.c:113
+#: builtin/read-tree.c:133
msgid "only empty the index"
msgstr "nur den Index leeren"
-#: builtin/read-tree.c:115
+#: builtin/read-tree.c:135
msgid "Merging"
msgstr "Merge"
-#: builtin/read-tree.c:117
+#: builtin/read-tree.c:137
msgid "perform a merge in addition to a read"
msgstr "einen Merge, zusätzlich zum Lesen, ausführen"
-#: builtin/read-tree.c:119
+#: builtin/read-tree.c:139
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:121
+#: builtin/read-tree.c:141
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:123
+#: builtin/read-tree.c:143
msgid "same as -m, but discard unmerged entries"
msgstr "genau wie -m, aber nicht zusammengeführte Einträge verwerfen"
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:144
msgid "<subdirectory>/"
msgstr "<Unterverzeichnis>/"
-#: builtin/read-tree.c:125
+#: builtin/read-tree.c:145
msgid "read the tree into the index under <subdirectory>/"
msgstr "das Verzeichnis in den Index unter <Unterverzeichnis>/ lesen"
-#: builtin/read-tree.c:128
+#: builtin/read-tree.c:148
msgid "update working tree with merge result"
msgstr "Arbeitsverzeichnis mit dem Ergebnis des Merges aktualisieren"
-#: builtin/read-tree.c:130
+#: builtin/read-tree.c:150
msgid "gitignore"
msgstr "gitignore"
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:151
msgid "allow explicitly ignored files to be overwritten"
msgstr "explizit ignorierte Dateien zu überschreiben erlauben"
-#: builtin/read-tree.c:134
+#: builtin/read-tree.c:154
msgid "don't check the working tree after merging"
msgstr "das Arbeitsverzeichnis nach dem Merge nicht prüfen"
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:155
msgid "don't update the index or the work tree"
msgstr "weder den Index, noch das Arbeitsverzeichnis aktualisieren"
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:157
msgid "skip applying sparse checkout filter"
msgstr "Anwendung des Filters für partielles Auschecken überspringen"
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:159
msgid "debug unpack-trees"
msgstr "unpack-trees protokollieren"
-#: builtin/receive-pack.c:26
+#: builtin/rebase--helper.c:7
+msgid "git rebase--helper [<options>]"
+msgstr "git rebase--helper [<Optionen>]"
+
+#: builtin/rebase--helper.c:19
+msgid "continue rebase"
+msgstr "Rebase fortsetzen"
+
+#: builtin/rebase--helper.c:21
+msgid "abort rebase"
+msgstr "Rebase abbrechen"
+
+#: builtin/receive-pack.c:27
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <Git-Verzeichnis>"
-#: builtin/receive-pack.c:793
+#: builtin/receive-pack.c:795
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"
@@ -11671,7 +11931,7 @@
"setzen Sie die Konfigurationsvariable 'receive.denyCurrentBranch' auf\n"
"'refuse'."
-#: builtin/receive-pack.c:813
+#: builtin/receive-pack.c:815
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"
@@ -11692,11 +11952,11 @@
"\n"
"Um diese Meldung zu unterdrücken, setzen Sie die Variable auf 'refuse'."
-#: builtin/receive-pack.c:1883
+#: builtin/receive-pack.c:1888
msgid "quiet"
msgstr "weniger Ausgaben"
-#: builtin/receive-pack.c:1897
+#: builtin/receive-pack.c:1902
msgid "You must specify a directory."
msgstr "Sie müssen ein Repository angeben."
@@ -11880,7 +12140,7 @@
msgid "(delete)"
msgstr "(lösche)"
-#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:854
+#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:856
#, c-format
msgid "No such remote: %s"
msgstr "Kein solches Remote-Repository: %s"
@@ -11911,7 +12171,7 @@
msgid "creating '%s' failed"
msgstr "Konnte '%s' nicht erstellen"
-#: builtin/remote.c:792
+#: builtin/remote.c:794
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -11927,137 +12187,137 @@
"entfernt;\n"
"um diese zu entfernen, benutzen Sie:"
-#: builtin/remote.c:806
+#: builtin/remote.c:808
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Konnte Sektion '%s' nicht aus Konfiguration entfernen"
-#: builtin/remote.c:907
+#: builtin/remote.c:909
#, 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:910
+#: builtin/remote.c:912
msgid " tracked"
msgstr " gefolgt"
-#: builtin/remote.c:912
+#: builtin/remote.c:914
msgid " stale (use 'git remote prune' to remove)"
msgstr " veraltet (benutzen Sie 'git remote prune' zum Löschen)"
-#: builtin/remote.c:914
+#: builtin/remote.c:916
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:955
+#: builtin/remote.c:957
#, 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:963
+#: builtin/remote.c:965
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "interaktiver Rebase auf Remote-Branch %s"
-#: builtin/remote.c:964
+#: builtin/remote.c:966
#, c-format
msgid "rebases onto remote %s"
msgstr "Rebase auf Remote-Branch %s"
-#: builtin/remote.c:967
+#: builtin/remote.c:969
#, c-format
msgid " merges with remote %s"
msgstr " führt mit Remote-Branch %s zusammen"
-#: builtin/remote.c:970
+#: builtin/remote.c:972
#, c-format
msgid "merges with remote %s"
msgstr "führt mit Remote-Branch %s zusammen"
-#: builtin/remote.c:973
+#: builtin/remote.c:975
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s und mit Remote-Branch %s\n"
-#: builtin/remote.c:1016
+#: builtin/remote.c:1018
msgid "create"
msgstr "erstellt"
-#: builtin/remote.c:1019
+#: builtin/remote.c:1021
msgid "delete"
msgstr "gelöscht"
-#: builtin/remote.c:1023
+#: builtin/remote.c:1025
msgid "up to date"
msgstr "aktuell"
-#: builtin/remote.c:1026
+#: builtin/remote.c:1028
msgid "fast-forwardable"
msgstr "vorspulbar"
-#: builtin/remote.c:1029
+#: builtin/remote.c:1031
msgid "local out of date"
msgstr "lokal nicht aktuell"
-#: builtin/remote.c:1036
+#: builtin/remote.c:1038
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s erzwingt Versandt nach %-*s (%s)"
-#: builtin/remote.c:1039
+#: builtin/remote.c:1041
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s versendet nach %-*s (%s)"
-#: builtin/remote.c:1043
+#: builtin/remote.c:1045
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s erzwingt Versand nach %s"
-#: builtin/remote.c:1046
+#: builtin/remote.c:1048
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s versendet nach %s"
-#: builtin/remote.c:1114
+#: builtin/remote.c:1116
msgid "do not query remotes"
msgstr "keine Abfrage von Remote-Repositories"
-#: builtin/remote.c:1141
+#: builtin/remote.c:1143
#, c-format
msgid "* remote %s"
msgstr "* Remote-Repository %s"
-#: builtin/remote.c:1142
+#: builtin/remote.c:1144
#, c-format
msgid " Fetch URL: %s"
msgstr " URL zum Abholen: %s"
-#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1295
+#: builtin/remote.c:1145 builtin/remote.c:1158 builtin/remote.c:1297
msgid "(no URL)"
msgstr "(keine URL)"
#. TRANSLATORS: the colon ':' should align with
#. the one in " Fetch URL: %s" translation
-#: builtin/remote.c:1154 builtin/remote.c:1156
+#: builtin/remote.c:1156 builtin/remote.c:1158
#, c-format
msgid " Push URL: %s"
msgstr " URL zum Versenden: %s"
-#: builtin/remote.c:1158 builtin/remote.c:1160 builtin/remote.c:1162
+#: builtin/remote.c:1160 builtin/remote.c:1162 builtin/remote.c:1164
#, c-format
msgid " HEAD branch: %s"
msgstr " Hauptbranch: %s"
-#: builtin/remote.c:1158
+#: builtin/remote.c:1160
msgid "(not queried)"
msgstr "(nicht abgefragt)"
-#: builtin/remote.c:1160
+#: builtin/remote.c:1162
msgid "(unknown)"
msgstr "(unbekannt)"
-#: builtin/remote.c:1164
+#: builtin/remote.c:1166
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
@@ -12065,163 +12325,163 @@
" Hauptbranch (externer HEAD ist mehrdeutig, könnte einer der folgenden "
"sein):\n"
-#: builtin/remote.c:1176
+#: builtin/remote.c:1178
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Remote-Branch:%s"
msgstr[1] " Remote-Branches:%s"
-#: builtin/remote.c:1179 builtin/remote.c:1205
+#: builtin/remote.c:1181 builtin/remote.c:1207
msgid " (status not queried)"
msgstr " (Zustand nicht abgefragt)"
-#: builtin/remote.c:1188
+#: builtin/remote.c:1190
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:1196
+#: builtin/remote.c:1198
msgid " Local refs will be mirrored by 'git push'"
msgstr " Lokale Referenzen werden von 'git push' gespiegelt"
-#: builtin/remote.c:1202
+#: builtin/remote.c:1204
#, 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:1223
+#: builtin/remote.c:1225
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "setzt refs/remotes/<Name>/HEAD gemäß dem Remote-Repository"
-#: builtin/remote.c:1225
+#: builtin/remote.c:1227
msgid "delete refs/remotes/<name>/HEAD"
msgstr "entfernt refs/remotes/<Name>/HEAD"
-#: builtin/remote.c:1240
+#: builtin/remote.c:1242
msgid "Cannot determine remote HEAD"
msgstr "Kann HEAD des Remote-Repositories nicht bestimmen"
-#: builtin/remote.c:1242
+#: builtin/remote.c:1244
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:1252
+#: builtin/remote.c:1254
#, c-format
msgid "Could not delete %s"
msgstr "Konnte %s nicht entfernen"
-#: builtin/remote.c:1260
+#: builtin/remote.c:1262
#, c-format
msgid "Not a valid ref: %s"
msgstr "keine gültige Referenz: %s"
-#: builtin/remote.c:1262
+#: builtin/remote.c:1264
#, c-format
msgid "Could not setup %s"
msgstr "Konnte %s nicht einrichten"
-#: builtin/remote.c:1280
+#: builtin/remote.c:1282
#, c-format
msgid " %s will become dangling!"
msgstr " %s wird unreferenziert!"
-#: builtin/remote.c:1281
+#: builtin/remote.c:1283
#, c-format
msgid " %s has become dangling!"
msgstr " %s wurde unreferenziert!"
-#: builtin/remote.c:1291
+#: builtin/remote.c:1293
#, c-format
msgid "Pruning %s"
msgstr "entferne veraltete Branches von %s"
-#: builtin/remote.c:1292
+#: builtin/remote.c:1294
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1308
+#: builtin/remote.c:1310
#, c-format
msgid " * [would prune] %s"
msgstr " * [würde veralteten Branch entfernen] %s"
-#: builtin/remote.c:1311
+#: builtin/remote.c:1313
#, c-format
msgid " * [pruned] %s"
msgstr "* [veralteten Branch entfernt] %s"
-#: builtin/remote.c:1356
+#: builtin/remote.c:1358
msgid "prune remotes after fetching"
msgstr "entferne veraltete Branches im Remote-Repository nach \"fetch\""
-#: builtin/remote.c:1419 builtin/remote.c:1473 builtin/remote.c:1541
+#: builtin/remote.c:1421 builtin/remote.c:1475 builtin/remote.c:1543
#, c-format
msgid "No such remote '%s'"
msgstr "Kein solches Remote-Repository '%s'"
-#: builtin/remote.c:1435
+#: builtin/remote.c:1437
msgid "add branch"
msgstr "Branch hinzufügen"
-#: builtin/remote.c:1442
+#: builtin/remote.c:1444
msgid "no remote specified"
msgstr "kein Remote-Repository angegeben"
-#: builtin/remote.c:1459
+#: builtin/remote.c:1461
msgid "query push URLs rather than fetch URLs"
msgstr "nur URLs für Push ausgeben"
-#: builtin/remote.c:1461
+#: builtin/remote.c:1463
msgid "return all URLs"
msgstr "alle URLs ausgeben"
-#: builtin/remote.c:1489
+#: builtin/remote.c:1491
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "Keine URLs für Remote-Repository '%s' konfiguriert."
-#: builtin/remote.c:1515
+#: builtin/remote.c:1517
msgid "manipulate push URLs"
msgstr "URLs für \"push\" manipulieren"
-#: builtin/remote.c:1517
+#: builtin/remote.c:1519
msgid "add URL"
msgstr "URL hinzufügen"
-#: builtin/remote.c:1519
+#: builtin/remote.c:1521
msgid "delete URLs"
msgstr "URLs löschen"
-#: builtin/remote.c:1526
+#: builtin/remote.c:1528
msgid "--add --delete doesn't make sense"
msgstr ""
"Die Optionen --add und --delete können nicht gemeinsam verwendet werden."
-#: builtin/remote.c:1567
+#: builtin/remote.c:1569
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "ungültiges altes URL Format: %s"
-#: builtin/remote.c:1575
+#: builtin/remote.c:1577
#, c-format
msgid "No such URL found: %s"
msgstr "Keine solche URL gefunden: %s"
-#: builtin/remote.c:1577
+#: builtin/remote.c:1579
msgid "Will not delete all non-push URLs"
msgstr "Werde keine URLs entfernen, die nicht für \"push\" bestimmt sind"
-#: builtin/remote.c:1591
+#: builtin/remote.c:1593
msgid "be verbose; must be placed before a subcommand"
msgstr "erweiterte Ausgaben; muss vor einem Unterbefehl angegeben werden"
-#: builtin/remote.c:1622
+#: builtin/remote.c:1624
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Unbekannter Unterbefehl: %s"
@@ -12343,22 +12603,22 @@
msgid "git replace [--format=<format>] [-l [<pattern>]]"
msgstr "git replace [--format=<Format>] [-l [<Muster>]]"
-#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
+#: builtin/replace.c:330 builtin/replace.c:368 builtin/replace.c:396
#, c-format
msgid "Not a valid object name: '%s'"
msgstr "Ungültiger Objekt-Name: '%s'"
-#: builtin/replace.c:355
+#: builtin/replace.c:360
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "ungültiger Merge-Tag in Commit '%s'"
-#: builtin/replace.c:357
+#: builtin/replace.c:362
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr "fehlerhafter Merge-Tag in Commit '%s'"
-#: builtin/replace.c:368
+#: builtin/replace.c:373
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -12367,45 +12627,45 @@
"Der ursprüngliche Commit '%s' enthält Merge-Tag '%s', der verworfen\n"
"wird; benutzen Sie --edit anstatt --graft"
-#: builtin/replace.c:401
+#: builtin/replace.c:406
#, c-format
msgid "the original commit '%s' has a gpg signature."
msgstr "Der ursprüngliche Commit '%s' hat eine GPG-Signatur."
-#: builtin/replace.c:402
+#: builtin/replace.c:407
msgid "the signature will be removed in the replacement commit!"
msgstr "Die Signatur wird in dem Ersetzungs-Commit entfernt!"
-#: builtin/replace.c:408
+#: builtin/replace.c:413
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr "Konnte Ersetzungs-Commit für '%s' nicht schreiben"
-#: builtin/replace.c:432
+#: builtin/replace.c:437
msgid "list replace refs"
msgstr "ersetzende Referenzen auflisten"
-#: builtin/replace.c:433
+#: builtin/replace.c:438
msgid "delete replace refs"
msgstr "ersetzende Referenzen löschen"
-#: builtin/replace.c:434
+#: builtin/replace.c:439
msgid "edit existing object"
msgstr "existierendes Objekt bearbeiten"
-#: builtin/replace.c:435
+#: builtin/replace.c:440
msgid "change a commit's parents"
msgstr "Eltern-Commits eines Commits ändern"
-#: builtin/replace.c:436
+#: builtin/replace.c:441
msgid "replace the ref if it exists"
msgstr "die Referenz ersetzen, wenn sie existiert"
-#: builtin/replace.c:437
+#: builtin/replace.c:442
msgid "do not pretty-print contents for --edit"
msgstr "keine ansprechende Anzeige des Objektinhaltes für --edit"
-#: builtin/replace.c:438
+#: builtin/replace.c:443
msgid "use this format"
msgstr "das angegebene Format benutzen"
@@ -12549,24 +12809,24 @@
msgid "rev-list does not support display of notes"
msgstr "rev-list unterstützt keine Anzeige von Notizen"
-#: builtin/rev-parse.c:391
+#: builtin/rev-parse.c:393
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<Optionen>] -- [<Argumente>...]"
-#: builtin/rev-parse.c:396
+#: builtin/rev-parse.c:398
msgid "keep the `--` passed as an arg"
msgstr "`--` als Argument lassen"
-#: builtin/rev-parse.c:398
+#: builtin/rev-parse.c:400
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:401
+#: builtin/rev-parse.c:403
msgid "output in stuck long form"
msgstr ""
"Ausgabe in Langform mit Argumenten an den Optionen (getrennt durch '=')"
-#: builtin/rev-parse.c:532
+#: builtin/rev-parse.c:534
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
@@ -12597,68 +12857,72 @@
msgid "git cherry-pick <subcommand>"
msgstr "git cherry-pick <Unterbefehl>"
-#: builtin/revert.c:71
+#: builtin/revert.c:89
#, c-format
msgid "%s: %s cannot be used with %s"
msgstr "%s: %s kann nicht mit %s verwendet werden"
-#: builtin/revert.c:80
+#: builtin/revert.c:98
msgid "end revert or cherry-pick sequence"
msgstr "\"revert\" oder \"cherry-pick\" Ablauf beenden"
-#: builtin/revert.c:81
+#: builtin/revert.c:99
msgid "resume revert or cherry-pick sequence"
msgstr "\"revert\" oder \"cherry-pick\" Ablauf fortsetzen"
-#: builtin/revert.c:82
+#: builtin/revert.c:100
msgid "cancel revert or cherry-pick sequence"
msgstr "\"revert\" oder \"cherry-pick\" Ablauf abbrechen"
-#: builtin/revert.c:83
+#: builtin/revert.c:101
msgid "don't automatically commit"
msgstr "nicht automatisch committen"
-#: builtin/revert.c:84
+#: builtin/revert.c:102
msgid "edit the commit message"
msgstr "Commit-Beschreibung bearbeiten"
-#: builtin/revert.c:87
-msgid "parent number"
+#: builtin/revert.c:105
+msgid "parent-number"
msgstr "Nummer des Elternteils"
-#: builtin/revert.c:89
+#: builtin/revert.c:106
+msgid "select mainline parent"
+msgstr "Elternteil der Hauptlinie auswählen"
+
+#: builtin/revert.c:108
msgid "merge strategy"
msgstr "Merge-Strategie"
-#: builtin/revert.c:90
+#: builtin/revert.c:109
msgid "option"
msgstr "Option"
-#: builtin/revert.c:91
+#: builtin/revert.c:110
msgid "option for merge strategy"
msgstr "Option für Merge-Strategie"
-#: builtin/revert.c:100
+#: builtin/revert.c:119
msgid "append commit name"
msgstr "Commit-Namen anhängen"
-#: builtin/revert.c:102
+#: builtin/revert.c:121
msgid "preserve initially empty commits"
msgstr "ursprüngliche, leere Commits erhalten"
-#: builtin/revert.c:103
+#: builtin/revert.c:122
msgid "allow commits with empty messages"
msgstr "Commits mit leerer Beschreibung erlauben"
-#: builtin/revert.c:104
+#: builtin/revert.c:123
msgid "keep redundant, empty commits"
msgstr "redundante, leere Commits behalten"
-#: builtin/revert.c:192
+#: builtin/revert.c:211
msgid "revert failed"
msgstr "\"revert\" fehlgeschlagen"
-#: builtin/revert.c:205
+#: builtin/revert.c:224
msgid "cherry-pick failed"
msgstr "\"cherry-pick\" fehlgeschlagen"
@@ -12758,19 +13022,19 @@
" --all und die explizite Angabe einer <Referenz> schließen sich gegenseitig "
"aus."
-#: builtin/send-pack.c:160
+#: builtin/send-pack.c:161
msgid "remote name"
msgstr "Name des Remote-Repositories"
-#: builtin/send-pack.c:171
+#: builtin/send-pack.c:175
msgid "use stateless RPC protocol"
msgstr "zustandsloses RPC-Protokoll verwenden"
-#: builtin/send-pack.c:172
+#: builtin/send-pack.c:176
msgid "read refs from stdin"
msgstr "Referenzen von der Standard-Eingabe lesen"
-#: builtin/send-pack.c:173
+#: builtin/send-pack.c:177
msgid "print status from remote helper"
msgstr "Status des Remote-Helpers ausgeben"
@@ -12778,27 +13042,27 @@
msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
msgstr "git shortlog [<Optionen>] [<Commitbereich>] [[--] [<Pfad>...]]"
-#: builtin/shortlog.c:249
+#: builtin/shortlog.c:248
msgid "Group by committer rather than author"
msgstr "über Commit-Ersteller anstatt Autor gruppieren"
-#: builtin/shortlog.c:251
+#: builtin/shortlog.c:250
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:253
+#: builtin/shortlog.c:252
msgid "Suppress commit descriptions, only provides commit count"
msgstr "Commit-Beschreibungen unterdrücken, nur Anzahl der Commits liefern"
-#: builtin/shortlog.c:255
+#: builtin/shortlog.c:254
msgid "Show the email address of each author"
msgstr "die E-Mail-Adresse von jedem Autor anzeigen"
-#: builtin/shortlog.c:256
+#: builtin/shortlog.c:255
msgid "w[,i1[,i2]]"
msgstr "w[,i1[,i2]]"
-#: builtin/shortlog.c:257
+#: builtin/shortlog.c:256
msgid "Linewrap output"
msgstr "Ausgabe mit Zeilenumbrüchen"
@@ -12818,123 +13082,123 @@
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr "git show-branch (-g | --reflog)[=<n>[,<Basis>]] [--list] [<Referenz>]"
-#: builtin/show-branch.c:375
+#: builtin/show-branch.c:374
#, 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:541
+#: builtin/show-branch.c:536
#, c-format
msgid "no matching refs with %s"
msgstr "keine übereinstimmenden Referenzen mit %s"
-#: builtin/show-branch.c:639
+#: builtin/show-branch.c:632
msgid "show remote-tracking and local branches"
msgstr "Remote-Tracking und lokale Branches anzeigen"
-#: builtin/show-branch.c:641
+#: builtin/show-branch.c:634
msgid "show remote-tracking branches"
msgstr "Remote-Tracking-Branches anzeigen"
-#: builtin/show-branch.c:643
+#: builtin/show-branch.c:636
msgid "color '*!+-' corresponding to the branch"
msgstr "'*!+-' entsprechend des Branches einfärben"
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:638
msgid "show <n> more commits after the common ancestor"
msgstr "<n> weitere Commits nach dem gemeinsamen Vorgänger-Commit anzeigen"
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:640
msgid "synonym to more=-1"
msgstr "Synonym für more=-1"
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:641
msgid "suppress naming strings"
msgstr "Namen unterdrücken"
-#: builtin/show-branch.c:650
+#: builtin/show-branch.c:643
msgid "include the current branch"
msgstr "den aktuellen Branch einbeziehen"
-#: builtin/show-branch.c:652
+#: builtin/show-branch.c:645
msgid "name commits with their object names"
msgstr "Commits nach ihren Objektnamen benennen"
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:647
msgid "show possible merge bases"
msgstr "mögliche Merge-Basen anzeigen"
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:649
msgid "show refs unreachable from any other ref"
msgstr ""
"Referenzen, die unerreichbar von allen anderen Referenzen sind, anzeigen"
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:651
msgid "show commits in topological order"
msgstr "Commits in topologischer Ordnung anzeigen"
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:654
msgid "show only commits not on the first branch"
msgstr "nur Commits anzeigen, die sich nicht im ersten Branch befinden"
-#: builtin/show-branch.c:663
+#: builtin/show-branch.c:656
msgid "show merges reachable from only one tip"
msgstr "Merges anzeigen, die nur von einem Branch aus erreichbar sind"
-#: builtin/show-branch.c:665
+#: builtin/show-branch.c:658
msgid "topologically sort, maintaining date order where possible"
msgstr "topologische Sortierung, Beibehaltung Datumsordnung wo möglich"
-#: builtin/show-branch.c:668
+#: builtin/show-branch.c:661
msgid "<n>[,<base>]"
msgstr "<n>[,<Basis>]"
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:662
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:703
+#: builtin/show-branch.c:696
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:727
+#: builtin/show-branch.c:720
msgid "no branches given, and HEAD is not valid"
msgstr "keine Branches angegeben, und HEAD ist ungültig"
-#: builtin/show-branch.c:730
+#: builtin/show-branch.c:723
msgid "--reflog option needs one branch name"
msgstr "Die Option --reflog benötigt einen Branchnamen."
-#: builtin/show-branch.c:733
+#: builtin/show-branch.c:726
#, 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:737
+#: builtin/show-branch.c:730
#, c-format
msgid "no such ref %s"
msgstr "Referenz nicht gefunden: %s"
-#: builtin/show-branch.c:829
+#: builtin/show-branch.c:814
#, 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:833
+#: builtin/show-branch.c:818
#, c-format
msgid "'%s' is not a valid ref."
msgstr "'%s' ist keine gültige Referenz."
-#: builtin/show-branch.c:836
+#: builtin/show-branch.c:821
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "kann Commit %s (%s) nicht finden"
@@ -13005,12 +13269,12 @@
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:1062
+#: builtin/submodule--helper.c:24 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:1071
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1084
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Vollständiger Referenzname erwartet, %s erhalten"
@@ -13020,95 +13284,105 @@
msgid "cannot strip one component off url '%s'"
msgstr "Kann eine Komponente von URL '%s' nicht extrahieren"
-#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:592
+#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630
msgid "alternative anchor for relative paths"
msgstr "Alternativer Anker für relative Pfade"
-#: builtin/submodule--helper.c:287
+#: builtin/submodule--helper.c:310
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<Pfad>] [<Pfad>...]"
-#: builtin/submodule--helper.c:333 builtin/submodule--helper.c:347
+#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "Keine URL für Submodul-Pfad '%s' in .gitmodules gefunden"
-#: builtin/submodule--helper.c:373
+#: builtin/submodule--helper.c:395
+#, c-format
+msgid ""
+"could not lookup configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr ""
+"Konnte Konfiguration '%s' nicht nachschlagen. Nehme an, dass dieses "
+"Repository\n"
+"sein eigenes verbindliches Upstream-Repository ist."
+
+#: builtin/submodule--helper.c:406
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr ""
"Fehler beim Eintragen der URL für Submodul-Pfad '%s' in die Konfiguration."
-#: builtin/submodule--helper.c:377
+#: builtin/submodule--helper.c:410
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Submodul '%s' (%s) für Pfad '%s' in die Konfiguration eingetragen.\n"
-#: builtin/submodule--helper.c:387
+#: builtin/submodule--helper.c:420
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "Warnung: 'update'-Modus für Submodul '%s' vorgeschlagen\n"
-#: builtin/submodule--helper.c:394
+#: builtin/submodule--helper.c:427
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
"Fehler bei Änderung des Aktualisierungsmodus für Submodul-Pfad '%s' in der\n"
"Konfiguration."
-#: builtin/submodule--helper.c:410
+#: builtin/submodule--helper.c:443
msgid "Suppress output for initializing a submodule"
msgstr "Ausgaben bei Initialisierung eines Submoduls unterdrücken"
-#: builtin/submodule--helper.c:415
+#: builtin/submodule--helper.c:448
msgid "git submodule--helper init [<path>]"
msgstr "git submodule--helper init [<Pfad>]"
-#: builtin/submodule--helper.c:436
+#: builtin/submodule--helper.c:476
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <Pfad>"
-#: builtin/submodule--helper.c:442
+#: builtin/submodule--helper.c:482
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "Keine Submodul-Zuordnung in .gitmodules für Pfad '%s' gefunden"
-#: builtin/submodule--helper.c:525 builtin/submodule--helper.c:528
+#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "Submodul '%s' kann Alternative nicht hinzufügen: %s"
-#: builtin/submodule--helper.c:564
+#: builtin/submodule--helper.c:604
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "Wert '%s' für submodule.alternateErrorStrategy wird nicht erkannt"
-#: builtin/submodule--helper.c:571
+#: builtin/submodule--helper.c:611
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "Wert '%s' für submodule.alternateLocation wird nicht erkannt."
-#: builtin/submodule--helper.c:595
+#: builtin/submodule--helper.c:633
msgid "where the new submodule will be cloned to"
msgstr "Pfad für neues Submodul"
-#: builtin/submodule--helper.c:598
+#: builtin/submodule--helper.c:636
msgid "name of the new submodule"
msgstr "Name des neuen Submoduls"
-#: builtin/submodule--helper.c:601
+#: builtin/submodule--helper.c:639
msgid "url where to clone the submodule from"
msgstr "URL von der das Submodul geklont wird"
-#: builtin/submodule--helper.c:607
+#: builtin/submodule--helper.c:645
msgid "depth for shallow clones"
msgstr "Tiefe des Klons mit unvollständiger Historie (shallow)"
-#: builtin/submodule--helper.c:610 builtin/submodule--helper.c:980
+#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993
msgid "force cloning progress"
msgstr "Fortschrittsanzeige beim Klonen erzwingen"
-#: builtin/submodule--helper.c:615
+#: builtin/submodule--helper.c:653
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -13117,98 +13391,88 @@
"<Repository>] [--name <Name>] [--url <URL>] [--name <Name>] [--depth "
"<Tiefe>] --url <URL> --path <Pfad>"
-#: builtin/submodule--helper.c:646
+#: builtin/submodule--helper.c:684
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "Klonen von '%s' in Submodul-Pfad '%s' fehlgeschlagen"
-#: builtin/submodule--helper.c:662
-#, c-format
-msgid "cannot open file '%s'"
-msgstr "Kann Datei '%s' nicht öffnen"
-
-#: builtin/submodule--helper.c:667
-#, c-format
-msgid "could not close file %s"
-msgstr "Konnte Datei '%s' nicht schließen."
-
-#: builtin/submodule--helper.c:674
+#: builtin/submodule--helper.c:699
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "Konnte Submodul-Verzeichnis '%s' nicht finden."
-#: builtin/submodule--helper.c:742
+#: builtin/submodule--helper.c:764
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Submodul-Pfad '%s' nicht initialisiert"
-#: builtin/submodule--helper.c:746
+#: builtin/submodule--helper.c:768
msgid "Maybe you want to use 'update --init'?"
msgstr "Meinten Sie vielleicht 'update --init'?"
-#: builtin/submodule--helper.c:772
+#: builtin/submodule--helper.c:793
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Überspringe nicht zusammengeführtes Submodul %s"
-#: builtin/submodule--helper.c:793
+#: builtin/submodule--helper.c:814
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Überspringe Submodul '%s'"
-#: builtin/submodule--helper.c:929
+#: builtin/submodule--helper.c:942
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Fehler beim Klonen von '%s'. Weiterer Versuch geplant"
-#: builtin/submodule--helper.c:940
+#: builtin/submodule--helper.c:953
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Zweiter Versuch '%s' zu klonen fehlgeschlagen, breche ab."
-#: builtin/submodule--helper.c:961 builtin/submodule--helper.c:1105
+#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162
msgid "path into the working tree"
msgstr "Pfad zum Arbeitsverzeichnis"
-#: builtin/submodule--helper.c:964
+#: builtin/submodule--helper.c:977
msgid "path into the working tree, across nested submodule boundaries"
msgstr ""
"Pfad zum Arbeitsverzeichnis, über verschachtelte Submodul-Grenzen hinweg"
-#: builtin/submodule--helper.c:968
+#: builtin/submodule--helper.c:981
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout oder none"
-#: builtin/submodule--helper.c:972
+#: builtin/submodule--helper.c:985
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr ""
"Erstellung eines Klons mit unvollständiger Historie (shallow), abgeschnitten "
"bei\n"
"der angegebenen Anzahl von Commits."
-#: builtin/submodule--helper.c:975
+#: builtin/submodule--helper.c:988
msgid "parallel jobs"
msgstr "Parallele Ausführungen"
-#: builtin/submodule--helper.c:977
+#: builtin/submodule--helper.c:990
msgid "whether the initial clone should follow the shallow recommendation"
msgstr ""
"ob das initiale Klonen den Empfehlungen für eine unvollständige\n"
"Historie (shallow) folgen soll"
-#: builtin/submodule--helper.c:978
+#: builtin/submodule--helper.c:991
msgid "don't print cloning progress"
msgstr "keine Fortschrittsanzeige beim Klonen"
-#: builtin/submodule--helper.c:985
+#: builtin/submodule--helper.c:998
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<Pfad>] [<Pfad>...]"
-#: builtin/submodule--helper.c:995
+#: builtin/submodule--helper.c:1008
msgid "bad value for update parameter"
msgstr "Fehlerhafter Wert für --update Parameter"
-#: builtin/submodule--helper.c:1066
+#: builtin/submodule--helper.c:1079
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -13217,24 +13481,24 @@
"Branch von Submodul (%s) ist konfiguriert, den Branch des Hauptprojektes\n"
"zu erben, aber das Hauptprojekt befindet sich auf keinem Branch."
-#: builtin/submodule--helper.c:1106
+#: builtin/submodule--helper.c:1163
msgid "recurse into submodules"
msgstr "Rekursion in Submodule durchführen"
-#: builtin/submodule--helper.c:1112
+#: builtin/submodule--helper.c:1169
msgid "git submodule--helper embed-git-dir [<path>...]"
msgstr "git submodule--helper embed-git-dir [<Pfad>...]"
-#: builtin/submodule--helper.c:1157
+#: 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:1164
+#: builtin/submodule--helper.c:1233
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s unterstützt kein --super-prefix"
-#: builtin/submodule--helper.c:1170
+#: builtin/submodule--helper.c:1239
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' ist kein gültiger Unterbefehl von submodule--helper"
@@ -13282,32 +13546,29 @@
#: builtin/tag.c:25
msgid ""
-"git tag -l [-n[<num>]] [--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[<Nummer>]] [--contains <Commit>] [--points-at <Objekt>]\n"
+"git tag -l [-n[<Nummer>]] [--contains <Commit>] [--no-contains <Commit>] [--"
+"points-at <Objekt>]\n"
"\t\t[--format=<Muster>] [--[no-]merged [<Commit>]] [<Muster>...]"
#: builtin/tag.c:27
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<Format>] <Tagname>..."
-#: builtin/tag.c:82
-#, c-format
-msgid "tag name too long: %.*s..."
-msgstr "Tagname zu lang: %.*s..."
-
-#: builtin/tag.c:87
+#: builtin/tag.c:83
#, c-format
msgid "tag '%s' not found."
msgstr "Tag '%s' nicht gefunden."
-#: builtin/tag.c:102
+#: builtin/tag.c:99
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Tag '%s' gelöscht (war %s)\n"
-#: builtin/tag.c:131
+#: builtin/tag.c:128
#, c-format
msgid ""
"\n"
@@ -13320,7 +13581,7 @@
" %s\n"
"ein. Zeilen, die mit '%c' beginnen, werden ignoriert.\n"
-#: builtin/tag.c:135
+#: builtin/tag.c:132
#, c-format
msgid ""
"\n"
@@ -13335,138 +13596,142 @@
"ein. Zeilen, die mit '%c' beginnen, werden behalten; Sie dürfen diese\n"
"selbst entfernen wenn Sie möchten.\n"
-#: builtin/tag.c:213
+#: builtin/tag.c:210
msgid "unable to sign the tag"
msgstr "konnte Tag nicht signieren"
-#: builtin/tag.c:215
+#: builtin/tag.c:212
msgid "unable to write tag file"
msgstr "konnte Tag-Datei nicht schreiben"
-#: builtin/tag.c:240
+#: builtin/tag.c:236
msgid "bad object type."
msgstr "ungültiger Objekt-Typ"
-#: builtin/tag.c:253
-msgid "tag header too big."
-msgstr "Tag-Kopf zu groß."
-
-#: builtin/tag.c:289
+#: builtin/tag.c:282
msgid "no tag message?"
msgstr "keine Tag-Beschreibung?"
-#: builtin/tag.c:295
+#: builtin/tag.c:289
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Die Tag-Beschreibung wurde gelassen in %s\n"
-#: builtin/tag.c:354
+#: builtin/tag.c:397
msgid "list tag names"
msgstr "Tagnamen auflisten"
-#: builtin/tag.c:356
+#: builtin/tag.c:399
msgid "print <n> lines of each tag message"
msgstr "<n> Zeilen jeder Tag-Beschreibung anzeigen"
-#: builtin/tag.c:358
+#: builtin/tag.c:401
msgid "delete tags"
msgstr "Tags löschen"
-#: builtin/tag.c:359
+#: builtin/tag.c:402
msgid "verify tags"
msgstr "Tags überprüfen"
-#: builtin/tag.c:361
+#: builtin/tag.c:404
msgid "Tag creation options"
msgstr "Optionen für Erstellung von Tags"
-#: builtin/tag.c:363
+#: builtin/tag.c:406
msgid "annotated tag, needs a message"
msgstr "annotiertes Tag, benötigt eine Beschreibung"
-#: builtin/tag.c:365
+#: builtin/tag.c:408
msgid "tag message"
msgstr "Tag-Beschreibung"
-#: builtin/tag.c:367
+#: builtin/tag.c:410
msgid "annotated and GPG-signed tag"
msgstr "annotiertes und GPG-signiertes Tag"
-#: builtin/tag.c:371
+#: builtin/tag.c:414
msgid "use another key to sign the tag"
msgstr "einen anderen Schlüssel verwenden, um das Tag zu signieren"
-#: builtin/tag.c:372
+#: builtin/tag.c:415
msgid "replace the tag if exists"
msgstr "das Tag ersetzen, wenn es existiert"
-#: builtin/tag.c:373 builtin/update-ref.c:368
+#: builtin/tag.c:416 builtin/update-ref.c:368
msgid "create a reflog"
msgstr "Reflog erstellen"
-#: builtin/tag.c:375
+#: builtin/tag.c:418
msgid "Tag listing options"
msgstr "Optionen für Auflistung der Tags"
-#: builtin/tag.c:376
+#: builtin/tag.c:419
msgid "show tag list in columns"
msgstr "Liste der Tags in Spalten anzeigen"
-#: builtin/tag.c:377 builtin/tag.c:378
+#: builtin/tag.c:420 builtin/tag.c:422
msgid "print only tags that contain the commit"
msgstr "nur Tags ausgeben, die diesen Commit beinhalten"
-#: builtin/tag.c:379
+#: builtin/tag.c:421 builtin/tag.c:423
+msgid "print only tags that don't contain the commit"
+msgstr "nur Tags ausgeben, die diesen Commit nicht enthalten"
+
+#: builtin/tag.c:424
msgid "print only tags that are merged"
msgstr "nur Tags ausgeben, die gemerged wurden"
-#: builtin/tag.c:380
+#: builtin/tag.c:425
msgid "print only tags that are not merged"
msgstr "nur Tags ausgeben, die nicht gemerged wurden"
-#: builtin/tag.c:385
+#: builtin/tag.c:430
msgid "print only tags of the object"
msgstr "nur Tags von dem Objekt ausgeben"
-#: builtin/tag.c:415
+#: builtin/tag.c:469
msgid "--column and -n are incompatible"
msgstr "--column und -n sind inkompatibel"
-#: builtin/tag.c:437
-msgid "-n option is only allowed with -l."
-msgstr "-n Option ist nur erlaubt mit -l."
+#: builtin/tag.c:491
+msgid "-n option is only allowed in list mode"
+msgstr "Die Option -n ist nur im Listenmodus erlaubt."
-#: builtin/tag.c:439
-msgid "--contains option is only allowed with -l."
-msgstr "--contains Option ist nur erlaubt mit -l."
+#: builtin/tag.c:493
+msgid "--contains option is only allowed in list mode"
+msgstr "Die Option --contains ist nur im Listenmodus erlaubt."
-#: builtin/tag.c:441
-msgid "--points-at option is only allowed with -l."
-msgstr "--points-at Option ist nur erlaubt mit -l."
+#: builtin/tag.c:495
+msgid "--no-contains option is only allowed in list mode"
+msgstr "Die Option --no-contains ist nur im Listenmodus erlaubt."
-#: builtin/tag.c:443
-msgid "--merged and --no-merged option are only allowed with -l"
-msgstr "Die Optionen --merged und --no-merged sind nur mit -l erlaubt."
+#: builtin/tag.c:497
+msgid "--points-at option is only allowed in list mode"
+msgstr "Die Option --points-at ist nur im Listenmodus erlaubt."
-#: builtin/tag.c:454
+#: builtin/tag.c:499
+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
msgid "only one -F or -m option is allowed."
msgstr "nur eine -F oder -m Option ist erlaubt."
-#: builtin/tag.c:473
+#: builtin/tag.c:529
msgid "too many params"
msgstr "zu viele Parameter"
-#: builtin/tag.c:479
+#: builtin/tag.c:535
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' ist kein gültiger Tagname."
-#: builtin/tag.c:484
+#: builtin/tag.c:540
#, c-format
msgid "tag '%s' already exists"
msgstr "Tag '%s' existiert bereits"
-#: builtin/tag.c:512
+#: builtin/tag.c:570
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Tag '%s' aktualisiert (war %s)\n"
@@ -13495,184 +13760,200 @@
msgid "failed to delete file %s"
msgstr "Konnte Datei '%s' nicht löschen"
-#: builtin/update-index.c:110 builtin/update-index.c:212
+#: builtin/update-index.c:110 builtin/update-index.c:216
#, c-format
msgid "failed to delete directory %s"
msgstr "Konnte Verzeichnis '%s' nicht löschen"
-#: builtin/update-index.c:133
+#: builtin/update-index.c:135
#, c-format
msgid "Testing mtime in '%s' "
msgstr "Prüfe mtime in '%s' "
-#: builtin/update-index.c:145
+#: builtin/update-index.c:149
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:158
+#: builtin/update-index.c:162
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:171
+#: builtin/update-index.c:175
msgid "directory stat info changes after updating a file"
msgstr ""
"Verzeichnisinformationen haben sich nach Aktualisierung einer Datei geändert"
-#: builtin/update-index.c:182
+#: builtin/update-index.c:186
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:193
+#: builtin/update-index.c:197
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:206
+#: builtin/update-index.c:210
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:213
+#: builtin/update-index.c:217
msgid " OK"
msgstr " OK"
-#: builtin/update-index.c:564
+#: builtin/update-index.c:568
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<Optionen>] [--] [<Datei>...]"
-#: builtin/update-index.c:919
+#: builtin/update-index.c:923
msgid "continue refresh even when index needs update"
msgstr ""
"Aktualisierung fortsetzen, auch wenn der Index aktualisiert werden muss"
-#: builtin/update-index.c:922
+#: builtin/update-index.c:926
msgid "refresh: ignore submodules"
msgstr "Aktualisierung: ignoriert Submodule"
-#: builtin/update-index.c:925
+#: builtin/update-index.c:929
msgid "do not ignore new files"
msgstr "keine neuen Dateien ignorieren"
-#: builtin/update-index.c:927
+#: builtin/update-index.c:931
msgid "let files replace directories and vice-versa"
msgstr "Dateien Verzeichnisse ersetzen lassen, und umgedreht"
-#: builtin/update-index.c:929
+#: builtin/update-index.c:933
msgid "notice files missing from worktree"
msgstr "fehlende Dateien im Arbeitsverzeichnis beachten"
-#: builtin/update-index.c:931
+#: builtin/update-index.c:935
msgid "refresh even if index contains unmerged entries"
msgstr ""
"aktualisieren, auch wenn der Index nicht zusammengeführte Einträge beinhaltet"
-#: builtin/update-index.c:934
+#: builtin/update-index.c:938
msgid "refresh stat information"
msgstr "Dateiinformationen aktualisieren"
-#: builtin/update-index.c:938
+#: builtin/update-index.c:942
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "wie --refresh, ignoriert aber \"assume-unchanged\" Einstellung"
-#: builtin/update-index.c:942
+#: builtin/update-index.c:946
msgid "<mode>,<object>,<path>"
msgstr "<Modus>,<Objekt>,<Pfad>"
-#: builtin/update-index.c:943
+#: builtin/update-index.c:947
msgid "add the specified entry to the index"
msgstr "den angegebenen Eintrag zum Commit vormerken"
-#: builtin/update-index.c:952
+#: builtin/update-index.c:956
msgid "mark files as \"not changing\""
msgstr "diese Datei immer als unverändert betrachten"
-#: builtin/update-index.c:955
+#: builtin/update-index.c:959
msgid "clear assumed-unchanged bit"
msgstr "\"assumed-unchanged\"-Bit löschen"
-#: builtin/update-index.c:958
+#: builtin/update-index.c:962
msgid "mark files as \"index-only\""
msgstr "Dateien als \"index-only\" markieren"
-#: builtin/update-index.c:961
+#: builtin/update-index.c:965
msgid "clear skip-worktree bit"
msgstr "\"skip-worktree\"-Bit löschen"
-#: builtin/update-index.c:964
+#: builtin/update-index.c:968
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:966
+#: builtin/update-index.c:970
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:968
+#: builtin/update-index.c:972
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "mit --stdin: eingegebene Zeilen sind durch NUL-Bytes abgeschlossen"
-#: builtin/update-index.c:970
+#: builtin/update-index.c:974
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:974
+#: builtin/update-index.c:978
msgid "add entries from standard input to the index"
msgstr "Einträge von der Standard-Eingabe zum Commit vormerken"
-#: builtin/update-index.c:978
+#: builtin/update-index.c:982
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:982
+#: builtin/update-index.c:986
msgid "only update entries that differ from HEAD"
msgstr "nur Einträge aktualisieren, die unterschiedlich zu HEAD sind"
-#: builtin/update-index.c:986
+#: builtin/update-index.c:990
msgid "ignore files missing from worktree"
msgstr "fehlende Dateien im Arbeitsverzeichnis ignorieren"
-#: builtin/update-index.c:989
+#: builtin/update-index.c:993
msgid "report actions to standard output"
msgstr "die Aktionen in der Standard-Ausgabe ausgeben"
-#: builtin/update-index.c:991
+#: builtin/update-index.c:995
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(für Fremdprogramme) keine gespeicherten, nicht aufgelöste Konflikte"
-#: builtin/update-index.c:995
+#: builtin/update-index.c:999
msgid "write index in this format"
msgstr "Index-Datei in diesem Format schreiben"
-#: builtin/update-index.c:997
+#: builtin/update-index.c:1001
msgid "enable or disable split index"
msgstr "Splitting des Index aktivieren oder deaktivieren"
-#: builtin/update-index.c:999
+#: builtin/update-index.c:1003
msgid "enable/disable untracked cache"
msgstr "Cache für unversionierte Dateien aktivieren oder deaktivieren"
-#: builtin/update-index.c:1001
+#: builtin/update-index.c:1005
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:1003
+#: builtin/update-index.c:1007
msgid "enable untracked cache without testing the filesystem"
msgstr ""
"Cache für unversionierte Dateien ohne Prüfung des Dateisystems aktivieren"
-#: builtin/update-index.c:1120
+#: builtin/update-index.c:1107
+msgid ""
+"core.splitIndex is set to false; remove or change it, if you really want to "
+"enable split index"
+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
+msgid ""
+"core.splitIndex is set to true; remove or change it, if you really want to "
+"disable split index"
+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
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
@@ -13680,11 +13961,11 @@
"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:1124
+#: builtin/update-index.c:1131
msgid "Untracked cache disabled"
msgstr "Cache für unversionierte Dateien deaktiviert"
-#: builtin/update-index.c:1132
+#: builtin/update-index.c:1139
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
@@ -13693,7 +13974,7 @@
"dies,\n"
"wenn sie wirklich den Cache für unversionierte Dateien aktivieren möchten."
-#: builtin/update-index.c:1136
+#: builtin/update-index.c:1143
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "Cache für unversionierte Dateien für '%s' aktiviert"
@@ -13787,27 +14068,27 @@
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <Pfad>"
-#: builtin/worktree.c:42
+#: builtin/worktree.c:43
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Lösche worktrees/%s: kein gültiges Verzeichnis"
-#: builtin/worktree.c:48
+#: builtin/worktree.c:49
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Lösche worktrees/%s: gitdir-Datei existiert nicht"
-#: builtin/worktree.c:53
+#: builtin/worktree.c:54
#, 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:64
+#: builtin/worktree.c:65
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Lösche worktrees/%s: ungültige gitdir-Datei"
-#: builtin/worktree.c:80
+#: builtin/worktree.c:81
#, 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"
@@ -13825,62 +14106,66 @@
msgid "'%s' already exists"
msgstr "'%s' existiert bereits"
-#: builtin/worktree.c:236
+#: builtin/worktree.c:235
#, c-format
msgid "could not create directory of '%s'"
msgstr "Konnte Verzeichnis '%s' nicht erstellen."
-#: builtin/worktree.c:272
+#: builtin/worktree.c:274
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "Bereite %s vor (Identifikation %s)"
-#: builtin/worktree.c:323
+#: builtin/worktree.c:328
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:325
+#: builtin/worktree.c:330
msgid "create a new branch"
msgstr "neuen Branch erstellen"
-#: builtin/worktree.c:327
+#: builtin/worktree.c:332
msgid "create or reset a branch"
msgstr "Branch erstellen oder umsetzen"
-#: builtin/worktree.c:329
+#: builtin/worktree.c:334
msgid "populate the new working tree"
msgstr "das neue Arbeitsverzeichnis auschecken"
-#: builtin/worktree.c:337
+#: builtin/worktree.c:335
+msgid "keep the new working tree locked"
+msgstr "das neue Arbeitsverzeichnis gesperrt lassen"
+
+#: builtin/worktree.c:343
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B und --detach schließen sich gegenseitig aus"
-#: builtin/worktree.c:472
+#: builtin/worktree.c:478
msgid "reason for locking"
msgstr "Sperrgrund"
-#: builtin/worktree.c:484 builtin/worktree.c:517
+#: builtin/worktree.c:490 builtin/worktree.c:523
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' ist kein Arbeitsverzeichnis"
-#: builtin/worktree.c:486 builtin/worktree.c:519
+#: builtin/worktree.c:492 builtin/worktree.c:525
msgid "The main working tree cannot be locked or unlocked"
msgstr "Das Hauptarbeitsverzeichnis kann nicht gesperrt oder entsperrt werden."
-#: builtin/worktree.c:491
+#: builtin/worktree.c:497
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' ist bereits gesperrt, Grund: %s"
-#: builtin/worktree.c:493
+#: builtin/worktree.c:499
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' ist bereits gesperrt"
-#: builtin/worktree.c:521
+#: builtin/worktree.c:527
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' ist nicht gesperrt"
@@ -13905,21 +14190,21 @@
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<Optionen>] <Verzeichnis>"
-#: upload-pack.c:1036
+#: upload-pack.c:1040
msgid "quit after a single request/response exchange"
msgstr "nach einem einzigen Request/Response-Austausch beenden"
-#: upload-pack.c:1038
+#: upload-pack.c:1042
msgid "exit immediately after initial ref advertisement"
msgstr "direkt nach der initialen Angabe der Commits beenden"
-#: upload-pack.c:1040
+#: upload-pack.c:1044
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:1042
+#: upload-pack.c:1046
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "Übertragung nach <n> Sekunden Inaktivität unterbrechen"
@@ -13954,17 +14239,22 @@
"oder 'git help <Konzept>', um mehr über einen spezifischen Befehl oder\n"
"Konzept zu erfahren."
-#: http.c:344
+#: http.c:336
+#, c-format
+msgid "negative value for http.postbuffer; defaulting to %d"
+msgstr "negativer Wert für http.postbuffer; benutze Standardwert %d"
+
+#: http.c:357
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:353
+#: http.c:366
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:1713
+#: http.c:1766
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -13975,7 +14265,7 @@
" gefragt nach: %s\n"
" umgeleitet: %s"
-#: remote-curl.c:319
+#: remote-curl.c:323
#, c-format
msgid "redirecting to %s"
msgstr "Leite nach %s um"
@@ -14364,7 +14654,7 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr "Einfacher Merge hat nicht funktioniert, versuche automatischen Merge."
-#: git-rebase.sh:57
+#: 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"
@@ -14378,39 +14668,39 @@
"Um den ursprünglichen Branch wiederherzustellen und den Rebase abzubrechen,\n"
"führen Sie \"git rebase --abort\" aus."
-#: git-rebase.sh:157 git-rebase.sh:396
+#: git-rebase.sh:158 git-rebase.sh:397
#, sh-format
msgid "Could not move back to $head_name"
msgstr "Konnte nicht zu $head_name zurückgehen"
-#: git-rebase.sh:171
+#: git-rebase.sh:172
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "Kann $stash_sha1 nicht speichern."
-#: git-rebase.sh:211
+#: git-rebase.sh:212
msgid "The pre-rebase hook refused to rebase."
msgstr "Der \"pre-rebase hook\" hat den Rebase zurückgewiesen."
-#: git-rebase.sh:216
+#: git-rebase.sh:217
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr "\"git-am\" scheint im Gange zu sein. Kann Rebase nicht durchführen."
-#: git-rebase.sh:357
+#: git-rebase.sh:358
msgid "No rebase in progress?"
msgstr "Kein Rebase im Gange?"
-#: git-rebase.sh:368
+#: git-rebase.sh:369
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"Die --edit-todo Aktion kann nur während eines interaktiven Rebase verwendet "
"werden."
-#: git-rebase.sh:375
+#: git-rebase.sh:376
msgid "Cannot read HEAD"
msgstr "Kann HEAD nicht lesen"
-#: git-rebase.sh:378
+#: git-rebase.sh:379
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -14418,7 +14708,7 @@
"Sie müssen alle Merge-Konflikte editieren und diese dann\n"
"mittels \"git add\" als aufgelöst markieren"
-#: git-rebase.sh:418
+#: git-rebase.sh:419
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -14439,104 +14729,104 @@
"und führen Sie diesen Befehl nochmal aus. Es wird angehalten, falls noch\n"
"etwas Schützenswertes vorhanden ist."
-#: git-rebase.sh:469
+#: git-rebase.sh:470
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "ungültiger Upstream-Branch $upstream_name"
-#: git-rebase.sh:493
+#: git-rebase.sh:494
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: es gibt mehr als eine Merge-Basis"
-#: git-rebase.sh:496 git-rebase.sh:500
+#: git-rebase.sh:497 git-rebase.sh:501
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: es gibt keine Merge-Basis"
-#: git-rebase.sh:505
+#: git-rebase.sh:506
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "$onto_name zeigt auf keinen gültigen Commit"
-#: git-rebase.sh:528
+#: git-rebase.sh:529
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "fatal: Branch $branch_name nicht gefunden"
-#: git-rebase.sh:561
+#: git-rebase.sh:562
msgid "Cannot autostash"
msgstr "Kann automatischen Stash nicht erzeugen."
-#: git-rebase.sh:566
+#: git-rebase.sh:567
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "Automatischen Stash erzeugt: $stash_abbrev"
-#: git-rebase.sh:570
+#: git-rebase.sh:571
msgid "Please commit or stash them."
msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"."
-#: git-rebase.sh:590
+#: git-rebase.sh:591
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "Aktueller Branch $branch_name ist auf dem neuesten Stand."
-#: git-rebase.sh:594
+#: git-rebase.sh:595
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr ""
"Aktueller Branch $branch_name ist auf dem neuesten Stand, Rebase erzwungen."
-#: git-rebase.sh:605
+#: git-rebase.sh:606
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Änderungen von $mb zu $onto:"
-#: git-rebase.sh:614
+#: git-rebase.sh:615
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
"Zunächst wird der Branch zurückgespult, um Ihre Änderungen\n"
"darauf neu anzuwenden ..."
-#: git-rebase.sh:624
+#: git-rebase.sh:625
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "$branch_name zu $onto_name vorgespult."
-#: git-stash.sh:50
+#: git-stash.sh:53
msgid "git stash clear with parameters is unimplemented"
msgstr "git stash clear mit Parametern ist nicht implementiert"
-#: git-stash.sh:73
+#: git-stash.sh:94
msgid "You do not have the initial commit yet"
msgstr "Sie haben bisher noch keinen initialen Commit"
-#: git-stash.sh:88
+#: git-stash.sh:109
msgid "Cannot save the current index state"
msgstr "Kann den aktuellen Zustand des Index nicht speichern"
-#: git-stash.sh:103
+#: git-stash.sh:124
msgid "Cannot save the untracked files"
msgstr "Kann die unversionierten Dateien nicht speichern"
-#: git-stash.sh:123 git-stash.sh:136
+#: git-stash.sh:144 git-stash.sh:157
msgid "Cannot save the current worktree state"
msgstr "Kann den aktuellen Zustand des Arbeitsverzeichnisses nicht speichern"
-#: git-stash.sh:140
+#: git-stash.sh:161
msgid "No changes selected"
msgstr "Keine Änderungen ausgewählt"
-#: git-stash.sh:143
+#: git-stash.sh:164
msgid "Cannot remove temporary index (can't happen)"
msgstr "Kann temporären Index nicht löschen (kann nicht passieren)"
-#: git-stash.sh:156
+#: git-stash.sh:177
msgid "Cannot record working tree state"
msgstr "Kann Zustand des Arbeitsverzeichnisses nicht aufzeichnen"
-#: git-stash.sh:188
+#: git-stash.sh:209
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr "Kann $ref_stash nicht mit $w_commit aktualisieren."
@@ -14551,7 +14841,7 @@
#. $ 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:238
+#: git-stash.sh:265
#, sh-format
msgid ""
"error: unknown option for 'stash save': $option\n"
@@ -14561,108 +14851,108 @@
" Um eine Beschreibung anzugeben, benutzen Sie \"git stash save -- "
"'$option'\""
-#: git-stash.sh:251
+#: git-stash.sh:278
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:259
+#: git-stash.sh:286
msgid "No local changes to save"
msgstr "Keine lokalen Änderungen zum Speichern"
-#: git-stash.sh:263
+#: git-stash.sh:291
msgid "Cannot initialize stash"
msgstr "Kann \"stash\" nicht initialisieren"
-#: git-stash.sh:267
+#: git-stash.sh:295
msgid "Cannot save the current status"
msgstr "Kann den aktuellen Status nicht speichern"
-#: git-stash.sh:268
+#: git-stash.sh:296
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr "Speicherte Arbeitsverzeichnis und Index-Status $stash_msg"
-#: git-stash.sh:285
+#: git-stash.sh:323
msgid "Cannot remove worktree changes"
msgstr "Kann Änderungen im Arbeitsverzeichnis nicht löschen"
-#: git-stash.sh:403
+#: git-stash.sh:471
#, sh-format
msgid "unknown option: $opt"
msgstr "unbekannte Option: $opt"
-#: git-stash.sh:416
+#: git-stash.sh:484
msgid "No stash found."
msgstr "Kein Stash-Eintrag gefunden."
-#: git-stash.sh:423
+#: git-stash.sh:491
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "Zu viele Commits angegeben: $REV"
-#: git-stash.sh:438
+#: git-stash.sh:506
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference ist keine gültige Referenz"
-#: git-stash.sh:466
+#: git-stash.sh:534
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' ist kein \"stash\"-artiger Commit"
-#: git-stash.sh:477
+#: git-stash.sh:545
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args' ist keine \"stash\"-Referenz"
-#: git-stash.sh:485
+#: git-stash.sh:553
msgid "unable to refresh index"
msgstr "Konnte den Index nicht aktualisieren."
-#: git-stash.sh:489
+#: git-stash.sh:557
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:497
+#: git-stash.sh:565
msgid "Conflicts in index. Try without --index."
msgstr "Konflikte im Index. Versuchen Sie es ohne --index."
-#: git-stash.sh:499
+#: git-stash.sh:567
msgid "Could not save index tree"
msgstr "Konnte Index-Verzeichnis nicht speichern"
-#: git-stash.sh:508
+#: git-stash.sh:576
msgid "Could not restore untracked files from stash"
msgstr "Konnte unversionierte Dateien vom Stash nicht wiederherstellen"
-#: git-stash.sh:533
+#: git-stash.sh:601
msgid "Cannot unstage modified files"
msgstr "Kann geänderte Dateien nicht aus dem Index entfernen"
-#: git-stash.sh:548
+#: git-stash.sh:616
msgid "Index was not unstashed."
msgstr "Index wurde nicht aus dem Stash zurückgeladen."
-#: git-stash.sh:562
+#: 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:571
+#: git-stash.sh:639
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "Gelöscht ${REV} ($s)"
-#: git-stash.sh:572
+#: git-stash.sh:640
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: Konnte \"stash\"-Eintrag nicht löschen"
-#: git-stash.sh:580
+#: git-stash.sh:648
msgid "No branch name specified"
msgstr "Kein Branchname spezifiziert"
-#: git-stash.sh:652
+#: git-stash.sh:727
msgid "(To restore them type \"git stash apply\")"
msgstr "(Zur Wiederherstellung geben Sie \"git stash apply\" ein)"
@@ -14753,29 +15043,29 @@
msgid "Failed to register submodule '$sm_path'"
msgstr "Fehler beim Eintragen von Submodul '$sm_path' in die Konfiguration."
-#: git-submodule.sh:327
+#: git-submodule.sh:341
#, sh-format
msgid "Entering '$displaypath'"
msgstr "Betrete '$displaypath'"
-#: git-submodule.sh:347
+#: git-submodule.sh:361
#, 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:418
+#: git-submodule.sh:432
#, sh-format
msgid "pathspec and --all are incompatible"
msgstr "Pfadspezifikationen und --all sind inkompatibel."
-#: git-submodule.sh:423
+#: git-submodule.sh:437
#, 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:443
+#: git-submodule.sh:457
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains a .git directory\n"
@@ -14787,7 +15077,7 @@
"löschen\n"
"möchten)"
-#: git-submodule.sh:451
+#: git-submodule.sh:465
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
@@ -14796,41 +15086,41 @@
"Arbeitsverzeichnis von Submodul in '$displaypath' enthält lokale Änderungen; "
"verwenden Sie '-f', um diese zu verwerfen"
-#: git-submodule.sh:454
+#: git-submodule.sh:468
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "Verzeichnis '$displaypath' bereinigt."
-#: git-submodule.sh:455
+#: git-submodule.sh:469
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr ""
"Konnte Arbeitsverzeichnis des Submoduls in '$displaypath' nicht löschen."
-#: git-submodule.sh:458
+#: git-submodule.sh:472
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr ""
"Konnte kein leeres Verzeichnis für Submodul in '$displaypath' erstellen."
-#: git-submodule.sh:467
+#: git-submodule.sh:481
#, 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:623
+#: git-submodule.sh:637
#, 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:633
+#: git-submodule.sh:647
#, 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:638
+#: git-submodule.sh:652
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -14839,12 +15129,12 @@
"Konnte aktuellen Commit von ${remote_name}/${branch} in Submodul-Pfad\n"
"'$sm_path' nicht finden."
-#: git-submodule.sh:656
+#: git-submodule.sh:670
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "Konnte \"fetch\" in Submodul-Pfad '$displaypath' nicht ausführen"
-#: git-submodule.sh:662
+#: git-submodule.sh:676
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -14853,85 +15143,85 @@
"\"fetch\" in Submodul-Pfad '$displaypath' ausgeführt, aber $sha1 nicht\n"
"enthalten. Direktes Anfordern dieses Commits ist fehlgeschlagen."
-#: git-submodule.sh:669
+#: git-submodule.sh:683
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "Konnte '$sha1' in Submodul-Pfad '$displaypath' nicht auschecken."
-#: git-submodule.sh:670
+#: git-submodule.sh:684
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Submodul-Pfad: '$displaypath': '$sha1' ausgecheckt"
-#: git-submodule.sh:674
+#: git-submodule.sh:688
#, 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:675
+#: git-submodule.sh:689
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Submodul-Pfad '$displaypath': Rebase auf '$sha1'"
-#: git-submodule.sh:680
+#: git-submodule.sh:694
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "Merge von '$sha1' in Submodul-Pfad '$displaypath' fehlgeschlagen"
-#: git-submodule.sh:681
+#: git-submodule.sh:695
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Submodul-Pfad '$displaypath': zusammengeführt in '$sha1'"
-#: git-submodule.sh:686
+#: git-submodule.sh:700
#, 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:687
+#: git-submodule.sh:701
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Submodul-Pfad '$displaypath': '$command $sha1'"
-#: git-submodule.sh:718
+#: git-submodule.sh:732
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Fehler bei Rekursion in Submodul-Pfad '$displaypath'"
-#: git-submodule.sh:826
+#: git-submodule.sh:840
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:878
+#: git-submodule.sh:892
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "unerwarteter Modus $mod_dst"
-#: git-submodule.sh:898
+#: git-submodule.sh:912
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Warnung: $display_name beinhaltet nicht Commit $sha1_src"
-#: git-submodule.sh:901
+#: git-submodule.sh:915
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Warnung: $display_name beinhaltet nicht Commit $sha1_dst"
-#: git-submodule.sh:904
+#: git-submodule.sh:918
#, 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:1051
+#: git-submodule.sh:1064
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "Fehler bei Rekursion in Submodul-Pfad '$sm_path'"
-#: git-submodule.sh:1118
+#: git-submodule.sh:1136
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Synchronisiere Submodul-URL für '$displaypath'"
@@ -15241,11 +15531,11 @@
msgid "Or you can abort the rebase with 'git rebase --abort'."
msgstr "Oder Sie können den Rebase mit 'git rebase --abort' abbrechen."
-#: git-rebase--interactive.sh:1079
+#: git-rebase--interactive.sh:1083
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "Konnte CHERRY_PICK_HEAD nicht löschen"
-#: git-rebase--interactive.sh:1084
+#: git-rebase--interactive.sh:1088
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
@@ -15277,13 +15567,13 @@
"\n"
" git rebase --continue\n"
-#: git-rebase--interactive.sh:1101
+#: git-rebase--interactive.sh:1105
msgid "Error trying to find the author identity to amend commit"
msgstr ""
"Fehler beim Versuch die Identität des Authors zum Verbessern des Commits zu\n"
"finden"
-#: git-rebase--interactive.sh:1106
+#: git-rebase--interactive.sh:1110
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
@@ -15293,11 +15583,11 @@
"erneut\n"
"aus."
-#: git-rebase--interactive.sh:1111 git-rebase--interactive.sh:1115
+#: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119
msgid "Could not commit staged changes."
msgstr "Konnte Änderungen aus der Staging-Area nicht committen."
-#: git-rebase--interactive.sh:1139
+#: git-rebase--interactive.sh:1147
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -15311,40 +15601,40 @@
" git rebase --continue\n"
"\n"
-#: git-rebase--interactive.sh:1147 git-rebase--interactive.sh:1305
+#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313
msgid "Could not execute editor"
msgstr "Konnte Editor nicht ausführen."
-#: git-rebase--interactive.sh:1160
+#: git-rebase--interactive.sh:1168
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "Konnte $switch_to nicht auschecken."
-#: git-rebase--interactive.sh:1165
+#: git-rebase--interactive.sh:1173
msgid "No HEAD?"
msgstr "Kein HEAD?"
-#: git-rebase--interactive.sh:1166
+#: git-rebase--interactive.sh:1174
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "Konnte temporäres Verzeichnis $state_dir nicht erstellen."
-#: git-rebase--interactive.sh:1168
+#: git-rebase--interactive.sh:1176
msgid "Could not mark as interactive"
msgstr "Konnte nicht als interaktiven Rebase markieren."
-#: git-rebase--interactive.sh:1178 git-rebase--interactive.sh:1183
+#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191
msgid "Could not init rewritten commits"
msgstr "Konnte neu geschriebene Commits nicht initialisieren."
-#: git-rebase--interactive.sh:1283
+#: git-rebase--interactive.sh:1291
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
msgstr[0] "Rebase von $shortrevisions auf $shortonto ($todocount Kommando)"
msgstr[1] "Rebase von $shortrevisions auf $shortonto ($todocount Kommandos)"
-#: git-rebase--interactive.sh:1288
+#: git-rebase--interactive.sh:1296
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -15354,7 +15644,7 @@
"Wenn Sie jedoch alles löschen, wird der Rebase abgebrochen.\n"
"\n"
-#: git-rebase--interactive.sh:1295
+#: git-rebase--interactive.sh:1303
msgid "Note that empty commits are commented out"
msgstr "Leere Commits sind auskommentiert."
@@ -15449,127 +15739,125 @@
msgid "unstaged"
msgstr "aus Staging-Area entfernt"
-#: git-add--interactive.perl:297 git-add--interactive.perl:322
+#: git-add--interactive.perl:288 git-add--interactive.perl:313
msgid "binary"
msgstr "Binär"
-#: git-add--interactive.perl:306 git-add--interactive.perl:360
+#: git-add--interactive.perl:297 git-add--interactive.perl:351
msgid "nothing"
msgstr "Nichts"
-#: git-add--interactive.perl:342 git-add--interactive.perl:357
+#: git-add--interactive.perl:333 git-add--interactive.perl:348
msgid "unchanged"
msgstr "unverändert"
-#: git-add--interactive.perl:653
+#: git-add--interactive.perl:644
#, 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:656
+#: git-add--interactive.perl:647
#, 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:659
+#: git-add--interactive.perl:650
#, 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:662
+#: git-add--interactive.perl:653
#, 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:671
+#: git-add--interactive.perl:662
msgid "Update"
msgstr "Aktualisieren"
-#: git-add--interactive.perl:683
+#: git-add--interactive.perl:674
msgid "Revert"
msgstr "Revert"
-#: git-add--interactive.perl:706
+#: git-add--interactive.perl:697
#, perl-format
msgid "note: %s is untracked now.\n"
msgstr "Hinweis: %s ist nun unversioniert.\n"
-#: git-add--interactive.perl:717
+#: git-add--interactive.perl:708
msgid "Add untracked"
msgstr "unversionierte Dateien hinzufügen"
-#: git-add--interactive.perl:723
+#: git-add--interactive.perl:714
msgid "No untracked files.\n"
msgstr "Keine unversionierten Dateien.\n"
-#: git-add--interactive.perl:1039
+#: git-add--interactive.perl:1030
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
msgstr ""
-"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-Block\n"
+"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-"
+"Block\n"
"direkt als zum Hinzufügen zur Staging-Area markiert."
-#: git-add--interactive.perl:1042
+#: git-add--interactive.perl:1033
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
msgstr ""
-"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-Block\n"
+"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-"
+"Block\n"
"direkt als zum Hinzufügen zum Stash markiert."
-#: git-add--interactive.perl:1045
+#: git-add--interactive.perl:1036
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
msgstr ""
-"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-Block\n"
+"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-"
+"Block\n"
"direkt als zum Entfernen aus der Staging-Area markiert."
-#: git-add--interactive.perl:1048 git-add--interactive.perl:1057
+#: git-add--interactive.perl:1039 git-add--interactive.perl:1048
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
msgstr ""
-"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-Block\n"
+"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-"
+"Block\n"
"direkt als zum Anwenden markiert."
-#: git-add--interactive.perl:1051
-msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be\n"
-"marked for discarding"
-msgstr ""
-"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-Block\n"
-"direkt als zum Verwerfen markiert."
-
-#: git-add--interactive.perl:1054
+#: git-add--interactive.perl:1042 git-add--interactive.perl:1045
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
msgstr ""
-"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-Block\n"
+"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-"
+"Block\n"
"direkt als zum Verwerfen markiert."
-#: git-add--interactive.perl:1067
+#: git-add--interactive.perl:1058
#, 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"
+msgstr ""
+"Fehler beim Öffnen von Editier-Datei eines Patch-Blocks zum Schreiben: %s"
-#: git-add--interactive.perl:1068
+#: git-add--interactive.perl:1059
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:1074
+#: git-add--interactive.perl:1065
#, perl-format
msgid ""
"---\n"
@@ -15583,17 +15871,18 @@
"Zeilen, die mit %s beginnen, werden entfernt.\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1082
+#: git-add--interactive.perl:1073
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 ""
"Wenn das nicht sauber angewendet werden kann, haben Sie die Möglichkeit\n"
-"einer erneuten Bearbeitung. Wenn alle Zeilen des Patch-Blocks entfernt werden,\n"
+"einer erneuten Bearbeitung. Wenn alle Zeilen des Patch-Blocks entfernt "
+"werden,\n"
"wird die Bearbeitung abgebrochen und der Patch-Block bleibt unverändert.\n"
-#: git-add--interactive.perl:1096
+#: git-add--interactive.perl:1087
#, 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"
@@ -15604,14 +15893,14 @@
#. 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:1187
+#: git-add--interactive.perl:1178
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:1196
+#: git-add--interactive.perl:1187
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -15621,11 +15910,13 @@
msgstr ""
"y - diesen Patch-Block zum Commit vormerken\n"
"n - diesen Patch-Block nicht zum Commit vormerken\n"
-"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht zum Commit vormerken\n"
+"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht zum Commit "
+"vormerken\n"
"a - diesen und alle weiteren Patch-Blöcke dieser Datei zum Commit vormerken\n"
-"d - diesen oder alle weiteren Patch-Blöcke in dieser Datei nicht zum Commit vormerken"
+"d - diesen oder alle weiteren Patch-Blöcke in dieser Datei nicht zum Commit "
+"vormerken"
-#: git-add--interactive.perl:1202
+#: git-add--interactive.perl:1193
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -15639,7 +15930,7 @@
"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:1208
+#: git-add--interactive.perl:1199
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -15653,7 +15944,7 @@
"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:1214
+#: git-add--interactive.perl:1205
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -15663,11 +15954,14 @@
msgstr ""
"y - diesen Patch-Block auf den Index anwenden\n"
"n - diesen Patch-Block nicht auf den Index anwenden\n"
-"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht auf den Index anwenden\n"
-"a - diesen und alle weiteren Patch-Blöcke dieser Datei auf den Index anwenden\n"
-"d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht auf den Index anwenden"
+"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht auf den Index "
+"anwenden\n"
+"a - diesen und alle weiteren Patch-Blöcke dieser Datei auf den Index "
+"anwenden\n"
+"d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht auf den Index "
+"anwenden"
-#: git-add--interactive.perl:1220
+#: git-add--interactive.perl:1211
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -15677,11 +15971,14 @@
msgstr ""
"y - diesen Patch-Block im Arbeitsverzeichnis verwerfen\n"
"n - diesen Patch-Block im Arbeitsverzeichnis nicht verwerfen\n"
-"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht im Arbeitsverzeichnis verwerfen\n"
-"a - diesen und alle weiteren Patch-Blöcke dieser Datei im Arbeitsverzeichnis verwerfen\n"
-"d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht im Arbeitsverzeichnis verwerfen"
+"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht im "
+"Arbeitsverzeichnis verwerfen\n"
+"a - diesen und alle weiteren Patch-Blöcke dieser Datei im Arbeitsverzeichnis "
+"verwerfen\n"
+"d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht im "
+"Arbeitsverzeichnis verwerfen"
-#: git-add--interactive.perl:1226
+#: git-add--interactive.perl:1217
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -15691,11 +15988,12 @@
msgstr ""
"y - diesen Patch-Block im Index und Arbeitsverzeichnis verwerfen\n"
"n - diesen Patch-Block nicht im Index und Arbeitsverzeichnis verwerfen\n"
-"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht im Index und Arbeitsverzeichnis verwerfen\n"
+"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht im Index und "
+"Arbeitsverzeichnis verwerfen\n"
"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:1232
+#: git-add--interactive.perl:1223
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -15709,7 +16007,7 @@
"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:1241
+#: git-add--interactive.perl:1232
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
@@ -15723,238 +16021,251 @@
msgstr ""
"g - Patch-Block zum Hinspringen auswählen\n"
"/ - nach Patch-Block suchen der gegebenem regulärem Ausdruck entspricht\n"
-"j - diesen Patch-Block unbestimmt lassen, nächsten unbestimmten Patch-Block anzeigen\n"
+"j - diesen Patch-Block unbestimmt lassen, nächsten unbestimmten Patch-Block "
+"anzeigen\n"
"J - diesen Patch-Block unbestimmt lassen, nächsten Patch-Block anzeigen\n"
-"k - diesen Patch-Block unbestimmt lassen, vorherigen unbestimmten Patch-Block anzeigen\n"
+"k - diesen Patch-Block unbestimmt lassen, vorherigen unbestimmten Patch-"
+"Block anzeigen\n"
"K - diesen Patch-Block unbestimmt lassen, vorherigen Patch-Block anzeigen\n"
"s - aktuellen Patch-Block in kleinere Patch-Blöcke aufteilen\n"
"e - aktuellen Patch-Block manuell editieren\n"
"? - Hilfe anzeigen\n"
-#: git-add--interactive.perl:1272
+#: git-add--interactive.perl:1263
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"
+msgstr ""
+"Die ausgewählten Patch-Blöcke können nicht auf den Index angewendet werden!\n"
-#: git-add--interactive.perl:1273
+#: git-add--interactive.perl:1264
msgid "Apply them to the worktree anyway? "
msgstr "Trotzdem auf Arbeitsverzeichnis anwenden? "
-#: git-add--interactive.perl:1276
+#: git-add--interactive.perl:1267
msgid "Nothing was applied.\n"
msgstr "Nichts angewendet.\n"
-#: git-add--interactive.perl:1287
+#: git-add--interactive.perl:1278
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "ignoriere nicht zusammengeführte Datei: %s\n"
-#: git-add--interactive.perl:1296
+#: git-add--interactive.perl:1287
msgid "Only binary files changed.\n"
msgstr "Nur Binärdateien geändert.\n"
-#: git-add--interactive.perl:1298
+#: git-add--interactive.perl:1289
msgid "No changes.\n"
msgstr "Keine Änderungen.\n"
-#: git-add--interactive.perl:1306
+#: git-add--interactive.perl:1297
msgid "Patch update"
msgstr "Patch Aktualisierung"
-#: git-add--interactive.perl:1358
+#: git-add--interactive.perl:1349
#, 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:1359
+#: git-add--interactive.perl:1350
#, 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:1360
+#: git-add--interactive.perl:1351
#, 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:1363
+#: git-add--interactive.perl:1354
#, 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:1364
+#: git-add--interactive.perl:1355
#, 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:1365
+#: git-add--interactive.perl:1356
#, 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:1368
+#: git-add--interactive.perl:1359
#, 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:1369
+#: git-add--interactive.perl:1360
#, 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:1370
+#: git-add--interactive.perl:1361
#, 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:1373
+#: git-add--interactive.perl:1364
#, 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:1374
+#: git-add--interactive.perl:1365
#, 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:1375
+#: git-add--interactive.perl:1366
#, 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:1378
+#: git-add--interactive.perl:1369
#, 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:1379
+#: git-add--interactive.perl:1370
#, 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:1380
+#: git-add--interactive.perl:1371
#, 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:1383
+#: git-add--interactive.perl:1374
#, 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,?]? "
+msgstr ""
+"Modusänderung vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1384
+#: git-add--interactive.perl:1375
#, 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,?]? "
+msgstr ""
+"Löschung vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1385
+#: git-add--interactive.perl:1376
#, 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,?]? "
+msgstr ""
+"Diesen Patch-Block vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d,/"
+"%s,?]? "
-#: git-add--interactive.perl:1388
+#: git-add--interactive.perl:1379
#, 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,?]? "
+msgstr ""
+"Modusänderung auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1389
+#: git-add--interactive.perl:1380
#, 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:1390
+#: git-add--interactive.perl:1381
#, 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,?]? "
+msgstr ""
+"Diesen Patch-Block auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d,/"
+"%s,?]? "
-#: git-add--interactive.perl:1493
+#: git-add--interactive.perl:1484
msgid "go to which hunk (<ret> to see more)? "
msgstr "zu welchem Patch-Block springen (<Enter> für mehr Informationen)? "
-#: git-add--interactive.perl:1495
+#: git-add--interactive.perl:1486
msgid "go to which hunk? "
msgstr "zu welchem Patch-Block springen? "
-#: git-add--interactive.perl:1504
+#: git-add--interactive.perl:1495
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "Ungültige Nummer: '%s'\n"
-#: git-add--interactive.perl:1509
+#: git-add--interactive.perl:1500
#, 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:1535
+#: git-add--interactive.perl:1526
msgid "search for regex? "
msgstr "Suche nach regulärem Ausdruck? "
-#: git-add--interactive.perl:1548
+#: git-add--interactive.perl:1539
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "Fehlerhafter regulärer Ausdruck für Suche %s: %s\n"
-#: git-add--interactive.perl:1558
+#: git-add--interactive.perl:1549
msgid "No hunk matches the given pattern\n"
msgstr "Kein Patch-Block entspricht dem angegebenen Pattern\n"
-#: git-add--interactive.perl:1570 git-add--interactive.perl:1592
+#: git-add--interactive.perl:1561 git-add--interactive.perl:1583
msgid "No previous hunk\n"
msgstr "Kein vorheriger Patch-Block\n"
-#: git-add--interactive.perl:1579 git-add--interactive.perl:1598
+#: git-add--interactive.perl:1570 git-add--interactive.perl:1589
msgid "No next hunk\n"
msgstr "Kein folgender Patch-Block\n"
-#: git-add--interactive.perl:1606
+#: git-add--interactive.perl:1597
#, 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:1658
+#: git-add--interactive.perl:1649
msgid "Review diff"
msgstr "Diff überprüfen"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1677
+#: git-add--interactive.perl:1668
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\t - view diff between HEAD and index\n"
+"diff - view diff between HEAD and index\n"
"add untracked - add contents of untracked files to the staged set of "
"changes\n"
msgstr ""
"status - Pfade mit Änderungen anzeigen\n"
-"update - Zustand des Arbeitsverzeichnisses den zum Commit vorgemerkten Änderungen hinzufügen\n"
-"revert - zum Commit vorgemerkten Änderungen auf HEAD Version zurücksetzen\n"
+"update - Zustand des Arbeitsverzeichnisses den zum Commit "
+"vorgemerkten Änderungen hinzufügen\n"
+"revert - zum Commit vorgemerkte Änderungen auf HEAD Version "
+"zurücksetzen\n"
"patch - Patch-Blöcke auswählen und selektiv aktualisieren\n"
-"diff\t - Unterschiede zwischen HEAD und Index anzeigen\n"
+"diff - Unterschiede zwischen HEAD und Index anzeigen\n"
"add untracked - Inhalte von unversionierten Dateien zum Commit vormerken\n"
-#: git-add--interactive.perl:1694 git-add--interactive.perl:1699
-#: git-add--interactive.perl:1702 git-add--interactive.perl:1709
-#: git-add--interactive.perl:1713 git-add--interactive.perl:1719
+#: 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
msgid "missing --"
msgstr "-- fehlt"
-#: git-add--interactive.perl:1715
+#: git-add--interactive.perl:1706
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "Unbekannter --patch Modus: %s"
-#: git-add--interactive.perl:1721 git-add--interactive.perl:1727
+#: git-add--interactive.perl:1712 git-add--interactive.perl:1718
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "ungültiges Argument %s, erwarte --"
#: git-send-email.perl:121
msgid "local zone differs from GMT by a non-minute interval\n"
-msgstr "lokale Zeitzone unterscheidet sich von GMT nicht um einen Minutenintervall\n"
+msgstr ""
+"lokale Zeitzone unterscheidet sich von GMT nicht um einen Minutenintervall\n"
#: git-send-email.perl:128 git-send-email.perl:134
msgid "local time offset greater than or equal to 24 hours\n"
@@ -15968,7 +16279,8 @@
#, 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"
+msgstr ""
+"'%s' enthält eine Zwischenversion der E-Mail, die Sie gerade verfassen.\n"
#: git-send-email.perl:287
#, perl-format
@@ -15981,7 +16293,8 @@
#: git-send-email.perl:368 git-send-email.perl:623
msgid "Cannot run git format-patch from outside a repository\n"
-msgstr "Kann 'git format-patch' nicht außerhalb eines Repositories ausführen.\n"
+msgstr ""
+"Kann 'git format-patch' nicht außerhalb eines Repositories ausführen.\n"
#: git-send-email.perl:437
#, perl-format
@@ -15996,7 +16309,8 @@
#: git-send-email.perl:498
#, 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"
+msgstr ""
+"Warnung: sendemail Alias mit Anführungsstrichen wird nicht unterstützt: %s\n"
#: git-send-email.perl:500
#, perl-format
@@ -16027,7 +16341,8 @@
"indem Sie ...\n"
"\n"
" * \"./%s\" angeben, wenn Sie eine Datei meinen, oder\n"
-" * die Option --format-patch angeben, wenn Sie einen Commit-Bereich meinen\n"
+" * die Option --format-patch angeben, wenn Sie einen Commit-Bereich "
+"meinen\n"
#: git-send-email.perl:610
#, perl-format
@@ -16048,7 +16363,10 @@
"\n"
"No patch files specified!\n"
"\n"
-msgstr "\nkeine Patch-Dateien angegeben!\n\n"
+msgstr ""
+"\n"
+"keine Patch-Dateien angegeben!\n"
+"\n"
#: git-send-email.perl:658
#, perl-format
@@ -16072,7 +16390,8 @@
"Ziehen Sie in Betracht, einen allgemeinen \"diffstat\" oder ein\n"
"Inhaltsverzeichnis, für den Patch den Sie schreiben, hinzuzufügen.\n"
"\n"
-"Leeren Sie den Inhalt des Bodys, wenn Sie keine Zusammenfassung senden möchten.\n"
+"Leeren Sie den Inhalt des Bodys, wenn Sie keine Zusammenfassung senden "
+"möchten.\n"
#: git-send-email.perl:701
#, perl-format
@@ -16086,7 +16405,8 @@
#: git-send-email.perl:739
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"
+msgstr ""
+"To/Cc/Bcc Felder wurden noch nicht interpretiert, sie wurden ignoriert\n"
#: git-send-email.perl:748
msgid "Summary email is empty, skipping it\n"
@@ -16120,7 +16440,8 @@
msgstr ""
"Versand zurückgewiesen, weil der Patch\n"
"\t%s\n"
-"die Betreffzeilenvorlage '*** SUBJECT HERE ***' enthält. Geben Sie --force an,\n"
+"die Betreffzeilenvorlage '*** SUBJECT HERE ***' enthält. Geben Sie --force "
+"an,\n"
"wenn Sie den Patch wirklich versenden wollen.\n"
#: git-send-email.perl:841
@@ -16134,7 +16455,9 @@
#: git-send-email.perl:871
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)? "
+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
#, perl-format
@@ -16146,7 +16469,9 @@
#. at this point.
#: git-send-email.perl:933
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]): "
+msgstr ""
+"Was soll mit dieser Adresse geschehen? (Beenden [q]|Löschen [d]|Bearbeiten "
+"[e]): "
#: git-send-email.perl:1234
#, perl-format
@@ -16166,13 +16491,16 @@
" run 'git config --global sendemail.confirm auto'.\n"
"\n"
msgstr ""
-" Die Cc-Liste oberhalb wurde um zusätzliche Adressen erweitert, die in der\n"
-" Commit-Beschreibung des Patches gefunden wurden. Wenn dies passiert, werden\n"
+" Die Cc-Liste oberhalb wurde um zusätzliche Adressen erweitert, die in "
+"der\n"
+" Commit-Beschreibung des Patches gefunden wurden. Wenn dies passiert, "
+"werden\n"
" Sie von send-email zu einer Eingabe aufgefordert. Dieses Verhalten wird\n"
" durch die Konfigurationseinstellung sendemail.confirm gesteuert.\n"
"\n"
" Für weitere Informationen, führen Sie 'git send-email --help' aus.\n"
-" Um das aktuelle Verhalten beizubehalten, aber diese Meldung zu unterdrücken,\n"
+" Um das aktuelle Verhalten beizubehalten, aber diese Meldung zu "
+"unterdrücken,\n"
" führen Sie 'git config --global sendemail.confirm auto' aus.\n"
"\n"
@@ -16199,7 +16527,8 @@
#: git-send-email.perl:1403
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"
+"Konnte SMTP nicht korrekt initialisieren. Bitte prüfen Sie Ihre "
+"Konfiguration\n"
"und benutzen Sie --smtp-debug."
#: git-send-email.perl:1421
@@ -16302,6 +16631,94 @@
msgid "Do you really want to send %s? [y|N]: "
msgstr "Wollen Sie %s wirklich versenden? [y|N]: "
+#~ msgid "tag: tagging "
+#~ msgstr "tag: tagge "
+
+#~ msgid "object of unknown type"
+#~ msgstr "Art des Objektes unbekannt"
+
+#~ msgid "commit object"
+#~ msgstr "Commit-Objekt"
+
+#~ msgid "tree object"
+#~ msgstr "Tree-Objekt"
+
+#~ msgid "blob object"
+#~ msgstr "Blob-Objekt"
+
+#~ msgid "other tag object"
+#~ msgstr "anderes Tag-Objekt"
+
+#, fuzzy
+#~ msgid "Submodule '%s' cannot checkout new HEAD"
+#~ msgstr "Submodul '%s' kann Alternative nicht hinzufügen: %s"
+
+#~ msgid "insanely long object directory %.*s"
+#~ msgstr "zu langes Objekt-Verzeichnis %.*s"
+
+#~ msgid "tag name too long: %.*s..."
+#~ msgstr "Tagname zu lang: %.*s..."
+
+#~ msgid "tag header too big."
+#~ msgstr "Tag-Kopf zu groß."
+
+#~ msgid ""
+#~ "If the patch applies cleanly, the edited hunk will immediately be\n"
+#~ "marked for discarding"
+#~ msgstr ""
+#~ "Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-"
+#~ "Block\n"
+#~ "direkt als zum Verwerfen markiert."
+
+#~ msgid ""
+#~ "There is nothing to exclude from by :(exclude) patterns.\n"
+#~ "Perhaps you forgot to add either ':/' or '.' ?"
+#~ msgstr ""
+#~ ":(exclude) Muster, aber keine anderen Pfadspezifikationen angegeben.\n"
+#~ "Vielleicht haben Sie vergessen entweder ':/' oder '.' hinzuzufügen?"
+
+#~ msgid "unrecognized format: %%(%s)"
+#~ msgstr "nicht erkanntes Format: %%(%s)"
+
+#~ msgid ":strip= requires a positive integer argument"
+#~ msgstr ":strip= erfordert eine positive Ganzzahl als Argument"
+
+#~ msgid "ref '%s' does not have %ld components to :strip"
+#~ msgstr "Referenz '%s' hat keine %ld Komponenten für :strip"
+
+#~ msgid "unknown %.*s format %s"
+#~ msgstr "Unbekanntes %.*s Format %s"
+
+#~ msgid "[%s: gone]"
+#~ msgstr "[%s: entfernt]"
+
+#~ msgid "[%s]"
+#~ msgstr "[%s]"
+
+#~ msgid "[%s: behind %d]"
+#~ msgstr "[%s: %d hinterher]"
+
+#~ msgid "[%s: ahead %d]"
+#~ msgstr "[%s: %d voraus]"
+
+#~ msgid "[%s: ahead %d, behind %d]"
+#~ msgstr "[%s: %d voraus, %d hinterher]"
+
+#~ msgid " **** invalid ref ****"
+#~ msgstr " **** ungültige Referenz ****"
+
+#~ msgid "git merge [<options>] <msg> HEAD <commit>"
+#~ msgstr "git merge [<Optionen>] <Beschreibung> HEAD <Commit>"
+
+#~ msgid "'%s' is not a commit"
+#~ msgstr "'%s' ist kein Commit"
+
+#~ msgid "cannot open file '%s'"
+#~ msgstr "Kann Datei '%s' nicht öffnen"
+
+#~ msgid "could not close file %s"
+#~ msgstr "Konnte Datei '%s' nicht schließen."
+
#~ msgid "Use an experimental blank-line-based heuristic to improve diffs"
#~ msgstr ""
#~ "eine experimentelle, auf Leerzeilen basierende Heuristik zur "
diff --git a/po/fr.po b/po/fr.po
index af7c327..0dd068d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -73,8 +73,8 @@
msgstr ""
"Project-Id-Version: git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-02-18 01:00+0800\n"
-"PO-Revision-Date: 2017-02-18 00:09+0100\n"
+"POT-Creation-Date: 2017-05-05 09:35+0800\n"
+"PO-Revision-Date: 2017-05-05 12:02+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"
@@ -125,7 +125,7 @@
msgid "Exiting because of an unresolved conflict."
msgstr "Abandon à cause de conflit non résolu."
-#: advice.c:114 builtin/merge.c:1206
+#: advice.c:114 builtin/merge.c:1185
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)."
@@ -408,7 +408,7 @@
msgid "cannot checkout %s"
msgstr "extraction de %s impossible"
-#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:248
+#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:253
#, c-format
msgid "failed to read %s"
msgstr "échec de la lecture de %s"
@@ -535,7 +535,7 @@
msgid "sha1 information is lacking or useless (%s)."
msgstr "l'information de sha1 est manquante ou inutilisable (%s)."
-#: apply.c:4081 builtin/checkout.c:233 builtin/reset.c:135
+#: apply.c:4081 builtin/checkout.c:252 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "échec de make_cache_entry pour le chemin '%s'"
@@ -613,7 +613,7 @@
msgid "truncating .rej filename to %.*s.rej"
msgstr "troncature du nom de fichier .rej en %.*s.rej"
-#: apply.c:4531 builtin/fetch.c:737 builtin/fetch.c:986
+#: apply.c:4531 builtin/fetch.c:739 builtin/fetch.c:988
#, c-format
msgid "cannot open %s"
msgstr "impossible d'ouvrir %s"
@@ -641,166 +641,166 @@
msgid "unable to read index file"
msgstr "lecture du fichier d'index impossible"
-#: apply.c:4824
+#: apply.c:4823
#, c-format
msgid "can't open patch '%s': %s"
msgstr "ouverture impossible du patch '%s' :%s"
-#: apply.c:4849
+#: apply.c:4850
#, 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:4855 apply.c:4870
+#: apply.c:4856 apply.c:4871
#, 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:4863
+#: apply.c:4864
#, 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:4879 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391
+#: apply.c:4880 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391
msgid "Unable to write new index file"
msgstr "Impossible d'écrire le nouveau fichier d'index"
-#: apply.c:4910 apply.c:4913 builtin/am.c:2277 builtin/am.c:2280
-#: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180
-#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:591
-#: builtin/submodule--helper.c:594 builtin/submodule--helper.c:960
-#: builtin/submodule--helper.c:963 builtin/submodule--helper.c:1104
+#: 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
msgid "path"
msgstr "chemin"
-#: apply.c:4911
+#: apply.c:4912
msgid "don't apply changes matching the given path"
msgstr "ne pas appliquer les modifications qui correspondent au chemin donné"
-#: apply.c:4914
+#: apply.c:4915
msgid "apply changes matching the given path"
msgstr "appliquer les modifications qui correspondent au chemin donné"
-#: apply.c:4916 builtin/am.c:2286
+#: apply.c:4917 builtin/am.c:2285
msgid "num"
msgstr "num"
-#: apply.c:4917
+#: apply.c:4918
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "supprimer <num> barres obliques des chemins traditionnels de diff"
-#: apply.c:4920
+#: apply.c:4921
msgid "ignore additions made by the patch"
msgstr "ignorer les additions réalisées par le patch"
-#: apply.c:4922
+#: apply.c:4923
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:4926
+#: apply.c:4927
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:4928
+#: apply.c:4929
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"
-#: apply.c:4930
+#: apply.c:4931
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:4932
+#: apply.c:4933
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:4934
+#: apply.c:4935
msgid "apply a patch without touching the working tree"
msgstr "appliquer les patch sans toucher à la copie de travail"
-#: apply.c:4936
+#: apply.c:4937
msgid "accept a patch that touches outside the working area"
msgstr "accepter un patch qui touche hors de la copie de travail"
-#: apply.c:4938
+#: apply.c:4939
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "appliquer aussi le patch (à utiliser avec ---stat/--summary/--check)"
-#: apply.c:4940
+#: apply.c:4941
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:4942
+#: apply.c:4943
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:4945 builtin/checkout-index.c:169 builtin/ls-files.c:507
+#: apply.c:4946 builtin/checkout-index.c:169 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:4947
+#: apply.c:4948
msgid "ensure at least <n> lines of context match"
msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte"
-#: apply.c:4948 builtin/am.c:2265
+#: apply.c:4949 builtin/am.c:2264
msgid "action"
msgstr "action"
-#: apply.c:4949
+#: apply.c:4950
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:4952 apply.c:4955
+#: apply.c:4953 apply.c:4956
msgid "ignore changes in whitespace when finding context"
msgstr "ignorer des modifications d'espace lors de la recherche de contexte"
-#: apply.c:4958
+#: apply.c:4959
msgid "apply the patch in reverse"
msgstr "appliquer le patch en sens inverse"
-#: apply.c:4960
+#: apply.c:4961
msgid "don't expect at least one line of context"
msgstr "ne pas s'attendre à au moins une ligne de contexte"
-#: apply.c:4962
+#: apply.c:4963
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants"
-#: apply.c:4964
+#: apply.c:4965
msgid "allow overlapping hunks"
msgstr "accepter les recouvrements de sections"
-#: apply.c:4965 builtin/add.c:267 builtin/check-ignore.c:19
+#: 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:1860 builtin/mv.c:122 builtin/read-tree.c:114
+#: builtin/log.c:1867 builtin/mv.c:122 builtin/read-tree.c:134
msgid "be verbose"
msgstr "mode verbeux"
-#: apply.c:4967
+#: apply.c:4968
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:4970
+#: apply.c:4971
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:4972 builtin/am.c:2274
+#: apply.c:4973 builtin/am.c:2273
msgid "root"
msgstr "racine"
-#: apply.c:4973
+#: apply.c:4974
msgid "prepend <root> to all filenames"
msgstr "préfixer tous les noms de fichier avec <root>"
@@ -823,103 +823,108 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <dépôt> [--exec <commande>] --list"
-#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300
+#: archive.c:332 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "le chemin '%s' ne correspond à aucun fichier"
-#: archive.c:429
+#: archive.c:417
msgid "fmt"
msgstr "fmt"
-#: archive.c:429
+#: archive.c:417
msgid "archive format"
msgstr "format d'archive"
-#: archive.c:430 builtin/log.c:1429
+#: archive.c:418 builtin/log.c:1436
msgid "prefix"
msgstr "préfixe"
-#: archive.c:431
+#: archive.c:419
msgid "prepend prefix to each pathname in the archive"
msgstr "préfixer chaque chemin de fichier dans l'archive"
-#: archive.c:432 builtin/blame.c:2607 builtin/blame.c:2608 builtin/config.c:59
-#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1054
-#: builtin/hash-object.c:101 builtin/ls-files.c:541 builtin/ls-files.c:544
-#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109
+#: 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
msgid "file"
msgstr "fichier"
-#: archive.c:433 builtin/archive.c:89
+#: archive.c:421 builtin/archive.c:89
msgid "write the archive to this file"
msgstr "écrire l'archive dans ce fichier"
-#: archive.c:435
+#: archive.c:423
msgid "read .gitattributes in working directory"
msgstr "lire .gitattributes dans le répertoire de travail"
-#: archive.c:436
+#: archive.c:424
msgid "report archived files on stderr"
msgstr "afficher les fichiers archivés sur stderr"
-#: archive.c:437
+#: archive.c:425
msgid "store only"
msgstr "stockage seulement"
-#: archive.c:438
+#: archive.c:426
msgid "compress faster"
msgstr "compression rapide"
-#: archive.c:446
+#: archive.c:434
msgid "compress better"
msgstr "compression efficace"
-#: archive.c:449
+#: archive.c:437
msgid "list supported archive formats"
msgstr "afficher les formats d'archive supportés"
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88
-#: builtin/submodule--helper.c:603 builtin/submodule--helper.c:969
+#: archive.c:439 builtin/archive.c:90 builtin/clone.c:103 builtin/clone.c:106
+#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
msgid "repo"
msgstr "dépôt"
-#: archive.c:452 builtin/archive.c:91
+#: archive.c:440 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:453 builtin/archive.c:92 builtin/notes.c:485
+#: archive.c:441 builtin/archive.c:92 builtin/notes.c:485
msgid "command"
msgstr "commande"
-#: archive.c:454 builtin/archive.c:93
+#: archive.c:442 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr "chemin vers la commande distante git-upload-archive"
-#: archive.c:461
+#: archive.c:449
msgid "Unexpected option --remote"
msgstr "Option --remote inattendue"
-#: archive.c:463
+#: archive.c:451
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:465
+#: archive.c:453
msgid "Unexpected option --output"
msgstr "Option --output inattendue"
-#: archive.c:487
+#: archive.c:475
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Format d'archive inconnu '%s'"
-#: archive.c:494
+#: archive.c:482
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Argument non supporté pour le format '%s' : -%d"
-#: attr.c:263
+#: attr.c:212
+#, c-format
+msgid "%.*s is not a valid attribute name"
+msgstr "%.*s n'est pas un nom valide d'attribut"
+
+#: attr.c:408
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -927,27 +932,27 @@
"Les motifs de négation sont ignorés dans les attributs git\n"
"Utilisez '\\!' pour un point d'exclamation littéral."
-#: bisect.c:441
+#: bisect.c:444
#, c-format
msgid "Could not open file '%s'"
msgstr "impossible d'ouvrir le fichier '%s'"
-#: bisect.c:446
+#: bisect.c:449
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "Contenu mal cité dans le fichier '%s' : %s"
-#: bisect.c:655
+#: bisect.c:657
#, c-format
msgid "We cannot bisect more!\n"
msgstr "Impossible de pousser la bissection plus loin !\n"
-#: bisect.c:708
+#: bisect.c:710
#, c-format
msgid "Not a valid commit name %s"
msgstr "%s n'est pas un nom de commit valide"
-#: bisect.c:732
+#: bisect.c:734
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -956,7 +961,7 @@
"La base de fusion %s est mauvaise.\n"
"Cela signifie que le bogue été corrigé entre %s et [%s].\n"
-#: bisect.c:737
+#: bisect.c:739
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -965,7 +970,7 @@
"La base de fusion %s est nouvelle.\n"
"La propriété a changé entre %s et [%s].\n"
-#: bisect.c:742
+#: bisect.c:744
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -974,7 +979,7 @@
"La base de fusion %s est %s.\n"
"Ceci signifie que le premier commit '%s' est entre %s et [%s].\n"
-#: bisect.c:750
+#: bisect.c:752
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -985,7 +990,7 @@
"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:763
+#: bisect.c:765
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -997,36 +1002,36 @@
"et %s.\n"
"On continue tout de même."
-#: bisect.c:798
+#: bisect.c:800
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "Bissection : une base de fusion doit être testée\n"
-#: bisect.c:849
+#: bisect.c:851
#, c-format
msgid "a %s revision is needed"
msgstr "une révision %s est nécessaire"
-#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:262
+#: bisect.c:868 builtin/notes.c:174 builtin/tag.c:255
#, c-format
msgid "could not create file '%s'"
msgstr "impossible de créer le fichier '%s'"
-#: bisect.c:917
+#: bisect.c:919
#, c-format
msgid "could not read file '%s'"
msgstr "impossible de lire le fichier '%s'"
-#: bisect.c:947
+#: bisect.c:949
msgid "reading bisect refs failed"
msgstr "impossible de lire les références de bissection"
-#: bisect.c:967
+#: bisect.c:969
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s était à la fois %s et %s\n"
-#: bisect.c:975
+#: bisect.c:977
#, c-format
msgid ""
"No testable commit found.\n"
@@ -1035,7 +1040,7 @@
"Aucun commit testable n'a été trouvé\n"
"Peut-être avez-vous démarré avec un mauvais paramètre de chemin ?\n"
-#: bisect.c:994
+#: bisect.c:996
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1044,7 +1049,7 @@
#. TRANSLATORS: the last %s will be replaced with
#. "(roughly %d steps)" translation
-#: bisect.c:998
+#: bisect.c:1000
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
@@ -1191,7 +1196,7 @@
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' est déjà extrait dans '%s'"
-#: branch.c:363
+#: branch.c:364
#, 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,7 +1211,7 @@
msgid "unrecognized header: %s%s (%d)"
msgstr "en-tête non reconnu : %s%s (%d)"
-#: bundle.c:87 sequencer.c:1331 sequencer.c:1752 builtin/commit.c:777
+#: bundle.c:87 sequencer.c:1341 sequencer.c:1767 builtin/commit.c:777
#, c-format
msgid "could not open '%s'"
msgstr "impossible d'ouvrir '%s'"
@@ -1215,10 +1220,10 @@
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:1499 sequencer.c:1154 sequencer.c:2290
-#: builtin/blame.c:2820 builtin/commit.c:1061 builtin/log.c:348
-#: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909
-#: builtin/merge.c:360 builtin/shortlog.c:177
+#: 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"
@@ -1257,7 +1262,7 @@
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:165 builtin/log.c:1572 builtin/shortlog.c:282
+#: bundle.c:443 builtin/log.c:170 builtin/log.c:1579 builtin/shortlog.c:281
#, c-format
msgid "unrecognized argument: %s"
msgstr "argument non reconnu : %s"
@@ -1280,8 +1285,8 @@
msgid "invalid color value: %.*s"
msgstr "Valeur invalide de couleur : %.*s"
-#: commit.c:40 sequencer.c:1564 builtin/am.c:421 builtin/am.c:457
-#: builtin/am.c:1493 builtin/am.c:2127
+#: commit.c:40 sequencer.c:1579 builtin/am.c:419 builtin/am.c:455
+#: builtin/am.c:1489 builtin/am.c:2126
#, c-format
msgid "could not parse %s"
msgstr "impossible d'analyser %s"
@@ -1291,7 +1296,7 @@
msgid "%s %s is not a commit!"
msgstr "%s %s n'est pas un commit !"
-#: commit.c:1514
+#: commit.c:1511
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
@@ -1307,146 +1312,171 @@
msgid "memory exhausted"
msgstr "plus de mémoire"
-#: config.c:518
+#: config.c:191
+msgid "relative config include conditionals must come from files"
+msgstr ""
+"les conditions d'inclusion de configuration relative doivent venir de "
+"fichiers"
+
+#: config.c:711
#, c-format
msgid "bad config line %d in blob %s"
msgstr "ligne %d de config incorrecte dans le blob %s"
-#: config.c:522
+#: config.c:715
#, c-format
msgid "bad config line %d in file %s"
msgstr "ligne %d de config incorrecte dans le fichier %s"
-#: config.c:526
+#: config.c:719
#, c-format
msgid "bad config line %d in standard input"
msgstr "ligne %d de config incorrecte dans l'entrée standard"
-#: config.c:530
+#: config.c:723
#, 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:534
+#: config.c:727
#, 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:538
+#: config.c:731
#, c-format
msgid "bad config line %d in %s"
msgstr "ligne %d de config incorrecte dans %s"
-#: config.c:657
+#: config.c:859
msgid "out of range"
msgstr "hors plage"
-#: config.c:657
+#: config.c:859
msgid "invalid unit"
msgstr "unité invalide"
-#: config.c:663
+#: config.c:865
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "valeur numérique de configuration invalide '%s' pour '%s' : %s"
-#: config.c:668
+#: config.c:870
#, 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:671
+#: config.c:873
#, 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:674
+#: config.c:876
#, 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:677
+#: config.c:879
#, 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:680
+#: config.c:882
#, 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:683
+#: config.c:885
#, 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:770
+#: config.c:980
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "impossible d'étendre le répertoire utilisateur dans : '%s'"
-#: config.c:865 config.c:876
+#: config.c:1075 config.c:1086
#, c-format
msgid "bad zlib compression level %d"
msgstr "niveau de compression zlib incorrect %d"
-#: config.c:993
+#: config.c:1203
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "mode invalide pour la création d'objet : %s"
-#: config.c:1149
+#: config.c:1359
#, c-format
msgid "bad pack compression level %d"
msgstr "niveau de compression du paquet %d"
-#: config.c:1339
+#: config.c:1557
msgid "unable to parse command-line config"
msgstr "lecture de la configuration de ligne de commande impossible"
-#: config.c:1389
+#: config.c:1611
msgid "unknown error occurred while reading the configuration files"
msgstr "erreur inconnue pendant la lecture des fichiers de configuration"
-#: config.c:1743
+#: config.c:1970
+#, c-format
+msgid "Invalid %s: '%s'"
+msgstr "%s invalide : '%s'"
+
+#: config.c:1991
+#, 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
+#, 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
#, 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:1745
+#: config.c:2030
#, 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:1804
+#: config.c:2089
#, c-format
msgid "%s has multiple values"
msgstr "%s a des valeurs multiples"
-#: config.c:2225 config.c:2450
+#: config.c:2423 config.c:2648
#, c-format
msgid "fstat on %s failed"
msgstr "échec de fstat sur %s"
-#: config.c:2343
+#: config.c:2541
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "impossible de régler '%s' à '%s'"
-#: config.c:2345
+#: config.c:2543 builtin/remote.c:774
#, c-format
msgid "could not unset '%s'"
msgstr "impossible de désinitialiser '%s'"
@@ -1621,20 +1651,20 @@
"Erreurs dans la variable de configuration 'diff.dirstat' :\n"
"%s"
-#: diff.c:3085
+#: diff.c:3102
#, c-format
msgid "external diff died, stopping at %s"
msgstr "l'application de diff externe a disparu, arrêt à %s"
-#: diff.c:3411
+#: diff.c:3428
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only, --name-status, --check et -s sont mutuellement exclusifs"
-#: diff.c:3501
+#: diff.c:3518
msgid "--follow requires exactly one pathspec"
msgstr "--follow a besoin d'une spécification de chemin unique"
-#: diff.c:3664
+#: diff.c:3681
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -1643,24 +1673,24 @@
"Impossible d'analyser le paramètre de l'option --dirstat/-X :\n"
"%s"
-#: diff.c:3678
+#: diff.c:3695
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "Impossible d'analyser le paramètre de l'option --submodule : '%s'"
-#: diff.c:4696
+#: diff.c:4719
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:4699
+#: diff.c:4722
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:4702
+#: diff.c:4725
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -1668,186 +1698,211 @@
"vous souhaitez peut-être régler la variable %s à au moins %d et réessayer le "
"commande."
-#: dir.c:1862
+#: dir.c:1899
msgid "failed to get kernel name and information"
msgstr "echec de l'obtention d'information de kernel"
-#: dir.c:1981
+#: dir.c:2018
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:2759
+#: dir.c:2776 dir.c:2781
+#, c-format
+msgid "could not create directories for %s"
+msgstr "impossible de créer les répertoires pour %s"
+
+#: dir.c:2806
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "impossible de migrer le répertoire git de '%s' vers '%s'"
-#: fetch-pack.c:213
+#: entry.c:280
+#, c-format
+msgid "could not stat file '%s'"
+msgstr "impossible de stat le fichier '%s'"
+
+#: fetch-pack.c:249
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack : list courte attendue"
-#: fetch-pack.c:225
+#: fetch-pack.c:261
msgid "git fetch-pack: expected ACK/NAK, got EOF"
msgstr "git fetch-pack : ACK/NACK attendu, EOF reçu"
-#: fetch-pack.c:243
+#: fetch-pack.c:280 builtin/archive.c:63
+#, c-format
+msgid "remote error: %s"
+msgstr "erreur distante : %s"
+
+#: fetch-pack.c:281
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack : ACK/NACK attendu, '%s' reçu"
-#: fetch-pack.c:295
+#: fetch-pack.c:333
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc nécessite multi_ack_detailed"
-#: fetch-pack.c:381
+#: fetch-pack.c:419
#, c-format
msgid "invalid shallow line: %s"
msgstr "ligne de superficiel invalide : %s"
-#: fetch-pack.c:387
+#: fetch-pack.c:425
#, c-format
msgid "invalid unshallow line: %s"
msgstr "ligne de fin de superficiel invalide : %s"
-#: fetch-pack.c:389
+#: fetch-pack.c:427
#, c-format
msgid "object not found: %s"
msgstr "objet non trouvé : %s"
-#: fetch-pack.c:392
+#: fetch-pack.c:430
#, c-format
msgid "error in object: %s"
msgstr "Erreur dans l'objet : %s"
-#: fetch-pack.c:394
+#: fetch-pack.c:432
#, c-format
msgid "no shallow found: %s"
msgstr "Pas de superficiel trouvé : %s"
-#: fetch-pack.c:397
+#: fetch-pack.c:435
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "superficiel/non superficiel attendu, %s trouvé"
-#: fetch-pack.c:436
+#: fetch-pack.c:474
#, c-format
msgid "got %s %d %s"
msgstr "réponse %s %d %s"
-#: fetch-pack.c:450
+#: fetch-pack.c:488
#, c-format
msgid "invalid commit %s"
msgstr "commit invalide %s"
-#: fetch-pack.c:483
+#: fetch-pack.c:521
msgid "giving up"
msgstr "abandon"
-#: fetch-pack.c:493 progress.c:235
+#: fetch-pack.c:531 progress.c:235
msgid "done"
msgstr "fait"
-#: fetch-pack.c:505
+#: fetch-pack.c:543
#, c-format
msgid "got %s (%d) %s"
msgstr "%s trouvé (%d) %s"
-#: fetch-pack.c:551
+#: fetch-pack.c:589
#, c-format
msgid "Marking %s as complete"
msgstr "Marquage de %s comme terminé"
-#: fetch-pack.c:697
+#: fetch-pack.c:737
#, c-format
msgid "already have %s (%s)"
msgstr "%s déjà possédé (%s)"
-#: fetch-pack.c:735
+#: fetch-pack.c:775
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack : impossible de dupliquer le démultiplexeur latéral"
-#: fetch-pack.c:743
+#: fetch-pack.c:783
msgid "protocol error: bad pack header"
msgstr "erreur de protocole : mauvais entête de paquet"
-#: fetch-pack.c:799
+#: fetch-pack.c:839
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack : impossible de dupliquer %s"
-#: fetch-pack.c:815
+#: fetch-pack.c:855
#, c-format
msgid "%s failed"
msgstr "échec de %s"
-#: fetch-pack.c:817
+#: fetch-pack.c:857
msgid "error in sideband demultiplexer"
msgstr "erreur dans le démultiplexer latéral"
-#: fetch-pack.c:844
+#: fetch-pack.c:884
msgid "Server does not support shallow clients"
msgstr "Le serveur ne supporte les clients superficiels"
-#: fetch-pack.c:848
+#: fetch-pack.c:888
msgid "Server supports multi_ack_detailed"
msgstr "Le serveur supporte multi_ack_detailed"
-#: fetch-pack.c:851
+#: fetch-pack.c:891
msgid "Server supports no-done"
msgstr "Le serveur support no-done"
-#: fetch-pack.c:857
+#: fetch-pack.c:897
msgid "Server supports multi_ack"
msgstr "Le serveur supporte multi_ack"
-#: fetch-pack.c:861
+#: fetch-pack.c:901
msgid "Server supports side-band-64k"
msgstr "Le serveur supporte side-band-64k"
-#: fetch-pack.c:865
+#: fetch-pack.c:905
msgid "Server supports side-band"
msgstr "Le serveru supporte side-band"
-#: fetch-pack.c:869
+#: fetch-pack.c:909
msgid "Server supports allow-tip-sha1-in-want"
msgstr "Le serveur supporte allow-tip-sha1-in-want"
-#: fetch-pack.c:873
+#: fetch-pack.c:913
msgid "Server supports allow-reachable-sha1-in-want"
msgstr "Le serveur supporte allow-reachable-sha1-in-want"
-#: fetch-pack.c:883
+#: fetch-pack.c:923
msgid "Server supports ofs-delta"
msgstr "Le serveur support ofs-delta"
-#: fetch-pack.c:890
+#: fetch-pack.c:930
#, c-format
msgid "Server version is %.*s"
msgstr "La version du serveur est %.*s"
-#: fetch-pack.c:896
+#: fetch-pack.c:936
msgid "Server does not support --shallow-since"
msgstr "Le receveur ne gère pas --shallow-since"
-#: fetch-pack.c:900
+#: fetch-pack.c:940
msgid "Server does not support --shallow-exclude"
msgstr "Le receveur ne gère pas --shallow-exclude"
-#: fetch-pack.c:902
+#: fetch-pack.c:942
msgid "Server does not support --deepen"
msgstr "Le receveur ne gère pas --deepen"
-#: fetch-pack.c:913
+#: fetch-pack.c:953
msgid "no common commits"
msgstr "pas de commit commun"
-#: fetch-pack.c:925
+#: fetch-pack.c:965
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack : échec de le récupération."
-#: fetch-pack.c:1087
+#: fetch-pack.c:1127
msgid "no matching remote head"
msgstr "pas de HEAD distante correspondante"
+#: fetch-pack.c:1149
+#, c-format
+msgid "no such remote ref %s"
+msgstr "référence distante inconnue %s"
+
+#: fetch-pack.c:1152
+#, 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
msgid "gpg failed to sign the data"
msgstr "gpg n'a pas pu signer les données"
@@ -1866,17 +1921,17 @@
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "couleur invalide '%.*s' ignorée dans log.graphColors"
-#: grep.c:1794
+#: grep.c:1796
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s' : lecture de %s impossible"
-#: grep.c:1811 builtin/clone.c:381 builtin/diff.c:81 builtin/rm.c:133
+#: grep.c:1813 builtin/clone.c:399 builtin/diff.c:81 builtin/rm.c:133
#, c-format
msgid "failed to stat '%s'"
msgstr "échec du stat de '%s'"
-#: grep.c:1822
+#: grep.c:1824
#, c-format
msgid "'%s': short read"
msgstr "'%s' : lecture tronquée"
@@ -1946,7 +2001,7 @@
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: ident.c:334
+#: ident.c:343
msgid ""
"\n"
"*** Please tell me who you are.\n"
@@ -1972,6 +2027,39 @@
"Éliminez --global pour ne faire les réglages que dans ce dépôt.\n"
"\n"
+#: ident.c:367
+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
+#, c-format
+msgid "unable to auto-detect email address (got '%s')"
+msgstr "impossible de détecter automatiquement l'adresse ('%s' trouvé)"
+
+#: ident.c:382
+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
+#, c-format
+msgid "unable to auto-detect name (got '%s')"
+msgstr "impossible de détecter automatiquement le nom ('%s' trouvé)"
+
+#: ident.c:396
+#, c-format
+msgid "empty ident name (for <%s>) not allowed"
+msgstr "nom d'identifiant vide (pour <%s>) non permis"
+
+#: ident.c:402
+#, 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
+#, c-format
+msgid "invalid date format: %s"
+msgstr "format de date invalide : %s"
+
#: lockfile.c:152
#, c-format
msgid ""
@@ -2000,8 +2088,8 @@
msgid "failed to read the cache"
msgstr "impossible de lire le cache"
-#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374
-#: builtin/checkout.c:588 builtin/clone.c:731
+#: merge.c:96 builtin/am.c:1999 builtin/am.c:2034 builtin/checkout.c:393
+#: builtin/checkout.c:607 builtin/clone.c:749
msgid "unable to write new index file"
msgstr "impossible d'écrire le nouveau fichier d'index"
@@ -2071,7 +2159,7 @@
msgid "Unable to add %s to database"
msgstr "Impossible d'ajouter %s à la base de données"
-#: merge-recursive.c:1088 merge-recursive.c:1102
+#: merge-recursive.c:1092
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2080,7 +2168,16 @@
"CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de "
"%s laissée dans l'arbre."
-#: merge-recursive.c:1094 merge-recursive.c:1107
+#: merge-recursive.c:1097
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree."
+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
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2089,20 +2186,29 @@
"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:1150
+#: merge-recursive.c:1109
+#, 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 ""
+"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
msgid "rename"
msgstr "renommage"
-#: merge-recursive.c:1150
+#: merge-recursive.c:1143
msgid "renamed"
msgstr "renommé"
-#: merge-recursive.c:1207
+#: merge-recursive.c:1200
#, 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:1232
+#: merge-recursive.c:1225
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -2111,137 +2217,137 @@
"CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche "
"\"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s"
-#: merge-recursive.c:1237
+#: merge-recursive.c:1230
msgid " (left unresolved)"
msgstr " (laissé non résolu)"
-#: merge-recursive.c:1299
+#: merge-recursive.c:1292
#, 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:1332
+#: merge-recursive.c:1325
#, 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:1535
+#: merge-recursive.c:1528
#, 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:1550
+#: merge-recursive.c:1543
#, c-format
msgid "Adding merged %s"
msgstr "Ajout de %s fusionné"
-#: merge-recursive.c:1557 merge-recursive.c:1771
+#: merge-recursive.c:1550 merge-recursive.c:1780
#, c-format
msgid "Adding as %s instead"
msgstr "Ajout plutôt comme %s"
-#: merge-recursive.c:1614
+#: merge-recursive.c:1607
#, c-format
msgid "cannot read object %s"
msgstr "impossible de lire l'objet %s"
-#: merge-recursive.c:1617
+#: merge-recursive.c:1610
#, c-format
msgid "object %s is not a blob"
msgstr "l'objet %s n'est pas un blob"
-#: merge-recursive.c:1670
+#: merge-recursive.c:1679
msgid "modify"
msgstr "modification"
-#: merge-recursive.c:1670
+#: merge-recursive.c:1679
msgid "modified"
msgstr "modifié"
-#: merge-recursive.c:1680
+#: merge-recursive.c:1689
msgid "content"
msgstr "contenu"
-#: merge-recursive.c:1687
+#: merge-recursive.c:1696
msgid "add/add"
msgstr "ajout/ajout"
-#: merge-recursive.c:1723
+#: merge-recursive.c:1732
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "%s sauté (fusion identique à l'existant)"
-#: merge-recursive.c:1737
+#: merge-recursive.c:1746
#, c-format
msgid "Auto-merging %s"
msgstr "Fusion automatique de %s"
-#: merge-recursive.c:1741 git-submodule.sh:930
+#: merge-recursive.c:1750 git-submodule.sh:944
msgid "submodule"
msgstr "sous-module"
-#: merge-recursive.c:1742
+#: merge-recursive.c:1751
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "CONFLIT (%s) : Conflit de fusion dans %s"
-#: merge-recursive.c:1836
+#: merge-recursive.c:1845
#, c-format
msgid "Removing %s"
msgstr "Suppression de %s"
-#: merge-recursive.c:1862
+#: merge-recursive.c:1871
msgid "file/directory"
msgstr "fichier/répertoire"
-#: merge-recursive.c:1868
+#: merge-recursive.c:1877
msgid "directory/file"
msgstr "répertoire/fichier"
-#: merge-recursive.c:1874
+#: merge-recursive.c:1883
#, 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:1883
+#: merge-recursive.c:1892
#, c-format
msgid "Adding %s"
msgstr "Ajout de %s"
-#: merge-recursive.c:1920
+#: merge-recursive.c:1929
msgid "Already up-to-date!"
msgstr "Déjà à jour !"
-#: merge-recursive.c:1929
+#: merge-recursive.c:1938
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "échec de fusion des arbres %s et %s"
-#: merge-recursive.c:2012
+#: merge-recursive.c:2021
msgid "Merging:"
msgstr "Fusion :"
-#: merge-recursive.c:2025
+#: merge-recursive.c:2034
#, 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:2064
+#: merge-recursive.c:2073
msgid "merge returned no commit"
msgstr "la fusion n'a pas retourné de commit"
-#: merge-recursive.c:2127
+#: merge-recursive.c:2136
#, c-format
msgid "Could not parse object '%s'"
msgstr "Impossible d'analyser l'objet '%s'"
-#: merge-recursive.c:2141 builtin/merge.c:645 builtin/merge.c:792
+#: merge-recursive.c:2150 builtin/merge.c:645 builtin/merge.c:792
msgid "Unable to write index."
msgstr "Impossible d'écrire l'index."
@@ -2317,18 +2423,37 @@
msgid "malformed object name '%s'"
msgstr "nom d'objet malformé '%s'"
-#: path.c:826
+#: path.c:810
#, c-format
msgid "Could not make %s writable by group"
msgstr "Impossible de rendre %s inscriptible pour le groupe"
-#: pathspec.c:142
+#: pathspec.c:125
+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
+msgid "Only one 'attr:' specification is allowed."
+msgstr "Une seule spécification 'attr:' est autorisée."
+
+#: pathspec.c:146
+msgid "attr spec must not be empty"
+msgstr "un spécificateur d'attribut ne peut pas être vide"
+
+#: pathspec.c:189
+#, c-format
+msgid "invalid attribute name %s"
+msgstr "nom d'attribut invalide %s"
+
+#: pathspec.c:254
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:149
+#: pathspec.c:261
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
@@ -2336,53 +2461,53 @@
"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:188
+#: pathspec.c:301
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr "paramètre invalide pour le spécificateur magique de chemin 'prefix'"
-#: pathspec.c:201
+#: pathspec.c:322
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr "La spécification magique de chemin '%.*s' est invalide dans '%s'"
-#: pathspec.c:206
+#: pathspec.c:327
#, 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:238
+#: pathspec.c:365
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr "Spécificateur magique '%c' non implémenté dans '%s'"
-#: pathspec.c:293 pathspec.c:315
+#: 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:350
+#: pathspec.c:483
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s : 'literal' et 'glob' sont incompatibles"
-#: pathspec.c:363
+#: pathspec.c:496
#, c-format
msgid "%s: '%s' is outside repository"
msgstr "%s : '%s' est hors du dépôt"
-#: pathspec.c:451
+#: pathspec.c:584
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "'%s' (mnémonique : '%c')"
-#: pathspec.c:461
+#: pathspec.c:594
#, 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:511
+#: pathspec.c:644
msgid ""
"empty strings as pathspecs will be made invalid in upcoming releases. please "
"use . instead if you meant to match all paths"
@@ -2391,24 +2516,16 @@
"invalides dans les prochaines versions. Veuillez utiliser . à la place pour "
"correspondre à tous le chemins"
-#: pathspec.c:535
+#: pathspec.c:668
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "le chemin '%s' est au-delà d'un lien symbolique"
-#: pathspec.c:544
-msgid ""
-"There is nothing to exclude from by :(exclude) patterns.\n"
-"Perhaps you forgot to add either ':/' or '.' ?"
-msgstr ""
-"Il n'y a rien dont il faut exclure par des motifs :(exclure).\n"
-"Peut-être avez-vous oublié d'ajouter ':/' ou '.' ?"
-
#: pretty.c:982
msgid "unable to parse --pretty format"
msgstr "impossible d'analyser le format --pretty"
-#: read-cache.c:1307
+#: read-cache.c:1442
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -2417,7 +2534,7 @@
"version d'index renseignée, mais la valeur est invalide.\n"
"Utilisation de la version %i"
-#: read-cache.c:1317
+#: read-cache.c:1452
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -2426,161 +2543,269 @@
"GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n"
"Utilisation de la version %i"
-#: refs.c:576 builtin/merge.c:844
+#: read-cache.c:2375 sequencer.c:1350 sequencer.c:2048
+#, c-format
+msgid "could not stat '%s'"
+msgstr "stat impossible de '%s'"
+
+#: read-cache.c:2388
+#, c-format
+msgid "unable to open git dir: %s"
+msgstr "impossible d'ouvrir le répertoire git : %s"
+
+#: read-cache.c:2400
+#, c-format
+msgid "unable to unlink: %s"
+msgstr "échec lors de l'unlink : %s"
+
+#: refs.c:620 builtin/merge.c:844
#, c-format
msgid "Could not open '%s' for writing"
msgstr "Impossible d'ouvrir '%s' en écriture"
-#: refs/files-backend.c:2481
+#: refs.c:1667
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "mises à jour des références interdites en environnement de quarantaine"
+
+#: refs/files-backend.c:1631
#, c-format
msgid "could not delete reference %s: %s"
msgstr "Impossible de supprimer la référence %s : %s"
-#: refs/files-backend.c:2484
+#: refs/files-backend.c:1634
#, c-format
msgid "could not delete references: %s"
msgstr "impossible de supprimer les références : %s"
-#: refs/files-backend.c:2493
+#: refs/files-backend.c:1643
#, c-format
msgid "could not remove reference %s"
msgstr "impossible de supprimer la référence %s"
-#: ref-filter.c:56
+# à priori on parle d'une branche ici
+#: ref-filter.c:35 wt-status.c:1780
+msgid "gone"
+msgstr "disparue"
+
+#: ref-filter.c:36
+#, c-format
+msgid "ahead %d"
+msgstr "en avance de %d"
+
+#: ref-filter.c:37
+#, c-format
+msgid "behind %d"
+msgstr "en retard de %d"
+
+#: ref-filter.c:38
+#, c-format
+msgid "ahead %d, behind %d"
+msgstr "en avance de %d, en retard de %d"
+
+#: ref-filter.c:104
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "format attendu : %%(color:<couleur>)"
-#: ref-filter.c:58
+#: ref-filter.c:106
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "couleur non reconnue : %%(color:%s)"
-#: ref-filter.c:72
+#: ref-filter.c:120
#, c-format
-msgid "unrecognized format: %%(%s)"
-msgstr "format non reconnu %%(%s)"
+msgid "Integer value expected refname:lstrip=%s"
+msgstr "Valeur entière attendue refname:lstrip=%s"
-#: ref-filter.c:78
+#: ref-filter.c:124
+#, c-format
+msgid "Integer value expected refname:rstrip=%s"
+msgstr "Valeur entière attendue refname:rstrip=%s"
+
+#: ref-filter.c:126
+#, c-format
+msgid "unrecognized %%(%s) argument: %s"
+msgstr "argument %%(%s) non reconnu : %s"
+
+#: ref-filter.c:166
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) n'accepte pas d'argument"
-#: ref-filter.c:85
+#: ref-filter.c:173
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "%%(subject) n'accepte pas d'argument"
-#: ref-filter.c:92
+#: ref-filter.c:180
#, c-format
msgid "%%(trailers) does not take arguments"
msgstr "%%(trailers) n'accepte pas d'argument"
-#: ref-filter.c:111
+#: ref-filter.c:199
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "valeur positive attendue contents:lines=%s"
-#: ref-filter.c:113
+#: ref-filter.c:201
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "argument %%(contents) non reconnu : %s"
-#: ref-filter.c:123
+#: ref-filter.c:214
+#, c-format
+msgid "positive value expected objectname:short=%s"
+msgstr "valeur positive attendue objectname:short=%s"
+
+#: ref-filter.c:218
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "argument %%(objectname) non reconnu : %s"
-#: ref-filter.c:145
+#: ref-filter.c:245
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "format attendu : %%(align:<largeur>,<position>)"
-#: ref-filter.c:157
+#: ref-filter.c:257
#, c-format
msgid "unrecognized position:%s"
msgstr "position non reconnue : %s"
-#: ref-filter.c:161
+#: ref-filter.c:261
#, c-format
msgid "unrecognized width:%s"
msgstr "largeur non reconnue : %s"
-#: ref-filter.c:167
+#: ref-filter.c:267
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "argument %%(align) non reconnu : %s"
-#: ref-filter.c:171
+#: ref-filter.c:271
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "valeur positive attendue avec l'atome %%(align)"
-#: ref-filter.c:255
+#: ref-filter.c:286
+#, c-format
+msgid "unrecognized %%(if) argument: %s"
+msgstr "argument %%(if) non reconnu : %s"
+
+#: ref-filter.c:371
#, c-format
msgid "malformed field name: %.*s"
msgstr "nom de champ malformé %.*s"
-#: ref-filter.c:281
+#: ref-filter.c:397
#, c-format
msgid "unknown field name: %.*s"
msgstr "nom de champ inconnu : %.*s"
-#: ref-filter.c:383
+#: ref-filter.c:501
+#, c-format
+msgid "format: %%(if) atom used without a %%(then) atom"
+msgstr "format : atome %%(if) utilisé sans un atome %%(then)"
+
+#: ref-filter.c:561
+#, c-format
+msgid "format: %%(then) atom used without an %%(if) atom"
+msgstr "format : atome %%(then) utilisé sans un atome %%(if)"
+
+#: ref-filter.c:563
+#, c-format
+msgid "format: %%(then) atom used more than once"
+msgstr "format : atome %%(then) utilisé plus d'une fois"
+
+#: ref-filter.c:565
+#, c-format
+msgid "format: %%(then) atom used after %%(else)"
+msgstr "format: atome %%(then) utilisé après %%(else)"
+
+#: ref-filter.c:591
+#, c-format
+msgid "format: %%(else) atom used without an %%(if) atom"
+msgstr "format : atome %%(else) utilisé sans un atome %%(if)"
+
+#: ref-filter.c:593
+#, c-format
+msgid "format: %%(else) atom used without a %%(then) atom"
+msgstr "format : atome %%(else) utilisé sans un atome %%(then)"
+
+#: ref-filter.c:595
+#, c-format
+msgid "format: %%(else) atom used more than once"
+msgstr "format : atome %%(else) utilisé plus d'une fois"
+
+#: ref-filter.c:608
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "format : atome %%(end) utilisé sans atome correspondant"
-#: ref-filter.c:435
+#: ref-filter.c:663
#, c-format
msgid "malformed format string %s"
msgstr "Chaîne de formatage mal formée %s"
-#: ref-filter.c:898
-msgid ":strip= requires a positive integer argument"
-msgstr ":strip= requiert un argument entier positif"
-
-#: ref-filter.c:903
+#: ref-filter.c:1247
#, c-format
-msgid "ref '%s' does not have %ld components to :strip"
-msgstr "la réf '%s' n'a pas %ld composants à :strip"
+msgid "(no branch, rebasing %s)"
+msgstr "(aucune branche, rebasage de %s)"
-#: ref-filter.c:1066
+#: ref-filter.c:1250
#, c-format
-msgid "unknown %.*s format %s"
-msgstr "format de %.*s inconnu %s"
+msgid "(no branch, bisect started on %s)"
+msgstr "(aucune branche, bisect a démarré sur %s)"
-#: ref-filter.c:1086 ref-filter.c:1117
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached at " in wt-status.c
+#: ref-filter.c:1256
+#, 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
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr "(HEAD détachée depuis %s)"
+
+#: ref-filter.c:1265
+msgid "(no branch)"
+msgstr "(aucune branche)"
+
+#: ref-filter.c:1420 ref-filter.c:1451
#, c-format
msgid "missing object %s for %s"
msgstr "objet manquant %s pour %s"
-#: ref-filter.c:1089 ref-filter.c:1120
+#: ref-filter.c:1423 ref-filter.c:1454
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "echec de parse_object_buffer sur %s pour %s"
-#: ref-filter.c:1343
+#: ref-filter.c:1692
#, c-format
msgid "malformed object at '%s'"
msgstr "objet malformé à '%s'"
-#: ref-filter.c:1410
+#: ref-filter.c:1759
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "réf avec un nom cassé %s ignoré"
-#: ref-filter.c:1415
+#: ref-filter.c:1764
#, c-format
msgid "ignoring broken ref %s"
msgstr "réf cassé %s ignoré"
-#: ref-filter.c:1670
+#: ref-filter.c:2028
#, c-format
msgid "format: %%(end) atom missing"
msgstr "format: atome %%(end) manquant"
-#: ref-filter.c:1734
+#: ref-filter.c:2109
#, c-format
msgid "malformed object name %s"
msgstr "nom d'objet malformé %s"
@@ -2732,15 +2957,25 @@
msgid "dup2(%d,%d) failed"
msgstr "échec de dup2(%d,%d)"
-#: send-pack.c:297
+#: send-pack.c:150
+#, c-format
+msgid "unable to parse remote unpack status: %s"
+msgstr "impossible d'analyser le status de dépaquetage remote : %s"
+
+#: send-pack.c:152
+#, c-format
+msgid "remote unpack failed: %s"
+msgstr "le dépaquetage a échoué : %s"
+
+#: send-pack.c:315
msgid "failed to sign the push certificate"
msgstr "impossible de signer le certificat de poussée"
-#: send-pack.c:410
+#: send-pack.c:428
msgid "the receiving end does not support --signed push"
msgstr "Le receveur ne gère pas les poussées avec --signed"
-#: send-pack.c:412
+#: send-pack.c:430
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -2748,11 +2983,11 @@
"pas d'envoi de certificat de poussée car le receveur ne gère pas les "
"poussées avec --signed"
-#: send-pack.c:424
+#: send-pack.c:442
msgid "the receiving end does not support --atomic push"
msgstr "Le receveur ne gère pas les poussées avec --atomic"
-#: send-pack.c:429
+#: send-pack.c:447
msgid "the receiving end does not support push options"
msgstr "Le receveur ne gère pas les options de poussées"
@@ -2791,12 +3026,12 @@
"avec 'git add <chemins>' ou 'git rm <chemins>'\n"
"puis validez le résultat avec 'git commit'"
-#: sequencer.c:294 sequencer.c:1667
+#: sequencer.c:294 sequencer.c:1682
#, c-format
msgid "could not lock '%s'"
msgstr "impossible de verrouiller '%s'"
-#: sequencer.c:297 sequencer.c:1545 sequencer.c:1672 sequencer.c:1686
+#: sequencer.c:297 sequencer.c:1560 sequencer.c:1687 sequencer.c:1701
#, c-format
msgid "could not write to '%s'"
msgstr "impossible d'écrire dans '%s'"
@@ -2806,13 +3041,13 @@
msgid "could not write eol to '%s'"
msgstr "impossible d'écrire la fin de ligne dans '%s'"
-#: sequencer.c:305 sequencer.c:1550 sequencer.c:1674
+#: sequencer.c:305 sequencer.c:1565 sequencer.c:1689
#, c-format
msgid "failed to finalize '%s'."
msgstr "échec lors de la finalisation de '%s'."
-#: sequencer.c:329 sequencer.c:808 sequencer.c:1571 builtin/am.c:259
-#: builtin/commit.c:749 builtin/merge.c:1036
+#: sequencer.c:329 sequencer.c:814 sequencer.c:1586 builtin/am.c:257
+#: builtin/commit.c:749 builtin/merge.c:1018
#, c-format
msgid "could not read '%s'"
msgstr "impossible de lire '%s'"
@@ -2876,17 +3111,17 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:688
+#: sequencer.c:694
#, c-format
msgid "could not parse commit %s\n"
msgstr "impossible d'analyser le commit %s\n"
-#: sequencer.c:693
+#: sequencer.c:699
#, c-format
msgid "could not parse parent commit %s\n"
msgstr "impossible d'analyser le commit parent %s\n"
-#: sequencer.c:815
+#: sequencer.c:821
#, c-format
msgid ""
"unexpected 1st line of squash message:\n"
@@ -2897,7 +3132,7 @@
"\n"
"\t%.*s"
-#: sequencer.c:821
+#: sequencer.c:827
#, c-format
msgid ""
"invalid 1st line of squash message:\n"
@@ -2908,232 +3143,232 @@
"\n"
"\t%.*s"
-#: sequencer.c:827 sequencer.c:852
+#: sequencer.c:833 sequencer.c:858
#, c-format
msgid "This is a combination of %d commits."
msgstr "Ceci est la combinaison de %d commits."
-#: sequencer.c:836
+#: sequencer.c:842
msgid "need a HEAD to fixup"
msgstr "une HEAD est nécessaire à la correction"
-#: sequencer.c:838
+#: sequencer.c:844
msgid "could not read HEAD"
msgstr "Impossible de lire HEAD"
-#: sequencer.c:840
+#: sequencer.c:846
msgid "could not read HEAD's commit message"
msgstr "impossible de lire le message de validation de HEAD"
-#: sequencer.c:846
+#: sequencer.c:852
#, c-format
msgid "cannot write '%s'"
msgstr "impossible d'écrire '%s'"
-#: sequencer.c:855 git-rebase--interactive.sh:445
+#: sequencer.c:861 git-rebase--interactive.sh:445
msgid "This is the 1st commit message:"
msgstr "Ceci est le premier message de validation :"
-#: sequencer.c:863
+#: sequencer.c:869
#, c-format
msgid "could not read commit message of %s"
msgstr "impossible de lire le message de validation de %s"
-#: sequencer.c:870
+#: sequencer.c:876
#, c-format
msgid "This is the commit message #%d:"
msgstr "Ceci est le message de validation numéro %d :"
-#: sequencer.c:875
+#: sequencer.c:881
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Le message de validation %d sera ignoré :"
-#: sequencer.c:880
+#: sequencer.c:886
#, c-format
msgid "unknown command: %d"
msgstr "commande inconnue : %d"
-#: sequencer.c:946
+#: sequencer.c:952
msgid "your index file is unmerged."
msgstr "votre fichier d'index n'est pas fusionné."
-#: sequencer.c:964
+#: sequencer.c:970
#, 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:972
+#: sequencer.c:978
#, c-format
msgid "commit %s does not have parent %d"
msgstr "le commit %s n'a pas de parent %d"
-#: sequencer.c:976
+#: sequencer.c:982
#, 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:982
+#: sequencer.c:988
#, 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:1001
+#: sequencer.c:1009
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s : impossible d'analyser le commit parent %s"
-#: sequencer.c:1063 sequencer.c:1812
+#: sequencer.c:1071 sequencer.c:1827
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "impossible de renommer '%s' en '%s'"
-#: sequencer.c:1114
+#: sequencer.c:1122
#, c-format
msgid "could not revert %s... %s"
msgstr "impossible d'annuler %s... %s"
-#: sequencer.c:1115
+#: sequencer.c:1123
#, c-format
msgid "could not apply %s... %s"
msgstr "impossible d'appliquer %s... %s"
-#: sequencer.c:1157
+#: sequencer.c:1165
msgid "empty commit set passed"
msgstr "l'ensemble de commits spécifié est vide"
-#: sequencer.c:1167
+#: sequencer.c:1175
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s : échec à la lecture de l'index"
-#: sequencer.c:1174
+#: sequencer.c:1182
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s : échec du rafraîchissement de l'index"
-#: sequencer.c:1294
+#: sequencer.c:1303
#, c-format
msgid "invalid line %d: %.*s"
msgstr "ligne %d invalide : %.*s"
-#: sequencer.c:1302
+#: sequencer.c:1311
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "'%s' impossible avec le commit précédent"
-#: sequencer.c:1334
+#: sequencer.c:1344
#, c-format
msgid "could not read '%s'."
msgstr "impossible de lire '%s'."
-#: sequencer.c:1341
+#: sequencer.c:1356
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'."
-#: sequencer.c:1343
+#: sequencer.c:1358
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "feuille d'instruction inutilisable : '%s'"
-#: sequencer.c:1348
+#: sequencer.c:1363
msgid "no commits parsed."
msgstr "aucun commit analysé."
-#: sequencer.c:1359
+#: sequencer.c:1374
msgid "cannot cherry-pick during a revert."
msgstr "impossible de picorer pendant l'annulation d'un commit."
-#: sequencer.c:1361
+#: sequencer.c:1376
msgid "cannot revert during a cherry-pick."
msgstr "impossible d'annuler un commit pendant un picorage."
-#: sequencer.c:1424
+#: sequencer.c:1439
#, c-format
msgid "invalid key: %s"
msgstr "clé invalide : %s"
-#: sequencer.c:1427
+#: sequencer.c:1442
#, c-format
msgid "invalid value for %s: %s"
msgstr "valeur invalide pour %s : %s"
-#: sequencer.c:1484
+#: sequencer.c:1499
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "feuille d'options malformée : %s"
-#: sequencer.c:1522
+#: sequencer.c:1537
msgid "a cherry-pick or revert is already in progress"
msgstr "un picorage ou un retour est déjà en cours"
-#: sequencer.c:1523
+#: sequencer.c:1538
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "essayez \"git cherry-pick (--continue|--quit|-- abort)\""
-#: sequencer.c:1526
+#: sequencer.c:1541
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "impossible de créer le répertoire de séquenceur '%s'"
-#: sequencer.c:1540
+#: sequencer.c:1555
msgid "could not lock HEAD"
msgstr "impossible de verrouiller HEAD"
-#: sequencer.c:1596 sequencer.c:2150
+#: sequencer.c:1611 sequencer.c:2181
msgid "no cherry-pick or revert in progress"
msgstr "aucun picorage ou retour en cours"
-#: sequencer.c:1598
+#: sequencer.c:1613
msgid "cannot resolve HEAD"
msgstr "impossible de résoudre HEAD"
-#: sequencer.c:1600 sequencer.c:1634
+#: sequencer.c:1615 sequencer.c:1649
msgid "cannot abort from a branch yet to be born"
msgstr "impossible d'abandonner depuis une branche non encore créée"
-#: sequencer.c:1620 builtin/grep.c:904
+#: sequencer.c:1635 builtin/grep.c:910
#, c-format
msgid "cannot open '%s'"
msgstr "impossible d'ouvrir '%s'"
-#: sequencer.c:1622
+#: sequencer.c:1637
#, c-format
msgid "cannot read '%s': %s"
msgstr "impossible de lire '%s' : %s"
-#: sequencer.c:1623
+#: sequencer.c:1638
msgid "unexpected end of file"
msgstr "fin de fichier inattendue"
-#: sequencer.c:1629
+#: sequencer.c:1644
#, 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:1640
+#: sequencer.c:1655
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:1777 sequencer.c:2049
+#: sequencer.c:1792 sequencer.c:2080
msgid "cannot read HEAD"
msgstr "impossible de lire HEAD"
-#: sequencer.c:1817 builtin/difftool.c:574
+#: sequencer.c:1832 builtin/difftool.c:616
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "impossible de copier '%s' vers '%s'"
-#: sequencer.c:1833
+#: sequencer.c:1848
msgid "could not read index"
msgstr "impossible de lire l'index"
-#: sequencer.c:1838
+#: sequencer.c:1853
#, c-format
msgid ""
"execution failed: %s\n"
@@ -3148,11 +3383,11 @@
"git rebase --continue\n"
"\n"
-#: sequencer.c:1844
+#: sequencer.c:1859
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:1850
+#: sequencer.c:1865
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -3169,17 +3404,17 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:1905 git-rebase.sh:168
+#: sequencer.c:1920 git-rebase.sh:169
#, c-format
msgid "Applied autostash."
msgstr "Autoremisage appliqué."
-#: sequencer.c:1917
+#: sequencer.c:1932
#, c-format
msgid "cannot store %s"
msgstr "impossible de stocker %s"
-#: sequencer.c:1919 git-rebase.sh:172
+#: sequencer.c:1934 git-rebase.sh:173
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
@@ -3190,57 +3425,57 @@
"Vos modifications sont à l'abri dans la remise.\n"
"Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n"
-#: sequencer.c:2000
+#: sequencer.c:2016
#, c-format
-msgid "stopped at %s... %.*s"
-msgstr "arrêt à %s... %.*s"
+msgid "Stopped at %s... %.*s\n"
+msgstr "arrêt à %s... %.*s\n"
-#: sequencer.c:2027
+#: sequencer.c:2058
#, c-format
msgid "unknown command %d"
msgstr "commande inconnue %d"
-#: sequencer.c:2057
+#: sequencer.c:2088
msgid "could not read orig-head"
msgstr "impossible de lire orig-head"
-#: sequencer.c:2061
+#: sequencer.c:2092
msgid "could not read 'onto'"
msgstr "impossible de lire 'onto'"
-#: sequencer.c:2068
+#: sequencer.c:2099
#, c-format
msgid "could not update %s"
msgstr "impossible de mettre à jour %s"
-#: sequencer.c:2075
+#: sequencer.c:2106
#, c-format
msgid "could not update HEAD to %s"
msgstr "impossible de mettre à jour HEAD sur %s"
-#: sequencer.c:2159
+#: sequencer.c:2190
msgid "cannot rebase: You have unstaged changes."
msgstr "impossible de rebaser : vous avez des modifications non indexées."
-#: sequencer.c:2164
+#: sequencer.c:2195
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "impossible de supprimer CHERRY_PICK_HEAD"
-#: sequencer.c:2173
+#: sequencer.c:2204
msgid "cannot amend non-existing commit"
msgstr "impossible de corriger un commit non-existant"
-#: sequencer.c:2175
+#: sequencer.c:2206
#, c-format
msgid "invalid file: '%s'"
msgstr "fichier invalide : '%s'"
-#: sequencer.c:2177
+#: sequencer.c:2208
#, c-format
msgid "invalid contents: '%s'"
msgstr "contenu invalide : '%s'"
-#: sequencer.c:2180
+#: sequencer.c:2211
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -3250,25 +3485,25 @@
"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:2190
+#: sequencer.c:2221
msgid "could not commit staged changes."
msgstr "impossible de valider les modifications indexées."
-#: sequencer.c:2270
+#: sequencer.c:2301
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s : impossible de picorer un %s"
-#: sequencer.c:2274
+#: sequencer.c:2305
#, c-format
msgid "%s: bad revision"
msgstr "%s : mauvaise révision"
-#: sequencer.c:2307
+#: sequencer.c:2338
msgid "can't revert as initial commit"
msgstr "impossible d'annuler en tant que commit initial"
-#: setup.c:160
+#: setup.c:165
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
@@ -3278,7 +3513,7 @@
"Utilisez 'git <commande> -- <chemin>...' pour spécifier des chemins qui "
"n'existent pas localement."
-#: setup.c:173
+#: setup.c:178
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -3289,7 +3524,7 @@
"Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n"
"'git <commande> [<révision>...] -- [<chemin>...]'"
-#: setup.c:223
+#: setup.c:228
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
@@ -3300,29 +3535,34 @@
"Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n"
"'git <commande> [<révision>...] -- [<chemin>...]'"
-#: setup.c:470
+#: setup.c:475
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "Version attendue du dépôt git <= %d, %d trouvée"
-#: setup.c:478
+#: setup.c:483
msgid "unknown repository extensions found:"
msgstr "extensions de dépôt inconnues trouvées :"
-#: setup.c:768
+#: setup.c:776
#, 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:770 setup.c:922 builtin/index-pack.c:1643
+#: setup.c:778 builtin/index-pack.c:1646
msgid "Cannot come back to cwd"
msgstr "Impossible de revenir au répertoire de travail courant"
-#: setup.c:852
+#: setup.c:1010
msgid "Unable to read current working directory"
msgstr "Impossible d'accéder au répertoire de travail courant"
-#: setup.c:927
+#: setup.c:1022 setup.c:1028
+#, c-format
+msgid "Cannot change to '%s'"
+msgstr "Impossible de modifié en '%s'"
+
+#: setup.c:1041
#, c-format
msgid ""
"Not a git repository (or any parent up to mount point %s)\n"
@@ -3333,12 +3573,7 @@
"Arrêt à la limite du système de fichiers (GIT_DISCOVERY_ACROSS_FILESYSTEM "
"n'est pas activé)."
-#: setup.c:934
-#, c-format
-msgid "Cannot change to '%s/..'"
-msgstr "Impossible de se déplacer vers le répertoire '%s/..'"
-
-#: setup.c:996
+#: setup.c:1106
#, c-format
msgid ""
"Problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -3348,58 +3583,58 @@
"Le propriétaire des fichiers doit toujours avoir les droits en lecture et "
"écriture."
-#: sha1_file.c:490
+#: sha1_file.c:559
#, c-format
msgid "path '%s' does not exist"
msgstr "le chemin '%s' n'existe pas"
-#: sha1_file.c:516
+#: sha1_file.c:585
#, 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:522
+#: sha1_file.c:591
#, 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:528
+#: sha1_file.c:597
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "le dépôt de référence '%s' est superficiel"
-#: sha1_file.c:536
+#: sha1_file.c:605
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "le dépôt de référence '%s' est greffé"
-#: sha1_file.c:1176
+#: sha1_file.c:1245
msgid "offset before end of packfile (broken .idx?)"
msgstr "offset avant la fin du fichier paquet (.idx cassé ?)"
-#: sha1_file.c:2637
+#: sha1_file.c:2721
#, 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:2641
+#: sha1_file.c:2725
#, 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:407
+#: sha1_name.c:409
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr "le SHA1 court %s est ambigu"
-#: sha1_name.c:418
+#: sha1_name.c:420
msgid "The candidates are:"
msgstr "Les candidats sont :"
-#: sha1_name.c:578
+#: sha1_name.c:580
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"
@@ -3424,47 +3659,57 @@
"message\n"
"en lançant \"git config advice.objectNameWarning false\""
-#: submodule.c:65 submodule.c:99
+#: submodule.c:67 submodule.c:101
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
"Modification impossible de .gitmodules non fusionné, résolvez les conflits "
"d'abord"
-#: submodule.c:69 submodule.c:103
+#: submodule.c:71 submodule.c:105
#, 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:77
+#: submodule.c:79
#, 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:110
+#: submodule.c:112
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "Impossible de supprimer l'élément de .gitmodules pour %s"
-#: submodule.c:121
+#: submodule.c:123
msgid "staging updated .gitmodules failed"
msgstr "échec de la mise en index du .gitmodules mis à jour"
-#: submodule.c:159
+#: submodule.c:161
msgid "negative values not allowed for submodule.fetchJobs"
msgstr "les valeurs négatives ne sont pas permises pour submodule.fetchJobs"
-#: submodule.c:1184
+#: submodule.c:1194
#, c-format
-msgid "could not start 'git status in submodule '%s'"
+msgid "'%s' not recognized as a git repository"
+msgstr "'%s' n'est pas reconnu comme dépôt git"
+
+#: submodule.c:1332
+#, 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:1197
+#: submodule.c:1345
#, c-format
-msgid "could not run 'git status in submodule '%s'"
+msgid "could not run 'git status' in submodule '%s'"
msgstr "impossible de lancer 'git status' dans le sous-module '%s'"
-#: submodule.c:1398
+#: submodule.c:1421
+#, c-format
+msgid "submodule '%s' has dirty index"
+msgstr "le sous-module '%s' a un index sale"
+
+#: submodule.c:1678
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -3472,18 +3717,18 @@
"relocate_gitdir pour le sous-module '%s' avec plus d'un arbre de travail "
"n'est pas supporté"
-#: submodule.c:1410 submodule.c:1471
+#: submodule.c:1690 submodule.c:1746
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "impossible de trouve le nom pour le sous-module '%s'"
-#: submodule.c:1414 submodule.c:1474 builtin/submodule--helper.c:640
-#: builtin/submodule--helper.c:650
+#: submodule.c:1694 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:1420
+#: submodule.c:1697
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -3494,12 +3739,25 @@
"'%s' sur\n"
"'%s'\n"
-#: submodule.c:1512
+#: submodule.c:1781
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "récursion impossible dans le sous-module '%s'"
-#: submodule-config.c:360
+#: submodule.c:1825
+msgid "could not start ls-files in .."
+msgstr "impossible de démarrer ls-files dans .."
+
+#: submodule.c:1845
+msgid "BUG: returned path string doesn't match cwd?"
+msgstr "BUG : le chemin renvoyé ne correspond pas à cwd ?"
+
+#: submodule.c:1864
+#, 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
#, c-format
msgid "invalid value for %s"
msgstr "Valeur invalide pour %s"
@@ -3568,7 +3826,7 @@
msgid "transport: invalid depth option '%s'"
msgstr "transport : option de profondeur invalide '%s'"
-#: transport.c:885
+#: transport.c:889
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -3577,7 +3835,7 @@
"Les chemins suivant de sous-module contiennent des modifications\n"
"qui ne peuvent être trouvées sur aucun distant :\n"
-#: transport.c:889
+#: transport.c:893
#, c-format
msgid ""
"\n"
@@ -3604,11 +3862,11 @@
"pour les pousser vers un serveur distant.\n"
"\n"
-#: transport.c:897
+#: transport.c:901
msgid "Aborting."
msgstr "Abandon."
-#: transport-helper.c:1082
+#: transport-helper.c:1080
#, c-format
msgid "Could not read ref %s"
msgstr "impossible de lire la réf %s"
@@ -3629,7 +3887,7 @@
msgid "too-short tree file"
msgstr "fichier arbre trop court"
-#: unpack-trees.c:99
+#: unpack-trees.c:104
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -3640,7 +3898,7 @@
"%%sVeuillez valider ou remiser vos modifications avant de basculer de "
"branche."
-#: unpack-trees.c:101
+#: unpack-trees.c:106
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -3650,7 +3908,7 @@
"l'extraction :\n"
"%%s"
-#: unpack-trees.c:104
+#: unpack-trees.c:109
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -3660,7 +3918,7 @@
"fusion :\n"
"%%sVeuillez valider ou remiser vos modifications avant la fusion."
-#: unpack-trees.c:106
+#: unpack-trees.c:111
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -3670,7 +3928,7 @@
"fusion :\n"
"%%s"
-#: unpack-trees.c:109
+#: unpack-trees.c:114
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -3679,7 +3937,7 @@
"Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"
"%%sVeuillez valider ou remiser vos modifications avant %s."
-#: unpack-trees.c:111
+#: unpack-trees.c:116
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -3688,7 +3946,7 @@
"Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"
"%%s"
-#: unpack-trees.c:116
+#: unpack-trees.c:121
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -3698,7 +3956,7 @@
"contenus :\n"
"%s"
-#: unpack-trees.c:120
+#: unpack-trees.c:125
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -3708,7 +3966,7 @@
"l'extraction :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."
-#: unpack-trees.c:122
+#: unpack-trees.c:127
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -3717,7 +3975,7 @@
"Les fichiers suivants non suivis seraient effacés par l'extraction :\n"
"%%s"
-#: unpack-trees.c:125
+#: unpack-trees.c:130
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -3727,7 +3985,7 @@
"la fusion :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant la fusion."
-#: unpack-trees.c:127
+#: unpack-trees.c:132
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -3736,7 +3994,7 @@
"Les fichiers suivants non suivis seraient effacés par la fusion :\n"
"%%s"
-#: unpack-trees.c:130
+#: unpack-trees.c:135
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -3746,7 +4004,7 @@
"%s :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant %s."
-#: unpack-trees.c:132
+#: unpack-trees.c:137
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -3755,7 +4013,7 @@
"Les fichiers suivants non suivis seraient effacés par %s :\n"
"%%s"
-#: unpack-trees.c:137
+#: unpack-trees.c:142
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -3766,7 +4024,7 @@
"l'extraction :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."
-#: unpack-trees.c:139
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -3776,7 +4034,7 @@
"Les fichiers suivants non suivis seraient écrasés par l'extraction :\n"
"%%s"
-#: unpack-trees.c:142
+#: unpack-trees.c:147
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -3786,7 +4044,7 @@
"la fusion :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant la fusion."
-#: unpack-trees.c:144
+#: unpack-trees.c:149
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -3795,7 +4053,7 @@
"Les fichiers suivants non suivis seraient écrasés par la fusion :\n"
"%%s"
-#: unpack-trees.c:147
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -3805,7 +4063,7 @@
"%s :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant %s."
-#: unpack-trees.c:149
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -3814,12 +4072,12 @@
"Les fichiers suivants non suivis seraient écrasés par %s :\n"
"%%s"
-#: unpack-trees.c:156
+#: unpack-trees.c:161
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "L'entrée '%s' surcharge avec '%s'. Affectation impossible."
-#: unpack-trees.c:159
+#: unpack-trees.c:164
#, c-format
msgid ""
"Cannot update sparse checkout: the following entries are not up-to-date:\n"
@@ -3829,7 +4087,7 @@
"pas à jour :\n"
"%s"
-#: unpack-trees.c:161
+#: unpack-trees.c:166
#, c-format
msgid ""
"The following working tree files would be overwritten by sparse checkout "
@@ -3840,7 +4098,7 @@
"jour par l'extraction creuse :\n"
"%s"
-#: unpack-trees.c:163
+#: unpack-trees.c:168
#, c-format
msgid ""
"The following working tree files would be removed by sparse checkout "
@@ -3851,45 +4109,61 @@
"à jour par extraction creuse :\n"
"%s"
-#: unpack-trees.c:240
+#: unpack-trees.c:170
+#, c-format
+msgid ""
+"Cannot update submodule:\n"
+"%s"
+msgstr ""
+"Mise à jour impossible pour le sous-module :\n"
+"%s"
+
+#: unpack-trees.c:247
#, c-format
msgid "Aborting\n"
msgstr "Abandon\n"
-#: unpack-trees.c:270
+#: unpack-trees.c:272
+#, 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
msgid "Checking out files"
msgstr "Extraction des fichiers"
-#: urlmatch.c:120
+#: urlmatch.c:163
msgid "invalid URL scheme name or missing '://' suffix"
msgstr "nom de schéma d'URL invalide ou suffixe '://' manquant"
-#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
+#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
#, c-format
msgid "invalid %XX escape sequence"
msgstr "séquence d'échappement %XX invalide"
-#: urlmatch.c:172
+#: urlmatch.c:215
msgid "missing host and scheme is not 'file:'"
msgstr "hôte manquant et le schéma n'est pas 'file:'"
-#: urlmatch.c:189
+#: urlmatch.c:232
msgid "a 'file:' URL may not have a port number"
msgstr "une URL 'file:' ne peut pas contenir de numéro de port"
-#: urlmatch.c:199
+#: urlmatch.c:247
msgid "invalid characters in host name"
msgstr "caractères invalides dans le nom d'hôte"
-#: urlmatch.c:244 urlmatch.c:255
+#: urlmatch.c:292 urlmatch.c:303
msgid "invalid port number"
msgstr "numéro de port invalide"
-#: urlmatch.c:322
+#: urlmatch.c:371
msgid "invalid '..' path segment"
msgstr "segment de chemin '..' invalide"
-#: worktree.c:282
+#: worktree.c:285
#, c-format
msgid "failed to read '%s'"
msgstr "échec de la lecture de '%s'"
@@ -3904,28 +4178,28 @@
msgid "could not open '%s' for writing"
msgstr "impossible d'ouvrir '%s' en écriture"
-#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759
-#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1033
+#: 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
#, c-format
msgid "could not open '%s' for reading"
msgstr "impossible d'ouvrir '%s' en lecture"
-#: wrapper.c:605 wrapper.c:626
+#: wrapper.c:581 wrapper.c:602
#, c-format
msgid "unable to access '%s'"
msgstr "impossible d'accéder à '%s'"
-#: wrapper.c:634
+#: wrapper.c:610
msgid "unable to get current working directory"
msgstr "impossible d'accéder au répertoire de travail courant"
-#: wrapper.c:658
+#: wrapper.c:634
#, c-format
msgid "could not write to %s"
msgstr "Impossible d'écrire dans %s"
-#: wrapper.c:660
+#: wrapper.c:636
#, c-format
msgid "could not close %s"
msgstr "impossible de fermer %s"
@@ -3957,11 +4231,11 @@
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:945
+#: wt-status.c:199 wt-status.c:958
msgid "Changes to be committed:"
msgstr "Modifications qui seront validées :"
-#: wt-status.c:217 wt-status.c:954
+#: wt-status.c:217 wt-status.c:967
msgid "Changes not staged for commit:"
msgstr "Modifications qui ne seront pas validées :"
@@ -4066,15 +4340,15 @@
msgid "untracked content, "
msgstr "contenu non suivi, "
-#: wt-status.c:818
+#: wt-status.c:831
msgid "Submodules changed but not updated:"
msgstr "Sous-modules modifiés mais non mis à jour :"
-#: wt-status.c:820
+#: wt-status.c:833
msgid "Submodule changes to be committed:"
msgstr "Changements du sous-module à valider :"
-#: wt-status.c:901
+#: wt-status.c:914
msgid ""
"Do not touch the line above.\n"
"Everything below will be removed."
@@ -4082,107 +4356,107 @@
"Ne touchez pas à la ligne ci-dessus\n"
"Tout ce qui suit sera éliminé."
-#: wt-status.c:1013
+#: wt-status.c:1026
msgid "You have unmerged paths."
msgstr "Vous avez des chemins non fusionnés."
-#: wt-status.c:1016
+#: wt-status.c:1029
msgid " (fix conflicts and run \"git commit\")"
msgstr " (réglez les conflits puis lancez \"git commit\")"
-#: wt-status.c:1018
+#: wt-status.c:1031
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (utilisez \"git merge --abort\" pour annuler la fusion)"
-#: wt-status.c:1023
+#: wt-status.c:1036
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:1026
+#: wt-status.c:1039
msgid " (use \"git commit\" to conclude merge)"
msgstr " (utilisez \"git commit\" pour terminer la fusion)"
-#: wt-status.c:1036
+#: wt-status.c:1049
msgid "You are in the middle of an am session."
msgstr "Vous êtes au milieu d'une session am."
-#: wt-status.c:1039
+#: wt-status.c:1052
msgid "The current patch is empty."
msgstr "Le patch actuel est vide."
-#: wt-status.c:1043
+#: wt-status.c:1056
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (réglez les conflits puis lancez \"git am --continue\")"
-#: wt-status.c:1045
+#: wt-status.c:1058
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (utilisez \"git am --skip\" pour sauter ce patch)"
-#: wt-status.c:1047
+#: wt-status.c:1060
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (utilisez \"git am --abort\" pour restaurer la branche d'origine)"
-#: wt-status.c:1176
+#: wt-status.c:1189
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo est manquant."
-#: wt-status.c:1178
+#: wt-status.c:1191
msgid "No commands done."
msgstr "Aucune commande réalisée."
-#: wt-status.c:1181
+#: wt-status.c:1194
#, 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:1192
+#: wt-status.c:1205
#, c-format
msgid " (see more in file %s)"
msgstr " (voir plus dans le fichier %s)"
-#: wt-status.c:1197
+#: wt-status.c:1210
msgid "No commands remaining."
msgstr "Aucune commande restante."
-#: wt-status.c:1200
+#: wt-status.c:1213
#, 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:1208
+#: wt-status.c:1221
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (utilisez \"git rebase --edit-todo\" pour voir et éditer)"
-#: wt-status.c:1221
+#: wt-status.c:1234
#, 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:1226
+#: wt-status.c:1239
msgid "You are currently rebasing."
msgstr "Vous êtes en train de rebaser."
-#: wt-status.c:1240
+#: wt-status.c:1253
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (réglez les conflits puis lancez \"git rebase --continue\")"
-#: wt-status.c:1242
+#: wt-status.c:1255
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (utilisez \"git rebase --skip\" pour sauter ce patch)"
-#: wt-status.c:1244
+#: wt-status.c:1257
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:1250
+#: wt-status.c:1263
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (tous les conflits sont réglés : lancez \"git rebase --continue\")"
-#: wt-status.c:1254
+#: wt-status.c:1267
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -4190,124 +4464,124 @@
"Vous êtes actuellement en train de fractionner un commit pendant un rebasage "
"de la branche '%s' sur '%s'."
-#: wt-status.c:1259
+#: wt-status.c:1272
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:1262
+#: wt-status.c:1275
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:1266
+#: wt-status.c:1279
#, 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:1271
+#: wt-status.c:1284
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:1274
+#: wt-status.c:1287
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (utilisez \"git commit --amend\" pour corriger le commit actuel)"
-#: wt-status.c:1276
+#: wt-status.c:1289
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:1286
+#: wt-status.c:1299
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Vous êtes actuellement en train de picorer le commit %s."
-#: wt-status.c:1291
+#: wt-status.c:1304
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (réglez les conflits puis lancez \"git cherry-pick --continue\")"
-#: wt-status.c:1294
+#: wt-status.c:1307
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:1296
+#: wt-status.c:1309
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:1305
+#: wt-status.c:1318
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Vous êtes actuellement en train de rétablir le commit %s."
-#: wt-status.c:1310
+#: wt-status.c:1323
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (réglez les conflits puis lancez \"git revert --continue\")"
-#: wt-status.c:1313
+#: wt-status.c:1326
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (tous les conflits sont réglés : lancez \"git revert --continue\")"
-#: wt-status.c:1315
+#: wt-status.c:1328
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (utilisez \"git revert --abort\" pour annuler le rétablissement)"
-#: wt-status.c:1326
+#: wt-status.c:1339
#, 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:1330
+#: wt-status.c:1343
msgid "You are currently bisecting."
msgstr "Vous êtes en cours de bissection."
-#: wt-status.c:1333
+#: wt-status.c:1346
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:1530
+#: wt-status.c:1543
msgid "On branch "
msgstr "Sur la branche "
-#: wt-status.c:1536
+#: wt-status.c:1549
msgid "interactive rebase in progress; onto "
msgstr "rebasage interactif en cours ; sur "
-#: wt-status.c:1538
+#: wt-status.c:1551
msgid "rebase in progress; onto "
msgstr "rebasage en cours ; sur "
-#: wt-status.c:1543
+#: wt-status.c:1556
msgid "HEAD detached at "
msgstr "HEAD détachée sur "
-#: wt-status.c:1545
+#: wt-status.c:1558
msgid "HEAD detached from "
msgstr "HEAD détachée depuis "
-#: wt-status.c:1548
+#: wt-status.c:1561
msgid "Not currently on any branch."
msgstr "Actuellement sur aucun branche."
-#: wt-status.c:1566
+#: wt-status.c:1579
msgid "Initial commit"
msgstr "Validation initiale"
-#: wt-status.c:1580
+#: wt-status.c:1593
msgid "Untracked files"
msgstr "Fichiers non suivis"
-#: wt-status.c:1582
+#: wt-status.c:1595
msgid "Ignored files"
msgstr "Fichiers ignorés"
-#: wt-status.c:1586
+#: wt-status.c:1599
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -4319,32 +4593,32 @@
"oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help "
"status')."
-#: wt-status.c:1592
+#: wt-status.c:1605
#, c-format
msgid "Untracked files not listed%s"
msgstr "Fichiers non suivis non affichés%s"
-#: wt-status.c:1594
+#: wt-status.c:1607
msgid " (use -u option to show untracked files)"
msgstr " (utilisez -u pour afficher les fichiers non suivis)"
-#: wt-status.c:1600
+#: wt-status.c:1613
msgid "No changes"
msgstr "Aucune modification"
-#: wt-status.c:1605
+#: wt-status.c:1618
#, 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:1608
+#: wt-status.c:1621
#, c-format
msgid "no changes added to commit\n"
msgstr "aucune modification ajoutée à la validation\n"
-#: wt-status.c:1611
+#: wt-status.c:1624
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -4353,72 +4627,67 @@
"aucune modification ajoutée à la validation mais des fichiers non suivis "
"sont présents (utilisez \"git add\" pour les suivre)\n"
-#: wt-status.c:1614
+#: wt-status.c:1627
#, 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:1617
+#: wt-status.c:1630
#, 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:1620 wt-status.c:1625
+#: wt-status.c:1633 wt-status.c:1638
#, c-format
msgid "nothing to commit\n"
msgstr "rien à valider\n"
-#: wt-status.c:1623
+#: wt-status.c:1636
#, 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:1627
+#: wt-status.c:1640
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "rien à valider, la copie de travail est propre\n"
-#: wt-status.c:1734
+#: wt-status.c:1749
msgid "Initial commit on "
msgstr "Validation initiale sur "
-#: wt-status.c:1738
+#: wt-status.c:1753
msgid "HEAD (no branch)"
msgstr "HEAD (aucune branche)"
-# à priori on parle d'une branche ici
-#: wt-status.c:1767
-msgid "gone"
-msgstr "disparue"
-
-#: wt-status.c:1769 wt-status.c:1777
+#: wt-status.c:1782 wt-status.c:1790
msgid "behind "
msgstr "derrière "
-#: wt-status.c:1772 wt-status.c:1775
+#: wt-status.c:1785 wt-status.c:1788
msgid "ahead "
msgstr "devant "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2277
+#: wt-status.c:2280
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "Impossible de %s : vous avez des modifications non indexées."
-#: wt-status.c:2283
+#: wt-status.c:2286
msgid "additionally, your index contains uncommitted changes."
msgstr "de plus, votre index contient des modifications non validées."
-#: wt-status.c:2285
+#: wt-status.c:2288
#, 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:414
+#: compat/precompose_utf8.c:57 builtin/clone.c:432
#, c-format
msgid "failed to unlink '%s'"
msgstr "échec lors de l'unlink de '%s'"
@@ -4445,7 +4714,7 @@
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:845
+#: builtin/add.c:209 builtin/rev-parse.c:872
msgid "Could not read the index"
msgstr "Impossible de lire l'index"
@@ -4481,9 +4750,9 @@
msgstr ""
"Les chemins suivants sont ignorés par un de vos fichiers .gitignore :\n"
-#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:123
+#: 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:1326 builtin/rm.c:241 builtin/send-pack.c:162
+#: builtin/remote.c:1328 builtin/rm.c:241 builtin/send-pack.c:163
msgid "dry run"
msgstr "simuler l'action"
@@ -4491,7 +4760,7 @@
msgid "interactive picking"
msgstr "sélection interactive"
-#: builtin/add.c:270 builtin/checkout.c:1159 builtin/reset.c:286
+#: builtin/add.c:270 builtin/checkout.c:1177 builtin/reset.c:286
msgid "select hunks interactively"
msgstr "sélection interactive des sections"
@@ -4534,11 +4803,11 @@
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:947
+#: builtin/add.c:283 builtin/update-index.c:951
msgid "(+/-)x"
msgstr "(+/-)x"
-#: builtin/add.c:283 builtin/update-index.c:948
+#: builtin/add.c:283 builtin/update-index.c:952
msgid "override the executable bit of the listed files"
msgstr "outrepasser le bit exécutable pour les fichiers listés"
@@ -4575,117 +4844,117 @@
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:279
-#: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350
+#: 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/submodule--helper.c:244
msgid "index file corrupt"
msgstr "fichier d'index corrompu"
-#: builtin/am.c:414
+#: builtin/am.c:412
msgid "could not parse author script"
msgstr "impossible d'analyser le script author"
-#: builtin/am.c:491
+#: builtin/am.c:489
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' a été effacé par le crochet applypatch-msg"
-#: builtin/am.c:532
+#: builtin/am.c:530
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Ligne en entrée malformée : '%s'."
-#: builtin/am.c:569
+#: builtin/am.c:567
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Impossible de copier les notes de '%s' vers '%s'"
-#: builtin/am.c:595
+#: builtin/am.c:593
msgid "fseek failed"
msgstr "échec de fseek"
-#: builtin/am.c:775
+#: builtin/am.c:777
#, c-format
msgid "could not parse patch '%s'"
msgstr "impossible d'analyser le patch '%s'"
-#: builtin/am.c:840
+#: builtin/am.c:842
msgid "Only one StGIT patch series can be applied at once"
msgstr "Seulement une série de patchs StGIT peut être appliquée à la fois"
-#: builtin/am.c:887
+#: builtin/am.c:889
msgid "invalid timestamp"
msgstr "horodatage invalide"
-#: builtin/am.c:890 builtin/am.c:898
+#: builtin/am.c:892 builtin/am.c:900
msgid "invalid Date line"
msgstr "ligne de Date invalide"
-#: builtin/am.c:895
+#: builtin/am.c:897
msgid "invalid timezone offset"
msgstr "décalage horaire invalide"
-#: builtin/am.c:984
+#: builtin/am.c:986
msgid "Patch format detection failed."
msgstr "Échec de détection du format du patch."
-#: builtin/am.c:989 builtin/clone.c:379
+#: builtin/am.c:991 builtin/clone.c:397
#, c-format
msgid "failed to create directory '%s'"
msgstr "échec de la création du répertoire '%s'"
-#: builtin/am.c:993
+#: builtin/am.c:995
msgid "Failed to split patches."
msgstr "Échec de découpage des patchs."
-#: builtin/am.c:1125 builtin/commit.c:376
+#: builtin/am.c:1127 builtin/commit.c:376
msgid "unable to write index file"
msgstr "impossible d'écrire le fichier d'index"
-#: builtin/am.c:1176
+#: builtin/am.c:1178
#, 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:1177
+#: builtin/am.c:1179
#, 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:1178
+#: builtin/am.c:1180
#, 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:1316
+#: 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:1390 builtin/log.c:1550
+#: builtin/am.c:1386 builtin/log.c:1557
#, c-format
msgid "invalid ident line: %s"
msgstr "ligne d'identification invalide : %s"
-#: builtin/am.c:1417
+#: builtin/am.c:1413
#, c-format
msgid "unable to parse commit %s"
msgstr "impossible d'analyser le commit %s"
-#: builtin/am.c:1610
+#: builtin/am.c:1606
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:1612
+#: builtin/am.c:1608
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:1631
+#: builtin/am.c:1627
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -4693,38 +4962,38 @@
"Avez-vous édité le patch à la main ?\n"
"Il ne s'applique pas aux blobs enregistrés dans son index."
-#: builtin/am.c:1637
+#: builtin/am.c:1633
msgid "Falling back to patching base and 3-way merge..."
msgstr "Retour à un patch de la base et fusion à 3 points..."
-#: builtin/am.c:1662
+#: builtin/am.c:1658
msgid "Failed to merge in the changes."
msgstr "Échec d'intégration des modifications."
-#: builtin/am.c:1686 builtin/merge.c:632
+#: builtin/am.c:1682 builtin/merge.c:631
msgid "git write-tree failed to write a tree"
msgstr "git write-tree a échoué à écrire un arbre"
-#: builtin/am.c:1693
+#: builtin/am.c:1689
msgid "applying to an empty history"
msgstr "application à un historique vide"
-#: builtin/am.c:1706 builtin/commit.c:1764 builtin/merge.c:802
+#: builtin/am.c:1702 builtin/commit.c:1764 builtin/merge.c:802
#: builtin/merge.c:827
msgid "failed to write commit object"
msgstr "échec de l'écriture de l'objet commit"
-#: builtin/am.c:1739 builtin/am.c:1743
+#: builtin/am.c:1735 builtin/am.c:1739
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "impossible de continuer : %s n'existe pas."
-#: builtin/am.c:1759
+#: builtin/am.c:1755
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:1764
+#: builtin/am.c:1760
msgid "Commit Body is:"
msgstr "Le corps de la validation est :"
@@ -4732,35 +5001,35 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1774
+#: builtin/am.c:1770
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:1824
+#: builtin/am.c:1820
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)"
-#: builtin/am.c:1861 builtin/am.c:1933
+#: builtin/am.c:1860 builtin/am.c:1932
#, c-format
msgid "Applying: %.*s"
msgstr "Application de %.*s"
-#: builtin/am.c:1877
+#: builtin/am.c:1876
msgid "No changes -- Patch already applied."
msgstr "Pas de changement -- Patch déjà appliqué."
-#: builtin/am.c:1885
+#: builtin/am.c:1884
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "le patch a échoué à %s %.*s"
-#: builtin/am.c:1891
+#: builtin/am.c:1890
#, 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:1936
+#: builtin/am.c:1935
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -4771,7 +5040,7 @@
"introduit les mêmes changements ; vous pourriez avoir envie de sauter ce "
"patch."
-#: builtin/am.c:1943
+#: builtin/am.c:1942
msgid ""
"You still have unmerged paths in your index.\n"
"Did you forget to use 'git add'?"
@@ -4779,17 +5048,17 @@
"Vous avez toujours des chemins non fusionnés dans votre index\n"
"Auriez-vous oublié de faire 'git add' ?"
-#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308
+#: builtin/am.c:2050 builtin/am.c:2054 builtin/am.c:2066 builtin/reset.c:308
#: builtin/reset.c:316
#, c-format
msgid "Could not parse object '%s'."
msgstr "Impossible d'analyser l'objet '%s'."
-#: builtin/am.c:2103
+#: builtin/am.c:2102
msgid "failed to clean index"
msgstr "échec du nettoyage de l'index"
-#: builtin/am.c:2137
+#: builtin/am.c:2136
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -4797,135 +5066,135 @@
"Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n"
"Pas de retour à ORIG_HEAD"
-#: builtin/am.c:2200
+#: builtin/am.c:2199
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Valeur invalide pour --patch-format : %s"
-#: builtin/am.c:2233
+#: builtin/am.c:2232
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<options>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2234
+#: builtin/am.c:2233
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<options>] (--continue | --quit | --abort)"
-#: builtin/am.c:2240
+#: builtin/am.c:2239
msgid "run interactively"
msgstr "exécution interactive"
-#: builtin/am.c:2242
+#: builtin/am.c:2241
msgid "historical option -- no-op"
msgstr "option historique -- no-op"
-#: builtin/am.c:2244
+#: builtin/am.c:2243
msgid "allow fall back on 3way merging if needed"
msgstr "permettre de revenir à une fusion à 3 points si nécessaire"
-#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57
+#: builtin/am.c:2244 builtin/init-db.c:483 builtin/prune-packed.c:57
#: builtin/repack.c:178
msgid "be quiet"
msgstr "être silencieux"
-#: builtin/am.c:2247
+#: builtin/am.c:2246
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:2250
+#: builtin/am.c:2249
msgid "recode into utf8 (default)"
msgstr "recoder en utf-8 (par défaut)"
-#: builtin/am.c:2252
+#: builtin/am.c:2251
msgid "pass -k flag to git-mailinfo"
msgstr "passer l'option -k à git-mailinfo"
-#: builtin/am.c:2254
+#: builtin/am.c:2253
msgid "pass -b flag to git-mailinfo"
msgstr "passer l'option -b à git-mailinfo"
-#: builtin/am.c:2256
+#: builtin/am.c:2255
msgid "pass -m flag to git-mailinfo"
msgstr "passer l'option -m à git-mailinfo"
-#: builtin/am.c:2258
+#: builtin/am.c:2257
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:2261
+#: builtin/am.c:2260
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:2264
+#: builtin/am.c:2263
msgid "strip everything before a scissors line"
msgstr "retirer tout le contenu avant la ligne des ciseaux"
-#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
-#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287
-#: builtin/am.c:2293
+#: 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
msgid "pass it through git-apply"
msgstr "le passer jusqu'à git-apply"
-#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
-#: builtin/grep.c:1038 builtin/merge.c:202 builtin/pull.c:135
+#: 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:644 builtin/show-ref.c:169 builtin/tag.c:355
+#: 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
msgid "n"
msgstr "n"
-#: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438
-#: builtin/tag.c:387 builtin/verify-tag.c:38
+#: 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
msgid "format"
msgstr "format"
-#: builtin/am.c:2290
+#: builtin/am.c:2289
msgid "format the patch(es) are in"
msgstr "format de présentation des patchs"
-#: builtin/am.c:2296
+#: builtin/am.c:2295
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:2298
+#: builtin/am.c:2297
msgid "continue applying patches after resolving a conflict"
msgstr "continuer à appliquer les patchs après résolution d'un conflit"
-#: builtin/am.c:2301
+#: builtin/am.c:2300
msgid "synonyms for --continue"
msgstr "synonymes de --continue"
-#: builtin/am.c:2304
+#: builtin/am.c:2303
msgid "skip the current patch"
msgstr "sauter le patch courant"
-#: builtin/am.c:2307
+#: builtin/am.c:2306
msgid "restore the original branch and abort the patching operation."
msgstr ""
"restaurer la branche originale et abandonner les applications de patch."
-#: builtin/am.c:2311
+#: builtin/am.c:2310
msgid "lie about committer date"
msgstr "mentir sur la date de validation"
-#: builtin/am.c:2313
+#: builtin/am.c:2312
msgid "use current timestamp for author date"
msgstr "utiliser l'horodatage actuel pour la date d'auteur"
-#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:233
-#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:370
+#: builtin/am.c:2314 builtin/commit.c:1600 builtin/merge.c:232
+#: builtin/pull.c:165 builtin/revert.c:111 builtin/tag.c:413
msgid "key-id"
msgstr "id-clé"
-#: builtin/am.c:2316
+#: builtin/am.c:2315
msgid "GPG-sign commits"
msgstr "signer les commits avec GPG"
-#: builtin/am.c:2319
+#: builtin/am.c:2318
msgid "(internal use for git-rebase)"
msgstr "(utilisation interne pour git-rebase)"
-#: builtin/am.c:2334
+#: builtin/am.c:2333
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."
@@ -4933,17 +5202,17 @@
"L'option -b/--binary ne fait plus rien depuis longtemps,\n"
"et elle sera supprimée. Veuillez ne plus l'utiliser."
-#: builtin/am.c:2341
+#: builtin/am.c:2340
msgid "failed to read the index"
msgstr "échec à la lecture de l'index"
-#: builtin/am.c:2356
+#: builtin/am.c:2355
#, 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:2380
+#: builtin/am.c:2379
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -4952,7 +5221,7 @@
"Répertoire abandonné %s trouvé.\n"
"Utilisez \"git am --abort\" pour le supprimer."
-#: builtin/am.c:2386
+#: builtin/am.c:2385
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 "
@@ -4984,11 +5253,6 @@
msgid "git archive: NACK %s"
msgstr "git archive : NACK %s"
-#: builtin/archive.c:63
-#, c-format
-msgid "remote error: %s"
-msgstr "erreur distante : %s"
-
#: builtin/archive.c:64
msgid "git archive: protocol error"
msgstr "git archive : erreur de protocole"
@@ -5017,117 +5281,117 @@
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:1786
+#: builtin/blame.c:1777
msgid "Blaming lines"
msgstr "Assignation de blâme au lignes"
-#: builtin/blame.c:2582
+#: builtin/blame.c:2573
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:2583
+#: builtin/blame.c:2574
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:2584
+#: builtin/blame.c:2575
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:2585
+#: builtin/blame.c:2576
msgid "Show work cost statistics"
msgstr "Montrer les statistiques de coût d'activité"
-#: builtin/blame.c:2586
+#: builtin/blame.c:2577
msgid "Force progress reporting"
msgstr "Forcer l'affichage de l'état d'avancement"
-#: builtin/blame.c:2587
+#: builtin/blame.c:2578
msgid "Show output score for blame entries"
msgstr "Montrer le score de sortie pour les éléments de blâme"
-#: builtin/blame.c:2588
+#: builtin/blame.c:2579
msgid "Show original filename (Default: auto)"
msgstr "Montrer les noms de fichier originaux (Défaut : auto)"
-#: builtin/blame.c:2589
+#: builtin/blame.c:2580
msgid "Show original linenumber (Default: off)"
msgstr "Montrer les numéros de lignes originaux (Défaut : désactivé)"
-#: builtin/blame.c:2590
+#: builtin/blame.c:2581
msgid "Show in a format designed for machine consumption"
msgstr "Afficher dans un format propice à la consommation par machine"
-#: builtin/blame.c:2591
+#: builtin/blame.c:2582
msgid "Show porcelain format with per-line commit information"
msgstr "Afficher en format porcelaine avec l'information de commit par ligne"
-#: builtin/blame.c:2592
+#: builtin/blame.c:2583
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:2593
+#: builtin/blame.c:2584
msgid "Show raw timestamp (Default: off)"
msgstr "Afficher les horodatages bruts (Défaut : désactivé)"
-#: builtin/blame.c:2594
+#: builtin/blame.c:2585
msgid "Show long commit SHA1 (Default: off)"
msgstr "Afficher les longs SHA1 de commits (Défaut : désactivé)"
-#: builtin/blame.c:2595
+#: builtin/blame.c:2586
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:2596
+#: builtin/blame.c:2587
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é)"
-#: builtin/blame.c:2597
+#: builtin/blame.c:2588
msgid "Ignore whitespace differences"
msgstr "Ignorer les différences d'espace"
-#: builtin/blame.c:2604
+#: builtin/blame.c:2595
msgid "Use an experimental heuristic to improve diffs"
msgstr "Utiliser une heuristique expérimentale pour améliorer les diffs"
-#: builtin/blame.c:2606
+#: builtin/blame.c:2597
msgid "Spend extra cycles to find better match"
msgstr ""
"Dépenser des cycles supplémentaires pour trouver une meilleure correspondance"
-#: builtin/blame.c:2607
+#: builtin/blame.c:2598
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:2608
+#: builtin/blame.c:2599
msgid "Use <file>'s contents as the final image"
msgstr "Utiliser le contenu de <fichier> comme image finale"
-#: builtin/blame.c:2609 builtin/blame.c:2610
+#: builtin/blame.c:2600 builtin/blame.c:2601
msgid "score"
msgstr "score"
-#: builtin/blame.c:2609
+#: builtin/blame.c:2600
msgid "Find line copies within and across files"
msgstr "Trouver les copies de ligne dans et entre les fichiers"
-#: builtin/blame.c:2610
+#: builtin/blame.c:2601
msgid "Find line movements within and across files"
msgstr "Trouver les mouvements de ligne dans et entre les fichiers"
-#: builtin/blame.c:2611
+#: builtin/blame.c:2602
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2611
+#: builtin/blame.c:2602
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:2658
+#: builtin/blame.c:2649
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
"--progress ne peut pas être utilisé avec --incremental ou les formats "
@@ -5139,42 +5403,42 @@
#. 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:2706
+#: builtin/blame.c:2697
msgid "4 years, 11 months ago"
msgstr "il y a 10 ans et 11 mois"
-#: builtin/blame.c:2786
+#: 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:2806
+#: 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:2811
+#: 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:2838
+#: 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:2849
+#: builtin/blame.c:2840
#, c-format
msgid "no such path %s in %s"
msgstr "pas de chemin %s dans %s"
-#: builtin/blame.c:2860
+#: 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:2879
+#: builtin/blame.c:2870
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
@@ -5202,7 +5466,11 @@
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [<options>] [-r | -a] [--points-at]"
-#: builtin/branch.c:143
+#: builtin/branch.c:31
+msgid "git branch [<options>] [-r | -a] [--format]"
+msgstr "git branch [<options>] [-r | -a] [--format]"
+
+#: builtin/branch.c:144
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -5211,7 +5479,7 @@
"suppression de la branche '%s' qui a été fusionnée dans\n"
" '%s', mais pas dans HEAD."
-#: builtin/branch.c:147
+#: builtin/branch.c:148
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -5220,12 +5488,12 @@
"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:161
+#: builtin/branch.c:162
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Impossible de rechercher l'objet commit pour '%s'"
-#: builtin/branch.c:165
+#: builtin/branch.c:166
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -5234,166 +5502,93 @@
"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:178
+#: builtin/branch.c:179
msgid "Update of config-file failed"
msgstr "Échec de la mise à jour du fichier de configuration"
-#: builtin/branch.c:206
+#: builtin/branch.c:210
msgid "cannot use -a with -d"
msgstr "impossible d'utiliser -a avec -d"
-#: builtin/branch.c:212
+#: builtin/branch.c:216
msgid "Couldn't look up commit object for HEAD"
msgstr "Impossible de rechercher l'objet commit pour HEAD"
-#: builtin/branch.c:226
+#: builtin/branch.c:230
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "Impossible de supprimer la branche '%s' extraite dans '%s'"
-#: builtin/branch.c:241
+#: builtin/branch.c:245
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "branche de suivi '%s' non trouvée."
-#: builtin/branch.c:242
+#: builtin/branch.c:246
#, c-format
msgid "branch '%s' not found."
msgstr "branche '%s' non trouvée."
-#: builtin/branch.c:257
+#: builtin/branch.c:261
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Erreur lors de la suppression de la branche de suivi '%s'"
-#: builtin/branch.c:258
+#: builtin/branch.c:262
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Erreur lors de la suppression de la branche '%s'"
-#: builtin/branch.c:265
+#: builtin/branch.c:269
#, 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:266
+#: builtin/branch.c:270
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Branche %s supprimée (précédemment %s).\n"
-# féminin pour une branche
-#: builtin/branch.c:312
-#, c-format
-msgid "[%s: gone]"
-msgstr "[%s: disparue]"
-
-#: builtin/branch.c:317
-#, c-format
-msgid "[%s]"
-msgstr "[%s]"
-
-#: builtin/branch.c:322
-#, c-format
-msgid "[%s: behind %d]"
-msgstr "[%s: en retard de %d]"
-
-#: builtin/branch.c:324
-#, c-format
-msgid "[behind %d]"
-msgstr "[en retard de %d]"
-
-#: builtin/branch.c:328
-#, c-format
-msgid "[%s: ahead %d]"
-msgstr "[%s : en avance de %d]"
-
-#: builtin/branch.c:330
-#, c-format
-msgid "[ahead %d]"
-msgstr "[en avance de %d]"
-
-#: builtin/branch.c:333
-#, c-format
-msgid "[%s: ahead %d, behind %d]"
-msgstr "[%s : en avance de %d, en retard de %d]"
-
-#: builtin/branch.c:336
-#, c-format
-msgid "[ahead %d, behind %d]"
-msgstr "[en avance de %d, en retard de %d]"
-
-#: builtin/branch.c:349
-msgid " **** invalid ref ****"
-msgstr " **** référence invalide ****"
-
-#: builtin/branch.c:375
-#, c-format
-msgid "(no branch, rebasing %s)"
-msgstr "(aucune branche, rebasage de %s)"
-
-#: builtin/branch.c:378
-#, 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
-#: builtin/branch.c:384
-#, 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
-#: builtin/branch.c:389
-#, c-format
-msgid "(HEAD detached from %s)"
-msgstr "(HEAD détachée depuis %s)"
-
-#: builtin/branch.c:393
-msgid "(no branch)"
-msgstr "(aucune branche)"
-
-#: builtin/branch.c:535
+#: builtin/branch.c:441
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "La branche %s est en cours de rebasage sur %s"
-#: builtin/branch.c:539
+#: builtin/branch.c:445
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "La branche %s est en cours de bissection sur %s"
-#: builtin/branch.c:554
+#: builtin/branch.c:460
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:564
+#: builtin/branch.c:470
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Nom de branche invalide : '%s'"
-#: builtin/branch.c:581
+#: builtin/branch.c:487
msgid "Branch rename failed"
msgstr "Échec de renommage de la branche"
-#: builtin/branch.c:585
+#: builtin/branch.c:490
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Renommage d'un branche mal nommée '%s'"
-#: builtin/branch.c:588
+#: builtin/branch.c:493
#, 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:595
+#: builtin/branch.c:502
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:611
+#: builtin/branch.c:518
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -5404,167 +5599,176 @@
" %s\n"
"Les lignes commençant par '%c' seront ignorées.\n"
-#: builtin/branch.c:643
+#: builtin/branch.c:551
msgid "Generic options"
msgstr "Options génériques"
-#: builtin/branch.c:645
+#: builtin/branch.c:553
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:646
+#: builtin/branch.c:554
msgid "suppress informational messages"
msgstr "supprimer les messages d'information"
-#: builtin/branch.c:647
+#: builtin/branch.c:555
msgid "set up tracking mode (see git-pull(1))"
msgstr "régler le mode de suivi (voir git-pull(1))"
-#: builtin/branch.c:649
+#: builtin/branch.c:557
msgid "change upstream info"
msgstr "modifier l'information amont"
-#: builtin/branch.c:651
+#: builtin/branch.c:559
msgid "upstream"
msgstr "amont"
-#: builtin/branch.c:651
+#: builtin/branch.c:559
msgid "change the upstream info"
msgstr "modifier l'information amont"
-#: builtin/branch.c:652
+#: builtin/branch.c:560
msgid "Unset the upstream info"
msgstr "Désactiver l'information amont"
-#: builtin/branch.c:653
+#: builtin/branch.c:561
msgid "use colored output"
msgstr "utiliser la coloration dans la sortie"
-#: builtin/branch.c:654
+#: builtin/branch.c:562
msgid "act on remote-tracking branches"
msgstr "agir sur les branches de suivi distantes"
-#: builtin/branch.c:656 builtin/branch.c:657
+#: builtin/branch.c:564 builtin/branch.c:566
msgid "print only branches that contain the commit"
msgstr "afficher seulement les branches qui contiennent le commit"
-#: builtin/branch.c:660
+#: builtin/branch.c:565 builtin/branch.c:567
+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
msgid "Specific git-branch actions:"
msgstr "Actions spécifiques à git-branch :"
-#: builtin/branch.c:661
+#: builtin/branch.c:571
msgid "list both remote-tracking and local branches"
msgstr "afficher à la fois les branches de suivi et les branches locales"
-#: builtin/branch.c:663
+#: builtin/branch.c:573
msgid "delete fully merged branch"
msgstr "supprimer une branche totalement fusionnée"
-#: builtin/branch.c:664
+#: builtin/branch.c:574
msgid "delete branch (even if not merged)"
msgstr "supprimer une branche (même non fusionnée)"
-#: builtin/branch.c:665
+#: builtin/branch.c:575
msgid "move/rename a branch and its reflog"
msgstr "déplacer/renommer une branche et son reflog"
-#: builtin/branch.c:666
+#: builtin/branch.c:576
msgid "move/rename a branch, even if target exists"
msgstr "déplacer/renommer une branche, même si la cible existe"
-#: builtin/branch.c:667
+#: builtin/branch.c:577
msgid "list branch names"
msgstr "afficher les noms des branches"
-#: builtin/branch.c:668
+#: builtin/branch.c:578
msgid "create the branch's reflog"
msgstr "créer le reflog de la branche"
-#: builtin/branch.c:670
+#: builtin/branch.c:580
msgid "edit the description for the branch"
msgstr "éditer la description de la branche"
-#: builtin/branch.c:671
+#: builtin/branch.c:581
msgid "force creation, move/rename, deletion"
msgstr "forcer la création, le déplacement/renommage, ou la suppression"
-#: builtin/branch.c:672
+#: builtin/branch.c:582
msgid "print only branches that are merged"
msgstr "afficher seulement les branches qui sont fusionnées"
-#: builtin/branch.c:673
+#: builtin/branch.c:583
msgid "print only branches that are not merged"
msgstr "afficher seulement les branches qui ne sont pas fusionnées"
-#: builtin/branch.c:674
+#: builtin/branch.c:584
msgid "list branches in columns"
msgstr "afficher les branches en colonnes"
-#: builtin/branch.c:675 builtin/for-each-ref.c:38 builtin/tag.c:381
+#: builtin/branch.c:585 builtin/for-each-ref.c:38 builtin/tag.c:426
msgid "key"
msgstr "clé"
-#: builtin/branch.c:676 builtin/for-each-ref.c:39 builtin/tag.c:382
+#: builtin/branch.c:586 builtin/for-each-ref.c:39 builtin/tag.c:427
msgid "field name to sort on"
msgstr "nom du champ servant à trier"
-#: builtin/branch.c:678 builtin/for-each-ref.c:41 builtin/notes.c:404
+#: 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:384
+#: builtin/tag.c:429
msgid "object"
msgstr "objet"
-#: builtin/branch.c:679
+#: builtin/branch.c:589
msgid "print only branches of the object"
msgstr "afficher seulement les branches de l'objet"
-#: builtin/branch.c:681 builtin/for-each-ref.c:46 builtin/tag.c:388
+#: builtin/branch.c:591 builtin/for-each-ref.c:47 builtin/tag.c:434
msgid "sorting and filtering are case insensitive"
msgstr "le tri et le filtrage sont non-sensibles à la casse"
-#: builtin/branch.c:698
+#: builtin/branch.c:592 builtin/for-each-ref.c:37 builtin/tag.c:433
+#: builtin/verify-tag.c:38
+msgid "format to use for the output"
+msgstr "format à utiliser pour la sortie"
+
+#: builtin/branch.c:611
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Échec de résolution de HEAD comme référence valide."
-#: builtin/branch.c:702 builtin/clone.c:706
+#: builtin/branch.c:615 builtin/clone.c:724
msgid "HEAD not found below refs/heads!"
msgstr "HEAD non trouvée sous refs/heads !"
-#: builtin/branch.c:724
+#: builtin/branch.c:638
msgid "--column and --verbose are incompatible"
msgstr "--column et --verbose sont incompatibles"
-#: builtin/branch.c:735 builtin/branch.c:787
+#: builtin/branch.c:649 builtin/branch.c:701
msgid "branch name required"
msgstr "le nom de branche est requis"
-#: builtin/branch.c:763
+#: builtin/branch.c:677
msgid "Cannot give description to detached HEAD"
msgstr "Impossible de décrire une HEAD détachée"
-#: builtin/branch.c:768
+#: builtin/branch.c:682
msgid "cannot edit description of more than one branch"
msgstr "impossible d'éditer la description de plus d'une branche"
-#: builtin/branch.c:775
+#: builtin/branch.c:689
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Aucun commit sur la branche '%s'."
-#: builtin/branch.c:778
+#: builtin/branch.c:692
#, c-format
msgid "No branch named '%s'."
msgstr "Aucune branche nommée '%s'."
-#: builtin/branch.c:793
+#: builtin/branch.c:707
msgid "too many branches for a rename operation"
msgstr "trop de branches pour une opération de renommage"
-#: builtin/branch.c:798
+#: builtin/branch.c:712
msgid "too many branches to set new upstream"
msgstr "trop de branches pour spécifier une branche amont"
-#: builtin/branch.c:802
+#: builtin/branch.c:716
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -5572,41 +5776,41 @@
"impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur "
"aucune branche."
-#: builtin/branch.c:805 builtin/branch.c:827 builtin/branch.c:848
+#: builtin/branch.c:719 builtin/branch.c:741 builtin/branch.c:762
#, c-format
msgid "no such branch '%s'"
msgstr "pas de branche '%s'"
-#: builtin/branch.c:809
+#: builtin/branch.c:723
#, c-format
msgid "branch '%s' does not exist"
msgstr "la branche '%s' n'existe pas"
-#: builtin/branch.c:821
+#: builtin/branch.c:735
msgid "too many branches to unset upstream"
msgstr "trop de branches pour désactiver un amont"
-#: builtin/branch.c:825
+#: builtin/branch.c:739
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:831
+#: builtin/branch.c:745
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "La branche '%s' n'a aucune information de branche amont"
-#: builtin/branch.c:845
+#: builtin/branch.c:759
msgid "it does not make sense to create 'HEAD' manually"
msgstr "créer manuellement 'HEAD' n'a pas de sens"
-#: builtin/branch.c:851
+#: builtin/branch.c:765
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:854
+#: builtin/branch.c:768
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
@@ -5615,7 +5819,7 @@
"l'option --set-upstream est obsolète et va disparaître. Utilisez plutôt --"
"track ou --set-upstream-to\n"
-#: builtin/branch.c:871
+#: builtin/branch.c:785
#, c-format
msgid ""
"\n"
@@ -5626,16 +5830,16 @@
"Si vous vouliez que '%s' suive '%s', faites ceci :\n"
"\n"
-#: builtin/bundle.c:51
+#: builtin/bundle.c:45
#, c-format
msgid "%s is okay\n"
msgstr "%s est correct\n"
-#: builtin/bundle.c:64
+#: builtin/bundle.c:58
msgid "Need a repository to create a bundle."
msgstr "La création d'un colis requiert un dépôt."
-#: builtin/bundle.c:68
+#: builtin/bundle.c:62
msgid "Need a repository to unbundle."
msgstr "Le dépaquetage d'un colis requiert un dépôt."
@@ -5683,7 +5887,7 @@
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:929
+#: builtin/cat-file.c:561 git-submodule.sh:943
msgid "blob"
msgstr "blob"
@@ -5743,7 +5947,7 @@
msgstr ""
"terminer les enregistrements en entrée et en sortie par un caractère NUL"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1140 builtin/gc.c:332
+#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:356
msgid "suppress progress reporting"
msgstr "supprimer l'état d'avancement"
@@ -5835,9 +6039,9 @@
msgstr "écrire le contenu dans des fichiers temporaires"
#: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:597 builtin/submodule--helper.c:600
-#: builtin/submodule--helper.c:606 builtin/submodule--helper.c:967
-#: builtin/worktree.c:471
+#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
+#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
+#: builtin/worktree.c:477
msgid "string"
msgstr "chaîne"
@@ -5849,115 +6053,115 @@
msgid "copy out the files from named stage"
msgstr "copier les fichiers depuis l'index nommé"
-#: builtin/checkout.c:25
+#: builtin/checkout.c:27
msgid "git checkout [<options>] <branch>"
msgstr "git checkout [<options>] <branche>"
-#: builtin/checkout.c:26
+#: builtin/checkout.c:28
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<options>] [<branche>] -- <fichier>..."
-#: builtin/checkout.c:134 builtin/checkout.c:167
+#: builtin/checkout.c:153 builtin/checkout.c:186
#, c-format
msgid "path '%s' does not have our version"
msgstr "le chemin '%s' n'a pas notre version"
-#: builtin/checkout.c:136 builtin/checkout.c:169
+#: builtin/checkout.c:155 builtin/checkout.c:188
#, c-format
msgid "path '%s' does not have their version"
msgstr "le chemin '%s' n'a pas leur version"
-#: builtin/checkout.c:152
+#: builtin/checkout.c:171
#, 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:196
+#: builtin/checkout.c:215
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "le chemin '%s' n'a pas les versions nécessaires"
-#: builtin/checkout.c:213
+#: builtin/checkout.c:232
#, c-format
msgid "path '%s': cannot merge"
msgstr "chemin '%s' : impossible de fusionner"
-#: builtin/checkout.c:230
+#: builtin/checkout.c:249
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Impossible d'ajouter le résultat de fusion pour '%s'"
-#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
-#: builtin/checkout.c:259
+#: builtin/checkout.c:269 builtin/checkout.c:272 builtin/checkout.c:275
+#: builtin/checkout.c:278
#, 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:262 builtin/checkout.c:265
+#: builtin/checkout.c:281 builtin/checkout.c:284
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' ne peut pas être utilisé avec %s"
-#: builtin/checkout.c:268
+#: builtin/checkout.c:287
#, 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:339 builtin/checkout.c:346
+#: builtin/checkout.c:358 builtin/checkout.c:365
#, c-format
msgid "path '%s' is unmerged"
msgstr "le chemin '%s' n'est pas fusionné"
-#: builtin/checkout.c:494
+#: builtin/checkout.c:513
msgid "you need to resolve your current index first"
msgstr "vous devez d'abord résoudre votre index courant"
-#: builtin/checkout.c:625
+#: builtin/checkout.c:644
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Impossible de faire un reflog pour '%s' : %s\n"
-#: builtin/checkout.c:666
+#: builtin/checkout.c:685
msgid "HEAD is now at"
msgstr "HEAD est maintenant sur"
-#: builtin/checkout.c:670 builtin/clone.c:660
+#: builtin/checkout.c:689 builtin/clone.c:678
msgid "unable to update HEAD"
msgstr "impossible de mettre à jour HEAD"
-#: builtin/checkout.c:674
+#: builtin/checkout.c:693
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Remise à zéro de la branche '%s'\n"
-#: builtin/checkout.c:677
+#: builtin/checkout.c:696
#, c-format
msgid "Already on '%s'\n"
msgstr "Déjà sur '%s'\n"
-#: builtin/checkout.c:681
+#: builtin/checkout.c:700
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Basculement et remise à zéro de la branche '%s'\n"
-#: builtin/checkout.c:683 builtin/checkout.c:1072
+#: builtin/checkout.c:702 builtin/checkout.c:1090
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Basculement sur la nouvelle branche '%s'\n"
-#: builtin/checkout.c:685
+#: builtin/checkout.c:704
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Basculement sur la branche '%s'\n"
-#: builtin/checkout.c:736
+#: builtin/checkout.c:755
#, c-format
msgid " ... and %d more.\n"
msgstr " ... et %d en plus.\n"
-#: builtin/checkout.c:742
+#: builtin/checkout.c:761
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -5980,7 +6184,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:761
+#: builtin/checkout.c:780
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -6009,151 +6213,151 @@
"git branch <nouvelle-branche> %s\n"
"\n"
-#: builtin/checkout.c:797
+#: builtin/checkout.c:816
msgid "internal error in revision walk"
msgstr "erreur interne lors du parcours des révisions"
-#: builtin/checkout.c:801
+#: builtin/checkout.c:820
msgid "Previous HEAD position was"
msgstr "La position précédente de HEAD était sur"
-#: builtin/checkout.c:828 builtin/checkout.c:1067
+#: builtin/checkout.c:847 builtin/checkout.c:1085
msgid "You are on a branch yet to be born"
msgstr "Vous êtes sur une branche qui doit encore naître"
-#: builtin/checkout.c:973
+#: builtin/checkout.c:991
#, c-format
msgid "only one reference expected, %d given."
msgstr "une seule référence attendue, %d fournies."
-#: builtin/checkout.c:1013 builtin/worktree.c:214
+#: builtin/checkout.c:1031 builtin/worktree.c:214
#, c-format
msgid "invalid reference: %s"
msgstr "référence invalide : %s"
-#: builtin/checkout.c:1042
+#: builtin/checkout.c:1060
#, c-format
msgid "reference is not a tree: %s"
msgstr "la référence n'est pas un arbre : %s"
-#: builtin/checkout.c:1081
+#: builtin/checkout.c:1099
msgid "paths cannot be used with switching branches"
msgstr "impossible d'utiliser des chemins avec un basculement de branches"
-#: builtin/checkout.c:1084 builtin/checkout.c:1088
+#: builtin/checkout.c:1102 builtin/checkout.c:1106
#, 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:1092 builtin/checkout.c:1095 builtin/checkout.c:1100
-#: builtin/checkout.c:1103
+#: builtin/checkout.c:1110 builtin/checkout.c:1113 builtin/checkout.c:1118
+#: builtin/checkout.c:1121
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' ne peut pas être utilisé avec '%s'"
-#: builtin/checkout.c:1108
+#: builtin/checkout.c:1126
#, 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:1141 builtin/checkout.c:1143 builtin/clone.c:93
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324
-#: builtin/worktree.c:326
+#: 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
msgid "branch"
msgstr "branche"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1160
msgid "create and checkout a new branch"
msgstr "créer et extraire une nouvelle branche"
-#: builtin/checkout.c:1144
+#: builtin/checkout.c:1162
msgid "create/reset and checkout a branch"
msgstr "créer/réinitialiser et extraire une branche"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1163
msgid "create reflog for new branch"
msgstr "créer un reflog pour une nouvelle branche"
-#: builtin/checkout.c:1146 builtin/worktree.c:328
+#: builtin/checkout.c:1164 builtin/worktree.c:333
msgid "detach HEAD at named commit"
msgstr "détacher la HEAD au commit nommé"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1165
msgid "set upstream info for new branch"
msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche"
-#: builtin/checkout.c:1149
+#: builtin/checkout.c:1167
msgid "new-branch"
msgstr "nouvelle branche"
-#: builtin/checkout.c:1149
+#: builtin/checkout.c:1167
msgid "new unparented branch"
msgstr "nouvelle branche sans parent"
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1168
msgid "checkout our version for unmerged files"
msgstr "extraire notre version pour les fichiers non fusionnés"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1170
msgid "checkout their version for unmerged files"
msgstr "extraire leur version pour les fichiers non fusionnés"
-#: builtin/checkout.c:1154
+#: builtin/checkout.c:1172
msgid "force checkout (throw away local modifications)"
msgstr "forcer l'extraction (laisser tomber les modifications locales)"
-#: builtin/checkout.c:1155
+#: builtin/checkout.c:1173
msgid "perform a 3-way merge with the new branch"
msgstr "effectuer une fusion à 3 points avec la nouvelle branche"
-#: builtin/checkout.c:1156 builtin/merge.c:235
+#: builtin/checkout.c:1174 builtin/merge.c:234
msgid "update ignored files (default)"
msgstr "mettre à jour les fichiers ignorés (par défaut)"
-#: builtin/checkout.c:1157 builtin/log.c:1466 parse-options.h:251
+#: builtin/checkout.c:1175 builtin/log.c:1473 parse-options.h:251
msgid "style"
msgstr "style"
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1176
msgid "conflict style (merge or diff3)"
msgstr "style de conflit (merge (fusion) ou diff3)"
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1179
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:1163
+#: builtin/checkout.c:1181
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "réessayer d'interpréter 'git checkout <branche-inexistante>'"
-#: builtin/checkout.c:1165
+#: builtin/checkout.c:1183
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:1166 builtin/clone.c:63 builtin/fetch.c:119
-#: builtin/merge.c:232 builtin/pull.c:117 builtin/push.c:539
-#: builtin/send-pack.c:168
+#: 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
msgid "force progress reporting"
msgstr "forcer l'affichage de l'état d'avancement"
-#: builtin/checkout.c:1197
+#: builtin/checkout.c:1224
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B et --orphan sont mutuellement exclusifs"
-#: builtin/checkout.c:1214
+#: builtin/checkout.c:1241
msgid "--track needs a branch name"
msgstr "--track requiert un nom de branche"
-#: builtin/checkout.c:1219
+#: builtin/checkout.c:1246
msgid "Missing branch name; try -b"
msgstr "Nom de branche manquant ; essayez -b"
-#: builtin/checkout.c:1255
+#: builtin/checkout.c:1282
msgid "invalid path specification"
msgstr "spécification de chemin invalide"
-#: builtin/checkout.c:1262
+#: builtin/checkout.c:1289
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
@@ -6163,12 +6367,12 @@
"en même temps.\n"
"Souhaitiez-vous extraire '%s' qui ne peut être résolu comme commit ?"
-#: builtin/checkout.c:1267
+#: builtin/checkout.c:1294
#, 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:1271
+#: builtin/checkout.c:1298
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -6207,7 +6411,7 @@
msgid "failed to remove %s"
msgstr "échec de la suppression de %s"
-#: builtin/clean.c:291 git-add--interactive.perl:623
+#: builtin/clean.c:297 git-add--interactive.perl:614
#, c-format
msgid ""
"Prompt help:\n"
@@ -6220,7 +6424,7 @@
"foo - sélectionner un élément par un préfixe unique\n"
" - (vide) ne rien sélectionner\n"
-#: builtin/clean.c:295 git-add--interactive.perl:632
+#: builtin/clean.c:301 git-add--interactive.perl:623
#, c-format
msgid ""
"Prompt help:\n"
@@ -6241,38 +6445,38 @@
"* - choisir tous les éléments\n"
" - (vide) terminer la sélection\n"
-#: builtin/clean.c:511 git-add--interactive.perl:598
-#: git-add--interactive.perl:603
+#: builtin/clean.c:517 git-add--interactive.perl:589
+#: git-add--interactive.perl:594
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Hein (%s) ?\n"
-#: builtin/clean.c:653
+#: builtin/clean.c:659
#, c-format
msgid "Input ignore patterns>> "
msgstr "Entrez les motifs à ignorer>> "
-#: builtin/clean.c:690
+#: builtin/clean.c:696
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "ATTENTION : Impossible de trouver les éléments correspondant à : %s"
-#: builtin/clean.c:711
+#: builtin/clean.c:717
msgid "Select items to delete"
msgstr "Sélectionner les éléments à supprimer"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:752
+#: builtin/clean.c:758
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Supprimer %s [y/N] ? "
-#: builtin/clean.c:777 git-add--interactive.perl:1669
+#: builtin/clean.c:783 git-add--interactive.perl:1660
#, c-format
msgid "Bye.\n"
msgstr "Au revoir.\n"
-#: builtin/clean.c:785
+#: builtin/clean.c:791
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -6290,62 +6494,63 @@
"help - cet écran\n"
"? - aide pour la sélection en ligne"
-#: builtin/clean.c:812 git-add--interactive.perl:1745
+#: builtin/clean.c:818 git-add--interactive.perl:1736
msgid "*** Commands ***"
msgstr "*** Commandes ***"
-#: builtin/clean.c:813 git-add--interactive.perl:1742
+#: builtin/clean.c:819 git-add--interactive.perl:1733
msgid "What now"
msgstr "Et maintenant ?"
-#: builtin/clean.c:821
+#: builtin/clean.c:827
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Supprimerait l'élément suivant :"
msgstr[1] "Supprimerait les éléments suivants :"
-#: builtin/clean.c:838
+#: builtin/clean.c:844
msgid "No more files to clean, exiting."
msgstr "Plus de fichier à nettoyer, sortie."
-#: builtin/clean.c:869
+#: builtin/clean.c:875
msgid "do not print names of files removed"
msgstr "ne pas afficher les noms des fichiers supprimés"
-#: builtin/clean.c:871
+#: builtin/clean.c:877
msgid "force"
msgstr "forcer"
-#: builtin/clean.c:872
+#: builtin/clean.c:878
msgid "interactive cleaning"
msgstr "nettoyage interactif"
-#: builtin/clean.c:874
+#: builtin/clean.c:880
msgid "remove whole directories"
msgstr "supprimer les répertoires entiers"
-#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:1056
-#: builtin/ls-files.c:538 builtin/name-rev.c:313 builtin/show-ref.c:176
+#: 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
msgid "pattern"
msgstr "motif"
-#: builtin/clean.c:876
+#: builtin/clean.c:882
msgid "add <pattern> to ignore rules"
msgstr "ajouter <motif> aux règles ignore"
-#: builtin/clean.c:877
+#: builtin/clean.c:883
msgid "remove ignored files, too"
msgstr "supprimer les fichiers ignorés, aussi"
-#: builtin/clean.c:879
+#: builtin/clean.c:885
msgid "remove only ignored files"
msgstr "supprimer seulement les fichiers ignorés"
-#: builtin/clean.c:897
+#: builtin/clean.c:903
msgid "-x and -X cannot be used together"
msgstr "-x et -X ne peuvent pas être utilisés ensemble"
-#: builtin/clean.c:901
+#: builtin/clean.c:907
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -6353,7 +6558,7 @@
"clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de "
"nettoyer"
-#: builtin/clean.c:904
+#: builtin/clean.c:910
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -6365,130 +6570,135 @@
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<options>] [--] <dépôt> [<répertoire>]"
-#: builtin/clone.c:65
+#: builtin/clone.c:80
msgid "don't create a checkout"
msgstr "ne pas créer d'extraction"
-#: builtin/clone.c:66 builtin/clone.c:68 builtin/init-db.c:478
+#: builtin/clone.c:81 builtin/clone.c:83 builtin/init-db.c:478
msgid "create a bare repository"
msgstr "créer un dépôt nu"
-#: builtin/clone.c:70
+#: builtin/clone.c:85
msgid "create a mirror repository (implies bare)"
msgstr "créer un dépôt miroir (implique dépôt nu)"
-#: builtin/clone.c:72
+#: builtin/clone.c:87
msgid "to clone from a local repository"
msgstr "pour cloner depuis un dépôt local"
-#: builtin/clone.c:74
+#: builtin/clone.c:89
msgid "don't use local hardlinks, always copy"
msgstr "ne pas utiliser de liens durs locaux, toujours copier"
-#: builtin/clone.c:76
+#: builtin/clone.c:91
msgid "setup as shared repository"
msgstr "régler comme dépôt partagé"
-#: builtin/clone.c:78 builtin/clone.c:80
+#: builtin/clone.c:93 builtin/clone.c:97
+msgid "pathspec"
+msgstr "spécificateur de chemin"
+
+#: builtin/clone.c:93 builtin/clone.c:97
msgid "initialize submodules in the clone"
msgstr "initialiser les sous-modules dans le clone"
-#: builtin/clone.c:82
+#: builtin/clone.c:100
msgid "number of submodules cloned in parallel"
msgstr "nombre de sous-modules clonés en parallèle"
-#: builtin/clone.c:83 builtin/init-db.c:475
+#: builtin/clone.c:101 builtin/init-db.c:475
msgid "template-directory"
msgstr "répertoire-modèle"
-#: builtin/clone.c:84 builtin/init-db.c:476
+#: builtin/clone.c:102 builtin/init-db.c:476
msgid "directory from which templates will be used"
msgstr "répertoire depuis lequel les modèles vont être utilisés"
-#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:604
-#: builtin/submodule--helper.c:970
+#: builtin/clone.c:104 builtin/clone.c:106 builtin/submodule--helper.c:642
+#: builtin/submodule--helper.c:983
msgid "reference repository"
msgstr "dépôt de référence"
-#: builtin/clone.c:90
+#: builtin/clone.c:108
msgid "use --reference only while cloning"
msgstr "utiliser seulement --reference pour cloner"
-#: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:109 builtin/column.c:26 builtin/merge-file.c:43
msgid "name"
msgstr "nom"
-#: builtin/clone.c:92
+#: builtin/clone.c:110
msgid "use <name> instead of 'origin' to track upstream"
msgstr "utiliser <nom> au lieu de 'origin' pour suivre la branche amont"
-#: builtin/clone.c:94
+#: builtin/clone.c:112
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "extraire <branche> au lieu de la HEAD du répertoire distant"
-#: builtin/clone.c:96
+#: builtin/clone.c:114
msgid "path to git-upload-pack on the remote"
msgstr "chemin vers git-upload-pack sur le serveur distant"
-#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:999 builtin/pull.c:202
+#: builtin/clone.c:115 builtin/fetch.c:120 builtin/grep.c:1006
+#: builtin/pull.c:202
msgid "depth"
msgstr "profondeur"
-#: builtin/clone.c:98
+#: builtin/clone.c:116
msgid "create a shallow clone of that depth"
msgstr "créer un clone superficiel de cette profondeur"
-#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2836
+#: builtin/clone.c:117 builtin/fetch.c:122 builtin/pack-objects.c:2918
#: parse-options.h:142
msgid "time"
msgstr "heure"
-#: builtin/clone.c:100
+#: builtin/clone.c:118
msgid "create a shallow clone since a specific time"
msgstr "créer un clone superficiel depuis une date spécifique"
-#: builtin/clone.c:101 builtin/fetch.c:124
+#: builtin/clone.c:119 builtin/fetch.c:124
msgid "revision"
msgstr "révision"
-#: builtin/clone.c:102 builtin/fetch.c:125
+#: builtin/clone.c:120 builtin/fetch.c:125
msgid "deepen history of shallow clone, excluding rev"
msgstr ""
"approfondir l'historique d'un clone superficiel en excluant une révision"
-#: builtin/clone.c:104
+#: builtin/clone.c:122
msgid "clone only one branch, HEAD or --branch"
msgstr "cloner seulement une branche, HEAD ou --branch"
-#: builtin/clone.c:106
+#: builtin/clone.c:124
msgid "any cloned submodules will be shallow"
msgstr "tous les sous-modules clonés seront superficiels"
-#: builtin/clone.c:107 builtin/init-db.c:484
+#: builtin/clone.c:125 builtin/init-db.c:484
msgid "gitdir"
msgstr "gitdir"
-#: builtin/clone.c:108 builtin/init-db.c:485
+#: builtin/clone.c:126 builtin/init-db.c:485
msgid "separate git dir from working tree"
msgstr "séparer le répertoire git de la copie de travail"
-#: builtin/clone.c:109
+#: builtin/clone.c:127
msgid "key=value"
msgstr "clé=valeur"
-#: builtin/clone.c:110
+#: builtin/clone.c:128
msgid "set config inside the new repository"
msgstr "régler la configuration dans le nouveau dépôt"
-#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:550
+#: builtin/clone.c:129 builtin/fetch.c:140 builtin/push.c:550
msgid "use IPv4 addresses only"
msgstr "n'utiliser que des adresses IPv4"
-#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:552
+#: builtin/clone.c:131 builtin/fetch.c:142 builtin/push.c:552
msgid "use IPv6 addresses only"
msgstr "n'utiliser que des adresses IPv6"
-#: builtin/clone.c:250
+#: builtin/clone.c:268
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
@@ -6496,42 +6706,42 @@
"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:303
+#: builtin/clone.c:321
#, 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:375
+#: builtin/clone.c:393
#, c-format
msgid "failed to open '%s'"
msgstr "échec à l'ouverture de '%s'"
-#: builtin/clone.c:383
+#: builtin/clone.c:401
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existe et n'est pas un répertoire"
-#: builtin/clone.c:397
+#: builtin/clone.c:415
#, c-format
msgid "failed to stat %s\n"
msgstr "échec du stat de %s\n"
-#: builtin/clone.c:419
+#: builtin/clone.c:437
#, c-format
msgid "failed to create link '%s'"
msgstr "échec de la création du lien '%s'"
-#: builtin/clone.c:423
+#: builtin/clone.c:441
#, c-format
msgid "failed to copy file to '%s'"
msgstr "échec de la copie vers '%s'"
-#: builtin/clone.c:448
+#: builtin/clone.c:466
#, c-format
msgid "done.\n"
msgstr "fait.\n"
-#: builtin/clone.c:460
+#: builtin/clone.c:478
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -6541,103 +6751,102 @@
"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:537
+#: builtin/clone.c:555
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Impossible de trouver la branche distante '%s' à cloner."
-#: builtin/clone.c:632
+#: builtin/clone.c:650
msgid "remote did not send all necessary objects"
msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires"
-#: builtin/clone.c:648
+#: builtin/clone.c:666
#, c-format
msgid "unable to update %s"
msgstr "impossible de mettre à jour %s"
-#: builtin/clone.c:697
+#: builtin/clone.c:715
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:728
+#: builtin/clone.c:746
msgid "unable to checkout working tree"
msgstr "impossible d'extraire la copie de travail"
-#: builtin/clone.c:768
+#: builtin/clone.c:786
msgid "unable to write parameters to config file"
msgstr "impossible d'écrire les paramètres dans le fichier de configuration"
-#: builtin/clone.c:831
+#: builtin/clone.c:849
msgid "cannot repack to clean up"
msgstr "impossible de remballer pour nettoyer"
-#: builtin/clone.c:833
+#: builtin/clone.c:851
msgid "cannot unlink temporary alternates file"
msgstr "impossible de unlinker le fichier temporaire alternates"
-#: builtin/clone.c:866 builtin/receive-pack.c:1895
+#: builtin/clone.c:884 builtin/receive-pack.c:1900
msgid "Too many arguments."
msgstr "Trop d'arguments."
-#: builtin/clone.c:870
+#: builtin/clone.c:888
msgid "You must specify a repository to clone."
msgstr "Vous devez spécifier un dépôt à cloner."
-#: builtin/clone.c:883
+#: builtin/clone.c:901
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "les options --bare et --origin %s sont incompatibles."
-#: builtin/clone.c:886
+#: builtin/clone.c:904
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare et --separate-git-dir sont incompatibles."
-#: builtin/clone.c:899
+#: builtin/clone.c:917
#, c-format
msgid "repository '%s' does not exist"
msgstr "le dépôt '%s' n'existe pas"
-#: builtin/clone.c:905 builtin/fetch.c:1335
+#: builtin/clone.c:923 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:915
+#: builtin/clone.c:933
#, 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:925
+#: builtin/clone.c:943
#, c-format
msgid "working tree '%s' already exists."
msgstr "la copie de travail '%s' existe déjà."
-#: builtin/clone.c:940 builtin/clone.c:951 builtin/difftool.c:252
-#: builtin/submodule--helper.c:659 builtin/worktree.c:222
-#: builtin/worktree.c:249
+#: builtin/clone.c:958 builtin/clone.c:969 builtin/difftool.c:252
+#: builtin/worktree.c:221 builtin/worktree.c:251
#, 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:943
+#: builtin/clone.c:961
#, 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:955
+#: builtin/clone.c:973
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Clonage dans le dépôt nu '%s'\n"
-#: builtin/clone.c:957
+#: builtin/clone.c:975
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Clonage dans '%s'...\n"
-#: builtin/clone.c:963
+#: builtin/clone.c:999
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
@@ -6645,42 +6854,42 @@
"clone --recursive n'est pas compatible avec à la fois --reference et --"
"reference-if-able"
-#: builtin/clone.c:1019
+#: builtin/clone.c:1055
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:1021
+#: builtin/clone.c:1057
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:1023
+#: builtin/clone.c:1059
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:1026
+#: builtin/clone.c:1062
msgid "source repository is shallow, ignoring --local"
msgstr "le dépôt source est superficiel, option --local ignorée"
-#: builtin/clone.c:1031
+#: builtin/clone.c:1067
msgid "--local is ignored"
msgstr "--local est ignoré"
-#: builtin/clone.c:1035
+#: builtin/clone.c:1071
#, c-format
msgid "Don't know how to clone %s"
msgstr "Je ne sais pas cloner %s"
-#: builtin/clone.c:1090 builtin/clone.c:1098
+#: builtin/clone.c:1126 builtin/clone.c:1134
#, 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:1101
+#: builtin/clone.c:1137
msgid "You appear to have cloned an empty repository."
msgstr "Vous semblez avoir cloné un dépôt vide."
@@ -6877,11 +7086,6 @@
msgid "malformed --author parameter"
msgstr "paramètre --author mal formé"
-#: builtin/commit.c:611
-#, c-format
-msgid "invalid date format: %s"
-msgstr "format de date invalide : %s"
-
#: builtin/commit.c:655
msgid ""
"unable to select a comment character that is not used\n"
@@ -6895,7 +7099,7 @@
msgid "could not lookup commit %s"
msgstr "impossible de rechercher le commit %s"
-#: builtin/commit.c:704 builtin/shortlog.c:295
+#: builtin/commit.c:704 builtin/shortlog.c:294
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(lecture du message de journal depuis l'entrée standard)\n"
@@ -6995,7 +7199,7 @@
msgid "Error building trees"
msgstr "Erreur lors de la construction des arbres"
-#: builtin/commit.c:968 builtin/tag.c:280
+#: builtin/commit.c:968 builtin/tag.c:273
#, 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"
@@ -7062,7 +7266,7 @@
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:495
+#: builtin/commit.c:1224 builtin/tag.c:551
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Mode de nettoyage invalide %s"
@@ -7084,7 +7288,7 @@
msgstr "version"
#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525
-#: builtin/worktree.c:442
+#: builtin/worktree.c:448
msgid "machine-readable output"
msgstr "sortie pour traitement automatique"
@@ -7097,7 +7301,7 @@
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:368
+#: builtin/fast-export.c:984 builtin/tag.c:411
msgid "mode"
msgstr "mode"
@@ -7155,7 +7359,7 @@
msgid "Commit message options"
msgstr "Options du message de validation"
-#: builtin/commit.c:1586 builtin/tag.c:366
+#: builtin/commit.c:1586 builtin/tag.c:409
msgid "read message from file"
msgstr "lire le message depuis un fichier"
@@ -7167,7 +7371,7 @@
msgid "override author for commit"
msgstr "remplacer l'auteur pour la validation"
-#: builtin/commit.c:1588 builtin/gc.c:333
+#: builtin/commit.c:1588 builtin/gc.c:357
msgid "date"
msgstr "date"
@@ -7175,8 +7379,8 @@
msgid "override date for commit"
msgstr "remplacer la date pour la validation"
-#: builtin/commit.c:1589 builtin/merge.c:222 builtin/notes.c:398
-#: builtin/notes.c:561 builtin/tag.c:364
+#: builtin/commit.c:1589 builtin/merge.c:221 builtin/notes.c:398
+#: builtin/notes.c:561 builtin/tag.c:407
msgid "message"
msgstr "message"
@@ -7185,7 +7389,7 @@
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:81
+#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:77
msgid "commit"
msgstr "commit"
@@ -7212,7 +7416,7 @@
msgstr ""
"à présent je suis l'auteur de la validation (utilisé avec -C/-c/--amend)"
-#: builtin/commit.c:1595 builtin/log.c:1413 builtin/revert.c:86
+#: builtin/commit.c:1595 builtin/log.c:1420 builtin/revert.c:104
msgid "add Signed-off-by:"
msgstr "ajouter une entrée Signed-off-by :"
@@ -7228,7 +7432,7 @@
msgid "default"
msgstr "défaut"
-#: builtin/commit.c:1598 builtin/tag.c:369
+#: builtin/commit.c:1598 builtin/tag.c:412
msgid "how to strip spaces and #comments from message"
msgstr "comment éliminer les espaces et les commentaires # du message"
@@ -7236,8 +7440,8 @@
msgid "include status in commit message template"
msgstr "inclure le statut dans le modèle de message de validation"
-#: builtin/commit.c:1601 builtin/merge.c:234 builtin/pull.c:166
-#: builtin/revert.c:93
+#: builtin/commit.c:1601 builtin/merge.c:233 builtin/pull.c:166
+#: builtin/revert.c:112
msgid "GPG sign commit"
msgstr "signer la validation avec GPG"
@@ -7331,142 +7535,142 @@
msgid "git config [<options>]"
msgstr "git config [<options>]"
-#: builtin/config.c:55
+#: builtin/config.c:56
msgid "Config file location"
msgstr "Emplacement du fichier de configuration"
-#: builtin/config.c:56
+#: builtin/config.c:57
msgid "use global config file"
msgstr "utiliser les fichier de configuration global"
-#: builtin/config.c:57
+#: builtin/config.c:58
msgid "use system config file"
msgstr "utiliser le fichier de configuration du système"
-#: builtin/config.c:58
+#: builtin/config.c:59
msgid "use repository config file"
msgstr "utiliser le fichier de configuration du dépôt"
-#: builtin/config.c:59
+#: builtin/config.c:60
msgid "use given config file"
msgstr "utiliser le fichier de configuration spécifié"
-#: builtin/config.c:60
+#: builtin/config.c:61
msgid "blob-id"
msgstr "blob-id"
-#: builtin/config.c:60
+#: builtin/config.c:61
msgid "read config from given blob object"
msgstr "lire la configuration depuis l'objet blob fourni"
-#: builtin/config.c:61
+#: builtin/config.c:62
msgid "Action"
msgstr "Action"
-#: builtin/config.c:62
+#: builtin/config.c:63
msgid "get value: name [value-regex]"
msgstr "obtenir la valeur : nom [regex-de-valeur]"
-#: builtin/config.c:63
+#: builtin/config.c:64
msgid "get all values: key [value-regex]"
msgstr "obtenir toutes les valeurs : clé [regex-de-valeur]"
-#: builtin/config.c:64
+#: builtin/config.c:65
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:65
+#: builtin/config.c:66
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:66
+#: builtin/config.c:67
msgid "replace all matching variables: name value [value_regex]"
msgstr ""
"remplacer toutes les variables correspondant : nom valeur [regex-de-valeur]"
-#: builtin/config.c:67
+#: builtin/config.c:68
msgid "add a new variable: name value"
msgstr "ajouter une nouvelle variable : nom valeur"
-#: builtin/config.c:68
+#: builtin/config.c:69
msgid "remove a variable: name [value-regex]"
msgstr "supprimer une variable : nom [regex-de-valeur]"
-#: builtin/config.c:69
+#: builtin/config.c:70
msgid "remove all matches: name [value-regex]"
msgstr "supprimer toutes les correspondances nom [regex-de-valeur]"
-#: builtin/config.c:70
+#: builtin/config.c:71
msgid "rename section: old-name new-name"
msgstr "renommer une section : ancien-nom nouveau-nom"
-#: builtin/config.c:71
+#: builtin/config.c:72
msgid "remove a section: name"
msgstr "supprimer une section : nom"
-#: builtin/config.c:72
+#: builtin/config.c:73
msgid "list all"
msgstr "afficher tout"
-#: builtin/config.c:73
+#: builtin/config.c:74
msgid "open an editor"
msgstr "ouvrir un éditeur"
-#: builtin/config.c:74
+#: builtin/config.c:75
msgid "find the color configured: slot [default]"
msgstr "trouver la couleur configurée : slot [par défaut]"
-#: builtin/config.c:75
+#: builtin/config.c:76
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "trouver le réglage de la couleur : slot [stdout-est-tty]"
-#: builtin/config.c:76
+#: builtin/config.c:77
msgid "Type"
msgstr "Type"
-#: builtin/config.c:77
+#: builtin/config.c:78
msgid "value is \"true\" or \"false\""
msgstr "la valeur est \"true\" (vrai) ou \"false\" (faux)"
-#: builtin/config.c:78
+#: builtin/config.c:79
msgid "value is decimal number"
msgstr "la valeur est un nombre décimal"
-#: builtin/config.c:79
+#: builtin/config.c:80
msgid "value is --bool or --int"
msgstr "la valeur est --bool ou --int"
-#: builtin/config.c:80
+#: builtin/config.c:81
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:81
+#: builtin/config.c:82
msgid "Other"
msgstr "Autre"
-#: builtin/config.c:82
+#: builtin/config.c:83
msgid "terminate values with NUL byte"
msgstr "terminer les valeurs avec un caractère NUL"
-#: builtin/config.c:83
+#: builtin/config.c:84
msgid "show variable names only"
msgstr "n'afficher que les noms de variable"
-#: builtin/config.c:84
+#: builtin/config.c:85
msgid "respect include directives on lookup"
msgstr "respecter les directives d'inclusion lors de la recherche"
-#: builtin/config.c:85
+#: builtin/config.c:86
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:327
+#: builtin/config.c:328
msgid "unable to parse default color value"
msgstr "impossible de lire la valeur de couleur par défaut"
-#: builtin/config.c:471
+#: builtin/config.c:472
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -7481,12 +7685,12 @@
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:613
+#: builtin/config.c:615
#, c-format
msgid "cannot create configuration file %s"
msgstr "création impossible du fichier de configuration '%s'"
-#: builtin/config.c:625
+#: builtin/config.c:627
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
@@ -7503,55 +7707,67 @@
msgid "print sizes in human readable format"
msgstr "affiche les tailles dans un format humainement lisible"
-#: builtin/describe.c:17
+#: builtin/describe.c:18
msgid "git describe [<options>] [<commit-ish>...]"
msgstr "git describe [<options>] <commit ou apparenté>*"
-#: builtin/describe.c:18
+#: builtin/describe.c:19
msgid "git describe [<options>] --dirty"
msgstr "git describe [<options>] --dirty"
-#: builtin/describe.c:217
+#: builtin/describe.c:53
+msgid "head"
+msgstr "tête"
+
+#: builtin/describe.c:53
+msgid "lightweight"
+msgstr "léger"
+
+#: builtin/describe.c:53
+msgid "annotated"
+msgstr "annoté"
+
+#: builtin/describe.c:250
#, c-format
msgid "annotated tag %s not available"
msgstr "l'étiquette annotée %s n'est pas disponible"
-#: builtin/describe.c:221
+#: builtin/describe.c:254
#, 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:223
+#: builtin/describe.c:256
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr "l'étiquette '%s' est en fait '%s'"
-#: builtin/describe.c:250 builtin/log.c:480
+#: builtin/describe.c:283 builtin/log.c:487
#, c-format
msgid "Not a valid object name %s"
msgstr "%s n'est pas un nom d'objet valide"
-#: builtin/describe.c:253
+#: builtin/describe.c:286
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s n'est pas un objet '%s' valide"
-#: builtin/describe.c:270
+#: builtin/describe.c:303
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "aucune étiquette ne correspond parfaitement à '%s'"
-#: builtin/describe.c:272
+#: builtin/describe.c:305
#, c-format
msgid "searching to describe %s\n"
msgstr "recherche de la description de %s\n"
-#: builtin/describe.c:319
+#: builtin/describe.c:352
#, c-format
msgid "finished search at %s\n"
msgstr "recherche terminée à %s\n"
-#: builtin/describe.c:346
+#: builtin/describe.c:379
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
@@ -7560,7 +7776,7 @@
"Aucune étiquette annotée ne peut décrire '%s'.\n"
"Cependant, il existe des étiquettes non-annotées : essayez avec --tags."
-#: builtin/describe.c:350
+#: builtin/describe.c:383
#, c-format
msgid ""
"No tags can describe '%s'.\n"
@@ -7569,12 +7785,12 @@
"Aucune étiquette ne peut décrire '%s'.\n"
"Essayez --always, ou créez des étiquettes."
-#: builtin/describe.c:371
+#: builtin/describe.c:413
#, c-format
msgid "traversed %lu commits\n"
msgstr "%lu commits parcourus\n"
-#: builtin/describe.c:374
+#: builtin/describe.c:416
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
@@ -7584,67 +7800,80 @@
"affichées\n"
"abandon de la recherche à %s\n"
-#: builtin/describe.c:396
+#: builtin/describe.c:438
msgid "find the tag that comes after the commit"
msgstr "rechercher l'étiquette qui suit le commit"
-#: builtin/describe.c:397
+#: builtin/describe.c:439
msgid "debug search strategy on stderr"
msgstr "déboguer la stratégie de recherche sur stderr"
-#: builtin/describe.c:398
+#: builtin/describe.c:440
msgid "use any ref"
msgstr "utiliser n'importe quelle référence"
-#: builtin/describe.c:399
+#: builtin/describe.c:441
msgid "use any tag, even unannotated"
msgstr "utiliser n'importe quelle étiquette, même non-annotée"
-#: builtin/describe.c:400
+#: builtin/describe.c:442
msgid "always use long format"
msgstr "toujours utiliser le format long"
-#: builtin/describe.c:401
+#: builtin/describe.c:443
msgid "only follow first parent"
msgstr "ne suivre que le premier parent"
-#: builtin/describe.c:404
+#: builtin/describe.c:446
msgid "only output exact matches"
msgstr "n'afficher que les correspondances exactes"
-#: builtin/describe.c:406
+#: builtin/describe.c:448
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:408
+#: builtin/describe.c:450
msgid "only consider tags matching <pattern>"
msgstr "ne considérer que les étiquettes correspondant à <motif>"
-#: builtin/describe.c:410 builtin/name-rev.c:320
+#: builtin/describe.c:452
+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
msgid "show abbreviated commit object as fallback"
msgstr "afficher les objets commits abrégés en dernier recours"
-#: builtin/describe.c:411
+#: builtin/describe.c:455 builtin/describe.c:458
msgid "mark"
msgstr "marque"
-#: builtin/describe.c:412
+#: builtin/describe.c:456
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:430
+#: builtin/describe.c:459
+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
msgid "--long is incompatible with --abbrev=0"
msgstr "--long et --abbrev=0 sont incompatibles"
-#: builtin/describe.c:456
+#: builtin/describe.c:506
msgid "No names found, cannot describe anything."
msgstr "aucun nom trouvé, impossible de décrire quoi que ce soit."
-#: builtin/describe.c:476
+#: builtin/describe.c:549
msgid "--dirty is incompatible with commit-ishes"
msgstr "--dirty est incompatible avec la spécification de commits ou assimilés"
+#: builtin/describe.c:551
+msgid "--broken is incompatible with commit-ishes"
+msgstr "--broken est incompatible avec les commits ou assimilés"
+
#: builtin/diff.c:83
#, c-format
msgid "'%s': not a regular file or symlink"
@@ -7683,7 +7912,22 @@
msgid "failed: %d"
msgstr "échec : %d"
-#: builtin/difftool.c:342
+#: builtin/difftool.c:283
+#, c-format
+msgid "could not read symlink %s"
+msgstr "lecture du lien symbolique %s impossible"
+
+#: builtin/difftool.c:285
+#, c-format
+msgid "could not read symlink file %s"
+msgstr "impossible de lire le fichier symlink %s"
+
+#: builtin/difftool.c:293
+#, 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
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
@@ -7691,53 +7935,53 @@
"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:567
+#: builtin/difftool.c:609
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "les deux fichiers sont modifiés : '%s' et '%s'."
-#: builtin/difftool.c:569
+#: builtin/difftool.c:611
msgid "working tree file has been left."
msgstr "le fichier dans l'arbre de travail a été laissé."
-#: builtin/difftool.c:580
+#: builtin/difftool.c:622
#, c-format
msgid "temporary files exist in '%s'."
msgstr "des fichiers temporaires existent dans '%s'."
-#: builtin/difftool.c:581
+#: builtin/difftool.c:623
msgid "you may want to cleanup or recover these."
msgstr "vous pourriez souhaiter les nettoyer ou les récupérer."
-#: builtin/difftool.c:626
+#: builtin/difftool.c:669
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "utiliser `diff.guitool` au lieu de `diff.tool`"
-#: builtin/difftool.c:628
+#: builtin/difftool.c:671
msgid "perform a full-directory diff"
msgstr "réalise un diff de répertoire complet"
-#: builtin/difftool.c:630
+#: builtin/difftool.c:673
msgid "do not prompt before launching a diff tool"
msgstr "ne pas confirmer avant de lancer l'outil de diff"
-#: builtin/difftool.c:636
+#: builtin/difftool.c:679
msgid "use symlinks in dir-diff mode"
msgstr "utiliser les liens symboliques en mode de diff de répertoire"
-#: builtin/difftool.c:637
+#: builtin/difftool.c:680
msgid "<tool>"
msgstr "<outil>"
-#: builtin/difftool.c:638
+#: builtin/difftool.c:681
msgid "use the specified diff tool"
msgstr "utiliser l'outil de diff spécifié"
-#: builtin/difftool.c:640
+#: builtin/difftool.c:683
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:643
+#: builtin/difftool.c:686
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
@@ -7745,19 +7989,19 @@
"provoque la fin de 'git-difftool' si l'outil de diff invoqué renvoie un code "
"non-nul"
-#: builtin/difftool.c:645
+#: builtin/difftool.c:688
msgid "<command>"
msgstr "<commande>"
-#: builtin/difftool.c:646
+#: builtin/difftool.c:689
msgid "specify a custom command for viewing diffs"
msgstr "spécifier une commande personnalisée pour visualiser les différences"
-#: builtin/difftool.c:670
+#: builtin/difftool.c:713
msgid "no <tool> given for --tool=<tool>"
msgstr "pas d'<outil> spécifié pour --tool=<outil>"
-#: builtin/difftool.c:677
+#: builtin/difftool.c:720
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "pas de <commande> spécifié pour --extcmd=<commande>"
@@ -7896,7 +8140,7 @@
msgid "convert to a complete repository"
msgstr "convertir en un dépôt complet"
-#: builtin/fetch.c:131 builtin/log.c:1433
+#: builtin/fetch.c:131 builtin/log.c:1440
msgid "dir"
msgstr "répertoire"
@@ -7924,75 +8168,75 @@
msgid "Couldn't find remote ref HEAD"
msgstr "impossible de trouver la référence HEAD distante"
-#: builtin/fetch.c:511
+#: builtin/fetch.c:513
#, 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:604
+#: builtin/fetch.c:606
#, c-format
msgid "object %s not found"
msgstr "objet %s non trouvé"
-#: builtin/fetch.c:608
+#: builtin/fetch.c:610
msgid "[up to date]"
msgstr "[à jour]"
-#: builtin/fetch.c:621 builtin/fetch.c:701
+#: builtin/fetch.c:623 builtin/fetch.c:703
msgid "[rejected]"
msgstr "[rejeté]"
-#: builtin/fetch.c:622
+#: builtin/fetch.c:624
msgid "can't fetch in current branch"
msgstr "impossible de récupérer dans la branche actuelle"
-#: builtin/fetch.c:631
+#: builtin/fetch.c:633
msgid "[tag update]"
msgstr "[mise à jour de l'étiquette]"
-#: builtin/fetch.c:632 builtin/fetch.c:665 builtin/fetch.c:681
-#: builtin/fetch.c:696
+#: builtin/fetch.c:634 builtin/fetch.c:667 builtin/fetch.c:683
+#: builtin/fetch.c:698
msgid "unable to update local ref"
msgstr "impossible de mettre à jour la référence locale"
-#: builtin/fetch.c:651
+#: builtin/fetch.c:653
msgid "[new tag]"
msgstr "[nouvelle étiquette]"
-#: builtin/fetch.c:654
+#: builtin/fetch.c:656
msgid "[new branch]"
msgstr "[nouvelle branche]"
-#: builtin/fetch.c:657
+#: builtin/fetch.c:659
msgid "[new ref]"
msgstr "[nouvelle référence]"
-#: builtin/fetch.c:696
+#: builtin/fetch.c:698
msgid "forced update"
msgstr "mise à jour forcée"
-#: builtin/fetch.c:701
+#: builtin/fetch.c:703
msgid "non-fast-forward"
msgstr "pas en avance rapide"
-#: builtin/fetch.c:746
+#: builtin/fetch.c:748
#, 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:766
+#: builtin/fetch.c:768
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
"%s rejeté parce que les racines superficielles ne sont pas mises à jour"
-#: builtin/fetch.c:853 builtin/fetch.c:949
+#: builtin/fetch.c:855 builtin/fetch.c:951
#, c-format
msgid "From %.*s\n"
msgstr "Depuis %.*s\n"
-#: builtin/fetch.c:864
+#: builtin/fetch.c:866
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -8001,55 +8245,55 @@
"des références locales n'ont pas pu être mises à jour ; essayez de lancer\n"
" 'git remote prune %s' pour supprimer des branches anciennes en conflit"
-#: builtin/fetch.c:919
+#: builtin/fetch.c:921
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s sera en suspens)"
-#: builtin/fetch.c:920
+#: builtin/fetch.c:922
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s est devenu en suspens)"
-#: builtin/fetch.c:952
+#: builtin/fetch.c:954
msgid "[deleted]"
msgstr "[supprimé]"
-#: builtin/fetch.c:953 builtin/remote.c:1020
+#: builtin/fetch.c:955 builtin/remote.c:1022
msgid "(none)"
msgstr "(aucun(e))"
-#: builtin/fetch.c:976
+#: builtin/fetch.c:978
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Refus de récupérer dans la branche courant %s d'un dépôt non nu"
-#: builtin/fetch.c:995
+#: builtin/fetch.c:997
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "La valeur \"%2$s\" de l'option \"%1$s\" est invalide pour %3$s"
-#: builtin/fetch.c:998
+#: builtin/fetch.c:1000
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "L'option \"%s\" est ignorée pour %s\n"
-#: builtin/fetch.c:1074
+#: builtin/fetch.c:1076
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "Je ne sais pas récupérer depuis %s"
-#: builtin/fetch.c:1234
+#: builtin/fetch.c:1236
#, c-format
msgid "Fetching %s\n"
msgstr "Récupération de %s\n"
-#: builtin/fetch.c:1236 builtin/remote.c:96
+#: builtin/fetch.c:1238 builtin/remote.c:96
#, c-format
msgid "Could not fetch %s"
msgstr "Impossible de récupérer %s"
-#: builtin/fetch.c:1254
+#: builtin/fetch.c:1256
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -8057,40 +8301,40 @@
"Aucun dépôt distant spécifié. Veuillez spécifier une URL ou un nom\n"
"distant depuis lesquels les nouvelles révisions devraient être récupérées."
-#: builtin/fetch.c:1277
+#: builtin/fetch.c:1279
msgid "You need to specify a tag name."
msgstr "Vous devez spécifier un nom d'étiquette."
-#: builtin/fetch.c:1319
+#: builtin/fetch.c:1321
msgid "Negative depth in --deepen is not supported"
msgstr "Une profondeur négative dans --deepen n'est pas supportée"
-#: builtin/fetch.c:1321
+#: builtin/fetch.c:1323
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen et --depth sont mutuellement exclusifs"
-#: builtin/fetch.c:1326
+#: builtin/fetch.c:1328
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble"
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1330
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:1350
+#: builtin/fetch.c:1352
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all n'accepte pas d'argument de dépôt"
-#: builtin/fetch.c:1352
+#: builtin/fetch.c:1354
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:1363
+#: builtin/fetch.c:1365
#, c-format
msgid "No such remote or remote group: %s"
msgstr "distant ou groupe distant inexistant : %s"
-#: builtin/fetch.c:1371
+#: builtin/fetch.c:1373
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 "
@@ -8131,12 +8375,12 @@
msgstr "git for-each-ref [--point-at <objet>]"
#: builtin/for-each-ref.c:11
-msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"
-msgstr "git for-each-ref [(--merged | --no-merged) [<objet>]]"
+msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
+msgstr "git for-each-ref [(--merged | --no-merged) [<commit>]]"
#: builtin/for-each-ref.c:12
-msgid "git for-each-ref [--contains [<object>]]"
-msgstr "git for-each-ref [--contains [<objet>]]"
+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
msgid "quote placeholders suitably for shells"
@@ -8158,10 +8402,6 @@
msgid "show only <n> matched refs"
msgstr "n'afficher que <n> références correspondant"
-#: builtin/for-each-ref.c:37 builtin/tag.c:387 builtin/verify-tag.c:38
-msgid "format to use for the output"
-msgstr "format à utiliser pour la sortie"
-
#: builtin/for-each-ref.c:41
msgid "print only refs which points at the given object"
msgstr "afficher seulement les références pointant sur l'objet"
@@ -8178,6 +8418,10 @@
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
+msgid "print only refs which don't contain the commit"
+msgstr "afficher seulement les références qui ne contiennent pas le commit"
+
#: builtin/fsck.c:554
msgid "Checking object directories"
msgstr "Vérification des répertoires d'objet"
@@ -8243,17 +8487,17 @@
msgid "git gc [<options>]"
msgstr "git gc [<options>]"
-#: builtin/gc.c:72
+#: builtin/gc.c:78
#, c-format
-msgid "Invalid %s: '%s'"
-msgstr "%s invalide : '%s'"
+msgid "Failed to fstat %s: %s"
+msgstr "Échec du stat de %s : %s"
-#: builtin/gc.c:139
+#: builtin/gc.c:310
#, c-format
-msgid "insanely long object directory %.*s"
-msgstr "objet répertoire démentiellement long %.*s"
+msgid "Can't stat %s"
+msgstr "impossible de faire un stat de %s"
-#: builtin/gc.c:297
+#: builtin/gc.c:319
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@ -8269,42 +8513,47 @@
"\n"
"%s"
-#: builtin/gc.c:334
+#: builtin/gc.c:358
msgid "prune unreferenced objects"
msgstr "éliminer les objets non référencés"
-#: builtin/gc.c:336
+#: builtin/gc.c:360
msgid "be more thorough (increased runtime)"
msgstr "être plus consciencieux (durée de traitement allongée)"
-#: builtin/gc.c:337
+#: builtin/gc.c:361
msgid "enable auto-gc mode"
msgstr "activer le mode auto-gc"
-#: builtin/gc.c:338
+#: builtin/gc.c:362
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:380
+#: builtin/gc.c:379
+#, c-format
+msgid "Failed to parse gc.logexpiry value %s"
+msgstr "impossible de lire la valeur de gc.logexpiry %s"
+
+#: builtin/gc.c:407
#, 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:382
+#: builtin/gc.c:409
#, 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:383
+#: builtin/gc.c:410
#, 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:404
+#: builtin/gc.c:431
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -8312,7 +8561,7 @@
"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:448
+#: builtin/gc.c:475
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
@@ -8333,244 +8582,249 @@
msgid "invalid number of threads specified (%d) for %s"
msgstr "nombre de fils spécifié invalide (%d) pour %s"
-#: builtin/grep.c:763 builtin/grep.c:804
+#: builtin/grep.c:769 builtin/grep.c:810
#, c-format
msgid "unable to read tree (%s)"
msgstr "impossible de lire l'arbre (%s)"
-#: builtin/grep.c:823
+#: builtin/grep.c:829
#, 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:887
+#: builtin/grep.c:893
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "l'option '%c' attend un valeur numérique"
-#: builtin/grep.c:973
+#: builtin/grep.c:980
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:975
+#: builtin/grep.c:982
msgid "find in contents not managed by git"
msgstr "rechercher dans les contenus non gérés par git"
-#: builtin/grep.c:977
+#: builtin/grep.c:984
msgid "search in both tracked and untracked files"
msgstr "rechercher dans les fichiers suivis et non-suivis"
-#: builtin/grep.c:979
+#: builtin/grep.c:986
msgid "ignore files specified via '.gitignore'"
msgstr "ignorer les fichiers spécifiés via '.gitignore'"
-#: builtin/grep.c:981
-msgid "recursivley search in each submodule"
+#: builtin/grep.c:988
+msgid "recursively search in each submodule"
msgstr "rechercher récursivement dans chaque sous-module"
-#: builtin/grep.c:983
+#: builtin/grep.c:990
msgid "basename"
msgstr "nom de base"
-#: builtin/grep.c:984
+#: builtin/grep.c:991
msgid "prepend parent project's basename to output"
msgstr "préfixer le nom de base du projet parent à la sortie"
-#: builtin/grep.c:987
+#: builtin/grep.c:994
msgid "show non-matching lines"
msgstr "afficher les lignes qui ne correspondent pas"
-#: builtin/grep.c:989
+#: builtin/grep.c:996
msgid "case insensitive matching"
msgstr "correspondance insensible à la casse"
-#: builtin/grep.c:991
+#: builtin/grep.c:998
msgid "match patterns only at word boundaries"
msgstr "rechercher les motifs aux séparateurs de mots"
-#: builtin/grep.c:993
+#: builtin/grep.c:1000
msgid "process binary files as text"
msgstr "traiter les fichiers binaires comme texte"
-#: builtin/grep.c:995
+#: builtin/grep.c:1002
msgid "don't match patterns in binary files"
msgstr "ne pas chercher les motifs dans les fichiers binaires"
-#: builtin/grep.c:998
+#: builtin/grep.c:1005
msgid "process binary files with textconv filters"
msgstr "traiter les fichiers binaires avec les filtres textconv"
-#: builtin/grep.c:1000
+#: builtin/grep.c:1007
msgid "descend at most <depth> levels"
msgstr "descendre au plus de <profondeur> dans l'arborescence"
-#: builtin/grep.c:1004
+#: builtin/grep.c:1011
msgid "use extended POSIX regular expressions"
msgstr "utiliser des expressions régulières étendues POSIX"
-#: builtin/grep.c:1007
+#: builtin/grep.c:1014
msgid "use basic POSIX regular expressions (default)"
msgstr "utiliser des expressions régulières basiques POSIX (par défaut)"
-#: builtin/grep.c:1010
+#: builtin/grep.c:1017
msgid "interpret patterns as fixed strings"
msgstr "interpréter les motifs comme de chaînes fixes"
-#: builtin/grep.c:1013
+#: builtin/grep.c:1020
msgid "use Perl-compatible regular expressions"
msgstr "utiliser des expressions régulières compatibles avec Perl"
-#: builtin/grep.c:1016
+#: builtin/grep.c:1023
msgid "show line numbers"
msgstr "afficher les numéros de ligne"
-#: builtin/grep.c:1017
+#: builtin/grep.c:1024
msgid "don't show filenames"
msgstr "ne pas pas afficher les noms de fichier"
-#: builtin/grep.c:1018
+#: builtin/grep.c:1025
msgid "show filenames"
msgstr "afficher les noms de fichier"
-#: builtin/grep.c:1020
+#: builtin/grep.c:1027
msgid "show filenames relative to top directory"
msgstr "afficher les noms de fichiers relativement au répertoire de base"
-#: builtin/grep.c:1022
+#: builtin/grep.c:1029
msgid "show only filenames instead of matching lines"
msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant"
-#: builtin/grep.c:1024
+#: builtin/grep.c:1031
msgid "synonym for --files-with-matches"
msgstr "synonyme pour --files-with-matches"
-#: builtin/grep.c:1027
+#: builtin/grep.c:1034
msgid "show only the names of files without match"
msgstr "n'afficher que les noms des fichiers sans correspondance"
-#: builtin/grep.c:1029
+#: builtin/grep.c:1036
msgid "print NUL after filenames"
msgstr "imprimer une caractère NUL après le noms de fichier"
-#: builtin/grep.c:1031
+#: builtin/grep.c:1038
msgid "show the number of matches instead of matching lines"
msgstr "afficher le nombre de correspondances au lieu des lignes correspondant"
-#: builtin/grep.c:1032
+#: builtin/grep.c:1039
msgid "highlight matches"
msgstr "mettre en évidence les correspondances"
-#: builtin/grep.c:1034
+#: builtin/grep.c:1041
msgid "print empty line between matches from different files"
msgstr ""
"imprimer une ligne vide entre les correspondances de fichiers différents"
-#: builtin/grep.c:1036
+#: builtin/grep.c:1043
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:1039
+#: builtin/grep.c:1046
msgid "show <n> context lines before and after matches"
msgstr "afficher <n> lignes de contexte avant et après les correspondances"
-#: builtin/grep.c:1042
+#: builtin/grep.c:1049
msgid "show <n> context lines before matches"
msgstr "afficher <n> lignes de contexte avant les correspondances"
-#: builtin/grep.c:1044
+#: builtin/grep.c:1051
msgid "show <n> context lines after matches"
msgstr "afficher <n> lignes de contexte après les correspondances"
-#: builtin/grep.c:1046
+#: builtin/grep.c:1053
msgid "use <n> worker threads"
msgstr "utiliser <n> fils de travail"
-#: builtin/grep.c:1047
+#: builtin/grep.c:1054
msgid "shortcut for -C NUM"
msgstr "raccourci pour -C NUM"
-#: builtin/grep.c:1050
+#: builtin/grep.c:1057
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:1052
+#: builtin/grep.c:1059
msgid "show the surrounding function"
msgstr "afficher la fonction contenante"
-#: builtin/grep.c:1055
+#: builtin/grep.c:1062
msgid "read patterns from file"
msgstr "lire les motifs depuis fichier"
-#: builtin/grep.c:1057
+#: builtin/grep.c:1064
msgid "match <pattern>"
msgstr "rechercher <motif>"
-#: builtin/grep.c:1059
+#: builtin/grep.c:1066
msgid "combine patterns specified with -e"
msgstr "combiner les motifs spécifiés par -e"
-#: builtin/grep.c:1071
+#: builtin/grep.c:1078
msgid "indicate hit with exit status without output"
msgstr ""
"indiquer des correspondances avec le code de sortie mais sans rien afficher"
-#: builtin/grep.c:1073
+#: builtin/grep.c:1080
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:1075
+#: builtin/grep.c:1082
msgid "show parse tree for grep expression"
msgstr "afficher l'arbre d'analyse pour le motif grep"
-#: builtin/grep.c:1079
+#: builtin/grep.c:1086
msgid "pager"
msgstr "pagineur"
-#: builtin/grep.c:1079
+#: builtin/grep.c:1086
msgid "show matching files in the pager"
msgstr "afficher les fichiers correspondant dans le pagineur"
-#: builtin/grep.c:1082
+#: builtin/grep.c:1089
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "permettre l'appel de grep(1) (ignoré par ce build)"
-#: builtin/grep.c:1146
+#: builtin/grep.c:1153
msgid "no pattern given."
msgstr "aucun motif fourni."
-#: builtin/grep.c:1178 builtin/index-pack.c:1482
+#: builtin/grep.c:1189
+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
+#, 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
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "nombre de fils spécifié invalide (%d)"
-#: builtin/grep.c:1215
+#: builtin/grep.c:1251
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:1238
+#: builtin/grep.c:1274
msgid "option not supported with --recurse-submodules."
msgstr "option non supportée avec --recurse-submodules."
-#: builtin/grep.c:1244
+#: builtin/grep.c:1280
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:1249
-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:1252
+#: builtin/grep.c:1286
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:1260
+#: builtin/grep.c:1294
msgid "both --cached and trees are given."
msgstr "--cached et des arbres sont fournis en même temps."
@@ -8798,241 +9052,246 @@
msgid "unable to create '%s'"
msgstr "impossible de créer '%s'"
-#: builtin/index-pack.c:322
+#: builtin/index-pack.c:323
#, c-format
msgid "cannot open packfile '%s'"
msgstr "impossible d'ouvrir le fichier paquet '%s'"
-#: builtin/index-pack.c:336
+#: builtin/index-pack.c:337
msgid "pack signature mismatch"
msgstr "la signature du paquet ne correspond pas"
-#: builtin/index-pack.c:338
+#: builtin/index-pack.c:339
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "la version de paquet %<PRIu32> non supportée"
-#: builtin/index-pack.c:356
+#: builtin/index-pack.c:357
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "le paquet a un mauvais objet à l'offset %<PRIuMAX> : %s"
-#: builtin/index-pack.c:478
+#: builtin/index-pack.c:479
#, c-format
msgid "inflate returned %d"
msgstr "la décompression (inflate) a retourné %d"
-#: builtin/index-pack.c:527
+#: builtin/index-pack.c:528
msgid "offset value overflow for delta base object"
msgstr "dépassement de la valeur d'offset pour l'objet delta de base"
-#: builtin/index-pack.c:535
+#: builtin/index-pack.c:536
msgid "delta base offset is out of bound"
msgstr "l'objet delta de base est hors limite"
-#: builtin/index-pack.c:543
+#: builtin/index-pack.c:544
#, c-format
msgid "unknown object type %d"
msgstr "type d'objet inconnu %d"
-#: builtin/index-pack.c:574
+#: builtin/index-pack.c:575
msgid "cannot pread pack file"
msgstr "impossible de lire (pread) le fichier paquet"
-#: builtin/index-pack.c:576
+#: builtin/index-pack.c:577
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "fin prématurée du fichier paquet, %<PRIuMAX> octet lu"
msgstr[1] "fin prématurée du fichier paquet, %<PRIuMAX> octets lus"
-#: builtin/index-pack.c:602
+#: builtin/index-pack.c:603
msgid "serious inflate inconsistency"
msgstr "grave incohérence dans la décompression (inflate)"
-#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
-#: builtin/index-pack.c:813 builtin/index-pack.c:822
+#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
+#: 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:751 builtin/pack-objects.c:164
-#: builtin/pack-objects.c:256
+#: builtin/index-pack.c:752 builtin/pack-objects.c:164
+#: builtin/pack-objects.c:257
#, c-format
msgid "unable to read %s"
msgstr "impossible de lire %s"
-#: builtin/index-pack.c:819
+#: builtin/index-pack.c:814
+#, c-format
+msgid "cannot read existing object info %s"
+msgstr "impossible de lire l'information existante de l'objet %s"
+
+#: builtin/index-pack.c:822
#, c-format
msgid "cannot read existing object %s"
msgstr "impossible de lire l'objet existant %s"
-#: builtin/index-pack.c:833
+#: builtin/index-pack.c:836
#, c-format
msgid "invalid blob object %s"
msgstr "objet blob invalide %s"
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:850
#, c-format
msgid "invalid %s"
msgstr "%s invalide"
-#: builtin/index-pack.c:850
+#: builtin/index-pack.c:853
msgid "Error in object"
msgstr "Erreur dans l'objet"
-#: builtin/index-pack.c:852
+#: builtin/index-pack.c:855
#, 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:924 builtin/index-pack.c:955
+#: builtin/index-pack.c:927 builtin/index-pack.c:958
msgid "failed to apply delta"
msgstr "échec d'application du delta"
-#: builtin/index-pack.c:1125
+#: builtin/index-pack.c:1128
msgid "Receiving objects"
msgstr "Réception d'objets"
-#: builtin/index-pack.c:1125
+#: builtin/index-pack.c:1128
msgid "Indexing objects"
msgstr "Indexation d'objets"
-#: builtin/index-pack.c:1157
+#: builtin/index-pack.c:1160
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "le paquet est corrompu (SHA1 ne correspond pas)"
-#: builtin/index-pack.c:1162
+#: builtin/index-pack.c:1165
msgid "cannot fstat packfile"
msgstr "impossible d'obtenir le statut (fstat) du fichier paquet"
-#: builtin/index-pack.c:1165
+#: builtin/index-pack.c:1168
msgid "pack has junk at the end"
msgstr "le paquet est invalide à la fin"
-#: builtin/index-pack.c:1176
+#: builtin/index-pack.c:1179
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "confusion extrême dans parse_pack_objects()"
-#: builtin/index-pack.c:1199
+#: builtin/index-pack.c:1202
msgid "Resolving deltas"
msgstr "Résolution des deltas"
-#: builtin/index-pack.c:1210
+#: builtin/index-pack.c:1213
#, c-format
msgid "unable to create thread: %s"
msgstr "impossible de créer le fil : %s"
-#: builtin/index-pack.c:1252
+#: builtin/index-pack.c:1255
msgid "confusion beyond insanity"
msgstr "confusion extrême"
-#: builtin/index-pack.c:1258
+#: builtin/index-pack.c:1261
#, 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:1270
+#: builtin/index-pack.c:1273
#, 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:1274
+#: builtin/index-pack.c:1277
#, 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:1298
+#: builtin/index-pack.c:1301
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "impossible de compresser l'objet ajouté (%d)"
-#: builtin/index-pack.c:1374
+#: builtin/index-pack.c:1377
#, c-format
msgid "local object %s is corrupt"
msgstr "l'objet local %s est corrompu"
-#: builtin/index-pack.c:1398
+#: builtin/index-pack.c:1403
msgid "error while closing pack file"
msgstr "erreur en fermeture du fichier paquet"
-#: builtin/index-pack.c:1411
+#: builtin/index-pack.c:1415
#, c-format
msgid "cannot write keep file '%s'"
msgstr "impossible d'écrire le fichier \"keep\" '%s'"
-#: builtin/index-pack.c:1419
+#: builtin/index-pack.c:1423
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "impossible de fermer le fichier \"keep\" '%s'"
-#: builtin/index-pack.c:1432
+#: builtin/index-pack.c:1433
msgid "cannot store pack file"
msgstr "impossible de stocker le fichier paquet"
-#: builtin/index-pack.c:1443
+#: builtin/index-pack.c:1441
msgid "cannot store index file"
msgstr "impossible de stocker le fichier d'index"
-#: builtin/index-pack.c:1476
+#: builtin/index-pack.c:1479
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "mauvais pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1486 builtin/index-pack.c:1683
+#: 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:1544
+#: builtin/index-pack.c:1547
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Impossible d'ouvrir le fichier paquet existant '%s'"
-#: builtin/index-pack.c:1546
+#: builtin/index-pack.c:1549
#, 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:1593
+#: builtin/index-pack.c:1596
#, 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:1600
+#: builtin/index-pack.c:1603
#, 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:1613
+#: builtin/index-pack.c:1616
#, 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:1695 builtin/index-pack.c:1698
-#: builtin/index-pack.c:1714 builtin/index-pack.c:1718
+#: builtin/index-pack.c:1698 builtin/index-pack.c:1701
+#: builtin/index-pack.c:1717 builtin/index-pack.c:1721
#, c-format
msgid "bad %s"
msgstr "mauvais %s"
-#: builtin/index-pack.c:1734
+#: builtin/index-pack.c:1737
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin ne peut pas être utilisé sans --stdin"
-#: builtin/index-pack.c:1736
+#: builtin/index-pack.c:1739
msgid "--stdin requires a git repository"
msgstr "--stdin requiert un dépôt git"
-#: builtin/index-pack.c:1744
+#: builtin/index-pack.c:1747
msgid "--verify with no packfile name given"
msgstr "--verify sans nom de fichier paquet donné"
@@ -9192,106 +9451,106 @@
msgid "git show [<options>] <object>..."
msgstr "git show [<options>] <objet>..."
-#: builtin/log.c:84
+#: builtin/log.c:89
#, c-format
msgid "invalid --decorate option: %s"
msgstr "option --decorate invalide : %s"
-#: builtin/log.c:139
+#: builtin/log.c:144
msgid "suppress diff output"
msgstr "supprimer la sortie des différences"
-#: builtin/log.c:140
+#: builtin/log.c:145
msgid "show source"
msgstr "afficher la source"
-#: builtin/log.c:141
+#: builtin/log.c:146
msgid "Use mail map file"
msgstr "Utiliser le fichier de correspondance de mail"
-#: builtin/log.c:142
+#: builtin/log.c:147
msgid "decorate options"
msgstr "décorer les options"
-#: builtin/log.c:145
+#: builtin/log.c:150
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:241
+#: builtin/log.c:246
#, c-format
msgid "Final output: %d %s\n"
msgstr "Sortie finale : %d %s\n"
-#: builtin/log.c:486
+#: builtin/log.c:493
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s : fichier incorrect"
-#: builtin/log.c:500 builtin/log.c:594
+#: builtin/log.c:507 builtin/log.c:601
#, c-format
msgid "Could not read object %s"
msgstr "Impossible de lire l'objet %s"
-#: builtin/log.c:618
+#: builtin/log.c:625
#, c-format
msgid "Unknown type: %d"
msgstr "Type inconnu : %d"
-#: builtin/log.c:739
+#: builtin/log.c:746
msgid "format.headers without value"
msgstr "format.headers sans valeur"
-#: builtin/log.c:839
+#: builtin/log.c:846
msgid "name of output directory is too long"
msgstr "le nom du répertoire de sortie est trop long"
-#: builtin/log.c:854
+#: builtin/log.c:861
#, c-format
msgid "Cannot open patch file %s"
msgstr "Impossible d'ouvrir le fichier correctif %s"
-#: builtin/log.c:868
+#: builtin/log.c:875
msgid "Need exactly one range."
msgstr "Exactement une plage nécessaire."
-#: builtin/log.c:878
+#: builtin/log.c:885
msgid "Not a range."
msgstr "Ceci n'est pas une plage."
-#: builtin/log.c:984
+#: builtin/log.c:991
msgid "Cover letter needs email format"
msgstr "La lettre de motivation doit être au format e-mail"
-#: builtin/log.c:1063
+#: builtin/log.c:1071
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to aberrant : %s"
-#: builtin/log.c:1091
+#: builtin/log.c:1098
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<options>] [<depuis> | <plage de révisions>]"
-#: builtin/log.c:1141
+#: builtin/log.c:1148
msgid "Two output directories?"
msgstr "Deux répertoires de sortie ?"
-#: builtin/log.c:1248 builtin/log.c:1891 builtin/log.c:1893 builtin/log.c:1905
+#: builtin/log.c:1255 builtin/log.c:1898 builtin/log.c:1900 builtin/log.c:1912
#, c-format
msgid "Unknown commit %s"
msgstr "Commit inconnu %s"
-#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:476
+#: builtin/log.c:1265 builtin/notes.c:883 builtin/tag.c:532
#, 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:1263
+#: builtin/log.c:1270
msgid "Could not find exact merge base."
msgstr "Impossible de trouver la base de fusion exacte."
-#: builtin/log.c:1267
+#: builtin/log.c:1274
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"
@@ -9304,216 +9563,216 @@
"ou vous pouvez spécifier le commit de base par --base=<id-du-commit-de-base> "
"manuellement."
-#: builtin/log.c:1287
+#: builtin/log.c:1294
msgid "Failed to find exact merge base"
msgstr "Impossible de trouver la base de fusion exacte"
-#: builtin/log.c:1298
+#: builtin/log.c:1305
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:1302
+#: builtin/log.c:1309
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:1351
+#: builtin/log.c:1358
msgid "cannot get patch id"
msgstr "impossible d'obtenir l'id du patch"
-#: builtin/log.c:1408
+#: builtin/log.c:1415
msgid "use [PATCH n/m] even with a single patch"
msgstr "utiliser [PATCH n/m] même avec un patch unique"
-#: builtin/log.c:1411
+#: builtin/log.c:1418
msgid "use [PATCH] even with multiple patches"
msgstr "utiliser [PATCH] même avec des patchs multiples"
-#: builtin/log.c:1415
+#: builtin/log.c:1422
msgid "print patches to standard out"
msgstr "afficher les patchs sur la sortie standard"
-#: builtin/log.c:1417
+#: builtin/log.c:1424
msgid "generate a cover letter"
msgstr "générer une lettre de motivation"
-#: builtin/log.c:1419
+#: builtin/log.c:1426
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:1420
+#: builtin/log.c:1427
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1421
+#: builtin/log.c:1428
msgid "use <sfx> instead of '.patch'"
msgstr "utiliser <sfx> au lieu de '.patch'"
-#: builtin/log.c:1423
+#: builtin/log.c:1430
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:1425
+#: builtin/log.c:1432
msgid "mark the series as Nth re-roll"
msgstr "marquer la série comme une Nième réédition"
-#: builtin/log.c:1427
+#: builtin/log.c:1434
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "utiliser [RFC PATCH] au lieu de [PATCH]"
-#: builtin/log.c:1430
+#: builtin/log.c:1437
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "utiliser [<préfixe>] au lieu de [PATCH]"
-#: builtin/log.c:1433
+#: builtin/log.c:1440
msgid "store resulting files in <dir>"
msgstr "stocker les fichiers résultats dans <répertoire>"
-#: builtin/log.c:1436
+#: builtin/log.c:1443
msgid "don't strip/add [PATCH]"
msgstr "ne pas retirer/ajouter [PATCH]"
-#: builtin/log.c:1439
+#: builtin/log.c:1446
msgid "don't output binary diffs"
msgstr "ne pas imprimer les diffs binaires"
-#: builtin/log.c:1441
+#: builtin/log.c:1448
msgid "output all-zero hash in From header"
msgstr "écrire une empreinte à zéro dans l'entête From"
-#: builtin/log.c:1443
+#: builtin/log.c:1450
msgid "don't include a patch matching a commit upstream"
msgstr "ne pas inclure un patch correspondant à un commit amont"
-#: builtin/log.c:1445
+#: builtin/log.c:1452
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:1447
+#: builtin/log.c:1454
msgid "Messaging"
msgstr "Communication"
-#: builtin/log.c:1448
+#: builtin/log.c:1455
msgid "header"
msgstr "en-tête"
-#: builtin/log.c:1449
+#: builtin/log.c:1456
msgid "add email header"
msgstr "ajouter l'en-tête d'e-mail"
-#: builtin/log.c:1450 builtin/log.c:1452
+#: builtin/log.c:1457 builtin/log.c:1459
msgid "email"
msgstr "e-mail"
-#: builtin/log.c:1450
+#: builtin/log.c:1457
msgid "add To: header"
msgstr "ajouter l'en-tête \"To:\""
-#: builtin/log.c:1452
+#: builtin/log.c:1459
msgid "add Cc: header"
msgstr "ajouter l'en-tête \"Cc:\""
-#: builtin/log.c:1454
+#: builtin/log.c:1461
msgid "ident"
msgstr "ident"
-#: builtin/log.c:1455
+#: builtin/log.c:1462
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:1457
+#: builtin/log.c:1464
msgid "message-id"
msgstr "id-message"
-#: builtin/log.c:1458
+#: builtin/log.c:1465
msgid "make first mail a reply to <message-id>"
msgstr "répondre dans le premier message à <id-message>"
-#: builtin/log.c:1459 builtin/log.c:1462
+#: builtin/log.c:1466 builtin/log.c:1469
msgid "boundary"
msgstr "limite"
-#: builtin/log.c:1460
+#: builtin/log.c:1467
msgid "attach the patch"
msgstr "attacher le patch"
-#: builtin/log.c:1463
+#: builtin/log.c:1470
msgid "inline the patch"
msgstr "patch à l'intérieur"
-#: builtin/log.c:1467
+#: builtin/log.c:1474
msgid "enable message threading, styles: shallow, deep"
msgstr ""
"activer l'enfilage de message, styles : shallow (superficiel), deep (profond)"
-#: builtin/log.c:1469
+#: builtin/log.c:1476
msgid "signature"
msgstr "signature"
-#: builtin/log.c:1470
+#: builtin/log.c:1477
msgid "add a signature"
msgstr "ajouter une signature"
-#: builtin/log.c:1471
+#: builtin/log.c:1478
msgid "base-commit"
msgstr "commit-de-base"
-#: builtin/log.c:1472
+#: builtin/log.c:1479
msgid "add prerequisite tree info to the patch series"
msgstr "Ajouter un arbre prérequis à la série de patchs"
-#: builtin/log.c:1474
+#: builtin/log.c:1481
msgid "add a signature from a file"
msgstr "ajouter une signature depuis un fichier"
-#: builtin/log.c:1475
+#: builtin/log.c:1482
msgid "don't print the patch filenames"
msgstr "ne pas afficher les noms de fichiers des patchs"
-#: builtin/log.c:1565
+#: builtin/log.c:1572
msgid "-n and -k are mutually exclusive."
msgstr "-n et -k sont mutuellement exclusifs."
-#: builtin/log.c:1567
+#: builtin/log.c:1574
msgid "--subject-prefix/--rfc and -k are mutually exclusive."
msgstr "--subject-prefix/--rfc et -k sont mutuellement exclusifs."
-#: builtin/log.c:1575
+#: builtin/log.c:1582
msgid "--name-only does not make sense"
msgstr "--name-only n'a pas de sens"
-#: builtin/log.c:1577
+#: builtin/log.c:1584
msgid "--name-status does not make sense"
msgstr "--name-status n'a pas de sens"
-#: builtin/log.c:1579
+#: builtin/log.c:1586
msgid "--check does not make sense"
msgstr "--check n'a pas de sens"
-#: builtin/log.c:1609
+#: builtin/log.c:1616
msgid "standard output, or directory, which one?"
msgstr "sortie standard, ou répertoire, lequel ?"
-#: builtin/log.c:1611
+#: builtin/log.c:1618
#, c-format
msgid "Could not create directory '%s'"
msgstr "Impossible de créer le répertoire '%s'"
-#: builtin/log.c:1705
+#: builtin/log.c:1712
#, c-format
msgid "unable to read signature file '%s'"
msgstr "lecture du fichier de signature '%s' impossible"
-#: builtin/log.c:1777
+#: builtin/log.c:1784
msgid "Failed to create output files"
msgstr "Échec de création des fichiers en sortie"
-#: builtin/log.c:1826
+#: builtin/log.c:1833
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]"
-#: builtin/log.c:1880
+#: builtin/log.c:1887
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -9521,106 +9780,106 @@
"Impossible de trouver une branche distante suivie, merci de spécifier "
"<branche_amont> manuellement.\n"
-#: builtin/ls-files.c:460
+#: builtin/ls-files.c:468
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<options>] [<fichier>...]"
-#: builtin/ls-files.c:509
+#: builtin/ls-files.c:517
msgid "identify the file status with tags"
msgstr "identifier le statut de fichier avec les étiquettes"
-#: builtin/ls-files.c:511
+#: builtin/ls-files.c:519
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "utiliser des minuscules pour les fichier 'assumés inchangés'"
-#: builtin/ls-files.c:513
+#: builtin/ls-files.c:521
msgid "show cached files in the output (default)"
msgstr "afficher les fichiers mis en cache dans la sortie (défaut)"
-#: builtin/ls-files.c:515
+#: builtin/ls-files.c:523
msgid "show deleted files in the output"
msgstr "afficher les fichiers supprimés dans la sortie"
-#: builtin/ls-files.c:517
+#: builtin/ls-files.c:525
msgid "show modified files in the output"
msgstr "afficher les fichiers modifiés dans la sortie"
-#: builtin/ls-files.c:519
+#: builtin/ls-files.c:527
msgid "show other files in the output"
msgstr "afficher les autres fichiers dans la sortie"
-#: builtin/ls-files.c:521
+#: builtin/ls-files.c:529
msgid "show ignored files in the output"
msgstr "afficher les fichiers ignorés dans la sortie"
-#: builtin/ls-files.c:524
+#: builtin/ls-files.c:532
msgid "show staged contents' object name in the output"
msgstr "afficher les nom des objets indexés dans la sortie"
-#: builtin/ls-files.c:526
+#: builtin/ls-files.c:534
msgid "show files on the filesystem that need to be removed"
msgstr ""
"afficher les fichiers du système de fichiers qui ont besoin d'être supprimés"
-#: builtin/ls-files.c:528
+#: builtin/ls-files.c:536
msgid "show 'other' directories' names only"
msgstr "afficher seulement les noms des répertoires 'other'"
-#: builtin/ls-files.c:530
+#: builtin/ls-files.c:538
msgid "show line endings of files"
msgstr "afficher les fins de lignes des fichiers"
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:540
msgid "don't show empty directories"
msgstr "ne pas afficher les répertoires vides"
-#: builtin/ls-files.c:535
+#: builtin/ls-files.c:543
msgid "show unmerged files in the output"
msgstr "afficher les fichiers non fusionnés dans la sortie"
-#: builtin/ls-files.c:537
+#: builtin/ls-files.c:545
msgid "show resolve-undo information"
msgstr "afficher l'information resolv-undo"
-#: builtin/ls-files.c:539
+#: builtin/ls-files.c:547
msgid "skip files matching pattern"
msgstr "sauter les fichiers correspondant au motif"
-#: builtin/ls-files.c:542
+#: builtin/ls-files.c:550
msgid "exclude patterns are read from <file>"
msgstr "les motifs d'exclusion sont lus depuis <fichier>"
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:553
msgid "read additional per-directory exclude patterns in <file>"
msgstr "lire des motifs d'exclusion additionnels par répertoire dans <fichier>"
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:555
msgid "add the standard git exclusions"
msgstr "ajouter les exclusions git standard"
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:558
msgid "make the output relative to the project top directory"
msgstr "afficher en relatif par rapport au répertoire racine du projet"
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:561
msgid "recurse through submodules"
msgstr "parcourir récursivement les sous-modules"
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:563
msgid "if any <file> is not in the index, treat this as an error"
msgstr "si un <fichier> n'est pas dans l'index, traiter cela comme une erreur"
-#: builtin/ls-files.c:556
+#: builtin/ls-files.c:564
msgid "tree-ish"
msgstr "arbre ou apparenté"
-#: builtin/ls-files.c:557
+#: builtin/ls-files.c:565
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
"considérer que les chemins supprimés depuis <arbre ou apparenté> sont "
"toujours présents"
-#: builtin/ls-files.c:559
+#: builtin/ls-files.c:567
msgid "show debugging data"
msgstr "afficher les données de débogage"
@@ -9634,41 +9893,41 @@
" [-q | --quiet] [--exit-code] [--get-url]\n"
" [--symref] [<dépôt> [<références>...]]"
-#: builtin/ls-remote.c:50
+#: builtin/ls-remote.c:52
msgid "do not print remote URL"
msgstr "ne pas afficher les URL distantes"
-#: builtin/ls-remote.c:51 builtin/ls-remote.c:53
+#: builtin/ls-remote.c:53 builtin/ls-remote.c:55
msgid "exec"
msgstr "exécutable"
-#: builtin/ls-remote.c:52 builtin/ls-remote.c:54
+#: builtin/ls-remote.c:54 builtin/ls-remote.c:56
msgid "path of git-upload-pack on the remote host"
msgstr "chemin vers git-upload-pack sur le serveur distant"
-#: builtin/ls-remote.c:56
+#: builtin/ls-remote.c:58
msgid "limit to tags"
msgstr "limiter aux étiquettes"
-#: builtin/ls-remote.c:57
+#: builtin/ls-remote.c:59
msgid "limit to heads"
msgstr "limiter aux heads"
-#: builtin/ls-remote.c:58
+#: builtin/ls-remote.c:60
msgid "do not show peeled tags"
msgstr "ne pas afficher les étiquettes pelées"
-#: builtin/ls-remote.c:60
+#: builtin/ls-remote.c:62
msgid "take url.<base>.insteadOf into account"
msgstr "prendre en compte url.<base>.insteadOf"
-#: builtin/ls-remote.c:62
+#: builtin/ls-remote.c:64
msgid "exit with exit code 2 if no matching refs are found"
msgstr ""
"sortir avec un code d'erreur 2 si aucune correspondance de référence n'est "
"trouvée"
-#: builtin/ls-remote.c:64
+#: builtin/ls-remote.c:66
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"
@@ -9715,149 +9974,145 @@
msgstr "git merge [<options>] [<commit>...]"
#: builtin/merge.c:47
-msgid "git merge [<options>] <msg> HEAD <commit>"
-msgstr "git merge [<options>] <message> HEAD <commit>"
-
-#: builtin/merge.c:48
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:49
+#: builtin/merge.c:48
msgid "git merge --continue"
msgstr "git merge --continue"
-#: builtin/merge.c:104
+#: builtin/merge.c:103
msgid "switch `m' requires a value"
msgstr "le commutateur `m' a besoin d'une valeur"
-#: builtin/merge.c:141
+#: builtin/merge.c:140
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Impossible de trouver la stratégie de fusion '%s'.\n"
-#: builtin/merge.c:142
+#: builtin/merge.c:141
#, c-format
msgid "Available strategies are:"
msgstr "Les stratégies disponibles sont :"
-#: builtin/merge.c:147
+#: builtin/merge.c:146
#, c-format
msgid "Available custom strategies are:"
msgstr "Les stratégies personnalisées sont :"
-#: builtin/merge.c:197 builtin/pull.c:127
+#: builtin/merge.c:196 builtin/pull.c:127
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:200 builtin/pull.c:130
+#: builtin/merge.c:199 builtin/pull.c:130
msgid "show a diffstat at the end of the merge"
msgstr "afficher un diffstat à la fin de la fusion"
-#: builtin/merge.c:201 builtin/pull.c:133
+#: builtin/merge.c:200 builtin/pull.c:133
msgid "(synonym to --stat)"
msgstr "(synonyme de --stat)"
-#: builtin/merge.c:203 builtin/pull.c:136
+#: builtin/merge.c:202 builtin/pull.c:136
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:206 builtin/pull.c:139
+#: builtin/merge.c:205 builtin/pull.c:139
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:208 builtin/pull.c:142
+#: builtin/merge.c:207 builtin/pull.c:142
msgid "perform a commit if the merge succeeds (default)"
msgstr "effectuer une validation si la fusion réussit (défaut)"
-#: builtin/merge.c:210 builtin/pull.c:145
+#: builtin/merge.c:209 builtin/pull.c:145
msgid "edit message before committing"
msgstr "éditer le message avant la validation"
-#: builtin/merge.c:211
+#: builtin/merge.c:210
msgid "allow fast-forward (default)"
msgstr "autoriser l'avance rapide (défaut)"
-#: builtin/merge.c:213 builtin/pull.c:151
+#: builtin/merge.c:212 builtin/pull.c:151
msgid "abort if fast-forward is not possible"
msgstr "abandonner si l'avance rapide n'est pas possible"
-#: builtin/merge.c:217 builtin/pull.c:154
+#: builtin/merge.c:216 builtin/pull.c:154
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:218 builtin/notes.c:774 builtin/pull.c:158
-#: builtin/revert.c:89
+#: builtin/merge.c:217 builtin/notes.c:773 builtin/pull.c:158
+#: builtin/revert.c:108
msgid "strategy"
msgstr "stratégie"
-#: builtin/merge.c:219 builtin/pull.c:159
+#: builtin/merge.c:218 builtin/pull.c:159
msgid "merge strategy to use"
msgstr "stratégie de fusion à utiliser"
-#: builtin/merge.c:220 builtin/pull.c:162
+#: builtin/merge.c:219 builtin/pull.c:162
msgid "option=value"
msgstr "option=valeur"
-#: builtin/merge.c:221 builtin/pull.c:163
+#: builtin/merge.c:220 builtin/pull.c:163
msgid "option for selected merge strategy"
msgstr "option pour la stratégie de fusion sélectionnée"
-#: builtin/merge.c:223
+#: builtin/merge.c:222
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:227
+#: builtin/merge.c:226
msgid "abort the current in-progress merge"
msgstr "abandonner la fusion en cours"
-#: builtin/merge.c:229
+#: builtin/merge.c:228
msgid "continue the current in-progress merge"
msgstr "continuer la fusion en cours"
-#: builtin/merge.c:231 builtin/pull.c:170
+#: builtin/merge.c:230 builtin/pull.c:170
msgid "allow merging unrelated histories"
msgstr "permettre la fusion d'historiques sans rapport"
-#: builtin/merge.c:259
+#: builtin/merge.c:258
msgid "could not run stash."
msgstr "impossible de lancer le remisage."
-#: builtin/merge.c:264
+#: builtin/merge.c:263
msgid "stash failed"
msgstr "échec du remisage"
-#: builtin/merge.c:269
+#: builtin/merge.c:268
#, c-format
msgid "not a valid object: %s"
msgstr "pas un objet valide : %s"
-#: builtin/merge.c:288 builtin/merge.c:305
+#: builtin/merge.c:287 builtin/merge.c:304
msgid "read-tree failed"
msgstr "read-tree a échoué"
-#: builtin/merge.c:335
+#: builtin/merge.c:334
msgid " (nothing to squash)"
msgstr " (rien à compresser)"
-#: builtin/merge.c:346
+#: builtin/merge.c:345
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Validation compressée -- HEAD non mise à jour\n"
-#: builtin/merge.c:396
+#: builtin/merge.c:395
#, 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:447
+#: builtin/merge.c:446
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' ne pointe pas sur un commit"
-#: builtin/merge.c:537
+#: builtin/merge.c:536
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s"
@@ -9921,64 +10176,59 @@
"La fusion automatique a échoué ; réglez les conflits et validez le "
"résultat.\n"
-#: builtin/merge.c:867
-#, c-format
-msgid "'%s' is not a commit"
-msgstr "'%s' n'est pas une validation"
-
-#: builtin/merge.c:908
+#: builtin/merge.c:890
msgid "No current branch."
msgstr "Pas de branche courante."
-#: builtin/merge.c:910
+#: builtin/merge.c:892
msgid "No remote for the current branch."
msgstr "Pas de branche distante pour la branche courante."
-#: builtin/merge.c:912
+#: builtin/merge.c:894
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:917
+#: builtin/merge.c:899
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Pas de branche de suivi pour %s depuis %s"
-#: builtin/merge.c:964
+#: builtin/merge.c:946
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Mauvaise valeur '%s' dans l'environnement '%s'"
-#: builtin/merge.c:1038
+#: builtin/merge.c:1020
#, c-format
msgid "could not close '%s'"
msgstr "impossible de fermer '%s'"
-#: builtin/merge.c:1065
+#: builtin/merge.c:1047
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "pas possible de fusionner ceci dans %s : %s"
-#: builtin/merge.c:1099
+#: builtin/merge.c:1081
msgid "not something we can merge"
msgstr "pas possible de fusionner ceci"
-#: builtin/merge.c:1167
+#: builtin/merge.c:1146
msgid "--abort expects no arguments"
msgstr "--abort n'accepte pas d'argument"
-#: builtin/merge.c:1171
+#: builtin/merge.c:1150
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:1183
+#: builtin/merge.c:1162
msgid "--continue expects no arguments"
msgstr "--continue ne supporte aucun argument"
-#: builtin/merge.c:1187
+#: builtin/merge.c:1166
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:1203
+#: builtin/merge.c:1182
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -9986,7 +10236,7 @@
"Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n"
"Veuillez valider vos modifications avant de pouvoir fusionner."
-#: builtin/merge.c:1210
+#: builtin/merge.c:1189
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -9994,114 +10244,114 @@
"Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n"
"Veuillez valider vos modifications avant de pouvoir fusionner."
-#: builtin/merge.c:1213
+#: builtin/merge.c:1192
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:1222
+#: builtin/merge.c:1201
msgid "You cannot combine --squash with --no-ff."
msgstr "Vous ne pouvez pas combiner --squash avec --no-ff."
-#: builtin/merge.c:1230
+#: builtin/merge.c:1209
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:1247
+#: builtin/merge.c:1226
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:1249
+#: builtin/merge.c:1228
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:1254
+#: builtin/merge.c:1233
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - pas possible de fusionner ceci"
-#: builtin/merge.c:1256
+#: builtin/merge.c:1235
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:1312
+#: builtin/merge.c:1269
#, 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:1315
+#: builtin/merge.c:1272
#, 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:1318
+#: builtin/merge.c:1275
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "La validation %s n'a pas de signature GPG."
-#: builtin/merge.c:1321
+#: builtin/merge.c:1278
#, 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:1383
+#: builtin/merge.c:1340
msgid "refusing to merge unrelated histories"
msgstr "refus de fusionner des historiques sans relation"
-#: builtin/merge.c:1392
+#: builtin/merge.c:1349
msgid "Already up-to-date."
msgstr "Déjà à jour."
-#: builtin/merge.c:1402
+#: builtin/merge.c:1359
#, c-format
msgid "Updating %s..%s\n"
msgstr "Mise à jour %s..%s\n"
-#: builtin/merge.c:1443
+#: builtin/merge.c:1400
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Essai de fusion vraiment triviale dans l'index...\n"
-#: builtin/merge.c:1450
+#: builtin/merge.c:1407
#, c-format
msgid "Nope.\n"
msgstr "Non.\n"
-#: builtin/merge.c:1475
+#: builtin/merge.c:1432
msgid "Already up-to-date. Yeeah!"
msgstr "Déjà à jour. Ouais !"
-#: builtin/merge.c:1481
+#: builtin/merge.c:1438
msgid "Not possible to fast-forward, aborting."
msgstr "Pas possible d'avancer rapidement, abandon."
-#: builtin/merge.c:1504 builtin/merge.c:1583
+#: builtin/merge.c:1461 builtin/merge.c:1540
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Retour de l'arbre à l'original...\n"
-#: builtin/merge.c:1508
+#: builtin/merge.c:1465
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Essai de la stratégie de fusion %s...\n"
-#: builtin/merge.c:1574
+#: builtin/merge.c:1531
#, 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:1576
+#: builtin/merge.c:1533
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "La fusion avec la stratégie %s a échoué.\n"
-#: builtin/merge.c:1585
+#: builtin/merge.c:1542
#, 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:1597
+#: builtin/merge.c:1554
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -10155,35 +10405,35 @@
"git merge-file [<options>] [-L <nom1> [-L <orig> [-L <nom2>]]] <fichier1> "
"<fichier-orig> <fichier2>"
-#: builtin/merge-file.c:33
+#: builtin/merge-file.c:32
msgid "send results to standard output"
msgstr "envoyer les résultats sur la sortie standard"
-#: builtin/merge-file.c:34
+#: builtin/merge-file.c:33
msgid "use a diff3 based merge"
msgstr "utiliser une fusion basée sur diff3"
-#: builtin/merge-file.c:35
+#: builtin/merge-file.c:34
msgid "for conflicts, use our version"
msgstr "pour les conflits, utiliser notre version (our)"
-#: builtin/merge-file.c:37
+#: builtin/merge-file.c:36
msgid "for conflicts, use their version"
msgstr "pour les conflits, utiliser leur version (their)"
-#: builtin/merge-file.c:39
+#: builtin/merge-file.c:38
msgid "for conflicts, use a union version"
msgstr "pour les conflits, utiliser l'ensemble des versions"
-#: builtin/merge-file.c:42
+#: builtin/merge-file.c:41
msgid "for conflicts, use this marker size"
msgstr "pour les conflits, utiliser cette taille de marqueur"
-#: builtin/merge-file.c:43
+#: builtin/merge-file.c:42
msgid "do not warn about conflicts"
msgstr "ne pas avertir à propos des conflits"
-#: builtin/merge-file.c:45
+#: builtin/merge-file.c:44
msgid "set labels for file1/orig-file/file2"
msgstr "définir les labels pour fichier1/fichier-orig/fichier2"
@@ -10328,44 +10578,48 @@
msgid "renaming '%s' failed"
msgstr "le renommage de '%s' a échoué"
-#: builtin/name-rev.c:257
+#: builtin/name-rev.c:289
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<options>] <validation>..."
-#: builtin/name-rev.c:258
+#: builtin/name-rev.c:290
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<options>] --all"
-#: builtin/name-rev.c:259
+#: builtin/name-rev.c:291
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<options>] --stdin"
-#: builtin/name-rev.c:311
+#: builtin/name-rev.c:346
msgid "print only names (no SHA-1)"
msgstr "afficher seulement les noms (pas de SHA-1)"
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:347
msgid "only use tags to name the commits"
msgstr "utiliser seulement les étiquettes pour nommer les validations"
-#: builtin/name-rev.c:314
+#: builtin/name-rev.c:349
msgid "only use refs matching <pattern>"
msgstr "utiliser seulement les références correspondant à <motif>"
-#: builtin/name-rev.c:316
+#: builtin/name-rev.c:351
+msgid "ignore refs matching <pattern>"
+msgstr "ignorer les références correspondant à <motif>"
+
+#: builtin/name-rev.c:353
msgid "list all commits reachable from all refs"
msgstr ""
"afficher toutes les validations accessibles depuis toutes les références"
-#: builtin/name-rev.c:317
+#: builtin/name-rev.c:354
msgid "read from stdin"
msgstr "lire depuis l'entrée standard"
-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:355
msgid "allow to print `undefined` names (default)"
msgstr "autoriser l'affichage des noms `non définis` (par défaut)"
-#: builtin/name-rev.c:324
+#: builtin/name-rev.c:361
msgid "dereference tags in the input (internal use)"
msgstr "déréférencer les étiquettes en entrée (usage interne)"
@@ -10512,19 +10766,19 @@
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:460
+#: builtin/notes.c:233 builtin/tag.c:516
#, c-format
msgid "cannot read '%s'"
msgstr "impossible de lire '%s'"
-#: builtin/notes.c:235 builtin/tag.c:463
+#: builtin/notes.c:235 builtin/tag.c:519
#, 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:659
+#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:658
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr "impossible de résoudre '%s' comme une référence valide."
@@ -10557,12 +10811,12 @@
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:652
-#: builtin/notes.c:802 builtin/notes.c:949 builtin/notes.c:970
+#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:651
+#: builtin/notes.c:801 builtin/notes.c:948 builtin/notes.c:969
msgid "too many parameters"
msgstr "trop de paramètres"
-#: builtin/notes.c:378 builtin/notes.c:665
+#: builtin/notes.c:378 builtin/notes.c:664
#, c-format
msgid "no note found for object %s."
msgstr "pas de note trouvée pour l'objet %s."
@@ -10605,7 +10859,7 @@
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:624 builtin/notes.c:889
+#: builtin/notes.c:463 builtin/notes.c:623 builtin/notes.c:888
#, c-format
msgid "Removing note for object %s\n"
msgstr "Suppression de la note pour l'objet %s\n"
@@ -10646,52 +10900,52 @@
"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:685
+#: builtin/notes.c:684
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "échec de la suppression de la référence NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:687
+#: builtin/notes.c:686
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "échec de la suppression de la référence NOTES_MERGE_REF"
-#: builtin/notes.c:689
+#: builtin/notes.c:688
msgid "failed to remove 'git notes merge' worktree"
msgstr "échec de la suppression de la copie de travail 'git notes merge'"
-#: builtin/notes.c:709
+#: builtin/notes.c:708
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "échec de la lecture de la référence NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:711
+#: builtin/notes.c:710
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "impossible de trouver le commit de NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:713
+#: builtin/notes.c:712
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "impossible d'analyser le commit de NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:726
+#: builtin/notes.c:725
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "échec de la résolution de NOTES_MERGE_REF"
-#: builtin/notes.c:729
+#: builtin/notes.c:728
msgid "failed to finalize notes merge"
msgstr "impossible de finaliser la fusion de notes"
-#: builtin/notes.c:755
+#: builtin/notes.c:754
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "stratégie de fusion de notes inconnue %s"
-#: builtin/notes.c:771
+#: builtin/notes.c:770
msgid "General options"
msgstr "Options générales"
-#: builtin/notes.c:773
+#: builtin/notes.c:772
msgid "Merge options"
msgstr "Options de fusion"
-#: builtin/notes.c:775
+#: builtin/notes.c:774
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -10699,47 +10953,47 @@
"résoudre les conflits de notes en utilisant la stratégie donnée (manual/ours/"
"theirs/union/cat_sort_uniq)"
-#: builtin/notes.c:777
+#: builtin/notes.c:776
msgid "Committing unmerged notes"
msgstr "Validation des notes non fusionnées"
-#: builtin/notes.c:779
+#: builtin/notes.c:778
msgid "finalize notes merge by committing unmerged notes"
msgstr "finaliser la fusion de notes en validant les notes non fusionnées"
-#: builtin/notes.c:781
+#: builtin/notes.c:780
msgid "Aborting notes merge resolution"
msgstr "Abandon de la résolution de fusion des notes"
-#: builtin/notes.c:783
+#: builtin/notes.c:782
msgid "abort notes merge"
msgstr "abandonner la fusion de notes"
-#: builtin/notes.c:794
+#: builtin/notes.c:793
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "--commit, --abort et -s/--strategy sont mutuellement incompatibles"
-#: builtin/notes.c:799
+#: builtin/notes.c:798
msgid "must specify a notes ref to merge"
msgstr "vous devez spécifier une référence de notes à fusionner"
-#: builtin/notes.c:823
+#: builtin/notes.c:822
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "-s/--strategy inconnu : %s"
-#: builtin/notes.c:860
+#: builtin/notes.c:859
#, 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:863
+#: builtin/notes.c:862
#, 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:865
+#: builtin/notes.c:864
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -10750,37 +11004,37 @@
"valide le résultat avec 'git notes merges --commit', ou abandonnez la fusion "
"avec 'git notes merge --abort'.\n"
-#: builtin/notes.c:887
+#: builtin/notes.c:886
#, c-format
msgid "Object %s has no note\n"
msgstr "L'objet %s n'a pas de note\n"
-#: builtin/notes.c:899
+#: builtin/notes.c:898
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:902
+#: builtin/notes.c:901
msgid "read object names from the standard input"
msgstr "lire les noms d'objet depuis l'entrée standard"
-#: builtin/notes.c:940 builtin/prune.c:105 builtin/worktree.c:127
+#: builtin/notes.c:939 builtin/prune.c:105 builtin/worktree.c:127
msgid "do not remove, show only"
msgstr "ne pas supprimer, afficher seulement"
-#: builtin/notes.c:941
+#: builtin/notes.c:940
msgid "report pruned notes"
msgstr "afficher les notes éliminées"
-#: builtin/notes.c:983
+#: builtin/notes.c:982
msgid "notes-ref"
msgstr "références-notes"
-#: builtin/notes.c:984
+#: builtin/notes.c:983
msgid "use notes from <notes-ref>"
msgstr "utiliser les notes depuis <références-notes>"
-#: builtin/notes.c:1019
+#: builtin/notes.c:1018
#, c-format
msgid "unknown subcommand: %s"
msgstr "sous-commande inconnue : %s"
@@ -10804,181 +11058,181 @@
msgid "deflate error (%d)"
msgstr "erreur de compression (%d)"
-#: builtin/pack-objects.c:766
+#: builtin/pack-objects.c:770
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:779
+#: builtin/pack-objects.c:783
msgid "Writing objects"
msgstr "Écriture des objets"
-#: builtin/pack-objects.c:1068
+#: builtin/pack-objects.c:1063
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:2344
+#: builtin/pack-objects.c:2426
msgid "Compressing objects"
msgstr "Compression des objets"
-#: builtin/pack-objects.c:2747
+#: builtin/pack-objects.c:2829
#, c-format
msgid "unsupported index version %s"
msgstr "version d'index non supportée %s"
-#: builtin/pack-objects.c:2751
+#: builtin/pack-objects.c:2833
#, c-format
msgid "bad index version '%s'"
msgstr "mauvaise version d'index '%s'"
-#: builtin/pack-objects.c:2781
+#: builtin/pack-objects.c:2863
msgid "do not show progress meter"
msgstr "ne pas afficher la barre de progression"
-#: builtin/pack-objects.c:2783
+#: builtin/pack-objects.c:2865
msgid "show progress meter"
msgstr "afficher la barre de progression"
-#: builtin/pack-objects.c:2785
+#: builtin/pack-objects.c:2867
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:2788
+#: builtin/pack-objects.c:2870
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:2789
+#: builtin/pack-objects.c:2871
msgid "version[,offset]"
msgstr "version[,offset]"
-#: builtin/pack-objects.c:2790
+#: builtin/pack-objects.c:2872
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:2793
+#: builtin/pack-objects.c:2875
msgid "maximum size of each output pack file"
msgstr "taille maximum de chaque fichier paquet en sortie"
-#: builtin/pack-objects.c:2795
+#: builtin/pack-objects.c:2877
msgid "ignore borrowed objects from alternate object store"
msgstr "ignorer les objets empruntés à un autre magasin d'objets"
-#: builtin/pack-objects.c:2797
+#: builtin/pack-objects.c:2879
msgid "ignore packed objects"
msgstr "ignorer les objets empaquetés"
-#: builtin/pack-objects.c:2799
+#: builtin/pack-objects.c:2881
msgid "limit pack window by objects"
msgstr "limiter la fenêtre d'empaquetage par objets"
-#: builtin/pack-objects.c:2801
+#: builtin/pack-objects.c:2883
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:2803
+#: builtin/pack-objects.c:2885
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:2805
+#: builtin/pack-objects.c:2887
msgid "reuse existing deltas"
msgstr "réutiliser les deltas existants"
-#: builtin/pack-objects.c:2807
+#: builtin/pack-objects.c:2889
msgid "reuse existing objects"
msgstr "réutiliser les objets existants"
-#: builtin/pack-objects.c:2809
+#: builtin/pack-objects.c:2891
msgid "use OFS_DELTA objects"
msgstr "utiliser les objets OFS_DELTA"
-#: builtin/pack-objects.c:2811
+#: builtin/pack-objects.c:2893
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:2813
+#: builtin/pack-objects.c:2895
msgid "do not create an empty pack output"
msgstr "ne pas créer un paquet vide"
-#: builtin/pack-objects.c:2815
+#: builtin/pack-objects.c:2897
msgid "read revision arguments from standard input"
msgstr "lire les paramètres de révision depuis l'entrée standard"
-#: builtin/pack-objects.c:2817
+#: builtin/pack-objects.c:2899
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:2820
+#: builtin/pack-objects.c:2902
msgid "include objects reachable from any reference"
msgstr "inclure les objets accessibles depuis toute référence"
-#: builtin/pack-objects.c:2823
+#: builtin/pack-objects.c:2905
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:2826
+#: builtin/pack-objects.c:2908
msgid "include objects referred to by the index"
msgstr "inclure les objets référencés par l'index"
-#: builtin/pack-objects.c:2829
+#: builtin/pack-objects.c:2911
msgid "output pack to stdout"
msgstr "afficher l'empaquetage sur la sortie standard"
-#: builtin/pack-objects.c:2831
+#: builtin/pack-objects.c:2913
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:2833
+#: builtin/pack-objects.c:2915
msgid "keep unreachable objects"
msgstr "garder les objets inaccessibles"
-#: builtin/pack-objects.c:2835
+#: builtin/pack-objects.c:2917
msgid "pack loose unreachable objects"
msgstr "empaqueter les objets inaccessibles détachés"
-#: builtin/pack-objects.c:2837
+#: builtin/pack-objects.c:2919
msgid "unpack unreachable objects newer than <time>"
msgstr "dépaqueter les objets inaccessibles plus récents que <heure>"
-#: builtin/pack-objects.c:2840
+#: builtin/pack-objects.c:2922
msgid "create thin packs"
msgstr "créer des paquets légers"
-#: builtin/pack-objects.c:2842
+#: builtin/pack-objects.c:2924
msgid "create packs suitable for shallow fetches"
msgstr "créer des paquets permettant des récupérations superficielles"
-#: builtin/pack-objects.c:2844
+#: builtin/pack-objects.c:2926
msgid "ignore packs that have companion .keep file"
msgstr "ignorer les paquets qui ont un fichier .keep"
-#: builtin/pack-objects.c:2846
+#: builtin/pack-objects.c:2928
msgid "pack compression level"
msgstr "niveau de compression du paquet"
-#: builtin/pack-objects.c:2848
+#: builtin/pack-objects.c:2930
msgid "do not hide commits by grafts"
msgstr "ne pas cacher les validations par greffes"
-#: builtin/pack-objects.c:2850
+#: builtin/pack-objects.c:2932
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:2852
+#: builtin/pack-objects.c:2934
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:2979
+#: builtin/pack-objects.c:3061
msgid "Counting objects"
msgstr "Décompte des objets"
@@ -11035,7 +11289,7 @@
msgid "incorporate changes by rebasing rather than merging"
msgstr "incorporer les modifications en rebasant plutôt qu'en fusionnant"
-#: builtin/pull.c:148 builtin/revert.c:101
+#: builtin/pull.c:148 builtin/rebase--helper.c:18 builtin/revert.c:120
msgid "allow fast-forward"
msgstr "autoriser l'avance rapide"
@@ -11112,7 +11366,7 @@
msgid "<remote>"
msgstr "<distant>"
-#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:455
+#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:456
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<branche>"
@@ -11422,11 +11676,11 @@
msgid "repository"
msgstr "dépôt"
-#: builtin/push.c:519 builtin/send-pack.c:161
+#: builtin/push.c:519 builtin/send-pack.c:162
msgid "push all refs"
msgstr "pousser toutes les références"
-#: builtin/push.c:520 builtin/send-pack.c:163
+#: builtin/push.c:520 builtin/send-pack.c:164
msgid "mirror all refs"
msgstr "refléter toutes les références"
@@ -11439,15 +11693,15 @@
msgstr ""
"pousser les étiquettes (ne peut pas être utilisé avec --all ou --mirror)"
-#: builtin/push.c:526 builtin/send-pack.c:164
+#: builtin/push.c:526 builtin/send-pack.c:165
msgid "force updates"
msgstr "forcer les mises à jour"
-#: builtin/push.c:528 builtin/send-pack.c:175
+#: builtin/push.c:528 builtin/send-pack.c:179
msgid "refname>:<expect"
msgstr "nom de référence>:<attendu"
-#: builtin/push.c:529 builtin/send-pack.c:176
+#: builtin/push.c:529 builtin/send-pack.c:180
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"
@@ -11455,12 +11709,12 @@
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:169
+#: builtin/push.c:534 builtin/send-pack.c:173
msgid "use thin pack"
msgstr "utiliser un empaquetage léger"
-#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:158
-#: builtin/send-pack.c:159
+#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:159
+#: builtin/send-pack.c:160
msgid "receive pack program"
msgstr "recevoir le programme d'empaquetage"
@@ -11480,19 +11734,19 @@
msgid "push missing but relevant tags"
msgstr "pousser les étiquettes manquantes mais pertinentes"
-#: builtin/push.c:546 builtin/send-pack.c:166
+#: builtin/push.c:546 builtin/send-pack.c:167
msgid "GPG sign the push"
msgstr "signer la poussée avec GPG"
-#: builtin/push.c:548 builtin/send-pack.c:170
+#: builtin/push.c:548 builtin/send-pack.c:174
msgid "request atomic transaction on remote side"
msgstr "demande une transaction atomique sur le serveur distant"
-#: builtin/push.c:549
+#: builtin/push.c:549 builtin/send-pack.c:170
msgid "server-specific"
msgstr "spécifique au serveur"
-#: builtin/push.c:549
+#: builtin/push.c:549 builtin/send-pack.c:171
msgid "option to transmit"
msgstr "option à transmettre"
@@ -11510,7 +11764,7 @@
"les options de poussée ne peuvent pas contenir de caractères de nouvelle "
"ligne"
-#: builtin/read-tree.c:37
+#: builtin/read-tree.c:40
msgid ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
@@ -11521,75 +11775,87 @@
"sparse-checkout] [--index-output=<fichier>] (--empty | <arbre ou apparenté "
"1> [<arbre ou apparenté 2> [<arbre ou apparenté 3>]])"
-#: builtin/read-tree.c:110
+#: builtin/read-tree.c:130
msgid "write resulting index to <file>"
msgstr "écrire l'index résultant dans <fichier>"
-#: builtin/read-tree.c:113
+#: builtin/read-tree.c:133
msgid "only empty the index"
msgstr "juste vider l'index"
-#: builtin/read-tree.c:115
+#: builtin/read-tree.c:135
msgid "Merging"
msgstr "Fusion"
-#: builtin/read-tree.c:117
+#: builtin/read-tree.c:137
msgid "perform a merge in addition to a read"
msgstr "effectuer une fusion en plus d'une lecture"
-#: builtin/read-tree.c:119
+#: builtin/read-tree.c:139
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:121
+#: builtin/read-tree.c:141
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:123
+#: builtin/read-tree.c:143
msgid "same as -m, but discard unmerged entries"
msgstr "comme -m, mais annule les éléments non fusionnés"
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:144
msgid "<subdirectory>/"
msgstr "<sous-répertoire>/"
-#: builtin/read-tree.c:125
+#: builtin/read-tree.c:145
msgid "read the tree into the index under <subdirectory>/"
msgstr "lire l'arbre dans l'index dans <sous-répertoire>/"
-#: builtin/read-tree.c:128
+#: builtin/read-tree.c:148
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:130
+#: builtin/read-tree.c:150
msgid "gitignore"
msgstr "gitignore"
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:151
msgid "allow explicitly ignored files to be overwritten"
msgstr "autoriser explicitement les fichiers ignorés à être écrasés"
-#: builtin/read-tree.c:134
+#: builtin/read-tree.c:154
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:135
+#: builtin/read-tree.c:155
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:137
+#: builtin/read-tree.c:157
msgid "skip applying sparse checkout filter"
msgstr "sauter l'application du filtre d'extraction creuse"
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:159
msgid "debug unpack-trees"
msgstr "déboguer unpack-trees"
-#: builtin/receive-pack.c:26
+#: builtin/rebase--helper.c:7
+msgid "git rebase--helper [<options>]"
+msgstr "git rebase-helper [<options>]"
+
+#: builtin/rebase--helper.c:19
+msgid "continue rebase"
+msgstr "continuer le rebasage"
+
+#: builtin/rebase--helper.c:21
+msgid "abort rebase"
+msgstr "abandonner le rebasage"
+
+#: builtin/receive-pack.c:27
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <répertoire-git>"
-#: builtin/receive-pack.c:793
+#: builtin/receive-pack.c:795
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"
@@ -11619,7 +11885,7 @@
"Pour éliminer ce message et conserver le comportement par défaut,\n"
"réglez « receive.denyCurrentBranch » à 'refuse'."
-#: builtin/receive-pack.c:813
+#: builtin/receive-pack.c:815
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"
@@ -11639,11 +11905,11 @@
"\n"
"Pour éliminer ce message, réglez-le à 'refuse'."
-#: builtin/receive-pack.c:1883
+#: builtin/receive-pack.c:1888
msgid "quiet"
msgstr "quiet"
-#: builtin/receive-pack.c:1897
+#: builtin/receive-pack.c:1902
msgid "You must specify a directory."
msgstr "Vous devez spécifier un répertoire."
@@ -11828,7 +12094,7 @@
msgid "(delete)"
msgstr "(supprimer)"
-#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:854
+#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:856
#, c-format
msgid "No such remote: %s"
msgstr "Distante inconnue : %s"
@@ -11859,7 +12125,7 @@
msgid "creating '%s' failed"
msgstr "échec de création de '%s'"
-#: builtin/remote.c:792
+#: builtin/remote.c:794
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -11874,137 +12140,137 @@
"supprimées ;\n"
"pour les supprimer, utilisez :"
-#: builtin/remote.c:806
+#: builtin/remote.c:808
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Impossible de supprimer la section de configuration '%s'"
-#: builtin/remote.c:907
+#: builtin/remote.c:909
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " nouveau (le prochain rapatriement (fetch) stockera dans remotes/%s)"
-#: builtin/remote.c:910
+#: builtin/remote.c:912
msgid " tracked"
msgstr " suivi"
-#: builtin/remote.c:912
+#: builtin/remote.c:914
msgid " stale (use 'git remote prune' to remove)"
msgstr " dépassé (utilisez 'git remote prune' pour supprimer)"
-#: builtin/remote.c:914
+#: builtin/remote.c:916
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:955
+#: builtin/remote.c:957
#, 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:963
+#: builtin/remote.c:965
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "rebase de manière interactive sur la distante %s"
-#: builtin/remote.c:964
+#: builtin/remote.c:966
#, c-format
msgid "rebases onto remote %s"
msgstr "rebase sur la distante %s"
-#: builtin/remote.c:967
+#: builtin/remote.c:969
#, c-format
msgid " merges with remote %s"
msgstr " fusionne avec la distante %s"
-#: builtin/remote.c:970
+#: builtin/remote.c:972
#, c-format
msgid "merges with remote %s"
msgstr "fusionne avec la distante %s"
-#: builtin/remote.c:973
+#: builtin/remote.c:975
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s et avec la distante %s\n"
-#: builtin/remote.c:1016
+#: builtin/remote.c:1018
msgid "create"
msgstr "créer"
-#: builtin/remote.c:1019
+#: builtin/remote.c:1021
msgid "delete"
msgstr "supprimer"
-#: builtin/remote.c:1023
+#: builtin/remote.c:1025
msgid "up to date"
msgstr "à jour"
-#: builtin/remote.c:1026
+#: builtin/remote.c:1028
msgid "fast-forwardable"
msgstr "peut être mis à jour en avance rapide"
-#: builtin/remote.c:1029
+#: builtin/remote.c:1031
msgid "local out of date"
msgstr "le local n'est pas à jour"
-#: builtin/remote.c:1036
+#: builtin/remote.c:1038
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s force vers %-*s (%s)"
-#: builtin/remote.c:1039
+#: builtin/remote.c:1041
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s pousse vers %-*s (%s)"
-#: builtin/remote.c:1043
+#: builtin/remote.c:1045
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s force vers %s"
-#: builtin/remote.c:1046
+#: builtin/remote.c:1048
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s pousse vers %s"
-#: builtin/remote.c:1114
+#: builtin/remote.c:1116
msgid "do not query remotes"
msgstr "ne pas interroger les distantes"
-#: builtin/remote.c:1141
+#: builtin/remote.c:1143
#, c-format
msgid "* remote %s"
msgstr "* distante %s"
-#: builtin/remote.c:1142
+#: builtin/remote.c:1144
#, c-format
msgid " Fetch URL: %s"
msgstr " URL de rapatriement : %s"
-#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1295
+#: builtin/remote.c:1145 builtin/remote.c:1158 builtin/remote.c:1297
msgid "(no URL)"
msgstr "(pas d'URL)"
#. TRANSLATORS: the colon ':' should align with
#. the one in " Fetch URL: %s" translation
-#: builtin/remote.c:1154 builtin/remote.c:1156
+#: builtin/remote.c:1156 builtin/remote.c:1158
#, c-format
msgid " Push URL: %s"
msgstr " URL push : %s"
-#: builtin/remote.c:1158 builtin/remote.c:1160 builtin/remote.c:1162
+#: builtin/remote.c:1160 builtin/remote.c:1162 builtin/remote.c:1164
#, c-format
msgid " HEAD branch: %s"
msgstr " Branche HEAD : %s"
-#: builtin/remote.c:1158
+#: builtin/remote.c:1160
msgid "(not queried)"
msgstr "(non demandé)"
-#: builtin/remote.c:1160
+#: builtin/remote.c:1162
msgid "(unknown)"
msgstr "(inconnu)"
-#: builtin/remote.c:1164
+#: builtin/remote.c:1166
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
@@ -12012,162 +12278,162 @@
" Branche HEAD (la HEAD distante est ambiguë, peut être l'une des "
"suivantes) :\n"
-#: builtin/remote.c:1176
+#: builtin/remote.c:1178
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Branche distante :%s"
msgstr[1] " Branches distantes :%s"
-#: builtin/remote.c:1179 builtin/remote.c:1205
+#: builtin/remote.c:1181 builtin/remote.c:1207
msgid " (status not queried)"
msgstr " (statut non demandé)"
-#: builtin/remote.c:1188
+#: builtin/remote.c:1190
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:1196
+#: builtin/remote.c:1198
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:1202
+#: builtin/remote.c:1204
#, 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:1223
+#: builtin/remote.c:1225
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "définir refs/remotes/<nom>/HEAD selon la distante"
-#: builtin/remote.c:1225
+#: builtin/remote.c:1227
msgid "delete refs/remotes/<name>/HEAD"
msgstr "supprimer refs/remotes/<nom>/HEAD"
-#: builtin/remote.c:1240
+#: builtin/remote.c:1242
msgid "Cannot determine remote HEAD"
msgstr "Impossible de déterminer la HEAD distante"
-#: builtin/remote.c:1242
+#: builtin/remote.c:1244
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:1252
+#: builtin/remote.c:1254
#, c-format
msgid "Could not delete %s"
msgstr "Impossible de supprimer %s"
-#: builtin/remote.c:1260
+#: builtin/remote.c:1262
#, c-format
msgid "Not a valid ref: %s"
msgstr "Référence non valide : %s"
-#: builtin/remote.c:1262
+#: builtin/remote.c:1264
#, c-format
msgid "Could not setup %s"
msgstr "Impossible de paramétrer %s"
-#: builtin/remote.c:1280
+#: builtin/remote.c:1282
#, c-format
msgid " %s will become dangling!"
msgstr " %s se retrouvera en suspens !"
-#: builtin/remote.c:1281
+#: builtin/remote.c:1283
#, c-format
msgid " %s has become dangling!"
msgstr " %s se retrouve en suspens !"
-#: builtin/remote.c:1291
+#: builtin/remote.c:1293
#, c-format
msgid "Pruning %s"
msgstr "Élimination de %s"
-#: builtin/remote.c:1292
+#: builtin/remote.c:1294
#, c-format
msgid "URL: %s"
msgstr "URL : %s"
-#: builtin/remote.c:1308
+#: builtin/remote.c:1310
#, c-format
msgid " * [would prune] %s"
msgstr " * [serait éliminé] %s"
-#: builtin/remote.c:1311
+#: builtin/remote.c:1313
#, c-format
msgid " * [pruned] %s"
msgstr " * [éliminé] %s"
-#: builtin/remote.c:1356
+#: builtin/remote.c:1358
msgid "prune remotes after fetching"
msgstr "éliminer les distants après le rapatriement"
-#: builtin/remote.c:1419 builtin/remote.c:1473 builtin/remote.c:1541
+#: builtin/remote.c:1421 builtin/remote.c:1475 builtin/remote.c:1543
#, c-format
msgid "No such remote '%s'"
msgstr "Pas de serveur remote '%s'"
-#: builtin/remote.c:1435
+#: builtin/remote.c:1437
msgid "add branch"
msgstr "ajouter une branche"
-#: builtin/remote.c:1442
+#: builtin/remote.c:1444
msgid "no remote specified"
msgstr "pas de serveur distant spécifié"
-#: builtin/remote.c:1459
+#: builtin/remote.c:1461
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:1461
+#: builtin/remote.c:1463
msgid "return all URLs"
msgstr "retourner toutes les URLs"
-#: builtin/remote.c:1489
+#: builtin/remote.c:1491
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "aucune URL configurée pour le dépôt distant '%s'"
-#: builtin/remote.c:1515
+#: builtin/remote.c:1517
msgid "manipulate push URLs"
msgstr "manipuler les URLs push"
-#: builtin/remote.c:1517
+#: builtin/remote.c:1519
msgid "add URL"
msgstr "ajouter une URL"
-#: builtin/remote.c:1519
+#: builtin/remote.c:1521
msgid "delete URLs"
msgstr "supprimer des URLs"
-#: builtin/remote.c:1526
+#: builtin/remote.c:1528
msgid "--add --delete doesn't make sense"
msgstr "--add --delete n'a aucun sens"
-#: builtin/remote.c:1567
+#: builtin/remote.c:1569
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Motif d'URL ancien invalide : %s"
-#: builtin/remote.c:1575
+#: builtin/remote.c:1577
#, c-format
msgid "No such URL found: %s"
msgstr "Pas d'URL trouvée : %s"
-#: builtin/remote.c:1577
+#: builtin/remote.c:1579
msgid "Will not delete all non-push URLs"
msgstr "Pas de suppression de toutes les URLs non-push"
-#: builtin/remote.c:1591
+#: builtin/remote.c:1593
msgid "be verbose; must be placed before a subcommand"
msgstr "être verbeux : doit être placé avant une sous-commande"
-#: builtin/remote.c:1622
+#: builtin/remote.c:1624
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Sous-commande inconnue : %s"
@@ -12287,22 +12553,22 @@
msgid "git replace [--format=<format>] [-l [<pattern>]]"
msgstr "git replace [--format=<format>] [-l [<motif>]]"
-#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
+#: builtin/replace.c:330 builtin/replace.c:368 builtin/replace.c:396
#, c-format
msgid "Not a valid object name: '%s'"
msgstr "Nom d'objet invalide : '%s'"
-#: builtin/replace.c:355
+#: builtin/replace.c:360
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "mauvaise étiquette de fusion dans le commit '%s'"
-#: builtin/replace.c:357
+#: builtin/replace.c:362
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr "étiquette de fusion malformée dans le commit '%s'"
-#: builtin/replace.c:368
+#: builtin/replace.c:373
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -12311,45 +12577,45 @@
"le commit original '%s' contient l'étiquette de fusion '%s' qui a disparu ; "
"utilisez --edit au lieu de --graft"
-#: builtin/replace.c:401
+#: builtin/replace.c:406
#, c-format
msgid "the original commit '%s' has a gpg signature."
msgstr "le commit original '%s' contient une signature GPG."
-#: builtin/replace.c:402
+#: builtin/replace.c:407
msgid "the signature will be removed in the replacement commit!"
msgstr "la signature sera éliminée dans la validation de remplacement !"
-#: builtin/replace.c:408
+#: builtin/replace.c:413
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr "Impossible d'écrire le commit de remplacement pour '%s'"
-#: builtin/replace.c:432
+#: builtin/replace.c:437
msgid "list replace refs"
msgstr "afficher les références de remplacement"
-#: builtin/replace.c:433
+#: builtin/replace.c:438
msgid "delete replace refs"
msgstr "supprimer les références de remplacement"
-#: builtin/replace.c:434
+#: builtin/replace.c:439
msgid "edit existing object"
msgstr "éditer l'objet existant"
-#: builtin/replace.c:435
+#: builtin/replace.c:440
msgid "change a commit's parents"
msgstr "Modifier les parents d'un commit"
-#: builtin/replace.c:436
+#: builtin/replace.c:441
msgid "replace the ref if it exists"
msgstr "remplacer la référence si elle existe"
-#: builtin/replace.c:437
+#: builtin/replace.c:442
msgid "do not pretty-print contents for --edit"
msgstr "afficher sans mise en forme pour --edit"
-#: builtin/replace.c:438
+#: builtin/replace.c:443
msgid "use this format"
msgstr "utiliser ce format"
@@ -12496,23 +12762,23 @@
msgid "rev-list does not support display of notes"
msgstr "rev-list ne supporte l'affichage des notes"
-#: builtin/rev-parse.c:391
+#: builtin/rev-parse.c:393
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<options>] -- [<arguments>...]"
-#: builtin/rev-parse.c:396
+#: builtin/rev-parse.c:398
msgid "keep the `--` passed as an arg"
msgstr "garder le `--` passé en argument"
-#: builtin/rev-parse.c:398
+#: builtin/rev-parse.c:400
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:401
+#: builtin/rev-parse.c:403
msgid "output in stuck long form"
msgstr "sortie en forme longue fixée"
-#: builtin/rev-parse.c:532
+#: builtin/rev-parse.c:534
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
@@ -12543,68 +12809,72 @@
msgid "git cherry-pick <subcommand>"
msgstr "git cherry-pick <sous-commande>"
-#: builtin/revert.c:71
+#: builtin/revert.c:89
#, c-format
msgid "%s: %s cannot be used with %s"
msgstr "%s : %s ne peut pas être utilisé avec %s"
-#: builtin/revert.c:80
+#: builtin/revert.c:98
msgid "end revert or cherry-pick sequence"
msgstr "mettre fin au retour ou picorage"
-#: builtin/revert.c:81
+#: builtin/revert.c:99
msgid "resume revert or cherry-pick sequence"
msgstr "reprendre le retour ou picorage"
-#: builtin/revert.c:82
+#: builtin/revert.c:100
msgid "cancel revert or cherry-pick sequence"
msgstr "annuler le retour ou picorage"
-#: builtin/revert.c:83
+#: builtin/revert.c:101
msgid "don't automatically commit"
msgstr "ne pas valider automatiquement"
-#: builtin/revert.c:84
+#: builtin/revert.c:102
msgid "edit the commit message"
msgstr "éditer le message de validation"
-#: builtin/revert.c:87
-msgid "parent number"
-msgstr "numéro de parent"
+#: builtin/revert.c:105
+msgid "parent-number"
+msgstr "numéro-de-parent"
-#: builtin/revert.c:89
+#: builtin/revert.c:106
+msgid "select mainline parent"
+msgstr "sélectionner le parent principal"
+
+#: builtin/revert.c:108
msgid "merge strategy"
msgstr "stratégie de fusion"
-#: builtin/revert.c:90
+#: builtin/revert.c:109
msgid "option"
msgstr "option"
-#: builtin/revert.c:91
+#: builtin/revert.c:110
msgid "option for merge strategy"
msgstr "option pour la stratégie de fusion"
-#: builtin/revert.c:100
+#: builtin/revert.c:119
msgid "append commit name"
msgstr "ajouter le nom de validation"
-#: builtin/revert.c:102
+#: builtin/revert.c:121
msgid "preserve initially empty commits"
msgstr "préserver les validations vides initialement"
-#: builtin/revert.c:103
+#: builtin/revert.c:122
msgid "allow commits with empty messages"
msgstr "autoriser les validations avec des messages vides"
-#: builtin/revert.c:104
+#: builtin/revert.c:123
msgid "keep redundant, empty commits"
msgstr "garder les validations redondantes, vides"
-#: builtin/revert.c:192
+#: builtin/revert.c:211
msgid "revert failed"
msgstr "revert a échoué"
-#: builtin/revert.c:205
+#: builtin/revert.c:224
msgid "cherry-pick failed"
msgstr "le picorage a échoué"
@@ -12702,19 +12972,19 @@
" --all et la spécification explicite de <référence> sont mutuellement "
"exclusifs."
-#: builtin/send-pack.c:160
+#: builtin/send-pack.c:161
msgid "remote name"
msgstr "nom distant"
-#: builtin/send-pack.c:171
+#: builtin/send-pack.c:175
msgid "use stateless RPC protocol"
msgstr "utiliser un protocole RPC sans état"
-#: builtin/send-pack.c:172
+#: builtin/send-pack.c:176
msgid "read refs from stdin"
msgstr "lire les références depuis l'entrée standard"
-#: builtin/send-pack.c:173
+#: builtin/send-pack.c:177
msgid "print status from remote helper"
msgstr "afficher les messages du greffon de protocole distant"
@@ -12722,29 +12992,29 @@
msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
msgstr "git shortlog [<options>] [<intervalle-révisions>] [[--] [<chemin>...]]"
-#: builtin/shortlog.c:249
+#: builtin/shortlog.c:248
msgid "Group by committer rather than author"
msgstr "Grouper par validateur plutôt que par auteur"
-#: builtin/shortlog.c:251
+#: builtin/shortlog.c:250
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:253
+#: builtin/shortlog.c:252
msgid "Suppress commit descriptions, only provides commit count"
msgstr ""
"Supprimer les descriptions de validation, fournit seulement le nombre de "
"validations"
-#: builtin/shortlog.c:255
+#: builtin/shortlog.c:254
msgid "Show the email address of each author"
msgstr "Afficher l'adresse e-mail de chaque auteur"
-#: builtin/shortlog.c:256
+#: builtin/shortlog.c:255
msgid "w[,i1[,i2]]"
msgstr "w[,i1[,i2]]"
-#: builtin/shortlog.c:257
+#: builtin/shortlog.c:256
msgid "Linewrap output"
msgstr "Couper les lignes"
@@ -12764,124 +13034,124 @@
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:375
+#: builtin/show-branch.c:374
#, 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:541
+#: builtin/show-branch.c:536
#, c-format
msgid "no matching refs with %s"
msgstr "aucune référence correspond à %s"
-#: builtin/show-branch.c:639
+#: builtin/show-branch.c:632
msgid "show remote-tracking and local branches"
msgstr "afficher les branches de suivi distantes et les branches locales"
-#: builtin/show-branch.c:641
+#: builtin/show-branch.c:634
msgid "show remote-tracking branches"
msgstr "afficher les branches de suivi distantes"
-#: builtin/show-branch.c:643
+#: builtin/show-branch.c:636
msgid "color '*!+-' corresponding to the branch"
msgstr "couleur '*!+-' correspondant à la branche"
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:638
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:647
+#: builtin/show-branch.c:640
msgid "synonym to more=-1"
msgstr "synonyme de more=-1"
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:641
msgid "suppress naming strings"
msgstr "supprimer les chaînes de nommage"
-#: builtin/show-branch.c:650
+#: builtin/show-branch.c:643
msgid "include the current branch"
msgstr "inclure la branche courante"
-#: builtin/show-branch.c:652
+#: builtin/show-branch.c:645
msgid "name commits with their object names"
msgstr "nommer les validations avec leurs noms d'objet"
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:647
msgid "show possible merge bases"
msgstr "afficher les bases possibles de fusion"
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:649
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:658
+#: builtin/show-branch.c:651
msgid "show commits in topological order"
msgstr "afficher les validations dans l'ordre topologique"
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:654
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:663
+#: builtin/show-branch.c:656
msgid "show merges reachable from only one tip"
msgstr "afficher les fusions accessibles depuis une seule pointe"
-#: builtin/show-branch.c:665
+#: builtin/show-branch.c:658
msgid "topologically sort, maintaining date order where possible"
msgstr "tri topologique, maintenant l'ordre par date si possible"
-#: builtin/show-branch.c:668
+#: builtin/show-branch.c:661
msgid "<n>[,<base>]"
msgstr "<n>[,<base>]"
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:662
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:703
+#: builtin/show-branch.c:696
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:727
+#: builtin/show-branch.c:720
msgid "no branches given, and HEAD is not valid"
msgstr "aucune branche spécifiée, et HEAD est invalide"
-#: builtin/show-branch.c:730
+#: builtin/show-branch.c:723
msgid "--reflog option needs one branch name"
msgstr "--reflog requiert un nom de branche"
-#: builtin/show-branch.c:733
+#: builtin/show-branch.c:726
#, 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:737
+#: builtin/show-branch.c:730
#, c-format
msgid "no such ref %s"
msgstr "référence inexistante %s"
-#: builtin/show-branch.c:829
+#: builtin/show-branch.c:814
#, 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:833
+#: builtin/show-branch.c:818
#, c-format
msgid "'%s' is not a valid ref."
msgstr "'%s' n'est pas une référence valide."
-#: builtin/show-branch.c:836
+#: builtin/show-branch.c:821
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "impossible de trouver le commit %s (%s)"
@@ -12953,12 +13223,12 @@
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:1062
+#: builtin/submodule--helper.c:24 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:1071
+#: builtin/submodule--helper.c:31 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"
@@ -12968,99 +13238,108 @@
msgid "cannot strip one component off url '%s'"
msgstr "impossible de supprimer un composant de l'URL '%s'"
-#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:592
+#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630
msgid "alternative anchor for relative paths"
msgstr "ancre alternative pour les chemins relatifs"
-#: builtin/submodule--helper.c:287
+#: builtin/submodule--helper.c:310
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<chemin>] [<chemin>...]"
-#: builtin/submodule--helper.c:333 builtin/submodule--helper.c:347
+#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "URL non trouvée pour le chemin de sous-module '%s' dans .gitmodules"
-#: builtin/submodule--helper.c:373
+#: builtin/submodule--helper.c:395
+#, c-format
+msgid ""
+"could not lookup configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr ""
+"impossible de trouver la configuration '%s'. Ce dépôt est considéré comme "
+"son propre amont d'autorité."
+
+#: builtin/submodule--helper.c:406
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Échec d'enregistrement de l'URL pour le chemin de sous-module '%s'"
-#: builtin/submodule--helper.c:377
+#: builtin/submodule--helper.c:410
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Sous-module '%s' (%s) enregistré pour le chemin '%s'\n"
-#: builtin/submodule--helper.c:387
+#: builtin/submodule--helper.c:420
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr ""
"attention : nous vous suggérons de spécifier une commande de mode de mise à "
"jour pour le sous-module '%s'\n"
-#: builtin/submodule--helper.c:394
+#: builtin/submodule--helper.c:427
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
"Échec d'enregistrement du mode de mise à jour pour le chemin de sous-module "
"'%s'"
-#: builtin/submodule--helper.c:410
+#: builtin/submodule--helper.c:443
msgid "Suppress output for initializing a submodule"
msgstr "Supprimer la sortie lors de l'initialisation d'un sous-module"
-#: builtin/submodule--helper.c:415
+#: builtin/submodule--helper.c:448
msgid "git submodule--helper init [<path>]"
msgstr "git submodule--helper init [<chemin>]"
-#: builtin/submodule--helper.c:436
+#: builtin/submodule--helper.c:476
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper <nom> <chemin>"
-#: builtin/submodule--helper.c:442
+#: builtin/submodule--helper.c:482
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr ""
"Pas de mise en correspondance du sous-module trouvé dans .gitmodules pour le "
"chemin '%s'"
-#: builtin/submodule--helper.c:525 builtin/submodule--helper.c:528
+#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "le sous-module '%s' ne peut pas ajouter d'alternative : %s"
-#: builtin/submodule--helper.c:564
+#: builtin/submodule--helper.c:604
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr ""
"La valeur '%s' pour submodule.alternateErrorStrategy n'est pas reconnue"
-#: builtin/submodule--helper.c:571
+#: builtin/submodule--helper.c:611
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "La valeur '%s' pour submodule.alternateLocation n'est pas reconnue"
-#: builtin/submodule--helper.c:595
+#: builtin/submodule--helper.c:633
msgid "where the new submodule will be cloned to"
msgstr "emplacement où le sous-module sera cloné"
-#: builtin/submodule--helper.c:598
+#: builtin/submodule--helper.c:636
msgid "name of the new submodule"
msgstr "nom du nouveau sous-module"
-#: builtin/submodule--helper.c:601
+#: builtin/submodule--helper.c:639
msgid "url where to clone the submodule from"
msgstr "URL depuis laquelle cloner le sous-module"
-#: builtin/submodule--helper.c:607
+#: builtin/submodule--helper.c:645
msgid "depth for shallow clones"
msgstr "profondeur de l'historique des clones superficiels"
-#: builtin/submodule--helper.c:610 builtin/submodule--helper.c:980
+#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993
msgid "force cloning progress"
msgstr "forcer l'affichage de la progression du clonage"
-#: builtin/submodule--helper.c:615
+#: builtin/submodule--helper.c:653
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -13068,93 +13347,83 @@
"git submodule--helper clone [--prefix=<chemin>] [--quiet] [--reference "
"<dépôt>] [--name <nom>] [--depth <profondeur>] --url <url> --path <chemin>"
-#: builtin/submodule--helper.c:646
+#: builtin/submodule--helper.c:684
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "Le clonage de '%s' dans le chemin de sous-module '%s' a échoué"
-#: builtin/submodule--helper.c:662
-#, c-format
-msgid "cannot open file '%s'"
-msgstr "impossible d'ouvrir le fichier '%s'"
-
-#: builtin/submodule--helper.c:667
-#, c-format
-msgid "could not close file %s"
-msgstr "impossible de fermer le fichier %s"
-
-#: builtin/submodule--helper.c:674
+#: builtin/submodule--helper.c:699
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "impossible de créer le répertoire de sous-module pour '%s'"
-#: builtin/submodule--helper.c:742
+#: builtin/submodule--helper.c:764
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Le chemin de sous-module '%s' n'est pas initialisé"
-#: builtin/submodule--helper.c:746
+#: builtin/submodule--helper.c:768
msgid "Maybe you want to use 'update --init'?"
msgstr "Vous voudriez sûrement utiliser 'update --init' ?"
-#: builtin/submodule--helper.c:772
+#: builtin/submodule--helper.c:793
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Sous-module non fusionné %s non traité"
-#: builtin/submodule--helper.c:793
+#: builtin/submodule--helper.c:814
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Sous-module '%s' non traité"
-#: builtin/submodule--helper.c:929
+#: builtin/submodule--helper.c:942
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Impossible de cloner '%s'. Réessai prévu"
-#: builtin/submodule--helper.c:940
+#: builtin/submodule--helper.c:953
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Impossible de cloner '%s' pour la seconde fois, abandon"
-#: builtin/submodule--helper.c:961 builtin/submodule--helper.c:1105
+#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162
msgid "path into the working tree"
msgstr "chemin dans la copie de travail"
-#: builtin/submodule--helper.c:964
+#: builtin/submodule--helper.c:977
msgid "path into the working tree, across nested submodule boundaries"
msgstr ""
"chemin dans la copie de travail, traversant les frontières de sous-modules"
-#: builtin/submodule--helper.c:968
+#: builtin/submodule--helper.c:981
msgid "rebase, merge, checkout or none"
msgstr "valeurs possibles : rebase, merge, checkout ou none"
-#: builtin/submodule--helper.c:972
+#: builtin/submodule--helper.c:985
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr "Créer un clone superficiel tronqué au nombre de révisions spécifié"
-#: builtin/submodule--helper.c:975
+#: builtin/submodule--helper.c:988
msgid "parallel jobs"
msgstr "jobs parallèles"
-#: builtin/submodule--helper.c:977
+#: builtin/submodule--helper.c:990
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "spécifie si le clonage initial doit être aussi superficiel"
-#: builtin/submodule--helper.c:978
+#: builtin/submodule--helper.c:991
msgid "don't print cloning progress"
msgstr "ne pas afficher la progression du clonage"
-#: builtin/submodule--helper.c:985
+#: builtin/submodule--helper.c:998
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<chemin>] [<chemin>...]"
-#: builtin/submodule--helper.c:995
+#: builtin/submodule--helper.c:1008
msgid "bad value for update parameter"
msgstr "valeur invalide pour la mise à jour du paramètre"
-#: builtin/submodule--helper.c:1066
+#: builtin/submodule--helper.c:1079
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -13163,25 +13432,25 @@
"la branche du sous-module %s est configurée pour hériter de la branche du "
"superprojet, mais le superprojet n'est sur aucune branche"
-#: builtin/submodule--helper.c:1106
+#: builtin/submodule--helper.c:1163
msgid "recurse into submodules"
msgstr "parcourir récursivement les sous-modules"
-#: builtin/submodule--helper.c:1112
+#: builtin/submodule--helper.c:1169
msgid "git submodule--helper embed-git-dir [<path>...]"
msgstr "git submodule--helper embed-git-dir [<chemin>...]"
-#: builtin/submodule--helper.c:1157
+#: 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:1164
+#: builtin/submodule--helper.c:1233
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s ne gère pas --super-prefix"
-#: builtin/submodule--helper.c:1170
+#: builtin/submodule--helper.c:1239
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' n'est pas une sous-commande valide de submodule--helper"
@@ -13229,32 +13498,29 @@
#: builtin/tag.c:25
msgid ""
-"git tag -l [-n[<num>]] [--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[<num>]] [--contains <commit>] [--points-at <objet>]\n"
+"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
+"points-at <objet>]\n"
"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<motif>...]"
#: builtin/tag.c:27
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<format>] <nométiquette>..."
-#: builtin/tag.c:82
-#, c-format
-msgid "tag name too long: %.*s..."
-msgstr "nom d'étiquette trop long : %.*s..."
-
-#: builtin/tag.c:87
+#: builtin/tag.c:83
#, c-format
msgid "tag '%s' not found."
msgstr "étiquette '%s' non trouvée."
-#: builtin/tag.c:102
+#: builtin/tag.c:99
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Étiquette '%s' supprimée (elle était sur %s)\n"
-#: builtin/tag.c:131
+#: builtin/tag.c:128
#, c-format
msgid ""
"\n"
@@ -13267,7 +13533,7 @@
" %s\n"
"Les lignes commençant par '%c' seront ignorées.\n"
-#: builtin/tag.c:135
+#: builtin/tag.c:132
#, c-format
msgid ""
"\n"
@@ -13282,138 +13548,143 @@
"Les lignes commençant par '%c' seront gardées ; vous pouvez les retirer vous-"
"même si vous le souhaitez.\n"
-#: builtin/tag.c:213
+#: builtin/tag.c:210
msgid "unable to sign the tag"
msgstr "impossible de signer l'étiquette"
-#: builtin/tag.c:215
+#: builtin/tag.c:212
msgid "unable to write tag file"
msgstr "impossible d'écrire le fichier d'étiquettes"
-#: builtin/tag.c:240
+#: builtin/tag.c:236
msgid "bad object type."
msgstr "mauvais type d'objet."
-#: builtin/tag.c:253
-msgid "tag header too big."
-msgstr "en-tête d'étiquette trop gros."
-
-#: builtin/tag.c:289
+#: builtin/tag.c:282
msgid "no tag message?"
msgstr "pas de message pour l'étiquette ?"
-#: builtin/tag.c:295
+#: builtin/tag.c:289
#, 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:354
+#: builtin/tag.c:397
msgid "list tag names"
msgstr "afficher les noms des étiquettes"
-#: builtin/tag.c:356
+#: builtin/tag.c:399
msgid "print <n> lines of each tag message"
msgstr "affiche <n> lignes de chaque message d'étiquette"
-#: builtin/tag.c:358
+#: builtin/tag.c:401
msgid "delete tags"
msgstr "supprimer des étiquettes"
-#: builtin/tag.c:359
+#: builtin/tag.c:402
msgid "verify tags"
msgstr "vérifier des étiquettes"
-#: builtin/tag.c:361
+#: builtin/tag.c:404
msgid "Tag creation options"
msgstr "Options de création de l'étiquette"
-#: builtin/tag.c:363
+#: builtin/tag.c:406
msgid "annotated tag, needs a message"
msgstr "étiquette annotée, nécessite un message"
-#: builtin/tag.c:365
+#: builtin/tag.c:408
msgid "tag message"
msgstr "message pour l'étiquette"
-#: builtin/tag.c:367
+#: builtin/tag.c:410
msgid "annotated and GPG-signed tag"
msgstr "étiquette annotée et signée avec GPG"
-#: builtin/tag.c:371
+#: builtin/tag.c:414
msgid "use another key to sign the tag"
msgstr "utiliser une autre clé pour signer l'étiquette"
-#: builtin/tag.c:372
+#: builtin/tag.c:415
msgid "replace the tag if exists"
msgstr "remplacer l'étiquette si elle existe"
-#: builtin/tag.c:373 builtin/update-ref.c:368
+#: builtin/tag.c:416 builtin/update-ref.c:368
msgid "create a reflog"
msgstr "créer un reflog"
-#: builtin/tag.c:375
+#: builtin/tag.c:418
msgid "Tag listing options"
msgstr "Options d'affichage des étiquettes"
-#: builtin/tag.c:376
+#: builtin/tag.c:419
msgid "show tag list in columns"
msgstr "afficher la liste des étiquettes sous forme de colonnes"
-#: builtin/tag.c:377 builtin/tag.c:378
+#: builtin/tag.c:420 builtin/tag.c:422
msgid "print only tags that contain the commit"
msgstr "afficher seulement les étiquettes qui contiennent la validation"
-#: builtin/tag.c:379
+#: builtin/tag.c:421 builtin/tag.c:423
+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
msgid "print only tags that are merged"
msgstr "afficher seulement les étiquettes qui sont fusionnées"
-#: builtin/tag.c:380
+#: builtin/tag.c:425
msgid "print only tags that are not merged"
msgstr "afficher seulement les étiquettes qui ne sont pas fusionnées"
-#: builtin/tag.c:385
+#: builtin/tag.c:430
msgid "print only tags of the object"
msgstr "afficher seulement les étiquettes de l'objet"
-#: builtin/tag.c:415
+#: builtin/tag.c:469
msgid "--column and -n are incompatible"
msgstr "--column et -n sont incompatibles"
-#: builtin/tag.c:437
-msgid "-n option is only allowed with -l."
-msgstr "l'option -n est autorisée seulement avec -l."
+#: builtin/tag.c:491
+msgid "-n option is only allowed in list mode"
+msgstr "l'option -n est autorisée seulement en mode de liste"
-#: builtin/tag.c:439
-msgid "--contains option is only allowed with -l."
-msgstr "l'option --contains est autorisée seulement avec -l."
+#: builtin/tag.c:493
+msgid "--contains option is only allowed in list mode"
+msgstr "l'option --contains est autorisée seulement en mode de liste"
-#: builtin/tag.c:441
-msgid "--points-at option is only allowed with -l."
-msgstr "l'option --points-at est autorisée seulement avec -l."
+#: builtin/tag.c:495
+msgid "--no-contains option is only allowed in list mode"
+msgstr "l'option --contains est autorisée seulement en mode liste"
-#: builtin/tag.c:443
-msgid "--merged and --no-merged option are only allowed with -l"
-msgstr "les options --merged et --no-merged ne sont autorisées qu'avec -l"
+#: builtin/tag.c:497
+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:454
+#: builtin/tag.c:499
+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
msgid "only one -F or -m option is allowed."
msgstr "une seule option -F ou -m est autorisée."
-#: builtin/tag.c:473
+#: builtin/tag.c:529
msgid "too many params"
msgstr "trop de paramètres"
-#: builtin/tag.c:479
+#: builtin/tag.c:535
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' n'est pas un nom d'étiquette valide."
-#: builtin/tag.c:484
+#: builtin/tag.c:540
#, c-format
msgid "tag '%s' already exists"
msgstr "l'étiquette '%s' existe déjà"
-#: builtin/tag.c:512
+#: builtin/tag.c:570
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Étiquette '%s' mise à jour (elle était sur %s)\n"
@@ -13442,178 +13713,194 @@
msgid "failed to delete file %s"
msgstr "échec de la suppression du fichier %s"
-#: builtin/update-index.c:110 builtin/update-index.c:212
+#: builtin/update-index.c:110 builtin/update-index.c:216
#, c-format
msgid "failed to delete directory %s"
msgstr "échec de la suppression du répertoire %s"
-#: builtin/update-index.c:133
+#: builtin/update-index.c:135
#, c-format
msgid "Testing mtime in '%s' "
msgstr "Test du mtime dans '%s' "
-#: builtin/update-index.c:145
+#: builtin/update-index.c:149
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:158
+#: builtin/update-index.c:162
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:171
+#: builtin/update-index.c:175
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:182
+#: builtin/update-index.c:186
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:193
+#: builtin/update-index.c:197
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:206
+#: builtin/update-index.c:210
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:213
+#: builtin/update-index.c:217
msgid " OK"
msgstr " OK"
-#: builtin/update-index.c:564
+#: builtin/update-index.c:568
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<options>] [--] [<fichier>...]"
-#: builtin/update-index.c:919
+#: builtin/update-index.c:923
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:922
+#: builtin/update-index.c:926
msgid "refresh: ignore submodules"
msgstr "rafraîchir : ignorer les sous-modules"
-#: builtin/update-index.c:925
+#: builtin/update-index.c:929
msgid "do not ignore new files"
msgstr "ne pas ignorer les nouveaux fichiers"
-#: builtin/update-index.c:927
+#: builtin/update-index.c:931
msgid "let files replace directories and vice-versa"
msgstr "laisser les fichiers remplacer des répertoires et vice-versa"
-#: builtin/update-index.c:929
+#: builtin/update-index.c:933
msgid "notice files missing from worktree"
msgstr "aviser des fichiers manquants dans la copie de travail"
-#: builtin/update-index.c:931
+#: builtin/update-index.c:935
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:934
+#: builtin/update-index.c:938
msgid "refresh stat information"
msgstr "rafraîchir l'information de stat"
-#: builtin/update-index.c:938
+#: builtin/update-index.c:942
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "comme --refresh, mais en ignorant l'option assume-unchanged"
-#: builtin/update-index.c:942
+#: builtin/update-index.c:946
msgid "<mode>,<object>,<path>"
msgstr "<mode>, <objet>, <chemin>"
-#: builtin/update-index.c:943
+#: builtin/update-index.c:947
msgid "add the specified entry to the index"
msgstr "ajouter l'élément spécifié dans l'index"
-#: builtin/update-index.c:952
+#: builtin/update-index.c:956
msgid "mark files as \"not changing\""
msgstr "marquer les fichiers comme \"non changeants\""
-#: builtin/update-index.c:955
+#: builtin/update-index.c:959
msgid "clear assumed-unchanged bit"
msgstr "mettre à zéro le bit supposé-non-modifié"
-#: builtin/update-index.c:958
+#: builtin/update-index.c:962
msgid "mark files as \"index-only\""
msgstr "marquer les fichiers comme \"index seulement\""
-#: builtin/update-index.c:961
+#: builtin/update-index.c:965
msgid "clear skip-worktree bit"
msgstr "mettre à zéro le bit sauter-la-copie-de travail"
-#: builtin/update-index.c:964
+#: builtin/update-index.c:968
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:966
+#: builtin/update-index.c:970
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:968
+#: builtin/update-index.c:972
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:970
+#: builtin/update-index.c:974
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:974
+#: builtin/update-index.c:978
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:978
+#: builtin/update-index.c:982
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:982
+#: builtin/update-index.c:986
msgid "only update entries that differ from HEAD"
msgstr "mettre à jour seulement les éléments qui diffèrent de HEAD"
-#: builtin/update-index.c:986
+#: builtin/update-index.c:990
msgid "ignore files missing from worktree"
msgstr "ignorer les fichiers manquants dans la copie de travail"
-#: builtin/update-index.c:989
+#: builtin/update-index.c:993
msgid "report actions to standard output"
msgstr "afficher les actions sur la sortie standard"
-#: builtin/update-index.c:991
+#: builtin/update-index.c:995
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(pour porcelaines) oublier les conflits sauvés et non résolus"
-#: builtin/update-index.c:995
+#: builtin/update-index.c:999
msgid "write index in this format"
msgstr "écrire l'index dans ce format"
-#: builtin/update-index.c:997
+#: builtin/update-index.c:1001
msgid "enable or disable split index"
msgstr "activer ou désactiver l'index divisé"
-#: builtin/update-index.c:999
+#: builtin/update-index.c:1003
msgid "enable/disable untracked cache"
msgstr "activer ou désactiver le cache de non-suivis"
-#: builtin/update-index.c:1001
+#: builtin/update-index.c:1005
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:1003
+#: builtin/update-index.c:1007
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:1120
+#: builtin/update-index.c:1107
+msgid ""
+"core.splitIndex is set to false; remove or change it, if you really want to "
+"enable split index"
+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
+msgid ""
+"core.splitIndex is set to true; remove or change it, if you really want to "
+"disable split index"
+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
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
@@ -13621,11 +13908,11 @@
"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:1124
+#: builtin/update-index.c:1131
msgid "Untracked cache disabled"
msgstr "Le cache non suivi est désactivé"
-#: builtin/update-index.c:1132
+#: builtin/update-index.c:1139
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
@@ -13633,7 +13920,7 @@
"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:1136
+#: builtin/update-index.c:1143
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "Le cache non suivi est activé pour '%s'"
@@ -13728,28 +14015,28 @@
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <chemin>"
-#: builtin/worktree.c:42
+#: builtin/worktree.c:43
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Suppression de worktrees/%s : répertoire invalide"
-#: builtin/worktree.c:48
+#: builtin/worktree.c:49
#, 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:53
+#: builtin/worktree.c:54
#, 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:64
+#: builtin/worktree.c:65
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Suppression de worktrees/%s : fichier gitdir invalide"
-#: builtin/worktree.c:80
+#: builtin/worktree.c:81
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr ""
@@ -13769,63 +14056,67 @@
msgid "'%s' already exists"
msgstr "'%s' existe déjà"
-#: builtin/worktree.c:236
+#: builtin/worktree.c:235
#, c-format
msgid "could not create directory of '%s'"
msgstr "impossible de créer le répertoire de '%s'"
-#: builtin/worktree.c:272
+#: builtin/worktree.c:274
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "Préparation de %s (identifiant %s)"
-#: builtin/worktree.c:323
+#: builtin/worktree.c:328
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:325
+#: builtin/worktree.c:330
msgid "create a new branch"
msgstr "créer une nouvelle branche"
-#: builtin/worktree.c:327
+#: builtin/worktree.c:332
msgid "create or reset a branch"
msgstr "créer ou réinitialiser une branche"
-#: builtin/worktree.c:329
+#: builtin/worktree.c:334
msgid "populate the new working tree"
msgstr "remplissage de la nouvelle copie de travail"
-#: builtin/worktree.c:337
+#: builtin/worktree.c:335
+msgid "keep the new working tree locked"
+msgstr "conserver le verrou sur le nouvel arbre de travail"
+
+#: builtin/worktree.c:343
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B et --detach sont mutuellement exclusifs"
-#: builtin/worktree.c:472
+#: builtin/worktree.c:478
msgid "reason for locking"
msgstr "raison du vérouillage"
-#: builtin/worktree.c:484 builtin/worktree.c:517
+#: builtin/worktree.c:490 builtin/worktree.c:523
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' n'est pas une copie de travail"
-#: builtin/worktree.c:486 builtin/worktree.c:519
+#: builtin/worktree.c:492 builtin/worktree.c:525
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"
-#: builtin/worktree.c:491
+#: builtin/worktree.c:497
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' est déjà verrouillé, car '%s'"
-#: builtin/worktree.c:493
+#: builtin/worktree.c:499
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' est déjà verrouillé"
-#: builtin/worktree.c:521
+#: builtin/worktree.c:527
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' n'est pas verrouillé"
@@ -13850,21 +14141,21 @@
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<options>] <répertoire>"
-#: upload-pack.c:1036
+#: upload-pack.c:1040
msgid "quit after a single request/response exchange"
msgstr "quitter après un unique échange requête/réponse"
-#: upload-pack.c:1038
+#: upload-pack.c:1042
msgid "exit immediately after initial ref advertisement"
msgstr "Sortir immédiatement après l'annonce initiale des références"
-#: upload-pack.c:1040
+#: upload-pack.c:1044
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:1042
+#: upload-pack.c:1046
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "interrompre le transfer après <n> secondes d'inactivité"
@@ -13895,15 +14186,20 @@
"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:344
+#: http.c:336
+#, 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"
+
+#: http.c:357
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:353
+#: http.c:366
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:1713
+#: http.c:1766
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -13914,7 +14210,7 @@
" demandé : %s\n"
" redirection : %s"
-#: remote-curl.c:319
+#: remote-curl.c:323
#, c-format
msgid "redirecting to %s"
msgstr "redirection vers %s"
@@ -14296,7 +14592,7 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr "La fusion simple a échoué, essai avec la fusion automatique."
-#: git-rebase.sh:57
+#: 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"
@@ -14308,39 +14604,39 @@
"Pour extraire la branche d'origine et stopper le rebasage, lancez \"git "
"rebase --abort\"."
-#: git-rebase.sh:157 git-rebase.sh:396
+#: git-rebase.sh:158 git-rebase.sh:397
#, sh-format
msgid "Could not move back to $head_name"
msgstr "Impossible de revenir à $head_name"
-#: git-rebase.sh:171
+#: git-rebase.sh:172
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "Impossible de stocker $stash_sha1"
-#: git-rebase.sh:211
+#: git-rebase.sh:212
msgid "The pre-rebase hook refused to rebase."
msgstr "Le crochet pre-rebase a refusé de rebaser."
-#: git-rebase.sh:216
+#: git-rebase.sh:217
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr "Il semble que git-am soit en cours. Impossible de rebaser."
-#: git-rebase.sh:357
+#: git-rebase.sh:358
msgid "No rebase in progress?"
msgstr "Pas de rebasage en cours ?"
-#: git-rebase.sh:368
+#: git-rebase.sh:369
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"L'action --edit-todo peut seulement être utilisée lors d'un rebasage "
"interactif."
-#: git-rebase.sh:375
+#: git-rebase.sh:376
msgid "Cannot read HEAD"
msgstr "Impossible de lire HEAD"
-#: git-rebase.sh:378
+#: git-rebase.sh:379
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -14348,7 +14644,7 @@
"Vous devez éditer tous les conflits de fusion et\n"
"les marquer comme résolus avec git add"
-#: git-rebase.sh:418
+#: git-rebase.sh:419
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -14370,102 +14666,102 @@
"chose\n"
"d'important ici."
-#: git-rebase.sh:469
+#: git-rebase.sh:470
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "invalide $upstream_name en amont"
-#: git-rebase.sh:493
+#: git-rebase.sh:494
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name : il y a plus d'une base de fusion"
-#: git-rebase.sh:496 git-rebase.sh:500
+#: git-rebase.sh:497 git-rebase.sh:501
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name : il n'y a pas de base de fusion"
-#: git-rebase.sh:505
+#: git-rebase.sh:506
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "Ne pointe pas sur une validation valide : $onto_name"
-#: git-rebase.sh:528
+#: git-rebase.sh:529
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "fatal : pas de branche : $branch_name"
-#: git-rebase.sh:561
+#: git-rebase.sh:562
msgid "Cannot autostash"
msgstr "Autoremisage impossible"
-#: git-rebase.sh:566
+#: git-rebase.sh:567
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "Autoremisage créé : $stash_abbrev"
-#: git-rebase.sh:570
+#: git-rebase.sh:571
msgid "Please commit or stash them."
msgstr "Veuillez les valider ou les remiser."
-#: git-rebase.sh:590
+#: git-rebase.sh:591
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "La branche courante $branch_name est à jour."
-#: git-rebase.sh:594
+#: git-rebase.sh:595
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "La branche courante $branch_name est à jour, rebasage forcé."
-#: git-rebase.sh:605
+#: git-rebase.sh:606
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Changements de $mb sur $onto :"
-#: git-rebase.sh:614
+#: git-rebase.sh:615
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
"Premièrement, rembobinons head pour rejouer votre travail par-dessus..."
-#: git-rebase.sh:624
+#: git-rebase.sh:625
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "$branch_name mise à jour en avance rapide sur $onto_name."
-#: git-stash.sh:50
+#: git-stash.sh:53
msgid "git stash clear with parameters is unimplemented"
msgstr "git stash clear avec des paramètres n'est pas implémenté"
-#: git-stash.sh:73
+#: git-stash.sh:94
msgid "You do not have the initial commit yet"
msgstr "Vous n'avez pas encore la validation initiale"
-#: git-stash.sh:88
+#: git-stash.sh:109
msgid "Cannot save the current index state"
msgstr "Impossible de sauver l'état courant de l'index"
-#: git-stash.sh:103
+#: git-stash.sh:124
msgid "Cannot save the untracked files"
msgstr "Impossible de sauver les fichiers non-suivis"
-#: git-stash.sh:123 git-stash.sh:136
+#: git-stash.sh:144 git-stash.sh:157
msgid "Cannot save the current worktree state"
msgstr "Impossible de sauver l'état courant de la copie de travail"
-#: git-stash.sh:140
+#: git-stash.sh:161
msgid "No changes selected"
msgstr "Aucun changement sélectionné"
-#: git-stash.sh:143
+#: git-stash.sh:164
msgid "Cannot remove temporary index (can't happen)"
msgstr "Impossible de supprimer l'index temporaire (ne peut pas se produire)"
-#: git-stash.sh:156
+#: git-stash.sh:177
msgid "Cannot record working tree state"
msgstr "Impossible d'enregistrer l'état de la copie de travail"
-#: git-stash.sh:188
+#: git-stash.sh:209
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr "Impossible de mettre à jour $ref_stash avec $w_commit"
@@ -14480,7 +14776,7 @@
#. $ 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:238
+#: git-stash.sh:265
#, sh-format
msgid ""
"error: unknown option for 'stash save': $option\n"
@@ -14489,108 +14785,108 @@
"erreur: option inconnue pour 'stash save': $option\n"
" Pour fournir un message, utilisez git stash save -- '$option'"
-#: git-stash.sh:251
+#: git-stash.sh:278
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:259
+#: git-stash.sh:286
msgid "No local changes to save"
msgstr "Pas de modifications locales à sauver"
-#: git-stash.sh:263
+#: git-stash.sh:291
msgid "Cannot initialize stash"
msgstr "Impossible d'initialiser le remisage"
-#: git-stash.sh:267
+#: git-stash.sh:295
msgid "Cannot save the current status"
msgstr "Impossible de sauver le statut courant"
-#: git-stash.sh:268
+#: git-stash.sh:296
#, 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:285
+#: git-stash.sh:323
msgid "Cannot remove worktree changes"
msgstr "Impossible de supprimer les changements de la copie de travail"
-#: git-stash.sh:403
+#: git-stash.sh:471
#, sh-format
msgid "unknown option: $opt"
msgstr "option inconnue : $opt"
-#: git-stash.sh:416
+#: git-stash.sh:484
msgid "No stash found."
msgstr "Pas de remisage trouvé."
-#: git-stash.sh:423
+#: git-stash.sh:491
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "Trop de révisions spécifiées : $REV"
-#: git-stash.sh:438
+#: git-stash.sh:506
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference n'est pas une référence valide"
-#: git-stash.sh:466
+#: git-stash.sh:534
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' n'est pas une validation de type remisage"
-#: git-stash.sh:477
+#: git-stash.sh:545
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args' n'est pas une référence de remisage"
-#: git-stash.sh:485
+#: git-stash.sh:553
msgid "unable to refresh index"
msgstr "impossible de rafraîchir l'index"
-#: git-stash.sh:489
+#: git-stash.sh:557
msgid "Cannot apply a stash in the middle of a merge"
msgstr "Impossible d'appliquer un remisage en cours de fusion"
-#: git-stash.sh:497
+#: git-stash.sh:565
msgid "Conflicts in index. Try without --index."
msgstr "Conflits dans l'index. Essayez sans --index."
-#: git-stash.sh:499
+#: git-stash.sh:567
msgid "Could not save index tree"
msgstr "Impossible de sauvegarder l'arbre d'index"
-#: git-stash.sh:508
+#: 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:533
+#: git-stash.sh:601
msgid "Cannot unstage modified files"
msgstr "Impossible de désindexer les fichiers modifiés"
-#: git-stash.sh:548
+#: git-stash.sh:616
msgid "Index was not unstashed."
msgstr "L'index n'a pas été sorti de remise."
-#: git-stash.sh:562
+#: 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:571
+#: git-stash.sh:639
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "${REV} supprimé ($s)"
-#: git-stash.sh:572
+#: git-stash.sh:640
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: Impossible de supprimer l'élément de stash"
-#: git-stash.sh:580
+#: git-stash.sh:648
msgid "No branch name specified"
msgstr "Aucune branche spécifiée"
-#: git-stash.sh:652
+#: git-stash.sh:727
msgid "(To restore them type \"git stash apply\")"
msgstr "(Pour les restaurer tapez \"git stash apply\")"
@@ -14680,28 +14976,28 @@
msgid "Failed to register submodule '$sm_path'"
msgstr "Échec d'enregistrement du sous-module '$sm_path'"
-#: git-submodule.sh:327
+#: git-submodule.sh:341
#, sh-format
msgid "Entering '$displaypath'"
msgstr "Entrée dans '$displaypath'"
-#: git-submodule.sh:347
+#: git-submodule.sh:361
#, sh-format
msgid "Stopping at '$displaypath'; script returned non-zero status."
msgstr "Arrêt sur '$displaypath' ; le script a retourné un statut non nul."
-#: git-submodule.sh:418
+#: git-submodule.sh:432
#, sh-format
msgid "pathspec and --all are incompatible"
msgstr "un spécificateur de chemin et --all sont incompatibles"
-#: git-submodule.sh:423
+#: git-submodule.sh:437
#, 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:443
+#: git-submodule.sh:457
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains a .git directory\n"
@@ -14712,7 +15008,7 @@
"(utilisez 'rm -rf' si vous voulez vraiment le supprimer en incluant tout son "
"historique)"
-#: git-submodule.sh:451
+#: git-submodule.sh:465
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
@@ -14721,42 +15017,42 @@
"La copie de travail du sous-module '$displaypath' contient des modifications "
"locales ; utilisez '-f' pour les annuler"
-#: git-submodule.sh:454
+#: git-submodule.sh:468
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "Répertoire '$displaypath' nettoyé"
-#: git-submodule.sh:455
+#: git-submodule.sh:469
#, 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:458
+#: git-submodule.sh:472
#, 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:467
+#: git-submodule.sh:481
#, 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:623
+#: git-submodule.sh:637
#, 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:633
+#: git-submodule.sh:647
#, 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:638
+#: git-submodule.sh:652
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -14765,12 +15061,12 @@
"Impossible de trouver la révision courante ${remote_name}/${branch} dans le "
"chemin de sous-module '$sm_path'"
-#: git-submodule.sh:656
+#: git-submodule.sh:670
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "Impossible de rapatrier dans le chemin de sous-module '$displaypath'"
-#: git-submodule.sh:662
+#: git-submodule.sh:676
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -14779,88 +15075,88 @@
"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:669
+#: git-submodule.sh:683
#, 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:670
+#: git-submodule.sh:684
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Chemin de sous-module '$displaypath' : '$sha1' extrait"
-#: git-submodule.sh:674
+#: git-submodule.sh:688
#, 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:675
+#: git-submodule.sh:689
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Chemin de sous-module '$displaypath' : rebasé dans '$sha1'"
-#: git-submodule.sh:680
+#: git-submodule.sh:694
#, 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:681
+#: git-submodule.sh:695
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Chemin de sous-module '$displaypath' : fusionné dans '$sha1'"
-#: git-submodule.sh:686
+#: git-submodule.sh:700
#, 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:687
+#: git-submodule.sh:701
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Chemin de sous-module '$displaypath' : '$command $sha1'"
-#: git-submodule.sh:718
+#: git-submodule.sh:732
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Échec de parcours dans le chemin du sous-module '$displaypath'"
-#: git-submodule.sh:826
+#: git-submodule.sh:840
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:878
+#: git-submodule.sh:892
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "mode $mod_dst inattendu"
-#: git-submodule.sh:898
+#: git-submodule.sh:912
#, 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:901
+#: git-submodule.sh:915
#, 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:904
+#: git-submodule.sh:918
#, 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:1051
+#: git-submodule.sh:1064
#, 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:1118
+#: git-submodule.sh:1136
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Synchronisation de l'URL sous-module pour '$displaypath'"
@@ -15164,11 +15460,11 @@
msgid "Or you can abort the rebase with 'git rebase --abort'."
msgstr "Ou bien vous pouvez abandonner le rebasage avec 'git rebase --abort'."
-#: git-rebase--interactive.sh:1079
+#: git-rebase--interactive.sh:1083
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "Impossible de supprimer CHERRY_PICK_HEAD"
-#: git-rebase--interactive.sh:1084
+#: git-rebase--interactive.sh:1088
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
@@ -15199,12 +15495,12 @@
"\n"
" git rebase --continue\n"
-#: git-rebase--interactive.sh:1101
+#: git-rebase--interactive.sh:1105
msgid "Error trying to find the author identity to amend commit"
msgstr ""
"Erreur lors de la recherche de l'identité de l'auteur pour corriger le commit"
-#: git-rebase--interactive.sh:1106
+#: git-rebase--interactive.sh:1110
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
@@ -15212,11 +15508,11 @@
"Vous avez des modifications non validées dans votre copie de travail.\n"
"Veuillez les valider d'abord, puis relancer 'git rebase --continue'."
-#: git-rebase--interactive.sh:1111 git-rebase--interactive.sh:1115
+#: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119
msgid "Could not commit staged changes."
msgstr "impossible de valider les modifications indexées."
-#: git-rebase--interactive.sh:1139
+#: git-rebase--interactive.sh:1147
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -15231,40 +15527,40 @@
" git rebase --continue\n"
"\n"
-#: git-rebase--interactive.sh:1147 git-rebase--interactive.sh:1305
+#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313
msgid "Could not execute editor"
msgstr "Impossible de lancer l'éditeur"
-#: git-rebase--interactive.sh:1160
+#: git-rebase--interactive.sh:1168
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "Impossible d'extraire $switch_to"
-#: git-rebase--interactive.sh:1165
+#: git-rebase--interactive.sh:1173
msgid "No HEAD?"
msgstr "Pas de HEAD ?"
-#: git-rebase--interactive.sh:1166
+#: git-rebase--interactive.sh:1174
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "Impossible de créer un répertoire temporaire $state_dir"
-#: git-rebase--interactive.sh:1168
+#: git-rebase--interactive.sh:1176
msgid "Could not mark as interactive"
msgstr "Impossible de marquer comme interactif"
-#: git-rebase--interactive.sh:1178 git-rebase--interactive.sh:1183
+#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191
msgid "Could not init rewritten commits"
msgstr "Impossible d'initialiser les commits réécrits"
-#: git-rebase--interactive.sh:1283
+#: git-rebase--interactive.sh:1291
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
msgstr[0] "Rebasage de $shortrevisions sur $shortonto ($todocount commande)"
msgstr[1] "Rebasage de $shortrevisions sur $shortonto ($todocount commandes)"
-#: git-rebase--interactive.sh:1288
+#: git-rebase--interactive.sh:1296
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -15274,7 +15570,7 @@
"Cependant, si vous effacez tout, le rebasage sera annulé.\n"
"\n"
-#: git-rebase--interactive.sh:1295
+#: git-rebase--interactive.sh:1303
msgid "Note that empty commits are commented out"
msgstr "Veuillez noter que les commits vides sont en commentaire"
@@ -15359,68 +15655,68 @@
msgid "unstaged"
msgstr "non-indexé"
-#: git-add--interactive.perl:297 git-add--interactive.perl:322
+#: git-add--interactive.perl:288 git-add--interactive.perl:313
msgid "binary"
msgstr "binaire"
-#: git-add--interactive.perl:306 git-add--interactive.perl:360
+#: git-add--interactive.perl:297 git-add--interactive.perl:351
msgid "nothing"
msgstr "rien"
-#: git-add--interactive.perl:342 git-add--interactive.perl:357
+#: git-add--interactive.perl:333 git-add--interactive.perl:348
msgid "unchanged"
msgstr "inchangé"
-#: git-add--interactive.perl:653
+#: git-add--interactive.perl:644
#, 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:656
+#: git-add--interactive.perl:647
#, 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:659
+#: git-add--interactive.perl:650
#, 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:662
+#: git-add--interactive.perl:653
#, 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:671
+#: git-add--interactive.perl:662
msgid "Update"
msgstr "Mise à jour"
-#: git-add--interactive.perl:683
+#: git-add--interactive.perl:674
msgid "Revert"
msgstr "Inverser"
-#: git-add--interactive.perl:706
+#: git-add--interactive.perl:697
#, perl-format
msgid "note: %s is untracked now.\n"
msgstr "note : %s n'est plus suivi à présent.\n"
-#: git-add--interactive.perl:717
+#: git-add--interactive.perl:708
msgid "Add untracked"
msgstr "Ajouter un fichier non-suivi"
-#: git-add--interactive.perl:723
+#: git-add--interactive.perl:714
msgid "No untracked files.\n"
msgstr "Aucun Fichier non suivi.\n"
-#: git-add--interactive.perl:1039
+#: git-add--interactive.perl:1030
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
@@ -15428,7 +15724,7 @@
"Si le patch s'applique proprement, la section éditée sera\n"
"immédiatement marquée comme indexée."
-#: git-add--interactive.perl:1042
+#: git-add--interactive.perl:1033
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
@@ -15436,7 +15732,7 @@
"Si le patch s'applique proprement, la section éditée sera\n"
"immédiatement marquée comme remisée."
-#: git-add--interactive.perl:1045
+#: git-add--interactive.perl:1036
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
@@ -15444,7 +15740,7 @@
"Si le patch s'applique proprement, la section éditée sera\n"
"immédiatement marquée comme desindexée."
-#: git-add--interactive.perl:1048 git-add--interactive.perl:1057
+#: git-add--interactive.perl:1039 git-add--interactive.perl:1048
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
@@ -15452,15 +15748,7 @@
"Si le patch s'applique proprement, la section éditée sera\n"
"immediatement marquée comme appliquée."
-#: git-add--interactive.perl:1051
-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"
-
-#: git-add--interactive.perl:1054
+#: git-add--interactive.perl:1042 git-add--interactive.perl:1045
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
@@ -15468,17 +15756,17 @@
"Si le patch s'applique proprement, la section éditée sera\n"
"immediatement marquée comme éliminée."
-#: git-add--interactive.perl:1067
+#: git-add--interactive.perl:1058
#, 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:1068
+#: git-add--interactive.perl:1059
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:1074
+#: git-add--interactive.perl:1065
#, perl-format
msgid ""
"---\n"
@@ -15492,7 +15780,7 @@
"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:1082
+#: git-add--interactive.perl:1073
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"
@@ -15502,7 +15790,7 @@
"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:1096
+#: git-add--interactive.perl:1087
#, 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"
@@ -15513,14 +15801,14 @@
#. 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:1187
+#: git-add--interactive.perl:1178
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:1196
+#: git-add--interactive.perl:1187
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -15534,7 +15822,7 @@
"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:1202
+#: git-add--interactive.perl:1193
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -15548,7 +15836,7 @@
"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:1208
+#: git-add--interactive.perl:1199
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -15562,7 +15850,7 @@
"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:1214
+#: git-add--interactive.perl:1205
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -15576,7 +15864,7 @@
"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:1220
+#: git-add--interactive.perl:1211
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -15590,7 +15878,7 @@
"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:1226
+#: git-add--interactive.perl:1217
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -15604,7 +15892,7 @@
"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:1232
+#: git-add--interactive.perl:1223
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -15618,7 +15906,7 @@
"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:1241
+#: git-add--interactive.perl:1232
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
@@ -15640,209 +15928,209 @@
"e - éditer manuellement la section actuelle\n"
"? - afficher l'aide\n"
-#: git-add--interactive.perl:1272
+#: git-add--interactive.perl:1263
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:1273
+#: git-add--interactive.perl:1264
msgid "Apply them to the worktree anyway? "
msgstr "Les appliquer quand même à l'arbre de travail ? "
-#: git-add--interactive.perl:1276
+#: git-add--interactive.perl:1267
msgid "Nothing was applied.\n"
msgstr "Rien n'a été appliqué.\n"
-#: git-add--interactive.perl:1287
+#: git-add--interactive.perl:1278
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "fichier non-fusionné ignoré : %s\n"
-#: git-add--interactive.perl:1296
+#: git-add--interactive.perl:1287
msgid "Only binary files changed.\n"
msgstr "Seuls des fichiers binaires ont changé.\n"
-#: git-add--interactive.perl:1298
+#: git-add--interactive.perl:1289
msgid "No changes.\n"
msgstr "Aucune modification.\n"
-#: git-add--interactive.perl:1306
+#: git-add--interactive.perl:1297
msgid "Patch update"
msgstr "Mise à jour par patch"
-#: git-add--interactive.perl:1358
+#: git-add--interactive.perl:1349
#, 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:1359
+#: git-add--interactive.perl:1350
#, 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:1360
+#: git-add--interactive.perl:1351
#, 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:1363
+#: git-add--interactive.perl:1354
#, 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:1364
+#: git-add--interactive.perl:1355
#, 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:1365
+#: git-add--interactive.perl:1356
#, 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:1368
+#: git-add--interactive.perl:1359
#, 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:1369
+#: git-add--interactive.perl:1360
#, 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:1370
+#: git-add--interactive.perl:1361
#, 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:1373
+#: git-add--interactive.perl:1364
#, 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:1374
+#: git-add--interactive.perl:1365
#, 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:1375
+#: git-add--interactive.perl:1366
#, 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:1378
+#: git-add--interactive.perl:1369
#, 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:1379
+#: git-add--interactive.perl:1370
#, 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:1380
+#: git-add--interactive.perl:1371
#, 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:1383
+#: git-add--interactive.perl:1374
#, 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:1384
+#: git-add--interactive.perl:1375
#, 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:1385
+#: git-add--interactive.perl:1376
#, 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:1388
+#: git-add--interactive.perl:1379
#, 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:1389
+#: git-add--interactive.perl:1380
#, 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:1390
+#: git-add--interactive.perl:1381
#, 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:1493
+#: git-add--interactive.perl:1484
msgid "go to which hunk (<ret> to see more)? "
msgstr "aller à quelle section (<ret> pour voir plus) ? "
-#: git-add--interactive.perl:1495
+#: git-add--interactive.perl:1486
msgid "go to which hunk? "
msgstr "aller à quelle section ? "
-#: git-add--interactive.perl:1504
+#: git-add--interactive.perl:1495
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "Nombre invalide : '%s'\n"
-#: git-add--interactive.perl:1509
+#: git-add--interactive.perl:1500
#, 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:1535
+#: git-add--interactive.perl:1526
msgid "search for regex? "
msgstr "rechercher la regex ? "
-#: git-add--interactive.perl:1548
+#: git-add--interactive.perl:1539
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "Regex de recherche malformée %s : %s\n"
-#: git-add--interactive.perl:1558
+#: git-add--interactive.perl:1549
msgid "No hunk matches the given pattern\n"
msgstr "Aucune section ne correspond au motif donné\n"
-#: git-add--interactive.perl:1570 git-add--interactive.perl:1592
+#: git-add--interactive.perl:1561 git-add--interactive.perl:1583
msgid "No previous hunk\n"
msgstr "Pas de section précédente\n"
-#: git-add--interactive.perl:1579 git-add--interactive.perl:1598
+#: git-add--interactive.perl:1570 git-add--interactive.perl:1589
msgid "No next hunk\n"
msgstr "Pas de section suivante\n"
-#: git-add--interactive.perl:1606
+#: git-add--interactive.perl:1597
#, 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:1658
+#: git-add--interactive.perl:1649
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:1677
+#: git-add--interactive.perl:1668
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\t - view diff between HEAD and index\n"
+"diff - view diff between HEAD and index\n"
"add untracked - add contents of untracked files to the staged set of "
"changes\n"
msgstr ""
@@ -15851,21 +16139,21 @@
"indexer\n"
"revert - faire revenir les modifications à indexer à la version HEAD\n"
"patch - sélectionner les sections et mettre à jour sélectivement\n"
-"diff\t - visualiser les diff entre HEAD et l'index\n"
-"add untracked - Ajouter les fichiers non-suivis aux modifications à indexer\n"
+"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:1694 git-add--interactive.perl:1699
-#: git-add--interactive.perl:1702 git-add--interactive.perl:1709
-#: git-add--interactive.perl:1713 git-add--interactive.perl:1719
+#: 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
msgid "missing --"
msgstr "-- manquant"
-#: git-add--interactive.perl:1715
+#: git-add--interactive.perl:1706
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "mode de --patch inconnu : %s"
-#: git-add--interactive.perl:1721 git-add--interactive.perl:1727
+#: git-add--interactive.perl:1712 git-add--interactive.perl:1718
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "argument invalide %s, -- attendu"
@@ -16229,6 +16517,93 @@
msgid "Do you really want to send %s? [y|N]: "
msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : "
+#~ msgid "could not stat '%s"
+#~ msgstr "stat impossible de '%s'"
+
+#~ msgid "tag: tagging "
+#~ msgstr "étiquette: étiquetage de "
+
+#~ msgid "object of unknown type"
+#~ msgstr "objet de type inconnu"
+
+#~ msgid "commit object"
+#~ msgstr "objet commit"
+
+#~ msgid "tree object"
+#~ msgstr "objet arbre"
+
+#~ msgid "blob object"
+#~ msgstr "objet blob"
+
+#~ msgid "other tag object"
+#~ msgstr "objet étiquette autre"
+
+#~ msgid ""
+#~ "There is nothing to exclude from by :(exclude) patterns.\n"
+#~ "Perhaps you forgot to add either ':/' or '.' ?"
+#~ msgstr ""
+#~ "Il n'y a rien dont il faut exclure par des motifs :(exclure).\n"
+#~ "Peut-être avez-vous oublié d'ajouter ':/' ou '.' ?"
+
+#~ msgid "unrecognized format: %%(%s)"
+#~ msgstr "format non reconnu %%(%s)"
+
+#~ msgid ":strip= requires a positive integer argument"
+#~ msgstr ":strip= requiert un argument entier positif"
+
+#~ msgid "ref '%s' does not have %ld components to :strip"
+#~ msgstr "la réf '%s' n'a pas %ld composants à :strip"
+
+#~ msgid "unknown %.*s format %s"
+#~ msgstr "format de %.*s inconnu %s"
+
+# féminin pour une branche
+#~ msgid "[%s: gone]"
+#~ msgstr "[%s: disparue]"
+
+#~ msgid "[%s]"
+#~ msgstr "[%s]"
+
+#~ msgid "[%s: behind %d]"
+#~ msgstr "[%s: en retard de %d]"
+
+#~ msgid "[%s: ahead %d]"
+#~ msgstr "[%s : en avance de %d]"
+
+#~ msgid "[%s: ahead %d, behind %d]"
+#~ msgstr "[%s : en avance de %d, en retard de %d]"
+
+#~ msgid " **** invalid ref ****"
+#~ msgstr " **** référence invalide ****"
+
+#~ msgid "insanely long object directory %.*s"
+#~ msgstr "objet répertoire démentiellement long %.*s"
+
+#~ msgid "git merge [<options>] <msg> HEAD <commit>"
+#~ msgstr "git merge [<options>] <message> HEAD <commit>"
+
+#~ msgid "'%s' is not a commit"
+#~ msgstr "'%s' n'est pas une validation"
+
+#~ msgid "cannot open file '%s'"
+#~ msgstr "impossible d'ouvrir le fichier '%s'"
+
+#~ msgid "could not close file %s"
+#~ msgstr "impossible de fermer le fichier %s"
+
+#~ msgid "tag name too long: %.*s..."
+#~ msgstr "nom d'étiquette trop long : %.*s..."
+
+#~ msgid "tag header too big."
+#~ msgstr "en-tête d'étiquette trop gros."
+
+#~ 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"
+
#~ msgid "Use an experimental blank-line-based heuristic to improve diffs"
#~ msgstr ""
#~ "Utiliser une heuristique expérimentale reposant sur les lignes vides pour "
@@ -16780,9 +17155,6 @@
#~ msgid "cannot update HEAD ref"
#~ msgstr "impossible de mettre à jour la référence HEAD"
-#~ msgid "cannot tell cwd"
-#~ msgstr "impossible de déterminer le répertoire de travail courant"
-
#~ msgid "%s: cannot lock the ref"
#~ msgstr "%s : impossible de verrouiller la référence"
diff --git a/po/git.pot b/po/git.pot
index cc0b9c3..db2ff70 100644
--- a/po/git.pot
+++ b/po/git.pot
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-02-18 01:00+0800\n"
+"POT-Creation-Date: 2017-05-05 09:35+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -58,7 +58,7 @@
msgid "Exiting because of an unresolved conflict."
msgstr ""
-#: advice.c:114 builtin/merge.c:1206
+#: advice.c:114 builtin/merge.c:1185
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr ""
@@ -305,7 +305,7 @@
msgid "cannot checkout %s"
msgstr ""
-#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:248
+#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:253
#, c-format
msgid "failed to read %s"
msgstr ""
@@ -428,7 +428,7 @@
msgid "sha1 information is lacking or useless (%s)."
msgstr ""
-#: apply.c:4081 builtin/checkout.c:233 builtin/reset.c:135
+#: apply.c:4081 builtin/checkout.c:252 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr ""
@@ -504,7 +504,7 @@
msgid "truncating .rej filename to %.*s.rej"
msgstr ""
-#: apply.c:4531 builtin/fetch.c:737 builtin/fetch.c:986
+#: apply.c:4531 builtin/fetch.c:739 builtin/fetch.c:988
#, c-format
msgid "cannot open %s"
msgstr ""
@@ -532,160 +532,160 @@
msgid "unable to read index file"
msgstr ""
-#: apply.c:4824
+#: apply.c:4823
#, c-format
msgid "can't open patch '%s': %s"
msgstr ""
-#: apply.c:4849
+#: apply.c:4850
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4855 apply.c:4870
+#: apply.c:4856 apply.c:4871
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4863
+#: apply.c:4864
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4879 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391
+#: apply.c:4880 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391
msgid "Unable to write new index file"
msgstr ""
-#: apply.c:4910 apply.c:4913 builtin/am.c:2277 builtin/am.c:2280
-#: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180
-#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:591
-#: builtin/submodule--helper.c:594 builtin/submodule--helper.c:960
-#: builtin/submodule--helper.c:963 builtin/submodule--helper.c:1104
+#: 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
msgid "path"
msgstr ""
-#: apply.c:4911
+#: apply.c:4912
msgid "don't apply changes matching the given path"
msgstr ""
-#: apply.c:4914
+#: apply.c:4915
msgid "apply changes matching the given path"
msgstr ""
-#: apply.c:4916 builtin/am.c:2286
+#: apply.c:4917 builtin/am.c:2285
msgid "num"
msgstr ""
-#: apply.c:4917
+#: apply.c:4918
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
-#: apply.c:4920
+#: apply.c:4921
msgid "ignore additions made by the patch"
msgstr ""
-#: apply.c:4922
+#: apply.c:4923
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
-#: apply.c:4926
+#: apply.c:4927
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
-#: apply.c:4928
+#: apply.c:4929
msgid "instead of applying the patch, output a summary for the input"
msgstr ""
-#: apply.c:4930
+#: apply.c:4931
msgid "instead of applying the patch, see if the patch is applicable"
msgstr ""
-#: apply.c:4932
+#: apply.c:4933
msgid "make sure the patch is applicable to the current index"
msgstr ""
-#: apply.c:4934
+#: apply.c:4935
msgid "apply a patch without touching the working tree"
msgstr ""
-#: apply.c:4936
+#: apply.c:4937
msgid "accept a patch that touches outside the working area"
msgstr ""
-#: apply.c:4938
+#: apply.c:4939
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
-#: apply.c:4940
+#: apply.c:4941
msgid "attempt three-way merge if a patch does not apply"
msgstr ""
-#: apply.c:4942
+#: apply.c:4943
msgid "build a temporary index based on embedded index information"
msgstr ""
-#: apply.c:4945 builtin/checkout-index.c:169 builtin/ls-files.c:507
+#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:515
msgid "paths are separated with NUL character"
msgstr ""
-#: apply.c:4947
+#: apply.c:4948
msgid "ensure at least <n> lines of context match"
msgstr ""
-#: apply.c:4948 builtin/am.c:2265
+#: apply.c:4949 builtin/am.c:2264
msgid "action"
msgstr ""
-#: apply.c:4949
+#: apply.c:4950
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
-#: apply.c:4952 apply.c:4955
+#: apply.c:4953 apply.c:4956
msgid "ignore changes in whitespace when finding context"
msgstr ""
-#: apply.c:4958
+#: apply.c:4959
msgid "apply the patch in reverse"
msgstr ""
-#: apply.c:4960
+#: apply.c:4961
msgid "don't expect at least one line of context"
msgstr ""
-#: apply.c:4962
+#: apply.c:4963
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr ""
-#: apply.c:4964
+#: apply.c:4965
msgid "allow overlapping hunks"
msgstr ""
-#: apply.c:4965 builtin/add.c:267 builtin/check-ignore.c:19
+#: 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:1860 builtin/mv.c:122 builtin/read-tree.c:114
+#: builtin/log.c:1867 builtin/mv.c:122 builtin/read-tree.c:134
msgid "be verbose"
msgstr ""
-#: apply.c:4967
+#: apply.c:4968
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
-#: apply.c:4970
+#: apply.c:4971
msgid "do not trust the line counts in the hunk headers"
msgstr ""
-#: apply.c:4972 builtin/am.c:2274
+#: apply.c:4973 builtin/am.c:2273
msgid "root"
msgstr ""
-#: apply.c:4973
+#: apply.c:4974
msgid "prepend <root> to all filenames"
msgstr ""
@@ -706,150 +706,155 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr ""
-#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300
+#: archive.c:332 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr ""
-#: archive.c:429
+#: archive.c:417
msgid "fmt"
msgstr ""
-#: archive.c:429
+#: archive.c:417
msgid "archive format"
msgstr ""
-#: archive.c:430 builtin/log.c:1429
+#: archive.c:418 builtin/log.c:1436
msgid "prefix"
msgstr ""
-#: archive.c:431
+#: archive.c:419
msgid "prepend prefix to each pathname in the archive"
msgstr ""
-#: archive.c:432 builtin/blame.c:2607 builtin/blame.c:2608 builtin/config.c:59
-#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1054
-#: builtin/hash-object.c:101 builtin/ls-files.c:541 builtin/ls-files.c:544
-#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109
+#: 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
msgid "file"
msgstr ""
-#: archive.c:433 builtin/archive.c:89
+#: archive.c:421 builtin/archive.c:89
msgid "write the archive to this file"
msgstr ""
-#: archive.c:435
+#: archive.c:423
msgid "read .gitattributes in working directory"
msgstr ""
-#: archive.c:436
+#: archive.c:424
msgid "report archived files on stderr"
msgstr ""
-#: archive.c:437
+#: archive.c:425
msgid "store only"
msgstr ""
-#: archive.c:438
+#: archive.c:426
msgid "compress faster"
msgstr ""
-#: archive.c:446
+#: archive.c:434
msgid "compress better"
msgstr ""
-#: archive.c:449
+#: archive.c:437
msgid "list supported archive formats"
msgstr ""
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88
-#: builtin/submodule--helper.c:603 builtin/submodule--helper.c:969
+#: archive.c:439 builtin/archive.c:90 builtin/clone.c:103 builtin/clone.c:106
+#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
msgid "repo"
msgstr ""
-#: archive.c:452 builtin/archive.c:91
+#: archive.c:440 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr ""
-#: archive.c:453 builtin/archive.c:92 builtin/notes.c:485
+#: archive.c:441 builtin/archive.c:92 builtin/notes.c:485
msgid "command"
msgstr ""
-#: archive.c:454 builtin/archive.c:93
+#: archive.c:442 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr ""
-#: archive.c:461
+#: archive.c:449
msgid "Unexpected option --remote"
msgstr ""
-#: archive.c:463
+#: archive.c:451
msgid "Option --exec can only be used together with --remote"
msgstr ""
-#: archive.c:465
+#: archive.c:453
msgid "Unexpected option --output"
msgstr ""
-#: archive.c:487
+#: archive.c:475
#, c-format
msgid "Unknown archive format '%s'"
msgstr ""
-#: archive.c:494
+#: archive.c:482
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr ""
-#: attr.c:263
+#: attr.c:212
+#, c-format
+msgid "%.*s is not a valid attribute name"
+msgstr ""
+
+#: attr.c:408
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
msgstr ""
-#: bisect.c:441
+#: bisect.c:444
#, c-format
msgid "Could not open file '%s'"
msgstr ""
-#: bisect.c:446
+#: bisect.c:449
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr ""
-#: bisect.c:655
+#: bisect.c:657
#, c-format
msgid "We cannot bisect more!\n"
msgstr ""
-#: bisect.c:708
+#: bisect.c:710
#, c-format
msgid "Not a valid commit name %s"
msgstr ""
-#: bisect.c:732
+#: bisect.c:734
#, c-format
msgid ""
"The merge base %s is bad.\n"
"This means the bug has been fixed between %s and [%s].\n"
msgstr ""
-#: bisect.c:737
+#: bisect.c:739
#, c-format
msgid ""
"The merge base %s is new.\n"
"The property has changed between %s and [%s].\n"
msgstr ""
-#: bisect.c:742
+#: bisect.c:744
#, c-format
msgid ""
"The merge base %s is %s.\n"
"This means the first '%s' commit is between %s and [%s].\n"
msgstr ""
-#: bisect.c:750
+#: bisect.c:752
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -857,7 +862,7 @@
"Maybe you mistook %s and %s revs?\n"
msgstr ""
-#: bisect.c:763
+#: bisect.c:765
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -865,43 +870,43 @@
"We continue anyway."
msgstr ""
-#: bisect.c:798
+#: bisect.c:800
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr ""
-#: bisect.c:849
+#: bisect.c:851
#, c-format
msgid "a %s revision is needed"
msgstr ""
-#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:262
+#: bisect.c:868 builtin/notes.c:174 builtin/tag.c:255
#, c-format
msgid "could not create file '%s'"
msgstr ""
-#: bisect.c:917
+#: bisect.c:919
#, c-format
msgid "could not read file '%s'"
msgstr ""
-#: bisect.c:947
+#: bisect.c:949
msgid "reading bisect refs failed"
msgstr ""
-#: bisect.c:967
+#: bisect.c:969
#, c-format
msgid "%s was both %s and %s\n"
msgstr ""
-#: bisect.c:975
+#: bisect.c:977
#, c-format
msgid ""
"No testable commit found.\n"
"Maybe you started with bad path parameters?\n"
msgstr ""
-#: bisect.c:994
+#: bisect.c:996
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -910,7 +915,7 @@
#. TRANSLATORS: the last %s will be replaced with
#. "(roughly %d steps)" translation
-#: bisect.c:998
+#: bisect.c:1000
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
@@ -1036,7 +1041,7 @@
msgid "'%s' is already checked out at '%s'"
msgstr ""
-#: branch.c:363
+#: branch.c:364
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr ""
@@ -1051,7 +1056,7 @@
msgid "unrecognized header: %s%s (%d)"
msgstr ""
-#: bundle.c:87 sequencer.c:1331 sequencer.c:1752 builtin/commit.c:777
+#: bundle.c:87 sequencer.c:1341 sequencer.c:1767 builtin/commit.c:777
#, c-format
msgid "could not open '%s'"
msgstr ""
@@ -1060,10 +1065,10 @@
msgid "Repository lacks these prerequisite commits:"
msgstr ""
-#: bundle.c:163 ref-filter.c:1499 sequencer.c:1154 sequencer.c:2290
-#: builtin/blame.c:2820 builtin/commit.c:1061 builtin/log.c:348
-#: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909
-#: builtin/merge.c:360 builtin/shortlog.c:177
+#: 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 ""
@@ -1102,7 +1107,7 @@
msgid "ref '%s' is excluded by the rev-list options"
msgstr ""
-#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:282
+#: bundle.c:443 builtin/log.c:170 builtin/log.c:1579 builtin/shortlog.c:281
#, c-format
msgid "unrecognized argument: %s"
msgstr ""
@@ -1125,8 +1130,8 @@
msgid "invalid color value: %.*s"
msgstr ""
-#: commit.c:40 sequencer.c:1564 builtin/am.c:421 builtin/am.c:457
-#: builtin/am.c:1493 builtin/am.c:2127
+#: commit.c:40 sequencer.c:1579 builtin/am.c:419 builtin/am.c:455
+#: builtin/am.c:1489 builtin/am.c:2126
#, c-format
msgid "could not parse %s"
msgstr ""
@@ -1136,7 +1141,7 @@
msgid "%s %s is not a commit!"
msgstr ""
-#: commit.c:1514
+#: commit.c:1511
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
@@ -1147,133 +1152,152 @@
msgid "memory exhausted"
msgstr ""
-#: config.c:518
+#: config.c:191
+msgid "relative config include conditionals must come from files"
+msgstr ""
+
+#: config.c:711
#, c-format
msgid "bad config line %d in blob %s"
msgstr ""
-#: config.c:522
+#: config.c:715
#, c-format
msgid "bad config line %d in file %s"
msgstr ""
-#: config.c:526
+#: config.c:719
#, c-format
msgid "bad config line %d in standard input"
msgstr ""
-#: config.c:530
+#: config.c:723
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr ""
-#: config.c:534
+#: config.c:727
#, c-format
msgid "bad config line %d in command line %s"
msgstr ""
-#: config.c:538
+#: config.c:731
#, c-format
msgid "bad config line %d in %s"
msgstr ""
-#: config.c:657
+#: config.c:859
msgid "out of range"
msgstr ""
-#: config.c:657
+#: config.c:859
msgid "invalid unit"
msgstr ""
-#: config.c:663
+#: config.c:865
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr ""
-#: config.c:668
+#: config.c:870
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr ""
-#: config.c:671
+#: config.c:873
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr ""
-#: config.c:674
+#: config.c:876
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
-#: config.c:677
+#: config.c:879
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
-#: config.c:680
+#: config.c:882
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
-#: config.c:683
+#: config.c:885
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr ""
-#: config.c:770
+#: config.c:980
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr ""
-#: config.c:865 config.c:876
+#: config.c:1075 config.c:1086
#, c-format
msgid "bad zlib compression level %d"
msgstr ""
-#: config.c:993
+#: config.c:1203
#, c-format
msgid "invalid mode for object creation: %s"
msgstr ""
-#: config.c:1149
+#: config.c:1359
#, c-format
msgid "bad pack compression level %d"
msgstr ""
-#: config.c:1339
+#: config.c:1557
msgid "unable to parse command-line config"
msgstr ""
-#: config.c:1389
+#: config.c:1611
msgid "unknown error occurred while reading the configuration files"
msgstr ""
-#: config.c:1743
+#: config.c:1970
+#, c-format
+msgid "Invalid %s: '%s'"
+msgstr ""
+
+#: config.c:1991
+#, c-format
+msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
+msgstr ""
+
+#: config.c:2017
+#, c-format
+msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
+msgstr ""
+
+#: config.c:2028
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr ""
-#: config.c:1745
+#: config.c:2030
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr ""
-#: config.c:1804
+#: config.c:2089
#, c-format
msgid "%s has multiple values"
msgstr ""
-#: config.c:2225 config.c:2450
+#: config.c:2423 config.c:2648
#, c-format
msgid "fstat on %s failed"
msgstr ""
-#: config.c:2343
+#: config.c:2541
#, c-format
msgid "could not set '%s' to '%s'"
msgstr ""
-#: config.c:2345
+#: config.c:2543 builtin/remote.c:774
#, c-format
msgid "could not unset '%s'"
msgstr ""
@@ -1434,225 +1458,250 @@
"%s"
msgstr ""
-#: diff.c:3085
+#: diff.c:3102
#, c-format
msgid "external diff died, stopping at %s"
msgstr ""
-#: diff.c:3411
+#: diff.c:3428
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr ""
-#: diff.c:3501
+#: diff.c:3518
msgid "--follow requires exactly one pathspec"
msgstr ""
-#: diff.c:3664
+#: diff.c:3681
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr ""
-#: diff.c:3678
+#: diff.c:3695
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr ""
-#: diff.c:4696
+#: diff.c:4719
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
-#: diff.c:4699
+#: diff.c:4722
msgid "only found copies from modified paths due to too many files."
msgstr ""
-#: diff.c:4702
+#: diff.c:4725
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr ""
-#: dir.c:1862
+#: dir.c:1899
msgid "failed to get kernel name and information"
msgstr ""
-#: dir.c:1981
+#: dir.c:2018
msgid "Untracked cache is disabled on this system or location."
msgstr ""
-#: dir.c:2759
+#: dir.c:2776 dir.c:2781
+#, c-format
+msgid "could not create directories for %s"
+msgstr ""
+
+#: dir.c:2806
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr ""
-#: fetch-pack.c:213
+#: entry.c:280
+#, c-format
+msgid "could not stat file '%s'"
+msgstr ""
+
+#: fetch-pack.c:249
msgid "git fetch-pack: expected shallow list"
msgstr ""
-#: fetch-pack.c:225
+#: fetch-pack.c:261
msgid "git fetch-pack: expected ACK/NAK, got EOF"
msgstr ""
-#: fetch-pack.c:243
+#: fetch-pack.c:280 builtin/archive.c:63
+#, c-format
+msgid "remote error: %s"
+msgstr ""
+
+#: fetch-pack.c:281
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr ""
-#: fetch-pack.c:295
+#: fetch-pack.c:333
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr ""
-#: fetch-pack.c:381
+#: fetch-pack.c:419
#, c-format
msgid "invalid shallow line: %s"
msgstr ""
-#: fetch-pack.c:387
+#: fetch-pack.c:425
#, c-format
msgid "invalid unshallow line: %s"
msgstr ""
-#: fetch-pack.c:389
+#: fetch-pack.c:427
#, c-format
msgid "object not found: %s"
msgstr ""
-#: fetch-pack.c:392
+#: fetch-pack.c:430
#, c-format
msgid "error in object: %s"
msgstr ""
-#: fetch-pack.c:394
+#: fetch-pack.c:432
#, c-format
msgid "no shallow found: %s"
msgstr ""
-#: fetch-pack.c:397
+#: fetch-pack.c:435
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr ""
-#: fetch-pack.c:436
+#: fetch-pack.c:474
#, c-format
msgid "got %s %d %s"
msgstr ""
-#: fetch-pack.c:450
+#: fetch-pack.c:488
#, c-format
msgid "invalid commit %s"
msgstr ""
-#: fetch-pack.c:483
+#: fetch-pack.c:521
msgid "giving up"
msgstr ""
-#: fetch-pack.c:493 progress.c:235
+#: fetch-pack.c:531 progress.c:235
msgid "done"
msgstr ""
-#: fetch-pack.c:505
+#: fetch-pack.c:543
#, c-format
msgid "got %s (%d) %s"
msgstr ""
-#: fetch-pack.c:551
+#: fetch-pack.c:589
#, c-format
msgid "Marking %s as complete"
msgstr ""
-#: fetch-pack.c:697
+#: fetch-pack.c:737
#, c-format
msgid "already have %s (%s)"
msgstr ""
-#: fetch-pack.c:735
+#: fetch-pack.c:775
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr ""
-#: fetch-pack.c:743
+#: fetch-pack.c:783
msgid "protocol error: bad pack header"
msgstr ""
-#: fetch-pack.c:799
+#: fetch-pack.c:839
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr ""
-#: fetch-pack.c:815
+#: fetch-pack.c:855
#, c-format
msgid "%s failed"
msgstr ""
-#: fetch-pack.c:817
+#: fetch-pack.c:857
msgid "error in sideband demultiplexer"
msgstr ""
-#: fetch-pack.c:844
+#: fetch-pack.c:884
msgid "Server does not support shallow clients"
msgstr ""
-#: fetch-pack.c:848
+#: fetch-pack.c:888
msgid "Server supports multi_ack_detailed"
msgstr ""
-#: fetch-pack.c:851
+#: fetch-pack.c:891
msgid "Server supports no-done"
msgstr ""
-#: fetch-pack.c:857
+#: fetch-pack.c:897
msgid "Server supports multi_ack"
msgstr ""
-#: fetch-pack.c:861
+#: fetch-pack.c:901
msgid "Server supports side-band-64k"
msgstr ""
-#: fetch-pack.c:865
+#: fetch-pack.c:905
msgid "Server supports side-band"
msgstr ""
-#: fetch-pack.c:869
+#: fetch-pack.c:909
msgid "Server supports allow-tip-sha1-in-want"
msgstr ""
-#: fetch-pack.c:873
+#: fetch-pack.c:913
msgid "Server supports allow-reachable-sha1-in-want"
msgstr ""
-#: fetch-pack.c:883
+#: fetch-pack.c:923
msgid "Server supports ofs-delta"
msgstr ""
-#: fetch-pack.c:890
+#: fetch-pack.c:930
#, c-format
msgid "Server version is %.*s"
msgstr ""
-#: fetch-pack.c:896
+#: fetch-pack.c:936
msgid "Server does not support --shallow-since"
msgstr ""
-#: fetch-pack.c:900
+#: fetch-pack.c:940
msgid "Server does not support --shallow-exclude"
msgstr ""
-#: fetch-pack.c:902
+#: fetch-pack.c:942
msgid "Server does not support --deepen"
msgstr ""
-#: fetch-pack.c:913
+#: fetch-pack.c:953
msgid "no common commits"
msgstr ""
-#: fetch-pack.c:925
+#: fetch-pack.c:965
msgid "git fetch-pack: fetch failed."
msgstr ""
-#: fetch-pack.c:1087
+#: fetch-pack.c:1127
msgid "no matching remote head"
msgstr ""
+#: fetch-pack.c:1149
+#, c-format
+msgid "no such remote ref %s"
+msgstr ""
+
+#: fetch-pack.c:1152
+#, c-format
+msgid "Server does not allow request for unadvertised object %s"
+msgstr ""
+
#: gpg-interface.c:185
msgid "gpg failed to sign the data"
msgstr ""
@@ -1671,17 +1720,17 @@
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr ""
-#: grep.c:1794
+#: grep.c:1796
#, c-format
msgid "'%s': unable to read %s"
msgstr ""
-#: grep.c:1811 builtin/clone.c:381 builtin/diff.c:81 builtin/rm.c:133
+#: grep.c:1813 builtin/clone.c:399 builtin/diff.c:81 builtin/rm.c:133
#, c-format
msgid "failed to stat '%s'"
msgstr ""
-#: grep.c:1822
+#: grep.c:1824
#, c-format
msgid "'%s': short read"
msgstr ""
@@ -1742,7 +1791,7 @@
msgid "%s: %s - %s"
msgstr ""
-#: ident.c:334
+#: ident.c:343
msgid ""
"\n"
"*** Please tell me who you are.\n"
@@ -1757,6 +1806,39 @@
"\n"
msgstr ""
+#: ident.c:367
+msgid "no email was given and auto-detection is disabled"
+msgstr ""
+
+#: ident.c:372
+#, c-format
+msgid "unable to auto-detect email address (got '%s')"
+msgstr ""
+
+#: ident.c:382
+msgid "no name was given and auto-detection is disabled"
+msgstr ""
+
+#: ident.c:388
+#, c-format
+msgid "unable to auto-detect name (got '%s')"
+msgstr ""
+
+#: ident.c:396
+#, c-format
+msgid "empty ident name (for <%s>) not allowed"
+msgstr ""
+
+#: ident.c:402
+#, c-format
+msgid "name consists only of disallowed characters: %s"
+msgstr ""
+
+#: ident.c:417 builtin/commit.c:611
+#, c-format
+msgid "invalid date format: %s"
+msgstr ""
+
#: lockfile.c:152
#, c-format
msgid ""
@@ -1778,8 +1860,8 @@
msgid "failed to read the cache"
msgstr ""
-#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374
-#: builtin/checkout.c:588 builtin/clone.c:731
+#: merge.c:96 builtin/am.c:1999 builtin/am.c:2034 builtin/checkout.c:393
+#: builtin/checkout.c:607 builtin/clone.c:749
msgid "unable to write new index file"
msgstr ""
@@ -1849,167 +1931,181 @@
msgid "Unable to add %s to database"
msgstr ""
-#: merge-recursive.c:1088 merge-recursive.c:1102
+#: merge-recursive.c:1092
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"in tree."
msgstr ""
-#: merge-recursive.c:1094 merge-recursive.c:1107
+#: merge-recursive.c:1097
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree."
+msgstr ""
+
+#: merge-recursive.c:1104
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"in tree at %s."
msgstr ""
-#: merge-recursive.c:1150
+#: merge-recursive.c:1109
+#, 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 ""
+
+#: merge-recursive.c:1143
msgid "rename"
msgstr ""
-#: merge-recursive.c:1150
+#: merge-recursive.c:1143
msgid "renamed"
msgstr ""
-#: merge-recursive.c:1207
+#: merge-recursive.c:1200
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr ""
-#: merge-recursive.c:1232
+#: merge-recursive.c:1225
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
"\"->\"%s\" in \"%s\"%s"
msgstr ""
-#: merge-recursive.c:1237
+#: merge-recursive.c:1230
msgid " (left unresolved)"
msgstr ""
-#: merge-recursive.c:1299
+#: merge-recursive.c:1292
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
-#: merge-recursive.c:1332
+#: merge-recursive.c:1325
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr ""
-#: merge-recursive.c:1535
+#: merge-recursive.c:1528
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr ""
-#: merge-recursive.c:1550
+#: merge-recursive.c:1543
#, c-format
msgid "Adding merged %s"
msgstr ""
-#: merge-recursive.c:1557 merge-recursive.c:1771
+#: merge-recursive.c:1550 merge-recursive.c:1780
#, c-format
msgid "Adding as %s instead"
msgstr ""
-#: merge-recursive.c:1614
+#: merge-recursive.c:1607
#, c-format
msgid "cannot read object %s"
msgstr ""
-#: merge-recursive.c:1617
+#: merge-recursive.c:1610
#, c-format
msgid "object %s is not a blob"
msgstr ""
-#: merge-recursive.c:1670
+#: merge-recursive.c:1679
msgid "modify"
msgstr ""
-#: merge-recursive.c:1670
+#: merge-recursive.c:1679
msgid "modified"
msgstr ""
-#: merge-recursive.c:1680
+#: merge-recursive.c:1689
msgid "content"
msgstr ""
-#: merge-recursive.c:1687
+#: merge-recursive.c:1696
msgid "add/add"
msgstr ""
-#: merge-recursive.c:1723
+#: merge-recursive.c:1732
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr ""
-#: merge-recursive.c:1737
+#: merge-recursive.c:1746
#, c-format
msgid "Auto-merging %s"
msgstr ""
-#: merge-recursive.c:1741 git-submodule.sh:930
+#: merge-recursive.c:1750 git-submodule.sh:944
msgid "submodule"
msgstr ""
-#: merge-recursive.c:1742
+#: merge-recursive.c:1751
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr ""
-#: merge-recursive.c:1836
+#: merge-recursive.c:1845
#, c-format
msgid "Removing %s"
msgstr ""
-#: merge-recursive.c:1862
+#: merge-recursive.c:1871
msgid "file/directory"
msgstr ""
-#: merge-recursive.c:1868
+#: merge-recursive.c:1877
msgid "directory/file"
msgstr ""
-#: merge-recursive.c:1874
-#, c-format
-msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
-msgstr ""
-
#: merge-recursive.c:1883
#, c-format
+msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
+msgstr ""
+
+#: merge-recursive.c:1892
+#, c-format
msgid "Adding %s"
msgstr ""
-#: merge-recursive.c:1920
+#: merge-recursive.c:1929
msgid "Already up-to-date!"
msgstr ""
-#: merge-recursive.c:1929
+#: merge-recursive.c:1938
#, c-format
msgid "merging of trees %s and %s failed"
msgstr ""
-#: merge-recursive.c:2012
+#: merge-recursive.c:2021
msgid "Merging:"
msgstr ""
-#: merge-recursive.c:2025
+#: merge-recursive.c:2034
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] ""
msgstr[1] ""
-#: merge-recursive.c:2064
+#: merge-recursive.c:2073
msgid "merge returned no commit"
msgstr ""
-#: merge-recursive.c:2127
+#: merge-recursive.c:2136
#, c-format
msgid "Could not parse object '%s'"
msgstr ""
-#: merge-recursive.c:2141 builtin/merge.c:645 builtin/merge.c:792
+#: merge-recursive.c:2150 builtin/merge.c:645 builtin/merge.c:792
msgid "Unable to write index."
msgstr ""
@@ -2082,255 +2178,373 @@
msgid "malformed object name '%s'"
msgstr ""
-#: path.c:826
+#: path.c:810
#, c-format
msgid "Could not make %s writable by group"
msgstr ""
-#: pathspec.c:142
+#: pathspec.c:125
+msgid "Escape character '\\' not allowed as last character in attr value"
+msgstr ""
+
+#: pathspec.c:143
+msgid "Only one 'attr:' specification is allowed."
+msgstr ""
+
+#: pathspec.c:146
+msgid "attr spec must not be empty"
+msgstr ""
+
+#: pathspec.c:189
+#, c-format
+msgid "invalid attribute name %s"
+msgstr ""
+
+#: pathspec.c:254
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
-#: pathspec.c:149
+#: pathspec.c:261
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
msgstr ""
-#: pathspec.c:188
+#: pathspec.c:301
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr ""
-#: pathspec.c:201
+#: pathspec.c:322
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr ""
-#: pathspec.c:206
+#: pathspec.c:327
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr ""
-#: pathspec.c:238
+#: pathspec.c:365
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr ""
-#: pathspec.c:293 pathspec.c:315
+#: pathspec.c:421 pathspec.c:443
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr ""
-#: pathspec.c:350
+#: pathspec.c:483
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr ""
-#: pathspec.c:363
+#: pathspec.c:496
#, c-format
msgid "%s: '%s' is outside repository"
msgstr ""
-#: pathspec.c:451
+#: pathspec.c:584
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr ""
-#: pathspec.c:461
+#: pathspec.c:594
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr ""
-#: pathspec.c:511
+#: pathspec.c:644
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:535
+#: pathspec.c:668
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr ""
-#: pathspec.c:544
-msgid ""
-"There is nothing to exclude from by :(exclude) patterns.\n"
-"Perhaps you forgot to add either ':/' or '.' ?"
-msgstr ""
-
#: pretty.c:982
msgid "unable to parse --pretty format"
msgstr ""
-#: read-cache.c:1307
+#: read-cache.c:1442
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
"Using version %i"
msgstr ""
-#: read-cache.c:1317
+#: read-cache.c:1452
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
"Using version %i"
msgstr ""
-#: refs.c:576 builtin/merge.c:844
+#: read-cache.c:2375 sequencer.c:1350 sequencer.c:2048
+#, c-format
+msgid "could not stat '%s'"
+msgstr ""
+
+#: read-cache.c:2388
+#, c-format
+msgid "unable to open git dir: %s"
+msgstr ""
+
+#: read-cache.c:2400
+#, c-format
+msgid "unable to unlink: %s"
+msgstr ""
+
+#: refs.c:620 builtin/merge.c:844
#, c-format
msgid "Could not open '%s' for writing"
msgstr ""
-#: refs/files-backend.c:2481
+#: refs.c:1667
+msgid "ref updates forbidden inside quarantine environment"
+msgstr ""
+
+#: refs/files-backend.c:1631
#, c-format
msgid "could not delete reference %s: %s"
msgstr ""
-#: refs/files-backend.c:2484
+#: refs/files-backend.c:1634
#, c-format
msgid "could not delete references: %s"
msgstr ""
-#: refs/files-backend.c:2493
+#: refs/files-backend.c:1643
#, c-format
msgid "could not remove reference %s"
msgstr ""
-#: ref-filter.c:56
+#: ref-filter.c:35 wt-status.c:1780
+msgid "gone"
+msgstr ""
+
+#: ref-filter.c:36
+#, c-format
+msgid "ahead %d"
+msgstr ""
+
+#: ref-filter.c:37
+#, c-format
+msgid "behind %d"
+msgstr ""
+
+#: ref-filter.c:38
+#, c-format
+msgid "ahead %d, behind %d"
+msgstr ""
+
+#: ref-filter.c:104
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr ""
-#: ref-filter.c:58
+#: ref-filter.c:106
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr ""
-#: ref-filter.c:72
+#: ref-filter.c:120
#, c-format
-msgid "unrecognized format: %%(%s)"
+msgid "Integer value expected refname:lstrip=%s"
msgstr ""
-#: ref-filter.c:78
+#: ref-filter.c:124
+#, c-format
+msgid "Integer value expected refname:rstrip=%s"
+msgstr ""
+
+#: ref-filter.c:126
+#, c-format
+msgid "unrecognized %%(%s) argument: %s"
+msgstr ""
+
+#: ref-filter.c:166
#, c-format
msgid "%%(body) does not take arguments"
msgstr ""
-#: ref-filter.c:85
+#: ref-filter.c:173
#, c-format
msgid "%%(subject) does not take arguments"
msgstr ""
-#: ref-filter.c:92
+#: ref-filter.c:180
#, c-format
msgid "%%(trailers) does not take arguments"
msgstr ""
-#: ref-filter.c:111
+#: ref-filter.c:199
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr ""
-#: ref-filter.c:113
+#: ref-filter.c:201
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr ""
-#: ref-filter.c:123
+#: ref-filter.c:214
+#, c-format
+msgid "positive value expected objectname:short=%s"
+msgstr ""
+
+#: ref-filter.c:218
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr ""
-#: ref-filter.c:145
+#: ref-filter.c:245
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr ""
-#: ref-filter.c:157
+#: ref-filter.c:257
#, c-format
msgid "unrecognized position:%s"
msgstr ""
-#: ref-filter.c:161
+#: ref-filter.c:261
#, c-format
msgid "unrecognized width:%s"
msgstr ""
-#: ref-filter.c:167
+#: ref-filter.c:267
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr ""
-#: ref-filter.c:171
+#: ref-filter.c:271
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr ""
-#: ref-filter.c:255
+#: ref-filter.c:286
+#, c-format
+msgid "unrecognized %%(if) argument: %s"
+msgstr ""
+
+#: ref-filter.c:371
#, c-format
msgid "malformed field name: %.*s"
msgstr ""
-#: ref-filter.c:281
+#: ref-filter.c:397
#, c-format
msgid "unknown field name: %.*s"
msgstr ""
-#: ref-filter.c:383
+#: ref-filter.c:501
+#, c-format
+msgid "format: %%(if) atom used without a %%(then) atom"
+msgstr ""
+
+#: ref-filter.c:561
+#, c-format
+msgid "format: %%(then) atom used without an %%(if) atom"
+msgstr ""
+
+#: ref-filter.c:563
+#, c-format
+msgid "format: %%(then) atom used more than once"
+msgstr ""
+
+#: ref-filter.c:565
+#, c-format
+msgid "format: %%(then) atom used after %%(else)"
+msgstr ""
+
+#: ref-filter.c:591
+#, c-format
+msgid "format: %%(else) atom used without an %%(if) atom"
+msgstr ""
+
+#: ref-filter.c:593
+#, c-format
+msgid "format: %%(else) atom used without a %%(then) atom"
+msgstr ""
+
+#: ref-filter.c:595
+#, c-format
+msgid "format: %%(else) atom used more than once"
+msgstr ""
+
+#: ref-filter.c:608
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr ""
-#: ref-filter.c:435
+#: ref-filter.c:663
#, c-format
msgid "malformed format string %s"
msgstr ""
-#: ref-filter.c:898
-msgid ":strip= requires a positive integer argument"
-msgstr ""
-
-#: ref-filter.c:903
+#: ref-filter.c:1247
#, c-format
-msgid "ref '%s' does not have %ld components to :strip"
+msgid "(no branch, rebasing %s)"
msgstr ""
-#: ref-filter.c:1066
+#: ref-filter.c:1250
#, c-format
-msgid "unknown %.*s format %s"
+msgid "(no branch, bisect started on %s)"
msgstr ""
-#: ref-filter.c:1086 ref-filter.c:1117
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached at " in wt-status.c
+#: ref-filter.c:1256
+#, c-format
+msgid "(HEAD detached at %s)"
+msgstr ""
+
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached from " in wt-status.c
+#: ref-filter.c:1261
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr ""
+
+#: ref-filter.c:1265
+msgid "(no branch)"
+msgstr ""
+
+#: ref-filter.c:1420 ref-filter.c:1451
#, c-format
msgid "missing object %s for %s"
msgstr ""
-#: ref-filter.c:1089 ref-filter.c:1120
+#: ref-filter.c:1423 ref-filter.c:1454
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr ""
-#: ref-filter.c:1343
+#: ref-filter.c:1692
#, c-format
msgid "malformed object at '%s'"
msgstr ""
-#: ref-filter.c:1410
+#: ref-filter.c:1759
#, c-format
msgid "ignoring ref with broken name %s"
msgstr ""
-#: ref-filter.c:1415
+#: ref-filter.c:1764
#, c-format
msgid "ignoring broken ref %s"
msgstr ""
-#: ref-filter.c:1670
+#: ref-filter.c:2028
#, c-format
msgid "format: %%(end) atom missing"
msgstr ""
-#: ref-filter.c:1734
+#: ref-filter.c:2109
#, c-format
msgid "malformed object name %s"
msgstr ""
@@ -2470,25 +2684,35 @@
msgid "dup2(%d,%d) failed"
msgstr ""
-#: send-pack.c:297
+#: send-pack.c:150
+#, c-format
+msgid "unable to parse remote unpack status: %s"
+msgstr ""
+
+#: send-pack.c:152
+#, c-format
+msgid "remote unpack failed: %s"
+msgstr ""
+
+#: send-pack.c:315
msgid "failed to sign the push certificate"
msgstr ""
-#: send-pack.c:410
+#: send-pack.c:428
msgid "the receiving end does not support --signed push"
msgstr ""
-#: send-pack.c:412
+#: send-pack.c:430
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
msgstr ""
-#: send-pack.c:424
+#: send-pack.c:442
msgid "the receiving end does not support --atomic push"
msgstr ""
-#: send-pack.c:429
+#: send-pack.c:447
msgid "the receiving end does not support push options"
msgstr ""
@@ -2522,12 +2746,12 @@
"and commit the result with 'git commit'"
msgstr ""
-#: sequencer.c:294 sequencer.c:1667
+#: sequencer.c:294 sequencer.c:1682
#, c-format
msgid "could not lock '%s'"
msgstr ""
-#: sequencer.c:297 sequencer.c:1545 sequencer.c:1672 sequencer.c:1686
+#: sequencer.c:297 sequencer.c:1560 sequencer.c:1687 sequencer.c:1701
#, c-format
msgid "could not write to '%s'"
msgstr ""
@@ -2537,13 +2761,13 @@
msgid "could not write eol to '%s'"
msgstr ""
-#: sequencer.c:305 sequencer.c:1550 sequencer.c:1674
+#: sequencer.c:305 sequencer.c:1565 sequencer.c:1689
#, c-format
msgid "failed to finalize '%s'."
msgstr ""
-#: sequencer.c:329 sequencer.c:808 sequencer.c:1571 builtin/am.c:259
-#: builtin/commit.c:749 builtin/merge.c:1036
+#: sequencer.c:329 sequencer.c:814 sequencer.c:1586 builtin/am.c:257
+#: builtin/commit.c:749 builtin/merge.c:1018
#, c-format
msgid "could not read '%s'"
msgstr ""
@@ -2595,17 +2819,17 @@
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:688
+#: sequencer.c:694
#, c-format
msgid "could not parse commit %s\n"
msgstr ""
-#: sequencer.c:693
+#: sequencer.c:699
#, c-format
msgid "could not parse parent commit %s\n"
msgstr ""
-#: sequencer.c:815
+#: sequencer.c:821
#, c-format
msgid ""
"unexpected 1st line of squash message:\n"
@@ -2613,7 +2837,7 @@
"\t%.*s"
msgstr ""
-#: sequencer.c:821
+#: sequencer.c:827
#, c-format
msgid ""
"invalid 1st line of squash message:\n"
@@ -2621,229 +2845,229 @@
"\t%.*s"
msgstr ""
-#: sequencer.c:827 sequencer.c:852
+#: sequencer.c:833 sequencer.c:858
#, c-format
msgid "This is a combination of %d commits."
msgstr ""
-#: sequencer.c:836
+#: sequencer.c:842
msgid "need a HEAD to fixup"
msgstr ""
-#: sequencer.c:838
+#: sequencer.c:844
msgid "could not read HEAD"
msgstr ""
-#: sequencer.c:840
+#: sequencer.c:846
msgid "could not read HEAD's commit message"
msgstr ""
-#: sequencer.c:846
+#: sequencer.c:852
#, c-format
msgid "cannot write '%s'"
msgstr ""
-#: sequencer.c:855 git-rebase--interactive.sh:445
+#: sequencer.c:861 git-rebase--interactive.sh:445
msgid "This is the 1st commit message:"
msgstr ""
-#: sequencer.c:863
+#: sequencer.c:869
#, c-format
msgid "could not read commit message of %s"
msgstr ""
-#: sequencer.c:870
+#: sequencer.c:876
#, c-format
msgid "This is the commit message #%d:"
msgstr ""
-#: sequencer.c:875
+#: sequencer.c:881
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr ""
-#: sequencer.c:880
+#: sequencer.c:886
#, c-format
msgid "unknown command: %d"
msgstr ""
-#: sequencer.c:946
+#: sequencer.c:952
msgid "your index file is unmerged."
msgstr ""
-#: sequencer.c:964
+#: sequencer.c:970
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr ""
-#: sequencer.c:972
+#: sequencer.c:978
#, c-format
msgid "commit %s does not have parent %d"
msgstr ""
-#: sequencer.c:976
+#: sequencer.c:982
#, c-format
msgid "mainline was specified but commit %s is not a merge."
msgstr ""
-#: sequencer.c:982
+#: sequencer.c:988
#, c-format
msgid "cannot get commit message for %s"
msgstr ""
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1001
+#: sequencer.c:1009
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr ""
-#: sequencer.c:1063 sequencer.c:1812
+#: sequencer.c:1071 sequencer.c:1827
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr ""
-#: sequencer.c:1114
+#: sequencer.c:1122
#, c-format
msgid "could not revert %s... %s"
msgstr ""
-#: sequencer.c:1115
+#: sequencer.c:1123
#, c-format
msgid "could not apply %s... %s"
msgstr ""
-#: sequencer.c:1157
+#: sequencer.c:1165
msgid "empty commit set passed"
msgstr ""
-#: sequencer.c:1167
+#: sequencer.c:1175
#, c-format
msgid "git %s: failed to read the index"
msgstr ""
-#: sequencer.c:1174
+#: sequencer.c:1182
#, c-format
msgid "git %s: failed to refresh the index"
msgstr ""
-#: sequencer.c:1294
+#: sequencer.c:1303
#, c-format
msgid "invalid line %d: %.*s"
msgstr ""
-#: sequencer.c:1302
+#: sequencer.c:1311
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr ""
-#: sequencer.c:1334
+#: sequencer.c:1344
#, c-format
msgid "could not read '%s'."
msgstr ""
-#: sequencer.c:1341
+#: sequencer.c:1356
msgid "please fix this using 'git rebase --edit-todo'."
msgstr ""
-#: sequencer.c:1343
+#: sequencer.c:1358
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr ""
-#: sequencer.c:1348
+#: sequencer.c:1363
msgid "no commits parsed."
msgstr ""
-#: sequencer.c:1359
+#: sequencer.c:1374
msgid "cannot cherry-pick during a revert."
msgstr ""
-#: sequencer.c:1361
+#: sequencer.c:1376
msgid "cannot revert during a cherry-pick."
msgstr ""
-#: sequencer.c:1424
+#: sequencer.c:1439
#, c-format
msgid "invalid key: %s"
msgstr ""
-#: sequencer.c:1427
+#: sequencer.c:1442
#, c-format
msgid "invalid value for %s: %s"
msgstr ""
-#: sequencer.c:1484
+#: sequencer.c:1499
#, c-format
msgid "malformed options sheet: '%s'"
msgstr ""
-#: sequencer.c:1522
+#: sequencer.c:1537
msgid "a cherry-pick or revert is already in progress"
msgstr ""
-#: sequencer.c:1523
+#: sequencer.c:1538
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr ""
-#: sequencer.c:1526
+#: sequencer.c:1541
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr ""
-#: sequencer.c:1540
+#: sequencer.c:1555
msgid "could not lock HEAD"
msgstr ""
-#: sequencer.c:1596 sequencer.c:2150
+#: sequencer.c:1611 sequencer.c:2181
msgid "no cherry-pick or revert in progress"
msgstr ""
-#: sequencer.c:1598
+#: sequencer.c:1613
msgid "cannot resolve HEAD"
msgstr ""
-#: sequencer.c:1600 sequencer.c:1634
+#: sequencer.c:1615 sequencer.c:1649
msgid "cannot abort from a branch yet to be born"
msgstr ""
-#: sequencer.c:1620 builtin/grep.c:904
+#: sequencer.c:1635 builtin/grep.c:910
#, c-format
msgid "cannot open '%s'"
msgstr ""
-#: sequencer.c:1622
+#: sequencer.c:1637
#, c-format
msgid "cannot read '%s': %s"
msgstr ""
-#: sequencer.c:1623
+#: sequencer.c:1638
msgid "unexpected end of file"
msgstr ""
-#: sequencer.c:1629
+#: sequencer.c:1644
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
-#: sequencer.c:1640
+#: sequencer.c:1655
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
-#: sequencer.c:1777 sequencer.c:2049
+#: sequencer.c:1792 sequencer.c:2080
msgid "cannot read HEAD"
msgstr ""
-#: sequencer.c:1817 builtin/difftool.c:574
+#: sequencer.c:1832 builtin/difftool.c:616
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr ""
-#: sequencer.c:1833
+#: sequencer.c:1848
msgid "could not read index"
msgstr ""
-#: sequencer.c:1838
+#: sequencer.c:1853
#, c-format
msgid ""
"execution failed: %s\n"
@@ -2853,11 +3077,11 @@
"\n"
msgstr ""
-#: sequencer.c:1844
+#: sequencer.c:1859
msgid "and made changes to the index and/or the working tree\n"
msgstr ""
-#: sequencer.c:1850
+#: sequencer.c:1865
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -2868,17 +3092,17 @@
"\n"
msgstr ""
-#: sequencer.c:1905 git-rebase.sh:168
+#: sequencer.c:1920 git-rebase.sh:169
#, c-format
msgid "Applied autostash."
msgstr ""
-#: sequencer.c:1917
+#: sequencer.c:1932
#, c-format
msgid "cannot store %s"
msgstr ""
-#: sequencer.c:1919 git-rebase.sh:172
+#: sequencer.c:1934 git-rebase.sh:173
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
@@ -2886,89 +3110,89 @@
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
msgstr ""
-#: sequencer.c:2000
+#: sequencer.c:2016
#, c-format
-msgid "stopped at %s... %.*s"
+msgid "Stopped at %s... %.*s\n"
msgstr ""
-#: sequencer.c:2027
+#: sequencer.c:2058
#, c-format
msgid "unknown command %d"
msgstr ""
-#: sequencer.c:2057
+#: sequencer.c:2088
msgid "could not read orig-head"
msgstr ""
-#: sequencer.c:2061
+#: sequencer.c:2092
msgid "could not read 'onto'"
msgstr ""
-#: sequencer.c:2068
+#: sequencer.c:2099
#, c-format
msgid "could not update %s"
msgstr ""
-#: sequencer.c:2075
+#: sequencer.c:2106
#, c-format
msgid "could not update HEAD to %s"
msgstr ""
-#: sequencer.c:2159
+#: sequencer.c:2190
msgid "cannot rebase: You have unstaged changes."
msgstr ""
-#: sequencer.c:2164
+#: sequencer.c:2195
msgid "could not remove CHERRY_PICK_HEAD"
msgstr ""
-#: sequencer.c:2173
+#: sequencer.c:2204
msgid "cannot amend non-existing commit"
msgstr ""
-#: sequencer.c:2175
+#: sequencer.c:2206
#, c-format
msgid "invalid file: '%s'"
msgstr ""
-#: sequencer.c:2177
+#: sequencer.c:2208
#, c-format
msgid "invalid contents: '%s'"
msgstr ""
-#: sequencer.c:2180
+#: sequencer.c:2211
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"first and then run 'git rebase --continue' again."
msgstr ""
-#: sequencer.c:2190
+#: sequencer.c:2221
msgid "could not commit staged changes."
msgstr ""
-#: sequencer.c:2270
+#: sequencer.c:2301
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr ""
-#: sequencer.c:2274
+#: sequencer.c:2305
#, c-format
msgid "%s: bad revision"
msgstr ""
-#: sequencer.c:2307
+#: sequencer.c:2338
msgid "can't revert as initial commit"
msgstr ""
-#: setup.c:160
+#: setup.c:165
#, 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 ""
-#: setup.c:173
+#: setup.c:178
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -2976,7 +3200,7 @@
"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
-#: setup.c:223
+#: setup.c:228
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
@@ -2984,96 +3208,96 @@
"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
-#: setup.c:470
+#: setup.c:475
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr ""
-#: setup.c:478
+#: setup.c:483
msgid "unknown repository extensions found:"
msgstr ""
-#: setup.c:768
+#: setup.c:776
#, c-format
msgid "Not a git repository (or any of the parent directories): %s"
msgstr ""
-#: setup.c:770 setup.c:922 builtin/index-pack.c:1643
+#: setup.c:778 builtin/index-pack.c:1646
msgid "Cannot come back to cwd"
msgstr ""
-#: setup.c:852
+#: setup.c:1010
msgid "Unable to read current working directory"
msgstr ""
-#: setup.c:927
+#: setup.c:1022 setup.c:1028
+#, c-format
+msgid "Cannot change to '%s'"
+msgstr ""
+
+#: setup.c:1041
#, 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 ""
-#: setup.c:934
-#, c-format
-msgid "Cannot change to '%s/..'"
-msgstr ""
-
-#: setup.c:996
+#: setup.c:1106
#, c-format
msgid ""
"Problem with core.sharedRepository filemode value (0%.3o).\n"
"The owner of files must always have read and write permissions."
msgstr ""
-#: sha1_file.c:490
+#: sha1_file.c:559
#, c-format
msgid "path '%s' does not exist"
msgstr ""
-#: sha1_file.c:516
+#: sha1_file.c:585
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
-#: sha1_file.c:522
+#: sha1_file.c:591
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr ""
-#: sha1_file.c:528
+#: sha1_file.c:597
#, c-format
msgid "reference repository '%s' is shallow"
msgstr ""
-#: sha1_file.c:536
+#: sha1_file.c:605
#, c-format
msgid "reference repository '%s' is grafted"
msgstr ""
-#: sha1_file.c:1176
+#: sha1_file.c:1245
msgid "offset before end of packfile (broken .idx?)"
msgstr ""
-#: sha1_file.c:2637
+#: sha1_file.c:2721
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
-#: sha1_file.c:2641
+#: sha1_file.c:2725
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
-#: sha1_name.c:407
+#: sha1_name.c:409
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr ""
-#: sha1_name.c:418
+#: sha1_name.c:420
msgid "The candidates are:"
msgstr ""
-#: sha1_name.c:578
+#: sha1_name.c:580
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"
@@ -3086,61 +3310,71 @@
"running \"git config advice.objectNameWarning false\""
msgstr ""
-#: submodule.c:65 submodule.c:99
+#: submodule.c:67 submodule.c:101
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
-#: submodule.c:69 submodule.c:103
+#: submodule.c:71 submodule.c:105
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr ""
-#: submodule.c:77
+#: submodule.c:79
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr ""
-#: submodule.c:110
+#: submodule.c:112
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr ""
-#: submodule.c:121
+#: submodule.c:123
msgid "staging updated .gitmodules failed"
msgstr ""
-#: submodule.c:159
+#: submodule.c:161
msgid "negative values not allowed for submodule.fetchJobs"
msgstr ""
-#: submodule.c:1184
+#: submodule.c:1194
#, c-format
-msgid "could not start 'git status in submodule '%s'"
+msgid "'%s' not recognized as a git repository"
msgstr ""
-#: submodule.c:1197
+#: submodule.c:1332
#, c-format
-msgid "could not run 'git status in submodule '%s'"
+msgid "could not start 'git status' in submodule '%s'"
msgstr ""
-#: submodule.c:1398
+#: submodule.c:1345
+#, c-format
+msgid "could not run 'git status' in submodule '%s'"
+msgstr ""
+
+#: submodule.c:1421
+#, c-format
+msgid "submodule '%s' has dirty index"
+msgstr ""
+
+#: submodule.c:1678
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr ""
-#: submodule.c:1410 submodule.c:1471
+#: submodule.c:1690 submodule.c:1746
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr ""
-#: submodule.c:1414 submodule.c:1474 builtin/submodule--helper.c:640
-#: builtin/submodule--helper.c:650
+#: submodule.c:1694 builtin/submodule--helper.c:678
+#: builtin/submodule--helper.c:688
#, c-format
msgid "could not create directory '%s'"
msgstr ""
-#: submodule.c:1420
+#: submodule.c:1697
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -3148,12 +3382,25 @@
"'%s'\n"
msgstr ""
-#: submodule.c:1512
+#: submodule.c:1781
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr ""
-#: submodule-config.c:360
+#: submodule.c:1825
+msgid "could not start ls-files in .."
+msgstr ""
+
+#: submodule.c:1845
+msgid "BUG: returned path string doesn't match cwd?"
+msgstr ""
+
+#: submodule.c:1864
+#, c-format
+msgid "ls-tree returned unexpected return code %d"
+msgstr ""
+
+#: submodule-config.c:380
#, c-format
msgid "invalid value for %s"
msgstr ""
@@ -3222,14 +3469,14 @@
msgid "transport: invalid depth option '%s'"
msgstr ""
-#: transport.c:885
+#: transport.c:889
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"not be found on any remote:\n"
msgstr ""
-#: transport.c:889
+#: transport.c:893
#, c-format
msgid ""
"\n"
@@ -3245,11 +3492,11 @@
"\n"
msgstr ""
-#: transport.c:897
+#: transport.c:901
msgid "Aborting."
msgstr ""
-#: transport-helper.c:1082
+#: transport-helper.c:1080
#, c-format
msgid "Could not read ref %s"
msgstr ""
@@ -3270,98 +3517,98 @@
msgid "too-short tree file"
msgstr ""
-#: unpack-trees.c:99
+#: unpack-trees.c:104
#, 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 ""
-#: unpack-trees.c:101
+#: unpack-trees.c:106
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:104
+#: unpack-trees.c:109
#, 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 ""
-#: unpack-trees.c:106
+#: unpack-trees.c:111
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:109
+#: unpack-trees.c:114
#, 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 ""
-#: unpack-trees.c:111
+#: unpack-trees.c:116
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:116
+#: unpack-trees.c:121
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
"%s"
msgstr ""
-#: unpack-trees.c:120
+#: unpack-trees.c:125
#, 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 ""
-#: unpack-trees.c:122
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%s"
-msgstr ""
-
-#: unpack-trees.c:125
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%sPlease move or remove them before you merge."
-msgstr ""
-
#: unpack-trees.c:127
#, c-format
msgid ""
-"The following untracked working tree files would be removed by merge:\n"
+"The following untracked working tree files would be removed by checkout:\n"
"%%s"
msgstr ""
#: unpack-trees.c:130
#, c-format
msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr ""
+
+#: unpack-trees.c:132
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+
+#: unpack-trees.c:135
+#, c-format
+msgid ""
"The following untracked working tree files would be removed by %s:\n"
"%%sPlease move or remove them before you %s."
msgstr ""
-#: unpack-trees.c:132
+#: unpack-trees.c:137
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:137
+#: unpack-trees.c:142
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -3369,7 +3616,7 @@
"%%sPlease move or remove them before you switch branches."
msgstr ""
-#: unpack-trees.c:139
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -3377,47 +3624,47 @@
"%%s"
msgstr ""
-#: unpack-trees.c:142
+#: unpack-trees.c:147
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"%%sPlease move or remove them before you merge."
msgstr ""
-#: unpack-trees.c:144
+#: unpack-trees.c:149
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:147
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"%%sPlease move or remove them before you %s."
msgstr ""
-#: unpack-trees.c:149
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:156
+#: unpack-trees.c:161
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr ""
-#: unpack-trees.c:159
+#: unpack-trees.c:164
#, c-format
msgid ""
"Cannot update sparse checkout: the following entries are not up-to-date:\n"
"%s"
msgstr ""
-#: unpack-trees.c:161
+#: unpack-trees.c:166
#, c-format
msgid ""
"The following working tree files would be overwritten by sparse checkout "
@@ -3425,7 +3672,7 @@
"%s"
msgstr ""
-#: unpack-trees.c:163
+#: unpack-trees.c:168
#, c-format
msgid ""
"The following working tree files would be removed by sparse checkout "
@@ -3433,45 +3680,57 @@
"%s"
msgstr ""
-#: unpack-trees.c:240
+#: unpack-trees.c:170
+#, c-format
+msgid ""
+"Cannot update submodule:\n"
+"%s"
+msgstr ""
+
+#: unpack-trees.c:247
#, c-format
msgid "Aborting\n"
msgstr ""
-#: unpack-trees.c:270
+#: unpack-trees.c:272
+#, c-format
+msgid "submodule update strategy not supported for submodule '%s'"
+msgstr ""
+
+#: unpack-trees.c:340
msgid "Checking out files"
msgstr ""
-#: urlmatch.c:120
+#: urlmatch.c:163
msgid "invalid URL scheme name or missing '://' suffix"
msgstr ""
-#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
+#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
#, c-format
msgid "invalid %XX escape sequence"
msgstr ""
-#: urlmatch.c:172
+#: urlmatch.c:215
msgid "missing host and scheme is not 'file:'"
msgstr ""
-#: urlmatch.c:189
+#: urlmatch.c:232
msgid "a 'file:' URL may not have a port number"
msgstr ""
-#: urlmatch.c:199
+#: urlmatch.c:247
msgid "invalid characters in host name"
msgstr ""
-#: urlmatch.c:244 urlmatch.c:255
+#: urlmatch.c:292 urlmatch.c:303
msgid "invalid port number"
msgstr ""
-#: urlmatch.c:322
+#: urlmatch.c:371
msgid "invalid '..' path segment"
msgstr ""
-#: worktree.c:282
+#: worktree.c:285
#, c-format
msgid "failed to read '%s'"
msgstr ""
@@ -3486,28 +3745,28 @@
msgid "could not open '%s' for writing"
msgstr ""
-#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759
-#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1033
+#: 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
#, c-format
msgid "could not open '%s' for reading"
msgstr ""
-#: wrapper.c:605 wrapper.c:626
+#: wrapper.c:581 wrapper.c:602
#, c-format
msgid "unable to access '%s'"
msgstr ""
-#: wrapper.c:634
+#: wrapper.c:610
msgid "unable to get current working directory"
msgstr ""
-#: wrapper.c:658
+#: wrapper.c:634
#, c-format
msgid "could not write to %s"
msgstr ""
-#: wrapper.c:660
+#: wrapper.c:636
#, c-format
msgid "could not close %s"
msgstr ""
@@ -3537,11 +3796,11 @@
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr ""
-#: wt-status.c:199 wt-status.c:945
+#: wt-status.c:199 wt-status.c:958
msgid "Changes to be committed:"
msgstr ""
-#: wt-status.c:217 wt-status.c:954
+#: wt-status.c:217 wt-status.c:967
msgid "Changes not staged for commit:"
msgstr ""
@@ -3639,236 +3898,236 @@
msgid "untracked content, "
msgstr ""
-#: wt-status.c:818
+#: wt-status.c:831
msgid "Submodules changed but not updated:"
msgstr ""
-#: wt-status.c:820
+#: wt-status.c:833
msgid "Submodule changes to be committed:"
msgstr ""
-#: wt-status.c:901
+#: wt-status.c:914
msgid ""
"Do not touch the line above.\n"
"Everything below will be removed."
msgstr ""
-#: wt-status.c:1013
+#: wt-status.c:1026
msgid "You have unmerged paths."
msgstr ""
-#: wt-status.c:1016
+#: wt-status.c:1029
msgid " (fix conflicts and run \"git commit\")"
msgstr ""
-#: wt-status.c:1018
+#: wt-status.c:1031
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr ""
-#: wt-status.c:1023
+#: wt-status.c:1036
msgid "All conflicts fixed but you are still merging."
msgstr ""
-#: wt-status.c:1026
+#: wt-status.c:1039
msgid " (use \"git commit\" to conclude merge)"
msgstr ""
-#: wt-status.c:1036
+#: wt-status.c:1049
msgid "You are in the middle of an am session."
msgstr ""
-#: wt-status.c:1039
+#: wt-status.c:1052
msgid "The current patch is empty."
msgstr ""
-#: wt-status.c:1043
+#: wt-status.c:1056
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr ""
-#: wt-status.c:1045
+#: wt-status.c:1058
msgid " (use \"git am --skip\" to skip this patch)"
msgstr ""
-#: wt-status.c:1047
+#: wt-status.c:1060
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
-#: wt-status.c:1176
+#: wt-status.c:1189
msgid "git-rebase-todo is missing."
msgstr ""
-#: wt-status.c:1178
+#: wt-status.c:1191
msgid "No commands done."
msgstr ""
-#: wt-status.c:1181
+#: wt-status.c:1194
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] ""
msgstr[1] ""
-#: wt-status.c:1192
+#: wt-status.c:1205
#, c-format
msgid " (see more in file %s)"
msgstr ""
-#: wt-status.c:1197
+#: wt-status.c:1210
msgid "No commands remaining."
msgstr ""
-#: wt-status.c:1200
+#: wt-status.c:1213
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
msgstr[0] ""
msgstr[1] ""
-#: wt-status.c:1208
+#: wt-status.c:1221
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr ""
-#: wt-status.c:1221
+#: wt-status.c:1234
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr ""
-#: wt-status.c:1226
+#: wt-status.c:1239
msgid "You are currently rebasing."
msgstr ""
-#: wt-status.c:1240
+#: wt-status.c:1253
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:1242
+#: wt-status.c:1255
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr ""
-#: wt-status.c:1244
+#: wt-status.c:1257
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
-#: wt-status.c:1250
+#: wt-status.c:1263
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:1254
+#: wt-status.c:1267
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: wt-status.c:1259
+#: wt-status.c:1272
msgid "You are currently splitting a commit during a rebase."
msgstr ""
-#: wt-status.c:1262
+#: wt-status.c:1275
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:1266
+#: wt-status.c:1279
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: wt-status.c:1271
+#: wt-status.c:1284
msgid "You are currently editing a commit during a rebase."
msgstr ""
-#: wt-status.c:1274
+#: wt-status.c:1287
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
-#: wt-status.c:1276
+#: wt-status.c:1289
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
-#: wt-status.c:1286
+#: wt-status.c:1299
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr ""
-#: wt-status.c:1291
+#: wt-status.c:1304
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr ""
-#: wt-status.c:1294
+#: wt-status.c:1307
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
-#: wt-status.c:1296
+#: wt-status.c:1309
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
-#: wt-status.c:1305
+#: wt-status.c:1318
#, c-format
msgid "You are currently reverting commit %s."
msgstr ""
-#: wt-status.c:1310
+#: wt-status.c:1323
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr ""
-#: wt-status.c:1313
+#: wt-status.c:1326
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
-#: wt-status.c:1315
+#: wt-status.c:1328
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
-#: wt-status.c:1326
+#: wt-status.c:1339
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr ""
-#: wt-status.c:1330
+#: wt-status.c:1343
msgid "You are currently bisecting."
msgstr ""
-#: wt-status.c:1333
+#: wt-status.c:1346
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
-#: wt-status.c:1530
+#: wt-status.c:1543
msgid "On branch "
msgstr ""
-#: wt-status.c:1536
+#: wt-status.c:1549
msgid "interactive rebase in progress; onto "
msgstr ""
-#: wt-status.c:1538
+#: wt-status.c:1551
msgid "rebase in progress; onto "
msgstr ""
-#: wt-status.c:1543
+#: wt-status.c:1556
msgid "HEAD detached at "
msgstr ""
-#: wt-status.c:1545
+#: wt-status.c:1558
msgid "HEAD detached from "
msgstr ""
-#: wt-status.c:1548
+#: wt-status.c:1561
msgid "Not currently on any branch."
msgstr ""
-#: wt-status.c:1566
+#: wt-status.c:1579
msgid "Initial commit"
msgstr ""
-#: wt-status.c:1580
+#: wt-status.c:1593
msgid "Untracked files"
msgstr ""
-#: wt-status.c:1582
+#: wt-status.c:1595
msgid "Ignored files"
msgstr ""
-#: wt-status.c:1586
+#: wt-status.c:1599
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -3876,97 +4135,93 @@
"new files yourself (see 'git help status')."
msgstr ""
-#: wt-status.c:1592
+#: wt-status.c:1605
#, c-format
msgid "Untracked files not listed%s"
msgstr ""
-#: wt-status.c:1594
+#: wt-status.c:1607
msgid " (use -u option to show untracked files)"
msgstr ""
-#: wt-status.c:1600
+#: wt-status.c:1613
msgid "No changes"
msgstr ""
-#: wt-status.c:1605
+#: wt-status.c:1618
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
-#: wt-status.c:1608
+#: wt-status.c:1621
#, c-format
msgid "no changes added to commit\n"
msgstr ""
-#: wt-status.c:1611
+#: wt-status.c:1624
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr ""
-#: wt-status.c:1614
+#: wt-status.c:1627
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr ""
-#: wt-status.c:1617
+#: wt-status.c:1630
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
-#: wt-status.c:1620 wt-status.c:1625
+#: wt-status.c:1633 wt-status.c:1638
#, c-format
msgid "nothing to commit\n"
msgstr ""
-#: wt-status.c:1623
+#: wt-status.c:1636
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
-#: wt-status.c:1627
+#: wt-status.c:1640
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr ""
-#: wt-status.c:1734
+#: wt-status.c:1749
msgid "Initial commit on "
msgstr ""
-#: wt-status.c:1738
+#: wt-status.c:1753
msgid "HEAD (no branch)"
msgstr ""
-#: wt-status.c:1767
-msgid "gone"
-msgstr ""
-
-#: wt-status.c:1769 wt-status.c:1777
+#: wt-status.c:1782 wt-status.c:1790
msgid "behind "
msgstr ""
-#: wt-status.c:1772 wt-status.c:1775
+#: wt-status.c:1785 wt-status.c:1788
msgid "ahead "
msgstr ""
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2277
+#: wt-status.c:2280
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr ""
-#: wt-status.c:2283
+#: wt-status.c:2286
msgid "additionally, your index contains uncommitted changes."
msgstr ""
-#: wt-status.c:2285
+#: wt-status.c:2288
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr ""
-#: compat/precompose_utf8.c:57 builtin/clone.c:414
+#: compat/precompose_utf8.c:57 builtin/clone.c:432
#, c-format
msgid "failed to unlink '%s'"
msgstr ""
@@ -3993,7 +4248,7 @@
msgid "Unstaged changes after refreshing the index:"
msgstr ""
-#: builtin/add.c:209 builtin/rev-parse.c:845
+#: builtin/add.c:209 builtin/rev-parse.c:872
msgid "Could not read the index"
msgstr ""
@@ -4028,9 +4283,9 @@
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
-#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:123
+#: 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:1326 builtin/rm.c:241 builtin/send-pack.c:162
+#: builtin/remote.c:1328 builtin/rm.c:241 builtin/send-pack.c:163
msgid "dry run"
msgstr ""
@@ -4038,7 +4293,7 @@
msgid "interactive picking"
msgstr ""
-#: builtin/add.c:270 builtin/checkout.c:1159 builtin/reset.c:286
+#: builtin/add.c:270 builtin/checkout.c:1177 builtin/reset.c:286
msgid "select hunks interactively"
msgstr ""
@@ -4078,11 +4333,11 @@
msgid "check if - even missing - files are ignored in dry run"
msgstr ""
-#: builtin/add.c:283 builtin/update-index.c:947
+#: builtin/add.c:283 builtin/update-index.c:951
msgid "(+/-)x"
msgstr ""
-#: builtin/add.c:283 builtin/update-index.c:948
+#: builtin/add.c:283 builtin/update-index.c:952
msgid "override the executable bit of the listed files"
msgstr ""
@@ -4118,148 +4373,148 @@
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr ""
-#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279
-#: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350
+#: 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/submodule--helper.c:244
msgid "index file corrupt"
msgstr ""
-#: builtin/am.c:414
+#: builtin/am.c:412
msgid "could not parse author script"
msgstr ""
-#: builtin/am.c:491
+#: builtin/am.c:489
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr ""
-#: builtin/am.c:532
+#: builtin/am.c:530
#, c-format
msgid "Malformed input line: '%s'."
msgstr ""
-#: builtin/am.c:569
+#: builtin/am.c:567
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr ""
-#: builtin/am.c:595
+#: builtin/am.c:593
msgid "fseek failed"
msgstr ""
-#: builtin/am.c:775
+#: builtin/am.c:777
#, c-format
msgid "could not parse patch '%s'"
msgstr ""
-#: builtin/am.c:840
+#: builtin/am.c:842
msgid "Only one StGIT patch series can be applied at once"
msgstr ""
-#: builtin/am.c:887
+#: builtin/am.c:889
msgid "invalid timestamp"
msgstr ""
-#: builtin/am.c:890 builtin/am.c:898
+#: builtin/am.c:892 builtin/am.c:900
msgid "invalid Date line"
msgstr ""
-#: builtin/am.c:895
+#: builtin/am.c:897
msgid "invalid timezone offset"
msgstr ""
-#: builtin/am.c:984
+#: builtin/am.c:986
msgid "Patch format detection failed."
msgstr ""
-#: builtin/am.c:989 builtin/clone.c:379
+#: builtin/am.c:991 builtin/clone.c:397
#, c-format
msgid "failed to create directory '%s'"
msgstr ""
-#: builtin/am.c:993
+#: builtin/am.c:995
msgid "Failed to split patches."
msgstr ""
-#: builtin/am.c:1125 builtin/commit.c:376
+#: builtin/am.c:1127 builtin/commit.c:376
msgid "unable to write index file"
msgstr ""
-#: builtin/am.c:1176
-#, c-format
-msgid "When you have resolved this problem, run \"%s --continue\"."
-msgstr ""
-
-#: builtin/am.c:1177
-#, c-format
-msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
-msgstr ""
-
#: builtin/am.c:1178
#, c-format
+msgid "When you have resolved this problem, run \"%s --continue\"."
+msgstr ""
+
+#: builtin/am.c:1179
+#, c-format
+msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
+msgstr ""
+
+#: builtin/am.c:1180
+#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
-#: builtin/am.c:1316
+#: builtin/am.c:1315
msgid "Patch is empty. Was it split wrong?"
msgstr ""
-#: builtin/am.c:1390 builtin/log.c:1550
+#: builtin/am.c:1386 builtin/log.c:1557
#, c-format
msgid "invalid ident line: %s"
msgstr ""
-#: builtin/am.c:1417
+#: builtin/am.c:1413
#, c-format
msgid "unable to parse commit %s"
msgstr ""
-#: builtin/am.c:1610
+#: builtin/am.c:1606
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
-#: builtin/am.c:1612
+#: builtin/am.c:1608
msgid "Using index info to reconstruct a base tree..."
msgstr ""
-#: builtin/am.c:1631
+#: builtin/am.c:1627
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
msgstr ""
-#: builtin/am.c:1637
+#: builtin/am.c:1633
msgid "Falling back to patching base and 3-way merge..."
msgstr ""
-#: builtin/am.c:1662
+#: builtin/am.c:1658
msgid "Failed to merge in the changes."
msgstr ""
-#: builtin/am.c:1686 builtin/merge.c:632
+#: builtin/am.c:1682 builtin/merge.c:631
msgid "git write-tree failed to write a tree"
msgstr ""
-#: builtin/am.c:1693
+#: builtin/am.c:1689
msgid "applying to an empty history"
msgstr ""
-#: builtin/am.c:1706 builtin/commit.c:1764 builtin/merge.c:802
+#: builtin/am.c:1702 builtin/commit.c:1764 builtin/merge.c:802
#: builtin/merge.c:827
msgid "failed to write commit object"
msgstr ""
-#: builtin/am.c:1739 builtin/am.c:1743
+#: builtin/am.c:1735 builtin/am.c:1739
#, c-format
msgid "cannot resume: %s does not exist."
msgstr ""
-#: builtin/am.c:1759
+#: builtin/am.c:1755
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
-#: builtin/am.c:1764
+#: builtin/am.c:1760
msgid "Commit Body is:"
msgstr ""
@@ -4267,212 +4522,212 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1774
+#: builtin/am.c:1770
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
-#: builtin/am.c:1824
+#: builtin/am.c:1820
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr ""
-#: builtin/am.c:1861 builtin/am.c:1933
+#: builtin/am.c:1860 builtin/am.c:1932
#, c-format
msgid "Applying: %.*s"
msgstr ""
-#: builtin/am.c:1877
+#: builtin/am.c:1876
msgid "No changes -- Patch already applied."
msgstr ""
-#: builtin/am.c:1885
+#: builtin/am.c:1884
#, c-format
msgid "Patch failed at %s %.*s"
msgstr ""
-#: builtin/am.c:1891
+#: builtin/am.c:1890
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr ""
-#: builtin/am.c:1936
+#: builtin/am.c:1935
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 ""
-#: builtin/am.c:1943
+#: builtin/am.c:1942
msgid ""
"You still have unmerged paths in your index.\n"
"Did you forget to use 'git add'?"
msgstr ""
-#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308
+#: builtin/am.c:2050 builtin/am.c:2054 builtin/am.c:2066 builtin/reset.c:308
#: builtin/reset.c:316
#, c-format
msgid "Could not parse object '%s'."
msgstr ""
-#: builtin/am.c:2103
+#: builtin/am.c:2102
msgid "failed to clean index"
msgstr ""
-#: builtin/am.c:2137
+#: builtin/am.c:2136
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr ""
-#: builtin/am.c:2200
+#: builtin/am.c:2199
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr ""
-#: builtin/am.c:2233
+#: builtin/am.c:2232
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr ""
-#: builtin/am.c:2234
+#: builtin/am.c:2233
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr ""
-#: builtin/am.c:2240
+#: builtin/am.c:2239
msgid "run interactively"
msgstr ""
-#: builtin/am.c:2242
+#: builtin/am.c:2241
msgid "historical option -- no-op"
msgstr ""
-#: builtin/am.c:2244
+#: builtin/am.c:2243
msgid "allow fall back on 3way merging if needed"
msgstr ""
-#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57
+#: builtin/am.c:2244 builtin/init-db.c:483 builtin/prune-packed.c:57
#: builtin/repack.c:178
msgid "be quiet"
msgstr ""
-#: builtin/am.c:2247
+#: builtin/am.c:2246
msgid "add a Signed-off-by line to the commit message"
msgstr ""
-#: builtin/am.c:2250
+#: builtin/am.c:2249
msgid "recode into utf8 (default)"
msgstr ""
-#: builtin/am.c:2252
+#: builtin/am.c:2251
msgid "pass -k flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2254
+#: builtin/am.c:2253
msgid "pass -b flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2256
+#: builtin/am.c:2255
msgid "pass -m flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2258
+#: builtin/am.c:2257
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr ""
-#: builtin/am.c:2261
+#: builtin/am.c:2260
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
-#: builtin/am.c:2264
+#: builtin/am.c:2263
msgid "strip everything before a scissors line"
msgstr ""
-#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
-#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287
-#: builtin/am.c:2293
+#: 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
msgid "pass it through git-apply"
msgstr ""
-#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
-#: builtin/grep.c:1038 builtin/merge.c:202 builtin/pull.c:135
+#: 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:644 builtin/show-ref.c:169 builtin/tag.c:355
+#: 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
msgid "n"
msgstr ""
-#: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438
-#: builtin/tag.c:387 builtin/verify-tag.c:38
+#: 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
msgid "format"
msgstr ""
-#: builtin/am.c:2290
+#: builtin/am.c:2289
msgid "format the patch(es) are in"
msgstr ""
-#: builtin/am.c:2296
+#: builtin/am.c:2295
msgid "override error message when patch failure occurs"
msgstr ""
-#: builtin/am.c:2298
+#: builtin/am.c:2297
msgid "continue applying patches after resolving a conflict"
msgstr ""
-#: builtin/am.c:2301
+#: builtin/am.c:2300
msgid "synonyms for --continue"
msgstr ""
-#: builtin/am.c:2304
+#: builtin/am.c:2303
msgid "skip the current patch"
msgstr ""
-#: builtin/am.c:2307
+#: builtin/am.c:2306
msgid "restore the original branch and abort the patching operation."
msgstr ""
-#: builtin/am.c:2311
+#: builtin/am.c:2310
msgid "lie about committer date"
msgstr ""
-#: builtin/am.c:2313
+#: builtin/am.c:2312
msgid "use current timestamp for author date"
msgstr ""
-#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:233
-#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:370
+#: builtin/am.c:2314 builtin/commit.c:1600 builtin/merge.c:232
+#: builtin/pull.c:165 builtin/revert.c:111 builtin/tag.c:413
msgid "key-id"
msgstr ""
-#: builtin/am.c:2316
+#: builtin/am.c:2315
msgid "GPG-sign commits"
msgstr ""
-#: builtin/am.c:2319
+#: builtin/am.c:2318
msgid "(internal use for git-rebase)"
msgstr ""
-#: builtin/am.c:2334
+#: builtin/am.c:2333
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 ""
-#: builtin/am.c:2341
+#: builtin/am.c:2340
msgid "failed to read the index"
msgstr ""
-#: builtin/am.c:2356
+#: builtin/am.c:2355
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
-#: builtin/am.c:2380
+#: builtin/am.c:2379
#, c-format
msgid ""
"Stray %s directory found.\n"
"Use \"git am --abort\" to remove it."
msgstr ""
-#: builtin/am.c:2386
+#: builtin/am.c:2385
msgid "Resolve operation not in progress, we are not resuming."
msgstr ""
@@ -4502,11 +4757,6 @@
msgid "git archive: NACK %s"
msgstr ""
-#: builtin/archive.c:63
-#, c-format
-msgid "remote error: %s"
-msgstr ""
-
#: builtin/archive.c:64
msgid "git archive: protocol error"
msgstr ""
@@ -4535,111 +4785,111 @@
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr ""
-#: builtin/blame.c:1786
+#: builtin/blame.c:1777
msgid "Blaming lines"
msgstr ""
-#: builtin/blame.c:2582
+#: builtin/blame.c:2573
msgid "Show blame entries as we find them, incrementally"
msgstr ""
-#: builtin/blame.c:2583
+#: builtin/blame.c:2574
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
-#: builtin/blame.c:2584
+#: builtin/blame.c:2575
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
-#: builtin/blame.c:2585
+#: builtin/blame.c:2576
msgid "Show work cost statistics"
msgstr ""
-#: builtin/blame.c:2586
+#: builtin/blame.c:2577
msgid "Force progress reporting"
msgstr ""
-#: builtin/blame.c:2587
+#: builtin/blame.c:2578
msgid "Show output score for blame entries"
msgstr ""
-#: builtin/blame.c:2588
+#: builtin/blame.c:2579
msgid "Show original filename (Default: auto)"
msgstr ""
-#: builtin/blame.c:2589
+#: builtin/blame.c:2580
msgid "Show original linenumber (Default: off)"
msgstr ""
-#: builtin/blame.c:2590
+#: builtin/blame.c:2581
msgid "Show in a format designed for machine consumption"
msgstr ""
-#: builtin/blame.c:2591
+#: builtin/blame.c:2582
msgid "Show porcelain format with per-line commit information"
msgstr ""
-#: builtin/blame.c:2592
+#: builtin/blame.c:2583
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
-#: builtin/blame.c:2593
+#: builtin/blame.c:2584
msgid "Show raw timestamp (Default: off)"
msgstr ""
-#: builtin/blame.c:2594
+#: builtin/blame.c:2585
msgid "Show long commit SHA1 (Default: off)"
msgstr ""
-#: builtin/blame.c:2595
+#: builtin/blame.c:2586
msgid "Suppress author name and timestamp (Default: off)"
msgstr ""
-#: builtin/blame.c:2596
+#: builtin/blame.c:2587
msgid "Show author email instead of name (Default: off)"
msgstr ""
-#: builtin/blame.c:2597
+#: builtin/blame.c:2588
msgid "Ignore whitespace differences"
msgstr ""
-#: builtin/blame.c:2604
+#: builtin/blame.c:2595
msgid "Use an experimental heuristic to improve diffs"
msgstr ""
-#: builtin/blame.c:2606
+#: builtin/blame.c:2597
msgid "Spend extra cycles to find better match"
msgstr ""
-#: builtin/blame.c:2607
+#: builtin/blame.c:2598
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr ""
-#: builtin/blame.c:2608
+#: builtin/blame.c:2599
msgid "Use <file>'s contents as the final image"
msgstr ""
-#: builtin/blame.c:2609 builtin/blame.c:2610
+#: builtin/blame.c:2600 builtin/blame.c:2601
msgid "score"
msgstr ""
-#: builtin/blame.c:2609
+#: builtin/blame.c:2600
msgid "Find line copies within and across files"
msgstr ""
-#: builtin/blame.c:2610
+#: builtin/blame.c:2601
msgid "Find line movements within and across files"
msgstr ""
-#: builtin/blame.c:2611
+#: builtin/blame.c:2602
msgid "n,m"
msgstr ""
-#: builtin/blame.c:2611
+#: builtin/blame.c:2602
msgid "Process only line range n,m, counting from 1"
msgstr ""
-#: builtin/blame.c:2658
+#: builtin/blame.c:2649
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
@@ -4649,38 +4899,38 @@
#. 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:2706
+#: builtin/blame.c:2697
msgid "4 years, 11 months ago"
msgstr ""
-#: builtin/blame.c:2786
+#: builtin/blame.c:2777
msgid "--contents and --reverse do not blend well."
msgstr ""
-#: builtin/blame.c:2806
+#: builtin/blame.c:2797
msgid "cannot use --contents with final commit object name"
msgstr ""
-#: builtin/blame.c:2811
+#: builtin/blame.c:2802
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
-#: builtin/blame.c:2838
+#: builtin/blame.c:2829
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
-#: builtin/blame.c:2849
+#: builtin/blame.c:2840
#, c-format
msgid "no such path %s in %s"
msgstr ""
-#: builtin/blame.c:2860
+#: builtin/blame.c:2851
#, c-format
msgid "cannot read blob %s for path %s"
msgstr ""
-#: builtin/blame.c:2879
+#: builtin/blame.c:2870
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
@@ -4707,189 +4957,121 @@
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr ""
-#: builtin/branch.c:143
+#: builtin/branch.c:31
+msgid "git branch [<options>] [-r | -a] [--format]"
+msgstr ""
+
+#: builtin/branch.c:144
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
" '%s', but not yet merged to HEAD."
msgstr ""
-#: builtin/branch.c:147
+#: builtin/branch.c:148
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
" '%s', even though it is merged to HEAD."
msgstr ""
-#: builtin/branch.c:161
+#: builtin/branch.c:162
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr ""
-#: builtin/branch.c:165
+#: builtin/branch.c:166
#, 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 ""
-#: builtin/branch.c:178
+#: builtin/branch.c:179
msgid "Update of config-file failed"
msgstr ""
-#: builtin/branch.c:206
+#: builtin/branch.c:210
msgid "cannot use -a with -d"
msgstr ""
-#: builtin/branch.c:212
+#: builtin/branch.c:216
msgid "Couldn't look up commit object for HEAD"
msgstr ""
-#: builtin/branch.c:226
+#: builtin/branch.c:230
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr ""
-#: builtin/branch.c:241
+#: builtin/branch.c:245
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr ""
-#: builtin/branch.c:242
+#: builtin/branch.c:246
#, c-format
msgid "branch '%s' not found."
msgstr ""
-#: builtin/branch.c:257
+#: builtin/branch.c:261
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr ""
-#: builtin/branch.c:258
+#: builtin/branch.c:262
#, c-format
msgid "Error deleting branch '%s'"
msgstr ""
-#: builtin/branch.c:265
+#: builtin/branch.c:269
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr ""
-#: builtin/branch.c:266
+#: builtin/branch.c:270
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr ""
-#: builtin/branch.c:312
-#, c-format
-msgid "[%s: gone]"
-msgstr ""
-
-#: builtin/branch.c:317
-#, c-format
-msgid "[%s]"
-msgstr ""
-
-#: builtin/branch.c:322
-#, c-format
-msgid "[%s: behind %d]"
-msgstr ""
-
-#: builtin/branch.c:324
-#, c-format
-msgid "[behind %d]"
-msgstr ""
-
-#: builtin/branch.c:328
-#, c-format
-msgid "[%s: ahead %d]"
-msgstr ""
-
-#: builtin/branch.c:330
-#, c-format
-msgid "[ahead %d]"
-msgstr ""
-
-#: builtin/branch.c:333
-#, c-format
-msgid "[%s: ahead %d, behind %d]"
-msgstr ""
-
-#: builtin/branch.c:336
-#, c-format
-msgid "[ahead %d, behind %d]"
-msgstr ""
-
-#: builtin/branch.c:349
-msgid " **** invalid ref ****"
-msgstr ""
-
-#: builtin/branch.c:375
-#, c-format
-msgid "(no branch, rebasing %s)"
-msgstr ""
-
-#: builtin/branch.c:378
-#, c-format
-msgid "(no branch, bisect started on %s)"
-msgstr ""
-
-#. TRANSLATORS: make sure this matches
-#. "HEAD detached at " in wt-status.c
-#: builtin/branch.c:384
-#, c-format
-msgid "(HEAD detached at %s)"
-msgstr ""
-
-#. TRANSLATORS: make sure this matches
-#. "HEAD detached from " in wt-status.c
-#: builtin/branch.c:389
-#, c-format
-msgid "(HEAD detached from %s)"
-msgstr ""
-
-#: builtin/branch.c:393
-msgid "(no branch)"
-msgstr ""
-
-#: builtin/branch.c:535
+#: builtin/branch.c:441
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr ""
-#: builtin/branch.c:539
+#: builtin/branch.c:445
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr ""
-#: builtin/branch.c:554
+#: builtin/branch.c:460
msgid "cannot rename the current branch while not on any."
msgstr ""
-#: builtin/branch.c:564
+#: builtin/branch.c:470
#, c-format
msgid "Invalid branch name: '%s'"
msgstr ""
-#: builtin/branch.c:581
+#: builtin/branch.c:487
msgid "Branch rename failed"
msgstr ""
-#: builtin/branch.c:585
+#: builtin/branch.c:490
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr ""
-#: builtin/branch.c:588
+#: builtin/branch.c:493
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr ""
-#: builtin/branch.c:595
+#: builtin/branch.c:502
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
-#: builtin/branch.c:611
+#: builtin/branch.c:518
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -4897,211 +5079,220 @@
"Lines starting with '%c' will be stripped.\n"
msgstr ""
-#: builtin/branch.c:643
+#: builtin/branch.c:551
msgid "Generic options"
msgstr ""
-#: builtin/branch.c:645
+#: builtin/branch.c:553
msgid "show hash and subject, give twice for upstream branch"
msgstr ""
-#: builtin/branch.c:646
+#: builtin/branch.c:554
msgid "suppress informational messages"
msgstr ""
-#: builtin/branch.c:647
+#: builtin/branch.c:555
msgid "set up tracking mode (see git-pull(1))"
msgstr ""
-#: builtin/branch.c:649
+#: builtin/branch.c:557
msgid "change upstream info"
msgstr ""
-#: builtin/branch.c:651
+#: builtin/branch.c:559
msgid "upstream"
msgstr ""
-#: builtin/branch.c:651
+#: builtin/branch.c:559
msgid "change the upstream info"
msgstr ""
-#: builtin/branch.c:652
+#: builtin/branch.c:560
msgid "Unset the upstream info"
msgstr ""
-#: builtin/branch.c:653
+#: builtin/branch.c:561
msgid "use colored output"
msgstr ""
-#: builtin/branch.c:654
+#: builtin/branch.c:562
msgid "act on remote-tracking branches"
msgstr ""
-#: builtin/branch.c:656 builtin/branch.c:657
+#: builtin/branch.c:564 builtin/branch.c:566
msgid "print only branches that contain the commit"
msgstr ""
-#: builtin/branch.c:660
+#: builtin/branch.c:565 builtin/branch.c:567
+msgid "print only branches that don't contain the commit"
+msgstr ""
+
+#: builtin/branch.c:570
msgid "Specific git-branch actions:"
msgstr ""
-#: builtin/branch.c:661
+#: builtin/branch.c:571
msgid "list both remote-tracking and local branches"
msgstr ""
-#: builtin/branch.c:663
+#: builtin/branch.c:573
msgid "delete fully merged branch"
msgstr ""
-#: builtin/branch.c:664
+#: builtin/branch.c:574
msgid "delete branch (even if not merged)"
msgstr ""
-#: builtin/branch.c:665
+#: builtin/branch.c:575
msgid "move/rename a branch and its reflog"
msgstr ""
-#: builtin/branch.c:666
+#: builtin/branch.c:576
msgid "move/rename a branch, even if target exists"
msgstr ""
-#: builtin/branch.c:667
+#: builtin/branch.c:577
msgid "list branch names"
msgstr ""
-#: builtin/branch.c:668
+#: builtin/branch.c:578
msgid "create the branch's reflog"
msgstr ""
-#: builtin/branch.c:670
+#: builtin/branch.c:580
msgid "edit the description for the branch"
msgstr ""
-#: builtin/branch.c:671
+#: builtin/branch.c:581
msgid "force creation, move/rename, deletion"
msgstr ""
-#: builtin/branch.c:672
+#: builtin/branch.c:582
msgid "print only branches that are merged"
msgstr ""
-#: builtin/branch.c:673
+#: builtin/branch.c:583
msgid "print only branches that are not merged"
msgstr ""
-#: builtin/branch.c:674
+#: builtin/branch.c:584
msgid "list branches in columns"
msgstr ""
-#: builtin/branch.c:675 builtin/for-each-ref.c:38 builtin/tag.c:381
+#: builtin/branch.c:585 builtin/for-each-ref.c:38 builtin/tag.c:426
msgid "key"
msgstr ""
-#: builtin/branch.c:676 builtin/for-each-ref.c:39 builtin/tag.c:382
+#: builtin/branch.c:586 builtin/for-each-ref.c:39 builtin/tag.c:427
msgid "field name to sort on"
msgstr ""
-#: builtin/branch.c:678 builtin/for-each-ref.c:41 builtin/notes.c:404
+#: 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:384
+#: builtin/tag.c:429
msgid "object"
msgstr ""
-#: builtin/branch.c:679
+#: builtin/branch.c:589
msgid "print only branches of the object"
msgstr ""
-#: builtin/branch.c:681 builtin/for-each-ref.c:46 builtin/tag.c:388
+#: builtin/branch.c:591 builtin/for-each-ref.c:47 builtin/tag.c:434
msgid "sorting and filtering are case insensitive"
msgstr ""
-#: builtin/branch.c:698
+#: builtin/branch.c:592 builtin/for-each-ref.c:37 builtin/tag.c:433
+#: builtin/verify-tag.c:38
+msgid "format to use for the output"
+msgstr ""
+
+#: builtin/branch.c:611
msgid "Failed to resolve HEAD as a valid ref."
msgstr ""
-#: builtin/branch.c:702 builtin/clone.c:706
+#: builtin/branch.c:615 builtin/clone.c:724
msgid "HEAD not found below refs/heads!"
msgstr ""
-#: builtin/branch.c:724
+#: builtin/branch.c:638
msgid "--column and --verbose are incompatible"
msgstr ""
-#: builtin/branch.c:735 builtin/branch.c:787
+#: builtin/branch.c:649 builtin/branch.c:701
msgid "branch name required"
msgstr ""
-#: builtin/branch.c:763
+#: builtin/branch.c:677
msgid "Cannot give description to detached HEAD"
msgstr ""
-#: builtin/branch.c:768
+#: builtin/branch.c:682
msgid "cannot edit description of more than one branch"
msgstr ""
-#: builtin/branch.c:775
+#: builtin/branch.c:689
#, c-format
msgid "No commit on branch '%s' yet."
msgstr ""
-#: builtin/branch.c:778
+#: builtin/branch.c:692
#, c-format
msgid "No branch named '%s'."
msgstr ""
-#: builtin/branch.c:793
+#: builtin/branch.c:707
msgid "too many branches for a rename operation"
msgstr ""
-#: builtin/branch.c:798
+#: builtin/branch.c:712
msgid "too many branches to set new upstream"
msgstr ""
-#: builtin/branch.c:802
+#: builtin/branch.c:716
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
-#: builtin/branch.c:805 builtin/branch.c:827 builtin/branch.c:848
+#: builtin/branch.c:719 builtin/branch.c:741 builtin/branch.c:762
#, c-format
msgid "no such branch '%s'"
msgstr ""
-#: builtin/branch.c:809
+#: builtin/branch.c:723
#, c-format
msgid "branch '%s' does not exist"
msgstr ""
-#: builtin/branch.c:821
+#: builtin/branch.c:735
msgid "too many branches to unset upstream"
msgstr ""
-#: builtin/branch.c:825
+#: builtin/branch.c:739
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
-#: builtin/branch.c:831
+#: builtin/branch.c:745
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr ""
-#: builtin/branch.c:845
+#: builtin/branch.c:759
msgid "it does not make sense to create 'HEAD' manually"
msgstr ""
-#: builtin/branch.c:851
+#: builtin/branch.c:765
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
-#: builtin/branch.c:854
+#: builtin/branch.c:768
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
"track or --set-upstream-to\n"
msgstr ""
-#: builtin/branch.c:871
+#: builtin/branch.c:785
#, c-format
msgid ""
"\n"
@@ -5109,16 +5300,16 @@
"\n"
msgstr ""
-#: builtin/bundle.c:51
+#: builtin/bundle.c:45
#, c-format
msgid "%s is okay\n"
msgstr ""
-#: builtin/bundle.c:64
+#: builtin/bundle.c:58
msgid "Need a repository to create a bundle."
msgstr ""
-#: builtin/bundle.c:68
+#: builtin/bundle.c:62
msgid "Need a repository to unbundle."
msgstr ""
@@ -5162,7 +5353,7 @@
msgid "for blob objects, run filters on object's content"
msgstr ""
-#: builtin/cat-file.c:561 git-submodule.sh:929
+#: builtin/cat-file.c:561 git-submodule.sh:943
msgid "blob"
msgstr ""
@@ -5218,7 +5409,7 @@
msgid "terminate input and output records by a NUL character"
msgstr ""
-#: builtin/check-ignore.c:18 builtin/checkout.c:1140 builtin/gc.c:332
+#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:356
msgid "suppress progress reporting"
msgstr ""
@@ -5308,9 +5499,9 @@
msgstr ""
#: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:597 builtin/submodule--helper.c:600
-#: builtin/submodule--helper.c:606 builtin/submodule--helper.c:967
-#: builtin/worktree.c:471
+#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
+#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
+#: builtin/worktree.c:477
msgid "string"
msgstr ""
@@ -5322,113 +5513,113 @@
msgid "copy out the files from named stage"
msgstr ""
-#: builtin/checkout.c:25
+#: builtin/checkout.c:27
msgid "git checkout [<options>] <branch>"
msgstr ""
-#: builtin/checkout.c:26
+#: builtin/checkout.c:28
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr ""
-#: builtin/checkout.c:134 builtin/checkout.c:167
+#: builtin/checkout.c:153 builtin/checkout.c:186
#, c-format
msgid "path '%s' does not have our version"
msgstr ""
-#: builtin/checkout.c:136 builtin/checkout.c:169
+#: builtin/checkout.c:155 builtin/checkout.c:188
#, c-format
msgid "path '%s' does not have their version"
msgstr ""
-#: builtin/checkout.c:152
+#: builtin/checkout.c:171
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr ""
-#: builtin/checkout.c:196
+#: builtin/checkout.c:215
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr ""
-#: builtin/checkout.c:213
+#: builtin/checkout.c:232
#, c-format
msgid "path '%s': cannot merge"
msgstr ""
-#: builtin/checkout.c:230
+#: builtin/checkout.c:249
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr ""
-#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
-#: builtin/checkout.c:259
+#: builtin/checkout.c:269 builtin/checkout.c:272 builtin/checkout.c:275
+#: builtin/checkout.c:278
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr ""
-#: builtin/checkout.c:262 builtin/checkout.c:265
+#: builtin/checkout.c:281 builtin/checkout.c:284
#, c-format
msgid "'%s' cannot be used with %s"
msgstr ""
-#: builtin/checkout.c:268
+#: builtin/checkout.c:287
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
-#: builtin/checkout.c:339 builtin/checkout.c:346
+#: builtin/checkout.c:358 builtin/checkout.c:365
#, c-format
msgid "path '%s' is unmerged"
msgstr ""
-#: builtin/checkout.c:494
+#: builtin/checkout.c:513
msgid "you need to resolve your current index first"
msgstr ""
-#: builtin/checkout.c:625
+#: builtin/checkout.c:644
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr ""
-#: builtin/checkout.c:666
+#: builtin/checkout.c:685
msgid "HEAD is now at"
msgstr ""
-#: builtin/checkout.c:670 builtin/clone.c:660
+#: builtin/checkout.c:689 builtin/clone.c:678
msgid "unable to update HEAD"
msgstr ""
-#: builtin/checkout.c:674
+#: builtin/checkout.c:693
#, c-format
msgid "Reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:677
+#: builtin/checkout.c:696
#, c-format
msgid "Already on '%s'\n"
msgstr ""
-#: builtin/checkout.c:681
+#: builtin/checkout.c:700
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:683 builtin/checkout.c:1072
+#: builtin/checkout.c:702 builtin/checkout.c:1090
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:685
+#: builtin/checkout.c:704
#, c-format
msgid "Switched to branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:736
+#: builtin/checkout.c:755
#, c-format
msgid " ... and %d more.\n"
msgstr ""
-#: builtin/checkout.c:742
+#: builtin/checkout.c:761
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -5443,7 +5634,7 @@
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:761
+#: builtin/checkout.c:780
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -5460,162 +5651,162 @@
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:797
+#: builtin/checkout.c:816
msgid "internal error in revision walk"
msgstr ""
-#: builtin/checkout.c:801
+#: builtin/checkout.c:820
msgid "Previous HEAD position was"
msgstr ""
-#: builtin/checkout.c:828 builtin/checkout.c:1067
+#: builtin/checkout.c:847 builtin/checkout.c:1085
msgid "You are on a branch yet to be born"
msgstr ""
-#: builtin/checkout.c:973
+#: builtin/checkout.c:991
#, c-format
msgid "only one reference expected, %d given."
msgstr ""
-#: builtin/checkout.c:1013 builtin/worktree.c:214
+#: builtin/checkout.c:1031 builtin/worktree.c:214
#, c-format
msgid "invalid reference: %s"
msgstr ""
-#: builtin/checkout.c:1042
+#: builtin/checkout.c:1060
#, c-format
msgid "reference is not a tree: %s"
msgstr ""
-#: builtin/checkout.c:1081
+#: builtin/checkout.c:1099
msgid "paths cannot be used with switching branches"
msgstr ""
-#: builtin/checkout.c:1084 builtin/checkout.c:1088
+#: builtin/checkout.c:1102 builtin/checkout.c:1106
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr ""
-#: builtin/checkout.c:1092 builtin/checkout.c:1095 builtin/checkout.c:1100
-#: builtin/checkout.c:1103
+#: builtin/checkout.c:1110 builtin/checkout.c:1113 builtin/checkout.c:1118
+#: builtin/checkout.c:1121
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr ""
-#: builtin/checkout.c:1108
+#: builtin/checkout.c:1126
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr ""
-#: builtin/checkout.c:1141 builtin/checkout.c:1143 builtin/clone.c:93
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324
-#: builtin/worktree.c:326
+#: 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
msgid "branch"
msgstr ""
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1160
msgid "create and checkout a new branch"
msgstr ""
-#: builtin/checkout.c:1144
+#: builtin/checkout.c:1162
msgid "create/reset and checkout a branch"
msgstr ""
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1163
msgid "create reflog for new branch"
msgstr ""
-#: builtin/checkout.c:1146 builtin/worktree.c:328
+#: builtin/checkout.c:1164 builtin/worktree.c:333
msgid "detach HEAD at named commit"
msgstr ""
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1165
msgid "set upstream info for new branch"
msgstr ""
-#: builtin/checkout.c:1149
+#: builtin/checkout.c:1167
msgid "new-branch"
msgstr ""
-#: builtin/checkout.c:1149
+#: builtin/checkout.c:1167
msgid "new unparented branch"
msgstr ""
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1168
msgid "checkout our version for unmerged files"
msgstr ""
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1170
msgid "checkout their version for unmerged files"
msgstr ""
-#: builtin/checkout.c:1154
+#: builtin/checkout.c:1172
msgid "force checkout (throw away local modifications)"
msgstr ""
-#: builtin/checkout.c:1155
+#: builtin/checkout.c:1173
msgid "perform a 3-way merge with the new branch"
msgstr ""
-#: builtin/checkout.c:1156 builtin/merge.c:235
+#: builtin/checkout.c:1174 builtin/merge.c:234
msgid "update ignored files (default)"
msgstr ""
-#: builtin/checkout.c:1157 builtin/log.c:1466 parse-options.h:251
+#: builtin/checkout.c:1175 builtin/log.c:1473 parse-options.h:251
msgid "style"
msgstr ""
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1176
msgid "conflict style (merge or diff3)"
msgstr ""
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1179
msgid "do not limit pathspecs to sparse entries only"
msgstr ""
-#: builtin/checkout.c:1163
+#: builtin/checkout.c:1181
msgid "second guess 'git checkout <no-such-branch>'"
msgstr ""
-#: builtin/checkout.c:1165
+#: builtin/checkout.c:1183
msgid "do not check if another worktree is holding the given ref"
msgstr ""
-#: builtin/checkout.c:1166 builtin/clone.c:63 builtin/fetch.c:119
-#: builtin/merge.c:232 builtin/pull.c:117 builtin/push.c:539
-#: builtin/send-pack.c:168
+#: 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
msgid "force progress reporting"
msgstr ""
-#: builtin/checkout.c:1197
+#: builtin/checkout.c:1224
msgid "-b, -B and --orphan are mutually exclusive"
msgstr ""
-#: builtin/checkout.c:1214
+#: builtin/checkout.c:1241
msgid "--track needs a branch name"
msgstr ""
-#: builtin/checkout.c:1219
+#: builtin/checkout.c:1246
msgid "Missing branch name; try -b"
msgstr ""
-#: builtin/checkout.c:1255
+#: builtin/checkout.c:1282
msgid "invalid path specification"
msgstr ""
-#: builtin/checkout.c:1262
+#: builtin/checkout.c:1289
#, 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 ""
-#: builtin/checkout.c:1267
+#: builtin/checkout.c:1294
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr ""
-#: builtin/checkout.c:1271
+#: builtin/checkout.c:1298
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -5651,7 +5842,7 @@
msgid "failed to remove %s"
msgstr ""
-#: builtin/clean.c:291 git-add--interactive.perl:623
+#: builtin/clean.c:297 git-add--interactive.perl:614
#, c-format
msgid ""
"Prompt help:\n"
@@ -5660,7 +5851,7 @@
" - (empty) select nothing\n"
msgstr ""
-#: builtin/clean.c:295 git-add--interactive.perl:632
+#: builtin/clean.c:301 git-add--interactive.perl:623
#, c-format
msgid ""
"Prompt help:\n"
@@ -5673,38 +5864,38 @@
" - (empty) finish selecting\n"
msgstr ""
-#: builtin/clean.c:511 git-add--interactive.perl:598
-#: git-add--interactive.perl:603
+#: builtin/clean.c:517 git-add--interactive.perl:589
+#: git-add--interactive.perl:594
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr ""
-#: builtin/clean.c:653
+#: builtin/clean.c:659
#, c-format
msgid "Input ignore patterns>> "
msgstr ""
-#: builtin/clean.c:690
+#: builtin/clean.c:696
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr ""
-#: builtin/clean.c:711
+#: builtin/clean.c:717
msgid "Select items to delete"
msgstr ""
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:752
+#: builtin/clean.c:758
#, c-format
msgid "Remove %s [y/N]? "
msgstr ""
-#: builtin/clean.c:777 git-add--interactive.perl:1669
+#: builtin/clean.c:783 git-add--interactive.perl:1660
#, c-format
msgid "Bye.\n"
msgstr ""
-#: builtin/clean.c:785
+#: builtin/clean.c:791
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -5715,68 +5906,69 @@
"? - help for prompt selection"
msgstr ""
-#: builtin/clean.c:812 git-add--interactive.perl:1745
+#: builtin/clean.c:818 git-add--interactive.perl:1736
msgid "*** Commands ***"
msgstr ""
-#: builtin/clean.c:813 git-add--interactive.perl:1742
+#: builtin/clean.c:819 git-add--interactive.perl:1733
msgid "What now"
msgstr ""
-#: builtin/clean.c:821
+#: builtin/clean.c:827
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/clean.c:838
+#: builtin/clean.c:844
msgid "No more files to clean, exiting."
msgstr ""
-#: builtin/clean.c:869
+#: builtin/clean.c:875
msgid "do not print names of files removed"
msgstr ""
-#: builtin/clean.c:871
+#: builtin/clean.c:877
msgid "force"
msgstr ""
-#: builtin/clean.c:872
+#: builtin/clean.c:878
msgid "interactive cleaning"
msgstr ""
-#: builtin/clean.c:874
+#: builtin/clean.c:880
msgid "remove whole directories"
msgstr ""
-#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:1056
-#: builtin/ls-files.c:538 builtin/name-rev.c:313 builtin/show-ref.c:176
+#: 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
msgid "pattern"
msgstr ""
-#: builtin/clean.c:876
+#: builtin/clean.c:882
msgid "add <pattern> to ignore rules"
msgstr ""
-#: builtin/clean.c:877
+#: builtin/clean.c:883
msgid "remove ignored files, too"
msgstr ""
-#: builtin/clean.c:879
+#: builtin/clean.c:885
msgid "remove only ignored files"
msgstr ""
-#: builtin/clean.c:897
+#: builtin/clean.c:903
msgid "-x and -X cannot be used together"
msgstr ""
-#: builtin/clean.c:901
+#: builtin/clean.c:907
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
msgstr ""
-#: builtin/clean.c:904
+#: builtin/clean.c:910
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -5786,307 +5978,310 @@
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr ""
-#: builtin/clone.c:65
+#: builtin/clone.c:80
msgid "don't create a checkout"
msgstr ""
-#: builtin/clone.c:66 builtin/clone.c:68 builtin/init-db.c:478
+#: builtin/clone.c:81 builtin/clone.c:83 builtin/init-db.c:478
msgid "create a bare repository"
msgstr ""
-#: builtin/clone.c:70
+#: builtin/clone.c:85
msgid "create a mirror repository (implies bare)"
msgstr ""
-#: builtin/clone.c:72
+#: builtin/clone.c:87
msgid "to clone from a local repository"
msgstr ""
-#: builtin/clone.c:74
+#: builtin/clone.c:89
msgid "don't use local hardlinks, always copy"
msgstr ""
-#: builtin/clone.c:76
+#: builtin/clone.c:91
msgid "setup as shared repository"
msgstr ""
-#: builtin/clone.c:78 builtin/clone.c:80
+#: builtin/clone.c:93 builtin/clone.c:97
+msgid "pathspec"
+msgstr ""
+
+#: builtin/clone.c:93 builtin/clone.c:97
msgid "initialize submodules in the clone"
msgstr ""
-#: builtin/clone.c:82
+#: builtin/clone.c:100
msgid "number of submodules cloned in parallel"
msgstr ""
-#: builtin/clone.c:83 builtin/init-db.c:475
+#: builtin/clone.c:101 builtin/init-db.c:475
msgid "template-directory"
msgstr ""
-#: builtin/clone.c:84 builtin/init-db.c:476
+#: builtin/clone.c:102 builtin/init-db.c:476
msgid "directory from which templates will be used"
msgstr ""
-#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:604
-#: builtin/submodule--helper.c:970
+#: builtin/clone.c:104 builtin/clone.c:106 builtin/submodule--helper.c:642
+#: builtin/submodule--helper.c:983
msgid "reference repository"
msgstr ""
-#: builtin/clone.c:90
+#: builtin/clone.c:108
msgid "use --reference only while cloning"
msgstr ""
-#: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:109 builtin/column.c:26 builtin/merge-file.c:43
msgid "name"
msgstr ""
-#: builtin/clone.c:92
+#: builtin/clone.c:110
msgid "use <name> instead of 'origin' to track upstream"
msgstr ""
-#: builtin/clone.c:94
+#: builtin/clone.c:112
msgid "checkout <branch> instead of the remote's HEAD"
msgstr ""
-#: builtin/clone.c:96
+#: builtin/clone.c:114
msgid "path to git-upload-pack on the remote"
msgstr ""
-#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:999
+#: builtin/clone.c:115 builtin/fetch.c:120 builtin/grep.c:1006
#: builtin/pull.c:202
msgid "depth"
msgstr ""
-#: builtin/clone.c:98
+#: builtin/clone.c:116
msgid "create a shallow clone of that depth"
msgstr ""
-#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2836
+#: builtin/clone.c:117 builtin/fetch.c:122 builtin/pack-objects.c:2918
#: parse-options.h:142
msgid "time"
msgstr ""
-#: builtin/clone.c:100
+#: builtin/clone.c:118
msgid "create a shallow clone since a specific time"
msgstr ""
-#: builtin/clone.c:101 builtin/fetch.c:124
+#: builtin/clone.c:119 builtin/fetch.c:124
msgid "revision"
msgstr ""
-#: builtin/clone.c:102 builtin/fetch.c:125
+#: builtin/clone.c:120 builtin/fetch.c:125
msgid "deepen history of shallow clone, excluding rev"
msgstr ""
-#: builtin/clone.c:104
+#: builtin/clone.c:122
msgid "clone only one branch, HEAD or --branch"
msgstr ""
-#: builtin/clone.c:106
+#: builtin/clone.c:124
msgid "any cloned submodules will be shallow"
msgstr ""
-#: builtin/clone.c:107 builtin/init-db.c:484
+#: builtin/clone.c:125 builtin/init-db.c:484
msgid "gitdir"
msgstr ""
-#: builtin/clone.c:108 builtin/init-db.c:485
+#: builtin/clone.c:126 builtin/init-db.c:485
msgid "separate git dir from working tree"
msgstr ""
-#: builtin/clone.c:109
+#: builtin/clone.c:127
msgid "key=value"
msgstr ""
-#: builtin/clone.c:110
+#: builtin/clone.c:128
msgid "set config inside the new repository"
msgstr ""
-#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:550
+#: builtin/clone.c:129 builtin/fetch.c:140 builtin/push.c:550
msgid "use IPv4 addresses only"
msgstr ""
-#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:552
+#: builtin/clone.c:131 builtin/fetch.c:142 builtin/push.c:552
msgid "use IPv6 addresses only"
msgstr ""
-#: builtin/clone.c:250
+#: builtin/clone.c:268
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
msgstr ""
-#: builtin/clone.c:303
+#: builtin/clone.c:321
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr ""
-#: builtin/clone.c:375
+#: builtin/clone.c:393
#, c-format
msgid "failed to open '%s'"
msgstr ""
-#: builtin/clone.c:383
+#: builtin/clone.c:401
#, c-format
msgid "%s exists and is not a directory"
msgstr ""
-#: builtin/clone.c:397
+#: builtin/clone.c:415
#, c-format
msgid "failed to stat %s\n"
msgstr ""
-#: builtin/clone.c:419
+#: builtin/clone.c:437
#, c-format
msgid "failed to create link '%s'"
msgstr ""
-#: builtin/clone.c:423
+#: builtin/clone.c:441
#, c-format
msgid "failed to copy file to '%s'"
msgstr ""
-#: builtin/clone.c:448
+#: builtin/clone.c:466
#, c-format
msgid "done.\n"
msgstr ""
-#: builtin/clone.c:460
+#: builtin/clone.c:478
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 ""
-#: builtin/clone.c:537
+#: builtin/clone.c:555
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr ""
-#: builtin/clone.c:632
+#: builtin/clone.c:650
msgid "remote did not send all necessary objects"
msgstr ""
-#: builtin/clone.c:648
+#: builtin/clone.c:666
#, c-format
msgid "unable to update %s"
msgstr ""
-#: builtin/clone.c:697
+#: builtin/clone.c:715
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
-#: builtin/clone.c:728
+#: builtin/clone.c:746
msgid "unable to checkout working tree"
msgstr ""
-#: builtin/clone.c:768
+#: builtin/clone.c:786
msgid "unable to write parameters to config file"
msgstr ""
-#: builtin/clone.c:831
+#: builtin/clone.c:849
msgid "cannot repack to clean up"
msgstr ""
-#: builtin/clone.c:833
+#: builtin/clone.c:851
msgid "cannot unlink temporary alternates file"
msgstr ""
-#: builtin/clone.c:866 builtin/receive-pack.c:1895
+#: builtin/clone.c:884 builtin/receive-pack.c:1900
msgid "Too many arguments."
msgstr ""
-#: builtin/clone.c:870
+#: builtin/clone.c:888
msgid "You must specify a repository to clone."
msgstr ""
-#: builtin/clone.c:883
+#: builtin/clone.c:901
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr ""
-#: builtin/clone.c:886
+#: builtin/clone.c:904
msgid "--bare and --separate-git-dir are incompatible."
msgstr ""
-#: builtin/clone.c:899
+#: builtin/clone.c:917
#, c-format
msgid "repository '%s' does not exist"
msgstr ""
-#: builtin/clone.c:905 builtin/fetch.c:1335
+#: builtin/clone.c:923 builtin/fetch.c:1337
#, c-format
msgid "depth %s is not a positive number"
msgstr ""
-#: builtin/clone.c:915
+#: builtin/clone.c:933
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr ""
-#: builtin/clone.c:925
+#: builtin/clone.c:943
#, c-format
msgid "working tree '%s' already exists."
msgstr ""
-#: builtin/clone.c:940 builtin/clone.c:951 builtin/difftool.c:252
-#: builtin/submodule--helper.c:659 builtin/worktree.c:222
-#: builtin/worktree.c:249
+#: builtin/clone.c:958 builtin/clone.c:969 builtin/difftool.c:252
+#: builtin/worktree.c:221 builtin/worktree.c:251
#, c-format
msgid "could not create leading directories of '%s'"
msgstr ""
-#: builtin/clone.c:943
+#: builtin/clone.c:961
#, c-format
msgid "could not create work tree dir '%s'"
msgstr ""
-#: builtin/clone.c:955
+#: builtin/clone.c:973
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr ""
-#: builtin/clone.c:957
+#: builtin/clone.c:975
#, c-format
msgid "Cloning into '%s'...\n"
msgstr ""
-#: builtin/clone.c:963
+#: builtin/clone.c:999
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgstr ""
-#: builtin/clone.c:1019
+#: builtin/clone.c:1055
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1021
+#: builtin/clone.c:1057
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1023
+#: builtin/clone.c:1059
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1026
+#: builtin/clone.c:1062
msgid "source repository is shallow, ignoring --local"
msgstr ""
-#: builtin/clone.c:1031
+#: builtin/clone.c:1067
msgid "--local is ignored"
msgstr ""
-#: builtin/clone.c:1035
+#: builtin/clone.c:1071
#, c-format
msgid "Don't know how to clone %s"
msgstr ""
-#: builtin/clone.c:1090 builtin/clone.c:1098
+#: builtin/clone.c:1126 builtin/clone.c:1134
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr ""
-#: builtin/clone.c:1101
+#: builtin/clone.c:1137
msgid "You appear to have cloned an empty repository."
msgstr ""
@@ -6243,11 +6438,6 @@
msgid "malformed --author parameter"
msgstr ""
-#: builtin/commit.c:611
-#, c-format
-msgid "invalid date format: %s"
-msgstr ""
-
#: builtin/commit.c:655
msgid ""
"unable to select a comment character that is not used\n"
@@ -6259,7 +6449,7 @@
msgid "could not lookup commit %s"
msgstr ""
-#: builtin/commit.c:704 builtin/shortlog.c:295
+#: builtin/commit.c:704 builtin/shortlog.c:294
#, c-format
msgid "(reading log message from standard input)\n"
msgstr ""
@@ -6343,7 +6533,7 @@
msgid "Error building trees"
msgstr ""
-#: builtin/commit.c:968 builtin/tag.c:280
+#: builtin/commit.c:968 builtin/tag.c:273
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr ""
@@ -6406,7 +6596,7 @@
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr ""
-#: builtin/commit.c:1224 builtin/tag.c:495
+#: builtin/commit.c:1224 builtin/tag.c:551
#, c-format
msgid "Invalid cleanup mode %s"
msgstr ""
@@ -6428,7 +6618,7 @@
msgstr ""
#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525
-#: builtin/worktree.c:442
+#: builtin/worktree.c:448
msgid "machine-readable output"
msgstr ""
@@ -6441,7 +6631,7 @@
msgstr ""
#: builtin/commit.c:1351 builtin/commit.c:1624 builtin/fast-export.c:981
-#: builtin/fast-export.c:984 builtin/tag.c:368
+#: builtin/fast-export.c:984 builtin/tag.c:411
msgid "mode"
msgstr ""
@@ -6495,7 +6685,7 @@
msgid "Commit message options"
msgstr ""
-#: builtin/commit.c:1586 builtin/tag.c:366
+#: builtin/commit.c:1586 builtin/tag.c:409
msgid "read message from file"
msgstr ""
@@ -6507,7 +6697,7 @@
msgid "override author for commit"
msgstr ""
-#: builtin/commit.c:1588 builtin/gc.c:333
+#: builtin/commit.c:1588 builtin/gc.c:357
msgid "date"
msgstr ""
@@ -6515,8 +6705,8 @@
msgid "override date for commit"
msgstr ""
-#: builtin/commit.c:1589 builtin/merge.c:222 builtin/notes.c:398
-#: builtin/notes.c:561 builtin/tag.c:364
+#: builtin/commit.c:1589 builtin/merge.c:221 builtin/notes.c:398
+#: builtin/notes.c:561 builtin/tag.c:407
msgid "message"
msgstr ""
@@ -6525,7 +6715,7 @@
msgstr ""
#: builtin/commit.c:1590 builtin/commit.c:1591 builtin/commit.c:1592
-#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:81
+#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:77
msgid "commit"
msgstr ""
@@ -6549,7 +6739,7 @@
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
-#: builtin/commit.c:1595 builtin/log.c:1413 builtin/revert.c:86
+#: builtin/commit.c:1595 builtin/log.c:1420 builtin/revert.c:104
msgid "add Signed-off-by:"
msgstr ""
@@ -6565,7 +6755,7 @@
msgid "default"
msgstr ""
-#: builtin/commit.c:1598 builtin/tag.c:369
+#: builtin/commit.c:1598 builtin/tag.c:412
msgid "how to strip spaces and #comments from message"
msgstr ""
@@ -6573,8 +6763,8 @@
msgid "include status in commit message template"
msgstr ""
-#: builtin/commit.c:1601 builtin/merge.c:234 builtin/pull.c:166
-#: builtin/revert.c:93
+#: builtin/commit.c:1601 builtin/merge.c:233 builtin/pull.c:166
+#: builtin/revert.c:112
msgid "GPG sign commit"
msgstr ""
@@ -6665,139 +6855,139 @@
msgid "git config [<options>]"
msgstr ""
-#: builtin/config.c:55
+#: builtin/config.c:56
msgid "Config file location"
msgstr ""
-#: builtin/config.c:56
+#: builtin/config.c:57
msgid "use global config file"
msgstr ""
-#: builtin/config.c:57
+#: builtin/config.c:58
msgid "use system config file"
msgstr ""
-#: builtin/config.c:58
+#: builtin/config.c:59
msgid "use repository config file"
msgstr ""
-#: builtin/config.c:59
+#: builtin/config.c:60
msgid "use given config file"
msgstr ""
-#: builtin/config.c:60
+#: builtin/config.c:61
msgid "blob-id"
msgstr ""
-#: builtin/config.c:60
+#: builtin/config.c:61
msgid "read config from given blob object"
msgstr ""
-#: builtin/config.c:61
+#: builtin/config.c:62
msgid "Action"
msgstr ""
-#: builtin/config.c:62
+#: builtin/config.c:63
msgid "get value: name [value-regex]"
msgstr ""
-#: builtin/config.c:63
+#: builtin/config.c:64
msgid "get all values: key [value-regex]"
msgstr ""
-#: builtin/config.c:64
+#: builtin/config.c:65
msgid "get values for regexp: name-regex [value-regex]"
msgstr ""
-#: builtin/config.c:65
+#: builtin/config.c:66
msgid "get value specific for the URL: section[.var] URL"
msgstr ""
-#: builtin/config.c:66
+#: builtin/config.c:67
msgid "replace all matching variables: name value [value_regex]"
msgstr ""
-#: builtin/config.c:67
+#: builtin/config.c:68
msgid "add a new variable: name value"
msgstr ""
-#: builtin/config.c:68
+#: builtin/config.c:69
msgid "remove a variable: name [value-regex]"
msgstr ""
-#: builtin/config.c:69
+#: builtin/config.c:70
msgid "remove all matches: name [value-regex]"
msgstr ""
-#: builtin/config.c:70
+#: builtin/config.c:71
msgid "rename section: old-name new-name"
msgstr ""
-#: builtin/config.c:71
+#: builtin/config.c:72
msgid "remove a section: name"
msgstr ""
-#: builtin/config.c:72
+#: builtin/config.c:73
msgid "list all"
msgstr ""
-#: builtin/config.c:73
+#: builtin/config.c:74
msgid "open an editor"
msgstr ""
-#: builtin/config.c:74
+#: builtin/config.c:75
msgid "find the color configured: slot [default]"
msgstr ""
-#: builtin/config.c:75
+#: builtin/config.c:76
msgid "find the color setting: slot [stdout-is-tty]"
msgstr ""
-#: builtin/config.c:76
+#: builtin/config.c:77
msgid "Type"
msgstr ""
-#: builtin/config.c:77
+#: builtin/config.c:78
msgid "value is \"true\" or \"false\""
msgstr ""
-#: builtin/config.c:78
+#: builtin/config.c:79
msgid "value is decimal number"
msgstr ""
-#: builtin/config.c:79
+#: builtin/config.c:80
msgid "value is --bool or --int"
msgstr ""
-#: builtin/config.c:80
+#: builtin/config.c:81
msgid "value is a path (file or directory name)"
msgstr ""
-#: builtin/config.c:81
+#: builtin/config.c:82
msgid "Other"
msgstr ""
-#: builtin/config.c:82
+#: builtin/config.c:83
msgid "terminate values with NUL byte"
msgstr ""
-#: builtin/config.c:83
+#: builtin/config.c:84
msgid "show variable names only"
msgstr ""
-#: builtin/config.c:84
+#: builtin/config.c:85
msgid "respect include directives on lookup"
msgstr ""
-#: builtin/config.c:85
+#: builtin/config.c:86
msgid "show origin of config (file, standard input, blob, command line)"
msgstr ""
-#: builtin/config.c:327
+#: builtin/config.c:328
msgid "unable to parse default color value"
msgstr ""
-#: builtin/config.c:471
+#: builtin/config.c:472
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -6807,12 +6997,12 @@
"#\temail = %s\n"
msgstr ""
-#: builtin/config.c:613
+#: builtin/config.c:615
#, c-format
msgid "cannot create configuration file %s"
msgstr ""
-#: builtin/config.c:625
+#: builtin/config.c:627
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
@@ -6827,140 +7017,164 @@
msgid "print sizes in human readable format"
msgstr ""
-#: builtin/describe.c:17
+#: builtin/describe.c:18
msgid "git describe [<options>] [<commit-ish>...]"
msgstr ""
-#: builtin/describe.c:18
+#: builtin/describe.c:19
msgid "git describe [<options>] --dirty"
msgstr ""
-#: builtin/describe.c:217
+#: builtin/describe.c:53
+msgid "head"
+msgstr ""
+
+#: builtin/describe.c:53
+msgid "lightweight"
+msgstr ""
+
+#: builtin/describe.c:53
+msgid "annotated"
+msgstr ""
+
+#: builtin/describe.c:250
#, c-format
msgid "annotated tag %s not available"
msgstr ""
-#: builtin/describe.c:221
+#: builtin/describe.c:254
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr ""
-#: builtin/describe.c:223
+#: builtin/describe.c:256
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr ""
-#: builtin/describe.c:250 builtin/log.c:480
+#: builtin/describe.c:283 builtin/log.c:487
#, c-format
msgid "Not a valid object name %s"
msgstr ""
-#: builtin/describe.c:253
+#: builtin/describe.c:286
#, c-format
msgid "%s is not a valid '%s' object"
msgstr ""
-#: builtin/describe.c:270
+#: builtin/describe.c:303
#, c-format
msgid "no tag exactly matches '%s'"
msgstr ""
-#: builtin/describe.c:272
+#: builtin/describe.c:305
#, c-format
msgid "searching to describe %s\n"
msgstr ""
-#: builtin/describe.c:319
+#: builtin/describe.c:352
#, c-format
msgid "finished search at %s\n"
msgstr ""
-#: builtin/describe.c:346
+#: builtin/describe.c:379
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
"However, there were unannotated tags: try --tags."
msgstr ""
-#: builtin/describe.c:350
+#: builtin/describe.c:383
#, c-format
msgid ""
"No tags can describe '%s'.\n"
"Try --always, or create some tags."
msgstr ""
-#: builtin/describe.c:371
+#: builtin/describe.c:413
#, c-format
msgid "traversed %lu commits\n"
msgstr ""
-#: builtin/describe.c:374
+#: builtin/describe.c:416
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
"gave up search at %s\n"
msgstr ""
-#: builtin/describe.c:396
+#: builtin/describe.c:438
msgid "find the tag that comes after the commit"
msgstr ""
-#: builtin/describe.c:397
+#: builtin/describe.c:439
msgid "debug search strategy on stderr"
msgstr ""
-#: builtin/describe.c:398
+#: builtin/describe.c:440
msgid "use any ref"
msgstr ""
-#: builtin/describe.c:399
+#: builtin/describe.c:441
msgid "use any tag, even unannotated"
msgstr ""
-#: builtin/describe.c:400
+#: builtin/describe.c:442
msgid "always use long format"
msgstr ""
-#: builtin/describe.c:401
+#: builtin/describe.c:443
msgid "only follow first parent"
msgstr ""
-#: builtin/describe.c:404
+#: builtin/describe.c:446
msgid "only output exact matches"
msgstr ""
-#: builtin/describe.c:406
+#: builtin/describe.c:448
msgid "consider <n> most recent tags (default: 10)"
msgstr ""
-#: builtin/describe.c:408
+#: builtin/describe.c:450
msgid "only consider tags matching <pattern>"
msgstr ""
-#: builtin/describe.c:410 builtin/name-rev.c:320
+#: builtin/describe.c:452
+msgid "do not consider tags matching <pattern>"
+msgstr ""
+
+#: builtin/describe.c:454 builtin/name-rev.c:357
msgid "show abbreviated commit object as fallback"
msgstr ""
-#: builtin/describe.c:411
+#: builtin/describe.c:455 builtin/describe.c:458
msgid "mark"
msgstr ""
-#: builtin/describe.c:412
+#: builtin/describe.c:456
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr ""
-#: builtin/describe.c:430
+#: builtin/describe.c:459
+msgid "append <mark> on broken working tree (default: \"-broken\")"
+msgstr ""
+
+#: builtin/describe.c:477
msgid "--long is incompatible with --abbrev=0"
msgstr ""
-#: builtin/describe.c:456
+#: builtin/describe.c:506
msgid "No names found, cannot describe anything."
msgstr ""
-#: builtin/describe.c:476
+#: builtin/describe.c:549
msgid "--dirty is incompatible with commit-ishes"
msgstr ""
+#: builtin/describe.c:551
+msgid "--broken is incompatible with commit-ishes"
+msgstr ""
+
#: builtin/diff.c:83
#, c-format
msgid "'%s': not a regular file or symlink"
@@ -6999,77 +7213,92 @@
msgid "failed: %d"
msgstr ""
-#: builtin/difftool.c:342
+#: builtin/difftool.c:283
+#, c-format
+msgid "could not read symlink %s"
+msgstr ""
+
+#: builtin/difftool.c:285
+#, c-format
+msgid "could not read symlink file %s"
+msgstr ""
+
+#: builtin/difftool.c:293
+#, c-format
+msgid "could not read object %s for symlink %s"
+msgstr ""
+
+#: builtin/difftool.c:395
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
msgstr ""
-#: builtin/difftool.c:567
+#: builtin/difftool.c:609
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr ""
-#: builtin/difftool.c:569
+#: builtin/difftool.c:611
msgid "working tree file has been left."
msgstr ""
-#: builtin/difftool.c:580
+#: builtin/difftool.c:622
#, c-format
msgid "temporary files exist in '%s'."
msgstr ""
-#: builtin/difftool.c:581
+#: builtin/difftool.c:623
msgid "you may want to cleanup or recover these."
msgstr ""
-#: builtin/difftool.c:626
+#: builtin/difftool.c:669
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr ""
-#: builtin/difftool.c:628
+#: builtin/difftool.c:671
msgid "perform a full-directory diff"
msgstr ""
-#: builtin/difftool.c:630
+#: builtin/difftool.c:673
msgid "do not prompt before launching a diff tool"
msgstr ""
-#: builtin/difftool.c:636
+#: builtin/difftool.c:679
msgid "use symlinks in dir-diff mode"
msgstr ""
-#: builtin/difftool.c:637
+#: builtin/difftool.c:680
msgid "<tool>"
msgstr ""
-#: builtin/difftool.c:638
+#: builtin/difftool.c:681
msgid "use the specified diff tool"
msgstr ""
-#: builtin/difftool.c:640
+#: builtin/difftool.c:683
msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
-#: builtin/difftool.c:643
+#: builtin/difftool.c:686
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
msgstr ""
-#: builtin/difftool.c:645
+#: builtin/difftool.c:688
msgid "<command>"
msgstr ""
-#: builtin/difftool.c:646
+#: builtin/difftool.c:689
msgid "specify a custom command for viewing diffs"
msgstr ""
-#: builtin/difftool.c:670
+#: builtin/difftool.c:713
msgid "no <tool> given for --tool=<tool>"
msgstr ""
-#: builtin/difftool.c:677
+#: builtin/difftool.c:720
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr ""
@@ -7205,7 +7434,7 @@
msgid "convert to a complete repository"
msgstr ""
-#: builtin/fetch.c:131 builtin/log.c:1433
+#: builtin/fetch.c:131 builtin/log.c:1440
msgid "dir"
msgstr ""
@@ -7233,167 +7462,167 @@
msgid "Couldn't find remote ref HEAD"
msgstr ""
-#: builtin/fetch.c:511
+#: builtin/fetch.c:513
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr ""
-#: builtin/fetch.c:604
+#: builtin/fetch.c:606
#, c-format
msgid "object %s not found"
msgstr ""
-#: builtin/fetch.c:608
+#: builtin/fetch.c:610
msgid "[up to date]"
msgstr ""
-#: builtin/fetch.c:621 builtin/fetch.c:701
+#: builtin/fetch.c:623 builtin/fetch.c:703
msgid "[rejected]"
msgstr ""
-#: builtin/fetch.c:622
+#: builtin/fetch.c:624
msgid "can't fetch in current branch"
msgstr ""
-#: builtin/fetch.c:631
+#: builtin/fetch.c:633
msgid "[tag update]"
msgstr ""
-#: builtin/fetch.c:632 builtin/fetch.c:665 builtin/fetch.c:681
-#: builtin/fetch.c:696
+#: builtin/fetch.c:634 builtin/fetch.c:667 builtin/fetch.c:683
+#: builtin/fetch.c:698
msgid "unable to update local ref"
msgstr ""
-#: builtin/fetch.c:651
+#: builtin/fetch.c:653
msgid "[new tag]"
msgstr ""
-#: builtin/fetch.c:654
+#: builtin/fetch.c:656
msgid "[new branch]"
msgstr ""
-#: builtin/fetch.c:657
+#: builtin/fetch.c:659
msgid "[new ref]"
msgstr ""
-#: builtin/fetch.c:696
+#: builtin/fetch.c:698
msgid "forced update"
msgstr ""
-#: builtin/fetch.c:701
+#: builtin/fetch.c:703
msgid "non-fast-forward"
msgstr ""
-#: builtin/fetch.c:746
+#: builtin/fetch.c:748
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr ""
-#: builtin/fetch.c:766
+#: builtin/fetch.c:768
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
-#: builtin/fetch.c:853 builtin/fetch.c:949
+#: builtin/fetch.c:855 builtin/fetch.c:951
#, c-format
msgid "From %.*s\n"
msgstr ""
-#: builtin/fetch.c:864
+#: builtin/fetch.c:866
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
" 'git remote prune %s' to remove any old, conflicting branches"
msgstr ""
-#: builtin/fetch.c:919
+#: builtin/fetch.c:921
#, c-format
msgid " (%s will become dangling)"
msgstr ""
-#: builtin/fetch.c:920
+#: builtin/fetch.c:922
#, c-format
msgid " (%s has become dangling)"
msgstr ""
-#: builtin/fetch.c:952
+#: builtin/fetch.c:954
msgid "[deleted]"
msgstr ""
-#: builtin/fetch.c:953 builtin/remote.c:1020
+#: builtin/fetch.c:955 builtin/remote.c:1022
msgid "(none)"
msgstr ""
-#: builtin/fetch.c:976
+#: builtin/fetch.c:978
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
-#: builtin/fetch.c:995
+#: builtin/fetch.c:997
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr ""
-#: builtin/fetch.c:998
+#: builtin/fetch.c:1000
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr ""
-#: builtin/fetch.c:1074
+#: builtin/fetch.c:1076
#, c-format
msgid "Don't know how to fetch from %s"
msgstr ""
-#: builtin/fetch.c:1234
+#: builtin/fetch.c:1236
#, c-format
msgid "Fetching %s\n"
msgstr ""
-#: builtin/fetch.c:1236 builtin/remote.c:96
+#: builtin/fetch.c:1238 builtin/remote.c:96
#, c-format
msgid "Could not fetch %s"
msgstr ""
-#: builtin/fetch.c:1254
+#: builtin/fetch.c:1256
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
msgstr ""
-#: builtin/fetch.c:1277
+#: builtin/fetch.c:1279
msgid "You need to specify a tag name."
msgstr ""
-#: builtin/fetch.c:1319
+#: builtin/fetch.c:1321
msgid "Negative depth in --deepen is not supported"
msgstr ""
-#: builtin/fetch.c:1321
+#: builtin/fetch.c:1323
msgid "--deepen and --depth are mutually exclusive"
msgstr ""
-#: builtin/fetch.c:1326
+#: builtin/fetch.c:1328
msgid "--depth and --unshallow cannot be used together"
msgstr ""
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1330
msgid "--unshallow on a complete repository does not make sense"
msgstr ""
-#: builtin/fetch.c:1350
+#: builtin/fetch.c:1352
msgid "fetch --all does not take a repository argument"
msgstr ""
-#: builtin/fetch.c:1352
+#: builtin/fetch.c:1354
msgid "fetch --all does not make sense with refspecs"
msgstr ""
-#: builtin/fetch.c:1363
+#: builtin/fetch.c:1365
#, c-format
msgid "No such remote or remote group: %s"
msgstr ""
-#: builtin/fetch.c:1371
+#: builtin/fetch.c:1373
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
@@ -7431,11 +7660,11 @@
msgstr ""
#: builtin/for-each-ref.c:11
-msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"
+msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
msgstr ""
#: builtin/for-each-ref.c:12
-msgid "git for-each-ref [--contains [<object>]]"
+msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
msgstr ""
#: builtin/for-each-ref.c:27
@@ -7458,10 +7687,6 @@
msgid "show only <n> matched refs"
msgstr ""
-#: builtin/for-each-ref.c:37 builtin/tag.c:387 builtin/verify-tag.c:38
-msgid "format to use for the output"
-msgstr ""
-
#: builtin/for-each-ref.c:41
msgid "print only refs which points at the given object"
msgstr ""
@@ -7478,6 +7703,10 @@
msgid "print only refs which contain the commit"
msgstr ""
+#: builtin/for-each-ref.c:46
+msgid "print only refs which don't contain the commit"
+msgstr ""
+
#: builtin/fsck.c:554
msgid "Checking object directories"
msgstr ""
@@ -7542,17 +7771,17 @@
msgid "git gc [<options>]"
msgstr ""
-#: builtin/gc.c:72
+#: builtin/gc.c:78
#, c-format
-msgid "Invalid %s: '%s'"
+msgid "Failed to fstat %s: %s"
msgstr ""
-#: builtin/gc.c:139
+#: builtin/gc.c:310
#, c-format
-msgid "insanely long object directory %.*s"
+msgid "Can't stat %s"
msgstr ""
-#: builtin/gc.c:297
+#: builtin/gc.c:319
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@ -7562,44 +7791,49 @@
"%s"
msgstr ""
-#: builtin/gc.c:334
+#: builtin/gc.c:358
msgid "prune unreferenced objects"
msgstr ""
-#: builtin/gc.c:336
+#: builtin/gc.c:360
msgid "be more thorough (increased runtime)"
msgstr ""
-#: builtin/gc.c:337
+#: builtin/gc.c:361
msgid "enable auto-gc mode"
msgstr ""
-#: builtin/gc.c:338
+#: builtin/gc.c:362
msgid "force running gc even if there may be another gc running"
msgstr ""
-#: builtin/gc.c:380
+#: builtin/gc.c:379
+#, c-format
+msgid "Failed to parse gc.logexpiry value %s"
+msgstr ""
+
+#: builtin/gc.c:407
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
-#: builtin/gc.c:382
+#: builtin/gc.c:409
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr ""
-#: builtin/gc.c:383
+#: builtin/gc.c:410
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr ""
-#: builtin/gc.c:404
+#: builtin/gc.c:431
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
-#: builtin/gc.c:448
+#: builtin/gc.c:475
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
@@ -7618,235 +7852,240 @@
msgid "invalid number of threads specified (%d) for %s"
msgstr ""
-#: builtin/grep.c:763 builtin/grep.c:804
+#: builtin/grep.c:769 builtin/grep.c:810
#, c-format
msgid "unable to read tree (%s)"
msgstr ""
-#: builtin/grep.c:823
+#: builtin/grep.c:829
#, c-format
msgid "unable to grep from object of type %s"
msgstr ""
-#: builtin/grep.c:887
+#: builtin/grep.c:893
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr ""
-#: builtin/grep.c:973
+#: builtin/grep.c:980
msgid "search in index instead of in the work tree"
msgstr ""
-#: builtin/grep.c:975
+#: builtin/grep.c:982
msgid "find in contents not managed by git"
msgstr ""
-#: builtin/grep.c:977
+#: builtin/grep.c:984
msgid "search in both tracked and untracked files"
msgstr ""
-#: builtin/grep.c:979
+#: builtin/grep.c:986
msgid "ignore files specified via '.gitignore'"
msgstr ""
-#: builtin/grep.c:981
-msgid "recursivley search in each submodule"
+#: builtin/grep.c:988
+msgid "recursively search in each submodule"
msgstr ""
-#: builtin/grep.c:983
+#: builtin/grep.c:990
msgid "basename"
msgstr ""
-#: builtin/grep.c:984
+#: builtin/grep.c:991
msgid "prepend parent project's basename to output"
msgstr ""
-#: builtin/grep.c:987
+#: builtin/grep.c:994
msgid "show non-matching lines"
msgstr ""
-#: builtin/grep.c:989
+#: builtin/grep.c:996
msgid "case insensitive matching"
msgstr ""
-#: builtin/grep.c:991
+#: builtin/grep.c:998
msgid "match patterns only at word boundaries"
msgstr ""
-#: builtin/grep.c:993
+#: builtin/grep.c:1000
msgid "process binary files as text"
msgstr ""
-#: builtin/grep.c:995
+#: builtin/grep.c:1002
msgid "don't match patterns in binary files"
msgstr ""
-#: builtin/grep.c:998
+#: builtin/grep.c:1005
msgid "process binary files with textconv filters"
msgstr ""
-#: builtin/grep.c:1000
+#: builtin/grep.c:1007
msgid "descend at most <depth> levels"
msgstr ""
-#: builtin/grep.c:1004
+#: builtin/grep.c:1011
msgid "use extended POSIX regular expressions"
msgstr ""
-#: builtin/grep.c:1007
+#: builtin/grep.c:1014
msgid "use basic POSIX regular expressions (default)"
msgstr ""
-#: builtin/grep.c:1010
+#: builtin/grep.c:1017
msgid "interpret patterns as fixed strings"
msgstr ""
-#: builtin/grep.c:1013
+#: builtin/grep.c:1020
msgid "use Perl-compatible regular expressions"
msgstr ""
-#: builtin/grep.c:1016
+#: builtin/grep.c:1023
msgid "show line numbers"
msgstr ""
-#: builtin/grep.c:1017
+#: builtin/grep.c:1024
msgid "don't show filenames"
msgstr ""
-#: builtin/grep.c:1018
+#: builtin/grep.c:1025
msgid "show filenames"
msgstr ""
-#: builtin/grep.c:1020
+#: builtin/grep.c:1027
msgid "show filenames relative to top directory"
msgstr ""
-#: builtin/grep.c:1022
+#: builtin/grep.c:1029
msgid "show only filenames instead of matching lines"
msgstr ""
-#: builtin/grep.c:1024
+#: builtin/grep.c:1031
msgid "synonym for --files-with-matches"
msgstr ""
-#: builtin/grep.c:1027
+#: builtin/grep.c:1034
msgid "show only the names of files without match"
msgstr ""
-#: builtin/grep.c:1029
+#: builtin/grep.c:1036
msgid "print NUL after filenames"
msgstr ""
-#: builtin/grep.c:1031
+#: builtin/grep.c:1038
msgid "show the number of matches instead of matching lines"
msgstr ""
-#: builtin/grep.c:1032
+#: builtin/grep.c:1039
msgid "highlight matches"
msgstr ""
-#: builtin/grep.c:1034
+#: builtin/grep.c:1041
msgid "print empty line between matches from different files"
msgstr ""
-#: builtin/grep.c:1036
+#: builtin/grep.c:1043
msgid "show filename only once above matches from same file"
msgstr ""
-#: builtin/grep.c:1039
+#: builtin/grep.c:1046
msgid "show <n> context lines before and after matches"
msgstr ""
-#: builtin/grep.c:1042
+#: builtin/grep.c:1049
msgid "show <n> context lines before matches"
msgstr ""
-#: builtin/grep.c:1044
+#: builtin/grep.c:1051
msgid "show <n> context lines after matches"
msgstr ""
-#: builtin/grep.c:1046
+#: builtin/grep.c:1053
msgid "use <n> worker threads"
msgstr ""
-#: builtin/grep.c:1047
+#: builtin/grep.c:1054
msgid "shortcut for -C NUM"
msgstr ""
-#: builtin/grep.c:1050
+#: builtin/grep.c:1057
msgid "show a line with the function name before matches"
msgstr ""
-#: builtin/grep.c:1052
+#: builtin/grep.c:1059
msgid "show the surrounding function"
msgstr ""
-#: builtin/grep.c:1055
+#: builtin/grep.c:1062
msgid "read patterns from file"
msgstr ""
-#: builtin/grep.c:1057
+#: builtin/grep.c:1064
msgid "match <pattern>"
msgstr ""
-#: builtin/grep.c:1059
+#: builtin/grep.c:1066
msgid "combine patterns specified with -e"
msgstr ""
-#: builtin/grep.c:1071
+#: builtin/grep.c:1078
msgid "indicate hit with exit status without output"
msgstr ""
-#: builtin/grep.c:1073
+#: builtin/grep.c:1080
msgid "show only matches from files that match all patterns"
msgstr ""
-#: builtin/grep.c:1075
+#: builtin/grep.c:1082
msgid "show parse tree for grep expression"
msgstr ""
-#: builtin/grep.c:1079
+#: builtin/grep.c:1086
msgid "pager"
msgstr ""
-#: builtin/grep.c:1079
+#: builtin/grep.c:1086
msgid "show matching files in the pager"
msgstr ""
-#: builtin/grep.c:1082
+#: builtin/grep.c:1089
msgid "allow calling of grep(1) (ignored by this build)"
msgstr ""
-#: builtin/grep.c:1146
+#: builtin/grep.c:1153
msgid "no pattern given."
msgstr ""
-#: builtin/grep.c:1178 builtin/index-pack.c:1482
+#: builtin/grep.c:1189
+msgid "--no-index or --untracked cannot be used with revs"
+msgstr ""
+
+#: builtin/grep.c:1195
+#, c-format
+msgid "unable to resolve revision: %s"
+msgstr ""
+
+#: builtin/grep.c:1228 builtin/index-pack.c:1485
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr ""
-#: builtin/grep.c:1215
+#: builtin/grep.c:1251
msgid "--open-files-in-pager only works on the worktree"
msgstr ""
-#: builtin/grep.c:1238
+#: builtin/grep.c:1274
msgid "option not supported with --recurse-submodules."
msgstr ""
-#: builtin/grep.c:1244
+#: builtin/grep.c:1280
msgid "--cached or --untracked cannot be used with --no-index."
msgstr ""
-#: builtin/grep.c:1249
-msgid "--no-index or --untracked cannot be used with revs."
-msgstr ""
-
-#: builtin/grep.c:1252
+#: builtin/grep.c:1286
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr ""
-#: builtin/grep.c:1260
+#: builtin/grep.c:1294
msgid "both --cached and trees are given."
msgstr ""
@@ -8065,240 +8304,245 @@
msgid "unable to create '%s'"
msgstr ""
-#: builtin/index-pack.c:322
+#: builtin/index-pack.c:323
#, c-format
msgid "cannot open packfile '%s'"
msgstr ""
-#: builtin/index-pack.c:336
+#: builtin/index-pack.c:337
msgid "pack signature mismatch"
msgstr ""
-#: builtin/index-pack.c:338
+#: builtin/index-pack.c:339
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr ""
-#: builtin/index-pack.c:356
+#: builtin/index-pack.c:357
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr ""
-#: builtin/index-pack.c:478
+#: builtin/index-pack.c:479
#, c-format
msgid "inflate returned %d"
msgstr ""
-#: builtin/index-pack.c:527
+#: builtin/index-pack.c:528
msgid "offset value overflow for delta base object"
msgstr ""
-#: builtin/index-pack.c:535
+#: builtin/index-pack.c:536
msgid "delta base offset is out of bound"
msgstr ""
-#: builtin/index-pack.c:543
+#: builtin/index-pack.c:544
#, c-format
msgid "unknown object type %d"
msgstr ""
-#: builtin/index-pack.c:574
+#: builtin/index-pack.c:575
msgid "cannot pread pack file"
msgstr ""
-#: builtin/index-pack.c:576
+#: builtin/index-pack.c:577
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:602
+#: builtin/index-pack.c:603
msgid "serious inflate inconsistency"
msgstr ""
-#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
-#: builtin/index-pack.c:813 builtin/index-pack.c:822
+#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
+#: builtin/index-pack.c:816 builtin/index-pack.c:825
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr ""
-#: builtin/index-pack.c:751 builtin/pack-objects.c:164
-#: builtin/pack-objects.c:256
+#: builtin/index-pack.c:752 builtin/pack-objects.c:164
+#: builtin/pack-objects.c:257
#, c-format
msgid "unable to read %s"
msgstr ""
-#: builtin/index-pack.c:819
+#: builtin/index-pack.c:814
+#, c-format
+msgid "cannot read existing object info %s"
+msgstr ""
+
+#: builtin/index-pack.c:822
#, c-format
msgid "cannot read existing object %s"
msgstr ""
-#: builtin/index-pack.c:833
+#: builtin/index-pack.c:836
#, c-format
msgid "invalid blob object %s"
msgstr ""
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:850
#, c-format
msgid "invalid %s"
msgstr ""
-#: builtin/index-pack.c:850
+#: builtin/index-pack.c:853
msgid "Error in object"
msgstr ""
-#: builtin/index-pack.c:852
+#: builtin/index-pack.c:855
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr ""
-#: builtin/index-pack.c:924 builtin/index-pack.c:955
+#: builtin/index-pack.c:927 builtin/index-pack.c:958
msgid "failed to apply delta"
msgstr ""
-#: builtin/index-pack.c:1125
+#: builtin/index-pack.c:1128
msgid "Receiving objects"
msgstr ""
-#: builtin/index-pack.c:1125
+#: builtin/index-pack.c:1128
msgid "Indexing objects"
msgstr ""
-#: builtin/index-pack.c:1157
+#: builtin/index-pack.c:1160
msgid "pack is corrupted (SHA1 mismatch)"
msgstr ""
-#: builtin/index-pack.c:1162
+#: builtin/index-pack.c:1165
msgid "cannot fstat packfile"
msgstr ""
-#: builtin/index-pack.c:1165
+#: builtin/index-pack.c:1168
msgid "pack has junk at the end"
msgstr ""
-#: builtin/index-pack.c:1176
+#: builtin/index-pack.c:1179
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr ""
-#: builtin/index-pack.c:1199
+#: builtin/index-pack.c:1202
msgid "Resolving deltas"
msgstr ""
-#: builtin/index-pack.c:1210
+#: builtin/index-pack.c:1213
#, c-format
msgid "unable to create thread: %s"
msgstr ""
-#: builtin/index-pack.c:1252
+#: builtin/index-pack.c:1255
msgid "confusion beyond insanity"
msgstr ""
-#: builtin/index-pack.c:1258
+#: builtin/index-pack.c:1261
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1270
+#: builtin/index-pack.c:1273
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr ""
-#: builtin/index-pack.c:1274
+#: builtin/index-pack.c:1277
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1298
+#: builtin/index-pack.c:1301
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr ""
-#: builtin/index-pack.c:1374
+#: builtin/index-pack.c:1377
#, c-format
msgid "local object %s is corrupt"
msgstr ""
-#: builtin/index-pack.c:1398
+#: builtin/index-pack.c:1403
msgid "error while closing pack file"
msgstr ""
-#: builtin/index-pack.c:1411
+#: builtin/index-pack.c:1415
#, c-format
msgid "cannot write keep file '%s'"
msgstr ""
-#: builtin/index-pack.c:1419
+#: builtin/index-pack.c:1423
#, c-format
msgid "cannot close written keep file '%s'"
msgstr ""
-#: builtin/index-pack.c:1432
+#: builtin/index-pack.c:1433
msgid "cannot store pack file"
msgstr ""
-#: builtin/index-pack.c:1443
+#: builtin/index-pack.c:1441
msgid "cannot store index file"
msgstr ""
-#: builtin/index-pack.c:1476
+#: builtin/index-pack.c:1479
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr ""
-#: builtin/index-pack.c:1486 builtin/index-pack.c:1683
+#: builtin/index-pack.c:1489 builtin/index-pack.c:1686
#, c-format
msgid "no threads support, ignoring %s"
msgstr ""
-#: builtin/index-pack.c:1544
+#: builtin/index-pack.c:1547
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr ""
-#: builtin/index-pack.c:1546
+#: builtin/index-pack.c:1549
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr ""
-#: builtin/index-pack.c:1593
+#: builtin/index-pack.c:1596
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1600
+#: builtin/index-pack.c:1603
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1613
+#: builtin/index-pack.c:1616
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr ""
-#: builtin/index-pack.c:1695 builtin/index-pack.c:1698
-#: builtin/index-pack.c:1714 builtin/index-pack.c:1718
+#: builtin/index-pack.c:1698 builtin/index-pack.c:1701
+#: builtin/index-pack.c:1717 builtin/index-pack.c:1721
#, c-format
msgid "bad %s"
msgstr ""
-#: builtin/index-pack.c:1734
+#: builtin/index-pack.c:1737
msgid "--fix-thin cannot be used without --stdin"
msgstr ""
-#: builtin/index-pack.c:1736
+#: builtin/index-pack.c:1739
msgid "--stdin requires a git repository"
msgstr ""
-#: builtin/index-pack.c:1744
+#: builtin/index-pack.c:1747
msgid "--verify with no packfile name given"
msgstr ""
@@ -8452,419 +8696,419 @@
msgid "git show [<options>] <object>..."
msgstr ""
-#: builtin/log.c:84
+#: builtin/log.c:89
#, c-format
msgid "invalid --decorate option: %s"
msgstr ""
-#: builtin/log.c:139
+#: builtin/log.c:144
msgid "suppress diff output"
msgstr ""
-#: builtin/log.c:140
+#: builtin/log.c:145
msgid "show source"
msgstr ""
-#: builtin/log.c:141
+#: builtin/log.c:146
msgid "Use mail map file"
msgstr ""
-#: builtin/log.c:142
+#: builtin/log.c:147
msgid "decorate options"
msgstr ""
-#: builtin/log.c:145
+#: builtin/log.c:150
msgid "Process line range n,m in file, counting from 1"
msgstr ""
-#: builtin/log.c:241
+#: builtin/log.c:246
#, c-format
msgid "Final output: %d %s\n"
msgstr ""
-#: builtin/log.c:486
+#: builtin/log.c:493
#, c-format
msgid "git show %s: bad file"
msgstr ""
-#: builtin/log.c:500 builtin/log.c:594
+#: builtin/log.c:507 builtin/log.c:601
#, c-format
msgid "Could not read object %s"
msgstr ""
-#: builtin/log.c:618
+#: builtin/log.c:625
#, c-format
msgid "Unknown type: %d"
msgstr ""
-#: builtin/log.c:739
+#: builtin/log.c:746
msgid "format.headers without value"
msgstr ""
-#: builtin/log.c:839
+#: builtin/log.c:846
msgid "name of output directory is too long"
msgstr ""
-#: builtin/log.c:854
+#: builtin/log.c:861
#, c-format
msgid "Cannot open patch file %s"
msgstr ""
-#: builtin/log.c:868
+#: builtin/log.c:875
msgid "Need exactly one range."
msgstr ""
-#: builtin/log.c:878
+#: builtin/log.c:885
msgid "Not a range."
msgstr ""
-#: builtin/log.c:984
+#: builtin/log.c:991
msgid "Cover letter needs email format"
msgstr ""
-#: builtin/log.c:1063
+#: builtin/log.c:1071
#, c-format
msgid "insane in-reply-to: %s"
msgstr ""
-#: builtin/log.c:1091
+#: builtin/log.c:1098
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr ""
-#: builtin/log.c:1141
+#: builtin/log.c:1148
msgid "Two output directories?"
msgstr ""
-#: builtin/log.c:1248 builtin/log.c:1891 builtin/log.c:1893 builtin/log.c:1905
+#: builtin/log.c:1255 builtin/log.c:1898 builtin/log.c:1900 builtin/log.c:1912
#, c-format
msgid "Unknown commit %s"
msgstr ""
-#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:476
+#: builtin/log.c:1265 builtin/notes.c:883 builtin/tag.c:532
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr ""
-#: builtin/log.c:1263
+#: builtin/log.c:1270
msgid "Could not find exact merge base."
msgstr ""
-#: builtin/log.c:1267
+#: builtin/log.c:1274
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 ""
-#: builtin/log.c:1287
+#: builtin/log.c:1294
msgid "Failed to find exact merge base"
msgstr ""
-#: builtin/log.c:1298
+#: builtin/log.c:1305
msgid "base commit should be the ancestor of revision list"
msgstr ""
-#: builtin/log.c:1302
+#: builtin/log.c:1309
msgid "base commit shouldn't be in revision list"
msgstr ""
-#: builtin/log.c:1351
+#: builtin/log.c:1358
msgid "cannot get patch id"
msgstr ""
-#: builtin/log.c:1408
+#: builtin/log.c:1415
msgid "use [PATCH n/m] even with a single patch"
msgstr ""
-#: builtin/log.c:1411
+#: builtin/log.c:1418
msgid "use [PATCH] even with multiple patches"
msgstr ""
-#: builtin/log.c:1415
+#: builtin/log.c:1422
msgid "print patches to standard out"
msgstr ""
-#: builtin/log.c:1417
+#: builtin/log.c:1424
msgid "generate a cover letter"
msgstr ""
-#: builtin/log.c:1419
+#: builtin/log.c:1426
msgid "use simple number sequence for output file names"
msgstr ""
-#: builtin/log.c:1420
+#: builtin/log.c:1427
msgid "sfx"
msgstr ""
-#: builtin/log.c:1421
+#: builtin/log.c:1428
msgid "use <sfx> instead of '.patch'"
msgstr ""
-#: builtin/log.c:1423
+#: builtin/log.c:1430
msgid "start numbering patches at <n> instead of 1"
msgstr ""
-#: builtin/log.c:1425
+#: builtin/log.c:1432
msgid "mark the series as Nth re-roll"
msgstr ""
-#: builtin/log.c:1427
+#: builtin/log.c:1434
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr ""
-#: builtin/log.c:1430
+#: builtin/log.c:1437
msgid "Use [<prefix>] instead of [PATCH]"
msgstr ""
-#: builtin/log.c:1433
+#: builtin/log.c:1440
msgid "store resulting files in <dir>"
msgstr ""
-#: builtin/log.c:1436
+#: builtin/log.c:1443
msgid "don't strip/add [PATCH]"
msgstr ""
-#: builtin/log.c:1439
+#: builtin/log.c:1446
msgid "don't output binary diffs"
msgstr ""
-#: builtin/log.c:1441
+#: builtin/log.c:1448
msgid "output all-zero hash in From header"
msgstr ""
-#: builtin/log.c:1443
+#: builtin/log.c:1450
msgid "don't include a patch matching a commit upstream"
msgstr ""
-#: builtin/log.c:1445
+#: builtin/log.c:1452
msgid "show patch format instead of default (patch + stat)"
msgstr ""
-#: builtin/log.c:1447
+#: builtin/log.c:1454
msgid "Messaging"
msgstr ""
-#: builtin/log.c:1448
+#: builtin/log.c:1455
msgid "header"
msgstr ""
-#: builtin/log.c:1449
+#: builtin/log.c:1456
msgid "add email header"
msgstr ""
-#: builtin/log.c:1450 builtin/log.c:1452
+#: builtin/log.c:1457 builtin/log.c:1459
msgid "email"
msgstr ""
-#: builtin/log.c:1450
+#: builtin/log.c:1457
msgid "add To: header"
msgstr ""
-#: builtin/log.c:1452
+#: builtin/log.c:1459
msgid "add Cc: header"
msgstr ""
-#: builtin/log.c:1454
+#: builtin/log.c:1461
msgid "ident"
msgstr ""
-#: builtin/log.c:1455
+#: builtin/log.c:1462
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
-#: builtin/log.c:1457
+#: builtin/log.c:1464
msgid "message-id"
msgstr ""
-#: builtin/log.c:1458
+#: builtin/log.c:1465
msgid "make first mail a reply to <message-id>"
msgstr ""
-#: builtin/log.c:1459 builtin/log.c:1462
+#: builtin/log.c:1466 builtin/log.c:1469
msgid "boundary"
msgstr ""
-#: builtin/log.c:1460
+#: builtin/log.c:1467
msgid "attach the patch"
msgstr ""
-#: builtin/log.c:1463
+#: builtin/log.c:1470
msgid "inline the patch"
msgstr ""
-#: builtin/log.c:1467
+#: builtin/log.c:1474
msgid "enable message threading, styles: shallow, deep"
msgstr ""
-#: builtin/log.c:1469
+#: builtin/log.c:1476
msgid "signature"
msgstr ""
-#: builtin/log.c:1470
+#: builtin/log.c:1477
msgid "add a signature"
msgstr ""
-#: builtin/log.c:1471
+#: builtin/log.c:1478
msgid "base-commit"
msgstr ""
-#: builtin/log.c:1472
+#: builtin/log.c:1479
msgid "add prerequisite tree info to the patch series"
msgstr ""
-#: builtin/log.c:1474
+#: builtin/log.c:1481
msgid "add a signature from a file"
msgstr ""
-#: builtin/log.c:1475
+#: builtin/log.c:1482
msgid "don't print the patch filenames"
msgstr ""
-#: builtin/log.c:1565
+#: builtin/log.c:1572
msgid "-n and -k are mutually exclusive."
msgstr ""
-#: builtin/log.c:1567
+#: builtin/log.c:1574
msgid "--subject-prefix/--rfc and -k are mutually exclusive."
msgstr ""
-#: builtin/log.c:1575
+#: builtin/log.c:1582
msgid "--name-only does not make sense"
msgstr ""
-#: builtin/log.c:1577
+#: builtin/log.c:1584
msgid "--name-status does not make sense"
msgstr ""
-#: builtin/log.c:1579
+#: builtin/log.c:1586
msgid "--check does not make sense"
msgstr ""
-#: builtin/log.c:1609
+#: builtin/log.c:1616
msgid "standard output, or directory, which one?"
msgstr ""
-#: builtin/log.c:1611
+#: builtin/log.c:1618
#, c-format
msgid "Could not create directory '%s'"
msgstr ""
-#: builtin/log.c:1705
+#: builtin/log.c:1712
#, c-format
msgid "unable to read signature file '%s'"
msgstr ""
-#: builtin/log.c:1777
+#: builtin/log.c:1784
msgid "Failed to create output files"
msgstr ""
-#: builtin/log.c:1826
+#: builtin/log.c:1833
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr ""
-#: builtin/log.c:1880
+#: builtin/log.c:1887
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr ""
-#: builtin/ls-files.c:460
+#: builtin/ls-files.c:468
msgid "git ls-files [<options>] [<file>...]"
msgstr ""
-#: builtin/ls-files.c:509
+#: builtin/ls-files.c:517
msgid "identify the file status with tags"
msgstr ""
-#: builtin/ls-files.c:511
+#: builtin/ls-files.c:519
msgid "use lowercase letters for 'assume unchanged' files"
msgstr ""
-#: builtin/ls-files.c:513
+#: builtin/ls-files.c:521
msgid "show cached files in the output (default)"
msgstr ""
-#: builtin/ls-files.c:515
+#: builtin/ls-files.c:523
msgid "show deleted files in the output"
msgstr ""
-#: builtin/ls-files.c:517
+#: builtin/ls-files.c:525
msgid "show modified files in the output"
msgstr ""
-#: builtin/ls-files.c:519
+#: builtin/ls-files.c:527
msgid "show other files in the output"
msgstr ""
-#: builtin/ls-files.c:521
+#: builtin/ls-files.c:529
msgid "show ignored files in the output"
msgstr ""
-#: builtin/ls-files.c:524
+#: builtin/ls-files.c:532
msgid "show staged contents' object name in the output"
msgstr ""
-#: builtin/ls-files.c:526
+#: builtin/ls-files.c:534
msgid "show files on the filesystem that need to be removed"
msgstr ""
-#: builtin/ls-files.c:528
+#: builtin/ls-files.c:536
msgid "show 'other' directories' names only"
msgstr ""
-#: builtin/ls-files.c:530
+#: builtin/ls-files.c:538
msgid "show line endings of files"
msgstr ""
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:540
msgid "don't show empty directories"
msgstr ""
-#: builtin/ls-files.c:535
+#: builtin/ls-files.c:543
msgid "show unmerged files in the output"
msgstr ""
-#: builtin/ls-files.c:537
+#: builtin/ls-files.c:545
msgid "show resolve-undo information"
msgstr ""
-#: builtin/ls-files.c:539
+#: builtin/ls-files.c:547
msgid "skip files matching pattern"
msgstr ""
-#: builtin/ls-files.c:542
+#: builtin/ls-files.c:550
msgid "exclude patterns are read from <file>"
msgstr ""
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:553
msgid "read additional per-directory exclude patterns in <file>"
msgstr ""
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:555
msgid "add the standard git exclusions"
msgstr ""
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:558
msgid "make the output relative to the project top directory"
msgstr ""
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:561
msgid "recurse through submodules"
msgstr ""
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:563
msgid "if any <file> is not in the index, treat this as an error"
msgstr ""
-#: builtin/ls-files.c:556
+#: builtin/ls-files.c:564
msgid "tree-ish"
msgstr ""
-#: builtin/ls-files.c:557
+#: builtin/ls-files.c:565
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
-#: builtin/ls-files.c:559
+#: builtin/ls-files.c:567
msgid "show debugging data"
msgstr ""
@@ -8875,39 +9119,39 @@
" [--symref] [<repository> [<refs>...]]"
msgstr ""
-#: builtin/ls-remote.c:50
+#: builtin/ls-remote.c:52
msgid "do not print remote URL"
msgstr ""
-#: builtin/ls-remote.c:51 builtin/ls-remote.c:53
+#: builtin/ls-remote.c:53 builtin/ls-remote.c:55
msgid "exec"
msgstr ""
-#: builtin/ls-remote.c:52 builtin/ls-remote.c:54
+#: builtin/ls-remote.c:54 builtin/ls-remote.c:56
msgid "path of git-upload-pack on the remote host"
msgstr ""
-#: builtin/ls-remote.c:56
+#: builtin/ls-remote.c:58
msgid "limit to tags"
msgstr ""
-#: builtin/ls-remote.c:57
+#: builtin/ls-remote.c:59
msgid "limit to heads"
msgstr ""
-#: builtin/ls-remote.c:58
+#: builtin/ls-remote.c:60
msgid "do not show peeled tags"
msgstr ""
-#: builtin/ls-remote.c:60
+#: builtin/ls-remote.c:62
msgid "take url.<base>.insteadOf into account"
msgstr ""
-#: builtin/ls-remote.c:62
+#: builtin/ls-remote.c:64
msgid "exit with exit code 2 if no matching refs are found"
msgstr ""
-#: builtin/ls-remote.c:64
+#: builtin/ls-remote.c:66
msgid "show underlying ref in addition to the object pointed by it"
msgstr ""
@@ -8952,146 +9196,142 @@
msgstr ""
#: builtin/merge.c:47
-msgid "git merge [<options>] <msg> HEAD <commit>"
-msgstr ""
-
-#: builtin/merge.c:48
msgid "git merge --abort"
msgstr ""
-#: builtin/merge.c:49
+#: builtin/merge.c:48
msgid "git merge --continue"
msgstr ""
-#: builtin/merge.c:104
+#: builtin/merge.c:103
msgid "switch `m' requires a value"
msgstr ""
-#: builtin/merge.c:141
+#: builtin/merge.c:140
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr ""
-#: builtin/merge.c:142
+#: builtin/merge.c:141
#, c-format
msgid "Available strategies are:"
msgstr ""
-#: builtin/merge.c:147
+#: builtin/merge.c:146
#, c-format
msgid "Available custom strategies are:"
msgstr ""
-#: builtin/merge.c:197 builtin/pull.c:127
+#: builtin/merge.c:196 builtin/pull.c:127
msgid "do not show a diffstat at the end of the merge"
msgstr ""
-#: builtin/merge.c:200 builtin/pull.c:130
+#: builtin/merge.c:199 builtin/pull.c:130
msgid "show a diffstat at the end of the merge"
msgstr ""
-#: builtin/merge.c:201 builtin/pull.c:133
+#: builtin/merge.c:200 builtin/pull.c:133
msgid "(synonym to --stat)"
msgstr ""
-#: builtin/merge.c:203 builtin/pull.c:136
+#: builtin/merge.c:202 builtin/pull.c:136
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
-#: builtin/merge.c:206 builtin/pull.c:139
+#: builtin/merge.c:205 builtin/pull.c:139
msgid "create a single commit instead of doing a merge"
msgstr ""
-#: builtin/merge.c:208 builtin/pull.c:142
+#: builtin/merge.c:207 builtin/pull.c:142
msgid "perform a commit if the merge succeeds (default)"
msgstr ""
-#: builtin/merge.c:210 builtin/pull.c:145
+#: builtin/merge.c:209 builtin/pull.c:145
msgid "edit message before committing"
msgstr ""
-#: builtin/merge.c:211
+#: builtin/merge.c:210
msgid "allow fast-forward (default)"
msgstr ""
-#: builtin/merge.c:213 builtin/pull.c:151
+#: builtin/merge.c:212 builtin/pull.c:151
msgid "abort if fast-forward is not possible"
msgstr ""
-#: builtin/merge.c:217 builtin/pull.c:154
+#: builtin/merge.c:216 builtin/pull.c:154
msgid "verify that the named commit has a valid GPG signature"
msgstr ""
-#: builtin/merge.c:218 builtin/notes.c:774 builtin/pull.c:158
-#: builtin/revert.c:89
+#: builtin/merge.c:217 builtin/notes.c:773 builtin/pull.c:158
+#: builtin/revert.c:108
msgid "strategy"
msgstr ""
-#: builtin/merge.c:219 builtin/pull.c:159
+#: builtin/merge.c:218 builtin/pull.c:159
msgid "merge strategy to use"
msgstr ""
-#: builtin/merge.c:220 builtin/pull.c:162
+#: builtin/merge.c:219 builtin/pull.c:162
msgid "option=value"
msgstr ""
-#: builtin/merge.c:221 builtin/pull.c:163
+#: builtin/merge.c:220 builtin/pull.c:163
msgid "option for selected merge strategy"
msgstr ""
-#: builtin/merge.c:223
+#: builtin/merge.c:222
msgid "merge commit message (for a non-fast-forward merge)"
msgstr ""
-#: builtin/merge.c:227
+#: builtin/merge.c:226
msgid "abort the current in-progress merge"
msgstr ""
-#: builtin/merge.c:229
+#: builtin/merge.c:228
msgid "continue the current in-progress merge"
msgstr ""
-#: builtin/merge.c:231 builtin/pull.c:170
+#: builtin/merge.c:230 builtin/pull.c:170
msgid "allow merging unrelated histories"
msgstr ""
-#: builtin/merge.c:259
+#: builtin/merge.c:258
msgid "could not run stash."
msgstr ""
-#: builtin/merge.c:264
+#: builtin/merge.c:263
msgid "stash failed"
msgstr ""
-#: builtin/merge.c:269
+#: builtin/merge.c:268
#, c-format
msgid "not a valid object: %s"
msgstr ""
-#: builtin/merge.c:288 builtin/merge.c:305
+#: builtin/merge.c:287 builtin/merge.c:304
msgid "read-tree failed"
msgstr ""
-#: builtin/merge.c:335
+#: builtin/merge.c:334
msgid " (nothing to squash)"
msgstr ""
-#: builtin/merge.c:346
+#: builtin/merge.c:345
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr ""
-#: builtin/merge.c:396
+#: builtin/merge.c:395
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr ""
-#: builtin/merge.c:447
+#: builtin/merge.c:446
#, c-format
msgid "'%s' does not point to a commit"
msgstr ""
-#: builtin/merge.c:537
+#: builtin/merge.c:536
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr ""
@@ -9144,181 +9384,176 @@
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
-#: builtin/merge.c:867
-#, c-format
-msgid "'%s' is not a commit"
-msgstr ""
-
-#: builtin/merge.c:908
+#: builtin/merge.c:890
msgid "No current branch."
msgstr ""
-#: builtin/merge.c:910
+#: builtin/merge.c:892
msgid "No remote for the current branch."
msgstr ""
-#: builtin/merge.c:912
+#: builtin/merge.c:894
msgid "No default upstream defined for the current branch."
msgstr ""
-#: builtin/merge.c:917
+#: builtin/merge.c:899
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr ""
-#: builtin/merge.c:964
+#: builtin/merge.c:946
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr ""
-#: builtin/merge.c:1038
+#: builtin/merge.c:1020
#, c-format
msgid "could not close '%s'"
msgstr ""
-#: builtin/merge.c:1065
+#: builtin/merge.c:1047
#, c-format
msgid "not something we can merge in %s: %s"
msgstr ""
-#: builtin/merge.c:1099
+#: builtin/merge.c:1081
msgid "not something we can merge"
msgstr ""
-#: builtin/merge.c:1167
+#: builtin/merge.c:1146
msgid "--abort expects no arguments"
msgstr ""
-#: builtin/merge.c:1171
+#: builtin/merge.c:1150
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr ""
-#: builtin/merge.c:1183
+#: builtin/merge.c:1162
msgid "--continue expects no arguments"
msgstr ""
-#: builtin/merge.c:1187
+#: builtin/merge.c:1166
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr ""
-#: builtin/merge.c:1203
+#: builtin/merge.c:1182
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
-#: builtin/merge.c:1210
+#: builtin/merge.c:1189
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
-#: builtin/merge.c:1213
+#: builtin/merge.c:1192
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr ""
-#: builtin/merge.c:1222
+#: builtin/merge.c:1201
msgid "You cannot combine --squash with --no-ff."
msgstr ""
-#: builtin/merge.c:1230
+#: builtin/merge.c:1209
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
-#: builtin/merge.c:1247
+#: builtin/merge.c:1226
msgid "Squash commit into empty head not supported yet"
msgstr ""
-#: builtin/merge.c:1249
+#: builtin/merge.c:1228
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
-#: builtin/merge.c:1254
+#: builtin/merge.c:1233
#, c-format
msgid "%s - not something we can merge"
msgstr ""
-#: builtin/merge.c:1256
+#: builtin/merge.c:1235
msgid "Can merge only exactly one commit into empty head"
msgstr ""
-#: builtin/merge.c:1312
+#: builtin/merge.c:1269
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
-#: builtin/merge.c:1315
+#: builtin/merge.c:1272
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
-#: builtin/merge.c:1318
+#: builtin/merge.c:1275
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr ""
-#: builtin/merge.c:1321
+#: builtin/merge.c:1278
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr ""
-#: builtin/merge.c:1383
+#: builtin/merge.c:1340
msgid "refusing to merge unrelated histories"
msgstr ""
-#: builtin/merge.c:1392
+#: builtin/merge.c:1349
msgid "Already up-to-date."
msgstr ""
-#: builtin/merge.c:1402
+#: builtin/merge.c:1359
#, c-format
msgid "Updating %s..%s\n"
msgstr ""
-#: builtin/merge.c:1443
+#: builtin/merge.c:1400
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr ""
-#: builtin/merge.c:1450
+#: builtin/merge.c:1407
#, c-format
msgid "Nope.\n"
msgstr ""
-#: builtin/merge.c:1475
+#: builtin/merge.c:1432
msgid "Already up-to-date. Yeeah!"
msgstr ""
-#: builtin/merge.c:1481
+#: builtin/merge.c:1438
msgid "Not possible to fast-forward, aborting."
msgstr ""
-#: builtin/merge.c:1504 builtin/merge.c:1583
+#: builtin/merge.c:1461 builtin/merge.c:1540
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr ""
-#: builtin/merge.c:1508
+#: builtin/merge.c:1465
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr ""
-#: builtin/merge.c:1574
+#: builtin/merge.c:1531
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr ""
-#: builtin/merge.c:1576
+#: builtin/merge.c:1533
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr ""
-#: builtin/merge.c:1585
+#: builtin/merge.c:1542
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr ""
-#: builtin/merge.c:1597
+#: builtin/merge.c:1554
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -9369,35 +9604,35 @@
"<orig-file> <file2>"
msgstr ""
-#: builtin/merge-file.c:33
+#: builtin/merge-file.c:32
msgid "send results to standard output"
msgstr ""
-#: builtin/merge-file.c:34
+#: builtin/merge-file.c:33
msgid "use a diff3 based merge"
msgstr ""
-#: builtin/merge-file.c:35
+#: builtin/merge-file.c:34
msgid "for conflicts, use our version"
msgstr ""
-#: builtin/merge-file.c:37
+#: builtin/merge-file.c:36
msgid "for conflicts, use their version"
msgstr ""
-#: builtin/merge-file.c:39
+#: builtin/merge-file.c:38
msgid "for conflicts, use a union version"
msgstr ""
-#: builtin/merge-file.c:42
+#: builtin/merge-file.c:41
msgid "for conflicts, use this marker size"
msgstr ""
-#: builtin/merge-file.c:43
+#: builtin/merge-file.c:42
msgid "do not warn about conflicts"
msgstr ""
-#: builtin/merge-file.c:45
+#: builtin/merge-file.c:44
msgid "set labels for file1/orig-file/file2"
msgstr ""
@@ -9540,43 +9775,47 @@
msgid "renaming '%s' failed"
msgstr ""
-#: builtin/name-rev.c:257
+#: builtin/name-rev.c:289
msgid "git name-rev [<options>] <commit>..."
msgstr ""
-#: builtin/name-rev.c:258
+#: builtin/name-rev.c:290
msgid "git name-rev [<options>] --all"
msgstr ""
-#: builtin/name-rev.c:259
+#: builtin/name-rev.c:291
msgid "git name-rev [<options>] --stdin"
msgstr ""
-#: builtin/name-rev.c:311
+#: builtin/name-rev.c:346
msgid "print only names (no SHA-1)"
msgstr ""
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:347
msgid "only use tags to name the commits"
msgstr ""
-#: builtin/name-rev.c:314
+#: builtin/name-rev.c:349
msgid "only use refs matching <pattern>"
msgstr ""
-#: builtin/name-rev.c:316
+#: builtin/name-rev.c:351
+msgid "ignore refs matching <pattern>"
+msgstr ""
+
+#: builtin/name-rev.c:353
msgid "list all commits reachable from all refs"
msgstr ""
-#: builtin/name-rev.c:317
+#: builtin/name-rev.c:354
msgid "read from stdin"
msgstr ""
-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:355
msgid "allow to print `undefined` names (default)"
msgstr ""
-#: builtin/name-rev.c:324
+#: builtin/name-rev.c:361
msgid "dereference tags in the input (internal use)"
msgstr ""
@@ -9716,19 +9955,19 @@
msgid "the note contents have been left in %s"
msgstr ""
-#: builtin/notes.c:233 builtin/tag.c:460
+#: builtin/notes.c:233 builtin/tag.c:516
#, c-format
msgid "cannot read '%s'"
msgstr ""
-#: builtin/notes.c:235 builtin/tag.c:463
+#: builtin/notes.c:235 builtin/tag.c:519
#, c-format
msgid "could not open or read '%s'"
msgstr ""
#: 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:659
+#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:658
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr ""
@@ -9761,12 +10000,12 @@
msgstr ""
#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496
-#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:652
-#: builtin/notes.c:802 builtin/notes.c:949 builtin/notes.c:970
+#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:651
+#: builtin/notes.c:801 builtin/notes.c:948 builtin/notes.c:969
msgid "too many parameters"
msgstr ""
-#: builtin/notes.c:378 builtin/notes.c:665
+#: builtin/notes.c:378 builtin/notes.c:664
#, c-format
msgid "no note found for object %s."
msgstr ""
@@ -9807,7 +10046,7 @@
msgid "Overwriting existing notes for object %s\n"
msgstr ""
-#: builtin/notes.c:463 builtin/notes.c:624 builtin/notes.c:889
+#: builtin/notes.c:463 builtin/notes.c:623 builtin/notes.c:888
#, c-format
msgid "Removing note for object %s\n"
msgstr ""
@@ -9843,97 +10082,97 @@
"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
msgstr ""
-#: builtin/notes.c:685
+#: builtin/notes.c:684
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr ""
-#: builtin/notes.c:687
+#: builtin/notes.c:686
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr ""
-#: builtin/notes.c:689
+#: builtin/notes.c:688
msgid "failed to remove 'git notes merge' worktree"
msgstr ""
-#: builtin/notes.c:709
+#: builtin/notes.c:708
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr ""
-#: builtin/notes.c:711
+#: builtin/notes.c:710
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr ""
-#: builtin/notes.c:713
+#: builtin/notes.c:712
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr ""
-#: builtin/notes.c:726
+#: builtin/notes.c:725
msgid "failed to resolve NOTES_MERGE_REF"
msgstr ""
-#: builtin/notes.c:729
+#: builtin/notes.c:728
msgid "failed to finalize notes merge"
msgstr ""
-#: builtin/notes.c:755
+#: builtin/notes.c:754
#, c-format
msgid "unknown notes merge strategy %s"
msgstr ""
-#: builtin/notes.c:771
+#: builtin/notes.c:770
msgid "General options"
msgstr ""
-#: builtin/notes.c:773
+#: builtin/notes.c:772
msgid "Merge options"
msgstr ""
-#: builtin/notes.c:775
+#: builtin/notes.c:774
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
msgstr ""
-#: builtin/notes.c:777
+#: builtin/notes.c:776
msgid "Committing unmerged notes"
msgstr ""
-#: builtin/notes.c:779
+#: builtin/notes.c:778
msgid "finalize notes merge by committing unmerged notes"
msgstr ""
-#: builtin/notes.c:781
+#: builtin/notes.c:780
msgid "Aborting notes merge resolution"
msgstr ""
-#: builtin/notes.c:783
+#: builtin/notes.c:782
msgid "abort notes merge"
msgstr ""
-#: builtin/notes.c:794
+#: builtin/notes.c:793
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr ""
-#: builtin/notes.c:799
+#: builtin/notes.c:798
msgid "must specify a notes ref to merge"
msgstr ""
-#: builtin/notes.c:823
+#: builtin/notes.c:822
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr ""
-#: builtin/notes.c:860
+#: builtin/notes.c:859
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr ""
-#: builtin/notes.c:863
+#: builtin/notes.c:862
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr ""
-#: builtin/notes.c:865
+#: builtin/notes.c:864
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -9941,36 +10180,36 @@
"abort'.\n"
msgstr ""
-#: builtin/notes.c:887
+#: builtin/notes.c:886
#, c-format
msgid "Object %s has no note\n"
msgstr ""
-#: builtin/notes.c:899
+#: builtin/notes.c:898
msgid "attempt to remove non-existent note is not an error"
msgstr ""
-#: builtin/notes.c:902
+#: builtin/notes.c:901
msgid "read object names from the standard input"
msgstr ""
-#: builtin/notes.c:940 builtin/prune.c:105 builtin/worktree.c:127
+#: builtin/notes.c:939 builtin/prune.c:105 builtin/worktree.c:127
msgid "do not remove, show only"
msgstr ""
-#: builtin/notes.c:941
+#: builtin/notes.c:940
msgid "report pruned notes"
msgstr ""
-#: builtin/notes.c:983
+#: builtin/notes.c:982
msgid "notes-ref"
msgstr ""
-#: builtin/notes.c:984
+#: builtin/notes.c:983
msgid "use notes from <notes-ref>"
msgstr ""
-#: builtin/notes.c:1019
+#: builtin/notes.c:1018
#, c-format
msgid "unknown subcommand: %s"
msgstr ""
@@ -9990,169 +10229,169 @@
msgid "deflate error (%d)"
msgstr ""
-#: builtin/pack-objects.c:766
+#: builtin/pack-objects.c:770
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
-#: builtin/pack-objects.c:779
+#: builtin/pack-objects.c:783
msgid "Writing objects"
msgstr ""
-#: builtin/pack-objects.c:1068
+#: builtin/pack-objects.c:1063
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
-#: builtin/pack-objects.c:2344
+#: builtin/pack-objects.c:2426
msgid "Compressing objects"
msgstr ""
-#: builtin/pack-objects.c:2747
+#: builtin/pack-objects.c:2829
#, c-format
msgid "unsupported index version %s"
msgstr ""
-#: builtin/pack-objects.c:2751
+#: builtin/pack-objects.c:2833
#, c-format
msgid "bad index version '%s'"
msgstr ""
-#: builtin/pack-objects.c:2781
+#: builtin/pack-objects.c:2863
msgid "do not show progress meter"
msgstr ""
-#: builtin/pack-objects.c:2783
+#: builtin/pack-objects.c:2865
msgid "show progress meter"
msgstr ""
-#: builtin/pack-objects.c:2785
+#: builtin/pack-objects.c:2867
msgid "show progress meter during object writing phase"
msgstr ""
-#: builtin/pack-objects.c:2788
+#: builtin/pack-objects.c:2870
msgid "similar to --all-progress when progress meter is shown"
msgstr ""
-#: builtin/pack-objects.c:2789
+#: builtin/pack-objects.c:2871
msgid "version[,offset]"
msgstr ""
-#: builtin/pack-objects.c:2790
+#: builtin/pack-objects.c:2872
msgid "write the pack index file in the specified idx format version"
msgstr ""
-#: builtin/pack-objects.c:2793
+#: builtin/pack-objects.c:2875
msgid "maximum size of each output pack file"
msgstr ""
-#: builtin/pack-objects.c:2795
+#: builtin/pack-objects.c:2877
msgid "ignore borrowed objects from alternate object store"
msgstr ""
-#: builtin/pack-objects.c:2797
+#: builtin/pack-objects.c:2879
msgid "ignore packed objects"
msgstr ""
-#: builtin/pack-objects.c:2799
+#: builtin/pack-objects.c:2881
msgid "limit pack window by objects"
msgstr ""
-#: builtin/pack-objects.c:2801
+#: builtin/pack-objects.c:2883
msgid "limit pack window by memory in addition to object limit"
msgstr ""
-#: builtin/pack-objects.c:2803
+#: builtin/pack-objects.c:2885
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
-#: builtin/pack-objects.c:2805
+#: builtin/pack-objects.c:2887
msgid "reuse existing deltas"
msgstr ""
-#: builtin/pack-objects.c:2807
+#: builtin/pack-objects.c:2889
msgid "reuse existing objects"
msgstr ""
-#: builtin/pack-objects.c:2809
+#: builtin/pack-objects.c:2891
msgid "use OFS_DELTA objects"
msgstr ""
-#: builtin/pack-objects.c:2811
+#: builtin/pack-objects.c:2893
msgid "use threads when searching for best delta matches"
msgstr ""
-#: builtin/pack-objects.c:2813
+#: builtin/pack-objects.c:2895
msgid "do not create an empty pack output"
msgstr ""
-#: builtin/pack-objects.c:2815
+#: builtin/pack-objects.c:2897
msgid "read revision arguments from standard input"
msgstr ""
-#: builtin/pack-objects.c:2817
+#: builtin/pack-objects.c:2899
msgid "limit the objects to those that are not yet packed"
msgstr ""
-#: builtin/pack-objects.c:2820
+#: builtin/pack-objects.c:2902
msgid "include objects reachable from any reference"
msgstr ""
-#: builtin/pack-objects.c:2823
+#: builtin/pack-objects.c:2905
msgid "include objects referred by reflog entries"
msgstr ""
-#: builtin/pack-objects.c:2826
+#: builtin/pack-objects.c:2908
msgid "include objects referred to by the index"
msgstr ""
-#: builtin/pack-objects.c:2829
+#: builtin/pack-objects.c:2911
msgid "output pack to stdout"
msgstr ""
-#: builtin/pack-objects.c:2831
+#: builtin/pack-objects.c:2913
msgid "include tag objects that refer to objects to be packed"
msgstr ""
-#: builtin/pack-objects.c:2833
+#: builtin/pack-objects.c:2915
msgid "keep unreachable objects"
msgstr ""
-#: builtin/pack-objects.c:2835
+#: builtin/pack-objects.c:2917
msgid "pack loose unreachable objects"
msgstr ""
-#: builtin/pack-objects.c:2837
+#: builtin/pack-objects.c:2919
msgid "unpack unreachable objects newer than <time>"
msgstr ""
-#: builtin/pack-objects.c:2840
+#: builtin/pack-objects.c:2922
msgid "create thin packs"
msgstr ""
-#: builtin/pack-objects.c:2842
+#: builtin/pack-objects.c:2924
msgid "create packs suitable for shallow fetches"
msgstr ""
-#: builtin/pack-objects.c:2844
+#: builtin/pack-objects.c:2926
msgid "ignore packs that have companion .keep file"
msgstr ""
-#: builtin/pack-objects.c:2846
+#: builtin/pack-objects.c:2928
msgid "pack compression level"
msgstr ""
-#: builtin/pack-objects.c:2848
+#: builtin/pack-objects.c:2930
msgid "do not hide commits by grafts"
msgstr ""
-#: builtin/pack-objects.c:2850
+#: builtin/pack-objects.c:2932
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
-#: builtin/pack-objects.c:2852
+#: builtin/pack-objects.c:2934
msgid "write a bitmap index together with the pack index"
msgstr ""
-#: builtin/pack-objects.c:2979
+#: builtin/pack-objects.c:3061
msgid "Counting objects"
msgstr ""
@@ -10209,7 +10448,7 @@
msgid "incorporate changes by rebasing rather than merging"
msgstr ""
-#: builtin/pull.c:148 builtin/revert.c:101
+#: builtin/pull.c:148 builtin/rebase--helper.c:18 builtin/revert.c:120
msgid "allow fast-forward"
msgstr ""
@@ -10276,7 +10515,7 @@
msgid "<remote>"
msgstr ""
-#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:455
+#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:456
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr ""
@@ -10502,11 +10741,11 @@
msgid "repository"
msgstr ""
-#: builtin/push.c:519 builtin/send-pack.c:161
+#: builtin/push.c:519 builtin/send-pack.c:162
msgid "push all refs"
msgstr ""
-#: builtin/push.c:520 builtin/send-pack.c:163
+#: builtin/push.c:520 builtin/send-pack.c:164
msgid "mirror all refs"
msgstr ""
@@ -10518,15 +10757,15 @@
msgid "push tags (can't be used with --all or --mirror)"
msgstr ""
-#: builtin/push.c:526 builtin/send-pack.c:164
+#: builtin/push.c:526 builtin/send-pack.c:165
msgid "force updates"
msgstr ""
-#: builtin/push.c:528 builtin/send-pack.c:175
+#: builtin/push.c:528 builtin/send-pack.c:179
msgid "refname>:<expect"
msgstr ""
-#: builtin/push.c:529 builtin/send-pack.c:176
+#: builtin/push.c:529 builtin/send-pack.c:180
msgid "require old value of ref to be at this value"
msgstr ""
@@ -10534,12 +10773,12 @@
msgid "control recursive pushing of submodules"
msgstr ""
-#: builtin/push.c:534 builtin/send-pack.c:169
+#: builtin/push.c:534 builtin/send-pack.c:173
msgid "use thin pack"
msgstr ""
-#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:158
-#: builtin/send-pack.c:159
+#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:159
+#: builtin/send-pack.c:160
msgid "receive pack program"
msgstr ""
@@ -10559,19 +10798,19 @@
msgid "push missing but relevant tags"
msgstr ""
-#: builtin/push.c:546 builtin/send-pack.c:166
+#: builtin/push.c:546 builtin/send-pack.c:167
msgid "GPG sign the push"
msgstr ""
-#: builtin/push.c:548 builtin/send-pack.c:170
+#: builtin/push.c:548 builtin/send-pack.c:174
msgid "request atomic transaction on remote side"
msgstr ""
-#: builtin/push.c:549
+#: builtin/push.c:549 builtin/send-pack.c:170
msgid "server-specific"
msgstr ""
-#: builtin/push.c:549
+#: builtin/push.c:549 builtin/send-pack.c:171
msgid "option to transmit"
msgstr ""
@@ -10587,82 +10826,94 @@
msgid "push options must not have new line characters"
msgstr ""
-#: builtin/read-tree.c:37
+#: 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>]])"
msgstr ""
-#: builtin/read-tree.c:110
+#: builtin/read-tree.c:130
msgid "write resulting index to <file>"
msgstr ""
-#: builtin/read-tree.c:113
+#: builtin/read-tree.c:133
msgid "only empty the index"
msgstr ""
-#: builtin/read-tree.c:115
+#: builtin/read-tree.c:135
msgid "Merging"
msgstr ""
-#: builtin/read-tree.c:117
+#: builtin/read-tree.c:137
msgid "perform a merge in addition to a read"
msgstr ""
-#: builtin/read-tree.c:119
+#: builtin/read-tree.c:139
msgid "3-way merge if no file level merging required"
msgstr ""
-#: builtin/read-tree.c:121
+#: builtin/read-tree.c:141
msgid "3-way merge in presence of adds and removes"
msgstr ""
-#: builtin/read-tree.c:123
+#: builtin/read-tree.c:143
msgid "same as -m, but discard unmerged entries"
msgstr ""
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:144
msgid "<subdirectory>/"
msgstr ""
-#: builtin/read-tree.c:125
+#: builtin/read-tree.c:145
msgid "read the tree into the index under <subdirectory>/"
msgstr ""
-#: builtin/read-tree.c:128
+#: builtin/read-tree.c:148
msgid "update working tree with merge result"
msgstr ""
-#: builtin/read-tree.c:130
+#: builtin/read-tree.c:150
msgid "gitignore"
msgstr ""
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:151
msgid "allow explicitly ignored files to be overwritten"
msgstr ""
-#: builtin/read-tree.c:134
+#: builtin/read-tree.c:154
msgid "don't check the working tree after merging"
msgstr ""
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:155
msgid "don't update the index or the work tree"
msgstr ""
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:157
msgid "skip applying sparse checkout filter"
msgstr ""
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:159
msgid "debug unpack-trees"
msgstr ""
-#: builtin/receive-pack.c:26
+#: builtin/rebase--helper.c:7
+msgid "git rebase--helper [<options>]"
+msgstr ""
+
+#: builtin/rebase--helper.c:19
+msgid "continue rebase"
+msgstr ""
+
+#: builtin/rebase--helper.c:21
+msgid "abort rebase"
+msgstr ""
+
+#: builtin/receive-pack.c:27
msgid "git receive-pack <git-dir>"
msgstr ""
-#: builtin/receive-pack.c:793
+#: builtin/receive-pack.c:795
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"
@@ -10679,7 +10930,7 @@
"'receive.denyCurrentBranch' configuration variable to 'refuse'."
msgstr ""
-#: builtin/receive-pack.c:813
+#: builtin/receive-pack.c:815
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"
@@ -10691,11 +10942,11 @@
"To squelch this message, you can set it to 'refuse'."
msgstr ""
-#: builtin/receive-pack.c:1883
+#: builtin/receive-pack.c:1888
msgid "quiet"
msgstr ""
-#: builtin/receive-pack.c:1897
+#: builtin/receive-pack.c:1902
msgid "You must specify a directory."
msgstr ""
@@ -10868,7 +11119,7 @@
msgid "(delete)"
msgstr ""
-#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:854
+#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:856
#, c-format
msgid "No such remote: %s"
msgstr ""
@@ -10896,7 +11147,7 @@
msgid "creating '%s' failed"
msgstr ""
-#: builtin/remote.c:792
+#: builtin/remote.c:794
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -10906,296 +11157,296 @@
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:806
+#: builtin/remote.c:808
#, c-format
msgid "Could not remove config section '%s'"
msgstr ""
-#: builtin/remote.c:907
+#: builtin/remote.c:909
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr ""
-#: builtin/remote.c:910
+#: builtin/remote.c:912
msgid " tracked"
msgstr ""
-#: builtin/remote.c:912
+#: builtin/remote.c:914
msgid " stale (use 'git remote prune' to remove)"
msgstr ""
-#: builtin/remote.c:914
+#: builtin/remote.c:916
msgid " ???"
msgstr ""
-#: builtin/remote.c:955
+#: builtin/remote.c:957
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr ""
-#: builtin/remote.c:963
+#: builtin/remote.c:965
#, c-format
msgid "rebases interactively onto remote %s"
msgstr ""
-#: builtin/remote.c:964
+#: builtin/remote.c:966
#, c-format
msgid "rebases onto remote %s"
msgstr ""
-#: builtin/remote.c:967
+#: builtin/remote.c:969
#, c-format
msgid " merges with remote %s"
msgstr ""
-#: builtin/remote.c:970
+#: builtin/remote.c:972
#, c-format
msgid "merges with remote %s"
msgstr ""
-#: builtin/remote.c:973
+#: builtin/remote.c:975
#, c-format
msgid "%-*s and with remote %s\n"
msgstr ""
-#: builtin/remote.c:1016
+#: builtin/remote.c:1018
msgid "create"
msgstr ""
-#: builtin/remote.c:1019
+#: builtin/remote.c:1021
msgid "delete"
msgstr ""
-#: builtin/remote.c:1023
+#: builtin/remote.c:1025
msgid "up to date"
msgstr ""
-#: builtin/remote.c:1026
+#: builtin/remote.c:1028
msgid "fast-forwardable"
msgstr ""
-#: builtin/remote.c:1029
+#: builtin/remote.c:1031
msgid "local out of date"
msgstr ""
-#: builtin/remote.c:1036
+#: builtin/remote.c:1038
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr ""
-#: builtin/remote.c:1039
+#: builtin/remote.c:1041
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr ""
-#: builtin/remote.c:1043
+#: builtin/remote.c:1045
#, c-format
msgid " %-*s forces to %s"
msgstr ""
-#: builtin/remote.c:1046
+#: builtin/remote.c:1048
#, c-format
msgid " %-*s pushes to %s"
msgstr ""
-#: builtin/remote.c:1114
+#: builtin/remote.c:1116
msgid "do not query remotes"
msgstr ""
-#: builtin/remote.c:1141
+#: builtin/remote.c:1143
#, c-format
msgid "* remote %s"
msgstr ""
-#: builtin/remote.c:1142
+#: builtin/remote.c:1144
#, c-format
msgid " Fetch URL: %s"
msgstr ""
-#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1295
+#: builtin/remote.c:1145 builtin/remote.c:1158 builtin/remote.c:1297
msgid "(no URL)"
msgstr ""
#. TRANSLATORS: the colon ':' should align with
#. the one in " Fetch URL: %s" translation
-#: builtin/remote.c:1154 builtin/remote.c:1156
+#: builtin/remote.c:1156 builtin/remote.c:1158
#, c-format
msgid " Push URL: %s"
msgstr ""
-#: builtin/remote.c:1158 builtin/remote.c:1160 builtin/remote.c:1162
+#: builtin/remote.c:1160 builtin/remote.c:1162 builtin/remote.c:1164
#, c-format
msgid " HEAD branch: %s"
msgstr ""
-#: builtin/remote.c:1158
+#: builtin/remote.c:1160
msgid "(not queried)"
msgstr ""
-#: builtin/remote.c:1160
+#: builtin/remote.c:1162
msgid "(unknown)"
msgstr ""
-#: builtin/remote.c:1164
+#: builtin/remote.c:1166
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr ""
-#: builtin/remote.c:1176
+#: builtin/remote.c:1178
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:1179 builtin/remote.c:1205
+#: builtin/remote.c:1181 builtin/remote.c:1207
msgid " (status not queried)"
msgstr ""
-#: builtin/remote.c:1188
+#: builtin/remote.c:1190
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:1196
+#: builtin/remote.c:1198
msgid " Local refs will be mirrored by 'git push'"
msgstr ""
-#: builtin/remote.c:1202
+#: builtin/remote.c:1204
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:1223
+#: builtin/remote.c:1225
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr ""
-#: builtin/remote.c:1225
+#: builtin/remote.c:1227
msgid "delete refs/remotes/<name>/HEAD"
msgstr ""
-#: builtin/remote.c:1240
+#: builtin/remote.c:1242
msgid "Cannot determine remote HEAD"
msgstr ""
-#: builtin/remote.c:1242
+#: builtin/remote.c:1244
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
-#: builtin/remote.c:1252
+#: builtin/remote.c:1254
#, c-format
msgid "Could not delete %s"
msgstr ""
-#: builtin/remote.c:1260
+#: builtin/remote.c:1262
#, c-format
msgid "Not a valid ref: %s"
msgstr ""
-#: builtin/remote.c:1262
+#: builtin/remote.c:1264
#, c-format
msgid "Could not setup %s"
msgstr ""
-#: builtin/remote.c:1280
+#: builtin/remote.c:1282
#, c-format
msgid " %s will become dangling!"
msgstr ""
-#: builtin/remote.c:1281
+#: builtin/remote.c:1283
#, c-format
msgid " %s has become dangling!"
msgstr ""
-#: builtin/remote.c:1291
+#: builtin/remote.c:1293
#, c-format
msgid "Pruning %s"
msgstr ""
-#: builtin/remote.c:1292
+#: builtin/remote.c:1294
#, c-format
msgid "URL: %s"
msgstr ""
-#: builtin/remote.c:1308
+#: builtin/remote.c:1310
#, c-format
msgid " * [would prune] %s"
msgstr ""
-#: builtin/remote.c:1311
+#: builtin/remote.c:1313
#, c-format
msgid " * [pruned] %s"
msgstr ""
-#: builtin/remote.c:1356
+#: builtin/remote.c:1358
msgid "prune remotes after fetching"
msgstr ""
-#: builtin/remote.c:1419 builtin/remote.c:1473 builtin/remote.c:1541
+#: builtin/remote.c:1421 builtin/remote.c:1475 builtin/remote.c:1543
#, c-format
msgid "No such remote '%s'"
msgstr ""
-#: builtin/remote.c:1435
+#: builtin/remote.c:1437
msgid "add branch"
msgstr ""
-#: builtin/remote.c:1442
+#: builtin/remote.c:1444
msgid "no remote specified"
msgstr ""
-#: builtin/remote.c:1459
+#: builtin/remote.c:1461
msgid "query push URLs rather than fetch URLs"
msgstr ""
-#: builtin/remote.c:1461
+#: builtin/remote.c:1463
msgid "return all URLs"
msgstr ""
-#: builtin/remote.c:1489
+#: builtin/remote.c:1491
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr ""
-#: builtin/remote.c:1515
+#: builtin/remote.c:1517
msgid "manipulate push URLs"
msgstr ""
-#: builtin/remote.c:1517
+#: builtin/remote.c:1519
msgid "add URL"
msgstr ""
-#: builtin/remote.c:1519
+#: builtin/remote.c:1521
msgid "delete URLs"
msgstr ""
-#: builtin/remote.c:1526
+#: builtin/remote.c:1528
msgid "--add --delete doesn't make sense"
msgstr ""
-#: builtin/remote.c:1567
+#: builtin/remote.c:1569
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr ""
-#: builtin/remote.c:1575
+#: builtin/remote.c:1577
#, c-format
msgid "No such URL found: %s"
msgstr ""
-#: builtin/remote.c:1577
+#: builtin/remote.c:1579
msgid "Will not delete all non-push URLs"
msgstr ""
-#: builtin/remote.c:1591
+#: builtin/remote.c:1593
msgid "be verbose; must be placed before a subcommand"
msgstr ""
-#: builtin/remote.c:1622
+#: builtin/remote.c:1624
#, c-format
msgid "Unknown subcommand: %s"
msgstr ""
@@ -11311,67 +11562,67 @@
msgid "git replace [--format=<format>] [-l [<pattern>]]"
msgstr ""
-#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
+#: builtin/replace.c:330 builtin/replace.c:368 builtin/replace.c:396
#, c-format
msgid "Not a valid object name: '%s'"
msgstr ""
-#: builtin/replace.c:355
+#: builtin/replace.c:360
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr ""
-#: builtin/replace.c:357
+#: builtin/replace.c:362
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr ""
-#: builtin/replace.c:368
+#: builtin/replace.c:373
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
"instead of --graft"
msgstr ""
-#: builtin/replace.c:401
+#: builtin/replace.c:406
#, c-format
msgid "the original commit '%s' has a gpg signature."
msgstr ""
-#: builtin/replace.c:402
+#: builtin/replace.c:407
msgid "the signature will be removed in the replacement commit!"
msgstr ""
-#: builtin/replace.c:408
+#: builtin/replace.c:413
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr ""
-#: builtin/replace.c:432
+#: builtin/replace.c:437
msgid "list replace refs"
msgstr ""
-#: builtin/replace.c:433
+#: builtin/replace.c:438
msgid "delete replace refs"
msgstr ""
-#: builtin/replace.c:434
+#: builtin/replace.c:439
msgid "edit existing object"
msgstr ""
-#: builtin/replace.c:435
+#: builtin/replace.c:440
msgid "change a commit's parents"
msgstr ""
-#: builtin/replace.c:436
+#: builtin/replace.c:441
msgid "replace the ref if it exists"
msgstr ""
-#: builtin/replace.c:437
+#: builtin/replace.c:442
msgid "do not pretty-print contents for --edit"
msgstr ""
-#: builtin/replace.c:438
+#: builtin/replace.c:443
msgid "use this format"
msgstr ""
@@ -11512,23 +11763,23 @@
msgid "rev-list does not support display of notes"
msgstr ""
-#: builtin/rev-parse.c:391
+#: builtin/rev-parse.c:393
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr ""
-#: builtin/rev-parse.c:396
+#: builtin/rev-parse.c:398
msgid "keep the `--` passed as an arg"
msgstr ""
-#: builtin/rev-parse.c:398
+#: builtin/rev-parse.c:400
msgid "stop parsing after the first non-option argument"
msgstr ""
-#: builtin/rev-parse.c:401
+#: builtin/rev-parse.c:403
msgid "output in stuck long form"
msgstr ""
-#: builtin/rev-parse.c:532
+#: builtin/rev-parse.c:534
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
@@ -11553,68 +11804,72 @@
msgid "git cherry-pick <subcommand>"
msgstr ""
-#: builtin/revert.c:71
+#: builtin/revert.c:89
#, c-format
msgid "%s: %s cannot be used with %s"
msgstr ""
-#: builtin/revert.c:80
+#: builtin/revert.c:98
msgid "end revert or cherry-pick sequence"
msgstr ""
-#: builtin/revert.c:81
+#: builtin/revert.c:99
msgid "resume revert or cherry-pick sequence"
msgstr ""
-#: builtin/revert.c:82
+#: builtin/revert.c:100
msgid "cancel revert or cherry-pick sequence"
msgstr ""
-#: builtin/revert.c:83
+#: builtin/revert.c:101
msgid "don't automatically commit"
msgstr ""
-#: builtin/revert.c:84
+#: builtin/revert.c:102
msgid "edit the commit message"
msgstr ""
-#: builtin/revert.c:87
-msgid "parent number"
+#: builtin/revert.c:105
+msgid "parent-number"
msgstr ""
-#: builtin/revert.c:89
+#: builtin/revert.c:106
+msgid "select mainline parent"
+msgstr ""
+
+#: builtin/revert.c:108
msgid "merge strategy"
msgstr ""
-#: builtin/revert.c:90
+#: builtin/revert.c:109
msgid "option"
msgstr ""
-#: builtin/revert.c:91
+#: builtin/revert.c:110
msgid "option for merge strategy"
msgstr ""
-#: builtin/revert.c:100
+#: builtin/revert.c:119
msgid "append commit name"
msgstr ""
-#: builtin/revert.c:102
+#: builtin/revert.c:121
msgid "preserve initially empty commits"
msgstr ""
-#: builtin/revert.c:103
+#: builtin/revert.c:122
msgid "allow commits with empty messages"
msgstr ""
-#: builtin/revert.c:104
+#: builtin/revert.c:123
msgid "keep redundant, empty commits"
msgstr ""
-#: builtin/revert.c:192
+#: builtin/revert.c:211
msgid "revert failed"
msgstr ""
-#: builtin/revert.c:205
+#: builtin/revert.c:224
msgid "cherry-pick failed"
msgstr ""
@@ -11699,19 +11954,19 @@
" --all and explicit <ref> specification are mutually exclusive."
msgstr ""
-#: builtin/send-pack.c:160
+#: builtin/send-pack.c:161
msgid "remote name"
msgstr ""
-#: builtin/send-pack.c:171
+#: builtin/send-pack.c:175
msgid "use stateless RPC protocol"
msgstr ""
-#: builtin/send-pack.c:172
+#: builtin/send-pack.c:176
msgid "read refs from stdin"
msgstr ""
-#: builtin/send-pack.c:173
+#: builtin/send-pack.c:177
msgid "print status from remote helper"
msgstr ""
@@ -11719,27 +11974,27 @@
msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
msgstr ""
-#: builtin/shortlog.c:249
+#: builtin/shortlog.c:248
msgid "Group by committer rather than author"
msgstr ""
-#: builtin/shortlog.c:251
+#: builtin/shortlog.c:250
msgid "sort output according to the number of commits per author"
msgstr ""
-#: builtin/shortlog.c:253
+#: builtin/shortlog.c:252
msgid "Suppress commit descriptions, only provides commit count"
msgstr ""
-#: builtin/shortlog.c:255
+#: builtin/shortlog.c:254
msgid "Show the email address of each author"
msgstr ""
-#: builtin/shortlog.c:256
+#: builtin/shortlog.c:255
msgid "w[,i1[,i2]]"
msgstr ""
-#: builtin/shortlog.c:257
+#: builtin/shortlog.c:256
msgid "Linewrap output"
msgstr ""
@@ -11755,120 +12010,120 @@
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr ""
-#: builtin/show-branch.c:375
+#: builtin/show-branch.c:374
#, c-format
msgid "ignoring %s; cannot handle more than %d ref"
msgid_plural "ignoring %s; cannot handle more than %d refs"
msgstr[0] ""
msgstr[1] ""
-#: builtin/show-branch.c:541
+#: builtin/show-branch.c:536
#, c-format
msgid "no matching refs with %s"
msgstr ""
-#: builtin/show-branch.c:639
+#: builtin/show-branch.c:632
msgid "show remote-tracking and local branches"
msgstr ""
-#: builtin/show-branch.c:641
+#: builtin/show-branch.c:634
msgid "show remote-tracking branches"
msgstr ""
-#: builtin/show-branch.c:643
+#: builtin/show-branch.c:636
msgid "color '*!+-' corresponding to the branch"
msgstr ""
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:638
msgid "show <n> more commits after the common ancestor"
msgstr ""
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:640
msgid "synonym to more=-1"
msgstr ""
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:641
msgid "suppress naming strings"
msgstr ""
-#: builtin/show-branch.c:650
+#: builtin/show-branch.c:643
msgid "include the current branch"
msgstr ""
-#: builtin/show-branch.c:652
+#: builtin/show-branch.c:645
msgid "name commits with their object names"
msgstr ""
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:647
msgid "show possible merge bases"
msgstr ""
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:649
msgid "show refs unreachable from any other ref"
msgstr ""
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:651
msgid "show commits in topological order"
msgstr ""
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:654
msgid "show only commits not on the first branch"
msgstr ""
-#: builtin/show-branch.c:663
+#: builtin/show-branch.c:656
msgid "show merges reachable from only one tip"
msgstr ""
-#: builtin/show-branch.c:665
+#: builtin/show-branch.c:658
msgid "topologically sort, maintaining date order where possible"
msgstr ""
-#: builtin/show-branch.c:668
+#: builtin/show-branch.c:661
msgid "<n>[,<base>]"
msgstr ""
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:662
msgid "show <n> most recent ref-log entries starting at base"
msgstr ""
-#: builtin/show-branch.c:703
+#: builtin/show-branch.c:696
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr ""
-#: builtin/show-branch.c:727
+#: builtin/show-branch.c:720
msgid "no branches given, and HEAD is not valid"
msgstr ""
-#: builtin/show-branch.c:730
+#: builtin/show-branch.c:723
msgid "--reflog option needs one branch name"
msgstr ""
-#: builtin/show-branch.c:733
+#: builtin/show-branch.c:726
#, 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] ""
msgstr[1] ""
-#: builtin/show-branch.c:737
+#: builtin/show-branch.c:730
#, c-format
msgid "no such ref %s"
msgstr ""
-#: builtin/show-branch.c:829
+#: builtin/show-branch.c:814
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] ""
msgstr[1] ""
-#: builtin/show-branch.c:833
+#: builtin/show-branch.c:818
#, c-format
msgid "'%s' is not a valid ref."
msgstr ""
-#: builtin/show-branch.c:836
+#: builtin/show-branch.c:821
#, c-format
msgid "cannot find commit %s (%s)"
msgstr ""
@@ -11931,12 +12186,12 @@
msgid "prepend comment character and space to each line"
msgstr ""
-#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1062
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1075
#, c-format
msgid "No such ref: %s"
msgstr ""
-#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1071
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1084
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr ""
@@ -11946,207 +12201,204 @@
msgid "cannot strip one component off url '%s'"
msgstr ""
-#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:592
+#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630
msgid "alternative anchor for relative paths"
msgstr ""
-#: builtin/submodule--helper.c:287
+#: builtin/submodule--helper.c:310
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:333 builtin/submodule--helper.c:347
+#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr ""
-#: builtin/submodule--helper.c:373
+#: builtin/submodule--helper.c:395
+#, c-format
+msgid ""
+"could not lookup configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr ""
+
+#: builtin/submodule--helper.c:406
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:377
+#: builtin/submodule--helper.c:410
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:387
+#: builtin/submodule--helper.c:420
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:394
+#: builtin/submodule--helper.c:427
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:410
+#: builtin/submodule--helper.c:443
msgid "Suppress output for initializing a submodule"
msgstr ""
-#: builtin/submodule--helper.c:415
+#: builtin/submodule--helper.c:448
msgid "git submodule--helper init [<path>]"
msgstr ""
-#: builtin/submodule--helper.c:436
+#: builtin/submodule--helper.c:476
msgid "git submodule--helper name <path>"
msgstr ""
-#: builtin/submodule--helper.c:442
+#: builtin/submodule--helper.c:482
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:525 builtin/submodule--helper.c:528
+#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr ""
-#: builtin/submodule--helper.c:564
+#: builtin/submodule--helper.c:604
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr ""
-#: builtin/submodule--helper.c:571
+#: builtin/submodule--helper.c:611
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr ""
-#: builtin/submodule--helper.c:595
+#: builtin/submodule--helper.c:633
msgid "where the new submodule will be cloned to"
msgstr ""
-#: builtin/submodule--helper.c:598
+#: builtin/submodule--helper.c:636
msgid "name of the new submodule"
msgstr ""
-#: builtin/submodule--helper.c:601
+#: builtin/submodule--helper.c:639
msgid "url where to clone the submodule from"
msgstr ""
-#: builtin/submodule--helper.c:607
+#: builtin/submodule--helper.c:645
msgid "depth for shallow clones"
msgstr ""
-#: builtin/submodule--helper.c:610 builtin/submodule--helper.c:980
+#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993
msgid "force cloning progress"
msgstr ""
-#: builtin/submodule--helper.c:615
+#: builtin/submodule--helper.c:653
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
msgstr ""
-#: builtin/submodule--helper.c:646
+#: builtin/submodule--helper.c:684
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr ""
-#: builtin/submodule--helper.c:662
-#, c-format
-msgid "cannot open file '%s'"
-msgstr ""
-
-#: builtin/submodule--helper.c:667
-#, c-format
-msgid "could not close file %s"
-msgstr ""
-
-#: builtin/submodule--helper.c:674
+#: builtin/submodule--helper.c:699
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr ""
-#: builtin/submodule--helper.c:742
+#: builtin/submodule--helper.c:764
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr ""
-#: builtin/submodule--helper.c:746
+#: builtin/submodule--helper.c:768
msgid "Maybe you want to use 'update --init'?"
msgstr ""
-#: builtin/submodule--helper.c:772
-#, c-format
-msgid "Skipping unmerged submodule %s"
-msgstr ""
-
#: builtin/submodule--helper.c:793
#, c-format
+msgid "Skipping unmerged submodule %s"
+msgstr ""
+
+#: builtin/submodule--helper.c:814
+#, c-format
msgid "Skipping submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:929
+#: builtin/submodule--helper.c:942
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr ""
-#: builtin/submodule--helper.c:940
+#: builtin/submodule--helper.c:953
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr ""
-#: builtin/submodule--helper.c:961 builtin/submodule--helper.c:1105
+#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162
msgid "path into the working tree"
msgstr ""
-#: builtin/submodule--helper.c:964
+#: builtin/submodule--helper.c:977
msgid "path into the working tree, across nested submodule boundaries"
msgstr ""
-#: builtin/submodule--helper.c:968
+#: builtin/submodule--helper.c:981
msgid "rebase, merge, checkout or none"
msgstr ""
-#: builtin/submodule--helper.c:972
+#: builtin/submodule--helper.c:985
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr ""
-#: builtin/submodule--helper.c:975
+#: builtin/submodule--helper.c:988
msgid "parallel jobs"
msgstr ""
-#: builtin/submodule--helper.c:977
+#: builtin/submodule--helper.c:990
msgid "whether the initial clone should follow the shallow recommendation"
msgstr ""
-#: builtin/submodule--helper.c:978
+#: builtin/submodule--helper.c:991
msgid "don't print cloning progress"
msgstr ""
-#: builtin/submodule--helper.c:985
+#: builtin/submodule--helper.c:998
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:995
+#: builtin/submodule--helper.c:1008
msgid "bad value for update parameter"
msgstr ""
-#: builtin/submodule--helper.c:1066
+#: 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"
msgstr ""
-#: builtin/submodule--helper.c:1106
+#: builtin/submodule--helper.c:1163
msgid "recurse into submodules"
msgstr ""
-#: builtin/submodule--helper.c:1112
+#: builtin/submodule--helper.c:1169
msgid "git submodule--helper embed-git-dir [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:1157
+#: builtin/submodule--helper.c:1226
msgid "submodule--helper subcommand must be called with a subcommand"
msgstr ""
-#: builtin/submodule--helper.c:1164
+#: builtin/submodule--helper.c:1233
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr ""
-#: builtin/submodule--helper.c:1170
+#: builtin/submodule--helper.c:1239
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr ""
@@ -12191,7 +12443,8 @@
#: builtin/tag.c:25
msgid ""
-"git tag -l [-n[<num>]] [--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 ""
@@ -12199,22 +12452,17 @@
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr ""
-#: builtin/tag.c:82
-#, c-format
-msgid "tag name too long: %.*s..."
-msgstr ""
-
-#: builtin/tag.c:87
+#: builtin/tag.c:83
#, c-format
msgid "tag '%s' not found."
msgstr ""
-#: builtin/tag.c:102
+#: builtin/tag.c:99
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr ""
-#: builtin/tag.c:131
+#: builtin/tag.c:128
#, c-format
msgid ""
"\n"
@@ -12223,7 +12471,7 @@
"Lines starting with '%c' will be ignored.\n"
msgstr ""
-#: builtin/tag.c:135
+#: builtin/tag.c:132
#, c-format
msgid ""
"\n"
@@ -12233,138 +12481,142 @@
"want to.\n"
msgstr ""
-#: builtin/tag.c:213
+#: builtin/tag.c:210
msgid "unable to sign the tag"
msgstr ""
-#: builtin/tag.c:215
+#: builtin/tag.c:212
msgid "unable to write tag file"
msgstr ""
-#: builtin/tag.c:240
+#: builtin/tag.c:236
msgid "bad object type."
msgstr ""
-#: builtin/tag.c:253
-msgid "tag header too big."
-msgstr ""
-
-#: builtin/tag.c:289
+#: builtin/tag.c:282
msgid "no tag message?"
msgstr ""
-#: builtin/tag.c:295
+#: builtin/tag.c:289
#, c-format
msgid "The tag message has been left in %s\n"
msgstr ""
-#: builtin/tag.c:354
+#: builtin/tag.c:397
msgid "list tag names"
msgstr ""
-#: builtin/tag.c:356
+#: builtin/tag.c:399
msgid "print <n> lines of each tag message"
msgstr ""
-#: builtin/tag.c:358
+#: builtin/tag.c:401
msgid "delete tags"
msgstr ""
-#: builtin/tag.c:359
+#: builtin/tag.c:402
msgid "verify tags"
msgstr ""
-#: builtin/tag.c:361
+#: builtin/tag.c:404
msgid "Tag creation options"
msgstr ""
-#: builtin/tag.c:363
+#: builtin/tag.c:406
msgid "annotated tag, needs a message"
msgstr ""
-#: builtin/tag.c:365
+#: builtin/tag.c:408
msgid "tag message"
msgstr ""
-#: builtin/tag.c:367
+#: builtin/tag.c:410
msgid "annotated and GPG-signed tag"
msgstr ""
-#: builtin/tag.c:371
+#: builtin/tag.c:414
msgid "use another key to sign the tag"
msgstr ""
-#: builtin/tag.c:372
+#: builtin/tag.c:415
msgid "replace the tag if exists"
msgstr ""
-#: builtin/tag.c:373 builtin/update-ref.c:368
+#: builtin/tag.c:416 builtin/update-ref.c:368
msgid "create a reflog"
msgstr ""
-#: builtin/tag.c:375
+#: builtin/tag.c:418
msgid "Tag listing options"
msgstr ""
-#: builtin/tag.c:376
+#: builtin/tag.c:419
msgid "show tag list in columns"
msgstr ""
-#: builtin/tag.c:377 builtin/tag.c:378
+#: builtin/tag.c:420 builtin/tag.c:422
msgid "print only tags that contain the commit"
msgstr ""
-#: builtin/tag.c:379
+#: builtin/tag.c:421 builtin/tag.c:423
+msgid "print only tags that don't contain the commit"
+msgstr ""
+
+#: builtin/tag.c:424
msgid "print only tags that are merged"
msgstr ""
-#: builtin/tag.c:380
+#: builtin/tag.c:425
msgid "print only tags that are not merged"
msgstr ""
-#: builtin/tag.c:385
+#: builtin/tag.c:430
msgid "print only tags of the object"
msgstr ""
-#: builtin/tag.c:415
+#: builtin/tag.c:469
msgid "--column and -n are incompatible"
msgstr ""
-#: builtin/tag.c:437
-msgid "-n option is only allowed with -l."
+#: builtin/tag.c:491
+msgid "-n option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:439
-msgid "--contains option is only allowed with -l."
+#: builtin/tag.c:493
+msgid "--contains option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:441
-msgid "--points-at option is only allowed with -l."
+#: builtin/tag.c:495
+msgid "--no-contains option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:443
-msgid "--merged and --no-merged option are only allowed with -l"
+#: builtin/tag.c:497
+msgid "--points-at option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:454
+#: builtin/tag.c:499
+msgid "--merged and --no-merged options are only allowed in list mode"
+msgstr ""
+
+#: builtin/tag.c:510
msgid "only one -F or -m option is allowed."
msgstr ""
-#: builtin/tag.c:473
+#: builtin/tag.c:529
msgid "too many params"
msgstr ""
-#: builtin/tag.c:479
+#: builtin/tag.c:535
#, c-format
msgid "'%s' is not a valid tag name."
msgstr ""
-#: builtin/tag.c:484
+#: builtin/tag.c:540
#, c-format
msgid "tag '%s' already exists"
msgstr ""
-#: builtin/tag.c:512
+#: builtin/tag.c:570
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr ""
@@ -12393,181 +12645,193 @@
msgid "failed to delete file %s"
msgstr ""
-#: builtin/update-index.c:110 builtin/update-index.c:212
+#: builtin/update-index.c:110 builtin/update-index.c:216
#, c-format
msgid "failed to delete directory %s"
msgstr ""
-#: builtin/update-index.c:133
+#: builtin/update-index.c:135
#, c-format
msgid "Testing mtime in '%s' "
msgstr ""
-#: builtin/update-index.c:145
+#: builtin/update-index.c:149
msgid "directory stat info does not change after adding a new file"
msgstr ""
-#: builtin/update-index.c:158
+#: builtin/update-index.c:162
msgid "directory stat info does not change after adding a new directory"
msgstr ""
-#: builtin/update-index.c:171
+#: builtin/update-index.c:175
msgid "directory stat info changes after updating a file"
msgstr ""
-#: builtin/update-index.c:182
+#: builtin/update-index.c:186
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
-#: builtin/update-index.c:193
+#: builtin/update-index.c:197
msgid "directory stat info does not change after deleting a file"
msgstr ""
-#: builtin/update-index.c:206
+#: builtin/update-index.c:210
msgid "directory stat info does not change after deleting a directory"
msgstr ""
-#: builtin/update-index.c:213
+#: builtin/update-index.c:217
msgid " OK"
msgstr ""
-#: builtin/update-index.c:564
+#: builtin/update-index.c:568
msgid "git update-index [<options>] [--] [<file>...]"
msgstr ""
-#: builtin/update-index.c:919
+#: builtin/update-index.c:923
msgid "continue refresh even when index needs update"
msgstr ""
-#: builtin/update-index.c:922
+#: builtin/update-index.c:926
msgid "refresh: ignore submodules"
msgstr ""
-#: builtin/update-index.c:925
+#: builtin/update-index.c:929
msgid "do not ignore new files"
msgstr ""
-#: builtin/update-index.c:927
+#: builtin/update-index.c:931
msgid "let files replace directories and vice-versa"
msgstr ""
-#: builtin/update-index.c:929
+#: builtin/update-index.c:933
msgid "notice files missing from worktree"
msgstr ""
-#: builtin/update-index.c:931
+#: builtin/update-index.c:935
msgid "refresh even if index contains unmerged entries"
msgstr ""
-#: builtin/update-index.c:934
+#: builtin/update-index.c:938
msgid "refresh stat information"
msgstr ""
-#: builtin/update-index.c:938
+#: builtin/update-index.c:942
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr ""
-#: builtin/update-index.c:942
+#: builtin/update-index.c:946
msgid "<mode>,<object>,<path>"
msgstr ""
-#: builtin/update-index.c:943
+#: builtin/update-index.c:947
msgid "add the specified entry to the index"
msgstr ""
-#: builtin/update-index.c:952
+#: builtin/update-index.c:956
msgid "mark files as \"not changing\""
msgstr ""
-#: builtin/update-index.c:955
+#: builtin/update-index.c:959
msgid "clear assumed-unchanged bit"
msgstr ""
-#: builtin/update-index.c:958
+#: builtin/update-index.c:962
msgid "mark files as \"index-only\""
msgstr ""
-#: builtin/update-index.c:961
+#: builtin/update-index.c:965
msgid "clear skip-worktree bit"
msgstr ""
-#: builtin/update-index.c:964
+#: builtin/update-index.c:968
msgid "add to index only; do not add content to object database"
msgstr ""
-#: builtin/update-index.c:966
+#: builtin/update-index.c:970
msgid "remove named paths even if present in worktree"
msgstr ""
-#: builtin/update-index.c:968
+#: builtin/update-index.c:972
msgid "with --stdin: input lines are terminated by null bytes"
msgstr ""
-#: builtin/update-index.c:970
+#: builtin/update-index.c:974
msgid "read list of paths to be updated from standard input"
msgstr ""
-#: builtin/update-index.c:974
+#: builtin/update-index.c:978
msgid "add entries from standard input to the index"
msgstr ""
-#: builtin/update-index.c:978
+#: builtin/update-index.c:982
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr ""
-#: builtin/update-index.c:982
+#: builtin/update-index.c:986
msgid "only update entries that differ from HEAD"
msgstr ""
-#: builtin/update-index.c:986
+#: builtin/update-index.c:990
msgid "ignore files missing from worktree"
msgstr ""
-#: builtin/update-index.c:989
+#: builtin/update-index.c:993
msgid "report actions to standard output"
msgstr ""
-#: builtin/update-index.c:991
+#: builtin/update-index.c:995
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr ""
-#: builtin/update-index.c:995
+#: builtin/update-index.c:999
msgid "write index in this format"
msgstr ""
-#: builtin/update-index.c:997
+#: builtin/update-index.c:1001
msgid "enable or disable split index"
msgstr ""
-#: builtin/update-index.c:999
+#: builtin/update-index.c:1003
msgid "enable/disable untracked cache"
msgstr ""
-#: builtin/update-index.c:1001
+#: builtin/update-index.c:1005
msgid "test if the filesystem supports untracked cache"
msgstr ""
-#: builtin/update-index.c:1003
+#: builtin/update-index.c:1007
msgid "enable untracked cache without testing the filesystem"
msgstr ""
-#: builtin/update-index.c:1120
+#: builtin/update-index.c:1107
+msgid ""
+"core.splitIndex is set to false; remove or change it, if you really want to "
+"enable split index"
+msgstr ""
+
+#: builtin/update-index.c:1116
+msgid ""
+"core.splitIndex is set to true; remove or change it, if you really want to "
+"disable split index"
+msgstr ""
+
+#: builtin/update-index.c:1127
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
msgstr ""
-#: builtin/update-index.c:1124
+#: builtin/update-index.c:1131
msgid "Untracked cache disabled"
msgstr ""
-#: builtin/update-index.c:1132
+#: builtin/update-index.c:1139
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
msgstr ""
-#: builtin/update-index.c:1136
+#: builtin/update-index.c:1143
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr ""
@@ -12660,27 +12924,27 @@
msgid "git worktree unlock <path>"
msgstr ""
-#: builtin/worktree.c:42
+#: builtin/worktree.c:43
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr ""
-#: builtin/worktree.c:48
+#: builtin/worktree.c:49
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr ""
-#: builtin/worktree.c:53
+#: builtin/worktree.c:54
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr ""
-#: builtin/worktree.c:64
+#: builtin/worktree.c:65
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr ""
-#: builtin/worktree.c:80
+#: builtin/worktree.c:81
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr ""
@@ -12698,60 +12962,64 @@
msgid "'%s' already exists"
msgstr ""
-#: builtin/worktree.c:236
+#: builtin/worktree.c:235
#, c-format
msgid "could not create directory of '%s'"
msgstr ""
-#: builtin/worktree.c:272
+#: builtin/worktree.c:274
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr ""
-#: builtin/worktree.c:323
+#: builtin/worktree.c:328
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
-#: builtin/worktree.c:325
+#: builtin/worktree.c:330
msgid "create a new branch"
msgstr ""
-#: builtin/worktree.c:327
+#: builtin/worktree.c:332
msgid "create or reset a branch"
msgstr ""
-#: builtin/worktree.c:329
+#: builtin/worktree.c:334
msgid "populate the new working tree"
msgstr ""
-#: builtin/worktree.c:337
+#: builtin/worktree.c:335
+msgid "keep the new working tree locked"
+msgstr ""
+
+#: builtin/worktree.c:343
msgid "-b, -B, and --detach are mutually exclusive"
msgstr ""
-#: builtin/worktree.c:472
+#: builtin/worktree.c:478
msgid "reason for locking"
msgstr ""
-#: builtin/worktree.c:484 builtin/worktree.c:517
+#: builtin/worktree.c:490 builtin/worktree.c:523
#, c-format
msgid "'%s' is not a working tree"
msgstr ""
-#: builtin/worktree.c:486 builtin/worktree.c:519
+#: builtin/worktree.c:492 builtin/worktree.c:525
msgid "The main working tree cannot be locked or unlocked"
msgstr ""
-#: builtin/worktree.c:491
+#: builtin/worktree.c:497
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr ""
-#: builtin/worktree.c:493
+#: builtin/worktree.c:499
#, c-format
msgid "'%s' is already locked"
msgstr ""
-#: builtin/worktree.c:521
+#: builtin/worktree.c:527
#, c-format
msgid "'%s' is not locked"
msgstr ""
@@ -12776,19 +13044,19 @@
msgid "git upload-pack [<options>] <dir>"
msgstr ""
-#: upload-pack.c:1036
+#: upload-pack.c:1040
msgid "quit after a single request/response exchange"
msgstr ""
-#: upload-pack.c:1038
+#: upload-pack.c:1042
msgid "exit immediately after initial ref advertisement"
msgstr ""
-#: upload-pack.c:1040
+#: upload-pack.c:1044
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr ""
-#: upload-pack.c:1042
+#: upload-pack.c:1046
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr ""
@@ -12812,15 +13080,20 @@
"to read about a specific subcommand or concept."
msgstr ""
-#: http.c:344
+#: http.c:336
+#, c-format
+msgid "negative value for http.postbuffer; defaulting to %d"
+msgstr ""
+
+#: http.c:357
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr ""
-#: http.c:353
+#: http.c:366
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr ""
-#: http.c:1713
+#: http.c:1766
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -12828,7 +13101,7 @@
" redirect: %s"
msgstr ""
-#: remote-curl.c:319
+#: remote-curl.c:323
#, c-format
msgid "redirecting to %s"
msgstr ""
@@ -13181,7 +13454,7 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr ""
-#: git-rebase.sh:57
+#: 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"
@@ -13189,43 +13462,43 @@
"\"."
msgstr ""
-#: git-rebase.sh:157 git-rebase.sh:396
+#: git-rebase.sh:158 git-rebase.sh:397
#, sh-format
msgid "Could not move back to $head_name"
msgstr ""
-#: git-rebase.sh:171
+#: git-rebase.sh:172
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr ""
-#: git-rebase.sh:211
+#: git-rebase.sh:212
msgid "The pre-rebase hook refused to rebase."
msgstr ""
-#: git-rebase.sh:216
+#: git-rebase.sh:217
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr ""
-#: git-rebase.sh:357
+#: git-rebase.sh:358
msgid "No rebase in progress?"
msgstr ""
-#: git-rebase.sh:368
+#: git-rebase.sh:369
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
-#: git-rebase.sh:375
+#: git-rebase.sh:376
msgid "Cannot read HEAD"
msgstr ""
-#: git-rebase.sh:378
+#: git-rebase.sh:379
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
msgstr ""
-#: git-rebase.sh:418
+#: git-rebase.sh:419
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -13238,101 +13511,101 @@
"valuable there."
msgstr ""
-#: git-rebase.sh:469
+#: git-rebase.sh:470
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr ""
-#: git-rebase.sh:493
+#: git-rebase.sh:494
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr ""
-#: git-rebase.sh:496 git-rebase.sh:500
+#: git-rebase.sh:497 git-rebase.sh:501
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr ""
-#: git-rebase.sh:505
+#: git-rebase.sh:506
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr ""
-#: git-rebase.sh:528
+#: git-rebase.sh:529
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr ""
-#: git-rebase.sh:561
+#: git-rebase.sh:562
msgid "Cannot autostash"
msgstr ""
-#: git-rebase.sh:566
+#: git-rebase.sh:567
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr ""
-#: git-rebase.sh:570
+#: git-rebase.sh:571
msgid "Please commit or stash them."
msgstr ""
-#: git-rebase.sh:590
+#: git-rebase.sh:591
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr ""
-#: git-rebase.sh:594
+#: git-rebase.sh:595
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr ""
-#: git-rebase.sh:605
+#: git-rebase.sh:606
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr ""
-#: git-rebase.sh:614
+#: git-rebase.sh:615
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
-#: git-rebase.sh:624
+#: git-rebase.sh:625
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr ""
-#: git-stash.sh:50
+#: git-stash.sh:53
msgid "git stash clear with parameters is unimplemented"
msgstr ""
-#: git-stash.sh:73
+#: git-stash.sh:94
msgid "You do not have the initial commit yet"
msgstr ""
-#: git-stash.sh:88
+#: git-stash.sh:109
msgid "Cannot save the current index state"
msgstr ""
-#: git-stash.sh:103
+#: git-stash.sh:124
msgid "Cannot save the untracked files"
msgstr ""
-#: git-stash.sh:123 git-stash.sh:136
+#: git-stash.sh:144 git-stash.sh:157
msgid "Cannot save the current worktree state"
msgstr ""
-#: git-stash.sh:140
+#: git-stash.sh:161
msgid "No changes selected"
msgstr ""
-#: git-stash.sh:143
+#: git-stash.sh:164
msgid "Cannot remove temporary index (can't happen)"
msgstr ""
-#: git-stash.sh:156
+#: git-stash.sh:177
msgid "Cannot record working tree state"
msgstr ""
-#: git-stash.sh:188
+#: git-stash.sh:209
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr ""
@@ -13347,114 +13620,114 @@
#. $ 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:238
+#: git-stash.sh:265
#, sh-format
msgid ""
"error: unknown option for 'stash save': $option\n"
" To provide a message, use git stash save -- '$option'"
msgstr ""
-#: git-stash.sh:251
+#: git-stash.sh:278
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr ""
-#: git-stash.sh:259
+#: git-stash.sh:286
msgid "No local changes to save"
msgstr ""
-#: git-stash.sh:263
+#: git-stash.sh:291
msgid "Cannot initialize stash"
msgstr ""
-#: git-stash.sh:267
+#: git-stash.sh:295
msgid "Cannot save the current status"
msgstr ""
-#: git-stash.sh:268
+#: git-stash.sh:296
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr ""
-#: git-stash.sh:285
+#: git-stash.sh:323
msgid "Cannot remove worktree changes"
msgstr ""
-#: git-stash.sh:403
+#: git-stash.sh:471
#, sh-format
msgid "unknown option: $opt"
msgstr ""
-#: git-stash.sh:416
+#: git-stash.sh:484
msgid "No stash found."
msgstr ""
-#: git-stash.sh:423
+#: git-stash.sh:491
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr ""
-#: git-stash.sh:438
+#: git-stash.sh:506
#, sh-format
msgid "$reference is not a valid reference"
msgstr ""
-#: git-stash.sh:466
+#: git-stash.sh:534
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr ""
-#: git-stash.sh:477
+#: git-stash.sh:545
#, sh-format
msgid "'$args' is not a stash reference"
msgstr ""
-#: git-stash.sh:485
+#: git-stash.sh:553
msgid "unable to refresh index"
msgstr ""
-#: git-stash.sh:489
+#: git-stash.sh:557
msgid "Cannot apply a stash in the middle of a merge"
msgstr ""
-#: git-stash.sh:497
+#: git-stash.sh:565
msgid "Conflicts in index. Try without --index."
msgstr ""
-#: git-stash.sh:499
+#: git-stash.sh:567
msgid "Could not save index tree"
msgstr ""
-#: git-stash.sh:508
+#: git-stash.sh:576
msgid "Could not restore untracked files from stash"
msgstr ""
-#: git-stash.sh:533
+#: git-stash.sh:601
msgid "Cannot unstage modified files"
msgstr ""
-#: git-stash.sh:548
+#: git-stash.sh:616
msgid "Index was not unstashed."
msgstr ""
-#: git-stash.sh:562
+#: git-stash.sh:630
msgid "The stash is kept in case you need it again."
msgstr ""
-#: git-stash.sh:571
+#: git-stash.sh:639
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr ""
-#: git-stash.sh:572
+#: git-stash.sh:640
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr ""
-#: git-stash.sh:580
+#: git-stash.sh:648
msgid "No branch name specified"
msgstr ""
-#: git-stash.sh:652
+#: git-stash.sh:727
msgid "(To restore them type \"git stash apply\")"
msgstr ""
@@ -13531,164 +13804,164 @@
msgid "Failed to register submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:327
+#: git-submodule.sh:341
#, sh-format
msgid "Entering '$displaypath'"
msgstr ""
-#: git-submodule.sh:347
+#: git-submodule.sh:361
#, sh-format
msgid "Stopping at '$displaypath'; script returned non-zero status."
msgstr ""
-#: git-submodule.sh:418
+#: git-submodule.sh:432
#, sh-format
msgid "pathspec and --all are incompatible"
msgstr ""
-#: git-submodule.sh:423
+#: git-submodule.sh:437
#, sh-format
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
-#: git-submodule.sh:443
+#: git-submodule.sh:457
#, 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 ""
-#: git-submodule.sh:451
+#: git-submodule.sh:465
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
"discard them"
msgstr ""
-#: git-submodule.sh:454
+#: git-submodule.sh:468
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr ""
-#: git-submodule.sh:455
+#: git-submodule.sh:469
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr ""
-#: git-submodule.sh:458
+#: git-submodule.sh:472
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr ""
-#: git-submodule.sh:467
+#: git-submodule.sh:481
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr ""
-#: git-submodule.sh:623
+#: git-submodule.sh:637
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:633
+#: git-submodule.sh:647
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:638
+#: git-submodule.sh:652
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"'$sm_path'"
msgstr ""
-#: git-submodule.sh:656
+#: git-submodule.sh:670
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:662
+#: git-submodule.sh:676
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
"Direct fetching of that commit failed."
msgstr ""
-#: git-submodule.sh:669
+#: git-submodule.sh:683
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:670
+#: git-submodule.sh:684
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr ""
-#: git-submodule.sh:674
+#: git-submodule.sh:688
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:675
+#: git-submodule.sh:689
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr ""
-#: git-submodule.sh:680
+#: git-submodule.sh:694
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:681
+#: git-submodule.sh:695
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr ""
-#: git-submodule.sh:686
+#: git-submodule.sh:700
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:687
+#: git-submodule.sh:701
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr ""
-#: git-submodule.sh:718
+#: git-submodule.sh:732
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:826
+#: git-submodule.sh:840
msgid "The --cached option cannot be used with the --files option"
msgstr ""
-#: git-submodule.sh:878
+#: git-submodule.sh:892
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr ""
-#: git-submodule.sh:898
+#: git-submodule.sh:912
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr ""
-#: git-submodule.sh:901
+#: git-submodule.sh:915
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr ""
-#: git-submodule.sh:904
+#: git-submodule.sh:918
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
-#: git-submodule.sh:1051
+#: git-submodule.sh:1064
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:1118
+#: git-submodule.sh:1136
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr ""
@@ -13938,11 +14211,11 @@
msgid "Or you can abort the rebase with 'git rebase --abort'."
msgstr ""
-#: git-rebase--interactive.sh:1079
+#: git-rebase--interactive.sh:1083
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr ""
-#: git-rebase--interactive.sh:1084
+#: git-rebase--interactive.sh:1088
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
@@ -13960,21 +14233,21 @@
" git rebase --continue\n"
msgstr ""
-#: git-rebase--interactive.sh:1101
+#: git-rebase--interactive.sh:1105
msgid "Error trying to find the author identity to amend commit"
msgstr ""
-#: git-rebase--interactive.sh:1106
+#: git-rebase--interactive.sh:1110
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
msgstr ""
-#: git-rebase--interactive.sh:1111 git-rebase--interactive.sh:1115
+#: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119
msgid "Could not commit staged changes."
msgstr ""
-#: git-rebase--interactive.sh:1139
+#: git-rebase--interactive.sh:1147
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -13983,47 +14256,47 @@
"\n"
msgstr ""
-#: git-rebase--interactive.sh:1147 git-rebase--interactive.sh:1305
+#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313
msgid "Could not execute editor"
msgstr ""
-#: git-rebase--interactive.sh:1160
+#: git-rebase--interactive.sh:1168
#, sh-format
msgid "Could not checkout $switch_to"
msgstr ""
-#: git-rebase--interactive.sh:1165
+#: git-rebase--interactive.sh:1173
msgid "No HEAD?"
msgstr ""
-#: git-rebase--interactive.sh:1166
+#: git-rebase--interactive.sh:1174
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr ""
-#: git-rebase--interactive.sh:1168
+#: git-rebase--interactive.sh:1176
msgid "Could not mark as interactive"
msgstr ""
-#: git-rebase--interactive.sh:1178 git-rebase--interactive.sh:1183
+#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191
msgid "Could not init rewritten commits"
msgstr ""
-#: git-rebase--interactive.sh:1283
+#: git-rebase--interactive.sh:1291
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
msgstr[0] ""
msgstr[1] ""
-#: git-rebase--interactive.sh:1288
+#: git-rebase--interactive.sh:1296
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
"\n"
msgstr ""
-#: git-rebase--interactive.sh:1295
+#: git-rebase--interactive.sh:1303
msgid "Note that empty commits are commented out"
msgstr ""
@@ -14098,113 +14371,107 @@
msgid "unstaged"
msgstr ""
-#: git-add--interactive.perl:297 git-add--interactive.perl:322
+#: git-add--interactive.perl:288 git-add--interactive.perl:313
msgid "binary"
msgstr ""
-#: git-add--interactive.perl:306 git-add--interactive.perl:360
+#: git-add--interactive.perl:297 git-add--interactive.perl:351
msgid "nothing"
msgstr ""
-#: git-add--interactive.perl:342 git-add--interactive.perl:357
+#: git-add--interactive.perl:333 git-add--interactive.perl:348
msgid "unchanged"
msgstr ""
-#: git-add--interactive.perl:653
+#: git-add--interactive.perl:644
#, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:656
+#: git-add--interactive.perl:647
#, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:659
+#: git-add--interactive.perl:650
#, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:662
+#: git-add--interactive.perl:653
#, perl-format
msgid "touched %d path\n"
msgid_plural "touched %d paths\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:671
+#: git-add--interactive.perl:662
msgid "Update"
msgstr ""
-#: git-add--interactive.perl:683
+#: git-add--interactive.perl:674
msgid "Revert"
msgstr ""
-#: git-add--interactive.perl:706
+#: git-add--interactive.perl:697
#, perl-format
msgid "note: %s is untracked now.\n"
msgstr ""
-#: git-add--interactive.perl:717
+#: git-add--interactive.perl:708
msgid "Add untracked"
msgstr ""
-#: git-add--interactive.perl:723
+#: git-add--interactive.perl:714
msgid "No untracked files.\n"
msgstr ""
-#: git-add--interactive.perl:1039
+#: git-add--interactive.perl:1030
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
msgstr ""
-#: git-add--interactive.perl:1042
+#: git-add--interactive.perl:1033
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
msgstr ""
-#: git-add--interactive.perl:1045
+#: git-add--interactive.perl:1036
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
msgstr ""
-#: git-add--interactive.perl:1048 git-add--interactive.perl:1057
+#: git-add--interactive.perl:1039 git-add--interactive.perl:1048
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
msgstr ""
-#: git-add--interactive.perl:1051
-msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be\n"
-"marked for discarding"
-msgstr ""
-
-#: git-add--interactive.perl:1054
+#: git-add--interactive.perl:1042 git-add--interactive.perl:1045
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
msgstr ""
-#: git-add--interactive.perl:1067
+#: git-add--interactive.perl:1058
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
msgstr ""
-#: git-add--interactive.perl:1068
+#: git-add--interactive.perl:1059
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr ""
-#: git-add--interactive.perl:1074
+#: git-add--interactive.perl:1065
#, perl-format
msgid ""
"---\n"
@@ -14214,14 +14481,14 @@
msgstr ""
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1082
+#: git-add--interactive.perl:1073
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 ""
-#: git-add--interactive.perl:1096
+#: git-add--interactive.perl:1087
#, perl-format
msgid "failed to open hunk edit file for reading: %s"
msgstr ""
@@ -14232,12 +14499,12 @@
#. 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:1187
+#: git-add--interactive.perl:1178
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
-#: git-add--interactive.perl:1196
+#: git-add--interactive.perl:1187
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -14246,7 +14513,7 @@
"d - do not stage this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1202
+#: git-add--interactive.perl:1193
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -14255,7 +14522,7 @@
"d - do not stash this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1208
+#: git-add--interactive.perl:1199
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -14264,7 +14531,7 @@
"d - do not unstage this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1214
+#: git-add--interactive.perl:1205
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -14273,7 +14540,7 @@
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1220
+#: git-add--interactive.perl:1211
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -14282,7 +14549,7 @@
"d - do not discard this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1226
+#: git-add--interactive.perl:1217
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -14291,7 +14558,7 @@
"d - do not discard this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1232
+#: git-add--interactive.perl:1223
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -14300,7 +14567,7 @@
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1241
+#: git-add--interactive.perl:1232
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
@@ -14313,217 +14580,217 @@
"? - print help\n"
msgstr ""
-#: git-add--interactive.perl:1272
+#: git-add--interactive.perl:1263
msgid "The selected hunks do not apply to the index!\n"
msgstr ""
-#: git-add--interactive.perl:1273
+#: git-add--interactive.perl:1264
msgid "Apply them to the worktree anyway? "
msgstr ""
-#: git-add--interactive.perl:1276
+#: git-add--interactive.perl:1267
msgid "Nothing was applied.\n"
msgstr ""
-#: git-add--interactive.perl:1287
+#: git-add--interactive.perl:1278
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr ""
-#: git-add--interactive.perl:1296
+#: git-add--interactive.perl:1287
msgid "Only binary files changed.\n"
msgstr ""
-#: git-add--interactive.perl:1298
+#: git-add--interactive.perl:1289
msgid "No changes.\n"
msgstr ""
-#: git-add--interactive.perl:1306
+#: git-add--interactive.perl:1297
msgid "Patch update"
msgstr ""
-#: git-add--interactive.perl:1358
+#: git-add--interactive.perl:1349
#, perl-format
msgid "Stage mode change [y,n,q,a,d,/%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1359
+#: git-add--interactive.perl:1350
#, perl-format
msgid "Stage deletion [y,n,q,a,d,/%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1360
+#: git-add--interactive.perl:1351
#, perl-format
msgid "Stage this hunk [y,n,q,a,d,/%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1363
+#: git-add--interactive.perl:1354
#, perl-format
msgid "Stash mode change [y,n,q,a,d,/%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1364
+#: git-add--interactive.perl:1355
#, perl-format
msgid "Stash deletion [y,n,q,a,d,/%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1365
+#: git-add--interactive.perl:1356
#, perl-format
msgid "Stash this hunk [y,n,q,a,d,/%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1368
+#: git-add--interactive.perl:1359
#, perl-format
msgid "Unstage mode change [y,n,q,a,d,/%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1369
+#: git-add--interactive.perl:1360
#, perl-format
msgid "Unstage deletion [y,n,q,a,d,/%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1370
+#: git-add--interactive.perl:1361
#, perl-format
msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1373
+#: git-add--interactive.perl:1364
#, perl-format
msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1374
+#: git-add--interactive.perl:1365
#, perl-format
msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1375
+#: git-add--interactive.perl:1366
#, perl-format
msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1378
+#: git-add--interactive.perl:1369
#, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1379
+#: git-add--interactive.perl:1370
#, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1380
+#: git-add--interactive.perl:1371
#, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1383
+#: git-add--interactive.perl:1374
#, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1384
+#: git-add--interactive.perl:1375
#, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1385
+#: git-add--interactive.perl:1376
#, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1388
+#: git-add--interactive.perl:1379
#, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1389
+#: git-add--interactive.perl:1380
#, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1390
+#: git-add--interactive.perl:1381
#, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1493
+#: git-add--interactive.perl:1484
msgid "go to which hunk (<ret> to see more)? "
msgstr ""
-#: git-add--interactive.perl:1495
+#: git-add--interactive.perl:1486
msgid "go to which hunk? "
msgstr ""
-#: git-add--interactive.perl:1504
+#: git-add--interactive.perl:1495
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr ""
-#: git-add--interactive.perl:1509
+#: git-add--interactive.perl:1500
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:1535
+#: git-add--interactive.perl:1526
msgid "search for regex? "
msgstr ""
-#: git-add--interactive.perl:1548
+#: git-add--interactive.perl:1539
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr ""
-#: git-add--interactive.perl:1558
+#: git-add--interactive.perl:1549
msgid "No hunk matches the given pattern\n"
msgstr ""
-#: git-add--interactive.perl:1570 git-add--interactive.perl:1592
+#: git-add--interactive.perl:1561 git-add--interactive.perl:1583
msgid "No previous hunk\n"
msgstr ""
-#: git-add--interactive.perl:1579 git-add--interactive.perl:1598
+#: git-add--interactive.perl:1570 git-add--interactive.perl:1589
msgid "No next hunk\n"
msgstr ""
-#: git-add--interactive.perl:1606
+#: git-add--interactive.perl:1597
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:1658
+#: git-add--interactive.perl:1649
msgid "Review diff"
msgstr ""
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1677
+#: git-add--interactive.perl:1668
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\t - view diff between HEAD and index\n"
+"diff - view diff between HEAD and index\n"
"add untracked - add contents of untracked files to the staged set of "
"changes\n"
msgstr ""
-#: git-add--interactive.perl:1694 git-add--interactive.perl:1699
-#: git-add--interactive.perl:1702 git-add--interactive.perl:1709
-#: git-add--interactive.perl:1713 git-add--interactive.perl:1719
+#: 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
msgid "missing --"
msgstr ""
-#: git-add--interactive.perl:1715
+#: git-add--interactive.perl:1706
#, perl-format
msgid "unknown --patch mode: %s"
msgstr ""
-#: git-add--interactive.perl:1721 git-add--interactive.perl:1727
+#: git-add--interactive.perl:1712 git-add--interactive.perl:1718
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr ""
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 114992d..8a2d55a 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -9,8 +9,8 @@
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-02-18 01:00+0800\n"
-"PO-Revision-Date: 2017-02-23 16:05-0100\n"
+"POT-Creation-Date: 2017-04-23 09:54+0800\n"
+"PO-Revision-Date: 2017-05-01 21:17+0000\n"
"Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
"Language-Team: Portuguese\n"
"Language: pt\n"
@@ -18,7 +18,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.12\n"
+"X-Generator: Virtaal 0.7.1\n"
#: advice.c:55
#, c-format
@@ -27,7 +27,8 @@
#: advice.c:83
msgid "Cherry-picking is not possible because you have unmerged files."
-msgstr "Não é possível efetuar cherry-pick porque tem ficheiros não integrados."
+msgstr ""
+"Não é possível efetuar cherry-pick porque tem ficheiros não integrados."
#: advice.c:85
msgid "Committing is not possible because you have unmerged files."
@@ -62,7 +63,7 @@
msgid "Exiting because of an unresolved conflict."
msgstr "A terminar devido a conflito não resolvido."
-#: advice.c:114 builtin/merge.c:1206
+#: advice.c:114 builtin/merge.c:1185
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Não concluído a integração (MERGE_HEAD presente)."
@@ -338,7 +339,7 @@
msgid "cannot checkout %s"
msgstr "não é possível extrair %s"
-#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:248
+#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:253
#, c-format
msgid "failed to read %s"
msgstr "falha ao ler %s"
@@ -463,7 +464,7 @@
msgid "sha1 information is lacking or useless (%s)."
msgstr "falta informação de sha1 ou não é útil (%s)."
-#: apply.c:4081 builtin/checkout.c:233 builtin/reset.c:135
+#: apply.c:4081 builtin/checkout.c:252 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "falha ao invocar make_cache_entry em '%s'"
@@ -540,7 +541,7 @@
msgid "truncating .rej filename to %.*s.rej"
msgstr "a truncar o nome do ficheiro .rej em %.*s.rej"
-#: apply.c:4531 builtin/fetch.c:737 builtin/fetch.c:986
+#: apply.c:4531 builtin/fetch.c:739 builtin/fetch.c:988
#, c-format
msgid "cannot open %s"
msgstr "não é possível abrir %s"
@@ -568,161 +569,162 @@
msgid "unable to read index file"
msgstr "não foi possível ler o ficheiro de índice"
-#: apply.c:4824
+#: apply.c:4823
#, c-format
msgid "can't open patch '%s': %s"
msgstr "não é possível abrir o patch '%s': %s"
-#: apply.c:4849
+#: apply.c:4850
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "%d erro de espaço em branco reprimido"
msgstr[1] "%d erros de espaço em branco reprimidos"
-#: apply.c:4855 apply.c:4870
+#: apply.c:4856 apply.c:4871
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d linha adiciona erros de espaço em branco."
msgstr[1] "%d linhas adicionam erros de espaço em branco."
-#: apply.c:4863
+#: apply.c:4864
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "%d linha aplicada depois de corrigir erros de espaço em branco."
msgstr[1] "%d linhas aplicadas depois de corrigir erros de espaço em branco."
-#: apply.c:4879 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391
+#: apply.c:4880 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391
msgid "Unable to write new index file"
msgstr "Não foi possível escrever novo ficheiro de índice"
-#: apply.c:4910 apply.c:4913 builtin/am.c:2277 builtin/am.c:2280
-#: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180
-#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:591
-#: builtin/submodule--helper.c:594 builtin/submodule--helper.c:960
-#: builtin/submodule--helper.c:963 builtin/submodule--helper.c:1104
+#: apply.c:4911 apply.c:4914 builtin/am.c:2277 builtin/am.c:2280
+#: 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
msgid "path"
msgstr "caminho"
-#: apply.c:4911
+#: apply.c:4912
msgid "don't apply changes matching the given path"
msgstr "não aplicar alterações que correspondam ao caminho fornecido"
-#: apply.c:4914
+#: apply.c:4915
msgid "apply changes matching the given path"
msgstr "aplicar alterações que correspondam ao caminho fornecido"
-#: apply.c:4916 builtin/am.c:2286
+#: apply.c:4917 builtin/am.c:2286
msgid "num"
msgstr "num"
-#: apply.c:4917
+#: apply.c:4918
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "remover <num> barras à esquerda dos caminhos de diff tradicional"
-#: apply.c:4920
+#: apply.c:4921
msgid "ignore additions made by the patch"
msgstr "ignorar adições feitas pelo patch"
-#: apply.c:4922
+#: apply.c:4923
msgid "instead of applying the patch, output diffstat for the input"
msgstr "em vez de aplicar o patch, mostrar o diffstat da entrada"
-#: apply.c:4926
+#: apply.c:4927
msgid "show number of added and deleted lines in decimal notation"
msgstr "mostrar número de linhas adicionadas e removidas em notação decimal"
-#: apply.c:4928
+#: apply.c:4929
msgid "instead of applying the patch, output a summary for the input"
msgstr "em vez de aplicar o patch, mostrar um resumo da entrada"
-#: apply.c:4930
+#: apply.c:4931
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "em vez de aplicar o patch, verificar se o patch pode ser aplicado"
-#: apply.c:4932
+#: apply.c:4933
msgid "make sure the patch is applicable to the current index"
msgstr "garantir que o patch pode ser aplicado ao índice atual"
-#: apply.c:4934
+#: apply.c:4935
msgid "apply a patch without touching the working tree"
msgstr "aplicar um patch sem tocar na árvore de trabalho"
-#: apply.c:4936
+#: apply.c:4937
msgid "accept a patch that touches outside the working area"
msgstr "aceitar patches que alteram ficheiros fora da área de trabalho"
-#: apply.c:4938
+#: apply.c:4939
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "aplicar o patch também (use com --stat/--summary/--check)"
-#: apply.c:4940
+#: apply.c:4941
msgid "attempt three-way merge if a patch does not apply"
msgstr "tentar integração com três pontos se um patch não se aplica com êxito"
-#: apply.c:4942
+#: apply.c:4943
msgid "build a temporary index based on embedded index information"
msgstr ""
"construir um índice temporário baseado na informação incorporada do índice"
-#: apply.c:4945 builtin/checkout-index.c:169 builtin/ls-files.c:507
+#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:508
msgid "paths are separated with NUL character"
msgstr "os caminhos estão separados por caracteres NUL"
-#: apply.c:4947
+#: apply.c:4948
msgid "ensure at least <n> lines of context match"
msgstr "garantir que, pelo menos, <n> linhas de contexto coincidem"
-#: apply.c:4948 builtin/am.c:2265
+#: apply.c:4949 builtin/am.c:2265
msgid "action"
msgstr "ação"
-#: apply.c:4949
+#: apply.c:4950
msgid "detect new or modified lines that have whitespace errors"
msgstr "detetar linhas novas ou modificadas que tenham espaços em branco"
-#: apply.c:4952 apply.c:4955
+#: apply.c:4953 apply.c:4956
msgid "ignore changes in whitespace when finding context"
msgstr "ignorar alterações de espaço em branco ao procurar contexto"
-#: apply.c:4958
+#: apply.c:4959
msgid "apply the patch in reverse"
msgstr "aplicar o patch em reverso"
-#: apply.c:4960
+#: apply.c:4961
msgid "don't expect at least one line of context"
msgstr "não esperar nenhuma linha de contexto"
-#: apply.c:4962
+#: apply.c:4963
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "deixar os excertos rejeitados nos respetivos ficheiros *.rej"
-#: apply.c:4964
+#: apply.c:4965
msgid "allow overlapping hunks"
msgstr "permitir a sobreposição de excertos"
-#: apply.c:4965 builtin/add.c:267 builtin/check-ignore.c:19
+#: 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:1860 builtin/mv.c:122 builtin/read-tree.c:114
+#: builtin/log.c:1867 builtin/mv.c:122 builtin/read-tree.c:134
msgid "be verbose"
msgstr "ser verboso"
-#: apply.c:4967
+#: apply.c:4968
msgid "tolerate incorrectly detected missing new-line at the end of file"
-msgstr "tolerar deteções incorretas de falta de nova linha no final do ficheiro"
+msgstr ""
+"tolerar deteções incorretas de falta de nova linha no final do ficheiro"
-#: apply.c:4970
+#: apply.c:4971
msgid "do not trust the line counts in the hunk headers"
msgstr "não confiar na contagem de linhas no cabeçalho dos excertos"
-#: apply.c:4972 builtin/am.c:2274
+#: apply.c:4973 builtin/am.c:2274
msgid "root"
msgstr "raiz"
-#: apply.c:4973
+#: apply.c:4974
msgid "prepend <root> to all filenames"
msgstr "preceder <root> a todos os nomes de ficheiro"
@@ -745,103 +747,108 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <repo> [--exec <cmd>] --list"
-#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300
+#: archive.c:332 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "o especificador de caminho '%s' não corresponde a nenhum ficheiro"
-#: archive.c:429
+#: archive.c:417
msgid "fmt"
msgstr "fmt"
-#: archive.c:429
+#: archive.c:417
msgid "archive format"
msgstr "formato do arquivo"
-#: archive.c:430 builtin/log.c:1429
+#: archive.c:418 builtin/log.c:1436
msgid "prefix"
msgstr "prefixo"
-#: archive.c:431
+#: archive.c:419
msgid "prepend prefix to each pathname in the archive"
msgstr "preceder o prefixo a cada nome de caminho dentro do arquivo"
-#: archive.c:432 builtin/blame.c:2607 builtin/blame.c:2608 builtin/config.c:59
-#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1054
-#: builtin/hash-object.c:101 builtin/ls-files.c:541 builtin/ls-files.c:544
-#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109
+#: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:59
+#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1061
+#: builtin/hash-object.c:101 builtin/ls-files.c:542 builtin/ls-files.c:545
+#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:129
#: parse-options.h:153
msgid "file"
msgstr "ficheiro"
-#: archive.c:433 builtin/archive.c:89
+#: archive.c:421 builtin/archive.c:89
msgid "write the archive to this file"
msgstr "escrever o arquivo para este ficheiro"
-#: archive.c:435
+#: archive.c:423
msgid "read .gitattributes in working directory"
msgstr "ler .gitattributes do diretório de trabalho"
-#: archive.c:436
+#: archive.c:424
msgid "report archived files on stderr"
msgstr "listar ficheiros arquivados para stderr"
-#: archive.c:437
+#: archive.c:425
msgid "store only"
msgstr "armazenar apenas"
-#: archive.c:438
+#: archive.c:426
msgid "compress faster"
msgstr "compressão rápida"
-#: archive.c:446
+#: archive.c:434
msgid "compress better"
msgstr "compressão ótima"
-#: archive.c:449
+#: archive.c:437
msgid "list supported archive formats"
msgstr "listar formatos de arquivo suportados"
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88
-#: builtin/submodule--helper.c:603 builtin/submodule--helper.c:969
+#: archive.c:439 builtin/archive.c:90 builtin/clone.c:103 builtin/clone.c:106
+#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
msgid "repo"
msgstr "repo"
-#: archive.c:452 builtin/archive.c:91
+#: archive.c:440 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr "obter o arquivo a partir do repositório remoto <repo>"
-#: archive.c:453 builtin/archive.c:92 builtin/notes.c:485
+#: archive.c:441 builtin/archive.c:92 builtin/notes.c:485
msgid "command"
msgstr "comando"
-#: archive.c:454 builtin/archive.c:93
+#: archive.c:442 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr "caminho para o comando git-upload-archive no remoto"
-#: archive.c:461
+#: archive.c:449
msgid "Unexpected option --remote"
msgstr "Opção inesperada --remote"
-#: archive.c:463
+#: archive.c:451
msgid "Option --exec can only be used together with --remote"
msgstr "A opção --exec só pode ser usada em conjunto com --remote"
-#: archive.c:465
+#: archive.c:453
msgid "Unexpected option --output"
msgstr "Opção inesperada --output"
-#: archive.c:487
+#: archive.c:475
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Formato de arquivo desconhecido '%s'"
-#: archive.c:494
+#: archive.c:482
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Argumento não suportado para o formato '%s': -%d"
-#: attr.c:263
+#: attr.c:212
+#, c-format
+msgid "%.*s is not a valid attribute name"
+msgstr "%.*s não é um nome de atributo válido"
+
+#: attr.c:408
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -849,27 +856,27 @@
"Os padrões negativos são ignorados nos atributos do git\n"
"Use '\\!' para uma exclamação literal à esquerda."
-#: bisect.c:441
+#: bisect.c:443
#, c-format
msgid "Could not open file '%s'"
msgstr "Não foi possível abrir o ficheiro '%s'"
-#: bisect.c:446
+#: bisect.c:448
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "Conteúdo incorretamente citado no ficheiro '%s': %s"
-#: bisect.c:655
+#: bisect.c:656
#, c-format
msgid "We cannot bisect more!\n"
msgstr "Não se está a bissetar mais!\n"
-#: bisect.c:708
+#: bisect.c:709
#, c-format
msgid "Not a valid commit name %s"
msgstr "%s não é um nome de commit válido"
-#: bisect.c:732
+#: bisect.c:733
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -878,7 +885,7 @@
"A base de integração %s é má (bad).\n"
"Significa que o bug foi corrigido entre %s e [%s].\n"
-#: bisect.c:737
+#: bisect.c:738
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -887,7 +894,7 @@
"A base de integração %s é nova (new).\n"
"A propriedade foi mudada entre %s e [%s].\n"
-#: bisect.c:742
+#: bisect.c:743
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -896,7 +903,7 @@
"A base de integração %s é %s.\n"
"Significa que o primeiro commit '%s' está entre %s e [%s].\n"
-#: bisect.c:750
+#: bisect.c:751
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -907,7 +914,7 @@
"git bisect não pode funcionar corretamente nesta situação.\n"
"Talvez confundiu revisões %s e %s?\n"
-#: bisect.c:763
+#: bisect.c:764
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -919,36 +926,36 @@
"%s.\n"
"Continua-se de qualquer maneira."
-#: bisect.c:798
+#: bisect.c:799
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "A bissetar: uma base de integração tem de ser testada\n"
-#: bisect.c:849
+#: bisect.c:850
#, c-format
msgid "a %s revision is needed"
msgstr "precisa-se de uma revisão %s"
-#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:262
+#: bisect.c:867 builtin/notes.c:174 builtin/tag.c:255
#, c-format
msgid "could not create file '%s'"
msgstr "não foi possível criar o ficheiro '%s'"
-#: bisect.c:917
+#: bisect.c:918
#, c-format
msgid "could not read file '%s'"
msgstr "não foi possível ler o ficheiro '%s'"
-#: bisect.c:947
+#: bisect.c:948
msgid "reading bisect refs failed"
msgstr "falha ao ler referências bissetadas"
-#: bisect.c:967
+#: bisect.c:968
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s era %s e %s em simultâneo\n"
-#: bisect.c:975
+#: bisect.c:976
#, c-format
msgid ""
"No testable commit found.\n"
@@ -957,7 +964,7 @@
"Nenhum commit testável encontrado.\n"
"Talvez tenha começado com parâmetros de caminho incorretos?\n"
-#: bisect.c:994
+#: bisect.c:995
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -966,7 +973,7 @@
#. TRANSLATORS: the last %s will be replaced with
#. "(roughly %d steps)" translation
-#: bisect.c:998
+#: bisect.c:999
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
@@ -1105,7 +1112,7 @@
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' foi já extraído em '%s'"
-#: branch.c:363
+#: branch.c:364
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "HEAD da árvore de trabalho %s não está atualizada"
@@ -1120,7 +1127,7 @@
msgid "unrecognized header: %s%s (%d)"
msgstr "cabeçalho não reconhecido: %s%s (%d)"
-#: bundle.c:87 sequencer.c:1331 sequencer.c:1752 builtin/commit.c:777
+#: bundle.c:87 sequencer.c:1339 sequencer.c:1760 builtin/commit.c:777
#, c-format
msgid "could not open '%s'"
msgstr "não foi possível abrir '%s'"
@@ -1129,10 +1136,10 @@
msgid "Repository lacks these prerequisite commits:"
msgstr "O repositório não possuí estes commits pré-requisitados:"
-#: bundle.c:163 ref-filter.c:1499 sequencer.c:1154 sequencer.c:2290
-#: builtin/blame.c:2820 builtin/commit.c:1061 builtin/log.c:348
-#: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909
-#: builtin/merge.c:360 builtin/shortlog.c:177
+#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2299
+#: 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 "falha ao configurar percurso de revisões"
@@ -1171,7 +1178,7 @@
msgid "ref '%s' is excluded by the rev-list options"
msgstr "a referência '%s' é excluída pelas opções de rev-list"
-#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:282
+#: bundle.c:443 builtin/log.c:170 builtin/log.c:1579 builtin/shortlog.c:281
#, c-format
msgid "unrecognized argument: %s"
msgstr "argumento não reconhecido: %s"
@@ -1194,7 +1201,7 @@
msgid "invalid color value: %.*s"
msgstr "valor de cor inválido: %.*s"
-#: commit.c:40 sequencer.c:1564 builtin/am.c:421 builtin/am.c:457
+#: commit.c:40 sequencer.c:1572 builtin/am.c:421 builtin/am.c:457
#: builtin/am.c:1493 builtin/am.c:2127
#, c-format
msgid "could not parse %s"
@@ -1205,7 +1212,7 @@
msgid "%s %s is not a commit!"
msgstr "%s %s não é um commit!"
-#: commit.c:1514
+#: commit.c:1511
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
@@ -1220,137 +1227,158 @@
msgid "memory exhausted"
msgstr "memória esgotada"
-#: config.c:518
+#: config.c:191
+msgid "relative config include conditionals must come from files"
+msgstr "configuração relativa com inclusão condicional deve provir de ficheiros"
+
+#: config.c:701
#, c-format
msgid "bad config line %d in blob %s"
msgstr "linha de configuração %d incorreta no blob %s"
-#: config.c:522
+#: config.c:705
#, c-format
msgid "bad config line %d in file %s"
msgstr "linha de configuração %d incorreta no ficheiro %s"
-#: config.c:526
+#: config.c:709
#, c-format
msgid "bad config line %d in standard input"
msgstr "linha de configuração %d incorreta na entrada padrão"
-#: config.c:530
+#: config.c:713
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "linha de configuração %d incorreta no submódulo-blob %s"
-#: config.c:534
+#: config.c:717
#, c-format
msgid "bad config line %d in command line %s"
msgstr "linha de configuração %d incorreta na linha de comandos %s"
-#: config.c:538
+#: config.c:721
#, c-format
msgid "bad config line %d in %s"
msgstr "linha de configuração %d incorreta em %s"
-#: config.c:657
+#: config.c:840
msgid "out of range"
msgstr "fora de intervalo"
-#: config.c:657
+#: config.c:840
msgid "invalid unit"
msgstr "unidade inválida"
-#: config.c:663
+#: config.c:846
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "valor numérico '%s' da configuração '%s' incorreto: %s"
-#: config.c:668
+#: config.c:851
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr "valor numérico '%s' da configuração '%s' incorreto no blob %s: %s"
-#: config.c:671
+#: config.c:854
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr "valor numérico '%s' da configuração '%s' incorreto no ficheiro %s: %s"
-#: config.c:674
+#: config.c:857
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
"valor numérico '%s' da configuração '%s' incorreto na entrada padrão: %s"
-#: config.c:677
+#: config.c:860
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
"valor numérico '%s' da configuração '%s' incorreto no submódulo-blob %s: %s"
-#: config.c:680
+#: config.c:863
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
-"valor numérico '%s' da configuração '%s' incorreto na linha de comandos %s: %s"
+"valor numérico '%s' da configuração '%s' incorreto na linha de comandos %s: "
+"%s"
-#: config.c:683
+#: config.c:866
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "valor numérico '%s' da configuração '%s' incorreto em %s: %s"
-#: config.c:770
+#: config.c:953
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "falha ao expandir diretório de utilizador em: '%s'"
-#: config.c:865 config.c:876
+#: config.c:1048 config.c:1059
#, c-format
msgid "bad zlib compression level %d"
msgstr "nível de compressão zlib %d incorreto"
-#: config.c:993
+#: config.c:1176
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "modo inválido para criação de objeto: %s"
-#: config.c:1149
+#: config.c:1332
#, c-format
msgid "bad pack compression level %d"
msgstr "nível de compactação do pacote %d incorreto"
-#: config.c:1339
+#: config.c:1522
msgid "unable to parse command-line config"
msgstr "não é possível analisar configuração de linha de comandos"
-#: config.c:1389
+#: config.c:1572
msgid "unknown error occurred while reading the configuration files"
msgstr ""
"ocorreu um erro desconhecido durante a leitura dos ficheiros de configuração"
-#: config.c:1743
+#: config.c:1931
+#, c-format
+msgid "Invalid %s: '%s'"
+msgstr "Inválido %s: '%s'"
+
+#: config.c:1952
+#, c-format
+msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
+msgstr ""
+"valor '%s' de core.untrackedCache desconhecido; usar 'keep' valor por omissão"
+
+#: config.c:1978
+#, c-format
+msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
+msgstr "o valor '%d' de splitIndex.maxPercentChange deve estar entre 0 e 100"
+
+#: config.c:1989
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "não é possível analisar '%s' da configuração de linha de comandos"
-#: config.c:1745
+#: config.c:1991
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "variável de configuração '%s' incorreta no ficheiro '%s' na linha %d"
-#: config.c:1804
+#: config.c:2050
#, c-format
msgid "%s has multiple values"
msgstr "%s tem múltiplos valores"
-#: config.c:2225 config.c:2450
+#: config.c:2384 config.c:2609
#, c-format
msgid "fstat on %s failed"
msgstr "falha de fstat de %s"
-#: config.c:2343
+#: config.c:2502
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "não foi possível definir '%s' como '%s'"
-#: config.c:2345
+#: config.c:2504 builtin/remote.c:774
#, c-format
msgid "could not unset '%s'"
msgstr "não foi possível reiniciar '%s'"
@@ -1521,20 +1549,20 @@
"Erros encontrados na variável de configuração 'diff.dirstat':\n"
"%s"
-#: diff.c:3085
+#: diff.c:3102
#, c-format
msgid "external diff died, stopping at %s"
msgstr "o diff externo terminou inesperadamente, interrompido em %s"
-#: diff.c:3411
+#: diff.c:3428
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only, --name-status, --check e -s são mutuamente exclusivos"
-#: diff.c:3501
+#: diff.c:3518
msgid "--follow requires exactly one pathspec"
msgstr "--follow requer exatamente um único especificador de caminho"
-#: diff.c:3664
+#: diff.c:3681
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -1543,209 +1571,229 @@
"Falha ao analisar parâmetro da opção --dirstat/-X:\n"
"%s"
-#: diff.c:3678
+#: diff.c:3695
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "Falha ao analisar parâmetro da opção --submodule: '%s'"
-#: diff.c:4696
+#: diff.c:4719
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
"a deteção mudança de nome inexata foi omitida devido a demasiados ficheiros."
-#: diff.c:4699
+#: diff.c:4722
msgid "only found copies from modified paths due to too many files."
msgstr ""
"só foram encontradas cópias de caminhos modificados devido a demasiados "
"ficheiros."
-#: diff.c:4702
+#: diff.c:4725
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr ""
"pode tentar definir a variável %s para, pelo menos, %d e repetir o comando."
-#: dir.c:1862
+#: dir.c:1899
msgid "failed to get kernel name and information"
msgstr "falha ao obter nome e informação do kernel"
-#: dir.c:1981
+#: dir.c:2018
msgid "Untracked cache is disabled on this system or location."
msgstr "A cache não controlada está desativada neste sistema ou localização."
-#: dir.c:2759
+#: dir.c:2776 dir.c:2781
+#, c-format
+msgid "could not create directories for %s"
+msgstr "não foi possível criar o diretórios para %s"
+
+#: dir.c:2806
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "não foi possível migrar o diretório git de '%s' para '%s'"
-#: fetch-pack.c:213
+#: entry.c:280
+#, c-format
+msgid "could not stat file '%s'"
+msgstr "não foi possível obter stat do ficheiro '%s'"
+
+#: fetch-pack.c:249
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: esperava-se lista rasa"
-#: fetch-pack.c:225
+#: fetch-pack.c:261
msgid "git fetch-pack: expected ACK/NAK, got EOF"
msgstr "git fetch-pack: esperava-se ACK/NAK, obteve-se EOF"
-#: fetch-pack.c:243
+#: fetch-pack.c:279
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: esperava-se ACK/NAK, obteve-se '%s'"
-#: fetch-pack.c:295
+#: fetch-pack.c:331
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc requer multi_ack_detailed"
-#: fetch-pack.c:381
+#: fetch-pack.c:417
#, c-format
msgid "invalid shallow line: %s"
msgstr "linha rasa inválida: %s"
-#: fetch-pack.c:387
+#: fetch-pack.c:423
#, c-format
msgid "invalid unshallow line: %s"
msgstr "linha para aprofundar inválida: %s"
-#: fetch-pack.c:389
+#: fetch-pack.c:425
#, c-format
msgid "object not found: %s"
msgstr "objeto não encontrado: %s"
-#: fetch-pack.c:392
+#: fetch-pack.c:428
#, c-format
msgid "error in object: %s"
msgstr "erro no objeto: %s"
-#: fetch-pack.c:394
+#: fetch-pack.c:430
#, c-format
msgid "no shallow found: %s"
msgstr "raso não encontrado: %s"
-#: fetch-pack.c:397
+#: fetch-pack.c:433
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "esperava-se raso/aprofundar, obteve-se %s"
-#: fetch-pack.c:436
+#: fetch-pack.c:472
#, c-format
msgid "got %s %d %s"
msgstr "obteve-se %s %d %s"
-#: fetch-pack.c:450
+#: fetch-pack.c:486
#, c-format
msgid "invalid commit %s"
msgstr "commit inválido %s"
-#: fetch-pack.c:483
+#: fetch-pack.c:519
msgid "giving up"
msgstr "desistência"
-#: fetch-pack.c:493 progress.c:235
+#: fetch-pack.c:529 progress.c:235
msgid "done"
msgstr "concluído"
-#: fetch-pack.c:505
+#: fetch-pack.c:541
#, c-format
msgid "got %s (%d) %s"
msgstr "obteve-se %s (%d) %s"
-#: fetch-pack.c:551
+#: fetch-pack.c:587
#, c-format
msgid "Marking %s as complete"
msgstr "Marcado %s como completo"
-#: fetch-pack.c:697
+#: fetch-pack.c:735
#, c-format
msgid "already have %s (%s)"
msgstr "já se tem %s (%s)"
-#: fetch-pack.c:735
+#: fetch-pack.c:773
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack: não é possível efetuar fork de sideband demultiplexer"
-#: fetch-pack.c:743
+#: fetch-pack.c:781
msgid "protocol error: bad pack header"
msgstr "erro de protocolo: cabeçalho de pacote incorreto"
-#: fetch-pack.c:799
+#: fetch-pack.c:837
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: não é possível criar processo filho %s"
-#: fetch-pack.c:815
+#: fetch-pack.c:853
#, c-format
msgid "%s failed"
msgstr "%s falhou"
-#: fetch-pack.c:817
+#: fetch-pack.c:855
msgid "error in sideband demultiplexer"
msgstr "erro no sideband demultiplexer"
-#: fetch-pack.c:844
+#: fetch-pack.c:882
msgid "Server does not support shallow clients"
msgstr "O servidor não suporta clientes rasos"
-#: fetch-pack.c:848
+#: fetch-pack.c:886
msgid "Server supports multi_ack_detailed"
msgstr "O servidor suporta multi_ack_detailed"
-#: fetch-pack.c:851
+#: fetch-pack.c:889
msgid "Server supports no-done"
msgstr "O servidor suporta no-done"
-#: fetch-pack.c:857
+#: fetch-pack.c:895
msgid "Server supports multi_ack"
msgstr "O servidor suporta muilti_ack"
-#: fetch-pack.c:861
+#: fetch-pack.c:899
msgid "Server supports side-band-64k"
msgstr "O servidor suporta side-band-64k"
-#: fetch-pack.c:865
+#: fetch-pack.c:903
msgid "Server supports side-band"
msgstr "O servidor suporta side-band"
-#: fetch-pack.c:869
+#: fetch-pack.c:907
msgid "Server supports allow-tip-sha1-in-want"
msgstr "O servidor suporta allow-tip-sha1-in-want"
-#: fetch-pack.c:873
+#: fetch-pack.c:911
msgid "Server supports allow-reachable-sha1-in-want"
msgstr "O servidor suporta allow-reachable-sha1-in-want"
-#: fetch-pack.c:883
+#: fetch-pack.c:921
msgid "Server supports ofs-delta"
msgstr "O servidor suporta ofs-delta"
-#: fetch-pack.c:890
+#: fetch-pack.c:928
#, c-format
msgid "Server version is %.*s"
msgstr "A versão do servidor é %.*s"
-#: fetch-pack.c:896
+#: fetch-pack.c:934
msgid "Server does not support --shallow-since"
msgstr "O servidor não suporta --shallow-since"
-#: fetch-pack.c:900
+#: fetch-pack.c:938
msgid "Server does not support --shallow-exclude"
msgstr "O servidor não suporta --shallow-exclude"
-#: fetch-pack.c:902
+#: fetch-pack.c:940
msgid "Server does not support --deepen"
msgstr "O servidor não suporta --deepen"
-#: fetch-pack.c:913
+#: fetch-pack.c:951
msgid "no common commits"
msgstr "nenhum commit em comum"
-#: fetch-pack.c:925
+#: fetch-pack.c:963
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: falha ao obter."
-#: fetch-pack.c:1087
+#: fetch-pack.c:1125
msgid "no matching remote head"
msgstr "nenhuma cabeça remota correspondente"
+#: fetch-pack.c:1147
+#, c-format
+msgid "no such remote ref %s"
+msgstr "referência remota %s inexistente"
+
+#: fetch-pack.c:1150
+#, c-format
+msgid "Server does not allow request for unadvertised object %s"
+msgstr "O servidor não permite pedido do objeto não anunciado %s"
+
#: gpg-interface.c:185
msgid "gpg failed to sign the data"
msgstr "gpg não assinou os dados"
@@ -1764,17 +1812,17 @@
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "ignorar cor inválida '%.*s' em log.graphColors"
-#: grep.c:1794
+#: grep.c:1796
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s': não foi possível ler %s"
-#: grep.c:1811 builtin/clone.c:381 builtin/diff.c:81 builtin/rm.c:133
+#: grep.c:1813 builtin/clone.c:399 builtin/diff.c:81 builtin/rm.c:133
#, c-format
msgid "failed to stat '%s'"
msgstr "falha ao invocar stat de '%s'"
-#: grep.c:1822
+#: grep.c:1824
#, c-format
msgid "'%s': short read"
msgstr "'%s': leitura truncada"
@@ -1843,7 +1891,7 @@
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: ident.c:334
+#: ident.c:343
msgid ""
"\n"
"*** Please tell me who you are.\n"
@@ -1869,6 +1917,40 @@
"Omita --global para definir a identidade apenas neste repositório.\n"
"\n"
+#: ident.c:367
+msgid "no email was given and auto-detection is disabled"
+msgstr "nenhum e-mail indicado e a deteção automática está desativada"
+
+#: ident.c:372
+#, c-format
+msgid "unable to auto-detect email address (got '%s')"
+msgstr ""
+"não é possível detetar automaticamente endereço de e-mail (obteve-se '%s')"
+
+#: ident.c:382
+msgid "no name was given and auto-detection is disabled"
+msgstr "nenhum nome indicado e a deteção automática está desativada"
+
+#: ident.c:388
+#, c-format
+msgid "unable to auto-detect name (got '%s')"
+msgstr "não é possível detetar automaticamente o nome (obteve-se '%s')"
+
+#: ident.c:396
+#, c-format
+msgid "empty ident name (for <%s>) not allowed"
+msgstr "nome de identificação vazio (de <%s>) não é permitido"
+
+#: ident.c:402
+#, c-format
+msgid "name consists only of disallowed characters: %s"
+msgstr "nome consiste apenas de caracteres não permitidos: %s"
+
+#: ident.c:417 builtin/commit.c:611
+#, c-format
+msgid "invalid date format: %s"
+msgstr "formato de data inválido: %s"
+
#: lockfile.c:152
#, c-format
msgid ""
@@ -1897,8 +1979,8 @@
msgid "failed to read the cache"
msgstr "falha ao ler a cache"
-#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374
-#: builtin/checkout.c:588 builtin/clone.c:731
+#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:393
+#: builtin/checkout.c:607 builtin/clone.c:749
msgid "unable to write new index file"
msgstr "não foi possível escrever novo ficheiro de índice"
@@ -1968,38 +2050,56 @@
msgid "Unable to add %s to database"
msgstr "Não é possível adicionar %s à base de dados"
-#: merge-recursive.c:1088 merge-recursive.c:1102
+#: merge-recursive.c:1092
#, c-format
msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left in "
-"tree."
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree."
msgstr ""
"CONFLITO (%s/eliminar): %s eliminado em %s e %s em %s. Versão de %s de %s "
"deixada na árvore."
-#: merge-recursive.c:1094 merge-recursive.c:1107
+#: merge-recursive.c:1097
#, c-format
msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %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."
+msgstr ""
+"CONFLITO (%s/eliminar): %s eliminado em %s e %s para %s em %s. Versão de %s "
+"de %s deixada na árvore."
+
+#: merge-recursive.c:1104
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree at %s."
msgstr ""
"CONFLITO (%s/eliminar): %s eliminado em %s e %s em %s. Versão de %s de %s "
"deixada na árvore em %s."
-#: merge-recursive.c:1150
+#: merge-recursive.c:1109
+#, 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 ""
+"CONFLITO (%s/eliminar): %s eliminado em %s e %s para %s em %s. Versão de %s "
+"de %s deixada na árvore em %s."
+
+#: merge-recursive.c:1143
msgid "rename"
msgstr "mudar nome"
-#: merge-recursive.c:1150
+#: merge-recursive.c:1143
msgid "renamed"
msgstr "nome mudado"
-#: merge-recursive.c:1207
+#: merge-recursive.c:1200
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s é um diretório em %s adicionando %s no seu lugar"
-#: merge-recursive.c:1232
+#: merge-recursive.c:1225
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -2008,138 +2108,138 @@
"CONFLITO (mudar nome/mudar nome): Mudar o nome \"%s\"->\"%s\" no ramo \"%s\" "
"mudar o nome \"%s\"->\"%s\" em \"%s\"%s"
-#: merge-recursive.c:1237
+#: merge-recursive.c:1230
msgid " (left unresolved)"
msgstr " (por resolver)"
-#: merge-recursive.c:1299
+#: merge-recursive.c:1292
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
-"CONFLITO (mudar nome/mudar nome): Mudar de nome %s->%s em %s. Mudar o nome %s-"
-">%s em %s"
+"CONFLITO (mudar nome/mudar nome): Mudar de nome %s->%s em %s. Mudar o nome "
+"%s->%s em %s"
-#: merge-recursive.c:1332
+#: merge-recursive.c:1325
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr "A mudar o nome de %s para %s e de %s para %s, em alternativa"
-#: merge-recursive.c:1535
+#: merge-recursive.c:1528
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr ""
"CONFLITO (mudar nome/adicionar): Mudar o nome %s->%s em %s. %s adicionado em "
"%s"
-#: merge-recursive.c:1550
+#: merge-recursive.c:1543
#, c-format
msgid "Adding merged %s"
msgstr "A adicionar %s integrado"
-#: merge-recursive.c:1557 merge-recursive.c:1771
+#: merge-recursive.c:1550 merge-recursive.c:1780
#, c-format
msgid "Adding as %s instead"
msgstr "A adicionar como %s, em alternativa."
-#: merge-recursive.c:1614
+#: merge-recursive.c:1607
#, c-format
msgid "cannot read object %s"
msgstr "não foi possível ler o objeto %s"
-#: merge-recursive.c:1617
+#: merge-recursive.c:1610
#, c-format
msgid "object %s is not a blob"
msgstr "o objeto %s não é um blob"
-#: merge-recursive.c:1670
+#: merge-recursive.c:1679
msgid "modify"
msgstr "modificar"
-#: merge-recursive.c:1670
+#: merge-recursive.c:1679
msgid "modified"
msgstr "modificado"
-#: merge-recursive.c:1680
+#: merge-recursive.c:1689
msgid "content"
msgstr "conteúdo"
-#: merge-recursive.c:1687
+#: merge-recursive.c:1696
msgid "add/add"
msgstr "adicionar/adicionar"
-#: merge-recursive.c:1723
+#: merge-recursive.c:1732
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "%s ignorado (integrado é igual ao existente)"
-#: merge-recursive.c:1737
+#: merge-recursive.c:1746
#, c-format
msgid "Auto-merging %s"
msgstr "A integrar automaticamente %s"
-#: merge-recursive.c:1741 git-submodule.sh:930
+#: merge-recursive.c:1750 git-submodule.sh:944
msgid "submodule"
msgstr "submódulo"
-#: merge-recursive.c:1742
+#: merge-recursive.c:1751
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "CONFLITO (%s): conflito de integração em %s"
-#: merge-recursive.c:1836
+#: merge-recursive.c:1845
#, c-format
msgid "Removing %s"
msgstr "A remover %s"
-#: merge-recursive.c:1862
+#: merge-recursive.c:1871
msgid "file/directory"
msgstr "ficheiro/diretório"
-#: merge-recursive.c:1868
+#: merge-recursive.c:1877
msgid "directory/file"
msgstr "diretório/ficheiro"
-#: merge-recursive.c:1874
+#: merge-recursive.c:1883
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"CONFLITO (%s): Há um diretório designado %s em %s. A adicionar %s como %s"
-#: merge-recursive.c:1883
+#: merge-recursive.c:1892
#, c-format
msgid "Adding %s"
msgstr "A adicionar %s"
-#: merge-recursive.c:1920
+#: merge-recursive.c:1929
msgid "Already up-to-date!"
msgstr "Já está atualizado!"
-#: merge-recursive.c:1929
+#: merge-recursive.c:1938
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "falha ao integrar as árvores %s e %s"
-#: merge-recursive.c:2012
+#: merge-recursive.c:2021
msgid "Merging:"
msgstr "A integrar:"
-#: merge-recursive.c:2025
+#: merge-recursive.c:2034
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "%u antecessor comum encontrado:"
msgstr[1] "%u antecessores comuns encontrados:"
-#: merge-recursive.c:2064
+#: merge-recursive.c:2073
msgid "merge returned no commit"
msgstr "a integração não retornou nenhum commit"
-#: merge-recursive.c:2127
+#: merge-recursive.c:2136
#, c-format
msgid "Could not parse object '%s'"
msgstr "Não foi possível analisar o objeto '%s'"
-#: merge-recursive.c:2141 builtin/merge.c:645 builtin/merge.c:792
+#: merge-recursive.c:2150 builtin/merge.c:645 builtin/merge.c:792
msgid "Unable to write index."
msgstr "Não é possível escrever no índice."
@@ -2147,8 +2247,8 @@
#, 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 ""
"Não concluíu a integração de notas anterior (%s existe).\n"
"Use 'git notes merge --commit' ou 'git notes merge --abort' para submeter/"
@@ -2216,18 +2316,37 @@
msgid "malformed object name '%s'"
msgstr "nome do objeto malformado '%s'"
-#: path.c:826
+#: path.c:805
#, c-format
msgid "Could not make %s writable by group"
msgstr "Não foi possível dar permissão de escrita ao grupo a %s"
-#: pathspec.c:142
+#: pathspec.c:125
+msgid "Escape character '\\' not allowed as last character in attr value"
+msgstr ""
+"O carácter de escape '\\' não pode ser usado como último carácter no valor "
+"de attr"
+
+#: pathspec.c:143
+msgid "Only one 'attr:' specification is allowed."
+msgstr "Só se pode especificar um 'attr:'."
+
+#: pathspec.c:146
+msgid "attr spec must not be empty"
+msgstr "especificador attr não pode estar vazio"
+
+#: pathspec.c:189
+#, c-format
+msgid "invalid attribute name %s"
+msgstr "nome de atributo inválido %s"
+
+#: pathspec.c:254
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
"as definições globais 'glob' e 'noglob' de especificador de caminho "
"(pathspec) são incompatíveis"
-#: pathspec.c:149
+#: pathspec.c:261
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
@@ -2235,52 +2354,52 @@
"a definição global de especificador de caminho 'literal' é incompatível com "
"todas as outras definições globais de especificador de caminho (pathspec)"
-#: pathspec.c:188
+#: pathspec.c:301
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr "parâmetro inválido na mágica 'prefix' do especificador de caminho"
-#: pathspec.c:201
+#: pathspec.c:322
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr "Mágica do especificador de caminho '%.*s' inválida em '%s'"
-#: pathspec.c:206
+#: pathspec.c:327
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr "Falta um ')' no final da mágica do especificador de caminho em '%s'"
-#: pathspec.c:238
+#: pathspec.c:365
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr "Mágica de especificador de caminho '%c' em '%s' não implementada"
-#: pathspec.c:293 pathspec.c:315
+#: pathspec.c:421 pathspec.c:443
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "O caminho '%s' está dentro do submódulo '%.*s'"
-#: pathspec.c:350
+#: pathspec.c:483
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s: 'literal' e 'glob' são incompatíveis"
-#: pathspec.c:363
+#: pathspec.c:496
#, c-format
msgid "%s: '%s' is outside repository"
msgstr "%s: '%s' está fora do repositório"
-#: pathspec.c:451
+#: pathspec.c:584
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "'%s' (mnemónica: '%c')"
-#: pathspec.c:461
+#: pathspec.c:594
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr ""
"%s: mágica de especificador de caminho não suportada por este comando: %s"
-#: pathspec.c:511
+#: pathspec.c:644
msgid ""
"empty strings as pathspecs will be made invalid in upcoming releases. please "
"use . instead if you meant to match all paths"
@@ -2288,19 +2407,11 @@
"cadeias de caracteres vazias como especificadores de caminho tornar-se-ão "
"inválidas nas próximas versões. Use . para corresponder a todos os caminhos"
-#: pathspec.c:535
+#: pathspec.c:668
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "o especificador de caminho '%s' é indicado por uma ligação simbólica"
-#: pathspec.c:544
-msgid ""
-"There is nothing to exclude from by :(exclude) patterns.\n"
-"Perhaps you forgot to add either ':/' or '.' ?"
-msgstr ""
-"Não há nada para excluir de acordo com o padrão :(excluir).\n"
-"Talvez se tenha esquecido de acrescentar ':/' ou '.' ?"
-
#: pretty.c:982
msgid "unable to parse --pretty format"
msgstr "não foi possível analisar o formato de --pretty"
@@ -2323,161 +2434,264 @@
"GIT_INDEX_VERSION definido, mas com valor inválido.\n"
"A usar a versão %i"
-#: refs.c:576 builtin/merge.c:844
+#: read-cache.c:2232
+#, c-format
+msgid "could not stat '%s"
+msgstr "não foi possível obter stat de '%s'"
+
+#: read-cache.c:2245
+#, c-format
+msgid "unable to open git dir: %s"
+msgstr "não é possível diretório git: %s"
+
+#: read-cache.c:2257
+#, c-format
+msgid "unable to unlink: %s"
+msgstr "não é possível invocar unlink: %s"
+
+#: refs.c:619 builtin/merge.c:844
#, c-format
msgid "Could not open '%s' for writing"
msgstr "Não foi possível abrir '%s' para escrita"
-#: refs/files-backend.c:2481
+#: refs/files-backend.c:2531
#, c-format
msgid "could not delete reference %s: %s"
msgstr "não foi possível eliminar a referência %s: %s"
-#: refs/files-backend.c:2484
+#: refs/files-backend.c:2534
#, c-format
msgid "could not delete references: %s"
msgstr "não foi possível eliminar as referências: %s"
-#: refs/files-backend.c:2493
+#: refs/files-backend.c:2543
#, c-format
msgid "could not remove reference %s"
msgstr "não foi possível eliminar a referência %s"
-#: ref-filter.c:56
+#: ref-filter.c:35 wt-status.c:1780
+msgid "gone"
+msgstr "desaparecido"
+
+#: ref-filter.c:36
+#, c-format
+msgid "ahead %d"
+msgstr "à frente %d"
+
+#: ref-filter.c:37
+#, c-format
+msgid "behind %d"
+msgstr "atrás %d"
+
+#: ref-filter.c:38
+#, c-format
+msgid "ahead %d, behind %d"
+msgstr "à frente %d, atrás %d"
+
+#: ref-filter.c:104
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "formato esperado: %%(color:<cor>)"
-#: ref-filter.c:58
+#: ref-filter.c:106
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "cor não reconhecida: %%(color:%s)"
-#: ref-filter.c:72
+#: ref-filter.c:120
#, c-format
-msgid "unrecognized format: %%(%s)"
-msgstr "formato não reconhecido: %%(%s)"
+msgid "Integer value expected refname:lstrip=%s"
+msgstr "valor inteiro esperado refname:lstrip=%s"
-#: ref-filter.c:78
+#: ref-filter.c:124
+#, c-format
+msgid "Integer value expected refname:rstrip=%s"
+msgstr "Valor inteiro esperado refname:rstrip=%s"
+
+#: ref-filter.c:126
+#, c-format
+msgid "unrecognized %%(%s) argument: %s"
+msgstr "argumento de %%(%s) não reconhecido: %s"
+
+#: ref-filter.c:166
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) não leva argumentos"
-#: ref-filter.c:85
+#: ref-filter.c:173
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "%%(subject) não leva argumentos"
-#: ref-filter.c:92
+#: ref-filter.c:180
#, c-format
msgid "%%(trailers) does not take arguments"
msgstr "%%(trailers) não leva argumentos"
-#: ref-filter.c:111
+#: ref-filter.c:199
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "valor positivo esperado contents:lines=%s"
-#: ref-filter.c:113
+#: ref-filter.c:201
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "argumento de %%(contents) não reconhecido: %s"
-#: ref-filter.c:123
+#: ref-filter.c:214
+#, c-format
+msgid "positive value expected objectname:short=%s"
+msgstr "valor positivo esperado objectname:short=%s"
+
+#: ref-filter.c:218
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "argumento de %%(objectname) não reconhecido: %s"
-#: ref-filter.c:145
+#: ref-filter.c:245
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "formato esperado: %%(align:<largura>,<posição>)"
-#: ref-filter.c:157
+#: ref-filter.c:257
#, c-format
msgid "unrecognized position:%s"
msgstr "posição não reconhecida:%s"
-#: ref-filter.c:161
+#: ref-filter.c:261
#, c-format
msgid "unrecognized width:%s"
msgstr "largura não reconhecida:%s"
-#: ref-filter.c:167
+#: ref-filter.c:267
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "argumento de %%(align) não reconhecido: %s"
-#: ref-filter.c:171
+#: ref-filter.c:271
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "largura positiva esperada com o átomo %%(algn)"
-#: ref-filter.c:255
+#: ref-filter.c:286
+#, c-format
+msgid "unrecognized %%(if) argument: %s"
+msgstr "argumento de %%(if) não reconhecido: %s"
+
+#: ref-filter.c:371
#, c-format
msgid "malformed field name: %.*s"
msgstr "nome de ficheiro malformado: %.*s"
-#: ref-filter.c:281
+#: ref-filter.c:397
#, c-format
msgid "unknown field name: %.*s"
msgstr "nome do campo desconhecido: %.*s"
-#: ref-filter.c:383
+#: ref-filter.c:501
+#, c-format
+msgid "format: %%(if) atom used without a %%(then) atom"
+msgstr "formato: átomo %%(if) utilizado sem átomo %%(then) correspondente"
+
+#: ref-filter.c:561
+#, c-format
+msgid "format: %%(then) atom used without an %%(if) atom"
+msgstr "formato: átomo %%(then) utilizado sem átomo %%(if) correspondente"
+
+#: ref-filter.c:563
+#, c-format
+msgid "format: %%(then) atom used more than once"
+msgstr "formato: átomo %%(then) utilizado mais que uma vez"
+
+#: ref-filter.c:565
+#, c-format
+msgid "format: %%(then) atom used after %%(else)"
+msgstr "formato: átomo %%(then) utilizado depois de %%(else)"
+
+#: ref-filter.c:591
+#, c-format
+msgid "format: %%(else) atom used without an %%(if) atom"
+msgstr "formato: átomo %%(else) utilizado sem átomo %%(if) correspondente"
+
+#: ref-filter.c:593
+#, c-format
+msgid "format: %%(else) atom used without a %%(then) atom"
+msgstr "formato: átomo %%(else) utilizado sem átomo %%(then) correspondente"
+
+#: ref-filter.c:595
+#, c-format
+msgid "format: %%(else) atom used more than once"
+msgstr "formato: átomo %%(else) utilizado mais que uma vez"
+
+#: ref-filter.c:608
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "formato: átomo %%(end) utilizado sem átomo correspondente"
-#: ref-filter.c:435
+#: ref-filter.c:663
#, c-format
msgid "malformed format string %s"
msgstr "cadeia malformada %s"
-#: ref-filter.c:898
-msgid ":strip= requires a positive integer argument"
-msgstr ":strip= requer um inteiro positivo como argumento"
-
-#: ref-filter.c:903
+#: ref-filter.c:1247
#, c-format
-msgid "ref '%s' does not have %ld components to :strip"
-msgstr "a referência '%s' não tem %ld componentes como se indica em :strip"
+msgid "(no branch, rebasing %s)"
+msgstr "(nenhum ramo, a efetuar rebase de %s)"
-#: ref-filter.c:1066
+#: ref-filter.c:1250
#, c-format
-msgid "unknown %.*s format %s"
-msgstr "formato de %.*s desconhecido %s"
+msgid "(no branch, bisect started on %s)"
+msgstr "(nenhum ramo, bissecção iniciada em %s)"
-#: ref-filter.c:1086 ref-filter.c:1117
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached at " in wt-status.c
+#: ref-filter.c:1256
+#, c-format
+msgid "(HEAD detached at %s)"
+msgstr "(HEAD destacada em %s)"
+
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached from " in wt-status.c
+#: ref-filter.c:1261
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr "(HEAD destacada de %s)"
+
+#: ref-filter.c:1265
+msgid "(no branch)"
+msgstr "(nenhum ramo)"
+
+#: ref-filter.c:1420 ref-filter.c:1451
#, c-format
msgid "missing object %s for %s"
msgstr "falta o objeto %s de %s"
-#: ref-filter.c:1089 ref-filter.c:1120
+#: ref-filter.c:1423 ref-filter.c:1454
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "falha ao invocar parse_object_buffer sobre %s de %s"
-#: ref-filter.c:1343
+#: ref-filter.c:1692
#, c-format
msgid "malformed object at '%s'"
msgstr "objeto malformado em '%s'"
-#: ref-filter.c:1410
+#: ref-filter.c:1759
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "a referência %s com nome danificado foi ignorada"
-#: ref-filter.c:1415
+#: ref-filter.c:1764
#, c-format
msgid "ignoring broken ref %s"
msgstr "a referência %s danificada foi ignorada"
-#: ref-filter.c:1670
+#: ref-filter.c:2028
#, c-format
msgid "format: %%(end) atom missing"
msgstr "formato: falta átomo %%(end)"
-#: ref-filter.c:1734
+#: ref-filter.c:2109
#, c-format
msgid "malformed object name %s"
msgstr "nome de objeto malformado %s"
@@ -2630,15 +2844,25 @@
msgid "dup2(%d,%d) failed"
msgstr "dup2(%d,%d) falhou"
-#: send-pack.c:297
+#: send-pack.c:150
+#, c-format
+msgid "unable to parse remote unpack status: %s"
+msgstr "não é possível analisar status de descompactação remota: %s"
+
+#: send-pack.c:152
+#, c-format
+msgid "remote unpack failed: %s"
+msgstr "descompactação remota falhou: %s"
+
+#: send-pack.c:315
msgid "failed to sign the push certificate"
msgstr "falha ao assinar o certificado de publicação"
-#: send-pack.c:410
+#: send-pack.c:428
msgid "the receiving end does not support --signed push"
msgstr "o recetor não suporta publicação com --signed"
-#: send-pack.c:412
+#: send-pack.c:430
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -2646,11 +2870,11 @@
"certificado de publicação não enviado uma vez que o recetor não suporta "
"publicação com --signed"
-#: send-pack.c:424
+#: send-pack.c:442
msgid "the receiving end does not support --atomic push"
msgstr "o recetor não suporta publicação com --atomic"
-#: send-pack.c:429
+#: send-pack.c:447
msgid "the receiving end does not support push options"
msgstr "o recetor não suporta opções de publicação"
@@ -2689,12 +2913,12 @@
"com 'git add <caminhos>' ou 'git rm <caminhos>'\n"
"e submeta o resultado com 'git commit'"
-#: sequencer.c:294 sequencer.c:1667
+#: sequencer.c:294 sequencer.c:1675
#, c-format
msgid "could not lock '%s'"
msgstr "não foi possível bloquear '%s'"
-#: sequencer.c:297 sequencer.c:1545 sequencer.c:1672 sequencer.c:1686
+#: sequencer.c:297 sequencer.c:1553 sequencer.c:1680 sequencer.c:1694
#, c-format
msgid "could not write to '%s'"
msgstr "não foi possível escrever em '%s'"
@@ -2704,13 +2928,13 @@
msgid "could not write eol to '%s'"
msgstr "não foi possível escrever fim de linha em '%s'"
-#: sequencer.c:305 sequencer.c:1550 sequencer.c:1674
+#: sequencer.c:305 sequencer.c:1558 sequencer.c:1682
#, c-format
msgid "failed to finalize '%s'."
msgstr "falha ao finalizar '%s'."
-#: sequencer.c:329 sequencer.c:808 sequencer.c:1571 builtin/am.c:259
-#: builtin/commit.c:749 builtin/merge.c:1036
+#: sequencer.c:329 sequencer.c:814 sequencer.c:1579 builtin/am.c:259
+#: builtin/commit.c:749 builtin/merge.c:1018
#, c-format
msgid "could not read '%s'"
msgstr "não foi possível ler '%s'"
@@ -2774,17 +2998,17 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:688
+#: sequencer.c:694
#, c-format
msgid "could not parse commit %s\n"
msgstr "não foi possível analisar o commit %s\n"
-#: sequencer.c:693
+#: sequencer.c:699
#, c-format
msgid "could not parse parent commit %s\n"
msgstr "não foi possível analisar o commit pai %s\n"
-#: sequencer.c:815
+#: sequencer.c:821
#, c-format
msgid ""
"unexpected 1st line of squash message:\n"
@@ -2795,7 +3019,7 @@
"\n"
"\t%.*s"
-#: sequencer.c:821
+#: sequencer.c:827
#, c-format
msgid ""
"invalid 1st line of squash message:\n"
@@ -2806,230 +3030,230 @@
"\n"
"\t%.*s"
-#: sequencer.c:827 sequencer.c:852
+#: sequencer.c:833 sequencer.c:858
#, c-format
msgid "This is a combination of %d commits."
msgstr "Isto é a combinação de %d commits."
-#: sequencer.c:836
+#: sequencer.c:842
msgid "need a HEAD to fixup"
msgstr "necessária uma HEAD para fixup"
-#: sequencer.c:838
+#: sequencer.c:844
msgid "could not read HEAD"
msgstr "não foi possível ler HEAD"
-#: sequencer.c:840
+#: sequencer.c:846
msgid "could not read HEAD's commit message"
msgstr "não foi possível ler a mensagem de commit de HEAD"
-#: sequencer.c:846
+#: sequencer.c:852
#, c-format
msgid "cannot write '%s'"
msgstr "não é possível escrever '%s'"
-#: sequencer.c:855 git-rebase--interactive.sh:445
+#: sequencer.c:861 git-rebase--interactive.sh:445
msgid "This is the 1st commit message:"
msgstr "Esta é a 1ª mensagem de commit:"
-#: sequencer.c:863
+#: sequencer.c:869
#, c-format
msgid "could not read commit message of %s"
msgstr "não foi possível ler a mensagem de commit de %s"
-#: sequencer.c:870
+#: sequencer.c:876
#, c-format
msgid "This is the commit message #%d:"
msgstr "Esta é a mensagem de commit nº%d:"
-#: sequencer.c:875
+#: sequencer.c:881
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "A mensagem de commit #%d será ignorada:"
-#: sequencer.c:880
+#: sequencer.c:886
#, c-format
msgid "unknown command: %d"
msgstr "comando desconhecido: %d"
-#: sequencer.c:946
+#: sequencer.c:952
msgid "your index file is unmerged."
msgstr "ficheiro de índice não integrado."
-#: sequencer.c:964
+#: sequencer.c:970
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "o commit %s é uma integração mas não foi fornecida a opção -m."
-#: sequencer.c:972
+#: sequencer.c:978
#, c-format
msgid "commit %s does not have parent %d"
msgstr "o commit %s não tem o pai %d"
-#: sequencer.c:976
+#: sequencer.c:982
#, c-format
msgid "mainline was specified but commit %s is not a merge."
msgstr ""
"a linha principal foi especificada mas o commit %s não é uma integração."
-#: sequencer.c:982
+#: sequencer.c:988
#, c-format
msgid "cannot get commit message for %s"
msgstr "não é possível obter a mensagem de commit de %s"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1001
+#: sequencer.c:1009
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: não foi possível analisar o commit pai %s"
-#: sequencer.c:1063 sequencer.c:1812
+#: sequencer.c:1071 sequencer.c:1820
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "não foi possível mudar o nome de '%s' para '%s'"
-#: sequencer.c:1114
+#: sequencer.c:1122
#, c-format
msgid "could not revert %s... %s"
msgstr "não foi possível reverter %s... %s"
-#: sequencer.c:1115
+#: sequencer.c:1123
#, c-format
msgid "could not apply %s... %s"
msgstr "não foi possível aplicar %s... %s"
-#: sequencer.c:1157
+#: sequencer.c:1165
msgid "empty commit set passed"
msgstr "o conjunto de commits especificado está vazio"
-#: sequencer.c:1167
+#: sequencer.c:1175
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: falha ao ler o índice"
-#: sequencer.c:1174
+#: sequencer.c:1182
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: falha ao atualizar o índice"
-#: sequencer.c:1294
+#: sequencer.c:1302
#, c-format
msgid "invalid line %d: %.*s"
msgstr "linha %d inválida: %.*s"
-#: sequencer.c:1302
+#: sequencer.c:1310
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "não é possível efetuar '%s' sem um commit anterior"
-#: sequencer.c:1334
+#: sequencer.c:1342
#, c-format
msgid "could not read '%s'."
msgstr "não foi possível ler '%s'."
-#: sequencer.c:1341
+#: sequencer.c:1349
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "corrija-o usando 'git rebase --edit-todo'."
-#: sequencer.c:1343
+#: sequencer.c:1351
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "folha de instruções inutilizável: '%s'"
-#: sequencer.c:1348
+#: sequencer.c:1356
msgid "no commits parsed."
msgstr "nenhum commit analisado."
-#: sequencer.c:1359
+#: sequencer.c:1367
msgid "cannot cherry-pick during a revert."
msgstr "não é possível efetuar cherry-pick durante uma reversão."
-#: sequencer.c:1361
+#: sequencer.c:1369
msgid "cannot revert during a cherry-pick."
msgstr "não é possível reverter durante um cherry-pick."
-#: sequencer.c:1424
+#: sequencer.c:1432
#, c-format
msgid "invalid key: %s"
msgstr "chave inválida: %s"
-#: sequencer.c:1427
+#: sequencer.c:1435
#, c-format
msgid "invalid value for %s: %s"
msgstr "valor inválido de %s: %s"
-#: sequencer.c:1484
+#: sequencer.c:1492
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "folha de opções malformada: '%s'"
-#: sequencer.c:1522
+#: sequencer.c:1530
msgid "a cherry-pick or revert is already in progress"
msgstr "cherry-pick ou revert em curso"
-#: sequencer.c:1523
+#: sequencer.c:1531
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "tente \"git cherry-pick (--continue | --quit |--abort)\""
-#: sequencer.c:1526
+#: sequencer.c:1534
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "não foi possível criar o diretório do sequenciador '%s'"
-#: sequencer.c:1540
+#: sequencer.c:1548
msgid "could not lock HEAD"
msgstr "não foi possível bloquear HEAD"
-#: sequencer.c:1596 sequencer.c:2150
+#: sequencer.c:1604 sequencer.c:2159
msgid "no cherry-pick or revert in progress"
msgstr "nenhum cherry-pick ou revert em curso"
-#: sequencer.c:1598
+#: sequencer.c:1606
msgid "cannot resolve HEAD"
msgstr "não é possível resolver HEAD"
-#: sequencer.c:1600 sequencer.c:1634
+#: sequencer.c:1608 sequencer.c:1642
msgid "cannot abort from a branch yet to be born"
msgstr "não é possível abortar um ramo ainda não criado"
-#: sequencer.c:1620 builtin/grep.c:904
+#: sequencer.c:1628 builtin/grep.c:910
#, c-format
msgid "cannot open '%s'"
msgstr "não é possível abrir '%s'"
-#: sequencer.c:1622
+#: sequencer.c:1630
#, c-format
msgid "cannot read '%s': %s"
msgstr "não é possível ler '%s': %s"
-#: sequencer.c:1623
+#: sequencer.c:1631
msgid "unexpected end of file"
msgstr "fim de ficheiro inesperado"
-#: sequencer.c:1629
+#: sequencer.c:1637
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "o ficheiro HEAD de pre-cherry-pick '%s' está corrompido"
-#: sequencer.c:1640
+#: sequencer.c:1648
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr "Parece que a HEAD se moveu. Não recuando, verifique a HEAD."
-#: sequencer.c:1777 sequencer.c:2049
+#: sequencer.c:1785 sequencer.c:2058
msgid "cannot read HEAD"
msgstr "não é possível ler HEAD"
-#: sequencer.c:1817 builtin/difftool.c:574
+#: sequencer.c:1825 builtin/difftool.c:616
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "não foi possível copiar '%s' para '%s'"
-#: sequencer.c:1833
+#: sequencer.c:1841
msgid "could not read index"
msgstr "não foi possível ler o índice"
-#: sequencer.c:1838
+#: sequencer.c:1846
#, c-format
msgid ""
"execution failed: %s\n"
@@ -3044,11 +3268,11 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:1844
+#: sequencer.c:1852
msgid "and made changes to the index and/or the working tree\n"
msgstr "e fez alterações ao índice e/ou à árvore de trabalho\n"
-#: sequencer.c:1850
+#: sequencer.c:1858
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -3065,17 +3289,17 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:1905 git-rebase.sh:168
+#: sequencer.c:1913 git-rebase.sh:168
#, c-format
msgid "Applied autostash."
msgstr "Pilha automática (autostash) aplicada."
-#: sequencer.c:1917
+#: sequencer.c:1925
#, c-format
msgid "cannot store %s"
msgstr "não é possível guardar %s"
-#: sequencer.c:1919 git-rebase.sh:172
+#: sequencer.c:1927 git-rebase.sh:172
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
@@ -3086,57 +3310,57 @@
"As suas alterações estão guardadas na pilha.\n"
"Pode executar \"git stash pop\" ou \"git stash drop\" oportunamente.\n"
-#: sequencer.c:2000
+#: sequencer.c:2009
#, c-format
-msgid "stopped at %s... %.*s"
-msgstr "parado a %s... %.*s"
+msgid "Stopped at %s... %.*s\n"
+msgstr "Parou a %s... %.*s\n"
-#: sequencer.c:2027
+#: sequencer.c:2036
#, c-format
msgid "unknown command %d"
msgstr "comando desconhecido %d"
-#: sequencer.c:2057
+#: sequencer.c:2066
msgid "could not read orig-head"
msgstr "não foi possível ler orig-head"
-#: sequencer.c:2061
+#: sequencer.c:2070
msgid "could not read 'onto'"
msgstr "não foi possível ler 'onto'"
-#: sequencer.c:2068
+#: sequencer.c:2077
#, c-format
msgid "could not update %s"
msgstr "não foi possível atualizar %s"
-#: sequencer.c:2075
+#: sequencer.c:2084
#, c-format
msgid "could not update HEAD to %s"
msgstr "não foi possível atualizar HEAD para %s"
-#: sequencer.c:2159
+#: sequencer.c:2168
msgid "cannot rebase: You have unstaged changes."
msgstr "não é possível rebasear: tem alterações não preparadas."
-#: sequencer.c:2164
+#: sequencer.c:2173
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "não foi possível remover CHERRY_PICK_HEAD"
-#: sequencer.c:2173
+#: sequencer.c:2182
msgid "cannot amend non-existing commit"
msgstr "não é possível emendar commit não-existente"
-#: sequencer.c:2175
+#: sequencer.c:2184
#, c-format
msgid "invalid file: '%s'"
msgstr "ficheiro inválido: '%s'"
-#: sequencer.c:2177
+#: sequencer.c:2186
#, c-format
msgid "invalid contents: '%s'"
msgstr "conteúdo inválido: '%s'"
-#: sequencer.c:2180
+#: sequencer.c:2189
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -3146,35 +3370,35 @@
"Tem alterações por submeter na árvore de trabalho. Submeta-as primeiro\n"
"e execute 'git rebase --continue' de novo."
-#: sequencer.c:2190
+#: sequencer.c:2199
msgid "could not commit staged changes."
msgstr "não foi possível submeter as alterações preparadas."
-#: sequencer.c:2270
+#: sequencer.c:2279
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: não é possível efetuar cherry-pick de %s"
-#: sequencer.c:2274
+#: sequencer.c:2283
#, c-format
msgid "%s: bad revision"
msgstr "%s: revisão incorreta"
-#: sequencer.c:2307
+#: sequencer.c:2316
msgid "can't revert as initial commit"
msgstr "não é possível reverter como commit inicial"
-#: setup.c:160
+#: setup.c:165
#, 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ão há tal caminho na árvore de trabalho.\n"
-"Use 'git <comando> -- <caminho>...' para especificar caminhos que não existem "
-"localmente."
+"Use 'git <comando> -- <caminho>...' para especificar caminhos que não "
+"existem localmente."
-#: setup.c:173
+#: setup.c:178
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -3186,7 +3410,7 @@
"Use '--' para separar caminhos de revisões, assim:\n"
"'git <comando> [<revisão>...] -- [<ficheiro>...]'"
-#: setup.c:223
+#: setup.c:228
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
@@ -3197,29 +3421,34 @@
"Use '--' para separar caminhos de revisões, assim:\n"
"'git <comando> [<revisão>...] -- [<ficheiro>...]'"
-#: setup.c:470
+#: setup.c:475
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "Esperava-se versão do repositório git <= %d, obteve-se %d"
-#: setup.c:478
+#: setup.c:483
msgid "unknown repository extensions found:"
msgstr "extensões de repositório desconhecidas encontradas:"
-#: setup.c:768
+#: setup.c:776
#, c-format
msgid "Not a git repository (or any of the parent directories): %s"
msgstr "Não é um repositório git (ou um dos diretórios pai): %s"
-#: setup.c:770 setup.c:922 builtin/index-pack.c:1643
+#: setup.c:778 builtin/index-pack.c:1646
msgid "Cannot come back to cwd"
msgstr "Não é possível voltar ao diretório de trabalho atual"
-#: setup.c:852
+#: setup.c:1010
msgid "Unable to read current working directory"
msgstr "Não é possível ler o diretório de trabalho atual"
-#: setup.c:927
+#: setup.c:1022 setup.c:1028
+#, c-format
+msgid "Cannot change to '%s'"
+msgstr "não é possível mudar para '%s'"
+
+#: setup.c:1041
#, c-format
msgid ""
"Not a git repository (or any parent up to mount point %s)\n"
@@ -3229,12 +3458,7 @@
"Interrompido no limite do sistema de ficheiros "
"(GIT_DISCOVERY_ACROSS_FILESYSTEM não definido)."
-#: setup.c:934
-#, c-format
-msgid "Cannot change to '%s/..'"
-msgstr "Não é possível mudar para '%s/..'"
-
-#: setup.c:996
+#: setup.c:1106
#, c-format
msgid ""
"Problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -3243,57 +3467,57 @@
"Problema com o valor core.sharedRepository modo de ficheiro (0%.3o).\n"
"O dono dos ficheiros tem de ter sempre permissões de leitura e escrita."
-#: sha1_file.c:490
+#: sha1_file.c:559
#, c-format
msgid "path '%s' does not exist"
msgstr "o caminho '%s' não existe"
-#: sha1_file.c:516
+#: sha1_file.c:585
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
"ainda não é suportada a funcionalidade que permite ter o repositório de "
"referência '%s' como uma extração ligada."
-#: sha1_file.c:522
+#: sha1_file.c:591
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "o repositório de referência '%s' não é um repositório local."
-#: sha1_file.c:528
+#: sha1_file.c:597
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "o repositório de referência '%s' é raso"
-#: sha1_file.c:536
+#: sha1_file.c:605
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "o repositório de referência '%s' está enxertado"
-#: sha1_file.c:1176
+#: sha1_file.c:1245
msgid "offset before end of packfile (broken .idx?)"
msgstr "offset antes do fim do ficheiro de pacote (.idx danificado?)"
-#: sha1_file.c:2637
+#: sha1_file.c:2721
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "offset antes do início do índice do pacote %s (índice corrompido?)"
-#: sha1_file.c:2641
+#: sha1_file.c:2725
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "offset depois do fim do índice do pacote %s (índice truncado?)"
-#: sha1_name.c:407
+#: sha1_name.c:409
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr "SHA1 curto %s é ambíguo"
-#: sha1_name.c:418
+#: sha1_name.c:420
msgid "The candidates are:"
msgstr "Os candidatos são:"
-#: sha1_name.c:578
+#: sha1_name.c:580
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"
@@ -3318,46 +3542,56 @@
"Analise estas referências e elimine-as se desejar. Desative esta\n"
"mensagem executando \"git config advice.objectNameWarning false\""
-#: submodule.c:65 submodule.c:99
+#: submodule.c:67 submodule.c:101
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
"Não é possível alterar .gitmodules não integrado, resolva primeiro os "
"conflitos de integração"
-#: submodule.c:69 submodule.c:103
+#: submodule.c:71 submodule.c:105
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "Secção de .gitmodules cujo path=%s não encontrada"
-#: submodule.c:77
+#: submodule.c:79
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "Não foi possível atualizar o elemento %s de .gitmodules"
-#: submodule.c:110
+#: submodule.c:112
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "Não foi possível remover o elemento %s de .gitmodules"
-#: submodule.c:121
+#: submodule.c:123
msgid "staging updated .gitmodules failed"
msgstr "falha ao preparar .gitmodules atualizado"
-#: submodule.c:159
+#: submodule.c:161
msgid "negative values not allowed for submodule.fetchJobs"
msgstr "não é permitido valores negativos em submodule.fetchJobs"
-#: submodule.c:1184
+#: submodule.c:1194
#, c-format
-msgid "could not start 'git status in submodule '%s'"
+msgid "'%s' not recognized as a git repository"
+msgstr "'%s' não é reconhecido como um repositório git"
+
+#: submodule.c:1332
+#, c-format
+msgid "could not start 'git status' in submodule '%s'"
msgstr "não foi possível iniciar 'git status' no submódulo '%s'"
-#: submodule.c:1197
+#: submodule.c:1345
#, c-format
-msgid "could not run 'git status in submodule '%s'"
+msgid "could not run 'git status' in submodule '%s'"
msgstr "não foi possível executar 'git status' no submódulo '%s'"
-#: submodule.c:1398
+#: submodule.c:1421
+#, c-format
+msgid "submodule '%s' has dirty index"
+msgstr "o submódulo '%s' tem índice sujo"
+
+#: submodule.c:1679
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -3365,18 +3599,18 @@
"relocate_gitdir para submodule '%s' com mais do que uma árvore de trabalho "
"não suportado"
-#: submodule.c:1410 submodule.c:1471
+#: submodule.c:1691 submodule.c:1747
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "não foi possível procurar pelo submódulo '%s'"
-#: submodule.c:1414 submodule.c:1474 builtin/submodule--helper.c:640
-#: builtin/submodule--helper.c:650
+#: submodule.c:1695 builtin/submodule--helper.c:678
+#: builtin/submodule--helper.c:688
#, c-format
msgid "could not create directory '%s'"
msgstr "não foi possível criar o diretório '%s'"
-#: submodule.c:1420
+#: submodule.c:1698
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -3387,12 +3621,25 @@
"'%s' para\n"
"'%s'\n"
-#: submodule.c:1512
+#: submodule.c:1782
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "não foi possível percorrer recursivamente o submódulo '%s'"
-#: submodule-config.c:360
+#: submodule.c:1826
+msgid "could not start ls-files in .."
+msgstr "não foi possível iniciar ls-files em .."
+
+#: submodule.c:1846
+msgid "BUG: returned path string doesn't match cwd?"
+msgstr "BUG: returned path string doesn't match cwd?"
+
+#: submodule.c:1865
+#, c-format
+msgid "ls-tree returned unexpected return code %d"
+msgstr "ls-tree retornou código de retorno inesperado %d"
+
+#: submodule-config.c:380
#, c-format
msgid "invalid value for %s"
msgstr "valor inválido de %s"
@@ -3461,7 +3708,7 @@
msgid "transport: invalid depth option '%s'"
msgstr "transporte: opção de profundidade '%s' inválida"
-#: transport.c:885
+#: transport.c:889
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -3470,7 +3717,7 @@
"Os seguintes caminhos de submódulo contêm alterações que\n"
"não puderam ser encontradas a nenhum remoto:\n"
-#: transport.c:889
+#: transport.c:893
#, c-format
msgid ""
"\n"
@@ -3497,11 +3744,11 @@
"para publicá-las no remoto.\n"
"\n"
-#: transport.c:897
+#: transport.c:901
msgid "Aborting."
msgstr "Abortado."
-#: transport-helper.c:1082
+#: transport-helper.c:1080
#, c-format
msgid "Could not read ref %s"
msgstr "Não foi possível ler a referência %s"
@@ -3522,7 +3769,7 @@
msgid "too-short tree file"
msgstr "ficheiro de árvore demasiado curto"
-#: unpack-trees.c:99
+#: unpack-trees.c:104
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -3532,7 +3779,7 @@
"extrair:\n"
"%%sSubmeta as suas alterações ou esconda-as antes de trocar de ramo."
-#: unpack-trees.c:101
+#: unpack-trees.c:106
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -3542,7 +3789,7 @@
"extrair:\n"
"%%s"
-#: unpack-trees.c:104
+#: unpack-trees.c:109
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -3552,7 +3799,7 @@
"integrar:\n"
"%%sSubmeta as suas alterações ou esconda-as antes de integrar."
-#: unpack-trees.c:106
+#: unpack-trees.c:111
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -3562,7 +3809,7 @@
"integrar:\n"
"%%s"
-#: unpack-trees.c:109
+#: unpack-trees.c:114
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -3572,7 +3819,7 @@
"%s:\n"
"%%sSubmeta as suas alterações ou esconda-as antes de efetuar %s."
-#: unpack-trees.c:111
+#: unpack-trees.c:116
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -3582,7 +3829,7 @@
"%s:\n"
"%%s"
-#: unpack-trees.c:116
+#: unpack-trees.c:121
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -3592,87 +3839,89 @@
"deles:\n"
"%s"
-#: unpack-trees.c:120
+#: unpack-trees.c:125
#, 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 ""
-"Os seguintes ficheiros não controlados na árvore de trabalho seriam removidos "
-"ao extrair:\n"
+"Os seguintes ficheiros não controlados na árvore de trabalho seriam "
+"removidos ao extrair:\n"
"%%sMova ou remova-os antes de trocar de ramos."
-#: unpack-trees.c:122
+#: unpack-trees.c:127
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"%%s"
msgstr ""
-"Os seguintes ficheiros não controlados na árvore de trabalho seriam removidos "
-"ao extrair:\n"
-"%%s"
-
-#: unpack-trees.c:125
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%sPlease move or remove them before you merge."
-msgstr ""
-"Os seguintes ficheiros não controlados na árvore de trabalho seriam removidos "
-"ao integrar:\n"
-"%%sMova ou remova-os antes de integrar."
-
-#: unpack-trees.c:127
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%s"
-msgstr ""
-"Os seguintes ficheiros não controlados na árvore de trabalho seriam removidos "
-"ao integrar:\n"
+"Os seguintes ficheiros não controlados na árvore de trabalho seriam "
+"removidos ao extrair:\n"
"%%s"
#: unpack-trees.c:130
#, c-format
msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%sPlease move or remove them before you %s."
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you merge."
msgstr ""
-"Os seguintes ficheiros não controlados na árvore de trabalho seriam removidos "
-"por %s:\n"
-"%%sMova ou remova-os antes de efetuar %s."
+"Os seguintes ficheiros não controlados na árvore de trabalho seriam "
+"removidos ao integrar:\n"
+"%%sMova ou remova-os antes de integrar."
#: unpack-trees.c:132
#, c-format
msgid ""
-"The following untracked working tree files would be removed by %s:\n"
+"The following untracked working tree files would be removed by merge:\n"
"%%s"
msgstr ""
-"Os seguintes ficheiros não controlados na árvore de trabalho seriam removidos "
-"por %s:\n"
+"Os seguintes ficheiros não controlados na árvore de trabalho seriam "
+"removidos ao integrar:\n"
"%%s"
+#: unpack-trees.c:135
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you %s."
+msgstr ""
+"Os seguintes ficheiros não controlados na árvore de trabalho seriam "
+"removidos por %s:\n"
+"%%sMova ou remova-os antes de efetuar %s."
+
#: unpack-trees.c:137
#, c-format
msgid ""
-"The following untracked working tree files would be overwritten by checkout:\n"
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+"Os seguintes ficheiros não controlados na árvore de trabalho seriam "
+"removidos por %s:\n"
+"%%s"
+
+#: unpack-trees.c:142
+#, 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 ""
"Os seguintes ficheiros não controlados da árvore de trabalho seriam "
"substituídos ao extrair:\n"
"%%sMova ou remova-os antes de trocar de ramos."
-#: unpack-trees.c:139
+#: unpack-trees.c:144
#, 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 ""
"Os seguintes ficheiros não controlados da árvore de trabalho seriam "
"substituídos ao extrair:\n"
"%%s"
-#: unpack-trees.c:142
+#: unpack-trees.c:147
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -3682,7 +3931,7 @@
"substituídos ao integrar:\n"
"%%sMova ou remova-os antes de integrar."
-#: unpack-trees.c:144
+#: unpack-trees.c:149
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -3692,7 +3941,7 @@
"substituídos ao integrar:\n"
"%%s"
-#: unpack-trees.c:147
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -3702,7 +3951,7 @@
"substituídos por %s:\n"
"%%sMova ou remova-os antes de efetuar %s."
-#: unpack-trees.c:149
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -3712,12 +3961,12 @@
"substituídos por %s:\n"
"%%s"
-#: unpack-trees.c:156
+#: unpack-trees.c:161
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "A entrada '%s' sobrepõe-se com '%s'. Não é possível vincular."
-#: unpack-trees.c:159
+#: unpack-trees.c:164
#, c-format
msgid ""
"Cannot update sparse checkout: the following entries are not up-to-date:\n"
@@ -3727,66 +3976,81 @@
"atualizadas:\n"
"%s"
-#: unpack-trees.c:161
+#: unpack-trees.c:166
#, c-format
msgid ""
"The following working tree files would be overwritten by sparse checkout "
"update:\n"
"%s"
msgstr ""
-"Os seguintes ficheiros na árvore de trabalho seriam substituídos ao atualizar "
-"a extração esparsa:\n"
+"Os seguintes ficheiros na árvore de trabalho seriam substituídos ao "
+"atualizar a extração esparsa:\n"
"%s"
-#: unpack-trees.c:163
+#: unpack-trees.c:168
#, 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 ""
"Os seguintes ficheiros na árvore de trabalho seriam removidos ao atualizar a "
"extração esparsa:\n"
"%s"
-#: unpack-trees.c:240
+#: unpack-trees.c:170
+#, c-format
+msgid ""
+"Cannot update submodule:\n"
+"%s"
+msgstr ""
+"Não é possível atualizar submódulo:\n"
+"%s"
+
+#: unpack-trees.c:247
#, c-format
msgid "Aborting\n"
msgstr "A abortar\n"
-#: unpack-trees.c:270
+#: unpack-trees.c:272
+#, c-format
+msgid "submodule update strategy not supported for submodule '%s'"
+msgstr "não foi possível procurar pelo submódulo '%s'"
+
+#: unpack-trees.c:340
msgid "Checking out files"
msgstr "A extrair ficheiros"
-#: urlmatch.c:120
+#: urlmatch.c:163
msgid "invalid URL scheme name or missing '://' suffix"
msgstr "nome de esquema de URL inválido ou falta do sufixo '://'"
-#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
+#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
#, c-format
msgid "invalid %XX escape sequence"
msgstr "sequencia de escape %XX inválida"
-#: urlmatch.c:172
+#: urlmatch.c:215
msgid "missing host and scheme is not 'file:'"
msgstr "sistema anfitrião não indicado e o esquema não é do tipo 'file:'"
-#: urlmatch.c:189
+#: urlmatch.c:232
msgid "a 'file:' URL may not have a port number"
msgstr "um URL do tipo 'file:' não pode ter um número de porta"
-#: urlmatch.c:199
+#: urlmatch.c:247
msgid "invalid characters in host name"
msgstr "caracteres inválidos no nome do anfitrião"
-#: urlmatch.c:244 urlmatch.c:255
+#: urlmatch.c:292 urlmatch.c:303
msgid "invalid port number"
msgstr "número de porta inválido"
-#: urlmatch.c:322
+#: urlmatch.c:371
msgid "invalid '..' path segment"
msgstr "segmento de caminho '..' inválido"
-#: worktree.c:282
+#: worktree.c:285
#, c-format
msgid "failed to read '%s'"
msgstr "falha ao ler '%s'"
@@ -3802,27 +4066,27 @@
msgstr "não foi possível abrir '%s' para escrita"
#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759
-#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1033
+#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1015
#: builtin/pull.c:341
#, c-format
msgid "could not open '%s' for reading"
msgstr "não foi possível abrir '%s' para leitura"
-#: wrapper.c:605 wrapper.c:626
+#: wrapper.c:581 wrapper.c:602
#, c-format
msgid "unable to access '%s'"
msgstr "não é possível aceder a '%s'"
-#: wrapper.c:634
+#: wrapper.c:610
msgid "unable to get current working directory"
msgstr "não é possível de obter o diretório de trabalho atual"
-#: wrapper.c:658
+#: wrapper.c:634
#, c-format
msgid "could not write to %s"
msgstr "não foi possível escrever para %s"
-#: wrapper.c:660
+#: wrapper.c:636
#, c-format
msgid "could not close %s"
msgstr "não foi possível fechar %s"
@@ -3854,11 +4118,11 @@
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (use \"git rm <ficheiro>...\" para marcar como resolvido)"
-#: wt-status.c:199 wt-status.c:945
+#: wt-status.c:199 wt-status.c:958
msgid "Changes to be committed:"
msgstr "Alterações para serem submetidas:"
-#: wt-status.c:217 wt-status.c:954
+#: wt-status.c:217 wt-status.c:967
msgid "Changes not staged for commit:"
msgstr "Alterações não preparadas para submeter:"
@@ -3881,7 +4145,8 @@
#: wt-status.c:226
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
-" (submeta ou descarte o conteúdo modificado ou não controlado nos submódulos)"
+" (submeta ou descarte o conteúdo modificado ou não controlado nos "
+"submódulos)"
#: wt-status.c:238
#, c-format
@@ -3960,15 +4225,15 @@
msgid "untracked content, "
msgstr "conteúdo não controlado, "
-#: wt-status.c:818
+#: wt-status.c:831
msgid "Submodules changed but not updated:"
msgstr "Submódulos alterados mas não atualizados:"
-#: wt-status.c:820
+#: wt-status.c:833
msgid "Submodule changes to be committed:"
msgstr "Alterações em submódulos para serem submetidas:"
-#: wt-status.c:901
+#: wt-status.c:914
msgid ""
"Do not touch the line above.\n"
"Everything below will be removed."
@@ -3976,234 +4241,235 @@
"Não altere a linha acima.\n"
"Tudo o que estiver abaixo será removido."
-#: wt-status.c:1013
+#: wt-status.c:1026
msgid "You have unmerged paths."
msgstr "Há caminhos não integrados."
-#: wt-status.c:1016
+#: wt-status.c:1029
msgid " (fix conflicts and run \"git commit\")"
msgstr " (corrija os conflitos e execute \"git commit\")"
-#: wt-status.c:1018
+#: wt-status.c:1031
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (use \"git am --abort\" para abortar a integração)"
-#: wt-status.c:1023
+#: wt-status.c:1036
msgid "All conflicts fixed but you are still merging."
msgstr "Todos os conflitos foram corrigidos mas ainda está a integrar."
-#: wt-status.c:1026
+#: wt-status.c:1039
msgid " (use \"git commit\" to conclude merge)"
msgstr " (use \"git commit\" para concluir a integração)"
-#: wt-status.c:1036
+#: wt-status.c:1049
msgid "You are in the middle of an am session."
msgstr "Sessão am em curso."
-#: wt-status.c:1039
+#: wt-status.c:1052
msgid "The current patch is empty."
msgstr "O patch atual está vazio."
-#: wt-status.c:1043
+#: wt-status.c:1056
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (corrija os conflitos e execute \"git am --continue\")"
-#: wt-status.c:1045
+#: wt-status.c:1058
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (use \"git am --skip\" para ignorar este patch)"
-#: wt-status.c:1047
+#: wt-status.c:1060
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (use \"git am --abort\" para restaurar o ramo original)"
-#: wt-status.c:1176
+#: wt-status.c:1189
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo não existe."
-#: wt-status.c:1178
+#: wt-status.c:1191
msgid "No commands done."
msgstr "Nenhum comando concluído."
-#: wt-status.c:1181
+#: wt-status.c:1194
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] "Último comando concluído (%d comando concluído):"
msgstr[1] "Últimos comandos concluídos (%d comandos concluídos):"
-#: wt-status.c:1192
+#: wt-status.c:1205
#, c-format
msgid " (see more in file %s)"
msgstr " (veja mais no ficheiro %s)"
-#: wt-status.c:1197
+#: wt-status.c:1210
msgid "No commands remaining."
msgstr "Nenhum comando por concluir."
-#: wt-status.c:1200
+#: wt-status.c:1213
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
msgstr[0] "Próximo comando a executar (%d comando restante):"
msgstr[1] "Próximos comandos a executar (%d comandos restantes):"
-#: wt-status.c:1208
+#: wt-status.c:1221
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (use \"git rebase --edit-todo\" para visualizar e editar)"
-#: wt-status.c:1221
+#: wt-status.c:1234
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Está a realizar rebase do ramo '%s' sobre '%s'."
-#: wt-status.c:1226
+#: wt-status.c:1239
msgid "You are currently rebasing."
msgstr "Está a rebasear neste momento."
-#: wt-status.c:1240
+#: wt-status.c:1253
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (corrija os conflitos e execute \"git rebase --continue\")"
-#: wt-status.c:1242
+#: wt-status.c:1255
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (use \"git rebase --skip\" para ignorar este patch)"
-#: wt-status.c:1244
+#: wt-status.c:1257
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (use \"git rebase --abort\" para restaurar o ramo original)"
-#: wt-status.c:1250
+#: wt-status.c:1263
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
" (todos os conflitos foram corrigidos: execute \"git rebase --continue\")"
-#: wt-status.c:1254
+#: wt-status.c:1267
#, c-format
-msgid "You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Está a dividir um commit ao mesmo tempo que se efetua rebase do ramo '%s' "
"sobre '%s'."
-#: wt-status.c:1259
+#: wt-status.c:1272
msgid "You are currently splitting a commit during a rebase."
msgstr "Está a dividir um commit durante um rebase."
-#: wt-status.c:1262
+#: wt-status.c:1275
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
" (Assim que o diretório de trabalho estiver limpo, execute \"git rebase --"
"continue\")"
-#: wt-status.c:1266
+#: wt-status.c:1279
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Está a editar um commit ao mesmo tempo que efetua rebase do ramo '%s' sobre "
"'%s'."
-#: wt-status.c:1271
+#: wt-status.c:1284
msgid "You are currently editing a commit during a rebase."
msgstr "Está a editar um commit durante um rebase."
-#: wt-status.c:1274
+#: wt-status.c:1287
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (use \"git commit --amend\" para emendar o commit atual)"
-#: wt-status.c:1276
+#: wt-status.c:1289
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
" (use \"git rebase --continue\" assim que estiver satisfeito com as "
"alterações)"
-#: wt-status.c:1286
+#: wt-status.c:1299
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Está a realizar cherry-pick do commit %s."
-#: wt-status.c:1291
+#: wt-status.c:1304
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (corrija os conflitos e execute \"git cherry-pick --continue\")"
-#: wt-status.c:1294
+#: wt-status.c:1307
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (todos os conflitos foram corrigidos: execute \"git cherry-pick --continue"
"\")"
-#: wt-status.c:1296
+#: wt-status.c:1309
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
" (use \"git cherry-pick --abort\" para cancelar a operação de cherry-pick)"
-#: wt-status.c:1305
+#: wt-status.c:1318
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Está a reverter o commit %s neste comento."
-#: wt-status.c:1310
+#: wt-status.c:1323
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (corrija dos conflitos e execute \"git revert --continue\")"
-#: wt-status.c:1313
+#: wt-status.c:1326
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
" (todos os conflitos foram corrigidos: execute \"git revert --continue\")"
-#: wt-status.c:1315
+#: wt-status.c:1328
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (use \"git rever --abort\" para cancelar a operação de reversão)"
-#: wt-status.c:1326
+#: wt-status.c:1339
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Está a bissetar, iniciado a partir do ramo '%s'."
-#: wt-status.c:1330
+#: wt-status.c:1343
msgid "You are currently bisecting."
msgstr "Está a bissetar neste momento."
-#: wt-status.c:1333
+#: wt-status.c:1346
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (use \"git bisect reset\" para voltar ao ramo original)"
-#: wt-status.c:1530
+#: wt-status.c:1543
msgid "On branch "
msgstr "No ramo "
-#: wt-status.c:1536
+#: wt-status.c:1549
msgid "interactive rebase in progress; onto "
msgstr "rebase interativo em curso; sobre "
-#: wt-status.c:1538
+#: wt-status.c:1551
msgid "rebase in progress; onto "
msgstr "rebase em curso; sobre "
-#: wt-status.c:1543
+#: wt-status.c:1556
msgid "HEAD detached at "
msgstr "HEAD destacada em "
-#: wt-status.c:1545
+#: wt-status.c:1558
msgid "HEAD detached from "
msgstr "HEAD destacada de "
-#: wt-status.c:1548
+#: wt-status.c:1561
msgid "Not currently on any branch."
msgstr "Não se encontra em nenhum ramo neste momento."
-#: wt-status.c:1566
+#: wt-status.c:1579
msgid "Initial commit"
msgstr "Commit inicial"
-#: wt-status.c:1580
+#: wt-status.c:1593
msgid "Untracked files"
msgstr "Ficheiros não controlados"
-#: wt-status.c:1582
+#: wt-status.c:1595
msgid "Ignored files"
msgstr "Ficheiros ignorados"
-#: wt-status.c:1586
+#: wt-status.c:1599
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -4215,32 +4481,32 @@
"cuidado de não se esquecer de adicionar novos ficheiros\n"
"(consulte 'git help status')."
-#: wt-status.c:1592
+#: wt-status.c:1605
#, c-format
msgid "Untracked files not listed%s"
msgstr "Ficheiros não controlados não listados%s"
-#: wt-status.c:1594
+#: wt-status.c:1607
msgid " (use -u option to show untracked files)"
msgstr " (use a opção -u para mostrar os ficheiros não controlados)"
-#: wt-status.c:1600
+#: wt-status.c:1613
msgid "No changes"
msgstr "Sem alterações"
-#: wt-status.c:1605
+#: wt-status.c:1618
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
-"nenhuma alteração adicionada para submeter (use \"git add\" e/ou \"git commit "
-"-a\")\n"
+"nenhuma alteração adicionada para submeter (use \"git add\" e/ou \"git "
+"commit -a\")\n"
-#: wt-status.c:1608
+#: wt-status.c:1621
#, c-format
msgid "no changes added to commit\n"
msgstr "nenhuma alteração adicionada para submeter\n"
-#: wt-status.c:1611
+#: wt-status.c:1624
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -4249,71 +4515,69 @@
"não foi adicionado nada para submeter, mas existem ficheiros não controlados "
"(use \"git add\" para controlá-los)\n"
-#: wt-status.c:1614
+#: wt-status.c:1627
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr ""
-"não foi adicionado nada para submeter, mas existem ficheiros não controlados\n"
+"não foi adicionado nada para submeter, mas existem ficheiros não "
+"controlados\n"
-#: wt-status.c:1617
+#: wt-status.c:1630
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"não há nada para submeter (crie/copie ficheiros e use \"git add\" para "
"controlá-los)\n"
-#: wt-status.c:1620 wt-status.c:1625
+#: wt-status.c:1633 wt-status.c:1638
#, c-format
msgid "nothing to commit\n"
msgstr "não há nada para submeter\n"
-#: wt-status.c:1623
+#: wt-status.c:1636
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
-"não há nada para submeter (use -u para mostrar os ficheiros não controlados)\n"
+"não há nada para submeter (use -u para mostrar os ficheiros não "
+"controlados)\n"
-#: wt-status.c:1627
+#: wt-status.c:1640
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "não há nada para submeter, árvore de trabalho limpa\n"
-#: wt-status.c:1734
+#: wt-status.c:1749
msgid "Initial commit on "
msgstr "Commit inicial em "
-#: wt-status.c:1738
+#: wt-status.c:1753
msgid "HEAD (no branch)"
msgstr "HEAD (nenhum ramo)"
-#: wt-status.c:1767
-msgid "gone"
-msgstr "desaparecido"
-
-#: wt-status.c:1769 wt-status.c:1777
+#: wt-status.c:1782 wt-status.c:1790
msgid "behind "
msgstr "atrás "
-#: wt-status.c:1772 wt-status.c:1775
+#: wt-status.c:1785 wt-status.c:1788
msgid "ahead "
msgstr "à frente "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2277
+#: wt-status.c:2280
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "não é possível efetuar %s: tem alterações não preparadas."
-#: wt-status.c:2283
+#: wt-status.c:2286
msgid "additionally, your index contains uncommitted changes."
msgstr "além disso, o índice contém alterações não submetidas."
-#: wt-status.c:2285
+#: wt-status.c:2288
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "não é possível efetuar %s: o índice contém alterações não submetidas."
-#: compat/precompose_utf8.c:57 builtin/clone.c:414
+#: compat/precompose_utf8.c:57 builtin/clone.c:432
#, c-format
msgid "failed to unlink '%s'"
msgstr "falha ao invocar unlink de '%s'"
@@ -4340,7 +4604,7 @@
msgid "Unstaged changes after refreshing the index:"
msgstr "Alterações não preparadas depois de atualizar o índice:"
-#: builtin/add.c:209 builtin/rev-parse.c:845
+#: builtin/add.c:209 builtin/rev-parse.c:872
msgid "Could not read the index"
msgstr "Não foi possível ler o índice"
@@ -4375,9 +4639,9 @@
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "Os seguintes caminhos estão ignorados por algum ficheiro .gitignore:\n"
-#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:123
+#: 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:1326 builtin/rm.c:241 builtin/send-pack.c:162
+#: builtin/remote.c:1328 builtin/rm.c:241 builtin/send-pack.c:163
msgid "dry run"
msgstr "simular ação"
@@ -4385,7 +4649,7 @@
msgid "interactive picking"
msgstr "seleção interativa"
-#: builtin/add.c:270 builtin/checkout.c:1159 builtin/reset.c:286
+#: builtin/add.c:270 builtin/checkout.c:1177 builtin/reset.c:286
msgid "select hunks interactively"
msgstr "selecionar blocos interativamente"
@@ -4412,7 +4676,8 @@
#: builtin/add.c:278
msgid "ignore paths removed in the working tree (same as --no-all)"
-msgstr "ignorar caminhos removidos na árvore de trabalho (o mesmo que --no-all)"
+msgstr ""
+"ignorar caminhos removidos na árvore de trabalho (o mesmo que --no-all)"
#: builtin/add.c:280
msgid "don't add, only refresh the index"
@@ -4426,11 +4691,11 @@
msgid "check if - even missing - files are ignored in dry run"
msgstr "verificar quais os ficheiros ignorados na simulação"
-#: builtin/add.c:283 builtin/update-index.c:947
+#: builtin/add.c:283 builtin/update-index.c:951
msgid "(+/-)x"
msgstr "(+/-)x"
-#: builtin/add.c:283 builtin/update-index.c:948
+#: builtin/add.c:283 builtin/update-index.c:952
msgid "override the executable bit of the listed files"
msgstr "substituir o bit executável dos ficheiros listados"
@@ -4466,8 +4731,8 @@
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Queria dizer 'git add .'?\n"
-#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279
-#: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350
+#: 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/submodule--helper.c:244
msgid "index file corrupt"
@@ -4521,7 +4786,7 @@
msgid "Patch format detection failed."
msgstr "Falha ao detetar o formato do patch."
-#: builtin/am.c:989 builtin/clone.c:379
+#: builtin/am.c:989 builtin/clone.c:397
#, c-format
msgid "failed to create directory '%s'"
msgstr "falha ao criar o diretório '%s'"
@@ -4548,14 +4813,14 @@
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
-"Para restaurar o ramo original e interromper a aplicação dos patches, execute "
-"\"%s --abort\"."
+"Para restaurar o ramo original e interromper a aplicação dos patches, "
+"execute \"%s --abort\"."
#: builtin/am.c:1316
msgid "Patch is empty. Was it split wrong?"
msgstr "O patch está vazio. Foi dividido incorretamente?"
-#: builtin/am.c:1390 builtin/log.c:1550
+#: builtin/am.c:1390 builtin/log.c:1557
#, c-format
msgid "invalid ident line: %s"
msgstr "linha de identidade inválida: %s"
@@ -4593,7 +4858,7 @@
msgid "Failed to merge in the changes."
msgstr "Falha ao integrar as alterações."
-#: builtin/am.c:1686 builtin/merge.c:632
+#: builtin/am.c:1686 builtin/merge.c:631
msgid "git write-tree failed to write a tree"
msgstr "git write-tree falhou ao escrever uma árvore"
@@ -4614,8 +4879,8 @@
#: builtin/am.c:1759
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
-"não é possível entrar em modo interativo sem um entrada padrão conectada a um "
-"terminal."
+"não é possível entrar em modo interativo sem um entrada padrão conectada a "
+"um terminal."
#: builtin/am.c:1764
msgid "Commit Body is:"
@@ -4759,15 +5024,15 @@
msgstr "transmitir ao git-apply"
#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
-#: builtin/grep.c:1038 builtin/merge.c:202 builtin/pull.c:135 builtin/pull.c:194
-#: builtin/repack.c:187 builtin/repack.c:191 builtin/show-branch.c:644
-#: builtin/show-ref.c:169 builtin/tag.c:355 parse-options.h:132
-#: parse-options.h:134 parse-options.h:245
+#: 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
msgid "n"
msgstr "n"
-#: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438
-#: builtin/tag.c:387 builtin/verify-tag.c:38
+#: builtin/am.c:2289 builtin/branch.c:592 builtin/for-each-ref.c:37
+#: builtin/replace.c:442 builtin/tag.c:433 builtin/verify-tag.c:38
msgid "format"
msgstr "formato"
@@ -4803,8 +5068,8 @@
msgid "use current timestamp for author date"
msgstr "usar a data e hora atual como data de autor"
-#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:233
-#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:370
+#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:232
+#: builtin/pull.c:165 builtin/revert.c:111 builtin/tag.c:413
msgid "key-id"
msgstr "id-chave"
@@ -4906,113 +5171,113 @@
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<rev-opções> estão documentadas em git-rev-list(1)"
-#: builtin/blame.c:1786
+#: builtin/blame.c:1777
msgid "Blaming lines"
msgstr "Linhas de culpa"
-#: builtin/blame.c:2582
+#: builtin/blame.c:2573
msgid "Show blame entries as we find them, incrementally"
msgstr ""
"Mostrar entradas de culpa à medida que forem encontradas, incrementalmente"
-#: builtin/blame.c:2583
+#: builtin/blame.c:2574
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "Mostar SHA-1 dos commits limite em branco (Predefinição: desativado)"
-#: builtin/blame.c:2584
+#: builtin/blame.c:2575
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "Não tratar os commits raiz como limites (Predefinição: desativado)"
-#: builtin/blame.c:2585
+#: builtin/blame.c:2576
msgid "Show work cost statistics"
msgstr "Mostrar estatísticas de custo de atividade"
-#: builtin/blame.c:2586
+#: builtin/blame.c:2577
msgid "Force progress reporting"
msgstr "Forçar informação de progresso"
-#: builtin/blame.c:2587
+#: builtin/blame.c:2578
msgid "Show output score for blame entries"
msgstr "Mostrar a pontuação das entradas de culpa"
-#: builtin/blame.c:2588
+#: builtin/blame.c:2579
msgid "Show original filename (Default: auto)"
msgstr "Mostrar o nome do ficheiro original (Predefinição: auto)"
-#: builtin/blame.c:2589
+#: builtin/blame.c:2580
msgid "Show original linenumber (Default: off)"
msgstr "Mostrar números de linha originais (Predefinição: desativado)"
-#: builtin/blame.c:2590
+#: builtin/blame.c:2581
msgid "Show in a format designed for machine consumption"
msgstr "Mostrar em formato próprio para ser consumo por uma máquina"
-#: builtin/blame.c:2591
+#: builtin/blame.c:2582
msgid "Show porcelain format with per-line commit information"
msgstr "Mostrar em formato de porcelana com informações de commit por linha"
-#: builtin/blame.c:2592
+#: builtin/blame.c:2583
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "Usar o mesmo modo de saída que git-annotate (Predefinição: desativado)"
-#: builtin/blame.c:2593
+#: builtin/blame.c:2584
msgid "Show raw timestamp (Default: off)"
msgstr "Mostrar carimbo de data/hora em bruto (Predefinição: desativado)"
-#: builtin/blame.c:2594
+#: builtin/blame.c:2585
msgid "Show long commit SHA1 (Default: off)"
msgstr "Mostrar SHA1 longo de commit (Predefinição: desativado)"
-#: builtin/blame.c:2595
+#: builtin/blame.c:2586
msgid "Suppress author name and timestamp (Default: off)"
msgstr ""
"Suprimir nome de autor e carimbo de data/hora (Predefinição: desativado)"
-#: builtin/blame.c:2596
+#: builtin/blame.c:2587
msgid "Show author email instead of name (Default: off)"
msgstr "Mostrar o email do autor em vez do nome (Predefinição: desativado)"
-#: builtin/blame.c:2597
+#: builtin/blame.c:2588
msgid "Ignore whitespace differences"
msgstr "Ignorar as diferenças de espaço em branco"
-#: builtin/blame.c:2604
+#: builtin/blame.c:2595
msgid "Use an experimental heuristic to improve diffs"
msgstr "Usar um heurística experimental para melhorar diffs"
-#: builtin/blame.c:2606
+#: builtin/blame.c:2597
msgid "Spend extra cycles to find better match"
msgstr "Despender ciclos extra para encontrar uma melhor correspondência"
-#: builtin/blame.c:2607
+#: builtin/blame.c:2598
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "Usar revisões do <ficheiro> em vez de invocar git-rev-list"
-#: builtin/blame.c:2608
+#: builtin/blame.c:2599
msgid "Use <file>'s contents as the final image"
msgstr "Usar o conteúdo do <ficheiro> como imagem final"
-#: builtin/blame.c:2609 builtin/blame.c:2610
+#: builtin/blame.c:2600 builtin/blame.c:2601
msgid "score"
msgstr "pontuação"
-#: builtin/blame.c:2609
+#: builtin/blame.c:2600
msgid "Find line copies within and across files"
msgstr "Localizar linhas copiadas dentro e entre ficheiros"
-#: builtin/blame.c:2610
+#: builtin/blame.c:2601
msgid "Find line movements within and across files"
msgstr "Localizar linhas movidas dentro e entre ficheiros"
-#: builtin/blame.c:2611
+#: builtin/blame.c:2602
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2611
+#: builtin/blame.c:2602
msgid "Process only line range n,m, counting from 1"
msgstr "Processar apenas o intervalo de linhas n,m, a cantar de 1"
-#: builtin/blame.c:2658
+#: builtin/blame.c:2649
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
"--progress não pode ser usado com --incremental ou formatos de porcelana"
@@ -5023,39 +5288,40 @@
#. 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:2706
+#: builtin/blame.c:2697
msgid "4 years, 11 months ago"
msgstr "há 4 anos e 11 meses atrás"
-#: builtin/blame.c:2786
+#: builtin/blame.c:2777
msgid "--contents and --reverse do not blend well."
msgstr "--contents e --reverse não se misturam bem."
-#: builtin/blame.c:2806
+#: builtin/blame.c:2797
msgid "cannot use --contents with final commit object name"
msgstr "não é possível usar --contents com nome de objeto commit final"
-#: builtin/blame.c:2811
+#: builtin/blame.c:2802
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
"--reverse e --first-parent juntos requer que se especifique o último commit"
-#: builtin/blame.c:2838
-msgid "--reverse --first-parent together require range along first-parent chain"
+#: builtin/blame.c:2829
+msgid ""
+"--reverse --first-parent together require range along first-parent chain"
msgstr ""
"--reverse --first-parent juntos requer intervalo ao longo do primeiro-pai"
-#: builtin/blame.c:2849
+#: builtin/blame.c:2840
#, c-format
msgid "no such path %s in %s"
msgstr "o caminho %s não existe em %s"
-#: builtin/blame.c:2860
+#: builtin/blame.c:2851
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "não é possível ler o blob %s do caminho %s"
-#: builtin/blame.c:2879
+#: builtin/blame.c:2870
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
@@ -5082,7 +5348,11 @@
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [<opções>] [-r | -a] [--points-at]"
-#: builtin/branch.c:143
+#: builtin/branch.c:31
+msgid "git branch [<options>] [-r | -a] [--format]"
+msgstr "git branch [<opções>] [-r | -a] [--format]"
+
+#: builtin/branch.c:144
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -5091,7 +5361,7 @@
"a eliminar o ramo '%s' integrado em\n"
" '%s', mas ainda não integrado em HEAD."
-#: builtin/branch.c:147
+#: builtin/branch.c:148
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -5100,12 +5370,12 @@
"ramo '%s' não eliminado, visto que ainda não foi integrado em\n"
" '%s', apesar de já ter sido integrado em HEAD."
-#: builtin/branch.c:161
+#: builtin/branch.c:162
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Não foi possível pesquisar pelo objeto commit de '%s'"
-#: builtin/branch.c:165
+#: builtin/branch.c:166
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -5114,165 +5384,93 @@
"O ramo '%s' não foi totalmente integrado.\n"
"Se tem a certeza que o quer eliminar, execute 'git branch -D %s'."
-#: builtin/branch.c:178
+#: builtin/branch.c:179
msgid "Update of config-file failed"
msgstr "Falha ao atualizar o ficheiro de configuração"
-#: builtin/branch.c:206
+#: builtin/branch.c:210
msgid "cannot use -a with -d"
msgstr "não é possível usar -a com -d"
-#: builtin/branch.c:212
+#: builtin/branch.c:216
msgid "Couldn't look up commit object for HEAD"
msgstr "Não foi possível pesquisar pelo objeto commit de HEAD"
-#: builtin/branch.c:226
+#: builtin/branch.c:230
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "Não é possível eliminar o ramo '%s' extraído em '%s'"
-#: builtin/branch.c:241
+#: builtin/branch.c:245
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "ramo de monitorização remoto '%s' não encontrado."
-#: builtin/branch.c:242
+#: builtin/branch.c:246
#, c-format
msgid "branch '%s' not found."
msgstr "ramo '%s' não encontrado."
-#: builtin/branch.c:257
+#: builtin/branch.c:261
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Erro a eliminar o ramo de monitorização remoto '%s'"
-#: builtin/branch.c:258
+#: builtin/branch.c:262
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Erro a eliminar ramo '%s'"
-#: builtin/branch.c:265
+#: builtin/branch.c:269
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Ramo de monitorização remoto %s eliminado (era %s).\n"
-#: builtin/branch.c:266
+#: builtin/branch.c:270
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Ramo %s eliminado (era %s).\n"
-#: builtin/branch.c:312
-#, c-format
-msgid "[%s: gone]"
-msgstr "[%s: desaparecido]"
-
-#: builtin/branch.c:317
-#, c-format
-msgid "[%s]"
-msgstr "[%s]"
-
-#: builtin/branch.c:322
-#, c-format
-msgid "[%s: behind %d]"
-msgstr "[%s: atrás %d]"
-
-#: builtin/branch.c:324
-#, c-format
-msgid "[behind %d]"
-msgstr "[atrás %d]"
-
-#: builtin/branch.c:328
-#, c-format
-msgid "[%s: ahead %d]"
-msgstr "[%s: à frente %d]"
-
-#: builtin/branch.c:330
-#, c-format
-msgid "[ahead %d]"
-msgstr "[à frente %d]"
-
-#: builtin/branch.c:333
-#, c-format
-msgid "[%s: ahead %d, behind %d]"
-msgstr "[%s: à frente %d, atrás %d]"
-
-#: builtin/branch.c:336
-#, c-format
-msgid "[ahead %d, behind %d]"
-msgstr "[à frente %d, atrás %d]"
-
-#: builtin/branch.c:349
-msgid " **** invalid ref ****"
-msgstr " **** referências inválida ****"
-
-#: builtin/branch.c:375
-#, c-format
-msgid "(no branch, rebasing %s)"
-msgstr "(nenhum ramo, a efetuar rebase de %s)"
-
-#: builtin/branch.c:378
-#, c-format
-msgid "(no branch, bisect started on %s)"
-msgstr "(nenhum ramo, bissecção iniciada em %s)"
-
-#. TRANSLATORS: make sure this matches
-#. "HEAD detached at " in wt-status.c
-#: builtin/branch.c:384
-#, c-format
-msgid "(HEAD detached at %s)"
-msgstr "(HEAD destacada em %s)"
-
-#. TRANSLATORS: make sure this matches
-#. "HEAD detached from " in wt-status.c
-#: builtin/branch.c:389
-#, c-format
-msgid "(HEAD detached from %s)"
-msgstr "(HEAD destacada de %s)"
-
-#: builtin/branch.c:393
-msgid "(no branch)"
-msgstr "(nenhum ramo)"
-
-#: builtin/branch.c:535
+#: builtin/branch.c:441
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "O ramo %s está a ser rebaseado em %s"
-#: builtin/branch.c:539
+#: builtin/branch.c:445
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "O ramo %s está a ser bissetado em %s"
-#: builtin/branch.c:554
+#: builtin/branch.c:460
msgid "cannot rename the current branch while not on any."
msgstr ""
"não é possível mudar o nome do ramo atual vista que não se encontra num ramo."
-#: builtin/branch.c:564
+#: builtin/branch.c:470
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Nome de ramo inválido: '%s'"
-#: builtin/branch.c:581
+#: builtin/branch.c:487
msgid "Branch rename failed"
msgstr "Falha ao mudar o nome do ramo"
-#: builtin/branch.c:585
+#: builtin/branch.c:490
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "O ramo incorretamente denominado '%s' mudou de nome"
-#: builtin/branch.c:588
+#: builtin/branch.c:493
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "O nome do ramo mudou para %s, mas a HEAD não está atualizada!"
-#: builtin/branch.c:595
+#: builtin/branch.c:502
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
"O ramo mudou de nome, mas a atualização do ficheiro de configuração falhou"
-#: builtin/branch.c:611
+#: builtin/branch.c:518
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -5283,166 +5481,176 @@
" %s\n"
"Linha começadas com '%c' serão ignoradas.\n"
-#: builtin/branch.c:643
+#: builtin/branch.c:551
msgid "Generic options"
msgstr "Opções genéricas"
-#: builtin/branch.c:645
+#: builtin/branch.c:553
msgid "show hash and subject, give twice for upstream branch"
msgstr "apresentar hash e assunto, duplique para ramos a montante"
-#: builtin/branch.c:646
+#: builtin/branch.c:554
msgid "suppress informational messages"
msgstr "suprimir mensagens informativas"
-#: builtin/branch.c:647
+#: builtin/branch.c:555
msgid "set up tracking mode (see git-pull(1))"
msgstr "configurar modo de seguimento (consulte git-pull(1))"
-#: builtin/branch.c:649
+#: builtin/branch.c:557
msgid "change upstream info"
msgstr "alterar a informação do ramo a montante"
-#: builtin/branch.c:651
+#: builtin/branch.c:559
msgid "upstream"
msgstr "a montante"
-#: builtin/branch.c:651
+#: builtin/branch.c:559
msgid "change the upstream info"
msgstr "alterar a informação do ramo a montante"
-#: builtin/branch.c:652
+#: builtin/branch.c:560
msgid "Unset the upstream info"
msgstr "Remover a informação do ramo a montante"
-#: builtin/branch.c:653
+#: builtin/branch.c:561
msgid "use colored output"
msgstr "usar saída colorida"
-#: builtin/branch.c:654
+#: builtin/branch.c:562
msgid "act on remote-tracking branches"
msgstr "atuar sobre ramos de monitorização remotos"
-#: builtin/branch.c:656 builtin/branch.c:657
+#: builtin/branch.c:564 builtin/branch.c:566
msgid "print only branches that contain the commit"
msgstr "imprimir apenas ramos que contenham o commit"
-#: builtin/branch.c:660
+#: builtin/branch.c:565 builtin/branch.c:567
+msgid "print only branches that don't contain the commit"
+msgstr "imprimir apenas ramos que não contenham o commit"
+
+#: builtin/branch.c:570
msgid "Specific git-branch actions:"
msgstr "Ações específicas do git-branch:"
-#: builtin/branch.c:661
+#: builtin/branch.c:571
msgid "list both remote-tracking and local branches"
msgstr "listar ramos de monitorização remotos e ramos locais"
-#: builtin/branch.c:663
+#: builtin/branch.c:573
msgid "delete fully merged branch"
msgstr "eliminar um ramo totalmente integrado"
-#: builtin/branch.c:664
+#: builtin/branch.c:574
msgid "delete branch (even if not merged)"
msgstr "eliminar um ramo (mesmo que não tenha sido integrado)"
-#: builtin/branch.c:665
+#: builtin/branch.c:575
msgid "move/rename a branch and its reflog"
msgstr "mover ou mudar o nome de um ramo e o seu reflog"
-#: builtin/branch.c:666
+#: builtin/branch.c:576
msgid "move/rename a branch, even if target exists"
msgstr "mover ou mudar o nome de um ramo, mesmo que o destino já exista"
-#: builtin/branch.c:667
+#: builtin/branch.c:577
msgid "list branch names"
msgstr "listar os nomes dos ramos"
-#: builtin/branch.c:668
+#: builtin/branch.c:578
msgid "create the branch's reflog"
msgstr "criar reflog do ramo"
-#: builtin/branch.c:670
+#: builtin/branch.c:580
msgid "edit the description for the branch"
msgstr "editar a descrição do ramo"
-#: builtin/branch.c:671
+#: builtin/branch.c:581
msgid "force creation, move/rename, deletion"
msgstr "forçar criação, mover/mudar o nome ou exclusão"
-#: builtin/branch.c:672
+#: builtin/branch.c:582
msgid "print only branches that are merged"
msgstr "imprimir apenas os ramos que foram integrados"
-#: builtin/branch.c:673
+#: builtin/branch.c:583
msgid "print only branches that are not merged"
msgstr "imprimir apenas os ramos que não foram integrados"
-#: builtin/branch.c:674
+#: builtin/branch.c:584
msgid "list branches in columns"
msgstr "listar os ramos em colunas"
-#: builtin/branch.c:675 builtin/for-each-ref.c:38 builtin/tag.c:381
+#: builtin/branch.c:585 builtin/for-each-ref.c:38 builtin/tag.c:426
msgid "key"
msgstr "chave"
-#: builtin/branch.c:676 builtin/for-each-ref.c:39 builtin/tag.c:382
+#: builtin/branch.c:586 builtin/for-each-ref.c:39 builtin/tag.c:427
msgid "field name to sort on"
msgstr "nome do campo pelo qual ordernar"
-#: builtin/branch.c:678 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:384
+#: 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
msgid "object"
msgstr "objeto"
-#: builtin/branch.c:679
+#: builtin/branch.c:589
msgid "print only branches of the object"
msgstr "imprimir apenas os ramos do objeto"
-#: builtin/branch.c:681 builtin/for-each-ref.c:46 builtin/tag.c:388
+#: builtin/branch.c:591 builtin/for-each-ref.c:47 builtin/tag.c:434
msgid "sorting and filtering are case insensitive"
msgstr "ordenar e filtrar são insensíveis a maiúsculas"
-#: builtin/branch.c:698
+#: builtin/branch.c:592 builtin/for-each-ref.c:37 builtin/tag.c:433
+#: builtin/verify-tag.c:38
+msgid "format to use for the output"
+msgstr "formato a usar na saída"
+
+#: builtin/branch.c:611
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Falha ao resolver HEAD numa referência válida."
-#: builtin/branch.c:702 builtin/clone.c:706
+#: builtin/branch.c:615 builtin/clone.c:724
msgid "HEAD not found below refs/heads!"
msgstr "HEAD não encontrada em refs/heads!"
-#: builtin/branch.c:724
+#: builtin/branch.c:638
msgid "--column and --verbose are incompatible"
msgstr "--column e --verbose são incompatíveis"
-#: builtin/branch.c:735 builtin/branch.c:787
+#: builtin/branch.c:649 builtin/branch.c:701
msgid "branch name required"
msgstr "nome do ramo é obrigatório"
-#: builtin/branch.c:763
+#: builtin/branch.c:677
msgid "Cannot give description to detached HEAD"
msgstr "Não é possível atribuir descrição a HEAD destacada"
-#: builtin/branch.c:768
+#: builtin/branch.c:682
msgid "cannot edit description of more than one branch"
msgstr "não é possível editar a descrição de mais do que um ramo"
-#: builtin/branch.c:775
+#: builtin/branch.c:689
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Ainda não há commits no ramo '%s'."
-#: builtin/branch.c:778
+#: builtin/branch.c:692
#, c-format
msgid "No branch named '%s'."
msgstr "Não há nenhum ramo denominado '%s'."
-#: builtin/branch.c:793
+#: builtin/branch.c:707
msgid "too many branches for a rename operation"
msgstr "demasiados ramos para uma operação de mudança de nome"
-#: builtin/branch.c:798
+#: builtin/branch.c:712
msgid "too many branches to set new upstream"
msgstr "demasiados ramos para definir novo ramo a montante"
-#: builtin/branch.c:802
+#: builtin/branch.c:716
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -5450,49 +5658,50 @@
"não foi possível definir %s como ramo a montante de HEAD visto que esta não "
"aponta para um ramo."
-#: builtin/branch.c:805 builtin/branch.c:827 builtin/branch.c:848
+#: builtin/branch.c:719 builtin/branch.c:741 builtin/branch.c:762
#, c-format
msgid "no such branch '%s'"
msgstr "o ramo '%s' não existe"
-#: builtin/branch.c:809
+#: builtin/branch.c:723
#, c-format
msgid "branch '%s' does not exist"
msgstr "o ramo '%s' não existe"
-#: builtin/branch.c:821
+#: builtin/branch.c:735
msgid "too many branches to unset upstream"
msgstr "demasiados ramos para remover a definição de ramo a montante"
-#: builtin/branch.c:825
+#: builtin/branch.c:739
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"não foi possível remover a definição de ramo a montante de HEAD visto que "
"esta não aponta para um ramo."
-#: builtin/branch.c:831
+#: builtin/branch.c:745
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "O ramo '%s' não tem informação sobre o ramo a montante"
-#: builtin/branch.c:845
+#: builtin/branch.c:759
msgid "it does not make sense to create 'HEAD' manually"
msgstr "não faz sentido criar 'HEAD' manualmente"
-#: builtin/branch.c:851
+#: builtin/branch.c:765
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
-msgstr "as opções -a e -r de 'git branch' não fazem sentido com um nome de ramo"
+msgstr ""
+"as opções -a e -r de 'git branch' não fazem sentido com um nome de ramo"
-#: builtin/branch.c:854
+#: builtin/branch.c:768
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
"track or --set-upstream-to\n"
msgstr ""
-"A opção --set-upstream é obsoleta e será removida. Considere o uso de --track "
-"ou --set-upstream-to\n"
+"A opção --set-upstream é obsoleta e será removida. Considere o uso de --"
+"track ou --set-upstream-to\n"
-#: builtin/branch.c:871
+#: builtin/branch.c:785
#, c-format
msgid ""
"\n"
@@ -5503,26 +5712,26 @@
"Se quer que '%s' siga '%s', faça:\n"
"\n"
-#: builtin/bundle.c:51
+#: builtin/bundle.c:45
#, c-format
msgid "%s is okay\n"
msgstr "%s está correto\n"
-#: builtin/bundle.c:64
+#: builtin/bundle.c:58
msgid "Need a repository to create a bundle."
msgstr "É necessário um repositório para criar um bundle."
-#: builtin/bundle.c:68
+#: builtin/bundle.c:62
msgid "Need a repository to unbundle."
msgstr "É preciso um repositório para desempacotar."
#: builtin/cat-file.c:513
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 "
-"| <tipo> | --textconv | --filters) [--path=<caminho>] <objeto>"
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
+"p | <tipo> | --textconv | --filters) [--path=<caminho>] <objeto>"
#: builtin/cat-file.c:514
msgid ""
@@ -5560,7 +5769,7 @@
msgid "for blob objects, run filters on object's content"
msgstr "para objetos blob, correr filtros sobre o conteúdo do objeto"
-#: builtin/cat-file.c:561 git-submodule.sh:929
+#: builtin/cat-file.c:561 git-submodule.sh:943
msgid "blob"
msgstr "blob"
@@ -5587,8 +5796,8 @@
#: builtin/cat-file.c:573
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
-"seguir ligações simbólica no interior da árvore (usado com --batch ou --batch-"
-"check)"
+"seguir ligações simbólica no interior da árvore (usado com --batch ou --"
+"batch-check)"
#: builtin/cat-file.c:575
msgid "show all objects with --batch or --batch-check"
@@ -5618,7 +5827,7 @@
msgid "terminate input and output records by a NUL character"
msgstr "terminar registos da entrada e da saída com um carácter NUL"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1140 builtin/gc.c:332
+#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:352
msgid "suppress progress reporting"
msgstr "suprimir informação de progresso"
@@ -5710,9 +5919,9 @@
msgstr "escrever o conteúdo em ficheiros temporários"
#: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:597 builtin/submodule--helper.c:600
-#: builtin/submodule--helper.c:606 builtin/submodule--helper.c:967
-#: builtin/worktree.c:471
+#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
+#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
+#: builtin/worktree.c:472
msgid "string"
msgstr "cadeia"
@@ -5724,114 +5933,114 @@
msgid "copy out the files from named stage"
msgstr "copiar os ficheiros do estágio indicado"
-#: builtin/checkout.c:25
+#: builtin/checkout.c:27
msgid "git checkout [<options>] <branch>"
msgstr "git checkout [<opções>] <ramo>"
-#: builtin/checkout.c:26
+#: builtin/checkout.c:28
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<opções>] [<ramo>] -- <ficheiro>..."
-#: builtin/checkout.c:134 builtin/checkout.c:167
+#: builtin/checkout.c:153 builtin/checkout.c:186
#, c-format
msgid "path '%s' does not have our version"
msgstr "o caminho '%s' não tem a nossa versão"
-#: builtin/checkout.c:136 builtin/checkout.c:169
+#: builtin/checkout.c:155 builtin/checkout.c:188
#, c-format
msgid "path '%s' does not have their version"
msgstr "o caminho '%s' não tem a versão deles"
-#: builtin/checkout.c:152
+#: builtin/checkout.c:171
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "o caminho '%s' não tem todas as versões necessárias"
-#: builtin/checkout.c:196
+#: builtin/checkout.c:215
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "o caminho '%s' não tem as versões necessárias"
-#: builtin/checkout.c:213
+#: builtin/checkout.c:232
#, c-format
msgid "path '%s': cannot merge"
msgstr "caminho '%s': não é possível integrar"
-#: builtin/checkout.c:230
+#: builtin/checkout.c:249
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Não é possível adicionar os resultados da integração de '%s'"
-#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
-#: builtin/checkout.c:259
+#: builtin/checkout.c:269 builtin/checkout.c:272 builtin/checkout.c:275
+#: builtin/checkout.c:278
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' não pode ser usado com caminhos em atualização"
-#: builtin/checkout.c:262 builtin/checkout.c:265
+#: builtin/checkout.c:281 builtin/checkout.c:284
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' não pode ser usado com %s"
-#: builtin/checkout.c:268
+#: builtin/checkout.c:287
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
"Não é possível atualizar os caminhos e mudar para o ramo '%s' ao mesmo tempo."
-#: builtin/checkout.c:339 builtin/checkout.c:346
+#: builtin/checkout.c:358 builtin/checkout.c:365
#, c-format
msgid "path '%s' is unmerged"
msgstr "o caminho '%s' não foi integrado"
-#: builtin/checkout.c:494
+#: builtin/checkout.c:513
msgid "you need to resolve your current index first"
msgstr "primeiro deve resolver o índice atual"
-#: builtin/checkout.c:625
+#: builtin/checkout.c:644
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Não é possível efetuar reflog de '%s': %s\n"
-#: builtin/checkout.c:666
+#: builtin/checkout.c:685
msgid "HEAD is now at"
msgstr "HEAD está agora em"
-#: builtin/checkout.c:670 builtin/clone.c:660
+#: builtin/checkout.c:689 builtin/clone.c:678
msgid "unable to update HEAD"
msgstr "não foi possível atualizar HEAD"
-#: builtin/checkout.c:674
+#: builtin/checkout.c:693
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Repor ramo '%s'\n"
-#: builtin/checkout.c:677
+#: builtin/checkout.c:696
#, c-format
msgid "Already on '%s'\n"
msgstr "Já em '%s'\n"
-#: builtin/checkout.c:681
+#: builtin/checkout.c:700
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Mudou para e repôs o ramo '%s'\n"
-#: builtin/checkout.c:683 builtin/checkout.c:1072
+#: builtin/checkout.c:702 builtin/checkout.c:1090
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Mudou para o novo ramo '%s'\n"
-#: builtin/checkout.c:685
+#: builtin/checkout.c:704
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Mudou para o ramo '%s'\n"
-#: builtin/checkout.c:736
+#: builtin/checkout.c:755
#, c-format
msgid " ... and %d more.\n"
msgstr " ... e mais %d.\n"
-#: builtin/checkout.c:742
+#: builtin/checkout.c:761
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -5852,7 +6061,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:761
+#: builtin/checkout.c:780
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -5879,164 +6088,166 @@
" git branch <nome-do-novo-ramo> %s\n"
"\n"
-#: builtin/checkout.c:797
+#: builtin/checkout.c:816
msgid "internal error in revision walk"
msgstr "erro interno durante o curso de revisões"
-#: builtin/checkout.c:801
+#: builtin/checkout.c:820
msgid "Previous HEAD position was"
msgstr "A posição anterior de HEAD era"
-#: builtin/checkout.c:828 builtin/checkout.c:1067
+#: builtin/checkout.c:847 builtin/checkout.c:1085
msgid "You are on a branch yet to be born"
msgstr "Está num ramo ainda não criado"
-#: builtin/checkout.c:973
+#: builtin/checkout.c:991
#, c-format
msgid "only one reference expected, %d given."
msgstr "esperava-se apenas uma referência, %d fornecidas."
-#: builtin/checkout.c:1013 builtin/worktree.c:214
+#: builtin/checkout.c:1031 builtin/worktree.c:214
#, c-format
msgid "invalid reference: %s"
msgstr "referência inválida: %s"
-#: builtin/checkout.c:1042
+#: builtin/checkout.c:1060
#, c-format
msgid "reference is not a tree: %s"
msgstr "a referência não é uma árvore: %s"
-#: builtin/checkout.c:1081
+#: builtin/checkout.c:1099
msgid "paths cannot be used with switching branches"
msgstr "não podem ser usados caminhos ao mudar de ramo"
-#: builtin/checkout.c:1084 builtin/checkout.c:1088
+#: builtin/checkout.c:1102 builtin/checkout.c:1106
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' não pode ser usado ao mudar de ramo"
-#: builtin/checkout.c:1092 builtin/checkout.c:1095 builtin/checkout.c:1100
-#: builtin/checkout.c:1103
+#: builtin/checkout.c:1110 builtin/checkout.c:1113 builtin/checkout.c:1118
+#: builtin/checkout.c:1121
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' não pode ser usado com '%s'"
-#: builtin/checkout.c:1108
+#: builtin/checkout.c:1126
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Não é possível mudar de ramo para '%s', visto que não é um commit"
-#: builtin/checkout.c:1141 builtin/checkout.c:1143 builtin/clone.c:93
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324
-#: builtin/worktree.c:326
+#: builtin/checkout.c:1159 builtin/checkout.c:1161 builtin/clone.c:111
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:325
+#: builtin/worktree.c:327
msgid "branch"
msgstr "ramo"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1160
msgid "create and checkout a new branch"
msgstr "criar e extrair um novo ramo"
-#: builtin/checkout.c:1144
+#: builtin/checkout.c:1162
msgid "create/reset and checkout a branch"
msgstr "criar/repor e extrair um ramo"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1163
msgid "create reflog for new branch"
msgstr "criar reflog do novo ramo"
-#: builtin/checkout.c:1146 builtin/worktree.c:328
+#: builtin/checkout.c:1164 builtin/worktree.c:329
msgid "detach HEAD at named commit"
msgstr "destacar HEAD no commit indicado"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1165
msgid "set upstream info for new branch"
msgstr "definir a informação do ramo a montante do novo ramo"
-#: builtin/checkout.c:1149
+#: builtin/checkout.c:1167
msgid "new-branch"
msgstr "novo-ramo"
-#: builtin/checkout.c:1149
+#: builtin/checkout.c:1167
msgid "new unparented branch"
msgstr "novo ramo sem pai"
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1168
msgid "checkout our version for unmerged files"
msgstr "extrair a nossa versão dos ficheiros não integrados"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1170
msgid "checkout their version for unmerged files"
msgstr "extrair a versão deles dos ficheiros não integrados"
-#: builtin/checkout.c:1154
+#: builtin/checkout.c:1172
msgid "force checkout (throw away local modifications)"
msgstr "forçar extração (descartar modificações locais)"
-#: builtin/checkout.c:1155
+#: builtin/checkout.c:1173
msgid "perform a 3-way merge with the new branch"
msgstr "realizar uma integração com 3 pontos com o novo ramo"
-#: builtin/checkout.c:1156 builtin/merge.c:235
+#: builtin/checkout.c:1174 builtin/merge.c:234
msgid "update ignored files (default)"
msgstr "atualizar ficheiros ignorados (predefinição)"
-#: builtin/checkout.c:1157 builtin/log.c:1466 parse-options.h:251
+#: builtin/checkout.c:1175 builtin/log.c:1473 parse-options.h:251
msgid "style"
msgstr "estilo"
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1176
msgid "conflict style (merge or diff3)"
msgstr "estilo de conflito (merge ou diff3)"
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1179
msgid "do not limit pathspecs to sparse entries only"
msgstr "não restringir especificadores de caminho a entradas esparsas"
-#: builtin/checkout.c:1163
+#: builtin/checkout.c:1181
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "tentar adivinhar 'git checkout <ramo-inexistente>'"
-#: builtin/checkout.c:1165
+#: builtin/checkout.c:1183
msgid "do not check if another worktree is holding the given ref"
-msgstr "não verificar se outra árvore de trabalho contém a referência fornecida"
+msgstr ""
+"não verificar se outra árvore de trabalho contém a referência fornecida"
-#: builtin/checkout.c:1166 builtin/clone.c:63 builtin/fetch.c:119
-#: builtin/merge.c:232 builtin/pull.c:117 builtin/push.c:539
-#: builtin/send-pack.c:168
+#: 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
msgid "force progress reporting"
msgstr "forçar informação de progresso"
-#: builtin/checkout.c:1197
+#: builtin/checkout.c:1224
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B e --orphan são mutuamente exclusivos"
-#: builtin/checkout.c:1214
+#: builtin/checkout.c:1241
msgid "--track needs a branch name"
msgstr "--track requer um nome dum ramo"
-#: builtin/checkout.c:1219
+#: builtin/checkout.c:1246
msgid "Missing branch name; try -b"
msgstr "Falta um nome dum ramo; tente -b"
-#: builtin/checkout.c:1255
+#: builtin/checkout.c:1282
msgid "invalid path specification"
msgstr "especificação de caminho inválida"
-#: builtin/checkout.c:1262
+#: builtin/checkout.c:1289
#, 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 ""
-"Não é possível atualizar os caminho e mudar para o ramo '%s' ao mesmo tempo.\n"
+"Não é possível atualizar os caminho e mudar para o ramo '%s' ao mesmo "
+"tempo.\n"
"Pretendia extrair '%s' o qual não pode ser resolvido como commit?"
-#: builtin/checkout.c:1267
+#: builtin/checkout.c:1294
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach não aceita um caminho como argumento '%s'"
-#: builtin/checkout.c:1271
+#: builtin/checkout.c:1298
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -6075,7 +6286,7 @@
msgid "failed to remove %s"
msgstr "falha ao remover %s"
-#: builtin/clean.c:291 git-add--interactive.perl:623
+#: builtin/clean.c:297 git-add--interactive.perl:614
#, c-format
msgid ""
"Prompt help:\n"
@@ -6088,7 +6299,7 @@
"foo - selecionar item baseado no prefixo único\n"
" - (vazio) não seleciona nada\n"
-#: builtin/clean.c:295 git-add--interactive.perl:632
+#: builtin/clean.c:301 git-add--interactive.perl:623
#, c-format
msgid ""
"Prompt help:\n"
@@ -6109,38 +6320,38 @@
"* - escolher todos os itens\n"
" - (vazio) concluir seleção\n"
-#: builtin/clean.c:511 git-add--interactive.perl:598
-#: git-add--interactive.perl:603
+#: builtin/clean.c:517 git-add--interactive.perl:589
+#: git-add--interactive.perl:594
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "O quê (%s)?\n"
-#: builtin/clean.c:653
+#: builtin/clean.c:659
#, c-format
msgid "Input ignore patterns>> "
msgstr "Introduza padrões a ignorar>> "
-#: builtin/clean.c:690
+#: builtin/clean.c:696
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "AVISO: não foram encontrados itens correspondentes a: %s"
-#: builtin/clean.c:711
+#: builtin/clean.c:717
msgid "Select items to delete"
msgstr "Selecione itens para eliminar"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:752
+#: builtin/clean.c:758
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Remover %s [y/N]? "
-#: builtin/clean.c:777 git-add--interactive.perl:1669
+#: builtin/clean.c:783 git-add--interactive.perl:1660
#, c-format
msgid "Bye.\n"
msgstr "Adeus.\n"
-#: builtin/clean.c:785
+#: builtin/clean.c:791
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -6158,62 +6369,63 @@
"help - esta ajuda\n"
"? - ajuda para seleção em linha de comandos"
-#: builtin/clean.c:812 git-add--interactive.perl:1745
+#: builtin/clean.c:818 git-add--interactive.perl:1736
msgid "*** Commands ***"
msgstr "*** Comandos ***"
-#: builtin/clean.c:813 git-add--interactive.perl:1742
+#: builtin/clean.c:819 git-add--interactive.perl:1733
msgid "What now"
msgstr "E agora"
-#: builtin/clean.c:821
+#: builtin/clean.c:827
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Removeria o seguinte item:"
msgstr[1] "Removeria os seguintes itens:"
-#: builtin/clean.c:838
+#: builtin/clean.c:844
msgid "No more files to clean, exiting."
msgstr "Não há mais ficheiros por limpar, a terminar."
-#: builtin/clean.c:869
+#: builtin/clean.c:875
msgid "do not print names of files removed"
msgstr "não imprimir os nomes dos ficheiros removidos"
-#: builtin/clean.c:871
+#: builtin/clean.c:877
msgid "force"
msgstr "forçar"
-#: builtin/clean.c:872
+#: builtin/clean.c:878
msgid "interactive cleaning"
msgstr "limpeza interativa"
-#: builtin/clean.c:874
+#: builtin/clean.c:880
msgid "remove whole directories"
msgstr "remover diretórios inteiros"
-#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:1056
-#: builtin/ls-files.c:538 builtin/name-rev.c:313 builtin/show-ref.c:176
+#: builtin/clean.c:881 builtin/describe.c:449 builtin/describe.c:451
+#: builtin/grep.c:1063 builtin/ls-files.c:539 builtin/name-rev.c:348
+#: builtin/name-rev.c:350 builtin/show-ref.c:176
msgid "pattern"
msgstr "padrão"
-#: builtin/clean.c:876
+#: builtin/clean.c:882
msgid "add <pattern> to ignore rules"
msgstr "adicionar <padrão> às regras ignoradas"
-#: builtin/clean.c:877
+#: builtin/clean.c:883
msgid "remove ignored files, too"
msgstr "também remover ficheiros ignorados"
-#: builtin/clean.c:879
+#: builtin/clean.c:885
msgid "remove only ignored files"
msgstr "remover apenas ficheiros ignorados"
-#: builtin/clean.c:897
+#: builtin/clean.c:903
msgid "-x and -X cannot be used together"
msgstr "-x e -X não pode ser usados juntos"
-#: builtin/clean.c:901
+#: builtin/clean.c:907
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -6221,7 +6433,7 @@
"clean.requireForce definido como true e nenhum -i, -n, ou -f fornecido; "
"limpeza recusada"
-#: builtin/clean.c:904
+#: builtin/clean.c:910
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -6233,129 +6445,134 @@
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<opções>] [--] <repo> [<dir>]"
-#: builtin/clone.c:65
+#: builtin/clone.c:80
msgid "don't create a checkout"
msgstr "não criar uma extração"
-#: builtin/clone.c:66 builtin/clone.c:68 builtin/init-db.c:478
+#: builtin/clone.c:81 builtin/clone.c:83 builtin/init-db.c:478
msgid "create a bare repository"
msgstr "criar um repositório nu"
-#: builtin/clone.c:70
+#: builtin/clone.c:85
msgid "create a mirror repository (implies bare)"
msgstr "criar um repositório espelhado (implica repositório nu)"
-#: builtin/clone.c:72
+#: builtin/clone.c:87
msgid "to clone from a local repository"
msgstr "para clonar de um repositório local"
-#: builtin/clone.c:74
+#: builtin/clone.c:89
msgid "don't use local hardlinks, always copy"
msgstr "não usar ligações fixas, copiar sempre"
-#: builtin/clone.c:76
+#: builtin/clone.c:91
msgid "setup as shared repository"
msgstr "configurar como repositório partilhado"
-#: builtin/clone.c:78 builtin/clone.c:80
+#: builtin/clone.c:93 builtin/clone.c:97
+msgid "pathspec"
+msgstr "pathspec"
+
+#: builtin/clone.c:93 builtin/clone.c:97
msgid "initialize submodules in the clone"
msgstr "inicializar submódulos no clone"
-#: builtin/clone.c:82
+#: builtin/clone.c:100
msgid "number of submodules cloned in parallel"
msgstr "número de submódulos clonados em paralelo"
-#: builtin/clone.c:83 builtin/init-db.c:475
+#: builtin/clone.c:101 builtin/init-db.c:475
msgid "template-directory"
msgstr "diretório-modelo"
-#: builtin/clone.c:84 builtin/init-db.c:476
+#: builtin/clone.c:102 builtin/init-db.c:476
msgid "directory from which templates will be used"
msgstr "diretório que contém os modelos usados"
-#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:604
-#: builtin/submodule--helper.c:970
+#: builtin/clone.c:104 builtin/clone.c:106 builtin/submodule--helper.c:642
+#: builtin/submodule--helper.c:983
msgid "reference repository"
msgstr "repositório de referência"
-#: builtin/clone.c:90
+#: builtin/clone.c:108
msgid "use --reference only while cloning"
msgstr "usar --reference apenas para clonar"
-#: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:109 builtin/column.c:26 builtin/merge-file.c:43
msgid "name"
msgstr "nome"
-#: builtin/clone.c:92
+#: builtin/clone.c:110
msgid "use <name> instead of 'origin' to track upstream"
msgstr "usar <nome> em vez de 'origin' para seguir o ramo a montante"
-#: builtin/clone.c:94
+#: builtin/clone.c:112
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "extrair <ramo> em vez da HEAD do remoto"
-#: builtin/clone.c:96
+#: builtin/clone.c:114
msgid "path to git-upload-pack on the remote"
msgstr "caminho para git-upload-pack no remoto"
-#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:999 builtin/pull.c:202
+#: builtin/clone.c:115 builtin/fetch.c:120 builtin/grep.c:1006
+#: builtin/pull.c:202
msgid "depth"
msgstr "profundidade"
-#: builtin/clone.c:98
+#: builtin/clone.c:116
msgid "create a shallow clone of that depth"
msgstr "criar um clone raso com essa profundidade"
-#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2836
+#: builtin/clone.c:117 builtin/fetch.c:122 builtin/pack-objects.c:2918
#: parse-options.h:142
msgid "time"
msgstr "hora"
-#: builtin/clone.c:100
+#: builtin/clone.c:118
msgid "create a shallow clone since a specific time"
msgstr "criar um clone raso desde uma data específica"
-#: builtin/clone.c:101 builtin/fetch.c:124
+#: builtin/clone.c:119 builtin/fetch.c:124
msgid "revision"
msgstr "revisão"
-#: builtin/clone.c:102 builtin/fetch.c:125
+#: builtin/clone.c:120 builtin/fetch.c:125
msgid "deepen history of shallow clone, excluding rev"
msgstr "aprofundar o histórico de um clone raso, excluindo a revisão"
-#: builtin/clone.c:104
+#: builtin/clone.c:122
msgid "clone only one branch, HEAD or --branch"
msgstr "clonar apenas um ramo, HEAD ou --branch"
-#: builtin/clone.c:106
+#: builtin/clone.c:124
msgid "any cloned submodules will be shallow"
msgstr "qualquer submódulo clonado será raso"
-#: builtin/clone.c:107 builtin/init-db.c:484
+#: builtin/clone.c:125 builtin/init-db.c:484
msgid "gitdir"
msgstr "gitdir"
-#: builtin/clone.c:108 builtin/init-db.c:485
+#: builtin/clone.c:126 builtin/init-db.c:485
msgid "separate git dir from working tree"
msgstr "separar o repositório git da árvore de trabalho"
-#: builtin/clone.c:109
+#: builtin/clone.c:127
msgid "key=value"
msgstr "chave=valor"
-#: builtin/clone.c:110
+#: builtin/clone.c:128
msgid "set config inside the new repository"
msgstr "definir configuração dentro do novo repositório"
-#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:550
+#: builtin/clone.c:129 builtin/fetch.c:140 builtin/push.c:550
msgid "use IPv4 addresses only"
msgstr "usar apenas endereços IPv4"
-#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:552
+#: builtin/clone.c:131 builtin/fetch.c:142 builtin/push.c:552
msgid "use IPv6 addresses only"
msgstr "usar apenas endereços IPv6"
-#: builtin/clone.c:250
+#: builtin/clone.c:268
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
@@ -6363,42 +6580,42 @@
"Não foi possível adivinhar o nome do diretório.\n"
"Especifique um diretório na linha de comandos"
-#: builtin/clone.c:303
+#: builtin/clone.c:321
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: Não foi possível adicionar sobressalente de '%s': %s\n"
-#: builtin/clone.c:375
+#: builtin/clone.c:393
#, c-format
msgid "failed to open '%s'"
msgstr "falha ao abrir '%s'"
-#: builtin/clone.c:383
+#: builtin/clone.c:401
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existe e não é um diretório"
-#: builtin/clone.c:397
+#: builtin/clone.c:415
#, c-format
msgid "failed to stat %s\n"
msgstr "falha ao invocar stat de %s\n"
-#: builtin/clone.c:419
+#: builtin/clone.c:437
#, c-format
msgid "failed to create link '%s'"
msgstr "falha ao criar a ligação '%s'"
-#: builtin/clone.c:423
+#: builtin/clone.c:441
#, c-format
msgid "failed to copy file to '%s'"
msgstr "falha ao copiar o ficheiro para '%s'"
-#: builtin/clone.c:448
+#: builtin/clone.c:466
#, c-format
msgid "done.\n"
msgstr "concluído.\n"
-#: builtin/clone.c:460
+#: builtin/clone.c:478
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -6408,137 +6625,140 @@
"Pode inspecionar o que foi extraído com 'git status'\n"
"e repetir a extração com 'git checkout -f HEAD'\n"
-#: builtin/clone.c:537
+#: builtin/clone.c:555
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Ramo remoto %s não encontrado para clonar."
-#: builtin/clone.c:632
+#: builtin/clone.c:650
msgid "remote did not send all necessary objects"
msgstr "o remoto não enviou todos os objetos necessários"
-#: builtin/clone.c:648
+#: builtin/clone.c:666
#, c-format
msgid "unable to update %s"
msgstr "não foi possível atualizar %s"
-#: builtin/clone.c:697
+#: builtin/clone.c:715
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
-"a HEAD remota referencia uma referência inexistente, não é possível extrair.\n"
+"a HEAD remota referencia uma referência inexistente, não é possível "
+"extrair.\n"
-#: builtin/clone.c:728
+#: builtin/clone.c:746
msgid "unable to checkout working tree"
msgstr "não foi possível extrair a árvore de trabalho"
-#: builtin/clone.c:768
+#: builtin/clone.c:786
msgid "unable to write parameters to config file"
msgstr "não foi possível escrever os parâmetros no ficheiro de configuração"
-#: builtin/clone.c:831
+#: builtin/clone.c:849
msgid "cannot repack to clean up"
msgstr "não é possível reempacotar para limpar"
-#: builtin/clone.c:833
+#: builtin/clone.c:851
msgid "cannot unlink temporary alternates file"
-msgstr "não é possível invocar unlink sobre o ficheiro sobressalente temporário"
+msgstr ""
+"não é possível invocar unlink sobre o ficheiro sobressalente temporário"
-#: builtin/clone.c:866 builtin/receive-pack.c:1895
+#: builtin/clone.c:884 builtin/receive-pack.c:1901
msgid "Too many arguments."
msgstr "Demasiados argumentos."
-#: builtin/clone.c:870
+#: builtin/clone.c:888
msgid "You must specify a repository to clone."
msgstr "Deve especificar um repositório para clonar."
-#: builtin/clone.c:883
+#: builtin/clone.c:901
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "as opções --bare e --origin %s são incompatíveis."
-#: builtin/clone.c:886
+#: builtin/clone.c:904
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare e --separate-git-dir são incompatíveis."
-#: builtin/clone.c:899
+#: builtin/clone.c:917
#, c-format
msgid "repository '%s' does not exist"
msgstr "o repositório '%s' não existe"
-#: builtin/clone.c:905 builtin/fetch.c:1335
+#: builtin/clone.c:923 builtin/fetch.c:1337
#, c-format
msgid "depth %s is not a positive number"
msgstr "profundidade %s não é um número positivo"
-#: builtin/clone.c:915
+#: builtin/clone.c:933
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "o caminho de destino '%s' já existe e não é um diretório vazio."
-#: builtin/clone.c:925
+#: builtin/clone.c:943
#, c-format
msgid "working tree '%s' already exists."
msgstr "a árvore de trabalho '%s' já existe."
-#: builtin/clone.c:940 builtin/clone.c:951 builtin/difftool.c:252
-#: builtin/submodule--helper.c:659 builtin/worktree.c:222 builtin/worktree.c:249
+#: builtin/clone.c:958 builtin/clone.c:969 builtin/difftool.c:252
+#: builtin/worktree.c:222 builtin/worktree.c:249
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "não foi possível criar os diretórios superiores de '%s'"
-#: builtin/clone.c:943
+#: builtin/clone.c:961
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "não foi possível criar o diretório de árvore de trabalho '%s'"
-#: builtin/clone.c:955
+#: builtin/clone.c:973
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "A clonar no repositório nu '%s'...\n"
-#: builtin/clone.c:957
+#: builtin/clone.c:975
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "A clonar em '%s'...\n"
-#: builtin/clone.c:963
+#: builtin/clone.c:999
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgstr ""
-"clone --recursive não é compatível com ambos --reference e --reference-if-able"
+"clone --recursive não é compatível com ambos --reference e --reference-if-"
+"able"
-#: builtin/clone.c:1019
+#: builtin/clone.c:1055
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth é ignorado em clones locais; use file:// ."
-#: builtin/clone.c:1021
+#: builtin/clone.c:1057
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr "--shallow-since é ignorado em clones locais; use file:// ."
-#: builtin/clone.c:1023
+#: builtin/clone.c:1059
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr "--shallow-exclude é ignorado em clones locais; use file:// ."
-#: builtin/clone.c:1026
+#: builtin/clone.c:1062
msgid "source repository is shallow, ignoring --local"
msgstr "o repositório de origem é raso, --local ignorado"
-#: builtin/clone.c:1031
+#: builtin/clone.c:1067
msgid "--local is ignored"
msgstr "--local ignorado"
-#: builtin/clone.c:1035
+#: builtin/clone.c:1071
#, c-format
msgid "Don't know how to clone %s"
msgstr "Não sei como clonar %s"
-#: builtin/clone.c:1090 builtin/clone.c:1098
+#: builtin/clone.c:1126 builtin/clone.c:1134
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "O ramo remoto %s não foi encontrado no repositório a montante %s"
-#: builtin/clone.c:1101
+#: builtin/clone.c:1137
msgid "You appear to have cloned an empty repository."
msgstr "Parece foi clonado um repositório vazio."
@@ -6731,11 +6951,6 @@
msgid "malformed --author parameter"
msgstr "parâmetro --author malformado"
-#: builtin/commit.c:611
-#, c-format
-msgid "invalid date format: %s"
-msgstr "formato de data inválido: %s"
-
#: builtin/commit.c:655
msgid ""
"unable to select a comment character that is not used\n"
@@ -6749,7 +6964,7 @@
msgid "could not lookup commit %s"
msgstr "não foi possível consultar o commit %s"
-#: builtin/commit.c:704 builtin/shortlog.c:295
+#: builtin/commit.c:704 builtin/shortlog.c:294
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(a ler mensagem de log da entrada padrão)\n"
@@ -6849,7 +7064,7 @@
msgid "Error building trees"
msgstr "Erro ao construir árvores"
-#: builtin/commit.c:968 builtin/tag.c:280
+#: builtin/commit.c:968 builtin/tag.c:273
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Indique a mensagem usando as opções -m ou -F.\n"
@@ -6915,7 +7130,7 @@
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr "Caminhos explícitos especificados sem -i ou -o; assumindo --only..."
-#: builtin/commit.c:1224 builtin/tag.c:495
+#: builtin/commit.c:1224 builtin/tag.c:551
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Modo de limpeza inválido %s"
@@ -6937,7 +7152,7 @@
msgstr "versão"
#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525
-#: builtin/worktree.c:442
+#: builtin/worktree.c:443
msgid "machine-readable output"
msgstr "saída inteligível por máquina"
@@ -6950,7 +7165,7 @@
msgstr "terminar entradas com NUL"
#: builtin/commit.c:1351 builtin/commit.c:1624 builtin/fast-export.c:981
-#: builtin/fast-export.c:984 builtin/tag.c:368
+#: builtin/fast-export.c:984 builtin/tag.c:411
msgid "mode"
msgstr "modo"
@@ -6970,8 +7185,8 @@
#: builtin/commit.c:1357
msgid ""
-"ignore changes to submodules, optional when: all, dirty, untracked. (Default: "
-"all)"
+"ignore changes to submodules, optional when: all, dirty, untracked. "
+"(Default: all)"
msgstr ""
"ignorar alterações em submódulos, quando é opcional: all, dirty, untracked. "
"(Predefinição: all)"
@@ -7008,7 +7223,7 @@
msgid "Commit message options"
msgstr "Opções de mensagem de commit"
-#: builtin/commit.c:1586 builtin/tag.c:366
+#: builtin/commit.c:1586 builtin/tag.c:409
msgid "read message from file"
msgstr "ler mensagem de um ficheiro"
@@ -7020,7 +7235,7 @@
msgid "override author for commit"
msgstr "substituir autor do commit"
-#: builtin/commit.c:1588 builtin/gc.c:333
+#: builtin/commit.c:1588 builtin/gc.c:353
msgid "date"
msgstr "data"
@@ -7028,8 +7243,8 @@
msgid "override date for commit"
msgstr "substituir data do commit"
-#: builtin/commit.c:1589 builtin/merge.c:222 builtin/notes.c:398
-#: builtin/notes.c:561 builtin/tag.c:364
+#: builtin/commit.c:1589 builtin/merge.c:221 builtin/notes.c:398
+#: builtin/notes.c:561 builtin/tag.c:407
msgid "message"
msgstr "mensagem"
@@ -7038,7 +7253,7 @@
msgstr "mensagem de commit"
#: builtin/commit.c:1590 builtin/commit.c:1591 builtin/commit.c:1592
-#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:81
+#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:77
msgid "commit"
msgstr "commit"
@@ -7057,13 +7272,14 @@
#: builtin/commit.c:1593
msgid "use autosquash formatted message to squash specified commit"
-msgstr "usar mensagem com formato autosquash para esmagar o commit especificado"
+msgstr ""
+"usar mensagem com formato autosquash para esmagar o commit especificado"
#: builtin/commit.c:1594
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "agora sou eu o autor do commit (usado com C/-c/--amend)"
-#: builtin/commit.c:1595 builtin/log.c:1413 builtin/revert.c:86
+#: builtin/commit.c:1595 builtin/log.c:1420 builtin/revert.c:104
msgid "add Signed-off-by:"
msgstr "adicionar Signed-off-by:"
@@ -7079,7 +7295,7 @@
msgid "default"
msgstr "predefinição"
-#: builtin/commit.c:1598 builtin/tag.c:369
+#: builtin/commit.c:1598 builtin/tag.c:412
msgid "how to strip spaces and #comments from message"
msgstr "como retirar espaços e #comentários da mensagem"
@@ -7087,8 +7303,8 @@
msgid "include status in commit message template"
msgstr "incluir status no modelo da mensagem de commit"
-#: builtin/commit.c:1601 builtin/merge.c:234 builtin/pull.c:166
-#: builtin/revert.c:93
+#: builtin/commit.c:1601 builtin/merge.c:233 builtin/pull.c:166
+#: builtin/revert.c:112
msgid "GPG sign commit"
msgstr "assinar o commit com GPG"
@@ -7332,12 +7548,12 @@
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:613
+#: builtin/config.c:611
#, c-format
msgid "cannot create configuration file %s"
msgstr "não é possível criar o ficheiro de configuração %s"
-#: builtin/config.c:625
+#: builtin/config.c:623
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
@@ -7354,55 +7570,67 @@
msgid "print sizes in human readable format"
msgstr "imprimir dimensões em formato inteligível por humanos"
-#: builtin/describe.c:17
+#: builtin/describe.c:18
msgid "git describe [<options>] [<commit-ish>...]"
msgstr "git describe [<opções>] [<commit-etc>...]"
-#: builtin/describe.c:18
+#: builtin/describe.c:19
msgid "git describe [<options>] --dirty"
msgstr "git describe [<opções>] --dirty"
-#: builtin/describe.c:217
+#: builtin/describe.c:53
+msgid "head"
+msgstr "cabeça"
+
+#: builtin/describe.c:53
+msgid "lightweight"
+msgstr "leve"
+
+#: builtin/describe.c:53
+msgid "annotated"
+msgstr "anotado"
+
+#: builtin/describe.c:250
#, c-format
msgid "annotated tag %s not available"
msgstr "a tag anotada %s não está disponível"
-#: builtin/describe.c:221
+#: builtin/describe.c:254
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr "a tag anotada %s não tem nenhum nome incorporado"
-#: builtin/describe.c:223
+#: builtin/describe.c:256
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr "a tag '%s' está de facto em '%s'"
-#: builtin/describe.c:250 builtin/log.c:480
+#: builtin/describe.c:283 builtin/log.c:487
#, c-format
msgid "Not a valid object name %s"
msgstr "%s não é um nome de objeto válido"
-#: builtin/describe.c:253
+#: builtin/describe.c:286
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s não é um objeto '%s' válido"
-#: builtin/describe.c:270
+#: builtin/describe.c:303
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "nenhuma tag corresponde exatamente a '%s'"
-#: builtin/describe.c:272
+#: builtin/describe.c:305
#, c-format
msgid "searching to describe %s\n"
msgstr "à procurar da descrição de %s\n"
-#: builtin/describe.c:319
+#: builtin/describe.c:352
#, c-format
msgid "finished search at %s\n"
msgstr "a pesquisa terminou em %s\n"
-#: builtin/describe.c:346
+#: builtin/describe.c:379
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
@@ -7411,7 +7639,7 @@
"Não é possível usar tags anotadas para descrever '%s'.\n"
"No entanto, é possível com tags não anotadas: tente --tags."
-#: builtin/describe.c:350
+#: builtin/describe.c:383
#, c-format
msgid ""
"No tags can describe '%s'.\n"
@@ -7420,12 +7648,12 @@
"Não é possível usar tags para descrever '%s'.\n"
"Tente --always, ou crie algumas tags."
-#: builtin/describe.c:371
+#: builtin/describe.c:413
#, c-format
msgid "traversed %lu commits\n"
msgstr "%lu commits percorridos\n"
-#: builtin/describe.c:374
+#: builtin/describe.c:416
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
@@ -7434,68 +7662,82 @@
"mais de %i tags encontradas; foram listadas as %i mais recentes\n"
"pesquisa interrompida em %s\n"
-#: builtin/describe.c:396
+#: builtin/describe.c:438
msgid "find the tag that comes after the commit"
msgstr "localizar a tag que vem após o commit"
-#: builtin/describe.c:397
+#: builtin/describe.c:439
msgid "debug search strategy on stderr"
msgstr "depurar a estratégia de procura para stderr"
-#: builtin/describe.c:398
+#: builtin/describe.c:440
msgid "use any ref"
msgstr "usar uma referência qualquer"
-#: builtin/describe.c:399
+#: builtin/describe.c:441
msgid "use any tag, even unannotated"
msgstr "usar uma tag qualquer, mesmo não anotada"
-#: builtin/describe.c:400
+#: builtin/describe.c:442
msgid "always use long format"
msgstr "usar sempre formato longo"
-#: builtin/describe.c:401
+#: builtin/describe.c:443
msgid "only follow first parent"
msgstr "seguir só o primeiro pai"
-#: builtin/describe.c:404
+#: builtin/describe.c:446
msgid "only output exact matches"
msgstr "imprimir apenas correspondências exatas"
-#: builtin/describe.c:406
+#: builtin/describe.c:448
msgid "consider <n> most recent tags (default: 10)"
msgstr "considerar as <n> tags mais recentes (predefinição: 10)"
-#: builtin/describe.c:408
+#: builtin/describe.c:450
msgid "only consider tags matching <pattern>"
msgstr "apenas considerar tags que correspondam ao <padrão>"
-#: builtin/describe.c:410 builtin/name-rev.c:320
+#: builtin/describe.c:452
+msgid "do not consider tags matching <pattern>"
+msgstr "não considerar tags que correspondam ao <padrão>"
+
+#: builtin/describe.c:454 builtin/name-rev.c:357
msgid "show abbreviated commit object as fallback"
msgstr "mostrar objetos de commit abreviados em recurso"
-#: builtin/describe.c:411
+#: builtin/describe.c:455 builtin/describe.c:458
msgid "mark"
msgstr "marca"
-#: builtin/describe.c:412
+#: builtin/describe.c:456
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr ""
"acrescentar <marca> se a árvore de trabalho contiver alterações "
"(predefinição: \"-dirty\")"
-#: builtin/describe.c:430
+#: builtin/describe.c:459
+msgid "append <mark> on broken working tree (default: \"-broken\")"
+msgstr ""
+"acrescentar <marca> no caso de árvore de trabalho quebrada (predefinição: \"-"
+"broken\")"
+
+#: builtin/describe.c:477
msgid "--long is incompatible with --abbrev=0"
msgstr "--long é incompatível com --abbrev=0"
-#: builtin/describe.c:456
+#: builtin/describe.c:506
msgid "No names found, cannot describe anything."
msgstr "Nenhum nome encontrado, não é possível descrever."
-#: builtin/describe.c:476
+#: builtin/describe.c:549
msgid "--dirty is incompatible with commit-ishes"
msgstr "--dirty é incompatível com commits ou semelhantes"
+#: builtin/describe.c:551
+msgid "--broken is incompatible with commit-ishes"
+msgstr "--broken é incompatível com commits ou semelhantes"
+
#: builtin/diff.c:83
#, c-format
msgid "'%s': not a regular file or symlink"
@@ -7534,7 +7776,22 @@
msgid "failed: %d"
msgstr "falha: %d"
-#: builtin/difftool.c:342
+#: builtin/difftool.c:283
+#, c-format
+msgid "could not read symlink %s"
+msgstr "não foi possível ler a ligação simbólica %s"
+
+#: builtin/difftool.c:285
+#, c-format
+msgid "could not read symlink file %s"
+msgstr "não foi possível ler o ficheiro de ligação simbólica %s"
+
+#: builtin/difftool.c:293
+#, c-format
+msgid "could not read object %s for symlink %s"
+msgstr "não foi possível ler o objeto %s da ligação simbólica %s"
+
+#: builtin/difftool.c:395
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
@@ -7542,54 +7799,54 @@
"formatos diff combinado('-c' e '--cc') não são suportados em\n"
"modo diff diretório ('-d' e '--dir-diff')."
-#: builtin/difftool.c:567
+#: builtin/difftool.c:609
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "ambos os ficheiros modificados: '%s' e '%s'."
-#: builtin/difftool.c:569
+#: builtin/difftool.c:611
msgid "working tree file has been left."
msgstr "ficheiro de árvore de trabalho foi deixado."
-#: builtin/difftool.c:580
+#: builtin/difftool.c:622
#, c-format
msgid "temporary files exist in '%s'."
msgstr "existem ficheiros temporários em '%s'."
-#: builtin/difftool.c:581
+#: builtin/difftool.c:623
msgid "you may want to cleanup or recover these."
msgstr "pode querer limpar ou recuperá-los."
-#: builtin/difftool.c:626
+#: builtin/difftool.c:669
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "use 'diff.guitool' em vez de 'diff.tool'"
-#: builtin/difftool.c:628
+#: builtin/difftool.c:671
msgid "perform a full-directory diff"
msgstr "efetuar diff diretório completo"
-#: builtin/difftool.c:630
+#: builtin/difftool.c:673
msgid "do not prompt before launching a diff tool"
msgstr "não perguntar antes de lançar uma ferramenta diff"
-#: builtin/difftool.c:636
+#: builtin/difftool.c:679
msgid "use symlinks in dir-diff mode"
msgstr "usar symlinks no modi dir-diff"
-#: builtin/difftool.c:637
+#: builtin/difftool.c:680
msgid "<tool>"
msgstr "<ferramenta>"
-#: builtin/difftool.c:638
+#: builtin/difftool.c:681
msgid "use the specified diff tool"
msgstr "usar a ferramenta diff especificada"
-#: builtin/difftool.c:640
+#: builtin/difftool.c:683
msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
"imprimir uma lista de ferramentas diff que podem ser usadas com '--tool'"
-#: builtin/difftool.c:643
+#: builtin/difftool.c:686
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
@@ -7597,19 +7854,19 @@
"fazer com que 'git-difftool' termine quando uma ferramenta diff invocada "
"retorna um código de saída não nulo"
-#: builtin/difftool.c:645
+#: builtin/difftool.c:688
msgid "<command>"
msgstr "<comando>"
-#: builtin/difftool.c:646
+#: builtin/difftool.c:689
msgid "specify a custom command for viewing diffs"
msgstr "especificar um comando personalizado para ver diffs"
-#: builtin/difftool.c:670
+#: builtin/difftool.c:713
msgid "no <tool> given for --tool=<tool>"
msgstr "nenhuma <ferramenta> dada a --tool=<ferramenta>"
-#: builtin/difftool.c:677
+#: builtin/difftool.c:720
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "nenhum <cmd> dado a --extcmd=<cmd>"
@@ -7667,7 +7924,8 @@
#: builtin/fetch.c:21
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
-msgstr "git fetch [<opções>] [<repositório> [<especificador-de-referência>...]]"
+msgstr ""
+"git fetch [<opções>] [<repositório> [<especificador-de-referência>...]]"
#: builtin/fetch.c:22
msgid "git fetch [<options>] <group>"
@@ -7715,7 +7973,8 @@
#: builtin/fetch.c:110 builtin/pull.c:188
msgid "prune remote-tracking branches no longer on remote"
-msgstr "eliminar os ramos de monitorização remotos que já não existem no remoto"
+msgstr ""
+"eliminar os ramos de monitorização remotos que já não existem no remoto"
#: builtin/fetch.c:111 builtin/pull.c:191
msgid "on-demand"
@@ -7745,7 +8004,7 @@
msgid "convert to a complete repository"
msgstr "converter num repositório completo"
-#: builtin/fetch.c:131 builtin/log.c:1433
+#: builtin/fetch.c:131 builtin/log.c:1440
msgid "dir"
msgstr "dir"
@@ -7773,73 +8032,73 @@
msgid "Couldn't find remote ref HEAD"
msgstr "Referência remota HEAD não encontrada"
-#: builtin/fetch.c:511
+#: builtin/fetch.c:513
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "a configuração fetch.ouput contém o valor inválido %s"
-#: builtin/fetch.c:604
+#: builtin/fetch.c:606
#, c-format
msgid "object %s not found"
msgstr "objeto %s não encontrado"
-#: builtin/fetch.c:608
+#: builtin/fetch.c:610
msgid "[up to date]"
msgstr "[atualizado]"
-#: builtin/fetch.c:621 builtin/fetch.c:701
+#: builtin/fetch.c:623 builtin/fetch.c:703
msgid "[rejected]"
msgstr "[rejeitado]"
-#: builtin/fetch.c:622
+#: builtin/fetch.c:624
msgid "can't fetch in current branch"
msgstr "não é possível obter no ramo atual"
-#: builtin/fetch.c:631
+#: builtin/fetch.c:633
msgid "[tag update]"
msgstr "[tag atualizada]"
-#: builtin/fetch.c:632 builtin/fetch.c:665 builtin/fetch.c:681
-#: builtin/fetch.c:696
+#: builtin/fetch.c:634 builtin/fetch.c:667 builtin/fetch.c:683
+#: builtin/fetch.c:698
msgid "unable to update local ref"
msgstr "não é possível atualizar a referência local"
-#: builtin/fetch.c:651
+#: builtin/fetch.c:653
msgid "[new tag]"
msgstr "[nova tag]"
-#: builtin/fetch.c:654
+#: builtin/fetch.c:656
msgid "[new branch]"
msgstr "[novo ramo]"
-#: builtin/fetch.c:657
+#: builtin/fetch.c:659
msgid "[new ref]"
msgstr "[nova referência]"
-#: builtin/fetch.c:696
+#: builtin/fetch.c:698
msgid "forced update"
msgstr "atualização forçada"
-#: builtin/fetch.c:701
+#: builtin/fetch.c:703
msgid "non-fast-forward"
msgstr "sem avanço-rápido"
-#: builtin/fetch.c:746
+#: builtin/fetch.c:748
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s não enviou todos os objetos necessários\n"
-#: builtin/fetch.c:766
+#: builtin/fetch.c:768
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "%s rejeitado, porque as raízes rasas não podem ser atualizadas"
-#: builtin/fetch.c:853 builtin/fetch.c:949
+#: builtin/fetch.c:855 builtin/fetch.c:951
#, c-format
msgid "From %.*s\n"
msgstr "De %.*s\n"
-#: builtin/fetch.c:864
+#: builtin/fetch.c:866
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -7848,55 +8107,55 @@
"algumas referências locais não puderam ser atualizadas; tente executar\n"
" 'git remote prune %s' para remover algum ramo antigo em conflito"
-#: builtin/fetch.c:919
+#: builtin/fetch.c:921
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s ficará suspenso)"
-#: builtin/fetch.c:920
+#: builtin/fetch.c:922
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s ficou suspenso)"
-#: builtin/fetch.c:952
+#: builtin/fetch.c:954
msgid "[deleted]"
msgstr "[eliminado]"
-#: builtin/fetch.c:953 builtin/remote.c:1020
+#: builtin/fetch.c:955 builtin/remote.c:1022
msgid "(none)"
msgstr "(nenhum)"
-#: builtin/fetch.c:976
+#: builtin/fetch.c:978
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Obtenção de objetos no ramo atual %s de um repositório não nu recusada"
-#: builtin/fetch.c:995
+#: builtin/fetch.c:997
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "O valor \"%2$s\" da opção \"%1$s\" não é válido em %3$s"
-#: builtin/fetch.c:998
+#: builtin/fetch.c:1000
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Opção \"%s\" ignorada em %s\n"
-#: builtin/fetch.c:1074
+#: builtin/fetch.c:1076
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "Não sei como obter de %s"
-#: builtin/fetch.c:1234
+#: builtin/fetch.c:1236
#, c-format
msgid "Fetching %s\n"
msgstr "A obter de %s\n"
-#: builtin/fetch.c:1236 builtin/remote.c:96
+#: builtin/fetch.c:1238 builtin/remote.c:96
#, c-format
msgid "Could not fetch %s"
msgstr "Não foi possível obter de %s"
-#: builtin/fetch.c:1254
+#: builtin/fetch.c:1256
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -7904,40 +8163,40 @@
"Nenhum repositório remoto especificado. Especifique um URL ou\n"
"o nome remoto a partir do qual as novas revisões devem ser obtidas."
-#: builtin/fetch.c:1277
+#: builtin/fetch.c:1279
msgid "You need to specify a tag name."
msgstr "Deve especificar um nome para a tag."
-#: builtin/fetch.c:1319
+#: builtin/fetch.c:1321
msgid "Negative depth in --deepen is not supported"
msgstr "Não é suportada profundidade negativa em --deepen"
-#: builtin/fetch.c:1321
+#: builtin/fetch.c:1323
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen e --depth são mutuamente exclusivos"
-#: builtin/fetch.c:1326
+#: builtin/fetch.c:1328
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth e --unshallow não podem ser usados juntos"
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1330
msgid "--unshallow on a complete repository does not make sense"
msgstr "usar --unshallow num repositório completo não faz sentido"
-#: builtin/fetch.c:1350
+#: builtin/fetch.c:1352
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all não leva um repositório como argumento"
-#: builtin/fetch.c:1352
+#: builtin/fetch.c:1354
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all não faz sentido com especificadores de referência"
-#: builtin/fetch.c:1363
+#: builtin/fetch.c:1365
#, c-format
msgid "No such remote or remote group: %s"
msgstr "O remoto ou grupo remoto não existe: %s"
-#: builtin/fetch.c:1371
+#: builtin/fetch.c:1373
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Não faz sentido obter um grupo e especificar uma referência"
@@ -7945,7 +8204,8 @@
msgid ""
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr ""
-"git fmt-merge-msg [-m <mensagem>] [--log[=<n>] | --no-log] [--file <ficheiro>]"
+"git fmt-merge-msg [-m <mensagem>] [--log[=<n>] | --no-log] [--file "
+"<ficheiro>]"
#: builtin/fmt-merge-msg.c:663
msgid "populate log with at most <n> entries from shortlog"
@@ -7976,12 +8236,12 @@
msgstr "git for-each-ref [--points-at <objeto>]"
#: builtin/for-each-ref.c:11
-msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"
-msgstr "git for-each-ref [(--merged | --no-merged) [<objeto>]]"
+msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
+msgstr "git for-each-ref [(--merged | --no-merged) [<commit>]]"
#: builtin/for-each-ref.c:12
-msgid "git for-each-ref [--contains [<object>]]"
-msgstr "git for-each-ref [--contains [<objeto>]]"
+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
msgid "quote placeholders suitably for shells"
@@ -8006,10 +8266,6 @@
msgid "show only <n> matched refs"
msgstr "mostrar apenas <n> referências correspondidas"
-#: builtin/for-each-ref.c:37 builtin/tag.c:387 builtin/verify-tag.c:38
-msgid "format to use for the output"
-msgstr "formato a usar na saída"
-
#: builtin/for-each-ref.c:41
msgid "print only refs which points at the given object"
msgstr "imprimir apenas referências que apontem para o objeto fornecido"
@@ -8026,6 +8282,10 @@
msgid "print only refs which contain the commit"
msgstr "imprimir apenas referências que contenham o commit"
+#: builtin/for-each-ref.c:46
+msgid "print only refs which don't contain the commit"
+msgstr "imprimir apenas referências que não contenham o commit"
+
#: builtin/fsck.c:554
msgid "Checking object directories"
msgstr "A verificar diretórios de objetos"
@@ -8090,17 +8350,17 @@
msgid "git gc [<options>]"
msgstr "git gc [<opções>]"
-#: builtin/gc.c:72
+#: builtin/gc.c:78
#, c-format
-msgid "Invalid %s: '%s'"
-msgstr "Inválido %s: '%s'"
+msgid "Failed to fstat %s: %s"
+msgstr "falha ao invocar fstat sobre %s: %s"
-#: builtin/gc.c:139
+#: builtin/gc.c:306
#, c-format
-msgid "insanely long object directory %.*s"
-msgstr "diretório de objetos demasiado longo %.*s"
+msgid "Can't stat %s"
+msgstr "não é possível invocar stat sobre %s"
-#: builtin/gc.c:297
+#: builtin/gc.c:315
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@ -8115,40 +8375,45 @@
"\n"
"%s"
-#: builtin/gc.c:334
+#: builtin/gc.c:354
msgid "prune unreferenced objects"
msgstr "eliminar ficheiros não referenciados"
-#: builtin/gc.c:336
+#: builtin/gc.c:356
msgid "be more thorough (increased runtime)"
msgstr "ser mais minucioso (aumenta o tempo de execução)"
-#: builtin/gc.c:337
+#: builtin/gc.c:357
msgid "enable auto-gc mode"
msgstr "ativar modo auto-gc"
-#: builtin/gc.c:338
+#: builtin/gc.c:358
msgid "force running gc even if there may be another gc running"
msgstr "forçar a execução do gc mesmo que haja outro gc a executar"
-#: builtin/gc.c:380
+#: builtin/gc.c:375
+#, c-format
+msgid "Failed to parse gc.logexpiry value %s"
+msgstr "falha ao analisar o valor %s de gc.logexpiry"
+
+#: builtin/gc.c:403
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
"A autocompactar o repositório em segundo plano para obter um melhor "
"desempenho.\n"
-#: builtin/gc.c:382
+#: builtin/gc.c:405
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "A autocompactar o repositório para obter um melhor desempenho.\n"
-#: builtin/gc.c:383
+#: builtin/gc.c:406
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "Consulte \"git help gc\" para ler sobre manutenção manual.\n"
-#: builtin/gc.c:404
+#: builtin/gc.c:427
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -8156,7 +8421,7 @@
"gc já a executar na máquina '%s' pid %<PRIuMAX> (use --force se não for o "
"caso)"
-#: builtin/gc.c:448
+#: builtin/gc.c:471
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
@@ -8177,239 +8442,245 @@
msgid "invalid number of threads specified (%d) for %s"
msgstr "o número de threads especificado em %2$s é inválido (%1$d)"
-#: builtin/grep.c:763 builtin/grep.c:804
+#: builtin/grep.c:769 builtin/grep.c:810
#, c-format
msgid "unable to read tree (%s)"
msgstr "não foi possível ler a árvore (%s)"
-#: builtin/grep.c:823
+#: builtin/grep.c:829
#, c-format
msgid "unable to grep from object of type %s"
msgstr "não foi possível efetuar grep de objetos do tipo %s"
-#: builtin/grep.c:887
+#: builtin/grep.c:893
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "a opção '%c' espera um valor numérico"
-#: builtin/grep.c:973
+#: builtin/grep.c:980
msgid "search in index instead of in the work tree"
msgstr "procurar no índice em vez de procurar na árvore de trabalho"
-#: builtin/grep.c:975
+#: builtin/grep.c:982
msgid "find in contents not managed by git"
msgstr "procurar em conteúdos não geridos pelo git"
-#: builtin/grep.c:977
+#: builtin/grep.c:984
msgid "search in both tracked and untracked files"
msgstr "procurar em ficheiros controlados e não controlados"
-#: builtin/grep.c:979
+#: builtin/grep.c:986
msgid "ignore files specified via '.gitignore'"
msgstr "ignorar ficheiros especificados via '.gitignore'"
-#: builtin/grep.c:981
-msgid "recursivley search in each submodule"
+#: builtin/grep.c:988
+msgid "recursively search in each submodule"
msgstr "procurar recursivamente em cada submódulo"
-#: builtin/grep.c:983
+#: builtin/grep.c:990
msgid "basename"
msgstr "nomebase"
-#: builtin/grep.c:984
+#: builtin/grep.c:991
msgid "prepend parent project's basename to output"
msgstr "preceder o nomebase do projeto pai na saída"
-#: builtin/grep.c:987
+#: builtin/grep.c:994
msgid "show non-matching lines"
msgstr "mostrar linhas não correspondidas"
-#: builtin/grep.c:989
+#: builtin/grep.c:996
msgid "case insensitive matching"
msgstr "não diferenciar maiúsculas de minúsculas"
-#: builtin/grep.c:991
+#: builtin/grep.c:998
msgid "match patterns only at word boundaries"
msgstr "corresponder padrões apenas a palavras"
-#: builtin/grep.c:993
+#: builtin/grep.c:1000
msgid "process binary files as text"
msgstr "processar ficheiros binários como texto"
-#: builtin/grep.c:995
+#: builtin/grep.c:1002
msgid "don't match patterns in binary files"
msgstr "ignorar ficheiros binários"
-#: builtin/grep.c:998
+#: builtin/grep.c:1005
msgid "process binary files with textconv filters"
msgstr "processar ficheiros binários com filtros textconv"
-#: builtin/grep.c:1000
+#: builtin/grep.c:1007
msgid "descend at most <depth> levels"
msgstr "descer no máximo até <profundidade>"
-#: builtin/grep.c:1004
+#: builtin/grep.c:1011
msgid "use extended POSIX regular expressions"
msgstr "usar expressões regulares estendidas do POSIX"
-#: builtin/grep.c:1007
+#: builtin/grep.c:1014
msgid "use basic POSIX regular expressions (default)"
msgstr "usar expressões regulares básicas do POSIX (predefinição)"
-#: builtin/grep.c:1010
+#: builtin/grep.c:1017
msgid "interpret patterns as fixed strings"
msgstr "interpretar padrões como cadeias de caracteres fixas"
-#: builtin/grep.c:1013
+#: builtin/grep.c:1020
msgid "use Perl-compatible regular expressions"
msgstr "usar expressões regulares compatíveis com Perl"
-#: builtin/grep.c:1016
+#: builtin/grep.c:1023
msgid "show line numbers"
msgstr "mostrar números de linha"
-#: builtin/grep.c:1017
+#: builtin/grep.c:1024
msgid "don't show filenames"
msgstr "não mostrar nomes de ficheiro"
-#: builtin/grep.c:1018
+#: builtin/grep.c:1025
msgid "show filenames"
msgstr "mostrar nomes de ficheiro"
-#: builtin/grep.c:1020
+#: builtin/grep.c:1027
msgid "show filenames relative to top directory"
msgstr "mostrar nomes de ficheiro relativamente ao diretório superior"
-#: builtin/grep.c:1022
+#: builtin/grep.c:1029
msgid "show only filenames instead of matching lines"
msgstr "mostrar apenas nomes de ficheiro em vez de linhas correspondidas"
-#: builtin/grep.c:1024
+#: builtin/grep.c:1031
msgid "synonym for --files-with-matches"
msgstr "sinónimo de --files-with-matches"
-#: builtin/grep.c:1027
+#: builtin/grep.c:1034
msgid "show only the names of files without match"
msgstr "mostrar apenas nomes de ficheiro sem correspondência"
-#: builtin/grep.c:1029
+#: builtin/grep.c:1036
msgid "print NUL after filenames"
msgstr "imprimir NUL depois dos nomes de ficheiro"
-#: builtin/grep.c:1031
+#: builtin/grep.c:1038
msgid "show the number of matches instead of matching lines"
msgstr "mostrar o número de correspondências em vez das linha correspondidas"
-#: builtin/grep.c:1032
+#: builtin/grep.c:1039
msgid "highlight matches"
msgstr "realçar correspondências"
-#: builtin/grep.c:1034
+#: builtin/grep.c:1041
msgid "print empty line between matches from different files"
msgstr ""
"imprimir uma linha em branco entre correspondências de diferentes ficheiros"
-#: builtin/grep.c:1036
+#: builtin/grep.c:1043
msgid "show filename only once above matches from same file"
msgstr ""
"mostrar só uma vez o nome do ficheiro acima das correspondências dentro do "
"mesmo ficheiro"
-#: builtin/grep.c:1039
+#: builtin/grep.c:1046
msgid "show <n> context lines before and after matches"
msgstr "mostrar <n> linhas de contexto antes e depois das correspondências"
-#: builtin/grep.c:1042
+#: builtin/grep.c:1049
msgid "show <n> context lines before matches"
msgstr "mostrar <n> linhas de contexto antes das correspondências"
-#: builtin/grep.c:1044
+#: builtin/grep.c:1051
msgid "show <n> context lines after matches"
msgstr "mostrar <n> linhas de contexto depois das correspondências"
-#: builtin/grep.c:1046
+#: builtin/grep.c:1053
msgid "use <n> worker threads"
msgstr "usar <n> threads de trabalho"
-#: builtin/grep.c:1047
+#: builtin/grep.c:1054
msgid "shortcut for -C NUM"
msgstr "atalho para -C NUM"
-#: builtin/grep.c:1050
+#: builtin/grep.c:1057
msgid "show a line with the function name before matches"
msgstr "mostrar uma linha com o nome da função antes das correspondências"
-#: builtin/grep.c:1052
+#: builtin/grep.c:1059
msgid "show the surrounding function"
msgstr "mostrar a função circundante"
-#: builtin/grep.c:1055
+#: builtin/grep.c:1062
msgid "read patterns from file"
msgstr "ler padrões do ficheiro"
-#: builtin/grep.c:1057
+#: builtin/grep.c:1064
msgid "match <pattern>"
msgstr "procurar <padrão>"
-#: builtin/grep.c:1059
+#: builtin/grep.c:1066
msgid "combine patterns specified with -e"
msgstr "combinar padrões especificados com -e"
-#: builtin/grep.c:1071
+#: builtin/grep.c:1078
msgid "indicate hit with exit status without output"
msgstr "indicar padrão encontrado no valor de saída, mas não imprimir"
-#: builtin/grep.c:1073
+#: builtin/grep.c:1080
msgid "show only matches from files that match all patterns"
-msgstr "mostrar apenas correspondências de ficheiro que tenham todos os padrões"
+msgstr ""
+"mostrar apenas correspondências de ficheiro que tenham todos os padrões"
-#: builtin/grep.c:1075
+#: builtin/grep.c:1082
msgid "show parse tree for grep expression"
msgstr "mostrar árvore de analise da expressões grep"
-#: builtin/grep.c:1079
+#: builtin/grep.c:1086
msgid "pager"
msgstr "paginador"
-#: builtin/grep.c:1079
+#: builtin/grep.c:1086
msgid "show matching files in the pager"
msgstr "mostrar ficheiros com correspondências no paginador"
-#: builtin/grep.c:1082
+#: builtin/grep.c:1089
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "permitir invocar grep(1) (ignorado nesta compilação)"
-#: builtin/grep.c:1146
+#: builtin/grep.c:1153
msgid "no pattern given."
msgstr "nenhum padrão fornecido."
-#: builtin/grep.c:1178 builtin/index-pack.c:1482
+#: builtin/grep.c:1189
+msgid "--no-index or --untracked cannot be used with revs"
+msgstr "--no-index ou --untracked não podem ser usados em revisões"
+
+#: builtin/grep.c:1195
+#, c-format
+msgid "unable to resolve revision: %s"
+msgstr "não foi possível resolver revisão: %s"
+
+#: builtin/grep.c:1228 builtin/index-pack.c:1485
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "número de threads especificado inválido (%d)"
-#: builtin/grep.c:1215
+#: builtin/grep.c:1251
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager só funciona na árvore de trabalho"
-#: builtin/grep.c:1238
+#: builtin/grep.c:1274
msgid "option not supported with --recurse-submodules."
msgstr "opção não suportada com --recurse-submodules."
-#: builtin/grep.c:1244
+#: builtin/grep.c:1280
msgid "--cached or --untracked cannot be used with --no-index."
msgstr "--cached ou --untracked não podem ser usados com --no-index."
-#: builtin/grep.c:1249
-msgid "--no-index or --untracked cannot be used with revs."
-msgstr "--no-index ou --untracked não podem ser usados em revisões."
-
-#: builtin/grep.c:1252
+#: builtin/grep.c:1286
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr ""
"--[no-]exclude-standard não podem ser usados em conteúdos não controlados."
-#: builtin/grep.c:1260
+#: builtin/grep.c:1294
msgid "both --cached and trees are given."
msgstr "--cached e árvores foram fornecidos simultaneamente."
@@ -8418,8 +8689,8 @@
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
msgstr ""
-"git hash-object [-t <tipo>] [-w] [--path=<ficheiro> | --no-filters] [--stdin] "
-"[--] <ficheiro>..."
+"git hash-object [-t <tipo>] [-w] [--path=<ficheiro> | --no-filters] [--"
+"stdin] [--] <ficheiro>..."
#: builtin/hash-object.c:82
msgid "git hash-object --stdin-paths"
@@ -8446,9 +8717,11 @@
msgstr "guardar o ficheiro tal como está, sem filtros"
#: builtin/hash-object.c:100
-msgid "just hash any random garbage to create corrupt objects for debugging Git"
+msgid ""
+"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
-"obter hash de lixo aleatório para criar objetos corrompidos para depurar o Git"
+"obter hash de lixo aleatório para criar objetos corrompidos para depurar o "
+"Git"
#: builtin/hash-object.c:101
msgid "process file as it were from this path"
@@ -8635,240 +8908,245 @@
msgid "unable to create '%s'"
msgstr "não foi possível criar '%s'"
-#: builtin/index-pack.c:322
+#: builtin/index-pack.c:323
#, c-format
msgid "cannot open packfile '%s'"
msgstr "não é possível abrir o ficheiro de pacote '%s'"
-#: builtin/index-pack.c:336
+#: builtin/index-pack.c:337
msgid "pack signature mismatch"
msgstr "a assinatura do pacote não corresponde"
-#: builtin/index-pack.c:338
+#: builtin/index-pack.c:339
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "versão de pacote %<PRIu32> não suportada"
-#: builtin/index-pack.c:356
+#: builtin/index-pack.c:357
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "pacote com objeto incorreto no offset %<PRIuMAX>: %s"
-#: builtin/index-pack.c:478
+#: builtin/index-pack.c:479
#, c-format
msgid "inflate returned %d"
msgstr "a descompactação retornou %d"
-#: builtin/index-pack.c:527
+#: builtin/index-pack.c:528
msgid "offset value overflow for delta base object"
msgstr "delta de objeto base com capacidade excedida no valor de offset"
-#: builtin/index-pack.c:535
+#: builtin/index-pack.c:536
msgid "delta base offset is out of bound"
msgstr "offset da base delta está fora do limite"
-#: builtin/index-pack.c:543
+#: builtin/index-pack.c:544
#, c-format
msgid "unknown object type %d"
msgstr "objeto de tipo desconhecido %d"
-#: builtin/index-pack.c:574
+#: builtin/index-pack.c:575
msgid "cannot pread pack file"
msgstr "não é possível invocar pread sobre o ficheiro de pacote"
-#: builtin/index-pack.c:576
+#: builtin/index-pack.c:577
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "fim prematuro de ficheiro de pacote, falta %<PRIuMAX> byte"
msgstr[1] "fim prematuro de ficheiro de pacote, faltam %<PRIuMAX> bytes"
-#: builtin/index-pack.c:602
+#: builtin/index-pack.c:603
msgid "serious inflate inconsistency"
msgstr "inconsistência de descompactação grave"
-#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
-#: builtin/index-pack.c:813 builtin/index-pack.c:822
+#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
+#: builtin/index-pack.c:816 builtin/index-pack.c:825
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "COLISÃO DE SHA1 COM %s ENCONTRADA!"
-#: builtin/index-pack.c:751 builtin/pack-objects.c:164
-#: builtin/pack-objects.c:256
+#: builtin/index-pack.c:752 builtin/pack-objects.c:164
+#: builtin/pack-objects.c:257
#, c-format
msgid "unable to read %s"
msgstr "não foi possível ler %s"
-#: builtin/index-pack.c:819
+#: builtin/index-pack.c:814
+#, c-format
+msgid "cannot read existing object info %s"
+msgstr "não é possível ler informação de objeto existente %s"
+
+#: builtin/index-pack.c:822
#, c-format
msgid "cannot read existing object %s"
msgstr "não é possível ler o objeto existente %s"
-#: builtin/index-pack.c:833
+#: builtin/index-pack.c:836
#, c-format
msgid "invalid blob object %s"
msgstr "objeto blob inválido %s"
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:850
#, c-format
msgid "invalid %s"
msgstr "inválido %s"
-#: builtin/index-pack.c:850
+#: builtin/index-pack.c:853
msgid "Error in object"
msgstr "Erro no objeto"
-#: builtin/index-pack.c:852
+#: builtin/index-pack.c:855
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Nem todos os objetos filhos de %s são alcançáveis"
-#: builtin/index-pack.c:924 builtin/index-pack.c:955
+#: builtin/index-pack.c:927 builtin/index-pack.c:958
msgid "failed to apply delta"
msgstr "falha ao aplicar delta"
-#: builtin/index-pack.c:1125
+#: builtin/index-pack.c:1128
msgid "Receiving objects"
msgstr "A receber objetos"
-#: builtin/index-pack.c:1125
+#: builtin/index-pack.c:1128
msgid "Indexing objects"
msgstr "A indexar objetos"
-#: builtin/index-pack.c:1157
+#: builtin/index-pack.c:1160
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "pacote corrompido (SHA1 não corresponde)"
-#: builtin/index-pack.c:1162
+#: builtin/index-pack.c:1165
msgid "cannot fstat packfile"
msgstr "não é possível invocar fstat sobre o ficheiro de pacote"
-#: builtin/index-pack.c:1165
+#: builtin/index-pack.c:1168
msgid "pack has junk at the end"
msgstr "pacote com lixo no final"
-#: builtin/index-pack.c:1176
+#: builtin/index-pack.c:1179
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "extrema confusão em parse_pack_objects()"
-#: builtin/index-pack.c:1199
+#: builtin/index-pack.c:1202
msgid "Resolving deltas"
msgstr "A resolver deltas"
-#: builtin/index-pack.c:1210
+#: builtin/index-pack.c:1213
#, c-format
msgid "unable to create thread: %s"
msgstr "não foi possível criar thread: %s"
-#: builtin/index-pack.c:1252
+#: builtin/index-pack.c:1255
msgid "confusion beyond insanity"
msgstr "extrema confusão"
-#: builtin/index-pack.c:1258
+#: builtin/index-pack.c:1261
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "concluído com %d objeto local"
msgstr[1] "concluído com %d objetos locais"
-#: builtin/index-pack.c:1270
+#: builtin/index-pack.c:1273
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Soma de verificação inesperada no final de %s (corrupção no disco?)"
-#: builtin/index-pack.c:1274
+#: builtin/index-pack.c:1277
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "pacote com %d delta não resolvido"
msgstr[1] "pacote com %d deltas não resolvidos"
-#: builtin/index-pack.c:1298
+#: builtin/index-pack.c:1301
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "não é possível compactar objeto acrescentado (%d)"
-#: builtin/index-pack.c:1374
+#: builtin/index-pack.c:1377
#, c-format
msgid "local object %s is corrupt"
msgstr "objeto local %s corrompido"
-#: builtin/index-pack.c:1398
+#: builtin/index-pack.c:1403
msgid "error while closing pack file"
msgstr "erro ao fechar ficheiro de pacote"
-#: builtin/index-pack.c:1411
+#: builtin/index-pack.c:1415
#, c-format
msgid "cannot write keep file '%s'"
msgstr "não é possível escrever o ficheiro de conservação '%s'"
-#: builtin/index-pack.c:1419
+#: builtin/index-pack.c:1423
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "não é possível fechar o ficheiro de conservação '%s' escrito"
-#: builtin/index-pack.c:1432
+#: builtin/index-pack.c:1433
msgid "cannot store pack file"
msgstr "não é possível guardar ficheiro de pacote"
-#: builtin/index-pack.c:1443
+#: builtin/index-pack.c:1441
msgid "cannot store index file"
msgstr "não é possível guardar o ficheiro índice"
-#: builtin/index-pack.c:1476
+#: builtin/index-pack.c:1479
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "pack.indexversion=%<PRIu32> incorreto"
-#: builtin/index-pack.c:1486 builtin/index-pack.c:1683
+#: builtin/index-pack.c:1489 builtin/index-pack.c:1686
#, c-format
msgid "no threads support, ignoring %s"
msgstr "sem suporte de threads, %s ignorado"
-#: builtin/index-pack.c:1544
+#: builtin/index-pack.c:1547
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Não é possível abrir o ficheiro de pacote '%s' existente"
-#: builtin/index-pack.c:1546
+#: builtin/index-pack.c:1549
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Não é possível abrir o ficheiro de índice do pacote existente de '%s'"
-#: builtin/index-pack.c:1593
+#: builtin/index-pack.c:1596
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "%d objeto não delta"
msgstr[1] "%d objetos não delta"
-#: builtin/index-pack.c:1600
+#: builtin/index-pack.c:1603
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "comprimento de cadeia = %d: %lu objeto"
msgstr[1] "comprimento de cadeia = %d: %lu objetos"
-#: builtin/index-pack.c:1613
+#: builtin/index-pack.c:1616
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "o nome do ficheiro de pacote '%s' não termina em '.pack'"
-#: builtin/index-pack.c:1695 builtin/index-pack.c:1698 builtin/index-pack.c:1714
-#: builtin/index-pack.c:1718
+#: builtin/index-pack.c:1698 builtin/index-pack.c:1701
+#: builtin/index-pack.c:1717 builtin/index-pack.c:1721
#, c-format
msgid "bad %s"
msgstr "%s incorreto"
-#: builtin/index-pack.c:1734
+#: builtin/index-pack.c:1737
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin não pode ser usado sem --stdin"
-#: builtin/index-pack.c:1736
+#: builtin/index-pack.c:1739
msgid "--stdin requires a git repository"
msgstr "--stdin requer um repositório git"
-#: builtin/index-pack.c:1744
+#: builtin/index-pack.c:1747
msgid "--verify with no packfile name given"
msgstr "--verify sem nome do ficheiro de pacote indicado"
@@ -9029,104 +9307,104 @@
msgid "git show [<options>] <object>..."
msgstr "git show [<opções>] <objeto>..."
-#: builtin/log.c:84
+#: builtin/log.c:89
#, c-format
msgid "invalid --decorate option: %s"
msgstr "opção --decorate inválida: %s"
-#: builtin/log.c:139
+#: builtin/log.c:144
msgid "suppress diff output"
msgstr "suprimir saída do diff"
-#: builtin/log.c:140
+#: builtin/log.c:145
msgid "show source"
msgstr "mostrar origem"
-#: builtin/log.c:141
+#: builtin/log.c:146
msgid "Use mail map file"
msgstr "usar ficheiro de mapeamento de correio"
-#: builtin/log.c:142
+#: builtin/log.c:147
msgid "decorate options"
msgstr "opções de decoração"
-#: builtin/log.c:145
+#: builtin/log.c:150
msgid "Process line range n,m in file, counting from 1"
msgstr "processar intervalo de linhas n,m, a contar a partir de 1"
-#: builtin/log.c:241
+#: builtin/log.c:246
#, c-format
msgid "Final output: %d %s\n"
msgstr "Resultado final: %d %s\n"
-#: builtin/log.c:486
+#: builtin/log.c:493
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: ficheiro incorreto"
-#: builtin/log.c:500 builtin/log.c:594
+#: builtin/log.c:507 builtin/log.c:601
#, c-format
msgid "Could not read object %s"
msgstr "Não foi possível ler o objeto %s"
-#: builtin/log.c:618
+#: builtin/log.c:625
#, c-format
msgid "Unknown type: %d"
msgstr "Tipo desconhecido: %d"
-#: builtin/log.c:739
+#: builtin/log.c:746
msgid "format.headers without value"
msgstr "format.headers sem valor"
-#: builtin/log.c:839
+#: builtin/log.c:846
msgid "name of output directory is too long"
msgstr "o nome do diretório de saída é demasiado longo"
-#: builtin/log.c:854
+#: builtin/log.c:861
#, c-format
msgid "Cannot open patch file %s"
msgstr "Não é possível abrir o ficheiro de patch %s"
-#: builtin/log.c:868
+#: builtin/log.c:875
msgid "Need exactly one range."
msgstr "É necessário exatamente um intervalo."
-#: builtin/log.c:878
+#: builtin/log.c:885
msgid "Not a range."
msgstr "Não é um intervalo."
-#: builtin/log.c:984
+#: builtin/log.c:991
msgid "Cover letter needs email format"
msgstr "A carta de apresentação precisa de um formato de e-mail"
-#: builtin/log.c:1063
+#: builtin/log.c:1071
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to incorreto: %s"
-#: builtin/log.c:1091
+#: builtin/log.c:1098
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<opções>] [<desde> | <intervalo-de-revisões>]"
-#: builtin/log.c:1141
+#: builtin/log.c:1148
msgid "Two output directories?"
msgstr "Dois diretórios de saída?"
-#: builtin/log.c:1248 builtin/log.c:1891 builtin/log.c:1893 builtin/log.c:1905
+#: builtin/log.c:1255 builtin/log.c:1898 builtin/log.c:1900 builtin/log.c:1912
#, c-format
msgid "Unknown commit %s"
msgstr "Commit desconhecido %s"
-#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:476
+#: builtin/log.c:1265 builtin/notes.c:883 builtin/tag.c:532
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Falha ao resolver '%s' numa referência válida."
-#: builtin/log.c:1263
+#: builtin/log.c:1270
msgid "Could not find exact merge base."
msgstr "Não foi possível encontrar a base exata de integração."
-#: builtin/log.c:1267
+#: builtin/log.c:1274
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"
@@ -9137,217 +9415,217 @@
"use branch --set-upstream-to para seguir um ramo remoto.\n"
"Ou pode especificar o commit base com --base=<base-commit-id> manualmente."
-#: builtin/log.c:1287
+#: builtin/log.c:1294
msgid "Failed to find exact merge base"
msgstr "Falha ao procurar base exata de integração"
-#: builtin/log.c:1298
+#: builtin/log.c:1305
msgid "base commit should be the ancestor of revision list"
msgstr "o commit base deve ser o antecessor da lista de revisões"
-#: builtin/log.c:1302
+#: builtin/log.c:1309
msgid "base commit shouldn't be in revision list"
msgstr "o commit base não deve fazer parte da lista de revisões"
-#: builtin/log.c:1351
+#: builtin/log.c:1358
msgid "cannot get patch id"
msgstr "não é possível obter o id do patch"
-#: builtin/log.c:1408
+#: builtin/log.c:1415
msgid "use [PATCH n/m] even with a single patch"
msgstr "usar [PATCH n/m] mesmo com um único patch"
-#: builtin/log.c:1411
+#: builtin/log.c:1418
msgid "use [PATCH] even with multiple patches"
msgstr "usar [PATCH] mesmo com múltiplos patches"
-#: builtin/log.c:1415
+#: builtin/log.c:1422
msgid "print patches to standard out"
msgstr "imprimir patches para a saída padrão"
-#: builtin/log.c:1417
+#: builtin/log.c:1424
msgid "generate a cover letter"
msgstr "gerar uma carta de apresentação"
-#: builtin/log.c:1419
+#: builtin/log.c:1426
msgid "use simple number sequence for output file names"
msgstr ""
"usar uma sequência de números simples para denominar os ficheiros gerados"
-#: builtin/log.c:1420
+#: builtin/log.c:1427
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1421
+#: builtin/log.c:1428
msgid "use <sfx> instead of '.patch'"
msgstr "usar <sfx> em vez de '.patch'"
-#: builtin/log.c:1423
+#: builtin/log.c:1430
msgid "start numbering patches at <n> instead of 1"
msgstr "começar a numerar os patches em <n> em vez de 1"
-#: builtin/log.c:1425
+#: builtin/log.c:1432
msgid "mark the series as Nth re-roll"
msgstr "marcar a série como a n-ésima reiteração"
-#: builtin/log.c:1427
+#: builtin/log.c:1434
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "Usar [RFC PATCH] em vez de [PATCH]"
-#: builtin/log.c:1430
+#: builtin/log.c:1437
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "usar [<prefixo>] em vez de [PATCH]"
-#: builtin/log.c:1433
+#: builtin/log.c:1440
msgid "store resulting files in <dir>"
msgstr "guardar os ficheiros resultantes em <dir>"
-#: builtin/log.c:1436
+#: builtin/log.c:1443
msgid "don't strip/add [PATCH]"
msgstr "não tirar/inserir [PATCH]"
-#: builtin/log.c:1439
+#: builtin/log.c:1446
msgid "don't output binary diffs"
msgstr "não gerar diffs binários"
-#: builtin/log.c:1441
+#: builtin/log.c:1448
msgid "output all-zero hash in From header"
msgstr "preencher o cabeçalho From com hash de zeros"
-#: builtin/log.c:1443
+#: builtin/log.c:1450
msgid "don't include a patch matching a commit upstream"
msgstr "não incluir um patch que coincida com um commit a montante"
-#: builtin/log.c:1445
+#: builtin/log.c:1452
msgid "show patch format instead of default (patch + stat)"
msgstr ""
"mostrar no formato de patch em vez de no formato por omissão (patch + stat)"
-#: builtin/log.c:1447
+#: builtin/log.c:1454
msgid "Messaging"
msgstr "Mensagem"
-#: builtin/log.c:1448
+#: builtin/log.c:1455
msgid "header"
msgstr "cabeçalho"
-#: builtin/log.c:1449
+#: builtin/log.c:1456
msgid "add email header"
msgstr "adicionar cabeçalho de e-mail"
-#: builtin/log.c:1450 builtin/log.c:1452
+#: builtin/log.c:1457 builtin/log.c:1459
msgid "email"
msgstr "e-mail"
-#: builtin/log.c:1450
+#: builtin/log.c:1457
msgid "add To: header"
msgstr "adicionar cabeçalho To:"
-#: builtin/log.c:1452
+#: builtin/log.c:1459
msgid "add Cc: header"
msgstr "adicionar cabeçalho Cc:"
-#: builtin/log.c:1454
+#: builtin/log.c:1461
msgid "ident"
msgstr "identidade"
-#: builtin/log.c:1455
+#: builtin/log.c:1462
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
-"definir o endereço From como <identidade> (ou como identidade do committer se "
-"não indicado)"
+"definir o endereço From como <identidade> (ou como identidade do committer "
+"se não indicado)"
-#: builtin/log.c:1457
+#: builtin/log.c:1464
msgid "message-id"
msgstr "id-mensagem"
-#: builtin/log.c:1458
+#: builtin/log.c:1465
msgid "make first mail a reply to <message-id>"
msgstr "usar o primeiro email para responder a <id-mensagem>"
-#: builtin/log.c:1459 builtin/log.c:1462
+#: builtin/log.c:1466 builtin/log.c:1469
msgid "boundary"
msgstr "limite"
-#: builtin/log.c:1460
+#: builtin/log.c:1467
msgid "attach the patch"
msgstr "anexar o patch"
-#: builtin/log.c:1463
+#: builtin/log.c:1470
msgid "inline the patch"
msgstr "incorporar o patch"
-#: builtin/log.c:1467
+#: builtin/log.c:1474
msgid "enable message threading, styles: shallow, deep"
msgstr "ativar mensagens por tópicos, estilos: shallow (raso), deep (profundo)"
-#: builtin/log.c:1469
+#: builtin/log.c:1476
msgid "signature"
msgstr "assinatura"
-#: builtin/log.c:1470
+#: builtin/log.c:1477
msgid "add a signature"
msgstr "adicionar uma assinatura"
-#: builtin/log.c:1471
+#: builtin/log.c:1478
msgid "base-commit"
msgstr "commit-base"
-#: builtin/log.c:1472
+#: builtin/log.c:1479
msgid "add prerequisite tree info to the patch series"
msgstr "adicionar informação pré-requisito da árvore à série de patches"
-#: builtin/log.c:1474
+#: builtin/log.c:1481
msgid "add a signature from a file"
msgstr "adicionar uma assinatura de um ficheiro"
-#: builtin/log.c:1475
+#: builtin/log.c:1482
msgid "don't print the patch filenames"
msgstr "não imprimir os nomes dos ficheiros de patch"
-#: builtin/log.c:1565
+#: builtin/log.c:1572
msgid "-n and -k are mutually exclusive."
msgstr "-n e -k são mutuamente exclusivos."
-#: builtin/log.c:1567
+#: builtin/log.c:1574
msgid "--subject-prefix/--rfc and -k are mutually exclusive."
msgstr "--subject-prefix/--rfc e -k são mutuamente exclusivos."
-#: builtin/log.c:1575
+#: builtin/log.c:1582
msgid "--name-only does not make sense"
msgstr "--name-only não faz sentido"
-#: builtin/log.c:1577
+#: builtin/log.c:1584
msgid "--name-status does not make sense"
msgstr "--name-status não faz sentido"
-#: builtin/log.c:1579
+#: builtin/log.c:1586
msgid "--check does not make sense"
msgstr "--check não faz sentido"
-#: builtin/log.c:1609
+#: builtin/log.c:1616
msgid "standard output, or directory, which one?"
msgstr "saída padrão, ou diretório, qual deles?"
-#: builtin/log.c:1611
+#: builtin/log.c:1618
#, c-format
msgid "Could not create directory '%s'"
msgstr "Não foi possível criar o diretório '%s'"
-#: builtin/log.c:1705
+#: builtin/log.c:1712
#, c-format
msgid "unable to read signature file '%s'"
msgstr "não é possível ler o ficheiro de assinatura '%s'"
-#: builtin/log.c:1777
+#: builtin/log.c:1784
msgid "Failed to create output files"
msgstr "Falha ao criar os ficheiros de saída"
-#: builtin/log.c:1826
+#: builtin/log.c:1833
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<ramo-a-montante> [<head> [<limite>]]]"
-#: builtin/log.c:1880
+#: builtin/log.c:1887
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -9355,106 +9633,107 @@
"O ramo remoto seguido não foi encontrado, especifique <ramo-a-montante> "
"manualmente.\n"
-#: builtin/ls-files.c:460
+#: builtin/ls-files.c:461
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<opções>] [<ficheiro>...]"
-#: builtin/ls-files.c:509
+#: builtin/ls-files.c:510
msgid "identify the file status with tags"
msgstr "identificar o estado do ficheiro com tags"
-#: builtin/ls-files.c:511
+#: builtin/ls-files.c:512
msgid "use lowercase letters for 'assume unchanged' files"
msgstr ""
"usar letras minúsculas para ficheiros 'assumido não alterado' ('assume "
"unchanged')"
-#: builtin/ls-files.c:513
+#: builtin/ls-files.c:514
msgid "show cached files in the output (default)"
msgstr "mostrar ficheiros em cache na saída (predefinição)"
-#: builtin/ls-files.c:515
+#: builtin/ls-files.c:516
msgid "show deleted files in the output"
msgstr "mostrar ficheiros eliminados na saída"
-#: builtin/ls-files.c:517
+#: builtin/ls-files.c:518
msgid "show modified files in the output"
msgstr "mostrar ficheiros modificados na saída"
-#: builtin/ls-files.c:519
+#: builtin/ls-files.c:520
msgid "show other files in the output"
msgstr "mostrar outros ficheiros na saída"
-#: builtin/ls-files.c:521
+#: builtin/ls-files.c:522
msgid "show ignored files in the output"
msgstr "mostrar ficheiros ignorados na saída"
-#: builtin/ls-files.c:524
+#: builtin/ls-files.c:525
msgid "show staged contents' object name in the output"
msgstr "mostrar nome de objetos com conteúdo preparado, na saída"
-#: builtin/ls-files.c:526
+#: builtin/ls-files.c:527
msgid "show files on the filesystem that need to be removed"
-msgstr "mostrar ficheiros no sistema de ficheiros que precisam de ser removidos"
+msgstr ""
+"mostrar ficheiros no sistema de ficheiros que precisam de ser removidos"
-#: builtin/ls-files.c:528
+#: builtin/ls-files.c:529
msgid "show 'other' directories' names only"
msgstr "mostrar nomes de diretórios 'other' (outro)"
-#: builtin/ls-files.c:530
+#: builtin/ls-files.c:531
msgid "show line endings of files"
msgstr "mostrar finais de linha dos ficheiros"
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:533
msgid "don't show empty directories"
msgstr "não mostrar diretórios vazios"
-#: builtin/ls-files.c:535
+#: builtin/ls-files.c:536
msgid "show unmerged files in the output"
msgstr "mostrar ficheiros não integrados na saída"
-#: builtin/ls-files.c:537
+#: builtin/ls-files.c:538
msgid "show resolve-undo information"
msgstr "mostrar informação de resolver-desfazer"
-#: builtin/ls-files.c:539
+#: builtin/ls-files.c:540
msgid "skip files matching pattern"
msgstr "ignorar ficheiros que correspondam ao padrão"
-#: builtin/ls-files.c:542
+#: builtin/ls-files.c:543
msgid "exclude patterns are read from <file>"
msgstr "ler padrões de exclusão do <ficheiro>"
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:546
msgid "read additional per-directory exclude patterns in <file>"
msgstr "ler padrões de exclusão por diretório do <ficheiro>"
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:548
msgid "add the standard git exclusions"
msgstr "incluir as exclusões standard do git"
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:551
msgid "make the output relative to the project top directory"
msgstr "mostrar os caminhos relativamente ao diretório superior do projeto"
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:554
msgid "recurse through submodules"
msgstr "percorrer submódulos recursivamente"
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:556
msgid "if any <file> is not in the index, treat this as an error"
msgstr "se um <ficheiro> não estiver no índice, tratar como erro"
-#: builtin/ls-files.c:556
+#: builtin/ls-files.c:557
msgid "tree-ish"
msgstr "árvore-etc"
-#: builtin/ls-files.c:557
+#: builtin/ls-files.c:558
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
"fingir que os caminhos removidos desde <árvore-etc> ainda estão presentes"
-#: builtin/ls-files.c:559
+#: builtin/ls-files.c:560
msgid "show debugging data"
msgstr "mostrar dados de depuração"
@@ -9468,39 +9747,39 @@
" [-q | --quiet] [--exit-code] [--get-url]\n"
" [--symref] [<repositório> [<referências>...]]"
-#: builtin/ls-remote.c:50
+#: builtin/ls-remote.c:52
msgid "do not print remote URL"
msgstr "não imprimir URL remoto"
-#: builtin/ls-remote.c:51 builtin/ls-remote.c:53
+#: builtin/ls-remote.c:53 builtin/ls-remote.c:55
msgid "exec"
msgstr "exec"
-#: builtin/ls-remote.c:52 builtin/ls-remote.c:54
+#: builtin/ls-remote.c:54 builtin/ls-remote.c:56
msgid "path of git-upload-pack on the remote host"
msgstr "caminho para git-upload-pack no servidor remoto"
-#: builtin/ls-remote.c:56
+#: builtin/ls-remote.c:58
msgid "limit to tags"
msgstr "restringir-se a tags"
-#: builtin/ls-remote.c:57
+#: builtin/ls-remote.c:59
msgid "limit to heads"
msgstr "restringir-se a cabeças"
-#: builtin/ls-remote.c:58
+#: builtin/ls-remote.c:60
msgid "do not show peeled tags"
msgstr "não mostrar tags descascadas"
-#: builtin/ls-remote.c:60
+#: builtin/ls-remote.c:62
msgid "take url.<base>.insteadOf into account"
msgstr "ter url.<base>.insteadOf em conta"
-#: builtin/ls-remote.c:62
+#: builtin/ls-remote.c:64
msgid "exit with exit code 2 if no matching refs are found"
msgstr "terminar com código de saída 2 se não forem encontradas referências"
-#: builtin/ls-remote.c:64
+#: builtin/ls-remote.c:66
msgid "show underlying ref in addition to the object pointed by it"
msgstr "mostrar a referência subjacente em adição ao objeto por ela apontado"
@@ -9546,148 +9825,144 @@
msgstr "git merge [<opções>] [<commit>...]"
#: builtin/merge.c:47
-msgid "git merge [<options>] <msg> HEAD <commit>"
-msgstr "git merge [<opções>] <msg> HEAD <commit>"
-
-#: builtin/merge.c:48
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:49
+#: builtin/merge.c:48
msgid "git merge --continue"
msgstr "git merge --continue"
-#: builtin/merge.c:104
+#: builtin/merge.c:103
msgid "switch `m' requires a value"
msgstr "a opção 'm' requer um valor"
-#: builtin/merge.c:141
+#: builtin/merge.c:140
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Estratégia de integração '%s' não encontrada.\n"
-#: builtin/merge.c:142
+#: builtin/merge.c:141
#, c-format
msgid "Available strategies are:"
msgstr "Estratégias disponíveis:"
-#: builtin/merge.c:147
+#: builtin/merge.c:146
#, c-format
msgid "Available custom strategies are:"
msgstr "Estratégias personalizadas disponíveis:"
-#: builtin/merge.c:197 builtin/pull.c:127
+#: builtin/merge.c:196 builtin/pull.c:127
msgid "do not show a diffstat at the end of the merge"
msgstr "não apresentar um diffstat ao fim da integração"
-#: builtin/merge.c:200 builtin/pull.c:130
+#: builtin/merge.c:199 builtin/pull.c:130
msgid "show a diffstat at the end of the merge"
msgstr "mostrar um diffstat ao fim da integração"
-#: builtin/merge.c:201 builtin/pull.c:133
+#: builtin/merge.c:200 builtin/pull.c:133
msgid "(synonym to --stat)"
msgstr "(sinónimo de --stat)"
-#: builtin/merge.c:203 builtin/pull.c:136
+#: builtin/merge.c:202 builtin/pull.c:136
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"adicionar (no máximo <n>) entradas do shortlog à mensagem de commit da "
"integração"
-#: builtin/merge.c:206 builtin/pull.c:139
+#: builtin/merge.c:205 builtin/pull.c:139
msgid "create a single commit instead of doing a merge"
msgstr "criar um único commit em vez de realizar uma integração"
-#: builtin/merge.c:208 builtin/pull.c:142
+#: builtin/merge.c:207 builtin/pull.c:142
msgid "perform a commit if the merge succeeds (default)"
msgstr "realizar um commit se a integração for bem sucedida (predefinição)"
-#: builtin/merge.c:210 builtin/pull.c:145
+#: builtin/merge.c:209 builtin/pull.c:145
msgid "edit message before committing"
msgstr "editar a mensagem antes de submeter"
-#: builtin/merge.c:211
+#: builtin/merge.c:210
msgid "allow fast-forward (default)"
msgstr "permitir avanço rápido (predefinição)"
-#: builtin/merge.c:213 builtin/pull.c:151
+#: builtin/merge.c:212 builtin/pull.c:151
msgid "abort if fast-forward is not possible"
msgstr "abortar se não é possível efetuar avanço rápido"
-#: builtin/merge.c:217 builtin/pull.c:154
+#: builtin/merge.c:216 builtin/pull.c:154
msgid "verify that the named commit has a valid GPG signature"
msgstr "verificar se o commit tem uma assinatura GPG válida"
-#: builtin/merge.c:218 builtin/notes.c:774 builtin/pull.c:158
-#: builtin/revert.c:89
+#: builtin/merge.c:217 builtin/notes.c:773 builtin/pull.c:158
+#: builtin/revert.c:108
msgid "strategy"
msgstr "estratégia"
-#: builtin/merge.c:219 builtin/pull.c:159
+#: builtin/merge.c:218 builtin/pull.c:159
msgid "merge strategy to use"
msgstr "estratégia de integração a usar"
-#: builtin/merge.c:220 builtin/pull.c:162
+#: builtin/merge.c:219 builtin/pull.c:162
msgid "option=value"
msgstr "opção=valor"
-#: builtin/merge.c:221 builtin/pull.c:163
+#: builtin/merge.c:220 builtin/pull.c:163
msgid "option for selected merge strategy"
msgstr "opções da estratégia de integração selecionada"
-#: builtin/merge.c:223
+#: builtin/merge.c:222
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "mensagem de commit (de integração não suscetível a avanço rápido)"
-#: builtin/merge.c:227
+#: builtin/merge.c:226
msgid "abort the current in-progress merge"
msgstr "abortar integração em curso"
-#: builtin/merge.c:229
+#: builtin/merge.c:228
msgid "continue the current in-progress merge"
msgstr "continuar a integração em curso"
-#: builtin/merge.c:231 builtin/pull.c:170
+#: builtin/merge.c:230 builtin/pull.c:170
msgid "allow merging unrelated histories"
msgstr "permitir integração de históricos não relacionados"
-#: builtin/merge.c:259
+#: builtin/merge.c:258
msgid "could not run stash."
msgstr "não foi possível executar o comando stash."
-#: builtin/merge.c:264
+#: builtin/merge.c:263
msgid "stash failed"
msgstr "falha ao executar o comando stash"
-#: builtin/merge.c:269
+#: builtin/merge.c:268
#, c-format
msgid "not a valid object: %s"
msgstr "nome de objeto inválido: %s"
-#: builtin/merge.c:288 builtin/merge.c:305
+#: builtin/merge.c:287 builtin/merge.c:304
msgid "read-tree failed"
msgstr "falha ao executar o comando read-tree"
-#: builtin/merge.c:335
+#: builtin/merge.c:334
msgid " (nothing to squash)"
msgstr " (não há nada para esmagar)"
-#: builtin/merge.c:346
+#: builtin/merge.c:345
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Commit esmagado -- HEAD não atualizada\n"
-#: builtin/merge.c:396
+#: builtin/merge.c:395
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Nenhuma mensagem de integração -- HEAD não atualizada\n"
-#: builtin/merge.c:447
+#: builtin/merge.c:446
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' não aponta para um commit"
-#: builtin/merge.c:537
+#: builtin/merge.c:536
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Valor de branch.%s.mergeoptions incorreto: %s"
@@ -9750,64 +10025,59 @@
"Falha ao realizar integração automática; corrija os conflitos e submeta o "
"resultado.\n"
-#: builtin/merge.c:867
-#, c-format
-msgid "'%s' is not a commit"
-msgstr "'%s' não é um commit"
-
-#: builtin/merge.c:908
+#: builtin/merge.c:890
msgid "No current branch."
msgstr "Nenhum ramo atual."
-#: builtin/merge.c:910
+#: builtin/merge.c:892
msgid "No remote for the current branch."
msgstr "Não há um remoto para o ramo atual."
-#: builtin/merge.c:912
+#: builtin/merge.c:894
msgid "No default upstream defined for the current branch."
msgstr "Não está definido nenhum ramo a montante para o ramo atual."
-#: builtin/merge.c:917
+#: builtin/merge.c:899
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Nenhum ramo de monitorização remoto seguido por %s de %s"
-#: builtin/merge.c:964
+#: builtin/merge.c:946
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Valor '%s' incorreto no ambiente '%s'"
-#: builtin/merge.c:1038
+#: builtin/merge.c:1020
#, c-format
msgid "could not close '%s'"
msgstr "não foi possível fechar '%s'"
-#: builtin/merge.c:1065
+#: builtin/merge.c:1047
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "não se pode integrar em %s: %s"
-#: builtin/merge.c:1099
+#: builtin/merge.c:1081
msgid "not something we can merge"
msgstr "não se pode integrar"
-#: builtin/merge.c:1167
+#: builtin/merge.c:1146
msgid "--abort expects no arguments"
msgstr "--abort não leva argumentos"
-#: builtin/merge.c:1171
+#: builtin/merge.c:1150
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "Não há nenhuma integração para se abortar (MERGE_HEAD não presente)."
-#: builtin/merge.c:1183
+#: builtin/merge.c:1162
msgid "--continue expects no arguments"
msgstr "--continue não leva argumentos"
-#: builtin/merge.c:1187
+#: builtin/merge.c:1166
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "Não há nenhuma integração em curso (MERGE_HEAD não presente)."
-#: builtin/merge.c:1203
+#: builtin/merge.c:1182
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -9815,7 +10085,7 @@
"Não concluiu a integração (MERGE_HEAD presente).\n"
"Submeta as suas alterações antes de integrar."
-#: builtin/merge.c:1210
+#: builtin/merge.c:1189
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -9823,122 +10093,122 @@
"Cherry-pick não concluído (CHERRY_PICK_HEAD presente).\n"
"Submeta as suas alterações antes de integrar."
-#: builtin/merge.c:1213
+#: builtin/merge.c:1192
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "Cherry-pick não concluído (CHERRY_PICK_HEAD presente)."
-#: builtin/merge.c:1222
+#: builtin/merge.c:1201
msgid "You cannot combine --squash with --no-ff."
msgstr "Não é possível combinar --squash e --no-ff."
-#: builtin/merge.c:1230
+#: builtin/merge.c:1209
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "Nenhum commit especificado e merge.defaultToUpstream não definido."
-#: builtin/merge.c:1247
+#: builtin/merge.c:1226
msgid "Squash commit into empty head not supported yet"
msgstr "Esmagar um commit numa cabeça vazia ainda não é suportado"
-#: builtin/merge.c:1249
+#: builtin/merge.c:1228
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
"Não faz sentido submeter de modo não suscetível a avanço rápido, numa cabeça "
"vazia"
-#: builtin/merge.c:1254
+#: builtin/merge.c:1233
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - não é algo se possa integrar"
-#: builtin/merge.c:1256
+#: builtin/merge.c:1235
msgid "Can merge only exactly one commit into empty head"
msgstr "Só se pode integrar exatamente um commit numa cabeça vazia"
-#: builtin/merge.c:1312
+#: builtin/merge.c:1269
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
"A assinatura GPG do commit %s, alegadamente assinada por %s, não é de "
"confiança."
-#: builtin/merge.c:1315
+#: builtin/merge.c:1272
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
"A assinatura GPG do commit %s, alegadamente assinada por %s, está incorreta."
-#: builtin/merge.c:1318
+#: builtin/merge.c:1275
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "O commit %s não tem uma assinatura GPG."
-#: builtin/merge.c:1321
+#: builtin/merge.c:1278
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "A assinatura GPG do commit %s por %s está correta\n"
-#: builtin/merge.c:1383
+#: builtin/merge.c:1340
msgid "refusing to merge unrelated histories"
msgstr "integração de históricos não relacionados recusada"
-#: builtin/merge.c:1392
+#: builtin/merge.c:1349
msgid "Already up-to-date."
msgstr "Já está atualizado."
-#: builtin/merge.c:1402
+#: builtin/merge.c:1359
#, c-format
msgid "Updating %s..%s\n"
msgstr "A atualizar %s..%s\n"
-#: builtin/merge.c:1443
+#: builtin/merge.c:1400
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "A tentar integração mesmo trivial no interior do índice...\n"
-#: builtin/merge.c:1450
+#: builtin/merge.c:1407
#, c-format
msgid "Nope.\n"
msgstr "Não.\n"
-#: builtin/merge.c:1475
+#: builtin/merge.c:1432
msgid "Already up-to-date. Yeeah!"
msgstr "Já está atualizado. Sim!"
-#: builtin/merge.c:1481
+#: builtin/merge.c:1438
msgid "Not possible to fast-forward, aborting."
msgstr "Não é possível avançar rapidamente, a abortar."
-#: builtin/merge.c:1504 builtin/merge.c:1583
+#: builtin/merge.c:1461 builtin/merge.c:1540
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "A recuar a árvore ao seu estado original...\n"
-#: builtin/merge.c:1508
+#: builtin/merge.c:1465
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "A tentar a estratégia de integração %s...\n"
-#: builtin/merge.c:1574
+#: builtin/merge.c:1531
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Nenhuma estratégia de integração conseguiu processar a integração.\n"
-#: builtin/merge.c:1576
+#: builtin/merge.c:1533
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Falha ao integrar com a estratégia %s.\n"
-#: builtin/merge.c:1585
+#: builtin/merge.c:1542
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "A usar %s para preparar resolução manual.\n"
-#: builtin/merge.c:1597
+#: builtin/merge.c:1554
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
-"A integração automática foi bem sucedida; interrompida antes de submeter como "
-"solicitado\n"
+"A integração automática foi bem sucedida; interrompida antes de submeter "
+"como solicitado\n"
#: builtin/merge-base.c:29
msgid "git merge-base [-a | --all] <commit> <commit>..."
@@ -9989,35 +10259,35 @@
"git merge-file [<opções>] [-L <nome1> [-L <orig> [-L <nome2>]]] <ficheiro1> "
"<ficheiro-orig> <ficheiro2>"
-#: builtin/merge-file.c:33
+#: builtin/merge-file.c:32
msgid "send results to standard output"
msgstr "enviar resultados para a saída padrão"
-#: builtin/merge-file.c:34
+#: builtin/merge-file.c:33
msgid "use a diff3 based merge"
msgstr "usar integração baseada em diff3"
-#: builtin/merge-file.c:35
+#: builtin/merge-file.c:34
msgid "for conflicts, use our version"
msgstr "usar a nossa versão em caso de conflito"
-#: builtin/merge-file.c:37
+#: builtin/merge-file.c:36
msgid "for conflicts, use their version"
msgstr "usar a versão deles em caso de conflito"
-#: builtin/merge-file.c:39
+#: builtin/merge-file.c:38
msgid "for conflicts, use a union version"
msgstr "usar a união das versões em caso de conflito"
-#: builtin/merge-file.c:42
+#: builtin/merge-file.c:41
msgid "for conflicts, use this marker size"
msgstr "usar este comprimento de marcador para os conflitos"
-#: builtin/merge-file.c:43
+#: builtin/merge-file.c:42
msgid "do not warn about conflicts"
msgstr "não alertar sobre conflitos"
-#: builtin/merge-file.c:45
+#: builtin/merge-file.c:44
msgid "set labels for file1/orig-file/file2"
msgstr "definir identificares para ficheiro1/ficheiro-orig/ficheiro2"
@@ -10079,7 +10349,8 @@
#: builtin/mv.c:84 builtin/rm.c:290
msgid "Please stage your changes to .gitmodules or stash them to proceed"
-msgstr "Prepare as suas alterações em .gitmodules ou esconda-as para prosseguir"
+msgstr ""
+"Prepare as suas alterações em .gitmodules ou esconda-as para prosseguir"
#: builtin/mv.c:102
#, c-format
@@ -10160,43 +10431,47 @@
msgid "renaming '%s' failed"
msgstr "falha ao mudar o nome de '%s'"
-#: builtin/name-rev.c:257
+#: builtin/name-rev.c:289
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<opções>] <commit>..."
-#: builtin/name-rev.c:258
+#: builtin/name-rev.c:290
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<opções>] --all"
-#: builtin/name-rev.c:259
+#: builtin/name-rev.c:291
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<opções>] --stdin"
-#: builtin/name-rev.c:311
+#: builtin/name-rev.c:346
msgid "print only names (no SHA-1)"
msgstr "imprimir apenas nomes (sem SHA-1)"
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:347
msgid "only use tags to name the commits"
msgstr "usar apenas tags para designar commits"
-#: builtin/name-rev.c:314
+#: builtin/name-rev.c:349
msgid "only use refs matching <pattern>"
msgstr "usar apenas referência que correspondam ao <padrão>"
-#: builtin/name-rev.c:316
+#: builtin/name-rev.c:351
+msgid "ignore refs matching <pattern>"
+msgstr "ignorar referências que correspondam ao <padrão>"
+
+#: builtin/name-rev.c:353
msgid "list all commits reachable from all refs"
msgstr "listar todos os commits alcançáveis a partir de todas as referências"
-#: builtin/name-rev.c:317
+#: builtin/name-rev.c:354
msgid "read from stdin"
msgstr "ler da entrada padrão"
-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:355
msgid "allow to print `undefined` names (default)"
msgstr "permitir imprimir nomes 'indefinidos' (predefinição)"
-#: builtin/name-rev.c:324
+#: builtin/name-rev.c:361
msgid "dereference tags in the input (internal use)"
msgstr "desreferenciar tags na entrada (uso interno)"
@@ -10341,19 +10616,19 @@
msgid "the note contents have been left in %s"
msgstr "o conteúdo da nota foi colocado em %s"
-#: builtin/notes.c:233 builtin/tag.c:460
+#: builtin/notes.c:233 builtin/tag.c:516
#, c-format
msgid "cannot read '%s'"
msgstr "não é possível ler '%s'"
-#: builtin/notes.c:235 builtin/tag.c:463
+#: builtin/notes.c:235 builtin/tag.c:519
#, c-format
msgid "could not open or read '%s'"
msgstr "não foi possível abrir ou ler '%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:659
+#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:658
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr "falha ao resolver '%s' como uma referência válida."
@@ -10386,12 +10661,12 @@
msgstr "foi recusado efetuar %s de notas em %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:652
-#: builtin/notes.c:802 builtin/notes.c:949 builtin/notes.c:970
+#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:651
+#: builtin/notes.c:801 builtin/notes.c:948 builtin/notes.c:969
msgid "too many parameters"
msgstr "demasiados parâmetros"
-#: builtin/notes.c:378 builtin/notes.c:665
+#: builtin/notes.c:378 builtin/notes.c:664
#, c-format
msgid "no note found for object %s."
msgstr "nenhuma nota encontrada para o objeto %s."
@@ -10426,15 +10701,15 @@
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr ""
-"Não é possível adicionar notas. Notas do objeto %s encontradas. Use '-f' para "
-"substituí-las."
+"Não é possível adicionar notas. Notas do objeto %s encontradas. Use '-f' "
+"para substituí-las."
#: builtin/notes.c:452 builtin/notes.c:531
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "A substituir as notas existentes do objeto %s\n"
-#: builtin/notes.c:463 builtin/notes.c:624 builtin/notes.c:889
+#: builtin/notes.c:463 builtin/notes.c:623 builtin/notes.c:888
#, c-format
msgid "Removing note for object %s\n"
msgstr "A remover a nota do objeto %s\n"
@@ -10474,139 +10749,139 @@
"As opções -m/-F/-c/-C são obsoletas no subcomando 'edit'.\n"
"Use 'git notes add -f -m/-F/-c/-C' em seu lugar.\n"
-#: builtin/notes.c:685
+#: builtin/notes.c:684
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "falha ao eliminar a referência NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:687
+#: builtin/notes.c:686
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "falha ao eliminar a referência NOTES_MERGE_REF"
-#: builtin/notes.c:689
+#: builtin/notes.c:688
msgid "failed to remove 'git notes merge' worktree"
msgstr "falha ao remover a árvore de trabalho de 'git notes merge'"
-#: builtin/notes.c:709
+#: builtin/notes.c:708
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "falha ao ler referência NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:711
+#: builtin/notes.c:710
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "não foi possível encontrar o commit de NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:713
+#: builtin/notes.c:712
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "não foi possível analisar o commit de NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:726
+#: builtin/notes.c:725
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "falha ao resolver NOTES_MERGE_REF"
-#: builtin/notes.c:729
+#: builtin/notes.c:728
msgid "failed to finalize notes merge"
msgstr "falha ao finalizar integração de notas"
-#: builtin/notes.c:755
+#: builtin/notes.c:754
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "estratégia de integração de notas %s desconhecida"
-#: builtin/notes.c:771
+#: builtin/notes.c:770
msgid "General options"
msgstr "Opções gerais"
-#: builtin/notes.c:773
+#: builtin/notes.c:772
msgid "Merge options"
msgstr "Opções de integração"
-#: builtin/notes.c:775
+#: builtin/notes.c:774
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
msgstr ""
-"resolver conflitos nas notas usando a estratégia indicada (manual/ours/theirs/"
-"union/cat_sort_uniq)"
+"resolver conflitos nas notas usando a estratégia indicada (manual/ours/"
+"theirs/union/cat_sort_uniq)"
-#: builtin/notes.c:777
+#: builtin/notes.c:776
msgid "Committing unmerged notes"
msgstr "A submeter notas não integradas"
-#: builtin/notes.c:779
+#: builtin/notes.c:778
msgid "finalize notes merge by committing unmerged notes"
msgstr "concluir integração de notas, submetendo notas não integradas"
-#: builtin/notes.c:781
+#: builtin/notes.c:780
msgid "Aborting notes merge resolution"
msgstr "A abortar resolução de integração das notas"
-#: builtin/notes.c:783
+#: builtin/notes.c:782
msgid "abort notes merge"
msgstr "abortar integração das notas"
-#: builtin/notes.c:794
+#: builtin/notes.c:793
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "não é possível misturar --commit, --abort ou -s/--strategy"
-#: builtin/notes.c:799
+#: builtin/notes.c:798
msgid "must specify a notes ref to merge"
msgstr "tem de especificar uma referência de notas para integrar"
-#: builtin/notes.c:823
+#: builtin/notes.c:822
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "-s/--strategy desconhecida: %s"
-#: builtin/notes.c:860
+#: builtin/notes.c:859
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "uma integração das notas em %s já está em curso em %s"
-#: builtin/notes.c:863
+#: builtin/notes.c:862
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr "falha ao guardar ligação à referência de notas atual (%s)"
-#: builtin/notes.c:865
+#: builtin/notes.c:864
#, 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"
msgstr ""
-"A integração automática de notas falhou. Corrija os conflitos em %s e submeta "
-"o resultado com 'git notes merge --commit' ou aborte a integração com 'git "
-"notes merge --abort'.\n"
+"A integração automática de notas falhou. Corrija os conflitos em %s e "
+"submeta o resultado com 'git notes merge --commit' ou aborte a integração "
+"com 'git notes merge --abort'.\n"
-#: builtin/notes.c:887
+#: builtin/notes.c:886
#, c-format
msgid "Object %s has no note\n"
msgstr "O objeto %s não tem nenhuma nota\n"
-#: builtin/notes.c:899
+#: builtin/notes.c:898
msgid "attempt to remove non-existent note is not an error"
msgstr "não considerar como erro a remoção de uma nota não existente"
-#: builtin/notes.c:902
+#: builtin/notes.c:901
msgid "read object names from the standard input"
msgstr "ler nome dos objetos da entrada padrão"
-#: builtin/notes.c:940 builtin/prune.c:105 builtin/worktree.c:127
+#: builtin/notes.c:939 builtin/prune.c:105 builtin/worktree.c:127
msgid "do not remove, show only"
msgstr "não remover, mostrar apenas"
-#: builtin/notes.c:941
+#: builtin/notes.c:940
msgid "report pruned notes"
msgstr "reportar notas podadas"
-#: builtin/notes.c:983
+#: builtin/notes.c:982
msgid "notes-ref"
msgstr "notes-ref"
-#: builtin/notes.c:984
+#: builtin/notes.c:983
msgid "use notes from <notes-ref>"
msgstr "usar notas de <notes-ref>"
-#: builtin/notes.c:1019
+#: builtin/notes.c:1018
#, c-format
msgid "unknown subcommand: %s"
msgstr "subcomando desconhecido: %s"
@@ -10630,177 +10905,177 @@
msgid "deflate error (%d)"
msgstr "erro ao compactar (%d)"
-#: builtin/pack-objects.c:766
+#: builtin/pack-objects.c:770
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
"a desativar escrita de mapa de bits, os pacotes são divididos devido a pack."
"packSizeLimit"
-#: builtin/pack-objects.c:779
+#: builtin/pack-objects.c:783
msgid "Writing objects"
msgstr "A escrever objetos"
-#: builtin/pack-objects.c:1068
+#: builtin/pack-objects.c:1063
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
-"a desativar escrita de mapa de bits, visto que alguns objetos não estão a ser "
-"compactados"
+"a desativar escrita de mapa de bits, visto que alguns objetos não estão a "
+"ser compactados"
-#: builtin/pack-objects.c:2344
+#: builtin/pack-objects.c:2426
msgid "Compressing objects"
msgstr "A comprimir objetos"
-#: builtin/pack-objects.c:2747
+#: builtin/pack-objects.c:2829
#, c-format
msgid "unsupported index version %s"
msgstr "versão de índice %s não suportada"
-#: builtin/pack-objects.c:2751
+#: builtin/pack-objects.c:2833
#, c-format
msgid "bad index version '%s'"
msgstr "versão de índice '%s' incorreta"
-#: builtin/pack-objects.c:2781
+#: builtin/pack-objects.c:2863
msgid "do not show progress meter"
msgstr "não mostrar medidor de progresso"
-#: builtin/pack-objects.c:2783
+#: builtin/pack-objects.c:2865
msgid "show progress meter"
msgstr "mostrar medidor de progresso"
-#: builtin/pack-objects.c:2785
+#: builtin/pack-objects.c:2867
msgid "show progress meter during object writing phase"
msgstr "mostrar medidor de progresso durante a fase de escrita de objetos"
-#: builtin/pack-objects.c:2788
+#: builtin/pack-objects.c:2870
msgid "similar to --all-progress when progress meter is shown"
msgstr "semelhante a --all-progress quando o medidor de progresso é mostrado"
-#: builtin/pack-objects.c:2789
+#: builtin/pack-objects.c:2871
msgid "version[,offset]"
msgstr "versão[,offset]"
-#: builtin/pack-objects.c:2790
+#: builtin/pack-objects.c:2872
msgid "write the pack index file in the specified idx format version"
msgstr ""
"escrever o ficheiro de índice do pacote na versão de formato especificada"
-#: builtin/pack-objects.c:2793
+#: builtin/pack-objects.c:2875
msgid "maximum size of each output pack file"
msgstr "tamanho máximo de cada ficheiro de pacote gerado"
-#: builtin/pack-objects.c:2795
+#: builtin/pack-objects.c:2877
msgid "ignore borrowed objects from alternate object store"
msgstr "ignorar objetos emprestados do arquivo de objetos sobressalentes"
-#: builtin/pack-objects.c:2797
+#: builtin/pack-objects.c:2879
msgid "ignore packed objects"
msgstr "ignorar objetos compactados"
-#: builtin/pack-objects.c:2799
+#: builtin/pack-objects.c:2881
msgid "limit pack window by objects"
msgstr "limitar a janela de compactação por objetos"
-#: builtin/pack-objects.c:2801
+#: builtin/pack-objects.c:2883
msgid "limit pack window by memory in addition to object limit"
msgstr ""
"limitar a janela de compactação por memória em adição ao limite por objetos"
-#: builtin/pack-objects.c:2803
+#: builtin/pack-objects.c:2885
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "tamanho máximo de cadeias delta permitidas no pacote resultante"
-#: builtin/pack-objects.c:2805
+#: builtin/pack-objects.c:2887
msgid "reuse existing deltas"
msgstr "reutilizar deltas existentes"
-#: builtin/pack-objects.c:2807
+#: builtin/pack-objects.c:2889
msgid "reuse existing objects"
msgstr "reutilizar objetos existentes"
-#: builtin/pack-objects.c:2809
+#: builtin/pack-objects.c:2891
msgid "use OFS_DELTA objects"
msgstr "usar objetos OFS_DELTA"
-#: builtin/pack-objects.c:2811
+#: builtin/pack-objects.c:2893
msgid "use threads when searching for best delta matches"
msgstr "usar threads ao procurar pela melhor correspondência delta"
-#: builtin/pack-objects.c:2813
+#: builtin/pack-objects.c:2895
msgid "do not create an empty pack output"
msgstr "não criar um pacote vazio"
-#: builtin/pack-objects.c:2815
+#: builtin/pack-objects.c:2897
msgid "read revision arguments from standard input"
msgstr "ler argumentos de revisão da entrada padrão"
-#: builtin/pack-objects.c:2817
+#: builtin/pack-objects.c:2899
msgid "limit the objects to those that are not yet packed"
msgstr "restringir-se aos objetos que ainda não foram compactados"
-#: builtin/pack-objects.c:2820
+#: builtin/pack-objects.c:2902
msgid "include objects reachable from any reference"
msgstr "incluir objetos alcançáveis a partir de qualquer referência"
-#: builtin/pack-objects.c:2823
+#: builtin/pack-objects.c:2905
msgid "include objects referred by reflog entries"
msgstr "incluir objetos referenciados por entradas do reflog"
-#: builtin/pack-objects.c:2826
+#: builtin/pack-objects.c:2908
msgid "include objects referred to by the index"
msgstr "incluir objetos referenciados pelo índice"
-#: builtin/pack-objects.c:2829
+#: builtin/pack-objects.c:2911
msgid "output pack to stdout"
msgstr "gerar pacote para a saída padrão"
-#: builtin/pack-objects.c:2831
+#: builtin/pack-objects.c:2913
msgid "include tag objects that refer to objects to be packed"
msgstr "incluir objetos tag que refiram objetos a compactar"
-#: builtin/pack-objects.c:2833
+#: builtin/pack-objects.c:2915
msgid "keep unreachable objects"
msgstr "manter objetos inalcançáveis"
-#: builtin/pack-objects.c:2835
+#: builtin/pack-objects.c:2917
msgid "pack loose unreachable objects"
msgstr "empacotar objetos soltos inalcançáveis"
-#: builtin/pack-objects.c:2837
+#: builtin/pack-objects.c:2919
msgid "unpack unreachable objects newer than <time>"
msgstr "descompactar objetos inalcançáveis mais recentes que <tempo>"
-#: builtin/pack-objects.c:2840
+#: builtin/pack-objects.c:2922
msgid "create thin packs"
msgstr "criar pacotes finos"
-#: builtin/pack-objects.c:2842
+#: builtin/pack-objects.c:2924
msgid "create packs suitable for shallow fetches"
msgstr "criar pacotes adequados para obter em repositórios pouco profundos"
-#: builtin/pack-objects.c:2844
+#: builtin/pack-objects.c:2926
msgid "ignore packs that have companion .keep file"
msgstr "ignorar pacotes que tenham um ficheiro .keep"
-#: builtin/pack-objects.c:2846
+#: builtin/pack-objects.c:2928
msgid "pack compression level"
msgstr "nível de compactação do pacote"
-#: builtin/pack-objects.c:2848
+#: builtin/pack-objects.c:2930
msgid "do not hide commits by grafts"
msgstr "não esconder commits introduzidos por enxertos"
-#: builtin/pack-objects.c:2850
+#: builtin/pack-objects.c:2932
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
"usar um índice de mapa de bits se disponível, para acelerar a contagem de "
"objetos"
-#: builtin/pack-objects.c:2852
+#: builtin/pack-objects.c:2934
msgid "write a bitmap index together with the pack index"
msgstr "escrever um índice de mapa de bits juntamente com o índice do pacote"
-#: builtin/pack-objects.c:2979
+#: builtin/pack-objects.c:3061
msgid "Counting objects"
msgstr "A contar objetos"
@@ -10857,7 +11132,7 @@
msgid "incorporate changes by rebasing rather than merging"
msgstr "incorporar alterações por rebase em vez de integrar"
-#: builtin/pull.c:148 builtin/revert.c:101
+#: builtin/pull.c:148 builtin/rebase--helper.c:18 builtin/revert.c:120
msgid "allow fast-forward"
msgstr "permitir avanço rápido"
@@ -10946,7 +11221,8 @@
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
-"Se deseja definir o ramo que deve ser seguido por este ramo, pode fazê-lo com:"
+"Se deseja definir o ramo que deve ser seguido por este ramo, pode fazê-lo "
+"com:"
#: builtin/pull.c:437
#, c-format
@@ -11182,8 +11458,8 @@
#: builtin/push.c:370
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"
@@ -11225,11 +11501,11 @@
msgid "repository"
msgstr "repositório"
-#: builtin/push.c:519 builtin/send-pack.c:161
+#: builtin/push.c:519 builtin/send-pack.c:162
msgid "push all refs"
msgstr "publicar todas as referências"
-#: builtin/push.c:520 builtin/send-pack.c:163
+#: builtin/push.c:520 builtin/send-pack.c:164
msgid "mirror all refs"
msgstr "replicar todas as referências"
@@ -11241,15 +11517,15 @@
msgid "push tags (can't be used with --all or --mirror)"
msgstr "publicar tags (não pode ser usado com --all ou --mirror)"
-#: builtin/push.c:526 builtin/send-pack.c:164
+#: builtin/push.c:526 builtin/send-pack.c:165
msgid "force updates"
msgstr "forçar atualização"
-#: builtin/push.c:528 builtin/send-pack.c:175
+#: builtin/push.c:528 builtin/send-pack.c:179
msgid "refname>:<expect"
msgstr "nome da referência>:<esperado"
-#: builtin/push.c:529 builtin/send-pack.c:176
+#: builtin/push.c:529 builtin/send-pack.c:180
msgid "require old value of ref to be at this value"
msgstr "exigir que o antigo valor da referência tenha este valor"
@@ -11257,12 +11533,12 @@
msgid "control recursive pushing of submodules"
msgstr "controlar a publicação recursiva de submódulos"
-#: builtin/push.c:534 builtin/send-pack.c:169
+#: builtin/push.c:534 builtin/send-pack.c:173
msgid "use thin pack"
msgstr "usar pacote fino"
-#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:158
-#: builtin/send-pack.c:159
+#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:159
+#: builtin/send-pack.c:160
msgid "receive pack program"
msgstr "programa receive pack"
@@ -11282,19 +11558,19 @@
msgid "push missing but relevant tags"
msgstr "publicar tags perdidas mas relevantes"
-#: builtin/push.c:546 builtin/send-pack.c:166
+#: builtin/push.c:546 builtin/send-pack.c:167
msgid "GPG sign the push"
msgstr "assinar publicação com GPG"
-#: builtin/push.c:548 builtin/send-pack.c:170
+#: builtin/push.c:548 builtin/send-pack.c:174
msgid "request atomic transaction on remote side"
msgstr "solicitar transação atómica no servidor remoto"
-#: builtin/push.c:549
+#: builtin/push.c:549 builtin/send-pack.c:170
msgid "server-specific"
msgstr "específico do servidor"
-#: builtin/push.c:549
+#: builtin/push.c:549 builtin/send-pack.c:171
msgid "option to transmit"
msgstr "opção para transmitir"
@@ -11310,87 +11586,100 @@
msgid "push options must not have new line characters"
msgstr "as opções de publicação não podem ter carateres de nova linha"
-#: builtin/read-tree.c:37
+#: 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>]])"
msgstr ""
-"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefixo>) "
-"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<ficheiro>] (--empty | <árvore-etc1> [<árvore-etc2> [<árvore-"
-"etc3>]])"
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --"
+"prefix=<prefixo>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-"
+"sparse-checkout] [--index-output=<ficheiro>] (--empty | <árvore-etc1> "
+"[<árvore-etc2> [<árvore-etc3>]])"
-#: builtin/read-tree.c:110
+#: builtin/read-tree.c:130
msgid "write resulting index to <file>"
msgstr "escrever o índice resultante no <ficheiro>"
-#: builtin/read-tree.c:113
+#: builtin/read-tree.c:133
msgid "only empty the index"
msgstr "apenas esvaziar o índice"
-#: builtin/read-tree.c:115
+#: builtin/read-tree.c:135
msgid "Merging"
msgstr "A integrar"
-#: builtin/read-tree.c:117
+#: builtin/read-tree.c:137
msgid "perform a merge in addition to a read"
msgstr "realizar uma integração em adição a uma leitura"
-#: builtin/read-tree.c:119
+#: builtin/read-tree.c:139
msgid "3-way merge if no file level merging required"
msgstr ""
-"integrar com 3 pontos se a integração ao nível de ficheiros não for necessária"
+"integrar com 3 pontos se a integração ao nível de ficheiros não for "
+"necessária"
-#: builtin/read-tree.c:121
+#: builtin/read-tree.c:141
msgid "3-way merge in presence of adds and removes"
msgstr "integrar com 3 ponto na presença de adições e remoções"
-#: builtin/read-tree.c:123
+#: builtin/read-tree.c:143
msgid "same as -m, but discard unmerged entries"
msgstr "o mesmo que -m, mas descartar entradas não integradas"
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:144
msgid "<subdirectory>/"
msgstr "<subdiretório>/"
-#: builtin/read-tree.c:125
+#: builtin/read-tree.c:145
msgid "read the tree into the index under <subdirectory>/"
msgstr "ler a árvore em <subdiretório>/ para o índice"
-#: builtin/read-tree.c:128
+#: builtin/read-tree.c:148
msgid "update working tree with merge result"
msgstr "atualizar a árvore de trabalho com os resultados da integração"
-#: builtin/read-tree.c:130
+#: builtin/read-tree.c:150
msgid "gitignore"
msgstr "gitignore"
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:151
msgid "allow explicitly ignored files to be overwritten"
msgstr "permitir que os ficheiros explicitamente ignorados sejam substituídos"
-#: builtin/read-tree.c:134
+#: builtin/read-tree.c:154
msgid "don't check the working tree after merging"
msgstr "não verificar a árvore de trabalho depois de integrar"
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:155
msgid "don't update the index or the work tree"
msgstr "não atualizar o índice ou a árvore de trabalho"
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:157
msgid "skip applying sparse checkout filter"
msgstr "ignorar a aplicação do filtro de extração esparsa"
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:159
msgid "debug unpack-trees"
msgstr "depurar unpack-trees"
-#: builtin/receive-pack.c:26
+#: builtin/rebase--helper.c:7
+msgid "git rebase--helper [<options>]"
+msgstr "git rebase--helper [<opções>]"
+
+#: builtin/rebase--helper.c:19
+msgid "continue rebase"
+msgstr "continuar rebase"
+
+#: builtin/rebase--helper.c:21
+msgid "abort rebase"
+msgstr "abortar rebase"
+
+#: builtin/receive-pack.c:27
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-dir>"
-#: builtin/receive-pack.c:793
+#: builtin/receive-pack.c:796
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"
@@ -11420,7 +11709,7 @@
"Para suprimir esta mensagem e manter o comportamento predefinido, defina a "
"variável de configuração 'receive.denyCurrentBranch' como 'refuse'."
-#: builtin/receive-pack.c:813
+#: builtin/receive-pack.c:816
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,11 +11729,11 @@
"\n"
"Para suprimir esta mensagem, pode definí-la como 'refuse'."
-#: builtin/receive-pack.c:1883
+#: builtin/receive-pack.c:1889
msgid "quiet"
msgstr "silencioso"
-#: builtin/receive-pack.c:1897
+#: builtin/receive-pack.c:1903
msgid "You must specify a directory."
msgstr "Deve especificar um diretório."
@@ -11623,7 +11912,7 @@
msgid "(delete)"
msgstr "(eliminado)"
-#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:854
+#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:856
#, c-format
msgid "No such remote: %s"
msgstr "Remoto inexistente: %s"
@@ -11656,7 +11945,7 @@
msgid "creating '%s' failed"
msgstr "falha ao criar '%s'"
-#: builtin/remote.c:792
+#: builtin/remote.c:794
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -11670,296 +11959,297 @@
"Nota: alguns ramos fora da hierarquia refs/remotes/ não foram removidos;\n"
"para os remover, use:"
-#: builtin/remote.c:806
+#: builtin/remote.c:808
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Não foi possível remover a secção de configuração '%s'"
-#: builtin/remote.c:907
+#: builtin/remote.c:909
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " novo (os próxima objetos obtidos serão guardados em remotes/%s)"
-#: builtin/remote.c:910
+#: builtin/remote.c:912
msgid " tracked"
msgstr " seguido"
-#: builtin/remote.c:912
+#: builtin/remote.c:914
msgid " stale (use 'git remote prune' to remove)"
msgstr " obsoleto (use 'git remote prune' para remover)"
-#: builtin/remote.c:914
+#: builtin/remote.c:916
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:955
+#: builtin/remote.c:957
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr ""
"branch.%s.merge inválido; não é possível rebasear sobre mais do que um ramo"
-#: builtin/remote.c:963
+#: builtin/remote.c:965
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "rebaseia interativamente sobre %s do remoto"
-#: builtin/remote.c:964
+#: builtin/remote.c:966
#, c-format
msgid "rebases onto remote %s"
msgstr "rebaseia sobre %s do remoto"
-#: builtin/remote.c:967
+#: builtin/remote.c:969
#, c-format
msgid " merges with remote %s"
msgstr " integra com %s do remoto"
-#: builtin/remote.c:970
+#: builtin/remote.c:972
#, c-format
msgid "merges with remote %s"
msgstr "integra com %s do remoto"
-#: builtin/remote.c:973
+#: builtin/remote.c:975
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s e com o %s do remoto\n"
-#: builtin/remote.c:1016
+#: builtin/remote.c:1018
msgid "create"
msgstr "criado"
-#: builtin/remote.c:1019
+#: builtin/remote.c:1021
msgid "delete"
msgstr "eliminado"
-#: builtin/remote.c:1023
+#: builtin/remote.c:1025
msgid "up to date"
msgstr "atualizado"
-#: builtin/remote.c:1026
+#: builtin/remote.c:1028
msgid "fast-forwardable"
msgstr "pode ser avançado rapidamente"
-#: builtin/remote.c:1029
+#: builtin/remote.c:1031
msgid "local out of date"
msgstr "local desatualizado"
-#: builtin/remote.c:1036
+#: builtin/remote.c:1038
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s força em %-*s (%s)"
-#: builtin/remote.c:1039
+#: builtin/remote.c:1041
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s publica em %-*s (%s)"
-#: builtin/remote.c:1043
+#: builtin/remote.c:1045
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s força em %s"
-#: builtin/remote.c:1046
+#: builtin/remote.c:1048
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s publica em %s"
-#: builtin/remote.c:1114
+#: builtin/remote.c:1116
msgid "do not query remotes"
msgstr "não consultar remotos"
-#: builtin/remote.c:1141
+#: builtin/remote.c:1143
#, c-format
msgid "* remote %s"
msgstr "* remoto %s"
-#: builtin/remote.c:1142
+#: builtin/remote.c:1144
#, c-format
msgid " Fetch URL: %s"
msgstr " Obter do URL: %s"
-#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1295
+#: builtin/remote.c:1145 builtin/remote.c:1158 builtin/remote.c:1297
msgid "(no URL)"
msgstr "(nenhum URL)"
#. TRANSLATORS: the colon ':' should align with
#. the one in " Fetch URL: %s" translation
-#: builtin/remote.c:1154 builtin/remote.c:1156
+#: builtin/remote.c:1156 builtin/remote.c:1158
#, c-format
msgid " Push URL: %s"
msgstr " Publicar no URL: %s"
-#: builtin/remote.c:1158 builtin/remote.c:1160 builtin/remote.c:1162
+#: builtin/remote.c:1160 builtin/remote.c:1162 builtin/remote.c:1164
#, c-format
msgid " HEAD branch: %s"
msgstr " Ramo HEAD: %s"
-#: builtin/remote.c:1158
+#: builtin/remote.c:1160
msgid "(not queried)"
msgstr "(não consultado)"
-#: builtin/remote.c:1160
+#: builtin/remote.c:1162
msgid "(unknown)"
msgstr "(desconhecido)"
-#: builtin/remote.c:1164
+#: builtin/remote.c:1166
#, c-format
-msgid " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
+msgid ""
+" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr " Ramo HEAD (o remoto HEAD é ambíguo, pode ser um dos seguintes):\n"
-#: builtin/remote.c:1176
+#: builtin/remote.c:1178
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Ramo remoto:%s"
msgstr[1] " Ramos remotos:%s"
-#: builtin/remote.c:1179 builtin/remote.c:1205
+#: builtin/remote.c:1181 builtin/remote.c:1207
msgid " (status not queried)"
msgstr " (estado não consultado)"
-#: builtin/remote.c:1188
+#: builtin/remote.c:1190
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Ramo local configurado para 'git pull':"
msgstr[1] " Ramos locais configurados para 'git pull':"
-#: builtin/remote.c:1196
+#: builtin/remote.c:1198
msgid " Local refs will be mirrored by 'git push'"
msgstr " Referências locais serão refletidas (mirror) por 'git push'"
-#: builtin/remote.c:1202
+#: builtin/remote.c:1204
#, 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 para 'git push'%s:"
msgstr[1] " Referências locais configuradas para 'git push'%s:"
-#: builtin/remote.c:1223
+#: builtin/remote.c:1225
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "definir refs/remotes/<nome>/HEAD de acordo com o remoto"
-#: builtin/remote.c:1225
+#: builtin/remote.c:1227
msgid "delete refs/remotes/<name>/HEAD"
msgstr "eliminar refs/remotes/<nome>/HEAD"
-#: builtin/remote.c:1240
+#: builtin/remote.c:1242
msgid "Cannot determine remote HEAD"
msgstr "Não é possível determinar o remoto HEAD"
-#: builtin/remote.c:1242
+#: builtin/remote.c:1244
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "Múltiplos ramos HEAD remotos. Escolha um explicitamente com:"
-#: builtin/remote.c:1252
+#: builtin/remote.c:1254
#, c-format
msgid "Could not delete %s"
msgstr "Não foi possível eliminar %s"
-#: builtin/remote.c:1260
+#: builtin/remote.c:1262
#, c-format
msgid "Not a valid ref: %s"
msgstr "Referência inválida: %s"
-#: builtin/remote.c:1262
+#: builtin/remote.c:1264
#, c-format
msgid "Could not setup %s"
msgstr "Não foi possível configurar %s"
-#: builtin/remote.c:1280
+#: builtin/remote.c:1282
#, c-format
msgid " %s will become dangling!"
msgstr " %s ficará suspenso!"
-#: builtin/remote.c:1281
+#: builtin/remote.c:1283
#, c-format
msgid " %s has become dangling!"
msgstr " %s ficou suspenso!"
-#: builtin/remote.c:1291
+#: builtin/remote.c:1293
#, c-format
msgid "Pruning %s"
msgstr "A eliminar %s"
-#: builtin/remote.c:1292
+#: builtin/remote.c:1294
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1308
+#: builtin/remote.c:1310
#, c-format
msgid " * [would prune] %s"
msgstr " * [eliminaria] %s"
-#: builtin/remote.c:1311
+#: builtin/remote.c:1313
#, c-format
msgid " * [pruned] %s"
msgstr " * [eliminado] %s"
-#: builtin/remote.c:1356
+#: builtin/remote.c:1358
msgid "prune remotes after fetching"
msgstr "eliminar remotos depois de obter"
-#: builtin/remote.c:1419 builtin/remote.c:1473 builtin/remote.c:1541
+#: builtin/remote.c:1421 builtin/remote.c:1475 builtin/remote.c:1543
#, c-format
msgid "No such remote '%s'"
msgstr "Remoto inexistente '%s'"
-#: builtin/remote.c:1435
+#: builtin/remote.c:1437
msgid "add branch"
msgstr "adicionar ramo"
-#: builtin/remote.c:1442
+#: builtin/remote.c:1444
msgid "no remote specified"
msgstr "nenhum remoto especificado"
-#: builtin/remote.c:1459
+#: builtin/remote.c:1461
msgid "query push URLs rather than fetch URLs"
msgstr "consultar URLs de publicação em vez de URLs utilizados para obter"
-#: builtin/remote.c:1461
+#: builtin/remote.c:1463
msgid "return all URLs"
msgstr "retornar todos os URLs"
-#: builtin/remote.c:1489
+#: builtin/remote.c:1491
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "o remoto '%s' não tem nenhum URL configurado"
-#: builtin/remote.c:1515
+#: builtin/remote.c:1517
msgid "manipulate push URLs"
msgstr "manipular URLs de publicação"
-#: builtin/remote.c:1517
+#: builtin/remote.c:1519
msgid "add URL"
msgstr "adicionar URL"
-#: builtin/remote.c:1519
+#: builtin/remote.c:1521
msgid "delete URLs"
msgstr "eliminar URLs"
-#: builtin/remote.c:1526
+#: builtin/remote.c:1528
msgid "--add --delete doesn't make sense"
msgstr "--add --delete não faz sentido"
-#: builtin/remote.c:1567
+#: builtin/remote.c:1569
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Padrão de URL antigo inválido: %s"
-#: builtin/remote.c:1575
+#: builtin/remote.c:1577
#, c-format
msgid "No such URL found: %s"
msgstr "URL não encontrado: %s"
-#: builtin/remote.c:1577
+#: builtin/remote.c:1579
msgid "Will not delete all non-push URLs"
msgstr "Não é possível remover todos os URLs de não publicação"
-#: builtin/remote.c:1591
+#: builtin/remote.c:1593
msgid "be verbose; must be placed before a subcommand"
msgstr "ser verboso; deve ser colocado antes de um subcomando"
-#: builtin/remote.c:1622
+#: builtin/remote.c:1624
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Subcomando desconhecido: %s"
@@ -12079,69 +12369,69 @@
msgid "git replace [--format=<format>] [-l [<pattern>]]"
msgstr "git replace [--format=<formato>] [-l [<padrão>]]"
-#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
+#: builtin/replace.c:329 builtin/replace.c:367 builtin/replace.c:395
#, c-format
msgid "Not a valid object name: '%s'"
msgstr "Nome de objeto inválido: '%s'"
-#: builtin/replace.c:355
+#: builtin/replace.c:359
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "mergetag incorreta no commit '%s'"
-#: builtin/replace.c:357
+#: builtin/replace.c:361
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr "mergetag malformada no commit '%s'"
-#: builtin/replace.c:368
+#: builtin/replace.c:372
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
"instead of --graft"
msgstr ""
-"o commit original '%s' contém a mergetag '%s' que foi excluída; use --edit em "
-"vez de --graft"
+"o commit original '%s' contém a mergetag '%s' que foi excluída; use --edit "
+"em vez de --graft"
-#: builtin/replace.c:401
+#: builtin/replace.c:405
#, c-format
msgid "the original commit '%s' has a gpg signature."
msgstr "o commit original '%s' tem uma assinatura gpg."
-#: builtin/replace.c:402
+#: builtin/replace.c:406
msgid "the signature will be removed in the replacement commit!"
msgstr "a assinatura será removida do commit suplente!"
-#: builtin/replace.c:408
+#: builtin/replace.c:412
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr "não foi possível escrever o commit suplente de: '%s'"
-#: builtin/replace.c:432
+#: builtin/replace.c:436
msgid "list replace refs"
msgstr "listar referências substituídas"
-#: builtin/replace.c:433
+#: builtin/replace.c:437
msgid "delete replace refs"
msgstr "eliminar referências substituídas"
-#: builtin/replace.c:434
+#: builtin/replace.c:438
msgid "edit existing object"
msgstr "editar objeto existente"
-#: builtin/replace.c:435
+#: builtin/replace.c:439
msgid "change a commit's parents"
msgstr "mudar os pais de um commit"
-#: builtin/replace.c:436
+#: builtin/replace.c:440
msgid "replace the ref if it exists"
msgstr "substituir a referência se esta existir"
-#: builtin/replace.c:437
+#: builtin/replace.c:441
msgid "do not pretty-print contents for --edit"
msgstr "não mostrar o conteúdo de --edit com impressão bonita"
-#: builtin/replace.c:438
+#: builtin/replace.c:442
msgid "use this format"
msgstr "usar este formato"
@@ -12155,7 +12445,8 @@
msgstr "registar resoluções limpas no índice"
#: builtin/reset.c:26
-msgid "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
+msgid ""
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
msgstr ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
@@ -12284,23 +12575,23 @@
msgid "rev-list does not support display of notes"
msgstr "rev-list não suporta apresentação de notas"
-#: builtin/rev-parse.c:391
+#: builtin/rev-parse.c:393
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<opções>] -- [<argumentos>...]"
-#: builtin/rev-parse.c:396
+#: builtin/rev-parse.c:398
msgid "keep the `--` passed as an arg"
msgstr "conservar '--' passado como argumento"
-#: builtin/rev-parse.c:398
+#: builtin/rev-parse.c:400
msgid "stop parsing after the first non-option argument"
msgstr "parar de analisar depois do primeiro argumento que não seja uma opção"
-#: builtin/rev-parse.c:401
+#: builtin/rev-parse.c:403
msgid "output in stuck long form"
msgstr "mostrar em formato fixo e longo"
-#: builtin/rev-parse.c:532
+#: builtin/rev-parse.c:534
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
@@ -12331,68 +12622,72 @@
msgid "git cherry-pick <subcommand>"
msgstr "git cherry-pick <subcommando>"
-#: builtin/revert.c:71
+#: builtin/revert.c:89
#, c-format
msgid "%s: %s cannot be used with %s"
msgstr "%s: %s não pode ser usado com %s"
-#: builtin/revert.c:80
+#: builtin/revert.c:98
msgid "end revert or cherry-pick sequence"
msgstr "terminar reversão ou cherry-pick"
-#: builtin/revert.c:81
+#: builtin/revert.c:99
msgid "resume revert or cherry-pick sequence"
msgstr "retomar a reversão ou cherry-pick"
-#: builtin/revert.c:82
+#: builtin/revert.c:100
msgid "cancel revert or cherry-pick sequence"
msgstr "cancelar reversão ou cherry-pick"
-#: builtin/revert.c:83
+#: builtin/revert.c:101
msgid "don't automatically commit"
msgstr "não submeter automaticamente"
-#: builtin/revert.c:84
+#: builtin/revert.c:102
msgid "edit the commit message"
msgstr "editar a mensagem de commit"
-#: builtin/revert.c:87
-msgid "parent number"
-msgstr "número de pai"
+#: builtin/revert.c:105
+msgid "parent-number"
+msgstr "número-pai"
-#: builtin/revert.c:89
+#: builtin/revert.c:106
+msgid "select mainline parent"
+msgstr "selecionar pai principal"
+
+#: builtin/revert.c:108
msgid "merge strategy"
msgstr "estratégia de integração"
-#: builtin/revert.c:90
+#: builtin/revert.c:109
msgid "option"
msgstr "opção"
-#: builtin/revert.c:91
+#: builtin/revert.c:110
msgid "option for merge strategy"
msgstr "opção de estratégia de integração"
-#: builtin/revert.c:100
+#: builtin/revert.c:119
msgid "append commit name"
msgstr "acrescentar nome do commit"
-#: builtin/revert.c:102
+#: builtin/revert.c:121
msgid "preserve initially empty commits"
msgstr "preservar commits inicialmente vazios"
-#: builtin/revert.c:103
+#: builtin/revert.c:122
msgid "allow commits with empty messages"
msgstr "permitir commits com mensagens vazias"
-#: builtin/revert.c:104
+#: builtin/revert.c:123
msgid "keep redundant, empty commits"
msgstr "manter commits redundantes e vazios"
-#: builtin/revert.c:192
+#: builtin/revert.c:211
msgid "revert failed"
msgstr "falha ao reverter"
-#: builtin/revert.c:205
+#: builtin/revert.c:224
msgid "cherry-pick failed"
msgstr "falha ao efetuar cherry-pick"
@@ -12487,49 +12782,51 @@
"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<diretório> "
"[<referência>...]\n"
-" --all e especificação explicita duma <referência> são mutuamente exclusivos."
+" --all e especificação explicita duma <referência> são mutuamente "
+"exclusivos."
-#: builtin/send-pack.c:160
+#: builtin/send-pack.c:161
msgid "remote name"
msgstr "nome do remoto"
-#: builtin/send-pack.c:171
+#: builtin/send-pack.c:175
msgid "use stateless RPC protocol"
msgstr "use protocolo RPC sem estado"
-#: builtin/send-pack.c:172
+#: builtin/send-pack.c:176
msgid "read refs from stdin"
msgstr "ler referências do stdin"
-#: builtin/send-pack.c:173
+#: builtin/send-pack.c:177
msgid "print status from remote helper"
msgstr "imprimir estado do programa auxiliar remoto"
#: builtin/shortlog.c:13
msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
-msgstr "git shortlog [<opções>] [<intervalo-de-revisões>] [[--] [<caminho>...]]"
+msgstr ""
+"git shortlog [<opções>] [<intervalo-de-revisões>] [[--] [<caminho>...]]"
-#: builtin/shortlog.c:249
+#: builtin/shortlog.c:248
msgid "Group by committer rather than author"
msgstr "agrupar por committer em vez de autor"
-#: builtin/shortlog.c:251
+#: builtin/shortlog.c:250
msgid "sort output according to the number of commits per author"
msgstr "ordenar saída de acordo com o número de commits por autor"
-#: builtin/shortlog.c:253
+#: builtin/shortlog.c:252
msgid "Suppress commit descriptions, only provides commit count"
msgstr "suprimir a descrição dos commits, fornecer apenas o número de commits"
-#: builtin/shortlog.c:255
+#: builtin/shortlog.c:254
msgid "Show the email address of each author"
msgstr "Mostrar o endereço de e-mail de cada autor"
-#: builtin/shortlog.c:256
+#: builtin/shortlog.c:255
msgid "w[,i1[,i2]]"
msgstr "w[,i1[,i2]]"
-#: builtin/shortlog.c:257
+#: builtin/shortlog.c:256
msgid "Linewrap output"
msgstr "ajustar linhas"
@@ -12549,122 +12846,122 @@
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:375
+#: builtin/show-branch.c:374
#, c-format
msgid "ignoring %s; cannot handle more than %d ref"
msgid_plural "ignoring %s; cannot handle more than %d refs"
msgstr[0] "ignorar %s; não é possível processar mais do que %d referência"
msgstr[1] "ingorar %s; não é possível processar mais do que %d referências"
-#: builtin/show-branch.c:541
+#: builtin/show-branch.c:536
#, c-format
msgid "no matching refs with %s"
msgstr "nenhuma referência corresponde com %s"
-#: builtin/show-branch.c:639
+#: builtin/show-branch.c:632
msgid "show remote-tracking and local branches"
msgstr "mostrar os ramos de monitorização remotos e os ramos locais"
-#: builtin/show-branch.c:641
+#: builtin/show-branch.c:634
msgid "show remote-tracking branches"
msgstr "mostrar os ramos de monitorização remotos"
-#: builtin/show-branch.c:643
+#: builtin/show-branch.c:636
msgid "color '*!+-' corresponding to the branch"
msgstr "colorir '*!+-' correspondendo ao ramo"
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:638
msgid "show <n> more commits after the common ancestor"
msgstr "mostrar mais <n> commits depois do antecessor comum"
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:640
msgid "synonym to more=-1"
msgstr "sinónimo de more=-1"
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:641
msgid "suppress naming strings"
msgstr "suprimir a cadeias de caracteres de nomes"
-#: builtin/show-branch.c:650
+#: builtin/show-branch.c:643
msgid "include the current branch"
msgstr "incluir o ramo atual"
-#: builtin/show-branch.c:652
+#: builtin/show-branch.c:645
msgid "name commits with their object names"
msgstr "designar commits pelos seus nomes de objeto"
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:647
msgid "show possible merge bases"
msgstr "mostrar possíveis bases de integração"
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:649
msgid "show refs unreachable from any other ref"
msgstr "mostrar referências inalcançáveis a partir de outras referências"
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:651
msgid "show commits in topological order"
msgstr "mostrar commits em ordem topológica"
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:654
msgid "show only commits not on the first branch"
msgstr "mostrar apenas commits não presentes no primeiro ramo"
-#: builtin/show-branch.c:663
+#: builtin/show-branch.c:656
msgid "show merges reachable from only one tip"
msgstr "mostrar integrações alcançáveis a partir duma única ponta"
-#: builtin/show-branch.c:665
+#: builtin/show-branch.c:658
msgid "topologically sort, maintaining date order where possible"
msgstr ""
"ordenar topologicamente, mantendo a ordenação por data sempre que possível"
-#: builtin/show-branch.c:668
+#: builtin/show-branch.c:661
msgid "<n>[,<base>]"
msgstr "<n>[,<base>]"
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:662
msgid "show <n> most recent ref-log entries starting at base"
msgstr "mostrar as <n> entradas de ref-log mais recente a partir da base"
-#: builtin/show-branch.c:703
+#: builtin/show-branch.c:696
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr ""
"--reflog é incompatível com --all, --remotes, --independent or --merge-base"
-#: builtin/show-branch.c:727
+#: builtin/show-branch.c:720
msgid "no branches given, and HEAD is not valid"
msgstr "nenhum ramo fornecido e HEAD não é válida"
-#: builtin/show-branch.c:730
+#: builtin/show-branch.c:723
msgid "--reflog option needs one branch name"
msgstr "a opção --reflog precisa do nome de um ramo"
-#: builtin/show-branch.c:733
+#: builtin/show-branch.c:726
#, 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] "apenas %d entrada podem ser mostradas neste momento."
msgstr[1] "apenas %d entradas podem ser mostradas neste momento."
-#: builtin/show-branch.c:737
+#: builtin/show-branch.c:730
#, c-format
msgid "no such ref %s"
msgstr "referência inexistente %s"
-#: builtin/show-branch.c:829
+#: builtin/show-branch.c:814
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] "não é possível processar mais do que %d revisão."
msgstr[1] "não é possível processar mais do que %d revisões."
-#: builtin/show-branch.c:833
+#: builtin/show-branch.c:818
#, c-format
msgid "'%s' is not a valid ref."
msgstr "'%s' não é uma referência válida."
-#: builtin/show-branch.c:836
+#: builtin/show-branch.c:821
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "não é possível encontrar o commit %s (%s)"
@@ -12692,7 +12989,8 @@
#: builtin/show-ref.c:161
msgid "stricter reference checking, requires exact ref path"
msgstr ""
-"verificação de referências mais rigorosa, requer o caminho exato da referência"
+"verificação de referências mais rigorosa, requer o caminho exato da "
+"referência"
#: builtin/show-ref.c:164 builtin/show-ref.c:166
msgid "show the HEAD reference, even if it would be filtered out"
@@ -12731,12 +13029,12 @@
msgid "prepend comment character and space to each line"
msgstr "preceder cada linha com um carácter de comentário e um espaço"
-#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1062
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1075
#, c-format
msgid "No such ref: %s"
msgstr "Referência inexistente: %s"
-#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1071
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1084
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Esperava-se um nome completo de uma referência, obteve-se %s"
@@ -12746,93 +13044,102 @@
msgid "cannot strip one component off url '%s'"
msgstr "não é possível tirar um componente do URL '%s'"
-#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:592
+#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630
msgid "alternative anchor for relative paths"
msgstr "âncora alternativa para caminhos relativos"
-#: builtin/submodule--helper.c:287
+#: builtin/submodule--helper.c:310
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<caminho>] [<caminho>...]"
-#: builtin/submodule--helper.c:333 builtin/submodule--helper.c:347
+#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:382
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "Nenhum URL encontrado para o caminho de submódulo '%s' em .gitmodules"
-#: builtin/submodule--helper.c:373
+#: builtin/submodule--helper.c:395
+#, c-format
+msgid ""
+"could not lookup configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr ""
+"não é possível encontrar configuração '%s'. Assumir que este repositório é o "
+"próprio repositório a montante autoritário."
+
+#: builtin/submodule--helper.c:406
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Falha ao registar o URL do caminho de submódulo '%s'"
-#: builtin/submodule--helper.c:377
+#: builtin/submodule--helper.c:410
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Submódulo '%s' (%s) registado com caminho '%s'\n"
-#: builtin/submodule--helper.c:387
+#: builtin/submodule--helper.c:420
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "aviso: modo de atualização do comando sugerido para o submódulo '%s'\n"
-#: builtin/submodule--helper.c:394
+#: builtin/submodule--helper.c:427
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr "Falha ao registar o modo de atualização do caminho de submódulo '%s'"
-#: builtin/submodule--helper.c:410
+#: builtin/submodule--helper.c:443
msgid "Suppress output for initializing a submodule"
msgstr "Suprimir a saída ao inicializar um submódulo"
-#: builtin/submodule--helper.c:415
+#: builtin/submodule--helper.c:448
msgid "git submodule--helper init [<path>]"
msgstr "git submodule--helper init [<caminho>]"
-#: builtin/submodule--helper.c:436
+#: builtin/submodule--helper.c:476
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <caminho>"
-#: builtin/submodule--helper.c:442
+#: builtin/submodule--helper.c:482
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr ""
"nenhum mapeamento de submódulo do caminho '%s' encontrado em .gitmodules"
-#: builtin/submodule--helper.c:525 builtin/submodule--helper.c:528
+#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "o submódulo '%s' não pode adicionar sobressalente: %s"
-#: builtin/submodule--helper.c:564
+#: builtin/submodule--helper.c:604
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "O valor '%s' de submodule.alternateErrorStrategy não é reconhecido"
-#: builtin/submodule--helper.c:571
+#: builtin/submodule--helper.c:611
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "O valor '%s' de submodule.alternateLocation não é reconhecido"
-#: builtin/submodule--helper.c:595
+#: builtin/submodule--helper.c:633
msgid "where the new submodule will be cloned to"
msgstr "sítio para aonde o novo submódulo será clonado"
-#: builtin/submodule--helper.c:598
+#: builtin/submodule--helper.c:636
msgid "name of the new submodule"
msgstr "nome do novo submódulo"
-#: builtin/submodule--helper.c:601
+#: builtin/submodule--helper.c:639
msgid "url where to clone the submodule from"
msgstr "url donde clonar o submódulos"
-#: builtin/submodule--helper.c:607
+#: builtin/submodule--helper.c:645
msgid "depth for shallow clones"
msgstr "profundidade de clones rasos"
-#: builtin/submodule--helper.c:610 builtin/submodule--helper.c:980
+#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993
msgid "force cloning progress"
msgstr "forçar progresso da clonagem"
-#: builtin/submodule--helper.c:615
+#: builtin/submodule--helper.c:653
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -12840,120 +13147,110 @@
"git submodule--helper clone [--prefix=<caminho>] [--quiet] [--reference "
"<repositório>] [--name <nome>] [--depth <depth>] --url <url> --path <caminho>"
-#: builtin/submodule--helper.c:646
+#: builtin/submodule--helper.c:684
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "falha ao clonar '%s' no caminho de submódulo '%s'"
-#: builtin/submodule--helper.c:662
-#, c-format
-msgid "cannot open file '%s'"
-msgstr "não é possível abrir o ficheiro '%s'"
-
-#: builtin/submodule--helper.c:667
-#, c-format
-msgid "could not close file %s"
-msgstr "não é possível fechar o ficheiro %s"
-
-#: builtin/submodule--helper.c:674
+#: builtin/submodule--helper.c:699
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "não foi possível obter o diretório do submódulo de '%s'"
-#: builtin/submodule--helper.c:742
+#: builtin/submodule--helper.c:764
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Caminho de submódulo '%s' não inicializado"
-#: builtin/submodule--helper.c:746
+#: builtin/submodule--helper.c:768
msgid "Maybe you want to use 'update --init'?"
msgstr "Pretendia usar 'update --init'?"
-#: builtin/submodule--helper.c:772
+#: builtin/submodule--helper.c:793
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "A ignorar submódulo %s não integrado"
-#: builtin/submodule--helper.c:793
+#: builtin/submodule--helper.c:814
#, c-format
msgid "Skipping submodule '%s'"
msgstr "A ignorar submódulo '%s'"
-#: builtin/submodule--helper.c:929
+#: builtin/submodule--helper.c:942
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Falha ao clonar '%s'. Nova tentativa agendada"
-#: builtin/submodule--helper.c:940
+#: builtin/submodule--helper.c:953
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Falha ao clonar '%s' pela segunda vez, abortado"
-#: builtin/submodule--helper.c:961 builtin/submodule--helper.c:1105
+#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162
msgid "path into the working tree"
msgstr "caminho para a árvore de trabalho"
-#: builtin/submodule--helper.c:964
+#: builtin/submodule--helper.c:977
msgid "path into the working tree, across nested submodule boundaries"
msgstr ""
"caminho para a árvore de trabalho, atravessando limites de submódulos "
"aninhados"
-#: builtin/submodule--helper.c:968
+#: builtin/submodule--helper.c:981
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout ou none"
-#: builtin/submodule--helper.c:972
+#: builtin/submodule--helper.c:985
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr "criar um clone raso, truncado ao número especificado de revisões"
-#: builtin/submodule--helper.c:975
+#: builtin/submodule--helper.c:988
msgid "parallel jobs"
msgstr "trabalhos em paralelo"
-#: builtin/submodule--helper.c:977
+#: builtin/submodule--helper.c:990
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "se o clone inicial deve seguir a recomendação rasa"
-#: builtin/submodule--helper.c:978
+#: builtin/submodule--helper.c:991
msgid "don't print cloning progress"
msgstr "não imprimir progresso da clonagem"
-#: builtin/submodule--helper.c:985
+#: builtin/submodule--helper.c:998
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<caminho>] [<caminho>...]"
-#: builtin/submodule--helper.c:995
+#: builtin/submodule--helper.c:1008
msgid "bad value for update parameter"
msgstr "valor incorreto no parâmetro update"
-#: builtin/submodule--helper.c:1066
+#: 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 ""
"O ramo do submódulo (%s) foi configurado para herdar o ramo do superprojeto, "
"mas o superprojeto não está em nenhum ramo"
-#: builtin/submodule--helper.c:1106
+#: builtin/submodule--helper.c:1163
msgid "recurse into submodules"
msgstr "percorrer submódulos recursivamente"
-#: builtin/submodule--helper.c:1112
+#: builtin/submodule--helper.c:1169
msgid "git submodule--helper embed-git-dir [<path>...]"
msgstr "git submodule--helper embed-git-dir [<caminho>...]"
-#: builtin/submodule--helper.c:1157
+#: builtin/submodule--helper.c:1226
msgid "submodule--helper subcommand must be called with a subcommand"
msgstr "o subcomando submodule--helper deve ser invocado com um subcomando"
-#: builtin/submodule--helper.c:1164
+#: builtin/submodule--helper.c:1233
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s não suporta --super-prefix"
-#: builtin/submodule--helper.c:1170
+#: builtin/submodule--helper.c:1239
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' não é um subcomando válido de submodule--helper"
@@ -12989,7 +13286,8 @@
#: builtin/tag.c:23
msgid ""
-"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> [<head>]"
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
+"[<head>]"
msgstr ""
"git tag [-a | -s | -u <id-chave>] [-f] [-m <msg> | -F <ficheiro>] <nome-da-"
"tag> [<head>]"
@@ -13000,32 +13298,29 @@
#: builtin/tag.c:25
msgid ""
-"git tag -l [-n[<num>]] [--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[<num>]] [--contains <commit>] [--points-at <objeto>]\n"
+"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] "
+"[--points-at <objeto>]\n"
"\t\t[--format=<formato>] [--[no-]merged [<commit>]] [<padrão>...]"
#: builtin/tag.c:27
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<formato>] <nometag>..."
-#: builtin/tag.c:82
-#, c-format
-msgid "tag name too long: %.*s..."
-msgstr "o nome da tag é demasiado longo: %.*s..."
-
-#: builtin/tag.c:87
+#: builtin/tag.c:83
#, c-format
msgid "tag '%s' not found."
msgstr "tag '%s' não encontrada."
-#: builtin/tag.c:102
+#: builtin/tag.c:99
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Tag '%s' eliminada (era %s)\n"
-#: builtin/tag.c:131
+#: builtin/tag.c:128
#, c-format
msgid ""
"\n"
@@ -13038,7 +13333,7 @@
" %s\n"
"Linha começadas com '%c' serão ignoradas.\n"
-#: builtin/tag.c:135
+#: builtin/tag.c:132
#, c-format
msgid ""
"\n"
@@ -13052,138 +13347,166 @@
" %s\n"
"Linhas começadas com '%c' serão mantidas; pode removê-las se o desejar.\n"
-#: builtin/tag.c:213
+#: builtin/tag.c:210
msgid "unable to sign the tag"
msgstr "não foi possível assinar a tag"
-#: builtin/tag.c:215
+#: builtin/tag.c:212
msgid "unable to write tag file"
msgstr "não foi possível escrever o ficheiro da tag"
-#: builtin/tag.c:240
+#: builtin/tag.c:236
msgid "bad object type."
msgstr "tipo de objeto incorreto."
-#: builtin/tag.c:253
-msgid "tag header too big."
-msgstr "cabeçalho da tag demasiado longo."
-
-#: builtin/tag.c:289
+#: builtin/tag.c:282
msgid "no tag message?"
msgstr "sem mensagem de tag?"
-#: builtin/tag.c:295
+#: builtin/tag.c:289
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "A mensagem da tag foi guardada em %s\n"
-#: builtin/tag.c:354
+#: builtin/tag.c:312
+msgid "tag: tagging "
+msgstr "tag: a colocar tag"
+
+#: builtin/tag.c:320
+msgid "object of unknown type"
+msgstr "objeto de tipo desconhecido"
+
+#: builtin/tag.c:327
+msgid "commit object"
+msgstr "objeto commit"
+
+#: builtin/tag.c:335
+msgid "tree object"
+msgstr "objeto árvore"
+
+#: builtin/tag.c:338
+msgid "blob object"
+msgstr "objeto blob"
+
+#: builtin/tag.c:341
+msgid "other tag object"
+msgstr "outro objeto tag"
+
+#: builtin/tag.c:397
msgid "list tag names"
msgstr "listar os nomes das tag"
-#: builtin/tag.c:356
+#: builtin/tag.c:399
msgid "print <n> lines of each tag message"
msgstr "imprimir <n> linhas de cada mensagem de tag"
-#: builtin/tag.c:358
+#: builtin/tag.c:401
msgid "delete tags"
msgstr "eliminar tags"
-#: builtin/tag.c:359
+#: builtin/tag.c:402
msgid "verify tags"
msgstr "verificar tags"
-#: builtin/tag.c:361
+#: builtin/tag.c:404
msgid "Tag creation options"
msgstr "Opções de criação de tags"
-#: builtin/tag.c:363
+#: builtin/tag.c:406
msgid "annotated tag, needs a message"
msgstr "tag anotada, é necessário uma mensagem"
-#: builtin/tag.c:365
+#: builtin/tag.c:408
msgid "tag message"
msgstr "mensagem da tag"
-#: builtin/tag.c:367
+#: builtin/tag.c:410
msgid "annotated and GPG-signed tag"
msgstr "tag anotada e assinada com GPG"
-#: builtin/tag.c:371
+#: builtin/tag.c:414
msgid "use another key to sign the tag"
msgstr "usar outra chave para assinar a tag"
-#: builtin/tag.c:372
+#: builtin/tag.c:415
msgid "replace the tag if exists"
msgstr "substituir a tag se esta existir"
-#: builtin/tag.c:373 builtin/update-ref.c:368
+#: builtin/tag.c:416 builtin/update-ref.c:368
msgid "create a reflog"
msgstr "criar um reflog"
-#: builtin/tag.c:375
+#: builtin/tag.c:418
msgid "Tag listing options"
msgstr "Opções de listagem de tags"
-#: builtin/tag.c:376
+#: builtin/tag.c:419
msgid "show tag list in columns"
msgstr "mostrar a lista de tags em colunas"
-#: builtin/tag.c:377 builtin/tag.c:378
+#: builtin/tag.c:420 builtin/tag.c:422
msgid "print only tags that contain the commit"
msgstr "imprimir apenas tags que contenham o commit"
-#: builtin/tag.c:379
+#: builtin/tag.c:421 builtin/tag.c:423
+msgid "print only tags that don't contain the commit"
+msgstr "imprimir apenas tags que não contenham o commit"
+
+#: builtin/tag.c:424
msgid "print only tags that are merged"
msgstr "imprimir apenas as tags que foram integradas"
-#: builtin/tag.c:380
+#: builtin/tag.c:425
msgid "print only tags that are not merged"
msgstr "imprimir apenas as tags que não foram integradas"
-#: builtin/tag.c:385
+#: builtin/tag.c:430
msgid "print only tags of the object"
msgstr "imprimir apenas as tags do objeto"
-#: builtin/tag.c:415
+#: builtin/tag.c:469
msgid "--column and -n are incompatible"
msgstr "--column e -n são incompatíveis"
-#: builtin/tag.c:437
-msgid "-n option is only allowed with -l."
-msgstr "a opção -n só é permitida com -l."
+#: builtin/tag.c:491
+msgid "-n option is only allowed in list mode"
+msgstr "a opção -n só é permitida no modo lista"
-#: builtin/tag.c:439
-msgid "--contains option is only allowed with -l."
-msgstr "a opção --contains só é permitida com -l."
+#: builtin/tag.c:493
+msgid "--contains option is only allowed in list mode"
+msgstr "a opção --contains só é permitida no modo lista"
-#: builtin/tag.c:441
-msgid "--points-at option is only allowed with -l."
-msgstr "a opção --points-at só é permitida com -l."
+#: builtin/tag.c:495
+msgid "--no-contains option is only allowed in list mode"
+msgstr "a opção --contains só é permitida no modo lista"
-#: builtin/tag.c:443
-msgid "--merged and --no-merged option are only allowed with -l"
-msgstr "as opções --merged e --no-merged só são permitidas com -l"
+#: builtin/tag.c:497
+msgid "--points-at option is only allowed in list mode"
+msgstr "a opção --points-at só é permitida no modo lista"
-#: builtin/tag.c:454
+#: builtin/tag.c:499
+msgid "--merged and --no-merged options are only allowed in list mode"
+msgstr "as opções --merged e --no-merged só são permitidas no modo lista"
+
+#: builtin/tag.c:510
msgid "only one -F or -m option is allowed."
msgstr "só é permitido um opção -F ou -m."
-#: builtin/tag.c:473
+#: builtin/tag.c:529
msgid "too many params"
msgstr "demasiado parâmetros"
-#: builtin/tag.c:479
+#: builtin/tag.c:535
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' não é um nome de tag válido."
-#: builtin/tag.c:484
+#: builtin/tag.c:540
#, c-format
msgid "tag '%s' already exists"
msgstr "a tag '%s' já existe"
-#: builtin/tag.c:512
+#: builtin/tag.c:570
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Tag '%s' atualizada (era %s)\n"
@@ -13212,176 +13535,193 @@
msgid "failed to delete file %s"
msgstr "falha ao eliminar o ficheiro %s"
-#: builtin/update-index.c:110 builtin/update-index.c:212
+#: builtin/update-index.c:110 builtin/update-index.c:216
#, c-format
msgid "failed to delete directory %s"
msgstr "falha ao eliminar o diretório %s"
-#: builtin/update-index.c:133
+#: builtin/update-index.c:135
#, c-format
msgid "Testing mtime in '%s' "
msgstr "A testar mtime em '%s' "
-#: builtin/update-index.c:145
+#: builtin/update-index.c:149
msgid "directory stat info does not change after adding a new file"
msgstr ""
"a informação de stat do diretório não mudou depois de adicionar um novo "
"ficheiro"
-#: builtin/update-index.c:158
+#: builtin/update-index.c:162
msgid "directory stat info does not change after adding a new directory"
msgstr ""
"a informação de stat do diretório não mudou depois de adicionar um novo "
"diretório"
-#: builtin/update-index.c:171
+#: builtin/update-index.c:175
msgid "directory stat info changes after updating a file"
msgstr "a informação de stat mudou depois de atualizar um ficheiro"
-#: builtin/update-index.c:182
+#: builtin/update-index.c:186
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
"a informação de stat do diretório mudou depois de adicionar um ficheiro "
"dentro dum subdiretório"
-#: builtin/update-index.c:193
+#: builtin/update-index.c:197
msgid "directory stat info does not change after deleting a file"
msgstr ""
"a informação de stat do diretório não mudou depois de eliminar um ficheiro"
-#: builtin/update-index.c:206
+#: builtin/update-index.c:210
msgid "directory stat info does not change after deleting a directory"
msgstr ""
"a informação de stat do diretório não mudou depois de eliminar um diretório"
-#: builtin/update-index.c:213
+#: builtin/update-index.c:217
msgid " OK"
msgstr " OK"
-#: builtin/update-index.c:564
+#: builtin/update-index.c:568
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<opções>] [--] [<ficheiro>...]"
-#: builtin/update-index.c:919
+#: builtin/update-index.c:923
msgid "continue refresh even when index needs update"
msgstr "continuar a refrescar mesmo quando o índice precise de ser atualizado"
-#: builtin/update-index.c:922
+#: builtin/update-index.c:926
msgid "refresh: ignore submodules"
msgstr "refrescar: ignorar submódulos"
-#: builtin/update-index.c:925
+#: builtin/update-index.c:929
msgid "do not ignore new files"
msgstr "não ignorar novos ficheiros"
-#: builtin/update-index.c:927
+#: builtin/update-index.c:931
msgid "let files replace directories and vice-versa"
msgstr "deixar que os ficheiros substituam os diretórios e vice-versa"
-#: builtin/update-index.c:929
+#: builtin/update-index.c:933
msgid "notice files missing from worktree"
msgstr "avisar sobre ficheiros que faltem na árvore de trabalho"
-#: builtin/update-index.c:931
+#: builtin/update-index.c:935
msgid "refresh even if index contains unmerged entries"
msgstr "refrescar mesmo que o índice contenha entradas não integradas"
-#: builtin/update-index.c:934
+#: builtin/update-index.c:938
msgid "refresh stat information"
msgstr "refrescar informação de stat"
-#: builtin/update-index.c:938
+#: builtin/update-index.c:942
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "como --refresh, mas ignorar a definição assume-unchanged"
-#: builtin/update-index.c:942
+#: builtin/update-index.c:946
msgid "<mode>,<object>,<path>"
msgstr "<modo>,<objeto>,<caminho>"
-#: builtin/update-index.c:943
+#: builtin/update-index.c:947
msgid "add the specified entry to the index"
msgstr "adicionar o elemento especificado ao índice"
-#: builtin/update-index.c:952
+#: builtin/update-index.c:956
msgid "mark files as \"not changing\""
msgstr "marcar ficheiros como \"não alterados\""
-#: builtin/update-index.c:955
+#: builtin/update-index.c:959
msgid "clear assumed-unchanged bit"
msgstr "limpar o bit assumed-unchanged"
-#: builtin/update-index.c:958
+#: builtin/update-index.c:962
msgid "mark files as \"index-only\""
msgstr "marcar ficheiros como \"únicos do índice\""
-#: builtin/update-index.c:961
+#: builtin/update-index.c:965
msgid "clear skip-worktree bit"
msgstr "limpar o bit ignorar-árvore-de-trabalho"
-#: builtin/update-index.c:964
+#: builtin/update-index.c:968
msgid "add to index only; do not add content to object database"
msgstr ""
"só adicionar ao índice; não adicionar o conteúdo à base de dados de objetos"
-#: builtin/update-index.c:966
+#: builtin/update-index.c:970
msgid "remove named paths even if present in worktree"
msgstr ""
"remover os caminhos mencionado mesmo se estiverem presentes na árvore de "
"trabalho"
-#: builtin/update-index.c:968
+#: builtin/update-index.c:972
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "com --stdin: as linhas da entrada são terminadas com bytes nulos"
-#: builtin/update-index.c:970
+#: builtin/update-index.c:974
msgid "read list of paths to be updated from standard input"
msgstr "ler lista de caminho a atualizar da entrada padrão"
-#: builtin/update-index.c:974
+#: builtin/update-index.c:978
msgid "add entries from standard input to the index"
msgstr "adicionar elementos da entrada padrão ao índice"
-#: builtin/update-index.c:978
+#: builtin/update-index.c:982
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "repovoar as fases nº2 e nº3 dos caminhos listados"
-#: builtin/update-index.c:982
+#: builtin/update-index.c:986
msgid "only update entries that differ from HEAD"
msgstr "atualizar apenas elementos que difiram de HEAD"
-#: builtin/update-index.c:986
+#: builtin/update-index.c:990
msgid "ignore files missing from worktree"
msgstr "ignorar ficheiros não presentes na árvore de trabalho"
-#: builtin/update-index.c:989
+#: builtin/update-index.c:993
msgid "report actions to standard output"
msgstr "mostrar ações na saída padrão"
-#: builtin/update-index.c:991
-msgid "(for porcelains) forget saved unresolved conflicts"
-msgstr "(para porcelanas) esquecer conflitos guardados que não foram resolvidos"
-
#: builtin/update-index.c:995
+msgid "(for porcelains) forget saved unresolved conflicts"
+msgstr ""
+"(para porcelanas) esquecer conflitos guardados que não foram resolvidos"
+
+#: builtin/update-index.c:999
msgid "write index in this format"
msgstr "escrever o índice neste formato"
-#: builtin/update-index.c:997
+#: builtin/update-index.c:1001
msgid "enable or disable split index"
msgstr "ativar ou desativar a divisão do índice"
-#: builtin/update-index.c:999
+#: builtin/update-index.c:1003
msgid "enable/disable untracked cache"
msgstr "ativar ou desativar cache não controlada"
-#: builtin/update-index.c:1001
+#: builtin/update-index.c:1005
msgid "test if the filesystem supports untracked cache"
msgstr "testar se o sistema de ficheiros suporta cache não controlada"
-#: builtin/update-index.c:1003
+#: builtin/update-index.c:1007
msgid "enable untracked cache without testing the filesystem"
msgstr "ativar cache não controlada sem testar o sistema de ficheiros"
-#: builtin/update-index.c:1120
+#: builtin/update-index.c:1107
+msgid ""
+"core.splitIndex is set to false; remove or change it, if you really want to "
+"enable split index"
+msgstr ""
+"core.splitIndex está definida como false; remova ou altere-a se pretende "
+"mesmo ativar índice separado"
+
+#: builtin/update-index.c:1116
+msgid ""
+"core.splitIndex is set to true; remove or change it, if you really want to "
+"disable split index"
+msgstr ""
+"core.splitIndex está definida como true; remova ou altere-a se pretende "
+"mesmo desativar índice separado"
+
+#: builtin/update-index.c:1127
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
@@ -13389,11 +13729,11 @@
"core.untrackedCache está definida como true; remova ou altere-a se pretende "
"mesmo desativar a cache não controlada"
-#: builtin/update-index.c:1124
+#: builtin/update-index.c:1131
msgid "Untracked cache disabled"
msgstr "A cache não controlada está desativada"
-#: builtin/update-index.c:1132
+#: builtin/update-index.c:1139
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
@@ -13401,7 +13741,7 @@
"core.untrackedCache está definida como false; remova ou altere-a se pretende "
"mesmo ativar a cache não controlada"
-#: builtin/update-index.c:1136
+#: builtin/update-index.c:1143
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "A cache não controlada de '%s' foi ativada."
@@ -13547,51 +13887,51 @@
msgid "Preparing %s (identifier %s)"
msgstr "A preparar %s (identificador %s)"
-#: builtin/worktree.c:323
+#: builtin/worktree.c:324
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
"extrair o <ramo> mesmo se já tenha sido extraído noutra árvore de trabalho"
-#: builtin/worktree.c:325
+#: builtin/worktree.c:326
msgid "create a new branch"
msgstr "criar um novo ramo"
-#: builtin/worktree.c:327
+#: builtin/worktree.c:328
msgid "create or reset a branch"
msgstr "criar ou repor um ramo"
-#: builtin/worktree.c:329
+#: builtin/worktree.c:330
msgid "populate the new working tree"
msgstr "povoar a nova árvore de trabalho"
-#: builtin/worktree.c:337
+#: builtin/worktree.c:338
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B e --detach são mutuamente exclusivos"
-#: builtin/worktree.c:472
+#: builtin/worktree.c:473
msgid "reason for locking"
msgstr "razão de trancar"
-#: builtin/worktree.c:484 builtin/worktree.c:517
+#: builtin/worktree.c:485 builtin/worktree.c:518
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' não é uma árvore de trabalho"
-#: builtin/worktree.c:486 builtin/worktree.c:519
+#: builtin/worktree.c:487 builtin/worktree.c:520
msgid "The main working tree cannot be locked or unlocked"
msgstr "A árvore de trabalho principal não pode ser trancada nem destrancada"
-#: builtin/worktree.c:491
+#: builtin/worktree.c:492
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' já está trancada, razão: %s"
-#: builtin/worktree.c:493
+#: builtin/worktree.c:494
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' já está trancada"
-#: builtin/worktree.c:521
+#: builtin/worktree.c:522
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' não está trancada"
@@ -13616,19 +13956,19 @@
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<opções>] <dir>"
-#: upload-pack.c:1036
+#: upload-pack.c:1040
msgid "quit after a single request/response exchange"
msgstr "terminar depois de uma única troca de pedido/resposta"
-#: upload-pack.c:1038
+#: upload-pack.c:1042
msgid "exit immediately after initial ref advertisement"
msgstr "sair imediatamente depois do anúncio inicial da referência"
-#: upload-pack.c:1040
+#: upload-pack.c:1044
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr "não tentar <diretório>/.git/ se o <diretório> não for um diretório Git"
-#: upload-pack.c:1042
+#: upload-pack.c:1046
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "interromper transferência depois de <n> segundos de inatividade"
@@ -13660,15 +14000,15 @@
"guias de conceitos. Consulte 'git help <comando>' ou 'git help <conceito>'\n"
"para ler sobre um subcomando ou conceito específico."
-#: http.c:344
+#: http.c:355
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "Não é suportado delegar controlo com cURL < 7.22.0"
-#: http.c:353
+#: http.c:364
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "Não é suportado afixar chaves públicas com cURL < 7.44.0"
-#: http.c:1713
+#: http.c:1755
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -13679,7 +14019,7 @@
" pedido para: %s\n"
" redireção: %s"
-#: remote-curl.c:319
+#: remote-curl.c:323
#, c-format
msgid "redirecting to %s"
msgstr "a redirecionar para %s "
@@ -13811,7 +14151,8 @@
#: rerere.h:40
msgid "update the index with reused conflict resolution if possible"
-msgstr "atualizar o índice com resoluções de conflitos reutilizadas se possível"
+msgstr ""
+"atualizar o índice com resoluções de conflitos reutilizadas se possível"
#: git-bisect.sh:54
msgid "You need to start by \"git bisect start\""
@@ -13842,7 +14183,8 @@
#, sh-format
msgid ""
"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
-msgstr "Falha ao extrair '$start_head'. Tente 'git bisect reset <ramo-válido>'."
+msgstr ""
+"Falha ao extrair '$start_head'. Tente 'git bisect reset <ramo-válido>'."
#: git-bisect.sh:177
msgid "won't bisect on cg-seek'ed tree"
@@ -14011,7 +14353,8 @@
#: git-merge-octopus.sh:46
msgid ""
-"Error: Your local changes to the following files would be overwritten by merge"
+"Error: Your local changes to the following files would be overwritten by "
+"merge"
msgstr ""
"Erro: As suas alterações locais nos seguintes ficheiros seriam substituídas "
"ao integrar"
@@ -14182,39 +14525,39 @@
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "$branch_name avançado rapidamente para $onto_name."
-#: git-stash.sh:50
+#: git-stash.sh:53
msgid "git stash clear with parameters is unimplemented"
msgstr "não está implementado git stash clear com parâmetros"
-#: git-stash.sh:73
+#: git-stash.sh:94
msgid "You do not have the initial commit yet"
msgstr "O commit inicial ainda não existe"
-#: git-stash.sh:88
+#: git-stash.sh:109
msgid "Cannot save the current index state"
msgstr "Não é possível guardar o estado atual do índice"
-#: git-stash.sh:103
+#: git-stash.sh:124
msgid "Cannot save the untracked files"
msgstr "Não é possível guardar os ficheiros não controlados"
-#: git-stash.sh:123 git-stash.sh:136
+#: git-stash.sh:144 git-stash.sh:157
msgid "Cannot save the current worktree state"
msgstr "Não é possível guardar o estado atual da árvore de trabalho"
-#: git-stash.sh:140
+#: git-stash.sh:161
msgid "No changes selected"
msgstr "Nenhuma alteração selecionada"
-#: git-stash.sh:143
+#: git-stash.sh:164
msgid "Cannot remove temporary index (can't happen)"
msgstr "Não é possível remover o índice temporário (não pode acontecer)"
-#: git-stash.sh:156
+#: git-stash.sh:177
msgid "Cannot record working tree state"
msgstr "Não é possível gravar o estado da árvore de trabalho"
-#: git-stash.sh:188
+#: git-stash.sh:209
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr "Não é possível atualizar $ref_stash com $w_commit"
@@ -14229,7 +14572,7 @@
#. $ 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:238
+#: git-stash.sh:265
#, sh-format
msgid ""
"error: unknown option for 'stash save': $option\n"
@@ -14238,108 +14581,108 @@
"erro: opção desconhecida de 'stash save': $option\n"
" Para fornecer uma mensagem, use git stash save -- '$option'"
-#: git-stash.sh:251
+#: git-stash.sh:278
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr ""
"Não é possível usar --patch e --include-untracked ou --all ao mesmo tempo"
-#: git-stash.sh:259
+#: git-stash.sh:286
msgid "No local changes to save"
msgstr "Não há alterações locais para guardar"
-#: git-stash.sh:263
+#: git-stash.sh:291
msgid "Cannot initialize stash"
msgstr "Não é possível inicializar a pilha"
-#: git-stash.sh:267
+#: git-stash.sh:295
msgid "Cannot save the current status"
msgstr "Não é possível guardar o estado atual"
-#: git-stash.sh:268
+#: git-stash.sh:296
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr "Diretório de trabalho e estado do índice $stash_msg guardados"
-#: git-stash.sh:285
+#: git-stash.sh:323
msgid "Cannot remove worktree changes"
msgstr "Não é possível remover as alterações da árvore de trabalho"
-#: git-stash.sh:403
+#: git-stash.sh:471
#, sh-format
msgid "unknown option: $opt"
msgstr "opção desconhecido: $opt"
-#: git-stash.sh:416
+#: git-stash.sh:484
msgid "No stash found."
msgstr "Nenhuma pilha encontrada."
-#: git-stash.sh:423
+#: git-stash.sh:491
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "Demasiadas revisões especificadas: $REV"
-#: git-stash.sh:438
+#: git-stash.sh:506
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference não é uma referência válida"
-#: git-stash.sh:466
+#: git-stash.sh:534
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' não é um commit semelhante a pilha"
-#: git-stash.sh:477
+#: git-stash.sh:545
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args' não é uma referência de pilha"
-#: git-stash.sh:485
+#: git-stash.sh:553
msgid "unable to refresh index"
msgstr "não foi possível refrescar o índice"
-#: git-stash.sh:489
+#: git-stash.sh:557
msgid "Cannot apply a stash in the middle of a merge"
msgstr "Não é possível aplicar uma pilha durante uma integração"
-#: git-stash.sh:497
+#: git-stash.sh:565
msgid "Conflicts in index. Try without --index."
msgstr "Conflitos no índice. Tente sem --index."
-#: git-stash.sh:499
+#: git-stash.sh:567
msgid "Could not save index tree"
msgstr "Não foi possível guardar árvore do índice"
-#: git-stash.sh:508
+#: git-stash.sh:576
msgid "Could not restore untracked files from stash"
msgstr "Não foi possível restaurar os ficheiros não controlados da pilha"
-#: git-stash.sh:533
+#: git-stash.sh:601
msgid "Cannot unstage modified files"
msgstr "Não é possível despreparar os ficheiros modificado"
-#: git-stash.sh:548
+#: git-stash.sh:616
msgid "Index was not unstashed."
msgstr "O índice não foi reposto."
-#: git-stash.sh:562
+#: git-stash.sh:630
msgid "The stash is kept in case you need it again."
msgstr "A pilha é guarda no caso de precisar dela de novo."
-#: git-stash.sh:571
+#: git-stash.sh:639
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "A descartar ${REV} ($s)"
-#: git-stash.sh:572
+#: git-stash.sh:640
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: Não foi possível descartar elemento da pilha"
-#: git-stash.sh:580
+#: git-stash.sh:648
msgid "No branch name specified"
msgstr "Nenhum nome de ramo especificado"
-#: git-stash.sh:652
+#: git-stash.sh:727
msgid "(To restore them type \"git stash apply\")"
msgstr "(Para os restaurar execute \"git stash apply\")"
@@ -14396,7 +14739,8 @@
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"
+"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 ""
@@ -14426,29 +14770,29 @@
msgid "Failed to register submodule '$sm_path'"
msgstr "Falha ao registar o submódulo '$sm_path'"
-#: git-submodule.sh:327
+#: git-submodule.sh:341
#, sh-format
msgid "Entering '$displaypath'"
msgstr "A entrar em '$displaypath'"
-#: git-submodule.sh:347
+#: git-submodule.sh:361
#, sh-format
msgid "Stopping at '$displaypath'; script returned non-zero status."
msgstr ""
"Interrompido em '$displaypath'; o script retornou um valor diferente de zero."
-#: git-submodule.sh:418
+#: git-submodule.sh:432
#, sh-format
msgid "pathspec and --all are incompatible"
msgstr "especificador de caminho e --all são incompatíveis"
-#: git-submodule.sh:423
+#: git-submodule.sh:437
#, sh-format
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
"Use '--all' se pretende mesmo anular a inicialização todos os submódulos"
-#: git-submodule.sh:443
+#: git-submodule.sh:457
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains a .git directory\n"
@@ -14457,7 +14801,7 @@
"A árvore de trabalho do submódulo '$displaypath' contém um diretório .git\n"
"(use 'rm -rf' se pretende mesmo removê-lo, incluindo todo o seu histórico)"
-#: git-submodule.sh:451
+#: git-submodule.sh:465
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
@@ -14466,41 +14810,41 @@
"A árvore de trabalho do submódulo '$displaypath' contém alterações locais; "
"use '-f' para as descartar"
-#: git-submodule.sh:454
+#: git-submodule.sh:468
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "Diretório '$displaypath' limpo"
-#: git-submodule.sh:455
+#: git-submodule.sh:469
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr ""
"Não foi possível remover a árvore de trabalho do submódulo '$displaypath'"
-#: git-submodule.sh:458
+#: git-submodule.sh:472
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr "Não foi possível criar o diretório vazio do submódulo '$displaypath'"
-#: git-submodule.sh:467
+#: git-submodule.sh:481
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr ""
"O registo do submódulo '$name' ($url) foi removido do caminho '$displaypath'"
-#: git-submodule.sh:623
+#: git-submodule.sh:637
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
"Não foi possível encontrar a revisão atual no caminho de submódulo "
"'$displaypath'"
-#: git-submodule.sh:633
+#: git-submodule.sh:647
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Não foi possível obter no caminho de submódulo '$sm_path'"
-#: git-submodule.sh:638
+#: git-submodule.sh:652
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -14509,12 +14853,12 @@
"Não foi possível encontrar a revisão atual ${remote_name}/${branch} no "
"caminho de submódulo '$sm_path'"
-#: git-submodule.sh:656
+#: git-submodule.sh:670
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "Não é possível obter no caminho de submódulo '$displaypath'"
-#: git-submodule.sh:662
+#: git-submodule.sh:676
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -14523,84 +14867,84 @@
"Obteve-se no caminho de submódulo '$displaypath', mas não continha $sha1. "
"Falha ao obter aquele commit diretamente."
-#: git-submodule.sh:669
+#: git-submodule.sh:683
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "Não é possível extrair '$sha1' no caminho de submódulo '$displaypath'"
-#: git-submodule.sh:670
+#: git-submodule.sh:684
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Caminho de submódulo '$displaypath': '$sha1' extraído"
-#: git-submodule.sh:674
+#: git-submodule.sh:688
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
"Não foi possível efetuar rebase de '$sha1' no caminho de submódulo "
"'$displaypath'"
-#: git-submodule.sh:675
+#: git-submodule.sh:689
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Caminho de submódulo '$displaypath': rebase concluído em '$sha1'"
-#: git-submodule.sh:680
+#: git-submodule.sh:694
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "Não é possível integrar '$sha1' no caminho de submódulo '$displaypath'"
-#: git-submodule.sh:681
+#: git-submodule.sh:695
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Caminho de submódulo '$displaypath': integrado em '$sha1'"
-#: git-submodule.sh:686
+#: git-submodule.sh:700
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
"Falha ao executar '$command $sha1' no caminho de submódulo '$displaypath'"
-#: git-submodule.sh:687
+#: git-submodule.sh:701
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Caminho de submódulo '$displaypath': '$command $sha1'"
-#: git-submodule.sh:718
+#: git-submodule.sh:732
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Falha ao percorrer o caminho de submódulo '$displaypath'"
-#: git-submodule.sh:826
+#: git-submodule.sh:840
msgid "The --cached option cannot be used with the --files option"
msgstr "A opção --cached não pode ser usada com a opção --files"
-#: git-submodule.sh:878
+#: git-submodule.sh:892
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "modo inesperado $mod_dst"
-#: git-submodule.sh:898
+#: git-submodule.sh:912
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Aviso: $display_name não contém o commit $sha1_src"
-#: git-submodule.sh:901
+#: git-submodule.sh:915
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Warn: $display_name não contém o commit $sha1_dst"
-#: git-submodule.sh:904
+#: git-submodule.sh:918
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr " Warn: $display_name contém os commits $sha1_src e $sha1_dst"
-#: git-submodule.sh:1051
+#: git-submodule.sh:1064
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "Falha ao percorrer recursivamente o caminho de submódulo '$sm_path'"
-#: git-submodule.sh:1118
+#: git-submodule.sh:1136
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "A sincronizar o URL do submódulo '$displaypath'"
@@ -14871,7 +15215,8 @@
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 ""
"Para evitar esta mensagem, use \"drop\" para remover um commit "
@@ -14901,11 +15246,11 @@
msgid "Or you can abort the rebase with 'git rebase --abort'."
msgstr "Ou pode abortar o rebase com 'git rebase --abort'."
-#: git-rebase--interactive.sh:1079
+#: git-rebase--interactive.sh:1083
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "Não foi possível remover CHERRY_PICK_HEAD"
-#: git-rebase--interactive.sh:1084
+#: git-rebase--interactive.sh:1088
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
@@ -14936,11 +15281,11 @@
"\n"
" git rebase --continue\n"
-#: git-rebase--interactive.sh:1101
+#: git-rebase--interactive.sh:1105
msgid "Error trying to find the author identity to amend commit"
msgstr "Erro ao tentar encontrar a identidade do autor para emendar o commit"
-#: git-rebase--interactive.sh:1106
+#: git-rebase--interactive.sh:1110
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
@@ -14948,11 +15293,11 @@
"Tem alterações por submeter na árvore de trabalho. Submeta-as primeiro\n"
"e execute 'git rebase --continue' de novo."
-#: git-rebase--interactive.sh:1111 git-rebase--interactive.sh:1115
+#: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119
msgid "Could not commit staged changes."
msgstr "Não foi possível submeter as alterações preparadas."
-#: git-rebase--interactive.sh:1139
+#: git-rebase--interactive.sh:1147
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -14966,40 +15311,40 @@
" git rebase --continue\n"
"\n"
-#: git-rebase--interactive.sh:1147 git-rebase--interactive.sh:1305
+#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313
msgid "Could not execute editor"
msgstr "Não foi possível executar o editor"
-#: git-rebase--interactive.sh:1160
+#: git-rebase--interactive.sh:1168
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "Não foi possível extrair $switch_to"
-#: git-rebase--interactive.sh:1165
+#: git-rebase--interactive.sh:1173
msgid "No HEAD?"
msgstr "Sem HEAD?"
-#: git-rebase--interactive.sh:1166
+#: git-rebase--interactive.sh:1174
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "Não foi possível criar $state_dir temporário"
-#: git-rebase--interactive.sh:1168
+#: git-rebase--interactive.sh:1176
msgid "Could not mark as interactive"
msgstr "Não foi possível marcar como interativo"
-#: git-rebase--interactive.sh:1178 git-rebase--interactive.sh:1183
+#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191
msgid "Could not init rewritten commits"
msgstr "Não foi possível inicializar commits reescritos"
-#: git-rebase--interactive.sh:1283
+#: git-rebase--interactive.sh:1291
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
msgstr[0] "Rebase $shortrevisions sobre $shortonto ($todocount comando)"
msgstr[1] "Rebase $shortrevisions sobre $shortonto ($todocount comandos)"
-#: git-rebase--interactive.sh:1288
+#: git-rebase--interactive.sh:1296
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -15009,7 +15354,7 @@
"No entanto, se remover tudo, o rebase será abortado.\n"
"\n"
-#: git-rebase--interactive.sh:1295
+#: git-rebase--interactive.sh:1303
msgid "Note that empty commits are commented out"
msgstr "Note que commits vazios são comentados"
@@ -15088,68 +15433,68 @@
msgid "unstaged"
msgstr "não preparado"
-#: git-add--interactive.perl:297 git-add--interactive.perl:322
+#: git-add--interactive.perl:288 git-add--interactive.perl:313
msgid "binary"
msgstr "binário"
-#: git-add--interactive.perl:306 git-add--interactive.perl:360
+#: git-add--interactive.perl:297 git-add--interactive.perl:351
msgid "nothing"
msgstr "nada"
-#: git-add--interactive.perl:342 git-add--interactive.perl:357
+#: git-add--interactive.perl:333 git-add--interactive.perl:348
msgid "unchanged"
msgstr "não alterado"
-#: git-add--interactive.perl:653
+#: git-add--interactive.perl:644
#, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] "%d caminho adicionar\n"
msgstr[1] "%d caminhos adicionados\n"
-#: git-add--interactive.perl:656
+#: git-add--interactive.perl:647
#, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] "%d caminho atualizado\n"
msgstr[1] "%d caminhos atualizados\n"
-#: git-add--interactive.perl:659
+#: git-add--interactive.perl:650
#, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] "%d caminho revertido\n"
msgstr[1] "%d caminhos revertidos\n"
-#: git-add--interactive.perl:662
+#: git-add--interactive.perl:653
#, perl-format
msgid "touched %d path\n"
msgid_plural "touched %d paths\n"
msgstr[0] "%d caminho afetado\n"
msgstr[1] "%d caminhos afetados\n"
-#: git-add--interactive.perl:671
+#: git-add--interactive.perl:662
msgid "Update"
msgstr "Atualizar"
-#: git-add--interactive.perl:683
+#: git-add--interactive.perl:674
msgid "Revert"
msgstr "Reverter"
-#: git-add--interactive.perl:706
+#: git-add--interactive.perl:697
#, perl-format
msgid "note: %s is untracked now.\n"
msgstr "nota: %s é agora não controlado.\n"
-#: git-add--interactive.perl:717
+#: git-add--interactive.perl:708
msgid "Add untracked"
msgstr "Adicionar não controlados"
-#: git-add--interactive.perl:723
+#: git-add--interactive.perl:714
msgid "No untracked files.\n"
msgstr "Nenhum ficheiros não controlado.\n"
-#: git-add--interactive.perl:1039
+#: git-add--interactive.perl:1030
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
@@ -15157,7 +15502,7 @@
"Se o patch se aplicar corretamente, o excerto editado será marcado\n"
"como preparado imediatamente."
-#: git-add--interactive.perl:1042
+#: git-add--interactive.perl:1033
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
@@ -15165,7 +15510,7 @@
"Se o patch se aplicar corretamente, o excerto editado será marcado\n"
"como escondido imediatamente."
-#: git-add--interactive.perl:1045
+#: git-add--interactive.perl:1036
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
@@ -15173,7 +15518,7 @@
"Se o patch se aplicar corretamente, o excerto editado será marcado\n"
"como não preparado imediatamente."
-#: git-add--interactive.perl:1048 git-add--interactive.perl:1057
+#: git-add--interactive.perl:1039 git-add--interactive.perl:1048
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
@@ -15181,15 +15526,7 @@
"Se o patch se aplicar corretamente, o excerto editado será marcado\n"
"para ser aplicado imediatamente."
-#: git-add--interactive.perl:1051
-msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be\n"
-"marked for discarding"
-msgstr ""
-"Se o patch se aplicar corretamente, o excerto editado será marcado\n"
-"para ser descartado imediatamente."
-
-#: git-add--interactive.perl:1054
+#: git-add--interactive.perl:1042 git-add--interactive.perl:1045
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
@@ -15197,16 +15534,17 @@
"Se o patch se aplicar corretamente, o excerto editado será marcado\n"
"para ser descartado imediatamente."
-#: git-add--interactive.perl:1067
+#: git-add--interactive.perl:1058
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
-msgstr "não foi possível abrir o ficheiro de edição do excerto para escrita: %s"
+msgstr ""
+"não foi possível abrir o ficheiro de edição do excerto para escrita: %s"
-#: git-add--interactive.perl:1068
+#: git-add--interactive.perl:1059
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr "Modo de edição manual de excerto -- ver guia rápido abaixo no final.\n"
-#: git-add--interactive.perl:1074
+#: git-add--interactive.perl:1065
#, perl-format
msgid ""
"---\n"
@@ -15220,7 +15558,7 @@
"Linhas começadas com %s serão removidas.\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1082
+#: git-add--interactive.perl:1073
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"
@@ -15230,10 +15568,11 @@
"de novo. Se todas as linhas do excerto forem removidas, a edição é\n"
"abortada e o exceto é deixado inalterado.\n"
-#: git-add--interactive.perl:1096
+#: git-add--interactive.perl:1087
#, perl-format
msgid "failed to open hunk edit file for reading: %s"
-msgstr "não foi possível abrir o ficheiro de edição do excerto para leitura: %s"
+msgstr ""
+"não foi possível abrir o ficheiro de edição do excerto para leitura: %s"
#. TRANSLATORS: do not translate [y/n]
#. The program will only accept that input
@@ -15241,14 +15580,14 @@
#. 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:1187
+#: git-add--interactive.perl:1178
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
"O excerto que editou não aplica.\n"
"Edite de novo (responder \"não\" descarta!) [y/n]? "
-#: git-add--interactive.perl:1196
+#: git-add--interactive.perl:1187
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -15262,7 +15601,7 @@
"a - preparar este excerto e todos os excertos seguintes no ficheiro\n"
"d - não preparar este excerto nem os excertos seguintes no ficheiro"
-#: git-add--interactive.perl:1202
+#: git-add--interactive.perl:1193
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -15276,7 +15615,7 @@
"a - esconder este excerto e todos os seguintes no ficheiro\n"
"d - não esconder este excerto nem os excertos seguintes no ficheiro"
-#: git-add--interactive.perl:1208
+#: git-add--interactive.perl:1199
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -15290,7 +15629,7 @@
"a - despreparar este excerto e todos os excertos seguintes no ficheiro\n"
"d - não despreparar este excerto nem os excertos seguintes no ficheiro"
-#: git-add--interactive.perl:1214
+#: git-add--interactive.perl:1205
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -15304,7 +15643,7 @@
"a - aplicar este excerto e todos os excertos seguintes no ficheiro\n"
"d - não aplicar este excerto nem os excertos seguintes no ficheiro"
-#: git-add--interactive.perl:1220
+#: git-add--interactive.perl:1211
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -15318,7 +15657,7 @@
"a - descartar este excerto e todos os excertos seguintes no ficheiro\n"
"d - não descartar este excerto nem os excertos seguintes no ficheiro"
-#: git-add--interactive.perl:1226
+#: git-add--interactive.perl:1217
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -15332,7 +15671,7 @@
"a - descartar este excerto e todos os excertos seguintes no ficheiro\n"
"d - não descartar este excerto nem os excertos seguintes no ficheiro"
-#: git-add--interactive.perl:1232
+#: git-add--interactive.perl:1223
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -15346,7 +15685,7 @@
"a - aplicar este excerto e todos os excertos seguintes no ficheiro\n"
"d - não aplicar este excerto nem os excertos seguintes no ficheiro"
-#: git-add--interactive.perl:1241
+#: git-add--interactive.perl:1232
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
@@ -15368,208 +15707,211 @@
"e - editar manualmente o excerto atual\n"
"? - imprimir ajuda\n"
-#: git-add--interactive.perl:1272
+#: git-add--interactive.perl:1263
msgid "The selected hunks do not apply to the index!\n"
msgstr "Os excertos selecionados não aplicam ao índice!\n"
-#: git-add--interactive.perl:1273
+#: git-add--interactive.perl:1264
msgid "Apply them to the worktree anyway? "
msgstr "Aplicá-los à árvore de trabalho mesmo assim? "
-#: git-add--interactive.perl:1276
+#: git-add--interactive.perl:1267
msgid "Nothing was applied.\n"
msgstr "Não foi aplicado nada.\n"
-#: git-add--interactive.perl:1287
+#: git-add--interactive.perl:1278
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "ignorado não integrado: %s\n"
-#: git-add--interactive.perl:1296
+#: git-add--interactive.perl:1287
msgid "Only binary files changed.\n"
msgstr "Apenas ficheiros binários alterados.\n"
-#: git-add--interactive.perl:1298
+#: git-add--interactive.perl:1289
msgid "No changes.\n"
msgstr "Sem alterações.\n"
-#: git-add--interactive.perl:1306
+#: git-add--interactive.perl:1297
msgid "Patch update"
msgstr "Atualizar patch"
-#: git-add--interactive.perl:1358
+#: git-add--interactive.perl:1349
#, perl-format
msgid "Stage mode change [y,n,q,a,d,/%s,?]? "
msgstr "Preparar alteração de modo [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1359
+#: git-add--interactive.perl:1350
#, perl-format
msgid "Stage deletion [y,n,q,a,d,/%s,?]? "
msgstr "Preparar eliminação [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1360
+#: git-add--interactive.perl:1351
#, perl-format
msgid "Stage this hunk [y,n,q,a,d,/%s,?]? "
msgstr "Preparar este excerto [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1363
+#: git-add--interactive.perl:1354
#, perl-format
msgid "Stash mode change [y,n,q,a,d,/%s,?]? "
msgstr "Esconder alteração de modo [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1364
+#: git-add--interactive.perl:1355
#, perl-format
msgid "Stash deletion [y,n,q,a,d,/%s,?]? "
msgstr "Esconder eliminação [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1365
+#: git-add--interactive.perl:1356
#, perl-format
msgid "Stash this hunk [y,n,q,a,d,/%s,?]? "
msgstr "Esconder este excerto [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1368
+#: git-add--interactive.perl:1359
#, perl-format
msgid "Unstage mode change [y,n,q,a,d,/%s,?]? "
msgstr "Não preparar alteração de modo [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1369
+#: git-add--interactive.perl:1360
#, perl-format
msgid "Unstage deletion [y,n,q,a,d,/%s,?]? "
msgstr "Não preparar eliminação [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1370
+#: git-add--interactive.perl:1361
#, perl-format
msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? "
msgstr "Não preparar este excerto [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1373
+#: git-add--interactive.perl:1364
#, perl-format
msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? "
msgstr "Aplicar alteração de modo ao índice [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1374
+#: git-add--interactive.perl:1365
#, perl-format
msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? "
msgstr "Aplicar eliminação ao índice [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1375
+#: git-add--interactive.perl:1366
#, perl-format
msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? "
msgstr "Aplicar este excerto ao índice [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1378
+#: git-add--interactive.perl:1369
#, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? "
msgstr "Descartar alteração de modo da árvore de trabalho [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1379
+#: git-add--interactive.perl:1370
#, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? "
msgstr "Descartar eliminação da árvore de trabalho [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1380
+#: git-add--interactive.perl:1371
#, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? "
msgstr "Descartar este excerto da árvore de trabalho [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1383
+#: git-add--interactive.perl:1374
#, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? "
msgstr ""
"Descartar alteração de modo do índice e da árvore de trabalho [y,n,q,a,d,/"
"%s,?]? "
-#: git-add--interactive.perl:1384
+#: git-add--interactive.perl:1375
#, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? "
msgstr ""
"Descartar eliminação do índice e da árvore de trabalho [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1385
+#: git-add--interactive.perl:1376
#, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? "
msgstr ""
"Descartar este excerto do índice e da árvore de trabalho [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1388
+#: git-add--interactive.perl:1379
#, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? "
msgstr ""
-"Aplicar alteração de modo ao índice e à árvore de trabalho [y,n,q,a,d,/%s,?]? "
+"Aplicar alteração de modo ao índice e à árvore de trabalho [y,n,q,a,d,/"
+"%s,?]? "
-#: git-add--interactive.perl:1389
+#: git-add--interactive.perl:1380
#, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Aplicar eliminação ao índice e à árvore de trabalho [y,n,q,a,d,/%s,?]? "
+msgstr ""
+"Aplicar eliminação ao índice e à árvore de trabalho [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1390
+#: git-add--interactive.perl:1381
#, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? "
msgstr ""
"Aplicar este excerto ao índice e à árvore de trabalho [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1493
+#: git-add--interactive.perl:1484
msgid "go to which hunk (<ret> to see more)? "
msgstr "ir para que excerto (<ret> para ver mais)? "
-#: git-add--interactive.perl:1495
+#: git-add--interactive.perl:1486
msgid "go to which hunk? "
msgstr "ir para que excerto? "
-#: git-add--interactive.perl:1504
+#: git-add--interactive.perl:1495
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "Número inválido: '%s'\n"
-#: git-add--interactive.perl:1509
+#: git-add--interactive.perl:1500
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] "Lamento, apenas %d excerto disponível.\n"
msgstr[1] "Lamento, apenas %d excertos disponíveis.\n"
-#: git-add--interactive.perl:1535
+#: git-add--interactive.perl:1526
msgid "search for regex? "
msgstr "procurar por regex? "
-#: git-add--interactive.perl:1548
+#: git-add--interactive.perl:1539
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "Regexp de pesquisa malformada %s: %s\n"
-#: git-add--interactive.perl:1558
+#: git-add--interactive.perl:1549
msgid "No hunk matches the given pattern\n"
msgstr "Nenhum excerto corresponde ao padrão fornecido\n"
-#: git-add--interactive.perl:1570 git-add--interactive.perl:1592
+#: git-add--interactive.perl:1561 git-add--interactive.perl:1583
msgid "No previous hunk\n"
msgstr "Nenhum excerto anterior\n"
-#: git-add--interactive.perl:1579 git-add--interactive.perl:1598
+#: git-add--interactive.perl:1570 git-add--interactive.perl:1589
msgid "No next hunk\n"
msgstr "Nenhum excerto seguinte\n"
-#: git-add--interactive.perl:1606
+#: git-add--interactive.perl:1597
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] "Dividir em %d excerto.\n"
msgstr[1] "Dividir em %d excertos.\n"
-#: git-add--interactive.perl:1658
+#: git-add--interactive.perl:1649
msgid "Review diff"
msgstr "Rever diff"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1677
+#: git-add--interactive.perl:1668
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\t - view diff between HEAD and index\n"
-"add untracked - add contents of untracked files to the staged set of changes\n"
+"diff - view diff between HEAD and index\n"
+"add untracked - add contents of untracked files to the staged set of "
+"changes\n"
msgstr ""
"status - mostrar caminhos com alterações\n"
"update - adicionar o estado da árvore de trabalho ao conjunto de "
@@ -15581,18 +15923,18 @@
"add untracked - adicionar conteúdos de ficheiros não controlados ao conjunto "
"de alterações preparadas\n"
-#: git-add--interactive.perl:1694 git-add--interactive.perl:1699
-#: git-add--interactive.perl:1702 git-add--interactive.perl:1709
-#: git-add--interactive.perl:1713 git-add--interactive.perl:1719
+#: 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
msgid "missing --"
msgstr "falta --"
-#: git-add--interactive.perl:1715
+#: git-add--interactive.perl:1706
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "Mode de --patch desconhecido: %s"
-#: git-add--interactive.perl:1721 git-add--interactive.perl:1727
+#: git-add--interactive.perl:1712 git-add--interactive.perl:1718
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "argumento inválido %s, esperava-se --"
@@ -15611,7 +15953,8 @@
#: git-send-email.perl:282
#, 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ém uma versão intermédia do e-mail que esteve a compor.\n"
#: git-send-email.perl:287
@@ -15781,7 +16124,8 @@
#: git-send-email.perl:871
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr ""
-"Message-ID para ser usado como In-Reply-To para o primeiro e-mail (se algum)? "
+"Message-ID para ser usado como In-Reply-To para o primeiro e-mail (se "
+"algum)? "
#: git-send-email.perl:921 git-send-email.perl:929
#, perl-format
@@ -15847,8 +16191,8 @@
#: git-send-email.perl:1403
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
-"Não é possível inicializar SMTP devidamente. Verifique a configuração e use --"
-"smtp-debug."
+"Não é possível inicializar SMTP devidamente. Verifique a configuração e use "
+"--smtp-debug."
#: git-send-email.perl:1421
#, perl-format
@@ -15950,6 +16294,71 @@
msgid "Do you really want to send %s? [y|N]: "
msgstr "Deseja mesmo enviar %s? [y|N]: "
+#~ msgid ""
+#~ "There is nothing to exclude from by :(exclude) patterns.\n"
+#~ "Perhaps you forgot to add either ':/' or '.' ?"
+#~ msgstr ""
+#~ "Não há nada para excluir de acordo com o padrão :(excluir).\n"
+#~ "Talvez se tenha esquecido de acrescentar ':/' ou '.' ?"
+
+#~ msgid "unrecognized format: %%(%s)"
+#~ msgstr "formato não reconhecido: %%(%s)"
+
+#~ msgid ":strip= requires a positive integer argument"
+#~ msgstr ":strip= requer um inteiro positivo como argumento"
+
+#~ msgid "ref '%s' does not have %ld components to :strip"
+#~ msgstr "a referência '%s' não tem %ld componentes como se indica em :strip"
+
+#~ msgid "unknown %.*s format %s"
+#~ msgstr "formato de %.*s desconhecido %s"
+
+#~ msgid "[%s: gone]"
+#~ msgstr "[%s: desaparecido]"
+
+#~ msgid "[%s]"
+#~ msgstr "[%s]"
+
+#~ msgid "[%s: behind %d]"
+#~ msgstr "[%s: atrás %d]"
+
+#~ msgid "[%s: ahead %d]"
+#~ msgstr "[%s: à frente %d]"
+
+#~ msgid "[%s: ahead %d, behind %d]"
+#~ msgstr "[%s: à frente %d, atrás %d]"
+
+#~ msgid " **** invalid ref ****"
+#~ msgstr " **** referências inválida ****"
+
+#~ msgid "insanely long object directory %.*s"
+#~ msgstr "diretório de objetos demasiado longo %.*s"
+
+#~ msgid "git merge [<options>] <msg> HEAD <commit>"
+#~ msgstr "git merge [<opções>] <msg> HEAD <commit>"
+
+#~ msgid "'%s' is not a commit"
+#~ msgstr "'%s' não é um commit"
+
+#~ msgid "cannot open file '%s'"
+#~ msgstr "não é possível abrir o ficheiro '%s'"
+
+#~ msgid "could not close file %s"
+#~ msgstr "não é possível fechar o ficheiro %s"
+
+#~ msgid "tag name too long: %.*s..."
+#~ msgstr "o nome da tag é demasiado longo: %.*s..."
+
+#~ msgid "tag header too big."
+#~ msgstr "cabeçalho da tag demasiado longo."
+
+#~ msgid ""
+#~ "If the patch applies cleanly, the edited hunk will immediately be\n"
+#~ "marked for discarding"
+#~ msgstr ""
+#~ "Se o patch se aplicar corretamente, o excerto editado será marcado\n"
+#~ "para ser descartado imediatamente."
+
#~ msgid "Use an experimental blank-line-based heuristic to improve diffs"
#~ msgstr ""
#~ "Usar uma heurística experimental baseada em linhas brancas para melhorar "
@@ -15973,7 +16382,8 @@
#~ 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"
#~ "(use 'rm -rf' se pretende mesmo removê-lo, incluindo todo o seu histórico)"
@@ -16017,7 +16427,8 @@
#~ msgstr "Primeiro tem de definir a sua informação de committer"
#~ msgid "bad numeric config value '%s' for '%s': invalid unit"
-#~ msgstr "valor numérico '%s' da configuração '%s' incorreto: unidade inválida"
+#~ msgstr ""
+#~ "valor numérico '%s' da configuração '%s' incorreto: unidade inválida"
#~ msgid "bad numeric config value '%s' for '%s' in blob %s: invalid unit"
#~ msgstr ""
@@ -16026,8 +16437,8 @@
#~ msgid "bad numeric config value '%s' for '%s' in file %s: invalid unit"
#~ msgstr ""
-#~ "valor numérico '%s' da configuração '%s' incorreto no ficheiro %s: unidade "
-#~ "inválida"
+#~ "valor numérico '%s' da configuração '%s' incorreto no ficheiro %s: "
+#~ "unidade inválida"
#~ msgid ""
#~ "bad numeric config value '%s' for '%s' in standard input: invalid unit"
@@ -16205,7 +16616,8 @@
#~ msgstr "Invoque 'bisect_state' com pelo menos um argumento."
#~ msgid ""
-#~ "If you want to reuse this local git directory instead of cloning again from"
+#~ "If you want to reuse this local git directory instead of cloning again "
+#~ "from"
#~ msgstr ""
#~ "Se deseja reutilizar este diretório git local em vez de clonar de novo de"
@@ -16213,7 +16625,8 @@
#~ "use the '--force' option. If the local git directory is not the correct "
#~ "repo"
#~ msgstr ""
-#~ "use a opção '--force'. Se o diretório git local não é o repositório correto"
+#~ "use a opção '--force'. Se o diretório git local não é o repositório "
+#~ "correto"
#~ msgid ""
#~ "or you are unsure what this means choose another name with the '--name' "
@@ -16227,7 +16640,8 @@
#~ "A árvore de trabalho do submódulo '$displaypath' contém um diretório .git"
#~ msgid ""
-#~ "(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 ""
#~ "(use 'rm -rf' se pretende mesmo removê-lo, incluindo todo o seu histórico)"
diff --git a/po/sv.po b/po/sv.po
index 96340dc..0c0f9f9 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -5,12 +5,12 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: git 2.12.0\n"
+"Project-Id-Version: git 2.13.0\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-02-18 01:00+0800\n"
-"PO-Revision-Date: 2017-02-20 19:38+0100\n"
+"POT-Creation-Date: 2017-05-05 09:35+0800\n"
+"PO-Revision-Date: 2017-05-09 08:02+0100\n"
"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
-"Language-Team: Svenska <tp-sv@listor.tp-sv.se>\n"
+"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"Language: sv\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -70,7 +70,7 @@
msgid "Exiting because of an unresolved conflict."
msgstr "Avslutar på grund av olöst konflikgt."
-#: advice.c:114 builtin/merge.c:1206
+#: advice.c:114 builtin/merge.c:1185
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)."
@@ -342,7 +342,7 @@
msgid "cannot checkout %s"
msgstr "kan inte checka ut %s"
-#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:248
+#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:253
#, c-format
msgid "failed to read %s"
msgstr "misslyckades läsa %s"
@@ -467,7 +467,7 @@
msgid "sha1 information is lacking or useless (%s)."
msgstr "sha1-informationen saknas eller är oanvändbar (%s)."
-#: apply.c:4081 builtin/checkout.c:233 builtin/reset.c:135
+#: apply.c:4081 builtin/checkout.c:252 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry misslyckades för sökvägen \"%s\""
@@ -543,7 +543,7 @@
msgid "truncating .rej filename to %.*s.rej"
msgstr "trunkerar .rej-filnamnet till %.*s.rej"
-#: apply.c:4531 builtin/fetch.c:737 builtin/fetch.c:986
+#: apply.c:4531 builtin/fetch.c:739 builtin/fetch.c:988
#, c-format
msgid "cannot open %s"
msgstr "kan inte öppna %s"
@@ -571,160 +571,160 @@
msgid "unable to read index file"
msgstr "kan inte läsa indexfilen"
-#: apply.c:4824
+#: apply.c:4823
#, c-format
msgid "can't open patch '%s': %s"
msgstr "kan inte öppna patchen \"%s\": %s"
-#: apply.c:4849
+#: apply.c:4850
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "undertryckte %d fel i blanksteg"
msgstr[1] "undertryckte %d fel i blanksteg"
-#: apply.c:4855 apply.c:4870
+#: apply.c:4856 apply.c:4871
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d rad lägger till fel i blanksteg."
msgstr[1] "%d rader lägger till fel i blanksteg."
-#: apply.c:4863
+#: apply.c:4864
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "%d rad applicerade efter att ha rättat fel i blanksteg."
msgstr[1] "%d rader applicerade efter att ha rättat fel i blanksteg."
-#: apply.c:4879 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391
+#: apply.c:4880 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391
msgid "Unable to write new index file"
msgstr "Kunde inte skriva ny indexfil"
-#: apply.c:4910 apply.c:4913 builtin/am.c:2277 builtin/am.c:2280
-#: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180
-#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:591
-#: builtin/submodule--helper.c:594 builtin/submodule--helper.c:960
-#: builtin/submodule--helper.c:963 builtin/submodule--helper.c:1104
+#: 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
msgid "path"
msgstr "sökväg"
-#: apply.c:4911
+#: apply.c:4912
msgid "don't apply changes matching the given path"
msgstr "tillämpa inte ändringar som motsvarar given sökväg"
-#: apply.c:4914
+#: apply.c:4915
msgid "apply changes matching the given path"
msgstr "tillämpa ändringar som motsvarar given sökväg"
-#: apply.c:4916 builtin/am.c:2286
+#: apply.c:4917 builtin/am.c:2285
msgid "num"
msgstr "antal"
-#: apply.c:4917
+#: apply.c:4918
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar"
-#: apply.c:4920
+#: apply.c:4921
msgid "ignore additions made by the patch"
msgstr "ignorera tillägg gjorda av patchen"
-#: apply.c:4922
+#: apply.c:4923
msgid "instead of applying the patch, output diffstat for the input"
msgstr "istället för att tillämpa patchen, skriv ut diffstat för indata"
-#: apply.c:4926
+#: apply.c:4927
msgid "show number of added and deleted lines in decimal notation"
msgstr "visa antal tillagda och borttagna rader decimalt"
-#: apply.c:4928
+#: apply.c:4929
msgid "instead of applying the patch, output a summary for the input"
msgstr "istället för att tillämpa patchen, skriv ut en summering av indata"
-#: apply.c:4930
+#: apply.c:4931
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "istället för att tillämpa patchen, se om patchen kan tillämpas"
-#: apply.c:4932
+#: apply.c:4933
msgid "make sure the patch is applicable to the current index"
msgstr "se till att patchen kan tillämpas på aktuellt index"
-#: apply.c:4934
+#: apply.c:4935
msgid "apply a patch without touching the working tree"
msgstr "tillämpa en patch utan att röra arbetskatalogen"
-#: apply.c:4936
+#: apply.c:4937
msgid "accept a patch that touches outside the working area"
msgstr "godta en patch som rör filer utanför arbetskatalogen"
-#: apply.c:4938
+#: apply.c:4939
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "tillämpa också patchen (använd med --stat/--summary/--check)"
-#: apply.c:4940
+#: apply.c:4941
msgid "attempt three-way merge if a patch does not apply"
msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas"
-#: apply.c:4942
+#: apply.c:4943
msgid "build a temporary index based on embedded index information"
msgstr "bygg ett temporärt index baserat på inbyggd indexinformation"
-#: apply.c:4945 builtin/checkout-index.c:169 builtin/ls-files.c:507
+#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:515
msgid "paths are separated with NUL character"
msgstr "sökvägar avdelas med NUL-tecken"
-#: apply.c:4947
+#: apply.c:4948
msgid "ensure at least <n> lines of context match"
msgstr "se till att åtminstone <n> rader sammanhang är lika"
-#: apply.c:4948 builtin/am.c:2265
+#: apply.c:4949 builtin/am.c:2264
msgid "action"
msgstr "åtgärd"
-#: apply.c:4949
+#: apply.c:4950
msgid "detect new or modified lines that have whitespace errors"
msgstr "detektera nya eller ändrade rader som har fel i blanktecken"
-#: apply.c:4952 apply.c:4955
+#: apply.c:4953 apply.c:4956
msgid "ignore changes in whitespace when finding context"
msgstr "ignorera ändringar i blanktecken för sammanhang"
-#: apply.c:4958
+#: apply.c:4959
msgid "apply the patch in reverse"
msgstr "tillämpa patchen baklänges"
-#: apply.c:4960
+#: apply.c:4961
msgid "don't expect at least one line of context"
msgstr "förvänta inte minst en rad sammanhang"
-#: apply.c:4962
+#: apply.c:4963
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "lämna refuserade stycken i motsvarande *.rej-filer"
-#: apply.c:4964
+#: apply.c:4965
msgid "allow overlapping hunks"
msgstr "tillåt överlappande stycken"
-#: apply.c:4965 builtin/add.c:267 builtin/check-ignore.c:19
+#: 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:1860 builtin/mv.c:122 builtin/read-tree.c:114
+#: builtin/log.c:1867 builtin/mv.c:122 builtin/read-tree.c:134
msgid "be verbose"
msgstr "var pratsam"
-#: apply.c:4967
+#: apply.c:4968
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"
-#: apply.c:4970
+#: apply.c:4971
msgid "do not trust the line counts in the hunk headers"
msgstr "lite inte på antalet linjer i styckehuvuden"
-#: apply.c:4972 builtin/am.c:2274
+#: apply.c:4973 builtin/am.c:2273
msgid "root"
msgstr "rot"
-#: apply.c:4973
+#: apply.c:4974
msgid "prepend <root> to all filenames"
msgstr "lägg till <rot> i alla filnamn"
@@ -747,103 +747,108 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <arkiv> [--exec <kmd>] --list"
-#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300
+#: archive.c:332 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer"
-#: archive.c:429
+#: archive.c:417
msgid "fmt"
msgstr "fmt"
-#: archive.c:429
+#: archive.c:417
msgid "archive format"
msgstr "arkivformat"
-#: archive.c:430 builtin/log.c:1429
+#: archive.c:418 builtin/log.c:1436
msgid "prefix"
msgstr "prefix"
-#: archive.c:431
+#: archive.c:419
msgid "prepend prefix to each pathname in the archive"
msgstr "lägg till prefix till varje sökväg i arkivet"
-#: archive.c:432 builtin/blame.c:2607 builtin/blame.c:2608 builtin/config.c:59
-#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1054
-#: builtin/hash-object.c:101 builtin/ls-files.c:541 builtin/ls-files.c:544
-#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109
+#: 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
msgid "file"
msgstr "fil"
-#: archive.c:433 builtin/archive.c:89
+#: archive.c:421 builtin/archive.c:89
msgid "write the archive to this file"
msgstr "skriv arkivet till filen"
-#: archive.c:435
+#: archive.c:423
msgid "read .gitattributes in working directory"
msgstr "läs .gitattributes i arbetskatalogen"
-#: archive.c:436
+#: archive.c:424
msgid "report archived files on stderr"
msgstr "rapportera arkiverade filer på standard fel"
-#: archive.c:437
+#: archive.c:425
msgid "store only"
msgstr "endast spara"
-#: archive.c:438
+#: archive.c:426
msgid "compress faster"
msgstr "komprimera snabbare"
-#: archive.c:446
+#: archive.c:434
msgid "compress better"
msgstr "komprimera bättre"
-#: archive.c:449
+#: archive.c:437
msgid "list supported archive formats"
msgstr "visa understödda arkivformat"
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88
-#: builtin/submodule--helper.c:603 builtin/submodule--helper.c:969
+#: archive.c:439 builtin/archive.c:90 builtin/clone.c:103 builtin/clone.c:106
+#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
msgid "repo"
msgstr "arkiv"
-#: archive.c:452 builtin/archive.c:91
+#: archive.c:440 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr "hämta arkivet från fjärrarkivet <arkiv>"
-#: archive.c:453 builtin/archive.c:92 builtin/notes.c:485
+#: archive.c:441 builtin/archive.c:92 builtin/notes.c:485
msgid "command"
msgstr "kommando"
-#: archive.c:454 builtin/archive.c:93
+#: archive.c:442 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr "sökväg till kommandot git-upload-archive på fjärren"
-#: archive.c:461
+#: archive.c:449
msgid "Unexpected option --remote"
msgstr "Oväntad flagga --remote"
-#: archive.c:463
+#: archive.c:451
msgid "Option --exec can only be used together with --remote"
msgstr "Flaggan --exec kan endast användas tillsammans med --remote"
-#: archive.c:465
+#: archive.c:453
msgid "Unexpected option --output"
msgstr "Oväntad flagga --output"
-#: archive.c:487
+#: archive.c:475
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Okänt arkivformat \"%s\""
-#: archive.c:494
+#: archive.c:482
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Argumentet stöd inte för formatet \"%s\": -%d"
-#: attr.c:263
+#: attr.c:212
+#, c-format
+msgid "%.*s is not a valid attribute name"
+msgstr "%-*s är inte ett giltigt namn på attribut"
+
+#: attr.c:408
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -851,27 +856,27 @@
"Negativa mönster ignoreras i git-attribut\n"
"Använd '\\!' för att inleda med ett utropstecken."
-#: bisect.c:441
+#: bisect.c:444
#, c-format
msgid "Could not open file '%s'"
msgstr "Kunde inte öppna filen \"%s\""
-#: bisect.c:446
+#: bisect.c:449
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "Felaktigt citerat innehåll i filen \"%s\": %s"
-#: bisect.c:655
+#: bisect.c:657
#, c-format
msgid "We cannot bisect more!\n"
msgstr "Det finns inte mer att göra \"bisect\" på!\n"
-#: bisect.c:708
+#: bisect.c:710
#, c-format
msgid "Not a valid commit name %s"
msgstr "Namnet på incheckningen är inte giltigt: %s"
-#: bisect.c:732
+#: bisect.c:734
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -880,7 +885,7 @@
"Sammanslagningsbasen %s är trasig.\n"
"Det betyder att felet har rättats mellan %s och [%s].\n"
-#: bisect.c:737
+#: bisect.c:739
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -889,7 +894,7 @@
"Sammanslagningsbasen %s är ny.\n"
"Egenskapen har ändrats mellan %s och [%s].\n"
-#: bisect.c:742
+#: bisect.c:744
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -898,7 +903,7 @@
"Sammanslagningsbasen %s är %s.\n"
"Det betyder att den första \"%s\" incheckningen är mellan %s och [%s].\n"
-#: bisect.c:750
+#: bisect.c:752
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -909,7 +914,7 @@
"git bisect kan inte fungera korrekt i detta fall.\n"
"Kanske du skrev fel %s- och %s-revisioner?\n"
-#: bisect.c:763
+#: bisect.c:765
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -921,36 +926,36 @@
"%s.\n"
"Vi fortsätter ändå."
-#: bisect.c:798
+#: bisect.c:800
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "Bisect: en sammanslagningsbas måste testas\n"
-#: bisect.c:849
+#: bisect.c:851
#, c-format
msgid "a %s revision is needed"
msgstr "en %s-revision behövs"
-#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:262
+#: bisect.c:868 builtin/notes.c:174 builtin/tag.c:255
#, c-format
msgid "could not create file '%s'"
msgstr "kunde inte skapa filen \"%s\""
-#: bisect.c:917
+#: bisect.c:919
#, c-format
msgid "could not read file '%s'"
msgstr "kunde inte läsa filen \"%s\""
-#: bisect.c:947
+#: bisect.c:949
msgid "reading bisect refs failed"
msgstr "misslyckades läsa bisect-referenser"
-#: bisect.c:967
+#: bisect.c:969
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s var både %s och %s\n"
-#: bisect.c:975
+#: bisect.c:977
#, c-format
msgid ""
"No testable commit found.\n"
@@ -959,7 +964,7 @@
"Ingen testbar incheckning hittades.\n"
"Kanske du startade med felaktiga sökvägsparametrar?\n"
-#: bisect.c:994
+#: bisect.c:996
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -968,7 +973,7 @@
#. TRANSLATORS: the last %s will be replaced with
#. "(roughly %d steps)" translation
-#: bisect.c:998
+#: bisect.c:1000
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
@@ -1108,7 +1113,7 @@
msgid "'%s' is already checked out at '%s'"
msgstr "\"%s\" är redan utcheckad på \"%s\""
-#: branch.c:363
+#: branch.c:364
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "HEAD i arbetskatalogen %s har inte uppdaterats"
@@ -1123,7 +1128,7 @@
msgid "unrecognized header: %s%s (%d)"
msgstr "okänt huvud: %s%s (%d)"
-#: bundle.c:87 sequencer.c:1331 sequencer.c:1752 builtin/commit.c:777
+#: bundle.c:87 sequencer.c:1341 sequencer.c:1767 builtin/commit.c:777
#, c-format
msgid "could not open '%s'"
msgstr "kunde inte öppna \"%s\""
@@ -1132,10 +1137,10 @@
msgid "Repository lacks these prerequisite commits:"
msgstr "Arkivet saknar dessa nödvändiga incheckningar:"
-#: bundle.c:163 ref-filter.c:1499 sequencer.c:1154 sequencer.c:2290
-#: builtin/blame.c:2820 builtin/commit.c:1061 builtin/log.c:348
-#: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909
-#: builtin/merge.c:360 builtin/shortlog.c:177
+#: 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 "misslyckades skapa revisionstraversering"
@@ -1174,7 +1179,7 @@
msgid "ref '%s' is excluded by the rev-list options"
msgstr "referensen \"%s\" exkluderas av argumenten till rev-list"
-#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:282
+#: bundle.c:443 builtin/log.c:170 builtin/log.c:1579 builtin/shortlog.c:281
#, c-format
msgid "unrecognized argument: %s"
msgstr "okänt argument: %s"
@@ -1197,8 +1202,8 @@
msgid "invalid color value: %.*s"
msgstr "felaktigt färgvärde: %.*s"
-#: commit.c:40 sequencer.c:1564 builtin/am.c:421 builtin/am.c:457
-#: builtin/am.c:1493 builtin/am.c:2127
+#: commit.c:40 sequencer.c:1579 builtin/am.c:419 builtin/am.c:455
+#: builtin/am.c:1489 builtin/am.c:2126
#, c-format
msgid "could not parse %s"
msgstr "kunde inte tolka %s"
@@ -1208,7 +1213,7 @@
msgid "%s %s is not a commit!"
msgstr "%s %s är inte en incheckning!"
-#: commit.c:1514
+#: commit.c:1511
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
@@ -1222,140 +1227,160 @@
msgid "memory exhausted"
msgstr "minnet slut"
-#: config.c:518
+#: config.c:191
+msgid "relative config include conditionals must come from files"
+msgstr "relativa konfigureringsinkluderingsvillkor måste komma från filer"
+
+#: config.c:711
#, c-format
msgid "bad config line %d in blob %s"
msgstr "felaktig konfigurationsfil rad %d i blob:en %s"
-#: config.c:522
+#: config.c:715
#, c-format
msgid "bad config line %d in file %s"
msgstr "felaktig konfigurationsfil rad %d i filen %s"
-#: config.c:526
+#: config.c:719
#, c-format
msgid "bad config line %d in standard input"
msgstr "felaktig konfigurationsfil rad %d i standard in"
-#: config.c:530
+#: config.c:723
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "felaktig konfigurationsfil rad %d i undermoduls-blob:en %s"
-#: config.c:534
+#: config.c:727
#, c-format
msgid "bad config line %d in command line %s"
msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s"
-#: config.c:538
+#: config.c:731
#, c-format
msgid "bad config line %d in %s"
msgstr "felaktig konfigurationsfil rad %d i %s"
-#: config.c:657
+#: config.c:859
msgid "out of range"
msgstr "utanför intervallet"
-#: config.c:657
+#: config.c:859
msgid "invalid unit"
msgstr "ogiltig enhet"
-#: config.c:663
+#: config.c:865
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s"
-#: config.c:668
+#: config.c:870
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i blob:en %s: %s"
-#: config.c:671
+#: config.c:873
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i filen %s: %s"
-#: config.c:674
+#: config.c:876
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i standard in: %s"
-#: config.c:677
+#: config.c:879
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i undermodul-blob:"
"en %s: %s"
-#: config.c:680
+#: config.c:882
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i kommandoraden "
"%s: %s"
-#: config.c:683
+#: config.c:885
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i %s: %s"
-#: config.c:770
+#: config.c:980
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "misslyckades expandera användarkatalog i: \"%s\""
-#: config.c:865 config.c:876
+#: config.c:1075 config.c:1086
#, c-format
msgid "bad zlib compression level %d"
msgstr "felaktigt zlib-komprimeringsgrad %d"
-#: config.c:993
+#: config.c:1203
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "felaktigt läge för skapande av objekt: %s"
-#: config.c:1149
+#: config.c:1359
#, c-format
msgid "bad pack compression level %d"
msgstr "felaktig paketkomprimeringsgrad %d"
-#: config.c:1339
+#: config.c:1557
msgid "unable to parse command-line config"
msgstr "kan inte tolka kommandoradskonfiguration"
-#: config.c:1389
+#: config.c:1611
msgid "unknown error occurred while reading the configuration files"
msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna"
-#: config.c:1743
+#: config.c:1970
+#, c-format
+msgid "Invalid %s: '%s'"
+msgstr "Felaktigt %s: \"%s\""
+
+#: config.c:1991
+#, c-format
+msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
+msgstr ""
+"okänt värde \"%s\" för core.untrackedCache; använder standardvärdet \"keep\""
+
+#: config.c:2017
+#, c-format
+msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
+msgstr "värdet \"%d\" för splitIndex.maxPercentage borde vara mellan 0 och 100"
+
+#: config.c:2028
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration"
-#: config.c:1745
+#: config.c:2030
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "felaktig konfigurationsvariabel \"%s\" i filen \"%s\" på rad %d"
-#: config.c:1804
+#: config.c:2089
#, c-format
msgid "%s has multiple values"
msgstr "%s har flera värden"
-#: config.c:2225 config.c:2450
+#: config.c:2423 config.c:2648
#, c-format
msgid "fstat on %s failed"
msgstr "fstat misslyckades på %s"
-#: config.c:2343
+#: config.c:2541
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "kunde inte ställa in \"%s\" till \"%s\""
-#: config.c:2345
+#: config.c:2543 builtin/remote.c:774
#, c-format
msgid "could not unset '%s'"
msgstr "kunde inte ta bort inställning för \"%s\""
@@ -1528,20 +1553,20 @@
"Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n"
"%s"
-#: diff.c:3085
+#: diff.c:3102
#, c-format
msgid "external diff died, stopping at %s"
msgstr "extern diff dog, stannar vid %s"
-#: diff.c:3411
+#: diff.c:3428
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only, --name-status, -check och -s är ömsesidigt uteslutande"
-#: diff.c:3501
+#: diff.c:3518
msgid "--follow requires exactly one pathspec"
msgstr "--follow kräver exakt en sökvägsangivelse"
-#: diff.c:3664
+#: diff.c:3681
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -1550,207 +1575,232 @@
"Misslyckades tolka argument till flaggan --dirstat/-X;\n"
"%s"
-#: diff.c:3678
+#: diff.c:3695
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\""
-#: diff.c:4696
+#: diff.c:4719
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
"onöjaktig namnbytesdetektering utfördes inte på grund av för många filer"
-#: diff.c:4699
+#: diff.c:4722
msgid "only found copies from modified paths due to too many files."
msgstr "hittade bara kopior från ändrade sökvägar på grund av för många filer."
-#: diff.c:4702
+#: diff.c:4725
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr ""
"du kan sätta variabeln %s till åtminstone %d och försöka kommandot på nytt."
-#: dir.c:1862
+#: dir.c:1899
msgid "failed to get kernel name and information"
msgstr "misslyckades hämta kärnans namn och information"
-#: dir.c:1981
+#: dir.c:2018
msgid "Untracked cache is disabled on this system or location."
msgstr "Ospårad cache är inaktiverad på systemet eller platsen."
-#: dir.c:2759
+#: dir.c:2776 dir.c:2781
+#, c-format
+msgid "could not create directories for %s"
+msgstr "kunde inte skapa kataloger för %s"
+
+#: dir.c:2806
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\""
-#: fetch-pack.c:213
+#: entry.c:280
+#, c-format
+msgid "could not stat file '%s'"
+msgstr "kunde inte ta status på filen \"%s\""
+
+#: fetch-pack.c:249
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: förväntade grund lista"
-#: fetch-pack.c:225
+#: fetch-pack.c:261
msgid "git fetch-pack: expected ACK/NAK, got EOF"
msgstr "git fetch-patch: förväntade ACK/NAK, fick EOF"
-#: fetch-pack.c:243
+#: fetch-pack.c:280 builtin/archive.c:63
+#, c-format
+msgid "remote error: %s"
+msgstr "fjärrfel: %s"
+
+#: fetch-pack.c:281
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: förväntade ACK/NAK, fick \"%s\""
-#: fetch-pack.c:295
+#: fetch-pack.c:333
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc kräver \"multi ack detailed\""
-#: fetch-pack.c:381
+#: fetch-pack.c:419
#, c-format
msgid "invalid shallow line: %s"
msgstr "ogiltig \"shallow\"-rad: %s"
-#: fetch-pack.c:387
+#: fetch-pack.c:425
#, c-format
msgid "invalid unshallow line: %s"
msgstr "ogiltig \"unshallow\"-rad: %s"
-#: fetch-pack.c:389
+#: fetch-pack.c:427
#, c-format
msgid "object not found: %s"
msgstr "objektet hittades inte: %s"
-#: fetch-pack.c:392
+#: fetch-pack.c:430
#, c-format
msgid "error in object: %s"
msgstr "fel i objekt: %s"
-#: fetch-pack.c:394
+#: fetch-pack.c:432
#, c-format
msgid "no shallow found: %s"
msgstr "ingen \"shallow\" hittades: %s"
-#: fetch-pack.c:397
+#: fetch-pack.c:435
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "förväntade shallow/unshallow, fick %s"
-#: fetch-pack.c:436
+#: fetch-pack.c:474
#, c-format
msgid "got %s %d %s"
msgstr "fick %s %d %s"
-#: fetch-pack.c:450
+#: fetch-pack.c:488
#, c-format
msgid "invalid commit %s"
msgstr "ogiltig incheckning %s"
-#: fetch-pack.c:483
+#: fetch-pack.c:521
msgid "giving up"
msgstr "ger upp"
-#: fetch-pack.c:493 progress.c:235
+#: fetch-pack.c:531 progress.c:235
msgid "done"
msgstr "klart"
-#: fetch-pack.c:505
+#: fetch-pack.c:543
#, c-format
msgid "got %s (%d) %s"
msgstr "fick %s (%d) %s"
-#: fetch-pack.c:551
+#: fetch-pack.c:589
#, c-format
msgid "Marking %s as complete"
msgstr "Markerar %s som komplett"
-#: fetch-pack.c:697
+#: fetch-pack.c:737
#, c-format
msgid "already have %s (%s)"
msgstr "har redan %s (%s)"
-#: fetch-pack.c:735
+#: fetch-pack.c:775
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare"
-#: fetch-pack.c:743
+#: fetch-pack.c:783
msgid "protocol error: bad pack header"
msgstr "protokollfel: felaktigt packhuvud"
-#: fetch-pack.c:799
+#: fetch-pack.c:839
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-patch: kunde inte grena av %s"
-#: fetch-pack.c:815
+#: fetch-pack.c:855
#, c-format
msgid "%s failed"
msgstr "%s misslyckades"
-#: fetch-pack.c:817
+#: fetch-pack.c:857
msgid "error in sideband demultiplexer"
msgstr "fel i sidbands-avmultiplexare"
-#: fetch-pack.c:844
+#: fetch-pack.c:884
msgid "Server does not support shallow clients"
msgstr "Servern stöder inte klienter med grunda arkiv"
-#: fetch-pack.c:848
+#: fetch-pack.c:888
msgid "Server supports multi_ack_detailed"
msgstr "Servern stöder \"multi_ack_detailed\""
-#: fetch-pack.c:851
+#: fetch-pack.c:891
msgid "Server supports no-done"
msgstr "Servern stöder \"no-done\""
-#: fetch-pack.c:857
+#: fetch-pack.c:897
msgid "Server supports multi_ack"
msgstr "Servern stöder \"multi_ack\""
-#: fetch-pack.c:861
+#: fetch-pack.c:901
msgid "Server supports side-band-64k"
msgstr "Servern stöder \"side-band-64k\""
-#: fetch-pack.c:865
+#: fetch-pack.c:905
msgid "Server supports side-band"
msgstr "Servern stöder \"side-band\""
-#: fetch-pack.c:869
+#: fetch-pack.c:909
msgid "Server supports allow-tip-sha1-in-want"
msgstr "Servern stöder \"allow-tip-sha1-in-want\""
-#: fetch-pack.c:873
+#: fetch-pack.c:913
msgid "Server supports allow-reachable-sha1-in-want"
msgstr "Servern stöder \"allow-reachable-sha1-in-want\""
-#: fetch-pack.c:883
+#: fetch-pack.c:923
msgid "Server supports ofs-delta"
msgstr "Servern stöder \"ofs-delta\""
-#: fetch-pack.c:890
+#: fetch-pack.c:930
#, c-format
msgid "Server version is %.*s"
msgstr "Serverversionen är %.*s"
-#: fetch-pack.c:896
+#: fetch-pack.c:936
msgid "Server does not support --shallow-since"
msgstr "Servern stöder inte --shallow-since"
-#: fetch-pack.c:900
+#: fetch-pack.c:940
msgid "Server does not support --shallow-exclude"
msgstr "Servern stöder inte --shallow-exclude"
-#: fetch-pack.c:902
+#: fetch-pack.c:942
msgid "Server does not support --deepen"
msgstr "Servern stöder inte --deepen"
-#: fetch-pack.c:913
+#: fetch-pack.c:953
msgid "no common commits"
msgstr "inga gemensamma incheckningar"
-#: fetch-pack.c:925
+#: fetch-pack.c:965
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-patch: hämtning misslyckades."
-#: fetch-pack.c:1087
+#: fetch-pack.c:1127
msgid "no matching remote head"
msgstr "inget motsvarande fjärrhuvud"
+#: fetch-pack.c:1149
+#, c-format
+msgid "no such remote ref %s"
+msgstr "ingen sådan fjärreferens: %s"
+
+#: fetch-pack.c:1152
+#, c-format
+msgid "Server does not allow request for unadvertised object %s"
+msgstr "Servern tillåter inte förfrågan om ej tillkännagivet objekt %s"
+
#: gpg-interface.c:185
msgid "gpg failed to sign the data"
msgstr "gpg misslyckades signera data"
@@ -1769,17 +1819,17 @@
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "ignorera felaktig färg \"%.*s\" i log.graphColors"
-#: grep.c:1794
+#: grep.c:1796
#, c-format
msgid "'%s': unable to read %s"
msgstr "\"%s\" kunde inte läsa %s"
-#: grep.c:1811 builtin/clone.c:381 builtin/diff.c:81 builtin/rm.c:133
+#: grep.c:1813 builtin/clone.c:399 builtin/diff.c:81 builtin/rm.c:133
#, c-format
msgid "failed to stat '%s'"
msgstr "misslyckades ta status på \"%s\""
-#: grep.c:1822
+#: grep.c:1824
#, c-format
msgid "'%s': short read"
msgstr "\"%s\": kort läsning"
@@ -1848,7 +1898,7 @@
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: ident.c:334
+#: ident.c:343
msgid ""
"\n"
"*** Please tell me who you are.\n"
@@ -1874,6 +1924,39 @@
"Kör utan --global för att endast ändra i aktuellt arkiv.\n"
"\n"
+#: ident.c:367
+msgid "no email was given and auto-detection is disabled"
+msgstr "ingen e-post angavs och autodetektering är inaktiverad"
+
+#: ident.c:372
+#, c-format
+msgid "unable to auto-detect email address (got '%s')"
+msgstr "kunde inte autodetektera e-postadress (fick \"%s\")"
+
+#: ident.c:382
+msgid "no name was given and auto-detection is disabled"
+msgstr "inget namn angavs och autodetektering är inaktiverad"
+
+#: ident.c:388
+#, c-format
+msgid "unable to auto-detect name (got '%s')"
+msgstr "kunde inte autodetektera namn (fick \"%s\")"
+
+#: ident.c:396
+#, c-format
+msgid "empty ident name (for <%s>) not allowed"
+msgstr "tomt ident-namn (för <%s>) ej tillåtet"
+
+#: ident.c:402
+#, c-format
+msgid "name consists only of disallowed characters: %s"
+msgstr "namnet består enbart av ej tillåtna tecken: %s"
+
+#: ident.c:417 builtin/commit.c:611
+#, c-format
+msgid "invalid date format: %s"
+msgstr "felaktigt datumformat: %s"
+
#: lockfile.c:152
#, c-format
msgid ""
@@ -1903,8 +1986,8 @@
msgid "failed to read the cache"
msgstr "misslyckades läsa cachen"
-#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374
-#: builtin/checkout.c:588 builtin/clone.c:731
+#: merge.c:96 builtin/am.c:1999 builtin/am.c:2034 builtin/checkout.c:393
+#: builtin/checkout.c:607 builtin/clone.c:749
msgid "unable to write new index file"
msgstr "kunde inte skriva ny indexfil"
@@ -1974,7 +2057,7 @@
msgid "Unable to add %s to database"
msgstr "Kunde inte lägga till %s till databasen"
-#: merge-recursive.c:1088 merge-recursive.c:1102
+#: merge-recursive.c:1092
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -1983,7 +2066,16 @@
"KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad "
"i trädet."
-#: merge-recursive.c:1094 merge-recursive.c:1107
+#: merge-recursive.c:1097
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree."
+msgstr ""
+"KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av "
+"%s lämnad i trädet."
+
+#: merge-recursive.c:1104
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -1992,20 +2084,29 @@
"KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad "
"i trädet vid %s."
-#: merge-recursive.c:1150
+#: merge-recursive.c:1109
+#, 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 ""
+"KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av "
+"%s lämnad i trädet vid %s."
+
+#: merge-recursive.c:1143
msgid "rename"
msgstr "namnbyte"
-#: merge-recursive.c:1150
+#: merge-recursive.c:1143
msgid "renamed"
msgstr "namnbytt"
-#: merge-recursive.c:1207
+#: merge-recursive.c:1200
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s är en katalog i %s lägger till som %s istället"
-#: merge-recursive.c:1232
+#: merge-recursive.c:1225
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -2014,135 +2115,135 @@
"KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" "
"namnbyte \"%s\"->\"%s\" i \"%s\"%s"
-#: merge-recursive.c:1237
+#: merge-recursive.c:1230
msgid " (left unresolved)"
msgstr " (lämnad olöst)"
-#: merge-recursive.c:1299
+#: merge-recursive.c:1292
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"KONFLIKT (namnbyte/namnbyte): Namnbyte %s->%s i %s. Namnbyte %s->%s i %s"
-#: merge-recursive.c:1332
+#: merge-recursive.c:1325
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr "Byter namn på %s till %s och %s till %s istället"
-#: merge-recursive.c:1535
+#: merge-recursive.c:1528
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr "KONFLIKT (namnbyte/tillägg): Namnbyte %s->%s i %s. %s tillagd i %s"
-#: merge-recursive.c:1550
+#: merge-recursive.c:1543
#, c-format
msgid "Adding merged %s"
msgstr "Lägger till sammanslagen %s"
-#: merge-recursive.c:1557 merge-recursive.c:1771
+#: merge-recursive.c:1550 merge-recursive.c:1780
#, c-format
msgid "Adding as %s instead"
msgstr "Lägger till som %s istället"
-#: merge-recursive.c:1614
+#: merge-recursive.c:1607
#, c-format
msgid "cannot read object %s"
msgstr "kan inte läsa objektet %s"
-#: merge-recursive.c:1617
+#: merge-recursive.c:1610
#, c-format
msgid "object %s is not a blob"
msgstr "objektet %s är inte en blob"
-#: merge-recursive.c:1670
+#: merge-recursive.c:1679
msgid "modify"
msgstr "ändra"
-#: merge-recursive.c:1670
+#: merge-recursive.c:1679
msgid "modified"
msgstr "ändrad"
-#: merge-recursive.c:1680
+#: merge-recursive.c:1689
msgid "content"
msgstr "innehåll"
-#: merge-recursive.c:1687
+#: merge-recursive.c:1696
msgid "add/add"
msgstr "tillägg/tillägg"
-#: merge-recursive.c:1723
+#: merge-recursive.c:1732
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "Hoppade över %s (sammanslagen samma som befintlig)"
-#: merge-recursive.c:1737
+#: merge-recursive.c:1746
#, c-format
msgid "Auto-merging %s"
msgstr "Slår ihop %s automatiskt"
-#: merge-recursive.c:1741 git-submodule.sh:930
+#: merge-recursive.c:1750 git-submodule.sh:944
msgid "submodule"
msgstr "undermodul"
-#: merge-recursive.c:1742
+#: merge-recursive.c:1751
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s"
-#: merge-recursive.c:1836
+#: merge-recursive.c:1845
#, c-format
msgid "Removing %s"
msgstr "Tar bort %s"
-#: merge-recursive.c:1862
+#: merge-recursive.c:1871
msgid "file/directory"
msgstr "fil/katalog"
-#: merge-recursive.c:1868
+#: merge-recursive.c:1877
msgid "directory/file"
msgstr "katalog/fil"
-#: merge-recursive.c:1874
+#: merge-recursive.c:1883
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"KONFLIKT (%s): Det finns en katalog med namnet %s i %s. Lägger till %s som %s"
-#: merge-recursive.c:1883
+#: merge-recursive.c:1892
#, c-format
msgid "Adding %s"
msgstr "Lägger till %s"
-#: merge-recursive.c:1920
+#: merge-recursive.c:1929
msgid "Already up-to-date!"
msgstr "Redan à jour!"
-#: merge-recursive.c:1929
+#: merge-recursive.c:1938
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "sammanslagning av träden %s och %s misslyckades"
-#: merge-recursive.c:2012
+#: merge-recursive.c:2021
msgid "Merging:"
msgstr "Slår ihop:"
-#: merge-recursive.c:2025
+#: merge-recursive.c:2034
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "hittade %u gemensam förfader:"
msgstr[1] "hittade %u gemensamma förfäder:"
-#: merge-recursive.c:2064
+#: merge-recursive.c:2073
msgid "merge returned no commit"
msgstr "sammanslagningen returnerade ingen incheckning"
-#: merge-recursive.c:2127
+#: merge-recursive.c:2136
#, c-format
msgid "Could not parse object '%s'"
msgstr "Kunde inte tolka objektet \"%s\""
-#: merge-recursive.c:2141 builtin/merge.c:645 builtin/merge.c:792
+#: merge-recursive.c:2150 builtin/merge.c:645 builtin/merge.c:792
msgid "Unable to write index."
msgstr "Kunde inte skriva indexet."
@@ -2219,17 +2320,34 @@
msgid "malformed object name '%s'"
msgstr "felformat objektnamn \"%s\""
-#: path.c:826
+#: path.c:810
#, c-format
msgid "Could not make %s writable by group"
msgstr "Kunde inte göra %s skrivbar för gruppen"
-#: pathspec.c:142
+#: pathspec.c:125
+msgid "Escape character '\\' not allowed as last character in attr value"
+msgstr "Specialtecknet \"\\\" tillåts inte som sista tecken i attributvärde"
+
+#: pathspec.c:143
+msgid "Only one 'attr:' specification is allowed."
+msgstr "Endast en \"attr:\"-angivelse tillåten."
+
+#: pathspec.c:146
+msgid "attr spec must not be empty"
+msgstr "attr-angivelse kan inte vara tom"
+
+#: pathspec.c:189
+#, c-format
+msgid "invalid attribute name %s"
+msgstr "ogiltigt attributnamn %s"
+
+#: pathspec.c:254
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
"de globala sökvägsinställningarna \"glob\" och \"noglob\" är inkompatibla"
-#: pathspec.c:149
+#: pathspec.c:261
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
@@ -2237,51 +2355,51 @@
"den globala sökvägsinställningen \"literal\" är inkompatibel med alla andra "
"globala sökvägsinställningar"
-#: pathspec.c:188
+#: pathspec.c:301
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr "ogiltig parameter för sökvägsuttrycket för \"prefix\""
-#: pathspec.c:201
+#: pathspec.c:322
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr "felaktigt sökvägsuttryck \"%.*s\" i \"%s\""
-#: pathspec.c:206
+#: pathspec.c:327
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr "\")\" saknas i slutet av sökvägsuttrycket för \"%s\""
-#: pathspec.c:238
+#: pathspec.c:365
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr "Tecknet \"%c\" i sökvägsuttrycket i \"%s\" har inte implementerats"
-#: pathspec.c:293 pathspec.c:315
+#: pathspec.c:421 pathspec.c:443
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\""
-#: pathspec.c:350
+#: pathspec.c:483
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s: \"literal\" och \"glob\" är inkompatibla"
-#: pathspec.c:363
+#: pathspec.c:496
#, c-format
msgid "%s: '%s' is outside repository"
msgstr "%s: \"%s\" är utanför arkivet"
-#: pathspec.c:451
+#: pathspec.c:584
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "\"%s\" (minnesstöd: \"%c\")"
-#: pathspec.c:461
+#: pathspec.c:594
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr "%s: sökvägsuttrycket hanteras inte av det här kommandot: %s"
-#: pathspec.c:511
+#: pathspec.c:644
msgid ""
"empty strings as pathspecs will be made invalid in upcoming releases. please "
"use . instead if you meant to match all paths"
@@ -2289,24 +2407,16 @@
"tomma strängar som sökvägsangivelser kommer bli ogiltiga i en kommande "
"utgåva. använd istället . om du vill träffa alla sökvägar"
-#: pathspec.c:535
+#: pathspec.c:668
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "sökvägsangivelsen \"%s\" är på andra sidan av en symbolisk länk"
-#: pathspec.c:544
-msgid ""
-"There is nothing to exclude from by :(exclude) patterns.\n"
-"Perhaps you forgot to add either ':/' or '.' ?"
-msgstr ""
-"Ingenting att exkludera från med :(exkludera)-mönster.\n"
-"Glömde du kanske att antingen lägga till \":/\" eller \".\"?"
-
#: pretty.c:982
msgid "unable to parse --pretty format"
msgstr "kunde inte tolka format för --pretty"
-#: read-cache.c:1307
+#: read-cache.c:1442
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -2315,7 +2425,7 @@
"index.version satt, men värdet är ogiltigt.\n"
"Använder version %i"
-#: read-cache.c:1317
+#: read-cache.c:1452
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -2324,161 +2434,268 @@
"GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n"
"Använder version %i"
-#: refs.c:576 builtin/merge.c:844
+#: read-cache.c:2375 sequencer.c:1350 sequencer.c:2048
+#, c-format
+msgid "could not stat '%s'"
+msgstr "kunde inte ta status på \"%s\""
+
+#: read-cache.c:2388
+#, c-format
+msgid "unable to open git dir: %s"
+msgstr "kunde inte öppna git-katalog: %s"
+
+#: read-cache.c:2400
+#, c-format
+msgid "unable to unlink: %s"
+msgstr "misslyckades ta bort länken: %s"
+
+#: refs.c:620 builtin/merge.c:844
#, c-format
msgid "Could not open '%s' for writing"
msgstr "Kunde inte öppna \"%s\" för skrivning"
-#: refs/files-backend.c:2481
+#: refs.c:1667
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "referensuppdateringar förbjudna i karantänmiljö"
+
+#: refs/files-backend.c:1631
#, c-format
msgid "could not delete reference %s: %s"
msgstr "kunde inte ta bort referensen %s: %s"
-#: refs/files-backend.c:2484
+#: refs/files-backend.c:1634
#, c-format
msgid "could not delete references: %s"
msgstr "kunde inte ta bort referenser: %s"
-#: refs/files-backend.c:2493
+#: refs/files-backend.c:1643
#, c-format
msgid "could not remove reference %s"
msgstr "kunde inte ta bort referensen %s"
-#: ref-filter.c:56
+#: ref-filter.c:35 wt-status.c:1780
+msgid "gone"
+msgstr "försvunnen"
+
+#: ref-filter.c:36
+#, c-format
+msgid "ahead %d"
+msgstr "före %d"
+
+#: ref-filter.c:37
+#, c-format
+msgid "behind %d"
+msgstr "bakom %d"
+
+#: ref-filter.c:38
+#, c-format
+msgid "ahead %d, behind %d"
+msgstr "före %d, bakom %d"
+
+#: ref-filter.c:104
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "förväntat format: %%(color:<color>)"
-#: ref-filter.c:58
+#: ref-filter.c:106
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "okänd färg: %%(color:%s)"
-#: ref-filter.c:72
+#: ref-filter.c:120
#, c-format
-msgid "unrecognized format: %%(%s)"
-msgstr "okänt format: %%(%s)"
+msgid "Integer value expected refname:lstrip=%s"
+msgstr "Heltalsvärde förväntades refname:lstrip=%s"
-#: ref-filter.c:78
+#: ref-filter.c:124
+#, c-format
+msgid "Integer value expected refname:rstrip=%s"
+msgstr "Heltalsvärde förväntades refname:rstrip=%s"
+
+#: ref-filter.c:126
+#, c-format
+msgid "unrecognized %%(%s) argument: %s"
+msgstr "okänt %%(%s)-argument: %s"
+
+#: ref-filter.c:166
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) tar inte argument"
-#: ref-filter.c:85
+#: ref-filter.c:173
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "%%(subject) tar inte argument"
-#: ref-filter.c:92
+#: ref-filter.c:180
#, c-format
msgid "%%(trailers) does not take arguments"
msgstr "%%(trailers) tar inte argument"
-#: ref-filter.c:111
+#: ref-filter.c:199
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "positivt värde förväntat contents:lines=%s"
-#: ref-filter.c:113
+#: ref-filter.c:201
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "okänt %%(contents)-argument: %s"
-#: ref-filter.c:123
+#: ref-filter.c:214
+#, c-format
+msgid "positive value expected objectname:short=%s"
+msgstr "positivt värde förväntat objectname:short=%s"
+
+#: ref-filter.c:218
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "okänt %%(objectname)-argument: %s"
-#: ref-filter.c:145
+#: ref-filter.c:245
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "förväntat format: %%(align:<bredd>,<position>)"
-#: ref-filter.c:157
+#: ref-filter.c:257
#, c-format
msgid "unrecognized position:%s"
msgstr "okänd position:%s"
-#: ref-filter.c:161
+#: ref-filter.c:261
#, c-format
msgid "unrecognized width:%s"
msgstr "okänd bredd:%s"
-#: ref-filter.c:167
+#: ref-filter.c:267
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "okänt %%(align)-argument: %s"
-#: ref-filter.c:171
+#: ref-filter.c:271
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "positiv bredd förväntad med atomen %%(align)"
-#: ref-filter.c:255
+#: ref-filter.c:286
+#, c-format
+msgid "unrecognized %%(if) argument: %s"
+msgstr "okänt %%(if)-argument: %s"
+
+#: ref-filter.c:371
#, c-format
msgid "malformed field name: %.*s"
msgstr "felformat fältnamn: %.*s"
-#: ref-filter.c:281
+#: ref-filter.c:397
#, c-format
msgid "unknown field name: %.*s"
msgstr "okänt fältnamn: %.*s"
-#: ref-filter.c:383
+#: ref-filter.c:501
+#, c-format
+msgid "format: %%(if) atom used without a %%(then) atom"
+msgstr "format: atomen %%(if) använd utan en %%(then)-atom"
+
+#: ref-filter.c:561
+#, c-format
+msgid "format: %%(then) atom used without an %%(if) atom"
+msgstr "format: atomen %%(then) använd utan en %%(if)-atom"
+
+#: ref-filter.c:563
+#, c-format
+msgid "format: %%(then) atom used more than once"
+msgstr "format: atomen %%(then) använd mer än en gång"
+
+#: ref-filter.c:565
+#, c-format
+msgid "format: %%(then) atom used after %%(else)"
+msgstr "format: atomen %%(then) använd efter %%(else)"
+
+#: ref-filter.c:591
+#, c-format
+msgid "format: %%(else) atom used without an %%(if) atom"
+msgstr "format: atomen %%(else) använd utan en %%(if)-atom"
+
+#: ref-filter.c:593
+#, c-format
+msgid "format: %%(else) atom used without a %%(then) atom"
+msgstr "format: atomen %%(else) använd utan en %%(then)-atom"
+
+#: ref-filter.c:595
+#, c-format
+msgid "format: %%(else) atom used more than once"
+msgstr "format: atomen %%(else) använd mer än en gång"
+
+#: ref-filter.c:608
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "format: atomen %%(end) använd utan motsvarande atom"
-#: ref-filter.c:435
+#: ref-filter.c:663
#, c-format
msgid "malformed format string %s"
msgstr "felformad formatsträng %s"
-#: ref-filter.c:898
-msgid ":strip= requires a positive integer argument"
-msgstr ":strip= kräver ett positivt heltalsargument"
-
-#: ref-filter.c:903
+#: ref-filter.c:1247
#, c-format
-msgid "ref '%s' does not have %ld components to :strip"
-msgstr "referensen \"%s\" har inte %ld komponenter för :strip"
+msgid "(no branch, rebasing %s)"
+msgstr "(ingen gren, ombaserar %s)"
-#: ref-filter.c:1066
+#: ref-filter.c:1250
#, c-format
-msgid "unknown %.*s format %s"
-msgstr "okänt \"%.*s\"-format %s"
+msgid "(no branch, bisect started on %s)"
+msgstr "(ingen gren, \"bisect\" startad på %s)"
-#: ref-filter.c:1086 ref-filter.c:1117
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached at " in wt-status.c
+#: ref-filter.c:1256
+#, c-format
+msgid "(HEAD detached at %s)"
+msgstr "(HEAD frånkopplat vid %s)"
+
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached from " in wt-status.c
+#: ref-filter.c:1261
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr "(HEAD frånkopplat från %s)"
+
+#: ref-filter.c:1265
+msgid "(no branch)"
+msgstr "(ingen gren)"
+
+#: ref-filter.c:1420 ref-filter.c:1451
#, c-format
msgid "missing object %s for %s"
msgstr "objektet %s saknas för %s"
-#: ref-filter.c:1089 ref-filter.c:1120
+#: ref-filter.c:1423 ref-filter.c:1454
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer misslyckades på %s för %s"
-#: ref-filter.c:1343
+#: ref-filter.c:1692
#, c-format
msgid "malformed object at '%s'"
msgstr "felformat objekt vid \"%s\""
-#: ref-filter.c:1410
+#: ref-filter.c:1759
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "ignorerar referens med trasigt namn %s"
-#: ref-filter.c:1415
+#: ref-filter.c:1764
#, c-format
msgid "ignoring broken ref %s"
msgstr "ignorerar trasig referens %s"
-#: ref-filter.c:1670
+#: ref-filter.c:2028
#, c-format
msgid "format: %%(end) atom missing"
msgstr "format: atomen %%(end) saknas"
-#: ref-filter.c:1734
+#: ref-filter.c:2109
#, c-format
msgid "malformed object name %s"
msgstr "felformat objektnamn %s"
@@ -2624,15 +2841,25 @@
msgid "dup2(%d,%d) failed"
msgstr "dup2(%d,%d) misslyckades"
-#: send-pack.c:297
+#: send-pack.c:150
+#, c-format
+msgid "unable to parse remote unpack status: %s"
+msgstr "kunde inte tolka fjärruppackningsstatus: %s"
+
+#: send-pack.c:152
+#, c-format
+msgid "remote unpack failed: %s"
+msgstr "fjärruppackning misslyckades: %s"
+
+#: send-pack.c:315
msgid "failed to sign the push certificate"
msgstr "misslyckades underteckna push-certifikatet"
-#: send-pack.c:410
+#: send-pack.c:428
msgid "the receiving end does not support --signed push"
msgstr "mottagarsidan stöder inte push med --signed"
-#: send-pack.c:412
+#: send-pack.c:430
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -2640,11 +2867,11 @@
"sänder inte push-certifikat eftersom mottagarsidan inte stlder push med --"
"signed"
-#: send-pack.c:424
+#: send-pack.c:442
msgid "the receiving end does not support --atomic push"
msgstr "mottagarsidan stöder inte push med --atomic"
-#: send-pack.c:429
+#: send-pack.c:447
msgid "the receiving end does not support push options"
msgstr "mottagarsidan stöder inte push-flaggor"
@@ -2683,12 +2910,12 @@
"med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n"
"och checka in resultatet med \"git commit\""
-#: sequencer.c:294 sequencer.c:1667
+#: sequencer.c:294 sequencer.c:1682
#, c-format
msgid "could not lock '%s'"
msgstr "kunde inte låsa \"%s\""
-#: sequencer.c:297 sequencer.c:1545 sequencer.c:1672 sequencer.c:1686
+#: sequencer.c:297 sequencer.c:1560 sequencer.c:1687 sequencer.c:1701
#, c-format
msgid "could not write to '%s'"
msgstr "kunde inte skriva till \"%s\""
@@ -2698,13 +2925,13 @@
msgid "could not write eol to '%s'"
msgstr "kunde inte skriva radslut till \"%s\""
-#: sequencer.c:305 sequencer.c:1550 sequencer.c:1674
+#: sequencer.c:305 sequencer.c:1565 sequencer.c:1689
#, c-format
msgid "failed to finalize '%s'."
msgstr "misslyckades färdigställa \"%s\"."
-#: sequencer.c:329 sequencer.c:808 sequencer.c:1571 builtin/am.c:259
-#: builtin/commit.c:749 builtin/merge.c:1036
+#: sequencer.c:329 sequencer.c:814 sequencer.c:1586 builtin/am.c:257
+#: builtin/commit.c:749 builtin/merge.c:1018
#, c-format
msgid "could not read '%s'"
msgstr "kunde inte läsa \"%s\""
@@ -2768,17 +2995,17 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:688
+#: sequencer.c:694
#, c-format
msgid "could not parse commit %s\n"
msgstr "kunde inte tolka incheckningen %s\n"
-#: sequencer.c:693
+#: sequencer.c:699
#, c-format
msgid "could not parse parent commit %s\n"
msgstr "kunde inte tolka föräldraincheckningen %s\n"
-#: sequencer.c:815
+#: sequencer.c:821
#, c-format
msgid ""
"unexpected 1st line of squash message:\n"
@@ -2789,7 +3016,7 @@
"\n"
"\t%.*s"
-#: sequencer.c:821
+#: sequencer.c:827
#, c-format
msgid ""
"invalid 1st line of squash message:\n"
@@ -2800,231 +3027,231 @@
"\n"
"\t%.*s"
-#: sequencer.c:827 sequencer.c:852
+#: sequencer.c:833 sequencer.c:858
#, c-format
msgid "This is a combination of %d commits."
msgstr "Det här är en kombination av %d incheckningar."
-#: sequencer.c:836
+#: sequencer.c:842
msgid "need a HEAD to fixup"
msgstr "behöver en HEAD-incheckning att rätta"
-#: sequencer.c:838
+#: sequencer.c:844
msgid "could not read HEAD"
msgstr "kunde inte läsa HEAD"
-#: sequencer.c:840
+#: sequencer.c:846
msgid "could not read HEAD's commit message"
msgstr "kunde inte läsa HEAD:s incheckningsmeddelande"
-#: sequencer.c:846
+#: sequencer.c:852
#, c-format
msgid "cannot write '%s'"
msgstr "kan inte skriva \"%s\""
-#: sequencer.c:855 git-rebase--interactive.sh:445
+#: sequencer.c:861 git-rebase--interactive.sh:445
msgid "This is the 1st commit message:"
msgstr "Det här är 1:a incheckningsmeddelandet:"
-#: sequencer.c:863
+#: sequencer.c:869
#, c-format
msgid "could not read commit message of %s"
msgstr "kunde inte läsa incheckningsmeddelande för %s"
-#: sequencer.c:870
+#: sequencer.c:876
#, c-format
msgid "This is the commit message #%d:"
msgstr "Det här är incheckningsmeddelande %d:"
-#: sequencer.c:875
+#: sequencer.c:881
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Incheckningsmeddelande %d kommer hoppas över:"
-#: sequencer.c:880
+#: sequencer.c:886
#, c-format
msgid "unknown command: %d"
msgstr "okänt kommando: %d"
-#: sequencer.c:946
+#: sequencer.c:952
msgid "your index file is unmerged."
msgstr "din indexfil har inte slagits ihop."
-#: sequencer.c:964
+#: sequencer.c:970
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "incheckning %s är en sammanslagning, men flaggan -m angavs inte."
-#: sequencer.c:972
+#: sequencer.c:978
#, c-format
msgid "commit %s does not have parent %d"
msgstr "incheckning %s har inte förälder %d"
-#: sequencer.c:976
+#: sequencer.c:982
#, c-format
msgid "mainline was specified but commit %s is not a merge."
msgstr "huvudlinje angavs, men incheckningen %s är inte en sammanslagning"
-#: sequencer.c:982
+#: sequencer.c:988
#, c-format
msgid "cannot get commit message for %s"
msgstr "kan inte hämta incheckningsmeddelande för %s"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1001
+#: sequencer.c:1009
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: kan inte tolka föräldraincheckningen %s"
-#: sequencer.c:1063 sequencer.c:1812
+#: sequencer.c:1071 sequencer.c:1827
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "kunde inte byta namn på \"%s\" till \"%s\""
-#: sequencer.c:1114
+#: sequencer.c:1122
#, c-format
msgid "could not revert %s... %s"
msgstr "kunde inte ångra %s... %s"
-#: sequencer.c:1115
+#: sequencer.c:1123
#, c-format
msgid "could not apply %s... %s"
msgstr "kunde inte tillämpa %s... %s"
-#: sequencer.c:1157
+#: sequencer.c:1165
msgid "empty commit set passed"
msgstr "den angivna uppsättningen incheckningar är tom"
-#: sequencer.c:1167
+#: sequencer.c:1175
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: misslyckades läsa indexet"
-#: sequencer.c:1174
+#: sequencer.c:1182
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: misslyckades uppdatera indexet"
-#: sequencer.c:1294
+#: sequencer.c:1303
#, c-format
msgid "invalid line %d: %.*s"
msgstr "ogiltig rad %d: %.*s"
-#: sequencer.c:1302
+#: sequencer.c:1311
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "Kan inte utföra \"%s\" utan en föregående incheckning"
-#: sequencer.c:1334
+#: sequencer.c:1344
#, c-format
msgid "could not read '%s'."
msgstr "kunde inte läsa \"%s\"."
-#: sequencer.c:1341
+#: sequencer.c:1356
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "rätta det med \"git rebase --edit-todo\"."
-#: sequencer.c:1343
+#: sequencer.c:1358
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "oanvändbart manus: %s"
-#: sequencer.c:1348
+#: sequencer.c:1363
msgid "no commits parsed."
msgstr "inga incheckningar lästes."
-#: sequencer.c:1359
+#: sequencer.c:1374
msgid "cannot cherry-pick during a revert."
msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"."
-#: sequencer.c:1361
+#: sequencer.c:1376
msgid "cannot revert during a cherry-pick."
msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"."
-#: sequencer.c:1424
+#: sequencer.c:1439
#, c-format
msgid "invalid key: %s"
msgstr "felaktig nyckel: %s"
-#: sequencer.c:1427
+#: sequencer.c:1442
#, c-format
msgid "invalid value for %s: %s"
msgstr "felaktigt värde för %s: %s"
-#: sequencer.c:1484
+#: sequencer.c:1499
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "trasigt manus: %s"
-#: sequencer.c:1522
+#: sequencer.c:1537
msgid "a cherry-pick or revert is already in progress"
msgstr "en \"cherry-pick\" eller \"revert\" pågår redan"
-#: sequencer.c:1523
+#: sequencer.c:1538
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\""
-#: sequencer.c:1526
+#: sequencer.c:1541
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\""
-#: sequencer.c:1540
+#: sequencer.c:1555
msgid "could not lock HEAD"
msgstr "kunde inte låsa HEAD"
-#: sequencer.c:1596 sequencer.c:2150
+#: sequencer.c:1611 sequencer.c:2181
msgid "no cherry-pick or revert in progress"
msgstr "ingen \"cherry-pick\" eller \"revert\" pågår"
-#: sequencer.c:1598
+#: sequencer.c:1613
msgid "cannot resolve HEAD"
msgstr "kan inte bestämma HEAD"
-#: sequencer.c:1600 sequencer.c:1634
+#: sequencer.c:1615 sequencer.c:1649
msgid "cannot abort from a branch yet to be born"
msgstr "kan inte avbryta från en gren som ännu inte är född"
-#: sequencer.c:1620 builtin/grep.c:904
+#: sequencer.c:1635 builtin/grep.c:910
#, c-format
msgid "cannot open '%s'"
msgstr "kan inte öppna \"%s\""
-#: sequencer.c:1622
+#: sequencer.c:1637
#, c-format
msgid "cannot read '%s': %s"
msgstr "kan inte läsa \"%s\": %s"
-#: sequencer.c:1623
+#: sequencer.c:1638
msgid "unexpected end of file"
msgstr "oväntat filslut"
-#: sequencer.c:1629
+#: sequencer.c:1644
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "sparad HEAD-fil från före \"cherry-pick\", \"%s\", är trasig"
-#: sequencer.c:1640
+#: sequencer.c:1655
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
"Du verkar ha flyttat HEAD.\n"
"Spolar inte tillbaka, kontrollera HEAD!"
-#: sequencer.c:1777 sequencer.c:2049
+#: sequencer.c:1792 sequencer.c:2080
msgid "cannot read HEAD"
msgstr "kan inte läsa HEAD"
-#: sequencer.c:1817 builtin/difftool.c:574
+#: sequencer.c:1832 builtin/difftool.c:616
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "kunde inte kopiera in \"%s\" till \"%s\""
-#: sequencer.c:1833
+#: sequencer.c:1848
msgid "could not read index"
msgstr "Kunde inte läsa indexet"
-#: sequencer.c:1838
+#: sequencer.c:1853
#, c-format
msgid ""
"execution failed: %s\n"
@@ -3039,11 +3266,11 @@
"\tgit rebase --continue\n"
"\n"
-#: sequencer.c:1844
+#: sequencer.c:1859
msgid "and made changes to the index and/or the working tree\n"
msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen\n"
-#: sequencer.c:1850
+#: sequencer.c:1865
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -3060,17 +3287,17 @@
"\tgit rebase --continue\n"
"\n"
-#: sequencer.c:1905 git-rebase.sh:168
+#: sequencer.c:1920 git-rebase.sh:169
#, c-format
msgid "Applied autostash."
msgstr "Tillämpade autostash."
-#: sequencer.c:1917
+#: sequencer.c:1932
#, c-format
msgid "cannot store %s"
msgstr "kan inte spara %s"
-#: sequencer.c:1919 git-rebase.sh:172
+#: sequencer.c:1934 git-rebase.sh:173
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
@@ -3081,57 +3308,57 @@
"Dina ändringar är säkra i stashen.\n"
"Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n"
-#: sequencer.c:2000
+#: sequencer.c:2016
#, c-format
-msgid "stopped at %s... %.*s"
-msgstr "stoppade på %s... %.*s"
+msgid "Stopped at %s... %.*s\n"
+msgstr "Stoppade på %s... %.*s\n"
-#: sequencer.c:2027
+#: sequencer.c:2058
#, c-format
msgid "unknown command %d"
msgstr "okänt kommando %d"
-#: sequencer.c:2057
+#: sequencer.c:2088
msgid "could not read orig-head"
msgstr "Kunde inte läsa orig-head"
-#: sequencer.c:2061
+#: sequencer.c:2092
msgid "could not read 'onto'"
msgstr "kunde inte läsa \"onto\""
-#: sequencer.c:2068
+#: sequencer.c:2099
#, c-format
msgid "could not update %s"
msgstr "kunde inte uppdatera %s"
-#: sequencer.c:2075
+#: sequencer.c:2106
#, c-format
msgid "could not update HEAD to %s"
msgstr "kunde inte uppdatera HEAD till %s"
-#: sequencer.c:2159
+#: sequencer.c:2190
msgid "cannot rebase: You have unstaged changes."
msgstr "kan inte ombasera: Du har oköade ändringar."
-#: sequencer.c:2164
+#: sequencer.c:2195
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "kunde inte ta bort CHERRY_PICK_HEAD"
-#: sequencer.c:2173
+#: sequencer.c:2204
msgid "cannot amend non-existing commit"
msgstr "kan inte lägga till incheckning som inte finns"
-#: sequencer.c:2175
+#: sequencer.c:2206
#, c-format
msgid "invalid file: '%s'"
msgstr "ogiltig fil: \"%s\""
-#: sequencer.c:2177
+#: sequencer.c:2208
#, c-format
msgid "invalid contents: '%s'"
msgstr "ogiltigt innehåll: \"%s\""
-#: sequencer.c:2180
+#: sequencer.c:2211
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -3141,25 +3368,25 @@
"Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n"
"först och kör sedan \"git rebase --continute\" igen."
-#: sequencer.c:2190
+#: sequencer.c:2221
msgid "could not commit staged changes."
msgstr "kunde inte checka in köade ändringar."
-#: sequencer.c:2270
+#: sequencer.c:2301
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\""
-#: sequencer.c:2274
+#: sequencer.c:2305
#, c-format
msgid "%s: bad revision"
msgstr "%s: felaktig revision"
-#: sequencer.c:2307
+#: sequencer.c:2338
msgid "can't revert as initial commit"
msgstr "kan inte ångra som första incheckning"
-#: setup.c:160
+#: setup.c:165
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
@@ -3169,7 +3396,7 @@
"Använd \"git <kommando> -- <sökväg>..\" för att ange sökvägar som inte finns "
"lokalt."
-#: setup.c:173
+#: setup.c:178
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -3181,7 +3408,7 @@
"Använd \"--\" för att skilja sökvägar från revisioner, så här:\n"
"\"git <kommando> [<revision>...] -- [<fil>...]\""
-#: setup.c:223
+#: setup.c:228
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
@@ -3192,29 +3419,34 @@
"Använd \"--\" för att skilja sökvägar från revisioner, så här:\n"
"\"git <kommando> [<revision>...] -- [<fil>...]\""
-#: setup.c:470
+#: setup.c:475
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "Förväntade git-arkivversion <= %d, hittade %d"
-#: setup.c:478
+#: setup.c:483
msgid "unknown repository extensions found:"
msgstr "okända arkivutökningar hittades:"
-#: setup.c:768
+#: setup.c:776
#, c-format
msgid "Not a git repository (or any of the parent directories): %s"
msgstr "Inte ett git-arkiv (eller någon av föräldrakatalogerna): %s"
-#: setup.c:770 setup.c:922 builtin/index-pack.c:1643
+#: setup.c:778 builtin/index-pack.c:1646
msgid "Cannot come back to cwd"
msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)"
-#: setup.c:852
+#: setup.c:1010
msgid "Unable to read current working directory"
msgstr "Kan inte läsa aktuell arbetskatalog"
-#: setup.c:927
+#: setup.c:1022 setup.c:1028
+#, c-format
+msgid "Cannot change to '%s'"
+msgstr "Kan inte byta till \"%s\""
+
+#: setup.c:1041
#, c-format
msgid ""
"Not a git repository (or any parent up to mount point %s)\n"
@@ -3224,12 +3456,7 @@
"monteringspunkten %s)\n"
"Stoppar vid filsystemsgräns (GIT_DISCOVERY_ACROSS_FILESYSTEM är inte satt)."
-#: setup.c:934
-#, c-format
-msgid "Cannot change to '%s/..'"
-msgstr "kan inte byta till \"%s/..\""
-
-#: setup.c:996
+#: setup.c:1106
#, c-format
msgid ""
"Problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -3238,55 +3465,55 @@
"Problem med filläges-värdet i core.sharedRepository (0%.3o).\n"
"Ägaren av filerna måste alltid ha läs- och skrivbehörighet."
-#: sha1_file.c:490
+#: sha1_file.c:559
#, c-format
msgid "path '%s' does not exist"
msgstr "sökvägen \"%s\" finns inte"
-#: sha1_file.c:516
+#: sha1_file.c:585
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr "referensarkivet \"%s\" som en länkad utcheckning stöds inte ännu."
-#: sha1_file.c:522
+#: sha1_file.c:591
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv."
-#: sha1_file.c:528
+#: sha1_file.c:597
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "referensarkivet \"%s\" är grunt"
-#: sha1_file.c:536
+#: sha1_file.c:605
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "referensarkivet \"%s\" är ympat"
-#: sha1_file.c:1176
+#: sha1_file.c:1245
msgid "offset before end of packfile (broken .idx?)"
msgstr "offset före slutet av packfilen (trasig .idx?)"
-#: sha1_file.c:2637
+#: sha1_file.c:2721
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "offset före slutet av packindex för %s (trasigt index?)"
-#: sha1_file.c:2641
+#: sha1_file.c:2725
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "offset borton slutet av packindex för %s (trunkerat index?)"
-#: sha1_name.c:407
+#: sha1_name.c:409
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr "kort SHA1 %s är tvetydig"
-#: sha1_name.c:418
+#: sha1_name.c:420
msgid "The candidates are:"
msgstr "Kandidaterna är:"
-#: sha1_name.c:578
+#: sha1_name.c:580
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"
@@ -3308,46 +3535,56 @@
"Undersök referenserna och ta kanske bort dem. Stäng av meddelandet\n"
"genom att köra \"git config advice.objectNameWarning false\""
-#: submodule.c:65 submodule.c:99
+#: submodule.c:67 submodule.c:101
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
"Kan inte ändra .gitmodules-fil som inte slagits ihop, lös "
"sammanslagningskonflikter först"
-#: submodule.c:69 submodule.c:103
+#: submodule.c:71 submodule.c:105
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "Hittade inte någon sektion i .gitmodules där sökväg=%s"
-#: submodule.c:77
+#: submodule.c:79
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "Kunde inte uppdatera .gitmodules-posten %s"
-#: submodule.c:110
+#: submodule.c:112
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "Kunde inte ta bort .gitmodules-posten för %s"
-#: submodule.c:121
+#: submodule.c:123
msgid "staging updated .gitmodules failed"
msgstr "misslyckades köa uppdaterad .gitmodules"
-#: submodule.c:159
+#: submodule.c:161
msgid "negative values not allowed for submodule.fetchJobs"
msgstr "negativa värden är inte tillåtna för submodule.fetchJobs"
-#: submodule.c:1184
+#: submodule.c:1194
#, c-format
-msgid "could not start 'git status in submodule '%s'"
+msgid "'%s' not recognized as a git repository"
+msgstr "\"%s\" känns inte igen som ett git-arkiv"
+
+#: submodule.c:1332
+#, c-format
+msgid "could not start 'git status' in submodule '%s'"
msgstr "kunde inte starta \"git status\" i undermodulen \"%s\""
-#: submodule.c:1197
+#: submodule.c:1345
#, c-format
-msgid "could not run 'git status in submodule '%s'"
+msgid "could not run 'git status' in submodule '%s'"
msgstr "kunde inte köra \"git status\" i undermodulen \"%s\""
-#: submodule.c:1398
+#: submodule.c:1421
+#, c-format
+msgid "submodule '%s' has dirty index"
+msgstr "undermodulen \"%s\" har ett smutsigt index"
+
+#: submodule.c:1678
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -3355,18 +3592,18 @@
"relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, "
"stöds ej"
-#: submodule.c:1410 submodule.c:1471
+#: submodule.c:1690 submodule.c:1746
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "kunde inte slå upp namnet för undermodulen \"%s\""
-#: submodule.c:1414 submodule.c:1474 builtin/submodule--helper.c:640
-#: builtin/submodule--helper.c:650
+#: submodule.c:1694 builtin/submodule--helper.c:678
+#: builtin/submodule--helper.c:688
#, c-format
msgid "could not create directory '%s'"
msgstr "kunde inte skapa katalogen \"%s\""
-#: submodule.c:1420
+#: submodule.c:1697
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -3377,12 +3614,25 @@
"\"%s\" till\n"
"\"%s\"\n"
-#: submodule.c:1512
+#: submodule.c:1781
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "kunde inte rekursera in i undermodulen \"%s\""
-#: submodule-config.c:360
+#: submodule.c:1825
+msgid "could not start ls-files in .."
+msgstr "kunde inte starta ls-files i .."
+
+#: submodule.c:1845
+msgid "BUG: returned path string doesn't match cwd?"
+msgstr "BUG: returnerad sökvägssträng matchar inte cwd?"
+
+#: submodule.c:1864
+#, c-format
+msgid "ls-tree returned unexpected return code %d"
+msgstr "ls-tree returnerade en oväntad returkod %d"
+
+#: submodule-config.c:380
#, c-format
msgid "invalid value for %s"
msgstr "ogiltigt värde för %s"
@@ -3451,7 +3701,7 @@
msgid "transport: invalid depth option '%s'"
msgstr "transport: ogiltig flagga för depth: %s"
-#: transport.c:885
+#: transport.c:889
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -3460,7 +3710,7 @@
"Följande undermodulsökvägar innehåller ändringar som\n"
"inte kan hittas av fjärrarna:\n"
-#: transport.c:889
+#: transport.c:893
#, c-format
msgid ""
"\n"
@@ -3487,11 +3737,11 @@
"för att sända dem till fjärren.\n"
"\n"
-#: transport.c:897
+#: transport.c:901
msgid "Aborting."
msgstr "Avbryter."
-#: transport-helper.c:1082
+#: transport-helper.c:1080
#, c-format
msgid "Could not read ref %s"
msgstr "Kunde inte läsa referensen %s"
@@ -3512,7 +3762,7 @@
msgid "too-short tree file"
msgstr "trädfil för kort"
-#: unpack-trees.c:99
+#: unpack-trees.c:104
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -3521,7 +3771,7 @@
"Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n"
"%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren."
-#: unpack-trees.c:101
+#: unpack-trees.c:106
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -3530,7 +3780,7 @@
"Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n"
"%%s"
-#: unpack-trees.c:104
+#: unpack-trees.c:109
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -3540,7 +3790,7 @@
"sammanslagning:\n"
"%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren."
-#: unpack-trees.c:106
+#: unpack-trees.c:111
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -3550,7 +3800,7 @@
"sammanslagning:\n"
"%%s"
-#: unpack-trees.c:109
+#: unpack-trees.c:114
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -3559,7 +3809,7 @@
"Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n"
"%%sChecka in dina ändringar eller använd \"stash\" innan du \"%s\"."
-#: unpack-trees.c:111
+#: unpack-trees.c:116
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -3568,7 +3818,7 @@
"Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n"
"%%s"
-#: unpack-trees.c:116
+#: unpack-trees.c:121
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -3578,7 +3828,7 @@
"dem:\n"
"%s"
-#: unpack-trees.c:120
+#: unpack-trees.c:125
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -3587,7 +3837,7 @@
"Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n"
"%%sFlytta eller ta bort dem innan du byter gren."
-#: unpack-trees.c:122
+#: unpack-trees.c:127
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -3596,7 +3846,7 @@
"Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n"
"%%s"
-#: unpack-trees.c:125
+#: unpack-trees.c:130
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -3606,7 +3856,7 @@
"sammanslagningen:\n"
"%%sFlytta eller ta bort dem innan du slår samman."
-#: unpack-trees.c:127
+#: unpack-trees.c:132
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -3616,7 +3866,7 @@
"sammanslagningen:\n"
"%%s"
-#: unpack-trees.c:130
+#: unpack-trees.c:135
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -3625,7 +3875,7 @@
"Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n"
"%%sFlytta eller ta bort dem innan du \"%s\"."
-#: unpack-trees.c:132
+#: unpack-trees.c:137
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -3634,7 +3884,7 @@
"Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n"
"%%s"
-#: unpack-trees.c:137
+#: unpack-trees.c:142
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -3645,7 +3895,7 @@
"utcheckningen:\n"
"%%sFlytta eller ta bort dem innan du byter gren."
-#: unpack-trees.c:139
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -3656,7 +3906,7 @@
"utcheckningen:\n"
"%%s"
-#: unpack-trees.c:142
+#: unpack-trees.c:147
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -3666,7 +3916,7 @@
"sammanslagningen:\n"
"%%sFlytta eller ta bort dem innan du byter gren."
-#: unpack-trees.c:144
+#: unpack-trees.c:149
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -3676,7 +3926,7 @@
"sammanslagningen:\n"
"%%s"
-#: unpack-trees.c:147
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -3685,7 +3935,7 @@
"Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n"
"%%sFlytta eller ta bort dem innan du \"%s\"."
-#: unpack-trees.c:149
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -3694,12 +3944,12 @@
"Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n"
"%%s"
-#: unpack-trees.c:156
+#: unpack-trees.c:161
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "Posten \"%s\" överlappar \"%s\". Kan inte binda."
-#: unpack-trees.c:159
+#: unpack-trees.c:164
#, c-format
msgid ""
"Cannot update sparse checkout: the following entries are not up-to-date:\n"
@@ -3708,7 +3958,7 @@
"Kan inte uppdatera gles utcheckning: följande poster är inte àjour:\n"
"%s"
-#: unpack-trees.c:161
+#: unpack-trees.c:166
#, c-format
msgid ""
"The following working tree files would be overwritten by sparse checkout "
@@ -3719,7 +3969,7 @@
"utcheckning:\n"
"%s"
-#: unpack-trees.c:163
+#: unpack-trees.c:168
#, c-format
msgid ""
"The following working tree files would be removed by sparse checkout "
@@ -3730,45 +3980,59 @@
"utcheckning:\n"
"%s"
-#: unpack-trees.c:240
+#: unpack-trees.c:170
+#, c-format
+msgid ""
+"Cannot update submodule:\n"
+"%s"
+msgstr ""
+"Kan inte uppdatera undermodul:\n"
+"%s"
+
+#: unpack-trees.c:247
#, c-format
msgid "Aborting\n"
msgstr "Avbryter\n"
-#: unpack-trees.c:270
+#: unpack-trees.c:272
+#, c-format
+msgid "submodule update strategy not supported for submodule '%s'"
+msgstr "uppdateringsstrategi för undermodul stöds inte för undermodulen \"%s\""
+
+#: unpack-trees.c:340
msgid "Checking out files"
msgstr "Checkar ut filer"
-#: urlmatch.c:120
+#: urlmatch.c:163
msgid "invalid URL scheme name or missing '://' suffix"
msgstr "ogiltig URL-schemanamn eller saknat \"://\"-suffix"
-#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
+#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
#, c-format
msgid "invalid %XX escape sequence"
msgstr "ogiltig %XX-teckensekvens"
-#: urlmatch.c:172
+#: urlmatch.c:215
msgid "missing host and scheme is not 'file:'"
msgstr "värd saknas och schemat är inte \"file:\""
-#: urlmatch.c:189
+#: urlmatch.c:232
msgid "a 'file:' URL may not have a port number"
msgstr "en \"file:\"-URL kan inte innehålla portnummer"
-#: urlmatch.c:199
+#: urlmatch.c:247
msgid "invalid characters in host name"
msgstr "ogiltiga tecken i värdnamnet"
-#: urlmatch.c:244 urlmatch.c:255
+#: urlmatch.c:292 urlmatch.c:303
msgid "invalid port number"
msgstr "felaktigt portnummer"
-#: urlmatch.c:322
+#: urlmatch.c:371
msgid "invalid '..' path segment"
msgstr "felaktigt \"..\"-sökvägssegment"
-#: worktree.c:282
+#: worktree.c:285
#, c-format
msgid "failed to read '%s'"
msgstr "misslyckades läsa \"%s\""
@@ -3783,28 +4047,28 @@
msgid "could not open '%s' for writing"
msgstr "kunde inte öppna \"%s\" för skrivning"
-#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759
-#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1033
+#: 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
#, c-format
msgid "could not open '%s' for reading"
msgstr "kunde inte öppna \"%s\" för läsning"
-#: wrapper.c:605 wrapper.c:626
+#: wrapper.c:581 wrapper.c:602
#, c-format
msgid "unable to access '%s'"
msgstr "kan inte komma åt \"%s\""
-#: wrapper.c:634
+#: wrapper.c:610
msgid "unable to get current working directory"
msgstr "kan inte hämta aktuell arbetskatalog"
-#: wrapper.c:658
+#: wrapper.c:634
#, c-format
msgid "could not write to %s"
msgstr "kunde inte skriva till %s"
-#: wrapper.c:660
+#: wrapper.c:636
#, c-format
msgid "could not close %s"
msgstr "kunde inte stänga %s"
@@ -3834,11 +4098,11 @@
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (använd \"git rm <fil>...\" för att ange lösning)"
-#: wt-status.c:199 wt-status.c:945
+#: wt-status.c:199 wt-status.c:958
msgid "Changes to be committed:"
msgstr "Ändringar att checka in:"
-#: wt-status.c:217 wt-status.c:954
+#: wt-status.c:217 wt-status.c:967
msgid "Changes not staged for commit:"
msgstr "Ändringar ej i incheckningskön:"
@@ -3942,15 +4206,15 @@
msgid "untracked content, "
msgstr "ospårat innehåll, "
-#: wt-status.c:818
+#: wt-status.c:831
msgid "Submodules changed but not updated:"
msgstr "Undermoduler ändrade men inte uppdaterade:"
-#: wt-status.c:820
+#: wt-status.c:833
msgid "Submodule changes to be committed:"
msgstr "Undermodulers ändringar att checka in:"
-#: wt-status.c:901
+#: wt-status.c:914
msgid ""
"Do not touch the line above.\n"
"Everything below will be removed."
@@ -3958,107 +4222,107 @@
"Rör inte raden ovan.\n"
"Allt nedan kommer tas bort."
-#: wt-status.c:1013
+#: wt-status.c:1026
msgid "You have unmerged paths."
msgstr "Du har ej sammanslagna sökvägar."
-#: wt-status.c:1016
+#: wt-status.c:1029
msgid " (fix conflicts and run \"git commit\")"
msgstr " (rätta konflikter och kör \"git commit\")"
-#: wt-status.c:1018
+#: wt-status.c:1031
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (använd \"git merge --abort\" för att avbryta sammanslagningen)"
-#: wt-status.c:1023
+#: wt-status.c:1036
msgid "All conflicts fixed but you are still merging."
msgstr "Alla konflikter har rättats men du är fortfarande i en sammanslagning."
-#: wt-status.c:1026
+#: wt-status.c:1039
msgid " (use \"git commit\" to conclude merge)"
msgstr " (använd \"git commit\" för att slutföra sammanslagningen)"
-#: wt-status.c:1036
+#: wt-status.c:1049
msgid "You are in the middle of an am session."
msgstr "Du är i mitten av en körning av \"git am\"."
-#: wt-status.c:1039
+#: wt-status.c:1052
msgid "The current patch is empty."
msgstr "Aktuell patch är tom."
-#: wt-status.c:1043
+#: wt-status.c:1056
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (rätta konflikter och kör sedan \"git am --continue\")"
-#: wt-status.c:1045
+#: wt-status.c:1058
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (använd \"git am --skip\" för att hoppa över patchen)"
-#: wt-status.c:1047
+#: wt-status.c:1060
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (använd \"git am --abort\" för att återställa ursprungsgrenen)"
-#: wt-status.c:1176
+#: wt-status.c:1189
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo saknas."
-#: wt-status.c:1178
+#: wt-status.c:1191
msgid "No commands done."
msgstr "Inga kommandon utförda."
-#: wt-status.c:1181
+#: wt-status.c:1194
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] "Sista kommandot utfört (%d kommando utfört):"
msgstr[1] "Sista kommandot utfört (%d kommandon utfört):"
-#: wt-status.c:1192
+#: wt-status.c:1205
#, c-format
msgid " (see more in file %s)"
msgstr " (se fler i filen %s)"
-#: wt-status.c:1197
+#: wt-status.c:1210
msgid "No commands remaining."
msgstr "Inga kommandon återstår."
-#: wt-status.c:1200
+#: wt-status.c:1213
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
msgstr[0] "Nästa kommando att utföra (%d kommando återstår):"
msgstr[1] "Följande kommandon att utföra (%d kommandon återstår):"
-#: wt-status.c:1208
+#: wt-status.c:1221
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (använd \"git rebase --edit-todo\" för att visa och redigera)"
-#: wt-status.c:1221
+#: wt-status.c:1234
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Du håller på att ombasera grenen \"%s\" ovanpå \"%s\"."
-#: wt-status.c:1226
+#: wt-status.c:1239
msgid "You are currently rebasing."
msgstr "Du håller på med en ombasering."
-#: wt-status.c:1240
+#: wt-status.c:1253
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")"
-#: wt-status.c:1242
+#: wt-status.c:1255
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)"
-#: wt-status.c:1244
+#: wt-status.c:1257
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (använd \"git rebase --abort\" för att checka ut ursprungsgrenen)"
-#: wt-status.c:1250
+#: wt-status.c:1263
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (alla konflikter rättade: kör \"git rebase --continue\")"
-#: wt-status.c:1254
+#: wt-status.c:1267
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -4066,122 +4330,122 @@
"Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" "
"ovanpå \"%s\"."
-#: wt-status.c:1259
+#: wt-status.c:1272
msgid "You are currently splitting a commit during a rebase."
msgstr "Du håller på att dela upp en incheckning i en ombasering."
-#: wt-status.c:1262
+#: wt-status.c:1275
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr " (Så fort din arbetskatalog är ren, kör \"git rebase --continue\")"
-#: wt-status.c:1266
+#: wt-status.c:1279
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Du håller på att redigera en incheckning medan du ombaserar grenen \"%s\" "
"ovanpå \"%s\"."
-#: wt-status.c:1271
+#: wt-status.c:1284
msgid "You are currently editing a commit during a rebase."
msgstr "Du håller på att redigera en incheckning under en ombasering."
-#: wt-status.c:1274
+#: wt-status.c:1287
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
" (använd \"git commit --amend\" för att lägga till på aktuell incheckning)"
-#: wt-status.c:1276
+#: wt-status.c:1289
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr " (använd \"git rebase --continue\" när du är nöjd med dina ändringar)"
-#: wt-status.c:1286
+#: wt-status.c:1299
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Du håller på med en \"cherry-pick\" av incheckningen %s."
-#: wt-status.c:1291
+#: wt-status.c:1304
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")"
-#: wt-status.c:1294
+#: wt-status.c:1307
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")"
-#: wt-status.c:1296
+#: wt-status.c:1309
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
" (använd \"git cherry-pick --abort\" för att avbryta \"cherry-pick\"-"
"operationen)"
-#: wt-status.c:1305
+#: wt-status.c:1318
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Du håller på med att ångra incheckningen %s."
-#: wt-status.c:1310
+#: wt-status.c:1323
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (rätta konflikter och kör sedan \"git revert --continue\")"
-#: wt-status.c:1313
+#: wt-status.c:1326
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (alla konflikter rättade: kör \"git revert --continue\")"
-#: wt-status.c:1315
+#: wt-status.c:1328
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)"
-#: wt-status.c:1326
+#: wt-status.c:1339
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Du håller på med en \"bisect\", startad från grenen \"%s\"."
-#: wt-status.c:1330
+#: wt-status.c:1343
msgid "You are currently bisecting."
msgstr "Du håller på med en \"bisect\"."
-#: wt-status.c:1333
+#: wt-status.c:1346
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
" (använd \"git bisect reset\" för att komma tillbaka till ursprungsgrenen)"
-#: wt-status.c:1530
+#: wt-status.c:1543
msgid "On branch "
msgstr "På grenen "
-#: wt-status.c:1536
+#: wt-status.c:1549
msgid "interactive rebase in progress; onto "
msgstr "interaktiv ombasering pågår; ovanpå"
-#: wt-status.c:1538
+#: wt-status.c:1551
msgid "rebase in progress; onto "
msgstr "ombasering pågår; ovanpå"
-#: wt-status.c:1543
+#: wt-status.c:1556
msgid "HEAD detached at "
msgstr "HEAD frånkopplad vid "
-#: wt-status.c:1545
+#: wt-status.c:1558
msgid "HEAD detached from "
msgstr "HEAD frånkopplad från "
-#: wt-status.c:1548
+#: wt-status.c:1561
msgid "Not currently on any branch."
msgstr "Inte på någon gren för närvarande."
-#: wt-status.c:1566
+#: wt-status.c:1579
msgid "Initial commit"
msgstr "Första incheckning"
-#: wt-status.c:1580
+#: wt-status.c:1593
msgid "Untracked files"
msgstr "Ospårade filer"
-#: wt-status.c:1582
+#: wt-status.c:1595
msgid "Ignored files"
msgstr "Ignorerade filer"
-#: wt-status.c:1586
+#: wt-status.c:1599
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -4193,32 +4457,32 @@
"lägga till nya filer själv (se \"git help status\")."
# %s är nästa sträng eller tom.
-#: wt-status.c:1592
+#: wt-status.c:1605
#, c-format
msgid "Untracked files not listed%s"
msgstr "Ospårade filer visas ej%s"
-#: wt-status.c:1594
+#: wt-status.c:1607
msgid " (use -u option to show untracked files)"
msgstr " (använd flaggan -u för att visa ospårade filer)"
-#: wt-status.c:1600
+#: wt-status.c:1613
msgid "No changes"
msgstr "Inga ändringar"
-#: wt-status.c:1605
+#: wt-status.c:1618
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"inga ändringar att checka in (använd \"git add\" och/eller \"git commit -a"
"\")\n"
-#: wt-status.c:1608
+#: wt-status.c:1621
#, c-format
msgid "no changes added to commit\n"
msgstr "inga ändringar att checka in\n"
-#: wt-status.c:1611
+#: wt-status.c:1624
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -4227,67 +4491,63 @@
"inget köat för incheckning, men ospårade filer finns (spåra med \"git add"
"\")\n"
-#: wt-status.c:1614
+#: wt-status.c:1627
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "inget köat för incheckning, men ospårade filer finns\n"
-#: wt-status.c:1617
+#: wt-status.c:1630
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr "inget att checka in (skapa/kopiera filer och spåra med \"git add\")\n"
-#: wt-status.c:1620 wt-status.c:1625
+#: wt-status.c:1633 wt-status.c:1638
#, c-format
msgid "nothing to commit\n"
msgstr "inget att checka in\n"
-#: wt-status.c:1623
+#: wt-status.c:1636
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "inget att checka in (använd -u för att visa ospårade filer)\n"
-#: wt-status.c:1627
+#: wt-status.c:1640
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "inget att checka in, arbetskatalogen ren\n"
-#: wt-status.c:1734
+#: wt-status.c:1749
msgid "Initial commit on "
msgstr "Första incheckning på "
-#: wt-status.c:1738
+#: wt-status.c:1753
msgid "HEAD (no branch)"
msgstr "HEAD (ingen gren)"
-#: wt-status.c:1767
-msgid "gone"
-msgstr "försvunnen"
-
-#: wt-status.c:1769 wt-status.c:1777
+#: wt-status.c:1782 wt-status.c:1790
msgid "behind "
msgstr "efter "
-#: wt-status.c:1772 wt-status.c:1775
+#: wt-status.c:1785 wt-status.c:1788
msgid "ahead "
msgstr "före "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2277
+#: wt-status.c:2280
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "kan inte %s: Du har oköade ändringar."
-#: wt-status.c:2283
+#: wt-status.c:2286
msgid "additionally, your index contains uncommitted changes."
msgstr "dessutom innehåller dit index ändringar som inte har checkats in."
-#: wt-status.c:2285
+#: wt-status.c:2288
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "kan inte %s: Ditt index innehåller ändringar som inte checkats in."
-#: compat/precompose_utf8.c:57 builtin/clone.c:414
+#: compat/precompose_utf8.c:57 builtin/clone.c:432
#, c-format
msgid "failed to unlink '%s'"
msgstr "misslyckades ta bort länken \"%s\""
@@ -4314,7 +4574,7 @@
msgid "Unstaged changes after refreshing the index:"
msgstr "Oköade ändringar efter att ha uppdaterat indexet:"
-#: builtin/add.c:209 builtin/rev-parse.c:845
+#: builtin/add.c:209 builtin/rev-parse.c:872
msgid "Could not read the index"
msgstr "Kunde inte läsa indexet"
@@ -4349,9 +4609,9 @@
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n"
-#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:123
+#: 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:1326 builtin/rm.c:241 builtin/send-pack.c:162
+#: builtin/remote.c:1328 builtin/rm.c:241 builtin/send-pack.c:163
msgid "dry run"
msgstr "testkörning"
@@ -4359,7 +4619,7 @@
msgid "interactive picking"
msgstr "plocka interaktivt"
-#: builtin/add.c:270 builtin/checkout.c:1159 builtin/reset.c:286
+#: builtin/add.c:270 builtin/checkout.c:1177 builtin/reset.c:286
msgid "select hunks interactively"
msgstr "välj stycken interaktivt"
@@ -4399,11 +4659,11 @@
msgid "check if - even missing - files are ignored in dry run"
msgstr "se om - även saknade - filer ignoreras i testkörning"
-#: builtin/add.c:283 builtin/update-index.c:947
+#: builtin/add.c:283 builtin/update-index.c:951
msgid "(+/-)x"
msgstr "(+/-)x"
-#: builtin/add.c:283 builtin/update-index.c:948
+#: builtin/add.c:283 builtin/update-index.c:952
msgid "override the executable bit of the listed files"
msgstr "överstyr exekveringsbiten för angivna filer"
@@ -4439,115 +4699,115 @@
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Kanske menade du att skriva \"git add .\"?\n"
-#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279
-#: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350
+#: 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/submodule--helper.c:244
msgid "index file corrupt"
msgstr "indexfilen trasig"
-#: builtin/am.c:414
+#: builtin/am.c:412
msgid "could not parse author script"
msgstr "kunde inte tolka författarskript"
-#: builtin/am.c:491
+#: builtin/am.c:489
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "\"%s\" togs bort av kroken applypatch-msg"
-#: builtin/am.c:532
+#: builtin/am.c:530
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Felaktig indatarad: \"%s\"."
-#: builtin/am.c:569
+#: builtin/am.c:567
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\""
-#: builtin/am.c:595
+#: builtin/am.c:593
msgid "fseek failed"
msgstr "\"fseek\" misslyckades"
-#: builtin/am.c:775
+#: builtin/am.c:777
#, c-format
msgid "could not parse patch '%s'"
msgstr "kunde inte tolka patchen \"%s\""
-#: builtin/am.c:840
+#: builtin/am.c:842
msgid "Only one StGIT patch series can be applied at once"
msgstr "Endast en StGIT-patchserie kan tillämpas åt gången"
-#: builtin/am.c:887
+#: builtin/am.c:889
msgid "invalid timestamp"
msgstr "ogiltig tidsstämpel"
-#: builtin/am.c:890 builtin/am.c:898
+#: builtin/am.c:892 builtin/am.c:900
msgid "invalid Date line"
msgstr "ogiltig \"Date\"-rad"
-#: builtin/am.c:895
+#: builtin/am.c:897
msgid "invalid timezone offset"
msgstr "ogiltig tidszons-offset"
-#: builtin/am.c:984
+#: builtin/am.c:986
msgid "Patch format detection failed."
msgstr "Misslyckades detektera patchformat."
-#: builtin/am.c:989 builtin/clone.c:379
+#: builtin/am.c:991 builtin/clone.c:397
#, c-format
msgid "failed to create directory '%s'"
msgstr "misslyckades skapa katalogen \"%s\""
-#: builtin/am.c:993
+#: builtin/am.c:995
msgid "Failed to split patches."
msgstr "Misslyckades dela patchar."
-#: builtin/am.c:1125 builtin/commit.c:376
+#: builtin/am.c:1127 builtin/commit.c:376
msgid "unable to write index file"
msgstr "kan inte skriva indexfil"
-#: builtin/am.c:1176
+#: builtin/am.c:1178
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "När du har löst problemet, kör \"%s --continue\"."
-#: builtin/am.c:1177
+#: builtin/am.c:1179
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "Om du hellre vill hoppa över patchen, kör \"%s --skip\" i stället."
-#: builtin/am.c:1178
+#: builtin/am.c:1180
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
"För att återgå till ursprunglig gren och sluta patcha, kör \"%s --abort\"."
-#: builtin/am.c:1316
+#: builtin/am.c:1315
msgid "Patch is empty. Was it split wrong?"
msgstr "Patchen är tom. Delades den upp felaktigt?"
-#: builtin/am.c:1390 builtin/log.c:1550
+#: builtin/am.c:1386 builtin/log.c:1557
#, c-format
msgid "invalid ident line: %s"
msgstr "ogiltig ident-rad: %s"
-#: builtin/am.c:1417
+#: builtin/am.c:1413
#, c-format
msgid "unable to parse commit %s"
msgstr "kunde inte tolka incheckningen %s"
-#: builtin/am.c:1610
+#: builtin/am.c:1606
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
"Arkivet saknar objekt som behövs för att falla tillbaka på 3-"
"vägssammanslagning."
-#: builtin/am.c:1612
+#: builtin/am.c:1608
msgid "Using index info to reconstruct a base tree..."
msgstr "Använder indexinfo för att återskapa ett basträd..."
-#: builtin/am.c:1631
+#: builtin/am.c:1627
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -4555,39 +4815,39 @@
"Har du handredigerat din patch?\n"
"Den kan inte tillämpas på blobbar som antecknats i dess index."
-#: builtin/am.c:1637
+#: builtin/am.c:1633
msgid "Falling back to patching base and 3-way merge..."
msgstr ""
"Faller tillbaka på att patcha grundversionen och trevägssammanslagning..."
-#: builtin/am.c:1662
+#: builtin/am.c:1658
msgid "Failed to merge in the changes."
msgstr "Misslyckades slå ihop ändringarna."
-#: builtin/am.c:1686 builtin/merge.c:632
+#: builtin/am.c:1682 builtin/merge.c:631
msgid "git write-tree failed to write a tree"
msgstr "git write-tree misslyckades skriva ett träd"
-#: builtin/am.c:1693
+#: builtin/am.c:1689
msgid "applying to an empty history"
msgstr "tillämpar på en tom historik"
-#: builtin/am.c:1706 builtin/commit.c:1764 builtin/merge.c:802
+#: builtin/am.c:1702 builtin/commit.c:1764 builtin/merge.c:802
#: builtin/merge.c:827
msgid "failed to write commit object"
msgstr "kunde inte skriva incheckningsobjekt"
-#: builtin/am.c:1739 builtin/am.c:1743
+#: builtin/am.c:1735 builtin/am.c:1739
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "kan inte återuppta: %s finns inte."
-#: builtin/am.c:1759
+#: builtin/am.c:1755
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
"kan inte vara interaktiv om standard in inte är ansluten till en terminal."
-#: builtin/am.c:1764
+#: builtin/am.c:1760
msgid "Commit Body is:"
msgstr "Incheckningskroppen är:"
@@ -4595,35 +4855,35 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1774
+#: builtin/am.c:1770
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "Tillämpa? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla: "
-#: builtin/am.c:1824
+#: builtin/am.c:1820
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)"
-#: builtin/am.c:1861 builtin/am.c:1933
+#: builtin/am.c:1860 builtin/am.c:1932
#, c-format
msgid "Applying: %.*s"
msgstr "Tillämpar: %.*s"
-#: builtin/am.c:1877
+#: builtin/am.c:1876
msgid "No changes -- Patch already applied."
msgstr "Inga ändringar -- Patchen har redan tillämpats."
-#: builtin/am.c:1885
+#: builtin/am.c:1884
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Patch misslyckades på %s %.*s"
-#: builtin/am.c:1891
+#: builtin/am.c:1890
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "En kopia av patchen som misslyckades finns i: %s"
-#: builtin/am.c:1936
+#: builtin/am.c:1935
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -4633,7 +4893,7 @@
"Om det inte är något kvar att köa kan det hända att något annat redan\n"
"introducerat samma ändringar; kanske du bör hoppa över patchen."
-#: builtin/am.c:1943
+#: builtin/am.c:1942
msgid ""
"You still have unmerged paths in your index.\n"
"Did you forget to use 'git add'?"
@@ -4641,17 +4901,17 @@
"Du har fortfarande sökvägar som inte slagits samman i ditt index.\n"
"Glömde du använda \"git add\"?"
-#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308
+#: builtin/am.c:2050 builtin/am.c:2054 builtin/am.c:2066 builtin/reset.c:308
#: builtin/reset.c:316
#, c-format
msgid "Could not parse object '%s'."
msgstr "Kan inte tolka objektet \"%s\""
-#: builtin/am.c:2103
+#: builtin/am.c:2102
msgid "failed to clean index"
msgstr "misslyckades städa upp indexet"
-#: builtin/am.c:2137
+#: builtin/am.c:2136
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -4659,133 +4919,133 @@
"Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n"
"Återställer inte till ORIG_HEAD"
-#: builtin/am.c:2200
+#: builtin/am.c:2199
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Felaktigt värde för --patch-format: %s"
-#: builtin/am.c:2233
+#: builtin/am.c:2232
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<flaggor>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2234
+#: builtin/am.c:2233
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<flaggor>] (--continue | --skip | --abort)"
-#: builtin/am.c:2240
+#: builtin/am.c:2239
msgid "run interactively"
msgstr "kör interaktivt"
-#: builtin/am.c:2242
+#: builtin/am.c:2241
msgid "historical option -- no-op"
msgstr "historisk flagga -- no-op"
-#: builtin/am.c:2244
+#: builtin/am.c:2243
msgid "allow fall back on 3way merging if needed"
msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt"
-#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57
+#: builtin/am.c:2244 builtin/init-db.c:483 builtin/prune-packed.c:57
#: builtin/repack.c:178
msgid "be quiet"
msgstr "var tyst"
-#: builtin/am.c:2247
+#: builtin/am.c:2246
msgid "add a Signed-off-by line to the commit message"
msgstr "lägg till \"Signed-off-by\"-rad i incheckningsmeddelandet"
-#: builtin/am.c:2250
+#: builtin/am.c:2249
msgid "recode into utf8 (default)"
msgstr "koda om till utf8 (standard)"
-#: builtin/am.c:2252
+#: builtin/am.c:2251
msgid "pass -k flag to git-mailinfo"
msgstr "sänd flaggan -k till git-mailinfo"
-#: builtin/am.c:2254
+#: builtin/am.c:2253
msgid "pass -b flag to git-mailinfo"
msgstr "sänd flaggan -b till git-mailinfo"
-#: builtin/am.c:2256
+#: builtin/am.c:2255
msgid "pass -m flag to git-mailinfo"
msgstr "sänd flaggan -m till git-mailinfo"
-#: builtin/am.c:2258
+#: builtin/am.c:2257
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "sänd flaggan --keep-cr till git-mailsplit för mbox-formatet"
-#: builtin/am.c:2261
+#: builtin/am.c:2260
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr "sänd inte flaggan --keep-cr till git-mailsplit oberoende av am.keepcr"
-#: builtin/am.c:2264
+#: builtin/am.c:2263
msgid "strip everything before a scissors line"
msgstr "ta bort allting före en saxlinje"
-#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
-#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287
-#: builtin/am.c:2293
+#: 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
msgid "pass it through git-apply"
msgstr "sänd det genom git-apply"
-#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
-#: builtin/grep.c:1038 builtin/merge.c:202 builtin/pull.c:135
+#: 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:644 builtin/show-ref.c:169 builtin/tag.c:355
+#: 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
msgid "n"
msgstr "n"
-#: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438
-#: builtin/tag.c:387 builtin/verify-tag.c:38
+#: 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
msgid "format"
msgstr "format"
-#: builtin/am.c:2290
+#: builtin/am.c:2289
msgid "format the patch(es) are in"
msgstr "format för patch(ar)"
-#: builtin/am.c:2296
+#: builtin/am.c:2295
msgid "override error message when patch failure occurs"
msgstr "överstyr felmeddelanden när patchfel uppstår"
-#: builtin/am.c:2298
+#: builtin/am.c:2297
msgid "continue applying patches after resolving a conflict"
msgstr "fortsätt applicera patchar efter att ha löst en konflikt"
-#: builtin/am.c:2301
+#: builtin/am.c:2300
msgid "synonyms for --continue"
msgstr "synonymer till --continue"
-#: builtin/am.c:2304
+#: builtin/am.c:2303
msgid "skip the current patch"
msgstr "hoppa över den aktuella grenen"
-#: builtin/am.c:2307
+#: builtin/am.c:2306
msgid "restore the original branch and abort the patching operation."
msgstr "återställ originalgrenen och avbryt patchningen."
-#: builtin/am.c:2311
+#: builtin/am.c:2310
msgid "lie about committer date"
msgstr "ljug om incheckningsdatum"
-#: builtin/am.c:2313
+#: builtin/am.c:2312
msgid "use current timestamp for author date"
msgstr "använd nuvarande tidsstämpel för författardatum"
-#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:233
-#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:370
+#: builtin/am.c:2314 builtin/commit.c:1600 builtin/merge.c:232
+#: builtin/pull.c:165 builtin/revert.c:111 builtin/tag.c:413
msgid "key-id"
msgstr "nyckel-id"
-#: builtin/am.c:2316
+#: builtin/am.c:2315
msgid "GPG-sign commits"
msgstr "GPG-signera incheckningar"
-#: builtin/am.c:2319
+#: builtin/am.c:2318
msgid "(internal use for git-rebase)"
msgstr "(används internt av git-rebase)"
-#: builtin/am.c:2334
+#: builtin/am.c:2333
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."
@@ -4793,16 +5053,16 @@
"Flaggan -b/--binary har varit utan funktion länge, och\n"
"kommer tas bort. Vi ber dig att inte använda den längre."
-#: builtin/am.c:2341
+#: builtin/am.c:2340
msgid "failed to read the index"
msgstr "misslyckades läsa indexet"
-#: builtin/am.c:2356
+#: builtin/am.c:2355
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "tidigare rebase-katalog %s finns fortfarande, men mbox angavs."
-#: builtin/am.c:2380
+#: builtin/am.c:2379
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -4811,7 +5071,7 @@
"Kvarbliven katalog %s hittades.\n"
"Använd \"git am --abort\" för att ta bort den."
-#: builtin/am.c:2386
+#: builtin/am.c:2385
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Lösningsoperation pågår inte, vi återupptar inte."
@@ -4841,11 +5101,6 @@
msgid "git archive: NACK %s"
msgstr "git archive: NACK %s"
-#: builtin/archive.c:63
-#, c-format
-msgid "remote error: %s"
-msgstr "fjärrfel: %s"
-
#: builtin/archive.c:64
msgid "git archive: protocol error"
msgstr "git archive: protokollfel"
@@ -4874,111 +5129,111 @@
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)"
-#: builtin/blame.c:1786
+#: builtin/blame.c:1777
msgid "Blaming lines"
msgstr "Klandra rader"
-#: builtin/blame.c:2582
+#: builtin/blame.c:2573
msgid "Show blame entries as we find them, incrementally"
msgstr "Visa klandringsposter när vi hittar dem, interaktivt"
-#: builtin/blame.c:2583
+#: builtin/blame.c:2574
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)"
-#: builtin/blame.c:2584
+#: builtin/blame.c:2575
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "Behandla inte rotincheckningar som gränser (Standard: av)"
-#: builtin/blame.c:2585
+#: builtin/blame.c:2576
msgid "Show work cost statistics"
msgstr "Visa statistik över arbetskostnad"
-#: builtin/blame.c:2586
+#: builtin/blame.c:2577
msgid "Force progress reporting"
msgstr "Tvinga förloppsrapportering"
-#: builtin/blame.c:2587
+#: builtin/blame.c:2578
msgid "Show output score for blame entries"
msgstr "Visa utdatapoäng för klandringsposter"
-#: builtin/blame.c:2588
+#: builtin/blame.c:2579
msgid "Show original filename (Default: auto)"
msgstr "Visa originalfilnamn (Standard: auto)"
-#: builtin/blame.c:2589
+#: builtin/blame.c:2580
msgid "Show original linenumber (Default: off)"
msgstr "Visa ursprungligt radnummer (Standard: av)"
-#: builtin/blame.c:2590
+#: builtin/blame.c:2581
msgid "Show in a format designed for machine consumption"
msgstr "Visa i ett format avsett för maskinkonsumtion"
-#: builtin/blame.c:2591
+#: builtin/blame.c:2582
msgid "Show porcelain format with per-line commit information"
msgstr "Visa porslinsformat med per-rad-incheckningsinformation"
-#: builtin/blame.c:2592
+#: builtin/blame.c:2583
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "Använd samma utdataläge som git-annotate (Standard: av)"
-#: builtin/blame.c:2593
+#: builtin/blame.c:2584
msgid "Show raw timestamp (Default: off)"
msgstr "Visa rå tidsstämpel (Standard: av)"
-#: builtin/blame.c:2594
+#: builtin/blame.c:2585
msgid "Show long commit SHA1 (Default: off)"
msgstr "Visa lång inchecknings-SHA1 (Standard: av)"
-#: builtin/blame.c:2595
+#: builtin/blame.c:2586
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)"
-#: builtin/blame.c:2596
+#: builtin/blame.c:2587
msgid "Show author email instead of name (Default: off)"
msgstr "Visa författarens e-post istället för namn (Standard: av)"
-#: builtin/blame.c:2597
+#: builtin/blame.c:2588
msgid "Ignore whitespace differences"
msgstr "Ignorera ändringar i blanksteg"
-#: builtin/blame.c:2604
+#: builtin/blame.c:2595
msgid "Use an experimental heuristic to improve diffs"
msgstr "Använd en experimentell algoritm för att förbättra diffar"
-#: builtin/blame.c:2606
+#: builtin/blame.c:2597
msgid "Spend extra cycles to find better match"
msgstr "Slösa extra cykler med att hitta bättre träff"
-#: builtin/blame.c:2607
+#: builtin/blame.c:2598
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "Använd revisioner från <fil> istället för att anropa git-rev-list"
-#: builtin/blame.c:2608
+#: builtin/blame.c:2599
msgid "Use <file>'s contents as the final image"
msgstr "Använd <fil>s innehåll som slutgiltig bild"
-#: builtin/blame.c:2609 builtin/blame.c:2610
+#: builtin/blame.c:2600 builtin/blame.c:2601
msgid "score"
msgstr "poäng"
-#: builtin/blame.c:2609
+#: builtin/blame.c:2600
msgid "Find line copies within and across files"
msgstr "Hitta kopierade rader inuti och mellan filer"
-#: builtin/blame.c:2610
+#: builtin/blame.c:2601
msgid "Find line movements within and across files"
msgstr "Hitta flyttade rader inuti och mellan filer"
-#: builtin/blame.c:2611
+#: builtin/blame.c:2602
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2611
+#: builtin/blame.c:2602
msgid "Process only line range n,m, counting from 1"
msgstr "Behandla endast radintervallet n,m, med början på 1"
-#: builtin/blame.c:2658
+#: builtin/blame.c:2649
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr "--progress kan inte användas med --incremental eller porslinsformat"
@@ -4988,42 +5243,42 @@
#. 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:2706
+#: builtin/blame.c:2697
msgid "4 years, 11 months ago"
msgstr "4 år, 11 månader sedan"
-#: builtin/blame.c:2786
+#: builtin/blame.c:2777
msgid "--contents and --reverse do not blend well."
msgstr "--contents och --reverse fungerar inte så bra tillsammans."
-#: builtin/blame.c:2806
+#: builtin/blame.c:2797
msgid "cannot use --contents with final commit object name"
msgstr "kan inte använda --contents med namn på slutgiltigt incheckningsobjekt"
-#: builtin/blame.c:2811
+#: builtin/blame.c:2802
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
"--reverse och --first-parent tillsammans kräver att du anger senaste "
"incheckningen"
-#: builtin/blame.c:2838
+#: builtin/blame.c:2829
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
"--reverse --first-parent tillsammans kräver ett intervall på första-förälder-"
"kedjan"
-#: builtin/blame.c:2849
+#: builtin/blame.c:2840
#, c-format
msgid "no such path %s in %s"
msgstr "sökvägen %s i %s finns inte"
-#: builtin/blame.c:2860
+#: builtin/blame.c:2851
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "kan inte läsa objektet %s för sökvägen %s"
-#: builtin/blame.c:2879
+#: builtin/blame.c:2870
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
@@ -5050,7 +5305,11 @@
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [<flaggor>] [-r | -a] [--points-at]"
-#: builtin/branch.c:143
+#: builtin/branch.c:31
+msgid "git branch [<options>] [-r | -a] [--format]"
+msgstr "git branch [<flaggor>] [-r | -a] [--format]"
+
+#: builtin/branch.c:144
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -5059,7 +5318,7 @@
"tar bort grenen \"%s\" som har slagits ihop med\n"
" \"%s\", men ännu inte slagits ihop med HEAD."
-#: builtin/branch.c:147
+#: builtin/branch.c:148
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -5068,12 +5327,12 @@
"tar inte bort grenen \"%s\" som inte har slagits ihop med\n"
" \"%s\", trots att den har slagits ihop med HEAD."
-#: builtin/branch.c:161
+#: builtin/branch.c:162
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\""
-#: builtin/branch.c:165
+#: builtin/branch.c:166
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -5082,164 +5341,92 @@
"Grenen \"%s\" har inte slagits samman i sin helhet.\n"
"Om du är säker på att du vill ta bort den, kör \"git branch -D %s\"."
-#: builtin/branch.c:178
+#: builtin/branch.c:179
msgid "Update of config-file failed"
msgstr "Misslyckades uppdatera konfigurationsfil"
-#: builtin/branch.c:206
+#: builtin/branch.c:210
msgid "cannot use -a with -d"
msgstr "kan inte ange -a med -d"
-#: builtin/branch.c:212
+#: builtin/branch.c:216
msgid "Couldn't look up commit object for HEAD"
msgstr "Kunde inte slå upp incheckningsobjekt för HEAD"
-#: builtin/branch.c:226
+#: builtin/branch.c:230
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "Kan inte ta bort grenen \"%s\" som är utcheckad på \"%s\""
-#: builtin/branch.c:241
+#: builtin/branch.c:245
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "fjärrspårande grenen \"%s\" hittades inte."
-#: builtin/branch.c:242
+#: builtin/branch.c:246
#, c-format
msgid "branch '%s' not found."
msgstr "grenen \"%s\" hittades inte."
-#: builtin/branch.c:257
+#: builtin/branch.c:261
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Fel vid borttagning av fjärrspårande grenen \"%s\""
-#: builtin/branch.c:258
+#: builtin/branch.c:262
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Fel vid borttagning av grenen \"%s\""
-#: builtin/branch.c:265
+#: builtin/branch.c:269
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Tog bort fjärrspårande grenen %s (var %s).\n"
-#: builtin/branch.c:266
+#: builtin/branch.c:270
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Tog bort grenen %s (var %s).\n"
-#: builtin/branch.c:312
-#, c-format
-msgid "[%s: gone]"
-msgstr "[%s: försvunnen]"
-
-#: builtin/branch.c:317
-#, c-format
-msgid "[%s]"
-msgstr "[%s]"
-
-#: builtin/branch.c:322
-#, c-format
-msgid "[%s: behind %d]"
-msgstr "[%s: bakom %d] "
-
-#: builtin/branch.c:324
-#, c-format
-msgid "[behind %d]"
-msgstr "[bakom %d] "
-
-#: builtin/branch.c:328
-#, c-format
-msgid "[%s: ahead %d]"
-msgstr "[%s: före %d] "
-
-#: builtin/branch.c:330
-#, c-format
-msgid "[ahead %d]"
-msgstr "[före %d] "
-
-#: builtin/branch.c:333
-#, c-format
-msgid "[%s: ahead %d, behind %d]"
-msgstr "[%s: före %d, bakom %d] "
-
-#: builtin/branch.c:336
-#, c-format
-msgid "[ahead %d, behind %d]"
-msgstr "[före %d, bakom %d] "
-
-#: builtin/branch.c:349
-msgid " **** invalid ref ****"
-msgstr " **** ogiltig ref ****"
-
-#: builtin/branch.c:375
-#, c-format
-msgid "(no branch, rebasing %s)"
-msgstr "(ingen gren, ombaserar %s)"
-
-#: builtin/branch.c:378
-#, c-format
-msgid "(no branch, bisect started on %s)"
-msgstr "(ingen gren, \"bisect\" startad på %s)"
-
-#. TRANSLATORS: make sure this matches
-#. "HEAD detached at " in wt-status.c
-#: builtin/branch.c:384
-#, c-format
-msgid "(HEAD detached at %s)"
-msgstr "(HEAD frånkopplat vid %s)"
-
-#. TRANSLATORS: make sure this matches
-#. "HEAD detached from " in wt-status.c
-#: builtin/branch.c:389
-#, c-format
-msgid "(HEAD detached from %s)"
-msgstr "(HEAD frånkopplat från %s)"
-
-#: builtin/branch.c:393
-msgid "(no branch)"
-msgstr "(ingen gren)"
-
-#: builtin/branch.c:535
+#: builtin/branch.c:441
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Grenen %s ombaseras på %s"
-#: builtin/branch.c:539
+#: builtin/branch.c:445
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Grenen %s är i en \"bisect\" på %s"
-#: builtin/branch.c:554
+#: builtin/branch.c:460
msgid "cannot rename the current branch while not on any."
msgstr ""
"kunde inte byta namn på aktuell gren när du inte befinner dig på någon."
-#: builtin/branch.c:564
+#: builtin/branch.c:470
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Felaktigt namn på gren: \"%s\""
-#: builtin/branch.c:581
+#: builtin/branch.c:487
msgid "Branch rename failed"
msgstr "Misslyckades byta namn på gren"
-#: builtin/branch.c:585
+#: builtin/branch.c:490
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\""
-#: builtin/branch.c:588
+#: builtin/branch.c:493
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Grenen namnbytt till %s, men HEAD har inte uppdaterats!"
-#: builtin/branch.c:595
+#: builtin/branch.c:502
msgid "Branch is renamed, but update of config-file failed"
msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen"
-#: builtin/branch.c:611
+#: builtin/branch.c:518
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -5250,208 +5437,217 @@
" %s\n"
"Rader som inleds med \"%c\" ignoreras.\n"
-#: builtin/branch.c:643
+#: builtin/branch.c:551
msgid "Generic options"
msgstr "Allmänna flaggor"
-#: builtin/branch.c:645
+#: builtin/branch.c:553
msgid "show hash and subject, give twice for upstream branch"
msgstr "visa hash och ärenderad, ange två gånger för uppströmsgren"
-#: builtin/branch.c:646
+#: builtin/branch.c:554
msgid "suppress informational messages"
msgstr "undertryck informationsmeddelanden"
-#: builtin/branch.c:647
+#: builtin/branch.c:555
msgid "set up tracking mode (see git-pull(1))"
msgstr "ställ in spårningsläge (se git-pull(1))"
-#: builtin/branch.c:649
+#: builtin/branch.c:557
msgid "change upstream info"
msgstr "ändra uppströmsinformation"
-#: builtin/branch.c:651
+#: builtin/branch.c:559
msgid "upstream"
msgstr "uppströms"
-#: builtin/branch.c:651
+#: builtin/branch.c:559
msgid "change the upstream info"
msgstr "ändra uppströmsinformationen"
-#: builtin/branch.c:652
+#: builtin/branch.c:560
msgid "Unset the upstream info"
msgstr "ta bort uppströmsinformationen"
-#: builtin/branch.c:653
+#: builtin/branch.c:561
msgid "use colored output"
msgstr "använd färgad utdata"
-#: builtin/branch.c:654
+#: builtin/branch.c:562
msgid "act on remote-tracking branches"
msgstr "arbeta på fjärrspårande grenar"
-#: builtin/branch.c:656 builtin/branch.c:657
+#: builtin/branch.c:564 builtin/branch.c:566
msgid "print only branches that contain the commit"
msgstr "visa endast grenar som innehåller incheckningen"
-#: builtin/branch.c:660
+#: builtin/branch.c:565 builtin/branch.c:567
+msgid "print only branches that don't contain the commit"
+msgstr "visa endast grenar som inte innehåller incheckningen"
+
+#: builtin/branch.c:570
msgid "Specific git-branch actions:"
msgstr "Specifika git-branch-åtgärder:"
-#: builtin/branch.c:661
+#: builtin/branch.c:571
msgid "list both remote-tracking and local branches"
msgstr "visa både fjärrspårande och lokala grenar"
-#: builtin/branch.c:663
+#: builtin/branch.c:573
msgid "delete fully merged branch"
msgstr "ta bort helt sammanslagen gren"
-#: builtin/branch.c:664
+#: builtin/branch.c:574
msgid "delete branch (even if not merged)"
msgstr "ta bort gren (även om inte helt sammanslagen)"
-#: builtin/branch.c:665
+#: builtin/branch.c:575
msgid "move/rename a branch and its reflog"
msgstr "flytta/ta bort en gren och dess reflogg"
-#: builtin/branch.c:666
+#: builtin/branch.c:576
msgid "move/rename a branch, even if target exists"
msgstr "flytta/ta bort en gren, även om målet finns"
-#: builtin/branch.c:667
+#: builtin/branch.c:577
msgid "list branch names"
msgstr "lista namn på grenar"
-#: builtin/branch.c:668
+#: builtin/branch.c:578
msgid "create the branch's reflog"
msgstr "skapa grenens reflogg"
-#: builtin/branch.c:670
+#: builtin/branch.c:580
msgid "edit the description for the branch"
msgstr "redigera beskrivning för grenen"
-#: builtin/branch.c:671
+#: builtin/branch.c:581
msgid "force creation, move/rename, deletion"
msgstr "tvinga skapande, flytt/namnändring, borttagande"
-#: builtin/branch.c:672
+#: builtin/branch.c:582
msgid "print only branches that are merged"
msgstr "visa endast sammanslagna grenar"
-#: builtin/branch.c:673
+#: builtin/branch.c:583
msgid "print only branches that are not merged"
msgstr "visa endast ej sammanslagna grenar"
-#: builtin/branch.c:674
+#: builtin/branch.c:584
msgid "list branches in columns"
msgstr "visa grenar i spalter"
-#: builtin/branch.c:675 builtin/for-each-ref.c:38 builtin/tag.c:381
+#: builtin/branch.c:585 builtin/for-each-ref.c:38 builtin/tag.c:426
msgid "key"
msgstr "nyckel"
-#: builtin/branch.c:676 builtin/for-each-ref.c:39 builtin/tag.c:382
+#: builtin/branch.c:586 builtin/for-each-ref.c:39 builtin/tag.c:427
msgid "field name to sort on"
msgstr "fältnamn att sortera på"
-#: builtin/branch.c:678 builtin/for-each-ref.c:41 builtin/notes.c:404
+#: 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:384
+#: builtin/tag.c:429
msgid "object"
msgstr "objekt"
-#: builtin/branch.c:679
+#: builtin/branch.c:589
msgid "print only branches of the object"
msgstr "visa endast grenar för objektet"
-#: builtin/branch.c:681 builtin/for-each-ref.c:46 builtin/tag.c:388
+#: builtin/branch.c:591 builtin/for-each-ref.c:47 builtin/tag.c:434
msgid "sorting and filtering are case insensitive"
msgstr "sortering och filtrering skiljer gemener och VERSALER"
-#: builtin/branch.c:698
+#: builtin/branch.c:592 builtin/for-each-ref.c:37 builtin/tag.c:433
+#: builtin/verify-tag.c:38
+msgid "format to use for the output"
+msgstr "format att använda för utdata"
+
+#: builtin/branch.c:611
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Misslyckades slå upp HEAD som giltig referens"
-#: builtin/branch.c:702 builtin/clone.c:706
+#: builtin/branch.c:615 builtin/clone.c:724
msgid "HEAD not found below refs/heads!"
msgstr "HEAD hittades inte under refs/heads!"
-#: builtin/branch.c:724
+#: builtin/branch.c:638
msgid "--column and --verbose are incompatible"
msgstr "--column och --verbose är inkompatibla"
-#: builtin/branch.c:735 builtin/branch.c:787
+#: builtin/branch.c:649 builtin/branch.c:701
msgid "branch name required"
msgstr "grennamn krävs"
-#: builtin/branch.c:763
+#: builtin/branch.c:677
msgid "Cannot give description to detached HEAD"
msgstr "Kan inte beskriva frånkopplad HEAD"
-#: builtin/branch.c:768
+#: builtin/branch.c:682
msgid "cannot edit description of more than one branch"
msgstr "kan inte redigera beskrivning för mer än en gren"
-#: builtin/branch.c:775
+#: builtin/branch.c:689
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Inga incheckningar på grenen \"%s\" ännu"
-#: builtin/branch.c:778
+#: builtin/branch.c:692
#, c-format
msgid "No branch named '%s'."
msgstr "Ingen gren vid namnet \"%s\"."
-#: builtin/branch.c:793
+#: builtin/branch.c:707
msgid "too many branches for a rename operation"
msgstr "för många grenar för namnbyte"
-#: builtin/branch.c:798
+#: builtin/branch.c:712
msgid "too many branches to set new upstream"
msgstr "för många grenar för att byta uppström"
-#: builtin/branch.c:802
+#: builtin/branch.c:716
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
"kunde inte sätta uppström för HEAD till %s när det inte pekar mot någon gren."
-#: builtin/branch.c:805 builtin/branch.c:827 builtin/branch.c:848
+#: builtin/branch.c:719 builtin/branch.c:741 builtin/branch.c:762
#, c-format
msgid "no such branch '%s'"
msgstr "okänd gren \"%s\""
-#: builtin/branch.c:809
+#: builtin/branch.c:723
#, c-format
msgid "branch '%s' does not exist"
msgstr "grenen \"%s\" finns inte"
-#: builtin/branch.c:821
+#: builtin/branch.c:735
msgid "too many branches to unset upstream"
msgstr "för många grenar för att ta bort uppström"
-#: builtin/branch.c:825
+#: builtin/branch.c:739
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"kunde inte ta bort uppström för HEAD när det inte pekar mot någon gren."
-#: builtin/branch.c:831
+#: builtin/branch.c:745
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Grenen \"%s\" har ingen uppströmsinformation"
-#: builtin/branch.c:845
+#: builtin/branch.c:759
msgid "it does not make sense to create 'HEAD' manually"
msgstr "kan inte skapa \"HEAD\" manuellt"
-#: builtin/branch.c:851
+#: builtin/branch.c:765
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
"flaggorna -a och -r på \"git branch\" kan inte anges tillsammans med ett "
"grennamn"
-#: builtin/branch.c:854
+#: builtin/branch.c:768
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
@@ -5460,7 +5656,7 @@
"Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track "
"eller --set-upstream-to\n"
-#: builtin/branch.c:871
+#: builtin/branch.c:785
#, c-format
msgid ""
"\n"
@@ -5471,16 +5667,16 @@
"Om du vill göra så att \"%s\" spårar \"%s\" gör du så här:\n"
"\n"
-#: builtin/bundle.c:51
+#: builtin/bundle.c:45
#, c-format
msgid "%s is okay\n"
msgstr "%s är okej\n"
-#: builtin/bundle.c:64
+#: builtin/bundle.c:58
msgid "Need a repository to create a bundle."
msgstr "Behöver ett arkiv för att skapa ett paket (bundle)."
-#: builtin/bundle.c:68
+#: builtin/bundle.c:62
msgid "Need a repository to unbundle."
msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)."
@@ -5528,7 +5724,7 @@
msgid "for blob objects, run filters on object's content"
msgstr "för blob-objekt, kör filger på objektets innehåll"
-#: builtin/cat-file.c:561 git-submodule.sh:929
+#: builtin/cat-file.c:561 git-submodule.sh:943
msgid "blob"
msgstr "blob"
@@ -5585,7 +5781,7 @@
msgid "terminate input and output records by a NUL character"
msgstr "avsluta in- och utdataposter med NUL-tecken"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1140 builtin/gc.c:332
+#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:356
msgid "suppress progress reporting"
msgstr "undertryck förloppsrapportering"
@@ -5675,9 +5871,9 @@
msgstr "skriv innehåll till temporära filer"
#: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:597 builtin/submodule--helper.c:600
-#: builtin/submodule--helper.c:606 builtin/submodule--helper.c:967
-#: builtin/worktree.c:471
+#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
+#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
+#: builtin/worktree.c:477
msgid "string"
msgstr "sträng"
@@ -5689,113 +5885,113 @@
msgid "copy out the files from named stage"
msgstr "kopiera ut filer från namngiven etapp"
-#: builtin/checkout.c:25
+#: builtin/checkout.c:27
msgid "git checkout [<options>] <branch>"
msgstr "git checkout [<flaggor>] <gren>"
-#: builtin/checkout.c:26
+#: builtin/checkout.c:28
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<flaggor>] [<gren>] -- <fil>..."
-#: builtin/checkout.c:134 builtin/checkout.c:167
+#: builtin/checkout.c:153 builtin/checkout.c:186
#, c-format
msgid "path '%s' does not have our version"
msgstr "sökvägen \"%s\" har inte vår version"
-#: builtin/checkout.c:136 builtin/checkout.c:169
+#: builtin/checkout.c:155 builtin/checkout.c:188
#, c-format
msgid "path '%s' does not have their version"
msgstr "sökvägen \"%s\" har inte deras version"
-#: builtin/checkout.c:152
+#: builtin/checkout.c:171
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "sökvägen \"%s\" innehåller inte alla nödvändiga versioner"
-#: builtin/checkout.c:196
+#: builtin/checkout.c:215
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "sökvägen \"%s\" innehåller inte nödvändiga versioner"
-#: builtin/checkout.c:213
+#: builtin/checkout.c:232
#, c-format
msgid "path '%s': cannot merge"
msgstr "sökväg \"%s\": kan inte slå ihop"
-#: builtin/checkout.c:230
+#: builtin/checkout.c:249
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\""
-#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
-#: builtin/checkout.c:259
+#: builtin/checkout.c:269 builtin/checkout.c:272 builtin/checkout.c:275
+#: builtin/checkout.c:278
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "\"%s\" kan inte användas vid uppdatering av sökvägar"
-#: builtin/checkout.c:262 builtin/checkout.c:265
+#: builtin/checkout.c:281 builtin/checkout.c:284
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "\"%s\" kan inte användas med %s"
-#: builtin/checkout.c:268
+#: builtin/checkout.c:287
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt."
-#: builtin/checkout.c:339 builtin/checkout.c:346
+#: builtin/checkout.c:358 builtin/checkout.c:365
#, c-format
msgid "path '%s' is unmerged"
msgstr "sökvägen \"%s\" har inte slagits ihop"
-#: builtin/checkout.c:494
+#: builtin/checkout.c:513
msgid "you need to resolve your current index first"
msgstr "du måste lösa ditt befintliga index först"
-#: builtin/checkout.c:625
+#: builtin/checkout.c:644
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Kan inte skapa referenslogg för \"%s\": %s\n"
-#: builtin/checkout.c:666
+#: builtin/checkout.c:685
msgid "HEAD is now at"
msgstr "HEAD är nu på"
-#: builtin/checkout.c:670 builtin/clone.c:660
+#: builtin/checkout.c:689 builtin/clone.c:678
msgid "unable to update HEAD"
msgstr "kan inte uppdatera HEAD"
-#: builtin/checkout.c:674
+#: builtin/checkout.c:693
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Återställ gren \"%s\"\n"
-#: builtin/checkout.c:677
+#: builtin/checkout.c:696
#, c-format
msgid "Already on '%s'\n"
msgstr "Redan på \"%s\"\n"
-#: builtin/checkout.c:681
+#: builtin/checkout.c:700
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Växlade till och nollställde grenen \"%s\"\n"
-#: builtin/checkout.c:683 builtin/checkout.c:1072
+#: builtin/checkout.c:702 builtin/checkout.c:1090
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Växlade till en ny gren \"%s\"\n"
-#: builtin/checkout.c:685
+#: builtin/checkout.c:704
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Växlade till grenen \"%s\"\n"
-#: builtin/checkout.c:736
+#: builtin/checkout.c:755
#, c-format
msgid " ... and %d more.\n"
msgstr " ... och %d till.\n"
-#: builtin/checkout.c:742
+#: builtin/checkout.c:761
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -5818,7 +6014,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:761
+#: builtin/checkout.c:780
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -5845,151 +6041,151 @@
" git branch <nytt_grennamn> %s\n"
"\n"
-#: builtin/checkout.c:797
+#: builtin/checkout.c:816
msgid "internal error in revision walk"
msgstr "internt fel vid genomgång av revisioner (revision walk)"
-#: builtin/checkout.c:801
+#: builtin/checkout.c:820
msgid "Previous HEAD position was"
msgstr "Tidigare position för HEAD var"
-#: builtin/checkout.c:828 builtin/checkout.c:1067
+#: builtin/checkout.c:847 builtin/checkout.c:1085
msgid "You are on a branch yet to be born"
msgstr "Du är på en gren som ännu inte är född"
-#: builtin/checkout.c:973
+#: builtin/checkout.c:991
#, c-format
msgid "only one reference expected, %d given."
msgstr "endast en referens förväntades, %d gavs."
-#: builtin/checkout.c:1013 builtin/worktree.c:214
+#: builtin/checkout.c:1031 builtin/worktree.c:214
#, c-format
msgid "invalid reference: %s"
msgstr "felaktig referens: %s"
-#: builtin/checkout.c:1042
+#: builtin/checkout.c:1060
#, c-format
msgid "reference is not a tree: %s"
msgstr "referensen är inte ett träd: %s"
-#: builtin/checkout.c:1081
+#: builtin/checkout.c:1099
msgid "paths cannot be used with switching branches"
msgstr "sökvägar kan inte användas vid byte av gren"
-#: builtin/checkout.c:1084 builtin/checkout.c:1088
+#: builtin/checkout.c:1102 builtin/checkout.c:1106
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "\"%s\" kan inte användas vid byte av gren"
-#: builtin/checkout.c:1092 builtin/checkout.c:1095 builtin/checkout.c:1100
-#: builtin/checkout.c:1103
+#: builtin/checkout.c:1110 builtin/checkout.c:1113 builtin/checkout.c:1118
+#: builtin/checkout.c:1121
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "\"%s\" kan inte användas med \"%s\""
-#: builtin/checkout.c:1108
+#: builtin/checkout.c:1126
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Kan inte växla gren till icke-incheckningen \"%s\""
-#: builtin/checkout.c:1141 builtin/checkout.c:1143 builtin/clone.c:93
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324
-#: builtin/worktree.c:326
+#: 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
msgid "branch"
msgstr "gren"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1160
msgid "create and checkout a new branch"
msgstr "skapa och checka ut en ny gren"
-#: builtin/checkout.c:1144
+#: builtin/checkout.c:1162
msgid "create/reset and checkout a branch"
msgstr "skapa/nollställ och checka ut en gren"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1163
msgid "create reflog for new branch"
msgstr "skapa reflogg för ny gren"
-#: builtin/checkout.c:1146 builtin/worktree.c:328
+#: builtin/checkout.c:1164 builtin/worktree.c:333
msgid "detach HEAD at named commit"
msgstr "koppla från HEAD vid namngiven incheckning"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1165
msgid "set upstream info for new branch"
msgstr "sätt uppströmsinformation för ny gren"
-#: builtin/checkout.c:1149
+#: builtin/checkout.c:1167
msgid "new-branch"
msgstr "ny-gren"
-#: builtin/checkout.c:1149
+#: builtin/checkout.c:1167
msgid "new unparented branch"
msgstr "ny gren utan förälder"
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1168
msgid "checkout our version for unmerged files"
msgstr "checka ut vår version för ej sammanslagna filer"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1170
msgid "checkout their version for unmerged files"
msgstr "checka ut deras version för ej sammanslagna filer"
-#: builtin/checkout.c:1154
+#: builtin/checkout.c:1172
msgid "force checkout (throw away local modifications)"
msgstr "tvinga utcheckning (kasta bort lokala ändringar)"
-#: builtin/checkout.c:1155
+#: builtin/checkout.c:1173
msgid "perform a 3-way merge with the new branch"
msgstr "utför en 3-vägssammanslagning för den nya grenen"
-#: builtin/checkout.c:1156 builtin/merge.c:235
+#: builtin/checkout.c:1174 builtin/merge.c:234
msgid "update ignored files (default)"
msgstr "uppdatera ignorerade filer (standard)"
-#: builtin/checkout.c:1157 builtin/log.c:1466 parse-options.h:251
+#: builtin/checkout.c:1175 builtin/log.c:1473 parse-options.h:251
msgid "style"
msgstr "stil"
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1176
msgid "conflict style (merge or diff3)"
msgstr "konfliktstil (merge eller diff3)"
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1179
msgid "do not limit pathspecs to sparse entries only"
msgstr "begränsa inte sökvägar till endast glesa poster"
-#: builtin/checkout.c:1163
+#: builtin/checkout.c:1181
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "förutspå \"git checkout <gren-saknas>\""
-#: builtin/checkout.c:1165
+#: builtin/checkout.c:1183
msgid "do not check if another worktree is holding the given ref"
msgstr ""
"kontrollera inte om en annan arbetskatalog håller den angivna referensen"
-#: builtin/checkout.c:1166 builtin/clone.c:63 builtin/fetch.c:119
-#: builtin/merge.c:232 builtin/pull.c:117 builtin/push.c:539
-#: builtin/send-pack.c:168
+#: 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
msgid "force progress reporting"
msgstr "tvinga förloppsrapportering"
-#: builtin/checkout.c:1197
+#: builtin/checkout.c:1224
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B och --orphan är ömsesidigt uteslutande"
-#: builtin/checkout.c:1214
+#: builtin/checkout.c:1241
msgid "--track needs a branch name"
msgstr "--track behöver ett namn på en gren"
-#: builtin/checkout.c:1219
+#: builtin/checkout.c:1246
msgid "Missing branch name; try -b"
msgstr "Grennamn saknas; försök med -b"
-#: builtin/checkout.c:1255
+#: builtin/checkout.c:1282
msgid "invalid path specification"
msgstr "felaktig sökvägsangivelse"
-#: builtin/checkout.c:1262
+#: builtin/checkout.c:1289
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
@@ -5998,12 +6194,12 @@
"Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt.\n"
"Ville du checka ut \"%s\" som inte kan lösas som en utcheckning?"
-#: builtin/checkout.c:1267
+#: builtin/checkout.c:1294
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach tar inte en sökväg som argument \"%s\""
-#: builtin/checkout.c:1271
+#: builtin/checkout.c:1298
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -6043,7 +6239,7 @@
msgid "failed to remove %s"
msgstr "misslyckades ta bort %s"
-#: builtin/clean.c:291 git-add--interactive.perl:623
+#: builtin/clean.c:297 git-add--interactive.perl:614
#, c-format
msgid ""
"Prompt help:\n"
@@ -6056,7 +6252,7 @@
"foo - markera post baserad på unikt prefix\n"
" - (tomt) markera ingenting\n"
-#: builtin/clean.c:295 git-add--interactive.perl:632
+#: builtin/clean.c:301 git-add--interactive.perl:623
#, c-format
msgid ""
"Prompt help:\n"
@@ -6077,38 +6273,38 @@
"* - välj alla poster\n"
" - (tomt) avsluta markering\n"
-#: builtin/clean.c:511 git-add--interactive.perl:598
-#: git-add--interactive.perl:603
+#: builtin/clean.c:517 git-add--interactive.perl:589
+#: git-add--interactive.perl:594
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Vadå (%s)?\n"
-#: builtin/clean.c:653
+#: builtin/clean.c:659
#, c-format
msgid "Input ignore patterns>> "
msgstr "Ange ignoreringsmönster>>"
-#: builtin/clean.c:690
+#: builtin/clean.c:696
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "VARNING: Hittar inte poster som motsvarar: %s"
-#: builtin/clean.c:711
+#: builtin/clean.c:717
msgid "Select items to delete"
msgstr "Välj poster att ta bort"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:752
+#: builtin/clean.c:758
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Ta bort %s [Y=ja / N=nej]?"
-#: builtin/clean.c:777 git-add--interactive.perl:1669
+#: builtin/clean.c:783 git-add--interactive.perl:1660
#, c-format
msgid "Bye.\n"
msgstr "Hej då.\n"
-#: builtin/clean.c:785
+#: builtin/clean.c:791
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -6126,62 +6322,63 @@
"help - denna skärm\n"
"? - hjälp för kommandoval"
-#: builtin/clean.c:812 git-add--interactive.perl:1745
+#: builtin/clean.c:818 git-add--interactive.perl:1736
msgid "*** Commands ***"
msgstr "*** Kommandon ***"
-#: builtin/clean.c:813 git-add--interactive.perl:1742
+#: builtin/clean.c:819 git-add--interactive.perl:1733
msgid "What now"
msgstr "Vad nu"
-#: builtin/clean.c:821
+#: builtin/clean.c:827
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Skulle ta bort följande post:"
msgstr[1] "Skulle ta bort följande poster:"
-#: builtin/clean.c:838
+#: builtin/clean.c:844
msgid "No more files to clean, exiting."
msgstr "Inga fler filer att städa, avslutar."
-#: builtin/clean.c:869
+#: builtin/clean.c:875
msgid "do not print names of files removed"
msgstr "skriv inte ut namn på borttagna filer"
-#: builtin/clean.c:871
+#: builtin/clean.c:877
msgid "force"
msgstr "tvinga"
-#: builtin/clean.c:872
+#: builtin/clean.c:878
msgid "interactive cleaning"
msgstr "städa interaktivt"
-#: builtin/clean.c:874
+#: builtin/clean.c:880
msgid "remove whole directories"
msgstr "ta bort hela kataloger"
-#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:1056
-#: builtin/ls-files.c:538 builtin/name-rev.c:313 builtin/show-ref.c:176
+#: 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
msgid "pattern"
msgstr "mönster"
-#: builtin/clean.c:876
+#: builtin/clean.c:882
msgid "add <pattern> to ignore rules"
msgstr "lägg till <mönster> till ignoreringsregler"
-#: builtin/clean.c:877
+#: builtin/clean.c:883
msgid "remove ignored files, too"
msgstr "ta även bort ignorerade filer"
-#: builtin/clean.c:879
+#: builtin/clean.c:885
msgid "remove only ignored files"
msgstr "ta endast bort ignorerade filer"
-#: builtin/clean.c:897
+#: builtin/clean.c:903
msgid "-x and -X cannot be used together"
msgstr "-x och -X kan inte användas samtidigt"
-#: builtin/clean.c:901
+#: builtin/clean.c:907
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -6189,7 +6386,7 @@
"clean.requireForce satt till true, men varken -i, -n eller -f angavs; vägrar "
"städa"
-#: builtin/clean.c:904
+#: builtin/clean.c:910
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -6201,130 +6398,134 @@
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]"
-#: builtin/clone.c:65
+#: builtin/clone.c:80
msgid "don't create a checkout"
msgstr "skapa inte någon utcheckning"
-#: builtin/clone.c:66 builtin/clone.c:68 builtin/init-db.c:478
+#: builtin/clone.c:81 builtin/clone.c:83 builtin/init-db.c:478
msgid "create a bare repository"
msgstr "skapa ett naket (\"bare\") arkiv"
-#: builtin/clone.c:70
+#: builtin/clone.c:85
msgid "create a mirror repository (implies bare)"
msgstr "skapa ett spegelarkiv (implicerar \"bare\")"
-#: builtin/clone.c:72
+#: builtin/clone.c:87
msgid "to clone from a local repository"
msgstr "för att klona från ett lokalt arkiv"
-#: builtin/clone.c:74
+#: builtin/clone.c:89
msgid "don't use local hardlinks, always copy"
msgstr "skapa inte lokala hårda länkar, kopiera alltid"
-#: builtin/clone.c:76
+#: builtin/clone.c:91
msgid "setup as shared repository"
msgstr "skapa som ett delat arkiv"
-#: builtin/clone.c:78 builtin/clone.c:80
+#: builtin/clone.c:93 builtin/clone.c:97
+msgid "pathspec"
+msgstr "sökvägsangivelse"
+
+#: builtin/clone.c:93 builtin/clone.c:97
msgid "initialize submodules in the clone"
msgstr "initiera undermoduler i klonen"
-#: builtin/clone.c:82
+#: builtin/clone.c:100
msgid "number of submodules cloned in parallel"
msgstr "antal undermoduler som klonas parallellt"
-#: builtin/clone.c:83 builtin/init-db.c:475
+#: builtin/clone.c:101 builtin/init-db.c:475
msgid "template-directory"
msgstr "mallkatalog"
-#: builtin/clone.c:84 builtin/init-db.c:476
+#: builtin/clone.c:102 builtin/init-db.c:476
msgid "directory from which templates will be used"
msgstr "katalog att använda mallar från"
-#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:604
-#: builtin/submodule--helper.c:970
+#: builtin/clone.c:104 builtin/clone.c:106 builtin/submodule--helper.c:642
+#: builtin/submodule--helper.c:983
msgid "reference repository"
msgstr "referensarkiv"
-#: builtin/clone.c:90
+#: builtin/clone.c:108
msgid "use --reference only while cloning"
msgstr "använd --reference endast under kloningen"
-#: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:109 builtin/column.c:26 builtin/merge-file.c:43
msgid "name"
msgstr "namn"
-#: builtin/clone.c:92
+#: builtin/clone.c:110
msgid "use <name> instead of 'origin' to track upstream"
msgstr "använd <namn> istället för \"origin\" för att spåra uppströms"
-#: builtin/clone.c:94
+#: builtin/clone.c:112
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "checka ut <gren> istället för fjärrens HEAD"
-#: builtin/clone.c:96
+#: builtin/clone.c:114
msgid "path to git-upload-pack on the remote"
msgstr "sökväg till git-upload-pack på fjärren"
-#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:999
+#: builtin/clone.c:115 builtin/fetch.c:120 builtin/grep.c:1006
#: builtin/pull.c:202
msgid "depth"
msgstr "djup"
-#: builtin/clone.c:98
+#: builtin/clone.c:116
msgid "create a shallow clone of that depth"
msgstr "skapa en grund klon på detta djup"
-#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2836
+#: builtin/clone.c:117 builtin/fetch.c:122 builtin/pack-objects.c:2918
#: parse-options.h:142
msgid "time"
msgstr "tid"
-#: builtin/clone.c:100
+#: builtin/clone.c:118
msgid "create a shallow clone since a specific time"
msgstr "skapa en grund klon från en angiven tidpunkt"
-#: builtin/clone.c:101 builtin/fetch.c:124
+#: builtin/clone.c:119 builtin/fetch.c:124
msgid "revision"
msgstr "revision"
-#: builtin/clone.c:102 builtin/fetch.c:125
+#: builtin/clone.c:120 builtin/fetch.c:125
msgid "deepen history of shallow clone, excluding rev"
msgstr "fördjupa historik för grund klon, exkludera revisionen"
-#: builtin/clone.c:104
+#: builtin/clone.c:122
msgid "clone only one branch, HEAD or --branch"
msgstr "klona endast en gren, HEAD eller --branch"
-#: builtin/clone.c:106
+#: builtin/clone.c:124
msgid "any cloned submodules will be shallow"
msgstr "klonade undermoduler kommer vara grunda"
-#: builtin/clone.c:107 builtin/init-db.c:484
+#: builtin/clone.c:125 builtin/init-db.c:484
msgid "gitdir"
msgstr "gitkat"
-#: builtin/clone.c:108 builtin/init-db.c:485
+#: builtin/clone.c:126 builtin/init-db.c:485
msgid "separate git dir from working tree"
msgstr "separera gitkatalogen från arbetskatalogen"
-#: builtin/clone.c:109
+#: builtin/clone.c:127
msgid "key=value"
msgstr "nyckel=värde"
-#: builtin/clone.c:110
+#: builtin/clone.c:128
msgid "set config inside the new repository"
msgstr "ställ in konfiguration i det nya arkivet"
-#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:550
+#: builtin/clone.c:129 builtin/fetch.c:140 builtin/push.c:550
msgid "use IPv4 addresses only"
msgstr "använd endast IPv4-adresser"
-#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:552
+#: builtin/clone.c:131 builtin/fetch.c:142 builtin/push.c:552
msgid "use IPv6 addresses only"
msgstr "använd endast IPv6-adresser"
-#: builtin/clone.c:250
+#: builtin/clone.c:268
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
@@ -6332,42 +6533,42 @@
"Kunde inte gissa katalognamn.\n"
"Ange en katalog på kommandoraden"
-#: builtin/clone.c:303
+#: builtin/clone.c:321
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: Kan inte skapa alternativ för \"%s\": %s\n"
-#: builtin/clone.c:375
+#: builtin/clone.c:393
#, c-format
msgid "failed to open '%s'"
msgstr "misslyckades öppna \"%s\""
-#: builtin/clone.c:383
+#: builtin/clone.c:401
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s finns och är ingen katalog"
-#: builtin/clone.c:397
+#: builtin/clone.c:415
#, c-format
msgid "failed to stat %s\n"
msgstr "misslyckades ta status på %s\n"
-#: builtin/clone.c:419
+#: builtin/clone.c:437
#, c-format
msgid "failed to create link '%s'"
msgstr "misslyckades skapa länken \"%s\""
-#: builtin/clone.c:423
+#: builtin/clone.c:441
#, c-format
msgid "failed to copy file to '%s'"
msgstr "misslyckades kopiera filen till \"%s\""
-#: builtin/clone.c:448
+#: builtin/clone.c:466
#, c-format
msgid "done.\n"
msgstr "klart.\n"
-#: builtin/clone.c:460
+#: builtin/clone.c:478
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -6377,139 +6578,138 @@
"Du kan inspektera det som checkades ut med \"git status\"\n"
"och försöka checka ut igen med \"git checkout -f HEAD\"\n"
-#: builtin/clone.c:537
+#: builtin/clone.c:555
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Kunde inte hitta fjärrgrenen %s för att klona."
-#: builtin/clone.c:632
+#: builtin/clone.c:650
msgid "remote did not send all necessary objects"
msgstr "fjärren sände inte alla nödvändiga objekt"
-#: builtin/clone.c:648
+#: builtin/clone.c:666
#, c-format
msgid "unable to update %s"
msgstr "kan inte uppdatera %s"
-#: builtin/clone.c:697
+#: builtin/clone.c:715
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut.\n"
-#: builtin/clone.c:728
+#: builtin/clone.c:746
msgid "unable to checkout working tree"
msgstr "kunde inte checka ut arbetskatalogen"
-#: builtin/clone.c:768
+#: builtin/clone.c:786
msgid "unable to write parameters to config file"
msgstr "kunde inte skriva parametrar till konfigurationsfilen"
-#: builtin/clone.c:831
+#: builtin/clone.c:849
msgid "cannot repack to clean up"
msgstr "kan inte packa om för att städa upp"
-#: builtin/clone.c:833
+#: builtin/clone.c:851
msgid "cannot unlink temporary alternates file"
msgstr "kunde inte ta bort temporär \"alternates\"-fil"
-#: builtin/clone.c:866 builtin/receive-pack.c:1895
+#: builtin/clone.c:884 builtin/receive-pack.c:1900
msgid "Too many arguments."
msgstr "För många argument."
-#: builtin/clone.c:870
+#: builtin/clone.c:888
msgid "You must specify a repository to clone."
msgstr "Du måste ange ett arkiv att klona."
-#: builtin/clone.c:883
+#: builtin/clone.c:901
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "flaggorna --bare och --origin %s är inkompatibla."
-#: builtin/clone.c:886
+#: builtin/clone.c:904
msgid "--bare and --separate-git-dir are incompatible."
msgstr "flaggorna --bare och --separate-git-dir är inkompatibla."
-#: builtin/clone.c:899
+#: builtin/clone.c:917
#, c-format
msgid "repository '%s' does not exist"
msgstr "arkivet \"%s\" finns inte"
-#: builtin/clone.c:905 builtin/fetch.c:1335
+#: builtin/clone.c:923 builtin/fetch.c:1337
#, c-format
msgid "depth %s is not a positive number"
msgstr "djupet %s är inte ett positivt tal"
-#: builtin/clone.c:915
+#: builtin/clone.c:933
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog."
-#: builtin/clone.c:925
+#: builtin/clone.c:943
#, c-format
msgid "working tree '%s' already exists."
msgstr "arbetsträdet \"%s\" finns redan."
-#: builtin/clone.c:940 builtin/clone.c:951 builtin/difftool.c:252
-#: builtin/submodule--helper.c:659 builtin/worktree.c:222
-#: builtin/worktree.c:249
+#: builtin/clone.c:958 builtin/clone.c:969 builtin/difftool.c:252
+#: builtin/worktree.c:221 builtin/worktree.c:251
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "kunde inte skapa inledande kataloger för \"%s\""
-#: builtin/clone.c:943
+#: builtin/clone.c:961
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "kunde inte skapa arbetskatalogen \"%s\""
-#: builtin/clone.c:955
+#: builtin/clone.c:973
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Klonar till ett naket arkiv \"%s\"...\n"
-#: builtin/clone.c:957
+#: builtin/clone.c:975
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Klonar till \"%s\"...\n"
-#: builtin/clone.c:963
+#: builtin/clone.c:999
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgstr ""
"clone --recursive är inte kompatibel med --reference och --reference-if-able"
-#: builtin/clone.c:1019
+#: builtin/clone.c:1055
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth ignoreras i lokala kloningar; använd file:// istället"
-#: builtin/clone.c:1021
+#: builtin/clone.c:1057
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr "--shallow-since ignoreras i lokala kloningar; använd file:// istället"
-#: builtin/clone.c:1023
+#: builtin/clone.c:1059
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-exclude ignoreras i lokala kloningar; använd file:// istället"
-#: builtin/clone.c:1026
+#: builtin/clone.c:1062
msgid "source repository is shallow, ignoring --local"
msgstr "källarkivet är grunt, ignorerar --local"
-#: builtin/clone.c:1031
+#: builtin/clone.c:1067
msgid "--local is ignored"
msgstr "--local ignoreras"
-#: builtin/clone.c:1035
+#: builtin/clone.c:1071
#, c-format
msgid "Don't know how to clone %s"
msgstr "Vet inte hur man klonar %s"
-#: builtin/clone.c:1090 builtin/clone.c:1098
+#: builtin/clone.c:1126 builtin/clone.c:1134
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s"
-#: builtin/clone.c:1101
+#: builtin/clone.c:1137
msgid "You appear to have cloned an empty repository."
msgstr "Du verkar ha klonat ett tomt arkiv."
@@ -6703,11 +6903,6 @@
msgid "malformed --author parameter"
msgstr "felformad \"--author\"-flagga"
-#: builtin/commit.c:611
-#, c-format
-msgid "invalid date format: %s"
-msgstr "felaktigt datumformat: %s"
-
#: builtin/commit.c:655
msgid ""
"unable to select a comment character that is not used\n"
@@ -6721,7 +6916,7 @@
msgid "could not lookup commit %s"
msgstr "kunde inte slå upp incheckningen %s"
-#: builtin/commit.c:704 builtin/shortlog.c:295
+#: builtin/commit.c:704 builtin/shortlog.c:294
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(läser loggmeddelande från standard in)\n"
@@ -6821,7 +7016,7 @@
msgid "Error building trees"
msgstr "Fel vid byggande av träd"
-#: builtin/commit.c:968 builtin/tag.c:280
+#: builtin/commit.c:968 builtin/tag.c:273
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Ange meddelandet en av flaggorna -m eller -F.\n"
@@ -6886,7 +7081,7 @@
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr "Explicita sökvägar angavs utan -i eller -o; antar --only sökvägar..."
-#: builtin/commit.c:1224 builtin/tag.c:495
+#: builtin/commit.c:1224 builtin/tag.c:551
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Felaktigt städningsläge %s"
@@ -6908,7 +7103,7 @@
msgstr "version"
#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525
-#: builtin/worktree.c:442
+#: builtin/worktree.c:448
msgid "machine-readable output"
msgstr "maskinläsbar utdata"
@@ -6921,7 +7116,7 @@
msgstr "terminera poster med NUL"
#: builtin/commit.c:1351 builtin/commit.c:1624 builtin/fast-export.c:981
-#: builtin/fast-export.c:984 builtin/tag.c:368
+#: builtin/fast-export.c:984 builtin/tag.c:411
msgid "mode"
msgstr "läge"
@@ -6977,7 +7172,7 @@
msgid "Commit message options"
msgstr "Alternativ för incheckningsmeddelande"
-#: builtin/commit.c:1586 builtin/tag.c:366
+#: builtin/commit.c:1586 builtin/tag.c:409
msgid "read message from file"
msgstr "läs meddelande från fil"
@@ -6989,7 +7184,7 @@
msgid "override author for commit"
msgstr "överstyr författare för incheckningen"
-#: builtin/commit.c:1588 builtin/gc.c:333
+#: builtin/commit.c:1588 builtin/gc.c:357
msgid "date"
msgstr "datum"
@@ -6997,8 +7192,8 @@
msgid "override date for commit"
msgstr "överstyr datum för incheckningen"
-#: builtin/commit.c:1589 builtin/merge.c:222 builtin/notes.c:398
-#: builtin/notes.c:561 builtin/tag.c:364
+#: builtin/commit.c:1589 builtin/merge.c:221 builtin/notes.c:398
+#: builtin/notes.c:561 builtin/tag.c:407
msgid "message"
msgstr "meddelande"
@@ -7007,7 +7202,7 @@
msgstr "incheckningsmeddelande"
#: builtin/commit.c:1590 builtin/commit.c:1591 builtin/commit.c:1592
-#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:81
+#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:77
msgid "commit"
msgstr "incheckning"
@@ -7034,7 +7229,7 @@
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "jag är nu författare av incheckningen (används med -C/-c/--amend)"
-#: builtin/commit.c:1595 builtin/log.c:1413 builtin/revert.c:86
+#: builtin/commit.c:1595 builtin/log.c:1420 builtin/revert.c:104
msgid "add Signed-off-by:"
msgstr "lägg till Signed-off-by:"
@@ -7050,7 +7245,7 @@
msgid "default"
msgstr "standard"
-#: builtin/commit.c:1598 builtin/tag.c:369
+#: builtin/commit.c:1598 builtin/tag.c:412
msgid "how to strip spaces and #comments from message"
msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande"
@@ -7058,8 +7253,8 @@
msgid "include status in commit message template"
msgstr "inkludera status i mallen för incheckningsmeddelandet"
-#: builtin/commit.c:1601 builtin/merge.c:234 builtin/pull.c:166
-#: builtin/revert.c:93
+#: builtin/commit.c:1601 builtin/merge.c:233 builtin/pull.c:166
+#: builtin/revert.c:112
msgid "GPG sign commit"
msgstr "GPG-signera incheckning"
@@ -7154,139 +7349,139 @@
msgid "git config [<options>]"
msgstr "git config [<flaggor>]"
-#: builtin/config.c:55
+#: builtin/config.c:56
msgid "Config file location"
msgstr "Konfigurationsfilens plats"
-#: builtin/config.c:56
+#: builtin/config.c:57
msgid "use global config file"
msgstr "använd global konfigurationsfil"
-#: builtin/config.c:57
+#: builtin/config.c:58
msgid "use system config file"
msgstr "använd systemets konfigurationsfil"
-#: builtin/config.c:58
+#: builtin/config.c:59
msgid "use repository config file"
msgstr "använd arkivets konfigurationsfil"
-#: builtin/config.c:59
+#: builtin/config.c:60
msgid "use given config file"
msgstr "använd angiven konfigurationsfil"
-#: builtin/config.c:60
+#: builtin/config.c:61
msgid "blob-id"
msgstr "blob-id"
-#: builtin/config.c:60
+#: builtin/config.c:61
msgid "read config from given blob object"
msgstr "läs konfiguration från givet blob-objekt"
-#: builtin/config.c:61
+#: builtin/config.c:62
msgid "Action"
msgstr "Åtgärd"
-#: builtin/config.c:62
+#: builtin/config.c:63
msgid "get value: name [value-regex]"
msgstr "hämta värde: namn [värde-reguttr]"
-#: builtin/config.c:63
+#: builtin/config.c:64
msgid "get all values: key [value-regex]"
msgstr "hämta alla värden: nyckel [värde-reguttr]"
-#: builtin/config.c:64
+#: builtin/config.c:65
msgid "get values for regexp: name-regex [value-regex]"
msgstr "hämta värden för reguttr: namn-reguttr [värde-reguttr]"
-#: builtin/config.c:65
+#: builtin/config.c:66
msgid "get value specific for the URL: section[.var] URL"
msgstr "hämta värde specifikt URL:en: sektion[.var] URL"
-#: builtin/config.c:66
+#: builtin/config.c:67
msgid "replace all matching variables: name value [value_regex]"
msgstr "ersätt alla motsvarande variabler: namn värde [värde-reguttr]"
-#: builtin/config.c:67
+#: builtin/config.c:68
msgid "add a new variable: name value"
msgstr "lägg till en ny variabel: namn värde"
-#: builtin/config.c:68
+#: builtin/config.c:69
msgid "remove a variable: name [value-regex]"
msgstr "ta bort en variabel: namn [värde-reguttr]"
-#: builtin/config.c:69
+#: builtin/config.c:70
msgid "remove all matches: name [value-regex]"
msgstr "ta bort alla träffar: namn [värde-reguttr]"
-#: builtin/config.c:70
+#: builtin/config.c:71
msgid "rename section: old-name new-name"
msgstr "byt namn på sektion: gammalt-namn nytt-namn"
-#: builtin/config.c:71
+#: builtin/config.c:72
msgid "remove a section: name"
msgstr "ta bort en sektion: namn"
-#: builtin/config.c:72
+#: builtin/config.c:73
msgid "list all"
msgstr "visa alla"
-#: builtin/config.c:73
+#: builtin/config.c:74
msgid "open an editor"
msgstr "öppna textredigeringsprogram"
-#: builtin/config.c:74
+#: builtin/config.c:75
msgid "find the color configured: slot [default]"
msgstr "hitta den inställda färgen: slot [default]"
-#: builtin/config.c:75
+#: builtin/config.c:76
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "hitta färginställningen: slot [stdout-is-tty]"
-#: builtin/config.c:76
+#: builtin/config.c:77
msgid "Type"
msgstr "Typ"
-#: builtin/config.c:77
+#: builtin/config.c:78
msgid "value is \"true\" or \"false\""
msgstr "värdet är \"true\" eller \"false\""
-#: builtin/config.c:78
+#: builtin/config.c:79
msgid "value is decimal number"
msgstr "värdet är ett decimalt tal"
-#: builtin/config.c:79
+#: builtin/config.c:80
msgid "value is --bool or --int"
msgstr "värdet är --bool eller --int"
-#: builtin/config.c:80
+#: builtin/config.c:81
msgid "value is a path (file or directory name)"
msgstr "värdet är en sökväg (fil- eller katalognamn)"
-#: builtin/config.c:81
+#: builtin/config.c:82
msgid "Other"
msgstr "Andra"
-#: builtin/config.c:82
+#: builtin/config.c:83
msgid "terminate values with NUL byte"
msgstr "terminera värden med NUL-byte"
-#: builtin/config.c:83
+#: builtin/config.c:84
msgid "show variable names only"
msgstr "visa endast variabelnamn"
-#: builtin/config.c:84
+#: builtin/config.c:85
msgid "respect include directives on lookup"
msgstr "respektera inkluderingsdirektiv vid uppslag"
-#: builtin/config.c:85
+#: builtin/config.c:86
msgid "show origin of config (file, standard input, blob, command line)"
msgstr "visa konfigurationskälla (fil, standard in, blob, kommandorad)"
-#: builtin/config.c:327
+#: builtin/config.c:328
msgid "unable to parse default color value"
msgstr "kan inte tolka standardfärgvärde"
-#: builtin/config.c:471
+#: builtin/config.c:472
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -7301,12 +7496,12 @@
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:613
+#: builtin/config.c:615
#, c-format
msgid "cannot create configuration file %s"
msgstr "kan inte skapa konfigurationsfilen \"%s\""
-#: builtin/config.c:625
+#: builtin/config.c:627
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
@@ -7323,55 +7518,67 @@
msgid "print sizes in human readable format"
msgstr "skriv storlekar i människoläsbart format"
-#: builtin/describe.c:17
+#: builtin/describe.c:18
msgid "git describe [<options>] [<commit-ish>...]"
msgstr "git describe [<flaggor>] [<incheckning-igt>...]"
-#: builtin/describe.c:18
+#: builtin/describe.c:19
msgid "git describe [<options>] --dirty"
msgstr "git describe [<flaggor>] --dirty"
-#: builtin/describe.c:217
+#: builtin/describe.c:53
+msgid "head"
+msgstr "huvud"
+
+#: builtin/describe.c:53
+msgid "lightweight"
+msgstr "lättviktig"
+
+#: builtin/describe.c:53
+msgid "annotated"
+msgstr "annoterad"
+
+#: builtin/describe.c:250
#, c-format
msgid "annotated tag %s not available"
msgstr "den annoterade taggen %s inte tillgänglig"
-#: builtin/describe.c:221
+#: builtin/describe.c:254
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr "den annoterade taggen %s har inget inbäddat namn"
-#: builtin/describe.c:223
+#: builtin/describe.c:256
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr "taggen \"%s\" är i verkligheten \"%s\" här"
-#: builtin/describe.c:250 builtin/log.c:480
+#: builtin/describe.c:283 builtin/log.c:487
#, c-format
msgid "Not a valid object name %s"
msgstr "Objektnamnet är inte giltigt: %s"
-#: builtin/describe.c:253
+#: builtin/describe.c:286
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s är inte ett giltigt \"%s\"-objekt"
-#: builtin/describe.c:270
+#: builtin/describe.c:303
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "ingen tagg motsvarar \"%s\" exakt"
-#: builtin/describe.c:272
+#: builtin/describe.c:305
#, c-format
msgid "searching to describe %s\n"
msgstr "söker för att beskriva %s\n"
-#: builtin/describe.c:319
+#: builtin/describe.c:352
#, c-format
msgid "finished search at %s\n"
msgstr "avslutade sökning på %s\n"
-#: builtin/describe.c:346
+#: builtin/describe.c:379
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
@@ -7380,7 +7587,7 @@
"Inga annoterade taggar kan beskriva \"%s\".\n"
"Det finns dock oannoterade taggar: testa --tags."
-#: builtin/describe.c:350
+#: builtin/describe.c:383
#, c-format
msgid ""
"No tags can describe '%s'.\n"
@@ -7389,12 +7596,12 @@
"Inga taggar kan beskriva \"%s\".\n"
"Testa --always, eller skapa några taggar."
-#: builtin/describe.c:371
+#: builtin/describe.c:413
#, c-format
msgid "traversed %lu commits\n"
msgstr "traverserade %lu incheckningar\n"
-#: builtin/describe.c:374
+#: builtin/describe.c:416
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
@@ -7403,66 +7610,78 @@
"mer än %i taggar hittades; listar de %i senaste\n"
"gav upp sökningen vid %s\n"
-#: builtin/describe.c:396
+#: builtin/describe.c:438
msgid "find the tag that comes after the commit"
msgstr "hitta taggen som kommer efter incheckningen"
-#: builtin/describe.c:397
+#: builtin/describe.c:439
msgid "debug search strategy on stderr"
msgstr "felsök sökstrategin på standard fel"
-#: builtin/describe.c:398
+#: builtin/describe.c:440
msgid "use any ref"
msgstr "använd alla referenser"
-#: builtin/describe.c:399
+#: builtin/describe.c:441
msgid "use any tag, even unannotated"
msgstr "använd alla taggar, även oannoterade"
-#: builtin/describe.c:400
+#: builtin/describe.c:442
msgid "always use long format"
msgstr "använd alltid långt format"
-#: builtin/describe.c:401
+#: builtin/describe.c:443
msgid "only follow first parent"
msgstr "följ endast första föräldern"
-#: builtin/describe.c:404
+#: builtin/describe.c:446
msgid "only output exact matches"
msgstr "skriv endast ut exakta träffar"
-#: builtin/describe.c:406
+#: builtin/describe.c:448
msgid "consider <n> most recent tags (default: 10)"
msgstr "överväg de <n> nyaste taggarna (standard: 10)"
-#: builtin/describe.c:408
+#: builtin/describe.c:450
msgid "only consider tags matching <pattern>"
msgstr "överväg endast taggar som motsvarar <mönster>"
-#: builtin/describe.c:410 builtin/name-rev.c:320
+#: builtin/describe.c:452
+msgid "do not consider tags matching <pattern>"
+msgstr "överväg inte taggar som motsvarar <mönster>"
+
+#: builtin/describe.c:454 builtin/name-rev.c:357
msgid "show abbreviated commit object as fallback"
msgstr "visa förkortade incheckningsobjekt som standard"
-#: builtin/describe.c:411
+#: builtin/describe.c:455 builtin/describe.c:458
msgid "mark"
msgstr "märke"
-#: builtin/describe.c:412
+#: builtin/describe.c:456
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr "lägg till <märke> på lortigt arbetsträd (standard: \"-dirty\")"
-#: builtin/describe.c:430
+#: builtin/describe.c:459
+msgid "append <mark> on broken working tree (default: \"-broken\")"
+msgstr "lägg till <märke> på trasigt arbetsträd (standard: \"-broken\")"
+
+#: builtin/describe.c:477
msgid "--long is incompatible with --abbrev=0"
msgstr "--long är inkompatibel med --abbrev=0"
-#: builtin/describe.c:456
+#: builtin/describe.c:506
msgid "No names found, cannot describe anything."
msgstr "Inga namn hittades, kan inte beskriva något."
-#: builtin/describe.c:476
+#: builtin/describe.c:549
msgid "--dirty is incompatible with commit-ishes"
msgstr "--dirty är inkompatibelt med \"commit-ish\"-värden"
+#: builtin/describe.c:551
+msgid "--broken is incompatible with commit-ishes"
+msgstr "--broken är inkompatibelt med \"commit-ish\"-värden"
+
#: builtin/diff.c:83
#, c-format
msgid "'%s': not a regular file or symlink"
@@ -7502,7 +7721,22 @@
msgid "failed: %d"
msgstr "misslyckades: %d"
-#: builtin/difftool.c:342
+#: builtin/difftool.c:283
+#, c-format
+msgid "could not read symlink %s"
+msgstr "kunde inte läsa symboliska länken %s"
+
+#: builtin/difftool.c:285
+#, c-format
+msgid "could not read symlink file %s"
+msgstr "kunde inte läsa symbolisk länk-fil %s"
+
+#: builtin/difftool.c:293
+#, c-format
+msgid "could not read object %s for symlink %s"
+msgstr "kunde inte läsa objektet %s för symboliska länken %s"
+
+#: builtin/difftool.c:395
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
@@ -7510,53 +7744,53 @@
"kombinerade diff-format (\"-c\" och \"--cc\") stöds inte i\n"
"katalogdiffläge (\"-d\" och \"--dir-diff\")."
-#: builtin/difftool.c:567
+#: builtin/difftool.c:609
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "bägge filerna ändrade: \"%s\" och \"%s\"."
-#: builtin/difftool.c:569
+#: builtin/difftool.c:611
msgid "working tree file has been left."
msgstr "filen i arbetskatalogen lämnades kvar."
-#: builtin/difftool.c:580
+#: builtin/difftool.c:622
#, c-format
msgid "temporary files exist in '%s'."
msgstr "temporära filer finns i \"%s\"."
-#: builtin/difftool.c:581
+#: builtin/difftool.c:623
msgid "you may want to cleanup or recover these."
msgstr "du kanske vill städa eller rädda dem."
-#: builtin/difftool.c:626
+#: builtin/difftool.c:669
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "använd \"diff.guitool\" istället för \"diff.tool\""
-#: builtin/difftool.c:628
+#: builtin/difftool.c:671
msgid "perform a full-directory diff"
msgstr "utför diff för hela katalogen"
-#: builtin/difftool.c:630
+#: builtin/difftool.c:673
msgid "do not prompt before launching a diff tool"
msgstr "fråga inte vid start av diff-verktyg"
-#: builtin/difftool.c:636
+#: builtin/difftool.c:679
msgid "use symlinks in dir-diff mode"
msgstr "använd symboliska länkar i katalogdiffläge"
-#: builtin/difftool.c:637
+#: builtin/difftool.c:680
msgid "<tool>"
msgstr "<verktyg>"
-#: builtin/difftool.c:638
+#: builtin/difftool.c:681
msgid "use the specified diff tool"
msgstr "använd angivet diff-verktyg"
-#: builtin/difftool.c:640
+#: builtin/difftool.c:683
msgid "print a list of diff tools that may be used with `--tool`"
msgstr "visa en lista över diff-verktyg som kan användas med \"--tool\""
-#: builtin/difftool.c:643
+#: builtin/difftool.c:686
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
@@ -7564,19 +7798,19 @@
"låt \"git-difftool\" avbryta när ett anropat diff-verktyg ger returvärde "
"skilt från noll"
-#: builtin/difftool.c:645
+#: builtin/difftool.c:688
msgid "<command>"
msgstr "<kommando>"
-#: builtin/difftool.c:646
+#: builtin/difftool.c:689
msgid "specify a custom command for viewing diffs"
msgstr "ange eget kommando för att visa diffar"
-#: builtin/difftool.c:670
+#: builtin/difftool.c:713
msgid "no <tool> given for --tool=<tool>"
msgstr "inget <verktyg> angavs för --tool=<verktyg>"
-#: builtin/difftool.c:677
+#: builtin/difftool.c:720
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "inget <kommando> angavs för --extcmd=<kommando>"
@@ -7712,7 +7946,7 @@
msgid "convert to a complete repository"
msgstr "konvertera till komplett arkiv"
-#: builtin/fetch.c:131 builtin/log.c:1433
+#: builtin/fetch.c:131 builtin/log.c:1440
msgid "dir"
msgstr "kat"
@@ -7740,73 +7974,73 @@
msgid "Couldn't find remote ref HEAD"
msgstr "Kunde inte hitta fjärr-referensen HEAD"
-#: builtin/fetch.c:511
+#: builtin/fetch.c:513
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "konfigurationen för fetch.output innehåller ogiltigt värde %s"
-#: builtin/fetch.c:604
+#: builtin/fetch.c:606
#, c-format
msgid "object %s not found"
msgstr "objektet %s hittades inte"
-#: builtin/fetch.c:608
+#: builtin/fetch.c:610
msgid "[up to date]"
msgstr "[àjour]"
-#: builtin/fetch.c:621 builtin/fetch.c:701
+#: builtin/fetch.c:623 builtin/fetch.c:703
msgid "[rejected]"
msgstr "[refuserad]"
-#: builtin/fetch.c:622
+#: builtin/fetch.c:624
msgid "can't fetch in current branch"
msgstr "kan inte hämta i aktuell gren"
-#: builtin/fetch.c:631
+#: builtin/fetch.c:633
msgid "[tag update]"
msgstr "[uppdaterad tagg]"
-#: builtin/fetch.c:632 builtin/fetch.c:665 builtin/fetch.c:681
-#: builtin/fetch.c:696
+#: builtin/fetch.c:634 builtin/fetch.c:667 builtin/fetch.c:683
+#: builtin/fetch.c:698
msgid "unable to update local ref"
msgstr "kunde inte uppdatera lokal ref"
-#: builtin/fetch.c:651
+#: builtin/fetch.c:653
msgid "[new tag]"
msgstr "[ny tagg]"
-#: builtin/fetch.c:654
+#: builtin/fetch.c:656
msgid "[new branch]"
msgstr "[ny gren]"
-#: builtin/fetch.c:657
+#: builtin/fetch.c:659
msgid "[new ref]"
msgstr "[ny ref]"
-#: builtin/fetch.c:696
+#: builtin/fetch.c:698
msgid "forced update"
msgstr "tvingad uppdatering"
-#: builtin/fetch.c:701
+#: builtin/fetch.c:703
msgid "non-fast-forward"
msgstr "ej snabbspolad"
-#: builtin/fetch.c:746
+#: builtin/fetch.c:748
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s sände inte alla nödvändiga objekt\n"
-#: builtin/fetch.c:766
+#: builtin/fetch.c:768
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "avvisa %s då grunda rötter inte kan uppdateras"
-#: builtin/fetch.c:853 builtin/fetch.c:949
+#: builtin/fetch.c:855 builtin/fetch.c:951
#, c-format
msgid "From %.*s\n"
msgstr "Från %.*s\n"
-#: builtin/fetch.c:864
+#: builtin/fetch.c:866
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -7815,55 +8049,55 @@
"vissa lokala referenser kunde inte uppdateras; testa att köra\n"
" \"git remote prune %s\" för att ta bort gamla grenar som står i konflikt"
-#: builtin/fetch.c:919
+#: builtin/fetch.c:921
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s kommer bli dinglande)"
-#: builtin/fetch.c:920
+#: builtin/fetch.c:922
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s har blivit dinglande)"
-#: builtin/fetch.c:952
+#: builtin/fetch.c:954
msgid "[deleted]"
msgstr "[borttagen]"
-#: builtin/fetch.c:953 builtin/remote.c:1020
+#: builtin/fetch.c:955 builtin/remote.c:1022
msgid "(none)"
msgstr "(ingen)"
-#: builtin/fetch.c:976
+#: builtin/fetch.c:978
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Vägrar hämta till aktuell gren %s i ett icke-naket arkiv"
-#: builtin/fetch.c:995
+#: builtin/fetch.c:997
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "Flaggan \"%s\" och värdet \"%s\" är inte giltigt för %s"
-#: builtin/fetch.c:998
+#: builtin/fetch.c:1000
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Flaggan \"%s\" ignoreras för %s\n"
-#: builtin/fetch.c:1074
+#: builtin/fetch.c:1076
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "Vet inte hur man hämtar från %s"
-#: builtin/fetch.c:1234
+#: builtin/fetch.c:1236
#, c-format
msgid "Fetching %s\n"
msgstr "Hämtar %s\n"
-#: builtin/fetch.c:1236 builtin/remote.c:96
+#: builtin/fetch.c:1238 builtin/remote.c:96
#, c-format
msgid "Could not fetch %s"
msgstr "Kunde inte hämta %s"
-#: builtin/fetch.c:1254
+#: builtin/fetch.c:1256
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -7871,40 +8105,40 @@
"Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n"
"fjärrarkiv som nya incheckningar skall hämtas från."
-#: builtin/fetch.c:1277
+#: builtin/fetch.c:1279
msgid "You need to specify a tag name."
msgstr "Du måste ange namnet på en tagg."
-#: builtin/fetch.c:1319
+#: builtin/fetch.c:1321
msgid "Negative depth in --deepen is not supported"
msgstr "Negativa djup stöds inte i --deepen"
-#: builtin/fetch.c:1321
+#: builtin/fetch.c:1323
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen och --depth är ömsesidigt uteslutande"
-#: builtin/fetch.c:1326
+#: builtin/fetch.c:1328
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth och --unshallow kan inte användas samtidigt"
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1330
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow kan inte användas på ett komplett arkiv"
-#: builtin/fetch.c:1350
+#: builtin/fetch.c:1352
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all tar inte namnet på ett arkiv som argument"
-#: builtin/fetch.c:1352
+#: builtin/fetch.c:1354
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all kan inte anges med referensspecifikationer"
-#: builtin/fetch.c:1363
+#: builtin/fetch.c:1365
#, c-format
msgid "No such remote or remote group: %s"
msgstr "Fjärren eller fjärrgruppen finns inte: %s"
-#: builtin/fetch.c:1371
+#: builtin/fetch.c:1373
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Kan inte hämta från grupp och ange referensspecifikationer"
@@ -7943,12 +8177,13 @@
msgstr "git for-each-ref [--points-at <objekt>]"
#: builtin/for-each-ref.c:11
-msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"
-msgstr "git for-each-ref [(--merged | --no-merged) [<objekt>]]"
+msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
+msgstr "git for-each-ref [(--merged | --no-merged) [<incheckning>]]"
#: builtin/for-each-ref.c:12
-msgid "git for-each-ref [--contains [<object>]]"
-msgstr "git for-each-ref [--contains [<objekt>]]"
+msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
+msgstr ""
+"git for-each-ref [--contains [<incheckning>]] [--no-contains [<incheckning>]]"
#: builtin/for-each-ref.c:27
msgid "quote placeholders suitably for shells"
@@ -7970,10 +8205,6 @@
msgid "show only <n> matched refs"
msgstr "visa endast <n> träffade refs"
-#: builtin/for-each-ref.c:37 builtin/tag.c:387 builtin/verify-tag.c:38
-msgid "format to use for the output"
-msgstr "format att använda för utdata"
-
#: builtin/for-each-ref.c:41
msgid "print only refs which points at the given object"
msgstr "visa endast referenser som pekar på objektet"
@@ -7990,6 +8221,10 @@
msgid "print only refs which contain the commit"
msgstr "visa endast referenser som innehåller incheckningen"
+#: builtin/for-each-ref.c:46
+msgid "print only refs which don't contain the commit"
+msgstr "visa endast referenser som inte innehåller incheckningen"
+
#: builtin/fsck.c:554
msgid "Checking object directories"
msgstr "Kontrollerar objektkataloger"
@@ -8056,17 +8291,17 @@
msgid "git gc [<options>]"
msgstr "git gc [<flaggor>]"
-#: builtin/gc.c:72
+#: builtin/gc.c:78
#, c-format
-msgid "Invalid %s: '%s'"
-msgstr "Felaktigt %s: \"%s\""
+msgid "Failed to fstat %s: %s"
+msgstr "Misslyckades ta status (fstat) på %s: %s"
-#: builtin/gc.c:139
+#: builtin/gc.c:310
#, c-format
-msgid "insanely long object directory %.*s"
-msgstr "tokigt lång objektkatalog %.*s"
+msgid "Can't stat %s"
+msgstr "Kan inte ta status på %s"
-#: builtin/gc.c:297
+#: builtin/gc.c:319
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@ -8081,38 +8316,43 @@
"\n"
"%s"
-#: builtin/gc.c:334
+#: builtin/gc.c:358
msgid "prune unreferenced objects"
msgstr "rensa ej refererade objekt"
-#: builtin/gc.c:336
+#: builtin/gc.c:360
msgid "be more thorough (increased runtime)"
msgstr "var mer grundlig (ökar körtiden)"
-#: builtin/gc.c:337
+#: builtin/gc.c:361
msgid "enable auto-gc mode"
msgstr "aktivera auto-gc-läge"
-#: builtin/gc.c:338
+#: builtin/gc.c:362
msgid "force running gc even if there may be another gc running"
msgstr "tvinga gc-körning även om en annan gc kanske körs"
-#: builtin/gc.c:380
+#: builtin/gc.c:379
+#, c-format
+msgid "Failed to parse gc.logexpiry value %s"
+msgstr "Kan inte tolka värdet %s för gc.logexpiry"
+
+#: builtin/gc.c:407
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr "Packar arkivet automatiskt i bakgrunden för optimal prestanda.\n"
-#: builtin/gc.c:382
+#: builtin/gc.c:409
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "Packar arkivet automatiskt för optimal prestanda.\n"
-#: builtin/gc.c:383
+#: builtin/gc.c:410
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "Se \"git help gc\" för manuell hushållning.\n"
-#: builtin/gc.c:404
+#: builtin/gc.c:431
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -8120,7 +8360,7 @@
"gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte "
"är fallet)"
-#: builtin/gc.c:448
+#: builtin/gc.c:475
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
@@ -8141,235 +8381,240 @@
msgid "invalid number of threads specified (%d) for %s"
msgstr "felaktigt antal trådar angivet (%d) för %s"
-#: builtin/grep.c:763 builtin/grep.c:804
+#: builtin/grep.c:769 builtin/grep.c:810
#, c-format
msgid "unable to read tree (%s)"
msgstr "kunde inte läsa träd (%s)"
-#: builtin/grep.c:823
+#: builtin/grep.c:829
#, c-format
msgid "unable to grep from object of type %s"
msgstr "Kunde inte \"grep\" från objekt av typen %s"
-#: builtin/grep.c:887
+#: builtin/grep.c:893
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "flaggan \"%c\" antar ett numeriskt värde"
-#: builtin/grep.c:973
+#: builtin/grep.c:980
msgid "search in index instead of in the work tree"
msgstr "sök i indexet istället för i arbetskatalogen"
-#: builtin/grep.c:975
+#: builtin/grep.c:982
msgid "find in contents not managed by git"
msgstr "sök i innehåll som inte hanteras av git"
-#: builtin/grep.c:977
+#: builtin/grep.c:984
msgid "search in both tracked and untracked files"
msgstr "sök i både spårade och ospårade filer"
-#: builtin/grep.c:979
+#: builtin/grep.c:986
msgid "ignore files specified via '.gitignore'"
msgstr "ignorera filer angivna i \".gitignore\""
-#: builtin/grep.c:981
-msgid "recursivley search in each submodule"
+#: builtin/grep.c:988
+msgid "recursively search in each submodule"
msgstr "sök varje undermodul rekursivt"
-#: builtin/grep.c:983
+#: builtin/grep.c:990
msgid "basename"
msgstr "basnamn"
-#: builtin/grep.c:984
+#: builtin/grep.c:991
msgid "prepend parent project's basename to output"
msgstr "lägg till föräldraprojektets basnamn i utdata"
-#: builtin/grep.c:987
+#: builtin/grep.c:994
msgid "show non-matching lines"
msgstr "visa rader som inte träffas"
-#: builtin/grep.c:989
+#: builtin/grep.c:996
msgid "case insensitive matching"
msgstr "skiftlägesokänslig sökning"
-#: builtin/grep.c:991
+#: builtin/grep.c:998
msgid "match patterns only at word boundaries"
msgstr "matcha endast mönster vid ordgränser"
-#: builtin/grep.c:993
+#: builtin/grep.c:1000
msgid "process binary files as text"
msgstr "hantera binärfiler som text"
-#: builtin/grep.c:995
+#: builtin/grep.c:1002
msgid "don't match patterns in binary files"
msgstr "träffa inte mönster i binärfiler"
-#: builtin/grep.c:998
+#: builtin/grep.c:1005
msgid "process binary files with textconv filters"
msgstr "hantera binärfiler med textconv-filter"
-#: builtin/grep.c:1000
+#: builtin/grep.c:1007
msgid "descend at most <depth> levels"
msgstr "gå som mest ned <djup> nivåer"
-#: builtin/grep.c:1004
+#: builtin/grep.c:1011
msgid "use extended POSIX regular expressions"
msgstr "använd utökade POSIX-reguljära uttryck"
-#: builtin/grep.c:1007
+#: builtin/grep.c:1014
msgid "use basic POSIX regular expressions (default)"
msgstr "använd grundläggande POSIX-reguljära uttryck (standard)"
-#: builtin/grep.c:1010
+#: builtin/grep.c:1017
msgid "interpret patterns as fixed strings"
msgstr "tolka mönster som fixerade strängar"
-#: builtin/grep.c:1013
+#: builtin/grep.c:1020
msgid "use Perl-compatible regular expressions"
msgstr "använd Perlkompatibla reguljära uttryck"
-#: builtin/grep.c:1016
+#: builtin/grep.c:1023
msgid "show line numbers"
msgstr "visa radnummer"
-#: builtin/grep.c:1017
+#: builtin/grep.c:1024
msgid "don't show filenames"
msgstr "visa inte filnamn"
-#: builtin/grep.c:1018
+#: builtin/grep.c:1025
msgid "show filenames"
msgstr "visa filnamn"
-#: builtin/grep.c:1020
+#: builtin/grep.c:1027
msgid "show filenames relative to top directory"
msgstr "visa filnamn relativa till toppkatalogen"
-#: builtin/grep.c:1022
+#: builtin/grep.c:1029
msgid "show only filenames instead of matching lines"
msgstr "visa endast filnamn istället för träffade rader"
-#: builtin/grep.c:1024
+#: builtin/grep.c:1031
msgid "synonym for --files-with-matches"
msgstr "synonym för --files-with-matches"
-#: builtin/grep.c:1027
+#: builtin/grep.c:1034
msgid "show only the names of files without match"
msgstr "visa endast namn på filer utan träffar"
-#: builtin/grep.c:1029
+#: builtin/grep.c:1036
msgid "print NUL after filenames"
msgstr "skriv NUL efter filnamn"
-#: builtin/grep.c:1031
+#: builtin/grep.c:1038
msgid "show the number of matches instead of matching lines"
msgstr "visa antal träffar istället för träffade rader"
-#: builtin/grep.c:1032
+#: builtin/grep.c:1039
msgid "highlight matches"
msgstr "ljusmarkera träffar"
-#: builtin/grep.c:1034
+#: builtin/grep.c:1041
msgid "print empty line between matches from different files"
msgstr "skriv tomma rader mellan träffar från olika filer"
-#: builtin/grep.c:1036
+#: builtin/grep.c:1043
msgid "show filename only once above matches from same file"
msgstr "visa filnamn endast en gång ovanför träffar från samma fil"
-#: builtin/grep.c:1039
+#: builtin/grep.c:1046
msgid "show <n> context lines before and after matches"
msgstr "visa <n> rader sammanhang före och efter träffar"
-#: builtin/grep.c:1042
+#: builtin/grep.c:1049
msgid "show <n> context lines before matches"
msgstr "visa <n> rader sammanhang före träffar"
-#: builtin/grep.c:1044
+#: builtin/grep.c:1051
msgid "show <n> context lines after matches"
msgstr "visa <n> rader sammanhang efter träffar"
-#: builtin/grep.c:1046
+#: builtin/grep.c:1053
msgid "use <n> worker threads"
msgstr "använd <n> jobbtrådar"
-#: builtin/grep.c:1047
+#: builtin/grep.c:1054
msgid "shortcut for -C NUM"
msgstr "genväg för -C NUM"
-#: builtin/grep.c:1050
+#: builtin/grep.c:1057
msgid "show a line with the function name before matches"
msgstr "visa en rad med funktionsnamnet före träffen"
-#: builtin/grep.c:1052
+#: builtin/grep.c:1059
msgid "show the surrounding function"
msgstr "visa den omkringliggande funktionen"
-#: builtin/grep.c:1055
+#: builtin/grep.c:1062
msgid "read patterns from file"
msgstr "läs mönster från fil"
-#: builtin/grep.c:1057
+#: builtin/grep.c:1064
msgid "match <pattern>"
msgstr "träffa <mönster>"
-#: builtin/grep.c:1059
+#: builtin/grep.c:1066
msgid "combine patterns specified with -e"
msgstr "kombinera mönster som anges med -e"
-#: builtin/grep.c:1071
+#: builtin/grep.c:1078
msgid "indicate hit with exit status without output"
msgstr "ange träff med slutstatuskod utan utdata"
-#: builtin/grep.c:1073
+#: builtin/grep.c:1080
msgid "show only matches from files that match all patterns"
msgstr "visa endast träffar från filer som träffar alla mönster"
-#: builtin/grep.c:1075
+#: builtin/grep.c:1082
msgid "show parse tree for grep expression"
msgstr "visa analysträd för grep-uttryck"
-#: builtin/grep.c:1079
+#: builtin/grep.c:1086
msgid "pager"
msgstr "bläddrare"
-#: builtin/grep.c:1079
+#: builtin/grep.c:1086
msgid "show matching files in the pager"
msgstr "visa träffade filer i filbläddraren"
-#: builtin/grep.c:1082
+#: builtin/grep.c:1089
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)"
-#: builtin/grep.c:1146
+#: builtin/grep.c:1153
msgid "no pattern given."
msgstr "inget mönster angavs."
-#: builtin/grep.c:1178 builtin/index-pack.c:1482
+#: builtin/grep.c:1189
+msgid "--no-index or --untracked cannot be used with revs"
+msgstr "--no-index och --untracked kan inte användas med revisioner"
+
+#: builtin/grep.c:1195
+#, c-format
+msgid "unable to resolve revision: %s"
+msgstr "kan inte slå upp revision: %s"
+
+#: builtin/grep.c:1228 builtin/index-pack.c:1485
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "felaktigt antal trådar angivet (%d)"
-#: builtin/grep.c:1215
+#: builtin/grep.c:1251
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager fungerar endast i arbetskatalogen"
-#: builtin/grep.c:1238
+#: builtin/grep.c:1274
msgid "option not supported with --recurse-submodules."
msgstr "flaggan stöds inte med --recurse-submodules."
-#: builtin/grep.c:1244
+#: builtin/grep.c:1280
msgid "--cached or --untracked cannot be used with --no-index."
msgstr "--cached och --untracked kan inte användas med --no-index."
-#: builtin/grep.c:1249
-msgid "--no-index or --untracked cannot be used with revs."
-msgstr "--no-index och --untracked kan inte användas med revisioner."
-
-#: builtin/grep.c:1252
+#: builtin/grep.c:1286
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr "--[no-]exclude-standard kan inte användas för spårat innehåll."
-#: builtin/grep.c:1260
+#: builtin/grep.c:1294
msgid "both --cached and trees are given."
msgstr "både --cached och träd angavs."
@@ -8595,240 +8840,245 @@
msgid "unable to create '%s'"
msgstr "kunde inte skapa \"%s\""
-#: builtin/index-pack.c:322
+#: builtin/index-pack.c:323
#, c-format
msgid "cannot open packfile '%s'"
msgstr "kan inte öppna paketfilen \"%s\""
-#: builtin/index-pack.c:336
+#: builtin/index-pack.c:337
msgid "pack signature mismatch"
msgstr "paketsignatur stämmer inte överens"
-#: builtin/index-pack.c:338
+#: builtin/index-pack.c:339
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "paketversion %<PRIu32> stöds ej"
-#: builtin/index-pack.c:356
+#: builtin/index-pack.c:357
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "paketet har felaktigt objekt vid index %<PRIuMAX>: %s"
-#: builtin/index-pack.c:478
+#: builtin/index-pack.c:479
#, c-format
msgid "inflate returned %d"
msgstr "inflate returnerade %d"
-#: builtin/index-pack.c:527
+#: builtin/index-pack.c:528
msgid "offset value overflow for delta base object"
msgstr "indexvärdespill för deltabasobjekt"
-#: builtin/index-pack.c:535
+#: builtin/index-pack.c:536
msgid "delta base offset is out of bound"
msgstr "deltabasindex utanför gränsen"
-#: builtin/index-pack.c:543
+#: builtin/index-pack.c:544
#, c-format
msgid "unknown object type %d"
msgstr "okänd objekttyp %d"
-#: builtin/index-pack.c:574
+#: builtin/index-pack.c:575
msgid "cannot pread pack file"
msgstr "kan inte utföra \"pread\" på paketfil"
-#: builtin/index-pack.c:576
+#: builtin/index-pack.c:577
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "för tidigt slut på paketfilen, %<PRIuMAX> byte saknas"
msgstr[1] "för tidigt slut på paketfilen, %<PRIuMAX> byte saknas"
-#: builtin/index-pack.c:602
+#: builtin/index-pack.c:603
msgid "serious inflate inconsistency"
msgstr "allvarlig inflate-inkonsekvens"
-#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
-#: builtin/index-pack.c:813 builtin/index-pack.c:822
+#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
+#: builtin/index-pack.c:816 builtin/index-pack.c:825
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !"
-#: builtin/index-pack.c:751 builtin/pack-objects.c:164
-#: builtin/pack-objects.c:256
+#: builtin/index-pack.c:752 builtin/pack-objects.c:164
+#: builtin/pack-objects.c:257
#, c-format
msgid "unable to read %s"
msgstr "kunde inte läsa %s"
-#: builtin/index-pack.c:819
+#: builtin/index-pack.c:814
+#, c-format
+msgid "cannot read existing object info %s"
+msgstr "kan inte läsa information om befintligt objekt %s"
+
+#: builtin/index-pack.c:822
#, c-format
msgid "cannot read existing object %s"
msgstr "kan inte läsa befintligt objekt %s"
-#: builtin/index-pack.c:833
+#: builtin/index-pack.c:836
#, c-format
msgid "invalid blob object %s"
msgstr "ogiltigt blob-objekt %s"
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:850
#, c-format
msgid "invalid %s"
msgstr "ogiltigt %s"
-#: builtin/index-pack.c:850
+#: builtin/index-pack.c:853
msgid "Error in object"
msgstr "Fel i objekt"
-#: builtin/index-pack.c:852
+#: builtin/index-pack.c:855
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Inte alla barnobjekt för %s kan nås"
-#: builtin/index-pack.c:924 builtin/index-pack.c:955
+#: builtin/index-pack.c:927 builtin/index-pack.c:958
msgid "failed to apply delta"
msgstr "misslyckades tillämpa delta"
-#: builtin/index-pack.c:1125
+#: builtin/index-pack.c:1128
msgid "Receiving objects"
msgstr "Tar emot objekt"
-#: builtin/index-pack.c:1125
+#: builtin/index-pack.c:1128
msgid "Indexing objects"
msgstr "Skapar index för objekt"
-#: builtin/index-pack.c:1157
+#: builtin/index-pack.c:1160
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "paketet är trasigt (SHA1 stämmer inte)"
-#: builtin/index-pack.c:1162
+#: builtin/index-pack.c:1165
msgid "cannot fstat packfile"
msgstr "kan inte utföra \"fstat\" på paketfil"
-#: builtin/index-pack.c:1165
+#: builtin/index-pack.c:1168
msgid "pack has junk at the end"
msgstr "paket har skräp i slutet"
-#: builtin/index-pack.c:1176
+#: builtin/index-pack.c:1179
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "förvirrad bortom vanvett i parse_pack_objects()"
-#: builtin/index-pack.c:1199
+#: builtin/index-pack.c:1202
msgid "Resolving deltas"
msgstr "Analyserar delta"
-#: builtin/index-pack.c:1210
+#: builtin/index-pack.c:1213
#, c-format
msgid "unable to create thread: %s"
msgstr "kunde inte skapa tråd: %s"
-#: builtin/index-pack.c:1252
+#: builtin/index-pack.c:1255
msgid "confusion beyond insanity"
msgstr "förvirrad bortom vanvett"
-#: builtin/index-pack.c:1258
+#: builtin/index-pack.c:1261
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "slutfördes med %d lokalt objekt"
msgstr[1] "slutfördes med %d lokala objekt"
-#: builtin/index-pack.c:1270
+#: builtin/index-pack.c:1273
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Oväntad svanschecksumma för %s (trasig disk?)"
-#: builtin/index-pack.c:1274
+#: builtin/index-pack.c:1277
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "paketet har %d oanalyserat delta"
msgstr[1] "paketet har %d oanalyserade delta"
-#: builtin/index-pack.c:1298
+#: builtin/index-pack.c:1301
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)"
-#: builtin/index-pack.c:1374
+#: builtin/index-pack.c:1377
#, c-format
msgid "local object %s is corrupt"
msgstr "lokalt objekt %s är trasigt"
-#: builtin/index-pack.c:1398
+#: builtin/index-pack.c:1403
msgid "error while closing pack file"
msgstr "fel vid stängning av paketfil"
-#: builtin/index-pack.c:1411
+#: builtin/index-pack.c:1415
#, c-format
msgid "cannot write keep file '%s'"
msgstr "kan inte ta skriva \"keep\"-fil \"%s\""
-#: builtin/index-pack.c:1419
+#: builtin/index-pack.c:1423
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "akn inte stänga skriven \"keep\"-fil \"%s\""
-#: builtin/index-pack.c:1432
+#: builtin/index-pack.c:1433
msgid "cannot store pack file"
msgstr "kan inte spara paketfil"
-#: builtin/index-pack.c:1443
+#: builtin/index-pack.c:1441
msgid "cannot store index file"
msgstr "kan inte spara indexfil"
-#: builtin/index-pack.c:1476
+#: builtin/index-pack.c:1479
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "felaktig pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1486 builtin/index-pack.c:1683
+#: builtin/index-pack.c:1489 builtin/index-pack.c:1686
#, c-format
msgid "no threads support, ignoring %s"
msgstr "trådstöd saknas, ignorerar %s"
-#: builtin/index-pack.c:1544
+#: builtin/index-pack.c:1547
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Kan inte öppna befintlig paketfil \"%s\""
-#: builtin/index-pack.c:1546
+#: builtin/index-pack.c:1549
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Kan inte öppna befintlig paket-idx-fil för \"%s\""
-#: builtin/index-pack.c:1593
+#: builtin/index-pack.c:1596
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "icke-delta: %d objekt"
msgstr[1] "icke-delta: %d objekt"
-#: builtin/index-pack.c:1600
+#: builtin/index-pack.c:1603
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "kedjelängd = %d: %lu objekt"
msgstr[1] "kedjelängd = %d: %lu objekt"
-#: builtin/index-pack.c:1613
+#: builtin/index-pack.c:1616
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\""
-#: builtin/index-pack.c:1695 builtin/index-pack.c:1698
-#: builtin/index-pack.c:1714 builtin/index-pack.c:1718
+#: builtin/index-pack.c:1698 builtin/index-pack.c:1701
+#: builtin/index-pack.c:1717 builtin/index-pack.c:1721
#, c-format
msgid "bad %s"
msgstr "felaktig %s"
-#: builtin/index-pack.c:1734
+#: builtin/index-pack.c:1737
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin kan inte användas med --stdin"
-#: builtin/index-pack.c:1736
+#: builtin/index-pack.c:1739
msgid "--stdin requires a git repository"
msgstr "--stdin kräver ett git-arkiv"
-#: builtin/index-pack.c:1744
+#: builtin/index-pack.c:1747
msgid "--verify with no packfile name given"
msgstr "--verify angavs utan paketfilnamn"
@@ -8988,104 +9238,104 @@
msgid "git show [<options>] <object>..."
msgstr "git show [<flaggor>] <objekt>..."
-#: builtin/log.c:84
+#: builtin/log.c:89
#, c-format
msgid "invalid --decorate option: %s"
msgstr "ogiltig flagga för --decorate: %s"
-#: builtin/log.c:139
+#: builtin/log.c:144
msgid "suppress diff output"
msgstr "undertryck diff-utdata"
-#: builtin/log.c:140
+#: builtin/log.c:145
msgid "show source"
msgstr "visa källkod"
-#: builtin/log.c:141
+#: builtin/log.c:146
msgid "Use mail map file"
msgstr "Använd e-postmappningsfil"
-#: builtin/log.c:142
+#: builtin/log.c:147
msgid "decorate options"
msgstr "dekoreringsflaggor"
-#: builtin/log.c:145
+#: builtin/log.c:150
msgid "Process line range n,m in file, counting from 1"
msgstr "Behandla radintervallet n,m i filen, med början på 1"
-#: builtin/log.c:241
+#: builtin/log.c:246
#, c-format
msgid "Final output: %d %s\n"
msgstr "Slututdata: %d %s\n"
-#: builtin/log.c:486
+#: builtin/log.c:493
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: felaktig fil"
-#: builtin/log.c:500 builtin/log.c:594
+#: builtin/log.c:507 builtin/log.c:601
#, c-format
msgid "Could not read object %s"
msgstr "Kunde inte läsa objektet %s"
-#: builtin/log.c:618
+#: builtin/log.c:625
#, c-format
msgid "Unknown type: %d"
msgstr "Okänd typ: %d"
-#: builtin/log.c:739
+#: builtin/log.c:746
msgid "format.headers without value"
msgstr "format.headers utan värde"
-#: builtin/log.c:839
+#: builtin/log.c:846
msgid "name of output directory is too long"
msgstr "namnet på utdatakatalogen är för långt"
-#: builtin/log.c:854
+#: builtin/log.c:861
#, c-format
msgid "Cannot open patch file %s"
msgstr "Kan inte öppna patchfilen %s"
-#: builtin/log.c:868
+#: builtin/log.c:875
msgid "Need exactly one range."
msgstr "Behöver precis ett intervall."
-#: builtin/log.c:878
+#: builtin/log.c:885
msgid "Not a range."
msgstr "Inte ett intervall."
-#: builtin/log.c:984
+#: builtin/log.c:991
msgid "Cover letter needs email format"
msgstr "Omslagsbrevet behöver e-postformat"
-#: builtin/log.c:1063
+#: builtin/log.c:1071
#, c-format
msgid "insane in-reply-to: %s"
msgstr "tokigt in-reply-to: %s"
-#: builtin/log.c:1091
+#: builtin/log.c:1098
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]"
-#: builtin/log.c:1141
+#: builtin/log.c:1148
msgid "Two output directories?"
msgstr "Två utdatakataloger?"
-#: builtin/log.c:1248 builtin/log.c:1891 builtin/log.c:1893 builtin/log.c:1905
+#: builtin/log.c:1255 builtin/log.c:1898 builtin/log.c:1900 builtin/log.c:1912
#, c-format
msgid "Unknown commit %s"
msgstr "Okänd incheckning %s"
-#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:476
+#: builtin/log.c:1265 builtin/notes.c:883 builtin/tag.c:532
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Kunde inte slå upp \"%s\" som en giltig referens."
-#: builtin/log.c:1263
+#: builtin/log.c:1270
msgid "Could not find exact merge base."
msgstr "Kunde inte hitta exakt sammanslagningsbas."
-#: builtin/log.c:1267
+#: builtin/log.c:1274
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"
@@ -9096,315 +9346,315 @@
"Eller så kan du ange basincheckning med --base=<bas-inchecknings-id> "
"manuellt."
-#: builtin/log.c:1287
+#: builtin/log.c:1294
msgid "Failed to find exact merge base"
msgstr "Kunde inte hitta exakt sammanslagningsbas"
-#: builtin/log.c:1298
+#: builtin/log.c:1305
msgid "base commit should be the ancestor of revision list"
msgstr "basincheckningen bör vara förfader till revisionslistan"
-#: builtin/log.c:1302
+#: builtin/log.c:1309
msgid "base commit shouldn't be in revision list"
msgstr "basincheckningen bör inte vara i revisionslistan"
-#: builtin/log.c:1351
+#: builtin/log.c:1358
msgid "cannot get patch id"
msgstr "kan inte hämta patch-id"
-#: builtin/log.c:1408
+#: builtin/log.c:1415
msgid "use [PATCH n/m] even with a single patch"
msgstr "använd [PATCH n/m] även för en ensam patch"
-#: builtin/log.c:1411
+#: builtin/log.c:1418
msgid "use [PATCH] even with multiple patches"
msgstr "använd [PATCH] även för flera patchar"
-#: builtin/log.c:1415
+#: builtin/log.c:1422
msgid "print patches to standard out"
msgstr "skriv patcharna på standard ut"
-#: builtin/log.c:1417
+#: builtin/log.c:1424
msgid "generate a cover letter"
msgstr "generera ett följebrev"
-#: builtin/log.c:1419
+#: builtin/log.c:1426
msgid "use simple number sequence for output file names"
msgstr "använd enkel nummersekvens för utdatafilnamn"
-#: builtin/log.c:1420
+#: builtin/log.c:1427
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1421
+#: builtin/log.c:1428
msgid "use <sfx> instead of '.patch'"
msgstr "använd <sfx> istället för \".patch\""
-#: builtin/log.c:1423
+#: builtin/log.c:1430
msgid "start numbering patches at <n> instead of 1"
msgstr "börja numrera patchar på <n> istället för 1"
-#: builtin/log.c:1425
+#: builtin/log.c:1432
msgid "mark the series as Nth re-roll"
msgstr "markera serien som N:te försök"
-#: builtin/log.c:1427
+#: builtin/log.c:1434
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "Använd [RFC PATCH] istället för [PATCH]"
-#: builtin/log.c:1430
+#: builtin/log.c:1437
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Använd [<prefix>] istället för [PATCH]"
-#: builtin/log.c:1433
+#: builtin/log.c:1440
msgid "store resulting files in <dir>"
msgstr "spara filerna i <katalog>"
-#: builtin/log.c:1436
+#: builtin/log.c:1443
msgid "don't strip/add [PATCH]"
msgstr "ta inte bort eller lägg till [PATCH]"
-#: builtin/log.c:1439
+#: builtin/log.c:1446
msgid "don't output binary diffs"
msgstr "skriv inte binära diffar"
-#: builtin/log.c:1441
+#: builtin/log.c:1448
msgid "output all-zero hash in From header"
msgstr "använd hashvärde med nollor i From-huvud"
-#: builtin/log.c:1443
+#: builtin/log.c:1450
msgid "don't include a patch matching a commit upstream"
msgstr "ta inte med patchar som motsvarar en uppströmsincheckning"
-#: builtin/log.c:1445
+#: builtin/log.c:1452
msgid "show patch format instead of default (patch + stat)"
msgstr "visa patchformat istället för standard (patch + stat)"
-#: builtin/log.c:1447
+#: builtin/log.c:1454
msgid "Messaging"
msgstr "E-post"
-#: builtin/log.c:1448
+#: builtin/log.c:1455
msgid "header"
msgstr "huvud"
-#: builtin/log.c:1449
+#: builtin/log.c:1456
msgid "add email header"
msgstr "lägg till e-posthuvud"
-#: builtin/log.c:1450 builtin/log.c:1452
+#: builtin/log.c:1457 builtin/log.c:1459
msgid "email"
msgstr "epost"
-#: builtin/log.c:1450
+#: builtin/log.c:1457
msgid "add To: header"
msgstr "Lägg till mottagarhuvud (\"To:\")"
-#: builtin/log.c:1452
+#: builtin/log.c:1459
msgid "add Cc: header"
msgstr "Lägg till kopiehuvud (\"Cc:\")"
-#: builtin/log.c:1454
+#: builtin/log.c:1461
msgid "ident"
msgstr "ident"
-#: builtin/log.c:1455
+#: builtin/log.c:1462
msgid "set From address to <ident> (or committer ident if absent)"
msgstr "sätt Från-adress till <ident> (eller incheckare om ident saknas)"
-#: builtin/log.c:1457
+#: builtin/log.c:1464
msgid "message-id"
msgstr "meddelande-id"
-#: builtin/log.c:1458
+#: builtin/log.c:1465
msgid "make first mail a reply to <message-id>"
msgstr "Gör det första brevet ett svar till <meddelande-id>"
-#: builtin/log.c:1459 builtin/log.c:1462
+#: builtin/log.c:1466 builtin/log.c:1469
msgid "boundary"
msgstr "gräns"
-#: builtin/log.c:1460
+#: builtin/log.c:1467
msgid "attach the patch"
msgstr "bifoga patchen"
-#: builtin/log.c:1463
+#: builtin/log.c:1470
msgid "inline the patch"
msgstr "gör patchen ett inline-objekt"
-#: builtin/log.c:1467
+#: builtin/log.c:1474
msgid "enable message threading, styles: shallow, deep"
msgstr "aktivera brevtrådning, typer: shallow, deep"
-#: builtin/log.c:1469
+#: builtin/log.c:1476
msgid "signature"
msgstr "signatur"
-#: builtin/log.c:1470
+#: builtin/log.c:1477
msgid "add a signature"
msgstr "lägg till signatur"
-#: builtin/log.c:1471
+#: builtin/log.c:1478
msgid "base-commit"
msgstr "basincheckning"
-#: builtin/log.c:1472
+#: builtin/log.c:1479
msgid "add prerequisite tree info to the patch series"
msgstr "lägg till förhandskrävd trädinfo i patchserien"
-#: builtin/log.c:1474
+#: builtin/log.c:1481
msgid "add a signature from a file"
msgstr "lägg till signatur från fil"
-#: builtin/log.c:1475
+#: builtin/log.c:1482
msgid "don't print the patch filenames"
msgstr "visa inte filnamn för patchar"
-#: builtin/log.c:1565
+#: builtin/log.c:1572
msgid "-n and -k are mutually exclusive."
msgstr "-n och -k kan inte användas samtidigt."
-#: builtin/log.c:1567
+#: builtin/log.c:1574
msgid "--subject-prefix/--rfc and -k are mutually exclusive."
msgstr "--subject-prefix/--rfc och -k kan inte användas samtidigt."
-#: builtin/log.c:1575
+#: builtin/log.c:1582
msgid "--name-only does not make sense"
msgstr "kan inte använda --name-only"
-#: builtin/log.c:1577
+#: builtin/log.c:1584
msgid "--name-status does not make sense"
msgstr "kan inte använda --name-status"
-#: builtin/log.c:1579
+#: builtin/log.c:1586
msgid "--check does not make sense"
msgstr "kan inte använda --check"
-#: builtin/log.c:1609
+#: builtin/log.c:1616
msgid "standard output, or directory, which one?"
msgstr "standard ut, eller katalog, vilken skall det vara?"
-#: builtin/log.c:1611
+#: builtin/log.c:1618
#, c-format
msgid "Could not create directory '%s'"
msgstr "Kunde inte skapa katalogen \"%s\""
-#: builtin/log.c:1705
+#: builtin/log.c:1712
#, c-format
msgid "unable to read signature file '%s'"
msgstr "kunde inte läsa signaturfil \"%s\""
-#: builtin/log.c:1777
+#: builtin/log.c:1784
msgid "Failed to create output files"
msgstr "Misslyckades skapa utdatafiler"
-#: builtin/log.c:1826
+#: builtin/log.c:1833
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]"
-#: builtin/log.c:1880
+#: builtin/log.c:1887
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n"
-#: builtin/ls-files.c:460
+#: builtin/ls-files.c:468
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<flaggor>] [<fil>...]"
-#: builtin/ls-files.c:509
+#: builtin/ls-files.c:517
msgid "identify the file status with tags"
msgstr "identifiera filstatus med taggar"
-#: builtin/ls-files.c:511
+#: builtin/ls-files.c:519
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "använd små bokstäver för \"anta oförändrade\"-filer"
-#: builtin/ls-files.c:513
+#: builtin/ls-files.c:521
msgid "show cached files in the output (default)"
msgstr "visa cachade filer i utdata (standard)"
-#: builtin/ls-files.c:515
+#: builtin/ls-files.c:523
msgid "show deleted files in the output"
msgstr "visa borttagna filer i utdata"
-#: builtin/ls-files.c:517
+#: builtin/ls-files.c:525
msgid "show modified files in the output"
msgstr "visa modifierade filer i utdata"
-#: builtin/ls-files.c:519
+#: builtin/ls-files.c:527
msgid "show other files in the output"
msgstr "visa andra filer i utdata"
-#: builtin/ls-files.c:521
+#: builtin/ls-files.c:529
msgid "show ignored files in the output"
msgstr "visa ignorerade filer i utdata"
-#: builtin/ls-files.c:524
+#: builtin/ls-files.c:532
msgid "show staged contents' object name in the output"
msgstr "visa köat innehålls objektnamn i utdata"
-#: builtin/ls-files.c:526
+#: builtin/ls-files.c:534
msgid "show files on the filesystem that need to be removed"
msgstr "visa filer i filsystemet som behöver tas bort"
-#: builtin/ls-files.c:528
+#: builtin/ls-files.c:536
msgid "show 'other' directories' names only"
msgstr "visa endast namn för \"andra\" kataloger"
-#: builtin/ls-files.c:530
+#: builtin/ls-files.c:538
msgid "show line endings of files"
msgstr "visa radslut i filer"
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:540
msgid "don't show empty directories"
msgstr "visa inte tomma kataloger"
-#: builtin/ls-files.c:535
+#: builtin/ls-files.c:543
msgid "show unmerged files in the output"
msgstr "visa ej sammanslagna filer i utdata"
-#: builtin/ls-files.c:537
+#: builtin/ls-files.c:545
msgid "show resolve-undo information"
msgstr "visa \"resolve-undo\"-information"
-#: builtin/ls-files.c:539
+#: builtin/ls-files.c:547
msgid "skip files matching pattern"
msgstr "hoppa över filer som motsvarar mönster"
-#: builtin/ls-files.c:542
+#: builtin/ls-files.c:550
msgid "exclude patterns are read from <file>"
msgstr "exkludera mönster som läses från <fil>"
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:553
msgid "read additional per-directory exclude patterns in <file>"
msgstr "läs ytterligare per-katalog-exkluderingsmönster från <fil>"
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:555
msgid "add the standard git exclusions"
msgstr "lägg till git:s standardexkluderingar"
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:558
msgid "make the output relative to the project top directory"
msgstr "gör utdata relativ till projektets toppkatalog"
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:561
msgid "recurse through submodules"
msgstr "rekursera ner i undermoduler"
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:563
msgid "if any <file> is not in the index, treat this as an error"
msgstr "om en <fil> inte är indexet, betrakta det som ett fel"
-#: builtin/ls-files.c:556
+#: builtin/ls-files.c:564
msgid "tree-ish"
msgstr "träd-igt"
-#: builtin/ls-files.c:557
+#: builtin/ls-files.c:565
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr "låtsas att sökvägar borttagna sedan <träd-igt> fortfarande finns"
-#: builtin/ls-files.c:559
+#: builtin/ls-files.c:567
msgid "show debugging data"
msgstr "visa felsökningsutdata"
@@ -9418,39 +9668,39 @@
" [-q | --quiet] [--exit-code] [--get-url]\n"
" [--symref] [<arkiv> [<referenser>...]]"
-#: builtin/ls-remote.c:50
+#: builtin/ls-remote.c:52
msgid "do not print remote URL"
msgstr "visa inte fjärr-URL"
-#: builtin/ls-remote.c:51 builtin/ls-remote.c:53
+#: builtin/ls-remote.c:53 builtin/ls-remote.c:55
msgid "exec"
msgstr "exec"
-#: builtin/ls-remote.c:52 builtin/ls-remote.c:54
+#: builtin/ls-remote.c:54 builtin/ls-remote.c:56
msgid "path of git-upload-pack on the remote host"
msgstr "sökväg till git-upload-pack på fjärren"
-#: builtin/ls-remote.c:56
+#: builtin/ls-remote.c:58
msgid "limit to tags"
msgstr "begränsa till taggar"
-#: builtin/ls-remote.c:57
+#: builtin/ls-remote.c:59
msgid "limit to heads"
msgstr "begränsa till huvuden"
-#: builtin/ls-remote.c:58
+#: builtin/ls-remote.c:60
msgid "do not show peeled tags"
msgstr "visa inte avskalade taggar"
-#: builtin/ls-remote.c:60
+#: builtin/ls-remote.c:62
msgid "take url.<base>.insteadOf into account"
msgstr "ta hänsyn till url.<bas>.insteadOf"
-#: builtin/ls-remote.c:62
+#: builtin/ls-remote.c:64
msgid "exit with exit code 2 if no matching refs are found"
msgstr "avsluta med felkod 2 om motsvarande referenser inte hittas"
-#: builtin/ls-remote.c:64
+#: builtin/ls-remote.c:66
msgid "show underlying ref in addition to the object pointed by it"
msgstr "visa underliggande referens och objektet det pekar på"
@@ -9495,147 +9745,143 @@
msgstr "git merge [<flaggor>] [<incheckning>...]"
#: builtin/merge.c:47
-msgid "git merge [<options>] <msg> HEAD <commit>"
-msgstr "git merge [<flaggor>] <meddelande> HEAD <incheckning>"
-
-#: builtin/merge.c:48
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:49
+#: builtin/merge.c:48
msgid "git merge --continue"
msgstr "git merge --continue"
-#: builtin/merge.c:104
+#: builtin/merge.c:103
msgid "switch `m' requires a value"
msgstr "flaggan \"m\" behöver ett värde"
-#: builtin/merge.c:141
+#: builtin/merge.c:140
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n"
-#: builtin/merge.c:142
+#: builtin/merge.c:141
#, c-format
msgid "Available strategies are:"
msgstr "Tillgängliga strategier är:"
-#: builtin/merge.c:147
+#: builtin/merge.c:146
#, c-format
msgid "Available custom strategies are:"
msgstr "Tillgängliga skräddarsydda strategier är:"
-#: builtin/merge.c:197 builtin/pull.c:127
+#: builtin/merge.c:196 builtin/pull.c:127
msgid "do not show a diffstat at the end of the merge"
msgstr "visa inte en diffstat när sammanslagningen är färdig"
-#: builtin/merge.c:200 builtin/pull.c:130
+#: builtin/merge.c:199 builtin/pull.c:130
msgid "show a diffstat at the end of the merge"
msgstr "visa en diffstat när sammanslagningen är färdig"
-#: builtin/merge.c:201 builtin/pull.c:133
+#: builtin/merge.c:200 builtin/pull.c:133
msgid "(synonym to --stat)"
msgstr "(synonym till --stat)"
-#: builtin/merge.c:203 builtin/pull.c:136
+#: builtin/merge.c:202 builtin/pull.c:136
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"lägg till (som mest <n>) poster från shortlog till incheckningsmeddelandet"
-#: builtin/merge.c:206 builtin/pull.c:139
+#: builtin/merge.c:205 builtin/pull.c:139
msgid "create a single commit instead of doing a merge"
msgstr "skapa en ensam incheckning istället för en sammanslagning"
-#: builtin/merge.c:208 builtin/pull.c:142
+#: builtin/merge.c:207 builtin/pull.c:142
msgid "perform a commit if the merge succeeds (default)"
msgstr "utför en incheckning om sammanslagningen lyckades (standard)"
-#: builtin/merge.c:210 builtin/pull.c:145
+#: builtin/merge.c:209 builtin/pull.c:145
msgid "edit message before committing"
msgstr "redigera meddelande innan incheckning"
-#: builtin/merge.c:211
+#: builtin/merge.c:210
msgid "allow fast-forward (default)"
msgstr "tillåt snabbspolning (standard)"
-#: builtin/merge.c:213 builtin/pull.c:151
+#: builtin/merge.c:212 builtin/pull.c:151
msgid "abort if fast-forward is not possible"
msgstr "avbryt om snabbspolning inte är möjlig"
-#: builtin/merge.c:217 builtin/pull.c:154
+#: builtin/merge.c:216 builtin/pull.c:154
msgid "verify that the named commit has a valid GPG signature"
msgstr "bekräfta att den namngivna incheckningen har en giltig GPG-signatur"
-#: builtin/merge.c:218 builtin/notes.c:774 builtin/pull.c:158
-#: builtin/revert.c:89
+#: builtin/merge.c:217 builtin/notes.c:773 builtin/pull.c:158
+#: builtin/revert.c:108
msgid "strategy"
msgstr "strategi"
-#: builtin/merge.c:219 builtin/pull.c:159
+#: builtin/merge.c:218 builtin/pull.c:159
msgid "merge strategy to use"
msgstr "sammanslagningsstrategi att använda"
-#: builtin/merge.c:220 builtin/pull.c:162
+#: builtin/merge.c:219 builtin/pull.c:162
msgid "option=value"
msgstr "alternativ=värde"
-#: builtin/merge.c:221 builtin/pull.c:163
+#: builtin/merge.c:220 builtin/pull.c:163
msgid "option for selected merge strategy"
msgstr "alternativ för vald sammanslagningsstrategi"
-#: builtin/merge.c:223
+#: builtin/merge.c:222
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning"
-#: builtin/merge.c:227
+#: builtin/merge.c:226
msgid "abort the current in-progress merge"
msgstr "avbryt den pågående sammanslagningen"
-#: builtin/merge.c:229
+#: builtin/merge.c:228
msgid "continue the current in-progress merge"
msgstr "fortsätt den pågående sammanslagningen"
-#: builtin/merge.c:231 builtin/pull.c:170
+#: builtin/merge.c:230 builtin/pull.c:170
msgid "allow merging unrelated histories"
msgstr "tillåt sammanslagning av orelaterade historier"
-#: builtin/merge.c:259
+#: builtin/merge.c:258
msgid "could not run stash."
msgstr "kunde köra stash."
-#: builtin/merge.c:264
+#: builtin/merge.c:263
msgid "stash failed"
msgstr "stash misslyckades"
-#: builtin/merge.c:269
+#: builtin/merge.c:268
#, c-format
msgid "not a valid object: %s"
msgstr "inte ett giltigt objekt: %s"
-#: builtin/merge.c:288 builtin/merge.c:305
+#: builtin/merge.c:287 builtin/merge.c:304
msgid "read-tree failed"
msgstr "read-tree misslyckades"
-#: builtin/merge.c:335
+#: builtin/merge.c:334
msgid " (nothing to squash)"
msgstr " (inget att platta till)"
-#: builtin/merge.c:346
+#: builtin/merge.c:345
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n"
-#: builtin/merge.c:396
+#: builtin/merge.c:395
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n"
-#: builtin/merge.c:447
+#: builtin/merge.c:446
#, c-format
msgid "'%s' does not point to a commit"
msgstr "\"%s\" verkar inte peka på en incheckning"
-#: builtin/merge.c:537
+#: builtin/merge.c:536
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Felaktig branch.%s.mergeoptions-sträng: %s"
@@ -9697,64 +9943,59 @@
msgstr ""
"Kunde inte slå ihop automatiskt; fixa konflikter och checka in resultatet.\n"
-#: builtin/merge.c:867
-#, c-format
-msgid "'%s' is not a commit"
-msgstr "\"%s\" är inte en incheckning"
-
-#: builtin/merge.c:908
+#: builtin/merge.c:890
msgid "No current branch."
msgstr "Inte på någon gren."
-#: builtin/merge.c:910
+#: builtin/merge.c:892
msgid "No remote for the current branch."
msgstr "Ingen fjärr för aktuell gren."
-#: builtin/merge.c:912
+#: builtin/merge.c:894
msgid "No default upstream defined for the current branch."
msgstr "Ingen standarduppström angiven för aktuell gren."
-#: builtin/merge.c:917
+#: builtin/merge.c:899
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Ingen fjärrspårande gren för %s från %s"
-#: builtin/merge.c:964
+#: builtin/merge.c:946
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Felaktigt värde \"%s\" i miljövariabeln \"%s\""
-#: builtin/merge.c:1038
+#: builtin/merge.c:1020
#, c-format
msgid "could not close '%s'"
msgstr "kunde inte stänga \"%s\""
-#: builtin/merge.c:1065
+#: builtin/merge.c:1047
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "inte något vi kan slå ihop med %s: %s"
-#: builtin/merge.c:1099
+#: builtin/merge.c:1081
msgid "not something we can merge"
msgstr "inte något vi kan slå ihop"
-#: builtin/merge.c:1167
+#: builtin/merge.c:1146
msgid "--abort expects no arguments"
msgstr "--abort tar inga argument"
-#: builtin/merge.c:1171
+#: builtin/merge.c:1150
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "Ingen sammanslagning att avbryta (MERGE_HEAD saknas)."
-#: builtin/merge.c:1183
+#: builtin/merge.c:1162
msgid "--continue expects no arguments"
msgstr "--continue tar inga argument"
-#: builtin/merge.c:1187
+#: builtin/merge.c:1166
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "Ingen sammanslagning pågår (MERGE_HEAD saknas)."
-#: builtin/merge.c:1203
+#: builtin/merge.c:1182
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -9762,7 +10003,7 @@
"Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n"
"Checka in dina ändringar innan du slår ihop."
-#: builtin/merge.c:1210
+#: builtin/merge.c:1189
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -9770,114 +10011,114 @@
"Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n"
"Checka in dina ändringar innan du slår ihop."
-#: builtin/merge.c:1213
+#: builtin/merge.c:1192
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns)."
-#: builtin/merge.c:1222
+#: builtin/merge.c:1201
msgid "You cannot combine --squash with --no-ff."
msgstr "Du kan inte kombinera --squash med --no-ff."
-#: builtin/merge.c:1230
+#: builtin/merge.c:1209
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt."
-#: builtin/merge.c:1247
+#: builtin/merge.c:1226
msgid "Squash commit into empty head not supported yet"
msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu"
-#: builtin/merge.c:1249
+#: builtin/merge.c:1228
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "Icke-snabbspolad incheckning kan inte användas med ett tomt huvud"
-#: builtin/merge.c:1254
+#: builtin/merge.c:1233
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - inte något vi kan slå ihop"
-#: builtin/merge.c:1256
+#: builtin/merge.c:1235
msgid "Can merge only exactly one commit into empty head"
msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud."
-#: builtin/merge.c:1312
+#: builtin/merge.c:1269
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
"Incheckningen %s har en obetrodd GPG-signatur som påstås vara gjord av %s."
-#: builtin/merge.c:1315
+#: builtin/merge.c:1272
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
"Incheckningen %s har en felaktig GPG-signatur som påstås vara gjord av %s."
-#: builtin/merge.c:1318
+#: builtin/merge.c:1275
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Incheckning %s har inte någon GPG-signatur."
-#: builtin/merge.c:1321
+#: builtin/merge.c:1278
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n"
-#: builtin/merge.c:1383
+#: builtin/merge.c:1340
msgid "refusing to merge unrelated histories"
msgstr "vägrar slå samman orelaterad historik"
-#: builtin/merge.c:1392
+#: builtin/merge.c:1349
msgid "Already up-to-date."
msgstr "Redan à jour."
-#: builtin/merge.c:1402
+#: builtin/merge.c:1359
#, c-format
msgid "Updating %s..%s\n"
msgstr "Uppdaterar %s..%s\n"
-#: builtin/merge.c:1443
+#: builtin/merge.c:1400
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Försöker riktigt enkel sammanslagning i indexet...\n"
-#: builtin/merge.c:1450
+#: builtin/merge.c:1407
#, c-format
msgid "Nope.\n"
msgstr "Nej.\n"
-#: builtin/merge.c:1475
+#: builtin/merge.c:1432
msgid "Already up-to-date. Yeeah!"
msgstr "Redan à jour. Toppen!"
-#: builtin/merge.c:1481
+#: builtin/merge.c:1438
msgid "Not possible to fast-forward, aborting."
msgstr "Kan inte snabbspola, avbryter."
-#: builtin/merge.c:1504 builtin/merge.c:1583
+#: builtin/merge.c:1461 builtin/merge.c:1540
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Återspolar trädet till orört...\n"
-#: builtin/merge.c:1508
+#: builtin/merge.c:1465
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Försöker sammanslagningsstrategin %s...\n"
-#: builtin/merge.c:1574
+#: builtin/merge.c:1531
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n"
-#: builtin/merge.c:1576
+#: builtin/merge.c:1533
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Sammanslagning med strategin %s misslyckades.\n"
-#: builtin/merge.c:1585
+#: builtin/merge.c:1542
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "Använder %s för att förbereda lösning för hand.\n"
-#: builtin/merge.c:1597
+#: builtin/merge.c:1554
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -9931,35 +10172,35 @@
"git merge-file [<alternativ>] [-L <namn1> [-L <orig> [-L <namn2>]]] <fil1> "
"<origfil> <fil2>"
-#: builtin/merge-file.c:33
+#: builtin/merge-file.c:32
msgid "send results to standard output"
msgstr "sänd resultat till standard ut"
-#: builtin/merge-file.c:34
+#: builtin/merge-file.c:33
msgid "use a diff3 based merge"
msgstr "använd diff3-baserad sammanslagning"
-#: builtin/merge-file.c:35
+#: builtin/merge-file.c:34
msgid "for conflicts, use our version"
msgstr "för konflikter, använd vår version"
-#: builtin/merge-file.c:37
+#: builtin/merge-file.c:36
msgid "for conflicts, use their version"
msgstr "för konflikter, använd deras version"
-#: builtin/merge-file.c:39
+#: builtin/merge-file.c:38
msgid "for conflicts, use a union version"
msgstr "för konflikter, använd en förenad version"
-#: builtin/merge-file.c:42
+#: builtin/merge-file.c:41
msgid "for conflicts, use this marker size"
msgstr "för konflikter, använd denna markörstorlek"
-#: builtin/merge-file.c:43
+#: builtin/merge-file.c:42
msgid "do not warn about conflicts"
msgstr "varna inte om konflikter"
-#: builtin/merge-file.c:45
+#: builtin/merge-file.c:44
msgid "set labels for file1/orig-file/file2"
msgstr "sätt etiketter för fil1/origfil/fil2"
@@ -10103,43 +10344,47 @@
msgid "renaming '%s' failed"
msgstr "misslyckades byta namn på \"%s\""
-#: builtin/name-rev.c:257
+#: builtin/name-rev.c:289
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<flaggor>] <incheckning>..."
-#: builtin/name-rev.c:258
+#: builtin/name-rev.c:290
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<flaggor>] --all"
-#: builtin/name-rev.c:259
+#: builtin/name-rev.c:291
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<flaggor>] --stdin"
-#: builtin/name-rev.c:311
+#: builtin/name-rev.c:346
msgid "print only names (no SHA-1)"
msgstr "skriv endast namn (ingen SHA-1)"
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:347
msgid "only use tags to name the commits"
msgstr "använd endast taggar för att namnge incheckningar"
-#: builtin/name-rev.c:314
+#: builtin/name-rev.c:349
msgid "only use refs matching <pattern>"
msgstr "använd endast referenser som motsvarar <mönster>"
-#: builtin/name-rev.c:316
+#: builtin/name-rev.c:351
+msgid "ignore refs matching <pattern>"
+msgstr "ignorera referenser som motsvarar <mönster>"
+
+#: builtin/name-rev.c:353
msgid "list all commits reachable from all refs"
msgstr "lista alla incheckningar som kan nås alla referenser"
-#: builtin/name-rev.c:317
+#: builtin/name-rev.c:354
msgid "read from stdin"
msgstr "läs från standard in"
-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:355
msgid "allow to print `undefined` names (default)"
msgstr "tillåt att skriva \"odefinierade\" namn (standard)"
-#: builtin/name-rev.c:324
+#: builtin/name-rev.c:361
msgid "dereference tags in the input (internal use)"
msgstr "avreferera taggar i indata (används internt)"
@@ -10286,19 +10531,19 @@
msgid "the note contents have been left in %s"
msgstr "anteckningens innehåll har lämnats kvar i %s"
-#: builtin/notes.c:233 builtin/tag.c:460
+#: builtin/notes.c:233 builtin/tag.c:516
#, c-format
msgid "cannot read '%s'"
msgstr "kunde inte läsa \"%s\""
-#: builtin/notes.c:235 builtin/tag.c:463
+#: builtin/notes.c:235 builtin/tag.c:519
#, c-format
msgid "could not open or read '%s'"
msgstr "kunde inte öppna eller läsa \"%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:659
+#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:658
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr "kunde inte slå upp \"%s\" som en giltig referens."
@@ -10331,12 +10576,12 @@
msgstr "vägrar utföra \"%s\" på anteckningar i %s (utanför 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:652
-#: builtin/notes.c:802 builtin/notes.c:949 builtin/notes.c:970
+#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:651
+#: builtin/notes.c:801 builtin/notes.c:948 builtin/notes.c:969
msgid "too many parameters"
msgstr "för många parametrar"
-#: builtin/notes.c:378 builtin/notes.c:665
+#: builtin/notes.c:378 builtin/notes.c:664
#, c-format
msgid "no note found for object %s."
msgstr "inga anteckningar hittades för objektet %s."
@@ -10379,7 +10624,7 @@
msgid "Overwriting existing notes for object %s\n"
msgstr "Skriver över befintliga anteckningar för objektet %s\n"
-#: builtin/notes.c:463 builtin/notes.c:624 builtin/notes.c:889
+#: builtin/notes.c:463 builtin/notes.c:623 builtin/notes.c:888
#, c-format
msgid "Removing note for object %s\n"
msgstr "Tar bort anteckning för objektet %s\n"
@@ -10419,52 +10664,52 @@
"Flaggorna -m/-F/-c/-C rekommenderas inte för underkommandot \"edit\".\n"
"Använd \"git notes add -f -m/-F/-c/-C\" istället.\n"
-#: builtin/notes.c:685
+#: builtin/notes.c:684
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "misslyckades ta bort referensen NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:687
+#: builtin/notes.c:686
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "misslyckades ta bort referensen NOTES_MERGE_REF"
-#: builtin/notes.c:689
+#: builtin/notes.c:688
msgid "failed to remove 'git notes merge' worktree"
msgstr "misslyckades ta bort arbetskatalogen för \"git notes merge\""
-#: builtin/notes.c:709
+#: builtin/notes.c:708
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "misslyckades läsa references NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:711
+#: builtin/notes.c:710
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "kunde inte hitta incheckning från NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:713
+#: builtin/notes.c:712
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "kunde inte tolka incheckning från NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:726
+#: builtin/notes.c:725
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "misslyckades bestämma NOTES_MERGE_REF"
-#: builtin/notes.c:729
+#: builtin/notes.c:728
msgid "failed to finalize notes merge"
msgstr "misslyckades färdigställa sammanslagning av anteckningar"
-#: builtin/notes.c:755
+#: builtin/notes.c:754
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "okänd sammanslagningsstrategi för anteckningar: %s"
-#: builtin/notes.c:771
+#: builtin/notes.c:770
msgid "General options"
msgstr "Allmänna flaggor"
-#: builtin/notes.c:773
+#: builtin/notes.c:772
msgid "Merge options"
msgstr "Flaggor för sammanslagning"
-#: builtin/notes.c:775
+#: builtin/notes.c:774
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -10472,48 +10717,48 @@
"läs konflikter i anteckningar med angiven strategi (manual/ours/theirs/union/"
"cat_sort_uniq)"
-#: builtin/notes.c:777
+#: builtin/notes.c:776
msgid "Committing unmerged notes"
msgstr "Checkar in ej sammanslagna anteckningar"
-#: builtin/notes.c:779
+#: builtin/notes.c:778
msgid "finalize notes merge by committing unmerged notes"
msgstr ""
"färdigställ sammanslagning av anteckningar genom att checka in ej "
"sammanslagna anteckningar"
-#: builtin/notes.c:781
+#: builtin/notes.c:780
msgid "Aborting notes merge resolution"
msgstr "Avbryt lösning av sammanslagning av anteckningar"
-#: builtin/notes.c:783
+#: builtin/notes.c:782
msgid "abort notes merge"
msgstr "avbryt sammanslagning av anteckningar"
-#: builtin/notes.c:794
+#: builtin/notes.c:793
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "kan inte blanda --commit, --abort eller -s/--strategy"
-#: builtin/notes.c:799
+#: builtin/notes.c:798
msgid "must specify a notes ref to merge"
msgstr "måste ange en antecknings-referens att slå ihop"
-#: builtin/notes.c:823
+#: builtin/notes.c:822
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "okänd -s/--strategy: %s"
-#: builtin/notes.c:860
+#: builtin/notes.c:859
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "sammanslagning av anteckningar till %s är redan igångsatt på %s"
-#: builtin/notes.c:863
+#: builtin/notes.c:862
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr "misslyckades lagra länk till aktuell anteckningsreferens (%s)"
-#: builtin/notes.c:865
+#: builtin/notes.c:864
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -10524,36 +10769,36 @@
"%s och checka in resultatet med \"git notes merge --commit\", eller avbryt "
"sammanslagningen med \"git notes merge --abort\".\n"
-#: builtin/notes.c:887
+#: builtin/notes.c:886
#, c-format
msgid "Object %s has no note\n"
msgstr "Objektet %s har ingen anteckning\n"
-#: builtin/notes.c:899
+#: builtin/notes.c:898
msgid "attempt to remove non-existent note is not an error"
msgstr "försök att ta bort icke-existerande anteckningar är inte ett fel"
-#: builtin/notes.c:902
+#: builtin/notes.c:901
msgid "read object names from the standard input"
msgstr "läs objektnamn från standard in"
-#: builtin/notes.c:940 builtin/prune.c:105 builtin/worktree.c:127
+#: builtin/notes.c:939 builtin/prune.c:105 builtin/worktree.c:127
msgid "do not remove, show only"
msgstr "ta inte bort, bara visa"
-#: builtin/notes.c:941
+#: builtin/notes.c:940
msgid "report pruned notes"
msgstr "rapportera borttagna anteckningar"
-#: builtin/notes.c:983
+#: builtin/notes.c:982
msgid "notes-ref"
msgstr "anteckningar-ref"
-#: builtin/notes.c:984
+#: builtin/notes.c:983
msgid "use notes from <notes-ref>"
msgstr "använd anteckningar från <anteckningsref>"
-#: builtin/notes.c:1019
+#: builtin/notes.c:1018
#, c-format
msgid "unknown subcommand: %s"
msgstr "okänt underkommando: %s"
@@ -10575,170 +10820,170 @@
msgid "deflate error (%d)"
msgstr "fel i deflate (%d)"
-#: builtin/pack-objects.c:766
+#: builtin/pack-objects.c:770
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
"inaktiverar skrivning av bitkarta, paket delas på grund av pack.packSizeLimit"
-#: builtin/pack-objects.c:779
+#: builtin/pack-objects.c:783
msgid "Writing objects"
msgstr "Skriver objekt"
-#: builtin/pack-objects.c:1068
+#: builtin/pack-objects.c:1063
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "inaktiverar skrivning av bitkarta då några objekt inte packas"
-#: builtin/pack-objects.c:2344
+#: builtin/pack-objects.c:2426
msgid "Compressing objects"
msgstr "Komprimerar objekt"
-#: builtin/pack-objects.c:2747
+#: builtin/pack-objects.c:2829
#, c-format
msgid "unsupported index version %s"
msgstr "indexversionen %s stöds ej"
-#: builtin/pack-objects.c:2751
+#: builtin/pack-objects.c:2833
#, c-format
msgid "bad index version '%s'"
msgstr "felaktig indexversion \"%s\""
-#: builtin/pack-objects.c:2781
+#: builtin/pack-objects.c:2863
msgid "do not show progress meter"
msgstr "visa inte förloppsindikator"
-#: builtin/pack-objects.c:2783
+#: builtin/pack-objects.c:2865
msgid "show progress meter"
msgstr "visa förloppsindikator"
-#: builtin/pack-objects.c:2785
+#: builtin/pack-objects.c:2867
msgid "show progress meter during object writing phase"
msgstr "visa förloppsindikator under objektskrivningsfasen"
-#: builtin/pack-objects.c:2788
+#: builtin/pack-objects.c:2870
msgid "similar to --all-progress when progress meter is shown"
msgstr "som --all-progress när förloppsindikatorn visas"
-#: builtin/pack-objects.c:2789
+#: builtin/pack-objects.c:2871
msgid "version[,offset]"
msgstr "version[,offset]"
-#: builtin/pack-objects.c:2790
+#: builtin/pack-objects.c:2872
msgid "write the pack index file in the specified idx format version"
msgstr "skriv paketindexfilen i angiven indexformatversion"
-#: builtin/pack-objects.c:2793
+#: builtin/pack-objects.c:2875
msgid "maximum size of each output pack file"
msgstr "maximal storlek på varje utdatapaketfil"
-#: builtin/pack-objects.c:2795
+#: builtin/pack-objects.c:2877
msgid "ignore borrowed objects from alternate object store"
msgstr "ignorera lånade objekt från alternativa objektlager"
-#: builtin/pack-objects.c:2797
+#: builtin/pack-objects.c:2879
msgid "ignore packed objects"
msgstr "ignorera packade objekt"
-#: builtin/pack-objects.c:2799
+#: builtin/pack-objects.c:2881
msgid "limit pack window by objects"
msgstr "begränsa paketfönster efter objekt"
-#: builtin/pack-objects.c:2801
+#: builtin/pack-objects.c:2883
msgid "limit pack window by memory in addition to object limit"
msgstr "begränsa paketfönster efter minne förutom objektgräns"
-#: builtin/pack-objects.c:2803
+#: builtin/pack-objects.c:2885
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "maximal längd på deltakedja tillåten i slutligt paket"
-#: builtin/pack-objects.c:2805
+#: builtin/pack-objects.c:2887
msgid "reuse existing deltas"
msgstr "återanvänd befintliga delta"
-#: builtin/pack-objects.c:2807
+#: builtin/pack-objects.c:2889
msgid "reuse existing objects"
msgstr "återanvänd befintliga objekt"
-#: builtin/pack-objects.c:2809
+#: builtin/pack-objects.c:2891
msgid "use OFS_DELTA objects"
msgstr "använd OFS_DELTA-objekt"
-#: builtin/pack-objects.c:2811
+#: builtin/pack-objects.c:2893
msgid "use threads when searching for best delta matches"
msgstr "använd trådar vid sökning efter bästa deltaträffar"
-#: builtin/pack-objects.c:2813
+#: builtin/pack-objects.c:2895
msgid "do not create an empty pack output"
msgstr "försök inte skapa tom paketutdata"
-#: builtin/pack-objects.c:2815
+#: builtin/pack-objects.c:2897
msgid "read revision arguments from standard input"
msgstr "läs revisionsargument från standard in"
-#: builtin/pack-objects.c:2817
+#: builtin/pack-objects.c:2899
msgid "limit the objects to those that are not yet packed"
msgstr "begränsa objekt till de som ännu inte packats"
-#: builtin/pack-objects.c:2820
+#: builtin/pack-objects.c:2902
msgid "include objects reachable from any reference"
msgstr "inkludera objekt som kan nås från någon referens"
-#: builtin/pack-objects.c:2823
+#: builtin/pack-objects.c:2905
msgid "include objects referred by reflog entries"
msgstr "inkludera objekt som refereras från referensloggposter"
-#: builtin/pack-objects.c:2826
+#: builtin/pack-objects.c:2908
msgid "include objects referred to by the index"
msgstr "inkludera objekt som refereras från indexet"
-#: builtin/pack-objects.c:2829
+#: builtin/pack-objects.c:2911
msgid "output pack to stdout"
msgstr "skriv paket på standard ut"
-#: builtin/pack-objects.c:2831
+#: builtin/pack-objects.c:2913
msgid "include tag objects that refer to objects to be packed"
msgstr "inkludera taggobjekt som refererar objekt som skall packas"
-#: builtin/pack-objects.c:2833
+#: builtin/pack-objects.c:2915
msgid "keep unreachable objects"
msgstr "behåll onåbara objekt"
-#: builtin/pack-objects.c:2835
+#: builtin/pack-objects.c:2917
msgid "pack loose unreachable objects"
msgstr "packa lösa onåbara objekt"
-#: builtin/pack-objects.c:2837
+#: builtin/pack-objects.c:2919
msgid "unpack unreachable objects newer than <time>"
msgstr "packa upp onåbara objekt nyare än <tid>"
-#: builtin/pack-objects.c:2840
+#: builtin/pack-objects.c:2922
msgid "create thin packs"
msgstr "skapa tunna paket"
-#: builtin/pack-objects.c:2842
+#: builtin/pack-objects.c:2924
msgid "create packs suitable for shallow fetches"
msgstr "skapa packfiler lämpade för grunda hämtningar"
-#: builtin/pack-objects.c:2844
+#: builtin/pack-objects.c:2926
msgid "ignore packs that have companion .keep file"
msgstr "ignorera paket som har tillhörande .keep-fil"
-#: builtin/pack-objects.c:2846
+#: builtin/pack-objects.c:2928
msgid "pack compression level"
msgstr "komprimeringsgrad för paket"
-#: builtin/pack-objects.c:2848
+#: builtin/pack-objects.c:2930
msgid "do not hide commits by grafts"
msgstr "göm inte incheckningar med ympningar (\"grafts\")"
-#: builtin/pack-objects.c:2850
+#: builtin/pack-objects.c:2932
msgid "use a bitmap index if available to speed up counting objects"
msgstr "använd bitkartindex om tillgängligt för att räkna objekt snabbare"
-#: builtin/pack-objects.c:2852
+#: builtin/pack-objects.c:2934
msgid "write a bitmap index together with the pack index"
msgstr "använd bitkartindex tillsammans med packindexet"
-#: builtin/pack-objects.c:2979
+#: builtin/pack-objects.c:3061
msgid "Counting objects"
msgstr "Räknar objekt"
@@ -10795,7 +11040,7 @@
msgid "incorporate changes by rebasing rather than merging"
msgstr "inlemma ändringar genom ombasering i stället för sammanslagning"
-#: builtin/pull.c:148 builtin/revert.c:101
+#: builtin/pull.c:148 builtin/rebase--helper.c:18 builtin/revert.c:120
msgid "allow fast-forward"
msgstr "tillåt snabbspolning"
@@ -10871,7 +11116,7 @@
msgid "<remote>"
msgstr "<fjärr>"
-#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:455
+#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:456
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<gren>"
@@ -11160,11 +11405,11 @@
msgid "repository"
msgstr "arkiv"
-#: builtin/push.c:519 builtin/send-pack.c:161
+#: builtin/push.c:519 builtin/send-pack.c:162
msgid "push all refs"
msgstr "sänd alla referenser"
-#: builtin/push.c:520 builtin/send-pack.c:163
+#: builtin/push.c:520 builtin/send-pack.c:164
msgid "mirror all refs"
msgstr "spegla alla referenser"
@@ -11176,15 +11421,15 @@
msgid "push tags (can't be used with --all or --mirror)"
msgstr "sänd taggar (kan inte användas med --all eller --mirror)"
-#: builtin/push.c:526 builtin/send-pack.c:164
+#: builtin/push.c:526 builtin/send-pack.c:165
msgid "force updates"
msgstr "tvinga uppdateringar"
-#: builtin/push.c:528 builtin/send-pack.c:175
+#: builtin/push.c:528 builtin/send-pack.c:179
msgid "refname>:<expect"
msgstr "refnamn>:<förvänta"
-#: builtin/push.c:529 builtin/send-pack.c:176
+#: builtin/push.c:529 builtin/send-pack.c:180
msgid "require old value of ref to be at this value"
msgstr "kräv att ref:s tidigare värde är detta"
@@ -11192,12 +11437,12 @@
msgid "control recursive pushing of submodules"
msgstr "styr rekursiv insändning av undermoduler"
-#: builtin/push.c:534 builtin/send-pack.c:169
+#: builtin/push.c:534 builtin/send-pack.c:173
msgid "use thin pack"
msgstr "använd tunna paket"
-#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:158
-#: builtin/send-pack.c:159
+#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:159
+#: builtin/send-pack.c:160
msgid "receive pack program"
msgstr "program för att ta emot paket"
@@ -11217,19 +11462,19 @@
msgid "push missing but relevant tags"
msgstr "sänd in saknade men relevanta taggar"
-#: builtin/push.c:546 builtin/send-pack.c:166
+#: builtin/push.c:546 builtin/send-pack.c:167
msgid "GPG sign the push"
msgstr "GPG-signera insändningen"
-#: builtin/push.c:548 builtin/send-pack.c:170
+#: builtin/push.c:548 builtin/send-pack.c:174
msgid "request atomic transaction on remote side"
msgstr "begär atomiska transaktioner på fjärrsidan"
-#: builtin/push.c:549
+#: builtin/push.c:549 builtin/send-pack.c:170
msgid "server-specific"
msgstr "serverspecifik"
-#: builtin/push.c:549
+#: builtin/push.c:549 builtin/send-pack.c:171
msgid "option to transmit"
msgstr ""
"inget att checka in\n"
@@ -11247,7 +11492,7 @@
msgid "push options must not have new line characters"
msgstr "push-flaggor kan inte innehålla radbrytning"
-#: builtin/read-tree.c:37
+#: builtin/read-tree.c:40
msgid ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
@@ -11257,75 +11502,87 @@
"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
"index-output=<fil>] (--empty | <träd-igt1> [<träd-igt2> [<träd-igt3>]])"
-#: builtin/read-tree.c:110
+#: builtin/read-tree.c:130
msgid "write resulting index to <file>"
msgstr "skriv resulterande index till <fil>"
-#: builtin/read-tree.c:113
+#: builtin/read-tree.c:133
msgid "only empty the index"
msgstr "töm bara indexet"
-#: builtin/read-tree.c:115
+#: builtin/read-tree.c:135
msgid "Merging"
msgstr "Sammanslagning"
-#: builtin/read-tree.c:117
+#: builtin/read-tree.c:137
msgid "perform a merge in addition to a read"
msgstr "utför en sammanslagning i tillägg till en läsning"
-#: builtin/read-tree.c:119
+#: builtin/read-tree.c:139
msgid "3-way merge if no file level merging required"
msgstr "3-vägssammanslagning om sammanslagning på filnivå ej krävs"
-#: builtin/read-tree.c:121
+#: builtin/read-tree.c:141
msgid "3-way merge in presence of adds and removes"
msgstr "3-vägssammanslagning när det finns tillägg och borttagningar"
-#: builtin/read-tree.c:123
+#: builtin/read-tree.c:143
msgid "same as -m, but discard unmerged entries"
msgstr "som -m, men kasta bort ej sammanslagna poster"
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:144
msgid "<subdirectory>/"
msgstr "<underkatalog>/"
-#: builtin/read-tree.c:125
+#: builtin/read-tree.c:145
msgid "read the tree into the index under <subdirectory>/"
msgstr "läs in trädet i indexet under <underkatalog>/"
-#: builtin/read-tree.c:128
+#: builtin/read-tree.c:148
msgid "update working tree with merge result"
msgstr "uppdatera arbetskatalogen med resultatet från sammanslagningen"
-#: builtin/read-tree.c:130
+#: builtin/read-tree.c:150
msgid "gitignore"
msgstr "gitignore"
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:151
msgid "allow explicitly ignored files to be overwritten"
msgstr "tillåt explicit ignorerade filer att skrivas över"
-#: builtin/read-tree.c:134
+#: builtin/read-tree.c:154
msgid "don't check the working tree after merging"
msgstr "kontrollera inte arbetskatalogen efter sammanslagning"
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:155
msgid "don't update the index or the work tree"
msgstr "uppdatera inte indexet eller arbetskatalogen"
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:157
msgid "skip applying sparse checkout filter"
msgstr "hoppa över att applicera filter för gles utcheckning"
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:159
msgid "debug unpack-trees"
msgstr "felsök unpack-trees"
-#: builtin/receive-pack.c:26
+#: builtin/rebase--helper.c:7
+msgid "git rebase--helper [<options>]"
+msgstr "git rebase--helper [<flaggor>]"
+
+#: builtin/rebase--helper.c:19
+msgid "continue rebase"
+msgstr "fortsätt ombasering"
+
+#: builtin/rebase--helper.c:21
+msgid "abort rebase"
+msgstr "avbryt ombasering"
+
+#: builtin/receive-pack.c:27
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-katalog>"
-#: builtin/receive-pack.c:793
+#: builtin/receive-pack.c:795
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"
@@ -11355,7 +11612,7 @@
"För att undvika detta meddelande och fortfarande behålla det\n"
"normala beteendet, sätt \"receive.denyCurrentBranch\" till \"refuse\"."
-#: builtin/receive-pack.c:813
+#: builtin/receive-pack.c:815
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"
@@ -11376,11 +11633,11 @@
"\n"
"För att undvika detta meddelande kan du sätta det till \"refuse\"."
-#: builtin/receive-pack.c:1883
+#: builtin/receive-pack.c:1888
msgid "quiet"
msgstr "tyst"
-#: builtin/receive-pack.c:1897
+#: builtin/receive-pack.c:1902
msgid "You must specify a directory."
msgstr "Du måste ange en katalog."
@@ -11558,7 +11815,7 @@
msgid "(delete)"
msgstr "(ta bort)"
-#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:854
+#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:856
#, c-format
msgid "No such remote: %s"
msgstr "Inget sådant fjärrarkiv: %s"
@@ -11589,7 +11846,7 @@
msgid "creating '%s' failed"
msgstr "misslyckades skapa \"%s\""
-#: builtin/remote.c:792
+#: builtin/remote.c:794
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -11603,296 +11860,296 @@
"Observera: Några grenar utanför hierarkin refs/remotes/ togs inte bort;\n"
"för att ta bort dem, använd:"
-#: builtin/remote.c:806
+#: builtin/remote.c:808
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Kunde inte ta bort konfigurationssektionen \"%s\""
-#: builtin/remote.c:907
+#: builtin/remote.c:909
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " ny (nästa hämtning sparar i remotes/%s)"
-#: builtin/remote.c:910
+#: builtin/remote.c:912
msgid " tracked"
msgstr " spårad"
-#: builtin/remote.c:912
+#: builtin/remote.c:914
msgid " stale (use 'git remote prune' to remove)"
msgstr " förlegad (använd \"git remote prune\" för att ta bort)"
-#: builtin/remote.c:914
+#: builtin/remote.c:916
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:955
+#: builtin/remote.c:957
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "ogiltig branch.%s.merge; kan inte ombasera över > 1 gren"
-#: builtin/remote.c:963
+#: builtin/remote.c:965
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "ombaseras interaktivt på fjärren %s"
-#: builtin/remote.c:964
+#: builtin/remote.c:966
#, c-format
msgid "rebases onto remote %s"
msgstr "ombaseras på fjärren %s"
-#: builtin/remote.c:967
+#: builtin/remote.c:969
#, c-format
msgid " merges with remote %s"
msgstr " sammanslås med fjärren %s"
-#: builtin/remote.c:970
+#: builtin/remote.c:972
#, c-format
msgid "merges with remote %s"
msgstr "sammanslås med fjärren %s"
-#: builtin/remote.c:973
+#: builtin/remote.c:975
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s och med fjärren %s\n"
-#: builtin/remote.c:1016
+#: builtin/remote.c:1018
msgid "create"
msgstr "skapa"
-#: builtin/remote.c:1019
+#: builtin/remote.c:1021
msgid "delete"
msgstr "ta bort"
-#: builtin/remote.c:1023
+#: builtin/remote.c:1025
msgid "up to date"
msgstr "àjour"
-#: builtin/remote.c:1026
+#: builtin/remote.c:1028
msgid "fast-forwardable"
msgstr "kan snabbspolas"
-#: builtin/remote.c:1029
+#: builtin/remote.c:1031
msgid "local out of date"
msgstr "lokal föråldrad"
-#: builtin/remote.c:1036
+#: builtin/remote.c:1038
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s tvingar till %-*s (%s)"
-#: builtin/remote.c:1039
+#: builtin/remote.c:1041
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s sänder till %-*s (%s)"
-#: builtin/remote.c:1043
+#: builtin/remote.c:1045
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s tvingar till %s"
-#: builtin/remote.c:1046
+#: builtin/remote.c:1048
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s sänder till %s"
-#: builtin/remote.c:1114
+#: builtin/remote.c:1116
msgid "do not query remotes"
msgstr "fråga inte fjärrar"
-#: builtin/remote.c:1141
+#: builtin/remote.c:1143
#, c-format
msgid "* remote %s"
msgstr "* fjärr %s"
-#: builtin/remote.c:1142
+#: builtin/remote.c:1144
#, c-format
msgid " Fetch URL: %s"
msgstr " Hämt-URL: %s"
-#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1295
+#: builtin/remote.c:1145 builtin/remote.c:1158 builtin/remote.c:1297
msgid "(no URL)"
msgstr "(ingen URL)"
#. TRANSLATORS: the colon ':' should align with
#. the one in " Fetch URL: %s" translation
-#: builtin/remote.c:1154 builtin/remote.c:1156
+#: builtin/remote.c:1156 builtin/remote.c:1158
#, c-format
msgid " Push URL: %s"
msgstr " Sänd-URL: %s"
-#: builtin/remote.c:1158 builtin/remote.c:1160 builtin/remote.c:1162
+#: builtin/remote.c:1160 builtin/remote.c:1162 builtin/remote.c:1164
#, c-format
msgid " HEAD branch: %s"
msgstr " HEAD-gren: %s"
-#: builtin/remote.c:1158
+#: builtin/remote.c:1160
msgid "(not queried)"
msgstr "(inte förfrågad)"
-#: builtin/remote.c:1160
+#: builtin/remote.c:1162
msgid "(unknown)"
msgstr "(okänd)"
-#: builtin/remote.c:1164
+#: builtin/remote.c:1166
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr " HEAD-gren (HEAD på fjärr är tvetydig, kan vara en av följande):\n"
-#: builtin/remote.c:1176
+#: builtin/remote.c:1178
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Fjärrgren:%s"
msgstr[1] " Fjärrgrenar:%s"
-#: builtin/remote.c:1179 builtin/remote.c:1205
+#: builtin/remote.c:1181 builtin/remote.c:1207
msgid " (status not queried)"
msgstr " (status inte förfrågad)"
-#: builtin/remote.c:1188
+#: builtin/remote.c:1190
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Lokal gren konfigurerad för \"git pull\":"
msgstr[1] " Lokala grenar konfigurerade för \"git pull\":"
-#: builtin/remote.c:1196
+#: builtin/remote.c:1198
msgid " Local refs will be mirrored by 'git push'"
msgstr " Lokala referenser speglas av \"git push\""
-#: builtin/remote.c:1202
+#: builtin/remote.c:1204
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " Lokal referens konfigurerad för \"git push\"%s:"
msgstr[1] " Lokala referenser konfigurerade för \"git push\"%s:"
-#: builtin/remote.c:1223
+#: builtin/remote.c:1225
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "sätt refs/remotes/<namn>/HEAD enligt fjärren"
-#: builtin/remote.c:1225
+#: builtin/remote.c:1227
msgid "delete refs/remotes/<name>/HEAD"
msgstr "ta bort refs/remotes/<namn>/HEAD"
-#: builtin/remote.c:1240
+#: builtin/remote.c:1242
msgid "Cannot determine remote HEAD"
msgstr "Kan inte bestämma HEAD på fjärren"
-#: builtin/remote.c:1242
+#: builtin/remote.c:1244
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "Flera HEAD-grenar på fjärren. Välj en explicit med:"
-#: builtin/remote.c:1252
+#: builtin/remote.c:1254
#, c-format
msgid "Could not delete %s"
msgstr "Kunde inte ta bort %s"
-#: builtin/remote.c:1260
+#: builtin/remote.c:1262
#, c-format
msgid "Not a valid ref: %s"
msgstr "Inte en giltig referens: %s"
-#: builtin/remote.c:1262
+#: builtin/remote.c:1264
#, c-format
msgid "Could not setup %s"
msgstr "Kunde inte ställa in %s"
-#: builtin/remote.c:1280
+#: builtin/remote.c:1282
#, c-format
msgid " %s will become dangling!"
msgstr " %s kommer bli dinglande!"
-#: builtin/remote.c:1281
+#: builtin/remote.c:1283
#, c-format
msgid " %s has become dangling!"
msgstr " %s har blivit dinglande!"
-#: builtin/remote.c:1291
+#: builtin/remote.c:1293
#, c-format
msgid "Pruning %s"
msgstr "Rensar %s"
-#: builtin/remote.c:1292
+#: builtin/remote.c:1294
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1308
+#: builtin/remote.c:1310
#, c-format
msgid " * [would prune] %s"
msgstr " * [skulle rensa] %s"
-#: builtin/remote.c:1311
+#: builtin/remote.c:1313
#, c-format
msgid " * [pruned] %s"
msgstr " * [rensad] %s"
-#: builtin/remote.c:1356
+#: builtin/remote.c:1358
msgid "prune remotes after fetching"
msgstr "rensa fjärrar efter hämtning"
-#: builtin/remote.c:1419 builtin/remote.c:1473 builtin/remote.c:1541
+#: builtin/remote.c:1421 builtin/remote.c:1475 builtin/remote.c:1543
#, c-format
msgid "No such remote '%s'"
msgstr "Ingen sådan fjärr \"%s\""
-#: builtin/remote.c:1435
+#: builtin/remote.c:1437
msgid "add branch"
msgstr "lägg till gren"
-#: builtin/remote.c:1442
+#: builtin/remote.c:1444
msgid "no remote specified"
msgstr "ingen fjärr angavs"
-#: builtin/remote.c:1459
+#: builtin/remote.c:1461
msgid "query push URLs rather than fetch URLs"
msgstr "fråga sänd-URL:er istället för hämta-URL:er"
-#: builtin/remote.c:1461
+#: builtin/remote.c:1463
msgid "return all URLs"
msgstr "returnera alla URL:er"
-#: builtin/remote.c:1489
+#: builtin/remote.c:1491
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "ingen URL:er angivna för fjärren \"%s\""
-#: builtin/remote.c:1515
+#: builtin/remote.c:1517
msgid "manipulate push URLs"
msgstr "manipulera URL:ar för sändning"
-#: builtin/remote.c:1517
+#: builtin/remote.c:1519
msgid "add URL"
msgstr "lägg till URL"
-#: builtin/remote.c:1519
+#: builtin/remote.c:1521
msgid "delete URLs"
msgstr "ta bort URL:ar"
-#: builtin/remote.c:1526
+#: builtin/remote.c:1528
msgid "--add --delete doesn't make sense"
msgstr "--add --delete ger ingen mening"
-#: builtin/remote.c:1567
+#: builtin/remote.c:1569
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Felaktig gammalt URL-mönster: %s"
-#: builtin/remote.c:1575
+#: builtin/remote.c:1577
#, c-format
msgid "No such URL found: %s"
msgstr "Ingen sådan URL hittades: %s"
-#: builtin/remote.c:1577
+#: builtin/remote.c:1579
msgid "Will not delete all non-push URLs"
msgstr "Kommer inte ta bort alla icke-sänd-URL:er"
-#: builtin/remote.c:1591
+#: builtin/remote.c:1593
msgid "be verbose; must be placed before a subcommand"
msgstr "var pratsam; måste skrivas före ett underkommando"
-#: builtin/remote.c:1622
+#: builtin/remote.c:1624
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Okänt underkommando: %s"
@@ -12011,22 +12268,22 @@
msgid "git replace [--format=<format>] [-l [<pattern>]]"
msgstr "git replace [--format=<format>] [-l [<mönster>]]"
-#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
+#: builtin/replace.c:330 builtin/replace.c:368 builtin/replace.c:396
#, c-format
msgid "Not a valid object name: '%s'"
msgstr "Objektnamnet är inte giltigt: \"%s\""
-#: builtin/replace.c:355
+#: builtin/replace.c:360
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "felaktig sammanslagningstagg i incheckningen \"%s\""
-#: builtin/replace.c:357
+#: builtin/replace.c:362
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr "felformad sammanslagningstagg i incheckningen \"%s\""
-#: builtin/replace.c:368
+#: builtin/replace.c:373
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -12035,45 +12292,45 @@
"den ursprungliga incheckningen \"%s\" innehåller sammanslagningstaggen \"%s"
"\" som har förkastats; använd --edit istället för --graft"
-#: builtin/replace.c:401
+#: builtin/replace.c:406
#, c-format
msgid "the original commit '%s' has a gpg signature."
msgstr "den ursprungliga incheckningen \"%s\" har en gpg-signatur."
-#: builtin/replace.c:402
+#: builtin/replace.c:407
msgid "the signature will be removed in the replacement commit!"
msgstr "signaturen kommer att tas bort i ersättningsincheckningen!"
-#: builtin/replace.c:408
+#: builtin/replace.c:413
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr "kunde inte skriva ersättningsincheckning för: \"%s\""
-#: builtin/replace.c:432
+#: builtin/replace.c:437
msgid "list replace refs"
msgstr "visa ersättningsreferenser"
-#: builtin/replace.c:433
+#: builtin/replace.c:438
msgid "delete replace refs"
msgstr "ta bort ersättningsreferenser"
-#: builtin/replace.c:434
+#: builtin/replace.c:439
msgid "edit existing object"
msgstr "redigera befintligt objekt"
-#: builtin/replace.c:435
+#: builtin/replace.c:440
msgid "change a commit's parents"
msgstr "ändra en inchecknings föräldrar"
-#: builtin/replace.c:436
+#: builtin/replace.c:441
msgid "replace the ref if it exists"
msgstr "ersätt referensen om den finns"
-#: builtin/replace.c:437
+#: builtin/replace.c:442
msgid "do not pretty-print contents for --edit"
msgstr "använd inte snygg visning av innehåll för --edit"
-#: builtin/replace.c:438
+#: builtin/replace.c:443
msgid "use this format"
msgstr "använd detta format"
@@ -12216,23 +12473,23 @@
msgid "rev-list does not support display of notes"
msgstr "rev-list stöder inte visning av anteckningar"
-#: builtin/rev-parse.c:391
+#: builtin/rev-parse.c:393
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<options>] -- [<argument>...]"
-#: builtin/rev-parse.c:396
+#: builtin/rev-parse.c:398
msgid "keep the `--` passed as an arg"
msgstr "behåll \"--\" sänt som argument"
-#: builtin/rev-parse.c:398
+#: builtin/rev-parse.c:400
msgid "stop parsing after the first non-option argument"
msgstr "sluta tolka efter första argument som inte är flagga"
-#: builtin/rev-parse.c:401
+#: builtin/rev-parse.c:403
msgid "output in stuck long form"
msgstr "utdata fast i lång form"
-#: builtin/rev-parse.c:532
+#: builtin/rev-parse.c:534
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
@@ -12263,68 +12520,72 @@
msgid "git cherry-pick <subcommand>"
msgstr "git cherry-pick <underkommando>"
-#: builtin/revert.c:71
+#: builtin/revert.c:89
#, c-format
msgid "%s: %s cannot be used with %s"
msgstr "%s: %s kan inte användas med %s"
-#: builtin/revert.c:80
+#: builtin/revert.c:98
msgid "end revert or cherry-pick sequence"
msgstr "avsluta revert- eller cherry-pick-sekvens"
-#: builtin/revert.c:81
+#: builtin/revert.c:99
msgid "resume revert or cherry-pick sequence"
msgstr "återuppta revert- eller cherry-pick-sekvens"
-#: builtin/revert.c:82
+#: builtin/revert.c:100
msgid "cancel revert or cherry-pick sequence"
msgstr "avbryt revert- eller cherry-pick-sekvens"
-#: builtin/revert.c:83
+#: builtin/revert.c:101
msgid "don't automatically commit"
msgstr "checka inte in automatiskt"
-#: builtin/revert.c:84
+#: builtin/revert.c:102
msgid "edit the commit message"
msgstr "redigera incheckningsmeddelandet"
-#: builtin/revert.c:87
-msgid "parent number"
-msgstr "nummer på förälder"
+#: builtin/revert.c:105
+msgid "parent-number"
+msgstr "nummer-på-förälder"
-#: builtin/revert.c:89
+#: builtin/revert.c:106
+msgid "select mainline parent"
+msgstr "välj förälder för huvudlinje"
+
+#: builtin/revert.c:108
msgid "merge strategy"
msgstr "sammanslagningsstrategi"
-#: builtin/revert.c:90
+#: builtin/revert.c:109
msgid "option"
msgstr "alternativ"
-#: builtin/revert.c:91
+#: builtin/revert.c:110
msgid "option for merge strategy"
msgstr "alternativ för sammanslagningsstrategi"
-#: builtin/revert.c:100
+#: builtin/revert.c:119
msgid "append commit name"
msgstr "lägg till incheckningsnamn"
-#: builtin/revert.c:102
+#: builtin/revert.c:121
msgid "preserve initially empty commits"
msgstr "behåll incheckningar som börjar som tomma"
-#: builtin/revert.c:103
+#: builtin/revert.c:122
msgid "allow commits with empty messages"
msgstr "tillåt incheckningar med tomt meddelande"
-#: builtin/revert.c:104
+#: builtin/revert.c:123
msgid "keep redundant, empty commits"
msgstr "behåll redundanta, tomma incheckningar"
-#: builtin/revert.c:192
+#: builtin/revert.c:211
msgid "revert failed"
msgstr "\"revert\" misslyckades"
-#: builtin/revert.c:205
+#: builtin/revert.c:224
msgid "cherry-pick failed"
msgstr "\"cherry-pick\" misslyckades"
@@ -12419,19 +12680,19 @@
"[<ref>...]\n"
" --all och explicit angiven <ref> är ömsesidigt uteslutande."
-#: builtin/send-pack.c:160
+#: builtin/send-pack.c:161
msgid "remote name"
msgstr "fjärrnamn"
-#: builtin/send-pack.c:171
+#: builtin/send-pack.c:175
msgid "use stateless RPC protocol"
msgstr "använd tillståndslöst RPC-protokoll"
-#: builtin/send-pack.c:172
+#: builtin/send-pack.c:176
msgid "read refs from stdin"
msgstr "läs referenser från standard in"
-#: builtin/send-pack.c:173
+#: builtin/send-pack.c:177
msgid "print status from remote helper"
msgstr "visa status från fjärrhjälpare"
@@ -12439,27 +12700,27 @@
msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
msgstr "git shortlog [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]"
-#: builtin/shortlog.c:249
+#: builtin/shortlog.c:248
msgid "Group by committer rather than author"
msgstr "Gruppera efter incheckare istället för författare"
-#: builtin/shortlog.c:251
+#: builtin/shortlog.c:250
msgid "sort output according to the number of commits per author"
msgstr "sortera utdata enligt antal incheckningar per författare"
-#: builtin/shortlog.c:253
+#: builtin/shortlog.c:252
msgid "Suppress commit descriptions, only provides commit count"
msgstr "Undertryck beskrivningar, visa bara antal incheckningar"
-#: builtin/shortlog.c:255
+#: builtin/shortlog.c:254
msgid "Show the email address of each author"
msgstr "Visa e-postadress för varje författare"
-#: builtin/shortlog.c:256
+#: builtin/shortlog.c:255
msgid "w[,i1[,i2]]"
msgstr "w[,i1[,i2]]"
-#: builtin/shortlog.c:257
+#: builtin/shortlog.c:256
msgid "Linewrap output"
msgstr "Radbryt utdata"
@@ -12479,122 +12740,122 @@
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr "git show-branch (-g | --reflog)[=<n>[,<bas>]] [--list] [<ref>]"
-#: builtin/show-branch.c:375
+#: builtin/show-branch.c:374
#, c-format
msgid "ignoring %s; cannot handle more than %d ref"
msgid_plural "ignoring %s; cannot handle more than %d refs"
msgstr[0] "ignorerar %s; kan inte hantera mer än %d referens"
msgstr[1] "ignorerar %s; kan inte hantera mer än %d referenser"
-#: builtin/show-branch.c:541
+#: builtin/show-branch.c:536
#, c-format
msgid "no matching refs with %s"
msgstr "inga motsvarande referenser med %s"
-#: builtin/show-branch.c:639
+#: builtin/show-branch.c:632
msgid "show remote-tracking and local branches"
msgstr "visa fjärrspårande och lokala grenar"
-#: builtin/show-branch.c:641
+#: builtin/show-branch.c:634
msgid "show remote-tracking branches"
msgstr "visa fjärrspårande grenar"
-#: builtin/show-branch.c:643
+#: builtin/show-branch.c:636
msgid "color '*!+-' corresponding to the branch"
msgstr "färga \"*!+-\" enligt grenen"
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:638
msgid "show <n> more commits after the common ancestor"
msgstr "visa <n> ytterligare incheckningar efter gemensam anfader"
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:640
msgid "synonym to more=-1"
msgstr "synonym till more=-1"
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:641
msgid "suppress naming strings"
msgstr "undertyck namnsträngar"
-#: builtin/show-branch.c:650
+#: builtin/show-branch.c:643
msgid "include the current branch"
msgstr "inkludera aktuell gren"
-#: builtin/show-branch.c:652
+#: builtin/show-branch.c:645
msgid "name commits with their object names"
msgstr "namnge incheckningar med deras objektnamn"
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:647
msgid "show possible merge bases"
msgstr "visa möjliga sammanslagningsbaser"
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:649
msgid "show refs unreachable from any other ref"
msgstr "visa referenser som inte kan nås från någon annan referens"
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:651
msgid "show commits in topological order"
msgstr "visa incheckningar i topologisk ordning"
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:654
msgid "show only commits not on the first branch"
msgstr "visa endast incheckningar inte på den första grenen"
-#: builtin/show-branch.c:663
+#: builtin/show-branch.c:656
msgid "show merges reachable from only one tip"
msgstr "visa sammanslagningar som endast kan nås från en spets"
-#: builtin/show-branch.c:665
+#: builtin/show-branch.c:658
msgid "topologically sort, maintaining date order where possible"
msgstr "sortera topologiskt, behåll datumordning när möjligt"
-#: builtin/show-branch.c:668
+#: builtin/show-branch.c:661
msgid "<n>[,<base>]"
msgstr "<n>[,<bas>]"
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:662
msgid "show <n> most recent ref-log entries starting at base"
msgstr "visa <n> nyaste refloggposter med början på bas"
-#: builtin/show-branch.c:703
+#: builtin/show-branch.c:696
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr ""
"--reflog är inkompatibel med --all, --remotes, --independent eller --merge-"
"base"
-#: builtin/show-branch.c:727
+#: builtin/show-branch.c:720
msgid "no branches given, and HEAD is not valid"
msgstr "inga grenar angavs, och HEAD är inte giltigt"
-#: builtin/show-branch.c:730
+#: builtin/show-branch.c:723
msgid "--reflog option needs one branch name"
msgstr "--reflog behöver ett namn på en gren"
-#: builtin/show-branch.c:733
+#: builtin/show-branch.c:726
#, 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] "maximalt %d poster kan visas samtidigt."
msgstr[1] "maximalt %d poster kan visas samtidigt."
-#: builtin/show-branch.c:737
+#: builtin/show-branch.c:730
#, c-format
msgid "no such ref %s"
msgstr "ingen sådan referens %s"
-#: builtin/show-branch.c:829
+#: builtin/show-branch.c:814
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] "kan inte hantera mer än %d revision."
msgstr[1] "kan inte hantera mer än %d revisioner."
-#: builtin/show-branch.c:833
+#: builtin/show-branch.c:818
#, c-format
msgid "'%s' is not a valid ref."
msgstr "\"%s\" är inte en giltig referens."
-#: builtin/show-branch.c:836
+#: builtin/show-branch.c:821
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "hittar inte incheckning %s (%s)"
@@ -12659,12 +12920,12 @@
msgid "prepend comment character and space to each line"
msgstr "lägg in kommentarstecken och blanksteg först på varje rad"
-#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1062
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1075
#, c-format
msgid "No such ref: %s"
msgstr "Ingen sådan referens: %s"
-#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1071
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1084
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Förväntade fullt referensnamn, fick %s"
@@ -12674,92 +12935,101 @@
msgid "cannot strip one component off url '%s'"
msgstr "kan inte ta bort en komponent från url:en \"%s\""
-#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:592
+#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630
msgid "alternative anchor for relative paths"
msgstr "alternativa ankare för relativa sökvägar"
-#: builtin/submodule--helper.c:287
+#: builtin/submodule--helper.c:310
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<sökväg>] [<sökväg>...]"
-#: builtin/submodule--helper.c:333 builtin/submodule--helper.c:347
+#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "Hittade ingen url för undermodulsökvägen \"%s\" i .gitmodules"
-#: builtin/submodule--helper.c:373
+#: builtin/submodule--helper.c:395
+#, c-format
+msgid ""
+"could not lookup configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr ""
+"kunde inte slå upp konfigurationen \"%s\". Antar att arkivet är sn eget "
+"officiella uppström."
+
+#: builtin/submodule--helper.c:406
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Misslyckades registrera url för undermodulsökväg \"%s\""
-#: builtin/submodule--helper.c:377
+#: builtin/submodule--helper.c:410
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Undermodulen \"%s\" (%s) registrerad för sökvägen \"%s\"\n"
-#: builtin/submodule--helper.c:387
+#: builtin/submodule--helper.c:420
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "varning: kommandouppdateringsläge föreslogs för undermodulen \"%s\"\n"
-#: builtin/submodule--helper.c:394
+#: builtin/submodule--helper.c:427
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr "Misslyckades registrera uppdateringsläge för undermodulsökväg \"%s\""
-#: builtin/submodule--helper.c:410
+#: builtin/submodule--helper.c:443
msgid "Suppress output for initializing a submodule"
msgstr "Dölj utdata från initiering av undermodul"
-#: builtin/submodule--helper.c:415
+#: builtin/submodule--helper.c:448
msgid "git submodule--helper init [<path>]"
msgstr "git submodule--helper init [<sökväg>]"
-#: builtin/submodule--helper.c:436
+#: builtin/submodule--helper.c:476
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <sökväg>"
-#: builtin/submodule--helper.c:442
+#: builtin/submodule--helper.c:482
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "hittade ingen undermodulmappning i .gitmodules för sökvägen \"%s\""
-#: builtin/submodule--helper.c:525 builtin/submodule--helper.c:528
+#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "undermodulen \"%s\" kan inte lägga till alternativ: %s"
-#: builtin/submodule--helper.c:564
+#: builtin/submodule--helper.c:604
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "Värdet \"%s\" i submodule.alternateErrorStrategy förstås inte"
-#: builtin/submodule--helper.c:571
+#: builtin/submodule--helper.c:611
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "Värdet \"%s\" i submodule.alternateLocation förstås inte"
-#: builtin/submodule--helper.c:595
+#: builtin/submodule--helper.c:633
msgid "where the new submodule will be cloned to"
msgstr "var den nya undermodulen skall klonas till"
-#: builtin/submodule--helper.c:598
+#: builtin/submodule--helper.c:636
msgid "name of the new submodule"
msgstr "namn på den nya undermodulen"
-#: builtin/submodule--helper.c:601
+#: builtin/submodule--helper.c:639
msgid "url where to clone the submodule from"
msgstr "URL att klona undermodulen från"
-#: builtin/submodule--helper.c:607
+#: builtin/submodule--helper.c:645
msgid "depth for shallow clones"
msgstr "djup för grunda kloner"
-#: builtin/submodule--helper.c:610 builtin/submodule--helper.c:980
+#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993
msgid "force cloning progress"
msgstr "tvinga kloningsförlopp"
-#: builtin/submodule--helper.c:615
+#: builtin/submodule--helper.c:653
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -12767,92 +13037,82 @@
"git submodule--helper clone [--prefix=<sökväg>] [--quiet] [--reference "
"<arkvi>] [--name <namn>] [--depth <djup>] --url <url> --path <sökväg>"
-#: builtin/submodule--helper.c:646
+#: builtin/submodule--helper.c:684
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "misslyckades klona \"%s\" till undermodulsökvägen \"%s\""
-#: builtin/submodule--helper.c:662
-#, c-format
-msgid "cannot open file '%s'"
-msgstr "kan inte öppna filen \"%s\""
-
-#: builtin/submodule--helper.c:667
-#, c-format
-msgid "could not close file %s"
-msgstr "kunde inte stänga filen %s"
-
-#: builtin/submodule--helper.c:674
+#: builtin/submodule--helper.c:699
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "kunde inte få tag i undermodulkatalog för \"%s\""
-#: builtin/submodule--helper.c:742
+#: builtin/submodule--helper.c:764
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Undermodulsökvägen \"%s\" har inte initierats"
-#: builtin/submodule--helper.c:746
+#: builtin/submodule--helper.c:768
msgid "Maybe you want to use 'update --init'?"
msgstr "Kanske menade du att använda \"update --init\"?"
-#: builtin/submodule--helper.c:772
+#: builtin/submodule--helper.c:793
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Hoppar över ej sammanslagen undermodul %s"
-#: builtin/submodule--helper.c:793
+#: builtin/submodule--helper.c:814
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Hoppar över undermodulen \"%s\""
-#: builtin/submodule--helper.c:929
+#: builtin/submodule--helper.c:942
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Misslyckades klona \"%s\". Nytt försök planlagt"
-#: builtin/submodule--helper.c:940
+#: builtin/submodule--helper.c:953
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Misslyckades klona \"%s\" för andra gången, avbryter"
-#: builtin/submodule--helper.c:961 builtin/submodule--helper.c:1105
+#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162
msgid "path into the working tree"
msgstr "sökväg inuti arbetskatalogen"
-#: builtin/submodule--helper.c:964
+#: builtin/submodule--helper.c:977
msgid "path into the working tree, across nested submodule boundaries"
msgstr "sökväg inuti arbetskatalogen, genom nästlade undermodulgränser"
-#: builtin/submodule--helper.c:968
+#: builtin/submodule--helper.c:981
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout eller none"
-#: builtin/submodule--helper.c:972
+#: builtin/submodule--helper.c:985
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr "Skapa en grund klon trunkerad till angivet antal revisioner"
-#: builtin/submodule--helper.c:975
+#: builtin/submodule--helper.c:988
msgid "parallel jobs"
msgstr "parallella jobb"
-#: builtin/submodule--helper.c:977
+#: builtin/submodule--helper.c:990
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "om den första klonen skall följa rekommendation för grund kloning"
-#: builtin/submodule--helper.c:978
+#: builtin/submodule--helper.c:991
msgid "don't print cloning progress"
msgstr "skriv inte klonförlopp"
-#: builtin/submodule--helper.c:985
+#: builtin/submodule--helper.c:998
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<sökväg>] [<sökväg>...]"
-#: builtin/submodule--helper.c:995
+#: builtin/submodule--helper.c:1008
msgid "bad value for update parameter"
msgstr "felaktigt värde för parametern update"
-#: builtin/submodule--helper.c:1066
+#: builtin/submodule--helper.c:1079
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -12861,24 +13121,24 @@
"Undermodulens (%s) gren inställd på att ärva gren från huvudprojektet, men "
"huvudprojektet är inte på någon gren"
-#: builtin/submodule--helper.c:1106
+#: builtin/submodule--helper.c:1163
msgid "recurse into submodules"
msgstr "rekursera ner i undermoduler"
-#: builtin/submodule--helper.c:1112
+#: builtin/submodule--helper.c:1169
msgid "git submodule--helper embed-git-dir [<path>...]"
msgstr "git submodule--helper embed-git-dir [<sökväg>...]"
-#: builtin/submodule--helper.c:1157
+#: builtin/submodule--helper.c:1226
msgid "submodule--helper subcommand must be called with a subcommand"
msgstr "underkommandot submodule--helper måste anropas med ett underkommando"
-#: builtin/submodule--helper.c:1164
+#: builtin/submodule--helper.c:1233
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s stöder inte --super-prefix"
-#: builtin/submodule--helper.c:1170
+#: builtin/submodule--helper.c:1239
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "\"%s\" är inte ett giltigt underkommando till submodule--helper"
@@ -12926,32 +13186,29 @@
#: builtin/tag.c:25
msgid ""
-"git tag -l [-n[<num>]] [--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[<antal>]] [--contains <incheckning>] [--points-at <objekt>]\n"
+"git tag -l [-n[<antal>]] [--contains <incheckning>] [--no-contains "
+"<incheckning>] [--points-at <objekt>]\n"
"\t\t[--format=<format>] [--[no-]merged [<incheckning>]] [<mönster>...]"
#: builtin/tag.c:27
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<format>] <taggnamn>..."
-#: builtin/tag.c:82
-#, c-format
-msgid "tag name too long: %.*s..."
-msgstr "taggnamnet för långt: %.*s..."
-
-#: builtin/tag.c:87
+#: builtin/tag.c:83
#, c-format
msgid "tag '%s' not found."
msgstr "taggen \"%s\" hittades inte."
-#: builtin/tag.c:102
+#: builtin/tag.c:99
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Tog bort tagg \"%s\" (var %s)\n"
-#: builtin/tag.c:131
+#: builtin/tag.c:128
#, c-format
msgid ""
"\n"
@@ -12964,7 +13221,7 @@
" %s\n"
"Rader som inleds med \"%c\" ignoreras.\n"
-#: builtin/tag.c:135
+#: builtin/tag.c:132
#, c-format
msgid ""
"\n"
@@ -12979,138 +13236,142 @@
"Rader som inleds med \"%c\" kommer behållas; du kan själv ta bort dem om\n"
"du vill.\n"
-#: builtin/tag.c:213
+#: builtin/tag.c:210
msgid "unable to sign the tag"
msgstr "kunde inte signera taggen"
-#: builtin/tag.c:215
+#: builtin/tag.c:212
msgid "unable to write tag file"
msgstr "kunde inte skriva tagg-filen"
-#: builtin/tag.c:240
+#: builtin/tag.c:236
msgid "bad object type."
msgstr "felaktig objekttyp"
-#: builtin/tag.c:253
-msgid "tag header too big."
-msgstr "tagghuvud för stort."
-
-#: builtin/tag.c:289
+#: builtin/tag.c:282
msgid "no tag message?"
msgstr "inget taggmeddelande?"
-#: builtin/tag.c:295
+#: builtin/tag.c:289
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Taggmeddelandet har lämnats i %s\n"
-#: builtin/tag.c:354
+#: builtin/tag.c:397
msgid "list tag names"
msgstr "lista taggnamn"
-#: builtin/tag.c:356
+#: builtin/tag.c:399
msgid "print <n> lines of each tag message"
msgstr "visa <n> rader från varje taggmeddelande"
-#: builtin/tag.c:358
+#: builtin/tag.c:401
msgid "delete tags"
msgstr "ta bort taggar"
-#: builtin/tag.c:359
+#: builtin/tag.c:402
msgid "verify tags"
msgstr "verifiera taggar"
-#: builtin/tag.c:361
+#: builtin/tag.c:404
msgid "Tag creation options"
msgstr "Alternativ för att skapa taggar"
-#: builtin/tag.c:363
+#: builtin/tag.c:406
msgid "annotated tag, needs a message"
msgstr "annoterad tagg, behöver meddelande"
-#: builtin/tag.c:365
+#: builtin/tag.c:408
msgid "tag message"
msgstr "taggmeddelande"
-#: builtin/tag.c:367
+#: builtin/tag.c:410
msgid "annotated and GPG-signed tag"
msgstr "annoterad och GPG-signerad tagg"
-#: builtin/tag.c:371
+#: builtin/tag.c:414
msgid "use another key to sign the tag"
msgstr "använd annan nyckel för att signera taggen"
-#: builtin/tag.c:372
+#: builtin/tag.c:415
msgid "replace the tag if exists"
msgstr "ersätt taggen om den finns"
-#: builtin/tag.c:373 builtin/update-ref.c:368
+#: builtin/tag.c:416 builtin/update-ref.c:368
msgid "create a reflog"
msgstr "skapa en reflog"
-#: builtin/tag.c:375
+#: builtin/tag.c:418
msgid "Tag listing options"
msgstr "Alternativ för listning av taggar"
-#: builtin/tag.c:376
+#: builtin/tag.c:419
msgid "show tag list in columns"
msgstr "lista taggar i spalter"
-#: builtin/tag.c:377 builtin/tag.c:378
+#: builtin/tag.c:420 builtin/tag.c:422
msgid "print only tags that contain the commit"
msgstr "visa endast taggar som innehåller incheckningen"
-#: builtin/tag.c:379
+#: builtin/tag.c:421 builtin/tag.c:423
+msgid "print only tags that don't contain the commit"
+msgstr "visa endast taggar som inte innehåller incheckningen"
+
+#: builtin/tag.c:424
msgid "print only tags that are merged"
msgstr "visa endast taggar som slagits samman"
-#: builtin/tag.c:380
+#: builtin/tag.c:425
msgid "print only tags that are not merged"
msgstr "visa endast taggar som ej slagits samman"
-#: builtin/tag.c:385
+#: builtin/tag.c:430
msgid "print only tags of the object"
msgstr "visa endast taggar för objektet"
-#: builtin/tag.c:415
+#: builtin/tag.c:469
msgid "--column and -n are incompatible"
msgstr "--column och -n är inkompatibla"
-#: builtin/tag.c:437
-msgid "-n option is only allowed with -l."
-msgstr "Flaggan -n är endast tillåten tillsammans med -l."
+#: builtin/tag.c:491
+msgid "-n option is only allowed in list mode"
+msgstr "Flaggan -n är endast tillåten i listläge"
-#: builtin/tag.c:439
-msgid "--contains option is only allowed with -l."
-msgstr "Flaggan --contains är endast tillåten tillsammans med -l"
+#: builtin/tag.c:493
+msgid "--contains option is only allowed in list mode"
+msgstr "Flaggan --contains är endast tillåten i listläge"
-#: builtin/tag.c:441
-msgid "--points-at option is only allowed with -l."
-msgstr "Flaggan --points-at är endast tillåten tillsammans med -l."
+#: builtin/tag.c:495
+msgid "--no-contains option is only allowed in list mode"
+msgstr "Flaggan --no-contains är endast tillåten i listläge"
-#: builtin/tag.c:443
-msgid "--merged and --no-merged option are only allowed with -l"
-msgstr "flaggorna --merged och --no-merged tillåts endast tillsammans med -l"
+#: builtin/tag.c:497
+msgid "--points-at option is only allowed in list mode"
+msgstr "Flaggan --points-at är endast tillåten i listläge"
-#: builtin/tag.c:454
+#: builtin/tag.c:499
+msgid "--merged and --no-merged options are only allowed in list mode"
+msgstr "Flaggorna --merged och --no-merged är endast tillåtna i listläge"
+
+#: builtin/tag.c:510
msgid "only one -F or -m option is allowed."
msgstr "endast en av flaggorna -F eller -m tillåts."
-#: builtin/tag.c:473
+#: builtin/tag.c:529
msgid "too many params"
msgstr "för många parametrar"
-#: builtin/tag.c:479
+#: builtin/tag.c:535
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "\"%s\" är inte ett giltigt taggnamn."
-#: builtin/tag.c:484
+#: builtin/tag.c:540
#, c-format
msgid "tag '%s' already exists"
msgstr "taggen \"%s\" finns redan"
-#: builtin/tag.c:512
+#: builtin/tag.c:570
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Uppdaterad tagg \"%s\" (var %s)\n"
@@ -13139,168 +13400,184 @@
msgid "failed to delete file %s"
msgstr "misslyckades ta bort filen %s"
-#: builtin/update-index.c:110 builtin/update-index.c:212
+#: builtin/update-index.c:110 builtin/update-index.c:216
#, c-format
msgid "failed to delete directory %s"
msgstr "misslyckades ta bort katalogen %s"
-#: builtin/update-index.c:133
+#: builtin/update-index.c:135
#, c-format
msgid "Testing mtime in '%s' "
msgstr "Testar mtime i \"%s\""
-#: builtin/update-index.c:145
+#: builtin/update-index.c:149
msgid "directory stat info does not change after adding a new file"
msgstr "stat-informationen för en katalog ändras inte när nya filer läggs till"
-#: builtin/update-index.c:158
+#: builtin/update-index.c:162
msgid "directory stat info does not change after adding a new directory"
msgstr ""
"stat-informationen för en katalog ändras inte när nya kataloger läggs till"
-#: builtin/update-index.c:171
+#: builtin/update-index.c:175
msgid "directory stat info changes after updating a file"
msgstr "stat-informationen för en katalog ändras när filer uppdateras"
-#: builtin/update-index.c:182
+#: builtin/update-index.c:186
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
"stat-informationen för en katalog ändras när filer läggs till i en "
"underkatalog"
-#: builtin/update-index.c:193
+#: builtin/update-index.c:197
msgid "directory stat info does not change after deleting a file"
msgstr "stat-informationen för en katalog ändras inte när en fil tas bort"
-#: builtin/update-index.c:206
+#: builtin/update-index.c:210
msgid "directory stat info does not change after deleting a directory"
msgstr "stat-informationen för en katalog ändras inte när en katalog tas bort"
-#: builtin/update-index.c:213
+#: builtin/update-index.c:217
msgid " OK"
msgstr " OK"
-#: builtin/update-index.c:564
+#: builtin/update-index.c:568
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<flaggor>] [--] [<fil>...]"
-#: builtin/update-index.c:919
+#: builtin/update-index.c:923
msgid "continue refresh even when index needs update"
msgstr "fortsätt uppdatera även när index inte är àjour"
-#: builtin/update-index.c:922
+#: builtin/update-index.c:926
msgid "refresh: ignore submodules"
msgstr "refresh: ignorera undermoduler"
-#: builtin/update-index.c:925
+#: builtin/update-index.c:929
msgid "do not ignore new files"
msgstr "ignorera inte nya filer"
-#: builtin/update-index.c:927
+#: builtin/update-index.c:931
msgid "let files replace directories and vice-versa"
msgstr "låt filer ersätta kataloger och omvänt"
-#: builtin/update-index.c:929
+#: builtin/update-index.c:933
msgid "notice files missing from worktree"
msgstr "lägg märke till filer som saknas i arbetskatalogen"
-#: builtin/update-index.c:931
+#: builtin/update-index.c:935
msgid "refresh even if index contains unmerged entries"
msgstr "uppdatera även om indexet innehåller ej sammanslagna poster"
-#: builtin/update-index.c:934
+#: builtin/update-index.c:938
msgid "refresh stat information"
msgstr "uppdatera statusinformation"
-#: builtin/update-index.c:938
+#: builtin/update-index.c:942
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "som --refresh, men ignorera assume-unchanged-inställning"
-#: builtin/update-index.c:942
+#: builtin/update-index.c:946
msgid "<mode>,<object>,<path>"
msgstr "<läge>,<objekt>,<sökväg>"
-#: builtin/update-index.c:943
+#: builtin/update-index.c:947
msgid "add the specified entry to the index"
msgstr "lägg till angiven post i indexet"
-#: builtin/update-index.c:952
+#: builtin/update-index.c:956
msgid "mark files as \"not changing\""
msgstr "markera filer som \"ändras inte\""
-#: builtin/update-index.c:955
+#: builtin/update-index.c:959
msgid "clear assumed-unchanged bit"
msgstr "rensa \"assume-unchanged\"-biten"
-#: builtin/update-index.c:958
+#: builtin/update-index.c:962
msgid "mark files as \"index-only\""
msgstr "markera filer som \"endast index\""
-#: builtin/update-index.c:961
+#: builtin/update-index.c:965
msgid "clear skip-worktree bit"
msgstr "töm \"skip-worktree\"-biten"
-#: builtin/update-index.c:964
+#: builtin/update-index.c:968
msgid "add to index only; do not add content to object database"
msgstr "lägg endast till indexet; lägg inte till innehållet i objektdatabasen"
-#: builtin/update-index.c:966
+#: builtin/update-index.c:970
msgid "remove named paths even if present in worktree"
msgstr "ta bort namngivna sökvägar även om de finns i arbetskatalogen"
-#: builtin/update-index.c:968
+#: builtin/update-index.c:972
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "med --stdin: indatarader termineras med null-byte"
-#: builtin/update-index.c:970
+#: builtin/update-index.c:974
msgid "read list of paths to be updated from standard input"
msgstr "läs lista över sökvägar att uppdatera från standard in"
-#: builtin/update-index.c:974
+#: builtin/update-index.c:978
msgid "add entries from standard input to the index"
msgstr "lägg poster från standard in till indexet"
-#: builtin/update-index.c:978
+#: builtin/update-index.c:982
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "återfyll etapp 2 och 3 från angivna sökvägar"
-#: builtin/update-index.c:982
+#: builtin/update-index.c:986
msgid "only update entries that differ from HEAD"
msgstr "uppdatera endast poster som skiljer sig från HEAD"
-#: builtin/update-index.c:986
+#: builtin/update-index.c:990
msgid "ignore files missing from worktree"
msgstr "ignorera filer som saknas i arbetskatalogen"
-#: builtin/update-index.c:989
+#: builtin/update-index.c:993
msgid "report actions to standard output"
msgstr "rapportera åtgärder på standard ut"
-#: builtin/update-index.c:991
+#: builtin/update-index.c:995
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(för porslin) glöm sparade olösta konflikter"
-#: builtin/update-index.c:995
+#: builtin/update-index.c:999
msgid "write index in this format"
msgstr "skriv index i detta format"
-#: builtin/update-index.c:997
+#: builtin/update-index.c:1001
msgid "enable or disable split index"
msgstr "aktivera eller inaktivera delat index"
-#: builtin/update-index.c:999
+#: builtin/update-index.c:1003
msgid "enable/disable untracked cache"
msgstr "aktivera/inaktivera ospårad cache"
-#: builtin/update-index.c:1001
+#: builtin/update-index.c:1005
msgid "test if the filesystem supports untracked cache"
msgstr "testa om filsystemet stöder ospårad cache"
-#: builtin/update-index.c:1003
+#: builtin/update-index.c:1007
msgid "enable untracked cache without testing the filesystem"
msgstr "aktivera ospårad cache utan att testa filsystemet"
-#: builtin/update-index.c:1120
+#: builtin/update-index.c:1107
+msgid ""
+"core.splitIndex is set to false; remove or change it, if you really want to "
+"enable split index"
+msgstr ""
+"core.splitIndex är satt till false; ta bort eller ändra det om du verkligen "
+"vill aktivera delat index"
+
+#: builtin/update-index.c:1116
+msgid ""
+"core.splitIndex is set to true; remove or change it, if you really want to "
+"disable split index"
+msgstr ""
+"core.splitIndex är satt till true; ta bort eller ändra det om du verkligen "
+"vill inaktivera delat index"
+
+#: builtin/update-index.c:1127
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
@@ -13308,11 +13585,11 @@
"core.untrackedCache är satt till true; ta bort eller ändra det om du "
"verkligen vill inaktivera den ospårade cachen"
-#: builtin/update-index.c:1124
+#: builtin/update-index.c:1131
msgid "Untracked cache disabled"
msgstr "Ospårad cache är inaktiverad"
-#: builtin/update-index.c:1132
+#: builtin/update-index.c:1139
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
@@ -13320,7 +13597,7 @@
"core.untrackedCache är satt till false; ta bort eller ändra det om du "
"verkligen vill aktivera den ospårade cachen"
-#: builtin/update-index.c:1136
+#: builtin/update-index.c:1143
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "Ospårad cache är aktiverad för \"%s\""
@@ -13413,27 +13690,27 @@
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <sökväg>"
-#: builtin/worktree.c:42
+#: builtin/worktree.c:43
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Tar bort worktrees/%s: inte en giltig katalog"
-#: builtin/worktree.c:48
+#: builtin/worktree.c:49
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Tar bort worktrees/%s: gitdir-filen existerar inte"
-#: builtin/worktree.c:53
+#: builtin/worktree.c:54
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "Tar bort worktrees/%s: kan inte läsa gitdir-filen (%s)"
-#: builtin/worktree.c:64
+#: builtin/worktree.c:65
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Tar bort worktrees/%s: felaktig gitdir-fil"
-#: builtin/worktree.c:80
+#: builtin/worktree.c:81
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr "Tar bort worktrees/%s: gitdir-filen pekar på en ickeexisterande plats"
@@ -13451,61 +13728,65 @@
msgid "'%s' already exists"
msgstr "\"%s\" finns redan"
-#: builtin/worktree.c:236
+#: builtin/worktree.c:235
#, c-format
msgid "could not create directory of '%s'"
msgstr "kunde inte skapa katalogen \"%s\""
-#: builtin/worktree.c:272
+#: builtin/worktree.c:274
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "Förbereder %s (identifieraren %s)"
-#: builtin/worktree.c:323
+#: builtin/worktree.c:328
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
"checka ut <gren> även om den redan är utcheckad i en annan arbetskatalog"
-#: builtin/worktree.c:325
+#: builtin/worktree.c:330
msgid "create a new branch"
msgstr "skapa en ny gren"
-#: builtin/worktree.c:327
+#: builtin/worktree.c:332
msgid "create or reset a branch"
msgstr "skapa eller återställ en gren"
-#: builtin/worktree.c:329
+#: builtin/worktree.c:334
msgid "populate the new working tree"
msgstr "befolka den nya arbetskatalogen"
-#: builtin/worktree.c:337
+#: builtin/worktree.c:335
+msgid "keep the new working tree locked"
+msgstr "låt arbetskatalogen förbli låst"
+
+#: builtin/worktree.c:343
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B och --detach är ömsesidigt uteslutande"
-#: builtin/worktree.c:472
+#: builtin/worktree.c:478
msgid "reason for locking"
msgstr "orsak till lås"
-#: builtin/worktree.c:484 builtin/worktree.c:517
+#: builtin/worktree.c:490 builtin/worktree.c:523
#, c-format
msgid "'%s' is not a working tree"
msgstr "\"%s\" är inte en arbetskatalog"
-#: builtin/worktree.c:486 builtin/worktree.c:519
+#: builtin/worktree.c:492 builtin/worktree.c:525
msgid "The main working tree cannot be locked or unlocked"
msgstr "Huvudarbetskatalogen kan inte låsas eller låsas upp"
-#: builtin/worktree.c:491
+#: builtin/worktree.c:497
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "\"%s\" är redan låst, orsak: %s"
-#: builtin/worktree.c:493
+#: builtin/worktree.c:499
#, c-format
msgid "'%s' is already locked"
msgstr "\"%s\" är redan låst"
-#: builtin/worktree.c:521
+#: builtin/worktree.c:527
#, c-format
msgid "'%s' is not locked"
msgstr "\"%s\" är inte låst"
@@ -13530,19 +13811,19 @@
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<flaggor>] <katalog>"
-#: upload-pack.c:1036
+#: upload-pack.c:1040
msgid "quit after a single request/response exchange"
msgstr "avsluta omedelbart efter första anrop/svar-utväxling"
-#: upload-pack.c:1038
+#: upload-pack.c:1042
msgid "exit immediately after initial ref advertisement"
msgstr "avsluta omedelbart efter inledande kungörelse av referenser"
-#: upload-pack.c:1040
+#: upload-pack.c:1044
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr "testa inte <katalog>/.git/ om <katalog> inte är en Git-katalog"
-#: upload-pack.c:1042
+#: upload-pack.c:1046
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "avbryt överföringen efter <n> sekunders inaktivitet"
@@ -13573,15 +13854,20 @@
"några konceptvägledningar. Se \"git help <kommando>\" eller \"git help\n"
"<koncept>\" för att läsa mer om specifika underkommandon och koncept."
-#: http.c:344
+#: http.c:336
+#, c-format
+msgid "negative value for http.postbuffer; defaulting to %d"
+msgstr "http.postbuffer har negativt värde; använder förvalet %d"
+
+#: http.c:357
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "Delegerad styrning stöds inte av cURL < 7.22.0"
-#: http.c:353
+#: http.c:366
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "Fastnålning av öppen nyckel stöds inte av cURL < 7.44.0"
-#: http.c:1713
+#: http.c:1766
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -13592,7 +13878,7 @@
" bad om: %s\n"
" omdirigering: %s"
-#: remote-curl.c:319
+#: remote-curl.c:323
#, c-format
msgid "redirecting to %s"
msgstr "omdirigerar till %s"
@@ -13969,7 +14255,7 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr "Enkel sammanslagning misslyckades, försöker automatisk sammanslagning."
-#: git-rebase.sh:57
+#: 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"
@@ -13980,37 +14266,37 @@
"Om du vill hoppa över patchen kör du istället \"git rebase --skip\".\n"
"För att återställa originalgrenen och avbryta kör du \"git rebase --abort\"."
-#: git-rebase.sh:157 git-rebase.sh:396
+#: git-rebase.sh:158 git-rebase.sh:397
#, sh-format
msgid "Could not move back to $head_name"
msgstr "Kunde inte flytta tillbaka till $head_name"
-#: git-rebase.sh:171
+#: git-rebase.sh:172
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "Kan inte spara $stash_sha1"
-#: git-rebase.sh:211
+#: git-rebase.sh:212
msgid "The pre-rebase hook refused to rebase."
msgstr "Kroken pre-rebase vägrade ombaseringen."
-#: git-rebase.sh:216
+#: git-rebase.sh:217
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr "Det verkar som en git-am körs. Kan inte ombasera."
-#: git-rebase.sh:357
+#: git-rebase.sh:358
msgid "No rebase in progress?"
msgstr "Ingen ombasering pågår?"
-#: git-rebase.sh:368
+#: git-rebase.sh:369
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "Åtgärden --edit-todo kan endast användas under interaktiv ombasering."
-#: git-rebase.sh:375
+#: git-rebase.sh:376
msgid "Cannot read HEAD"
msgstr "Kan inte läsa HEAD"
-#: git-rebase.sh:378
+#: git-rebase.sh:379
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -14018,7 +14304,7 @@
"Du måste redigera alla sammanslagningskonflikter och\n"
"därefter markera dem som lösta med git add"
-#: git-rebase.sh:418
+#: git-rebase.sh:419
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -14039,102 +14325,102 @@
"och kör programmet igen. Jag avslutar ifall du fortfarande har\n"
"något av värde där."
-#: git-rebase.sh:469
+#: git-rebase.sh:470
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "ogiltig uppström $upstream_name"
-#: git-rebase.sh:493
+#: git-rebase.sh:494
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: mer än en sammanslagningsbas finns"
-#: git-rebase.sh:496 git-rebase.sh:500
+#: git-rebase.sh:497 git-rebase.sh:501
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: ingen sammanslagningsbas finns"
-#: git-rebase.sh:505
+#: git-rebase.sh:506
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "Peka på en giltig incheckning: $onto_name"
-#: git-rebase.sh:528
+#: git-rebase.sh:529
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "ödesdigert: ingen sådan gren: $branch_name"
-#: git-rebase.sh:561
+#: git-rebase.sh:562
msgid "Cannot autostash"
msgstr "Kan inte utföra \"autostash\""
-#: git-rebase.sh:566
+#: git-rebase.sh:567
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "Skapade autostash: $stash_abbrev"
-#: git-rebase.sh:570
+#: git-rebase.sh:571
msgid "Please commit or stash them."
msgstr "Checka in eller använd \"stash\" på dem."
-#: git-rebase.sh:590
+#: git-rebase.sh:591
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "Aktuell gren $branch_name är à jour."
-#: git-rebase.sh:594
+#: git-rebase.sh:595
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "Aktuell gren $branch_name är à jour, ombasering framtvingad."
-#: git-rebase.sh:605
+#: git-rebase.sh:606
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Ändringar från $mb till $onto:"
-#: git-rebase.sh:614
+#: git-rebase.sh:615
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
"Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det..."
-#: git-rebase.sh:624
+#: git-rebase.sh:625
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "Snabbspolade $branch_name till $onto_name."
-#: git-stash.sh:50
+#: git-stash.sh:53
msgid "git stash clear with parameters is unimplemented"
msgstr "\"git stash clear\" med parametrar har inte implementerats"
-#: git-stash.sh:73
+#: git-stash.sh:94
msgid "You do not have the initial commit yet"
msgstr "Du har inte den första incheckningen ännu"
-#: git-stash.sh:88
+#: git-stash.sh:109
msgid "Cannot save the current index state"
msgstr "Kan inte spara aktuellt tillstånd för indexet"
-#: git-stash.sh:103
+#: git-stash.sh:124
msgid "Cannot save the untracked files"
msgstr "Kan inte spara ospårade filer"
-#: git-stash.sh:123 git-stash.sh:136
+#: git-stash.sh:144 git-stash.sh:157
msgid "Cannot save the current worktree state"
msgstr "Kan inte spara aktuellt tillstånd för arbetskatalogen"
-#: git-stash.sh:140
+#: git-stash.sh:161
msgid "No changes selected"
msgstr "Inga ändringar valda"
-#: git-stash.sh:143
+#: git-stash.sh:164
msgid "Cannot remove temporary index (can't happen)"
msgstr "Kan inte ta bort temporärt index (kan inte inträffa)"
-#: git-stash.sh:156
+#: git-stash.sh:177
msgid "Cannot record working tree state"
msgstr "Kan inte registrera tillstånd för arbetskatalog"
-#: git-stash.sh:188
+#: git-stash.sh:209
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr "Kan inte uppdatera $ref_stash med $w_commit"
@@ -14149,7 +14435,7 @@
#. $ 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:238
+#: git-stash.sh:265
#, sh-format
msgid ""
"error: unknown option for 'stash save': $option\n"
@@ -14158,108 +14444,108 @@
"fel: felaktig flagga för \"stash save\": $option\n"
" För att ange ett meddelande, använd git stash save -- \"$option\""
-#: git-stash.sh:251
+#: git-stash.sh:278
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr ""
"Kan inte använda --patch och --include-untracked eller --all samtidigt."
-#: git-stash.sh:259
+#: git-stash.sh:286
msgid "No local changes to save"
msgstr "Inga lokala ändringar att spara"
-#: git-stash.sh:263
+#: git-stash.sh:291
msgid "Cannot initialize stash"
msgstr "Kan inte initiera \"stash\""
-#: git-stash.sh:267
+#: git-stash.sh:295
msgid "Cannot save the current status"
msgstr "Kan inte spara aktuell status"
-#: git-stash.sh:268
+#: git-stash.sh:296
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr "Sparade arbetskatalogen och indexstatus $stash_msg"
-#: git-stash.sh:285
+#: git-stash.sh:323
msgid "Cannot remove worktree changes"
msgstr "Kan inte ta bort ändringar i arbetskatalogen"
-#: git-stash.sh:403
+#: git-stash.sh:471
#, sh-format
msgid "unknown option: $opt"
msgstr "okänd flagga: $opt"
-#: git-stash.sh:416
+#: git-stash.sh:484
msgid "No stash found."
msgstr "Ingen \"stash\" hittades."
-#: git-stash.sh:423
+#: git-stash.sh:491
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "För många revisioner angivna: $REV"
-#: git-stash.sh:438
+#: git-stash.sh:506
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference är inte en giltig referens"
-#: git-stash.sh:466
+#: git-stash.sh:534
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "\"$args\" är inte en \"stash\"-liknande incheckning"
-#: git-stash.sh:477
+#: git-stash.sh:545
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "\"$args\" är inte en \"stash\"-referens"
-#: git-stash.sh:485
+#: git-stash.sh:553
msgid "unable to refresh index"
msgstr "kan inte uppdatera indexet"
-#: git-stash.sh:489
+#: git-stash.sh:557
msgid "Cannot apply a stash in the middle of a merge"
msgstr "Kan inte tillämpa en \"stash\" mitt i en sammanslagning"
-#: git-stash.sh:497
+#: git-stash.sh:565
msgid "Conflicts in index. Try without --index."
msgstr "Konflikter i indexet. Testa utan --index."
-#: git-stash.sh:499
+#: git-stash.sh:567
msgid "Could not save index tree"
msgstr "Kunde inte spara indexträd"
-#: git-stash.sh:508
+#: git-stash.sh:576
msgid "Could not restore untracked files from stash"
msgstr "Kunde inte återställa ospårade filer från stash"
-#: git-stash.sh:533
+#: git-stash.sh:601
msgid "Cannot unstage modified files"
msgstr "Kan inte ta bort ändrade filer ur kön"
-#: git-stash.sh:548
+#: git-stash.sh:616
msgid "Index was not unstashed."
msgstr "Indexet har inte tagits ur kön."
-#: git-stash.sh:562
+#: git-stash.sh:630
msgid "The stash is kept in case you need it again."
msgstr "\"Stash\":en behålls ifall du behöver den igen."
-#: git-stash.sh:571
+#: git-stash.sh:639
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "Kastade ${REV} ($s)"
-#: git-stash.sh:572
+#: git-stash.sh:640
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: Kunde inte kasta \"stash\"-post"
-#: git-stash.sh:580
+#: git-stash.sh:648
msgid "No branch name specified"
msgstr "Inget grennamn angavs"
-#: git-stash.sh:652
+#: git-stash.sh:727
msgid "(To restore them type \"git stash apply\")"
msgstr "(För att återställa dem, skriv \"git stash apply\")"
@@ -14346,28 +14632,28 @@
msgid "Failed to register submodule '$sm_path'"
msgstr "Misslyckades registrera undermodulen \"$sm_path\""
-#: git-submodule.sh:327
+#: git-submodule.sh:341
#, sh-format
msgid "Entering '$displaypath'"
msgstr "Går in i \"$displaypath\""
-#: git-submodule.sh:347
+#: git-submodule.sh:361
#, sh-format
msgid "Stopping at '$displaypath'; script returned non-zero status."
msgstr ""
"Stoppar på \"$displaypath\"; skriptet returnerade en status skild från noll."
-#: git-submodule.sh:418
+#: git-submodule.sh:432
#, sh-format
msgid "pathspec and --all are incompatible"
msgstr "sökvägsangivelse och --all är inkompatibla"
-#: git-submodule.sh:423
+#: git-submodule.sh:437
#, sh-format
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "Använd \"--all\" om du verkligen vill avinitiera alla undermoduler"
-#: git-submodule.sh:443
+#: git-submodule.sh:457
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains a .git directory\n"
@@ -14376,7 +14662,7 @@
"Undermodulsarbetskatalogen \"$displaypath\" innehåller en .git-katalog\n"
"(använd \"rm -rf\" om du verkligen vill ta bort den och all dess historik)"
-#: git-submodule.sh:451
+#: git-submodule.sh:465
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
@@ -14385,38 +14671,38 @@
"Undermodulens arbetskatalog \"$displaypath\" har lokala ändringar; \"-f\" "
"kastar bort dem"
-#: git-submodule.sh:454
+#: git-submodule.sh:468
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "Rensade katalogen \"$displaypath\""
-#: git-submodule.sh:455
+#: git-submodule.sh:469
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr "Kunde inte ta bort undermodulens arbetskatalog \"$displaypath\""
-#: git-submodule.sh:458
+#: git-submodule.sh:472
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr "Kunde inte skapa tom undermodulskatalog \"$displaypath\""
-#: git-submodule.sh:467
+#: git-submodule.sh:481
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr ""
"Undermodulen \"$name\" ($url) avregistrerad för sökvägen \"$displaypath\""
-#: git-submodule.sh:623
+#: git-submodule.sh:637
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "Kan inte hitta aktuell revision i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:633
+#: git-submodule.sh:647
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Kan inte hämta i undermodulsökväg \"$sm_path\""
-#: git-submodule.sh:638
+#: git-submodule.sh:652
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -14425,12 +14711,12 @@
"Kan inte hitta aktuell revision för ${remote_name}/${branch} i "
"undermodulsökvägen \"$sm_path\""
-#: git-submodule.sh:656
+#: git-submodule.sh:670
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "Kan inte hämta i undermodulsökväg \"$displaypath\""
-#: git-submodule.sh:662
+#: git-submodule.sh:676
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -14439,84 +14725,84 @@
"Hämtade i undermodulssökvägen \"$displaypath\", men den innehöll inte $sha1. "
"Direkt hämtning av incheckningen misslyckades."
-#: git-submodule.sh:669
+#: git-submodule.sh:683
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "Kan inte checka ut \"$sha1\" i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:670
+#: git-submodule.sh:684
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Undermodulsökvägen \"$displaypath\": checkade ut \"$sha1\""
-#: git-submodule.sh:674
+#: git-submodule.sh:688
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "Kan inte ombasera \"$sha1\" i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:675
+#: git-submodule.sh:689
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Undermodulsökvägen \"$displaypath\": ombaserade in i \"$sha1\""
-#: git-submodule.sh:680
+#: git-submodule.sh:694
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "Kan inte slå ihop \"$sha1\" i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:681
+#: git-submodule.sh:695
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Undermodulsökvägen \"$displaypath\": sammanslagen i \"$sha1\""
-#: git-submodule.sh:686
+#: git-submodule.sh:700
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
"Misslyckades köra \"$command $sha1\" i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:687
+#: git-submodule.sh:701
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Undermodulsökvägen \"$displaypath\": \"$command $sha1\""
-#: git-submodule.sh:718
+#: git-submodule.sh:732
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:826
+#: git-submodule.sh:840
msgid "The --cached option cannot be used with the --files option"
msgstr "Flaggan --cached kan inte användas med flaggan --files"
-#: git-submodule.sh:878
+#: git-submodule.sh:892
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "oväntat läge $mod_dst"
-#: git-submodule.sh:898
+#: git-submodule.sh:912
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Varning: $display_name innehåller inte incheckningen $sha1_src"
-#: git-submodule.sh:901
+#: git-submodule.sh:915
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Varning: $display_name innehåller inte incheckningen $sha1_dst"
-#: git-submodule.sh:904
+#: git-submodule.sh:918
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
" Varning: $display_name innehåller inte incheckningarna $sha1_src och "
"$sha1_dst"
-#: git-submodule.sh:1051
+#: git-submodule.sh:1064
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\""
-#: git-submodule.sh:1118
+#: git-submodule.sh:1136
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Synkroniserar undermodul-url för \"$displaypath\""
@@ -14818,11 +15104,11 @@
msgid "Or you can abort the rebase with 'git rebase --abort'."
msgstr "Eller så kan du avbryta ombaseringen med \"git rebase --abort\"."
-#: git-rebase--interactive.sh:1079
+#: git-rebase--interactive.sh:1083
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "Kunde inte ta bort CHERRY_PICK_HEAD"
-#: git-rebase--interactive.sh:1084
+#: git-rebase--interactive.sh:1088
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
@@ -14853,11 +15139,11 @@
"\n"
" git rebase --continue\n"
-#: git-rebase--interactive.sh:1101
+#: git-rebase--interactive.sh:1105
msgid "Error trying to find the author identity to amend commit"
msgstr "Fel vid försök att hitta författaridentitet för att utöka incheckning"
-#: git-rebase--interactive.sh:1106
+#: git-rebase--interactive.sh:1110
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
@@ -14865,11 +15151,11 @@
"Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n"
"först och kör sedan \"git rebase --continute\" igen."
-#: git-rebase--interactive.sh:1111 git-rebase--interactive.sh:1115
+#: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119
msgid "Could not commit staged changes."
msgstr "Kunde inte checka in köade ändringar."
-#: git-rebase--interactive.sh:1139
+#: git-rebase--interactive.sh:1147
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -14883,40 +15169,40 @@
" git rebase --continue\n"
"\n"
-#: git-rebase--interactive.sh:1147 git-rebase--interactive.sh:1305
+#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313
msgid "Could not execute editor"
msgstr "Kunde inte starta textredigerare"
-#: git-rebase--interactive.sh:1160
+#: git-rebase--interactive.sh:1168
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "Kunde inte checka ut $switch_to"
-#: git-rebase--interactive.sh:1165
+#: git-rebase--interactive.sh:1173
msgid "No HEAD?"
msgstr "Inget HEAD?"
-#: git-rebase--interactive.sh:1166
+#: git-rebase--interactive.sh:1174
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "Kunde inte skapa temporär $state_dir"
-#: git-rebase--interactive.sh:1168
+#: git-rebase--interactive.sh:1176
msgid "Could not mark as interactive"
msgstr "Kunde inte markera som interaktiv"
-#: git-rebase--interactive.sh:1178 git-rebase--interactive.sh:1183
+#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191
msgid "Could not init rewritten commits"
msgstr "Kunde inte initiera omskrivna incheckningar"
-#: git-rebase--interactive.sh:1283
+#: git-rebase--interactive.sh:1291
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
msgstr[0] "Ombasera $shortrevisions på $shortonto ($todocount incheckning)"
msgstr[1] "Ombasera $shortrevisions på $shortonto ($todocount incheckningar)"
-#: git-rebase--interactive.sh:1288
+#: git-rebase--interactive.sh:1296
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -14926,7 +15212,7 @@
"Ombaseringen kommer dock att avbrytas om du tar bort allting.\n"
"\n"
-#: git-rebase--interactive.sh:1295
+#: git-rebase--interactive.sh:1303
msgid "Note that empty commits are commented out"
msgstr "Observera att tomma incheckningar är utkommenterade"
@@ -15004,68 +15290,68 @@
msgid "unstaged"
msgstr "ej köad"
-#: git-add--interactive.perl:297 git-add--interactive.perl:322
+#: git-add--interactive.perl:288 git-add--interactive.perl:313
msgid "binary"
msgstr "binär"
-#: git-add--interactive.perl:306 git-add--interactive.perl:360
+#: git-add--interactive.perl:297 git-add--interactive.perl:351
msgid "nothing"
msgstr "ingenting"
-#: git-add--interactive.perl:342 git-add--interactive.perl:357
+#: git-add--interactive.perl:333 git-add--interactive.perl:348
msgid "unchanged"
msgstr "oändrad"
-#: git-add--interactive.perl:653
+#: git-add--interactive.perl:644
#, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] "lade till %d sökväg\n"
msgstr[1] "lade till %d sökvägar\n"
-#: git-add--interactive.perl:656
+#: git-add--interactive.perl:647
#, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] "uppdaterade %d sökväg\n"
msgstr[1] "uppdaterade %d sökvägar\n"
-#: git-add--interactive.perl:659
+#: git-add--interactive.perl:650
#, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] "återställde %d sökväg\n"
msgstr[1] "återställde %d sökvägar\n"
-#: git-add--interactive.perl:662
+#: git-add--interactive.perl:653
#, perl-format
msgid "touched %d path\n"
msgid_plural "touched %d paths\n"
msgstr[0] "rörde %d sökväg\n"
msgstr[1] "rörde %d sökvägar\n"
-#: git-add--interactive.perl:671
+#: git-add--interactive.perl:662
msgid "Update"
msgstr "Uppdatera"
-#: git-add--interactive.perl:683
+#: git-add--interactive.perl:674
msgid "Revert"
msgstr "Återställ"
-#: git-add--interactive.perl:706
+#: git-add--interactive.perl:697
#, perl-format
msgid "note: %s is untracked now.\n"
msgstr "observera: %s spåras inte längre.\n"
-#: git-add--interactive.perl:717
+#: git-add--interactive.perl:708
msgid "Add untracked"
msgstr "Lägg till ospårad"
-#: git-add--interactive.perl:723
+#: git-add--interactive.perl:714
msgid "No untracked files.\n"
msgstr "Inga ospårade filer.\n"
-#: git-add--interactive.perl:1039
+#: git-add--interactive.perl:1030
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
@@ -15073,7 +15359,7 @@
"Om patchen kan appliceras rent kommer det redigerade stycket att\n"
"köas omedelbart."
-#: git-add--interactive.perl:1042
+#: git-add--interactive.perl:1033
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
@@ -15081,7 +15367,7 @@
"Om patchen kan appliceras rent kommer det redigerade stycket att\n"
"läggas till i \"stash\" omedelbart."
-#: git-add--interactive.perl:1045
+#: git-add--interactive.perl:1036
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
@@ -15089,7 +15375,7 @@
"Om patchen kan appliceras rent kommer det redigerade stycket att\n"
"tas bort från kön omedelbart."
-#: git-add--interactive.perl:1048 git-add--interactive.perl:1057
+#: git-add--interactive.perl:1039 git-add--interactive.perl:1048
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
@@ -15097,15 +15383,7 @@
"Om patchen kan appliceras rent kommer det redigerade stycket att\n"
"markeras för applicering omedelbart."
-#: git-add--interactive.perl:1051
-msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be\n"
-"marked for discarding"
-msgstr ""
-"Om patchen kan appliceras rent kommer det redigerade stycket att\n"
-"markeras för kasta omedelbart"
-
-#: git-add--interactive.perl:1054
+#: git-add--interactive.perl:1042 git-add--interactive.perl:1045
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
@@ -15113,16 +15391,16 @@
"Om patchen kan appliceras rent kommer det redigerade stycket att\n"
"markeras för kasta omedelbart."
-#: git-add--interactive.perl:1067
+#: git-add--interactive.perl:1058
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
msgstr "misslyckades öppna styckeredigeringsfil för skrivning: %s"
-#: git-add--interactive.perl:1068
+#: git-add--interactive.perl:1059
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr "Manuellt styckeredigeringsläge -- se nederst för snabbguide.\n"
-#: git-add--interactive.perl:1074
+#: git-add--interactive.perl:1065
#, perl-format
msgid ""
"---\n"
@@ -15136,7 +15414,7 @@
"Rader som börjar med %s kommer att tas bort.\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1082
+#: git-add--interactive.perl:1073
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"
@@ -15146,7 +15424,7 @@
"redigera den igen. Om alla rader i ett stycke tas bort avbryts\n"
"redigeringen och stycket lämnas oförändrat.\n"
-#: git-add--interactive.perl:1096
+#: git-add--interactive.perl:1087
#, perl-format
msgid "failed to open hunk edit file for reading: %s"
msgstr "misslyckades öppna styckesredigeringsfil för läsning: %s"
@@ -15157,14 +15435,14 @@
#. 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:1187
+#: git-add--interactive.perl:1178
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
"Ditt redigerade stycke kan inte appliceras. Redigera igen (\"nej\" kastar!) "
"[y/n]?"
-#: git-add--interactive.perl:1196
+#: git-add--interactive.perl:1187
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -15178,7 +15456,7 @@
"a - köa stycket och alla följande i filen\n"
"d - köa inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1202
+#: git-add--interactive.perl:1193
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -15192,7 +15470,7 @@
"a - \"stash\":a stycket och alla följande i filen\n"
"d - \"stash\":a inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1208
+#: git-add--interactive.perl:1199
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -15206,7 +15484,7 @@
"a - ta bort stycket och alla följande i filen från kön\n"
"d - ta inte bort stycket eller något av de följande i filen från kön"
-#: git-add--interactive.perl:1214
+#: git-add--interactive.perl:1205
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -15220,7 +15498,7 @@
"a - applicera stycket och alla följande i filen\n"
"d - applicera inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1220
+#: git-add--interactive.perl:1211
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -15234,7 +15512,7 @@
"a - förkasta stycket och alla följande i filen\n"
"d - förkasta inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1226
+#: git-add--interactive.perl:1217
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -15248,7 +15526,7 @@
"a - förkasta stycket och alla följande i filen\n"
"d - förkasta inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1232
+#: git-add--interactive.perl:1223
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -15262,7 +15540,7 @@
"a - applicera stycket och alla följande i filen\n"
"d - applicera inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1241
+#: git-add--interactive.perl:1232
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
@@ -15284,203 +15562,203 @@
"e - redigera aktuellt stycke manuellt\n"
"? - visa hjälp\n"
-#: git-add--interactive.perl:1272
+#: git-add--interactive.perl:1263
msgid "The selected hunks do not apply to the index!\n"
msgstr "Markerade stycken kan inte appliceras på indexet!\n"
-#: git-add--interactive.perl:1273
+#: git-add--interactive.perl:1264
msgid "Apply them to the worktree anyway? "
msgstr "Applicera dem på arbetskatalogen trots det? "
-#: git-add--interactive.perl:1276
+#: git-add--interactive.perl:1267
msgid "Nothing was applied.\n"
msgstr "Ingenting applicerades.\n"
-#: git-add--interactive.perl:1287
+#: git-add--interactive.perl:1278
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "ignorerar ej sammanslagen: %s\n"
-#: git-add--interactive.perl:1296
+#: git-add--interactive.perl:1287
msgid "Only binary files changed.\n"
msgstr "Endast binära filer ändrade.\n"
-#: git-add--interactive.perl:1298
+#: git-add--interactive.perl:1289
msgid "No changes.\n"
msgstr "Inga ändringar.\n"
-#: git-add--interactive.perl:1306
+#: git-add--interactive.perl:1297
msgid "Patch update"
msgstr "Uppdatera patch"
-#: git-add--interactive.perl:1358
+#: git-add--interactive.perl:1349
#, perl-format
msgid "Stage mode change [y,n,q,a,d,/%s,?]? "
msgstr "Köa ändrat läge [y,n,q,a,d,/%s,?]?"
-#: git-add--interactive.perl:1359
+#: git-add--interactive.perl:1350
#, perl-format
msgid "Stage deletion [y,n,q,a,d,/%s,?]? "
msgstr "Köa borttagning [y,n,q,a,d,/%s,?]?"
-#: git-add--interactive.perl:1360
+#: git-add--interactive.perl:1351
#, perl-format
msgid "Stage this hunk [y,n,q,a,d,/%s,?]? "
msgstr "Köa stycket [y,n,q,a,d,/%s,?]?"
-#: git-add--interactive.perl:1363
+#: git-add--interactive.perl:1354
#, perl-format
msgid "Stash mode change [y,n,q,a,d,/%s,?]? "
msgstr "Stash:a ändrat läge [y,n,q,a,d,/%s,?]?"
-#: git-add--interactive.perl:1364
+#: git-add--interactive.perl:1355
#, perl-format
msgid "Stash deletion [y,n,q,a,d,/%s,?]? "
msgstr "Stash:a borttagning [y,n,q,a,d,/%s,?]?"
-#: git-add--interactive.perl:1365
+#: git-add--interactive.perl:1356
#, perl-format
msgid "Stash this hunk [y,n,q,a,d,/%s,?]? "
msgstr "Stash:a stycket [y,n,q,a,d,/%s,?]?"
-#: git-add--interactive.perl:1368
+#: git-add--interactive.perl:1359
#, perl-format
msgid "Unstage mode change [y,n,q,a,d,/%s,?]? "
msgstr "Ta bort ändrat läge från kön [y,n,q,a,d,/%s,?]?"
-#: git-add--interactive.perl:1369
+#: git-add--interactive.perl:1360
#, perl-format
msgid "Unstage deletion [y,n,q,a,d,/%s,?]? "
msgstr "Ta bort borttagning från kön [y,n,q,a,d,/%s,?]?"
-#: git-add--interactive.perl:1370
+#: git-add--interactive.perl:1361
#, perl-format
msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? "
msgstr "Ta bort stycket från kön [y,n,q,a,d,/%s,?]?"
-#: git-add--interactive.perl:1373
+#: git-add--interactive.perl:1364
#, perl-format
msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? "
msgstr "Applicera ändrat läge på indexet [y,n,q,a,d,/%s,?]?"
-#: git-add--interactive.perl:1374
+#: git-add--interactive.perl:1365
#, perl-format
msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? "
msgstr "Applicera borttagning på indexet [y,n,q,a,d,/%s,?]?"
-#: git-add--interactive.perl:1375
+#: git-add--interactive.perl:1366
#, perl-format
msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? "
msgstr "Applicera stycket på indexet [y,n,q,a,d,/%s,?]?"
-#: git-add--interactive.perl:1378
+#: git-add--interactive.perl:1369
#, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? "
msgstr "Kasta ändrat läge från arbetskatalogen [y,n,q,a,d,/%s,?]?"
-#: git-add--interactive.perl:1379
+#: git-add--interactive.perl:1370
#, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? "
msgstr "Kasta borttagning från arbetskatalogen [y,n,q,a,d,/%s,?]?"
-#: git-add--interactive.perl:1380
+#: git-add--interactive.perl:1371
#, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? "
msgstr "Kasta stycket från arbetskatalogen [y,n,q,a,d,/%s,?]?"
-#: git-add--interactive.perl:1383
+#: git-add--interactive.perl:1374
#, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? "
msgstr "Kasta ändrat läge från indexet och arbetskatalogen [y,n,q,a,d,/%s,?]?"
-#: git-add--interactive.perl:1384
+#: git-add--interactive.perl:1375
#, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? "
msgstr "Kasta borttagning från indexet och arbetskatalogen [y,n,q,a,d,/%s,?]?"
-#: git-add--interactive.perl:1385
+#: git-add--interactive.perl:1376
#, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? "
msgstr "Kasta stycket från indexet och arbetskatalogen [y,n,q,a,d,/%s,?]?"
-#: git-add--interactive.perl:1388
+#: git-add--interactive.perl:1379
#, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? "
msgstr ""
"Applicera ändrat läge på indexet och arbetskatalogen [y,n,q,a,d,/%s,?]?"
-#: git-add--interactive.perl:1389
+#: git-add--interactive.perl:1380
#, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? "
msgstr ""
"Applicera borttagning på indexet och arbetskatalogen [y,n,q,a,d,/%s,?]?"
-#: git-add--interactive.perl:1390
+#: git-add--interactive.perl:1381
#, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? "
msgstr "Applicera stycket på indexet och arbetskatalogen [y,n,q,a,d,/%s,?]?"
-#: git-add--interactive.perl:1493
+#: git-add--interactive.perl:1484
msgid "go to which hunk (<ret> to see more)? "
msgstr "gå till vilket stycke (<ret> för att se fler)?"
-#: git-add--interactive.perl:1495
+#: git-add--interactive.perl:1486
msgid "go to which hunk? "
msgstr "gå till vilket stycke?"
-#: git-add--interactive.perl:1504
+#: git-add--interactive.perl:1495
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "Ogiltigt siffervärde: \"%s\"\n"
-#: git-add--interactive.perl:1509
+#: git-add--interactive.perl:1500
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] "Beklagar, det finns bara %d stycke.\n"
msgstr[1] "Beklagar, det finns bara %d stycken.\n"
-#: git-add--interactive.perl:1535
+#: git-add--interactive.perl:1526
msgid "search for regex? "
msgstr "sök efter reguljärt uttryck? "
-#: git-add--interactive.perl:1548
+#: git-add--interactive.perl:1539
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "Felaktigt format på reguljärt sökuttryck %s: %s\n"
-#: git-add--interactive.perl:1558
+#: git-add--interactive.perl:1549
msgid "No hunk matches the given pattern\n"
msgstr "Inga stycken motsvarar givet mönster\n"
-#: git-add--interactive.perl:1570 git-add--interactive.perl:1592
+#: git-add--interactive.perl:1561 git-add--interactive.perl:1583
msgid "No previous hunk\n"
msgstr "Inget föregående stycke\n"
-#: git-add--interactive.perl:1579 git-add--interactive.perl:1598
+#: git-add--interactive.perl:1570 git-add--interactive.perl:1589
msgid "No next hunk\n"
msgstr "Inget följande stycke\n"
-#: git-add--interactive.perl:1606
+#: git-add--interactive.perl:1597
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] "Dela i %d stycke.\n"
msgstr[1] "Dela i %d stycken.\n"
-#: git-add--interactive.perl:1658
+#: git-add--interactive.perl:1649
msgid "Review diff"
msgstr "Granska diff"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1677
+#: git-add--interactive.perl:1668
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\t - view diff between HEAD and index\n"
+"diff - view diff between HEAD and index\n"
"add untracked - add contents of untracked files to the staged set of "
"changes\n"
msgstr ""
@@ -15488,21 +15766,21 @@
"update - lägg arbetskatalogens tillstånd till köade ändringar\n"
"revert - återställ köade ändringar till HEAD-versionen\n"
"patch - välj och uppdatera valda stycken\n"
-"diff\t - visa diff mellan HEAD och index\n"
+"diff - visa diff mellan HEAD och index\n"
"add untracked - lägg till innehåll i ospårade filer till köade ändringar\n"
-#: git-add--interactive.perl:1694 git-add--interactive.perl:1699
-#: git-add--interactive.perl:1702 git-add--interactive.perl:1709
-#: git-add--interactive.perl:1713 git-add--interactive.perl:1719
+#: 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
msgid "missing --"
msgstr "saknad --"
-#: git-add--interactive.perl:1715
+#: git-add--interactive.perl:1706
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "okänt läge för --patch: %s"
-#: git-add--interactive.perl:1721 git-add--interactive.perl:1727
+#: git-add--interactive.perl:1712 git-add--interactive.perl:1718
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "felaktigt argument %s, förväntar --"
@@ -15863,6 +16141,92 @@
msgid "Do you really want to send %s? [y|N]: "
msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
+#~ msgid "could not stat '%s"
+#~ msgstr "kunde inte ta status på \"%s\""
+
+#~ msgid "tag: tagging "
+#~ msgstr "tag: taggar"
+
+#~ msgid "object of unknown type"
+#~ msgstr "objekt av okänd typ"
+
+#~ msgid "commit object"
+#~ msgstr "incheckningsobjekt"
+
+#~ msgid "tree object"
+#~ msgstr "trädobjekt"
+
+#~ msgid "blob object"
+#~ msgstr "blob-objekt"
+
+#~ msgid "other tag object"
+#~ msgstr "annat taggobjekt"
+
+#~ msgid ""
+#~ "There is nothing to exclude from by :(exclude) patterns.\n"
+#~ "Perhaps you forgot to add either ':/' or '.' ?"
+#~ msgstr ""
+#~ "Ingenting att exkludera från med :(exkludera)-mönster.\n"
+#~ "Glömde du kanske att antingen lägga till \":/\" eller \".\"?"
+
+#~ msgid "unrecognized format: %%(%s)"
+#~ msgstr "okänt format: %%(%s)"
+
+#~ msgid ":strip= requires a positive integer argument"
+#~ msgstr ":strip= kräver ett positivt heltalsargument"
+
+#~ msgid "ref '%s' does not have %ld components to :strip"
+#~ msgstr "referensen \"%s\" har inte %ld komponenter för :strip"
+
+#~ msgid "unknown %.*s format %s"
+#~ msgstr "okänt \"%.*s\"-format %s"
+
+#~ msgid "[%s: gone]"
+#~ msgstr "[%s: försvunnen]"
+
+#~ msgid "[%s]"
+#~ msgstr "[%s]"
+
+#~ msgid "[%s: behind %d]"
+#~ msgstr "[%s: bakom %d] "
+
+#~ msgid "[%s: ahead %d]"
+#~ msgstr "[%s: före %d] "
+
+#~ msgid "[%s: ahead %d, behind %d]"
+#~ msgstr "[%s: före %d, bakom %d] "
+
+#~ msgid " **** invalid ref ****"
+#~ msgstr " **** ogiltig ref ****"
+
+#~ msgid "insanely long object directory %.*s"
+#~ msgstr "tokigt lång objektkatalog %.*s"
+
+#~ msgid "git merge [<options>] <msg> HEAD <commit>"
+#~ msgstr "git merge [<flaggor>] <meddelande> HEAD <incheckning>"
+
+#~ msgid "'%s' is not a commit"
+#~ msgstr "\"%s\" är inte en incheckning"
+
+#~ msgid "cannot open file '%s'"
+#~ msgstr "kan inte öppna filen \"%s\""
+
+#~ msgid "could not close file %s"
+#~ msgstr "kunde inte stänga filen %s"
+
+#~ msgid "tag name too long: %.*s..."
+#~ msgstr "taggnamnet för långt: %.*s..."
+
+#~ msgid "tag header too big."
+#~ msgstr "tagghuvud för stort."
+
+#~ msgid ""
+#~ "If the patch applies cleanly, the edited hunk will immediately be\n"
+#~ "marked for discarding"
+#~ msgstr ""
+#~ "Om patchen kan appliceras rent kommer det redigerade stycket att\n"
+#~ "markeras för kasta omedelbart"
+
#~ msgid "Use an experimental blank-line-based heuristic to improve diffs"
#~ msgstr ""
#~ "Använd en experimentell algoritm baserad på tomma rader för att förbättra "
@@ -16437,9 +16801,6 @@
#~ msgid "cannot update HEAD ref"
#~ msgstr "kunde inte uppdatera HEAD-referens"
-#~ msgid "cannot tell cwd"
-#~ msgstr "kan inte läsa aktuell katalog (cwd)"
-
#~ msgid "%s: cannot lock the ref"
#~ msgstr "%s: kan inte låsa referensen"
diff --git a/po/vi.po b/po/vi.po
index dd70018..6b6e939 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,10 +6,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: git v2.12.0-rc1\n"
+"Project-Id-Version: git v2.13.0\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-02-18 01:00+0800\n"
-"PO-Revision-Date: 2017-02-18 07:07+0700\n"
+"POT-Creation-Date: 2017-05-05 09:35+0800\n"
+"PO-Revision-Date: 2017-05-05 13:38+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"
@@ -72,7 +72,7 @@
msgid "Exiting because of an unresolved conflict."
msgstr "Thoát ra bởi vì xung đột không thể giải quyết."
-#: advice.c:114 builtin/merge.c:1206
+#: advice.c:114 builtin/merge.c:1185
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Bạn chưa kết thúc việc hòa trộn (MERGE_HEAD vẫn tồn tại)."
@@ -344,7 +344,7 @@
msgid "cannot checkout %s"
msgstr "không thể lấy ra %s"
-#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:248
+#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:253
#, c-format
msgid "failed to read %s"
msgstr "gặp lỗi khi đọc %s"
@@ -467,7 +467,7 @@
msgid "sha1 information is lacking or useless (%s)."
msgstr "thông tin sha1 còn thiếu hay không dùng được(%s)."
-#: apply.c:4081 builtin/checkout.c:233 builtin/reset.c:135
+#: apply.c:4081 builtin/checkout.c:252 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry gặp lỗi đối với đường dẫn “%s”"
@@ -542,7 +542,7 @@
msgid "truncating .rej filename to %.*s.rej"
msgstr "đang cắt ngắn tên tập tin .rej thành %.*s.rej"
-#: apply.c:4531 builtin/fetch.c:737 builtin/fetch.c:986
+#: apply.c:4531 builtin/fetch.c:739 builtin/fetch.c:988
#, c-format
msgid "cannot open %s"
msgstr "không mở được “%s”"
@@ -570,162 +570,162 @@
msgid "unable to read index file"
msgstr "không thể đọc tập tin lưu bảng mục lục"
-#: apply.c:4824
+#: apply.c:4823
#, c-format
msgid "can't open patch '%s': %s"
msgstr "không thể mở miếng vá “%s”: %s"
-#: apply.c:4849
+#: apply.c:4850
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "đã chấm dứt %d lỗi khoảng trắng"
-#: apply.c:4855 apply.c:4870
+#: apply.c:4856 apply.c:4871
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d dòng thêm khoảng trắng lỗi."
-#: apply.c:4863
+#: apply.c:4864
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "%d dòng được áp dụng sau khi sửa các lỗi khoảng trắng."
-#: apply.c:4879 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391
+#: apply.c:4880 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391
msgid "Unable to write new index file"
msgstr "Không thể ghi tập tin lưu bảng mục lục mới"
-#: apply.c:4910 apply.c:4913 builtin/am.c:2277 builtin/am.c:2280
-#: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180
-#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:591
-#: builtin/submodule--helper.c:594 builtin/submodule--helper.c:960
-#: builtin/submodule--helper.c:963 builtin/submodule--helper.c:1104
+#: 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
msgid "path"
msgstr "đường-dẫn"
-#: apply.c:4911
+#: apply.c:4912
msgid "don't apply changes matching the given path"
msgstr "không áp dụng các thay đổi khớp với đường dẫn đã cho"
-#: apply.c:4914
+#: apply.c:4915
msgid "apply changes matching the given path"
msgstr "áp dụng các thay đổi khớp với đường dẫn đã cho"
-#: apply.c:4916 builtin/am.c:2286
+#: apply.c:4917 builtin/am.c:2285
msgid "num"
msgstr "số"
-#: apply.c:4917
+#: apply.c:4918
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "gỡ bỏ <số> dấu gạch chéo dẫn đầu từ đường dẫn diff cổ điển"
-#: apply.c:4920
+#: apply.c:4921
msgid "ignore additions made by the patch"
msgstr "lờ đi phần bổ xung được tạo ra bởi miếng vá"
-#: apply.c:4922
+#: apply.c:4923
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
"thay vì áp dụng một miếng vá, kết xuất kết quả từ lệnh diffstat cho đầu ra"
-#: apply.c:4926
+#: apply.c:4927
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
"hiển thị số lượng các dòng được thêm vào và xóa đi theo ký hiệu thập phân"
-#: apply.c:4928
+#: apply.c:4929
msgid "instead of applying the patch, output a summary for the input"
msgstr "thay vì áp dụng một miếng vá, kết xuất kết quả cho đầu vào"
-#: apply.c:4930
+#: apply.c:4931
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "thay vì áp dụng miếng vá, hãy xem xem miếng vá có thích hợp không"
-#: apply.c:4932
+#: apply.c:4933
msgid "make sure the patch is applicable to the current index"
msgstr "hãy chắc chắn là miếng vá thích hợp với bảng mục lục hiện hành"
-#: apply.c:4934
+#: apply.c:4935
msgid "apply a patch without touching the working tree"
msgstr "áp dụng một miếng vá mà không động chạm đến cây làm việc"
-#: apply.c:4936
+#: apply.c:4937
msgid "accept a patch that touches outside the working area"
msgstr "chấp nhận một miếng vá mà không động chạm đến cây làm việc"
-#: apply.c:4938
+#: apply.c:4939
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
"đồng thời áp dụng miếng vá (dùng với tùy chọn --stat/--summary/--check)"
-#: apply.c:4940
+#: apply.c:4941
msgid "attempt three-way merge if a patch does not apply"
msgstr "thử hòa trộn kiểu three-way nếu việc vá không thể thực hiện được"
-#: apply.c:4942
+#: apply.c:4943
msgid "build a temporary index based on embedded index information"
msgstr ""
"xây dựng bảng mục lục tạm thời trên cơ sở thông tin bảng mục lục được nhúng"
-#: apply.c:4945 builtin/checkout-index.c:169 builtin/ls-files.c:507
+#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:515
msgid "paths are separated with NUL character"
msgstr "các đường dẫn bị ngăn cách bởi ký tự NULL"
-#: apply.c:4947
+#: apply.c:4948
msgid "ensure at least <n> lines of context match"
msgstr "đảm bảo rằng có ít nhất <n> dòng nội dung khớp"
-#: apply.c:4948 builtin/am.c:2265
+#: apply.c:4949 builtin/am.c:2264
msgid "action"
msgstr "hành động"
-#: apply.c:4949
+#: apply.c:4950
msgid "detect new or modified lines that have whitespace errors"
msgstr "tìm thấy một dòng mới hoặc bị sửa đổi mà nó có lỗi do khoảng trắng"
-#: apply.c:4952 apply.c:4955
+#: apply.c:4953 apply.c:4956
msgid "ignore changes in whitespace when finding context"
msgstr "lờ đi sự thay đổi do khoảng trắng gây ra khi quét nội dung"
-#: apply.c:4958
+#: apply.c:4959
msgid "apply the patch in reverse"
msgstr "áp dụng miếng vá theo chiều ngược"
-#: apply.c:4960
+#: apply.c:4961
msgid "don't expect at least one line of context"
msgstr "đừng hy vọng có ít nhất một dòng nội dung"
-#: apply.c:4962
+#: apply.c:4963
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "để lại khối dữ liệu bị từ chối trong các tập tin *.rej tương ứng"
-#: apply.c:4964
+#: apply.c:4965
msgid "allow overlapping hunks"
msgstr "cho phép chồng khối nhớ"
-#: apply.c:4965 builtin/add.c:267 builtin/check-ignore.c:19
+#: 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:1860 builtin/mv.c:122 builtin/read-tree.c:114
+#: builtin/log.c:1867 builtin/mv.c:122 builtin/read-tree.c:134
msgid "be verbose"
msgstr "chi tiết"
-#: apply.c:4967
+#: apply.c:4968
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
"đã dò tìm thấy dung sai không chính xác thiếu dòng mới tại cuối tập tin"
-#: apply.c:4970
+#: apply.c:4971
msgid "do not trust the line counts in the hunk headers"
msgstr "không tin số lượng dòng trong phần đầu khối dữ liệu"
-#: apply.c:4972 builtin/am.c:2274
+#: apply.c:4973 builtin/am.c:2273
msgid "root"
msgstr "gốc"
-#: apply.c:4973
+#: apply.c:4974
msgid "prepend <root> to all filenames"
msgstr "treo thêm <root> vào tất cả các tên tập tin"
@@ -748,103 +748,108 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <kho> [--exec <lệnh>] --list"
-#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300
+#: archive.c:332 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "đặc tả đường dẫn “%s” không khớp với bất kỳ tập tin nào"
-#: archive.c:429
+#: archive.c:417
msgid "fmt"
msgstr "định_dạng"
-#: archive.c:429
+#: archive.c:417
msgid "archive format"
msgstr "định dạng lưu trữ"
-#: archive.c:430 builtin/log.c:1429
+#: archive.c:418 builtin/log.c:1436
msgid "prefix"
msgstr "tiền_tố"
-#: archive.c:431
+#: archive.c:419
msgid "prepend prefix to each pathname in the archive"
msgstr "nối thêm tiền tố vào từng đường dẫn tập tin trong kho lưu"
-#: archive.c:432 builtin/blame.c:2607 builtin/blame.c:2608 builtin/config.c:59
-#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1054
-#: builtin/hash-object.c:101 builtin/ls-files.c:541 builtin/ls-files.c:544
-#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109
+#: 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
msgid "file"
msgstr "tập_tin"
-#: archive.c:433 builtin/archive.c:89
+#: archive.c:421 builtin/archive.c:89
msgid "write the archive to this file"
msgstr "ghi kho lưu vào tập tin này"
-#: archive.c:435
+#: archive.c:423
msgid "read .gitattributes in working directory"
msgstr "đọc .gitattributes trong thư mục làm việc"
-#: archive.c:436
+#: archive.c:424
msgid "report archived files on stderr"
msgstr "liệt kê các tập tin được lưu trữ vào stderr (đầu ra lỗi tiêu chuẩn)"
-#: archive.c:437
+#: archive.c:425
msgid "store only"
msgstr "chỉ lưu (không nén)"
-#: archive.c:438
+#: archive.c:426
msgid "compress faster"
msgstr "nén nhanh hơn"
-#: archive.c:446
+#: archive.c:434
msgid "compress better"
msgstr "nén nhỏ hơn"
-#: archive.c:449
+#: archive.c:437
msgid "list supported archive formats"
msgstr "liệt kê các kiểu nén được hỗ trợ"
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88
-#: builtin/submodule--helper.c:603 builtin/submodule--helper.c:969
+#: archive.c:439 builtin/archive.c:90 builtin/clone.c:103 builtin/clone.c:106
+#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
msgid "repo"
msgstr "kho"
-#: archive.c:452 builtin/archive.c:91
+#: archive.c:440 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr "nhận kho nén từ kho chứa <kho> trên máy chủ"
-#: archive.c:453 builtin/archive.c:92 builtin/notes.c:485
+#: archive.c:441 builtin/archive.c:92 builtin/notes.c:485
msgid "command"
msgstr "lệnh"
-#: archive.c:454 builtin/archive.c:93
+#: archive.c:442 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr "đường dẫn đến lệnh git-upload-pack trên máy chủ"
-#: archive.c:461
+#: archive.c:449
msgid "Unexpected option --remote"
msgstr "Gặp tùy chọn --remote không cần"
-#: archive.c:463
+#: archive.c:451
msgid "Option --exec can only be used together with --remote"
msgstr "Tùy chọn --exec chỉ có thể được dùng cùng với --remote"
-#: archive.c:465
+#: archive.c:453
msgid "Unexpected option --output"
msgstr "Gặp tùy chọn không cần --output"
-#: archive.c:487
+#: archive.c:475
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Không hiểu định dạng “%s”"
-#: archive.c:494
+#: archive.c:482
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Tham số không được hỗ trợ cho định dạng “%s”: -%d"
-#: attr.c:263
+#: attr.c:212
+#, c-format
+msgid "%.*s is not a valid attribute name"
+msgstr "%.*s không phải tên thuộc tính hợp lệ"
+
+#: attr.c:408
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -852,27 +857,27 @@
"Các mẫu dạng phủ định bị cấm dùng cho các thuộc tính của git\n"
"Dùng “\\!” cho các chuỗi văn bản có dấu chấm than dẫn đầu."
-#: bisect.c:441
+#: bisect.c:444
#, c-format
msgid "Could not open file '%s'"
msgstr "Không thể mở tập tin “%s”"
-#: bisect.c:446
+#: bisect.c:449
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "nội dung được trích dẫn sai tập tin “%s”: %s"
-#: bisect.c:655
+#: bisect.c:657
#, c-format
msgid "We cannot bisect more!\n"
msgstr "Chúng tôi không bisect thêm nữa!\n"
-#: bisect.c:708
+#: bisect.c:710
#, c-format
msgid "Not a valid commit name %s"
msgstr "Không phải tên đối tượng commit %s hợp lệ"
-#: bisect.c:732
+#: bisect.c:734
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -881,7 +886,7 @@
"Hòa trộn trên %s là sai.\n"
"Điều đó có nghĩa là lỗi đã được sửa chữa giữa %s và [%s].\n"
-#: bisect.c:737
+#: bisect.c:739
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -890,7 +895,7 @@
"Hòa trộn trên %s là mới.\n"
"Gần như chắc chắn là có thay đổi giữa %s và [%s].\n"
-#: bisect.c:742
+#: bisect.c:744
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -899,7 +904,7 @@
"Hòa trộn trên %s là %s.\n"
"Điều đó có nghĩa là lần chuyển giao “%s” đầu tiên là giữa %s và [%s].\n"
-#: bisect.c:750
+#: bisect.c:752
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -910,7 +915,7 @@
"git bisect không thể làm việc đúng đắn trong trường hợp này.\n"
"Liệu có phải bạn nhầm lẫn các điểm %s và %s không?\n"
-#: bisect.c:763
+#: bisect.c:765
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -922,36 +927,36 @@
"%s.\n"
"Chúng tôi vẫn cứ tiếp tục."
-#: bisect.c:798
+#: bisect.c:800
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "Bisecting: nền hòa trộn cần phải được kiểm tra\n"
-#: bisect.c:849
+#: bisect.c:851
#, c-format
msgid "a %s revision is needed"
msgstr "cần một điểm xét duyệt %s"
-#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:262
+#: bisect.c:868 builtin/notes.c:174 builtin/tag.c:255
#, c-format
msgid "could not create file '%s'"
msgstr "không thể tạo tập tin “%s”"
-#: bisect.c:917
+#: bisect.c:919
#, c-format
msgid "could not read file '%s'"
msgstr "không thể đọc tập tin “%s”"
-#: bisect.c:947
+#: bisect.c:949
msgid "reading bisect refs failed"
msgstr "việc đọc tham chiếu bisect gặp lỗi"
-#: bisect.c:967
+#: bisect.c:969
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s là cả %s và %s\n"
-#: bisect.c:975
+#: bisect.c:977
#, c-format
msgid ""
"No testable commit found.\n"
@@ -960,7 +965,7 @@
"không tìm thấy lần chuyển giao kiểm tra được nào.\n"
"Có lẽ bạn bắt đầu với các tham số đường dẫn sai?\n"
-#: bisect.c:994
+#: bisect.c:996
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -968,7 +973,7 @@
#. TRANSLATORS: the last %s will be replaced with
#. "(roughly %d steps)" translation
-#: bisect.c:998
+#: bisect.c:1000
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
@@ -1108,7 +1113,7 @@
msgid "'%s' is already checked out at '%s'"
msgstr "“%s” đã được lấy ra tại “%s” rồi"
-#: branch.c:363
+#: branch.c:364
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "HEAD của cây làm việc %s chưa được cập nhật"
@@ -1123,7 +1128,7 @@
msgid "unrecognized header: %s%s (%d)"
msgstr "phần đầu không được thừa nhận: %s%s (%d)"
-#: bundle.c:87 sequencer.c:1331 sequencer.c:1752 builtin/commit.c:777
+#: bundle.c:87 sequencer.c:1341 sequencer.c:1767 builtin/commit.c:777
#, c-format
msgid "could not open '%s'"
msgstr "không thể mở “%s”"
@@ -1132,10 +1137,10 @@
msgid "Repository lacks these prerequisite commits:"
msgstr "Kho chứa thiếu những lần chuyển giao tiên quyết này:"
-#: bundle.c:163 ref-filter.c:1499 sequencer.c:1154 sequencer.c:2290
-#: builtin/blame.c:2820 builtin/commit.c:1061 builtin/log.c:348
-#: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909
-#: builtin/merge.c:360 builtin/shortlog.c:177
+#: 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 "cài đặt việc di chuyển qua các điểm xét duyệt gặp lỗi"
@@ -1172,7 +1177,7 @@
msgid "ref '%s' is excluded by the rev-list options"
msgstr "th.chiếu “%s” bị loại trừ bởi các tùy chọn rev-list"
-#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:282
+#: bundle.c:443 builtin/log.c:170 builtin/log.c:1579 builtin/shortlog.c:281
#, c-format
msgid "unrecognized argument: %s"
msgstr "đối số không được thừa nhận: %s"
@@ -1195,8 +1200,8 @@
msgid "invalid color value: %.*s"
msgstr "giá trị màu không hợp lệ: %.*s"
-#: commit.c:40 sequencer.c:1564 builtin/am.c:421 builtin/am.c:457
-#: builtin/am.c:1493 builtin/am.c:2127
+#: commit.c:40 sequencer.c:1579 builtin/am.c:419 builtin/am.c:455
+#: builtin/am.c:1489 builtin/am.c:2126
#, c-format
msgid "could not parse %s"
msgstr "không thể phân tích cú pháp %s"
@@ -1206,7 +1211,7 @@
msgid "%s %s is not a commit!"
msgstr "%s %s không phải là một lần chuyển giao!"
-#: commit.c:1514
+#: commit.c:1511
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
@@ -1220,135 +1225,155 @@
msgid "memory exhausted"
msgstr "hết bộ nhớ"
-#: config.c:518
+#: config.c:191
+msgid "relative config include conditionals must come from files"
+msgstr "các điều kiện bao gồm cấu hình liên quan phải đến từ các tập tin"
+
+#: config.c:711
#, c-format
msgid "bad config line %d in blob %s"
msgstr "tập tin cấu hình sai tại dòng %d trong blob %s"
-#: config.c:522
+#: config.c:715
#, c-format
msgid "bad config line %d in file %s"
msgstr "cấu hình sai tại dòng %d trong tập tin %s"
-#: config.c:526
+#: config.c:719
#, c-format
msgid "bad config line %d in standard input"
msgstr "cấu hình sai tại dòng %d trong đầu vào tiêu chuẩn"
-#: config.c:530
+#: config.c:723
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "cấu hình sai tại dòng %d trong blob-mô-đun-con %s"
-#: config.c:534
+#: config.c:727
#, c-format
msgid "bad config line %d in command line %s"
msgstr "cấu hình sai tại dòng %d trong dòng lệnh %s"
-#: config.c:538
+#: config.c:731
#, c-format
msgid "bad config line %d in %s"
msgstr "cấu hình sai tại dòng %d trong %s"
-#: config.c:657
+#: config.c:859
msgid "out of range"
msgstr "nằm ngoài phạm vi"
-#: config.c:657
+#: config.c:859
msgid "invalid unit"
msgstr "đơn vị không hợp lệ"
-#: config.c:663
+#: config.c:865
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "sai giá trị bằng số của cấu hình “%s” cho “%s”: %s"
-#: config.c:668
+#: config.c:870
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr "sai giá trị bằng số của cấu hình “%s” cho “%s” trong blob %s: %s"
-#: config.c:671
+#: config.c:873
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr "sai giá trị bằng số của cấu hình “%s” cho “%s” trong tập tin %s: %s"
-#: config.c:674
+#: config.c:876
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
"sai giá trị bằng số của cấu hình “%s” cho “%s” trong đầu vào tiêu chuẩn: %s"
-#: config.c:677
+#: config.c:879
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
"sai giá trị bằng số của cấu hình “%s” cho “%s” trong submodule-blob %s: %s"
-#: config.c:680
+#: config.c:882
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr "sai giá trị bằng số của cấu hình “%s” cho “%s” trong dòng lệnh %s: %s"
-#: config.c:683
+#: config.c:885
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "sai giá trị bằng số của cấu hình “%s” cho “%s” trong %s: %s"
-#: config.c:770
+#: config.c:980
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "gặp lỗi mở rộng thư mục người dùng trong: “%s”"
-#: config.c:865 config.c:876
+#: config.c:1075 config.c:1086
#, c-format
msgid "bad zlib compression level %d"
msgstr "mức nén zlib %d là sai"
-#: config.c:993
+#: config.c:1203
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "chế độ không hợp lệ đối với việc tạo đối tượng: %s"
-#: config.c:1149
+#: config.c:1359
#, c-format
msgid "bad pack compression level %d"
msgstr "mức nén gói %d không hợp lệ"
-#: config.c:1339
+#: config.c:1557
msgid "unable to parse command-line config"
msgstr "không thể phân tích cấu hình dòng lệnh"
-#: config.c:1389
+#: config.c:1611
msgid "unknown error occurred while reading the configuration files"
msgstr "đã có lỗi chưa biết xảy ra trong khi đọc các tập tin cấu hình"
-#: config.c:1743
+#: config.c:1970
+#, c-format
+msgid "Invalid %s: '%s'"
+msgstr "%s không hợp lệ: “%s”"
+
+#: config.c:1991
+#, c-format
+msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
+msgstr ""
+"không hiểu giá trị core.untrackedCache “%s”; dùng giá trị mặc định “keep”"
+
+#: config.c:2017
+#, c-format
+msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
+msgstr "giá trị splitIndex.maxPercentChange “%d” phải nằm giữa 0 và 100"
+
+#: config.c:2028
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "không thể phân tích “%s” từ cấu hình dòng lệnh"
-#: config.c:1745
+#: config.c:2030
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "sai biến cấu hình “%s” trong tập tin “%s” tại dòng %d"
-#: config.c:1804
+#: config.c:2089
#, c-format
msgid "%s has multiple values"
msgstr "%s có đa giá trị"
-#: config.c:2225 config.c:2450
+#: config.c:2423 config.c:2648
#, c-format
msgid "fstat on %s failed"
msgstr "fstat trên %s gặp lỗi"
-#: config.c:2343
+#: config.c:2541
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "không thể đặt “%s” thành “%s”"
-#: config.c:2345
+#: config.c:2543 builtin/remote.c:774
#, c-format
msgid "could not unset '%s'"
msgstr "không thể thôi đặt “%s”"
@@ -1510,20 +1535,20 @@
"Tìm thấy các lỗi trong biến cấu hình “diff.dirstat”:\n"
"%s"
-#: diff.c:3085
+#: diff.c:3102
#, c-format
msgid "external diff died, stopping at %s"
msgstr "phần mềm diff ở bên ngoài đã chết, dừng tại %s"
-#: diff.c:3411
+#: diff.c:3428
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only, --name-status, --check và -s loại từ lẫn nhau"
-#: diff.c:3501
+#: diff.c:3518
msgid "--follow requires exactly one pathspec"
msgstr "--follow cần chính xác một đặc tả đường dẫn"
-#: diff.c:3664
+#: diff.c:3681
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -1532,22 +1557,22 @@
"Gặp lỗi khi phân tích đối số tùy chọn --dirstat/-X:\n"
"%s"
-#: diff.c:3678
+#: diff.c:3695
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "Gặp lỗi khi phân tích đối số tùy chọn --submodule: “%s”"
-#: diff.c:4696
+#: diff.c:4719
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
"nhận thấy đổi tên không chính xác đã bị bỏ qua bởi có quá nhiều tập tin."
-#: diff.c:4699
+#: diff.c:4722
msgid "only found copies from modified paths due to too many files."
msgstr ""
"chỉ tìm thấy các bản sao từ đường dẫn đã sửa đổi bởi vì có quá nhiều tập tin."
-#: diff.c:4702
+#: diff.c:4725
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -1555,186 +1580,212 @@
"bạn có lẽ muốn đặt biến %s của bạn thành ít nhất là %d và thử lại lệnh lần "
"nữa."
-#: dir.c:1862
+#: dir.c:1899
msgid "failed to get kernel name and information"
msgstr "gặp lỗi khi lấy tên và thông tin của nhân"
-#: dir.c:1981
+#: dir.c:2018
msgid "Untracked cache is disabled on this system or location."
msgstr "Bộ nhớ tạm không theo vết bị tắt trên hệ thống hay vị trí này."
-#: dir.c:2759
+#: dir.c:2776 dir.c:2781
+#, c-format
+msgid "could not create directories for %s"
+msgstr "không thể tạo thư mục cho %s"
+
+#: dir.c:2806
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "không thể di cư thư mục git từ “%s” sang “%s”"
-#: fetch-pack.c:213
+#: entry.c:280
+#, c-format
+msgid "could not stat file '%s'"
+msgstr "không thể lấy thống kê tập tin “%s”"
+
+#: fetch-pack.c:249
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: cần danh sách shallow"
-#: fetch-pack.c:225
+#: fetch-pack.c:261
msgid "git fetch-pack: expected ACK/NAK, got EOF"
msgstr "git fetch-pack: cần ACK/NAK, nhưng lại nhận được EOF"
-#: fetch-pack.c:243
+#: fetch-pack.c:280 builtin/archive.c:63
+#, c-format
+msgid "remote error: %s"
+msgstr "lỗi máy chủ: %s"
+
+#: fetch-pack.c:281
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: cần ACK/NAK, nhưng lại nhận được “%s”"
-#: fetch-pack.c:295
+#: fetch-pack.c:333
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc cần multi_ack_detailed"
-#: fetch-pack.c:381
+#: fetch-pack.c:419
#, c-format
msgid "invalid shallow line: %s"
msgstr "dòng shallow không hợp lệ: %s"
-#: fetch-pack.c:387
+#: fetch-pack.c:425
#, c-format
msgid "invalid unshallow line: %s"
msgstr "dòng unshallow không hợp lệ: %s"
-#: fetch-pack.c:389
+#: fetch-pack.c:427
#, c-format
msgid "object not found: %s"
msgstr "Không tìm thấy đối tượng: %s"
-#: fetch-pack.c:392
+#: fetch-pack.c:430
#, c-format
msgid "error in object: %s"
msgstr "lỗi trong đối tượng: %s"
-#: fetch-pack.c:394
+#: fetch-pack.c:432
#, c-format
msgid "no shallow found: %s"
msgstr "không tìm shallow nào: %s"
-#: fetch-pack.c:397
+#: fetch-pack.c:435
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "cần shallow/unshallow, nhưng lại nhận được %s"
-#: fetch-pack.c:436
+#: fetch-pack.c:474
#, c-format
msgid "got %s %d %s"
msgstr "nhận %s %d - %s"
-#: fetch-pack.c:450
+#: fetch-pack.c:488
#, c-format
msgid "invalid commit %s"
msgstr "lần chuyển giao %s không hợp lệ"
-#: fetch-pack.c:483
+#: fetch-pack.c:521
msgid "giving up"
msgstr "chịu thua"
-#: fetch-pack.c:493 progress.c:235
+#: fetch-pack.c:531 progress.c:235
msgid "done"
msgstr "xong"
-#: fetch-pack.c:505
+#: fetch-pack.c:543
#, c-format
msgid "got %s (%d) %s"
msgstr "nhận %s (%d) %s"
-#: fetch-pack.c:551
+#: fetch-pack.c:589
#, c-format
msgid "Marking %s as complete"
msgstr "Đánh dấu %s là đã hoàn thành"
-#: fetch-pack.c:697
+#: fetch-pack.c:737
#, c-format
msgid "already have %s (%s)"
msgstr "đã sẵn có %s (%s)"
-#: fetch-pack.c:735
+#: fetch-pack.c:775
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack: không thể rẽ nhánh sideband demultiplexer"
-#: fetch-pack.c:743
+#: fetch-pack.c:783
msgid "protocol error: bad pack header"
msgstr "lỗi giao thức: phần đầu gói bị sai"
-#: fetch-pack.c:799
+#: fetch-pack.c:839
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: không thể rẽ nhánh %s"
-#: fetch-pack.c:815
+#: fetch-pack.c:855
#, c-format
msgid "%s failed"
msgstr "%s gặp lỗi"
-#: fetch-pack.c:817
+#: fetch-pack.c:857
msgid "error in sideband demultiplexer"
msgstr "có lỗi trong sideband demultiplexer"
-#: fetch-pack.c:844
+#: fetch-pack.c:884
msgid "Server does not support shallow clients"
msgstr "Máy chủ không hỗ trợ máy khách shallow"
-#: fetch-pack.c:848
+#: fetch-pack.c:888
msgid "Server supports multi_ack_detailed"
msgstr "Máy chủ hỗ trợ multi_ack_detailed"
-#: fetch-pack.c:851
+#: fetch-pack.c:891
msgid "Server supports no-done"
msgstr "Máy chủ hỗ trợ no-done"
-#: fetch-pack.c:857
+#: fetch-pack.c:897
msgid "Server supports multi_ack"
msgstr "Máy chủ hỗ trợ multi_ack"
-#: fetch-pack.c:861
+#: fetch-pack.c:901
msgid "Server supports side-band-64k"
msgstr "Máy chủ hỗ trợ side-band-64k"
-#: fetch-pack.c:865
+#: fetch-pack.c:905
msgid "Server supports side-band"
msgstr "Máy chủ hỗ trợ side-band"
-#: fetch-pack.c:869
+#: fetch-pack.c:909
msgid "Server supports allow-tip-sha1-in-want"
msgstr "Máy chủ hỗ trợ allow-tip-sha1-in-want"
-#: fetch-pack.c:873
+#: fetch-pack.c:913
msgid "Server supports allow-reachable-sha1-in-want"
msgstr "Máy chủ hỗ trợ allow-reachable-sha1-in-want"
-#: fetch-pack.c:883
+#: fetch-pack.c:923
msgid "Server supports ofs-delta"
msgstr "Máy chủ hỗ trợ ofs-delta"
-#: fetch-pack.c:890
+#: fetch-pack.c:930
#, c-format
msgid "Server version is %.*s"
msgstr "Phiên bản máy chủ là %.*s"
-#: fetch-pack.c:896
+#: fetch-pack.c:936
msgid "Server does not support --shallow-since"
msgstr "Máy chủ không hỗ trợ --shallow-since"
-#: fetch-pack.c:900
+#: fetch-pack.c:940
msgid "Server does not support --shallow-exclude"
msgstr "Máy chủ không hỗ trợ --shallow-exclude"
-#: fetch-pack.c:902
+#: fetch-pack.c:942
msgid "Server does not support --deepen"
msgstr "Máy chủ không hỗ trợ --deepen"
-#: fetch-pack.c:913
+#: fetch-pack.c:953
msgid "no common commits"
msgstr "không có lần chuyển giao chung nào"
-#: fetch-pack.c:925
+#: fetch-pack.c:965
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: fetch gặp lỗi."
-#: fetch-pack.c:1087
+#: fetch-pack.c:1127
msgid "no matching remote head"
msgstr "không khớp phần đầu máy chủ"
+#: fetch-pack.c:1149
+#, c-format
+msgid "no such remote ref %s"
+msgstr "Không có máy chủ tham chiếu nào như %s"
+
+#: fetch-pack.c:1152
+#, c-format
+msgid "Server does not allow request for unadvertised object %s"
+msgstr ""
+"Máy phục vụ không cho phép yêu cầu cho đối tượng không được báo trước %s"
+
#: gpg-interface.c:185
msgid "gpg failed to sign the data"
msgstr "gpg gặp lỗi khi ký dữ liệu"
@@ -1753,17 +1804,17 @@
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "bỏ qua màu không hợp lệ “%.*s” trong log.graphColors"
-#: grep.c:1794
+#: grep.c:1796
#, c-format
msgid "'%s': unable to read %s"
msgstr "“%s”: không thể đọc %s"
-#: grep.c:1811 builtin/clone.c:381 builtin/diff.c:81 builtin/rm.c:133
+#: grep.c:1813 builtin/clone.c:399 builtin/diff.c:81 builtin/rm.c:133
#, c-format
msgid "failed to stat '%s'"
msgstr "gặp lỗi khi lấy thống kê về “%s”"
-#: grep.c:1822
+#: grep.c:1824
#, c-format
msgid "'%s': short read"
msgstr "“%s”: đọc ngắn"
@@ -1829,7 +1880,7 @@
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: ident.c:334
+#: ident.c:343
msgid ""
"\n"
"*** Please tell me who you are.\n"
@@ -1855,6 +1906,39 @@
"Bỏ tùy chọn --global nếu chỉ định danh riêng cho kho này.\n"
"\n"
+#: ident.c:367
+msgid "no email was given and auto-detection is disabled"
+msgstr "không đưa ra địa chỉ thư điện tử và auto-detection bị tắt"
+
+#: ident.c:372
+#, c-format
+msgid "unable to auto-detect email address (got '%s')"
+msgstr "không thể tự dò tìm địa chỉ thư điện tử (nhận “%s”)"
+
+#: ident.c:382
+msgid "no name was given and auto-detection is disabled"
+msgstr "chưa chỉ ra tên và tự-động-dò-tìm bị tắt"
+
+#: ident.c:388
+#, c-format
+msgid "unable to auto-detect name (got '%s')"
+msgstr "không thể dò-tìm-tự động tên (đã nhận “%s”)"
+
+#: ident.c:396
+#, c-format
+msgid "empty ident name (for <%s>) not allowed"
+msgstr "không cho phép tên định danh là rỗng (cho <%s>)"
+
+#: ident.c:402
+#, c-format
+msgid "name consists only of disallowed characters: %s"
+msgstr "tên chỉ được phép bao gồm các ký tự sau: %s"
+
+#: ident.c:417 builtin/commit.c:611
+#, c-format
+msgid "invalid date format: %s"
+msgstr "ngày tháng không hợp lệ: %s"
+
#: lockfile.c:152
#, c-format
msgid ""
@@ -1883,8 +1967,8 @@
msgid "failed to read the cache"
msgstr "gặp lỗi khi đọc bộ nhớ đệm"
-#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374
-#: builtin/checkout.c:588 builtin/clone.c:731
+#: merge.c:96 builtin/am.c:1999 builtin/am.c:2034 builtin/checkout.c:393
+#: builtin/checkout.c:607 builtin/clone.c:749
msgid "unable to write new index file"
msgstr "không thể ghi tập tin lưu bảng mục lục mới"
@@ -1954,7 +2038,7 @@
msgid "Unable to add %s to database"
msgstr "Không thể thêm %s vào cơ sở dữ liệu"
-#: merge-recursive.c:1088 merge-recursive.c:1102
+#: merge-recursive.c:1092
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -1963,7 +2047,16 @@
"XUNG ĐỘT (%s/xóa): %s bị xóa trong %s và %s trong %s. Phiên bản %s của %s "
"còn lại trong cây (tree)."
-#: merge-recursive.c:1094 merge-recursive.c:1107
+#: merge-recursive.c:1097
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree."
+msgstr ""
+"XUNG ĐỘT (%s/xóa): %s bị xóa trong %s và %s đến %s trong %s. Phiên bản %s "
+"của %s còn lại trong cây (tree)."
+
+#: merge-recursive.c:1104
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -1972,20 +2065,29 @@
"XUNG ĐỘT (%s/xóa): %s bị xóa trong %s và %s trong %s. Phiên bản %s của %s "
"còn lại trong cây (tree) tại %s."
-#: merge-recursive.c:1150
+#: merge-recursive.c:1109
+#, 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 ""
+"XUNG ĐỘT (%s/xóa): %s bị xóa trong %s và %s đến %s trong %s. Phiên bản %s "
+"của %s còn lại trong cây (tree) tại %s."
+
+#: merge-recursive.c:1143
msgid "rename"
msgstr "đổi tên"
-#: merge-recursive.c:1150
+#: merge-recursive.c:1143
msgid "renamed"
msgstr "đã đổi tên"
-#: merge-recursive.c:1207
+#: merge-recursive.c:1200
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s là một thư mục trong %s thay vào đó thêm vào như là %s"
-#: merge-recursive.c:1232
+#: merge-recursive.c:1225
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -1994,136 +2096,136 @@
"XUNG ĐỘT (đổi-tên/đổi-tên): Đổi tên \"%s\"->\"%s\" trong nhánh \"%s\" đổi "
"tên \"%s\"->\"%s\" trong \"%s\"%s"
-#: merge-recursive.c:1237
+#: merge-recursive.c:1230
msgid " (left unresolved)"
msgstr " (cần giải quyết)"
-#: merge-recursive.c:1299
+#: merge-recursive.c:1292
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"XUNG ĐỘT (đổi-tên/đổi-tên): Đổi tên %s->%s trong %s. Đổi tên %s->%s trong %s"
-#: merge-recursive.c:1332
+#: merge-recursive.c:1325
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr "Đang đổi tên %s thành %s thay vì %s thành %s"
-#: merge-recursive.c:1535
+#: merge-recursive.c:1528
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr ""
"XUNG ĐỘT (đổi-tên/thêm): Đổi tên %s->%s trong %s. %s được thêm vào trong %s"
-#: merge-recursive.c:1550
+#: merge-recursive.c:1543
#, c-format
msgid "Adding merged %s"
msgstr "Thêm hòa trộn %s"
-#: merge-recursive.c:1557 merge-recursive.c:1771
+#: merge-recursive.c:1550 merge-recursive.c:1780
#, c-format
msgid "Adding as %s instead"
msgstr "Thay vào đó thêm vào %s"
-#: merge-recursive.c:1614
+#: merge-recursive.c:1607
#, c-format
msgid "cannot read object %s"
msgstr "không thể đọc đối tượng %s"
-#: merge-recursive.c:1617
+#: merge-recursive.c:1610
#, c-format
msgid "object %s is not a blob"
msgstr "đối tượng %s không phải là một blob"
-#: merge-recursive.c:1670
+#: merge-recursive.c:1679
msgid "modify"
msgstr "sửa đổi"
-#: merge-recursive.c:1670
+#: merge-recursive.c:1679
msgid "modified"
msgstr "đã sửa"
-#: merge-recursive.c:1680
+#: merge-recursive.c:1689
msgid "content"
msgstr "nội dung"
-#: merge-recursive.c:1687
+#: merge-recursive.c:1696
msgid "add/add"
msgstr "thêm/thêm"
-#: merge-recursive.c:1723
+#: merge-recursive.c:1732
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "Đã bỏ qua %s (đã có sẵn lần hòa trộn này)"
-#: merge-recursive.c:1737
+#: merge-recursive.c:1746
#, c-format
msgid "Auto-merging %s"
msgstr "Tự-động-hòa-trộn %s"
-#: merge-recursive.c:1741 git-submodule.sh:930
+#: merge-recursive.c:1750 git-submodule.sh:944
msgid "submodule"
msgstr "mô-đun-con"
-#: merge-recursive.c:1742
+#: merge-recursive.c:1751
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "XUNG ĐỘT (%s): Xung đột hòa trộn trong %s"
-#: merge-recursive.c:1836
+#: merge-recursive.c:1845
#, c-format
msgid "Removing %s"
msgstr "Đang xóa %s"
-#: merge-recursive.c:1862
+#: merge-recursive.c:1871
msgid "file/directory"
msgstr "tập-tin/thư-mục"
-#: merge-recursive.c:1868
+#: merge-recursive.c:1877
msgid "directory/file"
msgstr "thư-mục/tập-tin"
-#: merge-recursive.c:1874
+#: merge-recursive.c:1883
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"XUNG ĐỘT (%s): Ở đây không có thư mục nào có tên %s trong %s. Thêm %s như là "
"%s"
-#: merge-recursive.c:1883
+#: merge-recursive.c:1892
#, c-format
msgid "Adding %s"
msgstr "Thêm \"%s\""
-#: merge-recursive.c:1920
+#: merge-recursive.c:1929
msgid "Already up-to-date!"
msgstr "Đã cập nhật rồi!"
-#: merge-recursive.c:1929
+#: merge-recursive.c:1938
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "hòa trộn các cây %s và %s gặp lỗi"
-#: merge-recursive.c:2012
+#: merge-recursive.c:2021
msgid "Merging:"
msgstr "Đang trộn:"
-#: merge-recursive.c:2025
+#: merge-recursive.c:2034
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "tìm thấy %u tổ tiên chung:"
-#: merge-recursive.c:2064
+#: merge-recursive.c:2073
msgid "merge returned no commit"
msgstr "hòa trộn không trả về lần chuyển giao nào"
-#: merge-recursive.c:2127
+#: merge-recursive.c:2136
#, c-format
msgid "Could not parse object '%s'"
msgstr "Không thể phân tích đối tượng “%s”"
-#: merge-recursive.c:2141 builtin/merge.c:645 builtin/merge.c:792
+#: merge-recursive.c:2150 builtin/merge.c:645 builtin/merge.c:792
msgid "Unable to write index."
msgstr "Không thể ghi bảng mục lục"
@@ -2202,17 +2304,35 @@
msgid "malformed object name '%s'"
msgstr "tên đối tượng dị hình “%s”"
-#: path.c:826
+#: path.c:810
#, c-format
msgid "Could not make %s writable by group"
msgstr "Không thể làm %s được ghi bởi nhóm"
-#: pathspec.c:142
+#: pathspec.c:125
+msgid "Escape character '\\' not allowed as last character in attr value"
+msgstr ""
+"Ký tự thoát chuỗi “\\” không được phép là ký tự cuối trong giá trị thuộc tính"
+
+#: pathspec.c:143
+msgid "Only one 'attr:' specification is allowed."
+msgstr "chỉ có một đặc tả “attr:” là được phép."
+
+#: pathspec.c:146
+msgid "attr spec must not be empty"
+msgstr "đặc tả attr phải không được để trống"
+
+#: pathspec.c:189
+#, c-format
+msgid "invalid attribute name %s"
+msgstr "tên thuộc tính không hợp lệ %s"
+
+#: pathspec.c:254
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
"các cài đặt đặc tả đường dẫn “glob” và “noglob” toàn cục là xung khắc nhau"
-#: pathspec.c:149
+#: pathspec.c:261
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
@@ -2220,51 +2340,51 @@
"cài đặt đặc tả đường dẫn “literal” toàn cục là xung khắc với các cài đặt đặc "
"tả đường dẫn toàn cục khác"
-#: pathspec.c:188
+#: pathspec.c:301
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr "tham số không hợp lệ cho “tiền tố” màu nhiệm đặc tả đường đẫn"
-#: pathspec.c:201
+#: pathspec.c:322
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr "Số màu nhiệm đặc tả đường dẫn không hợp lệ “%.*s” trong “%s”"
-#: pathspec.c:206
+#: pathspec.c:327
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr "Thiếu “)” tại cuối của số màu nhiệm đặc tả đường dẫn trong “%s”"
-#: pathspec.c:238
+#: pathspec.c:365
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr "Chưa viết mã cho số màu nhiệm đặc tả đường dẫn “%c” trong “%s”"
-#: pathspec.c:293 pathspec.c:315
+#: pathspec.c:421 pathspec.c:443
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "Đặc tả đường dẫn “%s” thì ở trong mô-đun-con “%.*s”"
-#: pathspec.c:350
+#: pathspec.c:483
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s: “literal” và “glob” xung khắc nhau"
-#: pathspec.c:363
+#: pathspec.c:496
#, c-format
msgid "%s: '%s' is outside repository"
msgstr "%s: “%s” ngoài một kho chứa"
-#: pathspec.c:451
+#: pathspec.c:584
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "“%s” (mnemonic: “%c”)"
-#: pathspec.c:461
+#: pathspec.c:594
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr "%s: số mầu nhiệm đặc tả đường dẫn chưa được hỗ trợ bởi lệnh này: %s"
-#: pathspec.c:511
+#: pathspec.c:644
msgid ""
"empty strings as pathspecs will be made invalid in upcoming releases. please "
"use . instead if you meant to match all paths"
@@ -2272,24 +2392,16 @@
"chuỗi rỗng làm đặc tả đường dẫn không hợp lệ ở lần phát hành kế tiếp. Vui "
"lòng dùng . để thay thế nếu ý bạn là khớp mọi đường dẫn"
-#: pathspec.c:535
+#: pathspec.c:668
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "đặc tả đường dẫn “%s” vượt ra ngoài liên kết mềm"
-#: pathspec.c:544
-msgid ""
-"There is nothing to exclude from by :(exclude) patterns.\n"
-"Perhaps you forgot to add either ':/' or '.' ?"
-msgstr ""
-"Ở đây không có gì bị loại trừ bởi: các mẫu (loại trừ).\n"
-"Có lẽ bạn đã quên thêm hoặc là “:/” hoặc là “.”?"
-
#: pretty.c:982
msgid "unable to parse --pretty format"
msgstr "không thể phân tích định dạng --pretty"
-#: read-cache.c:1307
+#: read-cache.c:1442
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -2298,7 +2410,7 @@
"index.version được đặt, nhưng giá trị của nó lại không hợp lệ.\n"
"Dùng phiên bản %i"
-#: read-cache.c:1317
+#: read-cache.c:1452
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -2307,161 +2419,268 @@
"GIT_INDEX_VERSION được đặt, nhưng giá trị của nó lại không hợp lệ.\n"
"Dùng phiên bản %i"
-#: refs.c:576 builtin/merge.c:844
+#: read-cache.c:2375 sequencer.c:1350 sequencer.c:2048
+#, c-format
+msgid "could not stat '%s'"
+msgstr "không thể lấy thông tin thống kê về “%s”"
+
+#: read-cache.c:2388
+#, c-format
+msgid "unable to open git dir: %s"
+msgstr "không thể mở thư mục git: %s"
+
+#: read-cache.c:2400
+#, c-format
+msgid "unable to unlink: %s"
+msgstr "không thể bỏ liên kết (unlink): “%s”"
+
+#: refs.c:620 builtin/merge.c:844
#, c-format
msgid "Could not open '%s' for writing"
msgstr "Không thể mở “%s” để ghi"
-#: refs/files-backend.c:2481
+#: refs.c:1667
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "cập nhật tham chiếu bị cấm trong môi trường kiểm tra"
+
+#: refs/files-backend.c:1631
#, c-format
msgid "could not delete reference %s: %s"
msgstr "không thể xóa bỏ tham chiếu %s: %s"
-#: refs/files-backend.c:2484
+#: refs/files-backend.c:1634
#, c-format
msgid "could not delete references: %s"
msgstr "không thể xóa bỏ tham chiếu: %s"
-#: refs/files-backend.c:2493
+#: refs/files-backend.c:1643
#, c-format
msgid "could not remove reference %s"
msgstr "không thể gỡ bỏ tham chiếu: %s"
-#: ref-filter.c:56
+#: ref-filter.c:35 wt-status.c:1780
+msgid "gone"
+msgstr "đã ra đi"
+
+#: ref-filter.c:36
+#, c-format
+msgid "ahead %d"
+msgstr "phía trước %d"
+
+#: ref-filter.c:37
+#, c-format
+msgid "behind %d"
+msgstr "đằng sau %d"
+
+#: ref-filter.c:38
+#, c-format
+msgid "ahead %d, behind %d"
+msgstr "trước %d, sau %d"
+
+#: ref-filter.c:104
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "cần định dạng: %%(color:<color>)"
-#: ref-filter.c:58
+#: ref-filter.c:106
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "không nhận ra màu: %%(màu:%s)"
-#: ref-filter.c:72
+#: ref-filter.c:120
#, c-format
-msgid "unrecognized format: %%(%s)"
-msgstr "không nhận ra định dạng: %%(%s)"
+msgid "Integer value expected refname:lstrip=%s"
+msgstr "Giá trị nguyên cần tên tham chiếu:lstrip=%s"
-#: ref-filter.c:78
+#: ref-filter.c:124
+#, c-format
+msgid "Integer value expected refname:rstrip=%s"
+msgstr "Giá trị nguyên cần tên tham chiếu:rstrip=%s"
+
+#: ref-filter.c:126
+#, c-format
+msgid "unrecognized %%(%s) argument: %s"
+msgstr "đối số không được thừa nhận %%(%s): %s"
+
+#: ref-filter.c:166
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) không nhận các đối số"
-#: ref-filter.c:85
+#: ref-filter.c:173
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "%%(subject) không nhận các đối số"
-#: ref-filter.c:92
+#: ref-filter.c:180
#, c-format
msgid "%%(trailers) does not take arguments"
msgstr "%%(trailers) không nhận các đối số"
-#: ref-filter.c:111
+#: ref-filter.c:199
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "cần nội dung mang giá trị dương:lines=%s"
-#: ref-filter.c:113
+#: ref-filter.c:201
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "đối số không được thừa nhận %%(contents): %s"
-#: ref-filter.c:123
+#: ref-filter.c:214
+#, c-format
+msgid "positive value expected objectname:short=%s"
+msgstr "cần nội dung mang giá trị dương:shot=%s"
+
+#: ref-filter.c:218
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "đối số không được thừa nhận %%(objectname): %s"
-#: ref-filter.c:145
+#: ref-filter.c:245
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "cần định dạng: %%(align:<width>,<position>)"
-#: ref-filter.c:157
+#: ref-filter.c:257
#, c-format
msgid "unrecognized position:%s"
msgstr "vị trí không được thừa nhận:%s"
-#: ref-filter.c:161
+#: ref-filter.c:261
#, c-format
msgid "unrecognized width:%s"
msgstr "chiều rộng không được thừa nhận:%s"
-#: ref-filter.c:167
+#: ref-filter.c:267
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "đối số không được thừa nhận %%(align): %s"
-#: ref-filter.c:171
+#: ref-filter.c:271
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "cần giá trị độ rộng dương với nguyên tử %%(align)"
-#: ref-filter.c:255
+#: ref-filter.c:286
+#, c-format
+msgid "unrecognized %%(if) argument: %s"
+msgstr "đối số không được thừa nhận %%(if): %s"
+
+#: ref-filter.c:371
#, c-format
msgid "malformed field name: %.*s"
msgstr "tên trường dị hình: %.*s"
-#: ref-filter.c:281
+#: ref-filter.c:397
#, c-format
msgid "unknown field name: %.*s"
msgstr "không hiểu tên trường: %.*s"
-#: ref-filter.c:383
+#: ref-filter.c:501
+#, c-format
+msgid "format: %%(if) atom used without a %%(then) atom"
+msgstr "định dạng: nguyên tử %%(if) được dùng mà không có nguyên tử %%(then)"
+
+#: ref-filter.c:561
+#, c-format
+msgid "format: %%(then) atom used without an %%(if) atom"
+msgstr "định dạng: nguyên tử %%(then) được dùng mà không có nguyên tử %%(if)"
+
+#: ref-filter.c:563
+#, c-format
+msgid "format: %%(then) atom used more than once"
+msgstr "định dạng: nguyên tử %%(then) được dùng nhiều hơn một lần"
+
+#: ref-filter.c:565
+#, c-format
+msgid "format: %%(then) atom used after %%(else)"
+msgstr "định dạng: nguyên tử %%(then) được dùng sau %%(else)"
+
+#: ref-filter.c:591
+#, c-format
+msgid "format: %%(else) atom used without an %%(if) atom"
+msgstr "định dạng: nguyên tử %%(else) được dùng mà không có nguyên tử %%(if)"
+
+#: ref-filter.c:593
+#, c-format
+msgid "format: %%(else) atom used without a %%(then) atom"
+msgstr "định dạng: nguyên tử %%(else) được dùng mà không có nguyên tử %%(then)"
+
+#: ref-filter.c:595
+#, c-format
+msgid "format: %%(else) atom used more than once"
+msgstr "định dạng: nguyên tử %%(else) được dùng nhiều hơn một lần"
+
+#: ref-filter.c:608
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "định dạng: nguyên tử %%(end) được dùng mà không có nguyên tử tương ứng"
-#: ref-filter.c:435
+#: ref-filter.c:663
#, c-format
msgid "malformed format string %s"
msgstr "chuỗi định dạng dị hình %s"
-#: ref-filter.c:898
-msgid ":strip= requires a positive integer argument"
-msgstr ":strip= cần một đối số nguyên dương"
-
-#: ref-filter.c:903
+#: ref-filter.c:1247
#, c-format
-msgid "ref '%s' does not have %ld components to :strip"
-msgstr "tham chiếu “%s” không có %ld thành phần để mà :strip"
+msgid "(no branch, rebasing %s)"
+msgstr "(không nhánh, đang cải tổ %s)"
-#: ref-filter.c:1066
+#: ref-filter.c:1250
#, c-format
-msgid "unknown %.*s format %s"
-msgstr "Không hiểu định dạng %.*s %s"
+msgid "(no branch, bisect started on %s)"
+msgstr "(không nhánh, di chuyển nửa bước được bắt đầu tại %s)"
-#: ref-filter.c:1086 ref-filter.c:1117
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached at " in wt-status.c
+#: ref-filter.c:1256
+#, c-format
+msgid "(HEAD detached at %s)"
+msgstr "(HEAD được tách rời tại %s)"
+
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached from " in wt-status.c
+#: ref-filter.c:1261
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr "(HEAD được tách rời từ %s)"
+
+#: ref-filter.c:1265
+msgid "(no branch)"
+msgstr "(không nhánh)"
+
+#: ref-filter.c:1420 ref-filter.c:1451
#, c-format
msgid "missing object %s for %s"
msgstr "thiếu đối tượng %s cho %s"
-#: ref-filter.c:1089 ref-filter.c:1120
+#: ref-filter.c:1423 ref-filter.c:1454
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer gặp lỗi trên %s cho %s"
-#: ref-filter.c:1343
+#: ref-filter.c:1692
#, c-format
msgid "malformed object at '%s'"
msgstr "đối tượng dị hình tại “%s”"
-#: ref-filter.c:1410
+#: ref-filter.c:1759
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "đang lờ đi tham chiếu với tên hỏng %s"
-#: ref-filter.c:1415
+#: ref-filter.c:1764
#, c-format
msgid "ignoring broken ref %s"
msgstr "đang lờ đi tham chiếu hỏng %s"
-#: ref-filter.c:1670
+#: ref-filter.c:2028
#, c-format
msgid "format: %%(end) atom missing"
msgstr "định dạng: thiếu nguyên tử %%(end)"
-#: ref-filter.c:1734
+#: ref-filter.c:2109
#, c-format
msgid "malformed object name %s"
msgstr "tên đối tượng dị hình %s"
@@ -2607,15 +2826,25 @@
msgid "dup2(%d,%d) failed"
msgstr "dup2(%d,%d) gặp lỗi"
-#: send-pack.c:297
+#: send-pack.c:150
+#, c-format
+msgid "unable to parse remote unpack status: %s"
+msgstr "không thể phân tích tình trạng unpack máy chủ: %s"
+
+#: send-pack.c:152
+#, c-format
+msgid "remote unpack failed: %s"
+msgstr "máy chủ gặp lỗi unpack: %s"
+
+#: send-pack.c:315
msgid "failed to sign the push certificate"
msgstr "gặp lỗi khi ký chứng thực đẩy"
-#: send-pack.c:410
+#: send-pack.c:428
msgid "the receiving end does not support --signed push"
msgstr "kết thúc nhận không hỗ trợ đẩy --signed"
-#: send-pack.c:412
+#: send-pack.c:430
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -2623,11 +2852,11 @@
"đừng gửi giấy chứng nhận đẩy trước khi kết thúc nhận không hỗ trợ đẩy --"
"signed"
-#: send-pack.c:424
+#: send-pack.c:442
msgid "the receiving end does not support --atomic push"
msgstr "kết thúc nhận không hỗ trợ đẩy --atomic"
-#: send-pack.c:429
+#: send-pack.c:447
msgid "the receiving end does not support push options"
msgstr "kết thúc nhận không hỗ trợ các tùy chọn của lệnh push"
@@ -2666,12 +2895,12 @@
"với lệnh “git add <đường_dẫn>” hoặc “git rm <đường_dẫn>”\n"
"và chuyển giao kết quả bằng lệnh “git commit”"
-#: sequencer.c:294 sequencer.c:1667
+#: sequencer.c:294 sequencer.c:1682
#, c-format
msgid "could not lock '%s'"
msgstr "không thể khóa “%s”"
-#: sequencer.c:297 sequencer.c:1545 sequencer.c:1672 sequencer.c:1686
+#: sequencer.c:297 sequencer.c:1560 sequencer.c:1687 sequencer.c:1701
#, c-format
msgid "could not write to '%s'"
msgstr "không thể ghi vào “%s”"
@@ -2681,13 +2910,13 @@
msgid "could not write eol to '%s'"
msgstr "không thể ghi eol vào “%s”"
-#: sequencer.c:305 sequencer.c:1550 sequencer.c:1674
+#: sequencer.c:305 sequencer.c:1565 sequencer.c:1689
#, c-format
msgid "failed to finalize '%s'."
msgstr "gặp lỗi khi finalize “%s”"
-#: sequencer.c:329 sequencer.c:808 sequencer.c:1571 builtin/am.c:259
-#: builtin/commit.c:749 builtin/merge.c:1036
+#: sequencer.c:329 sequencer.c:814 sequencer.c:1586 builtin/am.c:257
+#: builtin/commit.c:749 builtin/merge.c:1018
#, c-format
msgid "could not read '%s'"
msgstr "Không thể đọc “%s”."
@@ -2751,17 +2980,17 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:688
+#: sequencer.c:694
#, c-format
msgid "could not parse commit %s\n"
msgstr "không thể phân tích lần chuyển giao %s\n"
-#: sequencer.c:693
+#: sequencer.c:699
#, c-format
msgid "could not parse parent commit %s\n"
msgstr "không thể phân tích lần chuyển giao cha mẹ “%s”\n"
-#: sequencer.c:815
+#: sequencer.c:821
#, c-format
msgid ""
"unexpected 1st line of squash message:\n"
@@ -2772,7 +3001,7 @@
"\n"
"\t%.*s"
-#: sequencer.c:821
+#: sequencer.c:827
#, c-format
msgid ""
"invalid 1st line of squash message:\n"
@@ -2783,233 +3012,233 @@
"\n"
"\t%.*s"
-#: sequencer.c:827 sequencer.c:852
+#: sequencer.c:833 sequencer.c:858
#, c-format
msgid "This is a combination of %d commits."
msgstr "Đây là tổ hợp của %d lần chuyển giao."
-#: sequencer.c:836
+#: sequencer.c:842
msgid "need a HEAD to fixup"
msgstr "cần một HEAD để sửa"
-#: sequencer.c:838
+#: sequencer.c:844
msgid "could not read HEAD"
msgstr "không thể đọc HEAD"
-#: sequencer.c:840
+#: sequencer.c:846
msgid "could not read HEAD's commit message"
msgstr "không thể đọc phần chú thích (message) của HEAD"
-#: sequencer.c:846
+#: sequencer.c:852
#, c-format
msgid "cannot write '%s'"
msgstr "không thể ghi “%s”"
-#: sequencer.c:855 git-rebase--interactive.sh:445
+#: sequencer.c:861 git-rebase--interactive.sh:445
msgid "This is the 1st commit message:"
msgstr "Đây là chú thích cho lần chuyển giao thứ nhất:"
-#: sequencer.c:863
+#: sequencer.c:869
#, c-format
msgid "could not read commit message of %s"
msgstr "không thể đọc phần chú thích (message) của %s"
-#: sequencer.c:870
+#: sequencer.c:876
#, c-format
msgid "This is the commit message #%d:"
msgstr "Đây là chú thích cho lần chuyển giao thứ #%d:"
-#: sequencer.c:875
+#: sequencer.c:881
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Chú thích cho lần chuyển giao thứ #%d sẽ bị bỏ qua:"
-#: sequencer.c:880
+#: sequencer.c:886
#, c-format
msgid "unknown command: %d"
msgstr "không hiểu câu lệnh %d"
-#: sequencer.c:946
+#: sequencer.c:952
msgid "your index file is unmerged."
msgstr "tập tin lưu mục lục của bạn không được hòa trộn."
-#: sequencer.c:964
+#: sequencer.c:970
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "lần chuyển giao %s là một lần hòa trộn nhưng không đưa ra tùy chọn -m."
-#: sequencer.c:972
+#: sequencer.c:978
#, c-format
msgid "commit %s does not have parent %d"
msgstr "lần chuyển giao %s không có cha mẹ %d"
-#: sequencer.c:976
+#: sequencer.c:982
#, c-format
msgid "mainline was specified but commit %s is not a merge."
msgstr ""
"luồng chính đã được chỉ ra nhưng lần chuyển giao %s không phải là một lần "
"hòa trộn."
-#: sequencer.c:982
+#: sequencer.c:988
#, c-format
msgid "cannot get commit message for %s"
msgstr "không thể lấy ghi chú lần chuyển giao cho %s"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1001
+#: sequencer.c:1009
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: không thể phân tích lần chuyển giao mẹ của %s"
-#: sequencer.c:1063 sequencer.c:1812
+#: sequencer.c:1071 sequencer.c:1827
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "không thể đổi tên “%s” thành “%s”"
-#: sequencer.c:1114
+#: sequencer.c:1122
#, c-format
msgid "could not revert %s... %s"
msgstr "không thể hoàn nguyên %s… %s"
-#: sequencer.c:1115
+#: sequencer.c:1123
#, c-format
msgid "could not apply %s... %s"
msgstr "không thể áp dụng miếng vá %s… %s"
-#: sequencer.c:1157
+#: sequencer.c:1165
msgid "empty commit set passed"
msgstr "lần chuyển giao trống rỗng đặt là hợp quy cách"
-#: sequencer.c:1167
+#: sequencer.c:1175
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: gặp lỗi đọc bảng mục lục"
-#: sequencer.c:1174
+#: sequencer.c:1182
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: gặp lỗi khi làm tươi mới bảng mục lục"
-#: sequencer.c:1294
+#: sequencer.c:1303
#, c-format
msgid "invalid line %d: %.*s"
msgstr "dòng không hợp lệ %d: %.*s"
-#: sequencer.c:1302
+#: sequencer.c:1311
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "không thể “%s” thể mà không có lần chuyển giao kế trước"
-#: sequencer.c:1334
+#: sequencer.c:1344
#, c-format
msgid "could not read '%s'."
msgstr "không thể đọc “%s”."
-#: sequencer.c:1341
+#: sequencer.c:1356
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "vui lòng sửa lỗi này bằng cách dùng “git rebase --edit-todo”."
-#: sequencer.c:1343
+#: sequencer.c:1358
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "bảng chỉ thị không thể dùng được: %s"
-#: sequencer.c:1348
+#: sequencer.c:1363
msgid "no commits parsed."
msgstr "không có lần chuyển giao nào được phân tích."
-#: sequencer.c:1359
+#: sequencer.c:1374
msgid "cannot cherry-pick during a revert."
msgstr "không thể cherry-pick trong khi hoàn nguyên."
-#: sequencer.c:1361
+#: sequencer.c:1376
msgid "cannot revert during a cherry-pick."
msgstr "không thể thực hiện việc hoàn nguyên trong khi đang cherry-pick."
-#: sequencer.c:1424
+#: sequencer.c:1439
#, c-format
msgid "invalid key: %s"
msgstr "khóa không đúng: %s"
-#: sequencer.c:1427
+#: sequencer.c:1442
#, c-format
msgid "invalid value for %s: %s"
msgstr "giá trị cho %s không hợp lệ: %s"
-#: sequencer.c:1484
+#: sequencer.c:1499
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "bảng tùy chọn dị hình: “%s”"
-#: sequencer.c:1522
+#: sequencer.c:1537
msgid "a cherry-pick or revert is already in progress"
msgstr "có một thao tác “cherry-pick” hoặc “revert” đang được thực hiện"
-#: sequencer.c:1523
+#: sequencer.c:1538
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "hãy thử \"git cherry-pick (--continue | --quit | --abort)\""
-#: sequencer.c:1526
+#: sequencer.c:1541
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "không thể tạo thư mục xếp dãy “%s”"
-#: sequencer.c:1540
+#: sequencer.c:1555
msgid "could not lock HEAD"
msgstr "không thể khóa HEAD"
-#: sequencer.c:1596 sequencer.c:2150
+#: sequencer.c:1611 sequencer.c:2181
msgid "no cherry-pick or revert in progress"
msgstr "không cherry-pick hay hoàn nguyên trong tiến trình"
-#: sequencer.c:1598
+#: sequencer.c:1613
msgid "cannot resolve HEAD"
msgstr "không thể phân giải HEAD"
-#: sequencer.c:1600 sequencer.c:1634
+#: sequencer.c:1615 sequencer.c:1649
msgid "cannot abort from a branch yet to be born"
msgstr "không thể hủy bỏ từ một nhánh mà nó còn chưa được tạo ra"
-#: sequencer.c:1620 builtin/grep.c:904
+#: sequencer.c:1635 builtin/grep.c:910
#, c-format
msgid "cannot open '%s'"
msgstr "không mở được “%s”"
-#: sequencer.c:1622
+#: sequencer.c:1637
#, c-format
msgid "cannot read '%s': %s"
msgstr "không thể đọc “%s”: %s"
-#: sequencer.c:1623
+#: sequencer.c:1638
msgid "unexpected end of file"
msgstr "gặp kết thúc tập tin đột xuất"
-#: sequencer.c:1629
+#: sequencer.c:1644
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "tập tin HEAD “pre-cherry-pick” đã lưu “%s” bị hỏng"
-#: sequencer.c:1640
+#: sequencer.c:1655
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
"Bạn có lẽ đã có HEAD đã bị di chuyển đi, Không thể tua, kiểm tra HEAD của "
"bạn!"
-#: sequencer.c:1777 sequencer.c:2049
+#: sequencer.c:1792 sequencer.c:2080
msgid "cannot read HEAD"
msgstr "không thể đọc HEAD"
-#: sequencer.c:1817 builtin/difftool.c:574
+#: sequencer.c:1832 builtin/difftool.c:616
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "không thể chép “%s” sang “%s”"
-#: sequencer.c:1833
+#: sequencer.c:1848
msgid "could not read index"
msgstr "không thể đọc bảng mục lục"
-#: sequencer.c:1838
+#: sequencer.c:1853
#, c-format
msgid ""
"execution failed: %s\n"
@@ -3024,11 +3253,11 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:1844
+#: sequencer.c:1859
msgid "and made changes to the index and/or the working tree\n"
msgstr "và tạo các thay đổi bảng mục lục và/hay cây làm việc\n"
-#: sequencer.c:1850
+#: sequencer.c:1865
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -3045,17 +3274,17 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:1905 git-rebase.sh:168
+#: sequencer.c:1920 git-rebase.sh:169
#, c-format
msgid "Applied autostash."
msgstr "Đã áp dụng autostash."
-#: sequencer.c:1917
+#: sequencer.c:1932
#, c-format
msgid "cannot store %s"
msgstr "không thử lưu “%s”"
-#: sequencer.c:1919 git-rebase.sh:172
+#: sequencer.c:1934 git-rebase.sh:173
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
@@ -3067,57 +3296,57 @@
"Bạn có thể chạy lệnh \"git stash pop\" hay \"git stash drop\" bất kỳ lúc "
"nào.\n"
-#: sequencer.c:2000
+#: sequencer.c:2016
#, c-format
-msgid "stopped at %s... %.*s"
-msgstr "dừng lại ở %s… %.*s"
+msgid "Stopped at %s... %.*s\n"
+msgstr "Dừng lại ở %s… %.*s\n"
-#: sequencer.c:2027
+#: sequencer.c:2058
#, c-format
msgid "unknown command %d"
msgstr "không hiểu câu lệnh %d"
-#: sequencer.c:2057
+#: sequencer.c:2088
msgid "could not read orig-head"
msgstr "không thể đọc orig-head"
-#: sequencer.c:2061
+#: sequencer.c:2092
msgid "could not read 'onto'"
msgstr "không thể đọc “onto”."
-#: sequencer.c:2068
+#: sequencer.c:2099
#, c-format
msgid "could not update %s"
msgstr "không thể cập nhật %s"
-#: sequencer.c:2075
+#: sequencer.c:2106
#, c-format
msgid "could not update HEAD to %s"
msgstr "không thể cập nhật HEAD thành %s"
-#: sequencer.c:2159
+#: sequencer.c:2190
msgid "cannot rebase: You have unstaged changes."
msgstr "không thể cải tổ: Bạn có các thay đổi chưa được đưa lên bệ phóng."
-#: sequencer.c:2164
+#: sequencer.c:2195
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "không thể xóa bỏ CHERRY_PICK_HEAD"
-#: sequencer.c:2173
+#: sequencer.c:2204
msgid "cannot amend non-existing commit"
msgstr "không thể tu bỏ một lần chuyển giao không tồn tại"
-#: sequencer.c:2175
+#: sequencer.c:2206
#, c-format
msgid "invalid file: '%s'"
msgstr "tập tin không hợp lệ: “%s”"
-#: sequencer.c:2177
+#: sequencer.c:2208
#, c-format
msgid "invalid contents: '%s'"
msgstr "nội dung không hợp lệ: “%s”"
-#: sequencer.c:2180
+#: sequencer.c:2211
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -3127,25 +3356,25 @@
"Bạn có các thay đổi chưa chuyển giao trong thư mục làm việc. Vui lòng\n"
"chuyển giao chúng trước và sau đó chạy lệnh “git rebase --continue” lần nữa."
-#: sequencer.c:2190
+#: sequencer.c:2221
msgid "could not commit staged changes."
msgstr "không thể chuyển giao các thay đổi đã đưa lên bệ phóng."
-#: sequencer.c:2270
+#: sequencer.c:2301
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: không thể cherry-pick một %s"
-#: sequencer.c:2274
+#: sequencer.c:2305
#, c-format
msgid "%s: bad revision"
msgstr "%s: điểm xét duyệt sai"
-#: sequencer.c:2307
+#: sequencer.c:2338
msgid "can't revert as initial commit"
msgstr "không thể hoàn nguyên một lần chuyển giao khởi tạo"
-#: setup.c:160
+#: setup.c:165
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
@@ -3155,7 +3384,7 @@
"Dùng “git <lệnh> -- <đường/dẫn>…” để chỉ định đường dẫn mà nó không tồn tại "
"một cách nội bộ."
-#: setup.c:173
+#: setup.c:178
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -3167,7 +3396,7 @@
"Dùng “--” để ngăn cách các đường dẫn khỏi điểm xem xét, như thế này:\n"
"“git <lệnh> [<điểm xem xét>…] -- [<tập tin>…]”"
-#: setup.c:223
+#: setup.c:228
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
@@ -3178,29 +3407,34 @@
"Dùng “--” để ngăn cách các đường dẫn khỏi điểm xem xét, như thế này:\n"
"“git <lệnh> [<điểm xem xét>…] -- [<tập tin>…]”"
-#: setup.c:470
+#: setup.c:475
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "Cần phiên bản kho git <= %d, nhưng lại nhận được %d"
-#: setup.c:478
+#: setup.c:483
msgid "unknown repository extensions found:"
msgstr "tìm thấy phần mở rộng kho chưa biết:"
-#: setup.c:768
+#: setup.c:776
#, c-format
msgid "Not a git repository (or any of the parent directories): %s"
msgstr "Không phải là kho git (hoặc bất kỳ thư mục cha mẹ nào): %s"
-#: setup.c:770 setup.c:922 builtin/index-pack.c:1643
+#: setup.c:778 builtin/index-pack.c:1646
msgid "Cannot come back to cwd"
msgstr "Không thể quay lại cwd"
-#: setup.c:852
+#: setup.c:1010
msgid "Unable to read current working directory"
msgstr "Không thể đọc thư mục làm việc hiện hành"
-#: setup.c:927
+#: setup.c:1022 setup.c:1028
+#, c-format
+msgid "Cannot change to '%s'"
+msgstr "Không thể chuyển sang “%s”"
+
+#: setup.c:1041
#, c-format
msgid ""
"Not a git repository (or any parent up to mount point %s)\n"
@@ -3210,12 +3444,7 @@
"Dừng tại biên của hệ thống tập tin (GIT_DISCOVERY_ACROSS_FILESYSTEM chưa "
"đặt)."
-#: setup.c:934
-#, c-format
-msgid "Cannot change to '%s/..'"
-msgstr "Không thể chuyển sang “%s/..”"
-
-#: setup.c:996
+#: setup.c:1106
#, c-format
msgid ""
"Problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -3224,56 +3453,56 @@
"Gặp vấn đề với gía trị chế độ tập tin core.sharedRepository (0%.3o).\n"
"người sở hữu tập tin phải luôn có quyền đọc và ghi."
-#: sha1_file.c:490
+#: sha1_file.c:559
#, c-format
msgid "path '%s' does not exist"
msgstr "đường dẫn “%s” không tồn tại"
-#: sha1_file.c:516
+#: sha1_file.c:585
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr "kho tham chiếu “%s” như là lấy ra liên kết vẫn chưa được hỗ trợ."
-#: sha1_file.c:522
+#: sha1_file.c:591
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "kho tham chiếu “%s” không phải là một kho nội bộ."
-#: sha1_file.c:528
+#: sha1_file.c:597
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "kho tham chiếu “%s” là nông"
-#: sha1_file.c:536
+#: sha1_file.c:605
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "kho tham chiếu “%s” bị cấy ghép"
-#: sha1_file.c:1176
+#: sha1_file.c:1245
msgid "offset before end of packfile (broken .idx?)"
msgstr "vị trí tương đối trước điểm kết thúc của tập tin gói (.idx hỏng à?)"
-#: sha1_file.c:2637
+#: sha1_file.c:2721
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "vị trí tương đối nằm trước chỉ mục gói cho %s (mục lục bị hỏng à?)"
-#: sha1_file.c:2641
+#: sha1_file.c:2725
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
"vị trí tương đối vượt quá cuối của chỉ mục gói cho %s (mục lục bị cắt cụt à?)"
-#: sha1_name.c:407
+#: sha1_name.c:409
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr "tóm lược SHA1 %s chưa rõ ràng"
-#: sha1_name.c:418
+#: sha1_name.c:420
msgid "The candidates are:"
msgstr "Các ứng cử là:"
-#: sha1_name.c:578
+#: sha1_name.c:580
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"
@@ -3297,46 +3526,56 @@
"này\n"
"bằng cách chạy lệnh \"git config advice.objectNameWarning false\""
-#: submodule.c:65 submodule.c:99
+#: submodule.c:67 submodule.c:101
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
"Không thể thay đổi .gitmodules chưa hòa trộn, hãy giải quyết xung đột trộn "
"trước"
-#: submodule.c:69 submodule.c:103
+#: submodule.c:71 submodule.c:105
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "Không thể tìm thấy phần trong .gitmodules nơi mà đường_dẫn=%s"
-#: submodule.c:77
+#: submodule.c:79
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "Không thể cập nhật mục .gitmodules %s"
-#: submodule.c:110
+#: submodule.c:112
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "Không thể gỡ bỏ mục .gitmodules dành cho %s"
-#: submodule.c:121
+#: submodule.c:123
msgid "staging updated .gitmodules failed"
msgstr "gặp lỗi khi tổ chức .gitmodules đã cập nhật"
-#: submodule.c:159
+#: submodule.c:161
msgid "negative values not allowed for submodule.fetchJobs"
msgstr "không cho phép giá trị âm ở submodule.fetchJobs"
-#: submodule.c:1184
+#: submodule.c:1194
#, c-format
-msgid "could not start 'git status in submodule '%s'"
-msgstr "không thể khởi chạy “git status trong mô-đun-con cho “%s”"
+msgid "'%s' not recognized as a git repository"
+msgstr "không nhận ra “%s” là một kho git"
-#: submodule.c:1197
+#: submodule.c:1332
#, c-format
-msgid "could not run 'git status in submodule '%s'"
-msgstr "không thể chạy “git status trong mô-đun-con “%s”"
+msgid "could not start 'git status' in submodule '%s'"
+msgstr "không thể lấy thống kê “git status” trong mô-đun-con “%s”"
-#: submodule.c:1398
+#: submodule.c:1345
+#, c-format
+msgid "could not run 'git status' in submodule '%s'"
+msgstr "không thể chạy “git status” trong mô-đun-con “%s”"
+
+#: submodule.c:1421
+#, c-format
+msgid "submodule '%s' has dirty index"
+msgstr "mô-đun-con “%s” có mục lục còn bẩn"
+
+#: submodule.c:1678
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -3344,18 +3583,18 @@
"relocate_gitdir cho mô-đun-con “%s” với nhiều hơn một cây làm việc là chưa "
"được hỗ trợ"
-#: submodule.c:1410 submodule.c:1471
+#: submodule.c:1690 submodule.c:1746
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "không thể tìm kiếm tên cho mô-đun-con “%s”"
-#: submodule.c:1414 submodule.c:1474 builtin/submodule--helper.c:640
-#: builtin/submodule--helper.c:650
+#: submodule.c:1694 builtin/submodule--helper.c:678
+#: builtin/submodule--helper.c:688
#, c-format
msgid "could not create directory '%s'"
msgstr "không thể tạo thư mục “%s”"
-#: submodule.c:1420
+#: submodule.c:1697
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -3366,12 +3605,25 @@
"“%s” sang\n"
"“%s”\n"
-#: submodule.c:1512
+#: submodule.c:1781
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "không thể đệ quy vào trong mô-đun-con “%s”"
-#: submodule-config.c:360
+#: submodule.c:1825
+msgid "could not start ls-files in .."
+msgstr "không thể lấy thông tin thống kê về ls-files trong .."
+
+#: submodule.c:1845
+msgid "BUG: returned path string doesn't match cwd?"
+msgstr "LỖI: trả về chuỗi đường dẫn không khớp cwd?"
+
+#: submodule.c:1864
+#, c-format
+msgid "ls-tree returned unexpected return code %d"
+msgstr "ls-tree trả về mã không như mong đợi %d"
+
+#: submodule-config.c:380
#, c-format
msgid "invalid value for %s"
msgstr "giá trị cho %s không hợp lệ"
@@ -3440,7 +3692,7 @@
msgid "transport: invalid depth option '%s'"
msgstr "vận chuyển: tùy chọn độ sâu “%s” không hợp lệ"
-#: transport.c:885
+#: transport.c:889
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -3449,7 +3701,7 @@
"Các đường dẫn mô-đun-con sau đây có chứa các thay đổi cái mà\n"
"có thể được tìm thấy trên mọi máy phục vụ:\n"
-#: transport.c:889
+#: transport.c:893
#, c-format
msgid ""
"\n"
@@ -3476,11 +3728,11 @@
"để đẩy chúng lên máy phục vụ.\n"
"\n"
-#: transport.c:897
+#: transport.c:901
msgid "Aborting."
msgstr "Bãi bỏ."
-#: transport-helper.c:1082
+#: transport-helper.c:1080
#, c-format
msgid "Could not read ref %s"
msgstr "Không thể đọc tham chiếu %s"
@@ -3501,7 +3753,7 @@
msgid "too-short tree file"
msgstr "tập tin cây quá ngắn"
-#: unpack-trees.c:99
+#: unpack-trees.c:104
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -3512,7 +3764,7 @@
"%%sVui lòng chuyển giao các thay đổi hay tạm cất chúng đi trước khi bạn "
"chuyển nhánh."
-#: unpack-trees.c:101
+#: unpack-trees.c:106
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -3522,7 +3774,7 @@
"checkout:\n"
"%%s"
-#: unpack-trees.c:104
+#: unpack-trees.c:109
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -3533,7 +3785,7 @@
"%%sVui lòng chuyển giao các thay đổi hay tạm cất chúng đi trước khi bạn hòa "
"trộn."
-#: unpack-trees.c:106
+#: unpack-trees.c:111
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -3543,7 +3795,7 @@
"hòa trộn:\n"
"%%s"
-#: unpack-trees.c:109
+#: unpack-trees.c:114
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -3553,7 +3805,7 @@
"%s:\n"
"%%sVui lòng chuyển giao các thay đổi hay tạm cất chúng đi trước khi bạn %s."
-#: unpack-trees.c:111
+#: unpack-trees.c:116
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -3563,7 +3815,7 @@
"%s:\n"
"%%s"
-#: unpack-trees.c:116
+#: unpack-trees.c:121
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -3573,7 +3825,7 @@
"trong nó:\n"
"%s"
-#: unpack-trees.c:120
+#: unpack-trees.c:125
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -3583,7 +3835,7 @@
"checkout:\n"
"%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn chuyển nhánh."
-#: unpack-trees.c:122
+#: unpack-trees.c:127
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -3593,36 +3845,36 @@
"checkout:\n"
"%%s"
-#: unpack-trees.c:125
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%sPlease move or remove them before you merge."
-msgstr ""
-"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị gỡ bỏ bởi lệnh hòa "
-"trộn:\n"
-"%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn hòa trộn."
-
-#: unpack-trees.c:127
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%s"
-msgstr ""
-"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị gỡ bỏ bởi lệnh hòa "
-"trộn:\n"
-"%%s"
-
#: unpack-trees.c:130
#, c-format
msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr ""
+"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị gỡ bỏ bởi lệnh hòa "
+"trộn:\n"
+"%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn hòa trộn."
+
+#: unpack-trees.c:132
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị gỡ bỏ bởi lệnh hòa "
+"trộn:\n"
+"%%s"
+
+#: unpack-trees.c:135
+#, c-format
+msgid ""
"The following untracked working tree files would be removed by %s:\n"
"%%sPlease move or remove them before you %s."
msgstr ""
"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị gỡ bỏ bởi %s:\n"
"%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn %s."
-#: unpack-trees.c:132
+#: unpack-trees.c:137
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -3631,7 +3883,7 @@
"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị gỡ bỏ bởi %s:\n"
"%%s"
-#: unpack-trees.c:137
+#: unpack-trees.c:142
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -3642,7 +3894,7 @@
"checkout:\n"
"%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn chuyển nhánh."
-#: unpack-trees.c:139
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -3653,7 +3905,7 @@
"checkout:\n"
"%%s"
-#: unpack-trees.c:142
+#: unpack-trees.c:147
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -3663,7 +3915,7 @@
"hòa trộn:\n"
"%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn hòa trộn."
-#: unpack-trees.c:144
+#: unpack-trees.c:149
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -3673,7 +3925,7 @@
"hòa trộn:\n"
"%%s"
-#: unpack-trees.c:147
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -3683,7 +3935,7 @@
"%s:\n"
"%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn %s."
-#: unpack-trees.c:149
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -3693,12 +3945,12 @@
"%s:\n"
"%%s"
-#: unpack-trees.c:156
+#: unpack-trees.c:161
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "Mục “%s” đè lên “%s”. Không thể buộc."
-#: unpack-trees.c:159
+#: unpack-trees.c:164
#, c-format
msgid ""
"Cannot update sparse checkout: the following entries are not up-to-date:\n"
@@ -3707,7 +3959,7 @@
"Không thể cập nhật checkout rải rác: các mục tin sau đây chưa cập nhật:\n"
"%s"
-#: unpack-trees.c:161
+#: unpack-trees.c:166
#, c-format
msgid ""
"The following working tree files would be overwritten by sparse checkout "
@@ -3718,7 +3970,7 @@
"nhật checkout rải rác:\n"
"%s"
-#: unpack-trees.c:163
+#: unpack-trees.c:168
#, c-format
msgid ""
"The following working tree files would be removed by sparse checkout "
@@ -3729,45 +3981,59 @@
"nhật checkout rải rác:\n"
"%s"
-#: unpack-trees.c:240
+#: unpack-trees.c:170
+#, c-format
+msgid ""
+"Cannot update submodule:\n"
+"%s"
+msgstr ""
+"Không thể cập nhật mô-đun-con:\n"
+"%s"
+
+#: unpack-trees.c:247
#, c-format
msgid "Aborting\n"
msgstr "Bãi bỏ\n"
-#: unpack-trees.c:270
+#: unpack-trees.c:272
+#, c-format
+msgid "submodule update strategy not supported for submodule '%s'"
+msgstr "chiến lược cập nhật mô-đun-con không được hỗ trợ cho mô-đun-con “%s”"
+
+#: unpack-trees.c:340
msgid "Checking out files"
msgstr "Đang lấy ra các tập tin"
-#: urlmatch.c:120
+#: urlmatch.c:163
msgid "invalid URL scheme name or missing '://' suffix"
msgstr "tên lược đồ URL không hợp lệ, hoặc thiếu hậu tố “://”"
-#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
+#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
#, c-format
msgid "invalid %XX escape sequence"
msgstr "thoát chuỗi %XX không hợp lệ"
-#: urlmatch.c:172
+#: urlmatch.c:215
msgid "missing host and scheme is not 'file:'"
msgstr "thiếu máy chủ và lược đồ thì không phải là giao thức “file:”"
-#: urlmatch.c:189
+#: urlmatch.c:232
msgid "a 'file:' URL may not have a port number"
msgstr "URL kiểu “file:” không được chứa cổng"
-#: urlmatch.c:199
+#: urlmatch.c:247
msgid "invalid characters in host name"
msgstr "có các ký tự không hợp lệ trong tên máy"
-#: urlmatch.c:244 urlmatch.c:255
+#: urlmatch.c:292 urlmatch.c:303
msgid "invalid port number"
msgstr "tên cổng không hợp lệ"
-#: urlmatch.c:322
+#: urlmatch.c:371
msgid "invalid '..' path segment"
msgstr "đoạn đường dẫn “..” không hợp lệ"
-#: worktree.c:282
+#: worktree.c:285
#, c-format
msgid "failed to read '%s'"
msgstr "gặp lỗi khi đọc “%s”"
@@ -3782,28 +4048,28 @@
msgid "could not open '%s' for writing"
msgstr "không thể mở “%s” để ghi"
-#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759
-#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1033
+#: 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
#, c-format
msgid "could not open '%s' for reading"
msgstr "không thể mở “%s” để đọc"
-#: wrapper.c:605 wrapper.c:626
+#: wrapper.c:581 wrapper.c:602
#, c-format
msgid "unable to access '%s'"
msgstr "không thể truy cập “%s”"
-#: wrapper.c:634
+#: wrapper.c:610
msgid "unable to get current working directory"
msgstr "Không thể lấy thư mục làm việc hiện hành"
-#: wrapper.c:658
+#: wrapper.c:634
#, c-format
msgid "could not write to %s"
msgstr "không thể ghi vào %s"
-#: wrapper.c:660
+#: wrapper.c:636
#, c-format
msgid "could not close %s"
msgstr "không thể đóng %s"
@@ -3835,11 +4101,11 @@
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (dùng \"git rm <tập-tin>…\" để đánh dấu là cần giải quyết)"
-#: wt-status.c:199 wt-status.c:945
+#: wt-status.c:199 wt-status.c:958
msgid "Changes to be committed:"
msgstr "Những thay đổi sẽ được chuyển giao:"
-#: wt-status.c:217 wt-status.c:954
+#: wt-status.c:217 wt-status.c:967
msgid "Changes not staged for commit:"
msgstr "Các thay đổi chưa được đặt lên bệ phóng để chuyển giao:"
@@ -3943,15 +4209,15 @@
msgid "untracked content, "
msgstr "nội dung chưa được theo dõi, "
-#: wt-status.c:818
+#: wt-status.c:831
msgid "Submodules changed but not updated:"
msgstr "Những mô-đun-con đã bị thay đổi nhưng chưa được cập nhật:"
-#: wt-status.c:820
+#: wt-status.c:833
msgid "Submodule changes to be committed:"
msgstr "Những mô-đun-con thay đổi đã được chuyển giao:"
-#: wt-status.c:901
+#: wt-status.c:914
msgid ""
"Do not touch the line above.\n"
"Everything below will be removed."
@@ -3959,109 +4225,109 @@
"Không động đến đường ở trên.\n"
"Mọi thứ phía dưới sẽ được xóa bỏ."
-#: wt-status.c:1013
+#: wt-status.c:1026
msgid "You have unmerged paths."
msgstr "Bạn có những đường dẫn chưa được hòa trộn."
-#: wt-status.c:1016
+#: wt-status.c:1029
msgid " (fix conflicts and run \"git commit\")"
msgstr " (sửa các xung đột rồi chạy \"git commit\")"
-#: wt-status.c:1018
+#: wt-status.c:1031
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (dùng \"git merge --abort\" để bãi bỏ việc hòa trộn)"
-#: wt-status.c:1023
+#: wt-status.c:1036
msgid "All conflicts fixed but you are still merging."
msgstr "Tất cả các xung đột đã được giải quyết nhưng bạn vẫn đang hòa trộn."
-#: wt-status.c:1026
+#: wt-status.c:1039
msgid " (use \"git commit\" to conclude merge)"
msgstr " (dùng \"git commit\" để hoàn tất việc hòa trộn)"
-#: wt-status.c:1036
+#: wt-status.c:1049
msgid "You are in the middle of an am session."
msgstr "Bạn đang ở giữa của một phiên “am”."
-#: wt-status.c:1039
+#: wt-status.c:1052
msgid "The current patch is empty."
msgstr "Miếng vá hiện tại bị trống rỗng."
-#: wt-status.c:1043
+#: wt-status.c:1056
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (sửa các xung đột và sau đó chạy lệnh \"git am --continue\")"
-#: wt-status.c:1045
+#: wt-status.c:1058
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (dùng \"git am --skip\" để bỏ qua miếng vá này)"
-#: wt-status.c:1047
+#: wt-status.c:1060
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (dùng \"git am --abort\" để phục hồi lại nhánh nguyên thủy)"
-#: wt-status.c:1176
+#: wt-status.c:1189
msgid "git-rebase-todo is missing."
msgstr "thiếu git-rebase-todo"
-#: wt-status.c:1178
+#: wt-status.c:1191
msgid "No commands done."
msgstr "Không thực hiện lệnh nào."
-#: wt-status.c:1181
+#: wt-status.c:1194
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] "Lệnh thực hiện cuối (%d lệnh được thực thi):"
-#: wt-status.c:1192
+#: wt-status.c:1205
#, c-format
msgid " (see more in file %s)"
msgstr " (xem thêm trong %s)"
-#: wt-status.c:1197
+#: wt-status.c:1210
msgid "No commands remaining."
msgstr "Không có lệnh nào còn lại."
-#: wt-status.c:1200
+#: wt-status.c:1213
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
msgstr[0] "Lệnh cần làm kế tiếp (%d lệnh còn lại):"
-#: wt-status.c:1208
+#: wt-status.c:1221
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (dùng lệnh \"git rebase --edit-todo\" để xem và sửa)"
-#: wt-status.c:1221
+#: wt-status.c:1234
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Bạn hiện nay đang thực hiện việc “rebase” nhánh “%s” trên “%s”."
-#: wt-status.c:1226
+#: wt-status.c:1239
msgid "You are currently rebasing."
msgstr "Bạn hiện nay đang thực hiện việc “rebase” (“cải tổ”)."
-#: wt-status.c:1240
+#: wt-status.c:1253
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
" (sửa các xung đột và sau đó chạy lệnh “cải tổ” \"git rebase --continue\")"
-#: wt-status.c:1242
+#: wt-status.c:1255
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (dùng lệnh “cải tổ” \"git rebase --skip\" để bỏ qua lần vá này)"
-#: wt-status.c:1244
+#: wt-status.c:1257
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
" (dùng lệnh “cải tổ” \"git rebase --abort\" để check-out nhánh nguyên thủy)"
-#: wt-status.c:1250
+#: wt-status.c:1263
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
" (khi tất cả các xung đột đã sửa xong: chạy lệnh “cải tổ” \"git rebase --"
"continue\")"
-#: wt-status.c:1254
+#: wt-status.c:1267
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -4069,130 +4335,130 @@
"Bạn hiện nay đang thực hiện việc chia tách một lần chuyển giao trong khi "
"đang “rebase” nhánh “%s” trên “%s”."
-#: wt-status.c:1259
+#: wt-status.c:1272
msgid "You are currently splitting a commit during a rebase."
msgstr ""
"Bạn hiện tại đang cắt đôi một lần chuyển giao trong khi đang thực hiện việc "
"rebase."
-#: wt-status.c:1262
+#: wt-status.c:1275
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
" (Một khi thư mục làm việc của bạn đã gọn gàng, chạy lệnh “cải tổ” \"git "
"rebase --continue\")"
-#: wt-status.c:1266
+#: wt-status.c:1279
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Bạn hiện nay đang thực hiện việc sửa chữa một lần chuyển giao trong khi đang "
"rebase nhánh “%s” trên “%s”."
-#: wt-status.c:1271
+#: wt-status.c:1284
msgid "You are currently editing a commit during a rebase."
msgstr "Bạn hiện đang sửa một lần chuyển giao trong khi bạn thực hiện rebase."
-#: wt-status.c:1274
+#: wt-status.c:1287
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (dùng \"git commit --amend\" để “tu bổ” lần chuyển giao hiện tại)"
-#: wt-status.c:1276
+#: wt-status.c:1289
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
" (chạy lệnh “cải tổ” \"git rebase --continue\" một khi bạn cảm thấy hài "
"lòng về những thay đổi của mình)"
-#: wt-status.c:1286
+#: wt-status.c:1299
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Bạn hiện nay đang thực hiện việc cherry-pick lần chuyển giao %s."
-#: wt-status.c:1291
+#: wt-status.c:1304
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr ""
" (sửa các xung đột và sau đó chạy lệnh \"git cherry-pick --continue\")"
-#: wt-status.c:1294
+#: wt-status.c:1307
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git cherry-pick --"
"continue\")"
-#: wt-status.c:1296
+#: wt-status.c:1309
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr " (dùng \"git cherry-pick --abort\" để hủy bỏ thao tác cherry-pick)"
-#: wt-status.c:1305
+#: wt-status.c:1318
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Bạn hiện nay đang thực hiện thao tác hoàn nguyên lần chuyển giao “%s”."
-#: wt-status.c:1310
+#: wt-status.c:1323
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (sửa các xung đột và sau đó chạy lệnh \"git revert --continue\")"
-#: wt-status.c:1313
+#: wt-status.c:1326
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
" (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git revert --continue\")"
-#: wt-status.c:1315
+#: wt-status.c:1328
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (dùng \"git revert --abort\" để hủy bỏ thao tác hoàn nguyên)"
-#: wt-status.c:1326
+#: wt-status.c:1339
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr ""
"Bạn hiện nay đang thực hiện thao tác di chuyển nửa bước (bisect), bắt đầu từ "
"nhánh “%s”."
-#: wt-status.c:1330
+#: wt-status.c:1343
msgid "You are currently bisecting."
msgstr "Bạn hiện tại đang thực hiện việc bisect (di chuyển nửa bước)."
-#: wt-status.c:1333
+#: wt-status.c:1346
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (dùng \"git bisect reset\" để quay trở lại nhánh nguyên thủy)"
-#: wt-status.c:1530
+#: wt-status.c:1543
msgid "On branch "
msgstr "Trên nhánh "
-#: wt-status.c:1536
+#: wt-status.c:1549
msgid "interactive rebase in progress; onto "
msgstr "rebase ở chế độ tương tác đang được thực hiện; lên trên "
-#: wt-status.c:1538
+#: wt-status.c:1551
msgid "rebase in progress; onto "
msgstr "rebase đang được thực hiện: lên trên "
-#: wt-status.c:1543
+#: wt-status.c:1556
msgid "HEAD detached at "
msgstr "HEAD được tách rời tại "
-#: wt-status.c:1545
+#: wt-status.c:1558
msgid "HEAD detached from "
msgstr "HEAD được tách rời từ "
-#: wt-status.c:1548
+#: wt-status.c:1561
msgid "Not currently on any branch."
msgstr "Hiện tại chẳng ở nhánh nào cả."
-#: wt-status.c:1566
+#: wt-status.c:1579
msgid "Initial commit"
msgstr "Lần chuyển giao khởi tạo"
-#: wt-status.c:1580
+#: wt-status.c:1593
msgid "Untracked files"
msgstr "Những tập tin chưa được theo dõi"
-#: wt-status.c:1582
+#: wt-status.c:1595
msgid "Ignored files"
msgstr "Những tập tin bị lờ đi"
-#: wt-status.c:1586
+#: wt-status.c:1599
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -4204,32 +4470,32 @@
"có lẽ làm nó nhanh hơn, nhưng bạn phải cẩn thận đừng quên mình phải\n"
"tự thêm các tập tin mới (xem “git help status”.."
-#: wt-status.c:1592
+#: wt-status.c:1605
#, c-format
msgid "Untracked files not listed%s"
msgstr "Những tập tin chưa được theo dõi không được liệt kê ra %s"
-#: wt-status.c:1594
+#: wt-status.c:1607
msgid " (use -u option to show untracked files)"
msgstr " (dùng tùy chọn -u để hiển thị các tập tin chưa được theo dõi)"
-#: wt-status.c:1600
+#: wt-status.c:1613
msgid "No changes"
msgstr "Không có thay đổi nào"
-#: wt-status.c:1605
+#: wt-status.c:1618
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"không có thay đổi nào được thêm vào để chuyển giao (dùng \"git add\" và/hoặc "
"\"git commit -a\")\n"
-#: wt-status.c:1608
+#: wt-status.c:1621
#, c-format
msgid "no changes added to commit\n"
msgstr "không có thay đổi nào được thêm vào để chuyển giao\n"
-#: wt-status.c:1611
+#: wt-status.c:1624
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -4238,74 +4504,70 @@
"không có gì được thêm vào lần chuyển giao nhưng có những tập tin chưa được "
"theo dõi hiện diện (dùng \"git add\" để đưa vào theo dõi)\n"
-#: wt-status.c:1614
+#: wt-status.c:1627
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr ""
"không có gì được thêm vào lần chuyển giao nhưng có những tập tin chưa được "
"theo dõi hiện diện\n"
-#: wt-status.c:1617
+#: wt-status.c:1630
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"không có gì để chuyển giao (tạo/sao-chép các tập tin và dùng \"git add\" để "
"đưa vào theo dõi)\n"
-#: wt-status.c:1620 wt-status.c:1625
+#: wt-status.c:1633 wt-status.c:1638
#, c-format
msgid "nothing to commit\n"
msgstr "không có gì để chuyển giao\n"
-#: wt-status.c:1623
+#: wt-status.c:1636
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
"không có gì để chuyển giao (dùng -u xem các tập tin chưa được theo dõi)\n"
-#: wt-status.c:1627
+#: wt-status.c:1640
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "không có gì để chuyển giao, thư mục làm việc sạch sẽ\n"
-#: wt-status.c:1734
+#: wt-status.c:1749
msgid "Initial commit on "
msgstr "Lần chuyển giao khởi tạo trên "
-#: wt-status.c:1738
+#: wt-status.c:1753
msgid "HEAD (no branch)"
msgstr "HEAD (không nhánh)"
-#: wt-status.c:1767
-msgid "gone"
-msgstr "đã ra đi"
-
-#: wt-status.c:1769 wt-status.c:1777
+#: wt-status.c:1782 wt-status.c:1790
msgid "behind "
msgstr "đằng sau "
-#: wt-status.c:1772 wt-status.c:1775
+#: wt-status.c:1785 wt-status.c:1788
msgid "ahead "
msgstr "phía trước "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2277
+#: wt-status.c:2280
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "không thể %s: Bạn có các thay đổi chưa được đưa lên bệ phóng."
-#: wt-status.c:2283
+#: wt-status.c:2286
msgid "additionally, your index contains uncommitted changes."
msgstr ""
"thêm vào đó, bảng mục lục của bạn có chứa các thay đổi chưa được chuyển giao."
-#: wt-status.c:2285
+#: wt-status.c:2288
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr ""
"không thể %s: Mục lục của bạn có chứa các thay đổi chưa được chuyển giao."
-#: compat/precompose_utf8.c:57 builtin/clone.c:414
+#: compat/precompose_utf8.c:57 builtin/clone.c:432
#, c-format
msgid "failed to unlink '%s'"
msgstr "gặp lỗi khi bỏ liên kết (unlink) “%s”"
@@ -4333,7 +4595,7 @@
msgstr ""
"Đưa ra khỏi bệ phóng các thay đổi sau khi làm tươi mới lại bảng mục lục:"
-#: builtin/add.c:209 builtin/rev-parse.c:845
+#: builtin/add.c:209 builtin/rev-parse.c:872
msgid "Could not read the index"
msgstr "Không thể đọc bảng mục lục"
@@ -4353,7 +4615,7 @@
#: builtin/add.c:230
#, c-format
msgid "Could not stat '%s'"
-msgstr "không thể lấy thông tin thống kê về “%s”"
+msgstr "Không thể lấy thông tin thống kê về “%s”"
#: builtin/add.c:232
msgid "Empty patch. Aborted."
@@ -4370,9 +4632,9 @@
"Các đường dẫn theo sau đây sẽ bị lờ đi bởi một trong các tập tin .gitignore "
"của bạn:\n"
-#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:123
+#: 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:1326 builtin/rm.c:241 builtin/send-pack.c:162
+#: builtin/remote.c:1328 builtin/rm.c:241 builtin/send-pack.c:163
msgid "dry run"
msgstr "chạy thử"
@@ -4380,7 +4642,7 @@
msgid "interactive picking"
msgstr "sửa bằng cách tương tác"
-#: builtin/add.c:270 builtin/checkout.c:1159 builtin/reset.c:286
+#: builtin/add.c:270 builtin/checkout.c:1177 builtin/reset.c:286
msgid "select hunks interactively"
msgstr "chọn “hunks” theo kiểu tương tác"
@@ -4424,11 +4686,11 @@
msgstr ""
"kiểm tra xem - thậm chí thiếu - tập tin bị bỏ qua trong quá trình chạy thử"
-#: builtin/add.c:283 builtin/update-index.c:947
+#: builtin/add.c:283 builtin/update-index.c:951
msgid "(+/-)x"
msgstr "(+/-)x"
-#: builtin/add.c:283 builtin/update-index.c:948
+#: builtin/add.c:283 builtin/update-index.c:952
msgid "override the executable bit of the listed files"
msgstr "ghi đè lên bít thi hành của các tập tin được liệt kê"
@@ -4464,114 +4726,114 @@
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Có lẽ ý bạn là “git add .” phải không?\n"
-#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279
-#: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350
+#: 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/submodule--helper.c:244
msgid "index file corrupt"
msgstr "tập tin ghi bảng mục lục bị hỏng"
-#: builtin/am.c:414
+#: builtin/am.c:412
msgid "could not parse author script"
msgstr "không thể phân tích cú pháp văn lệnh tác giả"
-#: builtin/am.c:491
+#: builtin/am.c:489
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "“%s” bị xóa bởi móc applypatch-msg"
-#: builtin/am.c:532
+#: builtin/am.c:530
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Dòng đầu vào dị hình: “%s”."
-#: builtin/am.c:569
+#: builtin/am.c:567
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Gặp lỗi khi sao chép ghi chú (note) từ “%s” tới “%s”"
-#: builtin/am.c:595
+#: builtin/am.c:593
msgid "fseek failed"
msgstr "fseek gặp lỗi"
-#: builtin/am.c:775
+#: builtin/am.c:777
#, c-format
msgid "could not parse patch '%s'"
msgstr "không thể phân tích cú pháp “%s”"
-#: builtin/am.c:840
+#: builtin/am.c:842
msgid "Only one StGIT patch series can be applied at once"
msgstr "Chỉ có một sê-ri miếng vá StGIT được áp dụng một lúc"
-#: builtin/am.c:887
+#: builtin/am.c:889
msgid "invalid timestamp"
msgstr "dấu thời gian không hợp lệ"
-#: builtin/am.c:890 builtin/am.c:898
+#: builtin/am.c:892 builtin/am.c:900
msgid "invalid Date line"
msgstr "dòng Ngày tháng không hợp lệ"
-#: builtin/am.c:895
+#: builtin/am.c:897
msgid "invalid timezone offset"
msgstr "độ lệch múi giờ không hợp lệ"
-#: builtin/am.c:984
+#: builtin/am.c:986
msgid "Patch format detection failed."
msgstr "Dò tìm định dạng miếng vá gặp lỗi."
-#: builtin/am.c:989 builtin/clone.c:379
+#: builtin/am.c:991 builtin/clone.c:397
#, c-format
msgid "failed to create directory '%s'"
msgstr "tạo thư mục \"%s\" gặp lỗi"
-#: builtin/am.c:993
+#: builtin/am.c:995
msgid "Failed to split patches."
msgstr "Gặp lỗi khi chia nhỏ các miếng vá."
-#: builtin/am.c:1125 builtin/commit.c:376
+#: builtin/am.c:1127 builtin/commit.c:376
msgid "unable to write index file"
msgstr "không thể ghi tập tin lưu mục lục"
-#: builtin/am.c:1176
+#: builtin/am.c:1178
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "Khi bạn đã phân giải xong trục trặc này, hãy chạy \"%s --continue\"."
-#: builtin/am.c:1177
+#: builtin/am.c:1179
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr ""
"Nếu bạn muốn bỏ qua miếng vá này, hãy chạy lệnh \"%s --skip\" để thay thế."
-#: builtin/am.c:1178
+#: builtin/am.c:1180
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr "Để phục hồi lại nhánh gốc và dừng vá, hãy chạy \"%s --abort\"."
-#: builtin/am.c:1316
+#: builtin/am.c:1315
msgid "Patch is empty. Was it split wrong?"
msgstr "Miếng vá trống rỗng. Quá trình chia nhỏ miếng vá có lỗi?"
-#: builtin/am.c:1390 builtin/log.c:1550
+#: builtin/am.c:1386 builtin/log.c:1557
#, c-format
msgid "invalid ident line: %s"
msgstr "dòng thụt lề không hợp lệ: %s"
-#: builtin/am.c:1417
+#: builtin/am.c:1413
#, c-format
msgid "unable to parse commit %s"
msgstr "không thể phân tích lần chuyển giao “%s”"
-#: builtin/am.c:1610
+#: builtin/am.c:1606
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr "Kho thiếu đối tượng blob cần thiết để trở về trên “3-way merge”."
-#: builtin/am.c:1612
+#: builtin/am.c:1608
msgid "Using index info to reconstruct a base tree..."
msgstr ""
"Sử dụng thông tin trong bảng mục lục để cấu trúc lại một cây (tree) cơ sở…"
-#: builtin/am.c:1631
+#: builtin/am.c:1627
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -4579,38 +4841,38 @@
"Bạn đã sửa miếng vá của mình bằng cách thủ công à?\n"
"Nó không thể áp dụng các blob đã được ghi lại trong bảng mục lục của nó."
-#: builtin/am.c:1637
+#: builtin/am.c:1633
msgid "Falling back to patching base and 3-way merge..."
msgstr "Đang trở lại để vá cơ sở và “hòa trộn 3-đường”…"
-#: builtin/am.c:1662
+#: builtin/am.c:1658
msgid "Failed to merge in the changes."
msgstr "Gặp lỗi khi trộn vào các thay đổi."
-#: builtin/am.c:1686 builtin/merge.c:632
+#: builtin/am.c:1682 builtin/merge.c:631
msgid "git write-tree failed to write a tree"
msgstr "lệnh git write-tree gặp lỗi khi ghi một cây"
-#: builtin/am.c:1693
+#: builtin/am.c:1689
msgid "applying to an empty history"
msgstr "áp dụng vào một lịch sử trống rỗng"
-#: builtin/am.c:1706 builtin/commit.c:1764 builtin/merge.c:802
+#: builtin/am.c:1702 builtin/commit.c:1764 builtin/merge.c:802
#: builtin/merge.c:827
msgid "failed to write commit object"
msgstr "gặp lỗi khi ghi đối tượng chuyển giao"
-#: builtin/am.c:1739 builtin/am.c:1743
+#: builtin/am.c:1735 builtin/am.c:1739
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "không thể phục hồi: %s không tồn tại."
-#: builtin/am.c:1759
+#: builtin/am.c:1755
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
"không thể được tương tác mà không có stdin kết nối với một thiết bị cuối"
-#: builtin/am.c:1764
+#: builtin/am.c:1760
msgid "Commit Body is:"
msgstr "Thân của lần chuyển giao là:"
@@ -4618,37 +4880,37 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1774
+#: builtin/am.c:1770
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
"Áp dụng? đồng ý [y]/khô[n]g/chỉnh sửa [e]/hiển thị miếng [v]á/chấp nhận tất "
"cả [a]: "
-#: builtin/am.c:1824
+#: builtin/am.c:1820
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Bảng mục lục bẩn: không thể áp dụng các miếng vá (bẩn: %s)"
-#: builtin/am.c:1861 builtin/am.c:1933
+#: builtin/am.c:1860 builtin/am.c:1932
#, c-format
msgid "Applying: %.*s"
msgstr "Áp dụng: %.*s"
-#: builtin/am.c:1877
+#: builtin/am.c:1876
msgid "No changes -- Patch already applied."
msgstr "Không thay đổi gì cả -- Miếng vá đã được áp dụng rồi."
-#: builtin/am.c:1885
+#: builtin/am.c:1884
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Gặp lỗi khi vá tại %s %.*s"
-#: builtin/am.c:1891
+#: builtin/am.c:1890
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "Bản sao chép của miếng vá mà nó gặp lỗi thì được tìm thấy trong: %s"
-#: builtin/am.c:1936
+#: builtin/am.c:1935
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -4659,7 +4921,7 @@
"đã sẵn được đưa vào với cùng nội dung thay đổi; bạn có lẽ muốn bỏ qua miếng "
"vá này."
-#: builtin/am.c:1943
+#: builtin/am.c:1942
msgid ""
"You still have unmerged paths in your index.\n"
"Did you forget to use 'git add'?"
@@ -4667,17 +4929,17 @@
"Bạn vẫn có những đường dẫn chưa được hòa trộn trong bảng mục lục của mình.\n"
"Bạn đã quên sử dụng lệnh “git add” à?"
-#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308
+#: builtin/am.c:2050 builtin/am.c:2054 builtin/am.c:2066 builtin/reset.c:308
#: builtin/reset.c:316
#, c-format
msgid "Could not parse object '%s'."
msgstr "không thể phân tích đối tượng “%s”."
-#: builtin/am.c:2103
+#: builtin/am.c:2102
msgid "failed to clean index"
msgstr "gặp lỗi khi dọn bảng mục lục"
-#: builtin/am.c:2137
+#: builtin/am.c:2136
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -4685,134 +4947,134 @@
"Bạn có lẽ đã có HEAD đã bị di chuyển đi kể từ lần “am” thất bại cuối cùng.\n"
"Không thể chuyển tới ORIG_HEAD"
-#: builtin/am.c:2200
+#: builtin/am.c:2199
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Giá trị không hợp lệ cho --patch-format: %s"
-#: builtin/am.c:2233
+#: builtin/am.c:2232
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<các-tùy-chọn>] [(<mbox>|<Maildir>)…]"
-#: builtin/am.c:2234
+#: builtin/am.c:2233
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<các-tùy-chọn>] (--continue | --skip | --abort)"
-#: builtin/am.c:2240
+#: builtin/am.c:2239
msgid "run interactively"
msgstr "chạy kiểu tương tác"
-#: builtin/am.c:2242
+#: builtin/am.c:2241
msgid "historical option -- no-op"
msgstr "tùy chọn lịch sử -- không-toán-tử"
-#: builtin/am.c:2244
+#: builtin/am.c:2243
msgid "allow fall back on 3way merging if needed"
msgstr "cho phép quay trở lại để hòa trộn kiểu “3way” nếu cần"
-#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57
+#: builtin/am.c:2244 builtin/init-db.c:483 builtin/prune-packed.c:57
#: builtin/repack.c:178
msgid "be quiet"
msgstr "im lặng"
-#: builtin/am.c:2247
+#: builtin/am.c:2246
msgid "add a Signed-off-by line to the commit message"
msgstr "Thêm dòng Signed-off-by cho ghi chú của lần chuyển giao"
-#: builtin/am.c:2250
+#: builtin/am.c:2249
msgid "recode into utf8 (default)"
msgstr "chuyển mã thành utf8 (mặc định)"
-#: builtin/am.c:2252
+#: builtin/am.c:2251
msgid "pass -k flag to git-mailinfo"
msgstr "chuyển cờ -k cho git-mailinfo"
-#: builtin/am.c:2254
+#: builtin/am.c:2253
msgid "pass -b flag to git-mailinfo"
msgstr "chuyển cờ -b cho git-mailinfo"
-#: builtin/am.c:2256
+#: builtin/am.c:2255
msgid "pass -m flag to git-mailinfo"
msgstr "chuyển cờ -m cho git-mailinfo"
-#: builtin/am.c:2258
+#: builtin/am.c:2257
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "chuyển cờ --keep-cr cho git-mailsplit với định dạng mbox"
-#: builtin/am.c:2261
+#: builtin/am.c:2260
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"đừng chuyển cờ --keep-cr cho git-mailsplit không phụ thuộc vào am.keepcr"
-#: builtin/am.c:2264
+#: builtin/am.c:2263
msgid "strip everything before a scissors line"
msgstr "cắt mọi thứ trước dòng scissors"
-#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
-#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287
-#: builtin/am.c:2293
+#: 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
msgid "pass it through git-apply"
msgstr "chuyển nó qua git-apply"
-#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
-#: builtin/grep.c:1038 builtin/merge.c:202 builtin/pull.c:135
+#: 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:644 builtin/show-ref.c:169 builtin/tag.c:355
+#: 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
msgid "n"
msgstr "n"
-#: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438
-#: builtin/tag.c:387 builtin/verify-tag.c:38
+#: 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
msgid "format"
msgstr "định dạng"
-#: builtin/am.c:2290
+#: builtin/am.c:2289
msgid "format the patch(es) are in"
msgstr "định dạng (các) miếng vá theo"
-#: builtin/am.c:2296
+#: builtin/am.c:2295
msgid "override error message when patch failure occurs"
msgstr "đè lên các lời nhắn lỗi khi xảy ra lỗi vá nghiêm trọng"
-#: builtin/am.c:2298
+#: builtin/am.c:2297
msgid "continue applying patches after resolving a conflict"
msgstr "tiếp tục áp dụng các miếng vá sau khi giải quyết xung đột"
-#: builtin/am.c:2301
+#: builtin/am.c:2300
msgid "synonyms for --continue"
msgstr "đồng nghĩa với --continue"
-#: builtin/am.c:2304
+#: builtin/am.c:2303
msgid "skip the current patch"
msgstr "bỏ qua miếng vá hiện hành"
-#: builtin/am.c:2307
+#: builtin/am.c:2306
msgid "restore the original branch and abort the patching operation."
msgstr "phục hồi lại nhánh gốc và loại bỏ thao tác vá."
-#: builtin/am.c:2311
+#: builtin/am.c:2310
msgid "lie about committer date"
msgstr "nói dối về ngày chuyển giao"
-#: builtin/am.c:2313
+#: builtin/am.c:2312
msgid "use current timestamp for author date"
msgstr "dùng dấu thời gian hiện tại cho ngày tác giả"
-#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:233
-#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:370
+#: builtin/am.c:2314 builtin/commit.c:1600 builtin/merge.c:232
+#: builtin/pull.c:165 builtin/revert.c:111 builtin/tag.c:413
msgid "key-id"
msgstr "mã-số-khóa"
-#: builtin/am.c:2316
+#: builtin/am.c:2315
msgid "GPG-sign commits"
msgstr "lần chuyển giao ký-GPG"
-#: builtin/am.c:2319
+#: builtin/am.c:2318
msgid "(internal use for git-rebase)"
msgstr "(dùng nội bộ cho git-rebase)"
-#: builtin/am.c:2334
+#: builtin/am.c:2333
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."
@@ -4820,16 +5082,16 @@
"Tùy chọn -b/--binary đã không dùng từ lâu rồi, và\n"
"nó sẽ được bỏ đi. Xin đừng sử dụng nó thêm nữa."
-#: builtin/am.c:2341
+#: builtin/am.c:2340
msgid "failed to read the index"
msgstr "gặp lỗi đọc bảng mục lục"
-#: builtin/am.c:2356
+#: builtin/am.c:2355
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "thư mục rebase trước %s không sẵn có nhưng mbox lại đưa ra."
-#: builtin/am.c:2380
+#: builtin/am.c:2379
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -4838,7 +5100,7 @@
"Tìm thấy thư mục lạc %s.\n"
"Dùng \"git am --abort\" để loại bỏ nó đi."
-#: builtin/am.c:2386
+#: builtin/am.c:2385
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Thao tác phân giải không được tiến hành, chúng ta không phục hồi lại."
@@ -4868,11 +5130,6 @@
msgid "git archive: NACK %s"
msgstr "git archive: NACK %s"
-#: builtin/archive.c:63
-#, c-format
-msgid "remote error: %s"
-msgstr "lỗi máy chủ: %s"
-
#: builtin/archive.c:64
msgid "git archive: protocol error"
msgstr "git archive: lỗi giao thức"
@@ -4902,113 +5159,113 @@
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<rev-opts> được mô tả trong tài liệu git-rev-list(1)"
-#: builtin/blame.c:1786
+#: builtin/blame.c:1777
msgid "Blaming lines"
msgstr "Các dòng blame"
-#: builtin/blame.c:2582
+#: builtin/blame.c:2573
msgid "Show blame entries as we find them, incrementally"
msgstr "Hiển thị các mục “blame” như là chúng ta thấy chúng, tăng dần"
-#: builtin/blame.c:2583
+#: builtin/blame.c:2574
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
"Hiển thị SHA-1 trắng cho những lần chuyển giao biên giới (Mặc định: off)"
-#: builtin/blame.c:2584
+#: builtin/blame.c:2575
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "Không coi các lần chuyển giao gốc là giới hạn (Mặc định: off)"
-#: builtin/blame.c:2585
+#: builtin/blame.c:2576
msgid "Show work cost statistics"
msgstr "Hiển thị thống kê công sức làm việc"
-#: builtin/blame.c:2586
+#: builtin/blame.c:2577
msgid "Force progress reporting"
msgstr "Ép buộc báo cáo tiến triển công việc"
-#: builtin/blame.c:2587
+#: builtin/blame.c:2578
msgid "Show output score for blame entries"
msgstr "Hiển thị kết xuất điểm số có các mục tin “blame”"
-#: builtin/blame.c:2588
+#: builtin/blame.c:2579
msgid "Show original filename (Default: auto)"
msgstr "Hiển thị tên tập tin gốc (Mặc định: auto)"
-#: builtin/blame.c:2589
+#: builtin/blame.c:2580
msgid "Show original linenumber (Default: off)"
msgstr "Hiển thị số dòng gốc (Mặc định: off)"
-#: builtin/blame.c:2590
+#: builtin/blame.c:2581
msgid "Show in a format designed for machine consumption"
msgstr "Hiển thị ở định dạng đã thiết kế cho sự tiêu dùng bằng máy"
-#: builtin/blame.c:2591
+#: builtin/blame.c:2582
msgid "Show porcelain format with per-line commit information"
msgstr "Hiển thị định dạng “porcelain” với thông tin chuyển giao mỗi dòng"
-#: builtin/blame.c:2592
+#: builtin/blame.c:2583
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "Dùng cùng chế độ xuất ra với git-annotate (Mặc định: off)"
-#: builtin/blame.c:2593
+#: builtin/blame.c:2584
msgid "Show raw timestamp (Default: off)"
msgstr "Hiển thị dấu vết thời gian dạng thô (Mặc định: off)"
-#: builtin/blame.c:2594
+#: builtin/blame.c:2585
msgid "Show long commit SHA1 (Default: off)"
msgstr "Hiển thị SHA1 của lần chuyển giao dạng dài (Mặc định: off)"
-#: builtin/blame.c:2595
+#: builtin/blame.c:2586
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Không hiển thị tên tác giả và dấu vết thời gian (Mặc định: off)"
-#: builtin/blame.c:2596
+#: builtin/blame.c:2587
msgid "Show author email instead of name (Default: off)"
msgstr "Hiển thị thư điện tử của tác giả thay vì tên (Mặc định: off)"
-#: builtin/blame.c:2597
+#: builtin/blame.c:2588
msgid "Ignore whitespace differences"
msgstr "Bỏ qua các khác biệt do khoảng trắng gây ra"
-#: builtin/blame.c:2604
+#: builtin/blame.c:2595
msgid "Use an experimental heuristic to improve diffs"
msgstr "Dùng một phỏng đoán thử nghiệm để tăng cường các diff"
-#: builtin/blame.c:2606
+#: builtin/blame.c:2597
msgid "Spend extra cycles to find better match"
msgstr "Tiêu thụ thêm năng tài nguyên máy móc để tìm kiếm tốt hơn nữa"
-#: builtin/blame.c:2607
+#: builtin/blame.c:2598
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr ""
"Sử dụng điểm xét duyệt (revision) từ <tập tin> thay vì gọi “git-rev-list”"
-#: builtin/blame.c:2608
+#: builtin/blame.c:2599
msgid "Use <file>'s contents as the final image"
msgstr "Sử dụng nội dung của <tập tin> như là ảnh cuối cùng"
-#: builtin/blame.c:2609 builtin/blame.c:2610
+#: builtin/blame.c:2600 builtin/blame.c:2601
msgid "score"
msgstr "điểm số"
-#: builtin/blame.c:2609
+#: builtin/blame.c:2600
msgid "Find line copies within and across files"
msgstr "Tìm các bản sao chép dòng trong và ngang qua tập tin"
-#: builtin/blame.c:2610
+#: builtin/blame.c:2601
msgid "Find line movements within and across files"
msgstr "Tìm các di chuyển dòng trong và ngang qua tập tin"
-#: builtin/blame.c:2611
+#: builtin/blame.c:2602
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2611
+#: builtin/blame.c:2602
msgid "Process only line range n,m, counting from 1"
msgstr "Xử lý chỉ dòng vùng n,m, tính từ 1"
-#: builtin/blame.c:2658
+#: builtin/blame.c:2649
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
"--progress không được dùng cùng với --incremental hay các định dạng porcelain"
@@ -5019,41 +5276,41 @@
#. 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:2706
+#: builtin/blame.c:2697
msgid "4 years, 11 months ago"
msgstr "4 năm, 11 tháng trước"
-#: builtin/blame.c:2786
+#: builtin/blame.c:2777
msgid "--contents and --reverse do not blend well."
msgstr "tùy chọn--contents và --reverse không được trộn vào nhau."
-#: builtin/blame.c:2806
+#: builtin/blame.c:2797
msgid "cannot use --contents with final commit object name"
msgstr "không thể dùng --contents với tên đối tượng chuyển giao cuối cùng"
-#: builtin/blame.c:2811
+#: builtin/blame.c:2802
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
"--reverse và --first-parent cùng nhau cần chỉ định lần chuyển giao cuối"
-#: builtin/blame.c:2838
+#: builtin/blame.c:2829
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
"--reverse --first-parent cùng nhau yêu cầu vùng cùng với chuỗi cha-mẹ-đầu-"
"tiên"
-#: builtin/blame.c:2849
+#: builtin/blame.c:2840
#, c-format
msgid "no such path %s in %s"
msgstr "không có đường dẫn %s trong “%s”"
-#: builtin/blame.c:2860
+#: builtin/blame.c:2851
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "không thể đọc blob %s cho đường dẫn “%s”"
-#: builtin/blame.c:2879
+#: builtin/blame.c:2870
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
@@ -5079,7 +5336,11 @@
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [<các-tùy-chọn>] [-r | -a] [--points-at]"
-#: builtin/branch.c:143
+#: builtin/branch.c:31
+msgid "git branch [<options>] [-r | -a] [--format]"
+msgstr "git branch [<các-tùy-chọn>] [-r | -a] [--format]"
+
+#: builtin/branch.c:144
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -5088,7 +5349,7 @@
"đang xóa nhánh “%s” mà nó lại đã được hòa trộn vào\n"
" “%s”, nhưng vẫn chưa được hòa trộn vào HEAD."
-#: builtin/branch.c:147
+#: builtin/branch.c:148
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -5097,12 +5358,12 @@
"không xóa nhánh “%s” cái mà chưa được hòa trộn vào\n"
" “%s”, cho dù là nó đã được hòa trộn vào HEAD."
-#: builtin/branch.c:161
+#: builtin/branch.c:162
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Không thể tìm kiếm đối tượng chuyển giao cho “%s”"
-#: builtin/branch.c:165
+#: builtin/branch.c:166
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -5111,163 +5372,91 @@
"Nhánh “%s” không được trộn một cách đầy đủ.\n"
"Nếu bạn thực sự muốn xóa nó, thì chạy lệnh “git branch -D %s”."
-#: builtin/branch.c:178
+#: builtin/branch.c:179
msgid "Update of config-file failed"
msgstr "Cập nhật tập tin cấu hình gặp lỗi"
-#: builtin/branch.c:206
+#: builtin/branch.c:210
msgid "cannot use -a with -d"
msgstr "không thể dùng tùy chọn -a với -d"
-#: builtin/branch.c:212
+#: builtin/branch.c:216
msgid "Couldn't look up commit object for HEAD"
msgstr "Không thể tìm kiếm đối tượng chuyển giao cho HEAD"
-#: builtin/branch.c:226
+#: builtin/branch.c:230
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "Không thể xóa nhánh “%s” đã được lấy ra tại “%s”"
-#: builtin/branch.c:241
+#: builtin/branch.c:245
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "không tìm thấy nhánh theo dõi máy chủ “%s”."
-#: builtin/branch.c:242
+#: builtin/branch.c:246
#, c-format
msgid "branch '%s' not found."
msgstr "không tìm thấy nhánh “%s”."
-#: builtin/branch.c:257
+#: builtin/branch.c:261
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Gặp lỗi khi đang xóa nhánh theo dõi máy chủ “%s”"
-#: builtin/branch.c:258
+#: builtin/branch.c:262
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Gặp lỗi khi xóa bỏ nhánh “%s”"
-#: builtin/branch.c:265
+#: builtin/branch.c:269
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Đã xóa nhánh theo dõi máy chủ \"%s\" (từng là %s).\n"
-#: builtin/branch.c:266
+#: builtin/branch.c:270
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Nhánh “%s” đã bị xóa (từng là %s)\n"
-#: builtin/branch.c:312
-#, c-format
-msgid "[%s: gone]"
-msgstr "[%s: đã ra đi]"
-
-#: builtin/branch.c:317
-#, c-format
-msgid "[%s]"
-msgstr "[%s]"
-
-#: builtin/branch.c:322
-#, c-format
-msgid "[%s: behind %d]"
-msgstr "[%s: đứng sau %d]"
-
-#: builtin/branch.c:324
-#, c-format
-msgid "[behind %d]"
-msgstr "[đằng sau %d]"
-
-#: builtin/branch.c:328
-#, c-format
-msgid "[%s: ahead %d]"
-msgstr "[%s: phía trước %d]"
-
-#: builtin/branch.c:330
-#, c-format
-msgid "[ahead %d]"
-msgstr "[phía trước %d]"
-
-#: builtin/branch.c:333
-#, c-format
-msgid "[%s: ahead %d, behind %d]"
-msgstr "[%s: trước %d, sau %d]"
-
-#: builtin/branch.c:336
-#, c-format
-msgid "[ahead %d, behind %d]"
-msgstr "[trước %d, sau %d]"
-
-#: builtin/branch.c:349
-msgid " **** invalid ref ****"
-msgstr " **** tham chiếu không hợp lệ ****"
-
-#: builtin/branch.c:375
-#, c-format
-msgid "(no branch, rebasing %s)"
-msgstr "(không nhánh, đang cải tổ %s)"
-
-#: builtin/branch.c:378
-#, c-format
-msgid "(no branch, bisect started on %s)"
-msgstr "(không nhánh, di chuyển nửa bước được bắt đầu tại %s)"
-
-#. TRANSLATORS: make sure this matches
-#. "HEAD detached at " in wt-status.c
-#: builtin/branch.c:384
-#, c-format
-msgid "(HEAD detached at %s)"
-msgstr "(HEAD được tách rời tại %s)"
-
-#. TRANSLATORS: make sure this matches
-#. "HEAD detached from " in wt-status.c
-#: builtin/branch.c:389
-#, c-format
-msgid "(HEAD detached from %s)"
-msgstr "(HEAD được tách rời từ %s)"
-
-#: builtin/branch.c:393
-msgid "(no branch)"
-msgstr "(không nhánh)"
-
-#: builtin/branch.c:535
+#: builtin/branch.c:441
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Nhánh %s đang được cải tổ lại tại %s"
-#: builtin/branch.c:539
+#: builtin/branch.c:445
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Nhánh %s đang được di chuyển phân đôi (bisect) tại %s"
-#: builtin/branch.c:554
+#: builtin/branch.c:460
msgid "cannot rename the current branch while not on any."
msgstr "không thể đổi tên nhánh hiện hành trong khi nó chẳng ở đâu cả."
-#: builtin/branch.c:564
+#: builtin/branch.c:470
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Tên nhánh không hợp lệ: “%s”"
-#: builtin/branch.c:581
+#: builtin/branch.c:487
msgid "Branch rename failed"
msgstr "Gặp lỗi khi đổi tên nhánh"
-#: builtin/branch.c:585
+#: builtin/branch.c:490
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Đã đổi tên nhánh khuyết danh “%s” đi"
-#: builtin/branch.c:588
+#: builtin/branch.c:493
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Nhánh bị đổi tên thành %s, nhưng HEAD lại không được cập nhật!"
-#: builtin/branch.c:595
+#: builtin/branch.c:502
msgid "Branch is renamed, but update of config-file failed"
msgstr "Nhánh bị đổi tên, nhưng cập nhật tập tin cấu hình gặp lỗi"
-#: builtin/branch.c:611
+#: builtin/branch.c:518
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -5278,167 +5467,176 @@
" %s\n"
"Những dòng được bắt đầu bằng “%c” sẽ được cắt bỏ.\n"
-#: builtin/branch.c:643
+#: builtin/branch.c:551
msgid "Generic options"
msgstr "Tùy chọn chung"
-#: builtin/branch.c:645
+#: builtin/branch.c:553
msgid "show hash and subject, give twice for upstream branch"
msgstr "hiển thị mã băm và chủ đề, đưa ra hai lần cho nhánh thượng nguồn"
-#: builtin/branch.c:646
+#: builtin/branch.c:554
msgid "suppress informational messages"
msgstr "không xuất các thông tin"
-#: builtin/branch.c:647
+#: builtin/branch.c:555
msgid "set up tracking mode (see git-pull(1))"
msgstr "cài đặt chế độ theo dõi (xem git-pull(1))"
-#: builtin/branch.c:649
+#: builtin/branch.c:557
msgid "change upstream info"
msgstr "thay đổi thông tin thượng nguồn"
-#: builtin/branch.c:651
+#: builtin/branch.c:559
msgid "upstream"
msgstr "thượng nguồn"
-#: builtin/branch.c:651
+#: builtin/branch.c:559
msgid "change the upstream info"
msgstr "thay đổi thông tin thượng nguồn"
-#: builtin/branch.c:652
+#: builtin/branch.c:560
msgid "Unset the upstream info"
msgstr "Bỏ đặt thông tin thượng nguồn"
-#: builtin/branch.c:653
+#: builtin/branch.c:561
msgid "use colored output"
msgstr "tô màu kết xuất"
-#: builtin/branch.c:654
+#: builtin/branch.c:562
msgid "act on remote-tracking branches"
msgstr "thao tác trên nhánh “remote-tracking”"
-#: builtin/branch.c:656 builtin/branch.c:657
+#: builtin/branch.c:564 builtin/branch.c:566
msgid "print only branches that contain the commit"
msgstr "chỉ hiển thị những nhánh mà nó chứa lần chuyển giao"
-#: builtin/branch.c:660
+#: builtin/branch.c:565 builtin/branch.c:567
+msgid "print only branches that don't contain the commit"
+msgstr "chỉ hiển thị những nhánh mà nó không chứa lần chuyển giao"
+
+#: builtin/branch.c:570
msgid "Specific git-branch actions:"
msgstr "Hành động git-branch:"
-#: builtin/branch.c:661
+#: builtin/branch.c:571
msgid "list both remote-tracking and local branches"
msgstr "liệt kê cả nhánh “remote-tracking” và nội bộ"
-#: builtin/branch.c:663
+#: builtin/branch.c:573
msgid "delete fully merged branch"
msgstr "xóa một toàn bộ nhánh đã hòa trộn"
-#: builtin/branch.c:664
+#: builtin/branch.c:574
msgid "delete branch (even if not merged)"
msgstr "xóa nhánh (cho dù là chưa được hòa trộn)"
-#: builtin/branch.c:665
+#: builtin/branch.c:575
msgid "move/rename a branch and its reflog"
msgstr "di chuyển hay đổi tên một nhánh và reflog của nó"
-#: builtin/branch.c:666
+#: builtin/branch.c:576
msgid "move/rename a branch, even if target exists"
msgstr "di chuyển hoặc đổi tên một nhánh ngay cả khi đích đã có sẵn"
-#: builtin/branch.c:667
+#: builtin/branch.c:577
msgid "list branch names"
msgstr "liệt kê các tên nhánh"
-#: builtin/branch.c:668
+#: builtin/branch.c:578
msgid "create the branch's reflog"
msgstr "tạo reflog của nhánh"
-#: builtin/branch.c:670
+#: builtin/branch.c:580
msgid "edit the description for the branch"
msgstr "sửa mô tả cho nhánh"
-#: builtin/branch.c:671
+#: builtin/branch.c:581
msgid "force creation, move/rename, deletion"
msgstr "buộc tạo, di chuyển/đổi tên, xóa"
-#: builtin/branch.c:672
+#: builtin/branch.c:582
msgid "print only branches that are merged"
msgstr "chỉ hiển thị những nhánh mà nó được hòa trộn"
-#: builtin/branch.c:673
+#: builtin/branch.c:583
msgid "print only branches that are not merged"
msgstr "chỉ hiển thị những nhánh mà nó không được hòa trộn"
-#: builtin/branch.c:674
+#: builtin/branch.c:584
msgid "list branches in columns"
msgstr "liệt kê các nhánh trong các cột"
-#: builtin/branch.c:675 builtin/for-each-ref.c:38 builtin/tag.c:381
+#: builtin/branch.c:585 builtin/for-each-ref.c:38 builtin/tag.c:426
msgid "key"
msgstr "khóa"
-#: builtin/branch.c:676 builtin/for-each-ref.c:39 builtin/tag.c:382
+#: builtin/branch.c:586 builtin/for-each-ref.c:39 builtin/tag.c:427
msgid "field name to sort on"
msgstr "tên trường cần sắp xếp"
-#: builtin/branch.c:678 builtin/for-each-ref.c:41 builtin/notes.c:404
+#: 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:384
+#: builtin/tag.c:429
msgid "object"
msgstr "đối tượng"
-#: builtin/branch.c:679
+#: builtin/branch.c:589
msgid "print only branches of the object"
msgstr "chỉ hiển thị các nhánh của đối tượng"
-#: builtin/branch.c:681 builtin/for-each-ref.c:46 builtin/tag.c:388
+#: builtin/branch.c:591 builtin/for-each-ref.c:47 builtin/tag.c:434
msgid "sorting and filtering are case insensitive"
msgstr "sắp xếp và lọc là phân biệt HOA thường"
-#: builtin/branch.c:698
+#: builtin/branch.c:592 builtin/for-each-ref.c:37 builtin/tag.c:433
+#: builtin/verify-tag.c:38
+msgid "format to use for the output"
+msgstr "định dạng sẽ dùng cho đầu ra"
+
+#: builtin/branch.c:611
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Gặp lỗi khi phân giải HEAD như là một tham chiếu hợp lệ."
-#: builtin/branch.c:702 builtin/clone.c:706
+#: builtin/branch.c:615 builtin/clone.c:724
msgid "HEAD not found below refs/heads!"
msgstr "không tìm thấy HEAD ở dưới refs/heads!"
-#: builtin/branch.c:724
+#: builtin/branch.c:638
msgid "--column and --verbose are incompatible"
msgstr "tùy chọn --column và --verbose xung khắc nhau"
-#: builtin/branch.c:735 builtin/branch.c:787
+#: builtin/branch.c:649 builtin/branch.c:701
msgid "branch name required"
msgstr "cần chỉ ra tên nhánh"
-#: builtin/branch.c:763
+#: builtin/branch.c:677
msgid "Cannot give description to detached HEAD"
msgstr "Không thể đưa ra mô tả HEAD đã tách rời"
-#: builtin/branch.c:768
+#: builtin/branch.c:682
msgid "cannot edit description of more than one branch"
msgstr "không thể sửa mô tả cho nhiều hơn một nhánh"
-#: builtin/branch.c:775
+#: builtin/branch.c:689
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Vẫn chưa chuyển giao trên nhánh “%s”."
-#: builtin/branch.c:778
+#: builtin/branch.c:692
#, c-format
msgid "No branch named '%s'."
msgstr "Không có nhánh nào có tên “%s”."
-#: builtin/branch.c:793
+#: builtin/branch.c:707
msgid "too many branches for a rename operation"
msgstr "quá nhiều nhánh dành cho thao tác đổi tên"
-#: builtin/branch.c:798
+#: builtin/branch.c:712
msgid "too many branches to set new upstream"
msgstr "quá nhiều nhánh được đặt cho thượng nguồn mới"
-#: builtin/branch.c:802
+#: builtin/branch.c:716
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -5446,40 +5644,40 @@
"không thể đặt thượng nguồn của HEAD thành %s khi mà nó chẳng chỉ đến nhánh "
"nào cả."
-#: builtin/branch.c:805 builtin/branch.c:827 builtin/branch.c:848
+#: builtin/branch.c:719 builtin/branch.c:741 builtin/branch.c:762
#, c-format
msgid "no such branch '%s'"
msgstr "không có nhánh nào như thế “%s”"
-#: builtin/branch.c:809
+#: builtin/branch.c:723
#, c-format
msgid "branch '%s' does not exist"
msgstr "chưa có nhánh “%s”"
-#: builtin/branch.c:821
+#: builtin/branch.c:735
msgid "too many branches to unset upstream"
msgstr "quá nhiều nhánh để bỏ đặt thượng nguồn"
-#: builtin/branch.c:825
+#: builtin/branch.c:739
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr "không thể bỏ đặt thượng nguồn của HEAD không chỉ đến một nhánh nào cả."
-#: builtin/branch.c:831
+#: builtin/branch.c:745
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Nhánh “%s” không có thông tin thượng nguồn"
-#: builtin/branch.c:845
+#: builtin/branch.c:759
msgid "it does not make sense to create 'HEAD' manually"
msgstr "không hợp lý khi tạo “HEAD” thủ công"
-#: builtin/branch.c:851
+#: builtin/branch.c:765
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
"hai tùy chọn -a và -r áp dụng cho lệnh “git branch” không hợp lý đối với tên "
"nhánh"
-#: builtin/branch.c:854
+#: builtin/branch.c:768
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
@@ -5488,7 +5686,7 @@
"Cờ --set-upstream đã lạc hậu và sẽ bị xóa bỏ. Nên dùng --track hoặc --set-"
"upstream-to\n"
-#: builtin/branch.c:871
+#: builtin/branch.c:785
#, c-format
msgid ""
"\n"
@@ -5499,16 +5697,16 @@
"Nếu bạn muốn “%s” theo dõi “%s”, thực hiện lệnh sau:\n"
"\n"
-#: builtin/bundle.c:51
+#: builtin/bundle.c:45
#, c-format
msgid "%s is okay\n"
msgstr "“%s” tốt\n"
-#: builtin/bundle.c:64
+#: builtin/bundle.c:58
msgid "Need a repository to create a bundle."
msgstr "Cần một kho chứa để có thể tạo một bundle."
-#: builtin/bundle.c:68
+#: builtin/bundle.c:62
msgid "Need a repository to unbundle."
msgstr "Cần một kho chứa để có thể giải nén một bundle."
@@ -5556,7 +5754,7 @@
msgid "for blob objects, run filters on object's content"
msgstr "với đối tượng blob, chạy lệnh filters trên nội dung của đối tượng"
-#: builtin/cat-file.c:561 git-submodule.sh:929
+#: builtin/cat-file.c:561 git-submodule.sh:943
msgid "blob"
msgstr "blob"
@@ -5613,7 +5811,7 @@
msgid "terminate input and output records by a NUL character"
msgstr "chấm dứt các bản ghi vào và ra bằng ký tự NULL"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1140 builtin/gc.c:332
+#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:356
msgid "suppress progress reporting"
msgstr "chặn các báo cáo tiến trình hoạt động"
@@ -5704,9 +5902,9 @@
msgstr "ghi nội dung vào tập tin tạm"
#: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:597 builtin/submodule--helper.c:600
-#: builtin/submodule--helper.c:606 builtin/submodule--helper.c:967
-#: builtin/worktree.c:471
+#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
+#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
+#: builtin/worktree.c:477
msgid "string"
msgstr "chuỗi"
@@ -5718,114 +5916,114 @@
msgid "copy out the files from named stage"
msgstr "sao chép ra các tập tin từ bệ phóng có tên"
-#: builtin/checkout.c:25
+#: builtin/checkout.c:27
msgid "git checkout [<options>] <branch>"
msgstr "git checkout [<các-tùy-chọn>] <nhánh>"
-#: builtin/checkout.c:26
+#: builtin/checkout.c:28
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<các-tùy-chọn>] [<nhánh>] -- <tập-tin>…"
-#: builtin/checkout.c:134 builtin/checkout.c:167
+#: builtin/checkout.c:153 builtin/checkout.c:186
#, c-format
msgid "path '%s' does not have our version"
msgstr "đường dẫn “%s” không có các phiên bản của chúng ta"
-#: builtin/checkout.c:136 builtin/checkout.c:169
+#: builtin/checkout.c:155 builtin/checkout.c:188
#, c-format
msgid "path '%s' does not have their version"
msgstr "đường dẫn “%s” không có các phiên bản của chúng"
-#: builtin/checkout.c:152
+#: builtin/checkout.c:171
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "đường dẫn “%s” không có tất cả các phiên bản cần thiết"
-#: builtin/checkout.c:196
+#: builtin/checkout.c:215
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "đường dẫn “%s” không có các phiên bản cần thiết"
-#: builtin/checkout.c:213
+#: builtin/checkout.c:232
#, c-format
msgid "path '%s': cannot merge"
msgstr "đường dẫn “%s”: không thể hòa trộn"
-#: builtin/checkout.c:230
+#: builtin/checkout.c:249
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Không thể thêm kết quả hòa trộn cho “%s”"
-#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
-#: builtin/checkout.c:259
+#: builtin/checkout.c:269 builtin/checkout.c:272 builtin/checkout.c:275
+#: builtin/checkout.c:278
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "không được dùng “%s” với các đường dẫn cập nhật"
-#: builtin/checkout.c:262 builtin/checkout.c:265
+#: builtin/checkout.c:281 builtin/checkout.c:284
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "không được dùng “%s” với %s"
-#: builtin/checkout.c:268
+#: builtin/checkout.c:287
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
"Không thể cập nhật các đường dẫn và chuyển đến nhánh “%s” cùng một lúc."
-#: builtin/checkout.c:339 builtin/checkout.c:346
+#: builtin/checkout.c:358 builtin/checkout.c:365
#, c-format
msgid "path '%s' is unmerged"
msgstr "đường dẫn “%s” không được hòa trộn"
-#: builtin/checkout.c:494
+#: builtin/checkout.c:513
msgid "you need to resolve your current index first"
msgstr "bạn cần phải giải quyết bảng mục lục hiện tại của bạn trước đã"
-#: builtin/checkout.c:625
+#: builtin/checkout.c:644
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Không thể thực hiện reflog cho “%s”: %s\n"
-#: builtin/checkout.c:666
+#: builtin/checkout.c:685
msgid "HEAD is now at"
msgstr "HEAD hiện giờ tại"
-#: builtin/checkout.c:670 builtin/clone.c:660
+#: builtin/checkout.c:689 builtin/clone.c:678
msgid "unable to update HEAD"
msgstr "không thể cập nhật HEAD"
-#: builtin/checkout.c:674
+#: builtin/checkout.c:693
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Đặt lại nhánh “%s”\n"
-#: builtin/checkout.c:677
+#: builtin/checkout.c:696
#, c-format
msgid "Already on '%s'\n"
msgstr "Đã sẵn sàng trên “%s”\n"
-#: builtin/checkout.c:681
+#: builtin/checkout.c:700
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Đã chuyển tới và đặt lại nhánh “%s”\n"
-#: builtin/checkout.c:683 builtin/checkout.c:1072
+#: builtin/checkout.c:702 builtin/checkout.c:1090
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Đã chuyển đến nhánh mới “%s”\n"
-#: builtin/checkout.c:685
+#: builtin/checkout.c:704
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Đã chuyển đến nhánh “%s”\n"
-#: builtin/checkout.c:736
+#: builtin/checkout.c:755
#, c-format
msgid " ... and %d more.\n"
msgstr " … và nhiều hơn %d.\n"
-#: builtin/checkout.c:742
+#: builtin/checkout.c:761
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -5844,7 +6042,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:761
+#: builtin/checkout.c:780
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -5865,152 +6063,152 @@
" git branch <tên_nhánh_mới> %s\n"
"\n"
-#: builtin/checkout.c:797
+#: builtin/checkout.c:816
msgid "internal error in revision walk"
msgstr "lỗi nội bộ trong khi di chuyển qua các điểm xét duyệt"
-#: builtin/checkout.c:801
+#: builtin/checkout.c:820
msgid "Previous HEAD position was"
msgstr "Vị trí trước kia của HEAD là"
-#: builtin/checkout.c:828 builtin/checkout.c:1067
+#: builtin/checkout.c:847 builtin/checkout.c:1085
msgid "You are on a branch yet to be born"
msgstr "Bạn tại nhánh mà nó chưa hề được sinh ra"
-#: builtin/checkout.c:973
+#: builtin/checkout.c:991
#, c-format
msgid "only one reference expected, %d given."
msgstr "chỉ cần một tham chiếu, nhưng lại đưa ra %d."
-#: builtin/checkout.c:1013 builtin/worktree.c:214
+#: builtin/checkout.c:1031 builtin/worktree.c:214
#, c-format
msgid "invalid reference: %s"
msgstr "tham chiếu không hợp lệ: %s"
-#: builtin/checkout.c:1042
+#: builtin/checkout.c:1060
#, c-format
msgid "reference is not a tree: %s"
msgstr "tham chiếu không phải là một cây:%s"
-#: builtin/checkout.c:1081
+#: builtin/checkout.c:1099
msgid "paths cannot be used with switching branches"
msgstr "các đường dẫn không thể dùng cùng với các nhánh chuyển"
-#: builtin/checkout.c:1084 builtin/checkout.c:1088
+#: builtin/checkout.c:1102 builtin/checkout.c:1106
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "“%s” không thể được sử dụng với các nhánh chuyển"
-#: builtin/checkout.c:1092 builtin/checkout.c:1095 builtin/checkout.c:1100
-#: builtin/checkout.c:1103
+#: builtin/checkout.c:1110 builtin/checkout.c:1113 builtin/checkout.c:1118
+#: builtin/checkout.c:1121
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "“%s” không thể được dùng với “%s”"
-#: builtin/checkout.c:1108
+#: builtin/checkout.c:1126
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Không thể chuyển nhánh đến một thứ không phải là lần chuyển giao “%s”"
-#: builtin/checkout.c:1141 builtin/checkout.c:1143 builtin/clone.c:93
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324
-#: builtin/worktree.c:326
+#: 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
msgid "branch"
msgstr "nhánh"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1160
msgid "create and checkout a new branch"
msgstr "tạo và checkout một nhánh mới"
-#: builtin/checkout.c:1144
+#: builtin/checkout.c:1162
msgid "create/reset and checkout a branch"
msgstr "tạo/đặt_lại và checkout một nhánh"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1163
msgid "create reflog for new branch"
msgstr "tạo reflog cho nhánh mới"
-#: builtin/checkout.c:1146 builtin/worktree.c:328
+#: builtin/checkout.c:1164 builtin/worktree.c:333
msgid "detach HEAD at named commit"
msgstr "rời bỏ HEAD tại lần chuyển giao theo tên"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1165
msgid "set upstream info for new branch"
msgstr "đặt thông tin thượng nguồn cho nhánh mới"
-#: builtin/checkout.c:1149
+#: builtin/checkout.c:1167
msgid "new-branch"
msgstr "nhánh-mới"
-#: builtin/checkout.c:1149
+#: builtin/checkout.c:1167
msgid "new unparented branch"
msgstr "nhánh không cha mới"
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1168
msgid "checkout our version for unmerged files"
msgstr ""
"lấy ra (checkout) phiên bản của chúng ta cho các tập tin chưa được hòa trộn"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1170
msgid "checkout their version for unmerged files"
msgstr ""
"lấy ra (checkout) phiên bản của chúng họ cho các tập tin chưa được hòa trộn"
-#: builtin/checkout.c:1154
+#: builtin/checkout.c:1172
msgid "force checkout (throw away local modifications)"
msgstr "ép buộc lấy ra (bỏ đi những thay đổi nội bộ)"
-#: builtin/checkout.c:1155
+#: builtin/checkout.c:1173
msgid "perform a 3-way merge with the new branch"
msgstr "thực hiện hòa trộn kiểu 3-way với nhánh mới"
-#: builtin/checkout.c:1156 builtin/merge.c:235
+#: builtin/checkout.c:1174 builtin/merge.c:234
msgid "update ignored files (default)"
msgstr "cập nhật các tập tin bị bỏ qua (mặc định)"
-#: builtin/checkout.c:1157 builtin/log.c:1466 parse-options.h:251
+#: builtin/checkout.c:1175 builtin/log.c:1473 parse-options.h:251
msgid "style"
msgstr "kiểu"
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1176
msgid "conflict style (merge or diff3)"
msgstr "xung đột kiểu (hòa trộn hoặc diff3)"
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1179
msgid "do not limit pathspecs to sparse entries only"
msgstr "không giới hạn đặc tả đường dẫn thành chỉ các mục thưa thớt"
-#: builtin/checkout.c:1163
+#: builtin/checkout.c:1181
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "gợi ý thứ hai \"git checkout <không-nhánh-nào-như-vậy>\""
-#: builtin/checkout.c:1165
+#: builtin/checkout.c:1183
msgid "do not check if another worktree is holding the given ref"
msgstr "không kiểm tra nếu cây làm việc khác đang giữ tham chiếu đã cho"
-#: builtin/checkout.c:1166 builtin/clone.c:63 builtin/fetch.c:119
-#: builtin/merge.c:232 builtin/pull.c:117 builtin/push.c:539
-#: builtin/send-pack.c:168
+#: 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
msgid "force progress reporting"
msgstr "ép buộc báo cáo tiến triển công việc"
-#: builtin/checkout.c:1197
+#: builtin/checkout.c:1224
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "Các tùy chọn -b, -B và --orphan loại từ lẫn nhau"
-#: builtin/checkout.c:1214
+#: builtin/checkout.c:1241
msgid "--track needs a branch name"
msgstr "--track cần tên một nhánh"
-#: builtin/checkout.c:1219
+#: builtin/checkout.c:1246
msgid "Missing branch name; try -b"
msgstr "Thiếu tên nhánh; hãy thử -b"
-#: builtin/checkout.c:1255
+#: builtin/checkout.c:1282
msgid "invalid path specification"
msgstr "đường dẫn đã cho không hợp lệ"
-#: builtin/checkout.c:1262
+#: builtin/checkout.c:1289
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
@@ -6020,12 +6218,12 @@
"Bạn đã có ý định checkout “%s” cái mà không thể được phân giải như là lần "
"chuyển giao?"
-#: builtin/checkout.c:1267
+#: builtin/checkout.c:1294
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach không nhận một đối số đường dẫn “%s”"
-#: builtin/checkout.c:1271
+#: builtin/checkout.c:1298
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -6064,7 +6262,7 @@
msgid "failed to remove %s"
msgstr "gặp lỗi khi gỡ bỏ %s"
-#: builtin/clean.c:291 git-add--interactive.perl:623
+#: builtin/clean.c:297 git-add--interactive.perl:614
#, c-format
msgid ""
"Prompt help:\n"
@@ -6077,7 +6275,7 @@
"foo - chọn mục trên cơ sở tiền tố duy nhất\n"
" - (để trống) không chọn gì cả\n"
-#: builtin/clean.c:295 git-add--interactive.perl:632
+#: builtin/clean.c:301 git-add--interactive.perl:623
#, c-format
msgid ""
"Prompt help:\n"
@@ -6098,38 +6296,38 @@
"* - chọn tất\n"
" - (để trống) kết thúc việc chọn\n"
-#: builtin/clean.c:511 git-add--interactive.perl:598
-#: git-add--interactive.perl:603
+#: builtin/clean.c:517 git-add--interactive.perl:589
+#: git-add--interactive.perl:594
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Hả (%s)?\n"
-#: builtin/clean.c:653
+#: builtin/clean.c:659
#, c-format
msgid "Input ignore patterns>> "
msgstr "Mẫu để lọc các tập tin đầu vào cần lờ đi>> "
-#: builtin/clean.c:690
+#: builtin/clean.c:696
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "CẢNH BÁO: Không tìm thấy các mục được khớp bởi: %s"
-#: builtin/clean.c:711
+#: builtin/clean.c:717
msgid "Select items to delete"
msgstr "Chọn mục muốn xóa"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:752
+#: builtin/clean.c:758
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Xóa bỏ “%s” [y/N]? "
-#: builtin/clean.c:777 git-add--interactive.perl:1669
+#: builtin/clean.c:783 git-add--interactive.perl:1660
#, c-format
msgid "Bye.\n"
msgstr "Tạm biệt.\n"
-#: builtin/clean.c:785
+#: builtin/clean.c:791
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -6147,61 +6345,62 @@
"help - hiển thị chính trợ giúp này\n"
"? - trợ giúp dành cho chọn bằng cách nhắc"
-#: builtin/clean.c:812 git-add--interactive.perl:1745
+#: builtin/clean.c:818 git-add--interactive.perl:1736
msgid "*** Commands ***"
msgstr "*** Lệnh ***"
-#: builtin/clean.c:813 git-add--interactive.perl:1742
+#: builtin/clean.c:819 git-add--interactive.perl:1733
msgid "What now"
msgstr "Giờ thì sao"
-#: builtin/clean.c:821
+#: builtin/clean.c:827
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Có muốn gỡ bỏ (các) mục sau đây không:"
-#: builtin/clean.c:838
+#: builtin/clean.c:844
msgid "No more files to clean, exiting."
msgstr "Không còn tập-tin nào để dọn dẹp, đang thoát ra."
-#: builtin/clean.c:869
+#: builtin/clean.c:875
msgid "do not print names of files removed"
msgstr "không hiển thị tên của các tập tin đã gỡ bỏ"
-#: builtin/clean.c:871
+#: builtin/clean.c:877
msgid "force"
msgstr "ép buộc"
-#: builtin/clean.c:872
+#: builtin/clean.c:878
msgid "interactive cleaning"
msgstr "dọn bằng kiểu tương tác"
-#: builtin/clean.c:874
+#: builtin/clean.c:880
msgid "remove whole directories"
msgstr "gỡ bỏ toàn bộ thư mục"
-#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:1056
-#: builtin/ls-files.c:538 builtin/name-rev.c:313 builtin/show-ref.c:176
+#: 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
msgid "pattern"
msgstr "mẫu"
-#: builtin/clean.c:876
+#: builtin/clean.c:882
msgid "add <pattern> to ignore rules"
msgstr "thêm <mẫu> vào trong qui tắc bỏ qua"
-#: builtin/clean.c:877
+#: builtin/clean.c:883
msgid "remove ignored files, too"
msgstr "đồng thời gỡ bỏ cả các tập tin bị bỏ qua"
-#: builtin/clean.c:879
+#: builtin/clean.c:885
msgid "remove only ignored files"
msgstr "chỉ gỡ bỏ những tập tin bị bỏ qua"
-#: builtin/clean.c:897
+#: builtin/clean.c:903
msgid "-x and -X cannot be used together"
msgstr "-x và -X không thể dùng cùng nhau"
-#: builtin/clean.c:901
+#: builtin/clean.c:907
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -6209,7 +6408,7 @@
"clean.requireForce được đặt thành true và không đưa ra tùy chọn -i, -n mà "
"cũng không -f; từ chối lệnh dọn dẹp (clean)"
-#: builtin/clean.c:904
+#: builtin/clean.c:910
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -6221,129 +6420,134 @@
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<các-tùy-chọn>] [--] <kho> [<t.mục>]"
-#: builtin/clone.c:65
+#: builtin/clone.c:80
msgid "don't create a checkout"
msgstr "không tạo một checkout"
-#: builtin/clone.c:66 builtin/clone.c:68 builtin/init-db.c:478
+#: builtin/clone.c:81 builtin/clone.c:83 builtin/init-db.c:478
msgid "create a bare repository"
msgstr "tạo kho thuần"
-#: builtin/clone.c:70
+#: builtin/clone.c:85
msgid "create a mirror repository (implies bare)"
msgstr "tạo kho bản sao (ý là kho thuần)"
-#: builtin/clone.c:72
+#: builtin/clone.c:87
msgid "to clone from a local repository"
msgstr "để nhân bản từ kho nội bộ"
-#: builtin/clone.c:74
+#: builtin/clone.c:89
msgid "don't use local hardlinks, always copy"
msgstr "không sử dụng liên kết cứng nội bộ, luôn sao chép"
-#: builtin/clone.c:76
+#: builtin/clone.c:91
msgid "setup as shared repository"
msgstr "cài đặt đây là kho chia sẻ"
-#: builtin/clone.c:78 builtin/clone.c:80
+#: builtin/clone.c:93 builtin/clone.c:97
+msgid "pathspec"
+msgstr "đặc-tả-đường-dẫn"
+
+#: builtin/clone.c:93 builtin/clone.c:97
msgid "initialize submodules in the clone"
msgstr "khởi tạo mô-đun-con trong bản sao"
-#: builtin/clone.c:82
+#: builtin/clone.c:100
msgid "number of submodules cloned in parallel"
msgstr "số lượng mô-đun-con được nhân bản đồng thời"
-#: builtin/clone.c:83 builtin/init-db.c:475
+#: builtin/clone.c:101 builtin/init-db.c:475
msgid "template-directory"
msgstr "thư-mục-mẫu"
-#: builtin/clone.c:84 builtin/init-db.c:476
+#: builtin/clone.c:102 builtin/init-db.c:476
msgid "directory from which templates will be used"
msgstr "thư mục mà tại đó các mẫu sẽ được dùng"
-#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:604
-#: builtin/submodule--helper.c:970
+#: builtin/clone.c:104 builtin/clone.c:106 builtin/submodule--helper.c:642
+#: builtin/submodule--helper.c:983
msgid "reference repository"
msgstr "kho tham chiếu"
-#: builtin/clone.c:90
+#: builtin/clone.c:108
msgid "use --reference only while cloning"
msgstr "chỉ dùng --reference khi nhân bản"
-#: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:109 builtin/column.c:26 builtin/merge-file.c:43
msgid "name"
msgstr "tên"
-#: builtin/clone.c:92
+#: builtin/clone.c:110
msgid "use <name> instead of 'origin' to track upstream"
msgstr "dùng <tên> thay cho “origin” để theo dõi thượng nguồn"
-#: builtin/clone.c:94
+#: builtin/clone.c:112
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "lấy ra <nhánh> thay cho HEAD của máy chủ"
-#: builtin/clone.c:96
+#: builtin/clone.c:114
msgid "path to git-upload-pack on the remote"
msgstr "đường dẫn đến git-upload-pack trên máy chủ"
-#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:999 builtin/pull.c:202
+#: builtin/clone.c:115 builtin/fetch.c:120 builtin/grep.c:1006
+#: builtin/pull.c:202
msgid "depth"
msgstr "độ-sâu"
-#: builtin/clone.c:98
+#: builtin/clone.c:116
msgid "create a shallow clone of that depth"
msgstr "tạo bản sao không đầy đủ cho mức sâu đã cho"
-#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2836
+#: builtin/clone.c:117 builtin/fetch.c:122 builtin/pack-objects.c:2918
#: parse-options.h:142
msgid "time"
msgstr "thời-gian"
-#: builtin/clone.c:100
+#: builtin/clone.c:118
msgid "create a shallow clone since a specific time"
msgstr "tạo bản sao không đầy đủ từ thời điểm đã cho"
-#: builtin/clone.c:101 builtin/fetch.c:124
+#: builtin/clone.c:119 builtin/fetch.c:124
msgid "revision"
msgstr "điểm xét duyệt"
-#: builtin/clone.c:102 builtin/fetch.c:125
+#: builtin/clone.c:120 builtin/fetch.c:125
msgid "deepen history of shallow clone, excluding rev"
msgstr "làm sâu hơn lịch sử của bản sao shallow, bằng điểm xét duyệt loại trừ"
-#: builtin/clone.c:104
+#: builtin/clone.c:122
msgid "clone only one branch, HEAD or --branch"
msgstr "chỉ nhân bản một nhánh, HEAD hoặc --branch"
-#: builtin/clone.c:106
+#: builtin/clone.c:124
msgid "any cloned submodules will be shallow"
msgstr "mọi mô-đun-con nhân bản sẽ là shallow (nông)"
-#: builtin/clone.c:107 builtin/init-db.c:484
+#: builtin/clone.c:125 builtin/init-db.c:484
msgid "gitdir"
msgstr "gitdir"
-#: builtin/clone.c:108 builtin/init-db.c:485
+#: builtin/clone.c:126 builtin/init-db.c:485
msgid "separate git dir from working tree"
msgstr "không dùng chung thư mục dành riêng cho git và thư mục làm việc"
-#: builtin/clone.c:109
+#: builtin/clone.c:127
msgid "key=value"
msgstr "khóa=giá_trị"
-#: builtin/clone.c:110
+#: builtin/clone.c:128
msgid "set config inside the new repository"
msgstr "đặt cấu hình bên trong một kho chứa mới"
-#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:550
+#: builtin/clone.c:129 builtin/fetch.c:140 builtin/push.c:550
msgid "use IPv4 addresses only"
msgstr "chỉ dùng địa chỉ IPv4"
-#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:552
+#: builtin/clone.c:131 builtin/fetch.c:142 builtin/push.c:552
msgid "use IPv6 addresses only"
msgstr "chỉ dùng địa chỉ IPv6"
-#: builtin/clone.c:250
+#: builtin/clone.c:268
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
@@ -6351,42 +6555,42 @@
"Không đoán được thư mục tên là gì.\n"
"Vui lòng chỉ định tên một thư mục trên dòng lệnh"
-#: builtin/clone.c:303
+#: builtin/clone.c:321
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "thông tin: không thể thêm thay thế cho “%s”: %s\n"
-#: builtin/clone.c:375
+#: builtin/clone.c:393
#, c-format
msgid "failed to open '%s'"
msgstr "gặp lỗi khi mở “%s”"
-#: builtin/clone.c:383
+#: builtin/clone.c:401
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s có tồn tại nhưng lại không phải là một thư mục"
-#: builtin/clone.c:397
+#: builtin/clone.c:415
#, c-format
msgid "failed to stat %s\n"
msgstr "gặp lỗi khi lấy thông tin thống kê về %s\n"
-#: builtin/clone.c:419
+#: builtin/clone.c:437
#, c-format
msgid "failed to create link '%s'"
msgstr "gặp lỗi khi tạo được liên kết mềm %s"
-#: builtin/clone.c:423
+#: builtin/clone.c:441
#, c-format
msgid "failed to copy file to '%s'"
msgstr "gặp lỗi khi sao chép tập tin và “%s”"
-#: builtin/clone.c:448
+#: builtin/clone.c:466
#, c-format
msgid "done.\n"
msgstr "hoàn tất.\n"
-#: builtin/clone.c:460
+#: builtin/clone.c:478
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -6396,100 +6600,99 @@
"Bạn kiểm tra kỹ xem cái gì được lấy ra bằng lệnh “git status”\n"
"và thử lấy ra với lệnh “git checkout -f HEAD”\n"
-#: builtin/clone.c:537
+#: builtin/clone.c:555
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Không tìm thấy nhánh máy chủ %s để nhân bản (clone)."
-#: builtin/clone.c:632
+#: builtin/clone.c:650
msgid "remote did not send all necessary objects"
msgstr "máy chủ đã không gửi tất cả các đối tượng cần thiết"
-#: builtin/clone.c:648
+#: builtin/clone.c:666
#, c-format
msgid "unable to update %s"
msgstr "không thể cập nhật %s"
-#: builtin/clone.c:697
+#: builtin/clone.c:715
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr "refers HEAD máy chủ chỉ đến ref không tồn tại, không thể lấy ra.\n"
-#: builtin/clone.c:728
+#: builtin/clone.c:746
msgid "unable to checkout working tree"
msgstr "không thể lấy ra (checkout) cây làm việc"
-#: builtin/clone.c:768
+#: builtin/clone.c:786
msgid "unable to write parameters to config file"
msgstr "không thể ghi các tham số vào tập tin cấu hình"
-#: builtin/clone.c:831
+#: builtin/clone.c:849
msgid "cannot repack to clean up"
msgstr "không thể đóng gói để dọn dẹp"
-#: builtin/clone.c:833
+#: builtin/clone.c:851
msgid "cannot unlink temporary alternates file"
msgstr "không thể bỏ liên kết tập tin thay thế tạm thời"
-#: builtin/clone.c:866 builtin/receive-pack.c:1895
+#: builtin/clone.c:884 builtin/receive-pack.c:1900
msgid "Too many arguments."
msgstr "Có quá nhiều đối số."
-#: builtin/clone.c:870
+#: builtin/clone.c:888
msgid "You must specify a repository to clone."
msgstr "Bạn phải chỉ định một kho để mà nhân bản (clone)."
-#: builtin/clone.c:883
+#: builtin/clone.c:901
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "tùy chọn --bare và --origin %s xung khắc nhau."
-#: builtin/clone.c:886
+#: builtin/clone.c:904
msgid "--bare and --separate-git-dir are incompatible."
msgstr "tùy chọn --bare và --separate-git-dir xung khắc nhau."
-#: builtin/clone.c:899
+#: builtin/clone.c:917
#, c-format
msgid "repository '%s' does not exist"
msgstr "kho chứa “%s” chưa tồn tại"
-#: builtin/clone.c:905 builtin/fetch.c:1335
+#: builtin/clone.c:923 builtin/fetch.c:1337
#, c-format
msgid "depth %s is not a positive number"
msgstr "độ sâu %s không phải là một số nguyên dương"
-#: builtin/clone.c:915
+#: builtin/clone.c:933
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "đường dẫn đích “%s” đã có từ trước và không phải là một thư mục rỗng."
-#: builtin/clone.c:925
+#: builtin/clone.c:943
#, c-format
msgid "working tree '%s' already exists."
msgstr "cây làm việc “%s” đã sẵn tồn tại rồi."
-#: builtin/clone.c:940 builtin/clone.c:951 builtin/difftool.c:252
-#: builtin/submodule--helper.c:659 builtin/worktree.c:222
-#: builtin/worktree.c:249
+#: builtin/clone.c:958 builtin/clone.c:969 builtin/difftool.c:252
+#: builtin/worktree.c:221 builtin/worktree.c:251
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "không thể tạo các thư mục dẫn đầu của “%s”"
-#: builtin/clone.c:943
+#: builtin/clone.c:961
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "không thể tạo cây thư mục làm việc dir “%s”"
-#: builtin/clone.c:955
+#: builtin/clone.c:973
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Đang nhân bản thành kho chứa bare “%s”…\n"
-#: builtin/clone.c:957
+#: builtin/clone.c:975
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Đang nhân bản thành “%s”…\n"
-#: builtin/clone.c:963
+#: builtin/clone.c:999
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
@@ -6497,41 +6700,41 @@
"nhân bản --recursive không tương thích với cả hai --reference và --reference-"
"if-able"
-#: builtin/clone.c:1019
+#: builtin/clone.c:1055
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth bị lờ đi khi nhân bản nội bộ; hãy sử dụng file:// để thay thế."
-#: builtin/clone.c:1021
+#: builtin/clone.c:1057
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-since bị lờ đi khi nhân bản nội bộ; hãy sử dụng file:// để thay "
"thế."
-#: builtin/clone.c:1023
+#: builtin/clone.c:1059
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-exclude bị lờ đi khi nhân bản nội bộ; hãy sử dụng file:// để thay "
"thế."
-#: builtin/clone.c:1026
+#: builtin/clone.c:1062
msgid "source repository is shallow, ignoring --local"
msgstr "kho nguồn là nông, nên bỏ qua --local"
-#: builtin/clone.c:1031
+#: builtin/clone.c:1067
msgid "--local is ignored"
msgstr "--local bị lờ đi"
-#: builtin/clone.c:1035
+#: builtin/clone.c:1071
#, c-format
msgid "Don't know how to clone %s"
msgstr "Không biết làm cách nào để nhân bản (clone) %s"
-#: builtin/clone.c:1090 builtin/clone.c:1098
+#: builtin/clone.c:1126 builtin/clone.c:1134
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Nhánh máy chủ %s không tìm thấy trong thượng nguồn %s"
-#: builtin/clone.c:1101
+#: builtin/clone.c:1137
msgid "You appear to have cloned an empty repository."
msgstr "Bạn hình như là đã nhân bản một kho trống rỗng."
@@ -6738,11 +6941,6 @@
msgid "malformed --author parameter"
msgstr "đối số cho --author bị dị hình"
-#: builtin/commit.c:611
-#, c-format
-msgid "invalid date format: %s"
-msgstr "ngày tháng không hợp lệ: %s"
-
#: builtin/commit.c:655
msgid ""
"unable to select a comment character that is not used\n"
@@ -6756,7 +6954,7 @@
msgid "could not lookup commit %s"
msgstr "không thể tìm kiếm commit (lần chuyển giao) %s"
-#: builtin/commit.c:704 builtin/shortlog.c:295
+#: builtin/commit.c:704 builtin/shortlog.c:294
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(đang đọc thông điệp nhật ký từ đầu vào tiêu chuẩn)\n"
@@ -6858,7 +7056,7 @@
msgid "Error building trees"
msgstr "Gặp lỗi khi xây dựng cây"
-#: builtin/commit.c:968 builtin/tag.c:280
+#: builtin/commit.c:968 builtin/tag.c:273
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Xin hãy cung cấp lời chú giải hoặc là dùng tùy chọn -m hoặc là -F.\n"
@@ -6932,7 +7130,7 @@
"Những đường dẫn rõ ràng được chỉ ra không có tùy chọn -i cũng không -o; coi "
"là --only những đường dẫn"
-#: builtin/commit.c:1224 builtin/tag.c:495
+#: builtin/commit.c:1224 builtin/tag.c:551
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Chế độ dọn dẹp không hợp lệ %s"
@@ -6954,7 +7152,7 @@
msgstr "phiên bản"
#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525
-#: builtin/worktree.c:442
+#: builtin/worktree.c:448
msgid "machine-readable output"
msgstr "kết xuất dạng máy-có-thể-đọc"
@@ -6967,7 +7165,7 @@
msgstr "chấm dứt các mục bằng NUL"
#: builtin/commit.c:1351 builtin/commit.c:1624 builtin/fast-export.c:981
-#: builtin/fast-export.c:984 builtin/tag.c:368
+#: builtin/fast-export.c:984 builtin/tag.c:411
msgid "mode"
msgstr "chế độ"
@@ -7026,7 +7224,7 @@
msgid "Commit message options"
msgstr "Các tùy chọn ghi chú commit"
-#: builtin/commit.c:1586 builtin/tag.c:366
+#: builtin/commit.c:1586 builtin/tag.c:409
msgid "read message from file"
msgstr "đọc chú thích từ tập tin"
@@ -7038,7 +7236,7 @@
msgid "override author for commit"
msgstr "ghi đè tác giả cho commit"
-#: builtin/commit.c:1588 builtin/gc.c:333
+#: builtin/commit.c:1588 builtin/gc.c:357
msgid "date"
msgstr "ngày tháng"
@@ -7046,8 +7244,8 @@
msgid "override date for commit"
msgstr "ghi đè ngày tháng cho lần chuyển giao"
-#: builtin/commit.c:1589 builtin/merge.c:222 builtin/notes.c:398
-#: builtin/notes.c:561 builtin/tag.c:364
+#: builtin/commit.c:1589 builtin/merge.c:221 builtin/notes.c:398
+#: builtin/notes.c:561 builtin/tag.c:407
msgid "message"
msgstr "chú thích"
@@ -7056,7 +7254,7 @@
msgstr "chú thích của lần chuyển giao"
#: builtin/commit.c:1590 builtin/commit.c:1591 builtin/commit.c:1592
-#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:81
+#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:77
msgid "commit"
msgstr "lần_chuyển_giao"
@@ -7084,7 +7282,7 @@
msgstr ""
"lần chuyển giao nhận tôi là tác giả (được dùng với tùy chọn -C/-c/--amend)"
-#: builtin/commit.c:1595 builtin/log.c:1413 builtin/revert.c:86
+#: builtin/commit.c:1595 builtin/log.c:1420 builtin/revert.c:104
msgid "add Signed-off-by:"
msgstr "(nên dùng) thêm dòng Signed-off-by:"
@@ -7100,7 +7298,7 @@
msgid "default"
msgstr "mặc định"
-#: builtin/commit.c:1598 builtin/tag.c:369
+#: builtin/commit.c:1598 builtin/tag.c:412
msgid "how to strip spaces and #comments from message"
msgstr "làm thế nào để cắt bỏ khoảng trắng và #ghichú từ mẩu tin nhắn"
@@ -7108,8 +7306,8 @@
msgid "include status in commit message template"
msgstr "bao gồm các trạng thái trong mẫu ghi chú chuyển giao"
-#: builtin/commit.c:1601 builtin/merge.c:234 builtin/pull.c:166
-#: builtin/revert.c:93
+#: builtin/commit.c:1601 builtin/merge.c:233 builtin/pull.c:166
+#: builtin/revert.c:112
msgid "GPG sign commit"
msgstr "ký lần chuyển giao dùng GPG"
@@ -7206,141 +7404,141 @@
msgid "git config [<options>]"
msgstr "git config [<các-tùy-chọn>]"
-#: builtin/config.c:55
+#: builtin/config.c:56
msgid "Config file location"
msgstr "Vị trí tập tin cấu hình"
-#: builtin/config.c:56
+#: builtin/config.c:57
msgid "use global config file"
msgstr "dùng tập tin cấu hình toàn cục"
-#: builtin/config.c:57
+#: builtin/config.c:58
msgid "use system config file"
msgstr "sử dụng tập tin cấu hình hệ thống"
-#: builtin/config.c:58
+#: builtin/config.c:59
msgid "use repository config file"
msgstr "dùng tập tin cấu hình của kho"
-#: builtin/config.c:59
+#: builtin/config.c:60
msgid "use given config file"
msgstr "sử dụng tập tin cấu hình đã cho"
-#: builtin/config.c:60
+#: builtin/config.c:61
msgid "blob-id"
msgstr "blob-id"
-#: builtin/config.c:60
+#: builtin/config.c:61
msgid "read config from given blob object"
msgstr "đọc cấu hình từ đối tượng blob đã cho"
-#: builtin/config.c:61
+#: builtin/config.c:62
msgid "Action"
msgstr "Hành động"
-#: builtin/config.c:62
+#: builtin/config.c:63
msgid "get value: name [value-regex]"
msgstr "lấy giá-trị: tên [value-regex]"
-#: builtin/config.c:63
+#: builtin/config.c:64
msgid "get all values: key [value-regex]"
msgstr "lấy tất cả giá-trị: khóa [value-regex]"
-#: builtin/config.c:64
+#: builtin/config.c:65
msgid "get values for regexp: name-regex [value-regex]"
msgstr "lấy giá trị cho regexp: name-regex [value-regex]"
-#: builtin/config.c:65
+#: builtin/config.c:66
msgid "get value specific for the URL: section[.var] URL"
msgstr "lấy đặc tả giá trị cho URL: phần[.biến] URL"
-#: builtin/config.c:66
+#: builtin/config.c:67
msgid "replace all matching variables: name value [value_regex]"
msgstr "thay thế tất cả các biến khớp mẫu: tên giá-trị [value_regex]"
-#: builtin/config.c:67
+#: builtin/config.c:68
msgid "add a new variable: name value"
msgstr "thêm biến mới: tên giá-trị"
-#: builtin/config.c:68
+#: builtin/config.c:69
msgid "remove a variable: name [value-regex]"
msgstr "gỡ bỏ biến: tên [value-regex]"
-#: builtin/config.c:69
+#: builtin/config.c:70
msgid "remove all matches: name [value-regex]"
msgstr "gỡ bỏ mọi cái khớp: tên [value-regex]"
-#: builtin/config.c:70
+#: builtin/config.c:71
msgid "rename section: old-name new-name"
msgstr "đổi tên phần: tên-cũ tên-mới"
-#: builtin/config.c:71
+#: builtin/config.c:72
msgid "remove a section: name"
msgstr "gỡ bỏ phần: tên"
-#: builtin/config.c:72
+#: builtin/config.c:73
msgid "list all"
msgstr "liệt kê tất"
-#: builtin/config.c:73
+#: builtin/config.c:74
msgid "open an editor"
msgstr "mở một trình biên soạn"
-#: builtin/config.c:74
+#: builtin/config.c:75
msgid "find the color configured: slot [default]"
msgstr "tìm cấu hình màu sắc: slot [mặc định]"
-#: builtin/config.c:75
+#: builtin/config.c:76
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "tìm các cài đặt về màu sắc: slot [stdout-là-tty]"
-#: builtin/config.c:76
+#: builtin/config.c:77
msgid "Type"
msgstr "Kiểu"
-#: builtin/config.c:77
+#: builtin/config.c:78
msgid "value is \"true\" or \"false\""
msgstr "giá trị là \"true\" hoặc \"false\""
-#: builtin/config.c:78
+#: builtin/config.c:79
msgid "value is decimal number"
msgstr "giá trị ở dạng số thập phân"
-#: builtin/config.c:79
+#: builtin/config.c:80
msgid "value is --bool or --int"
msgstr "giá trị là --bool hoặc --int"
-#: builtin/config.c:80
+#: builtin/config.c:81
msgid "value is a path (file or directory name)"
msgstr "giá trị là đường dẫn (tên tập tin hay thư mục)"
-#: builtin/config.c:81
+#: builtin/config.c:82
msgid "Other"
msgstr "Khác"
-#: builtin/config.c:82
+#: builtin/config.c:83
msgid "terminate values with NUL byte"
msgstr "chấm dứt giá trị với byte NUL"
-#: builtin/config.c:83
+#: builtin/config.c:84
msgid "show variable names only"
msgstr "chỉ hiển thị các tên biến"
-#: builtin/config.c:84
+#: builtin/config.c:85
msgid "respect include directives on lookup"
msgstr "tôn trọng kể cà các hướng trong tìm kiếm"
-#: builtin/config.c:85
+#: builtin/config.c:86
msgid "show origin of config (file, standard input, blob, command line)"
msgstr ""
"hiển thị nguyên gốc của cấu hình (tập tin, đầu vào tiêu chuẩn, blob, dòng "
"lệnh)"
-#: builtin/config.c:327
+#: builtin/config.c:328
msgid "unable to parse default color value"
msgstr "không thể phân tích giá trị màu mặc định"
-#: builtin/config.c:471
+#: builtin/config.c:472
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -7355,12 +7553,12 @@
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:613
+#: builtin/config.c:615
#, c-format
msgid "cannot create configuration file %s"
msgstr "không thể tạo tập tin cấu hình “%s”"
-#: builtin/config.c:625
+#: builtin/config.c:627
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
@@ -7377,55 +7575,67 @@
msgid "print sizes in human readable format"
msgstr "hiển thị kích cỡ theo định dạng dành cho người đọc"
-#: builtin/describe.c:17
+#: builtin/describe.c:18
msgid "git describe [<options>] [<commit-ish>...]"
msgstr "git describe [<các-tùy-chọn>] <commit-ish>*"
-#: builtin/describe.c:18
+#: builtin/describe.c:19
msgid "git describe [<options>] --dirty"
msgstr "git describe [<các-tùy-chọn>] --dirty"
-#: builtin/describe.c:217
+#: builtin/describe.c:53
+msgid "head"
+msgstr "phía trước "
+
+#: builtin/describe.c:53
+msgid "lightweight"
+msgstr "hạng nhẹ"
+
+#: builtin/describe.c:53
+msgid "annotated"
+msgstr "có diễn giải"
+
+#: builtin/describe.c:250
#, c-format
msgid "annotated tag %s not available"
msgstr "thẻ đã được ghi chú %s không sẵn để dùng"
-#: builtin/describe.c:221
+#: builtin/describe.c:254
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr "thẻ được chú giải %s không có tên nhúng"
-#: builtin/describe.c:223
+#: builtin/describe.c:256
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr "thẻ “%s” đã thực sự ở đây “%s” rồi"
-#: builtin/describe.c:250 builtin/log.c:480
+#: builtin/describe.c:283 builtin/log.c:487
#, c-format
msgid "Not a valid object name %s"
msgstr "Không phải tên đối tượng %s hợp lệ"
-#: builtin/describe.c:253
+#: builtin/describe.c:286
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s không phải là một đối tượng “%s” hợp lệ"
-#: builtin/describe.c:270
+#: builtin/describe.c:303
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "không có thẻ nào khớp chính xác với “%s”"
-#: builtin/describe.c:272
+#: builtin/describe.c:305
#, c-format
msgid "searching to describe %s\n"
msgstr "Đang tìm kiếm để mô tả %s\n"
-#: builtin/describe.c:319
+#: builtin/describe.c:352
#, c-format
msgid "finished search at %s\n"
msgstr "việc tìm kiếm đã kết thúc tại %s\n"
-#: builtin/describe.c:346
+#: builtin/describe.c:379
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
@@ -7434,7 +7644,7 @@
"Không có thẻ được chú giải nào được mô tả là “%s”.\n"
"Tuy nhiên, ở đây có những thẻ không được chú giải: hãy thử --tags."
-#: builtin/describe.c:350
+#: builtin/describe.c:383
#, c-format
msgid ""
"No tags can describe '%s'.\n"
@@ -7443,12 +7653,12 @@
"Không có thẻ có thể mô tả “%s”.\n"
"Hãy thử --always, hoặc tạo một số thẻ."
-#: builtin/describe.c:371
+#: builtin/describe.c:413
#, c-format
msgid "traversed %lu commits\n"
msgstr "đã xuyên %lu qua lần chuyển giao\n"
-#: builtin/describe.c:374
+#: builtin/describe.c:416
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
@@ -7457,66 +7667,78 @@
"tìm thấy nhiều hơn %i thẻ; đã liệt kê %i cái gần\n"
"đây nhất bỏ đi tìm kiếm tại %s\n"
-#: builtin/describe.c:396
+#: builtin/describe.c:438
msgid "find the tag that comes after the commit"
msgstr "tìm các thẻ mà nó đến trước lần chuyển giao"
-#: builtin/describe.c:397
+#: builtin/describe.c:439
msgid "debug search strategy on stderr"
msgstr "chiến lược tìm kiếm gỡ lỗi trên đầu ra lỗi chuẩn stderr"
-#: builtin/describe.c:398
+#: builtin/describe.c:440
msgid "use any ref"
msgstr "dùng ref bất kỳ"
-#: builtin/describe.c:399
+#: builtin/describe.c:441
msgid "use any tag, even unannotated"
msgstr "dùng thẻ bất kỳ, cả khi “unannotated”"
-#: builtin/describe.c:400
+#: builtin/describe.c:442
msgid "always use long format"
msgstr "luôn dùng định dạng dài"
-#: builtin/describe.c:401
+#: builtin/describe.c:443
msgid "only follow first parent"
msgstr "chỉ theo cha mẹ đầu tiên"
-#: builtin/describe.c:404
+#: builtin/describe.c:446
msgid "only output exact matches"
msgstr "chỉ xuất những gì khớp chính xác"
-#: builtin/describe.c:406
+#: builtin/describe.c:448
msgid "consider <n> most recent tags (default: 10)"
msgstr "coi như <n> thẻ gần đây nhất (mặc định: 10)"
-#: builtin/describe.c:408
+#: builtin/describe.c:450
msgid "only consider tags matching <pattern>"
msgstr "chỉ cân nhắc đến những thẻ khớp với <mẫu>"
-#: builtin/describe.c:410 builtin/name-rev.c:320
+#: builtin/describe.c:452
+msgid "do not consider tags matching <pattern>"
+msgstr "không coi rằng các thẻ khớp với <mẫu>"
+
+#: builtin/describe.c:454 builtin/name-rev.c:357
msgid "show abbreviated commit object as fallback"
msgstr "hiển thị đối tượng chuyển giao vắn tắt như là fallback"
-#: builtin/describe.c:411
+#: builtin/describe.c:455 builtin/describe.c:458
msgid "mark"
msgstr "dấu"
-#: builtin/describe.c:412
+#: builtin/describe.c:456
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr "thêm <dấu> trên cây thư mục làm việc bẩn (mặc định \"-dirty\")"
-#: builtin/describe.c:430
+#: builtin/describe.c:459
+msgid "append <mark> on broken working tree (default: \"-broken\")"
+msgstr "thêm <dấu> trên cây thư mục làm việc bị hỏng (mặc định \"-broken\")"
+
+#: builtin/describe.c:477
msgid "--long is incompatible with --abbrev=0"
msgstr "--long là xung khắc với tùy chọn --abbrev=0"
-#: builtin/describe.c:456
+#: builtin/describe.c:506
msgid "No names found, cannot describe anything."
msgstr "Không tìm thấy các tên, không thể mô tả gì cả."
-#: builtin/describe.c:476
+#: builtin/describe.c:549
msgid "--dirty is incompatible with commit-ishes"
msgstr "--dirty là xung khắc với các tùy chọn commit-ish"
+#: builtin/describe.c:551
+msgid "--broken is incompatible with commit-ishes"
+msgstr "--broken là xung khắc với commit-ishes"
+
#: builtin/diff.c:83
#, c-format
msgid "'%s': not a regular file or symlink"
@@ -7557,7 +7779,22 @@
msgid "failed: %d"
msgstr "gặp lỗi: %d"
-#: builtin/difftool.c:342
+#: builtin/difftool.c:283
+#, c-format
+msgid "could not read symlink %s"
+msgstr "không thể đọc liên kết mềm %s"
+
+#: builtin/difftool.c:285
+#, c-format
+msgid "could not read symlink file %s"
+msgstr "không đọc được tập tin liên kết mềm %s"
+
+#: builtin/difftool.c:293
+#, c-format
+msgid "could not read object %s for symlink %s"
+msgstr "Không thể đọc đối tượng %s cho liên kết mềm %s"
+
+#: builtin/difftool.c:395
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
@@ -7565,53 +7802,53 @@
"các định dạng diff tổ hợp(“-c” và “--cc”) chưa được hỗ trợ trong\n"
"chế độ diff thư mục(“-d” và “--dir-diff”)."
-#: builtin/difftool.c:567
+#: builtin/difftool.c:609
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "cả hai tập tin đã bị sửa: “%s” và “%s”."
-#: builtin/difftool.c:569
+#: builtin/difftool.c:611
msgid "working tree file has been left."
msgstr "cây làm việc ở bên trái."
-#: builtin/difftool.c:580
+#: builtin/difftool.c:622
#, c-format
msgid "temporary files exist in '%s'."
msgstr "các tập tin tạm đã sẵn có trong “%s”."
-#: builtin/difftool.c:581
+#: builtin/difftool.c:623
msgid "you may want to cleanup or recover these."
msgstr "bạn có lẽ muốn dọn dẹp hay "
-#: builtin/difftool.c:626
+#: builtin/difftool.c:669
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "dùng “diff.guitool“ thay vì dùng “diff.tool“"
-#: builtin/difftool.c:628
+#: builtin/difftool.c:671
msgid "perform a full-directory diff"
msgstr "thực hiện một diff toàn thư mục"
-#: builtin/difftool.c:630
+#: builtin/difftool.c:673
msgid "do not prompt before launching a diff tool"
msgstr "đừng nhắc khi khởi chạy công cụ diff"
-#: builtin/difftool.c:636
+#: builtin/difftool.c:679
msgid "use symlinks in dir-diff mode"
msgstr "dùng liên kết mềm trong diff-thư-mục"
-#: builtin/difftool.c:637
+#: builtin/difftool.c:680
msgid "<tool>"
msgstr "<công_cụ>"
-#: builtin/difftool.c:638
+#: builtin/difftool.c:681
msgid "use the specified diff tool"
msgstr "dùng công cụ diff đã cho"
-#: builtin/difftool.c:640
+#: builtin/difftool.c:683
msgid "print a list of diff tools that may be used with `--tool`"
msgstr "in ra danh sách các công cụ dif cái mà có thẻ dùng với “--tool“"
-#: builtin/difftool.c:643
+#: builtin/difftool.c:686
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
@@ -7619,19 +7856,19 @@
"làm cho “git-difftool” thoát khi gọi công cụ diff trả về mã không phải số "
"không"
-#: builtin/difftool.c:645
+#: builtin/difftool.c:688
msgid "<command>"
msgstr "<lệnh>"
-#: builtin/difftool.c:646
+#: builtin/difftool.c:689
msgid "specify a custom command for viewing diffs"
msgstr "chỉ định một lệnh tùy ý để xem diff"
-#: builtin/difftool.c:670
+#: builtin/difftool.c:713
msgid "no <tool> given for --tool=<tool>"
msgstr "chưa đưa ra <công_cụ> cho --tool=<công_cụ>"
-#: builtin/difftool.c:677
+#: builtin/difftool.c:720
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "chưa đưa ra <lệnh> cho --extcmd=<lệnh>"
@@ -7769,7 +8006,7 @@
msgid "convert to a complete repository"
msgstr "chuyển đổi hoàn toàn sang kho git"
-#: builtin/fetch.c:131 builtin/log.c:1433
+#: builtin/fetch.c:131 builtin/log.c:1440
msgid "dir"
msgstr "tmục"
@@ -7797,73 +8034,73 @@
msgid "Couldn't find remote ref HEAD"
msgstr "Không thể tìm thấy máy chủ cho tham chiếu HEAD"
-#: builtin/fetch.c:511
+#: builtin/fetch.c:513
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "phần cấu hình fetch.output có chứa giá-trị không hợp lệ %s"
-#: builtin/fetch.c:604
+#: builtin/fetch.c:606
#, c-format
msgid "object %s not found"
msgstr "Không tìm thấy đối tượng %s"
-#: builtin/fetch.c:608
+#: builtin/fetch.c:610
msgid "[up to date]"
msgstr "[đã cập nhật]"
-#: builtin/fetch.c:621 builtin/fetch.c:701
+#: builtin/fetch.c:623 builtin/fetch.c:703
msgid "[rejected]"
msgstr "[Bị từ chối]"
-#: builtin/fetch.c:622
+#: builtin/fetch.c:624
msgid "can't fetch in current branch"
msgstr "không thể fetch (lấy) về nhánh hiện hành"
-#: builtin/fetch.c:631
+#: builtin/fetch.c:633
msgid "[tag update]"
msgstr "[cập nhật thẻ]"
-#: builtin/fetch.c:632 builtin/fetch.c:665 builtin/fetch.c:681
-#: builtin/fetch.c:696
+#: builtin/fetch.c:634 builtin/fetch.c:667 builtin/fetch.c:683
+#: builtin/fetch.c:698
msgid "unable to update local ref"
msgstr "không thể cập nhật tham chiếu nội bộ"
-#: builtin/fetch.c:651
+#: builtin/fetch.c:653
msgid "[new tag]"
msgstr "[thẻ mới]"
-#: builtin/fetch.c:654
+#: builtin/fetch.c:656
msgid "[new branch]"
msgstr "[nhánh mới]"
-#: builtin/fetch.c:657
+#: builtin/fetch.c:659
msgid "[new ref]"
msgstr "[ref (tham chiếu) mới]"
-#: builtin/fetch.c:696
+#: builtin/fetch.c:698
msgid "forced update"
msgstr "cưỡng bức cập nhật"
-#: builtin/fetch.c:701
+#: builtin/fetch.c:703
msgid "non-fast-forward"
msgstr "không-phải-chuyển-tiếp-nhanh"
-#: builtin/fetch.c:746
+#: builtin/fetch.c:748
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s đã không gửi tất cả các đối tượng cần thiết\n"
-#: builtin/fetch.c:766
+#: builtin/fetch.c:768
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "từ chối %s bởi vì các gốc nông thì không được phép cập nhật"
-#: builtin/fetch.c:853 builtin/fetch.c:949
+#: builtin/fetch.c:855 builtin/fetch.c:951
#, c-format
msgid "From %.*s\n"
msgstr "Từ %.*s\n"
-#: builtin/fetch.c:864
+#: builtin/fetch.c:866
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -7872,57 +8109,57 @@
"một số tham chiếu nội bộ không thể được cập nhật; hãy thử chạy\n"
" “git remote prune %s” để bỏ đi những nhánh cũ, hay bị xung đột"
-#: builtin/fetch.c:919
+#: builtin/fetch.c:921
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s sẽ trở thành không đầu (không được quản lý))"
-#: builtin/fetch.c:920
+#: builtin/fetch.c:922
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s đã trở thành không đầu (không được quản lý))"
-#: builtin/fetch.c:952
+#: builtin/fetch.c:954
msgid "[deleted]"
msgstr "[đã xóa]"
-#: builtin/fetch.c:953 builtin/remote.c:1020
+#: builtin/fetch.c:955 builtin/remote.c:1022
msgid "(none)"
msgstr "(không)"
-#: builtin/fetch.c:976
+#: builtin/fetch.c:978
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
"Từ chối việc lấy vào trong nhánh hiện tại %s của một kho chứa không phải kho "
"trần (bare)"
-#: builtin/fetch.c:995
+#: builtin/fetch.c:997
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "Tùy chọn \"%s\" có giá trị \"%s\" là không hợp lệ cho %s"
-#: builtin/fetch.c:998
+#: builtin/fetch.c:1000
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Tùy chọn \"%s\" bị bỏ qua với %s\n"
-#: builtin/fetch.c:1074
+#: builtin/fetch.c:1076
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "Không biết làm cách nào để lấy về từ %s"
-#: builtin/fetch.c:1234
+#: builtin/fetch.c:1236
#, c-format
msgid "Fetching %s\n"
msgstr "Đang lấy “%s” về\n"
-#: builtin/fetch.c:1236 builtin/remote.c:96
+#: builtin/fetch.c:1238 builtin/remote.c:96
#, c-format
msgid "Could not fetch %s"
msgstr "không thể “%s” về"
-#: builtin/fetch.c:1254
+#: builtin/fetch.c:1256
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -7930,40 +8167,40 @@
"Chưa chỉ ra kho chứa máy chủ. Xin hãy chỉ định hoặc là URL hoặc\n"
"tên máy chủ từ cái mà những điểm xét duyệt mới có thể được fetch (lấy về)."
-#: builtin/fetch.c:1277
+#: builtin/fetch.c:1279
msgid "You need to specify a tag name."
msgstr "Bạn phải định rõ tên thẻ."
-#: builtin/fetch.c:1319
+#: builtin/fetch.c:1321
msgid "Negative depth in --deepen is not supported"
msgstr "Mức sâu là số âm trong --deepen là không được hỗ trợ"
-#: builtin/fetch.c:1321
+#: builtin/fetch.c:1323
msgid "--deepen and --depth are mutually exclusive"
msgstr "Các tùy chọn--deepen và --depth loại từ lẫn nhau"
-#: builtin/fetch.c:1326
+#: builtin/fetch.c:1328
msgid "--depth and --unshallow cannot be used together"
msgstr "tùy chọn --depth và --unshallow không thể sử dụng cùng với nhau"
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1330
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow trên kho hoàn chỉnh là không hợp lý"
-#: builtin/fetch.c:1350
+#: builtin/fetch.c:1352
msgid "fetch --all does not take a repository argument"
msgstr "lệnh lấy về \"fetch --all\" không lấy đối số kho chứa"
-#: builtin/fetch.c:1352
+#: builtin/fetch.c:1354
msgid "fetch --all does not make sense with refspecs"
msgstr "lệnh lấy về \"fetch --all\" không hợp lý với refspecs"
-#: builtin/fetch.c:1363
+#: builtin/fetch.c:1365
#, c-format
msgid "No such remote or remote group: %s"
msgstr "không có nhóm máy chủ hay máy chủ như thế: %s"
-#: builtin/fetch.c:1371
+#: builtin/fetch.c:1373
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Việc lấy về cả một nhóm và chỉ định refspecs không hợp lý"
@@ -8003,12 +8240,14 @@
msgstr "git for-each-ref [--points-at <đối tượng>]"
#: builtin/for-each-ref.c:11
-msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"
-msgstr "git branch ([--merged | --no-merged) [<đối_tượng>]"
+msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
+msgstr "git for-each-ref [(--merged | --no-merged) [<lần-chuyển-giao>]]"
#: builtin/for-each-ref.c:12
-msgid "git for-each-ref [--contains [<object>]]"
-msgstr "git for-each-ref [--contains [<đối_tượng>]]"
+msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
+msgstr ""
+"git for-each-ref [--contains [<lần-chuyển-giao>]] [--no-contains [<lần-"
+"chuyển-giao>]]"
#: builtin/for-each-ref.c:27
msgid "quote placeholders suitably for shells"
@@ -8030,10 +8269,6 @@
msgid "show only <n> matched refs"
msgstr "hiển thị chỉ <n> tham chiếu khớp"
-#: builtin/for-each-ref.c:37 builtin/tag.c:387 builtin/verify-tag.c:38
-msgid "format to use for the output"
-msgstr "định dạng sẽ dùng cho đầu ra"
-
#: builtin/for-each-ref.c:41
msgid "print only refs which points at the given object"
msgstr "chỉ hiển thị các tham chiếu mà nó chỉ đến đối tượng đã cho"
@@ -8050,6 +8285,10 @@
msgid "print only refs which contain the commit"
msgstr "chỉ hiển thị những tham chiếu mà nó chứa lần chuyển giao"
+#: builtin/for-each-ref.c:46
+msgid "print only refs which don't contain the commit"
+msgstr "chỉ hiển thị những tham chiếu mà nó không chứa lần chuyển giao"
+
#: builtin/fsck.c:554
msgid "Checking object directories"
msgstr "Đang kiểm tra các thư mục đối tượng"
@@ -8114,17 +8353,17 @@
msgid "git gc [<options>]"
msgstr "git gc [<các-tùy-chọn>]"
-#: builtin/gc.c:72
+#: builtin/gc.c:78
#, c-format
-msgid "Invalid %s: '%s'"
-msgstr "%s không hợp lệ: “%s”"
+msgid "Failed to fstat %s: %s"
+msgstr "Gặp lỗi khi lấy thông tin thống kê về tập tin %s: %s"
-#: builtin/gc.c:139
+#: builtin/gc.c:310
#, c-format
-msgid "insanely long object directory %.*s"
-msgstr "thư mục đối tượng dài một cách điên rồ %.*s"
+msgid "Can't stat %s"
+msgstr "không thể lấy thông tin thống kê về “%s”"
-#: builtin/gc.c:297
+#: builtin/gc.c:319
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@ -8139,40 +8378,45 @@
"\n"
"%s"
-#: builtin/gc.c:334
+#: builtin/gc.c:358
msgid "prune unreferenced objects"
msgstr "xóa bỏ các đối tượng không được tham chiếu"
-#: builtin/gc.c:336
+#: builtin/gc.c:360
msgid "be more thorough (increased runtime)"
msgstr "cẩn thận hơn nữa (tăng thời gian chạy)"
-#: builtin/gc.c:337
+#: builtin/gc.c:361
msgid "enable auto-gc mode"
msgstr "bật chế độ auto-gc"
-#: builtin/gc.c:338
+#: builtin/gc.c:362
msgid "force running gc even if there may be another gc running"
msgstr "buộc gc chạy ngay cả khi có tiến trình gc khác đang chạy"
-#: builtin/gc.c:380
+#: builtin/gc.c:379
+#, c-format
+msgid "Failed to parse gc.logexpiry value %s"
+msgstr "Gặp lỗi khi phân tích giá trị gc.logexpiry %s"
+
+#: builtin/gc.c:407
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
"Tự động đóng gói kho chứa trên nền hệ thống để tối ưu hóa hiệu suất làm "
"việc.\n"
-#: builtin/gc.c:382
+#: builtin/gc.c:409
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "Tự động đóng gói kho chứa để tối ưu hóa hiệu suất làm việc.\n"
-#: builtin/gc.c:383
+#: builtin/gc.c:410
#, c-format
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:404
+#: builtin/gc.c:431
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -8180,7 +8424,7 @@
"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:448
+#: builtin/gc.c:475
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
@@ -8201,238 +8445,241 @@
msgid "invalid number of threads specified (%d) for %s"
msgstr "số tuyến đã cho không hợp lệ (%d) cho %s"
-#: builtin/grep.c:763 builtin/grep.c:804
+#: builtin/grep.c:769 builtin/grep.c:810
#, c-format
msgid "unable to read tree (%s)"
msgstr "không thể đọc cây (%s)"
-#: builtin/grep.c:823
+#: builtin/grep.c:829
#, c-format
msgid "unable to grep from object of type %s"
msgstr "không thể thực hiện lệnh grep (lọc tìm) từ đối tượng thuộc kiểu %s"
-#: builtin/grep.c:887
+#: builtin/grep.c:893
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "chuyển đến “%c” cần một giá trị bằng số"
-#: builtin/grep.c:973
+#: builtin/grep.c:980
msgid "search in index instead of in the work tree"
msgstr "tìm trong bảng mục lục thay vì trong cây làm việc"
-#: builtin/grep.c:975
+#: builtin/grep.c:982
msgid "find in contents not managed by git"
msgstr "tìm trong nội dung không được quản lý bởi git"
-#: builtin/grep.c:977
+#: builtin/grep.c:984
msgid "search in both tracked and untracked files"
msgstr "tìm kiếm các tập tin được và chưa được theo dõi dấu vết"
-#: builtin/grep.c:979
+#: builtin/grep.c:986
msgid "ignore files specified via '.gitignore'"
msgstr "các tập tin bị bỏ qua được chỉ định thông qua “.gitignore”"
-#: builtin/grep.c:981
-msgid "recursivley search in each submodule"
+#: builtin/grep.c:988
+msgid "recursively search in each submodule"
msgstr "tìm kiếm đệ quy trong từng mô-đun-con"
-#: builtin/grep.c:983
+#: builtin/grep.c:990
msgid "basename"
msgstr "tên cơ sở"
-#: builtin/grep.c:984
+#: builtin/grep.c:991
msgid "prepend parent project's basename to output"
msgstr "treo vào trước tên cơ sở cha mẹ của đường dẫn vào kết xuất"
-#: builtin/grep.c:987
+#: builtin/grep.c:994
msgid "show non-matching lines"
msgstr "hiển thị những dòng không khớp với mẫu"
-#: builtin/grep.c:989
+#: builtin/grep.c:996
msgid "case insensitive matching"
msgstr "phân biệt HOA/thường"
-#: builtin/grep.c:991
+#: builtin/grep.c:998
msgid "match patterns only at word boundaries"
msgstr "chỉ khớp mẫu tại đường ranh giới từ"
-#: builtin/grep.c:993
+#: builtin/grep.c:1000
msgid "process binary files as text"
msgstr "xử lý tập tin nhị phân như là dạng văn bản thường"
-#: builtin/grep.c:995
+#: builtin/grep.c:1002
msgid "don't match patterns in binary files"
msgstr "không khớp mẫu trong các tập tin nhị phân"
-#: builtin/grep.c:998
+#: builtin/grep.c:1005
msgid "process binary files with textconv filters"
msgstr "xử lý tập tin nhị phân với các bộ lọc “textconv”"
-#: builtin/grep.c:1000
+#: builtin/grep.c:1007
msgid "descend at most <depth> levels"
msgstr "hạ xuống ít nhất là mức <sâu>"
-#: builtin/grep.c:1004
+#: builtin/grep.c:1011
msgid "use extended POSIX regular expressions"
msgstr "dùng biểu thức chính qui POSIX có mở rộng"
-#: builtin/grep.c:1007
+#: builtin/grep.c:1014
msgid "use basic POSIX regular expressions (default)"
msgstr "sử dụng biểu thức chính quy kiểu POSIX (mặc định)"
-#: builtin/grep.c:1010
+#: builtin/grep.c:1017
msgid "interpret patterns as fixed strings"
msgstr "diễn dịch các mẫu như là chuỗi cố định"
-#: builtin/grep.c:1013
+#: builtin/grep.c:1020
msgid "use Perl-compatible regular expressions"
msgstr "sử dụng biểu thức chính quy tương thích Perl"
-#: builtin/grep.c:1016
+#: builtin/grep.c:1023
msgid "show line numbers"
msgstr "hiển thị số của dòng"
-#: builtin/grep.c:1017
+#: builtin/grep.c:1024
msgid "don't show filenames"
msgstr "không hiển thị tên tập tin"
-#: builtin/grep.c:1018
+#: builtin/grep.c:1025
msgid "show filenames"
msgstr "hiển thị các tên tập tin"
-#: builtin/grep.c:1020
+#: builtin/grep.c:1027
msgid "show filenames relative to top directory"
msgstr "hiển thị tên tập tin tương đối với thư mục đỉnh (top)"
-#: builtin/grep.c:1022
+#: builtin/grep.c:1029
msgid "show only filenames instead of matching lines"
msgstr "chỉ hiển thị tên tập tin thay vì những dòng khớp với mẫu"
-#: builtin/grep.c:1024
+#: builtin/grep.c:1031
msgid "synonym for --files-with-matches"
msgstr "đồng nghĩa với --files-with-matches"
-#: builtin/grep.c:1027
+#: builtin/grep.c:1034
msgid "show only the names of files without match"
msgstr "chỉ hiển thị tên cho những tập tin không khớp với mẫu"
-#: builtin/grep.c:1029
+#: builtin/grep.c:1036
msgid "print NUL after filenames"
msgstr "thêm NUL vào sau tên tập tin"
-#: builtin/grep.c:1031
+#: builtin/grep.c:1038
msgid "show the number of matches instead of matching lines"
msgstr "hiển thị số lượng khớp thay vì những dòng khớp với mẫu"
-#: builtin/grep.c:1032
+#: builtin/grep.c:1039
msgid "highlight matches"
msgstr "tô sáng phần khớp mẫu"
-#: builtin/grep.c:1034
+#: builtin/grep.c:1041
msgid "print empty line between matches from different files"
msgstr "hiển thị dòng trống giữa các lần khớp từ các tập tin khác biệt"
-#: builtin/grep.c:1036
+#: builtin/grep.c:1043
msgid "show filename only once above matches from same file"
msgstr ""
"hiển thị tên tập tin một lần phía trên các lần khớp từ cùng một tập tin"
-#: builtin/grep.c:1039
+#: builtin/grep.c:1046
msgid "show <n> context lines before and after matches"
msgstr "hiển thị <n> dòng nội dung phía trước và sau các lần khớp"
-#: builtin/grep.c:1042
+#: builtin/grep.c:1049
msgid "show <n> context lines before matches"
msgstr "hiển thị <n> dòng nội dung trước khớp"
-#: builtin/grep.c:1044
+#: builtin/grep.c:1051
msgid "show <n> context lines after matches"
msgstr "hiển thị <n> dòng nội dung sau khớp"
-#: builtin/grep.c:1046
+#: builtin/grep.c:1053
msgid "use <n> worker threads"
msgstr "dùng <n> tuyến trình làm việc"
-#: builtin/grep.c:1047
+#: builtin/grep.c:1054
msgid "shortcut for -C NUM"
msgstr "dạng viết tắt của -C SỐ"
-#: builtin/grep.c:1050
+#: builtin/grep.c:1057
msgid "show a line with the function name before matches"
msgstr "hiển thị dòng vói tên hàm trước các lần khớp"
-#: builtin/grep.c:1052
+#: builtin/grep.c:1059
msgid "show the surrounding function"
msgstr "hiển thị hàm bao quanh"
-#: builtin/grep.c:1055
+#: builtin/grep.c:1062
msgid "read patterns from file"
msgstr "đọc mẫu từ tập-tin"
-#: builtin/grep.c:1057
+#: builtin/grep.c:1064
msgid "match <pattern>"
msgstr "match <mẫu>"
-#: builtin/grep.c:1059
+#: builtin/grep.c:1066
msgid "combine patterns specified with -e"
msgstr "tổ hợp mẫu được chỉ ra với tùy chọn -e"
-#: builtin/grep.c:1071
+#: builtin/grep.c:1078
msgid "indicate hit with exit status without output"
msgstr "đưa ra gợi ý với trạng thái thoát mà không có kết xuất"
-#: builtin/grep.c:1073
+#: builtin/grep.c:1080
msgid "show only matches from files that match all patterns"
msgstr "chỉ hiển thị những cái khớp từ tập tin mà nó khớp toàn bộ các mẫu"
-#: builtin/grep.c:1075
+#: builtin/grep.c:1082
msgid "show parse tree for grep expression"
msgstr "hiển thị cây phân tích cú pháp cho biểu thức “grep” (tìm kiếm)"
-#: builtin/grep.c:1079
+#: builtin/grep.c:1086
msgid "pager"
msgstr "dàn trang"
-#: builtin/grep.c:1079
+#: builtin/grep.c:1086
msgid "show matching files in the pager"
msgstr "hiển thị các tập tin khớp trong trang giấy"
-#: builtin/grep.c:1082
+#: builtin/grep.c:1089
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "cho phép gọi grep(1) (bị bỏ qua bởi lần dịch này)"
-#: builtin/grep.c:1146
+#: builtin/grep.c:1153
msgid "no pattern given."
msgstr "chưa chỉ ra mẫu."
-#: builtin/grep.c:1178 builtin/index-pack.c:1482
+#: builtin/grep.c:1189
+msgid "--no-index or --untracked cannot be used with revs"
+msgstr "--no-index hay --untracked không được sử dụng cùng với revs"
+
+#: builtin/grep.c:1195
+#, c-format
+msgid "unable to resolve revision: %s"
+msgstr "không thể phân giải điểm xét duyệt: %s"
+
+#: builtin/grep.c:1228 builtin/index-pack.c:1485
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "số tuyến chỉ ra không hợp lệ (%d)"
-#: builtin/grep.c:1215
+#: builtin/grep.c:1251
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager chỉ làm việc trên cây-làm-việc"
-#: builtin/grep.c:1238
+#: builtin/grep.c:1274
msgid "option not supported with --recurse-submodules."
msgstr "tùy chọn không được hỗ trợ với --recurse-submodules."
-#: builtin/grep.c:1244
+#: builtin/grep.c:1280
msgid "--cached or --untracked cannot be used with --no-index."
msgstr "--cached hay --untracked không được sử dụng với --no-index."
-#: builtin/grep.c:1249
-msgid "--no-index or --untracked cannot be used with revs."
-msgstr ""
-"--no-index hay --untracked không được sử dụng cùng với các tùy chọn liên "
-"quan đến revs."
-
-#: builtin/grep.c:1252
+#: builtin/grep.c:1286
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr "--[no-]exclude-standard không thể sử dụng cho nội dung lưu dấu vết."
-#: builtin/grep.c:1260
+#: builtin/grep.c:1294
msgid "both --cached and trees are given."
msgstr "cả hai --cached và các cây phải được chỉ ra."
@@ -8656,235 +8903,240 @@
msgid "unable to create '%s'"
msgstr "không thể tạo “%s”"
-#: builtin/index-pack.c:322
+#: builtin/index-pack.c:323
#, c-format
msgid "cannot open packfile '%s'"
msgstr "không thể mở packfile “%s”"
-#: builtin/index-pack.c:336
+#: builtin/index-pack.c:337
msgid "pack signature mismatch"
msgstr "chữ ký cho gói không khớp"
-#: builtin/index-pack.c:338
+#: builtin/index-pack.c:339
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "không hỗ trợ phiên bản gói %<PRIu32>"
-#: builtin/index-pack.c:356
+#: builtin/index-pack.c:357
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "gói có đối tượng sai tại khoảng bù %<PRIuMAX>: %s"
-#: builtin/index-pack.c:478
+#: builtin/index-pack.c:479
#, c-format
msgid "inflate returned %d"
msgstr "xả nén trả về %d"
-#: builtin/index-pack.c:527
+#: builtin/index-pack.c:528
msgid "offset value overflow for delta base object"
msgstr "tràn giá trị khoảng bù cho đối tượng delta cơ sở"
-#: builtin/index-pack.c:535
+#: builtin/index-pack.c:536
msgid "delta base offset is out of bound"
msgstr "khoảng bù cơ sở cho delta nằm ngoài phạm vi"
-#: builtin/index-pack.c:543
+#: builtin/index-pack.c:544
#, c-format
msgid "unknown object type %d"
msgstr "không hiểu kiểu đối tượng %d"
-#: builtin/index-pack.c:574
+#: builtin/index-pack.c:575
msgid "cannot pread pack file"
msgstr "không thể chạy hàm pread cho tập tin gói"
-#: builtin/index-pack.c:576
+#: builtin/index-pack.c:577
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "tập tin gói bị kết thúc sớm, thiếu %<PRIuMAX> byte"
-#: builtin/index-pack.c:602
+#: builtin/index-pack.c:603
msgid "serious inflate inconsistency"
msgstr "sự mâu thuẫn xả nén nghiêm trọng"
-#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
-#: builtin/index-pack.c:813 builtin/index-pack.c:822
+#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
+#: builtin/index-pack.c:816 builtin/index-pack.c:825
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "SỰ VA CHẠM SHA1 ĐÃ XẢY RA VỚI %s!"
-#: builtin/index-pack.c:751 builtin/pack-objects.c:164
-#: builtin/pack-objects.c:256
+#: builtin/index-pack.c:752 builtin/pack-objects.c:164
+#: builtin/pack-objects.c:257
#, c-format
msgid "unable to read %s"
msgstr "không thể đọc %s"
-#: builtin/index-pack.c:819
+#: builtin/index-pack.c:814
+#, c-format
+msgid "cannot read existing object info %s"
+msgstr "không thể đọc thông tin đối tượng sẵn có %s"
+
+#: builtin/index-pack.c:822
#, c-format
msgid "cannot read existing object %s"
msgstr "không thể đọc đối tượng đã tồn tại %s"
-#: builtin/index-pack.c:833
+#: builtin/index-pack.c:836
#, c-format
msgid "invalid blob object %s"
msgstr "đối tượng blob không hợp lệ %s"
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:850
#, c-format
msgid "invalid %s"
msgstr "%s không hợp lệ"
-#: builtin/index-pack.c:850
+#: builtin/index-pack.c:853
msgid "Error in object"
msgstr "Lỗi trong đối tượng"
-#: builtin/index-pack.c:852
+#: builtin/index-pack.c:855
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Không phải tất cả các đối tượng con của %s là có thể với tới được"
-#: builtin/index-pack.c:924 builtin/index-pack.c:955
+#: builtin/index-pack.c:927 builtin/index-pack.c:958
msgid "failed to apply delta"
msgstr "gặp lỗi khi áp dụng delta"
-#: builtin/index-pack.c:1125
+#: builtin/index-pack.c:1128
msgid "Receiving objects"
msgstr "Đang nhận về các đối tượng"
-#: builtin/index-pack.c:1125
+#: builtin/index-pack.c:1128
msgid "Indexing objects"
msgstr "Các đối tượng bảng mục lục"
-#: builtin/index-pack.c:1157
+#: builtin/index-pack.c:1160
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "gói bị sai hỏng (SHA1 không khớp)"
-#: builtin/index-pack.c:1162
+#: builtin/index-pack.c:1165
msgid "cannot fstat packfile"
msgstr "không thể lấy thông tin thống kê packfile"
-#: builtin/index-pack.c:1165
+#: builtin/index-pack.c:1168
msgid "pack has junk at the end"
msgstr "pack có phần thừa ở cuối"
-#: builtin/index-pack.c:1176
+#: builtin/index-pack.c:1179
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "lộn xộn hơn cả điên rồ khi chạy hàm parse_pack_objects()"
-#: builtin/index-pack.c:1199
+#: builtin/index-pack.c:1202
msgid "Resolving deltas"
msgstr "Đang phân giải các delta"
-#: builtin/index-pack.c:1210
+#: builtin/index-pack.c:1213
#, c-format
msgid "unable to create thread: %s"
msgstr "không thể tạo tuyến: %s"
-#: builtin/index-pack.c:1252
+#: builtin/index-pack.c:1255
msgid "confusion beyond insanity"
msgstr "lộn xộn hơn cả điên rồ"
-#: builtin/index-pack.c:1258
+#: builtin/index-pack.c:1261
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "đầy đủ với %d đối tượng nội bộ"
-#: builtin/index-pack.c:1270
+#: builtin/index-pack.c:1273
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Gặp tổng kiểm tra tail không cần cho %s (đĩa hỏng?)"
-#: builtin/index-pack.c:1274
+#: builtin/index-pack.c:1277
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "gói có %d delta chưa được giải quyết"
-#: builtin/index-pack.c:1298
+#: builtin/index-pack.c:1301
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "không thể xả nén đối tượng nối thêm (%d)"
-#: builtin/index-pack.c:1374
+#: builtin/index-pack.c:1377
#, c-format
msgid "local object %s is corrupt"
msgstr "đối tượng nội bộ %s bị hỏng"
-#: builtin/index-pack.c:1398
+#: builtin/index-pack.c:1403
msgid "error while closing pack file"
msgstr "gặp lỗi trong khi đóng tập tin gói"
-#: builtin/index-pack.c:1411
+#: builtin/index-pack.c:1415
#, c-format
msgid "cannot write keep file '%s'"
msgstr "không thể ghi tập tin giữ lại “%s”"
-#: builtin/index-pack.c:1419
+#: builtin/index-pack.c:1423
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "không thể đóng tập tin giữ lại đã được ghi “%s”"
-#: builtin/index-pack.c:1432
+#: builtin/index-pack.c:1433
msgid "cannot store pack file"
msgstr "không thể lưu tập tin gói"
-#: builtin/index-pack.c:1443
+#: builtin/index-pack.c:1441
msgid "cannot store index file"
msgstr "không thể lưu trữ tập tin ghi mục lục"
-#: builtin/index-pack.c:1476
+#: builtin/index-pack.c:1479
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "sai pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1486 builtin/index-pack.c:1683
+#: builtin/index-pack.c:1489 builtin/index-pack.c:1686
#, c-format
msgid "no threads support, ignoring %s"
msgstr "không hỗ trợ đa tuyến, bỏ qua %s"
-#: builtin/index-pack.c:1544
+#: builtin/index-pack.c:1547
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Không thể mở tập tin gói đã sẵn có “%s”"
-#: builtin/index-pack.c:1546
+#: builtin/index-pack.c:1549
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Không thể mở tập tin idx của gói cho “%s”"
-#: builtin/index-pack.c:1593
+#: builtin/index-pack.c:1596
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "không delta: %d đối tượng"
-#: builtin/index-pack.c:1600
+#: builtin/index-pack.c:1603
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "chiều dài xích = %d: %lu đối tượng"
-#: builtin/index-pack.c:1613
+#: builtin/index-pack.c:1616
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "tên tập tin tập tin gói “%s” không được kết thúc bằng đuôi “.pack”"
-#: builtin/index-pack.c:1695 builtin/index-pack.c:1698
-#: builtin/index-pack.c:1714 builtin/index-pack.c:1718
+#: builtin/index-pack.c:1698 builtin/index-pack.c:1701
+#: builtin/index-pack.c:1717 builtin/index-pack.c:1721
#, c-format
msgid "bad %s"
msgstr "%s sai"
-#: builtin/index-pack.c:1734
+#: builtin/index-pack.c:1737
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin không thể được dùng mà không có --stdin"
-#: builtin/index-pack.c:1736
+#: builtin/index-pack.c:1739
msgid "--stdin requires a git repository"
msgstr "--stdin cần một kho git"
-#: builtin/index-pack.c:1744
+#: builtin/index-pack.c:1747
msgid "--verify with no packfile name given"
msgstr "dùng tùy chọn --verify mà không đưa ra tên packfile"
@@ -9044,104 +9296,104 @@
msgid "git show [<options>] <object>..."
msgstr "git show [<các-tùy-chọn>] <đối-tượng>…"
-#: builtin/log.c:84
+#: builtin/log.c:89
#, c-format
msgid "invalid --decorate option: %s"
msgstr "tùy chọn--decorate không hợp lệ: %s"
-#: builtin/log.c:139
+#: builtin/log.c:144
msgid "suppress diff output"
msgstr "chặn mọi kết xuất từ diff"
-#: builtin/log.c:140
+#: builtin/log.c:145
msgid "show source"
msgstr "hiển thị mã nguồn"
-#: builtin/log.c:141
+#: builtin/log.c:146
msgid "Use mail map file"
msgstr "Sử dụng tập tin ánh xạ thư"
-#: builtin/log.c:142
+#: builtin/log.c:147
msgid "decorate options"
msgstr "các tùy chọn trang trí"
-#: builtin/log.c:145
+#: builtin/log.c:150
msgid "Process line range n,m in file, counting from 1"
msgstr "Xử lý chỉ dòng vùng n,m trong tập tin, tính từ 1"
-#: builtin/log.c:241
+#: builtin/log.c:246
#, c-format
msgid "Final output: %d %s\n"
msgstr "Kết xuất cuối cùng: %d %s\n"
-#: builtin/log.c:486
+#: builtin/log.c:493
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: sai tập tin"
-#: builtin/log.c:500 builtin/log.c:594
+#: builtin/log.c:507 builtin/log.c:601
#, c-format
msgid "Could not read object %s"
msgstr "Không thể đọc đối tượng %s"
-#: builtin/log.c:618
+#: builtin/log.c:625
#, c-format
msgid "Unknown type: %d"
msgstr "Không nhận ra kiểu: %d"
-#: builtin/log.c:739
+#: builtin/log.c:746
msgid "format.headers without value"
msgstr "format.headers không có giá trị cụ thể"
-#: builtin/log.c:839
+#: builtin/log.c:846
msgid "name of output directory is too long"
msgstr "tên của thư mục kết xuất quá dài"
-#: builtin/log.c:854
+#: builtin/log.c:861
#, c-format
msgid "Cannot open patch file %s"
msgstr "Không thể mở tập tin miếng vá: %s"
-#: builtin/log.c:868
+#: builtin/log.c:875
msgid "Need exactly one range."
msgstr "Cần chính xác một vùng."
-#: builtin/log.c:878
+#: builtin/log.c:885
msgid "Not a range."
msgstr "Không phải là một vùng."
-#: builtin/log.c:984
+#: builtin/log.c:991
msgid "Cover letter needs email format"
msgstr "“Cover letter” cần cho định dạng thư"
-#: builtin/log.c:1063
+#: builtin/log.c:1071
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to điên rồ: %s"
-#: builtin/log.c:1091
+#: builtin/log.c:1098
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<các-tùy-chọn>] [<kể-từ> | <vùng-xem-xét>]"
-#: builtin/log.c:1141
+#: builtin/log.c:1148
msgid "Two output directories?"
msgstr "Hai thư mục kết xuất?"
-#: builtin/log.c:1248 builtin/log.c:1891 builtin/log.c:1893 builtin/log.c:1905
+#: builtin/log.c:1255 builtin/log.c:1898 builtin/log.c:1900 builtin/log.c:1912
#, c-format
msgid "Unknown commit %s"
msgstr "Không hiểu lần chuyển giao %s"
-#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:476
+#: builtin/log.c:1265 builtin/notes.c:883 builtin/tag.c:532
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Gặp lỗi khi phân giải “%s” như là một tham chiếu hợp lệ."
-#: builtin/log.c:1263
+#: builtin/log.c:1270
msgid "Could not find exact merge base."
msgstr "Không tìm thấy nền hòa trộn chính xác."
-#: builtin/log.c:1267
+#: builtin/log.c:1274
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"
@@ -9152,214 +9404,214 @@
"nhánh máy chủ. Hoặc là bạn có thể chỉ định lần chuyển giao nền bằng\n"
"\"--base=<base-commit-id>\" một cách thủ công."
-#: builtin/log.c:1287
+#: builtin/log.c:1294
msgid "Failed to find exact merge base"
msgstr "Gặp lỗi khi tìm nền hòa trộn chính xác."
-#: builtin/log.c:1298
+#: builtin/log.c:1305
msgid "base commit should be the ancestor of revision list"
msgstr "lần chuyển giao nền không là tổ tiên của danh sách điểm xét duyệt"
-#: builtin/log.c:1302
+#: builtin/log.c:1309
msgid "base commit shouldn't be in revision list"
msgstr "lần chuyển giao nền không được trong danh sách điểm xét duyệt"
-#: builtin/log.c:1351
+#: builtin/log.c:1358
msgid "cannot get patch id"
msgstr "không thể lấy mã miếng vá"
-#: builtin/log.c:1408
+#: builtin/log.c:1415
msgid "use [PATCH n/m] even with a single patch"
msgstr "dùng [PATCH n/m] ngay cả với miếng vá đơn"
-#: builtin/log.c:1411
+#: builtin/log.c:1418
msgid "use [PATCH] even with multiple patches"
msgstr "dùng [VÁ] ngay cả với các miếng vá phức tạp"
-#: builtin/log.c:1415
+#: builtin/log.c:1422
msgid "print patches to standard out"
msgstr "hiển thị miếng vá ra đầu ra chuẩn"
-#: builtin/log.c:1417
+#: builtin/log.c:1424
msgid "generate a cover letter"
msgstr "tạo bì thư"
-#: builtin/log.c:1419
+#: builtin/log.c:1426
msgid "use simple number sequence for output file names"
msgstr "sử dụng chỗi dãy số dạng đơn giản cho tên tập-tin xuất ra"
-#: builtin/log.c:1420
+#: builtin/log.c:1427
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1421
+#: builtin/log.c:1428
msgid "use <sfx> instead of '.patch'"
msgstr "sử dụng <sfx> thay cho “.patch”"
-#: builtin/log.c:1423
+#: builtin/log.c:1430
msgid "start numbering patches at <n> instead of 1"
msgstr "bắt đầu đánh số miếng vá từ <n> thay vì 1"
-#: builtin/log.c:1425
+#: builtin/log.c:1432
msgid "mark the series as Nth re-roll"
msgstr "đánh dấu chuỗi nối tiếp dạng thứ-N re-roll"
-#: builtin/log.c:1427
+#: builtin/log.c:1434
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "Dùng [RFC VÁ] thay cho [VÁ]"
-#: builtin/log.c:1430
+#: builtin/log.c:1437
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Dùng [<tiền-tố>] thay cho [VÁ]"
-#: builtin/log.c:1433
+#: builtin/log.c:1440
msgid "store resulting files in <dir>"
msgstr "lưu các tập tin kết quả trong <t.mục>"
-#: builtin/log.c:1436
+#: builtin/log.c:1443
msgid "don't strip/add [PATCH]"
msgstr "không strip/add [VÁ]"
-#: builtin/log.c:1439
+#: builtin/log.c:1446
msgid "don't output binary diffs"
msgstr "không kết xuất diff (những khác biệt) nhị phân"
-#: builtin/log.c:1441
+#: builtin/log.c:1448
msgid "output all-zero hash in From header"
msgstr "xuất mọi mã băm all-zero trong phần đầu From"
-#: builtin/log.c:1443
+#: builtin/log.c:1450
msgid "don't include a patch matching a commit upstream"
msgstr "không bao gồm miếng vá khớp với một lần chuyển giao thượng nguồn"
-#: builtin/log.c:1445
+#: builtin/log.c:1452
msgid "show patch format instead of default (patch + stat)"
msgstr "hiển thị định dạng miếng vá thay vì mặc định (miếng vá + thống kê)"
-#: builtin/log.c:1447
+#: builtin/log.c:1454
msgid "Messaging"
msgstr "Lời nhắn"
-#: builtin/log.c:1448
+#: builtin/log.c:1455
msgid "header"
msgstr "đầu đề thư"
-#: builtin/log.c:1449
+#: builtin/log.c:1456
msgid "add email header"
msgstr "thêm đầu đề thư"
-#: builtin/log.c:1450 builtin/log.c:1452
+#: builtin/log.c:1457 builtin/log.c:1459
msgid "email"
msgstr "thư điện tử"
-#: builtin/log.c:1450
+#: builtin/log.c:1457
msgid "add To: header"
msgstr "thêm To: đầu đề thư"
-#: builtin/log.c:1452
+#: builtin/log.c:1459
msgid "add Cc: header"
msgstr "thêm Cc: đầu đề thư"
-#: builtin/log.c:1454
+#: builtin/log.c:1461
msgid "ident"
msgstr "thụt lề"
-#: builtin/log.c:1455
+#: builtin/log.c:1462
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"đặt “Địa chỉ gửi” thành <thụ lề> (hoặc thụt lề người commit nếu bỏ quên)"
-#: builtin/log.c:1457
+#: builtin/log.c:1464
msgid "message-id"
msgstr "message-id"
-#: builtin/log.c:1458
+#: builtin/log.c:1465
msgid "make first mail a reply to <message-id>"
msgstr "dùng thư đầu tiên để trả lời <message-id>"
-#: builtin/log.c:1459 builtin/log.c:1462
+#: builtin/log.c:1466 builtin/log.c:1469
msgid "boundary"
msgstr "ranh giới"
-#: builtin/log.c:1460
+#: builtin/log.c:1467
msgid "attach the patch"
msgstr "đính kèm miếng vá"
-#: builtin/log.c:1463
+#: builtin/log.c:1470
msgid "inline the patch"
msgstr "dùng miếng vá làm nội dung"
-#: builtin/log.c:1467
+#: builtin/log.c:1474
msgid "enable message threading, styles: shallow, deep"
msgstr "cho phép luồng lời nhắn, kiểu: “shallow”, “deep”"
-#: builtin/log.c:1469
+#: builtin/log.c:1476
msgid "signature"
msgstr "chữ ký"
-#: builtin/log.c:1470
+#: builtin/log.c:1477
msgid "add a signature"
msgstr "thêm chữ ký"
-#: builtin/log.c:1471
+#: builtin/log.c:1478
msgid "base-commit"
msgstr "lần_chuyển_giao_nền"
-#: builtin/log.c:1472
+#: builtin/log.c:1479
msgid "add prerequisite tree info to the patch series"
msgstr "add trước hết đòi hỏi thông tin cây tới sê-ri miếng vá"
-#: builtin/log.c:1474
+#: builtin/log.c:1481
msgid "add a signature from a file"
msgstr "thêm chữ ký từ một tập tin"
-#: builtin/log.c:1475
+#: builtin/log.c:1482
msgid "don't print the patch filenames"
msgstr "không hiển thị các tên tập tin của miếng vá"
-#: builtin/log.c:1565
+#: builtin/log.c:1572
msgid "-n and -k are mutually exclusive."
msgstr "-n và -k loại từ lẫn nhau."
-#: builtin/log.c:1567
+#: builtin/log.c:1574
msgid "--subject-prefix/--rfc and -k are mutually exclusive."
msgstr "--subject-prefix/--rfc và -k xung khắc nhau."
-#: builtin/log.c:1575
+#: builtin/log.c:1582
msgid "--name-only does not make sense"
msgstr "--name-only không hợp lý"
-#: builtin/log.c:1577
+#: builtin/log.c:1584
msgid "--name-status does not make sense"
msgstr "--name-status không hợp lý"
-#: builtin/log.c:1579
+#: builtin/log.c:1586
msgid "--check does not make sense"
msgstr "--check không hợp lý"
-#: builtin/log.c:1609
+#: builtin/log.c:1616
msgid "standard output, or directory, which one?"
msgstr "đầu ra chuẩn, hay thư mục, chọn cái nào?"
-#: builtin/log.c:1611
+#: builtin/log.c:1618
#, c-format
msgid "Could not create directory '%s'"
msgstr "Không thể tạo thư mục “%s”"
-#: builtin/log.c:1705
+#: builtin/log.c:1712
#, c-format
msgid "unable to read signature file '%s'"
msgstr "không thể đọc tập tin chữ ký “%s”"
-#: builtin/log.c:1777
+#: builtin/log.c:1784
msgid "Failed to create output files"
msgstr "Gặp lỗi khi tạo các tập tin kết xuất"
-#: builtin/log.c:1826
+#: builtin/log.c:1833
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<thượng-nguồn> [<đầu> [<giới-hạn>]]]"
-#: builtin/log.c:1880
+#: builtin/log.c:1887
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -9367,106 +9619,106 @@
"Không tìm thấy nhánh mạng được theo dõi, hãy chỉ định <thượng-nguồn> một "
"cách thủ công.\n"
-#: builtin/ls-files.c:460
+#: builtin/ls-files.c:468
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<các-tùy-chọn>] [<tập-tin>…]"
-#: builtin/ls-files.c:509
+#: builtin/ls-files.c:517
msgid "identify the file status with tags"
msgstr "nhận dạng các trạng thái tập tin với thẻ"
-#: builtin/ls-files.c:511
+#: builtin/ls-files.c:519
msgid "use lowercase letters for 'assume unchanged' files"
msgstr ""
"dùng chữ cái viết thường cho các tập tin “assume unchanged” (giả định không "
"thay đổi)"
-#: builtin/ls-files.c:513
+#: builtin/ls-files.c:521
msgid "show cached files in the output (default)"
msgstr "hiển thị các tập tin được nhớ tạm vào đầu ra (mặc định)"
-#: builtin/ls-files.c:515
+#: builtin/ls-files.c:523
msgid "show deleted files in the output"
msgstr "hiển thị các tập tin đã xóa trong kết xuất"
-#: builtin/ls-files.c:517
+#: builtin/ls-files.c:525
msgid "show modified files in the output"
msgstr "hiển thị các tập tin đã bị sửa đổi ra kết xuất"
-#: builtin/ls-files.c:519
+#: builtin/ls-files.c:527
msgid "show other files in the output"
msgstr "hiển thị các tập tin khác trong kết xuất"
-#: builtin/ls-files.c:521
+#: builtin/ls-files.c:529
msgid "show ignored files in the output"
msgstr "hiển thị các tập tin bị bỏ qua trong kết xuất"
-#: builtin/ls-files.c:524
+#: builtin/ls-files.c:532
msgid "show staged contents' object name in the output"
msgstr "hiển thị tên đối tượng của nội dung được đặt lên bệ phóng ra kết xuất"
-#: builtin/ls-files.c:526
+#: builtin/ls-files.c:534
msgid "show files on the filesystem that need to be removed"
msgstr "hiển thị các tập tin trên hệ thống tập tin mà nó cần được gỡ bỏ"
-#: builtin/ls-files.c:528
+#: builtin/ls-files.c:536
msgid "show 'other' directories' names only"
msgstr "chỉ hiển thị tên của các thư mục “khác”"
-#: builtin/ls-files.c:530
+#: builtin/ls-files.c:538
msgid "show line endings of files"
msgstr "hiển thị kết thúc dòng của các tập tin"
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:540
msgid "don't show empty directories"
msgstr "không hiển thị thư mục rỗng"
-#: builtin/ls-files.c:535
+#: builtin/ls-files.c:543
msgid "show unmerged files in the output"
msgstr "hiển thị các tập tin chưa hòa trộn trong kết xuất"
-#: builtin/ls-files.c:537
+#: builtin/ls-files.c:545
msgid "show resolve-undo information"
msgstr "hiển thị thông tin resolve-undo"
-#: builtin/ls-files.c:539
+#: builtin/ls-files.c:547
msgid "skip files matching pattern"
msgstr "bỏ qua những tập tin khớp với một mẫu"
-#: builtin/ls-files.c:542
+#: builtin/ls-files.c:550
msgid "exclude patterns are read from <file>"
msgstr "mẫu loại trừ được đọc từ <tập tin>"
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:553
msgid "read additional per-directory exclude patterns in <file>"
msgstr "đọc thêm các mẫu ngoại trừ mỗi thư mục trong <tập tin>"
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:555
msgid "add the standard git exclusions"
msgstr "thêm loại trừ tiêu chuẩn kiểu git"
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:558
msgid "make the output relative to the project top directory"
msgstr "làm cho kết xuất liên quan đến thư mục ở mức cao nhất (gốc) của dự án"
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:561
msgid "recurse through submodules"
msgstr "đệ quy xuyên qua mô-đun con"
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:563
msgid "if any <file> is not in the index, treat this as an error"
msgstr "nếu <tập tin> bất kỳ không ở trong bảng mục lục, xử lý nó như một lỗi"
-#: builtin/ls-files.c:556
+#: builtin/ls-files.c:564
msgid "tree-ish"
msgstr "tree-ish"
-#: builtin/ls-files.c:557
+#: builtin/ls-files.c:565
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
"giả định rằng các đường dẫn đã bị gỡ bỏ kể từ <tree-ish> nay vẫn hiện diện"
-#: builtin/ls-files.c:559
+#: builtin/ls-files.c:567
msgid "show debugging data"
msgstr "hiển thị dữ liệu gỡ lỗi"
@@ -9480,39 +9732,39 @@
" [-q | --quiet] [--exit-code] [--get-url]\n"
" [--symref] [<kho> [<các tham chiếu>…]]"
-#: builtin/ls-remote.c:50
+#: builtin/ls-remote.c:52
msgid "do not print remote URL"
msgstr "không hiển thị URL máy chủ"
-#: builtin/ls-remote.c:51 builtin/ls-remote.c:53
+#: builtin/ls-remote.c:53 builtin/ls-remote.c:55
msgid "exec"
msgstr "thực thi"
-#: builtin/ls-remote.c:52 builtin/ls-remote.c:54
+#: builtin/ls-remote.c:54 builtin/ls-remote.c:56
msgid "path of git-upload-pack on the remote host"
msgstr "đường dẫn của git-upload-pack trên máy chủ"
-#: builtin/ls-remote.c:56
+#: builtin/ls-remote.c:58
msgid "limit to tags"
msgstr "giới hạn tới các thẻ"
-#: builtin/ls-remote.c:57
+#: builtin/ls-remote.c:59
msgid "limit to heads"
msgstr "giới hạn cho các đầu"
-#: builtin/ls-remote.c:58
+#: builtin/ls-remote.c:60
msgid "do not show peeled tags"
msgstr "không hiển thị thẻ bị peel (gọt bỏ)"
-#: builtin/ls-remote.c:60
+#: builtin/ls-remote.c:62
msgid "take url.<base>.insteadOf into account"
msgstr "lấy url.<base>.insteadOf vào trong tài khoản"
-#: builtin/ls-remote.c:62
+#: builtin/ls-remote.c:64
msgid "exit with exit code 2 if no matching refs are found"
msgstr "thoát với mã là 2 nếu không tìm thấy tham chiếu nào khớp"
-#: builtin/ls-remote.c:64
+#: builtin/ls-remote.c:66
msgid "show underlying ref in addition to the object pointed by it"
msgstr "hiển thị tham chiếu nằm dưới để thêm vào đối tượng được chỉ bởi nó"
@@ -9557,148 +9809,144 @@
msgstr "git merge [<các-tùy-chọn>] [<commit>…]"
#: builtin/merge.c:47
-msgid "git merge [<options>] <msg> HEAD <commit>"
-msgstr "git merge [<các-tùy-chọn>] <tin-nhắn> HEAD <commit>"
-
-#: builtin/merge.c:48
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:49
+#: builtin/merge.c:48
msgid "git merge --continue"
msgstr "git merge --continue"
-#: builtin/merge.c:104
+#: builtin/merge.c:103
msgid "switch `m' requires a value"
msgstr "switch “m” yêu cầu một giá trị"
-#: builtin/merge.c:141
+#: builtin/merge.c:140
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Không tìm thấy chiến lược hòa trộn “%s”.\n"
-#: builtin/merge.c:142
+#: builtin/merge.c:141
#, c-format
msgid "Available strategies are:"
msgstr "Các chiến lược sẵn sàng là:"
-#: builtin/merge.c:147
+#: builtin/merge.c:146
#, c-format
msgid "Available custom strategies are:"
msgstr "Các chiến lược tùy chỉnh sẵn sàng là:"
-#: builtin/merge.c:197 builtin/pull.c:127
+#: builtin/merge.c:196 builtin/pull.c:127
msgid "do not show a diffstat at the end of the merge"
msgstr "không hiển thị thống kê khác biệt tại cuối của lần hòa trộn"
-#: builtin/merge.c:200 builtin/pull.c:130
+#: builtin/merge.c:199 builtin/pull.c:130
msgid "show a diffstat at the end of the merge"
msgstr "hiển thị thống kê khác biệt tại cuối của hòa trộn"
-#: builtin/merge.c:201 builtin/pull.c:133
+#: builtin/merge.c:200 builtin/pull.c:133
msgid "(synonym to --stat)"
msgstr "(đồng nghĩa với --stat)"
-#: builtin/merge.c:203 builtin/pull.c:136
+#: builtin/merge.c:202 builtin/pull.c:136
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr "thêm (ít nhất <n>) mục từ shortlog cho ghi chú chuyển giao hòa trộn"
-#: builtin/merge.c:206 builtin/pull.c:139
+#: builtin/merge.c:205 builtin/pull.c:139
msgid "create a single commit instead of doing a merge"
msgstr "tạo một lần chuyển giao đưon thay vì thực hiện việc hòa trộn"
-#: builtin/merge.c:208 builtin/pull.c:142
+#: builtin/merge.c:207 builtin/pull.c:142
msgid "perform a commit if the merge succeeds (default)"
msgstr "thực hiện chuyển giao nếu hòa trộn thành công (mặc định)"
-#: builtin/merge.c:210 builtin/pull.c:145
+#: builtin/merge.c:209 builtin/pull.c:145
msgid "edit message before committing"
msgstr "sửa chú thích trước khi chuyển giao"
-#: builtin/merge.c:211
+#: builtin/merge.c:210
msgid "allow fast-forward (default)"
msgstr "cho phép chuyển-tiếp-nhanh (mặc định)"
-#: builtin/merge.c:213 builtin/pull.c:151
+#: builtin/merge.c:212 builtin/pull.c:151
msgid "abort if fast-forward is not possible"
msgstr "bỏ qua nếu chuyển-tiếp-nhanh không thể được"
-#: builtin/merge.c:217 builtin/pull.c:154
+#: builtin/merge.c:216 builtin/pull.c:154
msgid "verify that the named commit has a valid GPG signature"
msgstr "thẩm tra xem lần chuyển giao có tên đó có chữ ký GPG hợp lệ hay không"
-#: builtin/merge.c:218 builtin/notes.c:774 builtin/pull.c:158
-#: builtin/revert.c:89
+#: builtin/merge.c:217 builtin/notes.c:773 builtin/pull.c:158
+#: builtin/revert.c:108
msgid "strategy"
msgstr "chiến lược"
-#: builtin/merge.c:219 builtin/pull.c:159
+#: builtin/merge.c:218 builtin/pull.c:159
msgid "merge strategy to use"
msgstr "chiến lược hòa trộn sẽ dùng"
-#: builtin/merge.c:220 builtin/pull.c:162
+#: builtin/merge.c:219 builtin/pull.c:162
msgid "option=value"
msgstr "tùy_chọn=giá_trị"
-#: builtin/merge.c:221 builtin/pull.c:163
+#: builtin/merge.c:220 builtin/pull.c:163
msgid "option for selected merge strategy"
msgstr "tùy chọn cho chiến lược hòa trộn đã chọn"
-#: builtin/merge.c:223
+#: builtin/merge.c:222
msgid "merge commit message (for a non-fast-forward merge)"
msgstr ""
"hòa trộn ghi chú của lần chuyển giao (dành cho hòa trộn không-chuyển-tiếp-"
"nhanh)"
-#: builtin/merge.c:227
+#: builtin/merge.c:226
msgid "abort the current in-progress merge"
msgstr "bãi bỏ quá trình hòa trộn hiện tại đang thực hiện"
-#: builtin/merge.c:229
+#: builtin/merge.c:228
msgid "continue the current in-progress merge"
msgstr "tiếp tục quá trình hòa trộn hiện tại đang thực hiện"
-#: builtin/merge.c:231 builtin/pull.c:170
+#: builtin/merge.c:230 builtin/pull.c:170
msgid "allow merging unrelated histories"
msgstr "cho phép hòa trộn lịch sử không liên quan"
-#: builtin/merge.c:259
+#: builtin/merge.c:258
msgid "could not run stash."
msgstr "không thể chạy stash."
-#: builtin/merge.c:264
+#: builtin/merge.c:263
msgid "stash failed"
msgstr "lệnh tạm cất gặp lỗi"
-#: builtin/merge.c:269
+#: builtin/merge.c:268
#, c-format
msgid "not a valid object: %s"
msgstr "không phải là một đối tượng hợp lệ: %s"
-#: builtin/merge.c:288 builtin/merge.c:305
+#: builtin/merge.c:287 builtin/merge.c:304
msgid "read-tree failed"
msgstr "read-tree gặp lỗi"
-#: builtin/merge.c:335
+#: builtin/merge.c:334
msgid " (nothing to squash)"
msgstr " (không có gì để squash)"
-#: builtin/merge.c:346
+#: builtin/merge.c:345
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Squash commit -- không cập nhật HEAD\n"
-#: builtin/merge.c:396
+#: builtin/merge.c:395
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Không có lời chú thích hòa trộn -- nên không cập nhật HEAD\n"
-#: builtin/merge.c:447
+#: builtin/merge.c:446
#, c-format
msgid "'%s' does not point to a commit"
msgstr "“%s” không chỉ đến một lần chuyển giao nào cả"
-#: builtin/merge.c:537
+#: builtin/merge.c:536
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Chuỗi branch.%s.mergeoptions sai: %s"
@@ -9763,65 +10011,60 @@
"Việc tự động hòa trộn gặp lỗi; hãy sửa các xung đột sau đó chuyển giao kết "
"quả.\n"
-#: builtin/merge.c:867
-#, c-format
-msgid "'%s' is not a commit"
-msgstr "%s không phải là một lần commit (chuyển giao)"
-
-#: builtin/merge.c:908
+#: builtin/merge.c:890
msgid "No current branch."
msgstr "không phải nhánh hiện hành"
-#: builtin/merge.c:910
+#: builtin/merge.c:892
msgid "No remote for the current branch."
msgstr "Không có máy chủ cho nhánh hiện hành."
-#: builtin/merge.c:912
+#: builtin/merge.c:894
msgid "No default upstream defined for the current branch."
msgstr "Không có thượng nguồn mặc định được định nghĩa cho nhánh hiện hành."
-#: builtin/merge.c:917
+#: builtin/merge.c:899
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Không nhánh mạng theo dõi cho %s từ %s"
-#: builtin/merge.c:964
+#: builtin/merge.c:946
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Giá trị sai “%s” trong biến môi trường “%s”"
-#: builtin/merge.c:1038
+#: builtin/merge.c:1020
#, c-format
msgid "could not close '%s'"
msgstr "không thể đóng “%s”"
-#: builtin/merge.c:1065
+#: builtin/merge.c:1047
#, c-format
msgid "not something we can merge in %s: %s"
-msgstr "không phải là một số thứ chúng tôi có thể hòa trộn trong %s: %s"
+msgstr "không phải là một thứ gì đó mà chúng tôi có thể hòa trộn trong %s: %s"
-#: builtin/merge.c:1099
+#: builtin/merge.c:1081
msgid "not something we can merge"
-msgstr "không phải là một số thứ chúng tôi có thể hòa trộn"
+msgstr "không phải là thứ gì đó mà chúng tôi có thể hòa trộn"
-#: builtin/merge.c:1167
+#: builtin/merge.c:1146
msgid "--abort expects no arguments"
msgstr "--abort không nhận các đối số"
-#: builtin/merge.c:1171
+#: builtin/merge.c:1150
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr ""
"Ở đây không có lần hòa trộn nào được hủy bỏ giữa chừng cả (thiếu MERGE_HEAD)."
-#: builtin/merge.c:1183
+#: builtin/merge.c:1162
msgid "--continue expects no arguments"
msgstr "--continue không nhận đối số"
-#: builtin/merge.c:1187
+#: builtin/merge.c:1166
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "Ở đây không có lần hòa trộn nào đang được xử lý cả (thiếu MERGE_HEAD)."
-#: builtin/merge.c:1203
+#: builtin/merge.c:1182
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -9829,7 +10072,7 @@
"Bạn chưa kết thúc việc hòa trộn (MERGE_HEAD vẫn tồn tại).\n"
"Hãy chuyển giao các thay đổi trước khi bạn có thể hòa trộn."
-#: builtin/merge.c:1210
+#: builtin/merge.c:1189
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -9837,115 +10080,115 @@
"Bạn chưa kết thúc việc cherry-pick (CHERRY_PICK_HEAD vẫn tồn tại).\n"
"Hãy chuyển giao các thay đổi trước khi bạn có thể hòa trộn."
-#: builtin/merge.c:1213
+#: builtin/merge.c:1192
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "Bạn chưa kết thúc việc cherry-pick (CHERRY_PICK_HEAD vẫn tồn tại)."
-#: builtin/merge.c:1222
+#: builtin/merge.c:1201
msgid "You cannot combine --squash with --no-ff."
msgstr "Bạn không thể kết hợp --squash với --no-ff."
-#: builtin/merge.c:1230
+#: builtin/merge.c:1209
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "Không chỉ ra lần chuyển giao và merge.defaultToUpstream chưa được đặt."
-#: builtin/merge.c:1247
+#: builtin/merge.c:1226
msgid "Squash commit into empty head not supported yet"
msgstr "Squash commit vào một head trống rỗng vẫn chưa được hỗ trợ"
-#: builtin/merge.c:1249
+#: builtin/merge.c:1228
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
"Chuyển giao không-chuyển-tiếp-nhanh không hợp lý ở trong một head trống rỗng"
-#: builtin/merge.c:1254
+#: builtin/merge.c:1233
#, c-format
msgid "%s - not something we can merge"
-msgstr "%s - không phải là một số thứ chúng tôi có thể hòa trộn"
+msgstr "%s - không phải là thứ gì đó mà chúng tôi có thể hòa trộn"
-#: builtin/merge.c:1256
+#: builtin/merge.c:1235
msgid "Can merge only exactly one commit into empty head"
msgstr ""
"Không thể hòa trộn một cách đúng đắn một lần chuyển giao vào một head rỗng"
-#: builtin/merge.c:1312
+#: builtin/merge.c:1269
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
"Lần chuyển giao %s có một chữ ký GPG không đáng tin, được cho là bởi %s."
-#: builtin/merge.c:1315
+#: builtin/merge.c:1272
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "Lần chuyển giao %s có một chữ ký GPG sai, được cho là bởi %s."
-#: builtin/merge.c:1318
+#: builtin/merge.c:1275
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Lần chuyển giao %s không có chữ ký GPG."
-#: builtin/merge.c:1321
+#: builtin/merge.c:1278
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "Lần chuyển giao %s có một chữ ký GPG tốt bởi %s\n"
-#: builtin/merge.c:1383
+#: builtin/merge.c:1340
msgid "refusing to merge unrelated histories"
msgstr "từ chối hòa trộn lịch sử không liên quan"
-#: builtin/merge.c:1392
+#: builtin/merge.c:1349
msgid "Already up-to-date."
msgstr "Đã cập nhật rồi."
-#: builtin/merge.c:1402
+#: builtin/merge.c:1359
#, c-format
msgid "Updating %s..%s\n"
msgstr "Đang cập nhật %s..%s\n"
-#: builtin/merge.c:1443
+#: builtin/merge.c:1400
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Đang thử hòa trộn kiểu “trivial in-index”…\n"
-#: builtin/merge.c:1450
+#: builtin/merge.c:1407
#, c-format
msgid "Nope.\n"
msgstr "Không.\n"
-#: builtin/merge.c:1475
+#: builtin/merge.c:1432
msgid "Already up-to-date. Yeeah!"
msgstr "Đã cập nhật rồi. Yeeah!"
-#: builtin/merge.c:1481
+#: builtin/merge.c:1438
msgid "Not possible to fast-forward, aborting."
msgstr "Thực hiện lệnh chuyển-tiếp-nhanh là không thể được, đang bỏ qua."
-#: builtin/merge.c:1504 builtin/merge.c:1583
+#: builtin/merge.c:1461 builtin/merge.c:1540
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Đang tua lại cây thành thời xa xưa…\n"
-#: builtin/merge.c:1508
+#: builtin/merge.c:1465
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Đang thử chiến lược hòa trộn %s…\n"
-#: builtin/merge.c:1574
+#: builtin/merge.c:1531
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Không có chiến lược hòa trộn nào được nắm giữ (handle) sự hòa trộn.\n"
-#: builtin/merge.c:1576
+#: builtin/merge.c:1533
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Hòa trộn với chiến lược %s gặp lỗi.\n"
-#: builtin/merge.c:1585
+#: builtin/merge.c:1542
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "Sử dụng %s để chuẩn bị giải quyết bằng tay.\n"
-#: builtin/merge.c:1597
+#: builtin/merge.c:1554
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -10000,35 +10243,35 @@
"git merge-file [<các-tùy-chọn>] [-L <tên1> [-L <gốc> [-L <tên2>]]] <tập-"
"tin1> <tập-tin-gốc> <tập-tin2>"
-#: builtin/merge-file.c:33
+#: builtin/merge-file.c:32
msgid "send results to standard output"
msgstr "gửi kết quả vào đầu ra tiêu chuẩn"
-#: builtin/merge-file.c:34
+#: builtin/merge-file.c:33
msgid "use a diff3 based merge"
msgstr "dùng kiểu hòa dựa trên diff3"
-#: builtin/merge-file.c:35
+#: builtin/merge-file.c:34
msgid "for conflicts, use our version"
msgstr "để tránh xung đột, sử dụng phiên bản của chúng ta"
-#: builtin/merge-file.c:37
+#: builtin/merge-file.c:36
msgid "for conflicts, use their version"
msgstr "để tránh xung đột, sử dụng phiên bản của họ"
-#: builtin/merge-file.c:39
+#: builtin/merge-file.c:38
msgid "for conflicts, use a union version"
msgstr "để tránh xung đột, sử dụng phiên bản kết hợp"
-#: builtin/merge-file.c:42
+#: builtin/merge-file.c:41
msgid "for conflicts, use this marker size"
msgstr "để tránh xung đột, hãy sử dụng kích thước bộ tạo này"
-#: builtin/merge-file.c:43
+#: builtin/merge-file.c:42
msgid "do not warn about conflicts"
msgstr "không cảnh báo về các xung đột xảy ra"
-#: builtin/merge-file.c:45
+#: builtin/merge-file.c:44
msgid "set labels for file1/orig-file/file2"
msgstr "đặt nhãn cho tập-tin-1/tập-tin-gốc/tập-tin-2"
@@ -10171,44 +10414,48 @@
msgid "renaming '%s' failed"
msgstr "gặp lỗi khi đổi tên “%s”"
-#: builtin/name-rev.c:257
+#: builtin/name-rev.c:289
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<các-tùy-chọn>] <commit>…"
-#: builtin/name-rev.c:258
+#: builtin/name-rev.c:290
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<các-tùy-chọn>] --all"
-#: builtin/name-rev.c:259
+#: builtin/name-rev.c:291
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<các-tùy-chọn>] --stdin"
-#: builtin/name-rev.c:311
+#: builtin/name-rev.c:346
msgid "print only names (no SHA-1)"
msgstr "chỉ hiển thị tên (không SHA-1)"
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:347
msgid "only use tags to name the commits"
msgstr "chỉ dùng các thẻ để đặt tên cho các lần chuyển giao"
-#: builtin/name-rev.c:314
+#: builtin/name-rev.c:349
msgid "only use refs matching <pattern>"
msgstr "chỉ sử dụng các tham chiếu khớp với <mẫu>"
-#: builtin/name-rev.c:316
+#: builtin/name-rev.c:351
+msgid "ignore refs matching <pattern>"
+msgstr "bỏ qua các tham chiếu khớp với <mẫu>"
+
+#: builtin/name-rev.c:353
msgid "list all commits reachable from all refs"
msgstr ""
"liệt kê tất cả các lần chuyển giao có thể đọc được từ tất cả các tham chiếu"
-#: builtin/name-rev.c:317
+#: builtin/name-rev.c:354
msgid "read from stdin"
msgstr "đọc từ đầu vào tiêu chuẩn"
-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:355
msgid "allow to print `undefined` names (default)"
msgstr "cho phép in các tên “chưa định nghĩa” (mặc định)"
-#: builtin/name-rev.c:324
+#: builtin/name-rev.c:361
msgid "dereference tags in the input (internal use)"
msgstr "bãi bỏ tham chiếu các thẻ trong đầu vào (dùng nội bộ)"
@@ -10354,19 +10601,19 @@
msgid "the note contents have been left in %s"
msgstr "nội dung ghi chú còn lại %s"
-#: builtin/notes.c:233 builtin/tag.c:460
+#: builtin/notes.c:233 builtin/tag.c:516
#, c-format
msgid "cannot read '%s'"
msgstr "không thể đọc “%s”"
-#: builtin/notes.c:235 builtin/tag.c:463
+#: builtin/notes.c:235 builtin/tag.c:519
#, c-format
msgid "could not open or read '%s'"
msgstr "không thể mở hay đọc “%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:659
+#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:658
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr "gặp lỗi khi phân giải “%s” như là một tham chiếu hợp lệ."
@@ -10399,12 +10646,12 @@
msgstr "từ chối %s ghi chú trong %s (nằm ngoài 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:652
-#: builtin/notes.c:802 builtin/notes.c:949 builtin/notes.c:970
+#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:651
+#: builtin/notes.c:801 builtin/notes.c:948 builtin/notes.c:969
msgid "too many parameters"
msgstr "quá nhiều đối số"
-#: builtin/notes.c:378 builtin/notes.c:665
+#: builtin/notes.c:378 builtin/notes.c:664
#, c-format
msgid "no note found for object %s."
msgstr "không tìm thấy ghi chú cho đối tượng %s."
@@ -10447,7 +10694,7 @@
msgid "Overwriting existing notes for object %s\n"
msgstr "Đang ghi đè lên ghi chú cũ cho đối tượng %s\n"
-#: builtin/notes.c:463 builtin/notes.c:624 builtin/notes.c:889
+#: builtin/notes.c:463 builtin/notes.c:623 builtin/notes.c:888
#, c-format
msgid "Removing note for object %s\n"
msgstr "Đang gỡ bỏ ghi chú (note) cho đối tượng %s\n"
@@ -10487,52 +10734,52 @@
"Các tùy chọn -m/-F/-c/-C đã cổ không còn dùng nữa cho lệnh con “edit”.\n"
"Xin hãy sử dụng lệnh sau để thay thế: “git notes add -f -m/-F/-c/-C”.\n"
-#: builtin/notes.c:685
+#: builtin/notes.c:684
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "gặp lỗi khi xóa tham chiếu NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:687
+#: builtin/notes.c:686
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "gặp lỗi khi xóa tham chiếu NOTES_MERGE_REF"
-#: builtin/notes.c:689
+#: builtin/notes.c:688
msgid "failed to remove 'git notes merge' worktree"
msgstr "gặp lỗi khi gỡ bỏ cây làm việc “git notes merge”"
-#: builtin/notes.c:709
+#: builtin/notes.c:708
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "gặp lỗi khi đọc tham chiếu NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:711
+#: builtin/notes.c:710
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "không thể tìm thấy lần chuyển giao từ NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:713
+#: builtin/notes.c:712
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "không thể phân tích cú pháp lần chuyển giao từ NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:726
+#: builtin/notes.c:725
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "gặp lỗi khi phân giải NOTES_MERGE_REF"
-#: builtin/notes.c:729
+#: builtin/notes.c:728
msgid "failed to finalize notes merge"
msgstr "gặp lỗi khi hoàn thành hòa trộn ghi chú"
-#: builtin/notes.c:755
+#: builtin/notes.c:754
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "không hiểu chiến lược hòa trộn ghi chú %s"
-#: builtin/notes.c:771
+#: builtin/notes.c:770
msgid "General options"
msgstr "Tùy chọn chung"
-#: builtin/notes.c:773
+#: builtin/notes.c:772
msgid "Merge options"
msgstr "Tùy chọn về hòa trộn"
-#: builtin/notes.c:775
+#: builtin/notes.c:774
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -10540,48 +10787,48 @@
"phân giải các xung đột “notes” sử dụng chiến lược đã đưa ra (manual/ours/"
"theirs/union/cat_sort_uniq)"
-#: builtin/notes.c:777
+#: builtin/notes.c:776
msgid "Committing unmerged notes"
msgstr "Chuyển giao các note chưa được hòa trộn"
-#: builtin/notes.c:779
+#: builtin/notes.c:778
msgid "finalize notes merge by committing unmerged notes"
msgstr ""
"các note cuối cùng được hòa trộn bởi các note chưa hòa trộn của lần chuyển "
"giao"
-#: builtin/notes.c:781
+#: builtin/notes.c:780
msgid "Aborting notes merge resolution"
msgstr "Hủy bỏ phân giải ghi chú (note) hòa trộn"
-#: builtin/notes.c:783
+#: builtin/notes.c:782
msgid "abort notes merge"
msgstr "bỏ qua hòa trộn các ghi chú (note)"
-#: builtin/notes.c:794
+#: builtin/notes.c:793
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "không thể trộn lẫn --commit, --abort hay -s/--strategy"
-#: builtin/notes.c:799
+#: builtin/notes.c:798
msgid "must specify a notes ref to merge"
msgstr "bạn phải chỉ định tham chiếu ghi chú để hòa trộn"
-#: builtin/notes.c:823
+#: builtin/notes.c:822
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "không hiểu -s/--strategy: %s"
-#: builtin/notes.c:860
+#: builtin/notes.c:859
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "một ghi chú hòa trộn vào %s đã sẵn trong quá trình xử lý tại %s"
-#: builtin/notes.c:863
+#: builtin/notes.c:862
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr "gặp lỗi khi lưu liên kết đến tham chiếu ghi chú hiện tại (%s)"
-#: builtin/notes.c:865
+#: builtin/notes.c:864
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -10592,36 +10839,36 @@
"chuyển giao kết quả bằng “git notes merge --commit”, hoặc bãi bỏ việc hòa "
"trộn bằng “git notes merge --abort”.\n"
-#: builtin/notes.c:887
+#: builtin/notes.c:886
#, c-format
msgid "Object %s has no note\n"
msgstr "Đối tượng %s không có ghi chú (note)\n"
-#: builtin/notes.c:899
+#: builtin/notes.c:898
msgid "attempt to remove non-existent note is not an error"
msgstr "cố gắng gỡ bỏ một note chưa từng tồn tại không phải là một lỗi"
-#: builtin/notes.c:902
+#: builtin/notes.c:901
msgid "read object names from the standard input"
msgstr "đọc tên đối tượng từ thiết bị nhập chuẩn"
-#: builtin/notes.c:940 builtin/prune.c:105 builtin/worktree.c:127
+#: builtin/notes.c:939 builtin/prune.c:105 builtin/worktree.c:127
msgid "do not remove, show only"
msgstr "không gỡ bỏ, chỉ hiển thị"
-#: builtin/notes.c:941
+#: builtin/notes.c:940
msgid "report pruned notes"
msgstr "báo cáo các đối tượng đã prune"
-#: builtin/notes.c:983
+#: builtin/notes.c:982
msgid "notes-ref"
msgstr "notes-ref"
-#: builtin/notes.c:984
+#: builtin/notes.c:983
msgid "use notes from <notes-ref>"
msgstr "dùng “notes” từ <notes-ref>"
-#: builtin/notes.c:1019
+#: builtin/notes.c:1018
#, c-format
msgid "unknown subcommand: %s"
msgstr "không hiểu câu lệnh con: %s"
@@ -10645,170 +10892,170 @@
msgid "deflate error (%d)"
msgstr "lỗi giải nén (%d)"
-#: builtin/pack-objects.c:766
+#: builtin/pack-objects.c:770
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr "tắt ghi bitmap, các gói bị chia nhỏ bởi vì pack.packSizeLimit"
-#: builtin/pack-objects.c:779
+#: builtin/pack-objects.c:783
msgid "Writing objects"
msgstr "Đang ghi lại các đối tượng"
-#: builtin/pack-objects.c:1068
+#: builtin/pack-objects.c:1063
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "tắt ghi bitmap, như vậy một số đối tượng sẽ không được đóng gói"
-#: builtin/pack-objects.c:2344
+#: builtin/pack-objects.c:2426
msgid "Compressing objects"
msgstr "Đang nén các đối tượng"
-#: builtin/pack-objects.c:2747
+#: builtin/pack-objects.c:2829
#, c-format
msgid "unsupported index version %s"
msgstr "phiên bản mục lục không được hỗ trợ %s"
-#: builtin/pack-objects.c:2751
+#: builtin/pack-objects.c:2833
#, c-format
msgid "bad index version '%s'"
msgstr "phiên bản mục lục sai “%s”"
-#: builtin/pack-objects.c:2781
+#: builtin/pack-objects.c:2863
msgid "do not show progress meter"
msgstr "không hiển thị bộ đo tiến trình"
-#: builtin/pack-objects.c:2783
+#: builtin/pack-objects.c:2865
msgid "show progress meter"
msgstr "hiển thị bộ đo tiến trình"
-#: builtin/pack-objects.c:2785
+#: builtin/pack-objects.c:2867
msgid "show progress meter during object writing phase"
msgstr "hiển thị bộ đo tiến triển trong suốt pha ghi đối tượng"
-#: builtin/pack-objects.c:2788
+#: builtin/pack-objects.c:2870
msgid "similar to --all-progress when progress meter is shown"
msgstr "tương tự --all-progress khi bộ đo tiến trình được xuất hiện"
-#: builtin/pack-objects.c:2789
+#: builtin/pack-objects.c:2871
msgid "version[,offset]"
msgstr "phiên bản[,offset]"
-#: builtin/pack-objects.c:2790
+#: builtin/pack-objects.c:2872
msgid "write the pack index file in the specified idx format version"
msgstr "ghi tập tin bảng mục lục gói (pack) ở phiên bản định dạng idx đã cho"
-#: builtin/pack-objects.c:2793
+#: builtin/pack-objects.c:2875
msgid "maximum size of each output pack file"
msgstr "kcíh thước tối đa cho tập tin gói được tạo"
-#: builtin/pack-objects.c:2795
+#: builtin/pack-objects.c:2877
msgid "ignore borrowed objects from alternate object store"
msgstr "bỏ qua các đối tượng vay mượn từ kho đối tượng thay thế"
-#: builtin/pack-objects.c:2797
+#: builtin/pack-objects.c:2879
msgid "ignore packed objects"
msgstr "bỏ qua các đối tượng đóng gói"
-#: builtin/pack-objects.c:2799
+#: builtin/pack-objects.c:2881
msgid "limit pack window by objects"
msgstr "giới hạn cửa sổ đóng gói theo đối tượng"
-#: builtin/pack-objects.c:2801
+#: builtin/pack-objects.c:2883
msgid "limit pack window by memory in addition to object limit"
msgstr "giới hạn cửa sổ đóng gói theo bộ nhớ cộng thêm với giới hạn đối tượng"
-#: builtin/pack-objects.c:2803
+#: builtin/pack-objects.c:2885
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "độ dài tối đa của chuỗi móc xích “delta” được phép trong gói kết quả"
-#: builtin/pack-objects.c:2805
+#: builtin/pack-objects.c:2887
msgid "reuse existing deltas"
msgstr "dùng lại các delta sẵn có"
-#: builtin/pack-objects.c:2807
+#: builtin/pack-objects.c:2889
msgid "reuse existing objects"
msgstr "dùng lại các đối tượng sẵn có"
-#: builtin/pack-objects.c:2809
+#: builtin/pack-objects.c:2891
msgid "use OFS_DELTA objects"
msgstr "dùng các đối tượng OFS_DELTA"
-#: builtin/pack-objects.c:2811
+#: builtin/pack-objects.c:2893
msgid "use threads when searching for best delta matches"
msgstr "sử dụng các tuyến trình khi tìm kiếm cho các mẫu khớp delta tốt nhất"
-#: builtin/pack-objects.c:2813
+#: builtin/pack-objects.c:2895
msgid "do not create an empty pack output"
msgstr "không thể tạo kết xuất gói trống rỗng"
-#: builtin/pack-objects.c:2815
+#: builtin/pack-objects.c:2897
msgid "read revision arguments from standard input"
msgstr " đọc tham số “revision” từ thiết bị nhập chuẩn"
-#: builtin/pack-objects.c:2817
+#: builtin/pack-objects.c:2899
msgid "limit the objects to those that are not yet packed"
msgstr "giới hạn các đối tượng thành những cái mà chúng vẫn chưa được đóng gói"
-#: builtin/pack-objects.c:2820
+#: builtin/pack-objects.c:2902
msgid "include objects reachable from any reference"
msgstr "bao gồm các đối tượng có thể đọc được từ bất kỳ tham chiếu nào"
-#: builtin/pack-objects.c:2823
+#: builtin/pack-objects.c:2905
msgid "include objects referred by reflog entries"
msgstr "bao gồm các đối tượng được tham chiếu bởi các mục reflog"
-#: builtin/pack-objects.c:2826
+#: builtin/pack-objects.c:2908
msgid "include objects referred to by the index"
msgstr "bao gồm các đối tượng được tham chiếu bởi mục lục"
-#: builtin/pack-objects.c:2829
+#: builtin/pack-objects.c:2911
msgid "output pack to stdout"
msgstr "xuất gói ra đầu ra tiêu chuẩn"
-#: builtin/pack-objects.c:2831
+#: builtin/pack-objects.c:2913
msgid "include tag objects that refer to objects to be packed"
msgstr "bao gồm các đối tượng tham chiếu đến các đối tượng được đóng gói"
-#: builtin/pack-objects.c:2833
+#: builtin/pack-objects.c:2915
msgid "keep unreachable objects"
msgstr "giữ lại các đối tượng không thể đọc được"
-#: builtin/pack-objects.c:2835
+#: builtin/pack-objects.c:2917
msgid "pack loose unreachable objects"
msgstr "pack mất các đối tượng không thể đọc được"
-#: builtin/pack-objects.c:2837
+#: builtin/pack-objects.c:2919
msgid "unpack unreachable objects newer than <time>"
msgstr ""
"xả nén (gỡ khỏi gói) các đối tượng không thể đọc được mới hơn <thời-gian>"
-#: builtin/pack-objects.c:2840
+#: builtin/pack-objects.c:2922
msgid "create thin packs"
msgstr "tạo gói nhẹ"
-#: builtin/pack-objects.c:2842
+#: builtin/pack-objects.c:2924
msgid "create packs suitable for shallow fetches"
msgstr "tạo gói để phù hợp cho lấy về nông (shallow)"
-#: builtin/pack-objects.c:2844
+#: builtin/pack-objects.c:2926
msgid "ignore packs that have companion .keep file"
msgstr "bỏ qua các gói mà nó có tập tin .keep đi kèm"
-#: builtin/pack-objects.c:2846
+#: builtin/pack-objects.c:2928
msgid "pack compression level"
msgstr "mức nén gói"
-#: builtin/pack-objects.c:2848
+#: builtin/pack-objects.c:2930
msgid "do not hide commits by grafts"
msgstr "không ẩn các lần chuyển giao bởi “grafts”"
-#: builtin/pack-objects.c:2850
+#: builtin/pack-objects.c:2932
msgid "use a bitmap index if available to speed up counting objects"
msgstr "dùng mục lục ánh xạ nếu có thể được để nâng cao tốc độ đếm đối tượng"
-#: builtin/pack-objects.c:2852
+#: builtin/pack-objects.c:2934
msgid "write a bitmap index together with the pack index"
msgstr "ghi một mục lục ánh xạ cùng với mục lục gói"
-#: builtin/pack-objects.c:2979
+#: builtin/pack-objects.c:3061
msgid "Counting objects"
msgstr "Đang đếm các đối tượng"
@@ -10865,7 +11112,7 @@
msgid "incorporate changes by rebasing rather than merging"
msgstr "các thay đổi hợp nhất bằng cải tổ thay vì hòa trộn"
-#: builtin/pull.c:148 builtin/revert.c:101
+#: builtin/pull.c:148 builtin/rebase--helper.c:18 builtin/revert.c:120
msgid "allow fast-forward"
msgstr "cho phép chuyển-tiếp-nhanh"
@@ -10943,7 +11190,7 @@
msgid "<remote>"
msgstr "<máy chủ>"
-#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:455
+#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:456
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<nhánh>"
@@ -11243,11 +11490,11 @@
msgid "repository"
msgstr "kho"
-#: builtin/push.c:519 builtin/send-pack.c:161
+#: builtin/push.c:519 builtin/send-pack.c:162
msgid "push all refs"
msgstr "đẩy tất cả các tham chiếu"
-#: builtin/push.c:520 builtin/send-pack.c:163
+#: builtin/push.c:520 builtin/send-pack.c:164
msgid "mirror all refs"
msgstr "mirror tất cả các tham chiếu"
@@ -11259,15 +11506,15 @@
msgid "push tags (can't be used with --all or --mirror)"
msgstr "đẩy các thẻ (không dùng cùng với --all hay --mirror)"
-#: builtin/push.c:526 builtin/send-pack.c:164
+#: builtin/push.c:526 builtin/send-pack.c:165
msgid "force updates"
msgstr "ép buộc cập nhật"
-#: builtin/push.c:528 builtin/send-pack.c:175
+#: builtin/push.c:528 builtin/send-pack.c:179
msgid "refname>:<expect"
msgstr "tên-tham-chiếu>:<cần"
-#: builtin/push.c:529 builtin/send-pack.c:176
+#: builtin/push.c:529 builtin/send-pack.c:180
msgid "require old value of ref to be at this value"
msgstr "yêu cầu giá-trị cũ của tham chiếu thì là giá-trị này"
@@ -11275,12 +11522,12 @@
msgid "control recursive pushing of submodules"
msgstr "điều khiển việc đẩy lên (push) đệ qui của mô-đun-con"
-#: builtin/push.c:534 builtin/send-pack.c:169
+#: builtin/push.c:534 builtin/send-pack.c:173
msgid "use thin pack"
msgstr "tạo gói nhẹ"
-#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:158
-#: builtin/send-pack.c:159
+#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:159
+#: builtin/send-pack.c:160
msgid "receive pack program"
msgstr "chương trình nhận gói"
@@ -11300,19 +11547,19 @@
msgid "push missing but relevant tags"
msgstr "push phần bị thiếu nhưng các thẻ lại thích hợp"
-#: builtin/push.c:546 builtin/send-pack.c:166
+#: builtin/push.c:546 builtin/send-pack.c:167
msgid "GPG sign the push"
msgstr "ký lần đẩy dùng GPG"
-#: builtin/push.c:548 builtin/send-pack.c:170
+#: builtin/push.c:548 builtin/send-pack.c:174
msgid "request atomic transaction on remote side"
msgstr "yêu cầu giao dịch hạt nhân bên phía máy chủ"
-#: builtin/push.c:549
+#: builtin/push.c:549 builtin/send-pack.c:170
msgid "server-specific"
msgstr "đặc-tả-máy-phục-vụ"
-#: builtin/push.c:549
+#: builtin/push.c:549 builtin/send-pack.c:171
msgid "option to transmit"
msgstr "tùy chọn để chuyển giao"
@@ -11328,7 +11575,7 @@
msgid "push options must not have new line characters"
msgstr "các tùy chọn push phải không có ký tự dòng mới"
-#: builtin/read-tree.c:37
+#: builtin/read-tree.c:40
msgid ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
@@ -11339,76 +11586,88 @@
"[--index-output=<tập-tin>] (--empty | <tree-ish1> [<tree-ish2> [<tree-"
"ish3>]])"
-#: builtin/read-tree.c:110
+#: builtin/read-tree.c:130
msgid "write resulting index to <file>"
msgstr "ghi mục lục kết quả vào <tập-tin>"
-#: builtin/read-tree.c:113
+#: builtin/read-tree.c:133
msgid "only empty the index"
msgstr "chỉ với bảng mục lục trống rỗng"
-#: builtin/read-tree.c:115
+#: builtin/read-tree.c:135
msgid "Merging"
msgstr "Hòa trộn"
-#: builtin/read-tree.c:117
+#: builtin/read-tree.c:137
msgid "perform a merge in addition to a read"
msgstr "thực hiện một hòa trộn thêm vào việc đọc"
-#: builtin/read-tree.c:119
+#: builtin/read-tree.c:139
msgid "3-way merge if no file level merging required"
msgstr ""
"hòa trộn kiểu “3-way” nếu không có tập tin mức hòa trộn nào được yêu cầu "
-#: builtin/read-tree.c:121
+#: builtin/read-tree.c:141
msgid "3-way merge in presence of adds and removes"
msgstr "hòa trộn 3-way trong sự hiện diện của “adds” và “removes”"
-#: builtin/read-tree.c:123
+#: builtin/read-tree.c:143
msgid "same as -m, but discard unmerged entries"
msgstr "giống với -m, nhưng bỏ qua các mục chưa được hòa trộn"
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:144
msgid "<subdirectory>/"
msgstr "<thư-mục-con>/"
-#: builtin/read-tree.c:125
+#: builtin/read-tree.c:145
msgid "read the tree into the index under <subdirectory>/"
msgstr "đọc cây vào trong bảng mục lục dưới <thư_mục_con>/"
-#: builtin/read-tree.c:128
+#: builtin/read-tree.c:148
msgid "update working tree with merge result"
msgstr "cập nhật cây làm việc với kết quả hòa trộn"
-#: builtin/read-tree.c:130
+#: builtin/read-tree.c:150
msgid "gitignore"
msgstr "gitignore"
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:151
msgid "allow explicitly ignored files to be overwritten"
msgstr "cho phép các tập tin rõ ràng bị lờ đi được ghi đè"
-#: builtin/read-tree.c:134
+#: builtin/read-tree.c:154
msgid "don't check the working tree after merging"
msgstr "không kiểm tra cây làm việc sau hòa trộn"
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:155
msgid "don't update the index or the work tree"
msgstr "không cập nhật bảng mục lục hay cây làm việc"
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:157
msgid "skip applying sparse checkout filter"
msgstr "bỏ qua áp dụng bộ lọc lấy ra (checkout) thưa thớt"
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:159
msgid "debug unpack-trees"
msgstr "gỡ lỗi “unpack-trees”"
-#: builtin/receive-pack.c:26
+#: builtin/rebase--helper.c:7
+msgid "git rebase--helper [<options>]"
+msgstr "git rebase--helper [<các-tùy-chọn>]"
+
+#: builtin/rebase--helper.c:19
+msgid "continue rebase"
+msgstr "tiếp tục cải tổ"
+
+#: builtin/rebase--helper.c:21
+msgid "abort rebase"
+msgstr "bãi bỏ việc cải tổ"
+
+#: builtin/receive-pack.c:27
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <thư-mục-git>"
-#: builtin/receive-pack.c:793
+#: builtin/receive-pack.c:795
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"
@@ -11438,7 +11697,7 @@
"Để chấm dứt lời nhắn này và vẫn giữ cách ứng xử mặc định, hãy đặt\n"
"biến cấu hình “receive.denyCurrentBranch” thành “refuse”."
-#: builtin/receive-pack.c:813
+#: builtin/receive-pack.c:815
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"
@@ -11459,11 +11718,11 @@
"\n"
"Để chấm dứt lời nhắn này, bạn hãy đặt nó thành “refuse”."
-#: builtin/receive-pack.c:1883
+#: builtin/receive-pack.c:1888
msgid "quiet"
msgstr "im lặng"
-#: builtin/receive-pack.c:1897
+#: builtin/receive-pack.c:1902
msgid "You must specify a directory."
msgstr "Bạn phải chỉ định thư mục."
@@ -11641,7 +11900,7 @@
msgid "(delete)"
msgstr "(xóa)"
-#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:854
+#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:856
#, c-format
msgid "No such remote: %s"
msgstr "Không có máy chủ nào như thế: %s"
@@ -11672,7 +11931,7 @@
msgid "creating '%s' failed"
msgstr "gặp lỗi khi tạo “%s”"
-#: builtin/remote.c:792
+#: builtin/remote.c:794
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -11684,293 +11943,293 @@
"đi;\n"
"để xóa đi, sử dụng:"
-#: builtin/remote.c:806
+#: builtin/remote.c:808
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Không thể gỡ bỏ phần cấu hình “%s”"
-#: builtin/remote.c:907
+#: builtin/remote.c:909
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " mới (lần lấy về tiếp theo sẽ lưu trong remotes/%s)"
-#: builtin/remote.c:910
+#: builtin/remote.c:912
msgid " tracked"
msgstr " được theo dõi"
-#: builtin/remote.c:912
+#: builtin/remote.c:914
msgid " stale (use 'git remote prune' to remove)"
msgstr " cũ rích (dùng “git remote prune” để gỡ bỏ)"
-#: builtin/remote.c:914
+#: builtin/remote.c:916
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:955
+#: builtin/remote.c:957
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "branch.%s.merge không hợp lệ; không thể cải tổ về phía > 1 nhánh"
-#: builtin/remote.c:963
+#: builtin/remote.c:965
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "thực hiện rebase một cách tương tác trên máy chủ %s"
-#: builtin/remote.c:964
+#: builtin/remote.c:966
#, c-format
msgid "rebases onto remote %s"
msgstr "thực hiện rebase trên máy chủ %s"
-#: builtin/remote.c:967
+#: builtin/remote.c:969
#, c-format
msgid " merges with remote %s"
msgstr " hòa trộn với máy chủ %s"
-#: builtin/remote.c:970
+#: builtin/remote.c:972
#, c-format
msgid "merges with remote %s"
msgstr "hòa trộn với máy chủ %s"
-#: builtin/remote.c:973
+#: builtin/remote.c:975
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s và với máy chủ %s\n"
-#: builtin/remote.c:1016
+#: builtin/remote.c:1018
msgid "create"
msgstr "tạo"
-#: builtin/remote.c:1019
+#: builtin/remote.c:1021
msgid "delete"
msgstr "xóa"
-#: builtin/remote.c:1023
+#: builtin/remote.c:1025
msgid "up to date"
msgstr "đã cập nhật"
-#: builtin/remote.c:1026
+#: builtin/remote.c:1028
msgid "fast-forwardable"
msgstr "có-thể-chuyển-tiếp-nhanh"
-#: builtin/remote.c:1029
+#: builtin/remote.c:1031
msgid "local out of date"
msgstr "dữ liệu nội bộ đã cũ"
-#: builtin/remote.c:1036
+#: builtin/remote.c:1038
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s ép buộc thành %-*s (%s)"
-#: builtin/remote.c:1039
+#: builtin/remote.c:1041
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s đẩy lên thành %-*s (%s)"
-#: builtin/remote.c:1043
+#: builtin/remote.c:1045
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s ép buộc thành %s"
-#: builtin/remote.c:1046
+#: builtin/remote.c:1048
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s đẩy lên thành %s"
-#: builtin/remote.c:1114
+#: builtin/remote.c:1116
msgid "do not query remotes"
msgstr "không truy vấn các máy chủ"
-#: builtin/remote.c:1141
+#: builtin/remote.c:1143
#, c-format
msgid "* remote %s"
msgstr "* máy chủ %s"
-#: builtin/remote.c:1142
+#: builtin/remote.c:1144
#, c-format
msgid " Fetch URL: %s"
msgstr " URL để lấy về: %s"
-#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1295
+#: builtin/remote.c:1145 builtin/remote.c:1158 builtin/remote.c:1297
msgid "(no URL)"
msgstr "(không có URL)"
#. TRANSLATORS: the colon ':' should align with
#. the one in " Fetch URL: %s" translation
-#: builtin/remote.c:1154 builtin/remote.c:1156
+#: builtin/remote.c:1156 builtin/remote.c:1158
#, c-format
msgid " Push URL: %s"
msgstr " URL để đẩy lên: %s"
-#: builtin/remote.c:1158 builtin/remote.c:1160 builtin/remote.c:1162
+#: builtin/remote.c:1160 builtin/remote.c:1162 builtin/remote.c:1164
#, c-format
msgid " HEAD branch: %s"
msgstr " Nhánh HEAD: %s"
-#: builtin/remote.c:1158
+#: builtin/remote.c:1160
msgid "(not queried)"
msgstr "(không yêu cầu)"
-#: builtin/remote.c:1160
+#: builtin/remote.c:1162
msgid "(unknown)"
msgstr "(không hiểu)"
-#: builtin/remote.c:1164
+#: builtin/remote.c:1166
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr " nhánh HEAD (HEAD máy chủ chưa rõ ràng, có lẽ là một trong số sau):\n"
-#: builtin/remote.c:1176
+#: builtin/remote.c:1178
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Những nhánh trên máy chủ:%s"
-#: builtin/remote.c:1179 builtin/remote.c:1205
+#: builtin/remote.c:1181 builtin/remote.c:1207
msgid " (status not queried)"
msgstr " (trạng thái không được yêu cầu)"
-#: builtin/remote.c:1188
+#: builtin/remote.c:1190
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Những nhánh nội bộ đã được cấu hình cho lệnh “git pull”:"
-#: builtin/remote.c:1196
+#: builtin/remote.c:1198
msgid " Local refs will be mirrored by 'git push'"
msgstr " refs nội bộ sẽ được phản chiếu bởi lệnh “git push”"
-#: builtin/remote.c:1202
+#: builtin/remote.c:1204
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " Những tham chiếu nội bộ được cấu hình cho lệnh “git push”%s:"
-#: builtin/remote.c:1223
+#: builtin/remote.c:1225
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "đặt refs/remotes/<tên>/HEAD cho phù hợp với máy chủ"
-#: builtin/remote.c:1225
+#: builtin/remote.c:1227
msgid "delete refs/remotes/<name>/HEAD"
msgstr "xóa refs/remotes/<tên>/HEAD"
-#: builtin/remote.c:1240
+#: builtin/remote.c:1242
msgid "Cannot determine remote HEAD"
msgstr "Không thể xác định được HEAD máy chủ"
-#: builtin/remote.c:1242
+#: builtin/remote.c:1244
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "Nhiều nhánh HEAD máy chủ. Hãy chọn rõ ràng một:"
-#: builtin/remote.c:1252
+#: builtin/remote.c:1254
#, c-format
msgid "Could not delete %s"
msgstr "Không thể xóa bỏ %s"
-#: builtin/remote.c:1260
+#: builtin/remote.c:1262
#, c-format
msgid "Not a valid ref: %s"
msgstr "Không phải là tham chiếu hợp lệ: %s"
-#: builtin/remote.c:1262
+#: builtin/remote.c:1264
#, c-format
msgid "Could not setup %s"
msgstr "Không thể cài đặt %s"
-#: builtin/remote.c:1280
+#: builtin/remote.c:1282
#, c-format
msgid " %s will become dangling!"
msgstr " %s sẽ trở thành không đầu (không được quản lý)!"
-#: builtin/remote.c:1281
+#: builtin/remote.c:1283
#, c-format
msgid " %s has become dangling!"
msgstr " %s đã trở thành không đầu (không được quản lý)!"
-#: builtin/remote.c:1291
+#: builtin/remote.c:1293
#, c-format
msgid "Pruning %s"
msgstr "Đang xén bớt %s"
-#: builtin/remote.c:1292
+#: builtin/remote.c:1294
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1308
+#: builtin/remote.c:1310
#, c-format
msgid " * [would prune] %s"
msgstr " * [nên xén bớt] %s"
-#: builtin/remote.c:1311
+#: builtin/remote.c:1313
#, c-format
msgid " * [pruned] %s"
msgstr " * [đã bị xén] %s"
-#: builtin/remote.c:1356
+#: builtin/remote.c:1358
msgid "prune remotes after fetching"
msgstr "cắt máy chủ sau khi lấy về"
-#: builtin/remote.c:1419 builtin/remote.c:1473 builtin/remote.c:1541
+#: builtin/remote.c:1421 builtin/remote.c:1475 builtin/remote.c:1543
#, c-format
msgid "No such remote '%s'"
msgstr "Không có máy chủ nào có tên “%s”"
-#: builtin/remote.c:1435
+#: builtin/remote.c:1437
msgid "add branch"
msgstr "thêm nhánh"
-#: builtin/remote.c:1442
+#: builtin/remote.c:1444
msgid "no remote specified"
msgstr "chưa chỉ ra máy chủ nào"
-#: builtin/remote.c:1459
+#: builtin/remote.c:1461
msgid "query push URLs rather than fetch URLs"
msgstr "truy vấn đẩy URL thay vì lấy"
-#: builtin/remote.c:1461
+#: builtin/remote.c:1463
msgid "return all URLs"
msgstr "trả về mọi URL"
-#: builtin/remote.c:1489
+#: builtin/remote.c:1491
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "không có URL nào được cấu hình cho nhánh “%s”"
-#: builtin/remote.c:1515
+#: builtin/remote.c:1517
msgid "manipulate push URLs"
msgstr "đẩy các “URL” bằng tay"
-#: builtin/remote.c:1517
+#: builtin/remote.c:1519
msgid "add URL"
msgstr "thêm URL"
-#: builtin/remote.c:1519
+#: builtin/remote.c:1521
msgid "delete URLs"
msgstr "xóa URLs"
-#: builtin/remote.c:1526
+#: builtin/remote.c:1528
msgid "--add --delete doesn't make sense"
msgstr "--add --delete không hợp lý"
-#: builtin/remote.c:1567
+#: builtin/remote.c:1569
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Kiểu mẫu URL cũ không hợp lệ: %s"
-#: builtin/remote.c:1575
+#: builtin/remote.c:1577
#, c-format
msgid "No such URL found: %s"
msgstr "Không tìm thấy URL như vậy: %s"
-#: builtin/remote.c:1577
+#: builtin/remote.c:1579
msgid "Will not delete all non-push URLs"
msgstr "Sẽ không xóa những địa chỉ URL không-push"
-#: builtin/remote.c:1591
+#: builtin/remote.c:1593
msgid "be verbose; must be placed before a subcommand"
msgstr "chi tiết; phải được đặt trước một lệnh-con"
-#: builtin/remote.c:1622
+#: builtin/remote.c:1624
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Không hiểu câu lệnh con: %s"
@@ -12088,22 +12347,22 @@
msgid "git replace [--format=<format>] [-l [<pattern>]]"
msgstr "git replace [--format=<định_dạng>] [-l [<mẫu>]]"
-#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
+#: builtin/replace.c:330 builtin/replace.c:368 builtin/replace.c:396
#, c-format
msgid "Not a valid object name: '%s'"
msgstr "Không phải là tên đối tượng hợp lệ: “%s”"
-#: builtin/replace.c:355
+#: builtin/replace.c:360
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "thẻ hòa trộn sai trong lần chuyển giao “%s”"
-#: builtin/replace.c:357
+#: builtin/replace.c:362
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr "thẻ hòa trộn không đúng dạng ở lần chuyển giao “%s”"
-#: builtin/replace.c:368
+#: builtin/replace.c:373
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -12112,45 +12371,45 @@
"lần chuyển giao gốc “%s” có chứa thẻ hòa trộn “%s” cái mà bị loại bỏ; dùng "
"tùy chọn --edit thay cho --graft"
-#: builtin/replace.c:401
+#: builtin/replace.c:406
#, c-format
msgid "the original commit '%s' has a gpg signature."
msgstr "lần chuyển giao gốc “%s” có chữ ký GPG."
-#: builtin/replace.c:402
+#: builtin/replace.c:407
msgid "the signature will be removed in the replacement commit!"
msgstr "chữ ký sẽ được bỏ đi trong lần chuyển giao thay thế!"
-#: builtin/replace.c:408
+#: builtin/replace.c:413
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr "không thể ghi lần chuyển giao thay thế cho: “%s”"
-#: builtin/replace.c:432
+#: builtin/replace.c:437
msgid "list replace refs"
msgstr "liệt kê các refs thay thế"
-#: builtin/replace.c:433
+#: builtin/replace.c:438
msgid "delete replace refs"
msgstr "xóa tham chiếu thay thế"
-#: builtin/replace.c:434
+#: builtin/replace.c:439
msgid "edit existing object"
msgstr "sửa đối tượng sẵn có"
-#: builtin/replace.c:435
+#: builtin/replace.c:440
msgid "change a commit's parents"
msgstr "thay đổi cha mẹ của lần chuyển giao"
-#: builtin/replace.c:436
+#: builtin/replace.c:441
msgid "replace the ref if it exists"
msgstr "thay thế tham chiếu nếu nó đã sẵn có"
-#: builtin/replace.c:437
+#: builtin/replace.c:442
msgid "do not pretty-print contents for --edit"
msgstr "đừng in đẹp các nội dung cho --edit"
-#: builtin/replace.c:438
+#: builtin/replace.c:443
msgid "use this format"
msgstr "dùng định dạng này"
@@ -12295,23 +12554,23 @@
msgid "rev-list does not support display of notes"
msgstr "rev-list không hỗ trợ hiển thị các ghi chú"
-#: builtin/rev-parse.c:391
+#: builtin/rev-parse.c:393
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<các-tùy-chọn>] -- [<các tham số>…]"
-#: builtin/rev-parse.c:396
+#: builtin/rev-parse.c:398
msgid "keep the `--` passed as an arg"
msgstr "giữ lại “--” chuyển sang làm tham số"
-#: builtin/rev-parse.c:398
+#: builtin/rev-parse.c:400
msgid "stop parsing after the first non-option argument"
msgstr "dừng phân tích sau đối số đầu tiên không có tùy chọn"
-#: builtin/rev-parse.c:401
+#: builtin/rev-parse.c:403
msgid "output in stuck long form"
msgstr "kết xuất trong định dạng gậy dài"
-#: builtin/rev-parse.c:532
+#: builtin/rev-parse.c:534
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
@@ -12341,68 +12600,72 @@
msgid "git cherry-pick <subcommand>"
msgstr "git cherry-pick <lệnh-con>"
-#: builtin/revert.c:71
+#: builtin/revert.c:89
#, c-format
msgid "%s: %s cannot be used with %s"
msgstr "%s: %s không thể được sử dụng với %s"
-#: builtin/revert.c:80
+#: builtin/revert.c:98
msgid "end revert or cherry-pick sequence"
msgstr "kết thúc cherry-pick hay hoàn nguyên liên tiếp nhau"
-#: builtin/revert.c:81
+#: builtin/revert.c:99
msgid "resume revert or cherry-pick sequence"
msgstr "phục hồi lại cherry-pick hay hoàn nguyên liên tiếp nhau"
-#: builtin/revert.c:82
+#: builtin/revert.c:100
msgid "cancel revert or cherry-pick sequence"
msgstr "không cherry-pick hay hoàn nguyên liên tiếp nhau"
-#: builtin/revert.c:83
+#: builtin/revert.c:101
msgid "don't automatically commit"
msgstr "không chuyển giao một cách tự động."
-#: builtin/revert.c:84
+#: builtin/revert.c:102
msgid "edit the commit message"
msgstr "sửa lại chú thích cho lần chuyển giao"
-#: builtin/revert.c:87
-msgid "parent number"
-msgstr "số của cha mẹ"
+#: builtin/revert.c:105
+msgid "parent-number"
+msgstr "số-cha-mẹ"
-#: builtin/revert.c:89
+#: builtin/revert.c:106
+msgid "select mainline parent"
+msgstr "chọn cha mẹ luồng chính"
+
+#: builtin/revert.c:108
msgid "merge strategy"
msgstr "chiến lược hòa trộn"
-#: builtin/revert.c:90
+#: builtin/revert.c:109
msgid "option"
msgstr "tùy chọn"
-#: builtin/revert.c:91
+#: builtin/revert.c:110
msgid "option for merge strategy"
msgstr "tùy chọn cho chiến lược hòa trộn"
-#: builtin/revert.c:100
+#: builtin/revert.c:119
msgid "append commit name"
msgstr "nối thêm tên lần chuyển giao"
-#: builtin/revert.c:102
+#: builtin/revert.c:121
msgid "preserve initially empty commits"
msgstr "cấm khởi tạo lần chuyển giao trống rỗng"
-#: builtin/revert.c:103
+#: builtin/revert.c:122
msgid "allow commits with empty messages"
msgstr "chấp nhận chuyển giao mà không ghi chú gì"
-#: builtin/revert.c:104
+#: builtin/revert.c:123
msgid "keep redundant, empty commits"
msgstr "giữ lại các lần chuyển giao dư thừa, rỗng"
-#: builtin/revert.c:192
+#: builtin/revert.c:211
msgid "revert failed"
msgstr "hoàn nguyên gặp lỗi"
-#: builtin/revert.c:205
+#: builtin/revert.c:224
msgid "cherry-pick failed"
msgstr "cherry-pick gặp lỗi"
@@ -12494,19 +12757,19 @@
"chiếu>…]\n"
" --all và đặc tả <ref> rõ ràng là loại trừ lẫn nhau."
-#: builtin/send-pack.c:160
+#: builtin/send-pack.c:161
msgid "remote name"
msgstr "tên máy dịch vụ"
-#: builtin/send-pack.c:171
+#: builtin/send-pack.c:175
msgid "use stateless RPC protocol"
msgstr "dùng giao thức RPC không ổn định"
-#: builtin/send-pack.c:172
+#: builtin/send-pack.c:176
msgid "read refs from stdin"
msgstr "đọc tham chiếu từ đầu vào tiêu chuẩn"
-#: builtin/send-pack.c:173
+#: builtin/send-pack.c:177
msgid "print status from remote helper"
msgstr "in các trạng thái từ phần hướng dẫn trên máy dịch vụ"
@@ -12514,27 +12777,27 @@
msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
msgstr "git shortlog [<các-tùy-chọn>] [<vùng-xét-duyệt>] [[--] [<đường-dẫn>…]]"
-#: builtin/shortlog.c:249
+#: builtin/shortlog.c:248
msgid "Group by committer rather than author"
msgstr "Nhóm theo người chuyển giao thay vì tác giả"
-#: builtin/shortlog.c:251
+#: builtin/shortlog.c:250
msgid "sort output according to the number of commits per author"
msgstr "sắp xếp kết xuất tuân theo số lượng chuyển giao trên mỗi tác giả"
-#: builtin/shortlog.c:253
+#: builtin/shortlog.c:252
msgid "Suppress commit descriptions, only provides commit count"
msgstr "Chặn mọi mô tả lần chuyển giao, chỉ đưa ra số lượng lần chuyển giao"
-#: builtin/shortlog.c:255
+#: builtin/shortlog.c:254
msgid "Show the email address of each author"
msgstr "Hiển thị thư điện tử cho từng tác giả"
-#: builtin/shortlog.c:256
+#: builtin/shortlog.c:255
msgid "w[,i1[,i2]]"
msgstr "w[,i1[,i2]]"
-#: builtin/shortlog.c:257
+#: builtin/shortlog.c:256
msgid "Linewrap output"
msgstr "Ngắt dòng khi quá dài"
@@ -12554,119 +12817,119 @@
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr "git show-branch (-g | --reflog)[=<n>[,<nền>]] [--list] [<ref>]"
-#: builtin/show-branch.c:375
+#: builtin/show-branch.c:374
#, c-format
msgid "ignoring %s; cannot handle more than %d ref"
msgid_plural "ignoring %s; cannot handle more than %d refs"
msgstr[0] "đang bỏ qua %s; không thể xử lý nhiều hơn %d tham chiếu"
-#: builtin/show-branch.c:541
+#: builtin/show-branch.c:536
#, c-format
msgid "no matching refs with %s"
msgstr "không tham chiếu nào khớp với %s"
-#: builtin/show-branch.c:639
+#: builtin/show-branch.c:632
msgid "show remote-tracking and local branches"
msgstr "hiển thị các nhánh remote-tracking và nội bộ"
-#: builtin/show-branch.c:641
+#: builtin/show-branch.c:634
msgid "show remote-tracking branches"
msgstr "hiển thị các nhánh remote-tracking"
-#: builtin/show-branch.c:643
+#: builtin/show-branch.c:636
msgid "color '*!+-' corresponding to the branch"
msgstr "màu “*!+-” tương ứng với nhánh"
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:638
msgid "show <n> more commits after the common ancestor"
msgstr "hiển thị thêm <n> lần chuyển giao sau cha mẹ chung"
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:640
msgid "synonym to more=-1"
msgstr "đồng nghĩa với more=-1"
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:641
msgid "suppress naming strings"
msgstr "chặn các chuỗi đặt tên"
-#: builtin/show-branch.c:650
+#: builtin/show-branch.c:643
msgid "include the current branch"
msgstr "bao gồm nhánh hiện hành"
-#: builtin/show-branch.c:652
+#: builtin/show-branch.c:645
msgid "name commits with their object names"
msgstr "đặt tên các lần chuyển giao bằng các tên của đối tượng của chúng"
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:647
msgid "show possible merge bases"
msgstr "hiển thị mọi cơ sở có thể dùng để hòa trộn"
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:649
msgid "show refs unreachable from any other ref"
msgstr "hiển thị các tham chiếu không thể được đọc bởi bất kỳ tham chiếu khác"
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:651
msgid "show commits in topological order"
msgstr "hiển thị các lần chuyển giao theo thứ tự tôpô"
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:654
msgid "show only commits not on the first branch"
msgstr "chỉ hiển thị các lần chuyển giao không nằm trên nhánh đầu tiên"
-#: builtin/show-branch.c:663
+#: builtin/show-branch.c:656
msgid "show merges reachable from only one tip"
msgstr "hiển thị các lần hòa trộn có thể đọc được chỉ từ một đầu mút"
-#: builtin/show-branch.c:665
+#: builtin/show-branch.c:658
msgid "topologically sort, maintaining date order where possible"
msgstr "sắp xếp hình thái học, bảo trì thứ tự ngày nếu có thể"
-#: builtin/show-branch.c:668
+#: builtin/show-branch.c:661
msgid "<n>[,<base>]"
msgstr "<n>[,<cơ_sở>]"
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:662
msgid "show <n> most recent ref-log entries starting at base"
msgstr "hiển thị <n> các mục “ref-log” gần nhất kể từ nền (base)"
-#: builtin/show-branch.c:703
+#: builtin/show-branch.c:696
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr ""
"--reflog là không tương thích với các tùy chọn --all, --remotes, --"
"independent hay --merge-base"
-#: builtin/show-branch.c:727
+#: builtin/show-branch.c:720
msgid "no branches given, and HEAD is not valid"
msgstr "chưa đưa ra nhánh, và HEAD không hợp lệ"
-#: builtin/show-branch.c:730
+#: builtin/show-branch.c:723
msgid "--reflog option needs one branch name"
msgstr "--reflog cần tên một nhánh"
-#: builtin/show-branch.c:733
+#: builtin/show-branch.c:726
#, 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] "chỉ có thể hiển thị cùng lúc %d hạng mục."
-#: builtin/show-branch.c:737
+#: builtin/show-branch.c:730
#, c-format
msgid "no such ref %s"
msgstr "không có tham chiếu nào như thế %s"
-#: builtin/show-branch.c:829
+#: builtin/show-branch.c:814
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] "không thể xử lý nhiều hơn %d điểm xét duyệt."
-#: builtin/show-branch.c:833
+#: builtin/show-branch.c:818
#, c-format
msgid "'%s' is not a valid ref."
msgstr "“%s” không phải tham chiếu hợp lệ."
-#: builtin/show-branch.c:836
+#: builtin/show-branch.c:821
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "không thể tìm thấy lần chuyển giao %s (%s)"
@@ -12735,12 +12998,12 @@
msgid "prepend comment character and space to each line"
msgstr "treo trước ký tự ghi chú và ký tự khoảng trắng cho từng dòng"
-#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1062
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1075
#, c-format
msgid "No such ref: %s"
msgstr "Không có tham chiếu nào như thế: %s"
-#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1071
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1084
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Cần tên tham chiếu dạng đầy đủ, nhưng lại nhận được %s"
@@ -12750,94 +13013,103 @@
msgid "cannot strip one component off url '%s'"
msgstr "không thể cắt bỏ một thành phần ra khỏi “%s” url"
-#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:592
+#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630
msgid "alternative anchor for relative paths"
msgstr "điểm neo thay thế cho các đường dẫn tương đối"
-#: builtin/submodule--helper.c:287
+#: builtin/submodule--helper.c:310
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=</đường/dẫn>] [</đường/dẫn>…]"
-#: builtin/submodule--helper.c:333 builtin/submodule--helper.c:347
+#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "Không tìm thấy url cho đường dẫn mô-đun-con “%s” trong .gitmodules"
-#: builtin/submodule--helper.c:373
+#: builtin/submodule--helper.c:395
+#, c-format
+msgid ""
+"could not lookup configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr ""
+"không thể tìm thấy cấu hình “%s”. Coi rằng kho này là thượng nguồn có quyền "
+"sở hữu chính nó."
+
+#: builtin/submodule--helper.c:406
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Gặp lỗi khi đăng ký url cho đường dẫn mô-đun-con “%s”"
-#: builtin/submodule--helper.c:377
+#: builtin/submodule--helper.c:410
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Mô-đun-con “%s” (%s) được đăng ký cho đường dẫn “%s”\n"
-#: builtin/submodule--helper.c:387
+#: builtin/submodule--helper.c:420
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "cảnh báo: chế độ lệnh cập nhật được gợi ý cho mô-đun-con “%s”\n"
-#: builtin/submodule--helper.c:394
+#: builtin/submodule--helper.c:427
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr "Gặp lỗi khi đăng ký chế độ cập nhật cho đường dẫn mô-đun-con “%s”"
-#: builtin/submodule--helper.c:410
+#: builtin/submodule--helper.c:443
msgid "Suppress output for initializing a submodule"
msgstr "Chặn kết xuất cho khởi tạo một mô-đun-con"
-#: builtin/submodule--helper.c:415
+#: builtin/submodule--helper.c:448
msgid "git submodule--helper init [<path>]"
msgstr "git submodule--helper init [</đường/dẫn>]"
-#: builtin/submodule--helper.c:436
+#: builtin/submodule--helper.c:476
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name </đường/dẫn>"
-#: builtin/submodule--helper.c:442
+#: builtin/submodule--helper.c:482
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr ""
"Không tìm thấy ánh xạ (mapping) mô-đun-con trong .gitmodules cho đường dẫn "
"“%s”"
-#: builtin/submodule--helper.c:525 builtin/submodule--helper.c:528
+#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "mô-đun-con “%s” không thể thêm thay thế: %s"
-#: builtin/submodule--helper.c:564
+#: builtin/submodule--helper.c:604
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "Giá trị “%s” cho submodule.alternateErrorStrategy không được thừa nhận"
-#: builtin/submodule--helper.c:571
+#: builtin/submodule--helper.c:611
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "Giá trị “%s” cho submodule.alternateLocation không được thừa nhận"
-#: builtin/submodule--helper.c:595
+#: builtin/submodule--helper.c:633
msgid "where the new submodule will be cloned to"
msgstr "nhân bản mô-đun-con mới vào chỗ nào"
-#: builtin/submodule--helper.c:598
+#: builtin/submodule--helper.c:636
msgid "name of the new submodule"
msgstr "tên của mô-đun-con mới"
-#: builtin/submodule--helper.c:601
+#: builtin/submodule--helper.c:639
msgid "url where to clone the submodule from"
msgstr "url nơi mà nhân bản mô-đun-con từ đó"
-#: builtin/submodule--helper.c:607
+#: builtin/submodule--helper.c:645
msgid "depth for shallow clones"
msgstr "chiều sâu lịch sử khi tạo bản sao"
-#: builtin/submodule--helper.c:610 builtin/submodule--helper.c:980
+#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993
msgid "force cloning progress"
msgstr "ép buộc tiến trình nhân bản"
-#: builtin/submodule--helper.c:615
+#: builtin/submodule--helper.c:653
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -12845,94 +13117,84 @@
"git submodule--helper clone [--prefix=</đường/dẫn>] [--quiet] [--reference "
"<kho>] [--name <tên>] [--depth <sâu>] [--url <url>] [</đường/dẫn>…]"
-#: builtin/submodule--helper.c:646
+#: builtin/submodule--helper.c:684
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "Nhân bản “%s” vào đường dẫn mô-đun-con “%s” gặp lỗi"
-#: builtin/submodule--helper.c:662
-#, c-format
-msgid "cannot open file '%s'"
-msgstr "không thể mở tập tin “%s”"
-
-#: builtin/submodule--helper.c:667
-#, c-format
-msgid "could not close file %s"
-msgstr "không thể đóng tập tin %s"
-
-#: builtin/submodule--helper.c:674
+#: builtin/submodule--helper.c:699
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "không thể lấy thư mục mô-đun-con cho “%s”"
-#: builtin/submodule--helper.c:742
+#: builtin/submodule--helper.c:764
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Đường dẫn mô-đun-con “%s” chưa được khởi tạo"
-#: builtin/submodule--helper.c:746
+#: builtin/submodule--helper.c:768
msgid "Maybe you want to use 'update --init'?"
msgstr "Có lẽ bạn là bạn muốn dùng \"update --init\" phải không?"
-#: builtin/submodule--helper.c:772
+#: builtin/submodule--helper.c:793
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Bỏ qua các mô-đun-con chưa được hòa trộn %s"
-#: builtin/submodule--helper.c:793
+#: builtin/submodule--helper.c:814
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Bỏ qua mô-đun-con “%s”"
-#: builtin/submodule--helper.c:929
+#: builtin/submodule--helper.c:942
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Gặp lỗi khi nhân bản “%s”. Thử lại lịch trình"
-#: builtin/submodule--helper.c:940
+#: builtin/submodule--helper.c:953
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Gặp lỗi khi nhân bản “%s” lần thứ hai nên bãi bỏ"
-#: builtin/submodule--helper.c:961 builtin/submodule--helper.c:1105
+#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162
msgid "path into the working tree"
msgstr "đường dẫn đến cây làm việc"
-#: builtin/submodule--helper.c:964
+#: builtin/submodule--helper.c:977
msgid "path into the working tree, across nested submodule boundaries"
msgstr "đường dẫn đến cây làm việc, chéo biên giới mô-đun-con lồng nhau"
-#: builtin/submodule--helper.c:968
+#: builtin/submodule--helper.c:981
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout hoặc không làm gì cả"
-#: builtin/submodule--helper.c:972
+#: builtin/submodule--helper.c:985
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr ""
"Tạo một bản sao nông được cắt ngắn thành số lượng điểm xét duyệt đã cho"
-#: builtin/submodule--helper.c:975
+#: builtin/submodule--helper.c:988
msgid "parallel jobs"
msgstr "công việc đồng thời"
-#: builtin/submodule--helper.c:977
+#: builtin/submodule--helper.c:990
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "nhân bản lần đầu có nên theo khuyến nghị là nông hay không"
-#: builtin/submodule--helper.c:978
+#: builtin/submodule--helper.c:991
msgid "don't print cloning progress"
msgstr "đừng in tiến trình nhân bản"
-#: builtin/submodule--helper.c:985
+#: builtin/submodule--helper.c:998
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr ""
"git submodule--helper update_clone [--prefix=</đường/dẫn>] [</đường/dẫn>…]"
-#: builtin/submodule--helper.c:995
+#: builtin/submodule--helper.c:1008
msgid "bad value for update parameter"
msgstr "giá trị cho tham số cập nhật bị sai"
-#: builtin/submodule--helper.c:1066
+#: builtin/submodule--helper.c:1079
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -12941,24 +13203,24 @@
"Nhánh mô-đun-con (%s) được cấu hình kế thừa nhánh từ siêu dự án, nhưng siêu "
"dự án lại không trên bất kỳ nhánh nào"
-#: builtin/submodule--helper.c:1106
+#: builtin/submodule--helper.c:1163
msgid "recurse into submodules"
msgstr "đệ quy vào trong mô-đun-con"
-#: builtin/submodule--helper.c:1112
+#: builtin/submodule--helper.c:1169
msgid "git submodule--helper embed-git-dir [<path>...]"
msgstr "git submodule--helper embed-git-dir [</đường/dẫn>…]"
-#: builtin/submodule--helper.c:1157
+#: builtin/submodule--helper.c:1226
msgid "submodule--helper subcommand must be called with a subcommand"
msgstr "lệnh con submodule--helper phải được gọi với một lệnh con"
-#: builtin/submodule--helper.c:1164
+#: builtin/submodule--helper.c:1233
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s không hỗ trợ --super-prefix"
-#: builtin/submodule--helper.c:1170
+#: builtin/submodule--helper.c:1239
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "“%s” không phải là lệnh con submodule--helper hợp lệ"
@@ -13005,33 +13267,29 @@
#: builtin/tag.c:25
msgid ""
-"git tag -l [-n[<num>]] [--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[<số>]] [--contains <lần_chuyển_giao>] [--points-at <đối-"
-"tượng>]\n"
-"\t\t[--format=<định dạng>] [--[no-]merged [<lần_chuyển_giao>]] [<mẫu>…]"
+"git tag -l [-n[<số>]] [--contains <lần_chuyển_giao>] [--no-contains "
+"<lần_chuyển_giao>] [--points-at <đối-tượng>]\n"
+"\t\t[--format=<định_dạng>] [--[no-]merged [<lần_chuyển_giao>]] [<mẫu>…]"
#: builtin/tag.c:27
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<định_dạng>] <tên-thẻ>…"
-#: builtin/tag.c:82
-#, c-format
-msgid "tag name too long: %.*s..."
-msgstr "tên thẻ quá dài: %.*s…"
-
-#: builtin/tag.c:87
+#: builtin/tag.c:83
#, c-format
msgid "tag '%s' not found."
msgstr "không tìm thấy tìm thấy thẻ “%s”."
-#: builtin/tag.c:102
+#: builtin/tag.c:99
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Thẻ đã bị xóa “%s” (từng là %s)\n"
-#: builtin/tag.c:131
+#: builtin/tag.c:128
#, c-format
msgid ""
"\n"
@@ -13044,7 +13302,7 @@
" %s\n"
"Những dòng được bắt đầu bằng “%c” sẽ được bỏ qua.\n"
-#: builtin/tag.c:135
+#: builtin/tag.c:132
#, c-format
msgid ""
"\n"
@@ -13059,138 +13317,143 @@
"Những dòng được bắt đầu bằng “%c” sẽ được giữ lại; bạn có thể xóa chúng đi "
"nếu muốn.\n"
-#: builtin/tag.c:213
+#: builtin/tag.c:210
msgid "unable to sign the tag"
msgstr "không thể ký thẻ"
-#: builtin/tag.c:215
+#: builtin/tag.c:212
msgid "unable to write tag file"
msgstr "không thể ghi vào tập tin lưu thẻ"
-#: builtin/tag.c:240
+#: builtin/tag.c:236
msgid "bad object type."
msgstr "kiểu đối tượng sai."
-#: builtin/tag.c:253
-msgid "tag header too big."
-msgstr "phần đầu thẻ quá lớn."
-
-#: builtin/tag.c:289
+#: builtin/tag.c:282
msgid "no tag message?"
msgstr "không có chú thích gì cho cho thẻ à?"
-#: builtin/tag.c:295
+#: builtin/tag.c:289
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Nội dung ghi chú còn lại %s\n"
-#: builtin/tag.c:354
+#: builtin/tag.c:397
msgid "list tag names"
msgstr "chỉ liệt kê tên các thẻ"
-#: builtin/tag.c:356
+#: builtin/tag.c:399
msgid "print <n> lines of each tag message"
msgstr "hiển thị <n> dòng cho mỗi ghi chú"
-#: builtin/tag.c:358
+#: builtin/tag.c:401
msgid "delete tags"
msgstr "xóa thẻ"
-#: builtin/tag.c:359
+#: builtin/tag.c:402
msgid "verify tags"
msgstr "thẩm tra thẻ"
-#: builtin/tag.c:361
+#: builtin/tag.c:404
msgid "Tag creation options"
msgstr "Tùy chọn tạo thẻ"
-#: builtin/tag.c:363
+#: builtin/tag.c:406
msgid "annotated tag, needs a message"
msgstr "để chú giải cho thẻ, cần một lời ghi chú"
-#: builtin/tag.c:365
+#: builtin/tag.c:408
msgid "tag message"
msgstr "phần chú thích cho thẻ"
-#: builtin/tag.c:367
+#: builtin/tag.c:410
msgid "annotated and GPG-signed tag"
msgstr "thẻ chú giải và ký kiểu GPG"
-#: builtin/tag.c:371
+#: builtin/tag.c:414
msgid "use another key to sign the tag"
msgstr "dùng kháo khác để ký thẻ"
-#: builtin/tag.c:372
+#: builtin/tag.c:415
msgid "replace the tag if exists"
msgstr "thay thế nếu thẻ đó đã có trước"
-#: builtin/tag.c:373 builtin/update-ref.c:368
+#: builtin/tag.c:416 builtin/update-ref.c:368
msgid "create a reflog"
msgstr "tạo một reflog"
-#: builtin/tag.c:375
+#: builtin/tag.c:418
msgid "Tag listing options"
msgstr "Các tùy chọn liệt kê thẻ"
-#: builtin/tag.c:376
+#: builtin/tag.c:419
msgid "show tag list in columns"
msgstr "hiển thị danh sách thẻ trong các cột"
-#: builtin/tag.c:377 builtin/tag.c:378
+#: builtin/tag.c:420 builtin/tag.c:422
msgid "print only tags that contain the commit"
msgstr "chỉ hiển thị những nhánh mà nó chứa lần chuyển giao"
-#: builtin/tag.c:379
+#: builtin/tag.c:421 builtin/tag.c:423
+msgid "print only tags that don't contain the commit"
+msgstr "chỉ hiển thị những thẻ mà nó không chứa lần chuyển giao"
+
+#: builtin/tag.c:424
msgid "print only tags that are merged"
msgstr "chỉ hiển thị những thẻ mà nó được hòa trộn"
-#: builtin/tag.c:380
+#: builtin/tag.c:425
msgid "print only tags that are not merged"
msgstr "chỉ hiển thị những thẻ mà nó không được hòa trộn"
-#: builtin/tag.c:385
+#: builtin/tag.c:430
msgid "print only tags of the object"
msgstr "chỉ hiển thị các thẻ của đối tượng"
-#: builtin/tag.c:415
+#: builtin/tag.c:469
msgid "--column and -n are incompatible"
msgstr "--column và -n xung khắc nhau"
-#: builtin/tag.c:437
-msgid "-n option is only allowed with -l."
-msgstr "tùy chọn -n chỉ cho phép dùng với -l."
+#: builtin/tag.c:491
+msgid "-n option is only allowed in list mode"
+msgstr "tùy chọn -n chỉ cho phép dùng trong chế độ liệt kê"
-#: builtin/tag.c:439
-msgid "--contains option is only allowed with -l."
-msgstr "tùy chọn --contains chỉ cho phép dùng với -l."
+#: builtin/tag.c:493
+msgid "--contains option is only allowed in list mode"
+msgstr "tùy chọn --contains chỉ cho phép dùng trong chế độ liệt kê"
-#: builtin/tag.c:441
-msgid "--points-at option is only allowed with -l."
-msgstr "tùy chọn --points-at chỉ cho phép dùng với -l."
+#: builtin/tag.c:495
+msgid "--no-contains option is only allowed in list mode"
+msgstr "tùy chọn --no-contains chỉ cho phép dùng trong chế độ liệt kê"
-#: builtin/tag.c:443
-msgid "--merged and --no-merged option are only allowed with -l"
-msgstr "tùy chọn --merged và --no-merged chỉ cho phép dùng với -l."
+#: builtin/tag.c:497
+msgid "--points-at option is only allowed in list mode"
+msgstr "tùy chọn --points-at chỉ cho phép dùng trong chế độ liệt kê"
-#: builtin/tag.c:454
+#: builtin/tag.c:499
+msgid "--merged and --no-merged options are only allowed in list mode"
+msgstr ""
+"tùy chọn --merged và --no-merged chỉ cho phép dùng trong chế độ liệt kê"
+
+#: builtin/tag.c:510
msgid "only one -F or -m option is allowed."
msgstr "chỉ có một tùy chọn -F hoặc -m là được phép."
-#: builtin/tag.c:473
+#: builtin/tag.c:529
msgid "too many params"
msgstr "quá nhiều đối số"
-#: builtin/tag.c:479
+#: builtin/tag.c:535
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "“%s” không phải thẻ hợp lệ."
-#: builtin/tag.c:484
+#: builtin/tag.c:540
#, c-format
msgid "tag '%s' already exists"
msgstr "Thẻ “%s” đã tồn tại rồi"
-#: builtin/tag.c:512
+#: builtin/tag.c:570
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Đã cập nhật thẻ “%s” (trước là %s)\n"
@@ -13219,171 +13482,187 @@
msgid "failed to delete file %s"
msgstr "gặp lỗi khi xóa tập tin %s"
-#: builtin/update-index.c:110 builtin/update-index.c:212
+#: builtin/update-index.c:110 builtin/update-index.c:216
#, c-format
msgid "failed to delete directory %s"
msgstr "gặp lỗi khi xóa thư mục %s"
-#: builtin/update-index.c:133
+#: builtin/update-index.c:135
#, c-format
msgid "Testing mtime in '%s' "
msgstr "Đang kiểm thử mtime trong “%s”"
-#: builtin/update-index.c:145
+#: builtin/update-index.c:149
msgid "directory stat info does not change after adding a new file"
msgstr "thông tin thống kê thư mục không thay đổi sau khi thêm tập tin mới"
-#: builtin/update-index.c:158
+#: builtin/update-index.c:162
msgid "directory stat info does not change after adding a new directory"
msgstr "thông tin thống kê thư mục không thay đổi sau khi thêm thư mục mới"
-#: builtin/update-index.c:171
+#: builtin/update-index.c:175
msgid "directory stat info changes after updating a file"
msgstr "thông tin thống kê thư mục thay đổi sau khi cập nhật tập tin"
-#: builtin/update-index.c:182
+#: builtin/update-index.c:186
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
"thông tin thống kê thư mục thay đổi sau khi thêm tập tin mới vào trong thư "
"mục con"
-#: builtin/update-index.c:193
+#: builtin/update-index.c:197
msgid "directory stat info does not change after deleting a file"
msgstr "thông tin thống kê thư mục không thay đổi sau khi xóa tập tin"
-#: builtin/update-index.c:206
+#: builtin/update-index.c:210
msgid "directory stat info does not change after deleting a directory"
msgstr "thông tin thống kê thư mục không thay đổi sau khi xóa thư mục"
-#: builtin/update-index.c:213
+#: builtin/update-index.c:217
msgid " OK"
msgstr " Đồng ý"
-#: builtin/update-index.c:564
+#: builtin/update-index.c:568
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<các-tùy-chọn>] [--] [<tập-tin>…]"
-#: builtin/update-index.c:919
+#: builtin/update-index.c:923
msgid "continue refresh even when index needs update"
msgstr "tiếp tục làm mới ngay cả khi bảng mục lục cần được cập nhật"
-#: builtin/update-index.c:922
+#: builtin/update-index.c:926
msgid "refresh: ignore submodules"
msgstr "refresh: lờ đi mô-đun-con"
-#: builtin/update-index.c:925
+#: builtin/update-index.c:929
msgid "do not ignore new files"
msgstr "không bỏ qua các tập tin mới tạo"
-#: builtin/update-index.c:927
+#: builtin/update-index.c:931
msgid "let files replace directories and vice-versa"
msgstr "để các tập tin thay thế các thư mục và “vice-versa”"
-#: builtin/update-index.c:929
+#: builtin/update-index.c:933
msgid "notice files missing from worktree"
msgstr "thông báo các tập-tin thiếu trong thư-mục làm việc"
-#: builtin/update-index.c:931
+#: builtin/update-index.c:935
msgid "refresh even if index contains unmerged entries"
msgstr ""
"làm tươi mới thậm chí khi bảng mục lục chứa các mục tin chưa được hòa trộn"
-#: builtin/update-index.c:934
+#: builtin/update-index.c:938
msgid "refresh stat information"
msgstr "lấy lại thông tin thống kê"
-#: builtin/update-index.c:938
+#: builtin/update-index.c:942
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "giống --refresh, nhưng bỏ qua các cài đặt “assume-unchanged”"
-#: builtin/update-index.c:942
+#: builtin/update-index.c:946
msgid "<mode>,<object>,<path>"
msgstr "<chế_độ>,<đối_tượng>,<đường_dẫn>"
-#: builtin/update-index.c:943
+#: builtin/update-index.c:947
msgid "add the specified entry to the index"
msgstr "thêm các tập tin đã chỉ ra vào bảng mục lục"
-#: builtin/update-index.c:952
+#: builtin/update-index.c:956
msgid "mark files as \"not changing\""
msgstr "Đánh dấu các tập tin là \"không thay đổi\""
-#: builtin/update-index.c:955
+#: builtin/update-index.c:959
msgid "clear assumed-unchanged bit"
msgstr "xóa bít assumed-unchanged (giả định là không thay đổi)"
-#: builtin/update-index.c:958
+#: builtin/update-index.c:962
msgid "mark files as \"index-only\""
msgstr "đánh dấu các tập tin là “chỉ-đọc”"
-#: builtin/update-index.c:961
+#: builtin/update-index.c:965
msgid "clear skip-worktree bit"
msgstr "xóa bít skip-worktree"
-#: builtin/update-index.c:964
+#: builtin/update-index.c:968
msgid "add to index only; do not add content to object database"
msgstr ""
"chỉ thêm vào bảng mục lục; không thêm nội dung vào cơ sở dữ liệu đối tượng"
-#: builtin/update-index.c:966
+#: builtin/update-index.c:970
msgid "remove named paths even if present in worktree"
msgstr ""
"gỡ bỏ các đường dẫn được đặt tên thậm chí cả khi nó hiện diện trong thư mục "
"làm việc"
-#: builtin/update-index.c:968
+#: builtin/update-index.c:972
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "với tùy chọn --stdin: các dòng đầu vào được chấm dứt bởi ký tự null"
-#: builtin/update-index.c:970
+#: builtin/update-index.c:974
msgid "read list of paths to be updated from standard input"
msgstr "đọc danh sách đường dẫn cần cập nhật từ đầu vào tiêu chuẩn"
-#: builtin/update-index.c:974
+#: builtin/update-index.c:978
msgid "add entries from standard input to the index"
msgstr "không thể đọc các mục từ đầu vào tiêu chuẩn vào bảng mục lục"
-#: builtin/update-index.c:978
+#: builtin/update-index.c:982
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "phục hồi các trạng thái #2 và #3 cho các đường dẫn được liệt kê"
-#: builtin/update-index.c:982
+#: builtin/update-index.c:986
msgid "only update entries that differ from HEAD"
msgstr "chỉ cập nhật các mục tin mà nó khác biệt so với HEAD"
-#: builtin/update-index.c:986
+#: builtin/update-index.c:990
msgid "ignore files missing from worktree"
msgstr "bỏ qua các tập-tin thiếu trong thư-mục làm việc"
-#: builtin/update-index.c:989
+#: builtin/update-index.c:993
msgid "report actions to standard output"
msgstr "báo cáo các thao tác ra thiết bị xuất chuẩn"
-#: builtin/update-index.c:991
+#: builtin/update-index.c:995
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(cho “porcelains”) quên các xung đột chưa được giải quyết đã ghi"
-#: builtin/update-index.c:995
+#: builtin/update-index.c:999
msgid "write index in this format"
msgstr "ghi mục lục ở định dạng này"
-#: builtin/update-index.c:997
+#: builtin/update-index.c:1001
msgid "enable or disable split index"
msgstr "bật/tắt chia cắt bảng mục lục"
-#: builtin/update-index.c:999
+#: builtin/update-index.c:1003
msgid "enable/disable untracked cache"
msgstr "bật/tắt bộ đệm không theo vết"
-#: builtin/update-index.c:1001
+#: builtin/update-index.c:1005
msgid "test if the filesystem supports untracked cache"
msgstr "kiểm tra xem hệ thống tập tin có hỗ trợ đệm không theo dõi hay không"
-#: builtin/update-index.c:1003
+#: builtin/update-index.c:1007
msgid "enable untracked cache without testing the filesystem"
msgstr "bật bộ đệm không theo vết mà không kiểm tra hệ thống tập tin"
-#: builtin/update-index.c:1120
+#: builtin/update-index.c:1107
+msgid ""
+"core.splitIndex is set to false; remove or change it, if you really want to "
+"enable split index"
+msgstr ""
+"core.splitIndex được đặt là sai; xóa bỏ hay thay đổi nó, nếu bạn thực sự "
+"muốn bật chia tách mục lục"
+
+#: builtin/update-index.c:1116
+msgid ""
+"core.splitIndex is set to true; remove or change it, if you really want to "
+"disable split index"
+msgstr ""
+"core.splitIndex được đặt là đúng; xóa bỏ hay thay đổi nó, nếu bạn thực sự "
+"muốn tắt chia tách mục lục"
+
+#: builtin/update-index.c:1127
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
@@ -13391,11 +13670,11 @@
"core.untrackedCache được đặt là đúng; xóa bỏ hay thay đổi nó, nếu bạn thực "
"sự muốn tắt bộ đệm chưa theo dõi"
-#: builtin/update-index.c:1124
+#: builtin/update-index.c:1131
msgid "Untracked cache disabled"
msgstr "Nhớ đệm không theo vết bị tắt"
-#: builtin/update-index.c:1132
+#: builtin/update-index.c:1139
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
@@ -13403,7 +13682,7 @@
"core.untrackedCache được đặt là sai; xóa bỏ hay thay đổi nó, nếu bạn thực sự "
"muốn bật bộ đệm chưa theo dõi"
-#: builtin/update-index.c:1136
+#: builtin/update-index.c:1143
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "Nhớ đệm không theo vết được bật cho “%s”"
@@ -13496,27 +13775,27 @@
msgid "git worktree unlock <path>"
msgstr "git worktree unlock </đường/dẫn>"
-#: builtin/worktree.c:42
+#: builtin/worktree.c:43
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Gỡ bỏ cây làm việc/%s: không phải là thư mục hợp lệ"
-#: builtin/worktree.c:48
+#: builtin/worktree.c:49
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Gỡ bỏ cây làm việc/%s: không có tập tin gitdir"
-#: builtin/worktree.c:53
+#: builtin/worktree.c:54
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "Gỡ bỏ cây làm việc/%s: không thể đọc tập tin gitdir (%s)"
-#: builtin/worktree.c:64
+#: builtin/worktree.c:65
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Gỡ bỏ cây làm việc/%s: tập tin gitdir không hợp lệ"
-#: builtin/worktree.c:80
+#: builtin/worktree.c:81
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr "Gỡ bỏ cây làm việc/%s: tập tin gitdir chỉ đến vị trí không tồn tại"
@@ -13534,60 +13813,64 @@
msgid "'%s' already exists"
msgstr "“%s” đã có từ trước rồi"
-#: builtin/worktree.c:236
+#: builtin/worktree.c:235
#, c-format
msgid "could not create directory of '%s'"
msgstr "không thể tạo thư mục của “%s”"
-#: builtin/worktree.c:272
+#: builtin/worktree.c:274
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "Đang chuẩn bị %s (định danh %s)"
-#: builtin/worktree.c:323
+#: builtin/worktree.c:328
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "lấy ra <nhánh> ngay cả khi nó đã được lấy ra ở cây làm việc khác"
-#: builtin/worktree.c:325
+#: builtin/worktree.c:330
msgid "create a new branch"
msgstr "tạo nhánh mới"
-#: builtin/worktree.c:327
+#: builtin/worktree.c:332
msgid "create or reset a branch"
msgstr "tạo hay đặt lại một nhánh"
-#: builtin/worktree.c:329
+#: builtin/worktree.c:334
msgid "populate the new working tree"
msgstr "di chuyển cây làm việc mới"
-#: builtin/worktree.c:337
+#: builtin/worktree.c:335
+msgid "keep the new working tree locked"
+msgstr "giữ cây làm việc mới bị khóa"
+
+#: builtin/worktree.c:343
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "Các tùy chọn -b, -B, và --detach loại từ lẫn nhau"
-#: builtin/worktree.c:472
+#: builtin/worktree.c:478
msgid "reason for locking"
msgstr "lý do khóa"
-#: builtin/worktree.c:484 builtin/worktree.c:517
+#: builtin/worktree.c:490 builtin/worktree.c:523
#, c-format
msgid "'%s' is not a working tree"
msgstr "%s không phải là cây làm việc"
-#: builtin/worktree.c:486 builtin/worktree.c:519
+#: builtin/worktree.c:492 builtin/worktree.c:525
msgid "The main working tree cannot be locked or unlocked"
msgstr "Cây thư mục làm việc chính không thể khóa hay bỏ khóa được"
-#: builtin/worktree.c:491
+#: builtin/worktree.c:497
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "“%s” đã được khóa rồi, lý do: %s"
-#: builtin/worktree.c:493
+#: builtin/worktree.c:499
#, c-format
msgid "'%s' is already locked"
msgstr "“%s” đã được khóa rồi"
-#: builtin/worktree.c:521
+#: builtin/worktree.c:527
#, c-format
msgid "'%s' is not locked"
msgstr "“%s” chưa bị khóa"
@@ -13612,19 +13895,19 @@
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<các-tùy-chọn>] </đường/dẫn>"
-#: upload-pack.c:1036
+#: upload-pack.c:1040
msgid "quit after a single request/response exchange"
msgstr "thoát sau khi một trao đổi yêu cầu hay trả lời đơn"
-#: upload-pack.c:1038
+#: upload-pack.c:1042
msgid "exit immediately after initial ref advertisement"
msgstr "thoát ngay sau khi khởi tạo quảng cáo tham chiếu"
-#: upload-pack.c:1040
+#: upload-pack.c:1044
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr "đừng thử <thư_mục>/.git/ nếu <thư_mục> không phải là thư mục Git"
-#: upload-pack.c:1042
+#: upload-pack.c:1046
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "ngắt truyền thông sau <n> giây không hoạt động"
@@ -13655,15 +13938,20 @@
"hướng dẫn về khái niệm. Xem “git help <lệnh>” hay “git help <khái-niệm>”\n"
"để xem các đặc tả cho lệnh hay khái niệm cụ thể."
-#: http.c:344
+#: http.c:336
+#, c-format
+msgid "negative value for http.postbuffer; defaulting to %d"
+msgstr "giá trị âm cho http.postbuffer; mặc định là %d"
+
+#: http.c:357
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "Điều khiển giao quyền không được hỗ trợ với cURL < 7.22.0"
-#: http.c:353
+#: http.c:366
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "Chốt khóa công không được hỗ trợ với cURL < 7.44.0"
-#: http.c:1713
+#: http.c:1766
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -13674,7 +13962,7 @@
" hỏi cho: %s\n"
" chuyển hướng: %s"
-#: remote-curl.c:319
+#: remote-curl.c:323
#, c-format
msgid "redirecting to %s"
msgstr "chuyển hướng đến %s"
@@ -14049,7 +14337,7 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr "Hòa trộn đơn giản không làm việc, thử hòa trộn tự động."
-#: git-rebase.sh:57
+#: 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"
@@ -14062,41 +14350,41 @@
"Để phục hồi lại thành nhánh nguyên thủy và dừng việc vá lại thì chạy \"git "
"rebase --abort\"."
-#: git-rebase.sh:157 git-rebase.sh:396
+#: git-rebase.sh:158 git-rebase.sh:397
#, sh-format
msgid "Could not move back to $head_name"
msgstr "Không thể quay trở lại $head_name"
-#: git-rebase.sh:171
+#: git-rebase.sh:172
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "Không thể lưu $stash_sha1"
-#: git-rebase.sh:211
+#: git-rebase.sh:212
msgid "The pre-rebase hook refused to rebase."
msgstr "Móc (hook) pre-rebase từ chối rebase."
-#: git-rebase.sh:216
+#: git-rebase.sh:217
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr ""
"Hình như đang trong quá trình thực hiện lệnh git-am. Không thể chạy lệnh "
"rebase."
-#: git-rebase.sh:357
+#: git-rebase.sh:358
msgid "No rebase in progress?"
msgstr "Không có tiến trình rebase nào phải không?"
-#: git-rebase.sh:368
+#: git-rebase.sh:369
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"Hành động “--edit-todo” chỉ có thể dùng trong quá trình “rebase” (sửa lịch "
"sử) tương tác."
-#: git-rebase.sh:375
+#: git-rebase.sh:376
msgid "Cannot read HEAD"
msgstr "Không thể đọc HEAD"
-#: git-rebase.sh:378
+#: git-rebase.sh:379
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -14104,7 +14392,7 @@
"Bạn phải sửa tất cả các lần hòa trộn xung đột và sau\n"
"đó đánh dấu chúng là cần xử lý sử dụng lệnh git add"
-#: git-rebase.sh:418
+#: git-rebase.sh:419
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -14125,102 +14413,102 @@
"và chạy TÔI lần nữa. TÔI dừng lại trong trường hợp bạn vẫn\n"
"có một số thứ quý giá ở đây."
-#: git-rebase.sh:469
+#: git-rebase.sh:470
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "thượng nguồn không hợp lệ $upstream_name"
-#: git-rebase.sh:493
+#: git-rebase.sh:494
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: ở đây có nhiều hơn một nền móng hòa trộn"
-#: git-rebase.sh:496 git-rebase.sh:500
+#: git-rebase.sh:497 git-rebase.sh:501
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: ở đây không có nền móng hòa trộn nào"
-#: git-rebase.sh:505
+#: git-rebase.sh:506
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "Không chỉ đến một lần chuyển giao không hợp lệ: $onto_name"
-#: git-rebase.sh:528
+#: git-rebase.sh:529
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "nghiêm trọng: không có nhánh như thế: $branch_name"
-#: git-rebase.sh:561
+#: git-rebase.sh:562
msgid "Cannot autostash"
msgstr "Không thể autostash"
-#: git-rebase.sh:566
+#: git-rebase.sh:567
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "Đã tạo autostash: $stash_abbrev"
-#: git-rebase.sh:570
+#: git-rebase.sh:571
msgid "Please commit or stash them."
msgstr "Xin hãy chuyển giao hoặc tạm cất (stash) chúng."
-#: git-rebase.sh:590
+#: git-rebase.sh:591
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "Nhánh hiện tại $branch_name đã được cập nhật rồi."
-#: git-rebase.sh:594
+#: git-rebase.sh:595
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "Nhánh hiện tại $branch_name đã được cập nhật rồi, lệnh rebase ép buộc."
-#: git-rebase.sh:605
+#: git-rebase.sh:606
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Thay đổi từ $mb thành $onto:"
-#: git-rebase.sh:614
+#: git-rebase.sh:615
msgid "First, rewinding head to replay your work on top of it..."
msgstr "Trước tiên, di chuyển head để xem lại các công việc trên đỉnh của nó…"
-#: git-rebase.sh:624
+#: git-rebase.sh:625
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "Chuyển-tiếp-nhanh $branch_name thành $onto_name."
-#: git-stash.sh:50
+#: git-stash.sh:53
msgid "git stash clear with parameters is unimplemented"
msgstr ""
"git stash clear với các tham số là chưa được thực hiện (không nhận đối số)"
-#: git-stash.sh:73
+#: git-stash.sh:94
msgid "You do not have the initial commit yet"
msgstr "Bạn chưa còn có lần chuyển giao khởi tạo"
-#: git-stash.sh:88
+#: git-stash.sh:109
msgid "Cannot save the current index state"
msgstr "Không thể ghi lại trạng thái bảng mục lục hiện hành"
-#: git-stash.sh:103
+#: git-stash.sh:124
msgid "Cannot save the untracked files"
msgstr "Không thể ghi lại các tập tin chưa theo dõi"
-#: git-stash.sh:123 git-stash.sh:136
+#: git-stash.sh:144 git-stash.sh:157
msgid "Cannot save the current worktree state"
msgstr "Không thể ghi lại trạng thái cây-làm-việc hiện hành"
-#: git-stash.sh:140
+#: git-stash.sh:161
msgid "No changes selected"
msgstr "Chưa có thay đổi nào được chọn"
-#: git-stash.sh:143
+#: git-stash.sh:164
msgid "Cannot remove temporary index (can't happen)"
msgstr "Không thể gỡ bỏ bảng mục lục tạm thời (không thể xảy ra)"
-#: git-stash.sh:156
+#: git-stash.sh:177
msgid "Cannot record working tree state"
msgstr "Không thể ghi lại trạng thái cây làm việc hiện hành"
-#: git-stash.sh:188
+#: git-stash.sh:209
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr "Không thể cập nhật $ref_stash với $w_commit"
@@ -14235,7 +14523,7 @@
#. $ 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:238
+#: git-stash.sh:265
#, sh-format
msgid ""
"error: unknown option for 'stash save': $option\n"
@@ -14245,107 +14533,107 @@
" Để có thể dùng lời chú thích có chứa -- ở đầu,\n"
" dùng git stash save -- \"$option\""
-#: git-stash.sh:251
+#: git-stash.sh:278
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "Không thể dùng --patch và --include-untracked hay --all cùng một lúc."
-#: git-stash.sh:259
+#: git-stash.sh:286
msgid "No local changes to save"
msgstr "Không có thay đổi nội bộ nào được ghi lại"
-#: git-stash.sh:263
+#: git-stash.sh:291
msgid "Cannot initialize stash"
msgstr "Không thể khởi tạo stash"
-#: git-stash.sh:267
+#: git-stash.sh:295
msgid "Cannot save the current status"
msgstr "Không thể ghi lại trạng thái hiện hành"
-#: git-stash.sh:268
+#: git-stash.sh:296
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr "Đã ghi lại thư mục làm việc và trạng thái mục lục $stash_msg"
-#: git-stash.sh:285
+#: git-stash.sh:323
msgid "Cannot remove worktree changes"
msgstr "Không thể gỡ bỏ các thay đổi cây-làm-việc"
-#: git-stash.sh:403
+#: git-stash.sh:471
#, sh-format
msgid "unknown option: $opt"
msgstr "không hiểu tùy chọn: $opt"
-#: git-stash.sh:416
+#: git-stash.sh:484
msgid "No stash found."
msgstr "Không tìm thấy lần chuyển giao cất đi (stash) nào."
-#: git-stash.sh:423
+#: git-stash.sh:491
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "Chỉ ra quá nhiều điểm xét duyệt: $REV"
-#: git-stash.sh:438
+#: git-stash.sh:506
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference không phải là tham chiếu hợp lệ"
-#: git-stash.sh:466
+#: git-stash.sh:534
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "“$args” không phải là lần chuyển giao kiểu-stash (cất đi)"
-#: git-stash.sh:477
+#: git-stash.sh:545
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "”$args” không phải tham chiếu đến stash"
-#: git-stash.sh:485
+#: git-stash.sh:553
msgid "unable to refresh index"
msgstr "không thể làm tươi mới bảng mục lục"
-#: git-stash.sh:489
+#: git-stash.sh:557
msgid "Cannot apply a stash in the middle of a merge"
msgstr "Không thể áp dụng một stash ở giữa của quá trình hòa trộn"
-#: git-stash.sh:497
+#: git-stash.sh:565
msgid "Conflicts in index. Try without --index."
msgstr "Xung đột trong bảng mục lục. Hãy thử mà không dùng tùy chọn --index."
-#: git-stash.sh:499
+#: git-stash.sh:567
msgid "Could not save index tree"
msgstr "Không thể ghi lại cây chỉ mục"
-#: git-stash.sh:508
+#: git-stash.sh:576
msgid "Could not restore untracked files from stash"
msgstr "Không thể phục hồi các tập tin chưa theo dõi từ stash"
-#: git-stash.sh:533
+#: git-stash.sh:601
msgid "Cannot unstage modified files"
msgstr "Không thể bỏ ra khỏi bệ phóng các tập tin đã được sửa chữa"
-#: git-stash.sh:548
+#: git-stash.sh:616
msgid "Index was not unstashed."
msgstr "Bảng mục lục đã không được bỏ stash."
-#: git-stash.sh:562
+#: git-stash.sh:630
msgid "The stash is kept in case you need it again."
msgstr "stash được giữ trong trường hợp bạn lại cần nó."
-#: git-stash.sh:571
+#: git-stash.sh:639
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "Đã xóa ${REV} ($s)"
-#: git-stash.sh:572
+#: git-stash.sh:640
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: Không thể xóa bỏ mục stash"
-#: git-stash.sh:580
+#: git-stash.sh:648
msgid "No branch name specified"
msgstr "Chưa chỉ ra tên của nhánh"
-#: git-stash.sh:652
+#: git-stash.sh:727
msgid "(To restore them type \"git stash apply\")"
msgstr "(Để phục hồi lại chúng hãy gõ \"git stash apply\")"
@@ -14438,27 +14726,27 @@
msgid "Failed to register submodule '$sm_path'"
msgstr "Gặp lỗi khi đăng ký với hệ thống mô-đun-con “$sm_path”"
-#: git-submodule.sh:327
+#: git-submodule.sh:341
#, sh-format
msgid "Entering '$displaypath'"
msgstr "Đang vào “$displaypath”"
-#: git-submodule.sh:347
+#: git-submodule.sh:361
#, sh-format
msgid "Stopping at '$displaypath'; script returned non-zero status."
msgstr "Dừng lại tại “$displaypath”; script trả về trạng thái khác không."
-#: git-submodule.sh:418
+#: git-submodule.sh:432
#, sh-format
msgid "pathspec and --all are incompatible"
msgstr "đặc tả đường dẫn và --all xung khắc nhau"
-#: git-submodule.sh:423
+#: git-submodule.sh:437
#, sh-format
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "Dùng “--all” nếu bạn thực sự muốn hủy khởi tạo mọi mô-đun-con"
-#: git-submodule.sh:443
+#: git-submodule.sh:457
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains a .git directory\n"
@@ -14468,7 +14756,7 @@
"(dùng “rm -rf” nếu bạn thực sự muốn gỡ bỏ nó cùng với tất cả lịch sử của "
"chúng)"
-#: git-submodule.sh:451
+#: git-submodule.sh:465
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
@@ -14477,39 +14765,39 @@
"Cây làm việc mô-đun-con “$displaypath” chứa các thay đổi nội bộ; hãy dùng “-"
"f” để loại bỏ chúng đi"
-#: git-submodule.sh:454
+#: git-submodule.sh:468
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "Đã tạo thư mục “$displaypath”"
-#: git-submodule.sh:455
+#: git-submodule.sh:469
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr "Không thể gỡ bỏ cây làm việc mô-đun-con “$displaypath”"
-#: git-submodule.sh:458
+#: git-submodule.sh:472
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr "Không thể tạo thư mục mô-đun-con rỗng “$displaypath”"
-#: git-submodule.sh:467
+#: git-submodule.sh:481
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr "Mô-đun-con “$name” ($url) được bỏ đăng ký cho đường dẫn “$displaypath”"
-#: git-submodule.sh:623
+#: git-submodule.sh:637
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
"Không tìm thấy điểm xét duyệt hiện hành trong đường dẫn mô-đun-con "
"“$displaypath”"
-#: git-submodule.sh:633
+#: git-submodule.sh:647
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Không thể lấy về trong đường dẫn mô-đun-con “$sm_path”"
-#: git-submodule.sh:638
+#: git-submodule.sh:652
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -14518,12 +14806,12 @@
"Không thể tìm thấy điểm xét duyệt hiện hành ${remote_name}/${branch} trong "
"đường dẫn mô-đun-con “$sm_path”"
-#: git-submodule.sh:656
+#: git-submodule.sh:670
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "Không thể lấy về trong đường dẫn mô-đun-con “$displaypath”"
-#: git-submodule.sh:662
+#: git-submodule.sh:676
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -14532,86 +14820,86 @@
"Đã lấy về từ đường dẫn mô-đun con “$displaypath”, nhưng nó không chứa $sha1. "
"Lấy về theo định hướng của lần chuyển giao đó gặp lỗi."
-#: git-submodule.sh:669
+#: git-submodule.sh:683
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "Không thể lấy ra “$sha1” trong đường dẫn mô-đun-con “$displaypath”"
-#: git-submodule.sh:670
+#: git-submodule.sh:684
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Đường dẫn mô-đun-con “$displaypath”: đã checkout “$sha1”"
-#: git-submodule.sh:674
+#: git-submodule.sh:688
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "Không thể cải tổ “$sha1” trong đường dẫn mô-đun-con “$displaypath”"
-#: git-submodule.sh:675
+#: git-submodule.sh:689
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Đường dẫn mô-đun-con “$displaypath”: được rebase vào trong “$sha1”"
-#: git-submodule.sh:680
+#: git-submodule.sh:694
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr ""
"Không thể hòa trộn (merge) “$sha1” trong đường dẫn mô-đun-con “$displaypath”"
-#: git-submodule.sh:681
+#: git-submodule.sh:695
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Đường dẫn mô-đun-con “$displaypath”: được hòa trộn vào “$sha1”"
-#: git-submodule.sh:686
+#: git-submodule.sh:700
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
"Thực hiện không thành công lệnh “$command $sha1” trong đường dẫn mô-đun-con "
"“$displaypath”"
-#: git-submodule.sh:687
+#: git-submodule.sh:701
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Đường dẫn mô-đun-con “$displaypath”: “$command $sha1”"
-#: git-submodule.sh:718
+#: git-submodule.sh:732
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Gặp lỗi khi đệ quy vào trong đường dẫn mô-đun-con “$displaypath”"
-#: git-submodule.sh:826
+#: git-submodule.sh:840
msgid "The --cached option cannot be used with the --files option"
msgstr "Tùy chọn --cached không thể dùng cùng với tùy chọn --files"
-#: git-submodule.sh:878
+#: git-submodule.sh:892
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "chế độ không như mong chờ $mod_dst"
-#: git-submodule.sh:898
+#: git-submodule.sh:912
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Cảnh báo: $display_name không chứa lần chuyển giao $sha1_src"
-#: git-submodule.sh:901
+#: git-submodule.sh:915
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Cảnh báo: $display_name không chứa lần chuyển giao $sha1_dst"
-#: git-submodule.sh:904
+#: git-submodule.sh:918
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
" Cảnh báo: $display_name không chứa những lần chuyển giao $sha1_src và "
"$sha1_dst"
-#: git-submodule.sh:1051
+#: git-submodule.sh:1064
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "Gặp lỗi khi đệ quy vào trong đường dẫn mô-đun-con “$sm_path”"
-#: git-submodule.sh:1118
+#: git-submodule.sh:1136
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Url Mô-đun-con đồng bộ hóa cho “$displaypath”"
@@ -14916,11 +15204,11 @@
msgid "Or you can abort the rebase with 'git rebase --abort'."
msgstr "Hoặc là bạn có thể bãi bỏ lần cải tổ với lệnh “git rebase --abort”."
-#: git-rebase--interactive.sh:1079
+#: git-rebase--interactive.sh:1083
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "Không thể xóa bỏ CHERRY_PICK_HEAD"
-#: git-rebase--interactive.sh:1084
+#: git-rebase--interactive.sh:1088
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
@@ -14951,11 +15239,11 @@
"\n"
" git rebase --continue\n"
-#: git-rebase--interactive.sh:1101
+#: git-rebase--interactive.sh:1105
msgid "Error trying to find the author identity to amend commit"
msgstr "Lỗi khi cố tìm định danh của tác giả để tu bổ lần chuyển giao"
-#: git-rebase--interactive.sh:1106
+#: git-rebase--interactive.sh:1110
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
@@ -14964,11 +15252,11 @@
"Vui lòng chuyển giao chúng và sau đó chạy lệnh “git rebase --continue” lần "
"nữa."
-#: git-rebase--interactive.sh:1111 git-rebase--interactive.sh:1115
+#: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119
msgid "Could not commit staged changes."
msgstr "Không thể chuyển giao các thay đổi đã đưa lên bệ phóng."
-#: git-rebase--interactive.sh:1139
+#: git-rebase--interactive.sh:1147
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -14982,39 +15270,39 @@
" git rebase --continue\n"
"\n"
-#: git-rebase--interactive.sh:1147 git-rebase--interactive.sh:1305
+#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313
msgid "Could not execute editor"
msgstr "Không thể thực thi trình biên soạn"
-#: git-rebase--interactive.sh:1160
+#: git-rebase--interactive.sh:1168
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "Không thể checkout $switch_to"
-#: git-rebase--interactive.sh:1165
+#: git-rebase--interactive.sh:1173
msgid "No HEAD?"
msgstr "Không HEAD?"
-#: git-rebase--interactive.sh:1166
+#: git-rebase--interactive.sh:1174
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "Không thể tạo thư mục tạm thời $state_dir"
-#: git-rebase--interactive.sh:1168
+#: git-rebase--interactive.sh:1176
msgid "Could not mark as interactive"
msgstr "Không thể đánh dấu là tương tác"
-#: git-rebase--interactive.sh:1178 git-rebase--interactive.sh:1183
+#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191
msgid "Could not init rewritten commits"
msgstr "Không thể khởi tạo các lần chuyển giao ghi lại"
-#: git-rebase--interactive.sh:1283
+#: git-rebase--interactive.sh:1291
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
msgstr[0] "Cải tổ $shortrevisions vào $shortonto (các lệnh $todocount)"
-#: git-rebase--interactive.sh:1288
+#: git-rebase--interactive.sh:1296
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -15023,7 +15311,7 @@
"\n"
"Tuy nhiên, nếu bạn xóa bỏ mọi thứ, việc cải tổ sẽ bị bãi bỏ.\n"
-#: git-rebase--interactive.sh:1295
+#: git-rebase--interactive.sh:1303
msgid "Note that empty commits are commented out"
msgstr "Chú ý rằng lần chuyển giao trống rỗng là ghi chú"
@@ -15107,64 +15395,64 @@
msgid "unstaged"
msgstr "chưa đưa lên bệ phóng"
-#: git-add--interactive.perl:297 git-add--interactive.perl:322
+#: git-add--interactive.perl:288 git-add--interactive.perl:313
msgid "binary"
msgstr "nhị phân"
-#: git-add--interactive.perl:306 git-add--interactive.perl:360
+#: git-add--interactive.perl:297 git-add--interactive.perl:351
msgid "nothing"
msgstr "không có gì"
-#: git-add--interactive.perl:342 git-add--interactive.perl:357
+#: git-add--interactive.perl:333 git-add--interactive.perl:348
msgid "unchanged"
msgstr "không thay đổi"
-#: git-add--interactive.perl:653
+#: git-add--interactive.perl:644
#, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] "đã thêm %d đường dẫn\n"
-#: git-add--interactive.perl:656
+#: git-add--interactive.perl:647
#, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] "đã cập nhật %d đường dẫn\n"
-#: git-add--interactive.perl:659
+#: git-add--interactive.perl:650
#, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] "đã hoàn nguyên %d đường dẫn\n"
-#: git-add--interactive.perl:662
+#: git-add--interactive.perl:653
#, perl-format
msgid "touched %d path\n"
msgid_plural "touched %d paths\n"
msgstr[0] "%d đường dẫn đã touch (chạm)\n"
-#: git-add--interactive.perl:671
+#: git-add--interactive.perl:662
msgid "Update"
msgstr "Cập nhật"
-#: git-add--interactive.perl:683
+#: git-add--interactive.perl:674
msgid "Revert"
msgstr "Hoàn nguyên"
-#: git-add--interactive.perl:706
+#: git-add--interactive.perl:697
#, perl-format
msgid "note: %s is untracked now.\n"
msgstr "chú ý: %s giờ đã bỏ theo dõi.\n"
-#: git-add--interactive.perl:717
+#: git-add--interactive.perl:708
msgid "Add untracked"
msgstr "Thêm các cái chưa được theo dõi"
-#: git-add--interactive.perl:723
+#: git-add--interactive.perl:714
msgid "No untracked files.\n"
msgstr "Không có tập tin nào chưa được theo dõi.\n"
-#: git-add--interactive.perl:1039
+#: git-add--interactive.perl:1030
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
@@ -15172,7 +15460,7 @@
"Nếu miếng vá được áp dụng sạch sẽ, hunk đã sửa sẽ ngay lập tức\n"
"được đánh dấu để chuyển lên bệ phóng."
-#: git-add--interactive.perl:1042
+#: git-add--interactive.perl:1033
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
@@ -15180,7 +15468,7 @@
"Nếu miếng vá được áp dụng sạch sẽ, hunk đã sửa sẽ ngay lập tức\n"
"được đánh dấu để tạm cất."
-#: git-add--interactive.perl:1045
+#: git-add--interactive.perl:1036
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
@@ -15188,7 +15476,7 @@
"Nếu miếng vá được áp dụng sạch sẽ, hunk đã sửa sẽ ngay lập tức\n"
"được đánh dấu để bỏ chuyển lên bệ phóng."
-#: git-add--interactive.perl:1048 git-add--interactive.perl:1057
+#: git-add--interactive.perl:1039 git-add--interactive.perl:1048
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
@@ -15196,15 +15484,7 @@
"Nếu miếng vá được áp dụng sạch sẽ, hunk đã sửa sẽ ngay lập tức\n"
"được đánh dấu để áp dụng."
-#: git-add--interactive.perl:1051
-msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be\n"
-"marked for discarding"
-msgstr ""
-"Nếu miếng vá được áp dụng sạch sẽ, hunk đã sửa sẽ ngay lập tức\n"
-"được đánh dấu để loại bỏ"
-
-#: git-add--interactive.perl:1054
+#: git-add--interactive.perl:1042 git-add--interactive.perl:1045
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
@@ -15212,16 +15492,16 @@
"Nếu miếng vá được áp dụng sạch sẽ, hunk đã sửa sẽ ngay lập tức\n"
"được đánh dấu để loại bỏ."
-#: git-add--interactive.perl:1067
+#: git-add--interactive.perl:1058
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
msgstr "gặp lỗi khi tập tin sửa hunk để ghi: %s"
-#: git-add--interactive.perl:1068
+#: git-add--interactive.perl:1059
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr "Chế độ sửa hunk bằng tay -- xem ở đáy để có hướng dẫn sử dụng nhanh.\n"
-#: git-add--interactive.perl:1074
+#: git-add--interactive.perl:1065
#, perl-format
msgid ""
"---\n"
@@ -15235,7 +15515,7 @@
"Những dòng bắt đầu bằng %s sẽ bị loại bỏ.\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1082
+#: git-add--interactive.perl:1073
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"
@@ -15245,7 +15525,7 @@
"để sửa lần nữa. Nếu mọi dòng của hunk bị xóa bỏ, thế thì những\n"
"sửa dổi sẽ bị loại bỏ, và hunk vẫn giữ nguyên.\n"
-#: git-add--interactive.perl:1096
+#: git-add--interactive.perl:1087
#, perl-format
msgid "failed to open hunk edit file for reading: %s"
msgstr "gặp lỗi khi mở tập tin hunk để đọc: %s"
@@ -15256,14 +15536,14 @@
#. 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:1187
+#: git-add--interactive.perl:1178
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
"Hunk đã sửa của bạn không được áp dụng. Sửa lại lần nữa (nói \"n\" để loại "
"bỏ!) [y/n]? "
-#: git-add--interactive.perl:1196
+#: git-add--interactive.perl:1187
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -15278,7 +15558,7 @@
"d - đừng đưa lên bệ phóng hunk này cũng như bất kỳ cái nào còn lại trong tập "
"tin"
-#: git-add--interactive.perl:1202
+#: git-add--interactive.perl:1193
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -15292,7 +15572,7 @@
"a - tạm cất hunk này và tất cả các hunk sau này trong tập tin\n"
"d - đừng tạm cất hunk này cũng như bất kỳ cái nào còn lại trong tập tin"
-#: git-add--interactive.perl:1208
+#: git-add--interactive.perl:1199
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -15308,7 +15588,7 @@
"d - đừng đưa ra khỏi bệ phóng hunk này cũng như bất kỳ cái nào còn lại trong "
"tập tin"
-#: git-add--interactive.perl:1214
+#: git-add--interactive.perl:1205
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -15322,7 +15602,7 @@
"a - áp dụng hunk này và tất cả các hunk sau này trong tập tin\n"
"d - đừng áp dụng hunk này cũng như bất kỳ cái nào sau này trong tập tin"
-#: git-add--interactive.perl:1220
+#: git-add--interactive.perl:1211
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -15336,7 +15616,7 @@
"a - loại bỏ hunk này và tất cả các hunk sau này trong tập tin\n"
"d - đừng loại bỏ hunk này cũng như bất kỳ cái nào sau này trong tập tin"
-#: git-add--interactive.perl:1226
+#: git-add--interactive.perl:1217
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -15350,7 +15630,7 @@
"a - loại bỏ hunk này và tất cả các hunk sau này trong tập tin\n"
"d - đừng loại bỏ hunk này cũng như bất kỳ cái nào sau này trong tập tin"
-#: git-add--interactive.perl:1232
+#: git-add--interactive.perl:1223
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -15364,7 +15644,7 @@
"a - áp dụng hunk này và tất cả các hunk sau này trong tập tin\n"
"d - đừng áp dụng hunk này cũng như bất kỳ cái nào sau này trong tập tin"
-#: git-add--interactive.perl:1241
+#: git-add--interactive.perl:1232
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
@@ -15386,200 +15666,200 @@
"e - sửa bằng tay hunk hiện hành\n"
"? - in trợ giúp\n"
-#: git-add--interactive.perl:1272
+#: git-add--interactive.perl:1263
msgid "The selected hunks do not apply to the index!\n"
msgstr "Các hunk đã chọn không được áp dụng vào bảng mục lục!\n"
-#: git-add--interactive.perl:1273
+#: git-add--interactive.perl:1264
msgid "Apply them to the worktree anyway? "
msgstr "Vẫn áp dụng chúng cho cây làm việc? "
-#: git-add--interactive.perl:1276
+#: git-add--interactive.perl:1267
msgid "Nothing was applied.\n"
msgstr "Đã không áp dụng gì cả.\n"
-#: git-add--interactive.perl:1287
+#: git-add--interactive.perl:1278
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "bỏ qua những thứ chưa hòa trộn: %s\n"
-#: git-add--interactive.perl:1296
+#: git-add--interactive.perl:1287
msgid "Only binary files changed.\n"
msgstr "Chỉ có các tập tin nhị phân là thay đổi.\n"
-#: git-add--interactive.perl:1298
+#: git-add--interactive.perl:1289
msgid "No changes.\n"
msgstr "Không có thay đổi nào.\n"
-#: git-add--interactive.perl:1306
+#: git-add--interactive.perl:1297
msgid "Patch update"
msgstr "Cập nhật miếng vá"
-#: git-add--interactive.perl:1358
+#: git-add--interactive.perl:1349
#, perl-format
msgid "Stage mode change [y,n,q,a,d,/%s,?]? "
msgstr "Thay đổi chế độ bệ phóng [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1359
+#: git-add--interactive.perl:1350
#, perl-format
msgid "Stage deletion [y,n,q,a,d,/%s,?]? "
msgstr "Xóa khỏi bệ phóng [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1360
+#: git-add--interactive.perl:1351
#, perl-format
msgid "Stage this hunk [y,n,q,a,d,/%s,?]? "
msgstr "Đưa lên bệ phóng hunk này [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1363
+#: git-add--interactive.perl:1354
#, perl-format
msgid "Stash mode change [y,n,q,a,d,/%s,?]? "
msgstr "Thay đổi chế độ tạm cất đi [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1364
+#: git-add--interactive.perl:1355
#, perl-format
msgid "Stash deletion [y,n,q,a,d,/%s,?]? "
msgstr "Xóa tạm cất [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1365
+#: git-add--interactive.perl:1356
#, perl-format
msgid "Stash this hunk [y,n,q,a,d,/%s,?]? "
msgstr "Tạm cất hunk này [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1368
+#: git-add--interactive.perl:1359
#, perl-format
msgid "Unstage mode change [y,n,q,a,d,/%s,?]? "
msgstr "Thay đổi chế độ bỏ ra khỏi bệ phóng [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1369
+#: git-add--interactive.perl:1360
#, perl-format
msgid "Unstage deletion [y,n,q,a,d,/%s,?]? "
msgstr "Xóa bỏ việc bỏ ra khỏi bệ phóng [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1370
+#: git-add--interactive.perl:1361
#, perl-format
msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? "
msgstr "Bỏ ra khỏi bệ phóng hunk này [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1373
+#: git-add--interactive.perl:1364
#, perl-format
msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? "
msgstr "Áp dụng thay đổi chế độ cho mục lục [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1374
+#: git-add--interactive.perl:1365
#, perl-format
msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? "
msgstr "Áp dụng việc xóa vào mục lục [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1375
+#: git-add--interactive.perl:1366
#, perl-format
msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? "
msgstr "Áo dụng hunk này vào mục lục [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1378
+#: git-add--interactive.perl:1369
#, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? "
msgstr "Loại bỏ các thay đổi chế độ từ cây làm việc [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1379
+#: git-add--interactive.perl:1370
#, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? "
msgstr "Loại bỏ việc xóa khỏi cây làm việc [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1380
+#: git-add--interactive.perl:1371
#, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? "
msgstr "Loại bỏ hunk này khỏi cây làm việc [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1383
+#: git-add--interactive.perl:1374
#, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? "
msgstr "Loại bỏ thay đổi chế độ từ mục lục và cây làm việc [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1384
+#: git-add--interactive.perl:1375
#, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? "
msgstr "Loại bỏ việc xóa khỏi mục lục và cây làm việc [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1385
+#: git-add--interactive.perl:1376
#, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? "
msgstr "Loại bỏ hunk này khỏi mục lục và cây làm việc [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1388
+#: git-add--interactive.perl:1379
#, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? "
msgstr ""
"Áp dụng thay đổi chế độ cho mục lục và cây làm việc [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1389
+#: git-add--interactive.perl:1380
#, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? "
msgstr "Áp dụng việc xóa vào mục lục và cây làm việc [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1390
+#: git-add--interactive.perl:1381
#, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? "
msgstr "Áp dụng hunk này vào mục lục và cây làm việc [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1493
+#: git-add--interactive.perl:1484
msgid "go to which hunk (<ret> to see more)? "
msgstr "nhảy đến hunk nào (<ret> để xem thêm)? "
-#: git-add--interactive.perl:1495
+#: git-add--interactive.perl:1486
msgid "go to which hunk? "
msgstr "nhảy đến hunk nào?"
-#: git-add--interactive.perl:1504
+#: git-add--interactive.perl:1495
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "Số không hợp lệ: “%s”\n"
-#: git-add--interactive.perl:1509
+#: git-add--interactive.perl:1500
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] "Rất tiếc, chỉ có sẵn %d hunk..\n"
-#: git-add--interactive.perl:1535
+#: git-add--interactive.perl:1526
msgid "search for regex? "
msgstr "tìm kiếm cho regex? "
-#: git-add--interactive.perl:1548
+#: git-add--interactive.perl:1539
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "Định dạng tìm kiếm của biểu thức chính quy không đúng %s: %s\n"
-#: git-add--interactive.perl:1558
+#: git-add--interactive.perl:1549
msgid "No hunk matches the given pattern\n"
msgstr "Không thấy hunk nào khớp mẫu đã cho\n"
-#: git-add--interactive.perl:1570 git-add--interactive.perl:1592
+#: git-add--interactive.perl:1561 git-add--interactive.perl:1583
msgid "No previous hunk\n"
msgstr "Không có hunk kế trước\n"
-#: git-add--interactive.perl:1579 git-add--interactive.perl:1598
+#: git-add--interactive.perl:1570 git-add--interactive.perl:1589
msgid "No next hunk\n"
msgstr "Không có hunk kế tiếp\n"
-#: git-add--interactive.perl:1606
+#: git-add--interactive.perl:1597
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] "Chi nhỏ thành %d hunks.\n"
-#: git-add--interactive.perl:1658
+#: git-add--interactive.perl:1649
msgid "Review diff"
msgstr "Xem xét lại diff"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1677
+#: git-add--interactive.perl:1668
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\t - view diff between HEAD and index\n"
+"diff - view diff between HEAD and index\n"
"add untracked - add contents of untracked files to the staged set of "
"changes\n"
msgstr ""
@@ -15593,18 +15873,18 @@
"add untracked - thêm nội dung các các tập tin chưa theo dõi và tập hợp các "
"thay đổi đã đặt lên bệ phóng\n"
-#: git-add--interactive.perl:1694 git-add--interactive.perl:1699
-#: git-add--interactive.perl:1702 git-add--interactive.perl:1709
-#: git-add--interactive.perl:1713 git-add--interactive.perl:1719
+#: 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
msgid "missing --"
msgstr "thiếu --"
-#: git-add--interactive.perl:1715
+#: git-add--interactive.perl:1706
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "không hiểu chế độ --patch: %s"
-#: git-add--interactive.perl:1721 git-add--interactive.perl:1727
+#: git-add--interactive.perl:1712 git-add--interactive.perl:1718
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "đối số không hợp lệ %s, cần --"
@@ -15962,6 +16242,89 @@
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 "tag: tagging "
+#~ msgstr "thẻ: đang đánh thẻ"
+
+#~ msgid "object of unknown type"
+#~ msgstr "đối tượng của kiểu chưa biết"
+
+#~ msgid "commit object"
+#~ msgstr "đối tượng lần chuyển giao"
+
+#~ msgid "tree object"
+#~ msgstr "đối tượng cây"
+
+#~ msgid "blob object"
+#~ msgstr "đối tượng blob"
+
+#~ msgid "other tag object"
+#~ msgstr "đối tượng thẻ khác"
+
+#~ msgid ""
+#~ "There is nothing to exclude from by :(exclude) patterns.\n"
+#~ "Perhaps you forgot to add either ':/' or '.' ?"
+#~ msgstr ""
+#~ "Ở đây không có gì bị loại trừ bởi: các mẫu (loại trừ).\n"
+#~ "Có lẽ bạn đã quên thêm hoặc là “:/” hoặc là “.”?"
+
+#~ msgid "unrecognized format: %%(%s)"
+#~ msgstr "không nhận ra định dạng: %%(%s)"
+
+#~ msgid ":strip= requires a positive integer argument"
+#~ msgstr ":strip= cần một đối số nguyên dương"
+
+#~ msgid "ref '%s' does not have %ld components to :strip"
+#~ msgstr "tham chiếu “%s” không có %ld thành phần để mà :strip"
+
+#~ msgid "unknown %.*s format %s"
+#~ msgstr "Không hiểu định dạng %.*s %s"
+
+#~ msgid "[%s: gone]"
+#~ msgstr "[%s: đã ra đi]"
+
+#~ msgid "[%s]"
+#~ msgstr "[%s]"
+
+#~ msgid "[%s: behind %d]"
+#~ msgstr "[%s: đứng sau %d]"
+
+#~ msgid "[%s: ahead %d]"
+#~ msgstr "[%s: phía trước %d]"
+
+#~ msgid "[%s: ahead %d, behind %d]"
+#~ msgstr "[%s: trước %d, sau %d]"
+
+#~ msgid " **** invalid ref ****"
+#~ msgstr " **** tham chiếu không hợp lệ ****"
+
+#~ msgid "insanely long object directory %.*s"
+#~ msgstr "thư mục đối tượng dài một cách điên rồ %.*s"
+
+#~ msgid "git merge [<options>] <msg> HEAD <commit>"
+#~ msgstr "git merge [<các-tùy-chọn>] <tin-nhắn> HEAD <commit>"
+
+#~ msgid "'%s' is not a commit"
+#~ msgstr "%s không phải là một lần commit (chuyển giao)"
+
+#~ msgid "cannot open file '%s'"
+#~ msgstr "không thể mở tập tin “%s”"
+
+#~ msgid "could not close file %s"
+#~ msgstr "không thể đóng tập tin %s"
+
+#~ msgid "tag name too long: %.*s..."
+#~ msgstr "tên thẻ quá dài: %.*s…"
+
+#~ msgid "tag header too big."
+#~ msgstr "phần đầu thẻ quá lớn."
+
+#~ msgid ""
+#~ "If the patch applies cleanly, the edited hunk will immediately be\n"
+#~ "marked for discarding"
+#~ msgstr ""
+#~ "Nếu miếng vá được áp dụng sạch sẽ, hunk đã sửa sẽ ngay lập tức\n"
+#~ "được đánh dấu để loại bỏ"
+
#~ msgid "Use an experimental blank-line-based heuristic to improve diffs"
#~ msgstr ""
#~ "Dùng một phỏng đoán dựa trên dòng trắng thử nghiệm để tăng cường các diff"
@@ -16538,9 +16901,6 @@
#~ msgid "Failed to chdir: %s"
#~ msgstr "Gặp lỗi với lệnh chdir: %s"
-#~ msgid "cannot tell cwd"
-#~ msgstr "không nói chuyện được với lệnh cwd"
-
#~ msgid "%s: cannot lock the ref"
#~ msgstr "%s: không thể khóa ref (tham chiếu)"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 622b61c..22d9961 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -135,8 +135,8 @@
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-02-18 01:00+0800\n"
-"PO-Revision-Date: 2017-02-25 00:10+0800\n"
+"POT-Creation-Date: 2017-05-05 09:35+0800\n"
+"PO-Revision-Date: 2017-05-09 21:54+0800\n"
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
"Language: zh_CN\n"
@@ -187,7 +187,7 @@
msgid "Exiting because of an unresolved conflict."
msgstr "因为存在未解决的冲突而退出。"
-#: advice.c:114 builtin/merge.c:1206
+#: advice.c:114 builtin/merge.c:1185
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。"
@@ -447,7 +447,7 @@
msgid "cannot checkout %s"
msgstr "不能检出 %s"
-#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:248
+#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:253
#, c-format
msgid "failed to read %s"
msgstr "无法读取 %s"
@@ -570,7 +570,7 @@
msgid "sha1 information is lacking or useless (%s)."
msgstr "sha1 信息缺失或无效（%s）。"
-#: apply.c:4081 builtin/checkout.c:233 builtin/reset.c:135
+#: apply.c:4081 builtin/checkout.c:252 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
@@ -598,7 +598,7 @@
#: apply.c:4274
#, c-format
msgid "unable to stat newly created file '%s'"
-msgstr "不能枚举新建文件 '%s' 的状态"
+msgstr "不能对新建文件 '%s' 调用 stat"
#: apply.c:4282
#, c-format
@@ -646,7 +646,7 @@
msgid "truncating .rej filename to %.*s.rej"
msgstr "截短 .rej 文件名为 %.*s.rej"
-#: apply.c:4531 builtin/fetch.c:737 builtin/fetch.c:986
+#: apply.c:4531 builtin/fetch.c:739 builtin/fetch.c:988
#, c-format
msgid "cannot open %s"
msgstr "不能打开 %s"
@@ -674,160 +674,160 @@
msgid "unable to read index file"
msgstr "无法读取索引文件"
-#: apply.c:4824
+#: apply.c:4823
#, c-format
msgid "can't open patch '%s': %s"
msgstr "不能打开补丁 '%s'：%s"
-#: apply.c:4849
+#: apply.c:4850
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "抑制下仍有 %d 个空白字符误用"
msgstr[1] "抑制下仍有 %d 个空白字符误用"
-#: apply.c:4855 apply.c:4870
+#: apply.c:4856 apply.c:4871
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d 行有空白字符误用。"
msgstr[1] "%d 行有空白字符误用。"
-#: apply.c:4863
+#: apply.c:4864
#, 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:4879 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391
+#: apply.c:4880 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391
msgid "Unable to write new index file"
msgstr "无法写入新索引文件"
-#: apply.c:4910 apply.c:4913 builtin/am.c:2277 builtin/am.c:2280
-#: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180
-#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:591
-#: builtin/submodule--helper.c:594 builtin/submodule--helper.c:960
-#: builtin/submodule--helper.c:963 builtin/submodule--helper.c:1104
+#: 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
msgid "path"
msgstr "路径"
-#: apply.c:4911
+#: apply.c:4912
msgid "don't apply changes matching the given path"
msgstr "不要应用与给出路径向匹配的变更"
-#: apply.c:4914
+#: apply.c:4915
msgid "apply changes matching the given path"
msgstr "应用与给出路径向匹配的变更"
-#: apply.c:4916 builtin/am.c:2286
+#: apply.c:4917 builtin/am.c:2285
msgid "num"
msgstr "数字"
-#: apply.c:4917
+#: apply.c:4918
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
-#: apply.c:4920
+#: apply.c:4921
msgid "ignore additions made by the patch"
msgstr "忽略补丁中的添加的文件"
-#: apply.c:4922
+#: apply.c:4923
msgid "instead of applying the patch, output diffstat for the input"
msgstr "不应用补丁，而是显示输入的差异统计（diffstat）"
-#: apply.c:4926
+#: apply.c:4927
msgid "show number of added and deleted lines in decimal notation"
msgstr "以十进制数显示添加和删除的行数"
-#: apply.c:4928
+#: apply.c:4929
msgid "instead of applying the patch, output a summary for the input"
msgstr "不应用补丁，而是显示输入的概要"
-#: apply.c:4930
+#: apply.c:4931
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "不应用补丁，而是查看补丁是否可应用"
-#: apply.c:4932
+#: apply.c:4933
msgid "make sure the patch is applicable to the current index"
msgstr "确认补丁可以应用到当前索引"
-#: apply.c:4934
+#: apply.c:4935
msgid "apply a patch without touching the working tree"
msgstr "应用补丁而不修改工作区"
-#: apply.c:4936
+#: apply.c:4937
msgid "accept a patch that touches outside the working area"
msgstr "接受修改工作区之外文件的补丁"
-#: apply.c:4938
+#: apply.c:4939
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）"
-#: apply.c:4940
+#: apply.c:4941
msgid "attempt three-way merge if a patch does not apply"
msgstr "如果一个补丁不能应用则尝试三方合并"
-#: apply.c:4942
+#: apply.c:4943
msgid "build a temporary index based on embedded index information"
msgstr "创建一个临时索引基于嵌入的索引信息"
-#: apply.c:4945 builtin/checkout-index.c:169 builtin/ls-files.c:507
+#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:515
msgid "paths are separated with NUL character"
msgstr "路径以 NUL 字符分隔"
-#: apply.c:4947
+#: apply.c:4948
msgid "ensure at least <n> lines of context match"
msgstr "确保至少匹配 <n> 行上下文"
-#: apply.c:4948 builtin/am.c:2265
+#: apply.c:4949 builtin/am.c:2264
msgid "action"
msgstr "动作"
-#: apply.c:4949
+#: apply.c:4950
msgid "detect new or modified lines that have whitespace errors"
msgstr "检查新增和修改的行中间的空白字符滥用"
-#: apply.c:4952 apply.c:4955
+#: apply.c:4953 apply.c:4956
msgid "ignore changes in whitespace when finding context"
msgstr "查找上下文时忽略空白字符的变更"
-#: apply.c:4958
+#: apply.c:4959
msgid "apply the patch in reverse"
msgstr "反向应用补丁"
-#: apply.c:4960
+#: apply.c:4961
msgid "don't expect at least one line of context"
msgstr "无需至少一行上下文"
-#: apply.c:4962
+#: apply.c:4963
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
-#: apply.c:4964
+#: apply.c:4965
msgid "allow overlapping hunks"
msgstr "允许重叠的补丁片段"
-#: apply.c:4965 builtin/add.c:267 builtin/check-ignore.c:19
+#: 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:1860 builtin/mv.c:122 builtin/read-tree.c:114
+#: builtin/log.c:1867 builtin/mv.c:122 builtin/read-tree.c:134
msgid "be verbose"
msgstr "冗长输出"
-#: apply.c:4967
+#: apply.c:4968
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "允许不正确的文件末尾换行符"
-#: apply.c:4970
+#: apply.c:4971
msgid "do not trust the line counts in the hunk headers"
msgstr "不信任补丁片段的头信息中的行号"
-#: apply.c:4972 builtin/am.c:2274
+#: apply.c:4973 builtin/am.c:2273
msgid "root"
msgstr "根目录"
-#: apply.c:4973
+#: apply.c:4974
msgid "prepend <root> to all filenames"
msgstr "为所有文件名前添加 <根目录>"
@@ -849,103 +849,108 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <仓库> [--exec <命令>] --list"
-#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300
+#: archive.c:332 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "路径规格 '%s' 未匹配任何文件"
-#: archive.c:429
+#: archive.c:417
msgid "fmt"
msgstr "格式"
-#: archive.c:429
+#: archive.c:417
msgid "archive format"
msgstr "归档格式"
-#: archive.c:430 builtin/log.c:1429
+#: archive.c:418 builtin/log.c:1436
msgid "prefix"
msgstr "前缀"
-#: archive.c:431
+#: archive.c:419
msgid "prepend prefix to each pathname in the archive"
msgstr "为归档中每个路径名加上前缀"
-#: archive.c:432 builtin/blame.c:2607 builtin/blame.c:2608 builtin/config.c:59
-#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1054
-#: builtin/hash-object.c:101 builtin/ls-files.c:541 builtin/ls-files.c:544
-#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109
+#: 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
msgid "file"
msgstr "文件"
-#: archive.c:433 builtin/archive.c:89
+#: archive.c:421 builtin/archive.c:89
msgid "write the archive to this file"
msgstr "归档写入此文件"
-#: archive.c:435
+#: archive.c:423
msgid "read .gitattributes in working directory"
msgstr "读取工作区中的 .gitattributes"
-#: archive.c:436
+#: archive.c:424
msgid "report archived files on stderr"
msgstr "在标准错误上报告归档文件"
-#: archive.c:437
+#: archive.c:425
msgid "store only"
msgstr "只存储"
-#: archive.c:438
+#: archive.c:426
msgid "compress faster"
msgstr "压缩速度更快"
-#: archive.c:446
+#: archive.c:434
msgid "compress better"
msgstr "压缩效果更好"
-#: archive.c:449
+#: archive.c:437
msgid "list supported archive formats"
msgstr "列出支持的归档格式"
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88
-#: builtin/submodule--helper.c:603 builtin/submodule--helper.c:969
+#: archive.c:439 builtin/archive.c:90 builtin/clone.c:103 builtin/clone.c:106
+#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
msgid "repo"
msgstr "仓库"
-#: archive.c:452 builtin/archive.c:91
+#: archive.c:440 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr "从远程仓库（<仓库>）提取归档文件"
-#: archive.c:453 builtin/archive.c:92 builtin/notes.c:485
+#: archive.c:441 builtin/archive.c:92 builtin/notes.c:485
msgid "command"
msgstr "命令"
-#: archive.c:454 builtin/archive.c:93
+#: archive.c:442 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr "远程 git-upload-archive 命令的路径"
-#: archive.c:461
+#: archive.c:449
msgid "Unexpected option --remote"
msgstr "未知参数 --remote"
-#: archive.c:463
+#: archive.c:451
msgid "Option --exec can only be used together with --remote"
msgstr "选项 --exec 只能和 --remote 同时使用"
-#: archive.c:465
+#: archive.c:453
msgid "Unexpected option --output"
msgstr "未知参数 --output"
-#: archive.c:487
+#: archive.c:475
#, c-format
msgid "Unknown archive format '%s'"
msgstr "未知归档格式 '%s'"
-#: archive.c:494
+#: archive.c:482
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "参数不支持此格式 '%s'：-%d"
-#: attr.c:263
+#: attr.c:212
+#, c-format
+msgid "%.*s is not a valid attribute name"
+msgstr "%.*s 不是一个有效的属性名"
+
+#: attr.c:408
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -953,27 +958,27 @@
"负值模版在 git attributes 中被忽略\n"
"当字符串确实要以感叹号开始时，使用 '\\!'。"
-#: bisect.c:441
+#: bisect.c:444
#, c-format
msgid "Could not open file '%s'"
msgstr "不能打开文件 '%s'"
-#: bisect.c:446
+#: bisect.c:449
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "文件 '%s' 包含错误的引用格式：%s"
-#: bisect.c:655
+#: bisect.c:657
#, c-format
msgid "We cannot bisect more!\n"
msgstr "我们无法进行更多的二分查找！\n"
-#: bisect.c:708
+#: bisect.c:710
#, c-format
msgid "Not a valid commit name %s"
msgstr "不是一个有效的提交名 %s"
-#: bisect.c:732
+#: bisect.c:734
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -982,7 +987,7 @@
"合并基线 %s 是坏的。\n"
"这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"
-#: bisect.c:737
+#: bisect.c:739
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -991,7 +996,7 @@
"合并基线 %s 是新的。\n"
"介于 %s 和 [%s] 之间的属性已经被修改。\n"
-#: bisect.c:742
+#: bisect.c:744
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -1000,7 +1005,7 @@
"合并基线 %s 是 %s。\n"
"这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"
-#: bisect.c:750
+#: bisect.c:752
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -1011,7 +1016,7 @@
"这种情况下 git 二分查找无法正常工作。\n"
"您可能弄错了 %s 和 %s 版本？\n"
-#: bisect.c:763
+#: bisect.c:765
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1022,36 +1027,36 @@
"所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
"我们仍旧继续。"
-#: bisect.c:798
+#: bisect.c:800
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "二分查找中：合并基线必须是经过测试的\n"
-#: bisect.c:849
+#: bisect.c:851
#, c-format
msgid "a %s revision is needed"
msgstr "需要一个 %s 版本"
-#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:262
+#: bisect.c:868 builtin/notes.c:174 builtin/tag.c:255
#, c-format
msgid "could not create file '%s'"
msgstr "不能创建文件 '%s'"
-#: bisect.c:917
+#: bisect.c:919
#, c-format
msgid "could not read file '%s'"
msgstr "不能读取文件 '%s'"
-#: bisect.c:947
+#: bisect.c:949
msgid "reading bisect refs failed"
msgstr "读取二分查找引用失败"
-#: bisect.c:967
+#: bisect.c:969
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s 同时为 %s 和 %s\n"
-#: bisect.c:975
+#: bisect.c:977
#, c-format
msgid ""
"No testable commit found.\n"
@@ -1060,7 +1065,7 @@
"没有发现可测试的提交。\n"
"可能您在运行时使用了错误的路径参数？\n"
-#: bisect.c:994
+#: bisect.c:996
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1069,7 +1074,7 @@
#. TRANSLATORS: the last %s will be replaced with
#. "(roughly %d steps)" translation
-#: bisect.c:998
+#: bisect.c:1000
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
@@ -1204,7 +1209,7 @@
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' 已经检出到 '%s'"
-#: branch.c:363
+#: branch.c:364
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "工作区 %s 的 HEAD 指向没有被更新"
@@ -1219,7 +1224,7 @@
msgid "unrecognized header: %s%s (%d)"
msgstr "未能识别的包头：%s%s (%d)"
-#: bundle.c:87 sequencer.c:1331 sequencer.c:1752 builtin/commit.c:777
+#: bundle.c:87 sequencer.c:1341 sequencer.c:1767 builtin/commit.c:777
#, c-format
msgid "could not open '%s'"
msgstr "不能打开 '%s'"
@@ -1228,10 +1233,10 @@
msgid "Repository lacks these prerequisite commits:"
msgstr "仓库中缺少这些必备的提交："
-#: bundle.c:163 ref-filter.c:1499 sequencer.c:1154 sequencer.c:2290
-#: builtin/blame.c:2820 builtin/commit.c:1061 builtin/log.c:348
-#: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909
-#: builtin/merge.c:360 builtin/shortlog.c:177
+#: 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 "版本遍历设置失败"
@@ -1270,7 +1275,7 @@
msgid "ref '%s' is excluded by the rev-list options"
msgstr "引用 '%s' 被 rev-list 选项排除"
-#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:282
+#: bundle.c:443 builtin/log.c:170 builtin/log.c:1579 builtin/shortlog.c:281
#, c-format
msgid "unrecognized argument: %s"
msgstr "未能识别的参数：%s"
@@ -1293,8 +1298,8 @@
msgid "invalid color value: %.*s"
msgstr "无效的颜色值：%.*s"
-#: commit.c:40 sequencer.c:1564 builtin/am.c:421 builtin/am.c:457
-#: builtin/am.c:1493 builtin/am.c:2127
+#: commit.c:40 sequencer.c:1579 builtin/am.c:419 builtin/am.c:455
+#: builtin/am.c:1489 builtin/am.c:2126
#, c-format
msgid "could not parse %s"
msgstr "不能解析 %s"
@@ -1304,7 +1309,7 @@
msgid "%s %s is not a commit!"
msgstr "%s %s 不是一个提交!"
-#: commit.c:1514
+#: commit.c:1511
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
@@ -1318,133 +1323,152 @@
msgid "memory exhausted"
msgstr "内存耗尽"
-#: config.c:518
+#: config.c:191
+msgid "relative config include conditionals must come from files"
+msgstr "包含相对路径的条件引用必须来自于文件"
+
+#: config.c:711
#, c-format
msgid "bad config line %d in blob %s"
msgstr "数据对象 %2$s 中错误的配置行 %1$d"
-#: config.c:522
+#: config.c:715
#, c-format
msgid "bad config line %d in file %s"
msgstr "文件 %2$s 中错误的配置行 %1$d"
-#: config.c:526
+#: config.c:719
#, c-format
msgid "bad config line %d in standard input"
msgstr "标准输入中错误的配置行 %d"
-#: config.c:530
+#: config.c:723
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
-#: config.c:534
+#: config.c:727
#, c-format
msgid "bad config line %d in command line %s"
msgstr "命令行 %2$s 中错误的配置行 %1$d"
-#: config.c:538
+#: config.c:731
#, c-format
msgid "bad config line %d in %s"
msgstr "在 %2$s 中错误的配置行 %1$d"
-#: config.c:657
+#: config.c:859
msgid "out of range"
msgstr "超出范围"
-#: config.c:657
+#: config.c:859
msgid "invalid unit"
msgstr "无效的单位"
-#: config.c:663
+#: config.c:865
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误：%3$s"
-#: config.c:668
+#: config.c:870
#, 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:671
+#: config.c:873
#, 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:674
+#: config.c:876
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s'：%3$s"
-#: config.c:677
+#: config.c:879
#, 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:680
+#: config.c:882
#, 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:683
+#: config.c:885
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
-#: config.c:770
+#: config.c:980
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "无法扩展 '%s' 中的用户目录"
-#: config.c:865 config.c:876
+#: config.c:1075 config.c:1086
#, c-format
msgid "bad zlib compression level %d"
msgstr "错误的 zlib 压缩级别 %d"
-#: config.c:993
+#: config.c:1203
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "无效的对象创建模式：%s"
-#: config.c:1149
+#: config.c:1359
#, c-format
msgid "bad pack compression level %d"
msgstr "错误的打包压缩级别 %d"
-#: config.c:1339
+#: config.c:1557
msgid "unable to parse command-line config"
msgstr "无法解析命令行中的配置"
-#: config.c:1389
+#: config.c:1611
msgid "unknown error occurred while reading the configuration files"
msgstr "在读取配置文件时遇到未知错误"
-#: config.c:1743
+#: config.c:1970
+#, c-format
+msgid "Invalid %s: '%s'"
+msgstr "无效 %s：'%s'"
+
+#: config.c:1991
+#, c-format
+msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
+msgstr "未知的 core.untrackedCache 取值 '%s'，使用默认值 'keep'"
+
+#: config.c:2017
+#, c-format
+msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
+msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"
+
+#: config.c:2028
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "无法解析命令行配置中的 '%s'"
-#: config.c:1745
+#: config.c:2030
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
-#: config.c:1804
+#: config.c:2089
#, c-format
msgid "%s has multiple values"
msgstr "%s 有多个取值"
-#: config.c:2225 config.c:2450
+#: config.c:2423 config.c:2648
#, c-format
msgid "fstat on %s failed"
-msgstr "在 %s 上执行 fstat 失败"
+msgstr "对 %s 调用 fstat 失败"
-#: config.c:2343
+#: config.c:2541
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "不能设置 '%s' 为 '%s'"
-#: config.c:2345
+#: config.c:2543 builtin/remote.c:774
#, c-format
msgid "could not unset '%s'"
msgstr "不能取消设置 '%s'"
@@ -1583,7 +1607,7 @@
#: diffcore-rename.c:536
msgid "Performing inexact rename detection"
-msgstr "正在进行非精确的重命名检测"
+msgstr "正在进行非精确的重命名探测"
#: diff.c:62
#, c-format
@@ -1616,20 +1640,20 @@
"发现配置变量 'diff.dirstat' 中的错误：\n"
"%s"
-#: diff.c:3085
+#: diff.c:3102
#, c-format
msgid "external diff died, stopping at %s"
msgstr "外部 diff 退出，停止在 %s"
-#: diff.c:3411
+#: diff.c:3428
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
-#: diff.c:3501
+#: diff.c:3518
msgid "--follow requires exactly one pathspec"
msgstr "--follow 明确要求只跟一个路径规格"
-#: diff.c:3664
+#: diff.c:3681
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -1638,205 +1662,230 @@
"无法解析 --dirstat/-X 选项的参数：\n"
"%s"
-#: diff.c:3678
+#: diff.c:3695
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "无法解析 --submodule 选项的参数：'%s'"
-#: diff.c:4696
+#: diff.c:4719
msgid "inexact rename detection was skipped due to too many files."
msgstr "因为文件太多，略过不严格的重命名检查。"
-#: diff.c:4699
+#: diff.c:4722
msgid "only found copies from modified paths due to too many files."
msgstr "因为文件太多，只在修改的路径中查找拷贝。"
-#: diff.c:4702
+#: diff.c:4725
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"
-#: dir.c:1862
+#: dir.c:1899
msgid "failed to get kernel name and information"
msgstr "无法获得内核名称和信息"
-#: dir.c:1981
+#: dir.c:2018
msgid "Untracked cache is disabled on this system or location."
msgstr "缓存未跟踪文件在本系统或位置中被禁用。"
-#: dir.c:2759
+#: dir.c:2776 dir.c:2781
+#, c-format
+msgid "could not create directories for %s"
+msgstr "不能为 %s 创建目录"
+
+#: dir.c:2806
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "不能从 '%s' 迁移 git 目录到 '%s'"
-#: fetch-pack.c:213
+#: entry.c:280
+#, c-format
+msgid "could not stat file '%s'"
+msgstr "不能对文件 '%s' 调用 stat"
+
+#: fetch-pack.c:249
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack：应为 shallow 列表"
-#: fetch-pack.c:225
+#: fetch-pack.c:261
msgid "git fetch-pack: expected ACK/NAK, got EOF"
msgstr "git fetch-pack：应为 ACK/NAK，却得到 EOF"
-#: fetch-pack.c:243
+#: fetch-pack.c:280 builtin/archive.c:63
+#, c-format
+msgid "remote error: %s"
+msgstr "远程错误：%s"
+
+#: fetch-pack.c:281
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'"
-#: fetch-pack.c:295
+#: fetch-pack.c:333
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc 需要 multi_ack_detailed"
-#: fetch-pack.c:381
+#: fetch-pack.c:419
#, c-format
msgid "invalid shallow line: %s"
msgstr "无效的 shallow 信息：%s"
-#: fetch-pack.c:387
+#: fetch-pack.c:425
#, c-format
msgid "invalid unshallow line: %s"
msgstr "无效的 unshallow 信息：%s"
-#: fetch-pack.c:389
+#: fetch-pack.c:427
#, c-format
msgid "object not found: %s"
msgstr "对象未找到：%s"
-#: fetch-pack.c:392
+#: fetch-pack.c:430
#, c-format
msgid "error in object: %s"
msgstr "对象中出错：%s"
-#: fetch-pack.c:394
+#: fetch-pack.c:432
#, c-format
msgid "no shallow found: %s"
msgstr "未发现 shallow：%s"
-#: fetch-pack.c:397
+#: fetch-pack.c:435
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "应为 shallow/unshallow，却得到 %s"
-#: fetch-pack.c:436
+#: fetch-pack.c:474
#, c-format
msgid "got %s %d %s"
msgstr "得到 %s %d %s"
-#: fetch-pack.c:450
+#: fetch-pack.c:488
#, c-format
msgid "invalid commit %s"
msgstr "无效提交 %s"
-#: fetch-pack.c:483
+#: fetch-pack.c:521
msgid "giving up"
msgstr "放弃"
-#: fetch-pack.c:493 progress.c:235
+#: fetch-pack.c:531 progress.c:235
msgid "done"
msgstr "完成"
-#: fetch-pack.c:505
+#: fetch-pack.c:543
#, c-format
msgid "got %s (%d) %s"
msgstr "得到 %s (%d) %s"
-#: fetch-pack.c:551
+#: fetch-pack.c:589
#, c-format
msgid "Marking %s as complete"
msgstr "标记 %s 为完成"
-#: fetch-pack.c:697
+#: fetch-pack.c:737
#, c-format
msgid "already have %s (%s)"
msgstr "已经有 %s（%s）"
-#: fetch-pack.c:735
+#: fetch-pack.c:775
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack：无法派生 sideband 多路输出"
-#: fetch-pack.c:743
+#: fetch-pack.c:783
msgid "protocol error: bad pack header"
msgstr "协议错误：坏的包头"
-#: fetch-pack.c:799
+#: fetch-pack.c:839
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack：无法派生进程 %s"
-#: fetch-pack.c:815
+#: fetch-pack.c:855
#, c-format
msgid "%s failed"
msgstr "%s 失败"
-#: fetch-pack.c:817
+#: fetch-pack.c:857
msgid "error in sideband demultiplexer"
msgstr "sideband 多路输出出错"
-#: fetch-pack.c:844
+#: fetch-pack.c:884
msgid "Server does not support shallow clients"
msgstr "服务器不支持 shalllow 客户端"
-#: fetch-pack.c:848
+#: fetch-pack.c:888
msgid "Server supports multi_ack_detailed"
msgstr "服务器支持 multi_ack_detailed"
-#: fetch-pack.c:851
+#: fetch-pack.c:891
msgid "Server supports no-done"
msgstr "服务器支持 no-done"
-#: fetch-pack.c:857
+#: fetch-pack.c:897
msgid "Server supports multi_ack"
msgstr "服务器支持 multi_ack"
-#: fetch-pack.c:861
+#: fetch-pack.c:901
msgid "Server supports side-band-64k"
msgstr "服务器支持 side-band-64k"
-#: fetch-pack.c:865
+#: fetch-pack.c:905
msgid "Server supports side-band"
msgstr "服务器支持 side-band"
-#: fetch-pack.c:869
+#: fetch-pack.c:909
msgid "Server supports allow-tip-sha1-in-want"
msgstr "服务器支持 allow-tip-sha1-in-want"
-#: fetch-pack.c:873
+#: fetch-pack.c:913
msgid "Server supports allow-reachable-sha1-in-want"
msgstr "服务器支持 allow-reachable-sha1-in-want"
-#: fetch-pack.c:883
+#: fetch-pack.c:923
msgid "Server supports ofs-delta"
msgstr "服务器支持 ofs-delta"
-#: fetch-pack.c:890
+#: fetch-pack.c:930
#, c-format
msgid "Server version is %.*s"
msgstr "服务器版本 %.*s"
-#: fetch-pack.c:896
+#: fetch-pack.c:936
msgid "Server does not support --shallow-since"
msgstr "服务器不支持 --shallow-since"
-#: fetch-pack.c:900
+#: fetch-pack.c:940
msgid "Server does not support --shallow-exclude"
msgstr "服务器不支持 --shallow-exclude"
-#: fetch-pack.c:902
+#: fetch-pack.c:942
msgid "Server does not support --deepen"
msgstr "服务器不支持 --deepen"
-#: fetch-pack.c:913
+#: fetch-pack.c:953
msgid "no common commits"
msgstr "没有共同的提交"
-#: fetch-pack.c:925
+#: fetch-pack.c:965
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack：获取失败。"
-#: fetch-pack.c:1087
+#: fetch-pack.c:1127
msgid "no matching remote head"
msgstr "没有匹配的远程分支"
+#: fetch-pack.c:1149
+#, c-format
+msgid "no such remote ref %s"
+msgstr "没有这样的远程引用 %s"
+
+#: fetch-pack.c:1152
+#, c-format
+msgid "Server does not allow request for unadvertised object %s"
+msgstr "服务器不允许请求未公开的对象 %s"
+
#: gpg-interface.c:185
msgid "gpg failed to sign the data"
msgstr "gpg 无法为数据签名"
@@ -1855,17 +1904,17 @@
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"
-#: grep.c:1794
+#: grep.c:1796
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s'：无法读取 %s"
-#: grep.c:1811 builtin/clone.c:381 builtin/diff.c:81 builtin/rm.c:133
+#: grep.c:1813 builtin/clone.c:399 builtin/diff.c:81 builtin/rm.c:133
#, c-format
msgid "failed to stat '%s'"
-msgstr "无法枚举 '%s' 状态"
+msgstr "对 '%s' 调用 stat 失败"
-#: grep.c:1822
+#: grep.c:1824
#, c-format
msgid "'%s': short read"
msgstr "'%s'：读取不完整"
@@ -1934,7 +1983,7 @@
msgid "%s: %s - %s"
msgstr "%s：%s - %s"
-#: ident.c:334
+#: ident.c:343
msgid ""
"\n"
"*** Please tell me who you are.\n"
@@ -1959,6 +2008,39 @@
"来设置您账号的缺省身份标识。\n"
"如果仅在本仓库设置身份标识，则省略 --global 参数。\n"
+#: ident.c:367
+msgid "no email was given and auto-detection is disabled"
+msgstr "未提供邮件地址且自动探测被禁用"
+
+#: ident.c:372
+#, c-format
+msgid "unable to auto-detect email address (got '%s')"
+msgstr "无法自动探测邮件地址（得到 '%s'）"
+
+#: ident.c:382
+msgid "no name was given and auto-detection is disabled"
+msgstr "未提供姓名且自动探测被禁用"
+
+#: ident.c:388
+#, c-format
+msgid "unable to auto-detect name (got '%s')"
+msgstr "无法自动探测姓名（得到 '%s'）"
+
+#: ident.c:396
+#, c-format
+msgid "empty ident name (for <%s>) not allowed"
+msgstr "不允许空的姓名（对于 <%s>）"
+
+#: ident.c:402
+#, c-format
+msgid "name consists only of disallowed characters: %s"
+msgstr "姓名中仅包含禁用字符：%s"
+
+#: ident.c:417 builtin/commit.c:611
+#, c-format
+msgid "invalid date format: %s"
+msgstr "无效的日期格式：%s"
+
#: lockfile.c:152
#, c-format
msgid ""
@@ -1986,8 +2068,8 @@
msgid "failed to read the cache"
msgstr "无法读取缓存"
-#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374
-#: builtin/checkout.c:588 builtin/clone.c:731
+#: merge.c:96 builtin/am.c:1999 builtin/am.c:2034 builtin/checkout.c:393
+#: builtin/checkout.c:607 builtin/clone.c:749
msgid "unable to write new index file"
msgstr "无法写新的索引文件"
@@ -2057,38 +2139,56 @@
msgid "Unable to add %s to database"
msgstr "不能添加 %s 至对象库"
-#: merge-recursive.c:1088 merge-recursive.c:1102
+#: merge-recursive.c:1092
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"in tree."
msgstr ""
-"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
-"的版本被保留。"
+"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
+"本被保留。"
-#: merge-recursive.c:1094 merge-recursive.c:1107
+#: merge-recursive.c:1097
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree."
+msgstr ""
+"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
+"%7$s 版本被保留。"
+
+#: merge-recursive.c:1104
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"in tree at %s."
msgstr ""
-"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
-"的版本保留于 %8$s 中。"
+"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
+"本保留在 %8$s 中。"
-#: merge-recursive.c:1150
+#: merge-recursive.c:1109
+#, 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 ""
+"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
+"%7$s 版本保留在 %9$s 中。"
+
+#: merge-recursive.c:1143
msgid "rename"
msgstr "重命名"
-#: merge-recursive.c:1150
+#: merge-recursive.c:1143
msgid "renamed"
msgstr "重命名"
-#: merge-recursive.c:1207
+#: merge-recursive.c:1200
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
-#: merge-recursive.c:1232
+#: merge-recursive.c:1225
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -2097,135 +2197,135 @@
"冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 "
"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
-#: merge-recursive.c:1237
+#: merge-recursive.c:1230
msgid " (left unresolved)"
msgstr "（留下未解决）"
-#: merge-recursive.c:1299
+#: merge-recursive.c:1292
#, 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:1332
+#: merge-recursive.c:1325
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr "而是重命名 %s 至 %s，以及 %s 至 %s"
-#: merge-recursive.c:1535
+#: merge-recursive.c:1528
#, 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:1550
+#: merge-recursive.c:1543
#, c-format
msgid "Adding merged %s"
msgstr "添加合并后的 %s"
-#: merge-recursive.c:1557 merge-recursive.c:1771
+#: merge-recursive.c:1550 merge-recursive.c:1780
#, c-format
msgid "Adding as %s instead"
msgstr "而是以 %s 为名添加"
-#: merge-recursive.c:1614
+#: merge-recursive.c:1607
#, c-format
msgid "cannot read object %s"
msgstr "不能读取对象 %s"
-#: merge-recursive.c:1617
+#: merge-recursive.c:1610
#, c-format
msgid "object %s is not a blob"
msgstr "对象 %s 不是一个数据对象"
-#: merge-recursive.c:1670
+#: merge-recursive.c:1679
msgid "modify"
msgstr "修改"
-#: merge-recursive.c:1670
+#: merge-recursive.c:1679
msgid "modified"
msgstr "修改"
-#: merge-recursive.c:1680
+#: merge-recursive.c:1689
msgid "content"
msgstr "内容"
-#: merge-recursive.c:1687
+#: merge-recursive.c:1696
msgid "add/add"
msgstr "添加/添加"
-#: merge-recursive.c:1723
+#: merge-recursive.c:1732
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "略过 %s（已经做过相同合并）"
-#: merge-recursive.c:1737
+#: merge-recursive.c:1746
#, c-format
msgid "Auto-merging %s"
msgstr "自动合并 %s"
-#: merge-recursive.c:1741 git-submodule.sh:930
+#: merge-recursive.c:1750 git-submodule.sh:944
msgid "submodule"
msgstr "子模组"
-#: merge-recursive.c:1742
+#: merge-recursive.c:1751
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "冲突（%s）：合并冲突于 %s"
-#: merge-recursive.c:1836
+#: merge-recursive.c:1845
#, c-format
msgid "Removing %s"
msgstr "删除 %s"
-#: merge-recursive.c:1862
+#: merge-recursive.c:1871
msgid "file/directory"
msgstr "文件/目录"
-#: merge-recursive.c:1868
+#: merge-recursive.c:1877
msgid "directory/file"
msgstr "目录/文件"
-#: merge-recursive.c:1874
+#: merge-recursive.c:1883
#, 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:1883
+#: merge-recursive.c:1892
#, c-format
msgid "Adding %s"
msgstr "添加 %s"
-#: merge-recursive.c:1920
+#: merge-recursive.c:1929
msgid "Already up-to-date!"
msgstr "已经是最新的！"
-#: merge-recursive.c:1929
+#: merge-recursive.c:1938
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "无法合并树 %s 和 %s"
-#: merge-recursive.c:2012
+#: merge-recursive.c:2021
msgid "Merging:"
msgstr "合并："
-#: merge-recursive.c:2025
+#: merge-recursive.c:2034
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "发现 %u 个共同祖先："
msgstr[1] "发现 %u 个共同祖先："
-#: merge-recursive.c:2064
+#: merge-recursive.c:2073
msgid "merge returned no commit"
msgstr "合并未返回提交"
-#: merge-recursive.c:2127
+#: merge-recursive.c:2136
#, c-format
msgid "Could not parse object '%s'"
msgstr "不能解析对象 '%s'"
-#: merge-recursive.c:2141 builtin/merge.c:645 builtin/merge.c:792
+#: merge-recursive.c:2150 builtin/merge.c:645 builtin/merge.c:792
msgid "Unable to write index."
msgstr "不能写入索引。"
@@ -2302,66 +2402,83 @@
msgid "malformed object name '%s'"
msgstr "非法的对象名 '%s'"
-#: path.c:826
+#: path.c:810
#, c-format
msgid "Could not make %s writable by group"
msgstr "不能设置 %s 为组可写"
-#: pathspec.c:142
+#: pathspec.c:125
+msgid "Escape character '\\' not allowed as last character in attr value"
+msgstr "转义字符 '\\' 不能作为属性值的最后一个字符"
+
+#: pathspec.c:143
+msgid "Only one 'attr:' specification is allowed."
+msgstr "只允许一个 'attr:' 规格。"
+
+#: pathspec.c:146
+msgid "attr spec must not be empty"
+msgstr "属性规格不能为空"
+
+#: pathspec.c:189
+#, c-format
+msgid "invalid attribute name %s"
+msgstr "无效的属性名 %s"
+
+#: pathspec.c:254
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
-#: pathspec.c:149
+#: pathspec.c:261
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
-#: pathspec.c:188
+#: pathspec.c:301
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr "路径规格包含无效的神奇前缀"
-#: pathspec.c:201
+#: pathspec.c:322
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
-#: pathspec.c:206
+#: pathspec.c:327
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
-#: pathspec.c:238
+#: pathspec.c:365
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
-#: pathspec.c:293 pathspec.c:315
+#: pathspec.c:421 pathspec.c:443
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
-#: pathspec.c:350
+#: pathspec.c:483
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s：'literal' 和 'glob' 不兼容"
-#: pathspec.c:363
+#: pathspec.c:496
#, c-format
msgid "%s: '%s' is outside repository"
msgstr "%s：'%s' 在仓库之外"
-#: pathspec.c:451
+#: pathspec.c:584
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "'%s'（助记符：'%c'）"
-#: pathspec.c:461
+#: pathspec.c:594
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr "%s：路径规格神奇前缀不被此命令支持：%s"
-#: pathspec.c:511
+#: pathspec.c:644
msgid ""
"empty strings as pathspecs will be made invalid in upcoming releases. please "
"use . instead if you meant to match all paths"
@@ -2369,24 +2486,16 @@
"在下一个版本中，使用空字符串作为路径规格将被视作非法。如果要匹配所有路径，\n"
"请代之以 ."
-#: pathspec.c:535
+#: pathspec.c:668
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "路径规格 '%s' 位于符号链接中"
-#: pathspec.c:544
-msgid ""
-"There is nothing to exclude from by :(exclude) patterns.\n"
-"Perhaps you forgot to add either ':/' or '.' ?"
-msgstr ""
-"没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
-"添加 ':/' 或 '.' ？"
-
#: pretty.c:982
msgid "unable to parse --pretty format"
msgstr "不能解析 --pretty 格式"
-#: read-cache.c:1307
+#: read-cache.c:1442
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -2395,7 +2504,7 @@
"设置了 index.version，但是取值无效。\n"
"使用版本 %i"
-#: read-cache.c:1317
+#: read-cache.c:1452
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -2404,161 +2513,268 @@
"设置了 GIT_INDEX_VERSION，但是取值无效。\n"
"使用版本 %i"
-#: refs.c:576 builtin/merge.c:844
+#: read-cache.c:2375 sequencer.c:1350 sequencer.c:2048
+#, c-format
+msgid "could not stat '%s'"
+msgstr "不能对 '%s' 调用 stat"
+
+#: read-cache.c:2388
+#, c-format
+msgid "unable to open git dir: %s"
+msgstr "不能打开 git 目录：%s"
+
+#: read-cache.c:2400
+#, c-format
+msgid "unable to unlink: %s"
+msgstr "无法删除：%s"
+
+#: refs.c:620 builtin/merge.c:844
#, c-format
msgid "Could not open '%s' for writing"
msgstr "无法打开 '%s' 进行写入"
-#: refs/files-backend.c:2481
+#: refs.c:1667
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "在隔离环境中禁止更新引用"
+
+#: refs/files-backend.c:1631
#, c-format
msgid "could not delete reference %s: %s"
msgstr "无法删除引用 %s：%s"
-#: refs/files-backend.c:2484
+#: refs/files-backend.c:1634
#, c-format
msgid "could not delete references: %s"
msgstr "无法删除引用：%s"
-#: refs/files-backend.c:2493
+#: refs/files-backend.c:1643
#, c-format
msgid "could not remove reference %s"
msgstr "无法删除引用 %s"
-#: ref-filter.c:56
+#: ref-filter.c:35 wt-status.c:1780
+msgid "gone"
+msgstr "丢失"
+
+#: ref-filter.c:36
+#, c-format
+msgid "ahead %d"
+msgstr "领先 %d"
+
+#: ref-filter.c:37
+#, c-format
+msgid "behind %d"
+msgstr "落后 %d"
+
+#: ref-filter.c:38
+#, c-format
+msgid "ahead %d, behind %d"
+msgstr "领先 %d，落后 %d"
+
+#: ref-filter.c:104
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "期望的格式：%%(color:<color>)"
-#: ref-filter.c:58
+#: ref-filter.c:106
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "未能识别的颜色：%%(color:%s)"
-#: ref-filter.c:72
+#: ref-filter.c:120
#, c-format
-msgid "unrecognized format: %%(%s)"
-msgstr "未能识别的格式：%%(%s)"
+msgid "Integer value expected refname:lstrip=%s"
+msgstr "期望整数值 refname:lstrip=%s"
-#: ref-filter.c:78
+#: ref-filter.c:124
+#, c-format
+msgid "Integer value expected refname:rstrip=%s"
+msgstr "期望整数值 refname:rstrip=%s"
+
+#: ref-filter.c:126
+#, c-format
+msgid "unrecognized %%(%s) argument: %s"
+msgstr "未能识别的 %%(%s) 参数：%s"
+
+#: ref-filter.c:166
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) 不带参数"
-#: ref-filter.c:85
+#: ref-filter.c:173
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "%%(subject) 不带参数"
-#: ref-filter.c:92
+#: ref-filter.c:180
#, c-format
msgid "%%(trailers) does not take arguments"
msgstr "%%(trailers) 不带参数"
-#: ref-filter.c:111
+#: ref-filter.c:199
#, c-format
msgid "positive value expected contents:lines=%s"
-msgstr "要为 contents:lines=%s 提供一个正数"
+msgstr "期望一个正数 contents:lines=%s"
-#: ref-filter.c:113
+#: ref-filter.c:201
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "未能识别的 %%(contents) 参数：%s"
-#: ref-filter.c:123
+#: ref-filter.c:214
+#, c-format
+msgid "positive value expected objectname:short=%s"
+msgstr "期望一个正数 objectname:short=%s"
+
+#: ref-filter.c:218
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "未能识别的 %%(objectname) 参数：%s"
-#: ref-filter.c:145
+#: ref-filter.c:245
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "期望的格式：%%(align:<width>,<position>)"
-#: ref-filter.c:157
+#: ref-filter.c:257
#, c-format
msgid "unrecognized position:%s"
msgstr "未能识别的位置：%s"
-#: ref-filter.c:161
+#: ref-filter.c:261
#, c-format
msgid "unrecognized width:%s"
msgstr "未能识别的宽度：%s"
-#: ref-filter.c:167
+#: ref-filter.c:267
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "未能识别的 %%(align) 参数：%s"
-#: ref-filter.c:171
+#: ref-filter.c:271
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "元素 %%(align) 需要一个正数的宽度"
-#: ref-filter.c:255
+#: ref-filter.c:286
+#, c-format
+msgid "unrecognized %%(if) argument: %s"
+msgstr "未能识别的 %%(if) 参数：%s"
+
+#: ref-filter.c:371
#, c-format
msgid "malformed field name: %.*s"
msgstr "非法的字段名：%.*s"
-#: ref-filter.c:281
+#: ref-filter.c:397
#, c-format
msgid "unknown field name: %.*s"
msgstr "未知的字段名：%.*s"
-#: ref-filter.c:383
+#: ref-filter.c:501
+#, c-format
+msgid "format: %%(if) atom used without a %%(then) atom"
+msgstr "格式：使用了 %%(if) 元素而没有 %%(then) 元素"
+
+#: ref-filter.c:561
+#, c-format
+msgid "format: %%(then) atom used without an %%(if) atom"
+msgstr "格式：使用了 %%(then) 元素而没有 %%(if) 元素"
+
+#: ref-filter.c:563
+#, c-format
+msgid "format: %%(then) atom used more than once"
+msgstr "格式：%%(then) 元素用了多次"
+
+#: ref-filter.c:565
+#, c-format
+msgid "format: %%(then) atom used after %%(else)"
+msgstr "格式：%%(then) 元素用在了 %%(else) 之后"
+
+#: ref-filter.c:591
+#, c-format
+msgid "format: %%(else) atom used without an %%(if) atom"
+msgstr "格式：使用了 %%(else) 元素而没有 %%(if) 元素"
+
+#: ref-filter.c:593
+#, c-format
+msgid "format: %%(else) atom used without a %%(then) atom"
+msgstr "格式：使用了 %%(else) 元素而没有 %%(then) 元素"
+
+#: ref-filter.c:595
+#, c-format
+msgid "format: %%(else) atom used more than once"
+msgstr "格式：%%(else) 元素用了多次"
+
+#: ref-filter.c:608
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "格式：使用了 %%(end) 元素却没有它的对应元素"
-#: ref-filter.c:435
+#: ref-filter.c:663
#, c-format
msgid "malformed format string %s"
msgstr "非法的格式化字符串 %s"
-#: ref-filter.c:898
-msgid ":strip= requires a positive integer argument"
-msgstr ":strip= 需要一个正整型参数"
-
-#: ref-filter.c:903
+#: ref-filter.c:1247
#, c-format
-msgid "ref '%s' does not have %ld components to :strip"
-msgstr "引用 '%s' 未提供用于 :strip 的 %ld 个组件"
+msgid "(no branch, rebasing %s)"
+msgstr "（非分支，正变基 %s）"
-#: ref-filter.c:1066
+#: ref-filter.c:1250
#, c-format
-msgid "unknown %.*s format %s"
-msgstr "未知的 %.*s 格式 %s"
+msgid "(no branch, bisect started on %s)"
+msgstr "（非分支，二分查找开始于 %s）"
-#: ref-filter.c:1086 ref-filter.c:1117
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached at " in wt-status.c
+#: ref-filter.c:1256
+#, 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
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr "（头指针分离自 %s）"
+
+#: ref-filter.c:1265
+msgid "(no branch)"
+msgstr "（非分支）"
+
+#: ref-filter.c:1420 ref-filter.c:1451
#, c-format
msgid "missing object %s for %s"
msgstr "缺失 %2$s 的对象 %1$s"
-#: ref-filter.c:1089 ref-filter.c:1120
+#: ref-filter.c:1423 ref-filter.c:1454
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
-#: ref-filter.c:1343
+#: ref-filter.c:1692
#, c-format
msgid "malformed object at '%s'"
msgstr "非法的对象于 '%s'"
-#: ref-filter.c:1410
+#: ref-filter.c:1759
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "忽略带有错误名称 %s 的引用"
-#: ref-filter.c:1415
+#: ref-filter.c:1764
#, c-format
msgid "ignoring broken ref %s"
msgstr "忽略损坏的引用 %s"
-#: ref-filter.c:1670
+#: ref-filter.c:2028
#, c-format
msgid "format: %%(end) atom missing"
msgstr "格式：缺少 %%(end) 元素"
-#: ref-filter.c:1734
+#: ref-filter.c:2109
#, c-format
msgid "malformed object name %s"
msgstr "非法的对象名 %s"
@@ -2704,25 +2920,35 @@
msgid "dup2(%d,%d) failed"
msgstr "不能调用 dup2(%d,%d)"
-#: send-pack.c:297
+#: send-pack.c:150
+#, c-format
+msgid "unable to parse remote unpack status: %s"
+msgstr "不能解析远程解包状态：%s"
+
+#: send-pack.c:152
+#, c-format
+msgid "remote unpack failed: %s"
+msgstr "远程解包失败：%s"
+
+#: send-pack.c:315
msgid "failed to sign the push certificate"
msgstr "无法为推送证书签名"
-#: send-pack.c:410
+#: send-pack.c:428
msgid "the receiving end does not support --signed push"
msgstr "接收端不支持签名推送"
-#: send-pack.c:412
+#: send-pack.c:430
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
msgstr "未发送推送证书，因为接收端不支持签名推送"
-#: send-pack.c:424
+#: send-pack.c:442
msgid "the receiving end does not support --atomic push"
msgstr "接收端不支持原子推送"
-#: send-pack.c:429
+#: send-pack.c:447
msgid "the receiving end does not support push options"
msgstr "接收端不支持推送选项"
@@ -2760,12 +2986,12 @@
"冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
"对修正后的文件做标记，然后用 'git commit' 提交"
-#: sequencer.c:294 sequencer.c:1667
+#: sequencer.c:294 sequencer.c:1682
#, c-format
msgid "could not lock '%s'"
msgstr "不能锁定 '%s'"
-#: sequencer.c:297 sequencer.c:1545 sequencer.c:1672 sequencer.c:1686
+#: sequencer.c:297 sequencer.c:1560 sequencer.c:1687 sequencer.c:1701
#, c-format
msgid "could not write to '%s'"
msgstr "不能写入 '%s'"
@@ -2775,13 +3001,13 @@
msgid "could not write eol to '%s'"
msgstr "不能将换行符写入 '%s'"
-#: sequencer.c:305 sequencer.c:1550 sequencer.c:1674
+#: sequencer.c:305 sequencer.c:1565 sequencer.c:1689
#, c-format
msgid "failed to finalize '%s'."
msgstr "无法完成 '%s'。"
-#: sequencer.c:329 sequencer.c:808 sequencer.c:1571 builtin/am.c:259
-#: builtin/commit.c:749 builtin/merge.c:1036
+#: sequencer.c:329 sequencer.c:814 sequencer.c:1586 builtin/am.c:257
+#: builtin/commit.c:749 builtin/merge.c:1018
#, c-format
msgid "could not read '%s'"
msgstr "不能读取 '%s'"
@@ -2845,17 +3071,17 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:688
+#: sequencer.c:694
#, c-format
msgid "could not parse commit %s\n"
msgstr "不能解析提交 %s\n"
-#: sequencer.c:693
+#: sequencer.c:699
#, c-format
msgid "could not parse parent commit %s\n"
msgstr "不能解析父提交 %s\n"
-#: sequencer.c:815
+#: sequencer.c:821
#, c-format
msgid ""
"unexpected 1st line of squash message:\n"
@@ -2866,7 +3092,7 @@
"\n"
"\t%.*s"
-#: sequencer.c:821
+#: sequencer.c:827
#, c-format
msgid ""
"invalid 1st line of squash message:\n"
@@ -2877,230 +3103,230 @@
"\n"
"\t%.*s"
-#: sequencer.c:827 sequencer.c:852
+#: sequencer.c:833 sequencer.c:858
#, c-format
msgid "This is a combination of %d commits."
msgstr "这是一个 %d 个提交的组合。"
-#: sequencer.c:836
+#: sequencer.c:842
msgid "need a HEAD to fixup"
msgstr "需要一个 HEAD 来修复"
-#: sequencer.c:838
+#: sequencer.c:844
msgid "could not read HEAD"
msgstr "不能读取 HEAD"
-#: sequencer.c:840
+#: sequencer.c:846
msgid "could not read HEAD's commit message"
msgstr "不能读取 HEAD 的提交说明"
-#: sequencer.c:846
+#: sequencer.c:852
#, c-format
msgid "cannot write '%s'"
msgstr "不能写 '%s'"
-#: sequencer.c:855 git-rebase--interactive.sh:445
+#: sequencer.c:861 git-rebase--interactive.sh:445
msgid "This is the 1st commit message:"
msgstr "这是第一个提交说明："
-#: sequencer.c:863
+#: sequencer.c:869
#, c-format
msgid "could not read commit message of %s"
msgstr "不能读取 %s 的提交说明"
-#: sequencer.c:870
+#: sequencer.c:876
#, c-format
msgid "This is the commit message #%d:"
msgstr "这是提交说明 #%d："
-#: sequencer.c:875
+#: sequencer.c:881
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "提交说明 #%d 将被跳过："
-#: sequencer.c:880
+#: sequencer.c:886
#, c-format
msgid "unknown command: %d"
msgstr "未知命令：%d"
-#: sequencer.c:946
+#: sequencer.c:952
msgid "your index file is unmerged."
msgstr "您的索引文件未完成合并。"
-#: sequencer.c:964
+#: sequencer.c:970
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
-#: sequencer.c:972
+#: sequencer.c:978
#, c-format
msgid "commit %s does not have parent %d"
msgstr "提交 %s 没有第 %d 个父提交"
-#: sequencer.c:976
+#: sequencer.c:982
#, c-format
msgid "mainline was specified but commit %s is not a merge."
msgstr "指定了主线，但是提交 %s 不是一个合并提交。"
-#: sequencer.c:982
+#: sequencer.c:988
#, 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:1001
+#: sequencer.c:1009
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s：不能解析父提交 %s"
-#: sequencer.c:1063 sequencer.c:1812
+#: sequencer.c:1071 sequencer.c:1827
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "不能将 '%s' 重命名为 '%s'"
-#: sequencer.c:1114
+#: sequencer.c:1122
#, c-format
msgid "could not revert %s... %s"
msgstr "不能还原 %s... %s"
-#: sequencer.c:1115
+#: sequencer.c:1123
#, c-format
msgid "could not apply %s... %s"
msgstr "不能应用 %s... %s"
-#: sequencer.c:1157
+#: sequencer.c:1165
msgid "empty commit set passed"
msgstr "提供了空的提交集"
-#: sequencer.c:1167
+#: sequencer.c:1175
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s：无法读取索引"
-#: sequencer.c:1174
+#: sequencer.c:1182
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s：无法刷新索引"
-#: sequencer.c:1294
+#: sequencer.c:1303
#, c-format
msgid "invalid line %d: %.*s"
msgstr "无效行 %d：%.*s"
-#: sequencer.c:1302
+#: sequencer.c:1311
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "没有父提交的情况下不能 '%s'"
-#: sequencer.c:1334
+#: sequencer.c:1344
#, c-format
msgid "could not read '%s'."
msgstr "不能读取 '%s'。"
-#: sequencer.c:1341
+#: sequencer.c:1356
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "请用 'git rebase --edit-todo' 来修改。"
-#: sequencer.c:1343
+#: sequencer.c:1358
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "不可用的指令清单：'%s'"
-#: sequencer.c:1348
+#: sequencer.c:1363
msgid "no commits parsed."
msgstr "没有解析提交。"
-#: sequencer.c:1359
+#: sequencer.c:1374
msgid "cannot cherry-pick during a revert."
msgstr "不能在回退中执行拣选。"
-#: sequencer.c:1361
+#: sequencer.c:1376
msgid "cannot revert during a cherry-pick."
msgstr "不能在拣选中执行回退。"
-#: sequencer.c:1424
+#: sequencer.c:1439
#, c-format
msgid "invalid key: %s"
msgstr "无效键名：%s"
-#: sequencer.c:1427
+#: sequencer.c:1442
#, c-format
msgid "invalid value for %s: %s"
msgstr "%s 的值无效：%s"
-#: sequencer.c:1484
+#: sequencer.c:1499
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "非法的选项清单：'%s'"
-#: sequencer.c:1522
+#: sequencer.c:1537
msgid "a cherry-pick or revert is already in progress"
msgstr "一个拣选或还原操作已在进行"
-#: sequencer.c:1523
+#: sequencer.c:1538
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
-#: sequencer.c:1526
+#: sequencer.c:1541
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "不能创建序列目录 '%s'"
-#: sequencer.c:1540
+#: sequencer.c:1555
msgid "could not lock HEAD"
msgstr "不能锁定 HEAD"
-#: sequencer.c:1596 sequencer.c:2150
+#: sequencer.c:1611 sequencer.c:2181
msgid "no cherry-pick or revert in progress"
msgstr "拣选或还原操作并未进行"
-#: sequencer.c:1598
+#: sequencer.c:1613
msgid "cannot resolve HEAD"
msgstr "不能解析 HEAD"
-#: sequencer.c:1600 sequencer.c:1634
+#: sequencer.c:1615 sequencer.c:1649
msgid "cannot abort from a branch yet to be born"
msgstr "不能从尚未建立的分支终止"
-#: sequencer.c:1620 builtin/grep.c:904
+#: sequencer.c:1635 builtin/grep.c:910
#, c-format
msgid "cannot open '%s'"
msgstr "不能打开 '%s'"
-#: sequencer.c:1622
+#: sequencer.c:1637
#, c-format
msgid "cannot read '%s': %s"
msgstr "不能读取 '%s'：%s"
-#: sequencer.c:1623
+#: sequencer.c:1638
msgid "unexpected end of file"
msgstr "意外的文件结束"
-#: sequencer.c:1629
+#: sequencer.c:1644
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
-#: sequencer.c:1640
+#: sequencer.c:1655
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr "您好像移动了 HEAD。未能回退，检查您的 HEAD！"
-#: sequencer.c:1777 sequencer.c:2049
+#: sequencer.c:1792 sequencer.c:2080
msgid "cannot read HEAD"
msgstr "不能读取 HEAD"
-#: sequencer.c:1817 builtin/difftool.c:574
+#: sequencer.c:1832 builtin/difftool.c:616
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "不能拷贝 '%s' 至 '%s'"
-#: sequencer.c:1833
+#: sequencer.c:1848
msgid "could not read index"
msgstr "不能读取索引"
# 译者：注意保持前导空格
-#: sequencer.c:1838
+#: sequencer.c:1853
#, c-format
msgid ""
"execution failed: %s\n"
@@ -3115,11 +3341,11 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:1844
+#: sequencer.c:1859
msgid "and made changes to the index and/or the working tree\n"
msgstr "并且修改索引和/或工作区\n"
-#: sequencer.c:1850
+#: sequencer.c:1865
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -3136,17 +3362,17 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:1905 git-rebase.sh:168
+#: sequencer.c:1920 git-rebase.sh:169
#, c-format
msgid "Applied autostash."
msgstr "成功应用 autostash。"
-#: sequencer.c:1917
+#: sequencer.c:1932
#, c-format
msgid "cannot store %s"
msgstr "不能存储 %s"
-#: sequencer.c:1919 git-rebase.sh:172
+#: sequencer.c:1934 git-rebase.sh:173
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
@@ -3157,82 +3383,84 @@
"您的修改安全地保存在 stash 中。\n"
"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
-#: sequencer.c:2000
+#: sequencer.c:2016
#, c-format
-msgid "stopped at %s... %.*s"
-msgstr "停止在 %s... %.*s"
+msgid "Stopped at %s... %.*s\n"
+msgstr "停止在 %s... %.*s\n"
-#: sequencer.c:2027
+#: sequencer.c:2058
#, c-format
msgid "unknown command %d"
msgstr "未知命令 %d"
-#: sequencer.c:2057
+#: sequencer.c:2088
msgid "could not read orig-head"
msgstr "不能读取 orig-head"
-#: sequencer.c:2061
+#: sequencer.c:2092
msgid "could not read 'onto'"
msgstr "不能读取 'onto'"
-#: sequencer.c:2068
+#: sequencer.c:2099
#, c-format
msgid "could not update %s"
msgstr "不能更新 %s"
-#: sequencer.c:2075
+#: sequencer.c:2106
#, c-format
msgid "could not update HEAD to %s"
msgstr "不能更新 HEAD 为 %s"
-#: sequencer.c:2159
+#: sequencer.c:2190
msgid "cannot rebase: You have unstaged changes."
msgstr "不能变基：您有未暂存的变更。"
-#: sequencer.c:2164
+#: sequencer.c:2195
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "不能删除 CHERRY_PICK_HEAD"
-#: sequencer.c:2173
+#: sequencer.c:2204
msgid "cannot amend non-existing commit"
msgstr "不能修补不存在的提交"
-#: sequencer.c:2175
+#: sequencer.c:2206
#, c-format
msgid "invalid file: '%s'"
msgstr "无效文件：'%s'"
-#: sequencer.c:2177
+#: sequencer.c:2208
#, c-format
msgid "invalid contents: '%s'"
msgstr "无效内容：'%s'"
-#: sequencer.c:2180
+#: sequencer.c:2211
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'。"
+msgstr ""
+"\n"
+"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
-#: sequencer.c:2190
+#: sequencer.c:2221
msgid "could not commit staged changes."
msgstr "不能提交暂存的修改。"
-#: sequencer.c:2270
+#: sequencer.c:2301
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s：不能拣选一个%s"
-#: sequencer.c:2274
+#: sequencer.c:2305
#, c-format
msgid "%s: bad revision"
msgstr "%s：错误的版本"
-#: sequencer.c:2307
+#: sequencer.c:2338
msgid "can't revert as initial commit"
msgstr "不能作为初始提交回退"
-#: setup.c:160
+#: setup.c:165
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
@@ -3241,7 +3469,7 @@
"%s：工作区中无此路径。\n"
"使用命令 'git <command> -- <path>...' 来指定本地不存在的路径。"
-#: setup.c:173
+#: setup.c:178
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -3252,7 +3480,7 @@
"使用 '--' 来分隔版本和路径，例如：\n"
"'git <command> [<revision>...] -- [<file>...]'"
-#: setup.c:223
+#: setup.c:228
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
@@ -3263,29 +3491,34 @@
"使用 '--' 来分隔版本和路径，例如：\n"
"'git <command> [<revision>...] -- [<file>...]'"
-#: setup.c:470
+#: setup.c:475
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "期望 git 仓库版本 <= %d，却得到 %d"
-#: setup.c:478
+#: setup.c:483
msgid "unknown repository extensions found:"
msgstr "发现未知的仓库扩展："
-#: setup.c:768
+#: setup.c:776
#, c-format
msgid "Not a git repository (or any of the parent directories): %s"
msgstr "不是一个 git 仓库（或者任何父目录）：%s"
-#: setup.c:770 setup.c:922 builtin/index-pack.c:1643
+#: setup.c:778 builtin/index-pack.c:1646
msgid "Cannot come back to cwd"
msgstr "无法返回当前工作目录"
-#: setup.c:852
+#: setup.c:1010
msgid "Unable to read current working directory"
msgstr "不能读取当前工作目录"
-#: setup.c:927
+#: setup.c:1022 setup.c:1028
+#, c-format
+msgid "Cannot change to '%s'"
+msgstr "不能切换到 '%s'"
+
+#: setup.c:1041
#, c-format
msgid ""
"Not a git repository (or any parent up to mount point %s)\n"
@@ -3294,12 +3527,7 @@
"不是一个 git 仓库（或者向上递归至挂载点 %s 的任何祖先目录）\n"
"停止在文件系统边界（未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM）。"
-#: setup.c:934
-#, c-format
-msgid "Cannot change to '%s/..'"
-msgstr "不能切换到 '%s/..'"
-
-#: setup.c:996
+#: setup.c:1106
#, c-format
msgid ""
"Problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -3308,55 +3536,55 @@
"参数 core.sharedRepository 的文件权限值有错（0%.3o）。\n"
"文件属主必须始终拥有读写权限。"
-#: sha1_file.c:490
+#: sha1_file.c:559
#, c-format
msgid "path '%s' does not exist"
msgstr "路径 '%s' 不存在"
-#: sha1_file.c:516
+#: sha1_file.c:585
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
-#: sha1_file.c:522
+#: sha1_file.c:591
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "参考仓库 '%s' 不是一个本地仓库。"
-#: sha1_file.c:528
+#: sha1_file.c:597
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "参考仓库 '%s' 是一个浅克隆"
-#: sha1_file.c:536
+#: sha1_file.c:605
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "参考仓库 '%s' 已被嫁接"
-#: sha1_file.c:1176
+#: sha1_file.c:1245
msgid "offset before end of packfile (broken .idx?)"
msgstr "偏移量在包文件结束之前（损坏的 .idx？）"
-#: sha1_file.c:2637
+#: sha1_file.c:2721
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"
-#: sha1_file.c:2641
+#: sha1_file.c:2725
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"
-#: sha1_name.c:407
+#: sha1_name.c:409
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr "短 SHA1 %s 存在歧义"
-#: sha1_name.c:418
+#: sha1_name.c:420
msgid "The candidates are:"
msgstr "候选者有："
-#: sha1_name.c:578
+#: sha1_name.c:580
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"
@@ -3377,61 +3605,71 @@
"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
"命令关闭本消息通知。"
-#: submodule.c:65 submodule.c:99
+#: submodule.c:67 submodule.c:101
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr "无法修改未合并的 .gitmodules，先解决合并冲突"
-#: submodule.c:69 submodule.c:103
+#: submodule.c:71 submodule.c:105
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
-#: submodule.c:77
+#: submodule.c:79
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "不能更新 .gitmodules 条目 %s"
-#: submodule.c:110
+#: submodule.c:112
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "无法移除 %s 的 .gitmodules 条目"
-#: submodule.c:121
+#: submodule.c:123
msgid "staging updated .gitmodules failed"
msgstr "将更新后 .gitmodules 添加暂存区失败"
-#: submodule.c:159
+#: submodule.c:161
msgid "negative values not allowed for submodule.fetchJobs"
msgstr "submodule.fetchJobs 不允许为负值"
-#: submodule.c:1184
+#: submodule.c:1194
#, c-format
-msgid "could not start 'git status in submodule '%s'"
-msgstr "无法在子模组 '%s' 中启动 git status"
+msgid "'%s' not recognized as a git repository"
+msgstr "无法将 '%s' 识别为一个 git 仓库"
-#: submodule.c:1197
+#: submodule.c:1332
#, c-format
-msgid "could not run 'git status in submodule '%s'"
-msgstr "无法在子模组 '%s' 中执行 git status"
+msgid "could not start 'git status' in submodule '%s'"
+msgstr "无法在子模组 '%s' 中启动 'git status'"
-#: submodule.c:1398
+#: submodule.c:1345
+#, c-format
+msgid "could not run 'git status' in submodule '%s'"
+msgstr "无法在子模组 '%s' 中执行 'git status'"
+
+#: submodule.c:1421
+#, c-format
+msgid "submodule '%s' has dirty index"
+msgstr "子模组 '%s' 中有脏索引"
+
+#: submodule.c:1678
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"
-#: submodule.c:1410 submodule.c:1471
+#: submodule.c:1690 submodule.c:1746
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "不能查询子模组 '%s' 的名称"
-#: submodule.c:1414 submodule.c:1474 builtin/submodule--helper.c:640
-#: builtin/submodule--helper.c:650
+#: submodule.c:1694 builtin/submodule--helper.c:678
+#: builtin/submodule--helper.c:688
#, c-format
msgid "could not create directory '%s'"
msgstr "不能创建目录 '%s'"
-#: submodule.c:1420
+#: submodule.c:1697
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -3442,12 +3680,25 @@
"'%s' 迁移至\n"
"'%s'\n"
-#: submodule.c:1512
+#: submodule.c:1781
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "无法递归进子模组路径 '%s'"
-#: submodule-config.c:360
+#: submodule.c:1825
+msgid "could not start ls-files in .."
+msgstr "无法在 .. 中启动 ls-files"
+
+#: submodule.c:1845
+msgid "BUG: returned path string doesn't match cwd?"
+msgstr "BUG：返回的路径和当前路径不匹配？"
+
+#: submodule.c:1864
+#, c-format
+msgid "ls-tree returned unexpected return code %d"
+msgstr "ls-tree 返回未知返回值 %d"
+
+#: submodule-config.c:380
#, c-format
msgid "invalid value for %s"
msgstr "%s 的值无效"
@@ -3485,7 +3736,7 @@
#: trailer.c:949 builtin/am.c:44
#, c-format
msgid "could not stat %s"
-msgstr "不能获取 %s 的文件状态"
+msgstr "不能对 %s 调用 stat"
#: trailer.c:951
#, c-format
@@ -3516,14 +3767,14 @@
msgid "transport: invalid depth option '%s'"
msgstr "传输：无效的深度选项 '%s'"
-#: transport.c:885
+#: transport.c:889
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"not be found on any remote:\n"
msgstr "下列子模组路径所包含的修改在任何远程源中都找不到：\n"
-#: transport.c:889
+#: transport.c:893
#, c-format
msgid ""
"\n"
@@ -3550,11 +3801,11 @@
"以推送至远程。\n"
"\n"
-#: transport.c:897
+#: transport.c:901
msgid "Aborting."
msgstr "正在终止。"
-#: transport-helper.c:1082
+#: transport-helper.c:1080
#, c-format
msgid "Could not read ref %s"
msgstr "不能读取引用 %s"
@@ -3575,7 +3826,7 @@
msgid "too-short tree file"
msgstr "太短的树文件"
-#: unpack-trees.c:99
+#: unpack-trees.c:104
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -3584,7 +3835,7 @@
"您对下列文件的本地修改将被检出操作覆盖：\n"
"%%s请在切换分支前提交您的修改或者保存进度。"
-#: unpack-trees.c:101
+#: unpack-trees.c:106
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -3593,7 +3844,7 @@
"您对下列文件的本地修改将被检出操作覆盖：\n"
"%%s"
-#: unpack-trees.c:104
+#: unpack-trees.c:109
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -3602,7 +3853,7 @@
"您对下列文件的本地修改将被合并操作覆盖：\n"
"%%s请在合并前提交您的修改或者保存进度。"
-#: unpack-trees.c:106
+#: unpack-trees.c:111
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -3611,7 +3862,7 @@
"您对下列文件的本地修改将被合并操作覆盖：\n"
"%%s"
-#: unpack-trees.c:109
+#: unpack-trees.c:114
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -3620,7 +3871,7 @@
"您对下列文件的本地修改将被 %s 覆盖：\n"
"%%s请在 %s 之前提交您的修改或者保存进度。"
-#: unpack-trees.c:111
+#: unpack-trees.c:116
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -3629,7 +3880,7 @@
"您对下列文件的本地修改将被 %s 覆盖：\n"
"%%s"
-#: unpack-trees.c:116
+#: unpack-trees.c:121
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -3638,7 +3889,7 @@
"更新如下目录将会丢失其中未跟踪的文件：\n"
"%s"
-#: unpack-trees.c:120
+#: unpack-trees.c:125
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -3647,7 +3898,7 @@
"工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"
"%%s请在切换分支之前移动或删除。"
-#: unpack-trees.c:122
+#: unpack-trees.c:127
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -3656,7 +3907,7 @@
"工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"
"%%s"
-#: unpack-trees.c:125
+#: unpack-trees.c:130
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -3665,7 +3916,7 @@
"工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"
"%%s请在合并前移动或删除。"
-#: unpack-trees.c:127
+#: unpack-trees.c:132
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -3674,7 +3925,7 @@
"工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"
"%%s"
-#: unpack-trees.c:130
+#: unpack-trees.c:135
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -3683,7 +3934,7 @@
"工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"
"%%s请在 %s 前移动或删除。"
-#: unpack-trees.c:132
+#: unpack-trees.c:137
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -3692,7 +3943,7 @@
"工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"
"%%s"
-#: unpack-trees.c:137
+#: unpack-trees.c:142
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -3702,7 +3953,7 @@
"工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"
"%%s请在切换分支前移动或删除。"
-#: unpack-trees.c:139
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -3712,7 +3963,7 @@
"工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"
"%%s"
-#: unpack-trees.c:142
+#: unpack-trees.c:147
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -3721,7 +3972,7 @@
"工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"
"%%s请在合并前移动或删除。"
-#: unpack-trees.c:144
+#: unpack-trees.c:149
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -3730,7 +3981,7 @@
"工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"
"%%s"
-#: unpack-trees.c:147
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -3739,7 +3990,7 @@
"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"
"%%s请在 %s 前移动或删除。"
-#: unpack-trees.c:149
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -3748,12 +3999,12 @@
"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"
"%%s"
-#: unpack-trees.c:156
+#: unpack-trees.c:161
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"
-#: unpack-trees.c:159
+#: unpack-trees.c:164
#, c-format
msgid ""
"Cannot update sparse checkout: the following entries are not up-to-date:\n"
@@ -3762,7 +4013,7 @@
"无法更新稀疏检出：如下条目不是最新：\n"
"%s"
-#: unpack-trees.c:161
+#: unpack-trees.c:166
#, c-format
msgid ""
"The following working tree files would be overwritten by sparse checkout "
@@ -3772,7 +4023,7 @@
"工作区中下列文件将被稀疏检出更新所覆盖：\n"
"%s"
-#: unpack-trees.c:163
+#: unpack-trees.c:168
#, c-format
msgid ""
"The following working tree files would be removed by sparse checkout "
@@ -3782,45 +4033,59 @@
"工作区中下列文件将被稀疏检出更新所删除：\n"
"%s"
-#: unpack-trees.c:240
+#: unpack-trees.c:170
+#, c-format
+msgid ""
+"Cannot update submodule:\n"
+"%s"
+msgstr ""
+"无法更新子模组：\n"
+"%s"
+
+#: unpack-trees.c:247
#, c-format
msgid "Aborting\n"
msgstr "终止中\n"
-#: unpack-trees.c:270
+#: unpack-trees.c:272
+#, c-format
+msgid "submodule update strategy not supported for submodule '%s'"
+msgstr "子模组 %s 不支持子模组更新策略"
+
+#: unpack-trees.c:340
msgid "Checking out files"
msgstr "正在检出文件"
-#: urlmatch.c:120
+#: urlmatch.c:163
msgid "invalid URL scheme name or missing '://' suffix"
msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
-#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
+#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
#, c-format
msgid "invalid %XX escape sequence"
msgstr "无效的 %XX 转义序列"
-#: urlmatch.c:172
+#: urlmatch.c:215
msgid "missing host and scheme is not 'file:'"
msgstr "缺失主机名且 URL 方案不是 'file:'"
-#: urlmatch.c:189
+#: urlmatch.c:232
msgid "a 'file:' URL may not have a port number"
msgstr "一个 'file:' URL 不应该包含端口号"
-#: urlmatch.c:199
+#: urlmatch.c:247
msgid "invalid characters in host name"
msgstr "主机名中包含无效的字符"
-#: urlmatch.c:244 urlmatch.c:255
+#: urlmatch.c:292 urlmatch.c:303
msgid "invalid port number"
msgstr "无效的端口号"
-#: urlmatch.c:322
+#: urlmatch.c:371
msgid "invalid '..' path segment"
msgstr "无效的 '..' 路径片段"
-#: worktree.c:282
+#: worktree.c:285
#, c-format
msgid "failed to read '%s'"
msgstr "无法读取 '%s'"
@@ -3835,28 +4100,28 @@
msgid "could not open '%s' for writing"
msgstr "无法打开 '%s' 进行写入"
-#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759
-#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1033
+#: 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
#, c-format
msgid "could not open '%s' for reading"
msgstr "无法打开 '%s' 进行读取"
-#: wrapper.c:605 wrapper.c:626
+#: wrapper.c:581 wrapper.c:602
#, c-format
msgid "unable to access '%s'"
msgstr "不能访问 '%s'"
-#: wrapper.c:634
+#: wrapper.c:610
msgid "unable to get current working directory"
msgstr "不能获取当前工作目录"
-#: wrapper.c:658
+#: wrapper.c:634
#, c-format
msgid "could not write to %s"
msgstr "不能写入 %s"
-#: wrapper.c:660
+#: wrapper.c:636
#, c-format
msgid "could not close %s"
msgstr "不能关闭 %s"
@@ -3891,11 +4156,11 @@
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " （使用 \"git rm <文件>...\" 标记解决方案）"
-#: wt-status.c:199 wt-status.c:945
+#: wt-status.c:199 wt-status.c:958
msgid "Changes to be committed:"
msgstr "要提交的变更："
-#: wt-status.c:217 wt-status.c:954
+#: wt-status.c:217 wt-status.c:967
msgid "Changes not staged for commit:"
msgstr "尚未暂存以备提交的变更："
@@ -4001,15 +4266,15 @@
msgid "untracked content, "
msgstr "未跟踪的内容, "
-#: wt-status.c:818
+#: wt-status.c:831
msgid "Submodules changed but not updated:"
msgstr "子模组已修改但尚未更新："
-#: wt-status.c:820
+#: wt-status.c:833
msgid "Submodule changes to be committed:"
msgstr "要提交的子模组变更："
-#: wt-status.c:901
+#: wt-status.c:914
msgid ""
"Do not touch the line above.\n"
"Everything below will be removed."
@@ -4017,77 +4282,77 @@
"不要改动上面的一行。\n"
"下面的所有内容均将被删除。"
-#: wt-status.c:1013
+#: wt-status.c:1026
msgid "You have unmerged paths."
msgstr "您有尚未合并的路径。"
# 译者：注意保持前导空格
-#: wt-status.c:1016
+#: wt-status.c:1029
msgid " (fix conflicts and run \"git commit\")"
msgstr " （解决冲突并运行 \"git commit\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1018
+#: wt-status.c:1031
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " （使用 \"git merge --abort\" 终止合并）"
-#: wt-status.c:1023
+#: wt-status.c:1036
msgid "All conflicts fixed but you are still merging."
msgstr "所有冲突已解决但您仍处于合并中。"
# 译者：注意保持前导空格
-#: wt-status.c:1026
+#: wt-status.c:1039
msgid " (use \"git commit\" to conclude merge)"
msgstr " （使用 \"git commit\" 结束合并）"
-#: wt-status.c:1036
+#: wt-status.c:1049
msgid "You are in the middle of an am session."
msgstr "您正处于 am 操作过程中。"
-#: wt-status.c:1039
+#: wt-status.c:1052
msgid "The current patch is empty."
msgstr "当前的补丁为空。"
# 译者：注意保持前导空格
-#: wt-status.c:1043
+#: wt-status.c:1056
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " （解决冲突，然后运行 \"git am --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1045
+#: wt-status.c:1058
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " （使用 \"git am --skip\" 跳过此补丁）"
# 译者：注意保持前导空格
-#: wt-status.c:1047
+#: wt-status.c:1060
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " （使用 \"git am --abort\" 恢复原有分支）"
-#: wt-status.c:1176
+#: wt-status.c:1189
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo 丢失。"
-#: wt-status.c:1178
+#: wt-status.c:1191
msgid "No commands done."
msgstr "没有命令被执行。"
-#: wt-status.c:1181
+#: wt-status.c:1194
#, 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:1192
+#: wt-status.c:1205
#, c-format
msgid " (see more in file %s)"
msgstr " （更多参见文件 %s）"
-#: wt-status.c:1197
+#: wt-status.c:1210
msgid "No commands remaining."
msgstr "未剩下任何命令。"
-#: wt-status.c:1200
+#: wt-status.c:1213
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
@@ -4095,165 +4360,165 @@
msgstr[1] "接下来要执行的命令（剩余 %d 条命令）："
# 译者：注意保持前导空格
-#: wt-status.c:1208
+#: wt-status.c:1221
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " （使用 \"git rebase --edit-todo\" 来查看和编辑）"
-#: wt-status.c:1221
+#: wt-status.c:1234
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
-#: wt-status.c:1226
+#: wt-status.c:1239
msgid "You are currently rebasing."
msgstr "您在执行变基操作。"
# 译者：注意保持前导空格
-#: wt-status.c:1240
+#: wt-status.c:1253
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " （解决冲突，然后运行 \"git rebase --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1242
+#: wt-status.c:1255
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " （使用 \"git rebase --skip\" 跳过此补丁）"
# 译者：注意保持前导空格
-#: wt-status.c:1244
+#: wt-status.c:1257
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " （使用 \"git rebase --abort\" 以检出原有分支）"
# 译者：注意保持前导空格
-#: wt-status.c:1250
+#: wt-status.c:1263
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）"
-#: wt-status.c:1254
+#: wt-status.c:1267
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
-#: wt-status.c:1259
+#: wt-status.c:1272
msgid "You are currently splitting a commit during a rebase."
msgstr "您在执行变基操作时拆分提交。"
# 译者：注意保持前导空格
-#: wt-status.c:1262
+#: wt-status.c:1275
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）"
-#: wt-status.c:1266
+#: wt-status.c:1279
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
-#: wt-status.c:1271
+#: wt-status.c:1284
msgid "You are currently editing a commit during a rebase."
msgstr "您在执行变基操作时编辑提交。"
# 译者：注意保持前导空格
-#: wt-status.c:1274
+#: wt-status.c:1287
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " （使用 \"git commit --amend\" 修补当前提交）"
# 译者：注意保持前导空格
-#: wt-status.c:1276
+#: wt-status.c:1289
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）"
-#: wt-status.c:1286
+#: wt-status.c:1299
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "您在执行拣选提交 %s 的操作。"
# 译者：注意保持前导空格
-#: wt-status.c:1291
+#: wt-status.c:1304
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " （解决冲突并运行 \"git cherry-pick --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1294
+#: wt-status.c:1307
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr " （所有冲突已解决：运行 \"git cherry-pick --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1296
+#: wt-status.c:1309
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr " （使用 \"git cherry-pick --abort\" 以取消拣选操作）"
-#: wt-status.c:1305
+#: wt-status.c:1318
#, c-format
msgid "You are currently reverting commit %s."
msgstr "您在执行反转提交 %s 的操作。"
# 译者：注意保持前导空格
-#: wt-status.c:1310
+#: wt-status.c:1323
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " （解决冲突并运行 \"git revert --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1313
+#: wt-status.c:1326
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " （所有冲突已解决：运行 \"git revert --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1315
+#: wt-status.c:1328
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " （使用 \"git revert --abort\" 以取消反转提交操作）"
-#: wt-status.c:1326
+#: wt-status.c:1339
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
-#: wt-status.c:1330
+#: wt-status.c:1343
msgid "You are currently bisecting."
msgstr "您在执行二分查找操作。"
# 译者：注意保持前导空格
-#: wt-status.c:1333
+#: wt-status.c:1346
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " （使用 \"git bisect reset\" 以回到原有分支）"
-#: wt-status.c:1530
+#: wt-status.c:1543
msgid "On branch "
msgstr "位于分支 "
-#: wt-status.c:1536
+#: wt-status.c:1549
msgid "interactive rebase in progress; onto "
msgstr "交互式变基操作正在进行中；至 "
-#: wt-status.c:1538
+#: wt-status.c:1551
msgid "rebase in progress; onto "
msgstr "变基操作正在进行中；至 "
-#: wt-status.c:1543
+#: wt-status.c:1556
msgid "HEAD detached at "
msgstr "头指针分离于 "
-#: wt-status.c:1545
+#: wt-status.c:1558
msgid "HEAD detached from "
msgstr "头指针分离自 "
-#: wt-status.c:1548
+#: wt-status.c:1561
msgid "Not currently on any branch."
msgstr "当前不在任何分支上。"
-#: wt-status.c:1566
+#: wt-status.c:1579
msgid "Initial commit"
msgstr "初始提交"
-#: wt-status.c:1580
+#: wt-status.c:1593
msgid "Untracked files"
msgstr "未跟踪的文件"
-#: wt-status.c:1582
+#: wt-status.c:1595
msgid "Ignored files"
msgstr "忽略的文件"
-#: wt-status.c:1586
+#: wt-status.c:1599
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -4263,103 +4528,99 @@
"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n"
"但您需要小心不要忘了添加新文件（参见 'git help status'）。"
-#: wt-status.c:1592
+#: wt-status.c:1605
#, c-format
msgid "Untracked files not listed%s"
msgstr "未跟踪的文件没有列出%s"
# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1594
+#: wt-status.c:1607
msgid " (use -u option to show untracked files)"
msgstr "（使用 -u 参数显示未跟踪的文件）"
-#: wt-status.c:1600
+#: wt-status.c:1613
msgid "No changes"
msgstr "没有修改"
-#: wt-status.c:1605
+#: wt-status.c:1618
#, 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:1608
+#: wt-status.c:1621
#, c-format
msgid "no changes added to commit\n"
msgstr "修改尚未加入提交\n"
-#: wt-status.c:1611
+#: wt-status.c:1624
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n"
-#: wt-status.c:1614
+#: wt-status.c:1627
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "提交为空，但是存在尚未跟踪的文件\n"
# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1617
+#: wt-status.c:1630
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n"
-#: wt-status.c:1620 wt-status.c:1625
+#: wt-status.c:1633 wt-status.c:1638
#, c-format
msgid "nothing to commit\n"
msgstr "无文件要提交\n"
# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1623
+#: wt-status.c:1636
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n"
# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1627
+#: wt-status.c:1640
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "无文件要提交，干净的工作区\n"
# 译者：注意保持句尾空格
-#: wt-status.c:1734
+#: wt-status.c:1749
msgid "Initial commit on "
msgstr "初始提交于 "
-#: wt-status.c:1738
+#: wt-status.c:1753
msgid "HEAD (no branch)"
msgstr "HEAD（非分支）"
-#: wt-status.c:1767
-msgid "gone"
-msgstr "丢失"
-
# 译者：注意保持句尾空格
-#: wt-status.c:1769 wt-status.c:1777
+#: wt-status.c:1782 wt-status.c:1790
msgid "behind "
msgstr "落后 "
-#: wt-status.c:1772 wt-status.c:1775
+#: wt-status.c:1785 wt-status.c:1788
msgid "ahead "
msgstr "领先 "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2277
+#: wt-status.c:2280
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "不能%s：您有未暂存的变更。"
-#: wt-status.c:2283
+#: wt-status.c:2286
msgid "additionally, your index contains uncommitted changes."
msgstr "另外，您的索引中包含未提交的变更。"
-#: wt-status.c:2285
+#: wt-status.c:2288
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "不能%s：您的索引中包含未提交的变更。"
-#: compat/precompose_utf8.c:57 builtin/clone.c:414
+#: compat/precompose_utf8.c:57 builtin/clone.c:432
#, c-format
msgid "failed to unlink '%s'"
msgstr "无法删除 '%s'"
@@ -4386,7 +4647,7 @@
msgid "Unstaged changes after refreshing the index:"
msgstr "刷新索引之后尚未被暂存的变更："
-#: builtin/add.c:209 builtin/rev-parse.c:845
+#: builtin/add.c:209 builtin/rev-parse.c:872
msgid "Could not read the index"
msgstr "不能读取索引"
@@ -4406,7 +4667,7 @@
#: builtin/add.c:230
#, c-format
msgid "Could not stat '%s'"
-msgstr "不能查看文件状态 '%s'"
+msgstr "不能对 '%s' 调用 stat"
#: builtin/add.c:232
msgid "Empty patch. Aborted."
@@ -4421,9 +4682,9 @@
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"
-#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:123
+#: 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:1326 builtin/rm.c:241 builtin/send-pack.c:162
+#: builtin/remote.c:1328 builtin/rm.c:241 builtin/send-pack.c:163
msgid "dry run"
msgstr "演习"
@@ -4431,7 +4692,7 @@
msgid "interactive picking"
msgstr "交互式拣选"
-#: builtin/add.c:270 builtin/checkout.c:1159 builtin/reset.c:286
+#: builtin/add.c:270 builtin/checkout.c:1177 builtin/reset.c:286
msgid "select hunks interactively"
msgstr "交互式挑选数据块"
@@ -4471,11 +4732,11 @@
msgid "check if - even missing - files are ignored in dry run"
msgstr "检查在演习模式下文件（即使不存在）是否被忽略"
-#: builtin/add.c:283 builtin/update-index.c:947
+#: builtin/add.c:283 builtin/update-index.c:951
msgid "(+/-)x"
msgstr "(+/-)x"
-#: builtin/add.c:283 builtin/update-index.c:948
+#: builtin/add.c:283 builtin/update-index.c:952
msgid "override the executable bit of the listed files"
msgstr "覆盖列表里文件的可执行位"
@@ -4511,112 +4772,112 @@
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:279
-#: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350
+#: 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/submodule--helper.c:244
msgid "index file corrupt"
msgstr "索引文件损坏"
-#: builtin/am.c:414
+#: builtin/am.c:412
msgid "could not parse author script"
msgstr "不能解析作者脚本"
-#: builtin/am.c:491
+#: builtin/am.c:489
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' 被 applypatch-msg 钩子删除"
-#: builtin/am.c:532
+#: builtin/am.c:530
#, c-format
msgid "Malformed input line: '%s'."
msgstr "非法的输入行：'%s'。"
-#: builtin/am.c:569
+#: builtin/am.c:567
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
-#: builtin/am.c:595
+#: builtin/am.c:593
msgid "fseek failed"
msgstr "fseek 失败"
-#: builtin/am.c:775
+#: builtin/am.c:777
#, c-format
msgid "could not parse patch '%s'"
msgstr "无法解析补丁 '%s'"
-#: builtin/am.c:840
+#: builtin/am.c:842
msgid "Only one StGIT patch series can be applied at once"
msgstr "一次只能有一个 StGIT 补丁队列被应用"
-#: builtin/am.c:887
+#: builtin/am.c:889
msgid "invalid timestamp"
msgstr "无效的时间戳"
-#: builtin/am.c:890 builtin/am.c:898
+#: builtin/am.c:892 builtin/am.c:900
msgid "invalid Date line"
msgstr "无效的日期行"
-#: builtin/am.c:895
+#: builtin/am.c:897
msgid "invalid timezone offset"
msgstr "无效的时区偏移值"
-#: builtin/am.c:984
+#: builtin/am.c:986
msgid "Patch format detection failed."
-msgstr "补丁格式检测失败。"
+msgstr "补丁格式探测失败。"
-#: builtin/am.c:989 builtin/clone.c:379
+#: builtin/am.c:991 builtin/clone.c:397
#, c-format
msgid "failed to create directory '%s'"
msgstr "无法创建目录 '%s'"
-#: builtin/am.c:993
+#: builtin/am.c:995
msgid "Failed to split patches."
msgstr "无法拆分补丁。"
-#: builtin/am.c:1125 builtin/commit.c:376
+#: builtin/am.c:1127 builtin/commit.c:376
msgid "unable to write index file"
msgstr "无法写入索引文件"
-#: builtin/am.c:1176
+#: builtin/am.c:1178
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "当您解决这一问题，执行 \"%s --continue\"。"
-#: builtin/am.c:1177
+#: builtin/am.c:1179
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。"
-#: builtin/am.c:1178
+#: builtin/am.c:1180
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr "若要复原至原始分支并停止补丁操作，执行 \"%s --abort\"。"
-#: builtin/am.c:1316
+#: builtin/am.c:1315
msgid "Patch is empty. Was it split wrong?"
msgstr "补丁为空。是不是切分错误？"
-#: builtin/am.c:1390 builtin/log.c:1550
+#: builtin/am.c:1386 builtin/log.c:1557
#, c-format
msgid "invalid ident line: %s"
msgstr "包含无效的身份标识：%s"
-#: builtin/am.c:1417
+#: builtin/am.c:1413
#, c-format
msgid "unable to parse commit %s"
msgstr "不能解析提交 %s"
-#: builtin/am.c:1610
+#: builtin/am.c:1606
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr "仓库缺乏必要的数据对象以进行三方合并。"
-#: builtin/am.c:1612
+#: builtin/am.c:1608
msgid "Using index info to reconstruct a base tree..."
msgstr "使用索引来重建一个（三方合并的）基础目录树..."
-#: builtin/am.c:1631
+#: builtin/am.c:1627
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -4624,37 +4885,37 @@
"您是否曾手动编辑过您的补丁？\n"
"无法应用补丁到索引中的数据对象上。"
-#: builtin/am.c:1637
+#: builtin/am.c:1633
msgid "Falling back to patching base and 3-way merge..."
msgstr "回落到基础版本上打补丁及进行三方合并..."
-#: builtin/am.c:1662
+#: builtin/am.c:1658
msgid "Failed to merge in the changes."
msgstr "无法合并变更。"
-#: builtin/am.c:1686 builtin/merge.c:632
+#: builtin/am.c:1682 builtin/merge.c:631
msgid "git write-tree failed to write a tree"
msgstr "git write-tree 无法写入一树对象"
-#: builtin/am.c:1693
+#: builtin/am.c:1689
msgid "applying to an empty history"
msgstr "正应用到一个空历史上"
-#: builtin/am.c:1706 builtin/commit.c:1764 builtin/merge.c:802
+#: builtin/am.c:1702 builtin/commit.c:1764 builtin/merge.c:802
#: builtin/merge.c:827
msgid "failed to write commit object"
msgstr "无法写提交对象"
-#: builtin/am.c:1739 builtin/am.c:1743
+#: builtin/am.c:1735 builtin/am.c:1739
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "无法继续：%s 不存在。"
-#: builtin/am.c:1759
+#: builtin/am.c:1755
msgid "cannot be interactive without stdin connected to a terminal."
msgstr "标准输入没有和终端关联，不能进行交互式操作。"
-#: builtin/am.c:1764
+#: builtin/am.c:1760
msgid "Commit Body is:"
msgstr "提交内容为："
@@ -4663,35 +4924,35 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1774
+#: builtin/am.c:1770
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "应用？是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]："
-#: builtin/am.c:1824
+#: builtin/am.c:1820
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "脏索引：不能应用补丁（脏文件：%s）"
-#: builtin/am.c:1861 builtin/am.c:1933
+#: builtin/am.c:1860 builtin/am.c:1932
#, c-format
msgid "Applying: %.*s"
msgstr "应用：%.*s"
-#: builtin/am.c:1877
+#: builtin/am.c:1876
msgid "No changes -- Patch already applied."
msgstr "没有变更 —— 补丁已经应用过。"
-#: builtin/am.c:1885
+#: builtin/am.c:1884
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "打补丁失败于 %s %.*s"
-#: builtin/am.c:1891
+#: builtin/am.c:1890
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "失败的补丁文件副本位于：%s"
-#: builtin/am.c:1936
+#: builtin/am.c:1935
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -4701,7 +4962,7 @@
"如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n"
"您也许想要跳过这个补丁。"
-#: builtin/am.c:1943
+#: builtin/am.c:1942
msgid ""
"You still have unmerged paths in your index.\n"
"Did you forget to use 'git add'?"
@@ -4709,149 +4970,149 @@
"您的索引中仍有未合并的路径。\n"
"您是否忘了执行 'git add'？"
-#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308
+#: builtin/am.c:2050 builtin/am.c:2054 builtin/am.c:2066 builtin/reset.c:308
#: builtin/reset.c:316
#, c-format
msgid "Could not parse object '%s'."
msgstr "不能解析对象 '%s'。"
-#: builtin/am.c:2103
+#: builtin/am.c:2102
msgid "failed to clean index"
msgstr "无法清空索引"
-#: builtin/am.c:2137
+#: builtin/am.c:2136
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:2200
+#: builtin/am.c:2199
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "无效的 --patch-format 值：%s"
-#: builtin/am.c:2233
+#: builtin/am.c:2232
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2234
+#: builtin/am.c:2233
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<选项>] (--continue | --skip | --abort)"
-#: builtin/am.c:2240
+#: builtin/am.c:2239
msgid "run interactively"
msgstr "以交互式方式运行"
-#: builtin/am.c:2242
+#: builtin/am.c:2241
msgid "historical option -- no-op"
msgstr "老的参数 —— 无作用"
-#: builtin/am.c:2244
+#: builtin/am.c:2243
msgid "allow fall back on 3way merging if needed"
msgstr "如果必要，允许使用三方合并。"
-#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57
+#: builtin/am.c:2244 builtin/init-db.c:483 builtin/prune-packed.c:57
#: builtin/repack.c:178
msgid "be quiet"
msgstr "静默模式"
-#: builtin/am.c:2247
+#: builtin/am.c:2246
msgid "add a Signed-off-by line to the commit message"
msgstr "在提交说明中添加一个 Signed-off-by 签名"
-#: builtin/am.c:2250
+#: builtin/am.c:2249
msgid "recode into utf8 (default)"
msgstr "使用 utf8 字符集（默认）"
-#: builtin/am.c:2252
+#: builtin/am.c:2251
msgid "pass -k flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -k 参数"
-#: builtin/am.c:2254
+#: builtin/am.c:2253
msgid "pass -b flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -b 参数"
-#: builtin/am.c:2256
+#: builtin/am.c:2255
msgid "pass -m flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -m 参数"
-#: builtin/am.c:2258
+#: builtin/am.c:2257
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数"
-#: builtin/am.c:2261
+#: builtin/am.c:2260
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置"
-#: builtin/am.c:2264
+#: builtin/am.c:2263
msgid "strip everything before a scissors line"
msgstr "丢弃裁切线前的所有内容"
-#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
-#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287
-#: builtin/am.c:2293
+#: 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
msgid "pass it through git-apply"
msgstr "传递给 git-apply"
-#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
-#: builtin/grep.c:1038 builtin/merge.c:202 builtin/pull.c:135
+#: 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:644 builtin/show-ref.c:169 builtin/tag.c:355
+#: 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
msgid "n"
msgstr "n"
-#: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438
-#: builtin/tag.c:387 builtin/verify-tag.c:38
+#: 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
msgid "format"
msgstr "格式"
-#: builtin/am.c:2290
+#: builtin/am.c:2289
msgid "format the patch(es) are in"
msgstr "补丁的格式"
-#: builtin/am.c:2296
+#: builtin/am.c:2295
msgid "override error message when patch failure occurs"
msgstr "打补丁失败时显示的错误信息"
-#: builtin/am.c:2298
+#: builtin/am.c:2297
msgid "continue applying patches after resolving a conflict"
msgstr "冲突解决后继续应用补丁"
-#: builtin/am.c:2301
+#: builtin/am.c:2300
msgid "synonyms for --continue"
msgstr "和 --continue 同义"
-#: builtin/am.c:2304
+#: builtin/am.c:2303
msgid "skip the current patch"
msgstr "跳过当前补丁"
-#: builtin/am.c:2307
+#: builtin/am.c:2306
msgid "restore the original branch and abort the patching operation."
msgstr "恢复原始分支并终止打补丁操作。"
-#: builtin/am.c:2311
+#: builtin/am.c:2310
msgid "lie about committer date"
msgstr "将作者日期作为提交日期"
-#: builtin/am.c:2313
+#: builtin/am.c:2312
msgid "use current timestamp for author date"
msgstr "用当前时间作为作者日期"
-#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:233
-#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:370
+#: builtin/am.c:2314 builtin/commit.c:1600 builtin/merge.c:232
+#: builtin/pull.c:165 builtin/revert.c:111 builtin/tag.c:413
msgid "key-id"
msgstr "key-id"
-#: builtin/am.c:2316
+#: builtin/am.c:2315
msgid "GPG-sign commits"
msgstr "使用 GPG 签名提交"
-#: builtin/am.c:2319
+#: builtin/am.c:2318
msgid "(internal use for git-rebase)"
msgstr "（内部使用，用于 git-rebase）"
-#: builtin/am.c:2334
+#: builtin/am.c:2333
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."
@@ -4859,16 +5120,16 @@
"参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被移除。\n"
"请不要再使用它了。"
-#: builtin/am.c:2341
+#: builtin/am.c:2340
msgid "failed to read the index"
msgstr "无法读取索引"
-#: builtin/am.c:2356
+#: builtin/am.c:2355
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。"
-#: builtin/am.c:2380
+#: builtin/am.c:2379
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -4877,7 +5138,7 @@
"发现了错误的 %s 目录。\n"
"使用 \"git am --abort\" 删除它。"
-#: builtin/am.c:2386
+#: builtin/am.c:2385
msgid "Resolve operation not in progress, we are not resuming."
msgstr "解决操作未进行，我们不会继续。"
@@ -4907,11 +5168,6 @@
msgid "git archive: NACK %s"
msgstr "git archive：NACK %s"
-#: builtin/archive.c:63
-#, c-format
-msgid "remote error: %s"
-msgstr "远程错误：%s"
-
#: builtin/archive.c:64
msgid "git archive: protocol error"
msgstr "git archive：协议错误"
@@ -4940,111 +5196,111 @@
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
-#: builtin/blame.c:1786
+#: builtin/blame.c:1777
msgid "Blaming lines"
msgstr "追踪代码行"
-#: builtin/blame.c:2582
+#: builtin/blame.c:2573
msgid "Show blame entries as we find them, incrementally"
msgstr "增量式地显示发现的 blame 条目"
-#: builtin/blame.c:2583
+#: builtin/blame.c:2574
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "边界提交显示空的 SHA-1（默认：关闭）"
-#: builtin/blame.c:2584
+#: builtin/blame.c:2575
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "不把根提交作为边界（默认：关闭）"
-#: builtin/blame.c:2585
+#: builtin/blame.c:2576
msgid "Show work cost statistics"
msgstr "显示命令消耗统计"
-#: builtin/blame.c:2586
+#: builtin/blame.c:2577
msgid "Force progress reporting"
msgstr "强制进度显示"
-#: builtin/blame.c:2587
+#: builtin/blame.c:2578
msgid "Show output score for blame entries"
msgstr "显示判断 blame 条目位移的得分诊断信息"
-#: builtin/blame.c:2588
+#: builtin/blame.c:2579
msgid "Show original filename (Default: auto)"
msgstr "显示原始文件名（默认：自动）"
-#: builtin/blame.c:2589
+#: builtin/blame.c:2580
msgid "Show original linenumber (Default: off)"
msgstr "显示原始的行号（默认：关闭）"
-#: builtin/blame.c:2590
+#: builtin/blame.c:2581
msgid "Show in a format designed for machine consumption"
msgstr "显示为一个适合机器读取的格式"
-#: builtin/blame.c:2591
+#: builtin/blame.c:2582
msgid "Show porcelain format with per-line commit information"
msgstr "为每一行显示机器适用的提交信息"
-#: builtin/blame.c:2592
+#: builtin/blame.c:2583
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "使用和 git-annotate 相同的输出模式（默认：关闭）"
-#: builtin/blame.c:2593
+#: builtin/blame.c:2584
msgid "Show raw timestamp (Default: off)"
msgstr "显示原始时间戳（默认：关闭）"
-#: builtin/blame.c:2594
+#: builtin/blame.c:2585
msgid "Show long commit SHA1 (Default: off)"
msgstr "显示长的 SHA1 提交号（默认：关闭）"
-#: builtin/blame.c:2595
+#: builtin/blame.c:2586
msgid "Suppress author name and timestamp (Default: off)"
msgstr "隐藏作者名字和时间戳（默认：关闭）"
-#: builtin/blame.c:2596
+#: builtin/blame.c:2587
msgid "Show author email instead of name (Default: off)"
msgstr "显示作者的邮箱而不是名字（默认：关闭）"
-#: builtin/blame.c:2597
+#: builtin/blame.c:2588
msgid "Ignore whitespace differences"
msgstr "忽略空白差异"
-#: builtin/blame.c:2604
+#: builtin/blame.c:2595
msgid "Use an experimental heuristic to improve diffs"
msgstr "使用一个试验性的启发式算法改进差异显示"
-#: builtin/blame.c:2606
+#: builtin/blame.c:2597
msgid "Spend extra cycles to find better match"
msgstr "花费额外的循环来找到更好的匹配"
-#: builtin/blame.c:2607
+#: builtin/blame.c:2598
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
-#: builtin/blame.c:2608
+#: builtin/blame.c:2599
msgid "Use <file>'s contents as the final image"
msgstr "使用 <文件> 的内容作为最终的图片"
-#: builtin/blame.c:2609 builtin/blame.c:2610
+#: builtin/blame.c:2600 builtin/blame.c:2601
msgid "score"
msgstr "得分"
-#: builtin/blame.c:2609
+#: builtin/blame.c:2600
msgid "Find line copies within and across files"
msgstr "找到文件内及跨文件的行拷贝"
-#: builtin/blame.c:2610
+#: builtin/blame.c:2601
msgid "Find line movements within and across files"
msgstr "找到文件内及跨文件的行移动"
-#: builtin/blame.c:2611
+#: builtin/blame.c:2602
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2611
+#: builtin/blame.c:2602
msgid "Process only line range n,m, counting from 1"
msgstr "只处理行范围在 n 和 m 之间的，从 1 开始"
-#: builtin/blame.c:2658
+#: builtin/blame.c:2649
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用"
@@ -5054,38 +5310,38 @@
#. 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:2706
+#: builtin/blame.c:2697
msgid "4 years, 11 months ago"
msgstr "4 年 11 个月前"
-#: builtin/blame.c:2786
+#: builtin/blame.c:2777
msgid "--contents and --reverse do not blend well."
msgstr "--contents 和 --reverse 不能混用。"
-#: builtin/blame.c:2806
+#: builtin/blame.c:2797
msgid "cannot use --contents with final commit object name"
msgstr "不能将 --contents 和最终的提交对象名共用"
-#: builtin/blame.c:2811
+#: builtin/blame.c:2802
msgid "--reverse and --first-parent together require specified latest commit"
msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"
-#: builtin/blame.c:2838
+#: builtin/blame.c:2829
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr "--reverse 和 --first-parent 共用，需要第一祖先链上的提交范围"
-#: builtin/blame.c:2849
+#: builtin/blame.c:2840
#, c-format
msgid "no such path %s in %s"
msgstr "在 %2$s 中无此路径 %1$s"
-#: builtin/blame.c:2860
+#: builtin/blame.c:2851
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "不能为路径 %2$s 读取数据对象 %1$s"
-#: builtin/blame.c:2879
+#: builtin/blame.c:2870
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
@@ -5112,8 +5368,12 @@
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [<选项>] [-r | -a] [--points-at]"
+#: builtin/branch.c:31
+msgid "git branch [<options>] [-r | -a] [--format]"
+msgstr "git branch [<选项>] [-r | -a] [--format]"
+
# 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
-#: builtin/branch.c:143
+#: builtin/branch.c:144
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -5123,7 +5383,7 @@
" '%s'，但未合并到 HEAD。"
# 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
-#: builtin/branch.c:147
+#: builtin/branch.c:148
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -5132,12 +5392,12 @@
"并未删除分支 '%s'， 虽然它已经合并到 HEAD，\n"
" 然而却尚未被合并到分支 '%s' 。"
-#: builtin/branch.c:161
+#: builtin/branch.c:162
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "无法查询 '%s' 指向的提交对象"
-#: builtin/branch.c:165
+#: builtin/branch.c:166
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -5146,163 +5406,91 @@
"分支 '%s' 没有完全合并。\n"
"如果您确认要删除它，执行 'git branch -D %s'。"
-#: builtin/branch.c:178
+#: builtin/branch.c:179
msgid "Update of config-file failed"
msgstr "无法更新 config 文件"
-#: builtin/branch.c:206
+#: builtin/branch.c:210
msgid "cannot use -a with -d"
msgstr "不能将 -a 和 -d 同时使用"
-#: builtin/branch.c:212
+#: builtin/branch.c:216
msgid "Couldn't look up commit object for HEAD"
msgstr "无法查询 HEAD 指向的提交对象"
-#: builtin/branch.c:226
+#: builtin/branch.c:230
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
-#: builtin/branch.c:241
+#: builtin/branch.c:245
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "未能找到远程跟踪分支 '%s'。"
-#: builtin/branch.c:242
+#: builtin/branch.c:246
#, c-format
msgid "branch '%s' not found."
msgstr "分支 '%s' 未发现。"
-#: builtin/branch.c:257
+#: builtin/branch.c:261
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "无法删除远程跟踪分支 '%s'"
-#: builtin/branch.c:258
+#: builtin/branch.c:262
#, c-format
msgid "Error deleting branch '%s'"
msgstr "无法删除分支 '%s'"
-#: builtin/branch.c:265
+#: builtin/branch.c:269
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "已删除远程跟踪分支 %s（曾为 %s）。\n"
-#: builtin/branch.c:266
+#: builtin/branch.c:270
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "已删除分支 %s（曾为 %s）。\n"
-#: builtin/branch.c:312
-#, c-format
-msgid "[%s: gone]"
-msgstr "[%s: 丢失]"
-
-#: builtin/branch.c:317
-#, c-format
-msgid "[%s]"
-msgstr "[%s]"
-
-#: builtin/branch.c:322
-#, c-format
-msgid "[%s: behind %d]"
-msgstr "[%s：落后 %d]"
-
-#: builtin/branch.c:324
-#, c-format
-msgid "[behind %d]"
-msgstr "[落后 %d]"
-
-#: builtin/branch.c:328
-#, c-format
-msgid "[%s: ahead %d]"
-msgstr "[%s：领先 %d]"
-
-#: builtin/branch.c:330
-#, c-format
-msgid "[ahead %d]"
-msgstr "[领先 %d]"
-
-#: builtin/branch.c:333
-#, c-format
-msgid "[%s: ahead %d, behind %d]"
-msgstr "[%s：领先 %d，落后 %d]"
-
-#: builtin/branch.c:336
-#, c-format
-msgid "[ahead %d, behind %d]"
-msgstr "[领先 %d，落后 %d]"
-
-#: builtin/branch.c:349
-msgid " **** invalid ref ****"
-msgstr " **** 无效引用 ****"
-
-#: builtin/branch.c:375
-#, c-format
-msgid "(no branch, rebasing %s)"
-msgstr "（非分支，正变基 %s）"
-
-#: builtin/branch.c:378
-#, c-format
-msgid "(no branch, bisect started on %s)"
-msgstr "（非分支，二分查找开始于 %s）"
-
-#. TRANSLATORS: make sure this matches
-#. "HEAD detached at " in wt-status.c
-#: builtin/branch.c:384
-#, c-format
-msgid "(HEAD detached at %s)"
-msgstr "（头指针分离于 %s）"
-
-#. TRANSLATORS: make sure this matches
-#. "HEAD detached from " in wt-status.c
-#: builtin/branch.c:389
-#, c-format
-msgid "(HEAD detached from %s)"
-msgstr "（头指针分离自 %s）"
-
-#: builtin/branch.c:393
-msgid "(no branch)"
-msgstr "（非分支）"
-
-#: builtin/branch.c:535
+#: builtin/branch.c:441
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "分支 %s 正被变基到 %s"
-#: builtin/branch.c:539
+#: builtin/branch.c:445
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "分支 %s 正被二分查找于 %s"
-#: builtin/branch.c:554
+#: builtin/branch.c:460
msgid "cannot rename the current branch while not on any."
msgstr "无法重命名当前分支因为不处于任何分支上。"
-#: builtin/branch.c:564
+#: builtin/branch.c:470
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "无效的分支名：'%s'"
-#: builtin/branch.c:581
+#: builtin/branch.c:487
msgid "Branch rename failed"
msgstr "分支重命名失败"
-#: builtin/branch.c:585
+#: builtin/branch.c:490
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "重命名掉一个错误命名的旧分支 '%s'"
-#: builtin/branch.c:588
+#: builtin/branch.c:493
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "分支重命名为 %s，但 HEAD 没有更新！"
-#: builtin/branch.c:595
+#: builtin/branch.c:502
msgid "Branch is renamed, but update of config-file failed"
msgstr "分支被重命名，但更新 config 文件失败"
-#: builtin/branch.c:611
+#: builtin/branch.c:518
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -5313,204 +5501,213 @@
" %s\n"
"以 '%c' 开头的行将被过滤。\n"
-#: builtin/branch.c:643
+#: builtin/branch.c:551
msgid "Generic options"
msgstr "通用选项"
-#: builtin/branch.c:645
+#: builtin/branch.c:553
msgid "show hash and subject, give twice for upstream branch"
msgstr "显示哈希值和主题，若参数出现两次则显示上游分支"
-#: builtin/branch.c:646
+#: builtin/branch.c:554
msgid "suppress informational messages"
msgstr "不显示信息"
-#: builtin/branch.c:647
+#: builtin/branch.c:555
msgid "set up tracking mode (see git-pull(1))"
msgstr "设置跟踪模式（参见 git-pull(1)）"
-#: builtin/branch.c:649
+#: builtin/branch.c:557
msgid "change upstream info"
msgstr "改变上游信息"
-#: builtin/branch.c:651
+#: builtin/branch.c:559
msgid "upstream"
msgstr "上游"
-#: builtin/branch.c:651
+#: builtin/branch.c:559
msgid "change the upstream info"
msgstr "改变上游信息"
-#: builtin/branch.c:652
+#: builtin/branch.c:560
msgid "Unset the upstream info"
msgstr "取消上游信息的设置"
-#: builtin/branch.c:653
+#: builtin/branch.c:561
msgid "use colored output"
msgstr "使用彩色输出"
-#: builtin/branch.c:654
+#: builtin/branch.c:562
msgid "act on remote-tracking branches"
msgstr "作用于远程跟踪分支"
-#: builtin/branch.c:656 builtin/branch.c:657
+#: builtin/branch.c:564 builtin/branch.c:566
msgid "print only branches that contain the commit"
msgstr "只打印包含该提交的分支"
-#: builtin/branch.c:660
+#: builtin/branch.c:565 builtin/branch.c:567
+msgid "print only branches that don't contain the commit"
+msgstr "只打印不包含该提交的分支"
+
+#: builtin/branch.c:570
msgid "Specific git-branch actions:"
msgstr "具体的 git-branch 动作："
-#: builtin/branch.c:661
+#: builtin/branch.c:571
msgid "list both remote-tracking and local branches"
msgstr "列出远程跟踪及本地分支"
-#: builtin/branch.c:663
+#: builtin/branch.c:573
msgid "delete fully merged branch"
msgstr "删除完全合并的分支"
-#: builtin/branch.c:664
+#: builtin/branch.c:574
msgid "delete branch (even if not merged)"
msgstr "删除分支（即使没有合并）"
-#: builtin/branch.c:665
+#: builtin/branch.c:575
msgid "move/rename a branch and its reflog"
msgstr "移动/重命名一个分支，以及它的引用日志"
-#: builtin/branch.c:666
+#: builtin/branch.c:576
msgid "move/rename a branch, even if target exists"
msgstr "移动/重命名一个分支，即使目标已存在"
-#: builtin/branch.c:667
+#: builtin/branch.c:577
msgid "list branch names"
msgstr "列出分支名"
-#: builtin/branch.c:668
+#: builtin/branch.c:578
msgid "create the branch's reflog"
msgstr "创建分支的引用日志"
-#: builtin/branch.c:670
+#: builtin/branch.c:580
msgid "edit the description for the branch"
msgstr "标记分支的描述"
-#: builtin/branch.c:671
+#: builtin/branch.c:581
msgid "force creation, move/rename, deletion"
msgstr "强制创建、移动/重命名、删除"
-#: builtin/branch.c:672
+#: builtin/branch.c:582
msgid "print only branches that are merged"
msgstr "只打印已经合并的分支"
-#: builtin/branch.c:673
+#: builtin/branch.c:583
msgid "print only branches that are not merged"
msgstr "只打印尚未合并的分支"
-#: builtin/branch.c:674
+#: builtin/branch.c:584
msgid "list branches in columns"
msgstr "以列的方式显示分支"
-#: builtin/branch.c:675 builtin/for-each-ref.c:38 builtin/tag.c:381
+#: builtin/branch.c:585 builtin/for-each-ref.c:38 builtin/tag.c:426
msgid "key"
msgstr "key"
-#: builtin/branch.c:676 builtin/for-each-ref.c:39 builtin/tag.c:382
+#: builtin/branch.c:586 builtin/for-each-ref.c:39 builtin/tag.c:427
msgid "field name to sort on"
msgstr "排序的字段名"
-#: builtin/branch.c:678 builtin/for-each-ref.c:41 builtin/notes.c:404
+#: 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:384
+#: builtin/tag.c:429
msgid "object"
msgstr "对象"
-#: builtin/branch.c:679
+#: builtin/branch.c:589
msgid "print only branches of the object"
msgstr "只打印指向该对象的分支"
-#: builtin/branch.c:681 builtin/for-each-ref.c:46 builtin/tag.c:388
+#: builtin/branch.c:591 builtin/for-each-ref.c:47 builtin/tag.c:434
msgid "sorting and filtering are case insensitive"
msgstr "排序和过滤属于大小写不敏感"
-#: builtin/branch.c:698
+#: builtin/branch.c:592 builtin/for-each-ref.c:37 builtin/tag.c:433
+#: builtin/verify-tag.c:38
+msgid "format to use for the output"
+msgstr "输出格式"
+
+#: builtin/branch.c:611
msgid "Failed to resolve HEAD as a valid ref."
msgstr "无法将 HEAD 解析为有效引用。"
-#: builtin/branch.c:702 builtin/clone.c:706
+#: builtin/branch.c:615 builtin/clone.c:724
msgid "HEAD not found below refs/heads!"
msgstr "HEAD 没有位于 /refs/heads 之下！"
-#: builtin/branch.c:724
+#: builtin/branch.c:638
msgid "--column and --verbose are incompatible"
msgstr "--column 和 --verbose 不兼容"
-#: builtin/branch.c:735 builtin/branch.c:787
+#: builtin/branch.c:649 builtin/branch.c:701
msgid "branch name required"
msgstr "必须提供分支名"
-#: builtin/branch.c:763
+#: builtin/branch.c:677
msgid "Cannot give description to detached HEAD"
msgstr "不能向分离头指针提供描述"
-#: builtin/branch.c:768
+#: builtin/branch.c:682
msgid "cannot edit description of more than one branch"
msgstr "不能为一个以上的分支编辑描述"
-#: builtin/branch.c:775
+#: builtin/branch.c:689
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "分支 '%s' 尚无提交。"
-#: builtin/branch.c:778
+#: builtin/branch.c:692
#, c-format
msgid "No branch named '%s'."
msgstr "没有分支 '%s'。"
-#: builtin/branch.c:793
+#: builtin/branch.c:707
msgid "too many branches for a rename operation"
msgstr "为重命名操作提供了太多的分支名"
-#: builtin/branch.c:798
+#: builtin/branch.c:712
msgid "too many branches to set new upstream"
msgstr "为设置新上游提供了太多的分支名"
-#: builtin/branch.c:802
+#: builtin/branch.c:716
#, 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:805 builtin/branch.c:827 builtin/branch.c:848
+#: builtin/branch.c:719 builtin/branch.c:741 builtin/branch.c:762
#, c-format
msgid "no such branch '%s'"
msgstr "没有此分支 '%s'"
-#: builtin/branch.c:809
+#: builtin/branch.c:723
#, c-format
msgid "branch '%s' does not exist"
msgstr "分支 '%s' 不存在"
-#: builtin/branch.c:821
+#: builtin/branch.c:735
msgid "too many branches to unset upstream"
msgstr "为取消上游设置操作提供了太多的分支名"
-#: builtin/branch.c:825
+#: builtin/branch.c:739
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
-#: builtin/branch.c:831
+#: builtin/branch.c:745
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "分支 '%s' 没有上游信息"
-#: builtin/branch.c:845
+#: builtin/branch.c:759
msgid "it does not make sense to create 'HEAD' manually"
msgstr "手工创建 'HEAD' 没有意义"
-#: builtin/branch.c:851
+#: builtin/branch.c:765
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
-#: builtin/branch.c:854
+#: builtin/branch.c:768
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
@@ -5518,7 +5715,7 @@
msgstr ""
"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
-#: builtin/branch.c:871
+#: builtin/branch.c:785
#, c-format
msgid ""
"\n"
@@ -5529,16 +5726,16 @@
"如果你想用 '%s' 跟踪 '%s', 这么做：\n"
"\n"
-#: builtin/bundle.c:51
+#: builtin/bundle.c:45
#, c-format
msgid "%s is okay\n"
msgstr "%s 可以\n"
-#: builtin/bundle.c:64
+#: builtin/bundle.c:58
msgid "Need a repository to create a bundle."
msgstr "需要一个仓库来创建包。"
-#: builtin/bundle.c:68
+#: builtin/bundle.c:62
msgid "Need a repository to unbundle."
msgstr "需要一个仓库来解包。"
@@ -5586,7 +5783,7 @@
msgid "for blob objects, run filters on object's content"
msgstr "对于数据对象，对其内容做过滤"
-#: builtin/cat-file.c:561 git-submodule.sh:929
+#: builtin/cat-file.c:561 git-submodule.sh:943
msgid "blob"
msgstr "数据对象"
@@ -5642,7 +5839,7 @@
msgid "terminate input and output records by a NUL character"
msgstr "输入和输出的记录使用 NUL 字符终结"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1140 builtin/gc.c:332
+#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:356
msgid "suppress progress reporting"
msgstr "不显示进度报告"
@@ -5732,9 +5929,9 @@
msgstr "将内容写入临时文件"
#: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:597 builtin/submodule--helper.c:600
-#: builtin/submodule--helper.c:606 builtin/submodule--helper.c:967
-#: builtin/worktree.c:471
+#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
+#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
+#: builtin/worktree.c:477
msgid "string"
msgstr "字符串"
@@ -5746,114 +5943,114 @@
msgid "copy out the files from named stage"
msgstr "从指定暂存区中拷出文件"
-#: builtin/checkout.c:25
+#: builtin/checkout.c:27
msgid "git checkout [<options>] <branch>"
msgstr "git checkout [<选项>] <分支>"
-#: builtin/checkout.c:26
+#: builtin/checkout.c:28
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
-#: builtin/checkout.c:134 builtin/checkout.c:167
+#: builtin/checkout.c:153 builtin/checkout.c:186
#, c-format
msgid "path '%s' does not have our version"
msgstr "路径 '%s' 没有我们的版本"
-#: builtin/checkout.c:136 builtin/checkout.c:169
+#: builtin/checkout.c:155 builtin/checkout.c:188
#, c-format
msgid "path '%s' does not have their version"
msgstr "路径 '%s' 没有他们的版本"
-#: builtin/checkout.c:152
+#: builtin/checkout.c:171
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "路径 '%s' 没有全部必须的版本"
-#: builtin/checkout.c:196
+#: builtin/checkout.c:215
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "路径 '%s' 没有必须的版本"
-#: builtin/checkout.c:213
+#: builtin/checkout.c:232
#, c-format
msgid "path '%s': cannot merge"
msgstr "path '%s'：无法合并"
-#: builtin/checkout.c:230
+#: builtin/checkout.c:249
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "无法为 '%s' 添加合并结果"
-#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
-#: builtin/checkout.c:259
+#: builtin/checkout.c:269 builtin/checkout.c:272 builtin/checkout.c:275
+#: builtin/checkout.c:278
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' 不能在更新路径时使用"
-#: builtin/checkout.c:262 builtin/checkout.c:265
+#: builtin/checkout.c:281 builtin/checkout.c:284
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' 不能和 %s 同时使用"
-#: builtin/checkout.c:268
+#: builtin/checkout.c:287
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr "不能同时更新路径并切换到分支'%s'。"
-#: builtin/checkout.c:339 builtin/checkout.c:346
+#: builtin/checkout.c:358 builtin/checkout.c:365
#, c-format
msgid "path '%s' is unmerged"
msgstr "路径 '%s' 未合并"
-#: builtin/checkout.c:494
+#: builtin/checkout.c:513
msgid "you need to resolve your current index first"
msgstr "您需要先解决当前索引的冲突"
-#: builtin/checkout.c:625
+#: builtin/checkout.c:644
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "不能对 '%s' 执行 reflog 操作：%s\n"
-#: builtin/checkout.c:666
+#: builtin/checkout.c:685
msgid "HEAD is now at"
msgstr "HEAD 目前位于"
-#: builtin/checkout.c:670 builtin/clone.c:660
+#: builtin/checkout.c:689 builtin/clone.c:678
msgid "unable to update HEAD"
msgstr "不能更新 HEAD"
-#: builtin/checkout.c:674
+#: builtin/checkout.c:693
#, c-format
msgid "Reset branch '%s'\n"
msgstr "重置分支 '%s'\n"
-#: builtin/checkout.c:677
+#: builtin/checkout.c:696
#, c-format
msgid "Already on '%s'\n"
msgstr "已经位于 '%s'\n"
-#: builtin/checkout.c:681
+#: builtin/checkout.c:700
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "切换并重置分支 '%s'\n"
-#: builtin/checkout.c:683 builtin/checkout.c:1072
+#: builtin/checkout.c:702 builtin/checkout.c:1090
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "切换到一个新分支 '%s'\n"
-#: builtin/checkout.c:685
+#: builtin/checkout.c:704
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "切换到分支 '%s'\n"
# 译者：注意保持前导空格
-#: builtin/checkout.c:736
+#: builtin/checkout.c:755
#, c-format
msgid " ... and %d more.\n"
msgstr " ... 及其它 %d 个。\n"
-#: builtin/checkout.c:742
+#: builtin/checkout.c:761
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -5874,7 +6071,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:761
+#: builtin/checkout.c:780
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -5901,150 +6098,150 @@
" git branch <新分支名> %s\n"
"\n"
-#: builtin/checkout.c:797
+#: builtin/checkout.c:816
msgid "internal error in revision walk"
msgstr "在版本遍历时遇到内部错误"
-#: builtin/checkout.c:801
+#: builtin/checkout.c:820
msgid "Previous HEAD position was"
msgstr "之前的 HEAD 位置是"
-#: builtin/checkout.c:828 builtin/checkout.c:1067
+#: builtin/checkout.c:847 builtin/checkout.c:1085
msgid "You are on a branch yet to be born"
msgstr "您位于一个尚未初始化的分支"
-#: builtin/checkout.c:973
+#: builtin/checkout.c:991
#, c-format
msgid "only one reference expected, %d given."
msgstr "应只有一个引用，却给出了 %d 个"
-#: builtin/checkout.c:1013 builtin/worktree.c:214
+#: builtin/checkout.c:1031 builtin/worktree.c:214
#, c-format
msgid "invalid reference: %s"
msgstr "无效引用：%s"
-#: builtin/checkout.c:1042
+#: builtin/checkout.c:1060
#, c-format
msgid "reference is not a tree: %s"
msgstr "引用不是一个树：%s"
-#: builtin/checkout.c:1081
+#: builtin/checkout.c:1099
msgid "paths cannot be used with switching branches"
msgstr "路径不能和切换分支同时使用"
-#: builtin/checkout.c:1084 builtin/checkout.c:1088
+#: builtin/checkout.c:1102 builtin/checkout.c:1106
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' 不能和切换分支同时使用"
-#: builtin/checkout.c:1092 builtin/checkout.c:1095 builtin/checkout.c:1100
-#: builtin/checkout.c:1103
+#: builtin/checkout.c:1110 builtin/checkout.c:1113 builtin/checkout.c:1118
+#: builtin/checkout.c:1121
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' 不能和 '%s' 同时使用"
-#: builtin/checkout.c:1108
+#: builtin/checkout.c:1126
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "不能切换分支到一个非提交 '%s'"
-#: builtin/checkout.c:1141 builtin/checkout.c:1143 builtin/clone.c:93
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324
-#: builtin/worktree.c:326
+#: 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
msgid "branch"
msgstr "分支"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1160
msgid "create and checkout a new branch"
msgstr "创建并检出一个新的分支"
-#: builtin/checkout.c:1144
+#: builtin/checkout.c:1162
msgid "create/reset and checkout a branch"
msgstr "创建/重置并检出一个分支"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1163
msgid "create reflog for new branch"
msgstr "为新的分支创建引用日志"
-#: builtin/checkout.c:1146 builtin/worktree.c:328
+#: builtin/checkout.c:1164 builtin/worktree.c:333
msgid "detach HEAD at named commit"
msgstr "HEAD 从指定的提交分离"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1165
msgid "set upstream info for new branch"
msgstr "为新的分支设置上游信息"
-#: builtin/checkout.c:1149
+#: builtin/checkout.c:1167
msgid "new-branch"
msgstr "新分支"
-#: builtin/checkout.c:1149
+#: builtin/checkout.c:1167
msgid "new unparented branch"
msgstr "新的没有父提交的分支"
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1168
msgid "checkout our version for unmerged files"
msgstr "对尚未合并的文件检出我们的版本"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1170
msgid "checkout their version for unmerged files"
msgstr "对尚未合并的文件检出他们的版本"
-#: builtin/checkout.c:1154
+#: builtin/checkout.c:1172
msgid "force checkout (throw away local modifications)"
msgstr "强制检出（丢弃本地修改）"
-#: builtin/checkout.c:1155
+#: builtin/checkout.c:1173
msgid "perform a 3-way merge with the new branch"
msgstr "和新的分支执行三方合并"
-#: builtin/checkout.c:1156 builtin/merge.c:235
+#: builtin/checkout.c:1174 builtin/merge.c:234
msgid "update ignored files (default)"
msgstr "更新忽略的文件（默认）"
-#: builtin/checkout.c:1157 builtin/log.c:1466 parse-options.h:251
+#: builtin/checkout.c:1175 builtin/log.c:1473 parse-options.h:251
msgid "style"
msgstr "风格"
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1176
msgid "conflict style (merge or diff3)"
msgstr "冲突输出风格（merge 或 diff3）"
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1179
msgid "do not limit pathspecs to sparse entries only"
msgstr "对路径不做稀疏检出的限制"
-#: builtin/checkout.c:1163
+#: builtin/checkout.c:1181
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "二次猜测'git checkout <无此分支>'"
-#: builtin/checkout.c:1165
+#: builtin/checkout.c:1183
msgid "do not check if another worktree is holding the given ref"
msgstr "不检查指定的引用是否被其他工作区所占用"
-#: builtin/checkout.c:1166 builtin/clone.c:63 builtin/fetch.c:119
-#: builtin/merge.c:232 builtin/pull.c:117 builtin/push.c:539
-#: builtin/send-pack.c:168
+#: 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
msgid "force progress reporting"
msgstr "强制显示进度报告"
-#: builtin/checkout.c:1197
+#: builtin/checkout.c:1224
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b、-B 和 --orphan 是互斥的"
-#: builtin/checkout.c:1214
+#: builtin/checkout.c:1241
msgid "--track needs a branch name"
msgstr "--track 需要一个分支名"
-#: builtin/checkout.c:1219
+#: builtin/checkout.c:1246
msgid "Missing branch name; try -b"
msgstr "缺少分支名；尝试 -b"
-#: builtin/checkout.c:1255
+#: builtin/checkout.c:1282
msgid "invalid path specification"
msgstr "无效的路径规格"
-#: builtin/checkout.c:1262
+#: builtin/checkout.c:1289
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
@@ -6053,12 +6250,12 @@
"不能同时更新路径并切换到分支'%s'。\n"
"您是想要检出 '%s' 但其未能解析为提交么？"
-#: builtin/checkout.c:1267
+#: builtin/checkout.c:1294
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout：--detach 不能接收路径参数 '%s'"
-#: builtin/checkout.c:1271
+#: builtin/checkout.c:1298
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -6096,7 +6293,7 @@
msgid "failed to remove %s"
msgstr "无法删除 %s"
-#: builtin/clean.c:291 git-add--interactive.perl:623
+#: builtin/clean.c:297 git-add--interactive.perl:614
#, c-format
msgid ""
"Prompt help:\n"
@@ -6109,7 +6306,7 @@
"foo - 通过唯一前缀选择一个选项\n"
" - （空）什么也不选择\n"
-#: builtin/clean.c:295 git-add--interactive.perl:632
+#: builtin/clean.c:301 git-add--interactive.perl:623
#, c-format
msgid ""
"Prompt help:\n"
@@ -6130,38 +6327,38 @@
"* - 选择所有选项\n"
" - （空）结束选择\n"
-#: builtin/clean.c:511 git-add--interactive.perl:598
-#: git-add--interactive.perl:603
+#: builtin/clean.c:517 git-add--interactive.perl:589
+#: git-add--interactive.perl:594
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "嗯（%s）？\n"
-#: builtin/clean.c:653
+#: builtin/clean.c:659
#, c-format
msgid "Input ignore patterns>> "
msgstr "输入模版以排除条目>> "
-#: builtin/clean.c:690
+#: builtin/clean.c:696
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "警告：无法找到和 %s 匹配的条目"
-#: builtin/clean.c:711
+#: builtin/clean.c:717
msgid "Select items to delete"
msgstr "选择要删除的条目"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:752
+#: builtin/clean.c:758
#, c-format
msgid "Remove %s [y/N]? "
msgstr "删除 %s [y/N]？"
-#: builtin/clean.c:777 git-add--interactive.perl:1669
+#: builtin/clean.c:783 git-add--interactive.perl:1660
#, c-format
msgid "Bye.\n"
msgstr "再见。\n"
-#: builtin/clean.c:785
+#: builtin/clean.c:791
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -6179,69 +6376,70 @@
"help - 显示本帮助\n"
"? - 显示如何在提示符下选择的帮助"
-#: builtin/clean.c:812 git-add--interactive.perl:1745
+#: builtin/clean.c:818 git-add--interactive.perl:1736
msgid "*** Commands ***"
msgstr "*** 命令 ***"
-#: builtin/clean.c:813 git-add--interactive.perl:1742
+#: builtin/clean.c:819 git-add--interactive.perl:1733
msgid "What now"
msgstr "请选择"
-#: builtin/clean.c:821
+#: builtin/clean.c:827
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "将删除如下条目："
msgstr[1] "将删除如下条目："
-#: builtin/clean.c:838
+#: builtin/clean.c:844
msgid "No more files to clean, exiting."
msgstr "没有要清理的文件，退出。"
-#: builtin/clean.c:869
+#: builtin/clean.c:875
msgid "do not print names of files removed"
msgstr "不打印删除文件的名称"
-#: builtin/clean.c:871
+#: builtin/clean.c:877
msgid "force"
msgstr "强制"
-#: builtin/clean.c:872
+#: builtin/clean.c:878
msgid "interactive cleaning"
msgstr "交互式清除"
-#: builtin/clean.c:874
+#: builtin/clean.c:880
msgid "remove whole directories"
msgstr "删除整个目录"
-#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:1056
-#: builtin/ls-files.c:538 builtin/name-rev.c:313 builtin/show-ref.c:176
+#: 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
msgid "pattern"
msgstr "模式"
-#: builtin/clean.c:876
+#: builtin/clean.c:882
msgid "add <pattern> to ignore rules"
msgstr "添加 <模式> 到忽略规则"
-#: builtin/clean.c:877
+#: builtin/clean.c:883
msgid "remove ignored files, too"
msgstr "也删除忽略的文件"
-#: builtin/clean.c:879
+#: builtin/clean.c:885
msgid "remove only ignored files"
msgstr "只删除忽略的文件"
-#: builtin/clean.c:897
+#: builtin/clean.c:903
msgid "-x and -X cannot be used together"
msgstr "-x 和 -X 不能同时使用"
-#: builtin/clean.c:901
+#: builtin/clean.c:907
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:904
+#: builtin/clean.c:910
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -6252,130 +6450,134 @@
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
-#: builtin/clone.c:65
+#: builtin/clone.c:80
msgid "don't create a checkout"
msgstr "不创建一个检出"
-#: builtin/clone.c:66 builtin/clone.c:68 builtin/init-db.c:478
+#: builtin/clone.c:81 builtin/clone.c:83 builtin/init-db.c:478
msgid "create a bare repository"
msgstr "创建一个纯仓库"
-#: builtin/clone.c:70
+#: builtin/clone.c:85
msgid "create a mirror repository (implies bare)"
msgstr "创建一个镜像仓库（也是纯仓库）"
-#: builtin/clone.c:72
+#: builtin/clone.c:87
msgid "to clone from a local repository"
msgstr "从本地仓库克隆"
-#: builtin/clone.c:74
+#: builtin/clone.c:89
msgid "don't use local hardlinks, always copy"
msgstr "不使用本地硬链接，始终复制"
-#: builtin/clone.c:76
+#: builtin/clone.c:91
msgid "setup as shared repository"
msgstr "设置为共享仓库"
-#: builtin/clone.c:78 builtin/clone.c:80
+#: builtin/clone.c:93 builtin/clone.c:97
+msgid "pathspec"
+msgstr "路径规格"
+
+#: builtin/clone.c:93 builtin/clone.c:97
msgid "initialize submodules in the clone"
msgstr "在克隆时初始化子模组"
-#: builtin/clone.c:82
+#: builtin/clone.c:100
msgid "number of submodules cloned in parallel"
msgstr "并发克隆的子模组的数量"
-#: builtin/clone.c:83 builtin/init-db.c:475
+#: builtin/clone.c:101 builtin/init-db.c:475
msgid "template-directory"
msgstr "模板目录"
-#: builtin/clone.c:84 builtin/init-db.c:476
+#: builtin/clone.c:102 builtin/init-db.c:476
msgid "directory from which templates will be used"
msgstr "模板目录将被使用"
-#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:604
-#: builtin/submodule--helper.c:970
+#: builtin/clone.c:104 builtin/clone.c:106 builtin/submodule--helper.c:642
+#: builtin/submodule--helper.c:983
msgid "reference repository"
msgstr "参考仓库"
-#: builtin/clone.c:90
+#: builtin/clone.c:108
msgid "use --reference only while cloning"
msgstr "仅在克隆时参考 --reference 指向的本地仓库"
-#: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:109 builtin/column.c:26 builtin/merge-file.c:43
msgid "name"
msgstr "名称"
-#: builtin/clone.c:92
+#: builtin/clone.c:110
msgid "use <name> instead of 'origin' to track upstream"
msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
-#: builtin/clone.c:94
+#: builtin/clone.c:112
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "检出 <分支> 而不是远程 HEAD"
-#: builtin/clone.c:96
+#: builtin/clone.c:114
msgid "path to git-upload-pack on the remote"
msgstr "远程 git-upload-pack 路径"
-#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:999
+#: builtin/clone.c:115 builtin/fetch.c:120 builtin/grep.c:1006
#: builtin/pull.c:202
msgid "depth"
msgstr "深度"
-#: builtin/clone.c:98
+#: builtin/clone.c:116
msgid "create a shallow clone of that depth"
msgstr "创建一个指定深度的浅克隆"
-#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2836
+#: builtin/clone.c:117 builtin/fetch.c:122 builtin/pack-objects.c:2918
#: parse-options.h:142
msgid "time"
msgstr "时间"
-#: builtin/clone.c:100
+#: builtin/clone.c:118
msgid "create a shallow clone since a specific time"
msgstr "从一个特定时间创建一个浅克隆"
-#: builtin/clone.c:101 builtin/fetch.c:124
+#: builtin/clone.c:119 builtin/fetch.c:124
msgid "revision"
msgstr "版本"
-#: builtin/clone.c:102 builtin/fetch.c:125
+#: builtin/clone.c:120 builtin/fetch.c:125
msgid "deepen history of shallow clone, excluding rev"
msgstr "深化浅克隆的历史，除了特定版本"
-#: builtin/clone.c:104
+#: builtin/clone.c:122
msgid "clone only one branch, HEAD or --branch"
msgstr "只克隆一个分支、HEAD 或 --branch"
-#: builtin/clone.c:106
+#: builtin/clone.c:124
msgid "any cloned submodules will be shallow"
msgstr "子模组将以浅下载模式克隆"
-#: builtin/clone.c:107 builtin/init-db.c:484
+#: builtin/clone.c:125 builtin/init-db.c:484
msgid "gitdir"
msgstr "git目录"
-#: builtin/clone.c:108 builtin/init-db.c:485
+#: builtin/clone.c:126 builtin/init-db.c:485
msgid "separate git dir from working tree"
msgstr "git目录和工作区分离"
-#: builtin/clone.c:109
+#: builtin/clone.c:127
msgid "key=value"
msgstr "key=value"
-#: builtin/clone.c:110
+#: builtin/clone.c:128
msgid "set config inside the new repository"
msgstr "在新仓库中设置配置信息"
-#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:550
+#: builtin/clone.c:129 builtin/fetch.c:140 builtin/push.c:550
msgid "use IPv4 addresses only"
msgstr "只使用 IPv4 地址"
-#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:552
+#: builtin/clone.c:131 builtin/fetch.c:142 builtin/push.c:552
msgid "use IPv6 addresses only"
msgstr "只使用 IPv6 地址"
-#: builtin/clone.c:250
+#: builtin/clone.c:268
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
@@ -6383,42 +6585,42 @@
"无法猜到目录名。\n"
"请在命令行指定一个目录"
-#: builtin/clone.c:303
+#: builtin/clone.c:321
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: 不能为 '%s' 添加一个备用：%s\n"
-#: builtin/clone.c:375
+#: builtin/clone.c:393
#, c-format
msgid "failed to open '%s'"
msgstr "无法打开 '%s'"
-#: builtin/clone.c:383
+#: builtin/clone.c:401
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s 存在且不是一个目录"
-#: builtin/clone.c:397
+#: builtin/clone.c:415
#, c-format
msgid "failed to stat %s\n"
-msgstr "无法枚举 %s 状态\n"
+msgstr "对 %s 调用 stat 失败\n"
-#: builtin/clone.c:419
+#: builtin/clone.c:437
#, c-format
msgid "failed to create link '%s'"
msgstr "无法创建链接 '%s'"
-#: builtin/clone.c:423
+#: builtin/clone.c:441
#, c-format
msgid "failed to copy file to '%s'"
msgstr "无法拷贝文件至 '%s'"
-#: builtin/clone.c:448
+#: builtin/clone.c:466
#, c-format
msgid "done.\n"
msgstr "完成。\n"
-#: builtin/clone.c:460
+#: builtin/clone.c:478
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -6428,136 +6630,135 @@
"您可以通过 'git status' 检查哪些已被检出，然后使用命令\n"
"'git checkout -f HEAD' 重试\n"
-#: builtin/clone.c:537
+#: builtin/clone.c:555
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "不能发现要克隆的远程分支 %s。"
-#: builtin/clone.c:632
+#: builtin/clone.c:650
msgid "remote did not send all necessary objects"
msgstr "远程没有发送所有必须的对象"
-#: builtin/clone.c:648
+#: builtin/clone.c:666
#, c-format
msgid "unable to update %s"
msgstr "不能更新 %s"
-#: builtin/clone.c:697
+#: builtin/clone.c:715
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"
-#: builtin/clone.c:728
+#: builtin/clone.c:746
msgid "unable to checkout working tree"
msgstr "不能检出工作区"
-#: builtin/clone.c:768
+#: builtin/clone.c:786
msgid "unable to write parameters to config file"
msgstr "无法将参数写入配置文件"
-#: builtin/clone.c:831
+#: builtin/clone.c:849
msgid "cannot repack to clean up"
msgstr "无法执行 repack 来清理"
-#: builtin/clone.c:833
+#: builtin/clone.c:851
msgid "cannot unlink temporary alternates file"
msgstr "无法删除临时的 alternates 文件"
-#: builtin/clone.c:866 builtin/receive-pack.c:1895
+#: builtin/clone.c:884 builtin/receive-pack.c:1900
msgid "Too many arguments."
msgstr "太多参数。"
-#: builtin/clone.c:870
+#: builtin/clone.c:888
msgid "You must specify a repository to clone."
msgstr "您必须指定一个仓库来克隆。"
-#: builtin/clone.c:883
+#: builtin/clone.c:901
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "--bare 和 --origin %s 选项不兼容。"
-#: builtin/clone.c:886
+#: builtin/clone.c:904
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare 和 --separate-git-dir 选项不兼容。"
-#: builtin/clone.c:899
+#: builtin/clone.c:917
#, c-format
msgid "repository '%s' does not exist"
msgstr "仓库 '%s' 不存在"
-#: builtin/clone.c:905 builtin/fetch.c:1335
+#: builtin/clone.c:923 builtin/fetch.c:1337
#, c-format
msgid "depth %s is not a positive number"
msgstr "深度 %s 不是一个正数"
-#: builtin/clone.c:915
+#: builtin/clone.c:933
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"
-#: builtin/clone.c:925
+#: builtin/clone.c:943
#, c-format
msgid "working tree '%s' already exists."
msgstr "工作区 '%s' 已经存在。"
-#: builtin/clone.c:940 builtin/clone.c:951 builtin/difftool.c:252
-#: builtin/submodule--helper.c:659 builtin/worktree.c:222
-#: builtin/worktree.c:249
+#: builtin/clone.c:958 builtin/clone.c:969 builtin/difftool.c:252
+#: builtin/worktree.c:221 builtin/worktree.c:251
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "不能为 '%s' 创建先导目录"
-#: builtin/clone.c:943
+#: builtin/clone.c:961
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "不能创建工作区目录 '%s'"
-#: builtin/clone.c:955
+#: builtin/clone.c:973
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "克隆到纯仓库 '%s'...\n"
-#: builtin/clone.c:957
+#: builtin/clone.c:975
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "正克隆到 '%s'...\n"
-#: builtin/clone.c:963
+#: builtin/clone.c:999
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容"
-#: builtin/clone.c:1019
+#: builtin/clone.c:1055
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth 在本地克隆时被忽略，请改用 file:// 协议。"
-#: builtin/clone.c:1021
+#: builtin/clone.c:1057
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr "--shallow-since 在本地克隆时被忽略，请改用 file:// 协议。"
-#: builtin/clone.c:1023
+#: builtin/clone.c:1059
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr "--shallow-exclude 在本地克隆时被忽略，请改用 file:// 协议。"
-#: builtin/clone.c:1026
+#: builtin/clone.c:1062
msgid "source repository is shallow, ignoring --local"
msgstr "源仓库是浅克隆，忽略 --local"
-#: builtin/clone.c:1031
+#: builtin/clone.c:1067
msgid "--local is ignored"
msgstr "--local 被忽略"
-#: builtin/clone.c:1035
+#: builtin/clone.c:1071
#, c-format
msgid "Don't know how to clone %s"
msgstr "不知道如何克隆 %s"
-#: builtin/clone.c:1090 builtin/clone.c:1098
+#: builtin/clone.c:1126 builtin/clone.c:1134
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "远程分支 %s 在上游 %s 未发现"
-#: builtin/clone.c:1101
+#: builtin/clone.c:1137
msgid "You appear to have cloned an empty repository."
msgstr "您似乎克隆了一个空仓库。"
@@ -6745,11 +6946,6 @@
msgid "malformed --author parameter"
msgstr "非法的 --author 参数"
-#: builtin/commit.c:611
-#, c-format
-msgid "invalid date format: %s"
-msgstr "无效的日期格式：%s"
-
#: builtin/commit.c:655
msgid ""
"unable to select a comment character that is not used\n"
@@ -6761,7 +6957,7 @@
msgid "could not lookup commit %s"
msgstr "不能查询提交 %s"
-#: builtin/commit.c:704 builtin/shortlog.c:295
+#: builtin/commit.c:704 builtin/shortlog.c:294
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "（正从标准输入中读取日志信息）\n"
@@ -6860,7 +7056,7 @@
msgid "Error building trees"
msgstr "无法创建树对象"
-#: builtin/commit.c:968 builtin/tag.c:280
+#: builtin/commit.c:968 builtin/tag.c:273
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
@@ -6923,7 +7119,7 @@
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr "指定了明确的路径而没有使用 -i 或 -o 选项，认为是 --only paths..."
-#: builtin/commit.c:1224 builtin/tag.c:495
+#: builtin/commit.c:1224 builtin/tag.c:551
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "无效的清理模式 %s"
@@ -6945,7 +7141,7 @@
msgstr "版本"
#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525
-#: builtin/worktree.c:442
+#: builtin/worktree.c:448
msgid "machine-readable output"
msgstr "机器可读的输出"
@@ -6958,7 +7154,7 @@
msgstr "条目以 NUL 字符结尾"
#: builtin/commit.c:1351 builtin/commit.c:1624 builtin/fast-export.c:981
-#: builtin/fast-export.c:984 builtin/tag.c:368
+#: builtin/fast-export.c:984 builtin/tag.c:411
msgid "mode"
msgstr "模式"
@@ -7014,7 +7210,7 @@
msgid "Commit message options"
msgstr "提交说明选项"
-#: builtin/commit.c:1586 builtin/tag.c:366
+#: builtin/commit.c:1586 builtin/tag.c:409
msgid "read message from file"
msgstr "从文件中读取提交说明"
@@ -7026,7 +7222,7 @@
msgid "override author for commit"
msgstr "提交时覆盖作者"
-#: builtin/commit.c:1588 builtin/gc.c:333
+#: builtin/commit.c:1588 builtin/gc.c:357
msgid "date"
msgstr "日期"
@@ -7034,8 +7230,8 @@
msgid "override date for commit"
msgstr "提交时覆盖日期"
-#: builtin/commit.c:1589 builtin/merge.c:222 builtin/notes.c:398
-#: builtin/notes.c:561 builtin/tag.c:364
+#: builtin/commit.c:1589 builtin/merge.c:221 builtin/notes.c:398
+#: builtin/notes.c:561 builtin/tag.c:407
msgid "message"
msgstr "说明"
@@ -7044,7 +7240,7 @@
msgstr "提交说明"
#: builtin/commit.c:1590 builtin/commit.c:1591 builtin/commit.c:1592
-#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:81
+#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:77
msgid "commit"
msgstr "提交"
@@ -7068,7 +7264,7 @@
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）"
-#: builtin/commit.c:1595 builtin/log.c:1413 builtin/revert.c:86
+#: builtin/commit.c:1595 builtin/log.c:1420 builtin/revert.c:104
msgid "add Signed-off-by:"
msgstr "添加 Signed-off-by: 签名"
@@ -7085,7 +7281,7 @@
msgid "default"
msgstr "default"
-#: builtin/commit.c:1598 builtin/tag.c:369
+#: builtin/commit.c:1598 builtin/tag.c:412
msgid "how to strip spaces and #comments from message"
msgstr "设置如何删除提交说明里的空格和#注释"
@@ -7093,8 +7289,8 @@
msgid "include status in commit message template"
msgstr "在提交说明模板里包含状态信息"
-#: builtin/commit.c:1601 builtin/merge.c:234 builtin/pull.c:166
-#: builtin/revert.c:93
+#: builtin/commit.c:1601 builtin/merge.c:233 builtin/pull.c:166
+#: builtin/revert.c:112
msgid "GPG sign commit"
msgstr "GPG 提交签名"
@@ -7187,139 +7383,139 @@
msgid "git config [<options>]"
msgstr "git config [<选项>]"
-#: builtin/config.c:55
+#: builtin/config.c:56
msgid "Config file location"
msgstr "配置文件位置"
-#: builtin/config.c:56
+#: builtin/config.c:57
msgid "use global config file"
msgstr "使用全局配置文件"
-#: builtin/config.c:57
+#: builtin/config.c:58
msgid "use system config file"
msgstr "使用系统级配置文件"
-#: builtin/config.c:58
+#: builtin/config.c:59
msgid "use repository config file"
msgstr "使用仓库级配置文件"
-#: builtin/config.c:59
+#: builtin/config.c:60
msgid "use given config file"
msgstr "使用指定的配置文件"
-#: builtin/config.c:60
+#: builtin/config.c:61
msgid "blob-id"
msgstr "数据对象 ID"
-#: builtin/config.c:60
+#: builtin/config.c:61
msgid "read config from given blob object"
msgstr "从给定的数据对象读取配置"
-#: builtin/config.c:61
+#: builtin/config.c:62
msgid "Action"
msgstr "操作"
-#: builtin/config.c:62
+#: builtin/config.c:63
msgid "get value: name [value-regex]"
msgstr "获取值：name [value-regex]"
-#: builtin/config.c:63
+#: builtin/config.c:64
msgid "get all values: key [value-regex]"
msgstr "获得所有的值：key [value-regex]"
-#: builtin/config.c:64
+#: builtin/config.c:65
msgid "get values for regexp: name-regex [value-regex]"
msgstr "根据正则表达式获得值：name-regex [value-regex]"
-#: builtin/config.c:65
+#: builtin/config.c:66
msgid "get value specific for the URL: section[.var] URL"
msgstr "获得 URL 取值：section[.var] URL"
-#: builtin/config.c:66
+#: builtin/config.c:67
msgid "replace all matching variables: name value [value_regex]"
msgstr "替换所有匹配的变量：name value [value_regex]"
-#: builtin/config.c:67
+#: builtin/config.c:68
msgid "add a new variable: name value"
msgstr "添加一个新的变量：name value"
-#: builtin/config.c:68
+#: builtin/config.c:69
msgid "remove a variable: name [value-regex]"
msgstr "删除一个变量：name [value-regex]"
-#: builtin/config.c:69
+#: builtin/config.c:70
msgid "remove all matches: name [value-regex]"
msgstr "删除所有匹配项：name [value-regex]"
-#: builtin/config.c:70
+#: builtin/config.c:71
msgid "rename section: old-name new-name"
msgstr "重命名小节：old-name new-name"
-#: builtin/config.c:71
+#: builtin/config.c:72
msgid "remove a section: name"
msgstr "删除一个小节：name"
-#: builtin/config.c:72
+#: builtin/config.c:73
msgid "list all"
msgstr "列出所有"
-#: builtin/config.c:73
+#: builtin/config.c:74
msgid "open an editor"
msgstr "打开一个编辑器"
-#: builtin/config.c:74
+#: builtin/config.c:75
msgid "find the color configured: slot [default]"
msgstr "获得配置的颜色：配置 [默认]"
-#: builtin/config.c:75
+#: builtin/config.c:76
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "获得颜色设置：配置 [stdout-is-tty]"
-#: builtin/config.c:76
+#: builtin/config.c:77
msgid "Type"
msgstr "类型"
-#: builtin/config.c:77
+#: builtin/config.c:78
msgid "value is \"true\" or \"false\""
msgstr "值是 \"true\" 或 \"false\""
-#: builtin/config.c:78
+#: builtin/config.c:79
msgid "value is decimal number"
msgstr "值是十进制数"
-#: builtin/config.c:79
+#: builtin/config.c:80
msgid "value is --bool or --int"
msgstr "值是 --bool or --int"
-#: builtin/config.c:80
+#: builtin/config.c:81
msgid "value is a path (file or directory name)"
msgstr "值是一个路径（文件或目录名）"
-#: builtin/config.c:81
+#: builtin/config.c:82
msgid "Other"
msgstr "其它"
-#: builtin/config.c:82
+#: builtin/config.c:83
msgid "terminate values with NUL byte"
msgstr "终止值是 NUL 字节"
-#: builtin/config.c:83
+#: builtin/config.c:84
msgid "show variable names only"
msgstr "只显示变量名"
-#: builtin/config.c:84
+#: builtin/config.c:85
msgid "respect include directives on lookup"
msgstr "查询时参照 include 指令递归查找"
-#: builtin/config.c:85
+#: builtin/config.c:86
msgid "show origin of config (file, standard input, blob, command line)"
msgstr "显示配置的来源（文件、标准输入、数据对象，或命令行）"
-#: builtin/config.c:327
+#: builtin/config.c:328
msgid "unable to parse default color value"
msgstr "不能解析默认颜色值"
-#: builtin/config.c:471
+#: builtin/config.c:472
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -7334,12 +7530,12 @@
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:613
+#: builtin/config.c:615
#, c-format
msgid "cannot create configuration file %s"
msgstr "不能创建配置文件 %s"
-#: builtin/config.c:625
+#: builtin/config.c:627
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
@@ -7356,55 +7552,67 @@
msgid "print sizes in human readable format"
msgstr "以用户可读的格式显示大小"
-#: builtin/describe.c:17
+#: builtin/describe.c:18
msgid "git describe [<options>] [<commit-ish>...]"
msgstr "git describe [<选项>] [<提交号>...]"
-#: builtin/describe.c:18
+#: builtin/describe.c:19
msgid "git describe [<options>] --dirty"
msgstr "git describe [<选项>] --dirty"
-#: builtin/describe.c:217
+#: builtin/describe.c:53
+msgid "head"
+msgstr "头"
+
+#: builtin/describe.c:53
+msgid "lightweight"
+msgstr "轻量级的"
+
+#: builtin/describe.c:53
+msgid "annotated"
+msgstr "附注的"
+
+#: builtin/describe.c:250
#, c-format
msgid "annotated tag %s not available"
msgstr "附注标签 %s 无效"
-#: builtin/describe.c:221
+#: builtin/describe.c:254
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr "附注标签 %s 没有嵌入名称"
-#: builtin/describe.c:223
+#: builtin/describe.c:256
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr "标签 '%s' 的确是在 '%s'"
-#: builtin/describe.c:250 builtin/log.c:480
+#: builtin/describe.c:283 builtin/log.c:487
#, c-format
msgid "Not a valid object name %s"
msgstr "不是一个有效的对象名 %s"
-#: builtin/describe.c:253
+#: builtin/describe.c:286
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s 不是一个有效的 '%s' 对象"
-#: builtin/describe.c:270
+#: builtin/describe.c:303
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "没有标签准确匹配 '%s'"
-#: builtin/describe.c:272
+#: builtin/describe.c:305
#, c-format
msgid "searching to describe %s\n"
msgstr "搜索描述 %s\n"
-#: builtin/describe.c:319
+#: builtin/describe.c:352
#, c-format
msgid "finished search at %s\n"
msgstr "完成搜索 %s\n"
-#: builtin/describe.c:346
+#: builtin/describe.c:379
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
@@ -7413,7 +7621,7 @@
"没有附注标签能描述 '%s'。\n"
"然而，存在未附注标签：尝试 --tags。"
-#: builtin/describe.c:350
+#: builtin/describe.c:383
#, c-format
msgid ""
"No tags can describe '%s'.\n"
@@ -7422,12 +7630,12 @@
"没有标签能描述 '%s'。\n"
"尝试 --always，或者创建一些标签。"
-#: builtin/describe.c:371
+#: builtin/describe.c:413
#, c-format
msgid "traversed %lu commits\n"
msgstr "已遍历 %lu 个提交\n"
-#: builtin/describe.c:374
+#: builtin/describe.c:416
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
@@ -7436,65 +7644,77 @@
"发现多于 %i 个标签，列出最近的 %i 个\n"
"在 %s 放弃搜索\n"
-#: builtin/describe.c:396
+#: builtin/describe.c:438
msgid "find the tag that comes after the commit"
msgstr "寻找该提交之后的标签"
-#: builtin/describe.c:397
+#: builtin/describe.c:439
msgid "debug search strategy on stderr"
msgstr "在标准错误上调试搜索策略"
-#: builtin/describe.c:398
+#: builtin/describe.c:440
msgid "use any ref"
msgstr "使用任意引用"
-#: builtin/describe.c:399
+#: builtin/describe.c:441
msgid "use any tag, even unannotated"
msgstr "使用任意标签，即使未附带注释"
-#: builtin/describe.c:400
+#: builtin/describe.c:442
msgid "always use long format"
msgstr "始终使用长提交号格式"
-#: builtin/describe.c:401
+#: builtin/describe.c:443
msgid "only follow first parent"
msgstr "只跟随第一个父提交"
-#: builtin/describe.c:404
+#: builtin/describe.c:446
msgid "only output exact matches"
msgstr "只输出精确匹配"
-#: builtin/describe.c:406
+#: builtin/describe.c:448
msgid "consider <n> most recent tags (default: 10)"
msgstr "考虑最近 <n> 个标签（默认：10）"
-#: builtin/describe.c:408
+#: builtin/describe.c:450
msgid "only consider tags matching <pattern>"
msgstr "只考虑匹配 <模式> 的标签"
-#: builtin/describe.c:410 builtin/name-rev.c:320
+#: builtin/describe.c:452
+msgid "do not consider tags matching <pattern>"
+msgstr "不考虑匹配 <模式> 的标签"
+
+#: builtin/describe.c:454 builtin/name-rev.c:357
msgid "show abbreviated commit object as fallback"
msgstr "显示简写的提交号作为后备"
-#: builtin/describe.c:411
+#: builtin/describe.c:455 builtin/describe.c:458
msgid "mark"
msgstr "标记"
-#: builtin/describe.c:412
+#: builtin/describe.c:456
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr "对于脏工作区，追加 <标记>（默认：\"-dirty\"）"
-#: builtin/describe.c:430
+#: builtin/describe.c:459
+msgid "append <mark> on broken working tree (default: \"-broken\")"
+msgstr "对于损坏的工作区，追加 <标记>（默认：\"-broken\"）"
+
+#: builtin/describe.c:477
msgid "--long is incompatible with --abbrev=0"
msgstr "--long 与 --abbrev=0 不兼容"
-#: builtin/describe.c:456
+#: builtin/describe.c:506
msgid "No names found, cannot describe anything."
msgstr "没有发现名称，无法描述任何东西。"
-#: builtin/describe.c:476
+#: builtin/describe.c:549
msgid "--dirty is incompatible with commit-ishes"
-msgstr "--dirty 不能与提交同时使用"
+msgstr "--dirty 与提交号不兼容"
+
+#: builtin/describe.c:551
+msgid "--broken is incompatible with commit-ishes"
+msgstr "--broken 与提交号不兼容"
#: builtin/diff.c:83
#, c-format
@@ -7534,77 +7754,94 @@
msgid "failed: %d"
msgstr "失败：%d"
-#: builtin/difftool.c:342
+#: builtin/difftool.c:283
+#, c-format
+msgid "could not read symlink %s"
+msgstr "无法读取符号链接 %s"
+
+#: builtin/difftool.c:285
+#, c-format
+msgid "could not read symlink file %s"
+msgstr "无法读取符号链接文件 %s"
+
+#: builtin/difftool.c:293
+#, c-format
+msgid "could not read object %s for symlink %s"
+msgstr "无法读取符号链接 %2$s 指向的对象 %1$s"
+
+#: builtin/difftool.c:395
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
-msgstr "不支持在目录比较模式（'-d' 和 '--dir-diff'）中采用组合差异格式（'-c' 和 '--cc'）。"
+msgstr ""
+"不支持在目录比较模式（'-d' 和 '--dir-diff'）中采用组合差异格式（'-c' 和 '--"
+"cc'）。"
-#: builtin/difftool.c:567
+#: builtin/difftool.c:609
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "两个文件都被修改：'%s' 和 '%s'。"
-#: builtin/difftool.c:569
+#: builtin/difftool.c:611
msgid "working tree file has been left."
msgstr "工作区文件被留了下来。"
-#: builtin/difftool.c:580
+#: builtin/difftool.c:622
#, c-format
msgid "temporary files exist in '%s'."
msgstr "临时文件存在于 '%s'。"
-#: builtin/difftool.c:581
+#: builtin/difftool.c:623
msgid "you may want to cleanup or recover these."
msgstr "您可能想要清理或者恢复它们。"
-#: builtin/difftool.c:626
+#: builtin/difftool.c:669
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "使用 `diff.guitool` 代替 `diff.tool`"
-#: builtin/difftool.c:628
+#: builtin/difftool.c:671
msgid "perform a full-directory diff"
msgstr "执行一个全目录差异比较"
-#: builtin/difftool.c:630
+#: builtin/difftool.c:673
msgid "do not prompt before launching a diff tool"
msgstr "启动差异比较工具之前不提示"
-#: builtin/difftool.c:636
+#: builtin/difftool.c:679
msgid "use symlinks in dir-diff mode"
msgstr "在 dir-diff 模式中使用符号链接"
-#: builtin/difftool.c:637
+#: builtin/difftool.c:680
msgid "<tool>"
msgstr "<工具>"
-#: builtin/difftool.c:638
+#: builtin/difftool.c:681
msgid "use the specified diff tool"
msgstr "使用指定的差异比较工具"
-#: builtin/difftool.c:640
+#: builtin/difftool.c:683
msgid "print a list of diff tools that may be used with `--tool`"
msgstr "显示可以用在 `--tool` 参数后的差异工具列表"
-#: builtin/difftool.c:643
+#: builtin/difftool.c:686
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
msgstr "当执行 diff 工具返回非零退出码时，使 'git-difftool' 退出"
-#: builtin/difftool.c:645
+#: builtin/difftool.c:688
msgid "<command>"
msgstr "<命令>"
-#: builtin/difftool.c:646
+#: builtin/difftool.c:689
msgid "specify a custom command for viewing diffs"
msgstr "指定一个用于查看差异的自定义命令"
-#: builtin/difftool.c:670
+#: builtin/difftool.c:713
msgid "no <tool> given for --tool=<tool>"
msgstr "没有为 --tool=<工具> 参数提供 <工具>"
-#: builtin/difftool.c:677
+#: builtin/difftool.c:720
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "没有为 --extcmd=<命令> 参数提供 <命令>"
@@ -7741,7 +7978,7 @@
msgid "convert to a complete repository"
msgstr "转换为一个完整的仓库"
-#: builtin/fetch.c:131 builtin/log.c:1433
+#: builtin/fetch.c:131 builtin/log.c:1440
msgid "dir"
msgstr "目录"
@@ -7769,73 +8006,73 @@
msgid "Couldn't find remote ref HEAD"
msgstr "无法发现远程 HEAD 引用"
-#: builtin/fetch.c:511
+#: builtin/fetch.c:513
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "配置变量 fetch.output 包含无效值 %s"
-#: builtin/fetch.c:604
+#: builtin/fetch.c:606
#, c-format
msgid "object %s not found"
msgstr "对象 %s 未发现"
-#: builtin/fetch.c:608
+#: builtin/fetch.c:610
msgid "[up to date]"
msgstr "[最新]"
-#: builtin/fetch.c:621 builtin/fetch.c:701
+#: builtin/fetch.c:623 builtin/fetch.c:703
msgid "[rejected]"
msgstr "[已拒绝]"
-#: builtin/fetch.c:622
+#: builtin/fetch.c:624
msgid "can't fetch in current branch"
msgstr "当前分支下不能执行获取操作"
-#: builtin/fetch.c:631
+#: builtin/fetch.c:633
msgid "[tag update]"
msgstr "[标签更新]"
-#: builtin/fetch.c:632 builtin/fetch.c:665 builtin/fetch.c:681
-#: builtin/fetch.c:696
+#: builtin/fetch.c:634 builtin/fetch.c:667 builtin/fetch.c:683
+#: builtin/fetch.c:698
msgid "unable to update local ref"
msgstr "不能更新本地引用"
-#: builtin/fetch.c:651
+#: builtin/fetch.c:653
msgid "[new tag]"
msgstr "[新标签]"
-#: builtin/fetch.c:654
+#: builtin/fetch.c:656
msgid "[new branch]"
msgstr "[新分支]"
-#: builtin/fetch.c:657
+#: builtin/fetch.c:659
msgid "[new ref]"
msgstr "[新引用]"
-#: builtin/fetch.c:696
+#: builtin/fetch.c:698
msgid "forced update"
msgstr "强制更新"
-#: builtin/fetch.c:701
+#: builtin/fetch.c:703
msgid "non-fast-forward"
msgstr "非快进"
-#: builtin/fetch.c:746
+#: builtin/fetch.c:748
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s 未发送所有必须的对象\n"
-#: builtin/fetch.c:766
+#: builtin/fetch.c:768
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "拒绝 %s 因为浅克隆不允许被更新"
-#: builtin/fetch.c:853 builtin/fetch.c:949
+#: builtin/fetch.c:855 builtin/fetch.c:951
#, c-format
msgid "From %.*s\n"
msgstr "来自 %.*s\n"
-#: builtin/fetch.c:864
+#: builtin/fetch.c:866
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -7845,95 +8082,95 @@
" 'git remote prune %s' 来删除旧的、有冲突的分支"
# 译者：注意保持前导空格
-#: builtin/fetch.c:919
+#: builtin/fetch.c:921
#, c-format
msgid " (%s will become dangling)"
msgstr " （%s 将成为摇摆状态）"
# 译者：注意保持前导空格
-#: builtin/fetch.c:920
+#: builtin/fetch.c:922
#, c-format
msgid " (%s has become dangling)"
msgstr " （%s 已成为摇摆状态）"
-#: builtin/fetch.c:952
+#: builtin/fetch.c:954
msgid "[deleted]"
msgstr "[已删除]"
-#: builtin/fetch.c:953 builtin/remote.c:1020
+#: builtin/fetch.c:955 builtin/remote.c:1022
msgid "(none)"
msgstr "（无）"
-#: builtin/fetch.c:976
+#: builtin/fetch.c:978
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "拒绝获取到非纯仓库的当前分支 %s"
-#: builtin/fetch.c:995
+#: builtin/fetch.c:997
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
-#: builtin/fetch.c:998
+#: builtin/fetch.c:1000
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "选项 \"%s\" 为 %s 所忽略\n"
-#: builtin/fetch.c:1074
+#: builtin/fetch.c:1076
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "不知道如何从 %s 获取"
-#: builtin/fetch.c:1234
+#: builtin/fetch.c:1236
#, c-format
msgid "Fetching %s\n"
msgstr "正在获取 %s\n"
-#: builtin/fetch.c:1236 builtin/remote.c:96
+#: builtin/fetch.c:1238 builtin/remote.c:96
#, c-format
msgid "Could not fetch %s"
msgstr "不能获取 %s"
-#: builtin/fetch.c:1254
+#: builtin/fetch.c:1256
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定，用以获取新提交。"
-#: builtin/fetch.c:1277
+#: builtin/fetch.c:1279
msgid "You need to specify a tag name."
msgstr "您需要指定一个标签名称。"
-#: builtin/fetch.c:1319
+#: builtin/fetch.c:1321
msgid "Negative depth in --deepen is not supported"
msgstr "--deepen 不支持负数深度"
-#: builtin/fetch.c:1321
+#: builtin/fetch.c:1323
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen 和 --depth 是互斥的"
-#: builtin/fetch.c:1326
+#: builtin/fetch.c:1328
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth 和 --unshallow 不能同时使用"
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1330
msgid "--unshallow on a complete repository does not make sense"
msgstr "对于一个完整的仓库，参数 --unshallow 没有意义"
-#: builtin/fetch.c:1350
+#: builtin/fetch.c:1352
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all 不能带一个仓库参数"
-#: builtin/fetch.c:1352
+#: builtin/fetch.c:1354
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all 带引用规格没有任何意义"
-#: builtin/fetch.c:1363
+#: builtin/fetch.c:1365
#, c-format
msgid "No such remote or remote group: %s"
msgstr "没有这样的远程或远程组：%s"
-#: builtin/fetch.c:1371
+#: builtin/fetch.c:1373
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "获取组并指定引用规格没有意义"
@@ -7971,12 +8208,12 @@
msgstr "git for-each-ref [--points-at <对象>]"
#: builtin/for-each-ref.c:11
-msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"
-msgstr "git for-each-ref [(--merged | --no-merged) [<对象>]]"
+msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
+msgstr "git for-each-ref [(--merged | --no-merged) [<提交>]]"
#: builtin/for-each-ref.c:12
-msgid "git for-each-ref [--contains [<object>]]"
-msgstr "git for-each-ref [--contains [<对象>]]"
+msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
+msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]"
#: builtin/for-each-ref.c:27
msgid "quote placeholders suitably for shells"
@@ -7998,10 +8235,6 @@
msgid "show only <n> matched refs"
msgstr "只显示 <n> 个匹配的引用"
-#: builtin/for-each-ref.c:37 builtin/tag.c:387 builtin/verify-tag.c:38
-msgid "format to use for the output"
-msgstr "输出格式"
-
#: builtin/for-each-ref.c:41
msgid "print only refs which points at the given object"
msgstr "只打印指向给定对象的引用"
@@ -8018,6 +8251,10 @@
msgid "print only refs which contain the commit"
msgstr "只打印包含该提交的引用"
+#: builtin/for-each-ref.c:46
+msgid "print only refs which don't contain the commit"
+msgstr "只打印不包含该提交的引用"
+
#: builtin/fsck.c:554
msgid "Checking object directories"
msgstr "检查对象目录中"
@@ -8082,17 +8319,17 @@
msgid "git gc [<options>]"
msgstr "git gc [<选项>]"
-#: builtin/gc.c:72
+#: builtin/gc.c:78
#, c-format
-msgid "Invalid %s: '%s'"
-msgstr "无效 %s：'%s'"
+msgid "Failed to fstat %s: %s"
+msgstr "对 %s 调用 fstat 失败：%s"
-#: builtin/gc.c:139
+#: builtin/gc.c:310
#, c-format
-msgid "insanely long object directory %.*s"
-msgstr "不正常的长对象目录 %.*s"
+msgid "Can't stat %s"
+msgstr "不能对 %s 调用 stat"
-#: builtin/gc.c:297
+#: builtin/gc.c:319
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@ -8106,45 +8343,50 @@
"\n"
"%s"
-#: builtin/gc.c:334
+#: builtin/gc.c:358
msgid "prune unreferenced objects"
msgstr "清除未引用的对象"
-#: builtin/gc.c:336
+#: builtin/gc.c:360
msgid "be more thorough (increased runtime)"
msgstr "更彻底（增加运行时间）"
-#: builtin/gc.c:337
+#: builtin/gc.c:361
msgid "enable auto-gc mode"
msgstr "启用自动垃圾回收模式"
-#: builtin/gc.c:338
+#: builtin/gc.c:362
msgid "force running gc even if there may be another gc running"
msgstr "强制执行 gc 即使另外一个 gc 正在执行"
-#: builtin/gc.c:380
+#: builtin/gc.c:379
+#, c-format
+msgid "Failed to parse gc.logexpiry value %s"
+msgstr "无法解析 gc.logexpiry 的值 %s"
+
+#: builtin/gc.c:407
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr "自动在后台执行仓库打包以求最佳性能。\n"
-#: builtin/gc.c:382
+#: builtin/gc.c:409
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "自动打包仓库以求最佳性能。\n"
-#: builtin/gc.c:383
+#: builtin/gc.c:410
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "手工维护参见 \"git help gc\"。\n"
-#: builtin/gc.c:404
+#: builtin/gc.c:431
#, 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:448
+#: builtin/gc.c:475
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。"
@@ -8163,236 +8405,241 @@
msgid "invalid number of threads specified (%d) for %s"
msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
-#: builtin/grep.c:763 builtin/grep.c:804
+#: builtin/grep.c:769 builtin/grep.c:810
#, c-format
msgid "unable to read tree (%s)"
msgstr "无法读取树（%s）"
-#: builtin/grep.c:823
+#: builtin/grep.c:829
#, c-format
msgid "unable to grep from object of type %s"
msgstr "无法抓取来自于 %s 类型的对象"
-#: builtin/grep.c:887
+#: builtin/grep.c:893
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "开关 `%c' 期望一个数字值"
-#: builtin/grep.c:973
+#: builtin/grep.c:980
msgid "search in index instead of in the work tree"
msgstr "在索引区搜索而不是在工作区"
-#: builtin/grep.c:975
+#: builtin/grep.c:982
msgid "find in contents not managed by git"
msgstr "在未被 git 管理的内容中查找"
# 译者：中文字符串拼接，可删除前导空格
-#: builtin/grep.c:977
+#: builtin/grep.c:984
msgid "search in both tracked and untracked files"
msgstr "在跟踪和未跟踪的文件中搜索"
-#: builtin/grep.c:979
+#: builtin/grep.c:986
msgid "ignore files specified via '.gitignore'"
msgstr "忽略 '.gitignore' 包含的文件"
-#: builtin/grep.c:981
-msgid "recursivley search in each submodule"
+#: builtin/grep.c:988
+msgid "recursively search in each submodule"
msgstr "在每一个子模组中递归搜索"
-#: builtin/grep.c:983
+#: builtin/grep.c:990
msgid "basename"
msgstr "基本名"
-#: builtin/grep.c:984
+#: builtin/grep.c:991
msgid "prepend parent project's basename to output"
msgstr "在输出中以父项目的基本名为前缀"
-#: builtin/grep.c:987
+#: builtin/grep.c:994
msgid "show non-matching lines"
msgstr "显示未匹配的行"
-#: builtin/grep.c:989
+#: builtin/grep.c:996
msgid "case insensitive matching"
msgstr "不区分大小写匹配"
-#: builtin/grep.c:991
+#: builtin/grep.c:998
msgid "match patterns only at word boundaries"
msgstr "只在单词边界匹配模式"
-#: builtin/grep.c:993
+#: builtin/grep.c:1000
msgid "process binary files as text"
msgstr "把二进制文件当做文本处理"
-#: builtin/grep.c:995
+#: builtin/grep.c:1002
msgid "don't match patterns in binary files"
msgstr "不在二进制文件中匹配模式"
-#: builtin/grep.c:998
+#: builtin/grep.c:1005
msgid "process binary files with textconv filters"
msgstr "用 textconv 过滤器处理二进制文件"
-#: builtin/grep.c:1000
+#: builtin/grep.c:1007
msgid "descend at most <depth> levels"
msgstr "最多以指定的深度向下寻找"
-#: builtin/grep.c:1004
+#: builtin/grep.c:1011
msgid "use extended POSIX regular expressions"
msgstr "使用扩展的 POSIX 正则表达式"
-#: builtin/grep.c:1007
+#: builtin/grep.c:1014
msgid "use basic POSIX regular expressions (default)"
msgstr "使用基本的 POSIX 正则表达式（默认）"
-#: builtin/grep.c:1010
+#: builtin/grep.c:1017
msgid "interpret patterns as fixed strings"
msgstr "把模式解析为固定的字符串"
-#: builtin/grep.c:1013
+#: builtin/grep.c:1020
msgid "use Perl-compatible regular expressions"
msgstr "使用 Perl 兼容的正则表达式"
-#: builtin/grep.c:1016
+#: builtin/grep.c:1023
msgid "show line numbers"
msgstr "显示行号"
-#: builtin/grep.c:1017
+#: builtin/grep.c:1024
msgid "don't show filenames"
msgstr "不显示文件名"
-#: builtin/grep.c:1018
+#: builtin/grep.c:1025
msgid "show filenames"
msgstr "显示文件名"
-#: builtin/grep.c:1020
+#: builtin/grep.c:1027
msgid "show filenames relative to top directory"
msgstr "显示相对于顶级目录的文件名"
-#: builtin/grep.c:1022
+#: builtin/grep.c:1029
msgid "show only filenames instead of matching lines"
msgstr "只显示文件名而不显示匹配的行"
-#: builtin/grep.c:1024
+#: builtin/grep.c:1031
msgid "synonym for --files-with-matches"
msgstr "和 --files-with-matches 同义"
-#: builtin/grep.c:1027
+#: builtin/grep.c:1034
msgid "show only the names of files without match"
msgstr "只显示未匹配的文件名"
-#: builtin/grep.c:1029
+#: builtin/grep.c:1036
msgid "print NUL after filenames"
msgstr "在文件名后输出 NUL 字符"
-#: builtin/grep.c:1031
+#: builtin/grep.c:1038
msgid "show the number of matches instead of matching lines"
msgstr "显示总匹配行数，而不显示匹配的行"
-#: builtin/grep.c:1032
+#: builtin/grep.c:1039
msgid "highlight matches"
msgstr "高亮显示匹配项"
-#: builtin/grep.c:1034
+#: builtin/grep.c:1041
msgid "print empty line between matches from different files"
msgstr "在不同文件的匹配项之间打印空行"
-#: builtin/grep.c:1036
+#: builtin/grep.c:1043
msgid "show filename only once above matches from same file"
msgstr "只在同一文件的匹配项的上面显示一次文件名"
-#: builtin/grep.c:1039
+#: builtin/grep.c:1046
msgid "show <n> context lines before and after matches"
msgstr "显示匹配项前后的 <n> 行上下文"
-#: builtin/grep.c:1042
+#: builtin/grep.c:1049
msgid "show <n> context lines before matches"
msgstr "显示匹配项前 <n> 行上下文"
-#: builtin/grep.c:1044
+#: builtin/grep.c:1051
msgid "show <n> context lines after matches"
msgstr "显示匹配项后 <n> 行上下文"
-#: builtin/grep.c:1046
+#: builtin/grep.c:1053
msgid "use <n> worker threads"
msgstr "使用 <n> 个工作线程"
-#: builtin/grep.c:1047
+#: builtin/grep.c:1054
msgid "shortcut for -C NUM"
msgstr "快捷键 -C 数字"
-#: builtin/grep.c:1050
+#: builtin/grep.c:1057
msgid "show a line with the function name before matches"
msgstr "在匹配的前面显示一行函数名"
-#: builtin/grep.c:1052
+#: builtin/grep.c:1059
msgid "show the surrounding function"
msgstr "显示所在函数的前后内容"
-#: builtin/grep.c:1055
+#: builtin/grep.c:1062
msgid "read patterns from file"
msgstr "从文件读取模式"
-#: builtin/grep.c:1057
+#: builtin/grep.c:1064
msgid "match <pattern>"
msgstr "匹配 <模式>"
-#: builtin/grep.c:1059
+#: builtin/grep.c:1066
msgid "combine patterns specified with -e"
msgstr "组合用 -e 参数设定的模式"
-#: builtin/grep.c:1071
+#: builtin/grep.c:1078
msgid "indicate hit with exit status without output"
msgstr "不输出，而用退出码标识命中状态"
-#: builtin/grep.c:1073
+#: builtin/grep.c:1080
msgid "show only matches from files that match all patterns"
msgstr "只显示匹配所有模式的文件中的匹配"
-#: builtin/grep.c:1075
+#: builtin/grep.c:1082
msgid "show parse tree for grep expression"
msgstr "显示 grep 表达式的解析树"
-#: builtin/grep.c:1079
+#: builtin/grep.c:1086
msgid "pager"
msgstr "分页"
-#: builtin/grep.c:1079
+#: builtin/grep.c:1086
msgid "show matching files in the pager"
msgstr "分页显示匹配的文件"
-#: builtin/grep.c:1082
+#: builtin/grep.c:1089
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "允许调用 grep(1)（本次构建忽略）"
-#: builtin/grep.c:1146
+#: builtin/grep.c:1153
msgid "no pattern given."
msgstr "未提供模式匹配。"
-#: builtin/grep.c:1178 builtin/index-pack.c:1482
+#: builtin/grep.c:1189
+msgid "--no-index or --untracked cannot be used with revs"
+msgstr "--no-index 或 --untracked 不能和版本同时使用"
+
+#: builtin/grep.c:1195
+#, c-format
+msgid "unable to resolve revision: %s"
+msgstr "不能解析版本：%s"
+
+#: builtin/grep.c:1228 builtin/index-pack.c:1485
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "指定的线程数无效（%d）"
-#: builtin/grep.c:1215
+#: builtin/grep.c:1251
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager 仅用于工作区"
-#: builtin/grep.c:1238
+#: builtin/grep.c:1274
msgid "option not supported with --recurse-submodules."
msgstr "选项不支持和 --recurse-submodules 共用。"
-#: builtin/grep.c:1244
+#: builtin/grep.c:1280
msgid "--cached or --untracked cannot be used with --no-index."
msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
-#: builtin/grep.c:1249
-msgid "--no-index or --untracked cannot be used with revs."
-msgstr "--no-index 或 --untracked 不能和版本同时使用。"
-
-#: builtin/grep.c:1252
+#: builtin/grep.c:1286
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
-#: builtin/grep.c:1260
+#: builtin/grep.c:1294
msgid "both --cached and trees are given."
msgstr "同时给出了 --cached 和树对象。"
@@ -8617,252 +8864,257 @@
msgid "unable to create '%s'"
msgstr "不能创建 '%s'"
-#: builtin/index-pack.c:322
+#: builtin/index-pack.c:323
#, c-format
msgid "cannot open packfile '%s'"
msgstr "无法打开包文件 '%s'"
-#: builtin/index-pack.c:336
+#: builtin/index-pack.c:337
msgid "pack signature mismatch"
msgstr "包签名不匹配"
-#: builtin/index-pack.c:338
+#: builtin/index-pack.c:339
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "不支持包版本 %<PRIu32>"
-#: builtin/index-pack.c:356
+#: builtin/index-pack.c:357
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>：%s"
-#: builtin/index-pack.c:478
+#: builtin/index-pack.c:479
#, c-format
msgid "inflate returned %d"
msgstr "解压缩返回 %d"
-#: builtin/index-pack.c:527
+#: builtin/index-pack.c:528
msgid "offset value overflow for delta base object"
msgstr "偏移值覆盖了 delta 基准对象"
-#: builtin/index-pack.c:535
+#: builtin/index-pack.c:536
msgid "delta base offset is out of bound"
msgstr "delta 基准偏移越界"
-#: builtin/index-pack.c:543
+#: builtin/index-pack.c:544
#, c-format
msgid "unknown object type %d"
msgstr "未知对象类型 %d"
-#: builtin/index-pack.c:574
+#: builtin/index-pack.c:575
msgid "cannot pread pack file"
msgstr "无法读取包文件"
-#: builtin/index-pack.c:576
+#: builtin/index-pack.c:577
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "包文件过早结束，缺少 %<PRIuMAX> 字节"
msgstr[1] "包文件过早结束，缺少 %<PRIuMAX> 字节"
-#: builtin/index-pack.c:602
+#: builtin/index-pack.c:603
msgid "serious inflate inconsistency"
msgstr "解压缩严重的不一致"
-#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
-#: builtin/index-pack.c:813 builtin/index-pack.c:822
+#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
+#: 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:751 builtin/pack-objects.c:164
-#: builtin/pack-objects.c:256
+#: builtin/index-pack.c:752 builtin/pack-objects.c:164
+#: builtin/pack-objects.c:257
#, c-format
msgid "unable to read %s"
msgstr "不能读 %s"
-#: builtin/index-pack.c:819
+#: builtin/index-pack.c:814
+#, c-format
+msgid "cannot read existing object info %s"
+msgstr "不能读取现存对象信息 %s"
+
+#: builtin/index-pack.c:822
#, c-format
msgid "cannot read existing object %s"
msgstr "不能读取现存对象 %s"
-#: builtin/index-pack.c:833
+#: builtin/index-pack.c:836
#, c-format
msgid "invalid blob object %s"
msgstr "无效的数据对象 %s"
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:850
#, c-format
msgid "invalid %s"
msgstr "无效的 %s"
-#: builtin/index-pack.c:850
+#: builtin/index-pack.c:853
msgid "Error in object"
msgstr "对象中出错"
-#: builtin/index-pack.c:852
+#: builtin/index-pack.c:855
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "%s 的所有子对象并非都可达"
-#: builtin/index-pack.c:924 builtin/index-pack.c:955
+#: builtin/index-pack.c:927 builtin/index-pack.c:958
msgid "failed to apply delta"
msgstr "无法应用 delta"
-#: builtin/index-pack.c:1125
+#: builtin/index-pack.c:1128
msgid "Receiving objects"
msgstr "接收对象中"
-#: builtin/index-pack.c:1125
+#: builtin/index-pack.c:1128
msgid "Indexing objects"
msgstr "索引对象中"
-#: builtin/index-pack.c:1157
+#: builtin/index-pack.c:1160
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "包冲突（SHA1 不匹配）"
-#: builtin/index-pack.c:1162
-msgid "cannot fstat packfile"
-msgstr "不能枚举包文件状态"
-
#: builtin/index-pack.c:1165
+msgid "cannot fstat packfile"
+msgstr "不能对包文件调用 fstat"
+
+#: builtin/index-pack.c:1168
msgid "pack has junk at the end"
msgstr "包的结尾有垃圾数据"
-#: builtin/index-pack.c:1176
+#: builtin/index-pack.c:1179
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "parse_pack_objects() 中遇到不可理喻的问题"
-#: builtin/index-pack.c:1199
+#: builtin/index-pack.c:1202
msgid "Resolving deltas"
msgstr "处理 delta 中"
-#: builtin/index-pack.c:1210
+#: builtin/index-pack.c:1213
#, c-format
msgid "unable to create thread: %s"
msgstr "不能创建线程：%s"
-#: builtin/index-pack.c:1252
+#: builtin/index-pack.c:1255
msgid "confusion beyond insanity"
msgstr "不可理喻"
-#: builtin/index-pack.c:1258
+#: builtin/index-pack.c:1261
#, 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:1270
+#: builtin/index-pack.c:1273
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "对 %s 的尾部校验出现意外（磁盘损坏？）"
-#: builtin/index-pack.c:1274
+#: builtin/index-pack.c:1277
#, 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:1298
+#: builtin/index-pack.c:1301
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "不能压缩附加对象（%d）"
-#: builtin/index-pack.c:1374
+#: builtin/index-pack.c:1377
#, c-format
msgid "local object %s is corrupt"
msgstr "本地对象 %s 已损坏"
-#: builtin/index-pack.c:1398
+#: builtin/index-pack.c:1403
msgid "error while closing pack file"
msgstr "关闭包文件时出错"
-#: builtin/index-pack.c:1411
+#: builtin/index-pack.c:1415
#, c-format
msgid "cannot write keep file '%s'"
msgstr "无法写保留文件 '%s'"
-#: builtin/index-pack.c:1419
+#: builtin/index-pack.c:1423
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "无法关闭保留文件 '%s'"
-#: builtin/index-pack.c:1432
+#: builtin/index-pack.c:1433
msgid "cannot store pack file"
msgstr "无法存储包文件"
-#: builtin/index-pack.c:1443
+#: builtin/index-pack.c:1441
msgid "cannot store index file"
msgstr "无法存储索引文件"
-#: builtin/index-pack.c:1476
+#: builtin/index-pack.c:1479
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "坏的 pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1486 builtin/index-pack.c:1683
+#: builtin/index-pack.c:1489 builtin/index-pack.c:1686
#, c-format
msgid "no threads support, ignoring %s"
msgstr "没有线程支持，忽略 %s"
-#: builtin/index-pack.c:1544
+#: builtin/index-pack.c:1547
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "无法打开现存包文件 '%s'"
-#: builtin/index-pack.c:1546
+#: builtin/index-pack.c:1549
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "无法为 %s 打开包索引文件"
-#: builtin/index-pack.c:1593
+#: builtin/index-pack.c:1596
#, 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:1600
+#: builtin/index-pack.c:1603
#, 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:1613
+#: builtin/index-pack.c:1616
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
-#: builtin/index-pack.c:1695 builtin/index-pack.c:1698
-#: builtin/index-pack.c:1714 builtin/index-pack.c:1718
+#: builtin/index-pack.c:1698 builtin/index-pack.c:1701
+#: builtin/index-pack.c:1717 builtin/index-pack.c:1721
#, c-format
msgid "bad %s"
msgstr "错误选项 %s"
-#: builtin/index-pack.c:1734
+#: builtin/index-pack.c:1737
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin 不能和 --stdin 同时使用"
-#: builtin/index-pack.c:1736
+#: builtin/index-pack.c:1739
msgid "--stdin requires a git repository"
msgstr "--stdin 需要一个 git 仓库"
-#: builtin/index-pack.c:1744
+#: builtin/index-pack.c:1747
msgid "--verify with no packfile name given"
msgstr "--verify 没有提供包文件名参数"
#: builtin/init-db.c:54
#, c-format
msgid "cannot stat '%s'"
-msgstr "不能枚举 '%s' 状态"
+msgstr "不能对 '%s' 调用 stat"
#: builtin/init-db.c:60
#, c-format
msgid "cannot stat template '%s'"
-msgstr "不能枚举模版 '%s' 状态"
+msgstr "不能对模版 '%s' 调用 stat"
#: builtin/init-db.c:65
#, c-format
@@ -9008,104 +9260,104 @@
msgid "git show [<options>] <object>..."
msgstr "git show [<选项>] <对象>..."
-#: builtin/log.c:84
+#: builtin/log.c:89
#, c-format
msgid "invalid --decorate option: %s"
msgstr "无效的 --decorate 选项：%s"
-#: builtin/log.c:139
+#: builtin/log.c:144
msgid "suppress diff output"
msgstr "不显示差异输出"
-#: builtin/log.c:140
+#: builtin/log.c:145
msgid "show source"
msgstr "显示源"
-#: builtin/log.c:141
+#: builtin/log.c:146
msgid "Use mail map file"
msgstr "使用邮件映射文件"
-#: builtin/log.c:142
+#: builtin/log.c:147
msgid "decorate options"
msgstr "修饰选项"
-#: builtin/log.c:145
+#: builtin/log.c:150
msgid "Process line range n,m in file, counting from 1"
msgstr "处理文件中第 n 到 m 之间的行，从 1 开始"
-#: builtin/log.c:241
+#: builtin/log.c:246
#, c-format
msgid "Final output: %d %s\n"
msgstr "最终输出：%d %s\n"
-#: builtin/log.c:486
+#: builtin/log.c:493
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: 损坏的文件"
-#: builtin/log.c:500 builtin/log.c:594
+#: builtin/log.c:507 builtin/log.c:601
#, c-format
msgid "Could not read object %s"
msgstr "不能读取对象 %s"
-#: builtin/log.c:618
+#: builtin/log.c:625
#, c-format
msgid "Unknown type: %d"
msgstr "未知类型：%d"
-#: builtin/log.c:739
+#: builtin/log.c:746
msgid "format.headers without value"
msgstr "format.headers 没有值"
-#: builtin/log.c:839
+#: builtin/log.c:846
msgid "name of output directory is too long"
msgstr "输出目录名太长"
-#: builtin/log.c:854
+#: builtin/log.c:861
#, c-format
msgid "Cannot open patch file %s"
msgstr "无法打开补丁文件 %s"
-#: builtin/log.c:868
+#: builtin/log.c:875
msgid "Need exactly one range."
msgstr "只需要一个范围。"
-#: builtin/log.c:878
+#: builtin/log.c:885
msgid "Not a range."
msgstr "不是一个范围。"
-#: builtin/log.c:984
+#: builtin/log.c:991
msgid "Cover letter needs email format"
msgstr "信封需要邮件地址格式"
-#: builtin/log.c:1063
+#: builtin/log.c:1071
#, c-format
msgid "insane in-reply-to: %s"
msgstr "不正常的 in-reply-to：%s"
-#: builtin/log.c:1091
+#: builtin/log.c:1098
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
-#: builtin/log.c:1141
+#: builtin/log.c:1148
msgid "Two output directories?"
msgstr "两个输出目录？"
-#: builtin/log.c:1248 builtin/log.c:1891 builtin/log.c:1893 builtin/log.c:1905
+#: builtin/log.c:1255 builtin/log.c:1898 builtin/log.c:1900 builtin/log.c:1912
#, c-format
msgid "Unknown commit %s"
msgstr "未知提交 %s"
-#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:476
+#: builtin/log.c:1265 builtin/notes.c:883 builtin/tag.c:532
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "无法解析 '%s' 为一个有效引用。"
-#: builtin/log.c:1263
+#: builtin/log.c:1270
msgid "Could not find exact merge base."
msgstr "不能找到准确的合并基线。"
-#: builtin/log.c:1267
+#: builtin/log.c:1274
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"
@@ -9115,315 +9367,315 @@
"git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n"
"参数 --base=<base-commit-id> 手动指定一个基线提交。"
-#: builtin/log.c:1287
+#: builtin/log.c:1294
msgid "Failed to find exact merge base"
msgstr "无法找到准确的合并基线"
-#: builtin/log.c:1298
+#: builtin/log.c:1305
msgid "base commit should be the ancestor of revision list"
msgstr "基线提交应该是版本列表的祖先"
-#: builtin/log.c:1302
+#: builtin/log.c:1309
msgid "base commit shouldn't be in revision list"
msgstr "基线提交不应该出现在版本列表中"
-#: builtin/log.c:1351
+#: builtin/log.c:1358
msgid "cannot get patch id"
msgstr "无法得到补丁 id"
-#: builtin/log.c:1408
+#: builtin/log.c:1415
msgid "use [PATCH n/m] even with a single patch"
msgstr "使用 [PATCH n/m]，即使只有一个补丁"
-#: builtin/log.c:1411
+#: builtin/log.c:1418
msgid "use [PATCH] even with multiple patches"
msgstr "使用 [PATCH]，即使有多个补丁"
-#: builtin/log.c:1415
+#: builtin/log.c:1422
msgid "print patches to standard out"
msgstr "打印补丁到标准输出"
-#: builtin/log.c:1417
+#: builtin/log.c:1424
msgid "generate a cover letter"
msgstr "生成一封附信"
-#: builtin/log.c:1419
+#: builtin/log.c:1426
msgid "use simple number sequence for output file names"
msgstr "使用简单的数字序列作为输出文件名"
-#: builtin/log.c:1420
+#: builtin/log.c:1427
msgid "sfx"
msgstr "后缀"
-#: builtin/log.c:1421
+#: builtin/log.c:1428
msgid "use <sfx> instead of '.patch'"
msgstr "使用 <后缀> 代替 '.patch'"
-#: builtin/log.c:1423
+#: builtin/log.c:1430
msgid "start numbering patches at <n> instead of 1"
msgstr "补丁以 <n> 开始编号，而不是1"
-#: builtin/log.c:1425
+#: builtin/log.c:1432
msgid "mark the series as Nth re-roll"
msgstr "标记补丁系列是第几次重制"
-#: builtin/log.c:1427
+#: builtin/log.c:1434
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "使用 [RFC PATCH] 代替 [PATCH]"
-#: builtin/log.c:1430
+#: builtin/log.c:1437
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "使用 [<前缀>] 代替 [PATCH]"
-#: builtin/log.c:1433
+#: builtin/log.c:1440
msgid "store resulting files in <dir>"
msgstr "把结果文件存储在 <目录>"
-#: builtin/log.c:1436
+#: builtin/log.c:1443
msgid "don't strip/add [PATCH]"
msgstr "不删除/添加 [PATCH]"
-#: builtin/log.c:1439
+#: builtin/log.c:1446
msgid "don't output binary diffs"
msgstr "不输出二进制差异"
-#: builtin/log.c:1441
+#: builtin/log.c:1448
msgid "output all-zero hash in From header"
msgstr "在 From 头信息中输出全为零的哈希值"
-#: builtin/log.c:1443
+#: builtin/log.c:1450
msgid "don't include a patch matching a commit upstream"
msgstr "不包含已在上游提交中的补丁"
-#: builtin/log.c:1445
+#: builtin/log.c:1452
msgid "show patch format instead of default (patch + stat)"
msgstr "显示纯补丁格式而非默认的（补丁+状态）"
-#: builtin/log.c:1447
+#: builtin/log.c:1454
msgid "Messaging"
msgstr "邮件发送"
-#: builtin/log.c:1448
+#: builtin/log.c:1455
msgid "header"
msgstr "header"
-#: builtin/log.c:1449
+#: builtin/log.c:1456
msgid "add email header"
msgstr "添加邮件头"
-#: builtin/log.c:1450 builtin/log.c:1452
+#: builtin/log.c:1457 builtin/log.c:1459
msgid "email"
msgstr "邮件地址"
-#: builtin/log.c:1450
+#: builtin/log.c:1457
msgid "add To: header"
msgstr "添加收件人"
-#: builtin/log.c:1452
+#: builtin/log.c:1459
msgid "add Cc: header"
msgstr "添加抄送"
-#: builtin/log.c:1454
+#: builtin/log.c:1461
msgid "ident"
msgstr "标识"
-#: builtin/log.c:1455
+#: builtin/log.c:1462
msgid "set From address to <ident> (or committer ident if absent)"
msgstr "将 From 地址设置为 <标识>（如若不提供，则用提交者 ID 做为地址）"
-#: builtin/log.c:1457
+#: builtin/log.c:1464
msgid "message-id"
msgstr "邮件标识"
-#: builtin/log.c:1458
+#: builtin/log.c:1465
msgid "make first mail a reply to <message-id>"
msgstr "使第一封邮件作为对 <邮件标识> 的回复"
-#: builtin/log.c:1459 builtin/log.c:1462
+#: builtin/log.c:1466 builtin/log.c:1469
msgid "boundary"
msgstr "边界"
-#: builtin/log.c:1460
+#: builtin/log.c:1467
msgid "attach the patch"
msgstr "附件方式添加补丁"
-#: builtin/log.c:1463
+#: builtin/log.c:1470
msgid "inline the patch"
msgstr "内联显示补丁"
-#: builtin/log.c:1467
+#: builtin/log.c:1474
msgid "enable message threading, styles: shallow, deep"
msgstr "启用邮件线索，风格：浅，深"
-#: builtin/log.c:1469
+#: builtin/log.c:1476
msgid "signature"
msgstr "签名"
-#: builtin/log.c:1470
+#: builtin/log.c:1477
msgid "add a signature"
msgstr "添加一个签名"
-#: builtin/log.c:1471
+#: builtin/log.c:1478
msgid "base-commit"
msgstr "基线提交"
-#: builtin/log.c:1472
+#: builtin/log.c:1479
msgid "add prerequisite tree info to the patch series"
msgstr "为补丁列表添加前置树信息"
-#: builtin/log.c:1474
+#: builtin/log.c:1481
msgid "add a signature from a file"
msgstr "从文件添加一个签名"
-#: builtin/log.c:1475
+#: builtin/log.c:1482
msgid "don't print the patch filenames"
msgstr "不要打印补丁文件名"
-#: builtin/log.c:1565
+#: builtin/log.c:1572
msgid "-n and -k are mutually exclusive."
msgstr "-n 和 -k 互斥。"
-#: builtin/log.c:1567
+#: builtin/log.c:1574
msgid "--subject-prefix/--rfc and -k are mutually exclusive."
msgstr "--subject-prefix/--rfc 和 -k 互斥。"
-#: builtin/log.c:1575
+#: builtin/log.c:1582
msgid "--name-only does not make sense"
msgstr "--name-only 无意义"
-#: builtin/log.c:1577
+#: builtin/log.c:1584
msgid "--name-status does not make sense"
msgstr "--name-status 无意义"
-#: builtin/log.c:1579
+#: builtin/log.c:1586
msgid "--check does not make sense"
msgstr "--check 无意义"
-#: builtin/log.c:1609
+#: builtin/log.c:1616
msgid "standard output, or directory, which one?"
msgstr "标准输出或目录，哪一个？"
-#: builtin/log.c:1611
+#: builtin/log.c:1618
#, c-format
msgid "Could not create directory '%s'"
msgstr "不能创建目录 '%s'"
-#: builtin/log.c:1705
+#: builtin/log.c:1712
#, c-format
msgid "unable to read signature file '%s'"
msgstr "无法读取签名文件 '%s'"
-#: builtin/log.c:1777
+#: builtin/log.c:1784
msgid "Failed to create output files"
msgstr "无法创建输出文件"
-#: builtin/log.c:1826
+#: builtin/log.c:1833
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
-#: builtin/log.c:1880
+#: builtin/log.c:1887
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr "不能找到跟踪的远程分支，请手工指定 <上游>。\n"
-#: builtin/ls-files.c:460
+#: builtin/ls-files.c:468
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<选项>] [<文件>...]"
-#: builtin/ls-files.c:509
+#: builtin/ls-files.c:517
msgid "identify the file status with tags"
msgstr "用标签标识文件的状态"
-#: builtin/ls-files.c:511
+#: builtin/ls-files.c:519
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "使用小写字母表示 '假设未改变的' 文件"
-#: builtin/ls-files.c:513
+#: builtin/ls-files.c:521
msgid "show cached files in the output (default)"
msgstr "显示缓存的文件（默认）"
-#: builtin/ls-files.c:515
+#: builtin/ls-files.c:523
msgid "show deleted files in the output"
msgstr "显示已删除的文件"
-#: builtin/ls-files.c:517
+#: builtin/ls-files.c:525
msgid "show modified files in the output"
msgstr "显示已修改的文件"
-#: builtin/ls-files.c:519
+#: builtin/ls-files.c:527
msgid "show other files in the output"
msgstr "显示其它文件"
-#: builtin/ls-files.c:521
+#: builtin/ls-files.c:529
msgid "show ignored files in the output"
msgstr "显示忽略的文件"
-#: builtin/ls-files.c:524
+#: builtin/ls-files.c:532
msgid "show staged contents' object name in the output"
msgstr "显示暂存区内容的对象名称"
-#: builtin/ls-files.c:526
+#: builtin/ls-files.c:534
msgid "show files on the filesystem that need to be removed"
msgstr "显示文件系统需要删除的文件"
-#: builtin/ls-files.c:528
+#: builtin/ls-files.c:536
msgid "show 'other' directories' names only"
msgstr "只显示“其他”目录的名称"
-#: builtin/ls-files.c:530
+#: builtin/ls-files.c:538
msgid "show line endings of files"
msgstr "显示文件换行符格式"
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:540
msgid "don't show empty directories"
msgstr "不显示空目录"
-#: builtin/ls-files.c:535
+#: builtin/ls-files.c:543
msgid "show unmerged files in the output"
msgstr "显示未合并的文件"
-#: builtin/ls-files.c:537
+#: builtin/ls-files.c:545
msgid "show resolve-undo information"
msgstr "显示 resolve-undo 信息"
-#: builtin/ls-files.c:539
+#: builtin/ls-files.c:547
msgid "skip files matching pattern"
msgstr "匹配排除文件的模式"
-#: builtin/ls-files.c:542
+#: builtin/ls-files.c:550
msgid "exclude patterns are read from <file>"
msgstr "从 <文件> 中读取排除模式"
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:553
msgid "read additional per-directory exclude patterns in <file>"
msgstr "从 <文件> 读取额外的每个目录的排除模式"
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:555
msgid "add the standard git exclusions"
msgstr "添加标准的 git 排除"
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:558
msgid "make the output relative to the project top directory"
msgstr "显示相对于顶级目录的文件名"
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:561
msgid "recurse through submodules"
msgstr "在子模组中递归"
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:563
msgid "if any <file> is not in the index, treat this as an error"
msgstr "如果任何 <文件> 都不在索引区，视为错误"
-#: builtin/ls-files.c:556
+#: builtin/ls-files.c:564
msgid "tree-ish"
msgstr "树或提交"
-#: builtin/ls-files.c:557
+#: builtin/ls-files.c:565
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
-#: builtin/ls-files.c:559
+#: builtin/ls-files.c:567
msgid "show debugging data"
msgstr "显示调试数据"
@@ -9437,39 +9689,39 @@
" [-q | --quiet] [--exit-code] [--get-url]\n"
" [--symref] [<仓库> [<引用>...]]"
-#: builtin/ls-remote.c:50
+#: builtin/ls-remote.c:52
msgid "do not print remote URL"
msgstr "不打印远程 URL"
-#: builtin/ls-remote.c:51 builtin/ls-remote.c:53
+#: builtin/ls-remote.c:53 builtin/ls-remote.c:55
msgid "exec"
msgstr "exec"
-#: builtin/ls-remote.c:52 builtin/ls-remote.c:54
+#: builtin/ls-remote.c:54 builtin/ls-remote.c:56
msgid "path of git-upload-pack on the remote host"
msgstr "远程主机上的 git-upload-pack 路径"
-#: builtin/ls-remote.c:56
+#: builtin/ls-remote.c:58
msgid "limit to tags"
msgstr "仅限于标签"
-#: builtin/ls-remote.c:57
+#: builtin/ls-remote.c:59
msgid "limit to heads"
msgstr "仅限于分支"
-#: builtin/ls-remote.c:58
+#: builtin/ls-remote.c:60
msgid "do not show peeled tags"
msgstr "不显示已解析的标签"
-#: builtin/ls-remote.c:60
+#: builtin/ls-remote.c:62
msgid "take url.<base>.insteadOf into account"
msgstr "参考 url.<base>.insteadOf 设置"
-#: builtin/ls-remote.c:62
+#: builtin/ls-remote.c:64
msgid "exit with exit code 2 if no matching refs are found"
msgstr "若未找到匹配的引用则以退出码2退出"
-#: builtin/ls-remote.c:64
+#: builtin/ls-remote.c:66
msgid "show underlying ref in addition to the object pointed by it"
msgstr "除了显示指向的对象外，显示指向的引用名"
@@ -9514,147 +9766,143 @@
msgstr "git merge [<选项>] [<提交>...]"
#: builtin/merge.c:47
-msgid "git merge [<options>] <msg> HEAD <commit>"
-msgstr "git merge [<选项>] <说明> HEAD <提交>"
-
-#: builtin/merge.c:48
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:49
+#: builtin/merge.c:48
msgid "git merge --continue"
msgstr "git merge --continue"
-#: builtin/merge.c:104
+#: builtin/merge.c:103
msgid "switch `m' requires a value"
msgstr "开关 `m' 需要一个值"
-#: builtin/merge.c:141
+#: builtin/merge.c:140
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "不能找到合并策略 '%s'。\n"
-#: builtin/merge.c:142
+#: builtin/merge.c:141
#, c-format
msgid "Available strategies are:"
msgstr "可用的策略有："
-#: builtin/merge.c:147
+#: builtin/merge.c:146
#, c-format
msgid "Available custom strategies are:"
msgstr "可用的自定义策略有："
-#: builtin/merge.c:197 builtin/pull.c:127
+#: builtin/merge.c:196 builtin/pull.c:127
msgid "do not show a diffstat at the end of the merge"
msgstr "在合并的最后不显示差异统计"
-#: builtin/merge.c:200 builtin/pull.c:130
+#: builtin/merge.c:199 builtin/pull.c:130
msgid "show a diffstat at the end of the merge"
msgstr "在合并的最后显示差异统计"
-#: builtin/merge.c:201 builtin/pull.c:133
+#: builtin/merge.c:200 builtin/pull.c:133
msgid "(synonym to --stat)"
msgstr "（和 --stat 同义）"
-#: builtin/merge.c:203 builtin/pull.c:136
+#: builtin/merge.c:202 builtin/pull.c:136
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr "在合并提交信息中添加（最多 <n> 条）精简提交记录"
-#: builtin/merge.c:206 builtin/pull.c:139
+#: builtin/merge.c:205 builtin/pull.c:139
msgid "create a single commit instead of doing a merge"
msgstr "创建一个单独的提交而不是做一次合并"
-#: builtin/merge.c:208 builtin/pull.c:142
+#: builtin/merge.c:207 builtin/pull.c:142
msgid "perform a commit if the merge succeeds (default)"
msgstr "如果合并成功，执行一次提交（默认）"
-#: builtin/merge.c:210 builtin/pull.c:145
+#: builtin/merge.c:209 builtin/pull.c:145
msgid "edit message before committing"
msgstr "在提交前编辑提交说明"
-#: builtin/merge.c:211
+#: builtin/merge.c:210
msgid "allow fast-forward (default)"
msgstr "允许快进（默认）"
-#: builtin/merge.c:213 builtin/pull.c:151
+#: builtin/merge.c:212 builtin/pull.c:151
msgid "abort if fast-forward is not possible"
msgstr "如果不能快进就放弃合并"
-#: builtin/merge.c:217 builtin/pull.c:154
+#: builtin/merge.c:216 builtin/pull.c:154
msgid "verify that the named commit has a valid GPG signature"
msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
-#: builtin/merge.c:218 builtin/notes.c:774 builtin/pull.c:158
-#: builtin/revert.c:89
+#: builtin/merge.c:217 builtin/notes.c:773 builtin/pull.c:158
+#: builtin/revert.c:108
msgid "strategy"
msgstr "策略"
-#: builtin/merge.c:219 builtin/pull.c:159
+#: builtin/merge.c:218 builtin/pull.c:159
msgid "merge strategy to use"
msgstr "要使用的合并策略"
-#: builtin/merge.c:220 builtin/pull.c:162
+#: builtin/merge.c:219 builtin/pull.c:162
msgid "option=value"
msgstr "option=value"
-#: builtin/merge.c:221 builtin/pull.c:163
+#: builtin/merge.c:220 builtin/pull.c:163
msgid "option for selected merge strategy"
msgstr "所选的合并策略的选项"
-#: builtin/merge.c:223
+#: builtin/merge.c:222
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "合并的提交说明（针对非快进式合并）"
-#: builtin/merge.c:227
+#: builtin/merge.c:226
msgid "abort the current in-progress merge"
msgstr "放弃当前正在进行的合并"
-#: builtin/merge.c:229
+#: builtin/merge.c:228
msgid "continue the current in-progress merge"
msgstr "继续当前正在进行的合并"
-#: builtin/merge.c:231 builtin/pull.c:170
+#: builtin/merge.c:230 builtin/pull.c:170
msgid "allow merging unrelated histories"
msgstr "允许合并不相关的历史"
-#: builtin/merge.c:259
+#: builtin/merge.c:258
msgid "could not run stash."
msgstr "不能进行进度保存。"
-#: builtin/merge.c:264
+#: builtin/merge.c:263
msgid "stash failed"
msgstr "进度保存失败"
-#: builtin/merge.c:269
+#: builtin/merge.c:268
#, c-format
msgid "not a valid object: %s"
msgstr "不是一个有效对象：%s"
-#: builtin/merge.c:288 builtin/merge.c:305
+#: builtin/merge.c:287 builtin/merge.c:304
msgid "read-tree failed"
msgstr "读取树失败"
# 译者：注意保持前导空格
-#: builtin/merge.c:335
+#: builtin/merge.c:334
msgid " (nothing to squash)"
msgstr " （无可压缩）"
-#: builtin/merge.c:346
+#: builtin/merge.c:345
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "压缩提交 -- 未更新 HEAD\n"
-#: builtin/merge.c:396
+#: builtin/merge.c:395
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "无合并信息 -- 未更新 HEAD\n"
-#: builtin/merge.c:447
+#: builtin/merge.c:446
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' 没有指向一个提交"
-#: builtin/merge.c:537
+#: builtin/merge.c:536
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "坏的 branch.%s.mergeoptions 字符串：%s"
@@ -9711,64 +9959,59 @@
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr "自动合并失败，修正冲突然后提交修正的结果。\n"
-#: builtin/merge.c:867
-#, c-format
-msgid "'%s' is not a commit"
-msgstr "'%s' 不是一个提交"
-
-#: builtin/merge.c:908
+#: builtin/merge.c:890
msgid "No current branch."
msgstr "没有当前分支。"
-#: builtin/merge.c:910
+#: builtin/merge.c:892
msgid "No remote for the current branch."
msgstr "当前分支没有对应的远程仓库。"
-#: builtin/merge.c:912
+#: builtin/merge.c:894
msgid "No default upstream defined for the current branch."
msgstr "当前分支没有定义默认的上游分支。"
-#: builtin/merge.c:917
+#: builtin/merge.c:899
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
-#: builtin/merge.c:964
+#: builtin/merge.c:946
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"
-#: builtin/merge.c:1038
+#: builtin/merge.c:1020
#, c-format
msgid "could not close '%s'"
msgstr "不能关闭 '%s'"
-#: builtin/merge.c:1065
+#: builtin/merge.c:1047
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "不能在 %s 中合并：%s"
-#: builtin/merge.c:1099
+#: builtin/merge.c:1081
msgid "not something we can merge"
msgstr "不能合并"
-#: builtin/merge.c:1167
+#: builtin/merge.c:1146
msgid "--abort expects no arguments"
msgstr "--abort 不带参数"
-#: builtin/merge.c:1171
+#: builtin/merge.c:1150
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "没有要终止的合并（MERGE_HEAD 丢失）。"
-#: builtin/merge.c:1183
+#: builtin/merge.c:1162
msgid "--continue expects no arguments"
msgstr "--continue 不带参数"
-#: builtin/merge.c:1187
+#: builtin/merge.c:1166
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "没有进行中的合并（MERGE_HEAD 丢失）。"
-#: builtin/merge.c:1203
+#: builtin/merge.c:1182
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -9776,7 +10019,7 @@
"您尚未结束您的合并（存在 MERGE_HEAD）。\n"
"请在合并前先提交您的修改。"
-#: builtin/merge.c:1210
+#: builtin/merge.c:1189
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -9784,112 +10027,112 @@
"您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n"
"请在合并前先提交您的修改。"
-#: builtin/merge.c:1213
+#: builtin/merge.c:1192
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。"
-#: builtin/merge.c:1222
+#: builtin/merge.c:1201
msgid "You cannot combine --squash with --no-ff."
msgstr "您不能将 --squash 与 --no-ff 同时使用。"
-#: builtin/merge.c:1230
+#: builtin/merge.c:1209
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
-#: builtin/merge.c:1247
+#: builtin/merge.c:1226
msgid "Squash commit into empty head not supported yet"
msgstr "尚不支持到空分支的压缩提交"
-#: builtin/merge.c:1249
+#: builtin/merge.c:1228
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "到空分支的非快进式提交没有意义"
-#: builtin/merge.c:1254
+#: builtin/merge.c:1233
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - 不能被合并"
-#: builtin/merge.c:1256
+#: builtin/merge.c:1235
msgid "Can merge only exactly one commit into empty head"
msgstr "只能将一个提交合并到空分支上"
-#: builtin/merge.c:1312
+#: builtin/merge.c:1269
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
-#: builtin/merge.c:1315
+#: builtin/merge.c:1272
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
-#: builtin/merge.c:1318
+#: builtin/merge.c:1275
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "提交 %s 没有一个 GPG 签名。"
-#: builtin/merge.c:1321
+#: builtin/merge.c:1278
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
-#: builtin/merge.c:1383
+#: builtin/merge.c:1340
msgid "refusing to merge unrelated histories"
msgstr "拒绝合并无关的历史"
-#: builtin/merge.c:1392
+#: builtin/merge.c:1349
msgid "Already up-to-date."
msgstr "已经是最新的。"
-#: builtin/merge.c:1402
+#: builtin/merge.c:1359
#, c-format
msgid "Updating %s..%s\n"
msgstr "更新 %s..%s\n"
-#: builtin/merge.c:1443
+#: builtin/merge.c:1400
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "尝试非常小的索引内合并...\n"
-#: builtin/merge.c:1450
+#: builtin/merge.c:1407
#, c-format
msgid "Nope.\n"
msgstr "无。\n"
-#: builtin/merge.c:1475
+#: builtin/merge.c:1432
msgid "Already up-to-date. Yeeah!"
msgstr "已经是最新的。耶！"
-#: builtin/merge.c:1481
+#: builtin/merge.c:1438
msgid "Not possible to fast-forward, aborting."
msgstr "无法快进，终止。"
-#: builtin/merge.c:1504 builtin/merge.c:1583
+#: builtin/merge.c:1461 builtin/merge.c:1540
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "将树回滚至原始状态...\n"
-#: builtin/merge.c:1508
+#: builtin/merge.c:1465
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "尝试合并策略 %s...\n"
-#: builtin/merge.c:1574
+#: builtin/merge.c:1531
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "没有合并策略处理此合并。\n"
-#: builtin/merge.c:1576
+#: builtin/merge.c:1533
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "使用策略 %s 合并失败。\n"
-#: builtin/merge.c:1585
+#: builtin/merge.c:1542
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "使用 %s 以准备手工解决。\n"
-#: builtin/merge.c:1597
+#: builtin/merge.c:1554
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr "自动合并进展顺利，按要求在提交前停止\n"
@@ -9942,35 +10185,35 @@
"git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
"件> <文件2>"
-#: builtin/merge-file.c:33
+#: builtin/merge-file.c:32
msgid "send results to standard output"
msgstr "将结果发送到标准输出"
-#: builtin/merge-file.c:34
+#: builtin/merge-file.c:33
msgid "use a diff3 based merge"
msgstr "使用基于 diff3 的合并"
-#: builtin/merge-file.c:35
+#: builtin/merge-file.c:34
msgid "for conflicts, use our version"
msgstr "如果冲突，使用我们的版本"
-#: builtin/merge-file.c:37
+#: builtin/merge-file.c:36
msgid "for conflicts, use their version"
msgstr "如果冲突，使用他们的版本"
-#: builtin/merge-file.c:39
+#: builtin/merge-file.c:38
msgid "for conflicts, use a union version"
msgstr "如果冲突，使用联合版本"
-#: builtin/merge-file.c:42
+#: builtin/merge-file.c:41
msgid "for conflicts, use this marker size"
msgstr "如果冲突，使用指定长度的标记"
-#: builtin/merge-file.c:43
+#: builtin/merge-file.c:42
msgid "do not warn about conflicts"
msgstr "不要警告冲突"
-#: builtin/merge-file.c:45
+#: builtin/merge-file.c:44
msgid "set labels for file1/orig-file/file2"
msgstr "为 文件1/初始文件/文件2 设置标签"
@@ -10113,43 +10356,47 @@
msgid "renaming '%s' failed"
msgstr "重命名 '%s' 失败"
-#: builtin/name-rev.c:257
+#: builtin/name-rev.c:289
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<选项>] <提交>..."
-#: builtin/name-rev.c:258
+#: builtin/name-rev.c:290
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<选项>] --all"
-#: builtin/name-rev.c:259
+#: builtin/name-rev.c:291
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<选项>] --stdin"
-#: builtin/name-rev.c:311
+#: builtin/name-rev.c:346
msgid "print only names (no SHA-1)"
msgstr "只打印名称（无 SHA-1）"
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:347
msgid "only use tags to name the commits"
msgstr "只使用标签来命名提交"
-#: builtin/name-rev.c:314
+#: builtin/name-rev.c:349
msgid "only use refs matching <pattern>"
msgstr "只使用和 <模式> 相匹配的引用"
-#: builtin/name-rev.c:316
+#: builtin/name-rev.c:351
+msgid "ignore refs matching <pattern>"
+msgstr "忽略和 <模式> 相匹配的引用"
+
+#: builtin/name-rev.c:353
msgid "list all commits reachable from all refs"
msgstr "列出可以从所有引用访问的提交"
-#: builtin/name-rev.c:317
+#: builtin/name-rev.c:354
msgid "read from stdin"
msgstr "从标准输入读取"
-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:355
msgid "allow to print `undefined` names (default)"
msgstr "允许打印 `未定义` 的名称（默认）"
-#: builtin/name-rev.c:324
+#: builtin/name-rev.c:361
msgid "dereference tags in the input (internal use)"
msgstr "反向解析输入中的标签（内部使用）"
@@ -10293,19 +10540,19 @@
msgid "the note contents have been left in %s"
msgstr "注解内容被留在 %s 中"
-#: builtin/notes.c:233 builtin/tag.c:460
+#: builtin/notes.c:233 builtin/tag.c:516
#, c-format
msgid "cannot read '%s'"
msgstr "不能读取 '%s'"
-#: builtin/notes.c:235 builtin/tag.c:463
+#: builtin/notes.c:235 builtin/tag.c:519
#, 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:659
+#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:658
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr "无法解析 '%s' 为一个有效引用。"
@@ -10338,12 +10585,12 @@
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:652
-#: builtin/notes.c:802 builtin/notes.c:949 builtin/notes.c:970
+#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:651
+#: builtin/notes.c:801 builtin/notes.c:948 builtin/notes.c:969
msgid "too many parameters"
msgstr "参数太多"
-#: builtin/notes.c:378 builtin/notes.c:665
+#: builtin/notes.c:378 builtin/notes.c:664
#, c-format
msgid "no note found for object %s."
msgstr "未发现对象 %s 的注解。"
@@ -10384,7 +10631,7 @@
msgid "Overwriting existing notes for object %s\n"
msgstr "覆盖对象 %s 现存注解\n"
-#: builtin/notes.c:463 builtin/notes.c:624 builtin/notes.c:889
+#: builtin/notes.c:463 builtin/notes.c:623 builtin/notes.c:888
#, c-format
msgid "Removing note for object %s\n"
msgstr "删除对象 %s 的注解\n"
@@ -10422,97 +10669,97 @@
"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
"请换用 'git notes add -f -m/-F/-c/-C'。\n"
-#: builtin/notes.c:685
+#: builtin/notes.c:684
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "无法删除引用 NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:687
+#: builtin/notes.c:686
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "无法删除引用 NOTES_MERGE_REF"
-#: builtin/notes.c:689
+#: builtin/notes.c:688
msgid "failed to remove 'git notes merge' worktree"
msgstr "无法删除 'git notes merge' 工作区"
-#: builtin/notes.c:709
+#: builtin/notes.c:708
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "无法读取引用 NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:711
+#: builtin/notes.c:710
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。"
-#: builtin/notes.c:713
+#: builtin/notes.c:712
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。"
-#: builtin/notes.c:726
+#: builtin/notes.c:725
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "无法解析 NOTES_MERGE_REF"
-#: builtin/notes.c:729
+#: builtin/notes.c:728
msgid "failed to finalize notes merge"
msgstr "无法完成注解合并"
-#: builtin/notes.c:755
+#: builtin/notes.c:754
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "未知的注解合并策略 %s"
-#: builtin/notes.c:771
+#: builtin/notes.c:770
msgid "General options"
msgstr "通用选项"
-#: builtin/notes.c:773
+#: builtin/notes.c:772
msgid "Merge options"
msgstr "合并选项"
-#: builtin/notes.c:775
+#: builtin/notes.c:774
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:777
+#: builtin/notes.c:776
msgid "Committing unmerged notes"
msgstr "提交未合并的注解"
-#: builtin/notes.c:779
+#: builtin/notes.c:778
msgid "finalize notes merge by committing unmerged notes"
msgstr "通过提交未合并的注解来完成注解合并"
-#: builtin/notes.c:781
+#: builtin/notes.c:780
msgid "Aborting notes merge resolution"
msgstr "中止注解合并的方案"
-#: builtin/notes.c:783
+#: builtin/notes.c:782
msgid "abort notes merge"
msgstr "中止注解合并"
-#: builtin/notes.c:794
+#: builtin/notes.c:793
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "不能混用 --commit、--abort 或 -s/--strategy"
-#: builtin/notes.c:799
+#: builtin/notes.c:798
msgid "must specify a notes ref to merge"
msgstr "必须指定一个注解引用来合并"
-#: builtin/notes.c:823
+#: builtin/notes.c:822
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "未知的 -s/--strategy：%s"
-#: builtin/notes.c:860
+#: builtin/notes.c:859
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中"
-#: builtin/notes.c:863
+#: builtin/notes.c:862
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr "无法存储链接到当前的注解引用（%s）"
-#: builtin/notes.c:865
+#: builtin/notes.c:864
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -10522,36 +10769,36 @@
"自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提"
"交结果，或者使用命令 'git notes merge --abort' 终止合并。\n"
-#: builtin/notes.c:887
+#: builtin/notes.c:886
#, c-format
msgid "Object %s has no note\n"
msgstr "对象 %s 没有注解\n"
-#: builtin/notes.c:899
+#: builtin/notes.c:898
msgid "attempt to remove non-existent note is not an error"
msgstr "尝试删除不存在的注解不是一个错误"
-#: builtin/notes.c:902
+#: builtin/notes.c:901
msgid "read object names from the standard input"
msgstr "从标准输入读取对象名称"
-#: builtin/notes.c:940 builtin/prune.c:105 builtin/worktree.c:127
+#: builtin/notes.c:939 builtin/prune.c:105 builtin/worktree.c:127
msgid "do not remove, show only"
msgstr "不删除，只显示"
-#: builtin/notes.c:941
+#: builtin/notes.c:940
msgid "report pruned notes"
msgstr "报告清除的注解"
-#: builtin/notes.c:983
+#: builtin/notes.c:982
msgid "notes-ref"
msgstr "注解引用"
-#: builtin/notes.c:984
+#: builtin/notes.c:983
msgid "use notes from <notes-ref>"
msgstr "从 <注解引用> 使用注解"
-#: builtin/notes.c:1019
+#: builtin/notes.c:1018
#, c-format
msgid "unknown subcommand: %s"
msgstr "未知子命令：%s"
@@ -10571,169 +10818,169 @@
msgid "deflate error (%d)"
msgstr "压缩错误 (%d)"
-#: builtin/pack-objects.c:766
+#: builtin/pack-objects.c:770
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr "禁用 bitmap 写入，因为 pack.packSizeLimit 设置使得包被切分为多个"
-#: builtin/pack-objects.c:779
+#: builtin/pack-objects.c:783
msgid "Writing objects"
msgstr "写入对象中"
-#: builtin/pack-objects.c:1068
+#: builtin/pack-objects.c:1063
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "禁用 bitmap 写入，因为一些对象将不会被打包"
-#: builtin/pack-objects.c:2344
+#: builtin/pack-objects.c:2426
msgid "Compressing objects"
msgstr "压缩对象中"
-#: builtin/pack-objects.c:2747
+#: builtin/pack-objects.c:2829
#, c-format
msgid "unsupported index version %s"
msgstr "不支持的索引版本 %s"
-#: builtin/pack-objects.c:2751
+#: builtin/pack-objects.c:2833
#, c-format
msgid "bad index version '%s'"
msgstr "坏的索引版本 '%s'"
-#: builtin/pack-objects.c:2781
+#: builtin/pack-objects.c:2863
msgid "do not show progress meter"
msgstr "不显示进度表"
-#: builtin/pack-objects.c:2783
+#: builtin/pack-objects.c:2865
msgid "show progress meter"
msgstr "显示进度表"
-#: builtin/pack-objects.c:2785
+#: builtin/pack-objects.c:2867
msgid "show progress meter during object writing phase"
msgstr "在对象写入阶段显示进度表"
-#: builtin/pack-objects.c:2788
+#: builtin/pack-objects.c:2870
msgid "similar to --all-progress when progress meter is shown"
msgstr "当进度表显示时类似于 --all-progress"
-#: builtin/pack-objects.c:2789
+#: builtin/pack-objects.c:2871
msgid "version[,offset]"
msgstr "版本[,偏移]"
-#: builtin/pack-objects.c:2790
+#: builtin/pack-objects.c:2872
msgid "write the pack index file in the specified idx format version"
msgstr "用指定的 idx 格式版本来写包索引文件"
-#: builtin/pack-objects.c:2793
+#: builtin/pack-objects.c:2875
msgid "maximum size of each output pack file"
msgstr "每个输出包的最大尺寸"
-#: builtin/pack-objects.c:2795
+#: builtin/pack-objects.c:2877
msgid "ignore borrowed objects from alternate object store"
msgstr "忽略从备用对象存储里借用对象"
-#: builtin/pack-objects.c:2797
+#: builtin/pack-objects.c:2879
msgid "ignore packed objects"
msgstr "忽略包对象"
-#: builtin/pack-objects.c:2799
+#: builtin/pack-objects.c:2881
msgid "limit pack window by objects"
msgstr "限制打包窗口的对象数"
-#: builtin/pack-objects.c:2801
+#: builtin/pack-objects.c:2883
msgid "limit pack window by memory in addition to object limit"
msgstr "除对象数量限制外设置打包窗口的内存限制"
-#: builtin/pack-objects.c:2803
+#: builtin/pack-objects.c:2885
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "打包允许的 delta 链的最大长度"
-#: builtin/pack-objects.c:2805
+#: builtin/pack-objects.c:2887
msgid "reuse existing deltas"
msgstr "重用已存在的 deltas"
-#: builtin/pack-objects.c:2807
+#: builtin/pack-objects.c:2889
msgid "reuse existing objects"
msgstr "重用已存在的对象"
-#: builtin/pack-objects.c:2809
+#: builtin/pack-objects.c:2891
msgid "use OFS_DELTA objects"
msgstr "使用 OFS_DELTA 对象"
-#: builtin/pack-objects.c:2811
+#: builtin/pack-objects.c:2893
msgid "use threads when searching for best delta matches"
msgstr "使用线程查询最佳 delta 匹配"
-#: builtin/pack-objects.c:2813
+#: builtin/pack-objects.c:2895
msgid "do not create an empty pack output"
msgstr "不创建空的包输出"
-#: builtin/pack-objects.c:2815
+#: builtin/pack-objects.c:2897
msgid "read revision arguments from standard input"
msgstr "从标准输入读取版本号参数"
-#: builtin/pack-objects.c:2817
+#: builtin/pack-objects.c:2899
msgid "limit the objects to those that are not yet packed"
msgstr "限制那些尚未打包的对象"
-#: builtin/pack-objects.c:2820
+#: builtin/pack-objects.c:2902
msgid "include objects reachable from any reference"
msgstr "包括可以从任何引用访问到的对象"
-#: builtin/pack-objects.c:2823
+#: builtin/pack-objects.c:2905
msgid "include objects referred by reflog entries"
msgstr "包括被引用日志引用到的对象"
-#: builtin/pack-objects.c:2826
+#: builtin/pack-objects.c:2908
msgid "include objects referred to by the index"
msgstr "包括被索引引用到的对象"
-#: builtin/pack-objects.c:2829
+#: builtin/pack-objects.c:2911
msgid "output pack to stdout"
msgstr "输出包到标准输出"
-#: builtin/pack-objects.c:2831
+#: builtin/pack-objects.c:2913
msgid "include tag objects that refer to objects to be packed"
msgstr "包括那些引用了待打包对象的标签对象"
-#: builtin/pack-objects.c:2833
+#: builtin/pack-objects.c:2915
msgid "keep unreachable objects"
msgstr "维持不可达的对象"
-#: builtin/pack-objects.c:2835
+#: builtin/pack-objects.c:2917
msgid "pack loose unreachable objects"
msgstr "打包松散的不可达对象"
-#: builtin/pack-objects.c:2837
+#: builtin/pack-objects.c:2919
msgid "unpack unreachable objects newer than <time>"
msgstr "将比给定 <时间> 新的无法访问的对象解包"
-#: builtin/pack-objects.c:2840
+#: builtin/pack-objects.c:2922
msgid "create thin packs"
msgstr "创建精简包"
-#: builtin/pack-objects.c:2842
+#: builtin/pack-objects.c:2924
msgid "create packs suitable for shallow fetches"
msgstr "创建适合浅克隆仓库获取的包"
-#: builtin/pack-objects.c:2844
+#: builtin/pack-objects.c:2926
msgid "ignore packs that have companion .keep file"
msgstr "忽略配有 .keep 文件的包"
-#: builtin/pack-objects.c:2846
+#: builtin/pack-objects.c:2928
msgid "pack compression level"
msgstr "打包压缩级别"
-#: builtin/pack-objects.c:2848
+#: builtin/pack-objects.c:2930
msgid "do not hide commits by grafts"
msgstr "显示被嫁接隐藏的提交"
-#: builtin/pack-objects.c:2850
+#: builtin/pack-objects.c:2932
msgid "use a bitmap index if available to speed up counting objects"
msgstr "使用 bitmap 索引（如果有的话）以提高对象计数时的速度"
-#: builtin/pack-objects.c:2852
+#: builtin/pack-objects.c:2934
msgid "write a bitmap index together with the pack index"
msgstr "在建立包索引的同时创建 bitmap 索引"
-#: builtin/pack-objects.c:2979
+#: builtin/pack-objects.c:3061
msgid "Counting objects"
msgstr "对象计数中"
@@ -10790,7 +11037,7 @@
msgid "incorporate changes by rebasing rather than merging"
msgstr "使用变基操作取代合并操作以合入修改"
-#: builtin/pull.c:148 builtin/revert.c:101
+#: builtin/pull.c:148 builtin/rebase--helper.c:18 builtin/revert.c:120
msgid "allow fast-forward"
msgstr "允许快进式"
@@ -10859,7 +11106,7 @@
msgid "<remote>"
msgstr "<远程>"
-#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:455
+#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:456
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<分支>"
@@ -11136,11 +11383,11 @@
msgid "repository"
msgstr "仓库"
-#: builtin/push.c:519 builtin/send-pack.c:161
+#: builtin/push.c:519 builtin/send-pack.c:162
msgid "push all refs"
msgstr "推送所有引用"
-#: builtin/push.c:520 builtin/send-pack.c:163
+#: builtin/push.c:520 builtin/send-pack.c:164
msgid "mirror all refs"
msgstr "镜像所有引用"
@@ -11152,15 +11399,15 @@
msgid "push tags (can't be used with --all or --mirror)"
msgstr "推送标签（不能使用 --all or --mirror）"
-#: builtin/push.c:526 builtin/send-pack.c:164
+#: builtin/push.c:526 builtin/send-pack.c:165
msgid "force updates"
msgstr "强制更新"
-#: builtin/push.c:528 builtin/send-pack.c:175
+#: builtin/push.c:528 builtin/send-pack.c:179
msgid "refname>:<expect"
msgstr "引用名>:<期望值"
-#: builtin/push.c:529 builtin/send-pack.c:176
+#: builtin/push.c:529 builtin/send-pack.c:180
msgid "require old value of ref to be at this value"
msgstr "要求引用旧的取值为设定值"
@@ -11168,12 +11415,12 @@
msgid "control recursive pushing of submodules"
msgstr "控制子模组的递归推送"
-#: builtin/push.c:534 builtin/send-pack.c:169
+#: builtin/push.c:534 builtin/send-pack.c:173
msgid "use thin pack"
msgstr "使用精简打包"
-#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:158
-#: builtin/send-pack.c:159
+#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:159
+#: builtin/send-pack.c:160
msgid "receive pack program"
msgstr "接收包程序"
@@ -11193,19 +11440,19 @@
msgid "push missing but relevant tags"
msgstr "推送缺失但有关的标签"
-#: builtin/push.c:546 builtin/send-pack.c:166
+#: builtin/push.c:546 builtin/send-pack.c:167
msgid "GPG sign the push"
msgstr "用 GPG 为推送签名"
-#: builtin/push.c:548 builtin/send-pack.c:170
+#: builtin/push.c:548 builtin/send-pack.c:174
msgid "request atomic transaction on remote side"
msgstr "需要远端支持原子事务"
-#: builtin/push.c:549
+#: builtin/push.c:549 builtin/send-pack.c:170
msgid "server-specific"
msgstr "server-specific"
-#: builtin/push.c:549
+#: builtin/push.c:549 builtin/send-pack.c:171
msgid "option to transmit"
msgstr "传输选项"
@@ -11221,7 +11468,7 @@
msgid "push options must not have new line characters"
msgstr "推送选项不能有换行符"
-#: builtin/read-tree.c:37
+#: builtin/read-tree.c:40
msgid ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
@@ -11231,75 +11478,87 @@
"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
"index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])"
-#: builtin/read-tree.c:110
+#: builtin/read-tree.c:130
msgid "write resulting index to <file>"
msgstr "将索引结果写入 <文件>"
-#: builtin/read-tree.c:113
+#: builtin/read-tree.c:133
msgid "only empty the index"
msgstr "只是清空索引"
-#: builtin/read-tree.c:115
+#: builtin/read-tree.c:135
msgid "Merging"
msgstr "合并"
-#: builtin/read-tree.c:117
+#: builtin/read-tree.c:137
msgid "perform a merge in addition to a read"
msgstr "读取之余再执行一个合并"
-#: builtin/read-tree.c:119
+#: builtin/read-tree.c:139
msgid "3-way merge if no file level merging required"
msgstr "如果没有文件级合并需要，执行三方合并"
-#: builtin/read-tree.c:121
+#: builtin/read-tree.c:141
msgid "3-way merge in presence of adds and removes"
msgstr "存在添加和删除时，也执行三方合并"
-#: builtin/read-tree.c:123
+#: builtin/read-tree.c:143
msgid "same as -m, but discard unmerged entries"
msgstr "类似于 -m，但丢弃未合并的条目"
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:144
msgid "<subdirectory>/"
msgstr "<子目录>/"
-#: builtin/read-tree.c:125
+#: builtin/read-tree.c:145
msgid "read the tree into the index under <subdirectory>/"
msgstr "读取树对象到索引的 <子目录>/ 下"
-#: builtin/read-tree.c:128
+#: builtin/read-tree.c:148
msgid "update working tree with merge result"
msgstr "用合并的结果更新工作区"
-#: builtin/read-tree.c:130
+#: builtin/read-tree.c:150
msgid "gitignore"
msgstr "gitignore"
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:151
msgid "allow explicitly ignored files to be overwritten"
msgstr "允许忽略文件中设定的文件可以被覆盖"
-#: builtin/read-tree.c:134
+#: builtin/read-tree.c:154
msgid "don't check the working tree after merging"
msgstr "合并后不检查工作区"
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:155
msgid "don't update the index or the work tree"
msgstr "不更新索引区和工作区"
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:157
msgid "skip applying sparse checkout filter"
msgstr "跳过应用稀疏检出过滤器"
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:159
msgid "debug unpack-trees"
msgstr "调试 unpack-trees"
-#: builtin/receive-pack.c:26
+#: builtin/rebase--helper.c:7
+msgid "git rebase--helper [<options>]"
+msgstr "git rebase--helper [<选项>]"
+
+#: builtin/rebase--helper.c:19
+msgid "continue rebase"
+msgstr "继续变基"
+
+#: builtin/rebase--helper.c:21
+msgid "abort rebase"
+msgstr "中止变基"
+
+#: builtin/receive-pack.c:27
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-dir>"
-#: builtin/receive-pack.c:793
+#: builtin/receive-pack.c:795
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"
@@ -11325,7 +11584,7 @@
"若要屏蔽此信息且保持默认行为，设置 'receive.denyCurrentBranch'\n"
"配置变量为 'refuse'。"
-#: builtin/receive-pack.c:813
+#: builtin/receive-pack.c:815
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"
@@ -11344,11 +11603,11 @@
"\n"
"若要屏蔽此信息，您可以设置它为 'refuse'。"
-#: builtin/receive-pack.c:1883
+#: builtin/receive-pack.c:1888
msgid "quiet"
msgstr "静默模式"
-#: builtin/receive-pack.c:1897
+#: builtin/receive-pack.c:1902
msgid "You must specify a directory."
msgstr "您必须指定一个目录。"
@@ -11525,7 +11784,7 @@
msgid "(delete)"
msgstr "（删除）"
-#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:854
+#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:856
#, c-format
msgid "No such remote: %s"
msgstr "没有这样的远程：%s"
@@ -11556,7 +11815,7 @@
msgid "creating '%s' failed"
msgstr "创建 '%s' 失败"
-#: builtin/remote.c:792
+#: builtin/remote.c:794
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -11566,144 +11825,144 @@
msgstr[0] "注意：ref/remotes 层级之外的一个分支未被移除。要删除它，使用："
msgstr[1] "注意：ref/remotes 层级之外的一些分支未被移除。要删除它们，使用："
-#: builtin/remote.c:806
+#: builtin/remote.c:808
#, c-format
msgid "Could not remove config section '%s'"
msgstr "不能移除配置小节 '%s'"
-#: builtin/remote.c:907
+#: builtin/remote.c:909
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " 新的（下一次获取将存储于 remotes/%s）"
-#: builtin/remote.c:910
+#: builtin/remote.c:912
msgid " tracked"
msgstr " 已跟踪"
-#: builtin/remote.c:912
+#: builtin/remote.c:914
msgid " stale (use 'git remote prune' to remove)"
msgstr " 过时（使用 'git remote prune' 来移除）"
-#: builtin/remote.c:914
+#: builtin/remote.c:916
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:955
+#: builtin/remote.c:957
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "无效的 branch.%s.merge，不能变基到一个以上的分支"
-#: builtin/remote.c:963
+#: builtin/remote.c:965
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "交互式变基到远程 %s"
-#: builtin/remote.c:964
+#: builtin/remote.c:966
#, c-format
msgid "rebases onto remote %s"
msgstr "变基到远程 %s"
-#: builtin/remote.c:967
+#: builtin/remote.c:969
#, c-format
msgid " merges with remote %s"
msgstr " 与远程 %s 合并"
-#: builtin/remote.c:970
+#: builtin/remote.c:972
#, c-format
msgid "merges with remote %s"
msgstr "与远程 %s 合并"
-#: builtin/remote.c:973
+#: builtin/remote.c:975
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s 以及和远程 %s\n"
-#: builtin/remote.c:1016
+#: builtin/remote.c:1018
msgid "create"
msgstr "创建"
-#: builtin/remote.c:1019
+#: builtin/remote.c:1021
msgid "delete"
msgstr "删除"
-#: builtin/remote.c:1023
+#: builtin/remote.c:1025
msgid "up to date"
msgstr "最新"
-#: builtin/remote.c:1026
+#: builtin/remote.c:1028
msgid "fast-forwardable"
msgstr "可快进"
-#: builtin/remote.c:1029
+#: builtin/remote.c:1031
msgid "local out of date"
msgstr "本地已过时"
-#: builtin/remote.c:1036
+#: builtin/remote.c:1038
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s 强制推送至 %-*s (%s)"
-#: builtin/remote.c:1039
+#: builtin/remote.c:1041
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s 推送至 %-*s (%s)"
-#: builtin/remote.c:1043
+#: builtin/remote.c:1045
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s 强制推送至 %s"
-#: builtin/remote.c:1046
+#: builtin/remote.c:1048
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s 推送至 %s"
-#: builtin/remote.c:1114
+#: builtin/remote.c:1116
msgid "do not query remotes"
msgstr "不查询远程"
-#: builtin/remote.c:1141
+#: builtin/remote.c:1143
#, c-format
msgid "* remote %s"
msgstr "* 远程 %s"
-#: builtin/remote.c:1142
+#: builtin/remote.c:1144
#, c-format
msgid " Fetch URL: %s"
msgstr " 获取地址：%s"
-#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1295
+#: builtin/remote.c:1145 builtin/remote.c:1158 builtin/remote.c:1297
msgid "(no URL)"
msgstr "(无 URL)"
#. TRANSLATORS: the colon ':' should align with
#. the one in " Fetch URL: %s" translation
-#: builtin/remote.c:1154 builtin/remote.c:1156
+#: builtin/remote.c:1156 builtin/remote.c:1158
#, c-format
msgid " Push URL: %s"
msgstr " 推送地址：%s"
-#: builtin/remote.c:1158 builtin/remote.c:1160 builtin/remote.c:1162
+#: builtin/remote.c:1160 builtin/remote.c:1162 builtin/remote.c:1164
#, c-format
msgid " HEAD branch: %s"
msgstr " HEAD 分支：%s"
# 译者：中文字符串拼接，可删除前导空格
-#: builtin/remote.c:1158
+#: builtin/remote.c:1160
msgid "(not queried)"
msgstr "（未查询）"
-#: builtin/remote.c:1160
+#: builtin/remote.c:1162
msgid "(unknown)"
msgstr "（未知）"
-#: builtin/remote.c:1164
+#: builtin/remote.c:1166
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr " HEAD 分支（远程 HEAD 模糊，可能是下列中的一个）：\n"
-#: builtin/remote.c:1176
+#: builtin/remote.c:1178
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
@@ -11711,155 +11970,155 @@
msgstr[1] " 远程分支：%s"
# 译者：中文字符串拼接，可删除前导空格
-#: builtin/remote.c:1179 builtin/remote.c:1205
+#: builtin/remote.c:1181 builtin/remote.c:1207
msgid " (status not queried)"
msgstr "（状态未查询）"
-#: builtin/remote.c:1188
+#: builtin/remote.c:1190
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:1196
+#: builtin/remote.c:1198
msgid " Local refs will be mirrored by 'git push'"
msgstr " 本地引用将在 'git push' 时被镜像"
-#: builtin/remote.c:1202
+#: builtin/remote.c:1204
#, 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:1223
+#: builtin/remote.c:1225
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
-#: builtin/remote.c:1225
+#: builtin/remote.c:1227
msgid "delete refs/remotes/<name>/HEAD"
msgstr "删除 refs/remotes/<名称>/HEAD"
-#: builtin/remote.c:1240
+#: builtin/remote.c:1242
msgid "Cannot determine remote HEAD"
msgstr "无法确定远程 HEAD"
-#: builtin/remote.c:1242
+#: builtin/remote.c:1244
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "多个远程 HEAD 分支。请明确地选择一个用命令："
-#: builtin/remote.c:1252
+#: builtin/remote.c:1254
#, c-format
msgid "Could not delete %s"
msgstr "无法删除 %s"
-#: builtin/remote.c:1260
+#: builtin/remote.c:1262
#, c-format
msgid "Not a valid ref: %s"
msgstr "不是一个有效引用：%s"
-#: builtin/remote.c:1262
+#: builtin/remote.c:1264
#, c-format
msgid "Could not setup %s"
msgstr "不能设置 %s"
# 译者：注意保持前导空格
-#: builtin/remote.c:1280
+#: builtin/remote.c:1282
#, c-format
msgid " %s will become dangling!"
msgstr " %s 将成为摇摆状态！"
# 译者：注意保持前导空格
-#: builtin/remote.c:1281
+#: builtin/remote.c:1283
#, c-format
msgid " %s has become dangling!"
msgstr " %s 已成为摇摆状态！"
-#: builtin/remote.c:1291
+#: builtin/remote.c:1293
#, c-format
msgid "Pruning %s"
msgstr "修剪 %s"
-#: builtin/remote.c:1292
+#: builtin/remote.c:1294
#, c-format
msgid "URL: %s"
msgstr "URL：%s"
-#: builtin/remote.c:1308
+#: builtin/remote.c:1310
#, c-format
msgid " * [would prune] %s"
msgstr " * [将删除] %s"
-#: builtin/remote.c:1311
+#: builtin/remote.c:1313
#, c-format
msgid " * [pruned] %s"
msgstr " * [已删除] %s"
-#: builtin/remote.c:1356
+#: builtin/remote.c:1358
msgid "prune remotes after fetching"
msgstr "抓取后清除远程"
-#: builtin/remote.c:1419 builtin/remote.c:1473 builtin/remote.c:1541
+#: builtin/remote.c:1421 builtin/remote.c:1475 builtin/remote.c:1543
#, c-format
msgid "No such remote '%s'"
msgstr "没有此远程 '%s'"
-#: builtin/remote.c:1435
+#: builtin/remote.c:1437
msgid "add branch"
msgstr "添加分支"
-#: builtin/remote.c:1442
+#: builtin/remote.c:1444
msgid "no remote specified"
msgstr "未指定远程"
-#: builtin/remote.c:1459
+#: builtin/remote.c:1461
msgid "query push URLs rather than fetch URLs"
msgstr "查询推送 URL 地址，而非获取 URL 地址"
-#: builtin/remote.c:1461
+#: builtin/remote.c:1463
msgid "return all URLs"
msgstr "返回所有 URL 地址"
-#: builtin/remote.c:1489
+#: builtin/remote.c:1491
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "没有给远程仓库 '%s' 设定 URL"
-#: builtin/remote.c:1515
+#: builtin/remote.c:1517
msgid "manipulate push URLs"
msgstr "操作推送 URLS"
-#: builtin/remote.c:1517
+#: builtin/remote.c:1519
msgid "add URL"
msgstr "添加 URL"
-#: builtin/remote.c:1519
+#: builtin/remote.c:1521
msgid "delete URLs"
msgstr "删除 URLS"
-#: builtin/remote.c:1526
+#: builtin/remote.c:1528
msgid "--add --delete doesn't make sense"
msgstr "--add --delete 无意义"
-#: builtin/remote.c:1567
+#: builtin/remote.c:1569
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "无效的旧 URL 匹配模版：%s"
-#: builtin/remote.c:1575
+#: builtin/remote.c:1577
#, c-format
msgid "No such URL found: %s"
msgstr "未找到此 URL：%s"
-#: builtin/remote.c:1577
+#: builtin/remote.c:1579
msgid "Will not delete all non-push URLs"
msgstr "将不会删除所有非推送 URL 地址"
-#: builtin/remote.c:1591
+#: builtin/remote.c:1593
msgid "be verbose; must be placed before a subcommand"
msgstr "冗长输出；必须置于子命令之前"
-#: builtin/remote.c:1622
+#: builtin/remote.c:1624
#, c-format
msgid "Unknown subcommand: %s"
msgstr "未知子命令：%s"
@@ -11977,67 +12236,67 @@
msgid "git replace [--format=<format>] [-l [<pattern>]]"
msgstr "git replace [--format=<格式>] [-l [<模式>]]"
-#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
+#: builtin/replace.c:330 builtin/replace.c:368 builtin/replace.c:396
#, c-format
msgid "Not a valid object name: '%s'"
msgstr "不是一个有效的对象名：'%s'"
-#: builtin/replace.c:355
+#: builtin/replace.c:360
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "提交 '%s' 中含有损坏的合并标签"
-#: builtin/replace.c:357
+#: builtin/replace.c:362
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr "提交 '%s' 中含有非法的合并标签"
-#: builtin/replace.c:368
+#: builtin/replace.c:373
#, 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:401
+#: builtin/replace.c:406
#, c-format
msgid "the original commit '%s' has a gpg signature."
msgstr "原始提交 '%s' 中包含一个 GPG 签名"
-#: builtin/replace.c:402
+#: builtin/replace.c:407
msgid "the signature will be removed in the replacement commit!"
msgstr "在替换的提交中签名将被移除！"
-#: builtin/replace.c:408
+#: builtin/replace.c:413
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr "不能为 '%s' 写替换提交"
-#: builtin/replace.c:432
+#: builtin/replace.c:437
msgid "list replace refs"
msgstr "列出替换的引用"
-#: builtin/replace.c:433
+#: builtin/replace.c:438
msgid "delete replace refs"
msgstr "删除替换的引用"
-#: builtin/replace.c:434
+#: builtin/replace.c:439
msgid "edit existing object"
msgstr "编辑现存的对象"
-#: builtin/replace.c:435
+#: builtin/replace.c:440
msgid "change a commit's parents"
msgstr "修改一个提交的父提交"
-#: builtin/replace.c:436
+#: builtin/replace.c:441
msgid "replace the ref if it exists"
msgstr "如果存在则替换引用"
-#: builtin/replace.c:437
+#: builtin/replace.c:442
msgid "do not pretty-print contents for --edit"
msgstr "不要为 --edit 操作美观显示内容"
-#: builtin/replace.c:438
+#: builtin/replace.c:443
msgid "use this format"
msgstr "使用此格式"
@@ -12181,23 +12440,23 @@
msgid "rev-list does not support display of notes"
msgstr "rev-list 不支持显示注解"
-#: builtin/rev-parse.c:391
+#: builtin/rev-parse.c:393
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
-#: builtin/rev-parse.c:396
+#: builtin/rev-parse.c:398
msgid "keep the `--` passed as an arg"
msgstr "保持 `--` 作为一个参数传递"
-#: builtin/rev-parse.c:398
+#: builtin/rev-parse.c:400
msgid "stop parsing after the first non-option argument"
msgstr "遇到第一个非选项参数后停止解析"
-#: builtin/rev-parse.c:401
+#: builtin/rev-parse.c:403
msgid "output in stuck long form"
msgstr "以固定长格式输出"
-#: builtin/rev-parse.c:532
+#: builtin/rev-parse.c:534
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
@@ -12227,68 +12486,72 @@
msgid "git cherry-pick <subcommand>"
msgstr "git cherry-pick <子命令>"
-#: builtin/revert.c:71
+#: builtin/revert.c:89
#, c-format
msgid "%s: %s cannot be used with %s"
msgstr "%s：%s 不能和 %s 同时使用"
-#: builtin/revert.c:80
+#: builtin/revert.c:98
msgid "end revert or cherry-pick sequence"
msgstr "终止反转或拣选操作"
-#: builtin/revert.c:81
+#: builtin/revert.c:99
msgid "resume revert or cherry-pick sequence"
msgstr "继续反转或拣选操作"
-#: builtin/revert.c:82
+#: builtin/revert.c:100
msgid "cancel revert or cherry-pick sequence"
msgstr "取消反转或拣选操作"
-#: builtin/revert.c:83
+#: builtin/revert.c:101
msgid "don't automatically commit"
msgstr "不要自动提交"
-#: builtin/revert.c:84
+#: builtin/revert.c:102
msgid "edit the commit message"
msgstr "编辑提交说明"
-#: builtin/revert.c:87
-msgid "parent number"
+#: builtin/revert.c:105
+msgid "parent-number"
msgstr "父编号"
-#: builtin/revert.c:89
+#: builtin/revert.c:106
+msgid "select mainline parent"
+msgstr "选择主干父提交编号"
+
+#: builtin/revert.c:108
msgid "merge strategy"
msgstr "合并策略"
-#: builtin/revert.c:90
+#: builtin/revert.c:109
msgid "option"
msgstr "选项"
-#: builtin/revert.c:91
+#: builtin/revert.c:110
msgid "option for merge strategy"
msgstr "合并策略的选项"
-#: builtin/revert.c:100
+#: builtin/revert.c:119
msgid "append commit name"
msgstr "追加提交名称"
-#: builtin/revert.c:102
+#: builtin/revert.c:121
msgid "preserve initially empty commits"
msgstr "保留初始化的空提交"
-#: builtin/revert.c:103
+#: builtin/revert.c:122
msgid "allow commits with empty messages"
msgstr "允许提交说明为空"
-#: builtin/revert.c:104
+#: builtin/revert.c:123
msgid "keep redundant, empty commits"
msgstr "保持多余的、空的提交"
-#: builtin/revert.c:192
+#: builtin/revert.c:211
msgid "revert failed"
msgstr "还原失败"
-#: builtin/revert.c:205
+#: builtin/revert.c:224
msgid "cherry-pick failed"
msgstr "拣选失败"
@@ -12380,19 +12643,19 @@
"receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n"
" --all 和明确的 <引用> 互斥。"
-#: builtin/send-pack.c:160
+#: builtin/send-pack.c:161
msgid "remote name"
msgstr "远程名称"
-#: builtin/send-pack.c:171
+#: builtin/send-pack.c:175
msgid "use stateless RPC protocol"
msgstr "使用无状态的 RPC 协议"
-#: builtin/send-pack.c:172
+#: builtin/send-pack.c:176
msgid "read refs from stdin"
msgstr "从标准输入读取引用"
-#: builtin/send-pack.c:173
+#: builtin/send-pack.c:177
msgid "print status from remote helper"
msgstr "打印来自远程 helper 的状态"
@@ -12400,27 +12663,27 @@
msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
-#: builtin/shortlog.c:249
+#: builtin/shortlog.c:248
msgid "Group by committer rather than author"
msgstr "按照提交者分组而不是作者"
-#: builtin/shortlog.c:251
+#: builtin/shortlog.c:250
msgid "sort output according to the number of commits per author"
msgstr "根据每个作者的提交数量排序"
-#: builtin/shortlog.c:253
+#: builtin/shortlog.c:252
msgid "Suppress commit descriptions, only provides commit count"
msgstr "隐藏提交说明，只提供提交数量"
-#: builtin/shortlog.c:255
+#: builtin/shortlog.c:254
msgid "Show the email address of each author"
msgstr "显示每个作者的电子邮件地址"
-#: builtin/shortlog.c:256
+#: builtin/shortlog.c:255
msgid "w[,i1[,i2]]"
msgstr "w[,i1[,i2]]"
-#: builtin/shortlog.c:257
+#: builtin/shortlog.c:256
msgid "Linewrap output"
msgstr "折行输出"
@@ -12440,120 +12703,120 @@
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]"
-#: builtin/show-branch.c:375
+#: builtin/show-branch.c:374
#, 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:541
+#: builtin/show-branch.c:536
#, c-format
msgid "no matching refs with %s"
msgstr "没有和 %s 匹配的引用"
-#: builtin/show-branch.c:639
+#: builtin/show-branch.c:632
msgid "show remote-tracking and local branches"
msgstr "显示远程跟踪的和本地的分支"
-#: builtin/show-branch.c:641
+#: builtin/show-branch.c:634
msgid "show remote-tracking branches"
msgstr "显示远程跟踪的分支"
-#: builtin/show-branch.c:643
+#: builtin/show-branch.c:636
msgid "color '*!+-' corresponding to the branch"
msgstr "着色 '*!+-' 到相应的分支"
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:638
msgid "show <n> more commits after the common ancestor"
msgstr "显示共同祖先后的 <n> 个提交"
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:640
msgid "synonym to more=-1"
msgstr "和 more=-1 同义"
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:641
msgid "suppress naming strings"
msgstr "不显示字符串命名"
-#: builtin/show-branch.c:650
+#: builtin/show-branch.c:643
msgid "include the current branch"
msgstr "包括当前分支"
-#: builtin/show-branch.c:652
+#: builtin/show-branch.c:645
msgid "name commits with their object names"
msgstr "以对象名字命名提交"
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:647
msgid "show possible merge bases"
msgstr "显示可能合并的基线"
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:649
msgid "show refs unreachable from any other ref"
msgstr "显示没有任何引用的的引用"
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:651
msgid "show commits in topological order"
msgstr "以拓扑顺序显示提交"
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:654
msgid "show only commits not on the first branch"
msgstr "只显示不在第一个分支上的提交"
-#: builtin/show-branch.c:663
+#: builtin/show-branch.c:656
msgid "show merges reachable from only one tip"
msgstr "显示仅一个分支可访问的合并提交"
-#: builtin/show-branch.c:665
+#: builtin/show-branch.c:658
msgid "topologically sort, maintaining date order where possible"
msgstr "拓扑方式排序，并尽可能地保持日期顺序"
-#: builtin/show-branch.c:668
+#: builtin/show-branch.c:661
msgid "<n>[,<base>]"
msgstr "<n>[,<base>]"
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:662
msgid "show <n> most recent ref-log entries starting at base"
msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
-#: builtin/show-branch.c:703
+#: builtin/show-branch.c:696
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容"
-#: builtin/show-branch.c:727
+#: builtin/show-branch.c:720
msgid "no branches given, and HEAD is not valid"
msgstr "未提供分支，且 HEAD 无效"
-#: builtin/show-branch.c:730
+#: builtin/show-branch.c:723
msgid "--reflog option needs one branch name"
msgstr "选项 --reflog 需要一个分支名"
-#: builtin/show-branch.c:733
+#: builtin/show-branch.c:726
#, 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:737
+#: builtin/show-branch.c:730
#, c-format
msgid "no such ref %s"
msgstr "无此引用 %s"
-#: builtin/show-branch.c:829
+#: builtin/show-branch.c:814
#, 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:833
+#: builtin/show-branch.c:818
#, c-format
msgid "'%s' is not a valid ref."
msgstr "'%s' 不是一个有效的引用。"
-#: builtin/show-branch.c:836
+#: builtin/show-branch.c:821
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "不能找到提交 %s（%s）"
@@ -12618,12 +12881,12 @@
msgid "prepend comment character and space to each line"
msgstr "为每一行的行首添加注释符和空格"
-#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1062
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1075
#, c-format
msgid "No such ref: %s"
msgstr "没有这样的引用：%s"
-#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1071
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1084
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "期望一个完整的引用名称，却得到 %s"
@@ -12633,93 +12896,100 @@
msgid "cannot strip one component off url '%s'"
msgstr "无法从 url '%s' 剥离一个组件"
-#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:592
+#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630
msgid "alternative anchor for relative paths"
msgstr "相对路径的替代锚记（anchor）"
-#: builtin/submodule--helper.c:287
+#: builtin/submodule--helper.c:310
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
-#: builtin/submodule--helper.c:333 builtin/submodule--helper.c:347
+#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url"
-#: builtin/submodule--helper.c:373
+#: builtin/submodule--helper.c:395
+#, c-format
+msgid ""
+"could not lookup configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。"
+
+#: builtin/submodule--helper.c:406
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "无法为子模组 '%s' 注册 url"
-#: builtin/submodule--helper.c:377
+#: builtin/submodule--helper.c:410
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "子模组 '%s'（%s）未对路径 '%s' 注册\n"
#
-#: builtin/submodule--helper.c:387
+#: builtin/submodule--helper.c:420
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "警告：建议子模组 '%s' 使用命令更新模式\n"
-#: builtin/submodule--helper.c:394
+#: builtin/submodule--helper.c:427
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr "无法为子模组 '%s' 注册更新模式"
-#: builtin/submodule--helper.c:410
+#: builtin/submodule--helper.c:443
msgid "Suppress output for initializing a submodule"
msgstr "初始化子模组时抑制输出"
-#: builtin/submodule--helper.c:415
+#: builtin/submodule--helper.c:448
msgid "git submodule--helper init [<path>]"
msgstr "git submodule--helper init [<路径>]"
-#: builtin/submodule--helper.c:436
+#: builtin/submodule--helper.c:476
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <路径>"
-#: builtin/submodule--helper.c:442
+#: builtin/submodule--helper.c:482
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
-#: builtin/submodule--helper.c:525 builtin/submodule--helper.c:528
+#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "子模组 '%s' 不能添加仓库备选：%s"
-#: builtin/submodule--helper.c:564
+#: builtin/submodule--helper.c:604
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'"
-#: builtin/submodule--helper.c:571
+#: builtin/submodule--helper.c:611
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'"
-#: builtin/submodule--helper.c:595
+#: builtin/submodule--helper.c:633
msgid "where the new submodule will be cloned to"
msgstr "新的子模组将要克隆的路径"
-#: builtin/submodule--helper.c:598
+#: builtin/submodule--helper.c:636
msgid "name of the new submodule"
msgstr "新子模组的名称"
-#: builtin/submodule--helper.c:601
+#: builtin/submodule--helper.c:639
msgid "url where to clone the submodule from"
msgstr "克隆子模组的 url 地址"
-#: builtin/submodule--helper.c:607
+#: builtin/submodule--helper.c:645
msgid "depth for shallow clones"
msgstr "浅克隆的深度"
-#: builtin/submodule--helper.c:610 builtin/submodule--helper.c:980
+#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993
msgid "force cloning progress"
msgstr "强制显示克隆进度"
-#: builtin/submodule--helper.c:615
+#: builtin/submodule--helper.c:653
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -12727,116 +12997,106 @@
"git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
"[--name <名字>] [--depth <深度>] --url <url> --path <路径>"
-#: builtin/submodule--helper.c:646
+#: builtin/submodule--helper.c:684
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "无法克隆 '%s' 到子模组路径 '%s'"
-#: builtin/submodule--helper.c:662
-#, c-format
-msgid "cannot open file '%s'"
-msgstr "无法打开文件 '%s'"
-
-#: builtin/submodule--helper.c:667
-#, c-format
-msgid "could not close file %s"
-msgstr "无法关闭文件 %s"
-
-#: builtin/submodule--helper.c:674
+#: builtin/submodule--helper.c:699
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "无法得到 '%s' 的子模组目录"
-#: builtin/submodule--helper.c:742
+#: builtin/submodule--helper.c:764
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "子模组 '%s' 尚未初始化"
-#: builtin/submodule--helper.c:746
+#: builtin/submodule--helper.c:768
msgid "Maybe you want to use 'update --init'?"
msgstr "也许您想要执行 'update --init'？"
-#: builtin/submodule--helper.c:772
+#: builtin/submodule--helper.c:793
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "略过未合并的子模组 %s"
-#: builtin/submodule--helper.c:793
+#: builtin/submodule--helper.c:814
#, c-format
msgid "Skipping submodule '%s'"
msgstr "略过子模组 '%s'"
-#: builtin/submodule--helper.c:929
+#: builtin/submodule--helper.c:942
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "克隆 '%s' 失败。按计划重试"
-#: builtin/submodule--helper.c:940
+#: builtin/submodule--helper.c:953
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "第二次尝试克隆 '%s' 失败，退出"
-#: builtin/submodule--helper.c:961 builtin/submodule--helper.c:1105
+#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162
msgid "path into the working tree"
msgstr "到工作区的路径"
-#: builtin/submodule--helper.c:964
+#: builtin/submodule--helper.c:977
msgid "path into the working tree, across nested submodule boundaries"
msgstr "工作区中的路径，递归嵌套子模组"
-#: builtin/submodule--helper.c:968
+#: builtin/submodule--helper.c:981
msgid "rebase, merge, checkout or none"
msgstr "rebase、merge、checkout 或 none"
-#: builtin/submodule--helper.c:972
+#: builtin/submodule--helper.c:985
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr "创建一个指定深度的浅克隆"
-#: builtin/submodule--helper.c:975
+#: builtin/submodule--helper.c:988
msgid "parallel jobs"
msgstr "并发任务"
-#: builtin/submodule--helper.c:977
+#: builtin/submodule--helper.c:990
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "初始克隆是否应该遵守推荐的浅克隆选项"
-#: builtin/submodule--helper.c:978
+#: builtin/submodule--helper.c:991
msgid "don't print cloning progress"
msgstr "不要输出克隆进度"
-#: builtin/submodule--helper.c:985
+#: builtin/submodule--helper.c:998
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]"
-#: builtin/submodule--helper.c:995
+#: builtin/submodule--helper.c:1008
msgid "bad value for update parameter"
msgstr "update 参数取值错误"
-#: builtin/submodule--helper.c:1066
+#: 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"
msgstr "子模组（%s）的分支配置为继承上级项目的分支，但是上级项目不在任何分支上"
-#: builtin/submodule--helper.c:1106
+#: builtin/submodule--helper.c:1163
msgid "recurse into submodules"
msgstr "在子模组中递归"
-#: builtin/submodule--helper.c:1112
+#: builtin/submodule--helper.c:1169
msgid "git submodule--helper embed-git-dir [<path>...]"
msgstr "git submodule--helper embed-git-dir [<路径>...]"
-#: builtin/submodule--helper.c:1157
+#: builtin/submodule--helper.c:1226
msgid "submodule--helper subcommand must be called with a subcommand"
msgstr "submodule-helper 子命令必须由另外的子命令调用"
-#: builtin/submodule--helper.c:1164
+#: builtin/submodule--helper.c:1233
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s 不支持 --super-prefix"
-#: builtin/submodule--helper.c:1170
+#: builtin/submodule--helper.c:1239
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' 不是一个有效的 submodule--helper 子命令"
@@ -12882,32 +13142,29 @@
#: builtin/tag.c:25
msgid ""
-"git tag -l [-n[<num>]] [--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[<数字>]] [--contains <提交>] [--points-at <对象>]\n"
+"git tag -l [-n[<数字>]] [--contains <提交>] [--no-contains <提交>] [--points-"
+"at <对象>]\n"
"\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]"
#: builtin/tag.c:27
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<格式>] <标签名>..."
-#: builtin/tag.c:82
-#, c-format
-msgid "tag name too long: %.*s..."
-msgstr "标签名称太长：%.*s..."
-
-#: builtin/tag.c:87
+#: builtin/tag.c:83
#, c-format
msgid "tag '%s' not found."
msgstr "未发现标签 '%s'。"
-#: builtin/tag.c:102
+#: builtin/tag.c:99
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "已删除标签 '%s'（曾为 %s）\n"
-#: builtin/tag.c:131
+#: builtin/tag.c:128
#, c-format
msgid ""
"\n"
@@ -12920,7 +13177,7 @@
" %s\n"
"以 '%c' 开头的行将被忽略。\n"
-#: builtin/tag.c:135
+#: builtin/tag.c:132
#, c-format
msgid ""
"\n"
@@ -12934,138 +13191,142 @@
" %s\n"
"以 '%c' 开头的行将被保留，如果您愿意也可以删除它们。\n"
-#: builtin/tag.c:213
+#: builtin/tag.c:210
msgid "unable to sign the tag"
msgstr "无法签署标签"
-#: builtin/tag.c:215
+#: builtin/tag.c:212
msgid "unable to write tag file"
msgstr "无法写标签文件"
-#: builtin/tag.c:240
+#: builtin/tag.c:236
msgid "bad object type."
msgstr "坏的对象类型。"
-#: builtin/tag.c:253
-msgid "tag header too big."
-msgstr "标签头信息太大。"
-
-#: builtin/tag.c:289
+#: builtin/tag.c:282
msgid "no tag message?"
msgstr "无标签说明？"
-#: builtin/tag.c:295
+#: builtin/tag.c:289
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "标签说明被保留在 %s\n"
-#: builtin/tag.c:354
+#: builtin/tag.c:397
msgid "list tag names"
msgstr "列出标签名称"
-#: builtin/tag.c:356
+#: builtin/tag.c:399
msgid "print <n> lines of each tag message"
msgstr "每个标签信息打印 <n> 行"
-#: builtin/tag.c:358
+#: builtin/tag.c:401
msgid "delete tags"
msgstr "删除标签"
-#: builtin/tag.c:359
+#: builtin/tag.c:402
msgid "verify tags"
msgstr "验证标签"
-#: builtin/tag.c:361
+#: builtin/tag.c:404
msgid "Tag creation options"
msgstr "标签创建选项"
-#: builtin/tag.c:363
+#: builtin/tag.c:406
msgid "annotated tag, needs a message"
msgstr "附注标签，需要一个说明"
-#: builtin/tag.c:365
+#: builtin/tag.c:408
msgid "tag message"
msgstr "标签说明"
-#: builtin/tag.c:367
+#: builtin/tag.c:410
msgid "annotated and GPG-signed tag"
msgstr "附注并附加 GPG 签名的标签"
-#: builtin/tag.c:371
+#: builtin/tag.c:414
msgid "use another key to sign the tag"
msgstr "使用另外的私钥签名该标签"
-#: builtin/tag.c:372
+#: builtin/tag.c:415
msgid "replace the tag if exists"
msgstr "如果存在，替换现有的标签"
-#: builtin/tag.c:373 builtin/update-ref.c:368
+#: builtin/tag.c:416 builtin/update-ref.c:368
msgid "create a reflog"
msgstr "创建引用日志"
-#: builtin/tag.c:375
+#: builtin/tag.c:418
msgid "Tag listing options"
msgstr "标签列表选项"
-#: builtin/tag.c:376
+#: builtin/tag.c:419
msgid "show tag list in columns"
msgstr "以列的方式显示标签列表"
-#: builtin/tag.c:377 builtin/tag.c:378
+#: builtin/tag.c:420 builtin/tag.c:422
msgid "print only tags that contain the commit"
-msgstr "只打印包含提交的标签"
+msgstr "只打印包含该提交的标签"
-#: builtin/tag.c:379
+#: builtin/tag.c:421 builtin/tag.c:423
+msgid "print only tags that don't contain the commit"
+msgstr "只打印不包含该提交的标签"
+
+#: builtin/tag.c:424
msgid "print only tags that are merged"
msgstr "只打印已经合并的标签"
-#: builtin/tag.c:380
+#: builtin/tag.c:425
msgid "print only tags that are not merged"
msgstr "只打印尚未合并的标签"
-#: builtin/tag.c:385
+#: builtin/tag.c:430
msgid "print only tags of the object"
-msgstr "只打印对象的标签"
+msgstr "只打印指向该对象的标签"
-#: builtin/tag.c:415
+#: builtin/tag.c:469
msgid "--column and -n are incompatible"
msgstr "--column 和 -n 不兼容"
-#: builtin/tag.c:437
-msgid "-n option is only allowed with -l."
-msgstr "-n 选项只允许和 -l 同时使用。"
+#: builtin/tag.c:491
+msgid "-n option is only allowed in list mode"
+msgstr "-n 选项只允许用在列表显示模式"
-#: builtin/tag.c:439
-msgid "--contains option is only allowed with -l."
-msgstr "--contains 选项只允许和 -l 同时使用。"
+#: builtin/tag.c:493
+msgid "--contains option is only allowed in list mode"
+msgstr "--contains 选项只允许用在列表显示模式"
-#: builtin/tag.c:441
-msgid "--points-at option is only allowed with -l."
-msgstr "--points-at 选项只允许和 -l 同时使用。"
+#: builtin/tag.c:495
+msgid "--no-contains option is only allowed in list mode"
+msgstr "--no-contains 选项只允许用在列表显示模式"
-#: builtin/tag.c:443
-msgid "--merged and --no-merged option are only allowed with -l"
-msgstr "选项 --merged 和 --no-merged 只能和 -l 共用"
+#: builtin/tag.c:497
+msgid "--points-at option is only allowed in list mode"
+msgstr "--points-at 选项只允许用在列表显示模式"
-#: builtin/tag.c:454
+#: builtin/tag.c:499
+msgid "--merged and --no-merged options are only allowed in list mode"
+msgstr "--merged 和 --no-merged 选项只允许用在列表显示模式"
+
+#: builtin/tag.c:510
msgid "only one -F or -m option is allowed."
msgstr "只允许一个 -F 或 -m 选项。"
-#: builtin/tag.c:473
+#: builtin/tag.c:529
msgid "too many params"
msgstr "太多参数"
-#: builtin/tag.c:479
+#: builtin/tag.c:535
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' 不是一个有效的标签名称。"
-#: builtin/tag.c:484
+#: builtin/tag.c:540
#, c-format
msgid "tag '%s' already exists"
msgstr "标签 '%s' 已存在"
-#: builtin/tag.c:512
+#: builtin/tag.c:570
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "已更新标签 '%s'（曾为 %s）\n"
@@ -13082,7 +13343,7 @@
#: builtin/update-index.c:85
#, c-format
msgid "failed to stat %s"
-msgstr "无法枚举 %s 状态"
+msgstr "对 %s 调用 stat 失败"
#: builtin/update-index.c:95
#, c-format
@@ -13094,165 +13355,179 @@
msgid "failed to delete file %s"
msgstr "无法删除文件 %s"
-#: builtin/update-index.c:110 builtin/update-index.c:212
+#: builtin/update-index.c:110 builtin/update-index.c:216
#, c-format
msgid "failed to delete directory %s"
msgstr "无法删除目录 %s"
-#: builtin/update-index.c:133
+#: builtin/update-index.c:135
#, c-format
msgid "Testing mtime in '%s' "
msgstr "在 '%s' 中测试 mtime "
-#: builtin/update-index.c:145
+#: builtin/update-index.c:149
msgid "directory stat info does not change after adding a new file"
msgstr "添加一个新文件后，目录的状态信息未改变"
-#: builtin/update-index.c:158
+#: builtin/update-index.c:162
msgid "directory stat info does not change after adding a new directory"
msgstr "添加一个新目录后，目录的状态信息未改变"
-#: builtin/update-index.c:171
+#: builtin/update-index.c:175
msgid "directory stat info changes after updating a file"
msgstr "更新一个文件后，目录的状态信息被修改"
-#: builtin/update-index.c:182
+#: builtin/update-index.c:186
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr "在子目录中添加文件后，目录的状态信息被修改"
-#: builtin/update-index.c:193
+#: builtin/update-index.c:197
msgid "directory stat info does not change after deleting a file"
msgstr "删除一个文件后，目录的状态信息未改变"
-#: builtin/update-index.c:206
+#: builtin/update-index.c:210
msgid "directory stat info does not change after deleting a directory"
msgstr "删除一个目录后，目录的状态信息未改变"
-#: builtin/update-index.c:213
+#: builtin/update-index.c:217
msgid " OK"
msgstr " OK"
-#: builtin/update-index.c:564
+#: builtin/update-index.c:568
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<选项>] [--] [<文件>...]"
-#: builtin/update-index.c:919
+#: builtin/update-index.c:923
msgid "continue refresh even when index needs update"
msgstr "当索引需要更新时继续刷新"
-#: builtin/update-index.c:922
+#: builtin/update-index.c:926
msgid "refresh: ignore submodules"
msgstr "刷新：忽略子模组"
-#: builtin/update-index.c:925
+#: builtin/update-index.c:929
msgid "do not ignore new files"
msgstr "不忽略新的文件"
-#: builtin/update-index.c:927
+#: builtin/update-index.c:931
msgid "let files replace directories and vice-versa"
msgstr "让文件替换目录（反之亦然）"
-#: builtin/update-index.c:929
+#: builtin/update-index.c:933
msgid "notice files missing from worktree"
msgstr "通知文件从工作区丢失"
-#: builtin/update-index.c:931
+#: builtin/update-index.c:935
msgid "refresh even if index contains unmerged entries"
msgstr "即使索引区包含未合并的条目也执行刷新"
-#: builtin/update-index.c:934
+#: builtin/update-index.c:938
msgid "refresh stat information"
msgstr "刷新统计信息"
-#: builtin/update-index.c:938
+#: builtin/update-index.c:942
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "类似于 --refresh，但是忽略 assume-unchanged 设置"
-#: builtin/update-index.c:942
+#: builtin/update-index.c:946
msgid "<mode>,<object>,<path>"
msgstr "<存取模式>,<对象>,<路径>"
-#: builtin/update-index.c:943
+#: builtin/update-index.c:947
msgid "add the specified entry to the index"
msgstr "添加指定的条目到索引区"
-#: builtin/update-index.c:952
+#: builtin/update-index.c:956
msgid "mark files as \"not changing\""
msgstr "把文件标记为 \"没有变更\""
-#: builtin/update-index.c:955
+#: builtin/update-index.c:959
msgid "clear assumed-unchanged bit"
msgstr "清除 assumed-unchanged 位"
-#: builtin/update-index.c:958
+#: builtin/update-index.c:962
msgid "mark files as \"index-only\""
msgstr "把文件标记为 \"仅索引\""
-#: builtin/update-index.c:961
+#: builtin/update-index.c:965
msgid "clear skip-worktree bit"
msgstr "清除 skip-worktree 位"
-#: builtin/update-index.c:964
+#: builtin/update-index.c:968
msgid "add to index only; do not add content to object database"
msgstr "只添加到索引区；不添加对象到对象库"
-#: builtin/update-index.c:966
+#: builtin/update-index.c:970
msgid "remove named paths even if present in worktree"
msgstr "即使存在工作区里，也删除路径"
-#: builtin/update-index.c:968
+#: builtin/update-index.c:972
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "携带 --stdin：输入的行以 null 字符终止"
-#: builtin/update-index.c:970
+#: builtin/update-index.c:974
msgid "read list of paths to be updated from standard input"
msgstr "从标准输入中读取需要更新的路径列表"
-#: builtin/update-index.c:974
+#: builtin/update-index.c:978
msgid "add entries from standard input to the index"
msgstr "从标准输入添加条目到索引区"
-#: builtin/update-index.c:978
+#: builtin/update-index.c:982
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "为指定文件重新生成第2和第3暂存区"
-#: builtin/update-index.c:982
+#: builtin/update-index.c:986
msgid "only update entries that differ from HEAD"
msgstr "只更新与 HEAD 不同的条目"
-#: builtin/update-index.c:986
+#: builtin/update-index.c:990
msgid "ignore files missing from worktree"
msgstr "忽略工作区丢失的文件"
-#: builtin/update-index.c:989
+#: builtin/update-index.c:993
msgid "report actions to standard output"
msgstr "在标准输出显示操作"
-#: builtin/update-index.c:991
+#: builtin/update-index.c:995
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(for porcelains) 忘记保存的未解决的冲突"
-#: builtin/update-index.c:995
+#: builtin/update-index.c:999
msgid "write index in this format"
msgstr "以这种格式写入索引区"
-#: builtin/update-index.c:997
+#: builtin/update-index.c:1001
msgid "enable or disable split index"
msgstr "启用或禁用索引拆分"
-#: builtin/update-index.c:999
+#: builtin/update-index.c:1003
msgid "enable/disable untracked cache"
msgstr "启用/禁用对未跟踪文件的缓存"
-#: builtin/update-index.c:1001
+#: builtin/update-index.c:1005
msgid "test if the filesystem supports untracked cache"
msgstr "测试文件系统是否支持未跟踪文件缓存"
-#: builtin/update-index.c:1003
+#: builtin/update-index.c:1007
msgid "enable untracked cache without testing the filesystem"
msgstr "无需检测文件系统，启用对未跟踪文件的缓存"
-#: builtin/update-index.c:1120
+#: builtin/update-index.c:1107
+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
+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
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
@@ -13260,11 +13535,11 @@
"core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存，请删除或修"
"改它。"
-#: builtin/update-index.c:1124
+#: builtin/update-index.c:1131
msgid "Untracked cache disabled"
msgstr "缓存未跟踪文件被禁用"
-#: builtin/update-index.c:1132
+#: builtin/update-index.c:1139
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
@@ -13272,7 +13547,7 @@
"core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存，请删除或"
"修改它。"
-#: builtin/update-index.c:1136
+#: builtin/update-index.c:1143
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "缓存未跟踪文件在 '%s' 启用"
@@ -13365,27 +13640,27 @@
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <路径>"
-#: builtin/worktree.c:42
+#: builtin/worktree.c:43
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "删除工作区/%s：不是一个有效的目录"
-#: builtin/worktree.c:48
+#: builtin/worktree.c:49
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "删除 worktrees/%s：gitdir 文件不存在"
-#: builtin/worktree.c:53
+#: builtin/worktree.c:54
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "删除 worktrees/%s：无法读取 gitdir 文件 (%s)"
-#: builtin/worktree.c:64
+#: builtin/worktree.c:65
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "删除 worktrees/%s：无效的 gitdir 文件"
-#: builtin/worktree.c:80
+#: builtin/worktree.c:81
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr "删除 worktrees/%s：gitdir 文件的指向不存在"
@@ -13403,60 +13678,64 @@
msgid "'%s' already exists"
msgstr "'%s' 已经存在"
-#: builtin/worktree.c:236
+#: builtin/worktree.c:235
#, c-format
msgid "could not create directory of '%s'"
msgstr "不能创建目录 '%s'"
-#: builtin/worktree.c:272
+#: builtin/worktree.c:274
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "准备 %s（标识符 %s）"
-#: builtin/worktree.c:323
+#: builtin/worktree.c:328
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "检出分支 <branch> 即使已经被检出到其它工作区"
-#: builtin/worktree.c:325
+#: builtin/worktree.c:330
msgid "create a new branch"
msgstr "创建一个新分支"
-#: builtin/worktree.c:327
+#: builtin/worktree.c:332
msgid "create or reset a branch"
msgstr "创建或重置一个分支"
-#: builtin/worktree.c:329
+#: builtin/worktree.c:334
msgid "populate the new working tree"
msgstr "生成新的工作区"
-#: builtin/worktree.c:337
+#: builtin/worktree.c:335
+msgid "keep the new working tree locked"
+msgstr "锁定新工作区"
+
+#: builtin/worktree.c:343
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b、-B 和 --detach 是互斥的"
-#: builtin/worktree.c:472
+#: builtin/worktree.c:478
msgid "reason for locking"
msgstr "锁定原因"
-#: builtin/worktree.c:484 builtin/worktree.c:517
+#: builtin/worktree.c:490 builtin/worktree.c:523
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' 不是一个工作区"
-#: builtin/worktree.c:486 builtin/worktree.c:519
+#: builtin/worktree.c:492 builtin/worktree.c:525
msgid "The main working tree cannot be locked or unlocked"
msgstr "主工作区无法被加锁或解锁"
-#: builtin/worktree.c:491
+#: builtin/worktree.c:497
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' 已被锁定，原因：%s"
-#: builtin/worktree.c:493
+#: builtin/worktree.c:499
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' 已被锁定"
-#: builtin/worktree.c:521
+#: builtin/worktree.c:527
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' 未被锁定"
@@ -13481,19 +13760,19 @@
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<选项>] <目录>"
-#: upload-pack.c:1036
+#: upload-pack.c:1040
msgid "quit after a single request/response exchange"
msgstr "在一次单独的请求/响应（request/response）交换后退出"
-#: upload-pack.c:1038
+#: upload-pack.c:1042
msgid "exit immediately after initial ref advertisement"
msgstr "在初始的引用广告后立即退出"
-#: upload-pack.c:1040
+#: upload-pack.c:1044
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr "不要尝试 <directory>/.git/ 如果 <directory> 不是一个 Git 目录"
-#: upload-pack.c:1042
+#: upload-pack.c:1046
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "不活动 <n> 秒钟后终止传输"
@@ -13524,15 +13803,20 @@
"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
"帮助。"
-#: http.c:344
+#: http.c:336
+#, c-format
+msgid "negative value for http.postbuffer; defaulting to %d"
+msgstr "http.postbuffer 为负值，默认为 %d"
+
+#: http.c:357
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "当 cURL < 7.22.0 时，不支持委托控制"
-#: http.c:353
+#: http.c:366
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "不支持公钥文件锁定，因为 cURL < 7.44.0"
-#: http.c:1713
+#: http.c:1766
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -13543,7 +13827,7 @@
" 请求：%s\n"
" 重定向：%s"
-#: remote-curl.c:319
+#: remote-curl.c:323
#, c-format
msgid "redirecting to %s"
msgstr "重定向到 %s"
@@ -13911,7 +14195,7 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr "简单合并未生效，尝试自动合并。"
-#: git-rebase.sh:57
+#: 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"
@@ -13922,37 +14206,37 @@
"如果您想跳过此补丁，则执行 \"git rebase --skip\"。\n"
"要恢复原分支并停止变基，执行 \"git rebase --abort\"。"
-#: git-rebase.sh:157 git-rebase.sh:396
+#: git-rebase.sh:158 git-rebase.sh:397
#, sh-format
msgid "Could not move back to $head_name"
msgstr "无法移回 $head_name"
-#: git-rebase.sh:171
+#: git-rebase.sh:172
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "无法保存 $stash_sha1"
-#: git-rebase.sh:211
+#: git-rebase.sh:212
msgid "The pre-rebase hook refused to rebase."
msgstr "钩子 pre-rebase 拒绝变基操作。"
-#: git-rebase.sh:216
+#: git-rebase.sh:217
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
-#: git-rebase.sh:357
+#: git-rebase.sh:358
msgid "No rebase in progress?"
msgstr "没有正在进行的变基？"
-#: git-rebase.sh:368
+#: git-rebase.sh:369
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
-#: git-rebase.sh:375
+#: git-rebase.sh:376
msgid "Cannot read HEAD"
msgstr "不能读取 HEAD"
-#: git-rebase.sh:378
+#: git-rebase.sh:379
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -13960,7 +14244,7 @@
"您必须编辑所有的合并冲突，然后通过 git add\n"
"命令将它们标记为已解决"
-#: git-rebase.sh:418
+#: git-rebase.sh:419
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -13979,101 +14263,101 @@
"\t$cmd_clear_stale_rebase\n"
"然后再重新执行变基操作。 为避免丢失重要数据，我已经停止当前操作。"
-#: git-rebase.sh:469
+#: git-rebase.sh:470
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "无效的上游 $upstream_name"
-#: git-rebase.sh:493
+#: git-rebase.sh:494
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: 有一个以上的合并基准"
-#: git-rebase.sh:496 git-rebase.sh:500
+#: git-rebase.sh:497 git-rebase.sh:501
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: 没有合并基准"
-#: git-rebase.sh:505
+#: git-rebase.sh:506
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "没有指向一个有效的提交：$onto_name"
-#: git-rebase.sh:528
+#: git-rebase.sh:529
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "严重错误：无此分支：$branch_name"
-#: git-rebase.sh:561
+#: git-rebase.sh:562
msgid "Cannot autostash"
msgstr "无法 autostash"
-#: git-rebase.sh:566
+#: git-rebase.sh:567
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "创建了 autostash: $stash_abbrev"
-#: git-rebase.sh:570
+#: git-rebase.sh:571
msgid "Please commit or stash them."
msgstr "请提交或为它们保存进度。"
-#: git-rebase.sh:590
+#: git-rebase.sh:591
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "当前分支 $branch_name 是最新的。"
-#: git-rebase.sh:594
+#: git-rebase.sh:595
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "当前分支 $branch_name 是最新的，强制变基。"
-#: git-rebase.sh:605
+#: git-rebase.sh:606
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "变更从 $mb 到 $onto："
-#: git-rebase.sh:614
+#: git-rebase.sh:615
msgid "First, rewinding head to replay your work on top of it..."
msgstr "首先，回退分支以便在上面重放您的工作..."
-#: git-rebase.sh:624
+#: git-rebase.sh:625
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "快进 $branch_name 至 $onto_name。"
-#: git-stash.sh:50
+#: git-stash.sh:53
msgid "git stash clear with parameters is unimplemented"
msgstr "git stash clear 不支持参数"
-#: git-stash.sh:73
+#: git-stash.sh:94
msgid "You do not have the initial commit yet"
msgstr "您尚未建立初始提交"
-#: git-stash.sh:88
+#: git-stash.sh:109
msgid "Cannot save the current index state"
msgstr "无法保存当前索引状态"
-#: git-stash.sh:103
+#: git-stash.sh:124
msgid "Cannot save the untracked files"
msgstr "无法保存未跟踪文件"
-#: git-stash.sh:123 git-stash.sh:136
+#: git-stash.sh:144 git-stash.sh:157
msgid "Cannot save the current worktree state"
msgstr "无法保存当前工作区状态"
-#: git-stash.sh:140
+#: git-stash.sh:161
msgid "No changes selected"
msgstr "没有选择变更"
-#: git-stash.sh:143
+#: git-stash.sh:164
msgid "Cannot remove temporary index (can't happen)"
msgstr "无法删除临时索引（不应发生）"
-#: git-stash.sh:156
+#: git-stash.sh:177
msgid "Cannot record working tree state"
msgstr "不能记录工作区状态"
-#: git-stash.sh:188
+#: git-stash.sh:209
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr "无法用 $w_commit 更新 $ref_stash"
@@ -14088,7 +14372,7 @@
#. $ 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:238
+#: git-stash.sh:265
#, sh-format
msgid ""
"error: unknown option for 'stash save': $option\n"
@@ -14097,107 +14381,107 @@
"错误：'stash save' 的未知选项：$option\n"
" 要提供一个描述信息，使用 git stash save -- '$option'"
-#: git-stash.sh:251
+#: git-stash.sh:278
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all"
-#: git-stash.sh:259
+#: git-stash.sh:286
msgid "No local changes to save"
msgstr "没有要保存的本地修改"
-#: git-stash.sh:263
+#: git-stash.sh:291
msgid "Cannot initialize stash"
msgstr "无法初始化 stash"
-#: git-stash.sh:267
+#: git-stash.sh:295
msgid "Cannot save the current status"
msgstr "无法保存当前状态"
-#: git-stash.sh:268
+#: git-stash.sh:296
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr "保存工作目录和索引状态 $stash_msg"
-#: git-stash.sh:285
+#: git-stash.sh:323
msgid "Cannot remove worktree changes"
msgstr "无法删除工作区变更"
-#: git-stash.sh:403
+#: git-stash.sh:471
#, sh-format
msgid "unknown option: $opt"
msgstr "未知选项: $opt"
-#: git-stash.sh:416
+#: git-stash.sh:484
msgid "No stash found."
msgstr "未发现 stash。"
-#: git-stash.sh:423
+#: git-stash.sh:491
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "指定了太多的版本：$REV"
-#: git-stash.sh:438
+#: git-stash.sh:506
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference 不是一个有效的引用"
-#: git-stash.sh:466
+#: git-stash.sh:534
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' 不是 stash 样提交"
-#: git-stash.sh:477
+#: git-stash.sh:545
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args' 不是一个 stash 引用"
-#: git-stash.sh:485
+#: git-stash.sh:553
msgid "unable to refresh index"
msgstr "无法刷新索引"
-#: git-stash.sh:489
+#: git-stash.sh:557
msgid "Cannot apply a stash in the middle of a merge"
msgstr "无法在合并过程中恢复进度"
-#: git-stash.sh:497
+#: git-stash.sh:565
msgid "Conflicts in index. Try without --index."
msgstr "索引中有冲突。尝试不使用 --index。"
-#: git-stash.sh:499
+#: git-stash.sh:567
msgid "Could not save index tree"
msgstr "不能保存索引树"
-#: git-stash.sh:508
+#: git-stash.sh:576
msgid "Could not restore untracked files from stash"
msgstr "无法从进度保存中恢复未跟踪文件"
-#: git-stash.sh:533
+#: git-stash.sh:601
msgid "Cannot unstage modified files"
msgstr "无法将修改的文件取消暂存"
-#: git-stash.sh:548
+#: git-stash.sh:616
msgid "Index was not unstashed."
msgstr "索引的进度没有被恢复。"
-#: git-stash.sh:562
+#: git-stash.sh:630
msgid "The stash is kept in case you need it again."
msgstr "暂存被保留以备您再次需要。"
-#: git-stash.sh:571
+#: git-stash.sh:639
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "丢弃了 ${REV} ($s)"
-#: git-stash.sh:572
+#: git-stash.sh:640
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}：不能丢弃进度条目"
-#: git-stash.sh:580
+#: git-stash.sh:648
msgid "No branch name specified"
msgstr "未指定分支名"
-#: git-stash.sh:652
+#: git-stash.sh:727
msgid "(To restore them type \"git stash apply\")"
msgstr "（为恢复数据输入 \"git stash apply\"）"
@@ -14281,27 +14565,27 @@
msgid "Failed to register submodule '$sm_path'"
msgstr "无法注册子模组 '$sm_path'"
-#: git-submodule.sh:327
+#: git-submodule.sh:341
#, sh-format
msgid "Entering '$displaypath'"
msgstr "正在进入 '$displaypath'"
-#: git-submodule.sh:347
+#: git-submodule.sh:361
#, sh-format
msgid "Stopping at '$displaypath'; script returned non-zero status."
msgstr "停止于 '$displaypath'；脚本返回非零值。"
-#: git-submodule.sh:418
+#: git-submodule.sh:432
#, sh-format
msgid "pathspec and --all are incompatible"
msgstr "pathspec 和 --all 不兼容"
-#: git-submodule.sh:423
+#: git-submodule.sh:437
#, sh-format
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "如果您确实想要对所有子模组执行取消初始化，请使用 '--all'"
-#: git-submodule.sh:443
+#: git-submodule.sh:457
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains a .git directory\n"
@@ -14310,56 +14594,56 @@
"子模组工作区 '$displaypath' 包含一个 .git 目录\n"
"（如果您真的想删除它及其全部历史，使用 'rm -rf' 命令）"
-#: git-submodule.sh:451
+#: git-submodule.sh:465
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
"discard them"
msgstr "子模组工作区 '$displaypath' 包含本地修改；使用 '-f' 丢弃它们"
-#: git-submodule.sh:454
+#: git-submodule.sh:468
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "已清除目录 '$displaypath'"
-#: git-submodule.sh:455
+#: git-submodule.sh:469
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr "无法移除子模组工作区 '$displaypath'"
-#: git-submodule.sh:458
+#: git-submodule.sh:472
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr "不能创建空的子模组目录 '$displaypath'"
-#: git-submodule.sh:467
+#: git-submodule.sh:481
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
-#: git-submodule.sh:623
+#: git-submodule.sh:637
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
-#: git-submodule.sh:633
+#: git-submodule.sh:647
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "无法在子模组路径 '$sm_path' 中获取"
-#: git-submodule.sh:638
+#: git-submodule.sh:652
#, 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:656
+#: git-submodule.sh:670
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "无法在子模组路径 '$displaypath' 中获取"
-#: git-submodule.sh:662
+#: git-submodule.sh:676
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -14367,84 +14651,84 @@
msgstr ""
"获取了子模组路径 '$displaypath'，但是它没有包含 $sha1。直接获取该提交失败。"
-#: git-submodule.sh:669
+#: git-submodule.sh:683
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
-#: git-submodule.sh:670
+#: git-submodule.sh:684
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "子模组路径 '$displaypath'：检出 '$sha1'"
-#: git-submodule.sh:674
+#: git-submodule.sh:688
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
-#: git-submodule.sh:675
+#: git-submodule.sh:689
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "子模组路径 '$displaypath'：变基至 '$sha1'"
-#: git-submodule.sh:680
+#: git-submodule.sh:694
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
-#: git-submodule.sh:681
+#: git-submodule.sh:695
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "子模组路径 '$displaypath'：已合并入 '$sha1'"
-#: git-submodule.sh:686
+#: git-submodule.sh:700
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败"
-#: git-submodule.sh:687
+#: git-submodule.sh:701
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "子模组 '$displaypath'：'$command $sha1'"
-#: git-submodule.sh:718
+#: git-submodule.sh:732
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "无法递归进子模组路径 '$displaypath'"
-#: git-submodule.sh:826
+#: git-submodule.sh:840
msgid "The --cached option cannot be used with the --files option"
msgstr "选项 --cached 不能和选项 --files 同时使用"
-#: git-submodule.sh:878
+#: git-submodule.sh:892
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "意外的模式 $mod_dst"
# 译者：注意保持前导空格
-#: git-submodule.sh:898
+#: git-submodule.sh:912
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " 警告：$display_name 未包含提交 $sha1_src"
# 译者：注意保持前导空格
-#: git-submodule.sh:901
+#: git-submodule.sh:915
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " 警告：$display_name 未包含提交 $sha1_dst"
# 译者：注意保持前导空格
-#: git-submodule.sh:904
+#: git-submodule.sh:918
#, 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:1051
+#: git-submodule.sh:1064
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "无法递归进子模组路径 '$sm_path'"
-#: git-submodule.sh:1118
+#: git-submodule.sh:1136
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "为 '$displaypath' 同步子模组 url"
@@ -14737,11 +15021,11 @@
msgid "Or you can abort the rebase with 'git rebase --abort'."
msgstr "或者您可以使用 'git rebase --abort' 命令终止变基操作。"
-#: git-rebase--interactive.sh:1079
+#: git-rebase--interactive.sh:1083
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "不能删除 CHERRY_PICK_HEAD"
-#: git-rebase--interactive.sh:1084
+#: git-rebase--interactive.sh:1088
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
@@ -14770,22 +15054,22 @@
"\n"
" git rebase --continue\n"
-#: git-rebase--interactive.sh:1101
+#: git-rebase--interactive.sh:1105
msgid "Error trying to find the author identity to amend commit"
msgstr "在修补提交中查找作者信息时遇到错误"
-#: git-rebase--interactive.sh:1106
+#: git-rebase--interactive.sh:1110
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
msgstr ""
"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
-#: git-rebase--interactive.sh:1111 git-rebase--interactive.sh:1115
+#: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119
msgid "Could not commit staged changes."
msgstr "不能提交暂存的修改。"
-#: git-rebase--interactive.sh:1139
+#: git-rebase--interactive.sh:1147
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -14799,40 +15083,40 @@
" git rebase --continue\n"
"\n"
-#: git-rebase--interactive.sh:1147 git-rebase--interactive.sh:1305
+#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313
msgid "Could not execute editor"
msgstr "无法运行编辑器"
-#: git-rebase--interactive.sh:1160
+#: git-rebase--interactive.sh:1168
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "不能检出 $switch_to"
-#: git-rebase--interactive.sh:1165
+#: git-rebase--interactive.sh:1173
msgid "No HEAD?"
msgstr "没有 HEAD？"
-#: git-rebase--interactive.sh:1166
+#: git-rebase--interactive.sh:1174
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "不能创建临时 $state_dir"
-#: git-rebase--interactive.sh:1168
+#: git-rebase--interactive.sh:1176
msgid "Could not mark as interactive"
msgstr "不能标记为交互式"
-#: git-rebase--interactive.sh:1178 git-rebase--interactive.sh:1183
+#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191
msgid "Could not init rewritten commits"
msgstr "不能对重写提交进行初始化"
-#: git-rebase--interactive.sh:1283
+#: git-rebase--interactive.sh:1291
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
msgstr[0] "变基 $shortrevisions 到 $shortonto（$todocount 个提交）"
msgstr[1] "变基 $shortrevisions 到 $shortonto（$todocount 个提交）"
-#: git-rebase--interactive.sh:1288
+#: git-rebase--interactive.sh:1296
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -14842,7 +15126,7 @@
"然而，如果您删除全部内容，变基操作将会终止。\n"
"\n"
-#: git-rebase--interactive.sh:1295
+#: git-rebase--interactive.sh:1303
msgid "Note that empty commits are commented out"
msgstr "注意空提交已被注释掉"
@@ -14917,113 +15201,107 @@
msgid "unstaged"
msgstr "未缓存"
-#: git-add--interactive.perl:297 git-add--interactive.perl:322
+#: git-add--interactive.perl:288 git-add--interactive.perl:313
msgid "binary"
msgstr "二进制"
-#: git-add--interactive.perl:306 git-add--interactive.perl:360
+#: git-add--interactive.perl:297 git-add--interactive.perl:351
msgid "nothing"
msgstr "无"
-#: git-add--interactive.perl:342 git-add--interactive.perl:357
+#: git-add--interactive.perl:333 git-add--interactive.perl:348
msgid "unchanged"
msgstr "没有修改"
-#: git-add--interactive.perl:653
+#: git-add--interactive.perl:644
#, 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:656
+#: git-add--interactive.perl:647
#, 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:659
+#: git-add--interactive.perl:650
#, 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:662
+#: git-add--interactive.perl:653
#, 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:671
+#: git-add--interactive.perl:662
msgid "Update"
msgstr "更新"
-#: git-add--interactive.perl:683
+#: git-add--interactive.perl:674
msgid "Revert"
msgstr "还原"
-#: git-add--interactive.perl:706
+#: git-add--interactive.perl:697
#, perl-format
msgid "note: %s is untracked now.\n"
msgstr "说明：%s 现已成为未跟踪的。\n"
-#: git-add--interactive.perl:717
+#: git-add--interactive.perl:708
msgid "Add untracked"
msgstr "添加未跟踪的"
-#: git-add--interactive.perl:723
+#: git-add--interactive.perl:714
msgid "No untracked files.\n"
msgstr "没有未跟踪的文件。\n"
-#: git-add--interactive.perl:1039
+#: git-add--interactive.perl:1030
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
msgstr "如果补丁能干净地应用，编辑块将立即标记为暂存。"
-#: git-add--interactive.perl:1042
+#: git-add--interactive.perl:1033
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
msgstr "如果补丁能干净地应用，编辑块将立即标记为保存进度。"
-#: git-add--interactive.perl:1045
+#: git-add--interactive.perl:1036
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
msgstr "如果补丁能干净地应用，编辑块将立即标记为未暂存。"
-#: git-add--interactive.perl:1048 git-add--interactive.perl:1057
+#: git-add--interactive.perl:1039 git-add--interactive.perl:1048
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
msgstr "如果补丁能干净地应用，编辑块将立即标记为应用。"
-#: git-add--interactive.perl:1051
-msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be\n"
-"marked for discarding"
-msgstr "如果补丁能干净地应用，编辑块将立即标记为丢弃"
-
-#: git-add--interactive.perl:1054
+#: git-add--interactive.perl:1042 git-add--interactive.perl:1045
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
msgstr "如果补丁能干净地应用，编辑块将立即标记为丢弃。"
-#: git-add--interactive.perl:1067
+#: git-add--interactive.perl:1058
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
msgstr "无法写入块编辑文件：%s"
-#: git-add--interactive.perl:1068
+#: git-add--interactive.perl:1059
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr "手动块编辑模式 -- 查看底部的快速指南。\n"
-#: git-add--interactive.perl:1074
+#: git-add--interactive.perl:1065
#, perl-format
msgid ""
"---\n"
@@ -15037,7 +15315,7 @@
"以 %s 开始的行将被删除。\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1082
+#: git-add--interactive.perl:1073
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"
@@ -15046,7 +15324,7 @@
"如果不能干净地应用，您将有机会重新编辑。如果该块的全部内容删除，则\n"
"此次编辑被终止，该块不会被修改。\n"
-#: git-add--interactive.perl:1096
+#: git-add--interactive.perl:1087
#, perl-format
msgid "failed to open hunk edit file for reading: %s"
msgstr "无法读取块编辑文件：%s"
@@ -15057,12 +15335,12 @@
#. 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:1187
+#: git-add--interactive.perl:1178
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr "您的编辑块不能被应用。重新编辑（选择 \"no\" 丢弃！） [y/n]? "
-#: git-add--interactive.perl:1196
+#: git-add--interactive.perl:1187
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -15076,7 +15354,7 @@
"a - 暂存该块和本文件中后面的全部块\n"
"d - 不暂存该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1202
+#: git-add--interactive.perl:1193
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -15090,7 +15368,7 @@
"a - 贮藏该块和本文件中后面的全部块\n"
"d - 不贮藏该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1208
+#: git-add--interactive.perl:1199
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -15104,7 +15382,7 @@
"a - 不暂存该块和本文件中后面的全部块\n"
"d - 不要不暂存该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1214
+#: git-add--interactive.perl:1205
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -15118,7 +15396,7 @@
"a - 应用该块和本文件中后面的全部块\n"
"d - 不要应用该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1220
+#: git-add--interactive.perl:1211
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -15132,7 +15410,7 @@
"a - 丢弃该块和本文件中后面的全部块\n"
"d - 不要丢弃该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1226
+#: git-add--interactive.perl:1217
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -15146,7 +15424,7 @@
"a - 丢弃该块和本文件中后面的全部块\n"
"d - 不要丢弃该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1232
+#: git-add--interactive.perl:1223
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -15160,7 +15438,7 @@
"a - 应用该块和本文件中后面的全部块\n"
"d - 不要应用该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1241
+#: git-add--interactive.perl:1232
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
@@ -15182,201 +15460,201 @@
"e - 手动编辑当前块\n"
"? - 显示帮助\n"
-#: git-add--interactive.perl:1272
+#: git-add--interactive.perl:1263
msgid "The selected hunks do not apply to the index!\n"
msgstr "选中的块不能应用到索引！\n"
-#: git-add--interactive.perl:1273
+#: git-add--interactive.perl:1264
msgid "Apply them to the worktree anyway? "
msgstr "无论如何都要应用到工作区么？"
-#: git-add--interactive.perl:1276
+#: git-add--interactive.perl:1267
msgid "Nothing was applied.\n"
msgstr "未应用。\n"
-#: git-add--interactive.perl:1287
+#: git-add--interactive.perl:1278
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "忽略未合入的：%s\n"
-#: git-add--interactive.perl:1296
+#: git-add--interactive.perl:1287
msgid "Only binary files changed.\n"
msgstr "只有二进制文件被修改。\n"
-#: git-add--interactive.perl:1298
+#: git-add--interactive.perl:1289
msgid "No changes.\n"
msgstr "没有修改。\n"
-#: git-add--interactive.perl:1306
+#: git-add--interactive.perl:1297
msgid "Patch update"
msgstr "补丁更新"
-#: git-add--interactive.perl:1358
+#: git-add--interactive.perl:1349
#, perl-format
msgid "Stage mode change [y,n,q,a,d,/%s,?]? "
msgstr "暂存状态修改 [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1359
+#: git-add--interactive.perl:1350
#, perl-format
msgid "Stage deletion [y,n,q,a,d,/%s,?]? "
msgstr "暂存状态删除 [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1360
+#: git-add--interactive.perl:1351
#, perl-format
msgid "Stage this hunk [y,n,q,a,d,/%s,?]? "
msgstr "暂存该块 [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1363
+#: git-add--interactive.perl:1354
#, perl-format
msgid "Stash mode change [y,n,q,a,d,/%s,?]? "
msgstr "贮藏状态修改 [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1364
+#: git-add--interactive.perl:1355
#, perl-format
msgid "Stash deletion [y,n,q,a,d,/%s,?]? "
msgstr "贮藏状态删除 [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1365
+#: git-add--interactive.perl:1356
#, perl-format
msgid "Stash this hunk [y,n,q,a,d,/%s,?]? "
msgstr "贮藏该块 [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1368
+#: git-add--interactive.perl:1359
#, perl-format
msgid "Unstage mode change [y,n,q,a,d,/%s,?]? "
msgstr "未暂存状态修改 [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1369
+#: git-add--interactive.perl:1360
#, perl-format
msgid "Unstage deletion [y,n,q,a,d,/%s,?]? "
msgstr "未暂存状态删除 [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1370
+#: git-add--interactive.perl:1361
#, perl-format
msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? "
msgstr "不暂存该块 [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1373
+#: git-add--interactive.perl:1364
#, 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:1374
+#: git-add--interactive.perl:1365
#, perl-format
msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? "
msgstr "从索引中删除应用状态 [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1375
+#: git-add--interactive.perl:1366
#, 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:1378
+#: git-add--interactive.perl:1369
#, 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:1379
+#: git-add--interactive.perl:1370
#, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? "
msgstr "从工作区中删除丢弃状态 [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1380
+#: git-add--interactive.perl:1371
#, 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:1383
+#: git-add--interactive.perl:1374
#, 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:1384
+#: git-add--interactive.perl:1375
#, 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:1385
+#: git-add--interactive.perl:1376
#, 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:1388
+#: git-add--interactive.perl:1379
#, 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:1389
+#: git-add--interactive.perl:1380
#, 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:1390
+#: git-add--interactive.perl:1381
#, 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:1493
+#: git-add--interactive.perl:1484
msgid "go to which hunk (<ret> to see more)? "
msgstr "跳转到哪个块（<回车> 查看更多）？ "
-#: git-add--interactive.perl:1495
+#: git-add--interactive.perl:1486
msgid "go to which hunk? "
msgstr "跳转到哪个块？"
-#: git-add--interactive.perl:1504
+#: git-add--interactive.perl:1495
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "无效数字：'%s'\n"
-#: git-add--interactive.perl:1509
+#: git-add--interactive.perl:1500
#, 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:1535
+#: git-add--interactive.perl:1526
msgid "search for regex? "
msgstr "使用正则表达式搜索？"
-#: git-add--interactive.perl:1548
+#: git-add--interactive.perl:1539
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "错误的正则表达式 %s：%s\n"
-#: git-add--interactive.perl:1558
+#: git-add--interactive.perl:1549
msgid "No hunk matches the given pattern\n"
msgstr "没有和给定模式相匹配的快\n"
-#: git-add--interactive.perl:1570 git-add--interactive.perl:1592
+#: git-add--interactive.perl:1561 git-add--interactive.perl:1583
msgid "No previous hunk\n"
msgstr "没有前一个块\n"
-#: git-add--interactive.perl:1579 git-add--interactive.perl:1598
+#: git-add--interactive.perl:1570 git-add--interactive.perl:1589
msgid "No next hunk\n"
msgstr "没有下一个块\n"
-#: git-add--interactive.perl:1606
+#: git-add--interactive.perl:1597
#, 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:1658
+#: git-add--interactive.perl:1649
msgid "Review diff"
msgstr "检视 diff"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1677
+#: git-add--interactive.perl:1668
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\t - view diff between HEAD and index\n"
+"diff - view diff between HEAD and index\n"
"add untracked - add contents of untracked files to the staged set of "
"changes\n"
msgstr ""
@@ -15387,18 +15665,18 @@
"diff - 显示 HEAD 和索引间差异\n"
"add untracked - 添加未跟踪文件的内容至暂存列表\n"
-#: git-add--interactive.perl:1694 git-add--interactive.perl:1699
-#: git-add--interactive.perl:1702 git-add--interactive.perl:1709
-#: git-add--interactive.perl:1713 git-add--interactive.perl:1719
+#: 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
msgid "missing --"
msgstr "缺失 --"
-#: git-add--interactive.perl:1715
+#: git-add--interactive.perl:1706
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "未知的 --patch 模式：%s"
-#: git-add--interactive.perl:1721 git-add--interactive.perl:1727
+#: git-add--interactive.perl:1712 git-add--interactive.perl:1718
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "无效的参数 %s，期望是 --"
@@ -15473,7 +15751,8 @@
" * Saying \"./%s\" if you mean a file; or\n"
" * Giving --format-patch option if you mean a range.\n"
msgstr ""
-"存在文件 '%s' 但是它也可能是一个用于产生补丁列表的提交范围。请用如下方法消除歧义：\n"
+"存在文件 '%s' 但是它也可能是一个用于产生补丁列表的提交范围。请用如下方法消除"
+"歧义：\n"
"\n"
" * 如果含义为一个文件，使用 \"./%s\"，或者\n"
" * 如果含义为一个范围，使用 --format-patch 选项。\n"
@@ -15497,7 +15776,10 @@
"\n"
"No patch files specified!\n"
"\n"
-msgstr "\n未指定补丁文件！\n\n"
+msgstr ""
+"\n"
+"未指定补丁文件！\n"
+"\n"
#: git-send-email.perl:658
#, perl-format
@@ -15744,6 +16026,87 @@
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 "使用一个试验性的基于空行的启发式算法改进差异显示"
