Merge tag 'l10n-2.51.0-2' of https://github.com/git-l10n/git-po
l10n-2.51.0-2
* tag 'l10n-2.51.0-2' of https://github.com/git-l10n/git-po:
l10n: Update Catalan Translation for Git 2.51-rc2
l10n: zh_CN: updated translation for 2.51
l10n: uk: add 2.51 translation
l10n: zh_TW: Git 2.51
l10n: po-id for 2.51
l10n: fr translation update for v2.51.0
l10n: tr: Update Turkish translations for 2.51.0
l10n: Updated translation for vi-2.51
l10n: sv.po: Update Swedish translation
l10n: bg.po: Updated Bulgarian translation (5856t)
diff --git a/po/bg.po b/po/bg.po
index a641066..d45d363 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -61,6 +61,7 @@
# dirty нечист, мръсен (файл, индекс)
# fallback резервен вариант
# pathspec magic опция за магически пътища
+# pathspec шаблон за пътища
# bitmap index индекс на база битови маски
# multi-pack bitmap многопакетната битова маска
# ewah bitmap битова маска във формат EWAH
@@ -237,6 +238,7 @@
# exit code изходен код
# score оценка за съвпадение
# raw необработен
+# mbox файл с поща
#
#
# ------------------------
@@ -266,8 +268,8 @@
msgstr ""
"Project-Id-Version: git 2.48\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2025-05-29 13:50+0200\n"
-"PO-Revision-Date: 2025-05-29 20:25+0200\n"
+"POT-Creation-Date: 2025-08-13 22:06+0200\n"
+"PO-Revision-Date: 2025-08-13 22:07+0200\n"
"Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
"Language: bg\n"
@@ -277,6 +279,10 @@
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#, c-format
+msgid "%s cannot be negative"
+msgstr "%s трябва да е неотрицателно"
+
+#, c-format
msgid "Huh (%s)?"
msgstr "Неуспешен анализ — „%s“."
@@ -980,8 +986,8 @@
"outside of your sparse-checkout definition, so will not be\n"
"updated in the index:\n"
msgstr ""
-"Следните пътища напасват с пътища извън дефиницията за частично\n"
-"изтегляне и няма да се обновят в индекса:\n"
+"Следните пътища и шаблони напасват с пътища извън дефиницията\n"
+"за частично изтегляне и няма да се обновят в индекса:\n"
msgid ""
"If you intend to update such entries, try one of the following:\n"
@@ -1644,11 +1650,11 @@
#, c-format
msgid "pathspec '%s' matches files outside the current directory"
-msgstr "пътят „%s“ съвпада с файлове извън текущата директория"
+msgstr "шаблонът за пътища „%s“ съвпада с файлове извън текущата директория"
#, c-format
msgid "pathspec '%s' did not match any files"
-msgstr "пътят „%s“ не съвпада с никой файл"
+msgstr "шаблонът за пътища „%s“ не съвпада с никой файл"
#, c-format
msgid "no such ref: %.*s"
@@ -2115,7 +2121,7 @@
msgstr "„%s“ вече се ползва от работното дърво в „%s“"
msgid "git add [<options>] [--] <pathspec>..."
-msgstr "git add [ОПЦИЯ…] [--] ПЪТ…"
+msgstr "git add [ОПЦИЯ…] [--] ШАБЛОН_ЗА_ПЪТИЩА…"
#, c-format
msgid "cannot chmod %cx '%s'"
@@ -2242,12 +2248,16 @@
msgstr "неуспешно добавяне на файлове"
#, c-format
+msgid "'%s' cannot be negative"
+msgstr "„%s“ трябва да е неотрицателно"
+
+#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "параметърът към „--chmod“ — „%s“ може да е или „-x“, или „+x“"
#, c-format
msgid "'%s' and pathspec arguments cannot be used together"
-msgstr "опцията „%s“ и път са несъвместими"
+msgstr "опцията „%s“ и шаблони за пътища са несъвместими"
#, c-format
msgid "Nothing specified, nothing added.\n"
@@ -2678,7 +2688,7 @@
msgstr ""
"git bisect start [--term-(new,bad)=УПРАВЛЯВАЩА_ДУМА --term-"
"(old,good)=УПРАВЛЯВАЩА_ДУМА] [--no-checkout] [--first-parent] [ЛОШО "
-"[ДОБРО…]] [--] [ПЪТ…]"
+"[ДОБРО…]] [--] [ШАБЛОН_ЗА_ПЪТИЩА…]"
msgid "git bisect (good|bad) [<rev>...]"
msgstr "git bisect (good|bad) [ВЕРСИЯ…]"
@@ -4251,7 +4261,7 @@
msgstr "изтегляне на чуждата версия на неслетите файлове"
msgid "do not limit pathspecs to sparse entries only"
-msgstr "без ограничаване на изброените пътища само до частично изтеглените"
+msgstr "без ограничаване на шаблоните за пътища само до частично изтеглените"
#, c-format
msgid "options '-%c', '-%c', and '%s' cannot be used together"
@@ -4341,7 +4351,9 @@
msgid ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] "
"[<pathspec>...]"
-msgstr "git clean [-d] [-f] [-i] [-n] [-q] [-e ШАБЛОН] [-x|-X] [--] [ПЪТ…]"
+msgstr ""
+"git clean [-d] [-f] [-i] [-n] [-q] [-e ШАБЛОН] [-x|-X] [--] "
+"[ШАБЛОН_ЗА_ПЪТИЩА…]"
#, c-format
msgid "Removing %s\n"
@@ -4595,7 +4607,7 @@
msgstr "настройване за споделено хранилище"
msgid "pathspec"
-msgstr "път"
+msgstr "ШАБЛОН_ЗА_ПЪТИЩА"
msgid "initialize submodules in the clone"
msgstr "инициализиране на подмодулите при това клониране"
@@ -5007,10 +5019,10 @@
" [-i|-o] [--pathspec-from-file=ФАЙЛ [--pathspec-file-nul]]\n"
" [(--trailer ЛЕКСЕМА[(=|:)СТОЙНОСТ])…] [-"
"S[ИДЕНТИФИКАТОР_НА_КЛЮЧ]]\n"
-" [--] [ПЪТ…]"
+" [--] [ШАБЛОН_ЗА_ПЪТИЩА…]"
msgid "git status [<options>] [--] [<pathspec>...]"
-msgstr "git status [ОПЦИЯ…] [--] [ПЪТ…]"
+msgstr "git status [ОПЦИЯ…] [--] [ШАБЛОН_ЗА_ПЪТИЩА…]"
msgid ""
"You asked to amend the most recent commit, but doing so would make\n"
@@ -5516,24 +5528,24 @@
msgid ""
"git config get [<file-option>] [<display-option>] [--includes] [--all] [--"
-"regexp] [--value=<value>] [--fixed-value] [--default=<default>] <name>"
+"regexp] [--value=<pattern>] [--fixed-value] [--default=<default>] [--"
+"url=<url>] <name>"
msgstr ""
"git config get [ОПЦИЯ_ЗА_ФАЙЛ] [ОПЦИЯ_ЗА_ИЗВЕЖДАНЕ] [--includes] [--all] [--"
-"regexp] [--value=СТОЙНОСТ] [--fixed-value] [--default=СТАНДАРТНО] ИМЕ"
+"regexp] [--value=ШАБЛОН] [--fixed-value] [--default=СТАНДАРТНО] ИМЕ"
msgid ""
-"git config set [<file-option>] [--type=<type>] [--all] [--value=<value>] [--"
-"fixed-value] <name> <value>"
+"git config set [<file-option>] [--type=<type>] [--all] [--value=<pattern>] "
+"[--fixed-value] <name> <value>"
msgstr ""
-"git config set [ОПЦИЯ_ЗА_ФАЙЛ] [--type=ВИД] [--all] [--value=СТОЙНОСТ] [--"
+"git config set [ОПЦИЯ_ЗА_ФАЙЛ] [--type=ВИД] [--all] [--value=ШАБЛОН] [--"
"fixed-value] ИМЕ СТОЙНОСТ"
msgid ""
-"git config unset [<file-option>] [--all] [--value=<value>] [--fixed-value] "
+"git config unset [<file-option>] [--all] [--value=<pattern>] [--fixed-value] "
"<name>"
msgstr ""
-"git config unset [ОПЦИЯ_ЗА_ФАЙЛ] [--all] [--value=СТОЙНОСТ] [--fixed-value] "
-"ИМЕ"
+"git config unset [ОПЦИЯ_ЗА_ФАЙЛ] [--all] [--value=ШАБЛОН] [--fixed-value] ИМЕ"
msgid "git config rename-section [<file-option>] <old-name> <new-name>"
msgstr "git config rename-section [ОПЦИЯ_ЗА_ФАЙЛ] СТАРО_ИМЕ НОВО_ИМЕ"
@@ -5550,18 +5562,18 @@
msgid ""
"git config get [<file-option>] [<display-option>] [--includes] [--all] [--"
-"regexp=<regexp>] [--value=<value>] [--fixed-value] [--default=<default>] "
+"regexp=<regexp>] [--value=<pattern>] [--fixed-value] [--default=<default>] "
"<name>"
msgstr ""
"git config get [ОПЦИЯ_ЗА_ФАЙЛ] [ОПЦИЯ_ЗА_ИЗВЕЖДАНЕ] [--includes] [--all] [--"
-"regexp=РЕГ_ИЗР][--value=СТОЙНОСТ] [--fixed-value] [--default=СТАНДАРТНО] ИМЕ"
+"regexp=РЕГ_ИЗР][--value=ШАБЛОН] [--fixed-value] [--default=СТАНДАРТНО] ИМЕ"
msgid ""
"git config set [<file-option>] [--type=<type>] [--comment=<message>] [--all] "
-"[--value=<value>] [--fixed-value] <name> <value>"
+"[--value=<pattern>] [--fixed-value] <name> <value>"
msgstr ""
"git config set [ОПЦИЯ_ЗА_ФАЙЛ] [--type=ВИД] [--comment=СЪОБЩЕНИЕ] [--all] [--"
-"value=СТОЙНОСТ] [--fixed-value] ИМЕ СТОЙНОСТ"
+"value=ШАБЛОН] [--fixed-value] ИМЕ СТОЙНОСТ"
msgid "Config file location"
msgstr "Местоположение на конфигурационния файл"
@@ -6087,7 +6099,7 @@
msgstr "опцията „-z“ е задължителна"
msgid "pathspec arguments not supported"
-msgstr "не се поддържат опции за пътища"
+msgstr "не се поддържат аргументи с шаблони за пътища"
msgid "revision arguments not allowed"
msgstr "не се поддържат опции за версии"
@@ -6244,7 +6256,7 @@
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
msgstr ""
-"Грешка: непреките етикети не се изнасят, освен ако не зададете „--mark-tags“."
+"ГРЕШКА: непреките етикети не се изнасят, освен ако не зададете „--mark-tags“."
msgid "--anonymize-map token cannot be empty"
msgstr "опцията „--anonymize-map“ изисква аргумент"
@@ -6437,23 +6449,6 @@
msgstr ""
"отхвърляне на „%s“, защото плитките върхове не може да бъдат обновявани"
-#, c-format
-msgid ""
-"some local refs could not be updated; try running\n"
-" 'git remote prune %s' to remove any old, conflicting branches"
-msgstr ""
-"някои локални указатели не може да бъдат обновени. Изпълнете командата\n"
-"„git remote prune %s“, за да премахнете остарелите клони, които\n"
-"предизвикват конфликта"
-
-#, c-format
-msgid " (%s will become dangling)"
-msgstr " (обектът „%s“ ще се окаже извън клон)"
-
-#, c-format
-msgid " (%s has become dangling)"
-msgstr " (обектът „%s“ вече е извън клон)"
-
msgid "[deleted]"
msgstr "[изтрит]"
@@ -6501,6 +6496,19 @@
"ще изключи предупреждението, докато отдалеченият указател HEAD не\n"
"започне да сочи нещо друго."
+#, c-format
+msgid ""
+"some local refs could not be updated; try running\n"
+" 'git remote prune %s' to remove any old, conflicting branches"
+msgstr ""
+"някои локални указатели не може да бъдат обновени. Изпълнете командата\n"
+"„git remote prune %s“, за да премахнете остарелите клони, които\n"
+"предизвикват конфликта"
+
+#, c-format
+msgid "fetching ref %s failed: %s"
+msgstr "неуспешно доставяне на указателя %s: %s"
+
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr ""
"засечени са множество клони, това е несъвместимо с опцията „--set-upstream“"
@@ -6747,6 +6755,9 @@
msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
msgstr "git for-each-ref [--contains [ПОДАВАНЕ]] [--no-contains [ПОДАВАНЕ]]"
+msgid "git for-each-ref [--start-after <marker>]"
+msgstr "git for-each-ref [--start-after МАРКЕР]"
+
msgid "quote placeholders suitably for shells"
msgstr "цитиране подходящо за командни интерпретатори на обвивката"
@@ -6762,6 +6773,12 @@
msgid "show only <n> matched refs"
msgstr "извеждане само на този БРОЙ напаснати указатели"
+msgid "marker"
+msgstr "МАРКЕР"
+
+msgid "start iteration after the provided marker"
+msgstr "начало на итерирането след указания маркер"
+
msgid "respect format colors"
msgstr "спазване на цветовете на форма̀та"
@@ -6786,9 +6803,15 @@
msgid "also include HEAD ref and pseudorefs"
msgstr "включване и на указателя „HEAD“ както и псевдо указателите"
+msgid "cannot use --start-after with custom sort options"
+msgstr "опцията „--start-after“ е несъвместима с изрична подредба"
+
msgid "unknown arguments supplied with --stdin"
msgstr "непознат аргумент към опцията „--stdin“"
+msgid "cannot use --start-after with patterns"
+msgstr "опцията „--start-after“ е несъвместима със задаването на шаблони"
+
msgid "git for-each-repo --config=<config> [--] <arguments>"
msgstr "git for-each-repo --config=НАСТРОЙКА [--] АРГУМЕНТ…"
@@ -7190,6 +7213,10 @@
msgid "pack prefix to store a pack containing pruned objects"
msgstr "префикс на имената на пакетите за окастрени обекти"
+msgid "skip maintenance tasks typically done in the foreground"
+msgstr ""
+"прескачане на дейностите по поддръжката — типично за работа на преден режим"
+
#, c-format
msgid "failed to parse gc.logExpiry value %s"
msgstr "неразпозната стойност на „gc.logExpiry“ %s"
@@ -7268,14 +7295,14 @@
"„core.multiPackIndex“ е изключена"
#, c-format
-msgid "lock file '%s' exists, skipping maintenance"
-msgstr "заключващият файл „%s“ съществува. Действието се прескача"
-
-#, c-format
msgid "task '%s' failed"
msgstr "неуспешно изпълнение на задачата „%s“"
#, c-format
+msgid "lock file '%s' exists, skipping maintenance"
+msgstr "заключващият файл „%s“ съществува. Действието се прескача"
+
+#, c-format
msgid "'%s' is not a valid task"
msgstr "„%s“ не е правилна задача"
@@ -7304,9 +7331,6 @@
msgid "run a specific task"
msgstr "изпълнение на определена задача"
-msgid "use at most one of --auto and --schedule=<frequency>"
-msgstr "опциите „--auto“ и „--schedule=ЧЕСТОТА“ са несъвместими"
-
#, c-format
msgid "unable to add '%s' value of '%s'"
msgstr "неуспешно добавяне на стойност на „%s“ за „%s“"
@@ -8199,11 +8223,7 @@
"във ФАЙЛа"
msgid "-L<range>:<file> cannot be used with pathspec"
-msgstr "опцията „-LДИАПАЗОН:ФАЙЛ“ не може да се ползва с път"
-
-#, c-format
-msgid "Final output: %d %s\n"
-msgstr "Резултат: %d %s\n"
+msgstr "опцията „-LДИАПАЗОН:ФАЙЛ“ не може да се ползва с шаблон за пътища"
#, c-format
msgid "git show %s: bad file"
@@ -8934,6 +8954,9 @@
msgid "(synonym to --stat)"
msgstr "(псевдоним на „--stat“)"
+msgid "show a compact-summary at the end of the merge"
+msgstr "извеждане на кратко-обобщение след завършване на сливане"
+
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"добавяне (на максимум такъв БРОЙ) записи от съкратения журнал в съобщението "
@@ -9209,10 +9232,6 @@
msgstr "ГРЕШКА: аргументът-етикет не минава проверка с „fsck“: %s"
#, c-format
-msgid "%d (FSCK_IGNORE?) should never trigger this callback"
-msgstr "%d (FSCK_IGNORE?) никога не трябва да задейства тази функция"
-
-#, c-format
msgid "could not read tagged object '%s'"
msgstr "обектът с етикет не може да се прочете: %s"
@@ -9746,15 +9765,26 @@
msgid "unknown subcommand: `%s'"
msgstr "непозната подкоманда: „%s“"
-msgid "git pack-objects --stdout [<options>] [< <ref-list> | < <object-list>]"
-msgstr ""
-"git pack-objects --stdout [ОПЦИЯ…] [< СПИСЪК_С_УКАЗАТЕЛИ|< СПИСЪК_С_ОБЕКТИ]"
-
msgid ""
-"git pack-objects [<options>] <base-name> [< <ref-list> | < <object-list>]"
+"git pack-objects [-q | --progress | --all-progress] [--all-progress-"
+"implied]\n"
+" [--no-reuse-delta] [--delta-base-offset] [--non-empty]\n"
+" [--local] [--incremental] [--window=<n>] [--depth=<n>]\n"
+" [--revs [--unpacked | --all]] [--keep-pack=<pack-name>]\n"
+" [--cruft] [--cruft-expiration=<time>]\n"
+" [--stdout [--filter=<filter-spec>] | <base-name>]\n"
+" [--shallow] [--keep-true-parents] [--[no-]sparse]\n"
+" [--name-hash-version=<n>] [--path-walk] < <object-list>"
msgstr ""
-"git pack-objects [ОПЦИЯ…] ПРЕФИКС_НА_ИМЕТО [< СПИСЪК_С_УКАЗАТЕЛИ|< "
-"СПИСЪК_С_ОБЕКТИ]"
+"git pack-objects [-q | --progress | --all-progress] [--all-progress-"
+"implied]\n"
+" [--no-reuse-delta] [--delta-base-offset] [--non-empty]\n"
+" [--local] [--incremental] [--window=БРОЙ] [--depth=БРОЙ]\n"
+" [--revs [--unpacked | --all]] [--keep-pack=ИМЕ_НА_ПАКЕТ]\n"
+" [--cruft] [--cruft-expiration=ВРЕМЕ]\n"
+" [--stdout [--filter=ФИЛТЪР] | ОСНОВНО_ИМЕ]\n"
+" [--shallow] [--keep-true-parents] [--[no-]sparse]\n"
+" [--name-hash-version=ВЕРСИЯ] [--path-walk] < СПИСЪК_С_ОБЕКТИ"
#, c-format
msgid "invalid --name-hash-version option: %d"
@@ -9863,6 +9893,15 @@
msgid "unable to get type of object %s"
msgstr "видът на обекта „%s“ не може да се определи"
+msgid "Compressing objects by path"
+msgstr "Компресиране на обектите на база пътя"
+
+#, c-format
+msgid "Path-based delta compression using up to %d thread"
+msgid_plural "Path-based delta compression using up to %d threads"
+msgstr[0] "Делта компресията на база път ще използва до %d нишка"
+msgstr[1] "Делта компресията на база път ще използва до %d нишки"
+
msgid "Compressing objects"
msgstr "Компресиране на обектите"
@@ -9941,6 +9980,9 @@
msgid "unable to force loose object"
msgstr "оставането на обекта непакетиран не може да се наложи"
+msgid "failed to pack objects via path-walk"
+msgstr "неуспешно пакетиране на обекти чрез обхождане на дървото"
+
#, c-format
msgid "not a rev '%s'"
msgstr "„%s“ не е версия"
@@ -10058,6 +10100,11 @@
msgid "create thin packs"
msgstr "създаване на съкратени пакети"
+msgid "use the path-walk API to walk objects when possible"
+msgstr ""
+"когато е възможно, използване на програмния интерфейс за обхождане на "
+"обектите"
+
msgid "create packs suitable for shallow fetches"
msgstr "пакетиране подходящо за плитко доставяне"
@@ -10120,6 +10167,10 @@
"ползва %d"
#, c-format
+msgid "cannot use %s with %s"
+msgstr "„%s“ и „%s“ са несъвместими"
+
+#, c-format
msgid "bad pack compression level %d"
msgstr "неправилно ниво на компресиране при пакетиране: %d"
@@ -10136,9 +10187,6 @@
"опцията „--thin“не може да се използва за създаване на пакетни файлове с "
"индекс"
-msgid "cannot use --filter with --stdin-packs"
-msgstr "опциите „--filter“ и „--stdin-packs“ са несъвместими"
-
msgid "cannot use internal rev list with --stdin-packs"
msgstr ""
"вътрешният списък на указатели и опцията „--stdin-packs“ са несъвместими"
@@ -10146,9 +10194,6 @@
msgid "cannot use internal rev list with --cruft"
msgstr "вътрешният списък на версии и опцията „--cruft“ са несъвместими"
-msgid "cannot use --stdin-packs with --cruft"
-msgstr "опциите „--stdin-packs“ и „--cruft“ са несъвместими"
-
msgid "Enumerating objects"
msgstr "Изброяване на обектите"
@@ -10161,22 +10206,6 @@
"%<PRIu32>), преизползвани при пакетиране: %<PRIu32> (от %<PRIuMAX>)"
msgid ""
-"'git pack-redundant' is nominated for removal.\n"
-"If you still use this command, please add an extra\n"
-"option, '--i-still-use-this', on the command line\n"
-"and let us know you still use it by sending an e-mail\n"
-"to <git@vger.kernel.org>. Thanks.\n"
-msgstr ""
-"Командата „git pack-redundant“ е остаряла и предстои\n"
-"пълното ѝ премахване. Ако все още я ползвате, добавете\n"
-"опцията „--i-still-use-this“ на командния ред и молим да\n"
-"ни известите с е-писмо до пощенския списък:\n"
-"<git@vger.kernel.org>.\n"
-
-msgid "refusing to run without --i-still-use-this"
-msgstr "трябва да добавите и опцията „--i-still-use-this“"
-
-msgid ""
"git pack-refs [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude "
"<pattern>]"
msgstr ""
@@ -11511,6 +11540,18 @@
msgid "unknown --mirror argument: %s"
msgstr "неправилна стойност за „--mirror“: %s"
+#, c-format
+msgid "remote name '%s' is a subset of existing remote '%s'"
+msgstr ""
+"името на отдалеченото хранилище „%s“ се съдържа в името на съществуващо "
+"отдалечено хранилище „%s“ като подниз"
+
+#, c-format
+msgid "remote name '%s' is a superset of existing remote '%s'"
+msgstr ""
+"името на отдалеченото хранилище „%s“ съдържа в името си съществуващо "
+"отдалечено хранилище „%s“ като подниз"
+
msgid "fetch the remote branches"
msgstr "отдалечените клони не може да бъдат доставени"
@@ -11821,14 +11862,6 @@
msgstr "„%s“ не може да се настрои"
#, c-format
-msgid " %s will become dangling!"
-msgstr "„%s“ ще се превърне в обект извън клоните!"
-
-#, c-format
-msgid " %s has become dangling!"
-msgstr "„%s“ се превърна в обект извън клоните!"
-
-#, c-format
msgid "Pruning %s"
msgstr "Окастряне на „%s“"
@@ -11892,11 +11925,11 @@
msgid ""
"git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"
"[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n"
-"[--write-midx] [--name-hash-version=<n>]"
+"[--write-midx] [--name-hash-version=<n>] [--path-walk]"
msgstr ""
"git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"
"[--window=БРОЙ] [--depth=БРОЙ] [--threads=БРОЙ] [--keep-pack=ИМЕ_НА_ПАКЕТ]\n"
-"[--write-midx] [--name-hash-version=БРОЙ]"
+"[--write-midx] [--name-hash-version=ВЕРСИЯ] [--path-walk]"
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
@@ -11994,6 +12027,9 @@
msgstr ""
"укажете функция за контролни суми за групиране на подобните обекти по път"
+msgid "pass --path-walk to git-pack-objects"
+msgstr "подаване на опцията „--path-walk“ на командата „git-pack-objects“"
+
msgid "do not run git-update-server-info"
msgstr "без изпълнение на командата „git-update-server-info“"
@@ -12328,7 +12364,7 @@
msgid ""
"git rerere [clear | forget <pathspec>... | diff | status | remaining | gc]"
-msgstr "git rerere [clear|forget ПЪТ…|diff|status|remaining|gc]"
+msgstr "git rerere [clear|forget ШАБЛОН_ЗА_ПЪТИЩА…|diff|status|remaining|gc]"
msgid "register clean resolutions in index"
msgstr "регистриране на чисти корекции на конфликти в индекса"
@@ -12345,7 +12381,7 @@
msgstr "git reset [--mixed|--soft|--hard|--merge|--keep] [-q] [ПОДАВАНЕ]"
msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
-msgstr "git reset [-q] [УКАЗАТЕЛ_КЪМ_ДЪРВО] [--] ПЪТИЩА…"
+msgstr "git reset [-q] [УКАЗАТЕЛ_КЪМ_ДЪРВО] [--] ШАБЛОН_ЗА_ПЪТИЩА…"
msgid ""
"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
@@ -12354,7 +12390,7 @@
"[УКАЗАТЕЛ_КЪМ_ДЪРВО]"
msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
-msgstr "git reset --patch [УКАЗАТЕЛ_КЪМ_ДЪРВО] [--] [ПЪТИЩА…]"
+msgstr "git reset --patch [УКАЗАТЕЛ_КЪМ_ДЪРВО] [--] [ШАБЛОН_ЗА_ПЪТИЩА…]"
msgid "mixed"
msgstr "смесено (mixed)"
@@ -12639,7 +12675,7 @@
msgstr ""
"git rm [-f|--force] [-n] [-r] [--cached] [--ignore-unmatch]\n"
" [--quiet] [--pathspec-from-file=ФАЙЛ [--pathspec-file-nul]]\n"
-" [--] [ПЪТ…]"
+" [--] [ШАБЛОН_ЗА_ПЪТИЩА…]"
msgid ""
"the following file has staged content different from both the\n"
@@ -12699,7 +12735,7 @@
"изтриване"
msgid "No pathspec was given. Which files should I remove?"
-msgstr "Не са зададени пътища. Кои файлове да се изтрият?"
+msgstr "Не са зададени шаблони за пътища. Кои файлове да се изтрият?"
msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
@@ -13148,7 +13184,7 @@
"quiet]\n"
" [-u|--include-untracked] [-a|--all] [(-m|--message) СЪОБЩЕНИЕ]\n"
" [--pathspec-from-file=ФАЙЛ [--pathspec-file-nul]]\n"
-" [--] [ПЪТ…]]"
+" [--] [ШАБЛОН_ЗА_ПЪТИЩА…]]"
msgid ""
"git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | "
@@ -13162,17 +13198,23 @@
msgid "git stash create [<message>]"
msgstr "git stash create [СЪОБЩЕНИЕ]"
+msgid "git stash export (--print | --to-ref <ref>) [<stash>...]"
+msgstr "git stash export (--print | --to-ref УКАЗАТЕЛ) [СКАТАНО…]"
+
+msgid "git stash import <commit>"
+msgstr "git bisect import ПОДАВАНЕ"
+
#, c-format
msgid "'%s' is not a stash-like commit"
msgstr "„%s“ не е подаване, приличащо на нещо скатано"
+msgid "No stash entries found."
+msgstr "Не е открито нищо скатано."
+
#, c-format
msgid "Too many revisions specified:%s"
msgstr "Указани са прекалено много версии:%s"
-msgid "No stash entries found."
-msgstr "Не е открито нищо скатано."
-
#, c-format
msgid "%s is not a valid reference"
msgstr "„%s“ е неправилно име за указател"
@@ -13327,6 +13369,69 @@
msgid "include ignore files"
msgstr "скатаване и на игнорираните файлове"
+#, c-format
+msgid "cannot parse commit %s"
+msgstr "подаването „%s“ не може да се анализира"
+
+#, c-format
+msgid "invalid author or committer for %s"
+msgstr "неправилен автор или подаващ на „%s“"
+
+msgid "could not write commit"
+msgstr "подаването не може да се запази"
+
+#, c-format
+msgid "not a valid revision: %s"
+msgstr "не е версия: %s"
+
+#, c-format
+msgid "not a commit: %s"
+msgstr "не е подаване: „%s“"
+
+#, c-format
+msgid "%s is not a valid exported stash commit"
+msgstr "„%s“ не е изнесено скатано подаване"
+
+#, c-format
+msgid "found root commit %s with invalid data"
+msgstr "открито е начално подаване „%s“ с неправилни данни"
+
+#, c-format
+msgid "found stash commit %s without expected prefix"
+msgstr "открито е скатано подаване „%s“ без очаквания префикс"
+
+#, c-format
+msgid "cannot parse parents of commit: %s"
+msgstr "не може да се анализират родителските подавания на: „%s“"
+
+#, c-format
+msgid "%s does not look like a stash commit"
+msgstr "„%s“ не изглежда да е скатано подаване"
+
+#, c-format
+msgid "cannot read commit buffer for %s"
+msgstr "буферът за подаване на „%s“ не може да се прочете"
+
+#, c-format
+msgid "cannot save the stash for %s"
+msgstr "скатаното за „%s“ не може да се запази"
+
+msgid "unable to write base commit"
+msgstr "базовото подаване не може да се запише"
+
+#, c-format
+msgid "unable to find stash entry %s"
+msgstr "скатаният запис за „%s“ не може да се открие"
+
+msgid "print the object ID instead of writing it to a ref"
+msgstr "извеждане на идентификатор на обект вместо запазването му в указател"
+
+msgid "save the data to the given ref"
+msgstr "запазване на данните в дадения указател"
+
+msgid "exactly one of --print and --to-ref is required"
+msgstr "необходима е точно една от опциите „--print“ и „--to-ref“"
+
msgid "skip and remove all lines starting with comment character"
msgstr "пропускане на всички редове, които започват с „#“"
@@ -13334,14 +13439,6 @@
msgstr "добавяне на „# “ в началото на всеки ред"
#, c-format
-msgid "Expecting a full ref name, got %s"
-msgstr "Изисква се пълно име на указател, а не „%s“"
-
-#, c-format
-msgid "could not get a repository handle for submodule '%s'"
-msgstr "не може да се получи връзка към хранилище за подмодула „%s“"
-
-#, c-format
msgid ""
"could not look up configuration '%s'. Assuming this repository is its own "
"authoritative upstream."
@@ -13350,6 +13447,10 @@
"за себе си."
#, c-format
+msgid "could not get a repository handle for submodule '%s'"
+msgstr "не може да се получи връзка към хранилище за подмодула „%s“"
+
+#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "Във файла „.gitmodules“ не е открит адрес за пътя към подмодул „%s“"
@@ -13709,6 +13810,10 @@
"но той не е на никой клон"
#, c-format
+msgid "Expecting a full ref name, got %s"
+msgstr "Изисква се пълно име на указател, а не „%s“"
+
+#, c-format
msgid "Unable to find current revision in submodule path '%s'"
msgstr "Текущата версия за подмодула в „%s“ липсва"
@@ -13914,6 +14019,10 @@
"или „../“"
#, c-format
+msgid "submodule name '%s' already used for path '%s'"
+msgstr "името на подмодул „%s“ вече се ползва за пътя „%s“"
+
+#, c-format
msgid "'%s' is not a valid submodule name"
msgstr "„%s“ е неправилно име за подмодул"
@@ -14568,10 +14677,6 @@
msgstr "Приготвяне на работното дърво (изтегляне на „%s“)"
#, c-format
-msgid "unreachable: invalid reference: %s"
-msgstr "недостижим обект: неправилен указател: %s"
-
-#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Подготвяне на работно дърво (указателят „HEAD“ не свързан: %s)"
@@ -14752,7 +14857,7 @@
#, c-format
msgid "error: %s: %s"
-msgstr "грешка: %s: „%s“"
+msgstr "ГРЕШКА: %s: „%s“"
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgstr "git write-tree [--missing-ok] [--prefix=ПРЕФИКС/]"
@@ -14876,8 +14981,9 @@
msgid "unable to dup bundle descriptor"
msgstr "неуспешно дублиране на дескриптора на пратката с „dup“"
+# заради git-po-helper не ползваме „git pack-objects“
msgid "Could not spawn pack-objects"
-msgstr "Командата „git pack-objects“ не може да се стартира"
+msgstr "Процесът на git — „pack-objects“ не може да се стартира"
msgid "pack-objects died"
msgstr "Командата „git pack-objects“ не завърши успешно"
@@ -15684,7 +15790,7 @@
msgstr "Откриване на подаванията в гра̀фа измежду пакетираните обекти"
msgid "Finding extra edges in commit graph"
-msgstr "Откриване на още върхове в гра̀фа с подаванията"
+msgstr "Откриване на още ребра в гра̀фа с подаванията"
msgid "failed to write correct number of base graph ids"
msgstr ""
@@ -16238,14 +16344,6 @@
msgstr "неправилна числова стойност „%s“ за „%s“ в %s: %s"
#, c-format
-msgid "invalid value for variable %s"
-msgstr "неправилна стойност за променливата „%s“"
-
-#, c-format
-msgid "ignoring unknown core.fsync component '%s'"
-msgstr "прескачане на непознатия компонент в настройката „core.fsync“: „%s“"
-
-#, c-format
msgid "bad boolean config value '%s' for '%s'"
msgstr "неправилна булева стойност „%s“ за „%s“"
@@ -16258,49 +16356,6 @@
msgstr "„%s“ не е правилна стойност за време за „%s“"
#, c-format
-msgid "abbrev length out of range: %d"
-msgstr "дължината на съкращаване е извън диапазона ([4; 40]): %d"
-
-#, c-format
-msgid "bad zlib compression level %d"
-msgstr "неправилно ниво на компресиране: %d"
-
-#, c-format
-msgid "%s cannot contain newline"
-msgstr "%s не може да съдържа нови редове"
-
-#, c-format
-msgid "%s must have at least one character"
-msgstr "%s трябва да съдържа поне един знак"
-
-#, c-format
-msgid "ignoring unknown core.fsyncMethod value '%s'"
-msgstr "непознатата стойност за „core.fsyncMethod“ — „%s“ се прескача"
-
-msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
-msgstr ""
-"настройката „core.fsyncObjectFiles“ е остаряла и е заменена с „core.fsync“"
-
-#, c-format
-msgid "invalid mode for object creation: %s"
-msgstr "неправилен режим за създаването на обекти: %s"
-
-#, c-format
-msgid "malformed value for %s"
-msgstr "неправилна стойност за „%s“"
-
-#, c-format
-msgid "malformed value for %s: %s"
-msgstr "неправилна стойност за „%s“: „%s“"
-
-msgid "must be one of nothing, matching, simple, upstream or current"
-msgstr ""
-"трябва да е една от следните стойности: „nothing“ (без изтласкване при липса "
-"на указател), „matching“ (всички клони със съвпадащи имена), „simple“ "
-"(клонът със същото име, от който се издърпва), „upstream“ (клонът, от който "
-"се издърпва) или „current“ (клонът със същото име)"
-
-#, c-format
msgid "unable to load config blob object '%s'"
msgstr "обектът-BLOB „%s“ с конфигурации не може да се зареди"
@@ -16833,8 +16888,8 @@
msgid "cannot compare a named pipe to a directory"
msgstr "именован канал не може да се сравни с директория"
-msgid "git diff --no-index [<options>] <path> <path>"
-msgstr "git diff --no-index [ОПЦИЯ…] ПЪТ ПЪТ"
+msgid "git diff --no-index [<options>] <path> <path> [<pathspec>...]"
+msgstr "git diff --no-index [ОПЦИЯ…] ПЪТ ПЪТ [ШАБЛОН_ЗА_ПЪТИЩА…]"
msgid ""
"Not a git repository. Use --no-index to compare two paths outside a working "
@@ -16843,6 +16898,13 @@
"Не е хранилище на git. Ползвайте опцията „--no-index“, за да сравните "
"пътища извън работно дърво"
+msgid ""
+"Limiting comparison with pathspecs is only supported if both paths are "
+"directories."
+msgstr ""
+"Ограничаването на сравнението чрез шаблони за пътища се поддържа, само "
+"когато и двата пътя са директории."
+
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
@@ -16902,7 +16964,7 @@
"външната програма за разлики завърши неуспешно. Спиране на работата при „%s“"
msgid "--follow requires exactly one pathspec"
-msgstr "опцията „--follow“ изисква точно един път"
+msgstr "опцията „--follow“ изисква точно един шаблон за пътища"
#, c-format
msgid "pathspec magic not supported by --follow: %s"
@@ -17365,7 +17427,7 @@
#, c-format
msgid "pathspec '%s' did not match any file(s) known to git"
-msgstr "пътят „%s“ не съвпада с никой файл в git"
+msgstr "шаблонът за пътища „%s“ не съвпада с никой файл в git"
#, c-format
msgid "unrecognized pattern: '%s'"
@@ -17438,6 +17500,57 @@
msgstr "неправилен път към пространства от имена „%s“"
#, c-format
+msgid "invalid value for variable %s"
+msgstr "неправилна стойност за променливата „%s“"
+
+#, c-format
+msgid "ignoring unknown core.fsync component '%s'"
+msgstr "прескачане на непознатия компонент в настройката „core.fsync“: „%s“"
+
+#, c-format
+msgid "abbrev length out of range: %d"
+msgstr "дължината на съкращаване е извън диапазона ([4; 40]): %d"
+
+#, c-format
+msgid "bad zlib compression level %d"
+msgstr "неправилно ниво на компресиране: %d"
+
+#, c-format
+msgid "%s cannot contain newline"
+msgstr "%s не може да съдържа нови редове"
+
+#, c-format
+msgid "%s must have at least one character"
+msgstr "%s трябва да съдържа поне един знак"
+
+#, c-format
+msgid "ignoring unknown core.fsyncMethod value '%s'"
+msgstr "непознатата стойност за „core.fsyncMethod“ — „%s“ се прескача"
+
+msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
+msgstr ""
+"настройката „core.fsyncObjectFiles“ е остаряла и е заменена с „core.fsync“"
+
+#, c-format
+msgid "invalid mode for object creation: %s"
+msgstr "неправилен режим за създаването на обекти: %s"
+
+#, c-format
+msgid "malformed value for %s"
+msgstr "неправилна стойност за „%s“"
+
+#, c-format
+msgid "malformed value for %s: %s"
+msgstr "неправилна стойност за „%s“: „%s“"
+
+msgid "must be one of nothing, matching, simple, upstream or current"
+msgstr ""
+"трябва да е една от следните стойности: „nothing“ (без изтласкване при липса "
+"на указател), „matching“ (всички клони със съвпадащи имена), „simple“ "
+"(клонът със същото име, от който се издърпва), „upstream“ (клонът, от който "
+"се издърпва) или „current“ (клонът със същото име)"
+
+#, c-format
msgid "too many args to run %s"
msgstr "прекалено много аргументи за изпълнение „%s“"
@@ -18173,6 +18286,36 @@
msgid "name consists only of disallowed characters: %s"
msgstr "името съдържа само непозволени знаци: „%s“"
+msgid "git imap-send [-v] [-q] [--[no-]curl] [(--folder|-f) <folder>] < <mbox>"
+msgstr ""
+"git imap-send [-v] [-q] [--[no-]curl] [(--folder|-f) ПАПКА] < ФАЙЛ_С_ПОЩА"
+
+msgid "no IMAP host specified"
+msgstr "не е указан хост за IMAP"
+
+msgid ""
+"set the IMAP host with 'git config imap.host <host>'.\n"
+"(e.g., 'git config imap.host imaps://imap.example.com')"
+msgstr ""
+"задайте хоста за IMAP с командата:\n"
+"\n"
+" git config imap.host ХОСТ\n"
+"\n"
+"(например: „git config imap.host imaps://imap.example.com“)"
+
+msgid "no IMAP folder specified"
+msgstr "не е указана папка за IMAP"
+
+msgid ""
+"set the target folder with 'git config imap.folder <folder>'.\n"
+"(e.g., 'git config imap.folder Drafts')"
+msgstr ""
+"задайте целевата папка с командата:\n"
+"\n"
+" git config imap.folder ПАПКА\n"
+"\n"
+"(например: „git config imap.folder Drafts“)"
+
msgid "expected 'tree:<depth>'"
msgstr "очаква се „tree:ДЪЛБОЧИНА“"
@@ -19174,6 +19317,26 @@
msgstr "неправилно име на обект: „%.*s“"
#, c-format
+msgid "invalid object type \"%s\""
+msgstr "неправилен вид обект: „%s“"
+
+#, c-format
+msgid "object %s is a %s, not a %s"
+msgstr "обектът „%s“ е %s, а не %s"
+
+#, c-format
+msgid "object %s has unknown type id %d"
+msgstr "обектът „%s“ е непознат вид: %d"
+
+#, c-format
+msgid "unable to parse object: %s"
+msgstr "обектът „%s“ не може да се анализира"
+
+#, c-format
+msgid "hash mismatch %s"
+msgstr "разлика в контролната сума: „%s“"
+
+#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
"директорията за обекти „%s“ не съществува, проверете „.git/objects/info/"
@@ -19243,26 +19406,6 @@
msgstr "„%s“ е неправилен обект от вид „%s“"
#, c-format
-msgid "invalid object type \"%s\""
-msgstr "неправилен вид обект: „%s“"
-
-#, c-format
-msgid "object %s is a %s, not a %s"
-msgstr "обектът „%s“ е %s, а не %s"
-
-#, c-format
-msgid "object %s has unknown type id %d"
-msgstr "обектът „%s“ е непознат вид: %d"
-
-#, c-format
-msgid "unable to parse object: %s"
-msgstr "обектът „%s“ не може да се анализира"
-
-#, c-format
-msgid "hash mismatch %s"
-msgstr "разлика в контролната сума: „%s“"
-
-#, c-format
msgid "duplicate entry when writing bitmap index: %s"
msgstr "повтарящ се запис при запазване на индекс на база битови маски: „%s“"
@@ -19273,9 +19416,6 @@
msgid "too many pseudo-merges"
msgstr "прекалено много псевдо сливания"
-msgid "trying to write commit not in index"
-msgstr "опит за записване на обект за подаване извън индекса"
-
msgid "failed to load bitmap index (corrupted?)"
msgstr ""
"индексът на база битови маски не може да се зареди (възможно е да е повреден)"
@@ -19556,6 +19696,10 @@
msgstr "опцията „%s“ не е налична"
#, c-format
+msgid "value for %s exceeds %<PRIdMAX>"
+msgstr "стойността %s е над %<PRIdMAX>"
+
+#, c-format
msgid "value %s for %s not in range [%<PRIdMAX>,%<PRIdMAX>]"
msgstr "стойността %s за „%s“ е извън диапазона [%<PRIdMAX>,%<PRIdMAX>]"
@@ -19711,7 +19855,7 @@
msgstr "кои празни знаци и #коментари да се махат от съобщенията"
msgid "read pathspec from file"
-msgstr "изчитане на пътищата от ФАЙЛ"
+msgstr "изчитане на шаблоните за пътища от ФАЙЛ"
msgid ""
"with --pathspec-from-file, pathspec elements are separated with NUL character"
@@ -19757,14 +19901,15 @@
msgstr "неправилно име на атрибут: „%s“"
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
-msgstr "глобалните настройки за пътища „glob“ и „noglob“ са несъвместими"
+msgstr ""
+"глобалните настройки за шаблони за пътища „glob“ и „noglob“ са несъвместими"
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
msgstr ""
"глобалната настройка за дословни пътища „literal“ е несъвместима с всички "
-"други глобални настройки за пътища"
+"други глобални настройки за шаблони за пътища"
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr "неправилен параметър за опцията за магически пътища „prefix“"
@@ -19803,7 +19948,7 @@
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
-msgstr "пътят „%s“ е след символна връзка"
+msgstr "шаблонът за пътища „%s“ е след символна връзка"
#, c-format
msgid "line is badly quoted: %s"
@@ -20548,6 +20693,14 @@
msgstr "„%s“ не сочи към позволен обект!"
#, c-format
+msgid "%s%s will become dangling after %s is deleted\n"
+msgstr "%s„%s“ ще остане извън клоните след изтриването на „%s“\n"
+
+#, c-format
+msgid "%s%s has become dangling after %s was deleted\n"
+msgstr "%s„%s“ остана извън клоните след изтриването на „%s“\n"
+
+#, c-format
msgid ""
"Using '%s' as the name for the initial branch. This default branch name\n"
"is subject to change. To configure the initial branch name to use in all\n"
@@ -21605,7 +21758,7 @@
msgstr ""
"След коригирането на конфликтите отбележете решаването им чрез:\n"
"\n"
-" git add/rm ПЪТ…\n"
+" git add/rm ШАБЛОН_ЗА_ПЪТИЩА…\n"
"\n"
"и изпълнете:\n"
"\n"
@@ -21630,7 +21783,7 @@
msgstr ""
"След коригирането на конфликтите отбележете решаването им чрез:\n"
"\n"
-" git add/rm ПЪТ…\n"
+" git add/rm ШАБЛОН_ЗА_ПЪТИЩА…\n"
"\n"
"и изпълнете:\n"
"\n"
@@ -22950,6 +23103,9 @@
msgstr ""
"превключване на окастрянето на пътищата, които не представляват интерес"
+msgid "toggle aggressive edge walk"
+msgstr "превключване на агресивно обхождане на ребрата"
+
msgid "read a pattern list over stdin"
msgstr "изчитане на списък с шаблони от стандартния вход"
@@ -23584,12 +23740,29 @@
msgstr "фатална грешка: "
msgid "error: "
-msgstr "грешка: "
+msgstr "ГРЕШКА: "
msgid "warning: "
msgstr "предупреждение: "
#, c-format
+msgid ""
+"'%s' is nominated for removal.\n"
+"If you still use this command, please add an extra\n"
+"option, '--i-still-use-this', on the command line\n"
+"and let us know you still use it by sending an e-mail\n"
+"to <git@vger.kernel.org>. Thanks.\n"
+msgstr ""
+"Предстои пълното премахване на „%s“.\n"
+"Ако все още ползвате тази команда, добавете\n"
+"опцията „--i-still-use-this“ на командния ред и молим да\n"
+"ни известите с е-писмо до пощенския списък:\n"
+"<git@vger.kernel.org>. Предварително благодарим.\n"
+
+msgid "refusing to run without --i-still-use-this"
+msgstr "трябва да добавите и опцията „--i-still-use-this“"
+
+#, c-format
msgid "uname() failed with error '%s' (%d)\n"
msgstr "грешка при изпълнението на „uname()“ — „%s“ (%d)\n"
@@ -24180,7 +24353,7 @@
msgid ""
"Error: Your local changes to the following files would be overwritten by "
"merge"
-msgstr "Грешка: Сливането ще презапише локалните промѐни на тези файлове:"
+msgstr "ГРЕШКА: Сливането ще презапише локалните промѐни на тези файлове:"
msgid "Automated merge did not work."
msgstr "Автоматичното сливане не сработи."
@@ -24541,6 +24714,10 @@
msgstr "(тяло) Добавяне на „як: %s“ от ред „%s“\n"
#, perl-format
+msgid "error: invalid SMTP port '%s'\n"
+msgstr "ГРЕШКА: неправилен порт за SMTP: „%s“\n"
+
+#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) Не може да се изпълни „%s“"
diff --git a/po/ca.po b/po/ca.po
index ace9b3c..8dc21f3 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -2,6 +2,7 @@
# This file is distributed under the same license as the Git package.
# Alex Henrie <alexhenrie24@gmail.com>, 2014-2016.
# Jordi Mas i Hernàndez <jmas@softcatala.org>, 2016-2024
+# Mikel Forcada <mikel.forcada@gmail.com> 2024-
#
# Terminologia
#
@@ -18,17 +19,19 @@
# cover letter | carta de presentació
# cruft | superflu
# delta | diferència
-# deprecated | en desús
+# deprecated | en desús / obsolet
# detached | separat
# dry-run | fer una prova
# fatal | fatal
# fetch | obtenir
# flush | buidar / buidatge
# graph | graf
+# graft | empelt / empeltar
# hash | resum
# hint | consell
# hook | lligam
# hunk | tros
+# lock | blocatge, blocar
# multi-pack-index | índex multipaquet
# not supported | no està admès
# pull | baixar
@@ -46,7 +49,7 @@
# upstream | font
#
# Alguns termes que són ordres específiques del git i d'àmbit molt tècnic
-# hem decidit no traduir-los per facilitar-ne la compressió a l'usuari i perquè
+# hem decidit no traduir-los per a facilitar-ne la compressió a l'usuari i perquè
# no tenen una transcendència al gran públic. Es tracta de casos similars
# a «ping» en l'àmbit de xarxes.
#
@@ -77,8 +80,8 @@
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2024-10-05 01:20+0000\n"
-"PO-Revision-Date: 2024-10-05 09:03+0200\n"
+"POT-Creation-Date: 2025-08-12 20:20-0400\n"
+"PO-Revision-Date: 2025-08-15 22:35+0200\n"
"Last-Translator: Mikel Forcada <mikel.forcada@gmail.com>\n"
"Language-Team: Catalan\n"
"Language: ca\n"
@@ -90,6 +93,11 @@
#: add-interactive.c
#, c-format
+msgid "%s cannot be negative"
+msgstr "%s no pot ser negatiu"
+
+#: add-interactive.c
+#, c-format
msgid "Huh (%s)?"
msgstr "Perdó (%s)?"
@@ -504,8 +512,8 @@
#, c-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-"Descarta el canvi de mode de l'índex i de l'arbre de treball [y,n,q,a,"
-"d%s,?]? "
+"Descarta el canvi de mode de l'índex i de l'arbre de treball [y,n,q,a,d"
+"%s,?]? "
#: add-patch.c
#, c-format
@@ -832,10 +840,10 @@
#, c-format
msgid ""
"\n"
-"Disable this message with \"git config advice.%s false\""
+"Disable this message with \"git config set advice.%s false\""
msgstr ""
"\n"
-"Desactiva aquest missatge amb «git config advice.%s false»"
+"Desactiva aquest missatge amb «git config set advice.%s false»"
#: advice.c
#, c-format
@@ -930,7 +938,7 @@
"* Use the --sparse option.\n"
"* Disable or modify the sparsity rules."
msgstr ""
-"Si voleu actualitzar aquestes entrades, proveu les següents solucions:\n"
+"Si voleu actualitzar aquestes entrades, proveu les solucions següents:\n"
"* Utilitzeu l'opció --sparse.\n"
"* Inhabiliteu o modifiqueu les regles de dispersió."
@@ -1024,11 +1032,10 @@
#: builtin/describe.c builtin/diff-tree.c builtin/difftool.c
#: builtin/fast-export.c builtin/fetch.c builtin/help.c builtin/index-pack.c
#: builtin/init-db.c builtin/log.c builtin/ls-files.c builtin/merge-base.c
-#: builtin/merge-tree.c builtin/merge.c builtin/pack-objects.c builtin/rebase.c
-#: builtin/repack.c builtin/replay.c builtin/reset.c builtin/rev-list.c
-#: builtin/rev-parse.c builtin/show-branch.c builtin/stash.c
-#: builtin/submodule--helper.c builtin/tag.c builtin/worktree.c parse-options.c
-#: range-diff.c revision.c
+#: builtin/merge-tree.c builtin/merge.c builtin/rebase.c builtin/repack.c
+#: builtin/replay.c builtin/reset.c builtin/rev-parse.c builtin/show-branch.c
+#: builtin/stash.c builtin/submodule--helper.c builtin/tag.c builtin/worktree.c
+#: parse-options.c range-diff.c revision.c
#, c-format
msgid "options '%s' and '%s' cannot be used together"
msgstr "les opcions «%s» i «%s» no es poden usar juntes"
@@ -1380,7 +1387,7 @@
#: apply.c
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
-msgstr "falta la informació sha1 o és inútil per al submòdul %s"
+msgstr "hi manca la informació sha1 o és inútil per al submòdul %s"
#: apply.c
#, c-format
@@ -1390,7 +1397,7 @@
#: apply.c
#, c-format
msgid "sha1 information is lacking or useless (%s)."
-msgstr "falta informació sha1 o és inútil (%s)."
+msgstr "hi manca informació sha1 o és inútil (%s)."
#: apply.c
#, c-format
@@ -1779,7 +1786,7 @@
#: archive.c
#, c-format
msgid "missing colon: '%s'"
-msgstr "falten els dos punts: «%s»"
+msgstr "hi manquen els dos punts: «%s»"
#: archive.c
#, c-format
@@ -1927,12 +1934,12 @@
#: attr.c
#, c-format
msgid "ignoring overly large gitattributes file '%s'"
-msgstr "s'ignorarà el fitxer «%s» gitattributes per a ser massa gran"
+msgstr "s'ignorarà el fitxer «%s» gitattributes per ser massa gran"
#: attr.c
#, c-format
msgid "ignoring overly large gitattributes blob '%s'"
-msgstr "s'ignorarà el blob «%s» gitattributes per a ser massa gran"
+msgstr "s'ignorarà el blob «%s» gitattributes per ser massa gran"
#: attr.c
msgid "cannot use --attr-source or GIT_ATTR_SOURCE without repo"
@@ -1942,7 +1949,7 @@
msgid "bad --attr-source or GIT_ATTR_SOURCE"
msgstr "--attr-source incorrecte o GIT_ATTR_SOURCE"
-#: attr.c read-cache.c
+#: attr.c read-cache.c refs/packed-backend.c
#, c-format
msgid "unable to stat '%s'"
msgstr "no s'ha pogut fer «stat» a «%s»"
@@ -2462,6 +2469,12 @@
msgid "adding files failed"
msgstr "l'afegiment de fitxers ha fallat"
+#: builtin/add.c builtin/checkout.c builtin/commit.c builtin/reset.c
+#: builtin/stash.c
+#, c-format
+msgid "'%s' cannot be negative"
+msgstr "'%s' no pot ser negatiu"
+
#: builtin/add.c
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
@@ -2500,7 +2513,7 @@
msgstr "acció «%s» incorrecta per a «%s»"
#: builtin/am.c builtin/blame.c builtin/fetch.c builtin/pack-objects.c
-#: builtin/pull.c builtin/revert.c config.c diff-merges.c gpg-interface.c
+#: builtin/pull.c builtin/revert.c diff-merges.c environment.c gpg-interface.c
#: ls-refs.c parallel-checkout.c sequencer.c setup.c
#, c-format
msgid "invalid value for '%s': '%s'"
@@ -2794,7 +2807,7 @@
msgid "bypass pre-applypatch and applypatch-msg hooks"
msgstr "evita els lligams pre-applypatch i applypatch-msg"
-#: builtin/am.c
+#: builtin/am.c builtin/cat-file.c
msgid "historical option -- no-op"
msgstr "opció històrica -- no-op"
@@ -2982,6 +2995,22 @@
msgid "git archive: expected a flush"
msgstr "git archive: s'esperava una neteja"
+#: builtin/backfill.c
+msgid "git backfill [--min-batch-size=<n>] [--[no-]sparse]"
+msgstr "git backfill [--min-batch-size=<n>] [--[no-]sparse]"
+
+#: builtin/backfill.c
+msgid "problem loading sparse-checkout"
+msgstr "s'ha produït un problema en carregar sparse-checkout"
+
+#: builtin/backfill.c
+msgid "Minimum number of objects to request at a time"
+msgstr "Nombre mínim d'objectes a sol·licitar d'una vegada."
+
+#: builtin/backfill.c
+msgid "Restrict the missing objects to the current sparse-checkout"
+msgstr "Restringeix els objectes que manquen al sparse-checkout actual"
+
#: builtin/bisect.c
msgid ""
"git bisect start [--term-(new|bad)=<term> --term-(old|good)=<term>] [--no-"
@@ -3420,7 +3449,7 @@
msgid "ignore whitespace differences"
msgstr "ignora les diferències d'espai en blanc"
-#: builtin/blame.c builtin/log.c
+#: builtin/blame.c builtin/clone.c builtin/log.c
msgid "rev"
msgstr "rev"
@@ -3773,7 +3802,7 @@
#: builtin/branch.c
msgid "move/rename a branch, even if target exists"
-msgstr "mou/canvia de nom una branca, encara que el destí existeixi"
+msgstr "mou/canvia de nom una branca, encara que la destinació existeixi"
#: builtin/branch.c builtin/for-each-ref.c builtin/tag.c
msgid "do not output a newline after empty formatted refs"
@@ -3785,7 +3814,7 @@
#: builtin/branch.c
msgid "copy a branch, even if target exists"
-msgstr "copia una branca, encara que el destí existeixi"
+msgstr "copia una branca, encara que la destinació existeixi"
#: builtin/branch.c
msgid "list branch names"
@@ -3944,11 +3973,6 @@
msgstr "versió de git:\n"
#: builtin/bugreport.c
-#, c-format
-msgid "uname() failed with error '%s' (%d)\n"
-msgstr "uname() ha fallat amb l'error «%s» (%d)\n"
-
-#: builtin/bugreport.c
msgid "compiler info: "
msgstr "informació del compilador: "
@@ -4005,8 +4029,8 @@
"Reviseu la resta de l'informe d'error de sota.\n"
"Podeu eliminar qualsevol línia que vulgueu.\n"
-#: builtin/bugreport.c builtin/commit.c builtin/fast-export.c builtin/rebase.c
-#: parse-options.h
+#: builtin/bugreport.c builtin/commit.c builtin/fast-export.c
+#: builtin/pack-objects.c builtin/rebase.c parse-options.h
msgid "mode"
msgstr "mode"
@@ -4126,7 +4150,7 @@
msgid "Unbundling objects"
msgstr "S'estan desagrupant objectes"
-#: builtin/cat-file.c merge-recursive.c
+#: builtin/cat-file.c
#, c-format
msgid "cannot read object %s '%s'"
msgstr "no es pot llegir l'objecte %s «%s»"
@@ -4163,12 +4187,8 @@
msgstr "git cat-file <tipus> <objecte>"
#: builtin/cat-file.c
-msgid "git cat-file (-e | -p) <object>"
-msgstr "git cat-file (-e | -p) <objecte>"
-
-#: builtin/cat-file.c
-msgid "git cat-file (-t | -s) [--allow-unknown-type] <object>"
-msgstr "git cat-file (-t | -s) [--allow-unknown-type] <objecte>"
+msgid "git cat-file (-e | -p | -t | -s) <object>"
+msgstr "git cat-file (-e | -p | -t | -s) <objecte>"
#: builtin/cat-file.c
msgid ""
@@ -4216,10 +4236,6 @@
msgid "show object size"
msgstr "mostra la mida de l'objecte"
-#: builtin/cat-file.c
-msgid "allow -s and -t to work with broken/corrupt objects"
-msgstr "permet que -s i -t funcionin amb objectes trencats/malmesos"
-
#: builtin/cat-file.c builtin/log.c
msgid "use mail map file"
msgstr "usa el fitxer de mapa de correu"
@@ -4293,6 +4309,15 @@
msgstr "useu un <camí> per a (--textconv | --filters); no amb «batch»"
#: builtin/cat-file.c
+msgid "objects filter only supported in batch mode"
+msgstr "el filtre d'objectes només s'admet en mode batch"
+
+#: builtin/cat-file.c
+#, c-format
+msgid "objects filter not supported: '%s'"
+msgstr "filtre d'objectes no admès: %s"
+
+#: builtin/cat-file.c
#, c-format
msgid "'%s=<%s>' needs '%s' or '%s'"
msgstr "«%s=<%s>» necessita «%s» o «%s»"
@@ -4881,7 +4906,7 @@
msgid "perform a 3-way merge with the new branch"
msgstr "realitza una fusió de 3 vies amb la branca nova"
-#: builtin/checkout.c builtin/log.c parse-options.h
+#: builtin/checkout.c builtin/log.c builtin/range-diff.c parse-options.h
msgid "style"
msgstr "estil"
@@ -4910,8 +4935,8 @@
msgstr "actualitza els fitxers ignorats (per defecte)"
#: builtin/checkout.c
-msgid "do not check if another worktree is holding the given ref"
-msgstr "no comprovis si un altre arbre de treball té la referència donada"
+msgid "do not check if another worktree is using this branch"
+msgstr "no comprovis si un altre arbre de treball usa aquesta branca"
#: builtin/checkout.c
msgid "checkout our version for unmerged files"
@@ -4937,7 +4962,7 @@
#: builtin/checkout.c
#, c-format
msgid "missing branch name; try -%c"
-msgstr "falta el nom de la branca; proveu -%c"
+msgstr "hi manca el nom de la branca; proveu -%c"
#: builtin/checkout.c
#, c-format
@@ -5207,170 +5232,6 @@
"netejar"
#: builtin/clone.c
-msgid "git clone [<options>] [--] <repo> [<dir>]"
-msgstr "git clone [<opcions>] [--] <repositori> [<directori>]"
-
-#: builtin/clone.c
-msgid "don't clone shallow repository"
-msgstr "no clonis un repositori superficial"
-
-#: builtin/clone.c
-msgid "don't create a checkout"
-msgstr "no facis cap agafament"
-
-#: builtin/clone.c builtin/init-db.c
-msgid "create a bare repository"
-msgstr "crea un repositori nu"
-
-#: builtin/clone.c
-msgid "create a mirror repository (implies --bare)"
-msgstr "crear un repositori mirall (implica --bare)"
-
-#: builtin/clone.c
-msgid "to clone from a local repository"
-msgstr "per a clonar des d'un repositori local"
-
-#: builtin/clone.c
-msgid "don't use local hardlinks, always copy"
-msgstr "no usis enllaços durs locals, sempre copia"
-
-#: builtin/clone.c
-msgid "setup as shared repository"
-msgstr "configura com a repositori compartit"
-
-#: builtin/clone.c
-msgid "pathspec"
-msgstr "especificació de camí"
-
-#: builtin/clone.c
-msgid "initialize submodules in the clone"
-msgstr "inicialitza els submòduls en el clon"
-
-#: builtin/clone.c
-msgid "number of submodules cloned in parallel"
-msgstr "nombre de submòduls clonats en paral·lel"
-
-#: builtin/clone.c builtin/init-db.c
-msgid "template-directory"
-msgstr "directori-de-plantilla"
-
-#: builtin/clone.c builtin/init-db.c
-msgid "directory from which templates will be used"
-msgstr "directori des del qual s'usaran les plantilles"
-
-#: builtin/clone.c builtin/submodule--helper.c
-msgid "reference repository"
-msgstr "repositori de referència"
-
-#: builtin/clone.c builtin/submodule--helper.c
-msgid "use --reference only while cloning"
-msgstr "usa --reference només en clonar"
-
-#: builtin/clone.c builtin/column.c builtin/fmt-merge-msg.c builtin/init-db.c
-#: builtin/merge-file.c builtin/merge.c builtin/pack-objects.c builtin/repack.c
-#: builtin/submodule--helper.c t/helper/test-simple-ipc.c
-msgid "name"
-msgstr "nom"
-
-#: builtin/clone.c
-msgid "use <name> instead of 'origin' to track upstream"
-msgstr "usa <nom> en lloc d'«origin» per a seguir la font"
-
-#: builtin/clone.c
-msgid "checkout <branch> instead of the remote's HEAD"
-msgstr "agafa <branca> en lloc de la HEAD del remot"
-
-#: builtin/clone.c
-msgid "path to git-upload-pack on the remote"
-msgstr "camí a git-upload-pack en el remot"
-
-#: builtin/clone.c builtin/fetch.c builtin/pull.c
-msgid "depth"
-msgstr "profunditat"
-
-#: builtin/clone.c
-msgid "create a shallow clone of that depth"
-msgstr "crea un clon superficial d'aquesta profunditat"
-
-#: builtin/clone.c
-msgid "create a shallow clone since a specific time"
-msgstr "crea un clon superficial des d'una data específica"
-
-#: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/rebase.c
-#: builtin/replay.c
-msgid "revision"
-msgstr "revisió"
-
-#: builtin/clone.c builtin/fetch.c builtin/pull.c
-msgid "deepen history of shallow clone, excluding rev"
-msgstr "aprofundeix la història d'un clon superficial, excloent una revisió"
-
-#: builtin/clone.c builtin/submodule--helper.c
-msgid "clone only one branch, HEAD or --branch"
-msgstr "clona només una branca, HEAD o --branch"
-
-#: builtin/clone.c
-msgid "don't clone any tags, and make later fetches not to follow them"
-msgstr ""
-"no cloneu cap etiqueta, i feu que els «fetch» següents no les segueixin"
-
-#: builtin/clone.c
-msgid "any cloned submodules will be shallow"
-msgstr "qualsevol submòdul clonat serà superficial"
-
-#: builtin/clone.c builtin/init-db.c
-msgid "gitdir"
-msgstr "directori de git"
-
-#: builtin/clone.c builtin/init-db.c
-msgid "separate git dir from working tree"
-msgstr "separa el directori de git de l'arbre de treball"
-
-#: builtin/clone.c builtin/init-db.c builtin/submodule--helper.c
-msgid "specify the reference format to use"
-msgstr "especifiqueu el format de referència a usar"
-
-#: builtin/clone.c
-msgid "key=value"
-msgstr "clau=valor"
-
-#: builtin/clone.c
-msgid "set config inside the new repository"
-msgstr "estableix la configuració dins del repositori nou"
-
-#: builtin/clone.c builtin/fetch.c builtin/ls-remote.c builtin/pull.c
-#: builtin/push.c builtin/send-pack.c
-msgid "server-specific"
-msgstr "específic al servidor"
-
-#: builtin/clone.c builtin/fetch.c builtin/ls-remote.c builtin/pull.c
-#: builtin/push.c builtin/send-pack.c
-msgid "option to transmit"
-msgstr "opció a transmetre"
-
-#: builtin/clone.c
-msgid "apply partial clone filters to submodules"
-msgstr "aplica els filtres de clonatge parcial als submòduls"
-
-#: builtin/clone.c
-msgid "any cloned submodules will use their remote-tracking branch"
-msgstr "qualsevol submòdul clonat utilitzarà la seva branca de seguiment remot"
-
-#: builtin/clone.c
-msgid "initialize sparse-checkout file to include only files at root"
-msgstr ""
-"inicialitza el fitxer «sparse-checkout» per a incloure només els fitxers a "
-"l'arrel"
-
-#: builtin/clone.c
-msgid "uri"
-msgstr "uri"
-
-#: builtin/clone.c
-msgid "a URI for downloading bundles before fetching from origin remote"
-msgstr "un URI per a baixar paquets abans d'obtenir des del remot origen"
-
-#: builtin/clone.c
#, 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"
@@ -5445,11 +5306,6 @@
"Podeu inspeccionar el que s'ha agafat amb «git status»\n"
"i tornar-ho a provar amb «git restore --source=HEAD :/»\n"
-#: builtin/clone.c
-#, 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 fetch-pack.c
msgid "remote did not send all necessary objects"
msgstr "el remot no ha enviat tots els objectes necessaris"
@@ -5486,6 +5342,172 @@
msgstr "no es pot desenllaçar el fitxer d'alternatives temporal"
#: builtin/clone.c
+msgid "don't clone shallow repository"
+msgstr "no clonis un repositori superficial"
+
+#: builtin/clone.c
+msgid "don't create a checkout"
+msgstr "no facis cap agafament"
+
+#: builtin/clone.c builtin/init-db.c
+msgid "create a bare repository"
+msgstr "crea un repositori nu"
+
+#: builtin/clone.c
+msgid "create a mirror repository (implies --bare)"
+msgstr "crear un repositori mirall (implica --bare)"
+
+#: builtin/clone.c
+msgid "to clone from a local repository"
+msgstr "per a clonar des d'un repositori local"
+
+#: builtin/clone.c
+msgid "don't use local hardlinks, always copy"
+msgstr "no usis enllaços durs locals, sempre copia"
+
+#: builtin/clone.c
+msgid "setup as shared repository"
+msgstr "configura com a repositori compartit"
+
+#: builtin/clone.c
+msgid "pathspec"
+msgstr "especificació de camí"
+
+#: builtin/clone.c
+msgid "initialize submodules in the clone"
+msgstr "inicialitza els submòduls en el clon"
+
+#: builtin/clone.c
+msgid "number of submodules cloned in parallel"
+msgstr "nombre de submòduls clonats en paral·lel"
+
+#: builtin/clone.c builtin/init-db.c
+msgid "template-directory"
+msgstr "directori-de-plantilla"
+
+#: builtin/clone.c builtin/init-db.c
+msgid "directory from which templates will be used"
+msgstr "directori des del qual s'usaran les plantilles"
+
+#: builtin/clone.c builtin/submodule--helper.c
+msgid "reference repository"
+msgstr "repositori de referència"
+
+#: builtin/clone.c builtin/submodule--helper.c
+msgid "use --reference only while cloning"
+msgstr "usa --reference només en clonar"
+
+#: builtin/clone.c builtin/column.c builtin/fmt-merge-msg.c builtin/init-db.c
+#: builtin/merge-file.c builtin/merge.c builtin/pack-objects.c builtin/repack.c
+#: builtin/submodule--helper.c t/helper/test-simple-ipc.c
+msgid "name"
+msgstr "nom"
+
+#: builtin/clone.c
+msgid "use <name> instead of 'origin' to track upstream"
+msgstr "usa <nom> en lloc d'«origin» per a seguir la font"
+
+#: builtin/clone.c
+msgid "checkout <branch> instead of the remote's HEAD"
+msgstr "agafa <branca> en lloc de la HEAD del remot"
+
+#: builtin/clone.c
+msgid "clone single revision <rev> and check out"
+msgstr "clona només la revisió <rev> i agafa"
+
+#: builtin/clone.c
+msgid "path to git-upload-pack on the remote"
+msgstr "camí a git-upload-pack en el remot"
+
+#: builtin/clone.c builtin/fetch.c builtin/pull.c
+msgid "depth"
+msgstr "profunditat"
+
+#: builtin/clone.c
+msgid "create a shallow clone of that depth"
+msgstr "crea un clon superficial d'aquesta profunditat"
+
+#: builtin/clone.c
+msgid "create a shallow clone since a specific time"
+msgstr "crea un clon superficial des d'una data específica"
+
+#: builtin/clone.c builtin/fetch.c builtin/pull.c
+msgid "ref"
+msgstr "ref"
+
+#: builtin/clone.c builtin/fetch.c builtin/pull.c
+msgid "deepen history of shallow clone, excluding ref"
+msgstr "aprofundeix la història d'un clon superficial, excloent referències"
+
+#: builtin/clone.c builtin/submodule--helper.c
+msgid "clone only one branch, HEAD or --branch"
+msgstr "clona només una branca, HEAD o --branch"
+
+#: builtin/clone.c
+msgid "clone tags, and make later fetches not to follow them"
+msgstr "cloneu les etiquetes, i feu que els «fetch» següents no les segueixin"
+
+#: builtin/clone.c
+msgid "any cloned submodules will be shallow"
+msgstr "qualsevol submòdul clonat serà superficial"
+
+#: builtin/clone.c builtin/init-db.c
+msgid "gitdir"
+msgstr "directori de git"
+
+#: builtin/clone.c builtin/init-db.c
+msgid "separate git dir from working tree"
+msgstr "separa el directori de git de l'arbre de treball"
+
+#: builtin/clone.c builtin/init-db.c builtin/submodule--helper.c
+msgid "specify the reference format to use"
+msgstr "especifiqueu el format de referència a usar"
+
+#: builtin/clone.c
+msgid "key=value"
+msgstr "clau=valor"
+
+#: builtin/clone.c
+msgid "set config inside the new repository"
+msgstr "estableix la configuració dins del repositori nou"
+
+#: builtin/clone.c builtin/fetch.c builtin/ls-remote.c builtin/pull.c
+#: builtin/push.c builtin/send-pack.c
+msgid "server-specific"
+msgstr "específic al servidor"
+
+#: builtin/clone.c builtin/fetch.c builtin/ls-remote.c builtin/pull.c
+#: builtin/push.c builtin/send-pack.c
+msgid "option to transmit"
+msgstr "opció a transmetre"
+
+#: builtin/clone.c
+msgid "apply partial clone filters to submodules"
+msgstr "aplica els filtres de clonatge parcial als submòduls"
+
+#: builtin/clone.c
+msgid "any cloned submodules will use their remote-tracking branch"
+msgstr "qualsevol submòdul clonat utilitzarà la seva branca de seguiment remot"
+
+#: builtin/clone.c
+msgid "initialize sparse-checkout file to include only files at root"
+msgstr ""
+"inicialitza el fitxer «sparse-checkout» per a incloure només els fitxers a "
+"l'arrel"
+
+#: builtin/clone.c
+msgid "uri"
+msgstr "uri"
+
+#: builtin/clone.c
+msgid "a URI for downloading bundles before fetching from origin remote"
+msgstr "un URI per a baixar paquets abans d'obtenir des del remot origen"
+
+#: builtin/clone.c
+msgid "git clone [<options>] [--] <repo> [<dir>]"
+msgstr "git clone [<opcions>] [--] <repositori> [<directori>]"
+
+#: builtin/clone.c
msgid "Too many arguments."
msgstr "Hi ha massa arguments."
@@ -5512,12 +5534,12 @@
#: builtin/clone.c
#, 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."
+msgstr "el camí de destinació «%s» ja existeix i no és un directori buit."
#: builtin/clone.c
#, c-format
msgid "repository path '%s' already exists and is not an empty directory."
-msgstr "el camí destí «%s» ja existeix i no és un directori buit."
+msgstr "el camí de destinació «%s» ja existeix i no és un directori buit."
#: builtin/clone.c
#, c-format
@@ -5614,6 +5636,11 @@
msgstr "La branca remota %s no es troba en la font %s"
#: builtin/clone.c
+#, c-format
+msgid "Remote revision %s not found in upstream %s"
+msgstr "La branca remota %s no es troba en la font %s "
+
+#: builtin/clone.c
msgid "You appear to have cloned an empty repository."
msgstr "Sembla que heu clonat un repositori buit."
@@ -5676,7 +5703,8 @@
"[no-]progress]\n"
" <split-options>"
-#: builtin/commit-graph.c builtin/fetch.c builtin/log.c builtin/repack.c
+#: builtin/commit-graph.c builtin/fetch.c builtin/gc.c builtin/log.c
+#: builtin/repack.c
msgid "dir"
msgstr "directori"
@@ -5836,7 +5864,7 @@
#: builtin/commit.c
msgid ""
-"git commit [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]\n"
+"git commit [-a | --interactive | --patch] [-s] [-v] [-u[<mode>]] [--amend]\n"
" [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|"
"reword):]<commit>]\n"
" [-F <file> | -m <msg>] [--reset-author] [--allow-empty]\n"
@@ -6466,28 +6494,30 @@
#: builtin/config.c
msgid ""
"git config get [<file-option>] [<display-option>] [--includes] [--all] [--"
-"regexp] [--value=<value>] [--fixed-value] [--default=<default>] <name>"
+"regexp] [--value=<pattern>] [--fixed-value] [--default=<default>] [--"
+"url=<url>] <name>"
msgstr ""
"git config get [<opció-fitxer>] [<opció-presentació>] [--includes] [--all] "
-"[--regexp] [--value=<valor>] [--fixed-value] [--default=<default>] <nom>"
+"[--regexp] [--value=<patró>] [--fixed-value] [--default=<default>] [--"
+"url=<url>] <nom>"
# Cal traduir els paràmetres amb <...>?
#: builtin/config.c
msgid ""
-"git config set [<file-option>] [--type=<type>] [--all] [--value=<value>] [--"
-"fixed-value] <name> <value>"
+"git config set [<file-option>] [--type=<type>] [--all] [--value=<pattern>] "
+"[--fixed-value] <name> <value>"
msgstr ""
-"git config set [<opció-fitxer>] [--type=<tipus>] [--all] [--value=<valor>] "
+"git config set [<opció-fitxer>] [--type=<tipus>] [--all] [--value=<patró>] "
"[--fixed-value] <nom> <valor>"
# Cal traduir els paràmetres amb <...>?
#: builtin/config.c
msgid ""
-"git config unset [<file-option>] [--all] [--value=<value>] [--fixed-value] "
-"<name> <value>"
+"git config unset [<file-option>] [--all] [--value=<pattern>] [--fixed-value] "
+"<name>"
msgstr ""
-"git config unset [<opció-fitxer>] [--all] [--value=<valor>] [--fixed-value] "
-"<name> <valor>"
+"git config unset [<opció-fitxer>] [--all] [--value=<patró>] [--fixed-value] "
+"<nom>"
#: builtin/config.c
msgid "git config rename-section [<file-option>] <old-name> <new-name>"
@@ -6512,21 +6542,21 @@
#: builtin/config.c
msgid ""
"git config get [<file-option>] [<display-option>] [--includes] [--all] [--"
-"regexp=<regexp>] [--value=<value>] [--fixed-value] [--default=<default>] "
+"regexp=<regexp>] [--value=<pattern>] [--fixed-value] [--default=<default>] "
"<name>"
msgstr ""
"git config get [<opció-fitxer>] [<opció-presentació>] [--includes] [--all] "
-"[--regexp=<expr-reg>] [--value=<valor>] [--fixed-value] [--"
+"[--regexp=<expr-reg>] [--value=<patró>] [--fixed-value] [--"
"default=<default>] <nom>"
# Cal traduir els paràmetres amb <...>?
#: builtin/config.c
msgid ""
"git config set [<file-option>] [--type=<type>] [--comment=<message>] [--all] "
-"[--value=<value>] [--fixed-value] <name> <value>"
+"[--value=<pattern>] [--fixed-value] <name> <value>"
msgstr ""
"git config set [<opció-fitxer>] [--type=<tipus>] [--comment=<missatge>] [--"
-"all] [--value=<valor>] [--fixed-value] <nom> <valor>"
+"all] [--value=<patró>] [--fixed-value] <nom> <valor>"
#: builtin/config.c
msgid "Config file location"
@@ -6778,7 +6808,7 @@
#: builtin/config.c
msgid "use default value when missing entry"
-msgstr "utilitza el valor per defecte quan falti una entrada"
+msgstr "utilitza el valor per defecte quan hi manqui una entrada"
#: builtin/config.c
msgid "--fixed-value only applies with 'value-pattern'"
@@ -6916,7 +6946,7 @@
#: builtin/config.c
msgid "with --get, use default value when missing entry"
-msgstr "amb --get utilitza el valor per defecte quan falti una entrada"
+msgstr "amb --get utilitza el valor per defecte quan hi manqui una entrada"
#: builtin/config.c
msgid "--get-color and variable type are incoherent"
@@ -6983,7 +7013,7 @@
#, c-format
msgid "unable to get credential storage lock in %d ms"
msgstr ""
-"no s'ha pogut obtenir el bloqueig de l'emmagatzematge de credencials en %d ms"
+"no s'ha pogut obtenir el blocatge de l'emmagatzematge de credencials en %d ms"
#: builtin/describe.c
msgid ""
@@ -7065,12 +7095,8 @@
#: builtin/describe.c
#, c-format
-msgid ""
-"more than %i tags found; listed %i most recent\n"
-"gave up search at %s\n"
-msgstr ""
-"s'han trobat més de %i etiquetes: s'han llistat les %i més recents\n"
-"s'ha renunciat la cerca a %s\n"
+msgid "found %i tags; gave up search at %s\n"
+msgstr "trobades %i etiquetes; s'ha abandonat la recerca en %s\n"
#: builtin/describe.c
#, c-format
@@ -7172,6 +7198,64 @@
msgid "specify the content of the diagnostic archive"
msgstr "especifica el contingut de l'arxiu de diagnòstic"
+#: builtin/diff-pairs.c
+#, c-format
+msgid "unable to parse mode: %s"
+msgstr "no s'ha pogut analitzar el mode: %s"
+
+#: builtin/diff-pairs.c
+#, c-format
+msgid "unable to parse object id: %s"
+msgstr "no s'ha pogut analitzar l'identificador d'objecte: %s"
+
+#: builtin/diff-pairs.c
+msgid "git diff-pairs -z [<diff-options>]"
+msgstr "git diff-pairs -z [<opcions-diferencia>]"
+
+#: builtin/diff-pairs.c builtin/log.c builtin/replay.c builtin/shortlog.c
+#: bundle.c
+#, c-format
+msgid "unrecognized argument: %s"
+msgstr "argument no reconegut: %s"
+
+#: builtin/diff-pairs.c
+msgid "working without -z is not supported"
+msgstr "no s'admet treballar sense -z"
+
+#: builtin/diff-pairs.c
+msgid "pathspec arguments not supported"
+msgstr "arguments de l'especificació de camí no admesos"
+
+#: builtin/diff-pairs.c
+msgid "revision arguments not allowed"
+msgstr "arguments de revisió no permesos"
+
+#: builtin/diff-pairs.c
+msgid "invalid raw diff input"
+msgstr "entrada de diff crua invàlida"
+
+#: builtin/diff-pairs.c
+msgid "tree objects not supported"
+msgstr "no s'admeten els objectes d'arbre"
+
+#: builtin/diff-pairs.c
+msgid "got EOF while reading path"
+msgstr "rebut un EOF durant la lectura del camí"
+
+#: builtin/diff-pairs.c
+msgid "got EOF while reading destination path"
+msgstr "rebut un EOF durant la lectura del camí de destinació"
+
+#: builtin/diff-pairs.c
+#, c-format
+msgid "unable to parse rename/copy score: %s"
+msgstr "no s'ha pogut analitzar puntuació de canvi de nom/còpia: %s"
+
+#: builtin/diff-pairs.c
+#, c-format
+msgid "unknown diff status: %c"
+msgstr "estat de diff desconegut: %c"
+
#: builtin/diff-tree.c
msgid "--merge-base only works with two commits"
msgstr "--merge-base només funciona amb dues comissions"
@@ -7354,6 +7438,10 @@
msgstr "selecciona la gestió de les etiquetes signades"
#: builtin/fast-export.c
+msgid "select handling of signed commits"
+msgstr "selecciona la gestió de les etiquetes signades"
+
+#: builtin/fast-export.c
msgid "select handling of tags that tag filtered objects"
msgstr "selecciona la gestió de les etiquetes que etiquetin objectes filtrats"
@@ -7460,7 +7548,7 @@
#: builtin/fetch-pack.c
#, c-format
msgid "Lockfile created but not reported: %s"
-msgstr "S'ha creat el fitxer de bloqueig però no s'ha informat: %s"
+msgstr "S'ha creat el fitxer de blocatge però no s'ha informat: %s"
#: builtin/fetch.c
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
@@ -7581,26 +7669,6 @@
"s'ha rebutjat %s perquè no es permeten actualitzar les arrels superficials"
#: builtin/fetch.c
-#, c-format
-msgid ""
-"some local refs could not be updated; try running\n"
-" 'git remote prune %s' to remove any old, conflicting branches"
-msgstr ""
-"algunes referències locals no s'han pogut actualitzar;\n"
-" intenteu executar «git remote prune %s» per a eliminar\n"
-" qualsevol branca antiga o conflictiva"
-
-#: builtin/fetch.c
-#, c-format
-msgid " (%s will become dangling)"
-msgstr " (%s es tornarà despenjat)"
-
-#: builtin/fetch.c
-#, c-format
-msgid " (%s has become dangling)"
-msgstr " (%s s'ha quedat despenjat)"
-
-#: builtin/fetch.c
msgid "[deleted]"
msgstr "[suprimit]"
@@ -7623,7 +7691,7 @@
msgid "option \"%s\" is ignored for %s"
msgstr "l'opció «%s» s'ignora per a «%s»"
-#: builtin/fetch.c object-file.c
+#: builtin/fetch.c odb.c
#, c-format
msgid "%s is not a valid object"
msgstr "%s no és un objecte vàlid"
@@ -7634,6 +7702,36 @@
msgstr "l'objecte %s no existeix"
#: builtin/fetch.c
+#, c-format
+msgid ""
+"Run 'git remote set-head %s %s' to follow the change, or set\n"
+"'remote.%s.followRemoteHEAD' configuration option to a different value\n"
+"if you do not want to see this message. Specifically running\n"
+"'git config set remote.%s.followRemoteHEAD warn-if-not-branch-%s'\n"
+"will disable the warning until the remote changes HEAD to something else."
+msgstr ""
+"Executeu 'git remote set-head %s %s' per a seguir el canvi, o fixeu\n"
+"l'opció de configuració 'remote.%s.followRemoteHEAD' a un valor diferent\n"
+"si no voleu veure aquest missatge. Específicament, si executeu\n"
+"'git config set remote.%s.followRemoteHEAD warn-if-not-branch-%s'\n"
+"es deshabilitarà l'avís fins que el remot canviï HEAD a alguna altra cosa."
+
+#: builtin/fetch.c
+#, c-format
+msgid ""
+"some local refs could not be updated; try running\n"
+" 'git remote prune %s' to remove any old, conflicting branches"
+msgstr ""
+"algunes referències locals no s'han pogut actualitzar;\n"
+" intenteu executar «git remote prune %s» per a eliminar\n"
+" qualsevol branca antiga o conflictiva"
+
+#: builtin/fetch.c
+#, c-format
+msgid "fetching ref %s failed: %s"
+msgstr "l'obtenció de la referència %s ha fallat: %s"
+
+#: builtin/fetch.c
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "s'han detectat múltiples branques, incompatible amb --set-upstream"
@@ -7810,6 +7908,10 @@
msgid "specify fetch refmap"
msgstr "específica l'obtenció del mapa de referències"
+#: builtin/fetch.c builtin/pull.c builtin/rebase.c builtin/replay.c
+msgid "revision"
+msgstr "revisió"
+
#: builtin/fetch.c builtin/pull.c
msgid "report that we have only objects reachable from this object"
msgstr "informa que només hi ha objectes abastables des d'aquest objecte"
@@ -7919,7 +8021,7 @@
#: builtin/fmt-merge-msg.c
msgid "use <name> instead of the real target branch"
-msgstr "usa <nom> en lloc de la branca de destí real"
+msgstr "usa <nom> en lloc de la branca de destinació real"
#: builtin/fmt-merge-msg.c
msgid "file to read from"
@@ -7943,6 +8045,10 @@
"git for-each-ref [--contains [<comissió>]] [--no-contains [<comissió>]]"
#: builtin/for-each-ref.c
+msgid "git for-each-ref [--start-after <marker>]"
+msgstr "git for-each-ref [--start-after <marcador>]"
+
+#: builtin/for-each-ref.c
msgid "quote placeholders suitably for shells"
msgstr ""
"posa els marcadors de posició entre cometes adequades per a intèrprets "
@@ -7964,6 +8070,14 @@
msgid "show only <n> matched refs"
msgstr "mostra només <n> referències coincidents"
+#: builtin/for-each-ref.c
+msgid "marker"
+msgstr "marca"
+
+#: builtin/for-each-ref.c
+msgid "start iteration after the provided marker"
+msgstr "comença la iteració després del marcador proporcionat"
+
#: builtin/for-each-ref.c builtin/tag.c
msgid "respect format colors"
msgstr "respecta els colors del format"
@@ -7997,9 +8111,18 @@
msgstr "inclou també la referència HEAD i les pseudoreferències"
#: builtin/for-each-ref.c
+msgid "cannot use --start-after with custom sort options"
+msgstr ""
+"no es pot utilitzar --start-after amb opcions personalitzades d'ordenació"
+
+#: builtin/for-each-ref.c
msgid "unknown arguments supplied with --stdin"
msgstr "s'han proporcionat arguments desconeguts amb --stdin"
+#: builtin/for-each-ref.c
+msgid "cannot use --start-after with patterns"
+msgstr "no es pot utilitzar --start-after amb patrons"
+
#: builtin/for-each-repo.c
msgid "git for-each-repo --config=<config> [--] <arguments>"
msgstr "git for-each-repo --config=<config> [--] <arguments>"
@@ -8018,7 +8141,7 @@
#: builtin/for-each-repo.c
msgid "missing --config=<config>"
-msgstr "falta --config=<config>"
+msgstr "hi manca --config=<config>"
#: builtin/for-each-repo.c
#, c-format
@@ -8163,11 +8286,6 @@
#: builtin/fsck.c
#, c-format
-msgid "%s: object is of unknown type '%s': %s"
-msgstr "%s: l'objecte és de tipus desconegut «%s»: %s"
-
-#: builtin/fsck.c
-#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "%s: no s'ha pogut analitzar l'objecte: %s"
@@ -8239,11 +8357,15 @@
msgstr "rev-index no vàlid per al paquet «%s»"
#: builtin/fsck.c
+msgid "Checking ref database"
+msgstr "S'està comprovant la base de dades de referències"
+
+#: builtin/fsck.c
msgid ""
"git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n"
" [--[no-]full] [--strict] [--verbose] [--lost-found]\n"
" [--[no-]dangling] [--[no-]progress] [--connectivity-only]\n"
-" [--[no-]name-objects] [<object>...]"
+" [--[no-]name-objects] [--[no-]references] [<object>...]"
msgstr ""
"git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n"
" [--[no-]full] [--strict] [--verbose] [--lost-found]\n"
@@ -8298,6 +8420,10 @@
msgid "show verbose names for reachable objects"
msgstr "mostra els noms detallats dels objectes abastables"
+#: builtin/fsck.c
+msgid "check reference database consistency"
+msgstr "comprova la consistència de les base de dades de referències"
+
#: builtin/fsck.c builtin/index-pack.c
msgid "Checking objects"
msgstr "S'estan comprovant els objectes"
@@ -8305,7 +8431,7 @@
#: builtin/fsck.c
#, c-format
msgid "%s: object missing"
-msgstr "%s: falta l'objecte"
+msgstr "%s: hi manca l'objecte"
#: builtin/fsck.c
#, c-format
@@ -8496,6 +8622,15 @@
msgid "repack all other packs except the largest pack"
msgstr "reempaqueta tots els altres paquets excepte el paquet més gran"
+#: builtin/gc.c builtin/repack.c
+msgid "pack prefix to store a pack containing pruned objects"
+msgstr ""
+"prefix del paquet per a emmagatzemar un paquet que contingui objectes podats"
+
+#: builtin/gc.c
+msgid "skip maintenance tasks typically done in the foreground"
+msgstr "omet les tasques de manteniment que es fan típicament en primer pla"
+
#: builtin/gc.c
#, c-format
msgid "failed to parse gc.logExpiry value %s"
@@ -8590,13 +8725,13 @@
#: builtin/gc.c
#, c-format
-msgid "lock file '%s' exists, skipping maintenance"
-msgstr "el fitxer de bloqueig «%s» existeix, s'omet el manteniment"
+msgid "task '%s' failed"
+msgstr "la tasca «%s» ha fallat"
#: builtin/gc.c
#, c-format
-msgid "task '%s' failed"
-msgstr "la tasca «%s» ha fallat"
+msgid "lock file '%s' exists, skipping maintenance"
+msgstr "el fitxer de blocatge «%s» existeix, s'omet el manteniment"
#: builtin/gc.c
#, c-format
@@ -8637,10 +8772,6 @@
msgstr "executa una tasca específica"
#: builtin/gc.c
-msgid "use at most one of --auto and --schedule=<frequency>"
-msgstr "usa com a màxim un entre --auto i --schedule=<freqüència>"
-
-#: builtin/gc.c
#, c-format
msgid "unable to add '%s' value of '%s'"
msgstr "no es pot afegir el valor «%s» de «%s»"
@@ -8742,8 +8873,28 @@
msgstr "el planificador %s no està disponible"
#: builtin/gc.c
-msgid "another process is scheduling background maintenance"
-msgstr "un altre procés està planificant un manteniment en segon pla"
+#, c-format
+msgid ""
+"unable to create '%s.lock': %s.\n"
+"\n"
+"Another scheduled git-maintenance(1) process seems to be running in this\n"
+"repository. Please make sure no other maintenance processes are running and\n"
+"then try again. If it still fails, a git-maintenance(1) process may have\n"
+"crashed in this repository earlier: remove the file manually to continue."
+msgstr ""
+"No s'ha pogut crear «%s.lock»: %s.\n"
+"\n"
+"Sembla que un altre procés git-maintenance(1) s'està executant en aquest\n"
+"repositori. Assegureu-vos que no hi ha cap altre proés de manteniment en "
+"execució\n"
+"i llavors proveu de nou. Si encara falla, potser un procés git-"
+"maintenance(1) \n"
+"ha fallat en aquest repositori abans: elimineu el fitxer manualment per a "
+"continuar."
+
+#: builtin/gc.c
+msgid "cannot acquire lock for scheduled background maintenance"
+msgstr "no puc adquirir un blocatge per al manteniment en segona mà planificat"
#: builtin/gc.c
msgid "git maintenance start [--scheduler=<scheduler>]"
@@ -9483,9 +9634,36 @@
msgstr[1] "longitud de cadena = %d: %lu objectes"
#: builtin/index-pack.c
+msgid "could not start pack-objects to repack local links"
+msgstr ""
+"no s'ha pogut iniciar pack-objects per a tornar a empaquetar els enllaços "
+"locals"
+
+#: builtin/index-pack.c
+msgid "failed to feed local object to pack-objects"
+msgstr "no s'ha pogut alimentar pack-objects amb l'objecte local"
+
+#: builtin/index-pack.c
+msgid "index-pack: Expecting full hex object ID lines only from pack-objects."
+msgstr ""
+"index-pack: s'esperen línies amb l'identificador d'objecte hexadecimal "
+"complet des de pack-objects."
+
+#: builtin/index-pack.c
+msgid "could not finish pack-objects to repack local links"
+msgstr ""
+"no s'ha pogut finalitzar pack-objects per a tornar a empaquetar els enllaços "
+"locals"
+
+#: builtin/index-pack.c
msgid "Cannot come back to cwd"
msgstr "No es pot tornar al directori de treball actual"
+#: builtin/index-pack.c builtin/unpack-objects.c
+#, c-format
+msgid "bad --pack_header: %s"
+msgstr "--pack_header incorrecte: %s"
+
#: builtin/index-pack.c
#, c-format
msgid "bad %s"
@@ -9497,6 +9675,10 @@
msgstr "algorisme de resum desconegut «%s»"
#: builtin/index-pack.c
+msgid "--promisor cannot be used with a pack name"
+msgstr "--promisor no es pot usar amb un nom de paquet"
+
+#: builtin/index-pack.c
msgid "--stdin requires a git repository"
msgstr "--stdin requereix un repositori git"
@@ -9636,7 +9818,7 @@
#: builtin/interpret-trailers.c
msgid "action if trailer is missing"
-msgstr "acció si el «trailer» falta"
+msgstr "acció si el «trailer» hi manca"
#: builtin/interpret-trailers.c
msgid "output only the trailers"
@@ -9716,22 +9898,12 @@
"traça l'evolució del rang de línia <inici>,<final> o funcions :<nom-funció> "
"a <fitxer>"
-#: builtin/log.c builtin/replay.c builtin/shortlog.c bundle.c
-#, c-format
-msgid "unrecognized argument: %s"
-msgstr "argument no reconegut: %s"
-
#: builtin/log.c
msgid "-L<range>:<file> cannot be used with pathspec"
msgstr "-L<rang>:<fitxer> no es pot usar amb una especificació de camí"
#: builtin/log.c
#, c-format
-msgid "Final output: %d %s\n"
-msgstr "Sortida final: %d %s\n"
-
-#: builtin/log.c
-#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: fitxer incorrecte"
@@ -10572,6 +10744,10 @@
msgstr "també mostra missatges informatius i de conflictes"
#: builtin/merge-tree.c
+msgid "suppress all output; only exit status wanted"
+msgstr "suprimeix tota la sortida; només es vol l'estat de sortida"
+
+#: builtin/merge-tree.c
msgid "list filenames without modes/oids/stages"
msgstr "llista els noms de fitxer sense modes/oids/stages"
@@ -10609,11 +10785,6 @@
msgid "malformed input line: '%s'."
msgstr "línia d'entrada mal formada: «%s»."
-#: builtin/merge-tree.c
-#, c-format
-msgid "merging cannot continue; got unclean result of %d"
-msgstr "la fusió no pot continuar; s'ha obtingut un resultat no net de %d"
-
#: builtin/merge.c
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<opcions>] [<comissió>...]"
@@ -10655,6 +10826,10 @@
msgstr "(sinònim de --stat)"
#: builtin/merge.c builtin/pull.c
+msgid "show a compact-summary at the end of the merge"
+msgstr "mostra un compact-summary al final de la fusió"
+
+#: builtin/merge.c builtin/pull.c
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ó "
@@ -10699,7 +10874,7 @@
#: builtin/merge.c
msgid "use <name> instead of the real target"
-msgstr "usa <nom> en lloc de destí real"
+msgstr "usa <nom> en lloc de destinació real"
#: builtin/merge.c
msgid "abort the current in-progress merge"
@@ -10738,7 +10913,7 @@
msgid "Already up to date. (nothing to squash)"
msgstr "Ja està actualitzat. (res a fer «squash»)"
-#: builtin/merge.c merge-ort-wrappers.c merge-recursive.c
+#: builtin/merge.c merge-ort-wrappers.c
msgid "Already up to date."
msgstr "Ja està al dia."
@@ -10762,7 +10937,7 @@
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Cadena branch.%s.mergeoptions incorrecta: %s"
-#: builtin/merge.c merge-recursive.c
+#: builtin/merge.c merge-ort-wrappers.c
msgid "Unable to write index."
msgstr "No s'ha pogut escriure l'índex."
@@ -10793,7 +10968,8 @@
"\n"
msgstr ""
"Introduïu un missatge de comissió per a explicar per què aquesta fusió és\n"
-"necessària, especialment si es fusiona una branca amb funcionalitat nova.\n"
+"necessària, especialment si es fusiona una font actualitzada amb una branca "
+"de tòpic.\n"
"\n"
#: builtin/merge.c
@@ -10926,7 +11102,7 @@
msgid "Updating %s..%s\n"
msgstr "S'estan actualitzant %s..%s\n"
-#: builtin/merge.c merge-ort-wrappers.c merge-recursive.c
+#: builtin/merge.c merge-ort-wrappers.c
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -10994,11 +11170,6 @@
#: builtin/mktag.c
#, c-format
-msgid "%d (FSCK_IGNORE?) should never trigger this callback"
-msgstr "%d (FSCK_IGNORE?) no hauria d'activar mai aquesta crida de retorn"
-
-#: builtin/mktag.c
-#, c-format
msgid "could not read tagged object '%s'"
msgstr "no s'ha pogut llegir l'objecte etiquetat «%s»"
@@ -11096,8 +11267,12 @@
"en un lot que és més gran que aquesta mida"
#: builtin/mv.c
-msgid "git mv [<options>] <source>... <destination>"
-msgstr "git mv [<opcions>] <origen>... <destí>"
+msgid "git mv [-v] [-f] [-n] [-k] <source> <destination>"
+msgstr "git mv [-v] [-f] [-n] [-k] <origen> <destinacio>"
+
+#: builtin/mv.c
+msgid "git mv [-v] [-f] [-n] [-k] <source>... <destination-directory>"
+msgstr "git mv [-v] [-f] [-n] [-k] <origen>... <directori-destinacio>"
#: builtin/mv.c
#, c-format
@@ -11117,7 +11292,7 @@
#: builtin/mv.c
msgid "force move/rename even if target exists"
-msgstr "força el moviment / canvi de nom encara que el destí existeixi"
+msgstr "força el moviment / canvi de nom encara que la destinació existeixi"
#: builtin/mv.c
msgid "skip move/rename errors"
@@ -11126,7 +11301,7 @@
#: builtin/mv.c
#, c-format
msgid "destination '%s' is not a directory"
-msgstr "el destí «%s» no és un directori"
+msgstr "la destinació «%s» no és un directori"
#: builtin/mv.c
#, c-format
@@ -11139,7 +11314,7 @@
#: builtin/mv.c
msgid "destination exists"
-msgstr "el destí existeix"
+msgstr "la destinació existeix"
#: builtin/mv.c
msgid "can not move directory into itself"
@@ -11172,20 +11347,25 @@
#: builtin/mv.c
msgid "multiple sources for the same target"
-msgstr "múltiples orígens per al mateix destí"
+msgstr "múltiples orígens per a la mateixa destinació"
#: builtin/mv.c
msgid "destination directory does not exist"
-msgstr "el directori destí no existeix"
+msgstr "el directori de destinació no existeix"
#: builtin/mv.c
msgid "destination exists in the index"
-msgstr "el destí existeix a l'índex"
+msgstr "la destinació existeix a l'índex"
#: builtin/mv.c
#, c-format
msgid "%s, source=%s, destination=%s"
-msgstr "%s, origen=%s, destí=%s"
+msgstr "%s, origen=%s, destinació=%s"
+
+#: builtin/mv.c
+#, c-format
+msgid "cannot move both '%s' and its parent directory '%s'"
+msgstr "no puc moure «%s» i el seu directori pare «%s» simultàniament"
#: builtin/mv.c
#, c-format
@@ -11247,60 +11427,59 @@
#: builtin/notes.c
msgid "git notes [--ref <notes-ref>] [list [<object>]]"
-msgstr "git notes [--ref <referència-de-notes>] [llista [<objecte>]]"
+msgstr "git notes [--ref <referència-notes>] [llista [<objecte>]]"
#: builtin/notes.c
msgid ""
"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [--[no-]separator|--"
"separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c "
-"| -C) <object>] [<object>]"
+"| -C) <object>] [<object>] [-e]"
msgstr ""
-"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [--[no-]separator|--"
-"separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <fitxer> | (-"
-"c | -C) <object>] [<object>]"
+"git notes [--ref <referència-notes>] add [-f] [--allow-empty] [--"
+"[no-]separator|--separator=<salt-paràgraf>] [--[no-]stripspace] [-m <msg> | -"
+"F <fitxer> | (-c | -C) <objecte>] [<objecte>]"
#: builtin/notes.c
msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
msgstr ""
-"git notes [--ref <referència-de-notes>] copy [-f] <objecte-de> <objecte-a>"
+"git notes [--ref <referència-notes>] copy [-f] <objecte-de> <objecte-a>"
#: builtin/notes.c
msgid ""
"git notes [--ref <notes-ref>] append [--allow-empty] [--[no-]separator|--"
"separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c "
-"| -C) <object>] [<object>]"
+"| -C) <object>] [<object>] [-e]"
msgstr ""
-"git notes [--ref <notes-ref>] append [--allow-empty] [--[no-]separator|--"
-"separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <fitxer> | (-"
-"c | -C) <objecte>] [<objecte>]"
+"git notes [--ref <referència-notes>] append [--allow-empty] [--"
+"[no-]separator|--separator=<salt-paràgraf>] [--[no-]stripspace] [-m <msg> | -"
+"F <fitxer> | (-c | -C) <objecte>] [<objecte>] [-e]"
#: builtin/notes.c
msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
-msgstr ""
-"git notes [--ref <referència-de-notes>] edit [--allow-empty] [<objecte>]"
+msgstr "git notes [--ref <referència-notes>] edit [--allow-empty] [<objecte>]"
#: builtin/notes.c
msgid "git notes [--ref <notes-ref>] show [<object>]"
-msgstr "git notes [--ref <referència-de-notes>] show [<objecte>]"
+msgstr "git notes [--ref <referència-notes>] show [<objecte>]"
#: builtin/notes.c
msgid ""
"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
msgstr ""
-"git notes [--ref <referència-de-notes>] merge [-v | -q] [-s <estratègia>] "
-"<referència-de-notes>"
+"git notes [--ref <referència-notes>] merge [-v | -q] [-s <estratègia>] "
+"<referència-notes>"
#: builtin/notes.c
msgid "git notes [--ref <notes-ref>] remove [<object>...]"
-msgstr "git notes [--ref <referència-de-notes>] remove [<objecte>...]"
+msgstr "git notes [--ref <referència-notes>] remove [<objecte>...]"
#: builtin/notes.c
msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
-msgstr "git notes [--ref <referència-de-notes>] prune [-n] [-v]"
+msgstr "git notes [--ref <referència-notes>] prune [-n] [-v]"
#: builtin/notes.c
msgid "git notes [--ref <notes-ref>] get-ref"
-msgstr "git notes [--ref <referència-de-notes>] get-ref"
+msgstr "git notes [--ref <referència-notes>] get-ref"
#: builtin/notes.c
msgid "git notes [list [<object>]]"
@@ -11332,7 +11511,7 @@
#: builtin/notes.c
msgid "git notes merge [<options>] <notes-ref>"
-msgstr "git notes merge [<opcions>] <referència-de-notes>"
+msgstr "git notes merge [<opcions>] <referència-notes>"
#: builtin/notes.c
msgid "git notes merge --commit [<options>]"
@@ -11428,6 +11607,10 @@
msgstr "reusa i edita l'objecte de nota especificat"
#: builtin/notes.c
+msgid "edit note message in editor"
+msgstr "edita el missatge d'anotació en l'editor"
+
+#: builtin/notes.c
msgid "reuse specified note object"
msgstr "reusa l'objecte de nota especificat"
@@ -11644,7 +11827,7 @@
#: builtin/notes.c
msgid "use notes from <notes-ref>"
-msgstr "usa les notes de <referència-de-notes>"
+msgstr "usa les notes de <referència-notes>"
#: builtin/notes.c builtin/remote.c parse-options.c
#, c-format
@@ -11652,14 +11835,35 @@
msgstr "subordre desconeguda: «%s»"
#: builtin/pack-objects.c
-msgid "git pack-objects --stdout [<options>] [< <ref-list> | < <object-list>]"
-msgstr "git pack-objects --stdout [<opcions>] [< <ref-list> | < <object-list>]"
+msgid ""
+"git pack-objects [-q | --progress | --all-progress] [--all-progress-"
+"implied]\n"
+" [--no-reuse-delta] [--delta-base-offset] [--non-empty]\n"
+" [--local] [--incremental] [--window=<n>] [--depth=<n>]\n"
+" [--revs [--unpacked | --all]] [--keep-pack=<pack-name>]\n"
+" [--cruft] [--cruft-expiration=<time>]\n"
+" [--stdout [--filter=<filter-spec>] | <base-name>]\n"
+" [--shallow] [--keep-true-parents] [--[no-]sparse]\n"
+" [--name-hash-version=<n>] [--path-walk] < <object-list>"
+msgstr ""
+"git pack-objects [-q | --progress | --all-progress] [--all-progress-"
+"implied]\n"
+" [--no-reuse-delta] [--delta-base-offset] [--non-empty]\n"
+" [--local] [--incremental] [--window=<n>] [--depth=<n>]\n"
+" [--revs [--unpacked | --all]] [--keep-pack=<nom-paquet>]\n"
+" [--cruft] [--cruft-expiration=<data>]\n"
+" [--stdout [--filter=<especificacio-filtre>] | <nom-base>]\n"
+" [--shallow] [--keep-true-parents] [--[no-]sparse]\n"
+" [--name-hash-version=<n>] [--path-walk] < <lista-objectes>"
#: builtin/pack-objects.c
-msgid ""
-"git pack-objects [<options>] <base-name> [< <ref-list> | < <object-list>]"
-msgstr ""
-"git pack-objects [<opcions>] <base-name> [< <ref-list> | < <object-list>]"
+#, c-format
+msgid "invalid --name-hash-version option: %d"
+msgstr "opció --name-hash-version no vàlida: %d"
+
+#: builtin/pack-objects.c
+msgid "currently, --write-bitmap-index requires --name-hash-version=1"
+msgstr "actualment, --write-bitmap-index requereix --name-hash-version=1"
#: builtin/pack-objects.c
#, c-format
@@ -11786,6 +11990,17 @@
msgstr "no s'ha pogut obtenir el tipus de l'objecte: %s"
#: builtin/pack-objects.c
+msgid "Compressing objects by path"
+msgstr "S'estan comprimint els objectes per camí"
+
+#: builtin/pack-objects.c
+#, c-format
+msgid "Path-based delta compression using up to %d thread"
+msgid_plural "Path-based delta compression using up to %d threads"
+msgstr[0] "La compressió de diferències basada en camins usa fins a %d fil"
+msgstr[1] "La compressió de diferències basada en camins usa fins a %d fils"
+
+#: builtin/pack-objects.c
msgid "Compressing objects"
msgstr "S'estan comprimint els objectes"
@@ -11878,6 +12093,10 @@
msgstr "no s'ha pogut forçar l'objecte solt"
#: builtin/pack-objects.c
+msgid "failed to pack objects via path-walk"
+msgstr "no s'ha pogut empaquetar els objectes via path-walk"
+
+#: builtin/pack-objects.c
#, c-format
msgid "not a rev '%s'"
msgstr "«%s» no és una revisió"
@@ -12030,6 +12249,10 @@
msgstr "crea paquets prims"
#: builtin/pack-objects.c
+msgid "use the path-walk API to walk objects when possible"
+msgstr "useu l'API path-walk per a recórrer objectes sempre que sigui possible"
+
+#: builtin/pack-objects.c
msgid "create packs suitable for shallow fetches"
msgstr "crea paquets adequats per a les obtencions superficials"
@@ -12072,6 +12295,10 @@
msgstr "no empaquetis els objectes als fitxers de paquet «promisor»"
#: builtin/pack-objects.c
+msgid "implies --missing=allow-any"
+msgstr "implica --missing=allow-any"
+
+#: builtin/pack-objects.c
msgid "respect islands during delta compression"
msgstr "respecta les illes durant la compressió delta"
@@ -12085,6 +12312,10 @@
"exclou qualsevol uploadpack.blobpackfileuri configurat amb aquest protocol"
#: builtin/pack-objects.c
+msgid "use the specified name-hash function to group similar objects"
+msgstr "usa la funció name-hash especificada per a agrupar objectes similars"
+
+#: builtin/pack-objects.c
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr "la profunditat de la cadena delta %d és massa profunda, forçant %d"
@@ -12094,7 +12325,12 @@
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "pack.deltaCacheLimit és massa alt, forçant %d"
-#: builtin/pack-objects.c config.c
+#: builtin/pack-objects.c
+#, c-format
+msgid "cannot use %s with %s"
+msgstr "no es pot usar %s amb %s"
+
+#: builtin/pack-objects.c environment.c
#, c-format
msgid "bad pack compression level %d"
msgstr "nivell de compressió de paquet %d erroni"
@@ -12114,10 +12350,6 @@
msgstr "--thin no es pot utilitzar per a construir un paquet indexable"
#: builtin/pack-objects.c
-msgid "cannot use --filter with --stdin-packs"
-msgstr "no es pot utilitzar --filter sense --stdin-packs"
-
-#: builtin/pack-objects.c
msgid "cannot use internal rev list with --stdin-packs"
msgstr "no es pot utilitzar la llista de revisió interna amb --stdin-packs"
@@ -12126,10 +12358,6 @@
msgstr "no es pot utilitzar la llista de revisió interna amb --cruft"
#: builtin/pack-objects.c
-msgid "cannot use --stdin-packs with --cruft"
-msgstr "no es pot --stdin-packs amb --cruft"
-
-#: builtin/pack-objects.c
msgid "Enumerating objects"
msgstr "S'estan enumerant els objectes"
@@ -12142,24 +12370,6 @@
"Total %<PRIu32> (%<PRIu32> diferències), reusats %<PRIu32> (%<PRIu32> "
"diferències), paquets reusats %<PRIu32> (de %<PRIuMAX>)"
-#: builtin/pack-redundant.c
-msgid ""
-"'git pack-redundant' is nominated for removal.\n"
-"If you still use this command, please add an extra\n"
-"option, '--i-still-use-this', on the command line\n"
-"and let us know you still use it by sending an e-mail\n"
-"to <git@vger.kernel.org>. Thanks.\n"
-msgstr ""
-"«git pack-redundant» està nominat per a la seva supressió.\n"
-"Si encara feu servir aquesta ordre, afegiu-hi l'opció\n"
-"addicional, «--i-still-use-this», a la línia d'ordres\n"
-"i feu-nos saber que encara l'useu enviant un correu electrònic\n"
-"a <git@vger.kernel.org>. Gràcies.\n"
-
-#: builtin/pack-redundant.c
-msgid "refusing to run without --i-still-use-this"
-msgstr "es rebutja a executar sense --i-still-use-this"
-
#: builtin/pack-refs.c
msgid ""
"git pack-refs [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude "
@@ -12355,6 +12565,11 @@
msgid "unable to access commit %s"
msgstr "no s'ha pogut accedir a la comissió %s"
+#: builtin/pull.c refspec.c
+#, c-format
+msgid "invalid refspec '%s'"
+msgstr "refspec no vàlida: «%s»"
+
#: builtin/pull.c
msgid "ignoring --verify-signatures for rebase"
msgstr "s'està ignorant --verify-signatures en fer «rebase»"
@@ -12463,7 +12678,7 @@
#: builtin/push.c
msgid "--delete only accepts plain target ref names"
-msgstr "--delete només accepta noms de referència de destí senzills"
+msgstr "--delete només accepta noms de referència de destinació senzills"
#: builtin/push.c
msgid ""
@@ -12533,9 +12748,8 @@
"upstream, see 'push.autoSetupRemote' in 'git help config'.\n"
msgstr ""
"\n"
-"Per fer que això succeeixi automàticament per a les branques sense "
-"seguiment\n"
-"font, vegeu «push.autoSetupRemote» a «git help config».\n"
+"Per fer que això succeeixi automàticament per a les fonts sense seguiment,\n"
+"vegeu «push.autoSetupRemote» a «git help config».\n"
#: builtin/push.c
#, c-format
@@ -12555,8 +12769,7 @@
#: builtin/push.c
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
-msgstr ""
-"La branca actual %s té múltiples branques fonts, s'està refusant pujar."
+msgstr "La branca actual %s té múltiples branques font; s'està refusant pujar."
#: builtin/push.c
msgid ""
@@ -12759,7 +12972,7 @@
"\n"
" git push <name>\n"
msgstr ""
-"No hi ha cap destí de pujada configurat.\n"
+"No hi ha cap destinació de pujada configurat.\n"
"Especifiqueu l'URL des de la línia d'ordres o bé configureu un repositori "
"remot fent servir\n"
"\n"
@@ -12922,7 +13135,7 @@
"[<upstream> [<branch>]]"
msgstr ""
"git rebase [-i] [options] [--exec <ordre>] [--onto <newbase> | --keep-base] "
-"[<upstream> [<branca>]]"
+"[<font> [<branca>]]"
#: builtin/rebase.c
msgid ""
@@ -13018,8 +13231,8 @@
#: builtin/rebase.c
#, c-format
msgid ""
-"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and "
-"\"stop\"."
+"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"stop"
+"\"."
msgstr ""
"tipus buit «%s» no reconegut; els valors vàlids són \"drop\", \"keep\" i "
"\"stop\"."
@@ -13510,6 +13723,10 @@
msgstr "git reflog exists <referència>"
#: builtin/reflog.c
+msgid "git reflog drop [--all [--single-worktree] | <refs>...]"
+msgstr "git reflog drop [--all [--single-worktree] | <refs>...]"
+
+#: builtin/reflog.c
#, c-format
msgid "invalid timestamp '%s' given to '--%s'"
msgstr "marca de temps «%s» donada a «--%s» no és vàlida"
@@ -13577,8 +13794,8 @@
#: builtin/reflog.c
#, c-format
-msgid "%s points nowhere!"
-msgstr "%s no apunta a enlloc"
+msgid "reflog could not be found: '%s'"
+msgstr "no s'ha pogut trobar el reflog: «%s»"
#: builtin/reflog.c
msgid "no reflog specified to delete"
@@ -13589,9 +13806,21 @@
msgid "invalid ref format: %s"
msgstr "format de referència no vàlid: %s"
+#: builtin/reflog.c
+msgid "drop the reflogs of all references"
+msgstr "descarta els reflogs de totes les referències"
+
+#: builtin/reflog.c
+msgid "drop reflogs from the current worktree only"
+msgstr "descarta només els reflogs de l'arbre de treball actual"
+
+#: builtin/reflog.c
+msgid "references specified along with --all"
+msgstr "referències especificades conjuntament amb --all"
+
#: builtin/refs.c
-msgid "git refs migrate --ref-format=<format> [--dry-run]"
-msgstr "git refs migrate --ref-format=<format> [--dry-run]"
+msgid "git refs migrate --ref-format=<format> [--no-reflog] [--dry-run]"
+msgstr "git refs migrate --ref-format=<format> [--no-reflog] [--dry-run]"
#: builtin/refs.c
msgid "git refs verify [--strict] [--verbose]"
@@ -13606,8 +13835,12 @@
msgstr "fes una prova no destructiva"
#: builtin/refs.c
+msgid "drop reflogs entirely during the migration"
+msgstr "descarta completament els reflogs durant la migració"
+
+#: builtin/refs.c
msgid "missing --ref-format=<format>"
-msgstr "falta --ref-format=<format>"
+msgstr "hi manca --ref-format=<format>"
#: builtin/refs.c
#, c-format
@@ -13725,6 +13958,18 @@
msgstr "argument de «--mirror» desconegut: %s"
#: builtin/remote.c
+#, c-format
+msgid "remote name '%s' is a subset of existing remote '%s'"
+msgstr "el nom remot «%s» és un subconjunt del remot existent «%s»"
+
+#: builtin/remote.c
+#, c-format
+msgid "remote name '%s' is a superset of existing remote '%s'"
+msgstr ""
+"el nom remot «%s» és un supeconjunt\n"
+" del remot existent «%s»"
+
+#: builtin/remote.c
msgid "fetch the remote branches"
msgstr "obtén les branques remotes"
@@ -14040,6 +14285,35 @@
msgstr[1] " Referències locals configurades per a «git push»%s:"
#: builtin/remote.c
+#, c-format
+msgid "'%s/HEAD' is unchanged and points to '%s'\n"
+msgstr "«%s/HEAD» no ha canviat i apunta a «%s»\n"
+
+#: builtin/remote.c
+#, c-format
+msgid "'%s/HEAD' has changed from '%s' and now points to '%s'\n"
+msgstr "«%s/HEAD» ha canviat des de «%s» i ara apunta a «%s»\n"
+
+#: builtin/remote.c
+#, c-format
+msgid "'%s/HEAD' is now created and points to '%s'\n"
+msgstr "«%s/HEAD» s'ha creat ara i apunta a «%s»\n"
+
+#: builtin/remote.c
+#, c-format
+msgid "'%s/HEAD' was detached at '%s' and now points to '%s'\n"
+msgstr "«%s/HEAD» s'ha separat en «%s» i ara apunta a «%s»\n"
+
+#: builtin/remote.c
+#, c-format
+msgid ""
+"'%s/HEAD' used to point to '%s' (which is not a remote branch), but now "
+"points to '%s'\n"
+msgstr ""
+"«%s/HEAD» solia apuntar a «%s» (que no és una branca remota), però ara "
+"apunta a«%s»\n"
+
+#: builtin/remote.c
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "estableix refs/remotes/<nom>/HEAD segons el remot"
@@ -14067,21 +14341,11 @@
#: builtin/remote.c
#, c-format
-msgid "Could not setup %s"
+msgid "Could not set up %s"
msgstr "No s'ha pogut configurar %s"
#: builtin/remote.c
#, c-format
-msgid " %s will become dangling!"
-msgstr " %s es quedara despenjat!"
-
-#: builtin/remote.c
-#, c-format
-msgid " %s has become dangling!"
-msgstr " %s s'ha quedat despenjat!"
-
-#: builtin/remote.c
-#, c-format
msgid "Pruning %s"
msgstr "S'està podant %s"
@@ -14160,8 +14424,14 @@
msgstr "sigues detallat; s'ha de col·locar abans d'una subordre"
#: builtin/repack.c
-msgid "git repack [<options>]"
-msgstr "git repack [<opcions>]"
+msgid ""
+"git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"
+"[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n"
+"[--write-midx] [--name-hash-version=<n>] [--path-walk]"
+msgstr ""
+"git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"
+"[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<nom-paquet>]\n"
+"[--write-midx] [--name-hash-version=<n>] [--path-walk]"
#: builtin/repack.c
msgid ""
@@ -14254,6 +14524,10 @@
msgstr "amb --cruft, vencen els objectes més antics que aquest"
#: builtin/repack.c
+msgid "with --cruft, only repack cruft packs smaller than this"
+msgstr "amb --cruft, empaqueta només els objectes més petits que aquest"
+
+#: builtin/repack.c
msgid "remove redundant packs, and run git-prune-packed"
msgstr "elimina els paquets redundants, i executeu git-prune-packed"
@@ -14266,6 +14540,17 @@
msgstr "passa --no-reuse-object a git-pack-objects"
#: builtin/repack.c
+msgid ""
+"specify the name hash version to use for grouping similar objects by path"
+msgstr ""
+"especifica la versió de hash de noms que s'ha d'usar per a agrupar objectes "
+"similars per camí"
+
+#: builtin/repack.c
+msgid "pass --path-walk to git-pack-objects"
+msgstr "passa --path-walk a git-pack-objects"
+
+#: builtin/repack.c
msgid "do not run git-update-server-info"
msgstr "no executis git-update-server-info"
@@ -14332,11 +14617,6 @@
msgstr "escriu un índex multipaquet dels paquets resultants"
#: builtin/repack.c
-msgid "pack prefix to store a pack containing pruned objects"
-msgstr ""
-"prefix del paquet per a emmagatzemar un paquet que contingui objectes podats"
-
-#: builtin/repack.c
msgid "pack prefix to store a pack containing filtered out objects"
msgstr ""
"prefix del paquet per a emmagatzemar un paquet que contingui objectes "
@@ -14525,7 +14805,7 @@
#: builtin/replace.c
#, c-format
msgid "graft for '%s' unnecessary"
-msgstr "«graft» per a «%s» innecessari"
+msgstr "l'empelt per a «%s» és innecessari"
#: builtin/replace.c
#, c-format
@@ -14538,7 +14818,7 @@
"could not convert the following graft(s):\n"
"%s"
msgstr ""
-"no s'han pogut convertir els següents «grafts»:\n"
+"no s'han pogut convertir els empelts següents:\n"
"%s"
#: builtin/replace.c
@@ -14559,7 +14839,7 @@
#: builtin/replace.c
msgid "convert existing graft file"
-msgstr "converteix el fitxer «graft» existent"
+msgstr "converteix el fitxer d'empelts existent"
#: builtin/replace.c
msgid "replace the ref if it exists"
@@ -14614,10 +14894,6 @@
msgstr "calen algunes comissions per tornar a reproduir"
#: builtin/replay.c
-msgid "--onto and --advance are incompatible"
-msgstr "--onto i --advance són incompatibles"
-
-#: builtin/replay.c
msgid "all positive revisions given must be references"
msgstr "totes les revisions positives que s'han donat han de ser referències"
@@ -14867,6 +15143,10 @@
msgstr "valor no vàlid per a «%s»: «%s», l'únic format permès és «%s»"
#: builtin/rev-list.c
+msgid "-z option used with unsupported option"
+msgstr "l'opció -z s'ha usat amb una opció no admesa"
+
+#: builtin/rev-list.c
msgid "rev-list does not support display of notes"
msgstr "el rev-list no permet mostrar notes"
@@ -15733,20 +16013,28 @@
msgstr "git stash create [<missatge>]"
#: builtin/stash.c
+msgid "git stash export (--print | --to-ref <ref>) [<stash>...]"
+msgstr "git stash export (--print | --to-ref <referència>) [<stash>...]"
+
+#: builtin/stash.c
+msgid "git stash import <commit>"
+msgstr "git stash import [<comissió>]"
+
+#: builtin/stash.c
#, c-format
msgid "'%s' is not a stash-like commit"
msgstr "«%s» no és una comissió de tipus «stash»"
#: builtin/stash.c
+msgid "No stash entries found."
+msgstr "No s'ha trobat cap entrada «stash»."
+
+#: builtin/stash.c
#, c-format
msgid "Too many revisions specified:%s"
msgstr "S'han especificat massa revisions:%s"
#: builtin/stash.c
-msgid "No stash entries found."
-msgstr "No s'ha trobat cap entrada «stash»."
-
-#: builtin/stash.c
#, c-format
msgid "%s is not a valid reference"
msgstr "«%s» no és una referència vàlida"
@@ -15942,6 +16230,88 @@
msgid "include ignore files"
msgstr "inclou els fitxers ignorats"
+#: builtin/stash.c
+#, c-format
+msgid "cannot parse commit %s"
+msgstr "no s'ha pogut analitzar la comissió %s"
+
+#: builtin/stash.c
+#, c-format
+msgid "invalid author or committer for %s"
+msgstr "autor o comissor invàlid per a %s"
+
+#: builtin/stash.c
+msgid "could not write commit"
+msgstr "no s'ha pogut escriure la comissió"
+
+#: builtin/stash.c
+#, c-format
+msgid "not a valid revision: %s"
+msgstr "«%s» no és una revisió vàlida"
+
+#: builtin/stash.c
+#, c-format
+msgid "not a commit: %s"
+msgstr "no és una comissió: «%s»"
+
+#: builtin/stash.c
+#, c-format
+msgid "%s is not a valid exported stash commit"
+msgstr "«%s» no és una comissió de «stash» exportada vàlida"
+
+#: builtin/stash.c
+#, c-format
+msgid "found root commit %s with invalid data"
+msgstr "s'ha trobat la comissió %s amb dades invàlides"
+
+#: builtin/stash.c
+#, c-format
+msgid "found stash commit %s without expected prefix"
+msgstr "s'ha trobat una comissió de «stash» %s sense el prefix esperat"
+
+#: builtin/stash.c
+#, c-format
+msgid "cannot parse parents of commit: %s"
+msgstr "no es poden analitzar els pares de la comissió: %s"
+
+#: builtin/stash.c
+#, c-format
+msgid "%s does not look like a stash commit"
+msgstr "«%s» no sembla una comissió de «stash»"
+
+#: builtin/stash.c
+#, c-format
+msgid "cannot read commit buffer for %s"
+msgstr "no es pot llegir la memòria intermèdia de comissió per a %s"
+
+#: builtin/stash.c
+#, c-format
+msgid "cannot save the stash for %s"
+msgstr "no es pot desar l'«stash» per a %s"
+
+#: builtin/stash.c
+msgid "unable to write base commit"
+msgstr "no s'ha pogut escriure la comissió base %s"
+
+#: builtin/stash.c
+#, c-format
+msgid "unable to find stash entry %s"
+msgstr "no s'ha pogut trobar l'entrada de «stash» %s"
+
+#: builtin/stash.c
+msgid "print the object ID instead of writing it to a ref"
+msgstr ""
+"imprimeix l'identificador de l'objecte en comptes d'escriure'l en una "
+"referència"
+
+#: builtin/stash.c
+msgid "save the data to the given ref"
+msgstr "desa les dades en la referència donada"
+
+#: builtin/stash.c
+msgid "exactly one of --print and --to-ref is required"
+msgstr "es requereix exactament una de --print i --to-ref"
+
#: builtin/stripspace.c
msgid "skip and remove all lines starting with comment character"
msgstr ""
@@ -15953,16 +16323,6 @@
#: builtin/submodule--helper.c
#, c-format
-msgid "Expecting a full ref name, got %s"
-msgstr "S'espera un nom de referència ple, s'ha rebut %s"
-
-#: builtin/submodule--helper.c
-#, c-format
-msgid "could not get a repository handle for submodule '%s'"
-msgstr "no s'ha pogut obtenir el gestor del repositori pel submòdul «%s»"
-
-#: builtin/submodule--helper.c
-#, c-format
msgid ""
"could not look up configuration '%s'. Assuming this repository is its own "
"authoritative upstream."
@@ -15972,6 +16332,11 @@
#: builtin/submodule--helper.c
#, c-format
+msgid "could not get a repository handle for submodule '%s'"
+msgstr "no s'ha pogut obtenir el gestor del repositori pel submòdul «%s»"
+
+#: builtin/submodule--helper.c
+#, 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"
@@ -16298,7 +16663,7 @@
msgstr ""
"git submodule--helper clone [--prefix=<camí>] [--quiet] [--reference "
"<repositori>] [--name <nom>] [--depth <depth>] [--single-branch] [--filter "
-"<filter-spec>] --url <url> --path <camí>"
+"<especificacio-filtre>] --url <url> --path <camí>"
#: builtin/submodule--helper.c
#, c-format
@@ -16412,6 +16777,11 @@
#: builtin/submodule--helper.c
#, c-format
+msgid "Expecting a full ref name, got %s"
+msgstr "S'espera un nom de referència ple, s'ha rebut %s"
+
+#: builtin/submodule--helper.c
+#, c-format
msgid "Unable to find current revision in submodule path '%s'"
msgstr "No s'ha pogut trobar la revisió actual al camí del submòdul «%s»"
@@ -16490,10 +16860,10 @@
"shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] "
"[--] [<path>...]"
msgstr ""
-"git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] "
-"[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-"
-"shallow] [--reference <repositori>] [--recursive] [--[no-]single-branch] "
-"[--] [<camí>...]"
+"git submodule [--quiet] update [--init [--filter=<especificacio-filtre>]] [--"
+"remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--"
+"[no-]recommend-shallow] [--reference <repositori>] [--recursive] [--"
+"[no-]single-branch] [--] [<camí>...]"
#: builtin/submodule--helper.c submodule.c
msgid "Failed to resolve HEAD as a valid ref."
@@ -16665,6 +17035,11 @@
#: builtin/submodule--helper.c
#, c-format
+msgid "submodule name '%s' already used for path '%s'"
+msgstr "el nom de submòdul «%s» ja s'usa per al camí «%s»"
+
+#: builtin/submodule--helper.c
+#, c-format
msgid "'%s' is not a valid submodule name"
msgstr "«%s» no és un nom de submòdul vàlid"
@@ -16714,7 +17089,7 @@
" [(--trailer <token>[(=|:)<value>])...]\n"
" <tagname> [<commit> | <object>]"
msgstr ""
-"git tag [-a | -s | -u <id-clau>] [-f] [-m <missatge> | -F <fitxer>] [-e]\n"
+"git tag [-a | -s | -u <id-clau>] [-f] [-m <msg> | -F <fitxer>] [-e]\n"
" [(--trailer <token>[(=|:)<valor>])...]\n"
" <nom-etiqueta> [<comissió> | <objecte>]"
@@ -17219,8 +17594,8 @@
msgstr "git update-ref [<opcions>] <nom-referència> <oid-nou> [<oid-vell>]"
#: builtin/update-ref.c
-msgid "git update-ref [<options>] --stdin [-z]"
-msgstr "git update-ref [<opcions>] --stdin [-z]"
+msgid "git update-ref [<options>] --stdin [-z] [--batch-updates]"
+msgstr "git update-ref [<opcions>] --stdin [-z] [--batch-updates]"
#: builtin/update-ref.c
msgid "delete the reference"
@@ -17238,6 +17613,10 @@
msgid "read updates from stdin"
msgstr "llegeix les actualitzacions des de stdin"
+#: builtin/update-ref.c
+msgid "batch reference updates"
+msgstr "actualitzacions de les referències de batch"
+
#: builtin/update-server-info.c
msgid "update the info files from scratch"
msgstr "actualitza els fitxers d'informació des de zero"
@@ -17464,11 +17843,6 @@
#: builtin/worktree.c
#, c-format
-msgid "unreachable: invalid reference: %s"
-msgstr "no accessible: referència no vàlida: %s"
-
-#: builtin/worktree.c
-#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "S'està preparant l'arbre de treball (HEAD %s separat)"
@@ -17529,6 +17903,10 @@
"prova de fer coincidir el nom de la branca nova amb una branca amb seguiment "
"remot"
+#: builtin/worktree.c
+msgid "use relative paths for worktrees"
+msgstr "usa camins relatius per als arbres de treball"
+
#: builtin/worktree.c diff.c parse-options.c
#, c-format
msgid "options '%s', '%s', and '%s' cannot be used together"
@@ -17602,7 +17980,7 @@
#: builtin/worktree.c
#, c-format
msgid "could not figure out destination name from '%s'"
-msgstr "no s'ha pogut deduir el nom de destí des de «%s»"
+msgstr "no s'ha pogut deduir el nom de destinació des de «%s»"
#: builtin/worktree.c
#, c-format
@@ -17610,7 +17988,7 @@
"cannot move a locked working tree, lock reason: %s\n"
"use 'move -f -f' to override or unlock first"
msgstr ""
-"no es pot moure un arbre de treball bloquejat, raó del bloqueig: %s\n"
+"no es pot moure un arbre de treball bloquejat, raó del blocatge: %s\n"
"useu primer «move -f -f» per a sobreescriure'l o desbloquejar-lo primer"
#: builtin/worktree.c
@@ -17658,7 +18036,7 @@
"cannot remove a locked working tree, lock reason: %s\n"
"use 'remove -f -f' to override or unlock first"
msgstr ""
-"no es pot suprimir un arbre de treball bloquejat, raó del bloqueig: %s\n"
+"no es pot suprimir un arbre de treball bloquejat, raó del blocatge: %s\n"
"useu primer «remove -f -f» per a sobreescriure'l o desbloquejar-lo"
#: builtin/worktree.c
@@ -17873,6 +18251,32 @@
msgid "index-pack died"
msgstr "l'index-pack s'ha mort"
+#: cache-tree.c
+#, c-format
+msgid "directory '%s' is present in index, but not sparse"
+msgstr "El directori %s és en l'índex però no és dispers"
+
+#: cache-tree.c unpack-trees.c
+msgid "corrupted cache-tree has entries not present in index"
+msgstr "el cache-tree corromput té entrades que no apareixen en l'índex"
+
+#: cache-tree.c
+#, c-format
+msgid "%s with flags 0x%x should not be in cache-tree"
+msgstr "%s amb els indicadors 0x%x no hauria de ser en el cache-tree"
+
+#: cache-tree.c
+#, c-format
+msgid "bad subtree '%.*s'"
+msgstr "subarbre incorrecte «%.*s»"
+
+#: cache-tree.c
+#, c-format
+msgid "cache-tree for path %.*s does not match. Expected %s got %s"
+msgstr ""
+"el cache-tree per al camí %.*s no coincideix. S'esperava %s i s'ha obtingut "
+"%s"
+
#: chunk-format.c
msgid "terminating chunk id appears earlier than expected"
msgstr ""
@@ -17932,6 +18336,10 @@
msgstr "Crea un arxiu de fitxers des d'un arbre amb nom"
#: command-list.h
+msgid "Download missing objects in a partial clone"
+msgstr "Descarrega els objectes que manquen en un clon parcial"
+
+#: command-list.h
msgid "Use binary search to find the commit that introduced a bug"
msgstr "Troba per cerca binària el canvi que hagi introduït un defecte"
@@ -18076,6 +18484,10 @@
msgstr "Compara un arbre amb l'arbre de treball o l'índex"
#: command-list.h
+msgid "Compare the content and mode of provided blob pairs"
+msgstr "Compara el contingut i el mode dels blobs proporcionats"
+
+#: command-list.h
msgid "Compares the content and mode of blobs found via two tree objects"
msgstr ""
"Compara el contingut i el mode dels blobs trobats a través de dos objectes "
@@ -19048,13 +19460,13 @@
"to convert the grafts into replace refs.\n"
"\n"
"Turn this message off by running\n"
-"\"git config advice.graftFileDeprecated false\""
+"\"git config set advice.graftFileDeprecated false\""
msgstr ""
"La compatibilitat amb <GIT_DIR>/info/grafts és obsoleta\n"
"i s'eliminarà en una futura versió del Git.\n"
"\n"
"Useu «git replace --convert-graft-file»\n"
-"per a convertir els grafs en referències de reemplaçament.\n"
+"per a convertir els empelts en referències de reemplaçament.\n"
"\n"
"Desactiveu aquest missatge executant\n"
"«git config advice.graftFileDeprecated false»"
@@ -19395,12 +19807,12 @@
#: config.c
#, c-format
msgid "missing environment variable name for configuration '%.*s'"
-msgstr "falta el nom de la variable d'entorn per a la configuració «%.*s»"
+msgstr "manca el nom de la variable d'entorn per a la configuració «%.*s»"
#: config.c
#, c-format
msgid "missing environment variable '%s' for configuration '%.*s'"
-msgstr "falta la variable d'entorn «%s» per a la configuració «%.*s»"
+msgstr "hi manca la variable d'entorn «%s» per a la configuració «%.*s»"
#: config.c
#, c-format
@@ -19449,12 +19861,12 @@
#: config.c
#, c-format
msgid "missing config key %s"
-msgstr "falta la clau de configuració %s"
+msgstr "hi manca la clau de configuració %s"
#: config.c
#, c-format
msgid "missing config value %s"
-msgstr "falta el valor de configuració %s"
+msgstr "hi manca el valor de configuració %s"
#: config.c
#, c-format
@@ -19536,16 +19948,6 @@
#: config.c
#, c-format
-msgid "invalid value for variable %s"
-msgstr "valor no vàlid per a la variable %s"
-
-#: config.c
-#, c-format
-msgid "ignoring unknown core.fsync component '%s'"
-msgstr "s'ignora el component core.fsync «%s» desconegut"
-
-#: config.c
-#, c-format
msgid "bad boolean config value '%s' for '%s'"
msgstr "valor de configuració booleà erroni «%s» per a «%s»"
@@ -19561,57 +19963,6 @@
#: config.c
#, c-format
-msgid "abbrev length out of range: %d"
-msgstr "la longitud d'«abbrev» està fora de rang: %d"
-
-#: config.c
-#, c-format
-msgid "bad zlib compression level %d"
-msgstr "nivell de compressió de zlib incorrecte %d"
-
-# newline → línia nova o salt de línia?
-#: config.c
-#, c-format
-msgid "%s cannot contain newline"
-msgstr "%s no pot contenir una nova línia"
-
-#: config.c
-#, c-format
-msgid "%s must have at least one character"
-msgstr "%s ha de tenir almenys un caràcter"
-
-#: config.c
-#, c-format
-msgid "ignoring unknown core.fsyncMethod value '%s'"
-msgstr "s'ignora el valor desconegut «%s» de core.fsyncMethod"
-
-#: config.c
-msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
-msgstr "core.fsyncObjectFiles és obsolet; useu core.fsync"
-
-#: config.c
-#, c-format
-msgid "invalid mode for object creation: %s"
-msgstr "mode de creació d'objecte no vàlid: %s"
-
-#: config.c
-#, c-format
-msgid "malformed value for %s"
-msgstr "valor no vàlid per a %s"
-
-#: config.c
-#, c-format
-msgid "malformed value for %s: %s"
-msgstr "valor no vàlid per a %s: %s"
-
-#: config.c
-msgid "must be one of nothing, matching, simple, upstream or current"
-msgstr ""
-"ha de ser un dels elements següents: nothing, matching, simple, upstream o "
-"current"
-
-#: config.c
-#, c-format
msgid "unable to load config blob object '%s'"
msgstr "no s'ha pogut carregar l'objecte blob de configuració «%s»"
@@ -19727,7 +20078,7 @@
#: config.c
#, c-format
msgid "missing value for '%s'"
-msgstr "falta el valor per «%s»"
+msgstr "hi manca el valor per a «%s»"
#: connect.c
msgid "the remote end hung up upon initial contact"
@@ -20086,6 +20437,21 @@
msgid "credential url cannot be parsed: %s"
msgstr "no s'ha pogut analitzar l'URL de credencials: %s"
+#: daemon.c
+#, c-format
+msgid "invalid timeout '%s', expecting a non-negative integer"
+msgstr "el temps d'espera «%s» és invàlid; s'espera un enter no negatiu"
+
+#: daemon.c
+#, c-format
+msgid "invalid init-timeout '%s', expecting a non-negative integer"
+msgstr "init-timeout invàlid «%s»; s'espera un enter no negatiu"
+
+#: daemon.c
+#, c-format
+msgid "invalid max-connections '%s', expecting an integer"
+msgstr "max-connections «%s» invàlid; s'espera un enter"
+
#: date.c
msgid "in the future"
msgstr "en el futur"
@@ -20189,7 +20555,7 @@
#: diagnose.c
#, c-format
msgid "could not archive missing directory '%s'"
-msgstr "no s'ha pogut arxivar el directori que falta «%s»"
+msgstr "no s'ha pogut arxivar el directori que hi manca «%s»"
#: diagnose.c dir.c
#, c-format
@@ -20239,8 +20605,9 @@
msgstr "no es pot comparar una canonada amb nom amb un directori"
#: diff-no-index.c
-msgid "git diff --no-index [<options>] <path> <path>"
-msgstr "git diff --no-index [<opcions>] <camí> <camí>"
+msgid "git diff --no-index [<options>] <path> <path> [<pathspec>...]"
+msgstr ""
+"git diff --no-index [<opcions>] <camí> <camí> [<especificacio-camí>...]"
#: diff-no-index.c
msgid ""
@@ -20250,6 +20617,14 @@
"No és un repositori Git. Useu --no-index per a comparar dos camins fora del "
"directori de treball"
+#: diff-no-index.c
+msgid ""
+"Limiting comparison with pathspecs is only supported if both paths are "
+"directories."
+msgstr ""
+"La comparació limitada entre especificacions de camí només s'admet si els "
+"dos camins són directoris."
+
#: diff.c
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
@@ -20294,7 +20669,7 @@
msgstr ""
"Valor desconegut de la variable de configuració de «diff.submodule»: «%s»"
-#: diff.c merge-recursive.c transport.c
+#: diff.c merge-ort.c transport.c
#, c-format
msgid "unknown value for config '%s': %s"
msgstr "valor desconegut per al config «%s»': %s"
@@ -20404,6 +20779,14 @@
msgstr "expressió regular donada a -I: no vàlida: «%s»"
#: diff.c
+msgid "-G requires a non-empty argument"
+msgstr "-G requires a non-empty argument"
+
+#: diff.c
+msgid "-S requires a non-empty argument"
+msgstr "-S requereix un argument no buit"
+
+#: diff.c
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr ""
@@ -20426,7 +20809,7 @@
msgid "<n>"
msgstr "<n>"
-#: diff.c
+#: diff.c parse-options.h
msgid "generate diffs with <n> lines context"
msgstr "genera diffs amb <n> línies de context"
@@ -20574,13 +20957,13 @@
#: diff.c
msgid "do not show any source or destination prefix"
-msgstr "no mostris cap prefix d'origen o destí"
+msgstr "no mostris cap prefix d'origen o de destinació"
#: diff.c
msgid "use default prefixes a/ and b/"
msgstr "utilitza els prefixos per defecte a/ i b/"
-#: diff.c
+#: diff.c parse-options.h
msgid "show context between diff hunks up to the specified number of lines"
msgstr ""
"mostra el context entre trossos de diferència fins al nombre especificat de "
@@ -20993,12 +21376,89 @@
msgid "bad git namespace path \"%s\""
msgstr "camí d'espai de noms git incorrecte «%s»"
+#: environment.c
+#, c-format
+msgid "invalid value for variable %s"
+msgstr "valor no vàlid per a la variable %s"
+
+#: environment.c
+#, c-format
+msgid "ignoring unknown core.fsync component '%s'"
+msgstr "s'ignora el component core.fsync «%s» desconegut"
+
+#: environment.c
+#, c-format
+msgid "abbrev length out of range: %d"
+msgstr "la longitud d'«abbrev» està fora de rang: %d"
+
+#: environment.c
+#, c-format
+msgid "bad zlib compression level %d"
+msgstr "nivell de compressió de zlib incorrecte %d"
+
+# newline → línia nova o salt de línia?
+#: environment.c
+#, c-format
+msgid "%s cannot contain newline"
+msgstr "%s no pot contenir una nova línia"
+
+#: environment.c
+#, c-format
+msgid "%s must have at least one character"
+msgstr "%s ha de tenir almenys un caràcter"
+
+#: environment.c
+#, c-format
+msgid "ignoring unknown core.fsyncMethod value '%s'"
+msgstr "s'ignora el valor desconegut «%s» de core.fsyncMethod"
+
+#: environment.c
+msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
+msgstr "core.fsyncObjectFiles és obsolet; useu core.fsync"
+
+#: environment.c
+#, c-format
+msgid "invalid mode for object creation: %s"
+msgstr "mode de creació d'objecte no vàlid: %s"
+
+#: environment.c
+#, c-format
+msgid "malformed value for %s"
+msgstr "valor no vàlid per a %s"
+
+#: environment.c
+#, c-format
+msgid "malformed value for %s: %s"
+msgstr "valor no vàlid per a %s: %s"
+
+#: environment.c
+msgid "must be one of nothing, matching, simple, upstream or current"
+msgstr ""
+"ha de ser un dels elements següents: nothing, matching, simple, upstream o "
+"current"
+
#: exec-cmd.c
#, c-format
msgid "too many args to run %s"
msgstr "hi ha massa arguments per a executar %s"
#: fetch-pack.c
+#, c-format
+msgid ""
+"You are attempting to fetch %s, which is in the commit graph file but not in "
+"the object database.\n"
+"This is probably due to repo corruption.\n"
+"If you are attempting to repair this repo corruption by refetching the "
+"missing object, use 'git fetch --refetch' with the missing object."
+msgstr ""
+"Esteu intentant obtenir %s, el qual és en el graf de comissions però no en "
+"la base de dades d'objectes\n"
+"Això és degut probablement a la corrupció del repositori.\n"
+"Si el que voleu és intentar reparar aquesta corrupció de repositori "
+"reobtenint l'objecte que manca, useu 'git fetch --refetch' amb l'objecte que "
+"manca"
+
+#: fetch-pack.c
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: llista shallow esperada"
@@ -21506,7 +21966,9 @@
#: gpg-interface.c
#, c-format
msgid "failed writing ssh signing key buffer to '%s'"
-msgstr "s'ha produït un error en escriure la clau de signatura ssh a «%s»"
+msgstr ""
+"s'ha produït un error en escriure la memòria intermèdia de la clau de "
+"signatura ssh a «%s»"
#: gpg-interface.c
msgid ""
@@ -21519,7 +21981,9 @@
#: gpg-interface.c
#, c-format
msgid "failed reading ssh signing data buffer from '%s'"
-msgstr "s'ha produït un error en llegir la signatura ssh des de «%s»"
+msgstr ""
+"s'ha produït un error en llegir la memòria intermèdia de les dades de "
+"signatura ssh des de «%s»"
#: graph.c
#, c-format
@@ -21722,10 +22186,10 @@
#, c-format
msgid ""
"The '%s' hook was ignored because it's not set as executable.\n"
-"You can disable this warning with `git config advice.ignoredHook false`."
+"You can disable this warning with `git config set advice.ignoredHook false`."
msgstr ""
"El lligam «%s» s'ha ignorat perquè no s'ha establert com a executable.\n"
-"Podeu desactivar aquest avís amb «git config advice.ignoredHook false»."
+"Podeu desactivar aquest avís amb «git config advice.ignoredHook false». "
#: http-fetch.c
msgid "not a git repository"
@@ -21746,16 +22210,13 @@
msgstr "No s'admet el control de delegació amb el cURL < 7.22.0"
#: http.c
-msgid "Public key pinning not supported with cURL < 7.39.0"
-msgstr "No s'admet la fixació de clau pública amb cURL < 7.39.0"
-
-#: http.c
msgid "Unknown value for http.proactiveauth"
msgstr "Valor desconegut de http.proactiveauth"
-#: http.c
-msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
-msgstr "CURLSSLOPT_NO_REVOKE no està admès amb cURL < 7.44.0"
+#: http.c parse.c
+#, c-format
+msgid "failed to parse %s"
+msgstr "s'ha produït un error en analitzar %s"
#: http.c
#, c-format
@@ -21859,6 +22320,35 @@
msgid "name consists only of disallowed characters: %s"
msgstr "el nom conté només caràcters no permesos: %s"
+#: imap-send.c
+msgid "git imap-send [-v] [-q] [--[no-]curl] [(--folder|-f) <folder>] < <mbox>"
+msgstr ""
+"git imap-send [-v] [-q] [--[no-]curl] [(--folder|-f) <carpeta>] < <bustia>"
+
+#: imap-send.c
+msgid "no IMAP host specified"
+msgstr "cap màquina IMAP especificada"
+
+#: imap-send.c
+msgid ""
+"set the IMAP host with 'git config imap.host <host>'.\n"
+"(e.g., 'git config imap.host imaps://imap.example.com')"
+msgstr ""
+"establiu la màquina d'IMAP amb 'git config imap.host <maquina>'.\n"
+"(p. ex., 'git config imap.host imaps://imap.example.com')"
+
+#: imap-send.c
+msgid "no IMAP folder specified"
+msgstr "cap carpeta IMAP especificada"
+
+#: imap-send.c
+msgid ""
+"set the target folder with 'git config imap.folder <folder>'.\n"
+"(e.g., 'git config imap.folder Drafts')"
+msgstr ""
+"establiu la carpeta de destinació amb 'git config imap.folder <carpeta>'.\n"
+"(p. ex., 'git config imap.folder Drafts')"
+
#: list-objects-filter-options.c
msgid "expected 'tree:<depth>'"
msgstr "s'esperava «tree:<profunditat>»"
@@ -21986,7 +22476,17 @@
msgid "unable to format message: %s"
msgstr "no es pot formatar el missatge: %s"
-#: merge-ort.c merge-recursive.c
+#: merge-ll.c
+#, c-format
+msgid "invalid marker-size '%s', expecting an integer"
+msgstr "marker-size «%s» invàlid; s'esperava un enter"
+
+#: merge-ort-wrappers.c
+#, c-format
+msgid "Could not parse object '%s'"
+msgstr "No s'ha pogut analitzar l'objecte «%s»"
+
+#: merge-ort.c
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "S'ha produït un error en fusionar el submòdul %s (no està agafat)"
@@ -21996,7 +22496,7 @@
msgid "Failed to merge submodule %s (no merge base)"
msgstr "S'ha produït un error en fusionar el submòdul %s (no hi ha fusió base)"
-#: merge-ort.c merge-recursive.c
+#: merge-ort.c
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr "S'ha produït un error en fusionar el submòdul %s (no hi ha comissions)"
@@ -22007,7 +22507,7 @@
msgid "error: failed to merge submodule %s (repository corrupt)"
msgstr "error: no s'ha pogut fusionar el submòdul %s (repositori malmès)"
-#: merge-ort.c merge-recursive.c
+#: merge-ort.c
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr ""
@@ -22052,12 +22552,12 @@
msgid "error: unable to add %s to database"
msgstr "error: no es pot afegir %s a la base de dades"
-#: merge-ort.c merge-recursive.c
+#: merge-ort.c
#, c-format
msgid "Auto-merging %s"
msgstr "S'està autofusionant %s"
-#: merge-ort.c merge-recursive.c
+#: merge-ort.c
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -22067,7 +22567,7 @@
"existent a %s en forma de canvi del nom del directori implícit, posant-hi "
"els camins següents a: %s."
-#: merge-ort.c merge-recursive.c
+#: merge-ort.c
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -22088,7 +22588,7 @@
"%s; s'han canviat de nom a múltiples altres directoris, sense una destinació "
"per a la majoria dels fitxers."
-#: merge-ort.c merge-recursive.c
+#: merge-ort.c
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
@@ -22097,7 +22597,7 @@
"AVÍS: S'està evitant aplicar el canvi de nom %s -> %s a %s, perquè %s ell "
"mateix ja havia canviat de nom."
-#: merge-ort.c merge-recursive.c
+#: merge-ort.c
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -22106,7 +22606,7 @@
"Pedaç actualitzat: %s afegit a %s dins d'un directori que va canviar de nom "
"a %s; movent-lo a %s."
-#: merge-ort.c merge-recursive.c
+#: merge-ort.c
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -22115,7 +22615,7 @@
"Pedaç actualitzat: %s canviat al nom %s a %s, dins d'un directori que va "
"canviar de nom a %s; movent-lo a %s."
-#: merge-ort.c merge-recursive.c
+#: merge-ort.c
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -22124,7 +22624,7 @@
"CONFLICTE (ubicació del fitxer): %s afegit a %s dins d'un directori que va "
"canviar de nom a %s suggerint que potser hauria de moure's a %s."
-#: merge-ort.c merge-recursive.c
+#: merge-ort.c
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -22196,19 +22696,19 @@
"canviat el nom d'un d'ells per tal que cadascun pugui ser registrat en algun "
"lloc."
-#: merge-ort.c merge-recursive.c
+#: merge-ort.c
msgid "content"
msgstr "contingut"
-#: merge-ort.c merge-recursive.c
+#: merge-ort.c
msgid "add/add"
msgstr "afegiment/afegiment"
-#: merge-ort.c merge-recursive.c
+#: merge-ort.c
msgid "submodule"
msgstr "submòdul"
-#: merge-ort.c merge-recursive.c
+#: merge-ort.c
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "CONFLICTE (%s): Conflicte de fusió en %s"
@@ -22271,329 +22771,6 @@
msgstr ""
"ha fallat la recollida de la informació de fusió per als arbres %s, %s, %s"
-#: merge-recursive.c
-msgid "(bad commit)\n"
-msgstr "(comissió errònia)\n"
-
-#: merge-recursive.c
-#, c-format
-msgid "add_cacheinfo failed for path '%s'; merge aborting."
-msgstr "add_cacheinfo ha fallat per al camí «%s»; interrompent la fusió."
-
-#: merge-recursive.c
-#, c-format
-msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
-msgstr ""
-"add_cacheinfo ha fallat al refrescar el camí «%s»; interrompent la fusió."
-
-#: merge-recursive.c
-#, c-format
-msgid "failed to create path '%s'%s"
-msgstr "s'ha produït un error en crear el camí «%s»%s"
-
-#: merge-recursive.c
-#, c-format
-msgid "Removing %s to make room for subdirectory\n"
-msgstr "S'està eliminant %s per a fer espai per al subdirectori\n"
-
-#: merge-recursive.c
-msgid ": perhaps a D/F conflict?"
-msgstr ": potser un conflicte D/F?"
-
-#: merge-recursive.c
-#, c-format
-msgid "refusing to lose untracked file at '%s'"
-msgstr "s'està refusant perdre el fitxer no seguit a «%s»"
-
-#: merge-recursive.c
-#, c-format
-msgid "blob expected for %s '%s'"
-msgstr "blob esperat per a %s «%s»"
-
-#: merge-recursive.c
-#, c-format
-msgid "failed to open '%s': %s"
-msgstr "s'ha produït un error en obrir «%s»: %s"
-
-#: merge-recursive.c
-#, c-format
-msgid "failed to symlink '%s': %s"
-msgstr "s'ha produït un error en fer l'enllaç simbòlic «%s»: %s"
-
-#: merge-recursive.c
-#, c-format
-msgid "do not know what to do with %06o %s '%s'"
-msgstr "no se sap què fer amb %06o %s «%s»"
-
-#: merge-recursive.c
-#, c-format
-msgid "Failed to merge submodule %s (repository corrupt)"
-msgstr "No s'ha pogut fusionar el submòdul %s (repositori malmès)"
-
-#: merge-recursive.c
-#, c-format
-msgid "Fast-forwarding submodule %s to the following commit:"
-msgstr "Avançament ràpid del submòdul %s a la següent comissió:"
-
-#: merge-recursive.c
-#, c-format
-msgid "Fast-forwarding submodule %s"
-msgstr "Avançament ràpid al submòdul %s"
-
-#: merge-recursive.c
-#, c-format
-msgid "Failed to merge submodule %s (merge following commits not found)"
-msgstr ""
-"Ha fallat en fusionar el submòdul %s (no s'ha trobat les comissions següents)"
-
-#: merge-recursive.c
-#, c-format
-msgid "Failed to merge submodule %s (not fast-forward)"
-msgstr ""
-"S'ha produït un error en fusionar el submòdul %s (sense avançament ràpid)"
-
-#: merge-recursive.c
-msgid "Found a possible merge resolution for the submodule:\n"
-msgstr "S'ha trobat una possible resolució de fusió pel submòdul:\n"
-
-#: merge-recursive.c
-#, c-format
-msgid ""
-"If this is correct simply add it to the index for example\n"
-"by using:\n"
-"\n"
-" git update-index --cacheinfo 160000 %s \"%s\"\n"
-"\n"
-"which will accept this suggestion.\n"
-msgstr ""
-"Si això és correcte simplement afegiu-ho a l'índex per exemple\n"
-"utilitzant:\n"
-"\n"
-" git update-index --cacheinfo 160000 %s «%s»\n"
-"\n"
-"que acceptarà aquest suggeriment.\n"
-
-#: merge-recursive.c
-#, c-format
-msgid "Failed to merge submodule %s (multiple merges found)"
-msgstr ""
-"S'ha produït un error en fusionar el submòdul %s (s'han trobat múltiples "
-"fusions)"
-
-#: merge-recursive.c
-msgid "failed to execute internal merge"
-msgstr "no s'ha pogut executar la fusió interna"
-
-#: merge-recursive.c
-#, c-format
-msgid "unable to add %s to database"
-msgstr "no s'ha pogut afegir %s a la base de dades"
-
-#: merge-recursive.c
-#, c-format
-msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
-msgstr ""
-"Error: s'està refusant perdre el fitxer no seguit a %s; en comptes s'ha "
-"escrit a %s."
-
-#: merge-recursive.c
-#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree."
-msgstr ""
-"CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s "
-"s'ha deixat en l'arbre."
-
-#: merge-recursive.c
-#, 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
-#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree at %s."
-msgstr ""
-"CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s "
-"s'ha deixat en l'arbre a %s."
-
-#: merge-recursive.c
-#, 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
-msgid "rename"
-msgstr "canvi de nom"
-
-#: merge-recursive.c
-msgid "renamed"
-msgstr "canviat de nom"
-
-#: merge-recursive.c
-#, c-format
-msgid "Refusing to lose dirty file at %s"
-msgstr "S'està refusant a perdre el fitxer brut a %s"
-
-#: merge-recursive.c
-#, c-format
-msgid "Refusing to lose untracked file at %s, even though it's in the way."
-msgstr ""
-"S'està refusant perdre el fitxer no seguit a «%s», malgrat que està en mig "
-"de l'operació."
-
-#: merge-recursive.c
-#, c-format
-msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
-msgstr ""
-"CONFLICTE (canvi de nom/afegiment): Canvi de nom %s->%s a %s. S'ha afegit "
-"%s a %s"
-
-#: merge-recursive.c
-#, 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
-#, c-format
-msgid "Refusing to lose untracked file at %s; adding as %s instead"
-msgstr ""
-"S'està refusant perdre el fitxer no seguit a %s; en comptes, s'està afegint "
-"com a %s"
-
-#: merge-recursive.c
-#, c-format
-msgid ""
-"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename "
-"\"%s\"->\"%s\" in \"%s\"%s"
-msgstr ""
-"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom «%s»->«%s» en la branca "
-"«%s» canvi de nom «%s»->«%s» en «%s»%s"
-
-#: merge-recursive.c
-msgid " (left unresolved)"
-msgstr " (deixat sense resolució)"
-
-#: merge-recursive.c
-#, 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
-#, c-format
-msgid ""
-"CONFLICT (directory rename split): Unclear where to place %s because "
-"directory %s was renamed to multiple other directories, with no destination "
-"getting a majority of the files."
-msgstr ""
-"CONFLICTE (divisió de canvi de nom de directori): no està clar on col·locar "
-"%s perquè el directori %s s'han canviat de nom a múltiples altres "
-"directoris, sense una destinació per a la majoria dels fitxers."
-
-#: merge-recursive.c
-#, c-format
-msgid ""
-"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
-">%s in %s"
-msgstr ""
-"CONFLICTE (canvi de nom/canvi de nom): canvi de nom %s->%s en %s. Canvi de "
-"nom de directori %s->%s en %s"
-
-#: merge-recursive.c
-#, c-format
-msgid "cannot read object %s"
-msgstr "no es pot llegir l'objecte %s"
-
-#: merge-recursive.c
-#, c-format
-msgid "object %s is not a blob"
-msgstr "l'objecte %s no és un blob"
-
-#: merge-recursive.c
-msgid "modify"
-msgstr "modificació"
-
-#: merge-recursive.c
-msgid "modified"
-msgstr "modificat"
-
-#: merge-recursive.c
-#, 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
-#, c-format
-msgid "Adding as %s instead"
-msgstr "S'està afegint com a %s en lloc d'això"
-
-#: merge-recursive.c
-#, c-format
-msgid "Removing %s"
-msgstr "S'està eliminant %s"
-
-#: merge-recursive.c
-msgid "file/directory"
-msgstr "fitxer/directori"
-
-#: merge-recursive.c
-msgid "directory/file"
-msgstr "directori/fitxer"
-
-#: merge-recursive.c
-#, 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
-#, c-format
-msgid "Adding %s"
-msgstr "S'està afegint %s"
-
-#: merge-recursive.c
-#, c-format
-msgid "CONFLICT (add/add): Merge conflict in %s"
-msgstr "CONFLICTE (afegiment/afegiment): Conflicte de fusió en %s"
-
-#: merge-recursive.c
-#, c-format
-msgid "merging of trees %s and %s failed"
-msgstr "la fusió dels arbres %s i %s ha fallat"
-
-#: merge-recursive.c
-msgid "Merging:"
-msgstr "S'està fusionant:"
-
-#: merge-recursive.c
-#, 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
-msgid "merge returned no commit"
-msgstr "la fusió no ha retornat cap comissió"
-
-#: merge-recursive.c
-#, c-format
-msgid "Could not parse object '%s'"
-msgstr "No s'ha pogut analitzar l'objecte «%s»"
-
#: merge.c
msgid "failed to read the cache"
msgstr "s'ha produït un error en llegir la memòria cau"
@@ -22647,16 +22824,17 @@
msgstr "no s'ha pogut netejar l'índex multipaquet a %s"
#: midx-write.c
-msgid "cannot write incremental MIDX with bitmap"
-msgstr "no es pot escriure un MIDX incremental amb mapa de bits"
-
-#: midx-write.c
msgid "ignoring existing multi-pack-index; checksum mismatch"
msgstr ""
"s'està ignorant l'índex multipaquet existent; la suma de verificació no "
"coincideix"
#: midx-write.c
+#, c-format
+msgid "could not load reverse index for MIDX %s"
+msgstr "no s'ha pogut carregar l'índex invers per al MIDX %s"
+
+#: midx-write.c
msgid "Adding packfiles to multi-pack-index"
msgstr "S'estan afegint fitxers empaquetats a l'índex multipaquet"
@@ -22762,8 +22940,8 @@
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr ""
-"la signatura de l'índex multipaquet 0x%08x no coincideix amb la signatura "
-"0x%08x"
+"la signatura de l'índex multipaquet 0x%08x no coincideix amb la signatura 0x"
+"%08x"
#: midx.c
#, c-format
@@ -22995,83 +23173,6 @@
#: object-file.c
#, c-format
-msgid "object directory %s does not exist; check .git/objects/info/alternates"
-msgstr ""
-"no existeix el directori d'objecte %s; comproveu .git/objects/info/alternates"
-
-#: object-file.c
-#, c-format
-msgid "unable to normalize alternate object path: %s"
-msgstr "no s'ha pogut normalitzar el camí a l'objecte alternatiu: %s"
-
-#: object-file.c
-#, c-format
-msgid "%s: ignoring alternate object stores, nesting too deep"
-msgstr ""
-"%s: s'estan ignorant els emmagatzematges alternatius d'objectes, imbricació "
-"massa profunda"
-
-#: object-file.c
-msgid "unable to fdopen alternates lockfile"
-msgstr "no s'ha pogut fer «fdopen» al fitxer de bloqueig alternatiu"
-
-#: object-file.c
-msgid "unable to read alternates file"
-msgstr "no es pot llegir el fitxer «alternates»"
-
-#: object-file.c
-msgid "unable to move new alternates file into place"
-msgstr "no s'ha pogut moure el nou fitxer «alternates» al lloc"
-
-#: object-file.c
-#, c-format
-msgid "path '%s' does not exist"
-msgstr "el camí «%s» no existeix"
-
-#: object-file.c
-#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr ""
-"encara no s'admet el repositori de referència «%s» com a agafament enllaçat."
-
-#: object-file.c
-#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr "el repositori de referència «%s» no és un repositori local."
-
-#: object-file.c
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr "el repositori de referència «%s» és superficial"
-
-#: object-file.c
-#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr "el repositori de referència «%s» és empeltat"
-
-#: object-file.c
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "no s'ha pogut trobar el directori de l'objecte que coincideixi amb %s"
-
-#: object-file.c
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr ""
-"línia no vàlida quan s'analitzaven les referències de l'«alternate»: %s"
-
-#: object-file.c
-#, c-format
-msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
-msgstr "s'està intentant fer mmap %<PRIuMAX> per sobre del límit %<PRIuMAX>"
-
-#: object-file.c
-#, c-format
-msgid "mmap failed%s"
-msgstr "mmap ha fallat%s"
-
-#: object-file.c
-#, c-format
msgid "object file %s is empty"
msgstr "el tipus d'objecte %s és buit"
@@ -23116,21 +23217,6 @@
#: object-file.c
#, c-format
-msgid "replacement %s not found for %s"
-msgstr "no s'ha trobat el reemplaçament %s per a %s"
-
-#: object-file.c
-#, c-format
-msgid "packed object %s (stored in %s) is corrupt"
-msgstr "l'objecte empaquetat %s (emmagatzemat a %s) és corrupte"
-
-#: object-file.c
-#, c-format
-msgid "missing mapping of %s to %s"
-msgstr "manca el mapatge de %s a %s"
-
-#: object-file.c
-#, c-format
msgid "unable to open %s"
msgstr "no s'ha pogut obrir %s"
@@ -23146,6 +23232,11 @@
#: object-file.c
#, c-format
+msgid "unable to write repeatedly vanishing file %s"
+msgstr "no puc escriure el fitxer %s que desapareix repetidament"
+
+#: object-file.c
+#, c-format
msgid "unable to set permission to '%s'"
msgstr "no s'ha pogut establir el permís a «%s»"
@@ -23244,11 +23335,6 @@
#: object-file.c
#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr "%s no és un objecte de «%s» vàlid"
-
-#: object-file.c
-#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "no coincideix el resum per a %s (s'esperava %s)"
@@ -23269,6 +23355,11 @@
#: object-file.c
#, c-format
+msgid "unable to parse type from header '%s' of %s"
+msgstr "no s'ha pogut analitzar el tipus de la capçalera «%s» de %s"
+
+#: object-file.c
+#, c-format
msgid "unable to unpack contents of %s"
msgstr "no s'han pogut desempaquetar els continguts de %s"
@@ -23362,7 +23453,7 @@
"\n"
"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
"examine these refs and maybe delete them. Turn this message off by\n"
-"running \"git config advice.objectNameWarning false\""
+"running \"git config set advice.objectNameWarning false\""
msgstr ""
"Git normalment mai crea una referència que acabi amb 40 caràcters\n"
"hexadecimals perquè s'ignorarà quan només especifiqueu 40 caràcters\n"
@@ -23473,6 +23564,93 @@
msgid "hash mismatch %s"
msgstr "el resum no coincideix %s"
+#: odb.c
+#, c-format
+msgid "object directory %s does not exist; check .git/objects/info/alternates"
+msgstr ""
+"no existeix el directori d'objecte %s; comproveu .git/objects/info/alternates"
+
+#: odb.c
+#, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr "no s'ha pogut normalitzar el camí a l'objecte alternatiu: %s"
+
+#: odb.c
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
+msgstr ""
+"%s: s'estan ignorant els emmagatzematges alternatius d'objectes, imbricació "
+"massa profunda"
+
+#: odb.c
+msgid "unable to fdopen alternates lockfile"
+msgstr "no s'ha pogut fer «fdopen» al fitxer de blocatge alternatiu"
+
+#: odb.c
+msgid "unable to read alternates file"
+msgstr "no es pot llegir el fitxer «alternates»"
+
+#: odb.c
+msgid "unable to move new alternates file into place"
+msgstr "no s'ha pogut moure el nou fitxer «alternates» al lloc"
+
+#: odb.c
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "el camí «%s» no existeix"
+
+#: odb.c
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr ""
+"encara no s'admet el repositori de referència «%s» com a agafament enllaçat."
+
+#: odb.c
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "el repositori de referència «%s» no és un repositori local."
+
+#: odb.c
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "el repositori de referència «%s» és superficial"
+
+#: odb.c
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "el repositori de referència «%s» és empeltat"
+
+#: odb.c
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "no s'ha pogut trobar el directori de l'objecte que coincideixi amb %s"
+
+#: odb.c
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr ""
+"línia no vàlida quan s'analitzaven les referències de l'«alternate»: %s"
+
+#: odb.c
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr "no s'ha trobat el reemplaçament %s per a %s"
+
+#: odb.c
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "l'objecte empaquetat %s (emmagatzemat a %s) és corrupte"
+
+#: odb.c
+#, c-format
+msgid "missing mapping of %s to %s"
+msgstr "manca el mapatge de %s a %s"
+
+#: odb.c
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "%s no és un objecte de «%s» vàlid"
+
#: pack-bitmap-write.c
#, c-format
msgid "duplicate entry when writing bitmap index: %s"
@@ -23487,10 +23665,6 @@
msgid "too many pseudo-merges"
msgstr "massa pseudo-fusions"
-#: pack-bitmap-write.c
-msgid "trying to write commit not in index"
-msgstr "s'està intentant no escriure la comissió a l'índex"
-
#: pack-bitmap.c
msgid "failed to load bitmap index (corrupted?)"
msgstr ""
@@ -23574,22 +23748,13 @@
#: pack-bitmap.c
msgid "multi-pack bitmap is missing required reverse index"
-msgstr "falta l'índex invers necessari al mapa de bits multipaquet"
+msgstr "hi manca l'índex invers necessari al mapa de bits multipaquet"
#: pack-bitmap.c
#, c-format
msgid "could not open pack %s"
msgstr "no s'ha pogut obrir el paquet %s"
-#: pack-bitmap.c t/helper/test-read-midx.c
-msgid "could not determine MIDX preferred pack"
-msgstr "no s'ha pogut determinar el paquet preferit MIDX"
-
-#: pack-bitmap.c
-#, c-format
-msgid "preferred pack (%s) is invalid"
-msgstr "el paquet preferit (%s) no és vàlid"
-
#: pack-bitmap.c
msgid "corrupt bitmap lookup table: triplet position out of index"
msgstr ""
@@ -23830,6 +23995,21 @@
#: parse-options.c
#, c-format
+msgid "value for %s exceeds %<PRIdMAX>"
+msgstr "el valor de %s supera %<PRIdMAX> "
+
+#: parse-options.c
+#, c-format
+msgid "value %s for %s not in range [%<PRIdMAX>,%<PRIdMAX>]"
+msgstr "el valor %s de %s no està dins del rang [%<PRIdMAX>,%<PRIdMAX>]"
+
+#: parse-options.c
+#, c-format
+msgid "%s expects an integer value with an optional k/m/g suffix"
+msgstr "%s espera un valor enter amb un sufix opcional k/m/g"
+
+#: parse-options.c
+#, c-format
msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
msgstr "%s espera un valor enter no negatiu amb un sufix opcional k/m/g"
@@ -23867,6 +24047,55 @@
msgid "unknown non-ascii option in string: `%s'"
msgstr "opció no ascii desconeguda en la cadena: «%s»"
+#. TRANSLATORS: The "<%s>" part of this string
+#. stands for an optional value given to a command
+#. line option in the long form, and "<>" is there
+#. as a convention to signal that it is a
+#. placeholder (i.e. the user should substitute it
+#. with the real value). If your language uses a
+#. different convention, you can change "<%s>" part
+#. to match yours, e.g. it might use "|%s|" instead,
+#. or if the alphabet is different enough it may use
+#. "%s" without any placeholder signal. Most
+#. translations leave this message as is.
+#.
+#: parse-options.c
+#, c-format
+msgid "[=<%s>]"
+msgstr "[=<%s>]"
+
+#. TRANSLATORS: The "<%s>" part of this string
+#. stands for an optional value given to a command
+#. line option in the short form, and "<>" is there
+#. as a convention to signal that it is a
+#. placeholder (i.e. the user should substitute it
+#. with the real value). If your language uses a
+#. different convention, you can change "<%s>" part
+#. to match yours, e.g. it might use "|%s|" instead,
+#. or if the alphabet is different enough it may use
+#. "%s" without any placeholder signal. Most
+#. translations leave this message as is.
+#.
+#: parse-options.c
+#, c-format
+msgid "[<%s>]"
+msgstr "[<%s>]"
+
+#. TRANSLATORS: The "<%s>" part of this string stands for a
+#. value given to a command line option, and "<>" is there
+#. as a convention to signal that it is a placeholder
+#. (i.e. the user should substitute it with the real value).
+#. If your language uses a different convention, you can
+#. change "<%s>" part to match yours, e.g. it might use
+#. "|%s|" instead, or if the alphabet is different enough it
+#. may use "%s" without any placeholder signal. Most
+#. translations leave this message as is.
+#.
+#: parse-options.c
+#, c-format
+msgid " <%s>"
+msgstr " <%s>"
+
#: parse-options.c
msgid "..."
msgstr "..."
@@ -23966,10 +24195,24 @@
msgid "bad boolean environment value '%s' for '%s'"
msgstr "el valor «%s» booleà de l'entorn és incorrecte per a «%s»"
-#: parse.c
+#: path-walk.c
#, c-format
-msgid "failed to parse %s"
-msgstr "s'ha produït un error en analitzar %s"
+msgid "failed to walk children of tree %s: not found"
+msgstr "no s'ha pogut recórrer els descendents de l'arbre %s: no s'han trobat"
+
+#: path-walk.c
+#, c-format
+msgid "failed to find object %s"
+msgstr "no s'ha pogut trobar l'objecte %s"
+
+#: path-walk.c
+#, c-format
+msgid "failed to find tag %s"
+msgstr "no s'ha pogut trobar l'etiqueta %s"
+
+#: path-walk.c
+msgid "failed to setup revision walk"
+msgstr "no s'ha pogut configurar un recorregut de revisió"
#: path.c
#, c-format
@@ -24165,6 +24408,31 @@
msgid "could not fetch %s from promisor remote"
msgstr "no s'ha pogut obtenir «%s» del «promisor» remot"
+#: promisor-remote.c
+#, c-format
+msgid "no or empty URL advertised for remote '%s'"
+msgstr "no hi ha URL configurat per al remot «%s» o és buit"
+
+#: promisor-remote.c
+#, c-format
+msgid "known remote named '%s' but with URL '%s' instead of '%s'"
+msgstr "remot conegut nomenat «%s» però amb URL «%s» en comptes de «%s»"
+
+#: promisor-remote.c
+#, c-format
+msgid "unknown '%s' value for '%s' config option"
+msgstr "valor desconegut «%s» per a l'opció «%s» de configuració"
+
+#: promisor-remote.c
+#, c-format
+msgid "unknown element '%s' from remote info"
+msgstr "valor desconegut «%s» en la informació del remot"
+
+#: promisor-remote.c
+#, c-format
+msgid "accepted promisor remote '%s' not found"
+msgstr "no s'ha trobat el remot promisor acceptat «%s»"
+
#: protocol-caps.c
msgid "object-info: expected flush after arguments"
msgstr "object-info: s'esperava una neteja després dels arguments"
@@ -24943,6 +25211,16 @@
#: refs.c
#, c-format
+msgid "%s%s will become dangling after %s is deleted\n"
+msgstr " %s%s es quedarà despenjat després d'esborrar %s\n"
+
+#: refs.c
+#, c-format
+msgid "%s%s has become dangling after %s was deleted\n"
+msgstr " %s%s s'ha quedat despenjat després d'esborrar %s\n"
+
+#: refs.c
+#, c-format
msgid ""
"Using '%s' as the name for the initial branch. This default branch name\n"
"is subject to change. To configure the initial branch name to use in all\n"
@@ -25000,9 +25278,20 @@
msgstr "el registre per a %s és buit"
#: refs.c
-msgid "refusing to force and skip creation of reflog"
+#, c-format
+msgid "refusing to update reflog for pseudoref '%s'"
msgstr ""
-"s'ha rebutjat l'acció forçada i l'omissió de crear un registre de referències"
+"s'ha rebutjat l'actualització del reflog per a la pseudoreferència «%s»"
+
+#: refs.c
+#, c-format
+msgid "refusing to update pseudoref '%s'"
+msgstr "s'ha rebutjat l'actualització de la pseudoreferència «%s»"
+
+#: refs.c
+#, c-format
+msgid "refusing to update reflog with bad name '%s'"
+msgstr "s'està refusant el reflog amb el nom incorrecte «%s»"
#: refs.c
#, c-format
@@ -25010,9 +25299,9 @@
msgstr "s'està refusant la referència amb nom malmès «%s»"
#: refs.c
-#, c-format
-msgid "refusing to update pseudoref '%s'"
-msgstr "s'ha rebutjat l'actualització de la pseudoreferència «%s»"
+msgid "refusing to force and skip creation of reflog"
+msgstr ""
+"s'ha rebutjat l'acció forçada i l'omissió de crear un registre de referències"
#: refs.c
#, c-format
@@ -25082,6 +25371,11 @@
#: refs/files-backend.c
#, c-format
+msgid "cannot read ref file '%s'"
+msgstr "no es pot llegir el fitxer de referències «%s»"
+
+#: refs/files-backend.c
+#, c-format
msgid "cannot open directory %s"
msgstr "no es pot obrir el directori «%s»"
@@ -25089,6 +25383,11 @@
msgid "Checking references consistency"
msgstr "S'està comprovant la consistència de les referències"
+#: refs/packed-backend.c
+#, c-format
+msgid "unable to open '%s'"
+msgstr "no s'ha pogut obrir %s"
+
#: refs/reftable-backend.c
#, c-format
msgid "refname is dangerous: %s"
@@ -25185,8 +25484,13 @@
#: refspec.c
#, c-format
-msgid "invalid refspec '%s'"
-msgstr "refspec no vàlida: «%s»"
+msgid "pattern '%s' has no '*'"
+msgstr "el patró «%s» no té cap «*»"
+
+#: refspec.c
+#, c-format
+msgid "replacement '%s' has no '*'"
+msgstr "el reemplaçament «%s» no té cap «*»"
#: remote-curl.c
#, c-format
@@ -25318,7 +25622,7 @@
#: remote-curl.c
msgid "protocol error: expected '<url> <path>', missing space"
msgstr ""
-"s'ha produït un error de protocol: s'esperava «<url> <camí>», falta espai"
+"s'ha produït un error de protocol: s'esperava «<url> <camí>», hi manca espai"
#: remote-curl.c
#, c-format
@@ -25348,6 +25652,31 @@
#: remote.c
#, c-format
+msgid ""
+"reading remote from \"%s/%s\", which is nominated for removal.\n"
+"\n"
+"If you still use the \"remotes/\" directory it is recommended to\n"
+"migrate to config-based remotes:\n"
+"\n"
+"\tgit remote rename %s %s\n"
+"\n"
+"If you cannot, please let us know why you still need to use it by\n"
+"sending an e-mail to <git@vger.kernel.org>."
+msgstr ""
+"s'està llegint el remot des de «%s/%s», el qual està nominat per a la seva "
+"supressió.\n"
+"\n"
+"Si encara feu servir el directori «remotes/», es recomana la migració a\n"
+"remots basats en configuració\n"
+"\n"
+"\tgit remote rename %s %s\n"
+"\n"
+"Si no podeu, feu-nos saber, per favor, per què necessiteu fer-lo servir "
+"encara\n"
+"tot enviant correu electrònic a <git@vger.kernel.org>."
+
+#: remote.c
+#, c-format
msgid "config remote shorthand cannot begin with '/': %s"
msgstr ""
"l'abreviatura del fitxer de configuració remot no pot començar amb «/»: %s"
@@ -25362,6 +25691,11 @@
#: remote.c
#, c-format
+msgid "unrecognized followRemoteHEAD value '%s' ignored"
+msgstr "valor de followRemoteHEAD no reconegut «%s» ignorat"
+
+#: remote.c
+#, c-format
msgid "unrecognized value transfer.credentialsInUrl: '%s'"
msgstr "valor no conegut per a transfer.credentialsInUrl: «%s»"
@@ -25387,16 +25721,6 @@
#: remote.c
#, c-format
-msgid "key '%s' of pattern had no '*'"
-msgstr "la clau «%s» del patró no té «*»"
-
-#: remote.c
-#, c-format
-msgid "value '%s' of pattern has no '*'"
-msgstr "el valor «%s» del patró no té «*»"
-
-#: remote.c
-#, c-format
msgid "src refspec %s does not match any"
msgstr "l'especificació de referència font %s no coincideix amb cap referència"
@@ -25431,7 +25755,8 @@
" és una referència «refs/{heads,tags}/». Si és així, afegim el prefix\n"
" refs/{heads,tags}/ corresponent al costat remot.\n"
"\n"
-"Res d'això ha funcionat. Cal que proporcioneu una referència completa."
+"Res d'això ha funcionat, i per això ho hem abandonat. Cal que proporcioneu "
+"una referència completa."
#: remote.c
#, c-format
@@ -25520,7 +25845,8 @@
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
-"el destí de pujada «%s» en el remot «%s» no té cap branca amb seguiment remot"
+"la destinació de pujada «%s» en el remot «%s» no té cap branca amb seguiment "
+"remot"
#: remote.c
#, c-format
@@ -25534,11 +25860,11 @@
#: remote.c
msgid "push has no destination (push.default is 'nothing')"
-msgstr "push no té destí (push.default és «nothing»)"
+msgstr "push no té destinació (push.default és «nothing»)"
#: remote.c
msgid "cannot resolve 'simple' push to a single destination"
-msgstr "no es pot resoldre una pujada «simple» a un sol destí"
+msgstr "no es pot resoldre una pujada «simple» a una sola destinació"
#: remote.c
#, c-format
@@ -25838,8 +26164,8 @@
msgstr "no s'ha pogut establir la configuració recomanada"
#: scalar.c
-msgid "could not turn on maintenance"
-msgstr "no s'ha pogut activar el manteniment"
+msgid "could not toggle maintenance"
+msgstr "no s'ha pogut commutar el manteniment"
#: scalar.c
msgid "could not start the FSMonitor daemon"
@@ -25900,14 +26226,17 @@
msgid "specify if tags should be fetched during clone"
msgstr "especifica si les etiquetes s'han d'obtenir durant el clon"
-# Deixem <enlistment> sense traduir de moment
+#: scalar.c
+msgid "specify if background maintenance should be enabled"
+msgstr "especifica si cal activar el manteniment en segon pla"
+
#: scalar.c
msgid ""
"scalar clone [--single-branch] [--branch <main-branch>] [--full-clone]\n"
-"\t[--[no-]src] [--[no-]tags] <url> [<enlistment>]"
+"\t[--[no-]src] [--[no-]tags] [--[no-]maintenance] <url> [<enlistment>]"
msgstr ""
"scalar clone [--single-branch] [--branch <branca-principal>] [--full-clone]\n"
-"\t[--[no-]src] [--[no-]tags] <url> [<enlistment>]"
+"\t[--[no-]src] [--[no-]tags] <url> [<allistament>]"
#: scalar.c
#, c-format
@@ -25949,27 +26278,44 @@
#: scalar.c
msgid "scalar diagnose [<enlistment>]"
-msgstr "scalar diagnose [<enlistment>]"
+msgstr "scalar diagnose [<allistament>]"
#: scalar.c
msgid "`scalar list` does not take arguments"
msgstr "«scalar list» no accepta arguments"
#: scalar.c
-msgid "scalar register [<enlistment>]"
-msgstr "scalar register [<enlistment>]"
+msgid "scalar register [--[no-]maintenance] [<enlistment>]"
+msgstr "scalar register [--[no-]maintenance] [<allistament>]"
#: scalar.c
msgid "reconfigure all registered enlistments"
msgstr "reconfigura tots els allistaments registrats"
#: scalar.c
-msgid "scalar reconfigure [--all | <enlistment>]"
-msgstr "scalar reconfigure [--all | <enlistment>]"
+msgid "(enable|disable|keep)"
+msgstr "(enable|disable|keep)"
+
+#: scalar.c
+msgid "signal how to adjust background maintenance"
+msgstr "assenyala com ajustar el manteniment en segon pla"
+
+#: scalar.c
+msgid ""
+"scalar reconfigure [--maintenance=(enable|disable|keep)] [--all | "
+"<enlistment>]"
+msgstr ""
+"scalar reconfigure [--maintenance=(enable|disable|keep)] [--all | "
+"<allistament>]"
#: scalar.c
msgid "--all or <enlistment>, but not both"
-msgstr "--all o <enlistment>, però no ambdós"
+msgstr "--all o <allistament>, però no ambdós"
+
+#: scalar.c
+#, c-format
+msgid "unknown mode for --maintenance option: %s"
+msgstr "mode desconegut per a l'opció de --maintenance: %s"
#: scalar.c
#, c-format
@@ -26010,7 +26356,7 @@
"scalar run <task> [<enlistment>]\n"
"Tasks:\n"
msgstr ""
-"scalar run <task> {<enlistment>]\n"
+"scalar run <task> {<allistament>]\n"
"Tasques:\n"
#: scalar.c
@@ -26020,11 +26366,11 @@
#: scalar.c
msgid "scalar unregister [<enlistment>]"
-msgstr "scalar unregister [<enlistment>]"
+msgstr "scalar unregister [<allistament>]"
#: scalar.c
msgid "scalar delete <enlistment>"
-msgstr "supressió de l'escalar <enlistment>"
+msgstr "supressió de l'escalar <allistament>"
#: scalar.c
msgid "refusing to delete current working directory"
@@ -26097,27 +26443,27 @@
#: send-pack.c
msgid "the receiving end does not support this repository's hash algorithm"
-msgstr "el receptor de destí no admet l'algorisme de resum del repositori"
+msgstr "el receptor de destinació no admet l'algorisme de resum del repositori"
#: send-pack.c
msgid "the receiving end does not support --signed push"
-msgstr "el destí receptor no admet pujar --signed"
+msgstr "la destinació receptora no admet pujar --signed"
#: send-pack.c
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
msgstr ""
-"no s'està enviant una certificació de pujada perquè el destí receptor no "
-"admet pujar --signed"
+"no s'està enviant una certificació de pujada perquè la destinació "
+"receptorano admet pujar --signed"
#: send-pack.c
msgid "the receiving end does not support --atomic push"
-msgstr "el destí receptor no admet pujar --atomic"
+msgstr "la destinació receptora no admet pujar --atomic"
#: send-pack.c
msgid "the receiving end does not support push options"
-msgstr "el receptor al destí no admet opcions de pujada"
+msgstr "el receptor a la destinació no admet opcions de pujada"
#: sequencer.c
#, c-format
@@ -26271,15 +26617,15 @@
#: sequencer.c
msgid "missing 'GIT_AUTHOR_NAME'"
-msgstr "falta «GIT_AUTHOR_NAME»"
+msgstr "hi manca «GIT_AUTHOR_NAME»"
#: sequencer.c
msgid "missing 'GIT_AUTHOR_EMAIL'"
-msgstr "falta «GIT_AUTHOR_EMAIL»"
+msgstr "hi manca «GIT_AUTHOR_EMAIL»"
#: sequencer.c
msgid "missing 'GIT_AUTHOR_DATE'"
-msgstr "falta «GIT_AUTHOR_DATE»"
+msgstr "hi manca «GIT_AUTHOR_DATE»"
#: sequencer.c
#, c-format
@@ -26413,7 +26759,7 @@
#: sequencer.c
msgid "corrupt author: missing date information"
-msgstr "autor malmès: falta la informació de la data"
+msgstr "autor malmès: hi manca la informació de la data"
#: sequencer.c
#, c-format
@@ -26602,7 +26948,7 @@
#: sequencer.c
#, c-format
msgid "missing arguments for %s"
-msgstr "falten els arguments per a %s"
+msgstr "hi manquen els arguments per a %s"
#: sequencer.c
#, c-format
@@ -26881,7 +27227,7 @@
"Updated the following refs with %s:\n"
"%s"
msgstr ""
-"S'han actualitzat els següents refs amb %s:\n"
+"S'han actualitzat les referències següents amb %s:\n"
"%s"
#: sequencer.c
@@ -27728,6 +28074,42 @@
msgstr ""
"nombre d'entrades a l'arbre de la memòria cau a invalidar (per defecte 0)"
+#: t/helper/test-pack-deltas.c
+msgid "the number of objects to write"
+msgstr "el nombre d'objectes a escriure"
+
+#: t/helper/test-path-walk.c
+msgid "test-tool path-walk <options> -- <revision-options>"
+msgstr "test-tool path-walk <opcions> -- <opcions-revisio>"
+
+#: t/helper/test-path-walk.c
+msgid "toggle inclusion of blob objects"
+msgstr "commuta la inclusió d'objectes de blob"
+
+#: t/helper/test-path-walk.c
+msgid "toggle inclusion of commit objects"
+msgstr "commuta la inclusió d'objectes de comissió"
+
+#: t/helper/test-path-walk.c
+msgid "toggle inclusion of tag objects"
+msgstr "commuta la inclusió d'objectes d'etiqueta"
+
+#: t/helper/test-path-walk.c
+msgid "toggle inclusion of tree objects"
+msgstr "commuta la inclusió d'objectes d'arbre"
+
+#: t/helper/test-path-walk.c
+msgid "toggle pruning of uninteresting paths"
+msgstr "commuta la poda de camins no interessants"
+
+#: t/helper/test-path-walk.c
+msgid "toggle aggressive edge walk"
+msgstr "commuta el recorregut agressiu de vores"
+
+#: t/helper/test-path-walk.c
+msgid "read a pattern list over stdin"
+msgstr "llegeix una llista patrons de l'entrada estàndard"
+
#: t/helper/test-reach.c
#, c-format
msgid "commit %s is not marked reachable"
@@ -27737,6 +28119,10 @@
msgid "too many commits marked reachable"
msgstr "hi ha massa comissions marcades com abastables"
+#: t/helper/test-read-midx.c
+msgid "could not determine MIDX preferred pack"
+msgstr "no s'ha pogut determinar el paquet preferit MIDX"
+
#: t/helper/test-serve-v2.c
msgid "test-tool serve-v2 [<options>]"
msgstr "test-tool serve-v2 [<opcions>]"
@@ -28498,6 +28884,30 @@
msgid "warning: "
msgstr "avís: "
+#: usage.c
+#, c-format
+msgid ""
+"'%s' is nominated for removal.\n"
+"If you still use this command, please add an extra\n"
+"option, '--i-still-use-this', on the command line\n"
+"and let us know you still use it by sending an e-mail\n"
+"to <git@vger.kernel.org>. Thanks.\n"
+msgstr ""
+"«%s» està nominat per a la seva supressió.\n"
+"Si encara feu servir aquesta ordre, afegiu-hi l'opció\n"
+"addicional, «--i-still-use-this», a la línia d'ordres\n"
+"i feu-nos saber que encara l'useu enviant un correu electrònic\n"
+"a <git@vger.kernel.org>. Gràcies.\n"
+
+#: usage.c
+msgid "refusing to run without --i-still-use-this"
+msgstr "es rebutja a executar sense --i-still-use-this"
+
+#: version.c
+#, c-format
+msgid "uname() failed with error '%s' (%d)\n"
+msgstr "uname() ha fallat amb l'error «%s» (%d)\n"
+
#: walker.c
msgid "Fetching objects"
msgstr "S'estan obtenint objectes"
@@ -28540,6 +28950,10 @@
msgstr "fitxer .git incorrecte"
#: worktree.c
+msgid ".git file absolute/relative path mismatch"
+msgstr "el camins absoluts/relatius del fitxer .git no coincideixen "
+
+#: worktree.c
msgid "not a valid path"
msgstr "no és un camí vàlid"
@@ -28562,6 +28976,10 @@
msgstr "gitdir illegible"
#: worktree.c
+msgid "gitdir absolute/relative path mismatch"
+msgstr "el camins absoluts/relatius del directori git no coincideixen "
+
+#: worktree.c
msgid "gitdir incorrect"
msgstr "gitdir incorrecte"
@@ -28605,6 +29023,16 @@
msgid "failed to set extensions.worktreeConfig setting"
msgstr "no s'ha pogut establir el paràmetre extensions.worktreeConfig"
+#: worktree.c
+msgid "unable to upgrade repository format to support relative worktrees"
+msgstr ""
+"no s'ha pogut actualitzar el format del repositori perquè admeti arbres de "
+"treball relatius"
+
+#: worktree.c
+msgid "unable to set extensions.relativeWorktrees setting"
+msgstr "no s'ha pogut establir el paràmetre extensions.relativeWorktrees"
+
#: wrapper.c
#, c-format
msgid "could not setenv '%s'"
@@ -28633,6 +29061,16 @@
msgid "unable to get random bytes"
msgstr "no s'han pogut obtenir octets aleatoris"
+#: wrapper.c
+#, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr "s'està intentant fer mmap %<PRIuMAX> per sobre del límit %<PRIuMAX>"
+
+#: wrapper.c
+#, c-format
+msgid "mmap failed%s"
+msgstr "mmap ha fallat%s"
+
#: wt-status.c
msgid "Unmerged paths:"
msgstr "Camins sense fusionar:"
@@ -29562,6 +30000,16 @@
#: git-send-email.perl
#, perl-format
+msgid "Outlook reassigned Message-ID to: %s\n"
+msgstr "Outlook ha reassignat el Message-ID a %s\n"
+
+#: git-send-email.perl
+msgid "Warning: Could not retrieve Message-ID from server response.\n"
+msgstr ""
+"Avís: no s'ha pogut recuperar el Message-ID de la resposta del servidor.\n"
+
+#: git-send-email.perl
+#, perl-format
msgid "Failed to send %s\n"
msgstr "S'ha produït un error en enviar %s\n"
@@ -29619,6 +30067,11 @@
#: git-send-email.perl
#, perl-format
+msgid "error: invalid SMTP port '%s'\n"
+msgstr "error: port SMTP invàlid: «%s»\n"
+
+#: git-send-email.perl
+#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) no s'ha pogut executar «%s»"
@@ -29681,6 +30134,367 @@
msgid "Do you really want to send %s? [y|N]: "
msgstr "Esteu segur que voleu enviar %s? [y|N]: "
+#~ msgid "start-after"
+#~ msgstr "start-after"
+
+#~ msgid "compact-summary"
+#~ msgstr "compact-summary"
+
+#~ msgid "git cat-file (-t | -s) [--allow-unknown-type] <object>"
+#~ msgstr "git cat-file (-t | -s) [--allow-unknown-type] <objecte>"
+
+#~ msgid "allow -s and -t to work with broken/corrupt objects"
+#~ msgstr "permet que -s i -t funcionin amb objectes trencats/malmesos"
+
+#, c-format
+#~ msgid "Could not find remote branch %s to clone."
+#~ msgstr "No s'ha pogut trobar la branca remota %s per a clonar."
+
+#, c-format
+#~ msgid ""
+#~ "more than %i tags found; listed %i most recent\n"
+#~ "gave up search at %s\n"
+#~ msgstr ""
+#~ "s'han trobat més de %i etiquetes: s'han llistat les %i més recents\n"
+#~ "s'ha renunciat la cerca a %s\n"
+
+#, c-format
+#~ msgid " (%s will become dangling)"
+#~ msgstr " (%s es tornarà despenjat)"
+
+#, c-format
+#~ msgid " (%s has become dangling)"
+#~ msgstr " (%s s'ha quedat despenjat)"
+
+#, c-format
+#~ msgid "%s: object is of unknown type '%s': %s"
+#~ msgstr "%s: l'objecte és de tipus desconegut «%s»: %s"
+
+#~ msgid "use at most one of --auto and --schedule=<frequency>"
+#~ msgstr "usa com a màxim un entre --auto i --schedule=<freqüència>"
+
+#, c-format
+#~ msgid "Final output: %d %s\n"
+#~ msgstr "Sortida final: %d %s\n"
+
+#, c-format
+#~ msgid "merging cannot continue; got unclean result of %d"
+#~ msgstr "la fusió no pot continuar; s'ha obtingut un resultat no net de %d"
+
+#, c-format
+#~ msgid "%d (FSCK_IGNORE?) should never trigger this callback"
+#~ msgstr "%d (FSCK_IGNORE?) no hauria d'activar mai aquesta crida de retorn"
+
+#~ msgid ""
+#~ "git pack-objects --stdout [<options>] [< <ref-list> | < <object-list>]"
+#~ msgstr ""
+#~ "git pack-objects --stdout [<opcions>] [< <ref-list> | < <object-list>]"
+
+#~ msgid ""
+#~ "git pack-objects [<options>] <base-name> [< <ref-list> | < <object-list>]"
+#~ msgstr ""
+#~ "git pack-objects [<opcions>] <base-name> [< <ref-list> | < <object-list>]"
+
+#~ msgid "cannot use --stdin-packs with --cruft"
+#~ msgstr "no es pot --stdin-packs amb --cruft"
+
+#, c-format
+#~ msgid "%s points nowhere!"
+#~ msgstr "%s no apunta a enlloc"
+
+#~ msgid "--onto and --advance are incompatible"
+#~ msgstr "--onto i --advance són incompatibles"
+
+#, c-format
+#~ msgid "unreachable: invalid reference: %s"
+#~ msgstr "no accessible: referència no vàlida: %s"
+
+#~ msgid "Public key pinning not supported with cURL < 7.39.0"
+#~ msgstr "No s'admet la fixació de clau pública amb cURL < 7.39.0"
+
+#~ msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
+#~ msgstr "CURLSSLOPT_NO_REVOKE no està admès amb cURL < 7.44.0"
+
+#~ msgid "(bad commit)\n"
+#~ msgstr "(comissió errònia)\n"
+
+#, c-format
+#~ msgid "add_cacheinfo failed for path '%s'; merge aborting."
+#~ msgstr "add_cacheinfo ha fallat per al camí «%s»; interrompent la fusió."
+
+#, c-format
+#~ msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
+#~ msgstr ""
+#~ "add_cacheinfo ha fallat al refrescar el camí «%s»; interrompent la fusió."
+
+#, c-format
+#~ msgid "failed to create path '%s'%s"
+#~ msgstr "s'ha produït un error en crear el camí «%s»%s"
+
+#, c-format
+#~ msgid "Removing %s to make room for subdirectory\n"
+#~ msgstr "S'està eliminant %s per a fer espai per al subdirectori\n"
+
+#~ msgid ": perhaps a D/F conflict?"
+#~ msgstr ": potser un conflicte D/F?"
+
+#, c-format
+#~ msgid "refusing to lose untracked file at '%s'"
+#~ msgstr "s'està refusant perdre el fitxer no seguit a «%s»"
+
+#, c-format
+#~ msgid "blob expected for %s '%s'"
+#~ msgstr "blob esperat per a %s «%s»"
+
+#, c-format
+#~ msgid "failed to open '%s': %s"
+#~ msgstr "s'ha produït un error en obrir «%s»: %s"
+
+#, c-format
+#~ msgid "failed to symlink '%s': %s"
+#~ msgstr "s'ha produït un error en fer l'enllaç simbòlic «%s»: %s"
+
+#, c-format
+#~ msgid "do not know what to do with %06o %s '%s'"
+#~ msgstr "no se sap què fer amb %06o %s «%s»"
+
+#, c-format
+#~ msgid "Failed to merge submodule %s (repository corrupt)"
+#~ msgstr "No s'ha pogut fusionar el submòdul %s (repositori malmès)"
+
+#, c-format
+#~ msgid "Fast-forwarding submodule %s to the following commit:"
+#~ msgstr "Avançament ràpid del submòdul %s a la següent comissió:"
+
+#, c-format
+#~ msgid "Fast-forwarding submodule %s"
+#~ msgstr "Avançament ràpid al submòdul %s"
+
+#, c-format
+#~ msgid "Failed to merge submodule %s (merge following commits not found)"
+#~ msgstr ""
+#~ "Ha fallat en fusionar el submòdul %s (no s'ha trobat les comissions "
+#~ "següents)"
+
+#, c-format
+#~ msgid "Failed to merge submodule %s (not fast-forward)"
+#~ msgstr ""
+#~ "S'ha produït un error en fusionar el submòdul %s (sense avançament ràpid)"
+
+#~ msgid "Found a possible merge resolution for the submodule:\n"
+#~ msgstr "S'ha trobat una possible resolució de fusió pel submòdul:\n"
+
+#, c-format
+#~ msgid ""
+#~ "If this is correct simply add it to the index for example\n"
+#~ "by using:\n"
+#~ "\n"
+#~ " git update-index --cacheinfo 160000 %s \"%s\"\n"
+#~ "\n"
+#~ "which will accept this suggestion.\n"
+#~ msgstr ""
+#~ "Si això és correcte simplement afegiu-ho a l'índex per exemple\n"
+#~ "utilitzant:\n"
+#~ "\n"
+#~ " git update-index --cacheinfo 160000 %s «%s»\n"
+#~ "\n"
+#~ "que acceptarà aquest suggeriment.\n"
+
+#, c-format
+#~ msgid "Failed to merge submodule %s (multiple merges found)"
+#~ msgstr ""
+#~ "S'ha produït un error en fusionar el submòdul %s (s'han trobat múltiples "
+#~ "fusions)"
+
+#~ msgid "failed to execute internal merge"
+#~ msgstr "no s'ha pogut executar la fusió interna"
+
+#, c-format
+#~ msgid "unable to add %s to database"
+#~ msgstr "no s'ha pogut afegir %s a la base de dades"
+
+#, c-format
+#~ msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
+#~ msgstr ""
+#~ "Error: s'està refusant perdre el fitxer no seguit a %s; en comptes s'ha "
+#~ "escrit a %s."
+
+#, c-format
+#~ msgid ""
+#~ "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s "
+#~ "left in tree."
+#~ msgstr ""
+#~ "CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de "
+#~ "%s s'ha deixat en l'arbre."
+
+#, 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."
+
+#, c-format
+#~ msgid ""
+#~ "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s "
+#~ "left in tree at %s."
+#~ msgstr ""
+#~ "CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de "
+#~ "%s s'ha deixat en l'arbre a %s."
+
+#, 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."
+
+#~ msgid "rename"
+#~ msgstr "canvi de nom"
+
+#~ msgid "renamed"
+#~ msgstr "canviat de nom"
+
+#, c-format
+#~ msgid "Refusing to lose dirty file at %s"
+#~ msgstr "S'està refusant a perdre el fitxer brut a %s"
+
+#, c-format
+#~ msgid "Refusing to lose untracked file at %s, even though it's in the way."
+#~ msgstr ""
+#~ "S'està refusant perdre el fitxer no seguit a «%s», malgrat que està en "
+#~ "mig de l'operació."
+
+#, c-format
+#~ msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
+#~ msgstr ""
+#~ "CONFLICTE (canvi de nom/afegiment): Canvi de nom %s->%s a %s. S'ha "
+#~ "afegit %s a %s"
+
+#, 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ò"
+
+#, c-format
+#~ msgid "Refusing to lose untracked file at %s; adding as %s instead"
+#~ msgstr ""
+#~ "S'està refusant perdre el fitxer no seguit a %s; en comptes, s'està "
+#~ "afegint com a %s"
+
+#, c-format
+#~ msgid ""
+#~ "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename "
+#~ "\"%s\"->\"%s\" in \"%s\"%s"
+#~ msgstr ""
+#~ "CONFLICTE (canvi de nom/canvi de nom): Canvi de nom «%s»->«%s» en la "
+#~ "branca «%s» canvi de nom «%s»->«%s» en «%s»%s"
+
+#~ msgid " (left unresolved)"
+#~ msgstr " (deixat sense resolució)"
+
+#, 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"
+
+#, c-format
+#~ msgid ""
+#~ "CONFLICT (directory rename split): Unclear where to place %s because "
+#~ "directory %s was renamed to multiple other directories, with no "
+#~ "destination getting a majority of the files."
+#~ msgstr ""
+#~ "CONFLICTE (divisió de canvi de nom de directori): no està clar on "
+#~ "col·locar %s perquè el directori %s s'han canviat de nom a múltiples "
+#~ "altres directoris, sense una destinació per a la majoria dels fitxers."
+
+#, c-format
+#~ msgid ""
+#~ "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory "
+#~ "%s->%s in %s"
+#~ msgstr ""
+#~ "CONFLICTE (canvi de nom/canvi de nom): canvi de nom %s->%s en %s. Canvi "
+#~ "de nom de directori %s->%s en %s"
+
+#, c-format
+#~ msgid "cannot read object %s"
+#~ msgstr "no es pot llegir l'objecte %s"
+
+#, c-format
+#~ msgid "object %s is not a blob"
+#~ msgstr "l'objecte %s no és un blob"
+
+#~ msgid "modify"
+#~ msgstr "modificació"
+
+#~ msgid "modified"
+#~ msgstr "modificat"
+
+#, c-format
+#~ msgid "Skipped %s (merged same as existing)"
+#~ msgstr "S'ha omès %s (el fusionat és igual a l'existent)"
+
+#, c-format
+#~ msgid "Adding as %s instead"
+#~ msgstr "S'està afegint com a %s en lloc d'això"
+
+#, c-format
+#~ msgid "Removing %s"
+#~ msgstr "S'està eliminant %s"
+
+#~ msgid "file/directory"
+#~ msgstr "fitxer/directori"
+
+#~ msgid "directory/file"
+#~ msgstr "directori/fitxer"
+
+#, 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"
+
+#, c-format
+#~ msgid "Adding %s"
+#~ msgstr "S'està afegint %s"
+
+#, c-format
+#~ msgid "CONFLICT (add/add): Merge conflict in %s"
+#~ msgstr "CONFLICTE (afegiment/afegiment): Conflicte de fusió en %s"
+
+#, c-format
+#~ msgid "merging of trees %s and %s failed"
+#~ msgstr "la fusió dels arbres %s i %s ha fallat"
+
+#~ msgid "Merging:"
+#~ msgstr "S'està fusionant:"
+
+#, 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ú:"
+
+#~ msgid "merge returned no commit"
+#~ msgstr "la fusió no ha retornat cap comissió"
+
+#~ msgid "cannot write incremental MIDX with bitmap"
+#~ msgstr "no es pot escriure un MIDX incremental amb mapa de bits"
+
+#~ msgid "trying to write commit not in index"
+#~ msgstr "s'està intentant no escriure la comissió a l'índex"
+
+#, c-format
+#~ msgid "preferred pack (%s) is invalid"
+#~ msgstr "el paquet preferit (%s) no és vàlid"
+
+#, c-format
+#~ msgid "key '%s' of pattern had no '*'"
+#~ msgstr "la clau «%s» del patró no té «*»"
+
#~ msgid "revision walk setup failed\n"
#~ msgstr "la configuració del recorregut de revisions ha fallat\n"
@@ -29745,10 +30559,6 @@
#~ msgid "bad ls-files format: %%%.*s"
#~ msgstr "format incorrecte de ls-files: %%%.*s"
-#, c-format
-#~ msgid "no URLs configured for remote '%s'"
-#~ msgstr "cap URL configurat per al remot «%s»"
-
#~ msgid "keep redundant, empty commits"
#~ msgstr "retén les comissions redundants i buides"
diff --git a/po/fr.po b/po/fr.po
index 7b5cc9b..f81fc39 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -87,8 +87,8 @@
msgstr ""
"Project-Id-Version: git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2025-05-27 22:57+0000\n"
-"PO-Revision-Date: 2025-05-29 12:54+0200\n"
+"POT-Creation-Date: 2025-08-12 17:01+0000\n"
+"PO-Revision-Date: 2025-08-14 19:13+0200\n"
"Last-Translator: Cédric Malard <c.malard-git@valdun.net>\n"
"Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n"
"Language: fr\n"
@@ -99,6 +99,10 @@
"X-Generator: Poedit 3.0.1\n"
#, c-format
+msgid "%s cannot be negative"
+msgstr "%s doit être non négatif"
+
+#, c-format
msgid "Huh (%s)?"
msgstr "Hein (%s) ?"
@@ -2047,6 +2051,10 @@
msgstr "échec de l'ajout de fichiers"
#, c-format
+msgid "'%s' cannot be negative"
+msgstr "'%s' doit être non négatif"
+
+#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "Le paramètre '%s' de --chmod doit être soit -x soit +x"
@@ -5265,24 +5273,25 @@
msgid ""
"git config get [<file-option>] [<display-option>] [--includes] [--all] [--"
-"regexp] [--value=<value>] [--fixed-value] [--default=<default>] <name>"
+"regexp] [--value=<pattern>] [--fixed-value] [--default=<default>] [--"
+"url=<url>] <name>"
msgstr ""
"git config get [<option-de-fichier>] [<option-d-affichage>] [--includes] [--"
-"all] [--regexp] [--value=<valeur>] [--fixed-value] [--default=<défaut>] "
-"<name>"
+"all] [--regexp] [--value=<motif>] [--fixed-value] [--default=<défaut>] [--"
+"url=<url>] <nom>"
msgid ""
-"git config set [<file-option>] [--type=<type>] [--all] [--value=<value>] [--"
-"fixed-value] <name> <value>"
+"git config set [<file-option>] [--type=<type>] [--all] [--value=<pattern>] "
+"[--fixed-value] <name> <value>"
msgstr ""
"git config set [<option-de-fichier>] [--type=<type>] [--all] [--"
-"value=<valeur>] [--fixed-value] <nom> <valeur>"
+"value=<motif>] [--fixed-value] <nom> <valeur>"
msgid ""
-"git config unset [<file-option>] [--all] [--value=<value>] [--fixed-value] "
+"git config unset [<file-option>] [--all] [--value=<pattern>] [--fixed-value] "
"<name>"
msgstr ""
-"git config unset [<option-de-fichier>] [--all] [--value=<valeur>] [--fixed-"
+"git config unset [<option-de-fichier>] [--all] [--value=<motif>] [--fixed-"
"value] <nom>"
msgid "git config rename-section [<file-option>] <old-name> <new-name>"
@@ -5301,19 +5310,19 @@
msgid ""
"git config get [<file-option>] [<display-option>] [--includes] [--all] [--"
-"regexp=<regexp>] [--value=<value>] [--fixed-value] [--default=<default>] "
+"regexp=<regexp>] [--value=<pattern>] [--fixed-value] [--default=<default>] "
"<name>"
msgstr ""
"git config get [<option-de-fichier>] [<option-d-affichage>] [--includes] [--"
-"all] [--regexp=<regexp>] [--value=<valeur>] [--fixed-value] [--"
-"default=<défaut>] <name>"
+"all] [--regexp=<regexp>] [--value=<motif>] [--fixed-value] [--"
+"default=<défaut>] <nom>"
msgid ""
"git config set [<file-option>] [--type=<type>] [--comment=<message>] [--all] "
-"[--value=<value>] [--fixed-value] <name> <value>"
+"[--value=<pattern>] [--fixed-value] <name> <value>"
msgstr ""
"git config set [<option-de-fichier>] [--type=<type>] [--comment=<message>] "
-"[--all] [--value=<valeur>] [--fixed-value] <nom> <valeur>"
+"[--all] [--value=<motif>] [--fixed-value] <nom> <valeur>"
msgid "Config file location"
msgstr "Emplacement du fichier de configuration"
@@ -6179,22 +6188,6 @@
"%s rejeté parce que les mises à jour de racines superficielles ne sont pas "
"permises"
-#, c-format
-msgid ""
-"some local refs could not be updated; try running\n"
-" 'git remote prune %s' to remove any old, conflicting branches"
-msgstr ""
-"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"
-
-#, c-format
-msgid " (%s will become dangling)"
-msgstr " (%s sera en suspens)"
-
-#, c-format
-msgid " (%s has become dangling)"
-msgstr " (%s est devenu en suspens)"
-
msgid "[deleted]"
msgstr "[supprimé]"
@@ -6236,6 +6229,18 @@
"%s'\n"
"va désactiver l'alerte jusqu'à ce que le distant change HEAD."
+#, c-format
+msgid ""
+"some local refs could not be updated; try running\n"
+" 'git remote prune %s' to remove any old, conflicting branches"
+msgstr ""
+"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"
+
+#, c-format
+msgid "fetching ref %s failed: %s"
+msgstr "échec de la récupération de %s : %s"
+
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "branches multiples détectées, imcompatible avec --set-upstream"
@@ -6483,6 +6488,9 @@
msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
msgstr "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
+msgid "git for-each-ref [--start-after <marker>]"
+msgstr "git for-each-ref [--start-after <marqueur>]"
+
msgid "quote placeholders suitably for shells"
msgstr "échapper les champs réservés pour les interpréteurs de commandes"
@@ -6498,6 +6506,12 @@
msgid "show only <n> matched refs"
msgstr "n'afficher que <n> références correspondant"
+msgid "marker"
+msgstr "marqueur"
+
+msgid "start iteration after the provided marker"
+msgstr "commencer l'itération après le marqueur indiqué"
+
msgid "respect format colors"
msgstr "respecter les couleurs de formatage"
@@ -6522,9 +6536,16 @@
msgid "also include HEAD ref and pseudorefs"
msgstr "inclure aussi la référence HEAD et les pseudo-réfs"
+msgid "cannot use --start-after with custom sort options"
+msgstr ""
+"impossible d'utiliser --start-after avec des options de tri personnalisé"
+
msgid "unknown arguments supplied with --stdin"
msgstr "arguments inconnus fournis avec l'option --stdin"
+msgid "cannot use --start-after with patterns"
+msgstr "impossible d'utiliser --start-after avec des motifs"
+
msgid "git for-each-repo --config=<config> [--] <arguments>"
msgstr "git for-each-repo --config=<config> [--] <arguments>"
@@ -6924,6 +6945,9 @@
msgid "pack prefix to store a pack containing pruned objects"
msgstr "préfixe de paquet pour stocker un paquet contenant les objets élagués"
+msgid "skip maintenance tasks typically done in the foreground"
+msgstr "passer les tâches de maintenance typiquement lancées en premier plan"
+
#, c-format
msgid "failed to parse gc.logExpiry value %s"
msgstr "impossible d'analyser gc.logExpiry %s"
@@ -6998,14 +7022,14 @@
"tâche incremental-repack ignorée parce que core.multiPackIndex est désactivé"
#, c-format
-msgid "lock file '%s' exists, skipping maintenance"
-msgstr "le fichier verrou '%s' existe, pas de maintenance"
-
-#, c-format
msgid "task '%s' failed"
msgstr "échec de la tâche '%s'"
#, c-format
+msgid "lock file '%s' exists, skipping maintenance"
+msgstr "le fichier verrou '%s' existe, pas de maintenance"
+
+#, c-format
msgid "'%s' is not a valid task"
msgstr "'%s' n'est pas une tâche valide"
@@ -7034,9 +7058,6 @@
msgid "run a specific task"
msgstr "lancer une tâche spécifique"
-msgid "use at most one of --auto and --schedule=<frequency>"
-msgstr "--auto et --schedule=<fréquence> sont mutuellement exclusifs"
-
#, c-format
msgid "unable to add '%s' value of '%s'"
msgstr "impossible d'ajouter la valeur '%s' de '%s'"
@@ -7932,10 +7953,6 @@
"-L<plage>:<fichier> ne peut pas être utilisé avec une spécificateur de chemin"
#, c-format
-msgid "Final output: %d %s\n"
-msgstr "Sortie finale : %d %s\n"
-
-#, c-format
msgid "git show %s: bad file"
msgstr "git show %s : fichier incorrect"
@@ -8659,6 +8676,9 @@
msgid "(synonym to --stat)"
msgstr "(synonyme de --stat)"
+msgid "show a compact-summary at the end of the merge"
+msgstr "afficher un résumé rapide à la fin de la fusion"
+
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 "
@@ -8932,10 +8952,6 @@
msgstr "erreur : l'entrée d'étiquette ne passe pas fsck : %s"
#, c-format
-msgid "%d (FSCK_IGNORE?) should never trigger this callback"
-msgstr "%d (FSCK_IGNORE?) ne devrait jamais rappeler cette fonction"
-
-#, c-format
msgid "could not read tagged object '%s'"
msgstr "impossible de lire l'objet étiqueté '%s'"
@@ -9456,16 +9472,27 @@
msgid "unknown subcommand: `%s'"
msgstr "sous-commande inconnue : `%s'"
-msgid "git pack-objects --stdout [<options>] [< <ref-list> | < <object-list>]"
-msgstr ""
-"git pack-objects --stdout [<options>] [< <liste-références> | < <liste-"
-"objets>]"
-
msgid ""
-"git pack-objects [<options>] <base-name> [< <ref-list> | < <object-list>]"
+"git pack-objects [-q | --progress | --all-progress] [--all-progress-"
+"implied]\n"
+" [--no-reuse-delta] [--delta-base-offset] [--non-empty]\n"
+" [--local] [--incremental] [--window=<n>] [--depth=<n>]\n"
+" [--revs [--unpacked | --all]] [--keep-pack=<pack-name>]\n"
+" [--cruft] [--cruft-expiration=<time>]\n"
+" [--stdout [--filter=<filter-spec>] | <base-name>]\n"
+" [--shallow] [--keep-true-parents] [--[no-]sparse]\n"
+" [--name-hash-version=<n>] [--path-walk] < <object-list>"
msgstr ""
-"git pack-objects [<options>] <nom-de-base> [< <liste-références> | < <liste-"
-"objets>]"
+"git pack-objects [-q | --progress | --all-progress] [--all-progress-"
+"implied]\n"
+" [--no-reuse-delta] [--delta-base-offset] [--non-empty]\n"
+" [--local] [--incremental] [--window=<n>] [--depth=<n>]\n"
+" [--revs [--unpacked | --all]] [--keep-pack=<nom-de-"
+"paquet>]\n"
+" [--cruft] [--cruft-expiration=<date>]\n"
+" [--stdout [--filter=<spéc-de-filtre>] | <nom-de-base>]\n"
+" [--shallow] [--keep-true-parents] [--[no-]sparse]\n"
+" [--name-hash-version=<n>] [--path-walk] < <liste-d-objets>"
#, c-format
msgid "invalid --name-hash-version option: %d"
@@ -9573,6 +9600,19 @@
msgid "unable to get type of object %s"
msgstr "impossible d'obtenir le type de l'objet %s"
+msgid "Compressing objects by path"
+msgstr "Compression des objets par chemin"
+
+#, c-format
+msgid "Path-based delta compression using up to %d thread"
+msgid_plural "Path-based delta compression using up to %d threads"
+msgstr[0] ""
+"Compression par delta basé sur les chemins en utilisant jusqu'à %d fil "
+"d'exécution"
+msgstr[1] ""
+"Compression par delta basé sur les chemins en utilisant jusqu'à %d fils "
+"d'exécution"
+
msgid "Compressing objects"
msgstr "Compression des objets"
@@ -9648,6 +9688,9 @@
msgid "unable to force loose object"
msgstr "impossible de forcer l'objet libre"
+msgid "failed to pack objects via path-walk"
+msgstr "échec du paquetage des objets par parcours de chemin"
+
#, c-format
msgid "not a rev '%s'"
msgstr "'%s' n'est pas une révision"
@@ -9763,6 +9806,11 @@
msgid "create thin packs"
msgstr "créer des paquets légers"
+msgid "use the path-walk API to walk objects when possible"
+msgstr ""
+"utiliser l'API de parcours de chemin pour parcourir les objets quand c'est "
+"possible"
+
msgid "create packs suitable for shallow fetches"
msgstr "créer des paquets permettant des récupérations superficielles"
@@ -9821,6 +9869,10 @@
msgstr "pack.deltaCacheLimit est trop grand, forcé à %d"
#, c-format
+msgid "cannot use %s with %s"
+msgstr "impossible d'utiliser %s avec %s"
+
+#, c-format
msgid "bad pack compression level %d"
msgstr "niveau de compression du paquet %d"
@@ -9835,9 +9887,6 @@
msgid "--thin cannot be used to build an indexable pack"
msgstr "--thin ne peut pas être utilisé pour construire un paquet indexable"
-msgid "cannot use --filter with --stdin-packs"
-msgstr "impossible d'utiliser --filter avec --stdin-packs"
-
msgid "cannot use internal rev list with --stdin-packs"
msgstr ""
"impossible d'utiliser une liste interne de révisions avec --stdin-packs"
@@ -9845,9 +9894,6 @@
msgid "cannot use internal rev list with --cruft"
msgstr "impossible d'utiliser une liste interne de révisions avec --cruft"
-msgid "cannot use --stdin-packs with --cruft"
-msgstr "impossible d'utiliser --stdin-packs avec --cruft"
-
msgid "Enumerating objects"
msgstr "Énumération des objets"
@@ -9860,22 +9906,6 @@
"réutilisés du paquet %<PRIu32> (depuis %<PRIuMAX>)"
msgid ""
-"'git pack-redundant' is nominated for removal.\n"
-"If you still use this command, please add an extra\n"
-"option, '--i-still-use-this', on the command line\n"
-"and let us know you still use it by sending an e-mail\n"
-"to <git@vger.kernel.org>. Thanks.\n"
-msgstr ""
-"La suppression de 'git pack-redundant' est prévue.\n"
-"Si vous utilisez cette commande, veuillez ajouter\n"
-"une option supplémentaire, '--i-still-use-this',\n"
-"sur la ligne de commande pour nous avertir par\n"
-"un courriel à <git@vger.kernel.org>. Merci.\n"
-
-msgid "refusing to run without --i-still-use-this"
-msgstr "refus de lancer sans --i-still-use-this"
-
-msgid ""
"git pack-refs [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude "
"<pattern>]"
msgstr ""
@@ -11198,6 +11228,14 @@
msgid "unknown --mirror argument: %s"
msgstr "argument de --mirror inconnu : %s"
+#, c-format
+msgid "remote name '%s' is a subset of existing remote '%s'"
+msgstr "le nom distance '%s' est un sous-ensemble du distant existant '%s'"
+
+#, c-format
+msgid "remote name '%s' is a superset of existing remote '%s'"
+msgstr "les nom distant '%s' est un sur-ensemble du distant existant '%s'"
+
msgid "fetch the remote branches"
msgstr "rapatrier les branches distantes"
@@ -11508,14 +11546,6 @@
msgstr "Impossible de paramétrer %s"
#, c-format
-msgid " %s will become dangling!"
-msgstr " %s se retrouvera en suspens !"
-
-#, c-format
-msgid " %s has become dangling!"
-msgstr " %s se retrouve en suspens !"
-
-#, c-format
msgid "Pruning %s"
msgstr "Élimination de %s"
@@ -11579,11 +11609,11 @@
msgid ""
"git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"
"[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n"
-"[--write-midx] [--name-hash-version=<n>]"
+"[--write-midx] [--name-hash-version=<n>] [--path-walk]"
msgstr ""
"git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"
"[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<nom-de-paquet>]\n"
-"[--write-midx] [--name-hash-version=<n>]"
+"[--write-midx] [--name-hash-version=<n>] [--path-walk]"
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
@@ -11673,6 +11703,9 @@
"spécifier la verison d'empreinte de nom à utiliser pour grouper les objets "
"similaires par chemin"
+msgid "pass --path-walk to git-pack-objects"
+msgstr "passer --path-walk à git-pack-objects"
+
msgid "do not run git-update-server-info"
msgstr "ne pas lancer git-update-server-info"
@@ -12849,17 +12882,23 @@
msgid "git stash create [<message>]"
msgstr "git stash create [<message>]"
+msgid "git stash export (--print | --to-ref <ref>) [<stash>...]"
+msgstr "git stash export (--print | --to-ref <réf>) [<remise>...]"
+
+msgid "git stash import <commit>"
+msgstr "git stash import <commit>"
+
#, c-format
msgid "'%s' is not a stash-like commit"
msgstr "'%s' n'est pas une validation de type remisage"
+msgid "No stash entries found."
+msgstr "Aucune entrée de remisage trouvée."
+
#, c-format
msgid "Too many revisions specified:%s"
msgstr "Trop de révisions spécifiées : %s"
-msgid "No stash entries found."
-msgstr "Aucune entrée de remisage trouvée."
-
#, c-format
msgid "%s is not a valid reference"
msgstr "%s n'est pas une référence valide"
@@ -13014,6 +13053,69 @@
msgid "include ignore files"
msgstr "inclure les fichiers ignorés"
+#, c-format
+msgid "cannot parse commit %s"
+msgstr "impossible d'analyser le commit %s"
+
+#, c-format
+msgid "invalid author or committer for %s"
+msgstr "identité d'auteur ou de valideur invalide pour %s"
+
+msgid "could not write commit"
+msgstr "impossible d'écrire le commit"
+
+#, c-format
+msgid "not a valid revision: %s"
+msgstr "révision invalide : %s"
+
+#, c-format
+msgid "not a commit: %s"
+msgstr "pas un commit : %s"
+
+#, c-format
+msgid "%s is not a valid exported stash commit"
+msgstr "%s n'est pas un commit de remisage exporté valide"
+
+#, c-format
+msgid "found root commit %s with invalid data"
+msgstr "commit racine %s trouvé avec des données invalides"
+
+#, c-format
+msgid "found stash commit %s without expected prefix"
+msgstr "commit de remisage %s trouvé sans le préfixe attendu"
+
+#, c-format
+msgid "cannot parse parents of commit: %s"
+msgstr "impossible d'analyser les parents du commit : %s"
+
+#, c-format
+msgid "%s does not look like a stash commit"
+msgstr "%s ne ressemble pas à un commit de remisage"
+
+#, c-format
+msgid "cannot read commit buffer for %s"
+msgstr "impossible de lire le tampon de commit pour %s"
+
+#, c-format
+msgid "cannot save the stash for %s"
+msgstr "impossible de sauvegarder le remisage pour %s"
+
+msgid "unable to write base commit"
+msgstr "impossible d'écrire le commit de base"
+
+#, c-format
+msgid "unable to find stash entry %s"
+msgstr "impossible de trouver l'entrée de remisage %s"
+
+msgid "print the object ID instead of writing it to a ref"
+msgstr "afficher l'ID d'objet au lieu de l'écrire sur une réf"
+
+msgid "save the data to the given ref"
+msgstr "sauvegarder la donnée sur la réf donnée"
+
+msgid "exactly one of --print and --to-ref is required"
+msgstr "un seul des deux paramètres --print et --to-ref est requis"
+
msgid "skip and remove all lines starting with comment character"
msgstr ""
"sauter et supprimer toutes les lignes commençant par le caractère de "
@@ -13023,14 +13125,6 @@
msgstr "ajouter devant chaque ligne le caractère de commentaire et un espace"
#, c-format
-msgid "Expecting a full ref name, got %s"
-msgstr "Nom de référence complet attendu, %s obtenu"
-
-#, c-format
-msgid "could not get a repository handle for submodule '%s'"
-msgstr "impossible de trouver une poignée de dépôt pour le sous-module '%s'"
-
-#, c-format
msgid ""
"could not look up configuration '%s'. Assuming this repository is its own "
"authoritative upstream."
@@ -13039,6 +13133,10 @@
"son propre amont d'autorité."
#, c-format
+msgid "could not get a repository handle for submodule '%s'"
+msgstr "impossible de trouver une poignée de dépôt pour le sous-module '%s'"
+
+#, 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"
@@ -13400,6 +13498,10 @@
"super-projet, mais le super-projet n'est sur aucune branche"
#, c-format
+msgid "Expecting a full ref name, got %s"
+msgstr "Nom de référence complet attendu, %s obtenu"
+
+#, c-format
msgid "Unable to find current revision in submodule path '%s'"
msgstr ""
"Impossible de trouver la révision actuelle dans le chemin de sous-module '%s'"
@@ -13605,6 +13707,10 @@
msgstr "l'URL de dépôt : '%s' doit être absolu ou commencer par ./|../"
#, c-format
+msgid "submodule name '%s' already used for path '%s'"
+msgstr "Sous-module '%s' déjà utilisé pour le chemin '%s'"
+
+#, c-format
msgid "'%s' is not a valid submodule name"
msgstr "'%s' n'est pas un nom valide de sous-module"
@@ -14251,10 +14357,6 @@
msgstr "Préparation de l'arbre de travail (extraction de '%s')"
#, c-format
-msgid "unreachable: invalid reference: %s"
-msgstr "non joignable : référence invalide : %s"
-
-#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Préparation de l'arbre de travail (HEAD détachée %s)"
@@ -15930,14 +16032,6 @@
"valeur numérique de configuration incorrecte '%s' pour '%s' dans %s : %s"
#, c-format
-msgid "invalid value for variable %s"
-msgstr "valeur invalide pour la variable %s"
-
-#, c-format
-msgid "ignoring unknown core.fsync component '%s'"
-msgstr "ignore le composant core.fsync inconne '%s'"
-
-#, c-format
msgid "bad boolean config value '%s' for '%s'"
msgstr "valeur booléenne de configuration invalide '%s' pour '%s'"
@@ -15950,44 +16044,6 @@
msgstr "'%s' pour '%s' n'est pas un horodatage valide"
#, c-format
-msgid "abbrev length out of range: %d"
-msgstr "longueur d'abbrev hors plage : %d"
-
-#, c-format
-msgid "bad zlib compression level %d"
-msgstr "niveau de compression zlib incorrect %d"
-
-#, c-format
-msgid "%s cannot contain newline"
-msgstr "%s ne peut pas contenir de retour à la ligne"
-
-#, c-format
-msgid "%s must have at least one character"
-msgstr "%s doit contenir au moins un caractère"
-
-#, c-format
-msgid "ignoring unknown core.fsyncMethod value '%s'"
-msgstr "valeur inconnue '%s' de core.fsyncMethod"
-
-msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
-msgstr "core.fsyncObjectFiles est obsolète ; utilisez core.fsync à la place"
-
-#, c-format
-msgid "invalid mode for object creation: %s"
-msgstr "mode invalide pour la création d'objet : %s"
-
-#, c-format
-msgid "malformed value for %s"
-msgstr "valeur mal formée pour %s"
-
-#, c-format
-msgid "malformed value for %s: %s"
-msgstr "valeur mal formée pour %s : %s"
-
-msgid "must be one of nothing, matching, simple, upstream or current"
-msgstr "doit être parmi nothing, matching, simple, upstream ou current"
-
-#, c-format
msgid "unable to load config blob object '%s'"
msgstr "impossible de charger l'objet blob de config '%s'"
@@ -16512,8 +16568,9 @@
msgid "cannot compare a named pipe to a directory"
msgstr "impossible de réparer un tuyau nommé à un répertoire"
-msgid "git diff --no-index [<options>] <path> <path>"
-msgstr "git diff --no-index [<options>] <chemin> <chemin>"
+msgid "git diff --no-index [<options>] <path> <path> [<pathspec>...]"
+msgstr ""
+"git diff --no-index [<options>] <chemin> <chemin> [<spéc-de-chemin>...]"
msgid ""
"Not a git repository. Use --no-index to compare two paths outside a working "
@@ -16522,6 +16579,13 @@
"Pas un dépôt git. Utilisez --no-index pour comparer deux chemins hors d'un "
"arbre de travail"
+msgid ""
+"Limiting comparison with pathspecs is only supported if both paths are "
+"directories."
+msgstr ""
+"La limitation de comparaison entre spécificateurs de chemins n'est prise en "
+"charge que si les deux chemins sont des répertoires."
+
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
@@ -17132,6 +17196,52 @@
msgstr "espaces de nom de Git \"%s\""
#, c-format
+msgid "invalid value for variable %s"
+msgstr "valeur invalide pour la variable %s"
+
+#, c-format
+msgid "ignoring unknown core.fsync component '%s'"
+msgstr "ignore le composant core.fsync inconne '%s'"
+
+#, c-format
+msgid "abbrev length out of range: %d"
+msgstr "longueur d'abbrev hors plage : %d"
+
+#, c-format
+msgid "bad zlib compression level %d"
+msgstr "niveau de compression zlib incorrect %d"
+
+#, c-format
+msgid "%s cannot contain newline"
+msgstr "%s ne peut pas contenir de retour à la ligne"
+
+#, c-format
+msgid "%s must have at least one character"
+msgstr "%s doit contenir au moins un caractère"
+
+#, c-format
+msgid "ignoring unknown core.fsyncMethod value '%s'"
+msgstr "valeur inconnue '%s' de core.fsyncMethod"
+
+msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
+msgstr "core.fsyncObjectFiles est obsolète ; utilisez core.fsync à la place"
+
+#, c-format
+msgid "invalid mode for object creation: %s"
+msgstr "mode invalide pour la création d'objet : %s"
+
+#, c-format
+msgid "malformed value for %s"
+msgstr "valeur mal formée pour %s"
+
+#, c-format
+msgid "malformed value for %s: %s"
+msgstr "valeur mal formée pour %s : %s"
+
+msgid "must be one of nothing, matching, simple, upstream or current"
+msgstr "doit être parmi nothing, matching, simple, upstream ou current"
+
+#, c-format
msgid "too many args to run %s"
msgstr "trop d'arguments pour lancer %s"
@@ -17849,6 +17959,30 @@
msgid "name consists only of disallowed characters: %s"
msgstr "le nom n'est constitué que de caractères interdits : %s"
+msgid "git imap-send [-v] [-q] [--[no-]curl] [(--folder|-f) <folder>] < <mbox>"
+msgstr ""
+"git imap-send [-v] [-q] [--[no-]curl] [(--folder|-f) <répertoire>] < <mbox>"
+
+msgid "no IMAP host specified"
+msgstr "serveur IMAP non spécifié"
+
+msgid ""
+"set the IMAP host with 'git config imap.host <host>'.\n"
+"(e.g., 'git config imap.host imaps://imap.example.com')"
+msgstr ""
+"régler l'hôte IMAP avec 'git config imap.host <hôte>'\n"
+"(par ex., 'git config imap.host imaps://imap.example.com')"
+
+msgid "no IMAP folder specified"
+msgstr "dossier IMAP non spécifié"
+
+msgid ""
+"set the target folder with 'git config imap.folder <folder>'.\n"
+"(e.g., 'git config imap.folder Drafts')"
+msgstr ""
+"régler le dossier cible avec 'git config imap.folder <dossier>'\"\n"
+"(par ex., 'git config imap.folder Drafts')"
+
msgid "expected 'tree:<depth>'"
msgstr "attendu : 'tree:<profondeur>'"
@@ -18656,7 +18790,7 @@
#, c-format
msgid "hash mismatch for %s (expected %s)"
-msgstr "incohérence de hachage pour %s (%s attendu)"
+msgstr "incohérence d'empreinte pour %s (%s attendu)"
#, c-format
msgid "unable to mmap %s"
@@ -18835,6 +18969,26 @@
msgstr "nom d'objet invalide : '%.*s'."
#, c-format
+msgid "invalid object type \"%s\""
+msgstr "type d'objet invalide \"%s\""
+
+#, c-format
+msgid "object %s is a %s, not a %s"
+msgstr "l'objet %s est de type %s, pas de type %s"
+
+#, c-format
+msgid "object %s has unknown type id %d"
+msgstr "l'objet %s a un id de type inconnu %d"
+
+#, c-format
+msgid "unable to parse object: %s"
+msgstr "impossible d'analyser l'objet : %s"
+
+#, c-format
+msgid "hash mismatch %s"
+msgstr "incohérence d'empreinte %s"
+
+#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
"le répertoire objet %s n'existe pas ; vérifiez .git/objects/info/alternates"
@@ -18903,26 +19057,6 @@
msgstr "%s n'est pas un objet '%s' valide"
#, c-format
-msgid "invalid object type \"%s\""
-msgstr "type d'objet invalide \"%s\""
-
-#, c-format
-msgid "object %s is a %s, not a %s"
-msgstr "l'objet %s est de type %s, pas de type %s"
-
-#, c-format
-msgid "object %s has unknown type id %d"
-msgstr "l'objet %s a un id de type inconnu %d"
-
-#, c-format
-msgid "unable to parse object: %s"
-msgstr "impossible d'analyser l'objet : %s"
-
-#, c-format
-msgid "hash mismatch %s"
-msgstr "incohérence de hachage %s"
-
-#, c-format
msgid "duplicate entry when writing bitmap index: %s"
msgstr "entrée dupliquée dans l'index en bitmap : '%s'"
@@ -18933,9 +19067,6 @@
msgid "too many pseudo-merges"
msgstr "trop de pseudo-fusions"
-msgid "trying to write commit not in index"
-msgstr "échec de l'écriture de l'objet commit absent de l'index"
-
msgid "failed to load bitmap index (corrupted?)"
msgstr "échec du chargement de l'index en bitmap (corruption ?)"
@@ -19187,6 +19318,10 @@
msgstr "%s n'est pas disponible"
#, c-format
+msgid "value for %s exceeds %<PRIdMAX>"
+msgstr "la valeur pour %s est supérieure à %<PRIdMAX>"
+
+#, c-format
msgid "value %s for %s not in range [%<PRIdMAX>,%<PRIdMAX>]"
msgstr "valeur %s pour %s pas dans la plage [%<PRIdMAX>,%<PRIdMAX>]"
@@ -20178,6 +20313,14 @@
msgstr "%s ne pointe pas sur un objet valide!"
#, c-format
+msgid "%s%s will become dangling after %s is deleted\n"
+msgstr "%s%s se retrouvera en suspens après que %s est effacé\n"
+
+#, c-format
+msgid "%s%s has become dangling after %s was deleted\n"
+msgstr "%s%s est en suspens depuis que %s a été effacé\n"
+
+#, c-format
msgid ""
"Using '%s' as the name for the initial branch. This default branch name\n"
"is subject to change. To configure the initial branch name to use in all\n"
@@ -22530,6 +22673,9 @@
msgid "toggle pruning of uninteresting paths"
msgstr "activer l'élagage des chemins inintéressants"
+msgid "toggle aggressive edge walk"
+msgstr "activer le parcours agressif des arêtes"
+
msgid "read a pattern list over stdin"
msgstr "lire les motifs depuis stdin"
@@ -23180,6 +23326,23 @@
msgstr "avertissement : "
#, c-format
+msgid ""
+"'%s' is nominated for removal.\n"
+"If you still use this command, please add an extra\n"
+"option, '--i-still-use-this', on the command line\n"
+"and let us know you still use it by sending an e-mail\n"
+"to <git@vger.kernel.org>. Thanks.\n"
+msgstr ""
+"La suppression de '%s' est prévue.\n"
+"Si vous utilisez cette commande, veuillez ajouter\n"
+"une option supplémentaire, '--i-still-use-this',\n"
+"sur la ligne de commande pour nous avertir par\n"
+"un courriel à <git@vger.kernel.org>. Merci.\n"
+
+msgid "refusing to run without --i-still-use-this"
+msgstr "refus de lancer sans --i-still-use-this"
+
+#, c-format
msgid "uname() failed with error '%s' (%d)\n"
msgstr "échec de uname() avec l'erreur '%s' (%d)\n"
@@ -24124,6 +24287,10 @@
msgstr "(corps) Ajout de cc: %s depuis la ligne '%s'\n"
#, perl-format
+msgid "error: invalid SMTP port '%s'\n"
+msgstr "erreur : port SMTP invalide '%s'\n"
+
+#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) Impossible d'exécuter '%s'"
@@ -24176,293 +24343,8 @@
msgid "Do you really want to send %s? [y|N]: "
msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : "
-#~ msgid "git cat-file (-t | -s) [--allow-unknown-type] <object>"
-#~ msgstr "git cat-file (-t | -s) [--allow-unknown-type] <objet>"
+#~ msgid "start-after"
+#~ msgstr "start-after"
-#~ msgid "allow -s and -t to work with broken/corrupt objects"
-#~ msgstr "autoriser -s et -t à travailler sur des objets cassés/corrompus"
-
-#, c-format
-#~ msgid "%s: object is of unknown type '%s': %s"
-#~ msgstr "%s : l'objet a un type '%s' inconnu : %s"
-
-#, c-format
-#~ msgid "%s points nowhere!"
-#~ msgstr "%s ne pointe nulle part !"
-
-#~ msgid "(bad commit)\n"
-#~ msgstr "(mauvais commit)\n"
-
-#, c-format
-#~ msgid "add_cacheinfo failed for path '%s'; merge aborting."
-#~ msgstr "échec de add_cacheinfo pour le chemin '%s' ; abandon de la fusion."
-
-#, c-format
-#~ msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
-#~ msgstr "échec de add_cacheinfo pour le chemin '%s' ; abandon de la fusion."
-
-#, c-format
-#~ msgid "failed to create path '%s'%s"
-#~ msgstr "impossible de créer le chemin '%s' %s"
-
-#, c-format
-#~ msgid "Removing %s to make room for subdirectory\n"
-#~ msgstr "Suppression de %s pour faire de la place pour le sous-répertoire\n"
-
-#~ msgid ": perhaps a D/F conflict?"
-#~ msgstr ": peut-être un conflit D/F ?"
-
-#, c-format
-#~ msgid "refusing to lose untracked file at '%s'"
-#~ msgstr "refus de perdre le fichier non suivi '%s'"
-
-#, c-format
-#~ msgid "blob expected for %s '%s'"
-#~ msgstr "blob attendu pour %s '%s'"
-
-#, c-format
-#~ msgid "failed to open '%s': %s"
-#~ msgstr "échec à l'ouverture de '%s' : %s"
-
-#, c-format
-#~ msgid "failed to symlink '%s': %s"
-#~ msgstr "échec à la création du lien symbolique '%s' : %s"
-
-#, c-format
-#~ msgid "do not know what to do with %06o %s '%s'"
-#~ msgstr "ne sait pas traiter %06o %s '%s'"
-
-#, c-format
-#~ msgid "Failed to merge submodule %s (repository corrupt)"
-#~ msgstr "Échec de la fusion du sous-module %s (dépôt corrompu)"
-
-#, c-format
-#~ msgid "Fast-forwarding submodule %s to the following commit:"
-#~ msgstr "Avance rapide du sous-module %s au commit suivant :"
-
-#, c-format
-#~ msgid "Fast-forwarding submodule %s"
-#~ msgstr "Avance rapide du sous-module %s"
-
-#, c-format
-#~ msgid "Failed to merge submodule %s (merge following commits not found)"
-#~ msgstr ""
-#~ "Échec de fusion du sous-module %s (fusion suivant les commits non trouvée)"
-
-#, c-format
-#~ msgid "Failed to merge submodule %s (not fast-forward)"
-#~ msgstr "Échec de fusion du sous-module %s (pas en avance rapide)"
-
-#~ msgid "Found a possible merge resolution for the submodule:\n"
-#~ msgstr "Résolution possible de fusion trouvée pour le sous-module :\n"
-
-#, c-format
-#~ msgid ""
-#~ "If this is correct simply add it to the index for example\n"
-#~ "by using:\n"
-#~ "\n"
-#~ " git update-index --cacheinfo 160000 %s \"%s\"\n"
-#~ "\n"
-#~ "which will accept this suggestion.\n"
-#~ msgstr ""
-#~ "Si c'est correct, ajoutez le simplement à l'index\n"
-#~ "en utilisant par exemple :\n"
-#~ "\n"
-#~ " git update-index --cacheinfo 160000 %s \"%s\"\n"
-#~ "\n"
-#~ "qui acceptera cette suggestion.\n"
-
-#, c-format
-#~ msgid "Failed to merge submodule %s (multiple merges found)"
-#~ msgstr "Échec de fusion du sous-module %s (plusieurs fusions trouvées)"
-
-#~ msgid "failed to execute internal merge"
-#~ msgstr "échec à l'exécution de la fusion interne"
-
-#, c-format
-#~ msgid "unable to add %s to database"
-#~ msgstr "impossible d'ajouter %s à la base de données"
-
-#, c-format
-#~ msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
-#~ msgstr ""
-#~ "Erreur : refus de perdre le fichier non suivi %s ; écriture dans %s à la "
-#~ "place."
-
-#, c-format
-#~ msgid ""
-#~ "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s "
-#~ "left in tree."
-#~ msgstr ""
-#~ "CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s "
-#~ "de %s laissée dans l'arbre."
-
-#, 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."
-
-#, c-format
-#~ msgid ""
-#~ "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s "
-#~ "left in tree at %s."
-#~ msgstr ""
-#~ "CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s "
-#~ "de %s laissée dans l'arbre dans le fichier %s."
-
-#, 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."
-
-#~ msgid "rename"
-#~ msgstr "renommage"
-
-#~ msgid "renamed"
-#~ msgstr "renommé"
-
-#, c-format
-#~ msgid "Refusing to lose dirty file at %s"
-#~ msgstr "Refus de perdre le fichier modifié %s"
-
-#, c-format
-#~ msgid "Refusing to lose untracked file at %s, even though it's in the way."
-#~ msgstr "Refus de perdre le fichier non suivi %s, même s'il gêne."
-
-#, c-format
-#~ msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
-#~ msgstr ""
-#~ "CONFLIT (renommage/ajout) : Renommage de %s->%s dans %s. %s ajouté dans %s"
-
-#, 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"
-
-#, c-format
-#~ msgid "Refusing to lose untracked file at %s; adding as %s instead"
-#~ msgstr "Refus de perdre le fichier non suivi %s ; ajout comme %s à la place"
-
-#, c-format
-#~ msgid ""
-#~ "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename "
-#~ "\"%s\"->\"%s\" in \"%s\"%s"
-#~ msgstr ""
-#~ "CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la "
-#~ "branche \"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s"
-
-#~ msgid " (left unresolved)"
-#~ msgstr " (laissé non résolu)"
-
-#, 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"
-
-#, c-format
-#~ msgid ""
-#~ "CONFLICT (directory rename split): Unclear where to place %s because "
-#~ "directory %s was renamed to multiple other directories, with no "
-#~ "destination getting a majority of the files."
-#~ msgstr ""
-#~ "CONFLIT (renommage de répertoire coupé) : la place de %s n'est pas claire "
-#~ "parce que le répertoire %s a été renommé en plusieurs autres répertoires, "
-#~ "sans aucune destination récupérant la majorité des fichiers."
-
-#, c-format
-#~ msgid ""
-#~ "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory "
-#~ "%s->%s in %s"
-#~ msgstr ""
-#~ "CONFLIT (renommage/renommage) : renommage du répertoire %s->%s dans %s. "
-#~ "Renommage de répertoire %s->%s dans %s"
-
-#, c-format
-#~ msgid "cannot read object %s"
-#~ msgstr "impossible de lire l'objet %s"
-
-#, c-format
-#~ msgid "object %s is not a blob"
-#~ msgstr "l'objet %s n'est pas un blob"
-
-#~ msgid "modify"
-#~ msgstr "modification"
-
-#~ msgid "modified"
-#~ msgstr "modifié"
-
-#, c-format
-#~ msgid "Skipped %s (merged same as existing)"
-#~ msgstr "%s sauté (fusion identique à l'existant)"
-
-#, c-format
-#~ msgid "Adding as %s instead"
-#~ msgstr "Ajout plutôt comme %s"
-
-#, c-format
-#~ msgid "Removing %s"
-#~ msgstr "Suppression de %s"
-
-#~ msgid "file/directory"
-#~ msgstr "fichier/répertoire"
-
-#~ msgid "directory/file"
-#~ msgstr "répertoire/fichier"
-
-#, 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"
-
-#, c-format
-#~ msgid "Adding %s"
-#~ msgstr "Ajout de %s"
-
-#, c-format
-#~ msgid "CONFLICT (add/add): Merge conflict in %s"
-#~ msgstr "CONFLIT (ajout/ajout) : Conflit de fusion dans %s"
-
-#, c-format
-#~ msgid "merging of trees %s and %s failed"
-#~ msgstr "échec de fusion des arbres %s et %s"
-
-#~ msgid "Merging:"
-#~ msgstr "Fusion :"
-
-#, 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 :"
-
-#~ msgid "merge returned no commit"
-#~ msgstr "la fusion n'a pas retourné de commit"
-
-#~ msgid "cannot write incremental MIDX with bitmap"
-#~ msgstr "impossible d'écrire un MIDX incrémental avec des bitmap"
-
-#, c-format
-#~ msgid "Could not find remote branch %s to clone."
-#~ msgstr "Impossible de trouver la branche distante '%s' à cloner."
-
-#, c-format
-#~ msgid "merging cannot continue; got unclean result of %d"
-#~ msgstr "la fusion ne peut pas continuer ; résultat non propre retourné %d"
-
-#~ msgid "--onto and --advance are incompatible"
-#~ msgstr "--onto et --advance sont incompatibles"
-
-#, c-format
-#~ msgid "key '%s' of pattern had no '*'"
-#~ msgstr "la clé '%s' du modèle n'a pas de '*'"
-
-#, c-format
-#~ msgid "preferred pack (%s) is invalid"
-#~ msgstr "le paquet préféré (%s) est invalide"
+#~ msgid "compact-summary"
+#~ msgstr "résumé-compact"
diff --git a/po/id.po b/po/id.po
index d318019..470e1c3 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2025-05-27 22:57+0000\n"
-"PO-Revision-Date: 2025-06-07 08:26+0700\n"
+"POT-Creation-Date: 2025-08-12 17:01+0000\n"
+"PO-Revision-Date: 2025-08-15 17:33+0700\n"
"Last-Translator: Bagas Sanjaya <bagasdotme@gmail.com>\n"
"Language-Team: Indonesian\n"
"Language: id\n"
@@ -19,6 +19,11 @@
#: add-interactive.c
#, c-format
+msgid "%s cannot be negative"
+msgstr "%s tidak boleh negatif"
+
+#: add-interactive.c
+#, c-format
msgid "Huh (%s)?"
msgstr "Huh (%s)?"
@@ -950,10 +955,10 @@
#: builtin/describe.c builtin/diff-tree.c builtin/difftool.c
#: builtin/fast-export.c builtin/fetch.c builtin/help.c builtin/index-pack.c
#: builtin/init-db.c builtin/log.c builtin/ls-files.c builtin/merge-base.c
-#: builtin/merge-tree.c builtin/merge.c builtin/pack-objects.c builtin/rebase.c
-#: builtin/repack.c builtin/replay.c builtin/reset.c builtin/rev-parse.c
-#: builtin/show-branch.c builtin/stash.c builtin/submodule--helper.c
-#: builtin/tag.c builtin/worktree.c parse-options.c range-diff.c revision.c
+#: builtin/merge-tree.c builtin/merge.c builtin/rebase.c builtin/repack.c
+#: builtin/replay.c builtin/reset.c builtin/rev-parse.c builtin/show-branch.c
+#: builtin/stash.c builtin/submodule--helper.c builtin/tag.c builtin/worktree.c
+#: parse-options.c range-diff.c revision.c
#, c-format
msgid "options '%s' and '%s' cannot be used together"
msgstr "Opsi '%s' dan '%s' tidak dapat digunakan bersamaan"
@@ -2369,6 +2374,12 @@
msgid "adding files failed"
msgstr "gagal menambahkan berkas"
+#: builtin/add.c builtin/checkout.c builtin/commit.c builtin/reset.c
+#: builtin/stash.c
+#, c-format
+msgid "'%s' cannot be negative"
+msgstr "'%s' tidak boleh negatif"
+
#: builtin/add.c
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
@@ -2407,7 +2418,7 @@
msgstr "tindakan jelek '%s' untuk '%s'"
#: builtin/am.c builtin/blame.c builtin/fetch.c builtin/pack-objects.c
-#: builtin/pull.c builtin/revert.c config.c diff-merges.c gpg-interface.c
+#: builtin/pull.c builtin/revert.c diff-merges.c environment.c gpg-interface.c
#: ls-refs.c parallel-checkout.c sequencer.c setup.c
#, c-format
msgid "invalid value for '%s': '%s'"
@@ -3901,8 +3912,8 @@
"Mohon tinjau sisa laporan bug di bawah ini.\n"
"Anda dapat menghapus baris-baris yang Anda tidak ingin dibagi.\n"
-#: builtin/bugreport.c builtin/commit.c builtin/fast-export.c builtin/rebase.c
-#: parse-options.h
+#: builtin/bugreport.c builtin/commit.c builtin/fast-export.c
+#: builtin/pack-objects.c builtin/rebase.c parse-options.h
msgid "mode"
msgstr "mode"
@@ -6350,25 +6361,27 @@
#: builtin/config.c
msgid ""
"git config get [<file-option>] [<display-option>] [--includes] [--all] [--"
-"regexp] [--value=<value>] [--fixed-value] [--default=<default>] <name>"
+"regexp] [--value=<pattern>] [--fixed-value] [--default=<default>] [--"
+"url=<url>] <name>"
msgstr ""
"git config get [<opsi berkas>] [<opsi tampilan>] [--includes] [--all] [--"
-"regexp] [--value=<nilai>] [--fixed-value] [--default=<default>] <nama>"
+"regexp] [--value=<nilai>] [--fixed-value] [--default=<default>] [--"
+"url=<url>] <nama>"
#: builtin/config.c
msgid ""
-"git config set [<file-option>] [--type=<type>] [--all] [--value=<value>] [--"
-"fixed-value] <name> <value>"
+"git config set [<file-option>] [--type=<type>] [--all] [--value=<pattern>] "
+"[--fixed-value] <name> <value>"
msgstr ""
-"git config set [<opsi berkas>] [--type=<tipe>] [--all] [--value=<nilai>] [--"
+"git config set [<opsi berkas>] [--type=<tipe>] [--all] [--value=<pola>] [--"
"fixed-value] <nama> <nilai>"
#: builtin/config.c
msgid ""
-"git config unset [<file-option>] [--all] [--value=<value>] [--fixed-value] "
+"git config unset [<file-option>] [--all] [--value=<pattern>] [--fixed-value] "
"<name>"
msgstr ""
-"git config unset [<opsi berkas>] [--all] [--value=<nilai>] [--fixed-value] "
+"git config unset [<opsi berkas>] [--all] [--value=<pola>] [--fixed-value] "
"<nama>"
#: builtin/config.c
@@ -6390,20 +6403,19 @@
#: builtin/config.c
msgid ""
"git config get [<file-option>] [<display-option>] [--includes] [--all] [--"
-"regexp=<regexp>] [--value=<value>] [--fixed-value] [--default=<default>] "
+"regexp=<regexp>] [--value=<pattern>] [--fixed-value] [--default=<default>] "
"<name>"
msgstr ""
"git config get [<opsi berkas>] [<opsi tampilan] [--includes] [--all] [--"
-"regexp=<regexp> [--value=<nilai>] [--fixed-value] [--default=<default>] "
-"<nama>"
+"regexp=<regexp> [--value=<pola>] [--fixed-value] [--default=<asali>] <nama>"
#: builtin/config.c
msgid ""
"git config set [<file-option>] [--type=<type>] [--comment=<message>] [--all] "
-"[--value=<value>] [--fixed-value] <name> <value>"
+"[--value=<pattern>] [--fixed-value] <name> <value>"
msgstr ""
"git config set [<opsi berkas>] [--type=<tipe>] [--comment=<pesan>] [--all] "
-"[--value=<nilai>] [--fixed-value] <nama> <nilai>"
+"[--value=<pola>] [--fixed-value] <nama> <nilai>"
#: builtin/config.c
msgid "Config file location"
@@ -7493,25 +7505,6 @@
msgstr "tolak %s karena akar dangkal tidak diperkenankan untuk diperbarui"
#: builtin/fetch.c
-#, c-format
-msgid ""
-"some local refs could not be updated; try running\n"
-" 'git remote prune %s' to remove any old, conflicting branches"
-msgstr ""
-"beberapa referensi lokal tidak dapat diperbarui; coba jalankan\n"
-" 'git remote prune %s' untuk hapus cabang yang lama dan berkonflik"
-
-#: builtin/fetch.c
-#, c-format
-msgid " (%s will become dangling)"
-msgstr " (%s akan menjadi terjuntai)"
-
-#: builtin/fetch.c
-#, c-format
-msgid " (%s has become dangling)"
-msgstr " (%s telah menjadi terjuntai)"
-
-#: builtin/fetch.c
msgid "[deleted]"
msgstr "[dihapus]"
@@ -7534,7 +7527,7 @@
msgid "option \"%s\" is ignored for %s"
msgstr "opsi \"%s\" diabaikan untuk %s"
-#: builtin/fetch.c object-store.c
+#: builtin/fetch.c odb.c
#, c-format
msgid "%s is not a valid object"
msgstr "%s bukan sebuah objek valid"
@@ -7560,6 +7553,20 @@
"mematikan peringatan ini sampai remote mengubah HEAD ke yang lain."
#: builtin/fetch.c
+#, c-format
+msgid ""
+"some local refs could not be updated; try running\n"
+" 'git remote prune %s' to remove any old, conflicting branches"
+msgstr ""
+"beberapa referensi lokal tidak dapat diperbarui; coba jalankan\n"
+" 'git remote prune %s' untuk hapus cabang yang lama dan berkonflik"
+
+#: builtin/fetch.c
+#, c-format
+msgid "fetching ref %s failed: %s"
+msgstr "gagal mengambil referensi %s: %s"
+
+#: builtin/fetch.c
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "banyak cabang terdeteksi, tidak kompatibel dengan --set-upstream"
@@ -7868,6 +7875,10 @@
msgstr "git for-each-ref [--contains [<komit>]] [--no-contains [<komit>]]"
#: builtin/for-each-ref.c
+msgid "git for-each-ref [--start-after <marker>]"
+msgstr "git for-each-ref [--start-after <penanda>]"
+
+#: builtin/for-each-ref.c
msgid "quote placeholders suitably for shells"
msgstr "kutip tempat penampung yang sesuai untuk cangkang"
@@ -7887,6 +7898,14 @@
msgid "show only <n> matched refs"
msgstr "hanya perlihatkan <n> referensi yang cocok"
+#: builtin/for-each-ref.c
+msgid "marker"
+msgstr "penanda"
+
+#: builtin/for-each-ref.c
+msgid "start iteration after the provided marker"
+msgstr "mulai iterasi setelah penanda yang diberikan"
+
#: builtin/for-each-ref.c builtin/tag.c
msgid "respect format colors"
msgstr "hargai warna format"
@@ -7920,9 +7939,17 @@
msgstr "juga termasuk referensi HEAD dan referensi semu"
#: builtin/for-each-ref.c
+msgid "cannot use --start-after with custom sort options"
+msgstr "tidak dapat menggunakan --start-after dengan opsi urut kustom"
+
+#: builtin/for-each-ref.c
msgid "unknown arguments supplied with --stdin"
msgstr "argumen tidak dikenal diberikan dengan --stdin"
+#: builtin/for-each-ref.c
+msgid "cannot use --start-after with patterns"
+msgstr "tidak dapat menggunakan --start-after dengan pola"
+
#: builtin/for-each-repo.c
msgid "git for-each-repo --config=<config> [--] <arguments>"
msgstr "git for-each-repo --config=<konfigurasi> [--] <argumen perintah>"
@@ -8427,6 +8454,10 @@
msgstr "awalan pak untuk menyimpan pak berisi objek terpangkas"
#: builtin/gc.c
+msgid "skip maintenance tasks typically done in the foreground"
+msgstr "lewati tugas pemeliharaan yang umumnya dilakukan di depan layar"
+
+#: builtin/gc.c
#, c-format
msgid "failed to parse gc.logExpiry value %s"
msgstr "gagal menguraikan nilai gc.logExpiry %s"
@@ -8516,13 +8547,13 @@
#: builtin/gc.c
#, c-format
-msgid "lock file '%s' exists, skipping maintenance"
-msgstr "berkas kunci '%s' ada, melewatkan pemeliharaan"
+msgid "task '%s' failed"
+msgstr "tugas '%s' gagal"
#: builtin/gc.c
#, c-format
-msgid "task '%s' failed"
-msgstr "tugas '%s' gagal"
+msgid "lock file '%s' exists, skipping maintenance"
+msgstr "berkas kunci '%s' ada, melewatkan pemeliharaan"
#: builtin/gc.c
#, c-format
@@ -8564,10 +8595,6 @@
msgstr "jalankan tugas spesifik"
#: builtin/gc.c
-msgid "use at most one of --auto and --schedule=<frequency>"
-msgstr "gunakan paling banyak satu dari --auto dan --schedule=<frekuensi>"
-
-#: builtin/gc.c
#, c-format
msgid "unable to add '%s' value of '%s'"
msgstr "tidak dapat menambahkan nilai '%s' dari '%s'"
@@ -9683,11 +9710,6 @@
#: builtin/log.c
#, c-format
-msgid "Final output: %d %s\n"
-msgstr "Keluaran terakhir: %d %s\n"
-
-#: builtin/log.c
-#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: berkas jelek"
@@ -10606,6 +10628,10 @@
msgstr "(sinonim untuk --stat)"
#: builtin/merge.c builtin/pull.c
+msgid "show a compact-summary at the end of the merge"
+msgstr "perlihatkan ringkasan kecil di akhir penggabungan"
+
+#: builtin/merge.c builtin/pull.c
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"tambah (paling banyak <n>) entri dari log pendek ke pesan komit penggabungan"
@@ -10942,11 +10968,6 @@
#: builtin/mktag.c
#, c-format
-msgid "%d (FSCK_IGNORE?) should never trigger this callback"
-msgstr "%d (FSCK_IGNORE?) seharusnya tidak pernah memicu pemanggilan balik ini"
-
-#: builtin/mktag.c
-#, c-format
msgid "could not read tagged object '%s'"
msgstr "tidak dapat membaca objek tertag '%s'"
@@ -11603,17 +11624,26 @@
msgstr "subperintah tidak dikenal: `%s'"
#: builtin/pack-objects.c
-msgid "git pack-objects --stdout [<options>] [< <ref-list> | < <object-list>]"
-msgstr ""
-"git pack-objects --stdout [<opsi>...] [< <daftar referensi> | < <daftar-"
-"objek>]"
-
-#: builtin/pack-objects.c
msgid ""
-"git pack-objects [<options>] <base-name> [< <ref-list> | < <object-list>]"
+"git pack-objects [-q | --progress | --all-progress] [--all-progress-"
+"implied]\n"
+" [--no-reuse-delta] [--delta-base-offset] [--non-empty]\n"
+" [--local] [--incremental] [--window=<n>] [--depth=<n>]\n"
+" [--revs [--unpacked | --all]] [--keep-pack=<pack-name>]\n"
+" [--cruft] [--cruft-expiration=<time>]\n"
+" [--stdout [--filter=<filter-spec>] | <base-name>]\n"
+" [--shallow] [--keep-true-parents] [--[no-]sparse]\n"
+" [--name-hash-version=<n>] [--path-walk] < <object-list>"
msgstr ""
-"git pack-objects [<opsi>...] <nama dasar> [< <daftar referensi> | < <daftar-"
-"objek>]"
+"git pack-objects [-q | --progress | --all-progress] [--all-progress-"
+"implied]\n"
+" [--no-reuse-delta] [--delta-base-offset] [--non-empty]\n"
+" [--local] [--incremental] [--window=<n>] [--depth=<n>]\n"
+" [--revs [--unpacked | --all]] [--keep-pack=<nama pak>]\n"
+" [--cruft] [--cruft-expiration=<waktu>]\n"
+" [--stdout [--filter=<spek penyaring>] | <nama dasar>]\n"
+" [--shallow] [--keep-true-parents] [--[no-]sparse]\n"
+" [--name-hash-version=<n>] [--path-walk] < <daftar objek>"
#: builtin/pack-objects.c
#, c-format
@@ -11743,6 +11773,17 @@
msgstr "tidak dapat mendapatkan tipe objek %s"
#: builtin/pack-objects.c
+msgid "Compressing objects by path"
+msgstr "Memampatkan objek berdasarkan jalur"
+
+#: builtin/pack-objects.c
+#, c-format
+msgid "Path-based delta compression using up to %d thread"
+msgid_plural "Path-based delta compression using up to %d threads"
+msgstr[0] "Kompresi delta berdasarkan jalur menggunakan sampai %d utas"
+msgstr[1] "Kompresi delta berdasarkan jalur menggunakan sampai %d utas"
+
+#: builtin/pack-objects.c
msgid "Compressing objects"
msgstr "Memampatkan objek"
@@ -11835,6 +11876,10 @@
msgstr "tidak dapat memaksakan objek longgar"
#: builtin/pack-objects.c
+msgid "failed to pack objects via path-walk"
+msgstr "gagal mempak objek lewat jalan jalur"
+
+#: builtin/pack-objects.c
#, c-format
msgid "not a rev '%s'"
msgstr "bukan sebuah revisi '%s'"
@@ -11979,6 +12024,10 @@
msgstr "buat pak tipis"
#: builtin/pack-objects.c
+msgid "use the path-walk API to walk objects when possible"
+msgstr "gunakan API path-walk untuk melangkahi objek apabila dimungkinkan"
+
+#: builtin/pack-objects.c
msgid "create packs suitable for shallow fetches"
msgstr "buat pak yang cocok untuk pengambilan dangkal"
@@ -12052,7 +12101,12 @@
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "pack.deltaCacheLimit terlalu tinggi, memaksakan %d"
-#: builtin/pack-objects.c config.c
+#: builtin/pack-objects.c
+#, c-format
+msgid "cannot use %s with %s"
+msgstr "tidak dapat menggunakan %s dengan %s"
+
+#: builtin/pack-objects.c environment.c
#, c-format
msgid "bad pack compression level %d"
msgstr "level kompresi pak jelek %d"
@@ -12073,10 +12127,6 @@
"--thin tidak dapat digunakan untuk membangun sebuah pak yang dapat diindeks"
#: builtin/pack-objects.c
-msgid "cannot use --filter with --stdin-packs"
-msgstr "tidak dapat menggunakan --filter dengan --stdin-packs"
-
-#: builtin/pack-objects.c
msgid "cannot use internal rev list with --stdin-packs"
msgstr "tidak dapat menggunakan daftar revisi internal dengan --stdin-packs"
@@ -12085,10 +12135,6 @@
msgstr "tidak dapat menggunakan daftar revisi internal dengan --cruft"
#: builtin/pack-objects.c
-msgid "cannot use --stdin-packs with --cruft"
-msgstr "tidak dapat menggunakan --stdin-packs dengan --cruft"
-
-#: builtin/pack-objects.c
msgid "Enumerating objects"
msgstr "Menghitung objek"
@@ -12101,24 +12147,6 @@
"Total %<PRIu32> (delta %<PRIu32>), digunakan ulang %<PRIu32> (delta "
"%<PRIu32>), pak yang digunakan ulang %<PRIu32> (dari %<PRIuMAX>)"
-#: builtin/pack-redundant.c
-msgid ""
-"'git pack-redundant' is nominated for removal.\n"
-"If you still use this command, please add an extra\n"
-"option, '--i-still-use-this', on the command line\n"
-"and let us know you still use it by sending an e-mail\n"
-"to <git@vger.kernel.org>. Thanks.\n"
-msgstr ""
-"'git pack-redundant' dinominasikan untuk dihapus.\n"
-"Jika Anda masih menggunakan perintah ini, mohon tambahkan sebuah opsi\n"
-"ekstra, '--i-still-use-this', pada baris perintah dan beri tahu kami jika\n"
-"Anda masih menggunakannya dengan mengirimkan surel ke\n"
-"<git@vger.kernel.org>. Terima kasih.\n"
-
-#: builtin/pack-redundant.c
-msgid "refusing to run without --i-still-use-this"
-msgstr "menolak menjalankan tanpa --i-still-use-this"
-
#: builtin/pack-refs.c
msgid ""
"git pack-refs [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude "
@@ -13695,6 +13723,16 @@
msgstr "argumen --mirror tidak dikenal: %s"
#: builtin/remote.c
+#, c-format
+msgid "remote name '%s' is a subset of existing remote '%s'"
+msgstr "nama remote '%s' adalah subset dari remote yang sudah ada '%s'"
+
+#: builtin/remote.c
+#, c-format
+msgid "remote name '%s' is a superset of existing remote '%s'"
+msgstr "nama remote '%s' adalah superset dari remote yang sudah ada '%s'"
+
+#: builtin/remote.c
msgid "fetch the remote branches"
msgstr "ambil cabang remote"
@@ -14069,16 +14107,6 @@
#: builtin/remote.c
#, c-format
-msgid " %s will become dangling!"
-msgstr " %s akan menjadi teruntai!"
-
-#: builtin/remote.c
-#, c-format
-msgid " %s has become dangling!"
-msgstr " %s telah menjadi teruntai!"
-
-#: builtin/remote.c
-#, c-format
msgid "Pruning %s"
msgstr "Memangkas %s"
@@ -14160,11 +14188,11 @@
msgid ""
"git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"
"[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n"
-"[--write-midx] [--name-hash-version=<n>]"
+"[--write-midx] [--name-hash-version=<n>] [--path-walk]"
msgstr ""
"git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"
"[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<nama pak>]\n"
-"[--write-midx] [--name-hash-version=<n>]"
+"[--write-midx] [--name-hash-version=<n>] [--path-walk]"
#: builtin/repack.c
msgid ""
@@ -14269,6 +14297,10 @@
"serupa berdasarkan jalur"
#: builtin/repack.c
+msgid "pass --path-walk to git-pack-objects"
+msgstr "lewatkan --path-walk ke git-pack-objects"
+
+#: builtin/repack.c
msgid "do not run git-update-server-info"
msgstr "jangan jalankan git-update-server-info"
@@ -15721,20 +15753,28 @@
msgstr "git stash create [<pesan>]"
#: builtin/stash.c
+msgid "git stash export (--print | --to-ref <ref>) [<stash>...]"
+msgstr "git stash export (--print | --to-ref <ref>) [<stase>...]"
+
+#: builtin/stash.c
+msgid "git stash import <commit>"
+msgstr "git stash import <komit>"
+
+#: builtin/stash.c
#, c-format
msgid "'%s' is not a stash-like commit"
msgstr "'%s' bukan komit mirip stase"
#: builtin/stash.c
+msgid "No stash entries found."
+msgstr "Tidak ada entri stase ditemukan."
+
+#: builtin/stash.c
#, c-format
msgid "Too many revisions specified:%s"
msgstr "Terlalu banyak revisi disebutkan:%s"
#: builtin/stash.c
-msgid "No stash entries found."
-msgstr "Tidak ada entri stase ditemukan."
-
-#: builtin/stash.c
#, c-format
msgid "%s is not a valid reference"
msgstr "%s bukan referensi valid"
@@ -15934,6 +15974,86 @@
msgid "include ignore files"
msgstr "masukkan berkas ignore"
+#: builtin/stash.c
+#, c-format
+msgid "cannot parse commit %s"
+msgstr "tidak dapat menguraikan komit %s"
+
+#: builtin/stash.c
+#, c-format
+msgid "invalid author or committer for %s"
+msgstr "pengarang atau pengkomit tidak valid untuk %s"
+
+#: builtin/stash.c
+msgid "could not write commit"
+msgstr "tidak dapat menulis komit"
+
+#: builtin/stash.c
+#, c-format
+msgid "not a valid revision: %s"
+msgstr "bukan revisi valid: %s"
+
+#: builtin/stash.c
+#, c-format
+msgid "not a commit: %s"
+msgstr "bukan komit: %s"
+
+#: builtin/stash.c
+#, c-format
+msgid "%s is not a valid exported stash commit"
+msgstr "%s bukan komit stase terekspor yang valid"
+
+#: builtin/stash.c
+#, c-format
+msgid "found root commit %s with invalid data"
+msgstr "dapat komit akar %s dengan data invalid"
+
+#: builtin/stash.c
+#, c-format
+msgid "found stash commit %s without expected prefix"
+msgstr "dapat komit stase %s tanpa prefiks yang diharapkan"
+
+#: builtin/stash.c
+#, c-format
+msgid "cannot parse parents of commit: %s"
+msgstr "tidak dapat menguraikan induk komit: %s"
+
+#: builtin/stash.c
+#, c-format
+msgid "%s does not look like a stash commit"
+msgstr "%s bukan terlihat seperti komit stase"
+
+#: builtin/stash.c
+#, c-format
+msgid "cannot read commit buffer for %s"
+msgstr "tidak dapat membaca penyangga komit untuk %s"
+
+#: builtin/stash.c
+#, c-format
+msgid "cannot save the stash for %s"
+msgstr "tidak dapat menyimpan stase untuk %s"
+
+#: builtin/stash.c
+msgid "unable to write base commit"
+msgstr "tidak dapat menulis komit dasar"
+
+#: builtin/stash.c
+#, c-format
+msgid "unable to find stash entry %s"
+msgstr "tidak dapat menemukan entri stase %s"
+
+#: builtin/stash.c
+msgid "print the object ID instead of writing it to a ref"
+msgstr "cetak ID objek daripada menulisnya ke referensi"
+
+#: builtin/stash.c
+msgid "save the data to the given ref"
+msgstr "simpan data ke referensi yang diberikan"
+
+#: builtin/stash.c
+msgid "exactly one of --print and --to-ref is required"
+msgstr "tepatnya salah satu dari --print dan --to-ref diperlukan"
+
#: builtin/stripspace.c
msgid "skip and remove all lines starting with comment character"
msgstr "lewati dan hapus semua baris yang diawali dengan karakter komentar"
@@ -15944,16 +16064,6 @@
#: builtin/submodule--helper.c
#, c-format
-msgid "Expecting a full ref name, got %s"
-msgstr "Mengharapkan nama referensi penuh, dapat %s"
-
-#: builtin/submodule--helper.c
-#, c-format
-msgid "could not get a repository handle for submodule '%s'"
-msgstr "tidak dapat mendapat pegangan repositori untuk submodul '%s'"
-
-#: builtin/submodule--helper.c
-#, c-format
msgid ""
"could not look up configuration '%s'. Assuming this repository is its own "
"authoritative upstream."
@@ -15963,6 +16073,11 @@
#: builtin/submodule--helper.c
#, c-format
+msgid "could not get a repository handle for submodule '%s'"
+msgstr "tidak dapat mendapat pegangan repositori untuk submodul '%s'"
+
+#: builtin/submodule--helper.c
+#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "Tidak ada url yang ditemukan untuk jalur submodul '%s' di .gitmodules"
@@ -16393,6 +16508,11 @@
#: builtin/submodule--helper.c
#, c-format
+msgid "Expecting a full ref name, got %s"
+msgstr "Mengharapkan nama referensi penuh, dapat %s"
+
+#: builtin/submodule--helper.c
+#, c-format
msgid "Unable to find current revision in submodule path '%s'"
msgstr "Tidak dapat menemukan revisi saat ini pada jalur submodul '%s'"
@@ -16642,6 +16762,11 @@
#: builtin/submodule--helper.c
#, c-format
+msgid "submodule name '%s' already used for path '%s'"
+msgstr "nama submodul '%s' telah digunakan untuk jalur '%s'"
+
+#: builtin/submodule--helper.c
+#, c-format
msgid "'%s' is not a valid submodule name"
msgstr "'%s' bukan nama submodul yang valid"
@@ -17425,11 +17550,6 @@
#: builtin/worktree.c
#, c-format
-msgid "unreachable: invalid reference: %s"
-msgstr "tidak dapat dicapat: referensi tidak valid: %s"
-
-#: builtin/worktree.c
-#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Menyiapkan pohon kerja (HEAD terpisah %s)"
@@ -19479,16 +19599,6 @@
#: config.c
#, c-format
-msgid "invalid value for variable %s"
-msgstr "nilai tidak valid untuk variabel %s"
-
-#: config.c
-#, c-format
-msgid "ignoring unknown core.fsync component '%s'"
-msgstr "mengabaikan komponen core.fsync tidak dikenal '%s'"
-
-#: config.c
-#, c-format
msgid "bad boolean config value '%s' for '%s'"
msgstr "nilai konfigurasi boolean '%s' jelek untuk '%s'"
@@ -19504,54 +19614,6 @@
#: config.c
#, c-format
-msgid "abbrev length out of range: %d"
-msgstr "panjang singkatan di luar rentang: %d"
-
-#: config.c
-#, c-format
-msgid "bad zlib compression level %d"
-msgstr "level kompresi zlib jelek %d"
-
-#: config.c
-#, c-format
-msgid "%s cannot contain newline"
-msgstr "%s tidak dapat berisi baris baru"
-
-#: config.c
-#, c-format
-msgid "%s must have at least one character"
-msgstr "%s harus ada sedikitnya satu karakter"
-
-#: config.c
-#, c-format
-msgid "ignoring unknown core.fsyncMethod value '%s'"
-msgstr "mengabaikan nilai core.fsyncMethod tidak dikenal '%s'"
-
-#: config.c
-msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
-msgstr "core.fsyncObjectFiles usang; gunakan core.fsync sebagai gantinya"
-
-#: config.c
-#, c-format
-msgid "invalid mode for object creation: %s"
-msgstr "mode tidak valid untuk pembuatan objek: %s"
-
-#: config.c
-#, c-format
-msgid "malformed value for %s"
-msgstr "nilai rusak untuk %s"
-
-#: config.c
-#, c-format
-msgid "malformed value for %s: %s"
-msgstr "nilai rusak untuk %s: %s"
-
-#: config.c
-msgid "must be one of nothing, matching, simple, upstream or current"
-msgstr "harus salah satu dari nothing, matching, simple, upstream atau current"
-
-#: config.c
-#, c-format
msgid "unable to load config blob object '%s'"
msgstr "tidak dapat memuat objek blob konfigurasi '%s'"
@@ -20185,8 +20247,8 @@
msgstr "tidak dapat membandingkan pipa bernama dan sebuah direktori"
#: diff-no-index.c
-msgid "git diff --no-index [<options>] <path> <path>"
-msgstr "git diff --no-index [<opsi>] <jalur> <jalur>"
+msgid "git diff --no-index [<options>] <path> <path> [<pathspec>...]"
+msgstr "git diff --no-index [<opsi>] <jalur> <jalur> [<spek jalur>...]"
#: diff-no-index.c
msgid ""
@@ -20196,6 +20258,14 @@
"Bukan sebuah repositori git. Gunakan --no-index untuk membandingkan dua "
"jalur di luar pohon kerja"
+#: diff-no-index.c
+msgid ""
+"Limiting comparison with pathspecs is only supported if both paths are "
+"directories."
+msgstr ""
+"Membatasi perbandingan dengan spek jalur hanya didukung jika kedua jalur "
+"merupakan direktori."
+
#: diff.c
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
@@ -20378,7 +20448,7 @@
msgid "<n>"
msgstr "<n>"
-#: diff.c
+#: diff.c parse-options.h
msgid "generate diffs with <n> lines context"
msgstr "buat diff dengan <n> baris konteks"
@@ -20529,7 +20599,7 @@
msgid "use default prefixes a/ and b/"
msgstr "gunakan awalan asali a/ dan b/"
-#: diff.c
+#: diff.c parse-options.h
msgid "show context between diff hunks up to the specified number of lines"
msgstr ""
"perlihatkan konteks diantara bingkah diff hingga jumlah baris yang disebutkan"
@@ -20929,6 +20999,64 @@
msgid "bad git namespace path \"%s\""
msgstr "jalur ruang nama git jelek \"%s\""
+#: environment.c
+#, c-format
+msgid "invalid value for variable %s"
+msgstr "nilai tidak valid untuk variabel %s"
+
+#: environment.c
+#, c-format
+msgid "ignoring unknown core.fsync component '%s'"
+msgstr "mengabaikan komponen core.fsync tidak dikenal '%s'"
+
+#: environment.c
+#, c-format
+msgid "abbrev length out of range: %d"
+msgstr "panjang singkatan di luar rentang: %d"
+
+#: environment.c
+#, c-format
+msgid "bad zlib compression level %d"
+msgstr "level kompresi zlib jelek %d"
+
+#: environment.c
+#, c-format
+msgid "%s cannot contain newline"
+msgstr "%s tidak dapat berisi baris baru"
+
+#: environment.c
+#, c-format
+msgid "%s must have at least one character"
+msgstr "%s harus ada sedikitnya satu karakter"
+
+#: environment.c
+#, c-format
+msgid "ignoring unknown core.fsyncMethod value '%s'"
+msgstr "mengabaikan nilai core.fsyncMethod tidak dikenal '%s'"
+
+#: environment.c
+msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
+msgstr "core.fsyncObjectFiles usang; gunakan core.fsync sebagai gantinya"
+
+#: environment.c
+#, c-format
+msgid "invalid mode for object creation: %s"
+msgstr "mode tidak valid untuk pembuatan objek: %s"
+
+#: environment.c
+#, c-format
+msgid "malformed value for %s"
+msgstr "nilai rusak untuk %s"
+
+#: environment.c
+#, c-format
+msgid "malformed value for %s: %s"
+msgstr "nilai rusak untuk %s: %s"
+
+#: environment.c
+msgid "must be one of nothing, matching, simple, upstream or current"
+msgstr "harus salah satu dari nothing, matching, simple, upstream atau current"
+
#: exec-cmd.c
#, c-format
msgid "too many args to run %s"
@@ -21800,6 +21928,35 @@
msgid "name consists only of disallowed characters: %s"
msgstr "nama hanya terdiri dari karakter yang tidak diperbolehkan: %s"
+#: imap-send.c
+msgid "git imap-send [-v] [-q] [--[no-]curl] [(--folder|-f) <folder>] < <mbox>"
+msgstr ""
+"git imap-send [-v] [-q] [--[no-]curl] [(--folder|-f) <folder>] < <mbox>"
+
+#: imap-send.c
+msgid "no IMAP host specified"
+msgstr "tidak ada host IMAP yang dirincikan"
+
+#: imap-send.c
+msgid ""
+"set the IMAP host with 'git config imap.host <host>'.\n"
+"(e.g., 'git config imap.host imaps://imap.example.com')"
+msgstr ""
+"setel host IMAP dengan 'git config imap.host <host>'.\n"
+"(misalnya 'git config imap.host imaps://imap.example.com')"
+
+#: imap-send.c
+msgid "no IMAP folder specified"
+msgstr "tidak ada folder IMAP yang dirincikan"
+
+#: imap-send.c
+msgid ""
+"set the target folder with 'git config imap.folder <folder>'.\n"
+"(e.g., 'git config imap.folder Drafts')"
+msgstr ""
+"setel folder target dengan 'git config imap.folder <folder>'.\n"
+"(contohnya 'git config imap.folder Drafts')"
+
#: list-objects-filter-options.c
msgid "expected 'tree:<depth>'"
msgstr "'tree:<kedalaman> diharapkan'"
@@ -22962,89 +23119,6 @@
msgid "invalid object name '%.*s'."
msgstr "nama objek tidak valid '%.*s'."
-#: object-store.c
-#, c-format
-msgid "object directory %s does not exist; check .git/objects/info/alternates"
-msgstr "direktori objek %s tidak ada; periksa .git/objects/info/alternates"
-
-#: object-store.c
-#, c-format
-msgid "unable to normalize alternate object path: %s"
-msgstr "tidak dapat menormalisasikan jalur objek alternatif: %s"
-
-#: object-store.c
-#, c-format
-msgid "%s: ignoring alternate object stores, nesting too deep"
-msgstr "%s: mengabaikan penyimpanan objek alternatif, bersarang terlalu dalam"
-
-#: object-store.c
-msgid "unable to fdopen alternates lockfile"
-msgstr "tidak dapat men-fdopen berkas kunci alternatif"
-
-#: object-store.c
-msgid "unable to read alternates file"
-msgstr "tidak dapat membaca berkas alternatif"
-
-#: object-store.c
-msgid "unable to move new alternates file into place"
-msgstr "tidak dapat memindahkan berkas alternatif baru ke tempatnya"
-
-#: object-store.c
-#, c-format
-msgid "path '%s' does not exist"
-msgstr "jalur '%s' tidak ada"
-
-#: object-store.c
-#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr ""
-"repositori referensi '%s' sebagai sebuah checkout tertaut belum didukung."
-
-#: object-store.c
-#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr "repositori referensi '%s' bukan sebuah repositori lokal"
-
-#: object-store.c
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr "repositori referensi '%s' dangkal"
-
-#: object-store.c
-#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr "repositori referensi '%s' cangkok"
-
-#: object-store.c
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "tidak dapat menemukan direktori objek yang cocok dengan %s"
-
-#: object-store.c
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr "baris tidak valid saat menguraikan referensi alternatif: %s"
-
-#: object-store.c
-#, c-format
-msgid "replacement %s not found for %s"
-msgstr "pengganti %s tidak ditemukan untuk %s"
-
-#: object-store.c
-#, c-format
-msgid "packed object %s (stored in %s) is corrupt"
-msgstr "objek terpak %s (disimpan di %s) rusak"
-
-#: object-store.c
-#, c-format
-msgid "missing mapping of %s to %s"
-msgstr "pemetaan %s ke %s hilang"
-
-#: object-store.c
-#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr "%s bukan sebuah objek '%s' valid"
-
#: object.c
#, c-format
msgid "invalid object type \"%s\""
@@ -23070,6 +23144,89 @@
msgid "hash mismatch %s"
msgstr "hash tidak cocok %s"
+#: odb.c
+#, c-format
+msgid "object directory %s does not exist; check .git/objects/info/alternates"
+msgstr "direktori objek %s tidak ada; periksa .git/objects/info/alternates"
+
+#: odb.c
+#, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr "tidak dapat menormalisasikan jalur objek alternatif: %s"
+
+#: odb.c
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
+msgstr "%s: mengabaikan penyimpanan objek alternatif, bersarang terlalu dalam"
+
+#: odb.c
+msgid "unable to fdopen alternates lockfile"
+msgstr "tidak dapat men-fdopen berkas kunci alternatif"
+
+#: odb.c
+msgid "unable to read alternates file"
+msgstr "tidak dapat membaca berkas alternatif"
+
+#: odb.c
+msgid "unable to move new alternates file into place"
+msgstr "tidak dapat memindahkan berkas alternatif baru ke tempatnya"
+
+#: odb.c
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "jalur '%s' tidak ada"
+
+#: odb.c
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr ""
+"repositori referensi '%s' sebagai sebuah checkout tertaut belum didukung."
+
+#: odb.c
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "repositori referensi '%s' bukan sebuah repositori lokal"
+
+#: odb.c
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "repositori referensi '%s' dangkal"
+
+#: odb.c
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "repositori referensi '%s' cangkok"
+
+#: odb.c
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "tidak dapat menemukan direktori objek yang cocok dengan %s"
+
+#: odb.c
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "baris tidak valid saat menguraikan referensi alternatif: %s"
+
+#: odb.c
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr "pengganti %s tidak ditemukan untuk %s"
+
+#: odb.c
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "objek terpak %s (disimpan di %s) rusak"
+
+#: odb.c
+#, c-format
+msgid "missing mapping of %s to %s"
+msgstr "pemetaan %s ke %s hilang"
+
+#: odb.c
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "%s bukan sebuah objek '%s' valid"
+
#: pack-bitmap-write.c
#, c-format
msgid "duplicate entry when writing bitmap index: %s"
@@ -23084,10 +23241,6 @@
msgid "too many pseudo-merges"
msgstr "terlalu banyak penggabungan semu"
-#: pack-bitmap-write.c
-msgid "trying to write commit not in index"
-msgstr "mencoba menulis komit yang bukan di indeks"
-
#: pack-bitmap.c
msgid "failed to load bitmap index (corrupted?)"
msgstr "gagal menulis indeks bitmap (rusak?)"
@@ -23398,6 +23551,11 @@
#: parse-options.c
#, c-format
+msgid "value for %s exceeds %<PRIdMAX>"
+msgstr "nilai %s melebihi %<PRIdMAX>"
+
+#: parse-options.c
+#, c-format
msgid "value %s for %s not in range [%<PRIdMAX>,%<PRIdMAX>]"
msgstr "nilai %s untuk %s di luar rentang [%<PRIdMAX>,%<PRIdMAX>]"
@@ -24584,6 +24742,16 @@
#: refs.c
#, c-format
+msgid "%s%s will become dangling after %s is deleted\n"
+msgstr "%s%s akan menjadi teruntai setelah %s dihapus\n"
+
+#: refs.c
+#, c-format
+msgid "%s%s has become dangling after %s was deleted\n"
+msgstr "%s%s telah menjadi teruntai setelah %s dihapus\n"
+
+#: refs.c
+#, c-format
msgid ""
"Using '%s' as the name for the initial branch. This default branch name\n"
"is subject to change. To configure the initial branch name to use in all\n"
@@ -27417,6 +27585,10 @@
msgstr "pangkas jalur yang tidak menarik"
#: t/helper/test-path-walk.c
+msgid "toggle aggressive edge walk"
+msgstr "nyalakan jalan tepian agresif"
+
+#: t/helper/test-path-walk.c
msgid "read a pattern list over stdin"
msgstr "baca daftar pola dari masukan standar"
@@ -28179,6 +28351,25 @@
msgid "warning: "
msgstr "peringatan: "
+#: usage.c
+#, c-format
+msgid ""
+"'%s' is nominated for removal.\n"
+"If you still use this command, please add an extra\n"
+"option, '--i-still-use-this', on the command line\n"
+"and let us know you still use it by sending an e-mail\n"
+"to <git@vger.kernel.org>. Thanks.\n"
+msgstr ""
+"'%s' dinominasikan untuk dihapus.\n"
+"Jika Anda masih menggunakan perintah ini, mohon tambahkan sebuah opsi\n"
+"tambahan, '--i-still-use-this', pada baris perintah dan beri tahu kami jika\n"
+"Anda masih menggunakannya dengan mengirimkan surel ke\n"
+"<git@vger.kernel.org>. Terima kasih.\n"
+
+#: usage.c
+msgid "refusing to run without --i-still-use-this"
+msgstr "menolak menjalankan tanpa --i-still-use-this"
+
#: version.c
#, c-format
msgid "uname() failed with error '%s' (%d)\n"
@@ -29328,6 +29519,11 @@
#: git-send-email.perl
#, perl-format
+msgid "error: invalid SMTP port '%s'\n"
+msgstr "galat: port SMTP tidak valid '%s'\n"
+
+#: git-send-email.perl
+#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) Tidak dapat menjalankan '%s'"
diff --git a/po/sv.po b/po/sv.po
index 42c357e..5ee10ac 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: git 2.49.0\n"
+"Project-Id-Version: git 2.51.0\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2025-03-10 17:45+0100\n"
-"PO-Revision-Date: 2025-03-10 17:48+0100\n"
+"POT-Creation-Date: 2025-08-14 09:52+0100\n"
+"PO-Revision-Date: 2025-08-14 09:53+0100\n"
"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
"Language-Team: Svenska <tp-sv@listor.tp-sv.se>\n"
"Language: sv\n"
@@ -19,6 +19,10 @@
"X-Generator: Gtranslator 42.0\n"
#, c-format
+msgid "%s cannot be negative"
+msgstr "%s kan inte vara negativt"
+
+#, c-format
msgid "Huh (%s)?"
msgstr "Vadå (%s)?"
@@ -1923,6 +1927,10 @@
msgstr "misslyckades lägga till filer"
#, c-format
+msgid "'%s' cannot be negative"
+msgstr "”%s” kan inte vara negativt"
+
+#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "”--chmod”-parametern ”%s” måste antingen vara -x eller +x"
@@ -3241,11 +3249,8 @@
msgid "git cat-file <type> <object>"
msgstr "git cat-file <typ> <objekt>"
-msgid "git cat-file (-e | -p) <object>"
-msgstr "git cat-file (-e | -p) <objekt>"
-
-msgid "git cat-file (-t | -s) [--allow-unknown-type] <object>"
-msgstr "git cat-file (-t | -s) [--allow-unknown-type] <objekt>"
+msgid "git cat-file (-e | -p | -t | -s) <object>"
+msgstr "git cat-file (-e | -p | -t | -s) <objekt>"
msgid ""
"git cat-file (--textconv | --filters)\n"
@@ -3284,9 +3289,6 @@
msgid "show object size"
msgstr "visa objektstorlek"
-msgid "allow -s and -t to work with broken/corrupt objects"
-msgstr "låter -s och -t att fungera med trasiga/sönderskrivna objekt"
-
msgid "use mail map file"
msgstr "använd e-postmappningsfil"
@@ -3342,6 +3344,13 @@
msgid "use a <path> for (--textconv | --filters); Not with 'batch'"
msgstr "använd en <sökväg> för (--textconv | --filters): Inte med ”batch”"
+msgid "objects filter only supported in batch mode"
+msgstr "objektfilter stöds endast i buntläge"
+
+#, c-format
+msgid "objects filter not supported: '%s'"
+msgstr "objektfilter stöds inte: ”%s”"
+
#, c-format
msgid "'%s=<%s>' needs '%s' or '%s'"
msgstr "”%s=<%s>” behöver ”%s” eller ”%s”"
@@ -5054,23 +5063,25 @@
msgid ""
"git config get [<file-option>] [<display-option>] [--includes] [--all] [--"
-"regexp] [--value=<value>] [--fixed-value] [--default=<default>] <name>"
+"regexp] [--value=<pattern>] [--fixed-value] [--default=<default>] [--"
+"url=<url>] <name>"
msgstr ""
"git config get [<filflagga>] [<visningsflagga>] [--includes] [--all] [--"
-"regexp] [--value=<värde>] [--fixed-value] [--default=<förval>] <namn>"
+"regexp] [--value=<mönster>] [--fixed-value] [--default=<förval>] [--"
+"url=<url>] <namn>"
msgid ""
-"git config set [<file-option>] [--type=<type>] [--all] [--value=<value>] [--"
-"fixed-value] <name> <value>"
+"git config set [<file-option>] [--type=<type>] [--all] [--value=<pattern>] "
+"[--fixed-value] <name> <value>"
msgstr ""
-"git config set [<filflagga>] [--type=<typ>] [--all] [--value=<värde>] [--"
+"git config set [<filflagga>] [--type=<typ>] [--all] [--value=<mönster>] [--"
"fixed-value] <namn> <värde>"
msgid ""
-"git config unset [<file-option>] [--all] [--value=<value>] [--fixed-value] "
+"git config unset [<file-option>] [--all] [--value=<pattern>] [--fixed-value] "
"<name>"
msgstr ""
-"git config unset [<filflagga>] [--all] [--value=<värde>] [--fixed-value] "
+"git config unset [<filflagga>] [--all] [--value=<mönster>] [--fixed-value] "
"<namn>"
msgid "git config rename-section [<file-option>] <old-name> <new-name>"
@@ -5087,19 +5098,19 @@
msgid ""
"git config get [<file-option>] [<display-option>] [--includes] [--all] [--"
-"regexp=<regexp>] [--value=<value>] [--fixed-value] [--default=<default>] "
+"regexp=<regexp>] [--value=<pattern>] [--fixed-value] [--default=<default>] "
"<name>"
msgstr ""
"git config get [<filflagga>] [<visningsflagga>] [--includes] [--all] [--"
-"regexp=<reguttr>] [--value=<värde>] [--fixed-value] [--default=<förval>] "
+"regexp=<reguttr>] [--value=<mönster>] [--fixed-value] [--default=<förval>] "
"<namn>"
msgid ""
"git config set [<file-option>] [--type=<type>] [--comment=<message>] [--all] "
-"[--value=<value>] [--fixed-value] <name> <value>"
+"[--value=<pattern>] [--fixed-value] <name> <value>"
msgstr ""
"git config set [<filflagga>] [--type=<typ>] [--comment=<meddelande>] [--all] "
-"[--value=<värde>] [--fixed-value] <namn> <värde>"
+"[--value=<mönster>] [--fixed-value] <namn> <värde>"
msgid "Config file location"
msgstr "Konfigurationsfilens plats"
@@ -5585,6 +5596,50 @@
msgid "specify the content of the diagnostic archive"
msgstr "ange vilket innehåll diagnostikarkivet ska ha"
+#, c-format
+msgid "unable to parse mode: %s"
+msgstr "kan inte tolka läget: %s"
+
+#, c-format
+msgid "unable to parse object id: %s"
+msgstr "kan inte tolka objekt-id: %s"
+
+msgid "git diff-pairs -z [<diff-options>]"
+msgstr "git diff-pairs -z [<diff-flaggor>]"
+
+#, c-format
+msgid "unrecognized argument: %s"
+msgstr "okänt argument: %s"
+
+msgid "working without -z is not supported"
+msgstr "stöder inte att arbeta utan -z"
+
+msgid "pathspec arguments not supported"
+msgstr "sökvägsangivelser stöds inte som argument"
+
+msgid "revision arguments not allowed"
+msgstr "revisioner tillåts inte som argument"
+
+msgid "invalid raw diff input"
+msgstr "ogiltig indata i rå diff"
+
+msgid "tree objects not supported"
+msgstr "trädobjekt stöds inte"
+
+msgid "got EOF while reading path"
+msgstr "fick filslut vid läsning av sökväg"
+
+msgid "got EOF while reading destination path"
+msgstr "fick filslut vid läsning av destinationssökväg"
+
+#, c-format
+msgid "unable to parse rename/copy score: %s"
+msgstr "kan inte tolka namnbyte-/kopieringspoäng: %s"
+
+#, c-format
+msgid "unknown diff status: %c"
+msgstr "okänd diff-status: %c"
+
msgid "--merge-base only works with two commits"
msgstr "--merge-base fungerar endast med två incheckningar"
@@ -5725,6 +5780,9 @@
msgid "select handling of signed tags"
msgstr "välj hantering av signerade taggar"
+msgid "select handling of signed commits"
+msgstr "välj hantering av signerade incheckningar"
+
msgid "select handling of tags that tag filtered objects"
msgstr "välj hantering av taggar som har taggfiltrerade objekt"
@@ -5895,22 +5953,6 @@
msgid "rejected %s because shallow roots are not allowed to be updated"
msgstr "avvisade %s då grunda rötter inte tillåts uppdateras"
-#, c-format
-msgid ""
-"some local refs could not be updated; try running\n"
-" 'git remote prune %s' to remove any old, conflicting branches"
-msgstr ""
-"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"
-
-#, c-format
-msgid " (%s will become dangling)"
-msgstr " (%s kommer bli dinglande)"
-
-#, c-format
-msgid " (%s has become dangling)"
-msgstr " (%s har blivit dinglande)"
-
msgid "[deleted]"
msgstr "[borttagen]"
@@ -5951,6 +5993,18 @@
"varningen till fjärren ändrar HEAD till något annat genom att köra\n"
"”git config set remote %s.followRemoteHEAD warn-if-not-branch-%s”."
+#, c-format
+msgid ""
+"some local refs could not be updated; try running\n"
+" 'git remote prune %s' to remove any old, conflicting branches"
+msgstr ""
+"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"
+
+#, c-format
+msgid "fetching ref %s failed: %s"
+msgstr "misslyckades hämta referensen %s: %s"
+
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "flera grenar upptäcktes, inkompatibelt med --set-upstream"
@@ -6191,6 +6245,9 @@
msgstr ""
"git for-each-ref [--contains [<incheckning>]] [--no-contains [<incheckning>]]"
+msgid "git for-each-ref [--start-after <marker>]"
+msgstr "git for-each-ref [--start-after <markör>]"
+
msgid "quote placeholders suitably for shells"
msgstr "citera platshållare passande för skal"
@@ -6206,6 +6263,12 @@
msgid "show only <n> matched refs"
msgstr "visa endast <n> träffade refs"
+msgid "marker"
+msgstr "markör"
+
+msgid "start iteration after the provided marker"
+msgstr "påbörjar iterationen efter angiven markör"
+
msgid "respect format colors"
msgstr "använd formatfärger"
@@ -6230,9 +6293,15 @@
msgid "also include HEAD ref and pseudorefs"
msgstr "ta också med HEAD- och pseudo-referenser"
+msgid "cannot use --start-after with custom sort options"
+msgstr "kan inte använda --start-after med skräddarsydda sorteringsalternativ"
+
msgid "unknown arguments supplied with --stdin"
msgstr "okända argument angavs tillsammans med --stdin"
+msgid "cannot use --start-after with patterns"
+msgstr "kan inte använda --start-after med mönster"
+
msgid "git for-each-repo --config=<config> [--] <arguments>"
msgstr "git for-each-repo --config=<konfig> [--] <argument>"
@@ -6365,10 +6434,6 @@
msgstr "%s: objektet trasigt eller saknas: %s"
#, c-format
-msgid "%s: object is of unknown type '%s': %s"
-msgstr "%s: objektet har okänd typ ”%s”: %s"
-
-#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "%s: objektet kunde inte tolkas: %s"
@@ -6425,16 +6490,19 @@
msgid "invalid rev-index for pack '%s'"
msgstr "ogiltigt rev-index för paketet ”%s”"
+msgid "Checking ref database"
+msgstr "Kontrollerar referensdatabasen"
+
msgid ""
"git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n"
" [--[no-]full] [--strict] [--verbose] [--lost-found]\n"
" [--[no-]dangling] [--[no-]progress] [--connectivity-only]\n"
-" [--[no-]name-objects] [<object>...]"
+" [--[no-]name-objects] [--[no-]references] [<object>...]"
msgstr ""
"git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n"
" [--[no-]full] [--strict] [--verbose] [--lost-found]\n"
" [--[no-]dangling] [--[no-]progress] [--connectivity-only]\n"
-" [--[no-]name-objects] [<objekt>...]"
+" [--[no-]name-objects] [--[no-]references] [<objekt>...]"
msgid "show unreachable objects"
msgstr "visa onåbara objekt"
@@ -6474,6 +6542,9 @@
msgid "show verbose names for reachable objects"
msgstr "visa ordrika namn för nåbara objekt"
+msgid "check reference database consistency"
+msgstr "kontrollerar referensdatabasens konsistens"
+
msgid "Checking objects"
msgstr "Kontrollerar objekt"
@@ -6632,6 +6703,9 @@
msgid "pack prefix to store a pack containing pruned objects"
msgstr "paketprefix att lagra ett paket som innehåller bortrensade objekt"
+msgid "skip maintenance tasks typically done in the foreground"
+msgstr "hoppa över underhållsfunktioner som vanligtvis körs i förgrunden"
+
#, c-format
msgid "failed to parse gc.logExpiry value %s"
msgstr "misslyckades tolka värdet %s för gc.logExpiry"
@@ -6704,14 +6778,14 @@
"inaktiverat"
#, c-format
-msgid "lock file '%s' exists, skipping maintenance"
-msgstr "låsfilen ”%s” finns, hoppar över underhåll"
-
-#, c-format
msgid "task '%s' failed"
msgstr "uppgiften ”%s” misslyckades"
#, c-format
+msgid "lock file '%s' exists, skipping maintenance"
+msgstr "låsfilen ”%s” finns, hoppar över underhåll"
+
+#, c-format
msgid "'%s' is not a valid task"
msgstr "”%s” är inte en giltig uppgift"
@@ -6740,9 +6814,6 @@
msgid "run a specific task"
msgstr "utför en specifik uppgift"
-msgid "use at most one of --auto and --schedule=<frequency>"
-msgstr "använd som mest en av --auto och --schedule=<frekvens>"
-
#, c-format
msgid "unable to add '%s' value of '%s'"
msgstr "kan inte lägga till ”%s”-värdet för ”%s”"
@@ -7608,18 +7679,10 @@
"spåra utvecklingen av radintervallet <start>,<slut> eller funktionen :"
"<funknamn> i <fil>"
-#, c-format
-msgid "unrecognized argument: %s"
-msgstr "okänt argument: %s"
-
msgid "-L<range>:<file> cannot be used with pathspec"
msgstr "-L<intervall>:<fil> kan inte användas med sökvägsspecifikation"
#, c-format
-msgid "Final output: %d %s\n"
-msgstr "Slututdata: %d %s\n"
-
-#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: felaktig fil"
@@ -8250,6 +8313,9 @@
msgid "also show informational/conflict messages"
msgstr "visa även informations-/konfliktmeddelanden"
+msgid "suppress all output; only exit status wanted"
+msgstr "undertryck all utdata; önskar endast avslutningsstatus"
+
msgid "list filenames without modes/oids/stages"
msgstr "lista filnamn utan lägen/oid/köer"
@@ -8310,6 +8376,9 @@
msgid "(synonym to --stat)"
msgstr "(synonym till --stat)"
+msgid "show a compact-summary at the end of the merge"
+msgstr "visa en kompakt sammanfattning när sammanslagningen är färdig"
+
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"
@@ -8575,10 +8644,6 @@
msgstr "fel: taggindata godkänns inte av fsck: %s"
#, c-format
-msgid "%d (FSCK_IGNORE?) should never trigger this callback"
-msgstr "%d (FSCK_IGNORE?) skulle aldrig utlösa detta återanrop"
-
-#, c-format
msgid "could not read tagged object '%s'"
msgstr "kunde inte läsa det taggade objektet ”%s”"
@@ -8651,8 +8716,11 @@
"vid ompackning, samla mindre paketfiler i en bunt som är större än denna "
"storlek"
-msgid "git mv [<options>] <source>... <destination>"
-msgstr "git mv [<flaggor>] <källa>... <mål>"
+msgid "git mv [-v] [-f] [-n] [-k] <source> <destination>"
+msgstr "git mv [-v] [-f] [-n] [-k] <källa> <mål>"
+
+msgid "git mv [-v] [-f] [-n] [-k] <source>... <destination-directory>"
+msgstr "git mv [-v] [-f] [-n] [-k] <källa> <målkatalog>"
#, c-format
msgid "Directory %s is in index and no submodule?"
@@ -8722,6 +8790,10 @@
msgstr "%s, källa=%s, mål=%s"
#, c-format
+msgid "cannot move both '%s' and its parent directory '%s'"
+msgstr "kan inte flytta både ”%s” och dess föräldrakatalog ”%s”"
+
+#, c-format
msgid "Renaming %s to %s\n"
msgstr "Byter namn på %s till %s\n"
@@ -9086,13 +9158,26 @@
msgid "unknown subcommand: `%s'"
msgstr "okänt underkommando: ”%s”"
-msgid "git pack-objects --stdout [<options>] [< <ref-list> | < <object-list>]"
-msgstr "git pack-objects --stdout [<flaggor>] [< <reflista> | < <objektlista>]"
-
msgid ""
-"git pack-objects [<options>] <base-name> [< <ref-list> | < <object-list>]"
+"git pack-objects [-q | --progress | --all-progress] [--all-progress-"
+"implied]\n"
+" [--no-reuse-delta] [--delta-base-offset] [--non-empty]\n"
+" [--local] [--incremental] [--window=<n>] [--depth=<n>]\n"
+" [--revs [--unpacked | --all]] [--keep-pack=<pack-name>]\n"
+" [--cruft] [--cruft-expiration=<time>]\n"
+" [--stdout [--filter=<filter-spec>] | <base-name>]\n"
+" [--shallow] [--keep-true-parents] [--[no-]sparse]\n"
+" [--name-hash-version=<n>] [--path-walk] < <object-list>"
msgstr ""
-"git pack-objects [<flaggor>] <basnamn> [< <reflista> | < <objektlista>]"
+"git pack-objects [-q | --progress | --all-progress] [--all-progress-"
+"implied]\n"
+" [--no-reuse-delta] [--delta-base-offset] [--non-empty]\n"
+" [--local] [--incremental] [--window=<n>] [--depth=<n>]\n"
+" [--revs [--unpacked | --all]] [--keep-pack=<paketnamn>]\n"
+" [--cruft] [--cruft-expiration=<tid>]\n"
+" [--stdout [--filter=<filterspec>] | <basnamn>]\n"
+" [--shallow] [--keep-true-parents] [--[no-]sparse]\n"
+" [--name-hash-version=<n>] [--path-walk] < <objektlista>"
#, c-format
msgid "invalid --name-hash-version option: %d"
@@ -9196,6 +9281,15 @@
msgid "unable to get type of object %s"
msgstr "kan inte hämta typ för objektet %s"
+msgid "Compressing objects by path"
+msgstr "komprimerar objekt efter sökväg"
+
+#, c-format
+msgid "Path-based delta compression using up to %d thread"
+msgid_plural "Path-based delta compression using up to %d threads"
+msgstr[0] "Sökvägsbaserad deltakomprimering använder upp till %d tråd"
+msgstr[1] "Sökvägsbaserad deltakomprimering använder upp till %d trådar"
+
msgid "Compressing objects"
msgstr "Komprimerar objekt"
@@ -9270,6 +9364,9 @@
msgid "unable to force loose object"
msgstr "kan inte tvinga lösa objekt"
+msgid "failed to pack objects via path-walk"
+msgstr "misslyckades packa objekt genom att gå genom sökväg"
+
#, c-format
msgid "not a rev '%s'"
msgstr "inte en referens ”%s”"
@@ -9379,6 +9476,9 @@
msgid "create thin packs"
msgstr "skapa tunna paket"
+msgid "use the path-walk API to walk objects when possible"
+msgstr "använd ”path-walk”-API:et för att gå genom objekt om möjligt"
+
msgid "create packs suitable for shallow fetches"
msgstr "skapa packfiler lämpade för grunda hämtningar"
@@ -9435,6 +9535,10 @@
msgstr "pack.deltaCacheLimit är för högt, påtvingar %d"
#, c-format
+msgid "cannot use %s with %s"
+msgstr "kan inte använda %s med %s"
+
+#, c-format
msgid "bad pack compression level %d"
msgstr "felaktig paketkomprimeringsgrad %d"
@@ -9448,18 +9552,12 @@
msgid "--thin cannot be used to build an indexable pack"
msgstr "--thin kan inte användas för att bygga ett indexerbart paket"
-msgid "cannot use --filter with --stdin-packs"
-msgstr "kan inte använda --filter med --stdin-packs"
-
msgid "cannot use internal rev list with --stdin-packs"
msgstr "kan inte använda intern revisionslista med --stdin-packs"
msgid "cannot use internal rev list with --cruft"
msgstr "kan inte använda intern revisionslista med --cruft"
-msgid "cannot use --stdin-packs with --cruft"
-msgstr "kan inte använda --stdin-packs med --cruft"
-
msgid "Enumerating objects"
msgstr "Räknar upp objekt"
@@ -9472,22 +9570,6 @@
"paket-återanvända %<PRIu32> (från %<PRIuMAX>)"
msgid ""
-"'git pack-redundant' is nominated for removal.\n"
-"If you still use this command, please add an extra\n"
-"option, '--i-still-use-this', on the command line\n"
-"and let us know you still use it by sending an e-mail\n"
-"to <git@vger.kernel.org>. Thanks.\n"
-msgstr ""
-"”git pack-redundant” har nominerats för borttagning.\n"
-"Om du fortfarande använder kommandot, lägg till flaggan\n"
-"”--i-still-use-this” på kommandoraden och berätta för\n"
-"oss att du fortfarande använder det på e-post till\n"
-"<git@vger.kernel.org>. Tack.\n"
-
-msgid "refusing to run without --i-still-use-this"
-msgstr "vägrar köra utan --i-still-use-this"
-
-msgid ""
"git pack-refs [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude "
"<pattern>]"
msgstr ""
@@ -9639,6 +9721,10 @@
msgid "unable to access commit %s"
msgstr "kan inte komma åt incheckningen %s"
+#, c-format
+msgid "invalid refspec '%s'"
+msgstr "felaktig referensspecifikation: ”%s”"
+
msgid "ignoring --verify-signatures for rebase"
msgstr "ignorera --verify-signatures för ombasering"
@@ -10588,6 +10674,9 @@
msgid "git reflog exists <ref>"
msgstr "git reflog exists <referens>"
+msgid "git reflog drop [--all [--single-worktree] | <refs>...]"
+msgstr "git reflog drop [--all [--single-worktree] | <referenser>...]"
+
#, c-format
msgid "invalid timestamp '%s' given to '--%s'"
msgstr "ogiltig tidsstämpel ”%s” given i ”--%s”"
@@ -10636,8 +10725,8 @@
msgstr "Markerar nåbara objekt..."
#, c-format
-msgid "%s points nowhere!"
-msgstr "%s pekar ingenstans!"
+msgid "reflog could not be found: '%s'"
+msgstr "refernsloggen hittades inte: ”%s”"
msgid "no reflog specified to delete"
msgstr "ingen referenslogg att ta bort angavs"
@@ -10646,6 +10735,15 @@
msgid "invalid ref format: %s"
msgstr "felaktigt referensformat: %s"
+msgid "drop the reflogs of all references"
+msgstr "kasta referensloggar för alla referenser"
+
+msgid "drop reflogs from the current worktree only"
+msgstr "kasta referensloggar endast för aktuell arbetskatalog"
+
+msgid "references specified along with --all"
+msgstr "referenser angivna tillsammans med --all"
+
msgid "git refs migrate --ref-format=<format> [--no-reflog] [--dry-run]"
msgstr "git refs migrate --ref-format=<format> [--no-reflog] [--dry-run]"
@@ -10753,6 +10851,14 @@
msgid "unknown --mirror argument: %s"
msgstr "okänt argument till --mirror: %s"
+#, c-format
+msgid "remote name '%s' is a subset of existing remote '%s'"
+msgstr "fjärrnamnet ”%s” är en delmängd av befintlig fjärr ”%s”"
+
+#, c-format
+msgid "remote name '%s' is a superset of existing remote '%s'"
+msgstr "fjärrnamnet ”%s” är en övermängd av befintlig fjärr ”%s”"
+
msgid "fetch the remote branches"
msgstr "hämta fjärrgrenarna"
@@ -11052,14 +11158,6 @@
msgstr "Kunde inte ställa in %s"
#, c-format
-msgid " %s will become dangling!"
-msgstr " %s kommer bli dinglande!"
-
-#, c-format
-msgid " %s has become dangling!"
-msgstr " %s har blivit dinglande!"
-
-#, c-format
msgid "Pruning %s"
msgstr "Rensar %s"
@@ -11123,11 +11221,11 @@
msgid ""
"git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"
"[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n"
-"[--write-midx] [--name-hash-version=<n>]"
+"[--write-midx] [--name-hash-version=<n>] [--path-walk]"
msgstr ""
"git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"
"[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<paket-namn>]\n"
-"[--write-midx] [--name-hash-version=<n>]"
+"[--write-midx] [--name-hash-version=<n>] [--path-walk]"
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
@@ -11192,6 +11290,9 @@
msgid "with --cruft, expire objects older than this"
msgstr "med --cruft, låt tid gå ut för objekt äldre än detta"
+msgid "with --cruft, only repack cruft packs smaller than this"
+msgstr "med --cruft, packa bara om onödiga paket mindre än detta"
+
msgid "remove redundant packs, and run git-prune-packed"
msgstr "ta bort överflödiga paket, och kör git-prune-packed"
@@ -11207,6 +11308,9 @@
"ange den namnhash-version som ska användas för att gruppera liknande objekt "
"efter sökväg"
+msgid "pass --path-walk to git-pack-objects"
+msgstr "sänd --path-walk till git-pack-objects"
+
msgid "do not run git-update-server-info"
msgstr "kör inte git-update-server-info"
@@ -11666,6 +11770,9 @@
msgid "invalid value for '%s': '%s', the only allowed format is '%s'"
msgstr "felaktigt värde för ”%s”: ”%s”, det enda tillåtna formatet är ”%s”"
+msgid "-z option used with unsupported option"
+msgstr "flaggan -z använd med en flagga som inte stöds"
+
msgid "rev-list does not support display of notes"
msgstr "rev-list stöder inte visning av anteckningar"
@@ -12351,17 +12458,23 @@
msgid "git stash create [<message>]"
msgstr "git stash create [<meddelande>]"
+msgid "git stash export (--print | --to-ref <ref>) [<stash>...]"
+msgstr "git stash export (--print | --to-ref <referens>) [<stash>...]"
+
+msgid "git stash import <commit>"
+msgstr "git stash import <incheckning>"
+
#, c-format
msgid "'%s' is not a stash-like commit"
msgstr "”%s” är inte en ”stash”-liknande incheckning"
+msgid "No stash entries found."
+msgstr "Inga ”stash”-poster hittades."
+
#, c-format
msgid "Too many revisions specified:%s"
msgstr "För många revisioner angivna:%s"
-msgid "No stash entries found."
-msgstr "Inga ”stash”-poster hittades."
-
#, c-format
msgid "%s is not a valid reference"
msgstr "%s är inte en giltig referens"
@@ -12513,6 +12626,69 @@
msgid "include ignore files"
msgstr "ta med ignorerade filer"
+#, c-format
+msgid "cannot parse commit %s"
+msgstr "kan inte tolka incheckningen %s"
+
+#, c-format
+msgid "invalid author or committer for %s"
+msgstr "ogiltig författare eller incheckare för %s"
+
+msgid "could not write commit"
+msgstr "kunde inte skriva incheckning"
+
+#, c-format
+msgid "not a valid revision: %s"
+msgstr "inte en giltig revision: %s"
+
+#, c-format
+msgid "not a commit: %s"
+msgstr "inte en incheckning: ”%s”"
+
+#, c-format
+msgid "%s is not a valid exported stash commit"
+msgstr "%s är inte en giltig exporterad ”stash”-incheckning"
+
+#, c-format
+msgid "found root commit %s with invalid data"
+msgstr "hittade rotincheckningen %s med ogiltig data"
+
+#, c-format
+msgid "found stash commit %s without expected prefix"
+msgstr "hittade ”stash”-incheckningen %s utan förväntat prefix"
+
+#, c-format
+msgid "cannot parse parents of commit: %s"
+msgstr "kan inte tolka föräldrar för incheckningen: %s"
+
+#, c-format
+msgid "%s does not look like a stash commit"
+msgstr "%s ser inte ut som en ”stash”-incheckning"
+
+#, c-format
+msgid "cannot read commit buffer for %s"
+msgstr "kan inte läsa incheckningsbuffert för %s"
+
+#, c-format
+msgid "cannot save the stash for %s"
+msgstr "kan inte spara ”stash” för %s"
+
+msgid "unable to write base commit"
+msgstr "kan inte skriva basincheckning"
+
+#, c-format
+msgid "unable to find stash entry %s"
+msgstr "kan inte hitta ”stash”-posten %s"
+
+msgid "print the object ID instead of writing it to a ref"
+msgstr "skriv ut objekt-ID istället för skriva det till en referens"
+
+msgid "save the data to the given ref"
+msgstr "spara data till given referens"
+
+msgid "exactly one of --print and --to-ref is required"
+msgstr "exakt en av --print och --to-ref krävs"
+
msgid "skip and remove all lines starting with comment character"
msgstr "hoppa över och ta bort alla rader som inleds med kommentarstecken"
@@ -12520,14 +12696,6 @@
msgstr "lägg in kommentarstecken och blanksteg först på varje rad"
#, c-format
-msgid "Expecting a full ref name, got %s"
-msgstr "Förväntade fullt referensnamn, fick %s"
-
-#, c-format
-msgid "could not get a repository handle for submodule '%s'"
-msgstr "kunde inte få tag i arkivhandtag för undermodulen ”%s”"
-
-#, c-format
msgid ""
"could not look up configuration '%s'. Assuming this repository is its own "
"authoritative upstream."
@@ -12536,6 +12704,10 @@
"officiella uppström."
#, c-format
+msgid "could not get a repository handle for submodule '%s'"
+msgstr "kunde inte få tag i arkivhandtag för undermodulen ”%s”"
+
+#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "Hittade ingen url för undermodulsökvägen ”%s” i .gitmodules"
@@ -12881,6 +13053,10 @@
"huvudprojektet är inte på någon gren"
#, c-format
+msgid "Expecting a full ref name, got %s"
+msgstr "Förväntade fullt referensnamn, fick %s"
+
+#, c-format
msgid "Unable to find current revision in submodule path '%s'"
msgstr "Kan inte hitta aktuell revision i undermodulsökvägen ”%s”"
@@ -13080,6 +13256,10 @@
msgstr "arkiv-URL: ”%s” måste vara absolut eller börja med ./|../"
#, c-format
+msgid "submodule name '%s' already used for path '%s'"
+msgstr "undermodulnamnet ”%s” används redan för sökvägen ”%s”"
+
+#, c-format
msgid "'%s' is not a valid submodule name"
msgstr "”%s” är inte ett giltigt namn på undermodul"
@@ -13507,8 +13687,8 @@
msgid "git update-ref [<options>] <refname> <new-oid> [<old-oid>]"
msgstr "git update-ref [<flaggor>] <refnamn> <gammalt-oid> [<nytt-oid>]"
-msgid "git update-ref [<options>] --stdin [-z]"
-msgstr "git update-ref [<flaggor>] --stdin [-z]"
+msgid "git update-ref [<options>] --stdin [-z] [--batch-updates]"
+msgstr "git update-ref [<flaggor>] --stdin [-z] [--batch-updates]"
msgid "delete the reference"
msgstr "ta bort referensen"
@@ -13522,6 +13702,9 @@
msgid "read updates from stdin"
msgstr "läs uppdateringar från standard in"
+msgid "batch reference updates"
+msgstr "bunta referensuppdateringar"
+
msgid "update the info files from scratch"
msgstr "uppdatera informationsfilerna från grunden"
@@ -13702,10 +13885,6 @@
msgstr "Förbereder arbetskatalog (checkar ut ”%s”)"
#, c-format
-msgid "unreachable: invalid reference: %s"
-msgstr "onåbar: felaktig referens: %s"
-
-#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Förbereder arbetskatalog (frånkopplat HEAD %s)"
@@ -14201,6 +14380,9 @@
msgid "Compare a tree to the working tree or index"
msgstr "Jämför en träd med arbetskatalogen eller indexet"
+msgid "Compare the content and mode of provided blob pairs"
+msgstr "Jämför innehåll och läge för det angivna blob-paret"
+
msgid "Compares the content and mode of blobs found via two tree objects"
msgstr "Visar innehåll och läge för blob:ar som hittats via två trädobjekt"
@@ -15306,14 +15488,6 @@
msgstr "felaktigt numeriskt konfigurationsvärde ”%s” för ”%s” i %s: %s"
#, c-format
-msgid "invalid value for variable %s"
-msgstr "ogiltigt värde för variabeln %s"
-
-#, c-format
-msgid "ignoring unknown core.fsync component '%s'"
-msgstr "ignorerar okänd core.fsync-komponent ”%s”"
-
-#, c-format
msgid "bad boolean config value '%s' for '%s'"
msgstr "felaktigt booleskt konfigurationsvärde ”%s” för ”%s”"
@@ -15326,44 +15500,6 @@
msgstr "”%s” för ”%s” är inte en giltig tidsstämpel"
#, c-format
-msgid "abbrev length out of range: %d"
-msgstr "förkortningslängd utanför intervallet: %d"
-
-#, c-format
-msgid "bad zlib compression level %d"
-msgstr "felaktigt zlib-komprimeringsgrad %d"
-
-#, c-format
-msgid "%s cannot contain newline"
-msgstr "%s kan inte innehålla nyradstecken"
-
-#, c-format
-msgid "%s must have at least one character"
-msgstr "%s måste innehålla minst ett tecken"
-
-#, c-format
-msgid "ignoring unknown core.fsyncMethod value '%s'"
-msgstr "ignorerar okänt core.fsyncMethod-värde ”%s”"
-
-msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
-msgstr "core.fsyncObjectFiles avråds från; använd core.fsync istället"
-
-#, c-format
-msgid "invalid mode for object creation: %s"
-msgstr "felaktigt läge för skapande av objekt: %s"
-
-#, c-format
-msgid "malformed value for %s"
-msgstr "felformat värde för %s"
-
-#, c-format
-msgid "malformed value for %s: %s"
-msgstr "felformat värde för %s: %s"
-
-msgid "must be one of nothing, matching, simple, upstream or current"
-msgstr "måste vara en av nothing, matching, simple, upstream eller current"
-
-#, c-format
msgid "unable to load config blob object '%s'"
msgstr "kan inte läsa konfigurerings-blobobjektet ”%s”"
@@ -15871,8 +16007,9 @@
msgid "cannot compare a named pipe to a directory"
msgstr "kan inte jämföra ett namngivet rör med en katalog"
-msgid "git diff --no-index [<options>] <path> <path>"
-msgstr "git diff --no-index [<flaggor>] <sökväg> <sökväg>"
+msgid "git diff --no-index [<options>] <path> <path> [<pathspec>...]"
+msgstr ""
+"git diff --no-index [<flaggor>] <sökväg> <sökväg> [<sökvägsangivelse>...]"
msgid ""
"Not a git repository. Use --no-index to compare two paths outside a working "
@@ -15881,6 +16018,13 @@
"Inte ett git-arkiv. Använd --no-index för att jämföra två sökvägar utanför "
"en arbetskatalog."
+msgid ""
+"Limiting comparison with pathspecs is only supported if both paths are "
+"directories."
+msgstr ""
+"Det är endast möjligt att begränsa jämförelsen med sökvägsangivelser om "
+"bägge sökvägarna är kataloger."
+
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " Misslyckades tolka dirstat-avskärningsprocentandel ”%s”\n"
@@ -16452,6 +16596,52 @@
msgstr "felaktig git-namnrymdssökväg ”%s”"
#, c-format
+msgid "invalid value for variable %s"
+msgstr "ogiltigt värde för variabeln %s"
+
+#, c-format
+msgid "ignoring unknown core.fsync component '%s'"
+msgstr "ignorerar okänd core.fsync-komponent ”%s”"
+
+#, c-format
+msgid "abbrev length out of range: %d"
+msgstr "förkortningslängd utanför intervallet: %d"
+
+#, c-format
+msgid "bad zlib compression level %d"
+msgstr "felaktigt zlib-komprimeringsgrad %d"
+
+#, c-format
+msgid "%s cannot contain newline"
+msgstr "%s kan inte innehålla nyradstecken"
+
+#, c-format
+msgid "%s must have at least one character"
+msgstr "%s måste innehålla minst ett tecken"
+
+#, c-format
+msgid "ignoring unknown core.fsyncMethod value '%s'"
+msgstr "ignorerar okänt core.fsyncMethod-värde ”%s”"
+
+msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
+msgstr "core.fsyncObjectFiles avråds från; använd core.fsync istället"
+
+#, c-format
+msgid "invalid mode for object creation: %s"
+msgstr "felaktigt läge för skapande av objekt: %s"
+
+#, c-format
+msgid "malformed value for %s"
+msgstr "felformat värde för %s"
+
+#, c-format
+msgid "malformed value for %s: %s"
+msgstr "felformat värde för %s: %s"
+
+msgid "must be one of nothing, matching, simple, upstream or current"
+msgstr "måste vara en av nothing, matching, simple, upstream eller current"
+
+#, c-format
msgid "too many args to run %s"
msgstr "för många flaggor för att köra %s"
@@ -17077,6 +17267,10 @@
msgstr "Okänt värde för http.proactiveauth"
#, c-format
+msgid "failed to parse %s"
+msgstr "misslyckades tolka %s"
+
+#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr "SSL-bakändan ”%s” stöds inte. Dessa SSL-bakändor stöds:"
@@ -17157,6 +17351,29 @@
msgid "name consists only of disallowed characters: %s"
msgstr "namnet består enbart av ej tillåtna tecken: %s"
+msgid "git imap-send [-v] [-q] [--[no-]curl] [(--folder|-f) <folder>] < <mbox>"
+msgstr "git imap-send [-v] [-q] [--[no-]curl] [(--folder|-f) <mapp>] < <mbox>"
+
+msgid "no IMAP host specified"
+msgstr "ingen IMAP-värd angavs"
+
+msgid ""
+"set the IMAP host with 'git config imap.host <host>'.\n"
+"(e.g., 'git config imap.host imaps://imap.example.com')"
+msgstr ""
+"ställ in IMAP-värden med ”git config imap.host <värd>”.\n"
+"(t.ex., ”git config imap.host imaps://imap.example.com”)"
+
+msgid "no IMAP folder specified"
+msgstr "ingen IMAP-mapp angavs"
+
+msgid ""
+"set the target folder with 'git config imap.folder <folder>'.\n"
+"(e.g., 'git config imap.folder Drafts')"
+msgstr ""
+"ställ in IMAP-mappen med ”git config imap.folder <mapp>”.\n"
+"(t.ex., ”git config imap.folder Utkast”)"
+
msgid "expected 'tree:<depth>'"
msgstr "förväntade ”tree:<djup>”"
@@ -17263,6 +17480,10 @@
msgstr "felaktigt värde för marker-size ”%s”, förväntade ett heltal"
#, c-format
+msgid "Could not parse object '%s'"
+msgstr "Kunde inte tolka objektet ”%s”"
+
+#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "Misslyckades slå ihop undermodulen %s (ej utcheckad)"
@@ -17504,264 +17725,6 @@
msgid "collecting merge info failed for trees %s, %s, %s"
msgstr "samling av sammanslagningsinfo misslyckades för träden %s, %s, %s"
-msgid "(bad commit)\n"
-msgstr "(felaktig incheckning)\n"
-
-#, c-format
-msgid "add_cacheinfo failed for path '%s'; merge aborting."
-msgstr ""
-"add_cacheinfo misslyckades för sökvägen ”%s”; avslutar sammanslagningen."
-
-#, c-format
-msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
-msgstr ""
-"add_cacheinfo misslyckades uppdatera för sökvägen ”%s”; avslutar "
-"sammanslagningen."
-
-#, c-format
-msgid "failed to create path '%s'%s"
-msgstr "misslyckades skapa sökvägen ”%s”%s"
-
-#, c-format
-msgid "Removing %s to make room for subdirectory\n"
-msgstr "Tar bort %s för att göra plats för underkatalog\n"
-
-msgid ": perhaps a D/F conflict?"
-msgstr ": kanske en K/F-konflikt?"
-
-#, c-format
-msgid "refusing to lose untracked file at '%s'"
-msgstr "vägrar förlora ospårad fil vid ”%s”"
-
-#, c-format
-msgid "blob expected for %s '%s'"
-msgstr "blob förväntades för %s ”%s”"
-
-#, c-format
-msgid "failed to open '%s': %s"
-msgstr "misslyckades öppna ”%s”: %s"
-
-#, c-format
-msgid "failed to symlink '%s': %s"
-msgstr "misslyckades skapa symboliska länken ”%s”: %s"
-
-#, c-format
-msgid "do not know what to do with %06o %s '%s'"
-msgstr "vet inte hur %06o %s ”%s” ska hanteras"
-
-#, c-format
-msgid "Failed to merge submodule %s (repository corrupt)"
-msgstr "Misslyckades slå ihop undermodulen %s (arkivet är trasigt)"
-
-#, c-format
-msgid "Fast-forwarding submodule %s to the following commit:"
-msgstr "Snabbspolar undermodulen %s till följande incheckning:"
-
-#, c-format
-msgid "Fast-forwarding submodule %s"
-msgstr "Snabbspolar undermodulen %s"
-
-#, c-format
-msgid "Failed to merge submodule %s (merge following commits not found)"
-msgstr ""
-"Misslyckades slå ihop undermodulen %s (sammanslagning efter incheckningar "
-"hittades inte)"
-
-#, c-format
-msgid "Failed to merge submodule %s (not fast-forward)"
-msgstr "Misslyckades slå ihop undermodulen %s (ej snabbspolning)"
-
-msgid "Found a possible merge resolution for the submodule:\n"
-msgstr "Hittade en möjlig lösning av sammanslagning för undermodulen:\n"
-
-#, c-format
-msgid ""
-"If this is correct simply add it to the index for example\n"
-"by using:\n"
-"\n"
-" git update-index --cacheinfo 160000 %s \"%s\"\n"
-"\n"
-"which will accept this suggestion.\n"
-msgstr ""
-"Om detta är riktigt lägger du bara till det i indexet, till\n"
-"exempel så här:\n"
-"\n"
-" git update-index --cacheinfo 160000 %s \"%s\"\n"
-"\n"
-"vilket godtar lösningen.\n"
-
-#, c-format
-msgid "Failed to merge submodule %s (multiple merges found)"
-msgstr ""
-"Misslyckades slå ihop undermodulen %s (flera sammanslagningar hittades)"
-
-msgid "failed to execute internal merge"
-msgstr "misslyckades exekvera intern sammanslagning"
-
-#, c-format
-msgid "unable to add %s to database"
-msgstr "kan inte lägga till %s till databasen"
-
-#, c-format
-msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
-msgstr "Fel: Vägrar förlora ospårad fil vid %s; skriver till %s istället."
-
-#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree."
-msgstr ""
-"KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad "
-"i trädet."
-
-#, 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."
-
-#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree at %s."
-msgstr ""
-"KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad "
-"i trädet vid %s."
-
-#, 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."
-
-msgid "rename"
-msgstr "namnbyte"
-
-msgid "renamed"
-msgstr "namnbytt"
-
-#, c-format
-msgid "Refusing to lose dirty file at %s"
-msgstr "Vägrar förlora lortig fil vid ”%s”"
-
-#, c-format
-msgid "Refusing to lose untracked file at %s, even though it's in the way."
-msgstr "Vägrar förlora ospårad fil vid %s, trots att den är i vägen."
-
-#, c-format
-msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
-msgstr "KONFLIKT (namnbyte/tillägg): Namnbyte %s→%s i %s. Lade till %s i %s"
-
-#, 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"
-
-#, c-format
-msgid "Refusing to lose untracked file at %s; adding as %s instead"
-msgstr "Vägrar förlora ospårad fil vid %s; lägger till som %s istället"
-
-#, c-format
-msgid ""
-"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename "
-"\"%s\"->\"%s\" in \"%s\"%s"
-msgstr ""
-"KONFLIKT (namnbyte/namnbyte): Namnbyte ”%s”→”%s” på grenen ”%s” namnbyte "
-"”%s”→”%s” i ”%s”%s"
-
-msgid " (left unresolved)"
-msgstr " (lämnad olöst)"
-
-#, 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"
-
-#, c-format
-msgid ""
-"CONFLICT (directory rename split): Unclear where to place %s because "
-"directory %s was renamed to multiple other directories, with no destination "
-"getting a majority of the files."
-msgstr ""
-"KONFLIKT (namnändrad delad katalog): Osäker på var %s ska placeras då "
-"katalogen %s bytte namn till flera andra kataloger, utan att någon "
-"destination fick en majoritet av filerna."
-
-#, c-format
-msgid ""
-"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
-">%s in %s"
-msgstr ""
-"KONFLIKT (namnbyte/namnbyte): Namnbytt katalog %s→%s i %s. Namnbytt katalog "
-"%s→%s i %s"
-
-#, c-format
-msgid "cannot read object %s"
-msgstr "kan inte läsa objektet %s"
-
-#, c-format
-msgid "object %s is not a blob"
-msgstr "objektet %s är inte en blob"
-
-msgid "modify"
-msgstr "ändra"
-
-msgid "modified"
-msgstr "ändrad"
-
-#, c-format
-msgid "Skipped %s (merged same as existing)"
-msgstr "Hoppade över %s (sammanslagen samma som befintlig)"
-
-#, c-format
-msgid "Adding as %s instead"
-msgstr "Lägger till som %s istället"
-
-#, c-format
-msgid "Removing %s"
-msgstr "Tar bort %s"
-
-msgid "file/directory"
-msgstr "fil/katalog"
-
-msgid "directory/file"
-msgstr "katalog/fil"
-
-#, 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"
-
-#, c-format
-msgid "Adding %s"
-msgstr "Lägger till %s"
-
-#, c-format
-msgid "CONFLICT (add/add): Merge conflict in %s"
-msgstr "KONFLIKT (tillägg/tillägg): Sammanslagningskonflikt i %s"
-
-#, c-format
-msgid "merging of trees %s and %s failed"
-msgstr "sammanslagning av träden %s och %s misslyckades"
-
-msgid "Merging:"
-msgstr "Slår ihop:"
-
-#, 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:"
-
-msgid "merge returned no commit"
-msgstr "sammanslagningen returnerade ingen incheckning"
-
-#, c-format
-msgid "Could not parse object '%s'"
-msgstr "Kunde inte tolka objektet ”%s”"
-
msgid "failed to read the cache"
msgstr "misslyckades läsa cachen"
@@ -17803,12 +17766,13 @@
msgid "failed to clear multi-pack-index at %s"
msgstr "misslyckades städa multi-pack-index på %s"
-msgid "cannot write incremental MIDX with bitmap"
-msgstr "kan inte skriva inkrementell MIDX med bitkarta"
-
msgid "ignoring existing multi-pack-index; checksum mismatch"
msgstr "ignorerar befintlig multi-pack-index; felaktig kontrollsumma"
+#, c-format
+msgid "could not load reverse index for MIDX %s"
+msgstr "kunde inte läsa in baklängesindexet för MIDX %s"
+
msgid "Adding packfiles to multi-pack-index"
msgstr "Lägger till paketfiler till multi-pack-index"
@@ -18063,63 +18027,6 @@
msgstr "Misslyckades konvertera objekt från %s till %s"
#, c-format
-msgid "object directory %s does not exist; check .git/objects/info/alternates"
-msgstr "objektkatalogen %s finns inte; se .git/objects/info/alternates"
-
-#, c-format
-msgid "unable to normalize alternate object path: %s"
-msgstr "kan inte normalisera supplerande objektsökväg: %s"
-
-#, c-format
-msgid "%s: ignoring alternate object stores, nesting too deep"
-msgstr "%s: ignorerar supplerande objektlager, för djup nästling"
-
-msgid "unable to fdopen alternates lockfile"
-msgstr "kan inte utföra ”fdopen” på suppleantlåsfil"
-
-msgid "unable to read alternates file"
-msgstr "kan inte läsa ”alternates”-filen"
-
-msgid "unable to move new alternates file into place"
-msgstr "kan inte flytta ny ”alternates”-fil på plats"
-
-#, c-format
-msgid "path '%s' does not exist"
-msgstr "sökvägen ”%s” finns inte"
-
-#, 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."
-
-#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr "referensarkivet ”%s” är inte ett lokalt arkiv."
-
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr "referensarkivet ”%s” är grunt"
-
-#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr "referensarkivet ”%s” är ympat"
-
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "kunde inte hitta objektkatalog för %s"
-
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr "felaktig rad vid tolkning av supplerande referenser: %s"
-
-#, c-format
-msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
-msgstr "försök att utföra ”mmap” på %<PRIuMAX> över gränsen %<PRIuMAX>"
-
-#, c-format
-msgid "mmap failed%s"
-msgstr "mmap misslyckades%s"
-
-#, c-format
msgid "object file %s is empty"
msgstr "objektfilen %s är tom"
@@ -18155,18 +18062,6 @@
msgstr "löst objekt %s (lagrat i %s) är trasigt"
#, c-format
-msgid "replacement %s not found for %s"
-msgstr "ersättningen %s hittades inte för %s"
-
-#, c-format
-msgid "packed object %s (stored in %s) is corrupt"
-msgstr "packat objekt %s (lagrat i %s) är trasigt"
-
-#, c-format
-msgid "missing mapping of %s to %s"
-msgstr "saknar koppling av %s till %s"
-
-#, c-format
msgid "unable to open %s"
msgstr "kan inte öppna %s"
@@ -18260,10 +18155,6 @@
msgstr "%s: filtypen stöds ej"
#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr "%s är inte ett giltigt ”%s”-objekt"
-
-#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "hash stämmer inte för %s (förväntade %s)"
@@ -18280,6 +18171,10 @@
msgstr "kan inte tolka huvud för %s"
#, c-format
+msgid "unable to parse type from header '%s' of %s"
+msgstr "kan inte tolka typen från huvudet ”%s” för %s"
+
+#, c-format
msgid "unable to unpack contents of %s"
msgstr "kan inte tolka innehåll i %s"
@@ -18456,6 +18351,71 @@
msgstr "hashvärde stämmer inte överens %s"
#, c-format
+msgid "object directory %s does not exist; check .git/objects/info/alternates"
+msgstr "objektkatalogen %s finns inte; se .git/objects/info/alternates"
+
+#, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr "kan inte normalisera supplerande objektsökväg: %s"
+
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
+msgstr "%s: ignorerar supplerande objektlager, för djup nästling"
+
+msgid "unable to fdopen alternates lockfile"
+msgstr "kan inte utföra ”fdopen” på suppleantlåsfil"
+
+msgid "unable to read alternates file"
+msgstr "kan inte läsa ”alternates”-filen"
+
+msgid "unable to move new alternates file into place"
+msgstr "kan inte flytta ny ”alternates”-fil på plats"
+
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "sökvägen ”%s” finns inte"
+
+#, 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."
+
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "referensarkivet ”%s” är inte ett lokalt arkiv."
+
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "referensarkivet ”%s” är grunt"
+
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "referensarkivet ”%s” är ympat"
+
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "kunde inte hitta objektkatalog för %s"
+
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "felaktig rad vid tolkning av supplerande referenser: %s"
+
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr "ersättningen %s hittades inte för %s"
+
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "packat objekt %s (lagrat i %s) är trasigt"
+
+#, c-format
+msgid "missing mapping of %s to %s"
+msgstr "saknar koppling av %s till %s"
+
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "%s är inte ett giltigt ”%s”-objekt"
+
+#, c-format
msgid "duplicate entry when writing bitmap index: %s"
msgstr "duplicerad post när bitkarteindex skulle skrivas: %s"
@@ -18466,9 +18426,6 @@
msgid "too many pseudo-merges"
msgstr "för många pseudo-sammanslagningar"
-msgid "trying to write commit not in index"
-msgstr "försöker skriva incheckning som inte finns i indexet"
-
msgid "failed to load bitmap index (corrupted?)"
msgstr "misslyckade läsa in bitkarteindex (trasigt?)"
@@ -18713,6 +18670,18 @@
msgstr "%s är inte tillgängligt"
#, c-format
+msgid "value for %s exceeds %<PRIdMAX>"
+msgstr "värdet för %s överstiger %<PRIdMAX>"
+
+#, c-format
+msgid "value %s for %s not in range [%<PRIdMAX>,%<PRIdMAX>]"
+msgstr "värdet %s för %s inte i intervallet [%<PRIdMAX>,%<PRIdMAX>]"
+
+#, c-format
+msgid "%s expects an integer value with an optional k/m/g suffix"
+msgstr "%s förväntar ett heltalsvärde, med valfritt k/m/g-suffix"
+
+#, c-format
msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
msgstr "%s förväntar ett icke-negativt heltalsvärde, med valfritt k/m/g-suffix"
@@ -18870,10 +18839,6 @@
msgstr "felaktigt booleskt miljövariabelvärde ”%s” för ”%s”"
#, c-format
-msgid "failed to parse %s"
-msgstr "misslyckades tolka %s"
-
-#, c-format
msgid "failed to walk children of tree %s: not found"
msgstr "misslyckades traversera löven i trädet %s: hittades inte"
@@ -19034,8 +18999,12 @@
msgstr "kunde inte hämta %s från kontraktsfjärr"
#, c-format
-msgid "known remote named '%s' but with url '%s' instead of '%s'"
-msgstr "känd fjärr som heter ”%s” med med url:en ”%s” istället för ”%s”"
+msgid "no or empty URL advertised for remote '%s'"
+msgstr "ingen eller tom URL tillkännagavs för fjärren ”%s”"
+
+#, c-format
+msgid "known remote named '%s' but with URL '%s' instead of '%s'"
+msgstr "känd fjärr som heter ”%s” men med URL:en ”%s” istället för ”%s”"
#, c-format
msgid "unknown '%s' value for '%s' config option"
@@ -19678,6 +19647,14 @@
msgstr "”%s” pekar inte på ett giltigt objekt!"
#, c-format
+msgid "%s%s will become dangling after %s is deleted\n"
+msgstr "%s%s kommer bli dinglande efter att %s tagits bort\n"
+
+#, c-format
+msgid "%s%s has become dangling after %s was deleted\n"
+msgstr "%s%s har blivit dinglande efter att %s togs bort\n"
+
+#, c-format
msgid ""
"Using '%s' as the name for the initial branch. This default branch name\n"
"is subject to change. To configure the initial branch name to use in all\n"
@@ -19805,6 +19782,10 @@
msgstr "Kontrollerar konsistens för referenser"
#, c-format
+msgid "unable to open '%s'"
+msgstr "kan inte öppna ”%s”"
+
+#, c-format
msgid "refname is dangerous: %s"
msgstr "refnamnet är farligt: %s"
@@ -19871,10 +19852,6 @@
msgstr "referensnamnet %s är en symbolisk referens, kopiering stöds inte"
#, c-format
-msgid "invalid refspec '%s'"
-msgstr "felaktig referensspecifikation: ”%s”"
-
-#, c-format
msgid "pattern '%s' has no '*'"
msgstr "mönstret ”%s” innehåller ingen ”*”"
@@ -20413,8 +20390,8 @@
msgid "could not set recommended config"
msgstr "kan inte ange rekommenderad konfiguration"
-msgid "could not turn on maintenance"
-msgstr "kunde inte aktivera underhåll"
+msgid "could not toggle maintenance"
+msgstr "kunde inte växla underhåll"
msgid "could not start the FSMonitor daemon"
msgstr "kunde inte starta FSMonitor-server"
@@ -20460,12 +20437,15 @@
msgid "specify if tags should be fetched during clone"
msgstr "ange om taggar ska hämtas vid kloning"
+msgid "specify if background maintenance should be enabled"
+msgstr "ange om bakgrundsunderhåll ska aktiveras"
+
msgid ""
"scalar clone [--single-branch] [--branch <main-branch>] [--full-clone]\n"
-"\t[--[no-]src] [--[no-]tags] <url> [<enlistment>]"
+"\t[--[no-]src] [--[no-]tags] [--[no-]maintenance] <url> [<enlistment>]"
msgstr ""
"scalar clone [--single-branch] [--branch <huvudgren>] [--full-clone]\n"
-"\t[--[no-]src] [--[no-]tags] <url> [<enrollering>]"
+"\t[--[no-]src] [--[no-]tags] [--[no-]maintenance] <url> [<enrollering>]"
#, c-format
msgid "cannot deduce worktree name from '%s'"
@@ -20503,19 +20483,33 @@
msgid "`scalar list` does not take arguments"
msgstr "”scalar list” tar inte argument"
-msgid "scalar register [<enlistment>]"
-msgstr "scalar register [<enrollering>]"
+msgid "scalar register [--[no-]maintenance] [<enlistment>]"
+msgstr "scalar register [--[no-]maintenance] [<enrollering>]"
msgid "reconfigure all registered enlistments"
msgstr "konfigurera alla registrerade enrolleringar på nytt"
-msgid "scalar reconfigure [--all | <enlistment>]"
-msgstr "scalar reconfigure [--all | <enrollering>]"
+msgid "(enable|disable|keep)"
+msgstr "(aktivera|inaktivera|behåll)"
+
+msgid "signal how to adjust background maintenance"
+msgstr "signallera hur bakgrundsunderhåll ska justeras"
+
+msgid ""
+"scalar reconfigure [--maintenance=(enable|disable|keep)] [--all | "
+"<enlistment>]"
+msgstr ""
+"scalar reconfigure [--maintenance=(enable|disable|keep)] [--all | "
+"<enrollering>]"
msgid "--all or <enlistment>, but not both"
msgstr "--all eller <enrollering>, men inte bägge"
#, c-format
+msgid "unknown mode for --maintenance option: %s"
+msgstr "okänt läge för flaggan --maintenance: %s"
+
+#, c-format
msgid "could not remove stale scalar.repo '%s'"
msgstr "kunde inte ta bort gammal scalar.repo ”%s”"
@@ -21946,6 +21940,9 @@
msgid "number of entries in the cache tree to invalidate (default 0)"
msgstr "antal poster i cacheträdet att ogiltigförklara (förval är 0)"
+msgid "the number of objects to write"
+msgstr "antal objekt att skriva"
+
msgid "test-tool path-walk <options> -- <revision-options>"
msgstr "test-tool path-walk <flaggor> -- <revision-flaggor>"
@@ -21964,6 +21961,9 @@
msgid "toggle pruning of uninteresting paths"
msgstr "växla bortrensning av ointressanta sökvägar"
+msgid "toggle aggressive edge walk"
+msgstr "växla aggressiv kantvandring"
+
msgid "read a pattern list over stdin"
msgstr "läs en mönsterlista från standard in"
@@ -22601,6 +22601,23 @@
msgstr "varning: "
#, c-format
+msgid ""
+"'%s' is nominated for removal.\n"
+"If you still use this command, please add an extra\n"
+"option, '--i-still-use-this', on the command line\n"
+"and let us know you still use it by sending an e-mail\n"
+"to <git@vger.kernel.org>. Thanks.\n"
+msgstr ""
+"”%s” har nominerats för borttagning.\n"
+"Om du fortfarande använder kommandot, lägg till flaggan\n"
+"”--i-still-use-this” på kommandoraden och berätta för\n"
+"oss att du fortfarande använder det på e-post till\n"
+"<git@vger.kernel.org>. Tack.\n"
+
+msgid "refusing to run without --i-still-use-this"
+msgstr "vägrar köra utan --i-still-use-this"
+
+#, c-format
msgid "uname() failed with error '%s' (%d)\n"
msgstr "uname() misslyckades med felet ”%s” (%d)\n"
@@ -22719,6 +22736,14 @@
msgid "unable to get random bytes"
msgstr "kan inte hämta slumpdata"
+#, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr "försök att utföra ”mmap” på %<PRIuMAX> över gränsen %<PRIuMAX>"
+
+#, c-format
+msgid "mmap failed%s"
+msgstr "mmap misslyckades%s"
+
msgid "Unmerged paths:"
msgstr "Ej sammanslagna sökvägar:"
@@ -23450,6 +23475,13 @@
"smtp-debug."
#, perl-format
+msgid "Outlook reassigned Message-ID to: %s\n"
+msgstr "Outlook gav nytt Message-ID till: %s\n"
+
+msgid "Warning: Could not retrieve Message-ID from server response.\n"
+msgstr "Varning: Kunde inte hämta Message-ID från serversvaret.\n"
+
+#, perl-format
msgid "Failed to send %s\n"
msgstr "Misslyckades sända %s\n"
@@ -23494,6 +23526,10 @@
msgstr "(kropp) Lägger till cc: %s från raden ”%s”\n"
#, perl-format
+msgid "error: invalid SMTP port '%s'\n"
+msgstr "fel: ogiltig SMTP-port ”%s”\n"
+
+#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) Kunde inte köra ”%s”"
diff --git a/po/tr.po b/po/tr.po
index 9f5edc1..9c16191 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -96,8 +96,8 @@
msgstr ""
"Project-Id-Version: Git Turkish Localization Project\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2025-05-29 11:02+0300\n"
-"PO-Revision-Date: 2025-05-29 12:00+0300\n"
+"POT-Creation-Date: 2025-08-14 16:38+0300\n"
+"PO-Revision-Date: 2025-08-14 16:45+0300\n"
"Last-Translator: Emir SARI <emir_sari@icloud.com>\n"
"Language-Team: Turkish (https://github.com/bitigchi/git-po/)\n"
"Language: tr\n"
@@ -107,6 +107,10 @@
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#, c-format
+msgid "%s cannot be negative"
+msgstr "%s negatif olamaz"
+
+#, c-format
msgid "Huh (%s)?"
msgstr "Pardon (%s)?"
@@ -2011,6 +2015,10 @@
msgstr "dosya ekleme başarısız"
#, c-format
+msgid "'%s' cannot be negative"
+msgstr "'%s' negatif olamaz"
+
+#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "--chmod param '%s' ya -x ya da +x olmalıdır"
@@ -5163,23 +5171,25 @@
msgid ""
"git config get [<file-option>] [<display-option>] [--includes] [--all] [--"
-"regexp] [--value=<value>] [--fixed-value] [--default=<default>] <name>"
+"regexp] [--value=<pattern>] [--fixed-value] [--default=<default>] [--"
+"url=<url>] <name>"
msgstr ""
-"git config get [<dosya-sçnği>] [<görüntü-sçnği>] [--includes] [--all] [--"
-"regexp] [--value=<değer>] [--fixed-value] [--default=<öntanımlı>] <ad>"
+"git config get [<dosya-seçeneği>] [<display-option>] [--includes] [--all] [--"
+"regexp] [--value=<dizgi>] [--fixed-value] [--default=<öntanımlı>] [--"
+"url=<url>] <ad>"
msgid ""
-"git config set [<file-option>] [--type=<type>] [--all] [--value=<value>] [--"
-"fixed-value] <name> <value>"
+"git config set [<file-option>] [--type=<type>] [--all] [--value=<pattern>] "
+"[--fixed-value] <name> <value>"
msgstr ""
-"git config set [<dosya-seçeneği>] [--type=<tür>] [--all] [--value=<değer>] "
+"git config set [<dosya-seçeneği>] [--type=<tür>] [--all] [--value=<dizgi>] "
"[--fixed-value] <ad> <değer>"
msgid ""
-"git config unset [<file-option>] [--all] [--value=<value>] [--fixed-value] "
+"git config unset [<file-option>] [--all] [--value=<pattern>] [--fixed-value] "
"<name>"
msgstr ""
-"git config unset [<dosya-seçeneği>] [--all] [--value=<değer>] [--fixed-"
+"git config unset [<dosya-seçeneği>] [--all] [--value=<dizgi>] [--fixed-"
"value] <ad>"
msgid "git config rename-section [<file-option>] <old-name> <new-name>"
@@ -5196,19 +5206,19 @@
msgid ""
"git config get [<file-option>] [<display-option>] [--includes] [--all] [--"
-"regexp=<regexp>] [--value=<value>] [--fixed-value] [--default=<default>] "
+"regexp=<regexp>] [--value=<pattern>] [--fixed-value] [--default=<default>] "
"<name>"
msgstr ""
-"git config get [<dosya-seçeneği>] [<görüntüleme-seçeneği>] [--includes] [--"
-"all] [--regexp=<düzenli-ifade>] [--value=<değer>] [--fixed-value] [--"
+"git config get [<dosya-seçeneği>] [<görüntü-seçeneği>] [--includes] [--all] "
+"[--regexp=<düzenli-ifade>] [--value=<dizgi>] [--fixed-value] [--"
"default=<öntanımlı>] <ad>"
msgid ""
"git config set [<file-option>] [--type=<type>] [--comment=<message>] [--all] "
-"[--value=<value>] [--fixed-value] <name> <value>"
+"[--value=<pattern>] [--fixed-value] <name> <value>"
msgstr ""
"git config set [<dosya-seçeneği>] [--type=<tür>] [--comment=<ileti>] [--all] "
-"[--value=<değer>] [--fixed-value] <ad> <değer>"
+"[--value=<dizgi>] [--fixed-value] <ad> <değer>"
msgid "Config file location"
msgstr "Yapılandırma dosyası konumu"
@@ -6055,22 +6065,6 @@
msgid "rejected %s because shallow roots are not allowed to be updated"
msgstr "%s reddedildi; çünkü sığ köklerin güncellenmesine izin verilmiyor"
-#, c-format
-msgid ""
-"some local refs could not be updated; try running\n"
-" 'git remote prune %s' to remove any old, conflicting branches"
-msgstr ""
-"bazı yerel başvurular güncellenemedi; 'git remote prune %s'\n"
-"kullanarak eski ve çakışan dalları kaldırmayı deneyin"
-
-#, c-format
-msgid " (%s will become dangling)"
-msgstr " (%s sarkacak)"
-
-#, c-format
-msgid " (%s has become dangling)"
-msgstr " (%s sarkmaya başladı)"
-
msgid "[deleted]"
msgstr "[silindi]"
@@ -6112,6 +6106,18 @@
"komutunu çalıştırmak, uyarıyı HEAD'e veya başka bir şeye uzaktan\n"
"değişiklik olana dek devre dışı bırakır."
+#, c-format
+msgid ""
+"some local refs could not be updated; try running\n"
+" 'git remote prune %s' to remove any old, conflicting branches"
+msgstr ""
+"bazı yerel başvurular güncellenemedi; 'git remote prune %s'\n"
+"kullanarak eski ve çakışan dalları kaldırmayı deneyin"
+
+#, c-format
+msgid "fetching ref %s failed: %s"
+msgstr "%s başvurusu getirilemedi: %s"
+
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "birden çok dal algılandı, --set-upstream ile uyumsuz"
@@ -6355,6 +6361,9 @@
msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
msgstr "git for-each-ref [--contains [<işleme>]] [--no-contains [<işleme>]]"
+msgid "git for-each-ref [--start-after <marker>]"
+msgstr "git for-each-ref [--start-after <imleyici>]"
+
msgid "quote placeholders suitably for shells"
msgstr "yer tutucuları kabuğun anlayabileceği biçimde tırnak içine al"
@@ -6370,6 +6379,12 @@
msgid "show only <n> matched refs"
msgstr "yalnızca <n> eşleşen başvuruyu göster"
+msgid "marker"
+msgstr "imleyici"
+
+msgid "start iteration after the provided marker"
+msgstr "yinelemeyi belirtilen imleyiciden sonra başlat"
+
msgid "respect format colors"
msgstr "biçim renklerine uy"
@@ -6394,9 +6409,15 @@
msgid "also include HEAD ref and pseudorefs"
msgstr "ayrıca HEAD ve yalancı başvuruları içer"
+msgid "cannot use --start-after with custom sort options"
+msgstr "özel sıralama seçenekleriyle --start-after kullanılamıyor"
+
msgid "unknown arguments supplied with --stdin"
msgstr "--stdin ile bilinmeyen argümanlar verilmiş"
+msgid "cannot use --start-after with patterns"
+msgstr "dizgilerle --start-after kullanılamıyor"
+
msgid "git for-each-repo --config=<config> [--] <arguments>"
msgstr "git for-each-repo --config=<yapılandırma> [--] <argümanlar>"
@@ -6792,6 +6813,9 @@
msgid "pack prefix to store a pack containing pruned objects"
msgstr "budanan nesneler içeren paketi depolamak için paket öneki"
+msgid "skip maintenance tasks typically done in the foreground"
+msgstr "genelde ön planda yapılan bakım görevlerini atla"
+
#, c-format
msgid "failed to parse gc.logExpiry value %s"
msgstr "gc.logExpiry değeri %s ayrıştırılamadı"
@@ -6863,14 +6887,14 @@
"incremental-repack görevi atlanıyor; çünkü core.multiPackIndex devre dışı"
#, c-format
-msgid "lock file '%s' exists, skipping maintenance"
-msgstr "kilit dosyası '%s' var, bakım atlanıyor"
-
-#, c-format
msgid "task '%s' failed"
msgstr "'%s' görevi başarısız oldu"
#, c-format
+msgid "lock file '%s' exists, skipping maintenance"
+msgstr "kilit dosyası '%s' var, bakım atlanıyor"
+
+#, c-format
msgid "'%s' is not a valid task"
msgstr "'%s' geçerli bir görev değil"
@@ -6899,9 +6923,6 @@
msgid "run a specific task"
msgstr "belirli bir görevi çalıştır"
-msgid "use at most one of --auto and --schedule=<frequency>"
-msgstr "tek kezde --auto ve --schedule=<sıklık>'tan birini kullan"
-
#, c-format
msgid "unable to add '%s' value of '%s'"
msgstr "şunun için '%s' değeri eklenemiyor: '%s'"
@@ -7779,10 +7800,6 @@
msgstr "-L<erim>:<dosya>, yol belirteci ile kullanılamıyor"
#, c-format
-msgid "Final output: %d %s\n"
-msgstr "Son çıktı: %d %s\n"
-
-#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: hatalı dosya"
@@ -8481,6 +8498,9 @@
msgid "(synonym to --stat)"
msgstr "(--stat eşanlamlısı)"
+msgid "show a compact-summary at the end of the merge"
+msgstr "birleştirmenin sonunda ufak bir özet göster"
+
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"kısa günlükten birleştirme işlemesi iletisine girdiler (en çok <n>) ekle"
@@ -8744,10 +8764,6 @@
msgstr "hata: etiket girdisi fsck'den geçemiyor: %s"
#, c-format
-msgid "%d (FSCK_IGNORE?) should never trigger this callback"
-msgstr "%d (FSCK_IGNORE?) hiçbir zaman bu geri çağırmayı tetiklememeli"
-
-#, c-format
msgid "could not read tagged object '%s'"
msgstr "etiketlenmiş nesne '%s' okunamadı"
@@ -9259,16 +9275,26 @@
msgid "unknown subcommand: `%s'"
msgstr "bilinmeyen altkomut: '%s'"
-msgid "git pack-objects --stdout [<options>] [< <ref-list> | < <object-list>]"
-msgstr ""
-"git pack-objects --stdout [<sçnklr>] [< <başvuru-listesi> | < <nesne-"
-"listesi>]"
-
msgid ""
-"git pack-objects [<options>] <base-name> [< <ref-list> | < <object-list>]"
+"git pack-objects [-q | --progress | --all-progress] [--all-progress-"
+"implied]\n"
+" [--no-reuse-delta] [--delta-base-offset] [--non-empty]\n"
+" [--local] [--incremental] [--window=<n>] [--depth=<n>]\n"
+" [--revs [--unpacked | --all]] [--keep-pack=<pack-name>]\n"
+" [--cruft] [--cruft-expiration=<time>]\n"
+" [--stdout [--filter=<filter-spec>] | <base-name>]\n"
+" [--shallow] [--keep-true-parents] [--[no-]sparse]\n"
+" [--name-hash-version=<n>] [--path-walk] < <object-list>"
msgstr ""
-"git pack-objects [<sçnklr>] <temel-ad> [< <bşvru-listesi> | < <nesne-"
-"listesi>]"
+"git pack-objects [-q | --progress | --all-progress]\n"
+" [--all-progress-implied] [--no-reuse-delta]\n"
+" [--delta-base-offset] [--non-empty]\n"
+" [--local] [--incremental] [--window=<n>] [--depth=<n>]\n"
+" [--revs [--unpacked | --all]] [--keep-pack=<paket-adı>]\n"
+" [--cruft] [--cruft-expiration=<zaman>]\n"
+" [--stdout [--filter=<süzgeç-belirtimi>] | <taban-adı>]\n"
+" [--shallow] [--keep-true-parents] [--[no-]sparse]\n"
+" [--name-hash-version=<n>] [--path-walk] < <nesne-listesi>"
#, c-format
msgid "invalid --name-hash-version option: %d"
@@ -9373,6 +9399,15 @@
msgid "unable to get type of object %s"
msgstr "%s nesnesinin türü alınamıyor"
+msgid "Compressing objects by path"
+msgstr "Nesneler yola göre sıkıştırılıyor"
+
+#, c-format
+msgid "Path-based delta compression using up to %d thread"
+msgid_plural "Path-based delta compression using up to %d threads"
+msgstr[0] "Yol tabanlı delta sıkıştırması %d iş parçacığı kullanıyor"
+msgstr[1] "Yol tabanlı delta sıkıştırması %d iş parçacığı kullanıyor"
+
msgid "Compressing objects"
msgstr "Nesneler sıkıştırılıyor"
@@ -9448,6 +9483,9 @@
msgid "unable to force loose object"
msgstr "gevşek nesne zorlanamıyor"
+msgid "failed to pack objects via path-walk"
+msgstr "path-walk ile nesneler paketlenemedi"
+
#, c-format
msgid "not a rev '%s'"
msgstr "bir revizyon değil: '%s'"
@@ -9557,6 +9595,9 @@
msgid "create thin packs"
msgstr "ince paketler oluştur"
+msgid "use the path-walk API to walk objects when possible"
+msgstr "olursa nesneleri yürütmek için path-walk API'sini kullan"
+
msgid "create packs suitable for shallow fetches"
msgstr "sığ getirmelere uygun paketler oluştur"
@@ -9614,6 +9655,10 @@
msgstr "pack.deltaCacheLimit çok yüksek, %d zorlanıyor"
#, c-format
+msgid "cannot use %s with %s"
+msgstr "%s, %s ile kullanılamıyor"
+
+#, c-format
msgid "bad pack compression level %d"
msgstr "hatalı paket sıkıştırma düzeyi %d"
@@ -9626,18 +9671,12 @@
msgid "--thin cannot be used to build an indexable pack"
msgstr "--thin bir indekslenebilir paket yapımında kullanılamaz"
-msgid "cannot use --filter with --stdin-packs"
-msgstr "--filter, --stdin-packs ile birlikte kullanılamıyor"
-
msgid "cannot use internal rev list with --stdin-packs"
msgstr "iç revizyon listeleri, --stdin-packs ile birlikte kullanılamıyor"
msgid "cannot use internal rev list with --cruft"
msgstr "iç revizyon listeleri, --cruft ile birlikte kullanılamıyor"
-msgid "cannot use --stdin-packs with --cruft"
-msgstr "--stdin-packs, --cruft ile birlikte kullanılamıyor"
-
msgid "Enumerating objects"
msgstr "Nesneler ortaya dökülüyor"
@@ -9650,23 +9689,6 @@
"%<PRIu32>), yeniden kullanılan paket %<PRIu32> (%<PRIuMAX> konumundan)"
msgid ""
-"'git pack-redundant' is nominated for removal.\n"
-"If you still use this command, please add an extra\n"
-"option, '--i-still-use-this', on the command line\n"
-"and let us know you still use it by sending an e-mail\n"
-"to <git@vger.kernel.org>. Thanks.\n"
-msgstr ""
-"'git pack-redundant' komutu kaldırma için aday\n"
-"gösterildi. Bu komutu hâlâ kullanıyorsanız lütfen\n"
-"komut satırında '--i-still-use-this' ek seçeneğini\n"
-"kullanın ve bunu hâlâ kullandığınızı\n"
-"<git@vger.kernel.org> adresine bir e-posta atarak\n"
-"bize haber verin. Sağ olun.\n"
-
-msgid "refusing to run without --i-still-use-this"
-msgstr "--i-still-use-this olmadan çalıştırma reddediliyor"
-
-msgid ""
"git pack-refs [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude "
"<pattern>]"
msgstr ""
@@ -10958,6 +10980,14 @@
msgid "unknown --mirror argument: %s"
msgstr "bilinmeyen --mirror argümanı: %s"
+#, c-format
+msgid "remote name '%s' is a subset of existing remote '%s'"
+msgstr "uzak konum adı '%s', var olan '%s' uzak konumunun bir alt kümesi"
+
+#, c-format
+msgid "remote name '%s' is a superset of existing remote '%s'"
+msgstr "uzak konum adı '%s', var olan '%s' uzak konumunun bir üst kümesi"
+
msgid "fetch the remote branches"
msgstr "uzak konum dallarını getir"
@@ -11264,14 +11294,6 @@
msgstr "%s ayarlanamadı"
#, c-format
-msgid " %s will become dangling!"
-msgstr " %s sarkacak!"
-
-#, c-format
-msgid " %s has become dangling!"
-msgstr " %s sarkmaya başladı!"
-
-#, c-format
msgid "Pruning %s"
msgstr "%s budanıyor"
@@ -11335,11 +11357,11 @@
msgid ""
"git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"
"[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n"
-"[--write-midx] [--name-hash-version=<n>]"
+"[--write-midx] [--name-hash-version=<n>] [--path-walk]"
msgstr ""
"git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"
"[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<paket-adı>]\n"
-"[--write-midx] [--name-hash-version=<n>]"
+"[--write-midx] [--name-hash-version=<n>] [--path-walk]"
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
@@ -11421,6 +11443,9 @@
msgstr ""
"benzer nesneleri yola göre gruplamada kullanılacak name-hash sürümünü belirt"
+msgid "pass --path-walk to git-pack-objects"
+msgstr "--path-walk'ı 'git-pack-objects'e geçir"
+
msgid "do not run git-update-server-info"
msgstr "'git-update-server-info' çalıştırma"
@@ -12571,17 +12596,23 @@
msgid "git stash create [<message>]"
msgstr "git stash create [<ileti>]"
+msgid "git stash export (--print | --to-ref <ref>) [<stash>...]"
+msgstr "git stash export (--print | --to-ref <başvuru>) [<zula>...]"
+
+msgid "git stash import <commit>"
+msgstr "git stash import [<işleme>]"
+
#, c-format
msgid "'%s' is not a stash-like commit"
msgstr "'%s' zulaya benzer bir işleme değil"
+msgid "No stash entries found."
+msgstr "Zula girdisi bulunamadı."
+
#, c-format
msgid "Too many revisions specified:%s"
msgstr "Çok fazla revizyon belirtildi:%s"
-msgid "No stash entries found."
-msgstr "Zula girdisi bulunamadı."
-
#, c-format
msgid "%s is not a valid reference"
msgstr "%s geçerli bir başvuru değil"
@@ -12733,6 +12764,69 @@
msgid "include ignore files"
msgstr "yok sayma dosyalarını içer"
+#, c-format
+msgid "cannot parse commit %s"
+msgstr "%s işlemesi ayrıştırılamıyor"
+
+#, c-format
+msgid "invalid author or committer for %s"
+msgstr "%s için geçersiz yazar veya işleyici"
+
+msgid "could not write commit"
+msgstr "işleme yazılamadı"
+
+#, c-format
+msgid "not a valid revision: %s"
+msgstr "geçerli bir revizyon değil: %s"
+
+#, c-format
+msgid "not a commit: %s"
+msgstr "bir işleme değil: %s"
+
+#, c-format
+msgid "%s is not a valid exported stash commit"
+msgstr "%s, geçerli bir dışa aktarılmış zula işlemesi değil"
+
+#, c-format
+msgid "found root commit %s with invalid data"
+msgstr "geçersiz veriyle %s kök işlemesi bulundu"
+
+#, c-format
+msgid "found stash commit %s without expected prefix"
+msgstr "beklenen öneksiz %s zula işlemesi bulundu"
+
+#, c-format
+msgid "cannot parse parents of commit: %s"
+msgstr "işlemenin üst ögesi ayrıştırılamıyor: %s"
+
+#, c-format
+msgid "%s does not look like a stash commit"
+msgstr "%s, bir zula işlemesi gibi görünmüyor"
+
+#, c-format
+msgid "cannot read commit buffer for %s"
+msgstr "%s için işleme arabelleği okunamıyor"
+
+#, c-format
+msgid "cannot save the stash for %s"
+msgstr "%s için zula kaydedilemiyor"
+
+msgid "unable to write base commit"
+msgstr "taban işleme yazılamıyor"
+
+#, c-format
+msgid "unable to find stash entry %s"
+msgstr "zula girdisi %s bulunamıyor"
+
+msgid "print the object ID instead of writing it to a ref"
+msgstr "başvuruya yazmak yerine nesne kimliğini yazdır"
+
+msgid "save the data to the given ref"
+msgstr "veriyi verilen başvuruya kaydet"
+
+msgid "exactly one of --print and --to-ref is required"
+msgstr "tam olarak --print veya --to-ref arasından biri gerekiyor"
+
msgid "skip and remove all lines starting with comment character"
msgstr "yorum karakteri ile başlayan tüm satırları atla ve kaldır"
@@ -12740,14 +12834,6 @@
msgstr "her satırın başına yorum karakteri ve boşluk koy"
#, c-format
-msgid "Expecting a full ref name, got %s"
-msgstr "Tam bir başvuru adı bekleniyordu, %s alındı"
-
-#, c-format
-msgid "could not get a repository handle for submodule '%s'"
-msgstr "'%s' altmodülü için depo tutacağı alınamadı"
-
-#, c-format
msgid ""
"could not look up configuration '%s'. Assuming this repository is its own "
"authoritative upstream."
@@ -12756,6 +12842,10 @@
"varsayılıyor."
#, c-format
+msgid "could not get a repository handle for submodule '%s'"
+msgstr "'%s' altmodülü için depo tutacağı alınamadı"
+
+#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr ".gitmodules içinde '%s' altmodül yolu için url bulunamadı"
@@ -13104,6 +13194,10 @@
"ancak üst proje, herhangi bir dalda değil"
#, c-format
+msgid "Expecting a full ref name, got %s"
+msgstr "Tam bir başvuru adı bekleniyordu, %s alındı"
+
+#, c-format
msgid "Unable to find current revision in submodule path '%s'"
msgstr "'%s' altmodül yolunda geçerli revizyon bulunamadı"
@@ -13302,6 +13396,10 @@
msgstr "depo URL'si: '%s' mutlak olmalı veya ./|../ ile başlamalıdır"
#, c-format
+msgid "submodule name '%s' already used for path '%s'"
+msgstr "altmodül adı '%s', halihazırda '%s' yolu için kullanılıyor"
+
+#, c-format
msgid "'%s' is not a valid submodule name"
msgstr "'%s' geçerli bir altmodül adı değil"
@@ -13924,10 +14022,6 @@
msgstr "Çalışma ağacı hazırlanıyor ('%s' çıkış yapılıyor)"
#, c-format
-msgid "unreachable: invalid reference: %s"
-msgstr "erişilemiyor: geçersiz başvuru: %s"
-
-#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Çalışma ağacı hazırlanıyor (ayrık HEAD %s)"
@@ -15524,14 +15618,6 @@
msgstr "hatalı sayısal yapılandırma değeri '%s', '%s' için (%s içinde): %s"
#, c-format
-msgid "invalid value for variable %s"
-msgstr "%s değişkeni için geçersiz değer"
-
-#, c-format
-msgid "ignoring unknown core.fsync component '%s'"
-msgstr "bilinmeyen core.fsync bileşeni '%s' yok sayılıyor"
-
-#, c-format
msgid "bad boolean config value '%s' for '%s'"
msgstr "hatalı Boole yapılandırma değeri '%s', '%s' için"
@@ -15544,44 +15630,6 @@
msgstr "%s', '%s' için geçerli bir zaman damgası değil"
#, c-format
-msgid "abbrev length out of range: %d"
-msgstr "kısaltma uzunluğu erim dışında: %d"
-
-#, c-format
-msgid "bad zlib compression level %d"
-msgstr "hatalı zlib sıkıştırma düzeyi %d"
-
-#, c-format
-msgid "%s cannot contain newline"
-msgstr "%s yenisatır içeremez"
-
-#, c-format
-msgid "%s must have at least one character"
-msgstr "%s, en az bir karaktere iye olmalı"
-
-#, c-format
-msgid "ignoring unknown core.fsyncMethod value '%s'"
-msgstr "bilinmeyen core.fsyncMethod değeri '%s' yok sayılıyor"
-
-msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
-msgstr "core.fsyncObjectFiles artık kullanılmıyor; yerine core.fsync kullanın"
-
-#, c-format
-msgid "invalid mode for object creation: %s"
-msgstr "nesne oluşturma için geçersiz kip: %s"
-
-#, c-format
-msgid "malformed value for %s"
-msgstr "%s için hatalı oluşturulmuş değer"
-
-#, c-format
-msgid "malformed value for %s: %s"
-msgstr "%s için hatalı oluşturulmuş değer: %s"
-
-msgid "must be one of nothing, matching, simple, upstream or current"
-msgstr "nothing, matching, simple, upstream veya current içinden biri olmalı"
-
-#, c-format
msgid "unable to load config blob object '%s'"
msgstr "'%s' yapılandırma ikili nesnesi yüklenemiyor"
@@ -16092,8 +16140,8 @@
msgid "cannot compare a named pipe to a directory"
msgstr "adlandırılmış bir veriyolu bir dizinle karşılaştırılamıyor"
-msgid "git diff --no-index [<options>] <path> <path>"
-msgstr "git diff --no-index [<seçenekler>] <yol> <yol>"
+msgid "git diff --no-index [<options>] <path> <path> [<pathspec>...]"
+msgstr "git diff --no-index [<seçenekler>] <yol> <yol> [<yol-belirteci>...]"
msgid ""
"Not a git repository. Use --no-index to compare two paths outside a working "
@@ -16102,6 +16150,13 @@
"Bir git deposu değil. Bir çalışma ağacının dışındaki iki yolu karşılaştırmak "
"için --no-index kullanın"
+msgid ""
+"Limiting comparison with pathspecs is only supported if both paths are "
+"directories."
+msgstr ""
+"Karşılaştırmayı yol belirteçleriyle sınırlamak yalnızca her iki yol da "
+"dizinse desteklenir."
+
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " dirstat kesim yüzdesi '%s' ayrıştırılamadı\n"
@@ -16678,6 +16733,52 @@
msgstr "hatalı git ad alanı yolu \"%s\""
#, c-format
+msgid "invalid value for variable %s"
+msgstr "%s değişkeni için geçersiz değer"
+
+#, c-format
+msgid "ignoring unknown core.fsync component '%s'"
+msgstr "bilinmeyen core.fsync bileşeni '%s' yok sayılıyor"
+
+#, c-format
+msgid "abbrev length out of range: %d"
+msgstr "kısaltma uzunluğu erim dışında: %d"
+
+#, c-format
+msgid "bad zlib compression level %d"
+msgstr "hatalı zlib sıkıştırma düzeyi %d"
+
+#, c-format
+msgid "%s cannot contain newline"
+msgstr "%s yenisatır içeremez"
+
+#, c-format
+msgid "%s must have at least one character"
+msgstr "%s, en az bir karaktere iye olmalı"
+
+#, c-format
+msgid "ignoring unknown core.fsyncMethod value '%s'"
+msgstr "bilinmeyen core.fsyncMethod değeri '%s' yok sayılıyor"
+
+msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
+msgstr "core.fsyncObjectFiles artık kullanılmıyor; yerine core.fsync kullanın"
+
+#, c-format
+msgid "invalid mode for object creation: %s"
+msgstr "nesne oluşturma için geçersiz kip: %s"
+
+#, c-format
+msgid "malformed value for %s"
+msgstr "%s için hatalı oluşturulmuş değer"
+
+#, c-format
+msgid "malformed value for %s: %s"
+msgstr "%s için hatalı oluşturulmuş değer: %s"
+
+msgid "must be one of nothing, matching, simple, upstream or current"
+msgstr "nothing, matching, simple, upstream veya current içinden biri olmalı"
+
+#, c-format
msgid "too many args to run %s"
msgstr "%s çalıştırmak için pek fazla argüman"
@@ -17387,6 +17488,30 @@
msgid "name consists only of disallowed characters: %s"
msgstr "ad yalnızca izin verilmeyen karakterlerden oluşuyor: %s"
+msgid "git imap-send [-v] [-q] [--[no-]curl] [(--folder|-f) <folder>] < <mbox>"
+msgstr ""
+"git imap-send [-v] [-q] [--[no-]curl] [(--folder|-f) <klasör>] < <mbox>"
+
+msgid "no IMAP host specified"
+msgstr "belirtilmiş IMAP makinesi yok"
+
+msgid ""
+"set the IMAP host with 'git config imap.host <host>'.\n"
+"(e.g., 'git config imap.host imaps://imap.example.com')"
+msgstr ""
+"IMAP makinesini 'git config imap.host <makine>' ile ayarlayın.\n"
+"Örneğin, 'git config imap.host imaps://imap.example.com'."
+
+msgid "no IMAP folder specified"
+msgstr "belirtilmiş IMAP klasörü yok"
+
+msgid ""
+"set the target folder with 'git config imap.folder <folder>'.\n"
+"(e.g., 'git config imap.folder Drafts')"
+msgstr ""
+"Hedef klasörü 'git config imap.folder <klasör>' ile ayarlayın.\n"
+"Örneğin, 'git config imap.folder Taslaklar'."
+
msgid "expected 'tree:<depth>'"
msgstr "'tree:<derinlik>' bekleniyordu"
@@ -18345,6 +18470,26 @@
msgstr "geçersiz nesne adı: '%.*s'."
#, c-format
+msgid "invalid object type \"%s\""
+msgstr "geçersiz nesne türü \"%s\""
+
+#, c-format
+msgid "object %s is a %s, not a %s"
+msgstr "%s nesnesi bir %s, %s değil"
+
+#, c-format
+msgid "object %s has unknown type id %d"
+msgstr "%s nesnesi %d bilinmeyen tür numarasına iye"
+
+#, c-format
+msgid "unable to parse object: %s"
+msgstr "nesne ayrıştırılamıyor: %s"
+
+#, c-format
+msgid "hash mismatch %s"
+msgstr "sağlama uyuşmazlığı %s"
+
+#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr "nesne dizini %s yok; şurayı denetleyin: .git/objects/info/alternates"
@@ -18411,26 +18556,6 @@
msgstr "%s geçerli bir '%s' nesnesi değil"
#, c-format
-msgid "invalid object type \"%s\""
-msgstr "geçersiz nesne türü \"%s\""
-
-#, c-format
-msgid "object %s is a %s, not a %s"
-msgstr "%s nesnesi bir %s, %s değil"
-
-#, c-format
-msgid "object %s has unknown type id %d"
-msgstr "%s nesnesi %d bilinmeyen tür numarasına iye"
-
-#, c-format
-msgid "unable to parse object: %s"
-msgstr "nesne ayrıştırılamıyor: %s"
-
-#, c-format
-msgid "hash mismatch %s"
-msgstr "sağlama uyuşmazlığı %s"
-
-#, c-format
msgid "duplicate entry when writing bitmap index: %s"
msgstr "biteşlem indeksi yazılırken yinelenen girdi: %s"
@@ -18441,9 +18566,6 @@
msgid "too many pseudo-merges"
msgstr "pek çok yalancı birleştirme"
-msgid "trying to write commit not in index"
-msgstr "indekste olmayan işleme yazılmaya çalışılıyor"
-
msgid "failed to load bitmap index (corrupted?)"
msgstr "biteşlem indeksi yüklenemedi (hasarlı mı?)"
@@ -18689,6 +18811,10 @@
msgstr "%s kullanılabilir değil"
#, c-format
+msgid "value for %s exceeds %<PRIdMAX>"
+msgstr "%s için olan değer, %<PRIdMAX> değerini aşıyor"
+
+#, c-format
msgid "value %s for %s not in range [%<PRIdMAX>,%<PRIdMAX>]"
msgstr "%s değeri, %s için, [%<PRIdMAX>, %<PRIdMAX>] eriminde değil"
@@ -19654,6 +19780,14 @@
msgstr "%s geçerli bir nesneye işaret etmiyor!"
#, c-format
+msgid "%s%s will become dangling after %s is deleted\n"
+msgstr "%s%s, %s silindikten sonra sarkacak\n"
+
+#, c-format
+msgid "%s%s has become dangling after %s was deleted\n"
+msgstr "%s%s, %s silindikten sonra sarkmaya başladı\n"
+
+#, c-format
msgid ""
"Using '%s' as the name for the initial branch. This default branch name\n"
"is subject to change. To configure the initial branch name to use in all\n"
@@ -21964,6 +22098,9 @@
msgid "toggle pruning of uninteresting paths"
msgstr "ilgisiz yolların budanmasını aç/kapat"
+msgid "toggle aggressive edge walk"
+msgstr "agresif kenar yürüyüşünü aç/kapat"
+
msgid "read a pattern list over stdin"
msgstr "stdin'den bir dizgi listesi oku"
@@ -22595,6 +22732,24 @@
msgstr "uyarı: "
#, c-format
+msgid ""
+"'%s' is nominated for removal.\n"
+"If you still use this command, please add an extra\n"
+"option, '--i-still-use-this', on the command line\n"
+"and let us know you still use it by sending an e-mail\n"
+"to <git@vger.kernel.org>. Thanks.\n"
+msgstr ""
+"'%s' komutu, kaldırma için aday\n"
+"gösterildi. Bu komutu hâlâ kullanıyorsanız lütfen\n"
+"komut satırında '--i-still-use-this' ek seçeneğini\n"
+"kullanın ve bunu hâlâ kullandığınızı\n"
+"<git@vger.kernel.org> adresine bir e-posta atarak\n"
+"bize haber verin. Sağ olun.\n"
+
+msgid "refusing to run without --i-still-use-this"
+msgstr "--i-still-use-this olmadan çalıştırma reddediliyor"
+
+#, c-format
msgid "uname() failed with error '%s' (%d)\n"
msgstr "uname() '%s' hatasını verip çıktı (%d)\n"
@@ -23506,6 +23661,10 @@
msgstr "(body) Cc: %s, '%s' satırından ekleniyor\n"
#, perl-format
+msgid "error: invalid SMTP port '%s'\n"
+msgstr "hata: geçersiz SMTP kapısı '%s'\n"
+
+#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) '%s' yürütülemedi"
diff --git a/po/uk.po b/po/uk.po
index 5ae839f..12c44f8 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: Git v2.46\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2025-06-07 16:24-0700\n"
-"PO-Revision-Date: 2025-06-03 18:43-0700\n"
+"POT-Creation-Date: 2025-08-14 15:16-0700\n"
+"PO-Revision-Date: 2025-08-14 17:33-0700\n"
"Last-Translator: Kateryna Golovanova <kate@kgthreads.com>\n"
"Language-Team: Ukrainian <https://github.com/arkid15r/git-uk-l10n/>\n"
"Language: uk\n"
@@ -21,6 +21,10 @@
"X-Generator: Poedit 3.6\n"
#, c-format
+msgid "%s cannot be negative"
+msgstr "%s не може бути відʼємним"
+
+#, c-format
msgid "Huh (%s)?"
msgstr "Га (%s)?"
@@ -1957,6 +1961,10 @@
msgstr "додавання файлів завершилося невдало"
#, c-format
+msgid "'%s' cannot be negative"
+msgstr "\"%s\" не може бути відʼємним"
+
+#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "--chmod параметр \"%s\" має бути -x або +x"
@@ -5155,25 +5163,26 @@
msgid ""
"git config get [<file-option>] [<display-option>] [--includes] [--all] [--"
-"regexp] [--value=<value>] [--fixed-value] [--default=<default>] <name>"
+"regexp] [--value=<pattern>] [--fixed-value] [--default=<default>] [--"
+"url=<url>] <name>"
msgstr ""
"git config get [<опція-файлу>] [<опція-відображення>] [--includes] [--all] "
-"[--regexp] [--value=<значення>] [--fixed-value] [--default=<за "
-"замовчуванням>] <назва>"
+"[--regexp] [--value=<шаблон>] [--fixed-value] [--default=<значення за "
+"замовчуванням>] [--url=<URL-адреса>] <назва>"
msgid ""
-"git config set [<file-option>] [--type=<type>] [--all] [--value=<value>] [--"
-"fixed-value] <name> <value>"
+"git config set [<file-option>] [--type=<type>] [--all] [--value=<pattern>] "
+"[--fixed-value] <name> <value>"
msgstr ""
-"git config set [<опція-файлу>] [--type=<тип>] [--all] [--value=<значення>] "
-"[--fixed-value] <назва> <значення>"
+"git config set [<опція-файлу>] [--type=<тип>] [--all] [--value=<шаблон>] [--"
+"fixed-value] <назва> <значення>"
msgid ""
-"git config unset [<file-option>] [--all] [--value=<value>] [--fixed-value] "
+"git config unset [<file-option>] [--all] [--value=<pattern>] [--fixed-value] "
"<name>"
msgstr ""
-"git config unset [<опція-файлу>] [--all] [--value=<значення>] [--fixed-"
-"value] <назва>"
+"git config unset [<опція-файлу>] [--all] [--value=<шаблон>] [--fixed-value] "
+"<назва>"
msgid "git config rename-section [<file-option>] <old-name> <new-name>"
msgstr "git config rename-section [<опція-файлу>] <стара-назва> <нова-назва>"
@@ -5189,19 +5198,19 @@
msgid ""
"git config get [<file-option>] [<display-option>] [--includes] [--all] [--"
-"regexp=<regexp>] [--value=<value>] [--fixed-value] [--default=<default>] "
+"regexp=<regexp>] [--value=<pattern>] [--fixed-value] [--default=<default>] "
"<name>"
msgstr ""
"git config get [<опція-файлу>] [<опція-відображення>] [--includes] [--all] "
-"[--regexp=<регвир>] [--value=<значення>] [--fixed-value] [--default=<за-"
-"замовчуванням>] <назва>"
+"[--regexp=<регвир>] [--value=<шаблон>] [--fixed-value] [--default=<значення "
+"за замовчуванням>] <назва>"
msgid ""
"git config set [<file-option>] [--type=<type>] [--comment=<message>] [--all] "
-"[--value=<value>] [--fixed-value] <name> <value>"
+"[--value=<pattern>] [--fixed-value] <name> <value>"
msgstr ""
-"git config set [<опція-файлу>] [--type=<тип>] [--comment=<допис>] [--all][--"
-"value=<значення>] [--fixed-value] <назва> <значення>"
+"git config set [<опція-файлу>] [--type=<тип>] [--comment=<допис>] [--all] [--"
+"value=<шаблон>] [--fixed-value] <назва> <значення>"
msgid "Config file location"
msgstr "Розташування файлу конфігурації"
@@ -6061,22 +6070,6 @@
msgid "rejected %s because shallow roots are not allowed to be updated"
msgstr "відхилено %s, оскільки неглибокі корені не можна оновлювати"
-#, c-format
-msgid ""
-"some local refs could not be updated; try running\n"
-" 'git remote prune %s' to remove any old, conflicting branches"
-msgstr ""
-"не вдалося оновити деякі локальні посилання; спробуйте виконати\n"
-" \"git remote prune %s\", щоб видалити всі старі конфліктні гілки"
-
-#, c-format
-msgid " (%s will become dangling)"
-msgstr " (%s стануть висячими)"
-
-#, c-format
-msgid " (%s has become dangling)"
-msgstr " (%s став висячим)"
-
msgid "[deleted]"
msgstr "[видалено]"
@@ -6118,6 +6111,18 @@
"\"git config set remote.%s.followRemoteHEAD warn-if-not-branch-%s\"\n"
"вимкне попередження, доки віддалене призначення не змінить HEAD на щось інше."
+#, c-format
+msgid ""
+"some local refs could not be updated; try running\n"
+" 'git remote prune %s' to remove any old, conflicting branches"
+msgstr ""
+"не вдалося оновити деякі локальні посилання; спробуйте виконати\n"
+" \"git remote prune %s\", щоб видалити всі старі конфліктні гілки"
+
+#, c-format
+msgid "fetching ref %s failed: %s"
+msgstr "не вдалося отримати посилання %s: %s"
+
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "виявлено кілька гілок, несумісних з --set-upstream"
@@ -6365,6 +6370,9 @@
msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
msgstr "git for-each-ref [--contains [<коміт>]] [--no-contains [<коміт>]]"
+msgid "git for-each-ref [--start-after <marker>]"
+msgstr "git for-each-ref [--start-after <маркер>]"
+
msgid "quote placeholders suitably for shells"
msgstr "заповнювачі лапок для shell"
@@ -6380,6 +6388,12 @@
msgid "show only <n> matched refs"
msgstr "показати тільки <н> відповідних посилань"
+msgid "marker"
+msgstr "маркер"
+
+msgid "start iteration after the provided marker"
+msgstr "почати ітерацію після вказаного маркера"
+
msgid "respect format colors"
msgstr "дотримуватися кольорів формату"
@@ -6404,9 +6418,16 @@
msgid "also include HEAD ref and pseudorefs"
msgstr "також включити HEAD та псевдопосилання"
+msgid "cannot use --start-after with custom sort options"
+msgstr ""
+"неможливо використовувати --start-after із власними параметрами сортування"
+
msgid "unknown arguments supplied with --stdin"
msgstr "невідомі аргументи надані через --stdin"
+msgid "cannot use --start-after with patterns"
+msgstr "неможливо використовувати --start-after із шаблонами"
+
msgid "git for-each-repo --config=<config> [--] <arguments>"
msgstr "git for-each-repo --config=<конфіг> [--] <аргументи>"
@@ -6803,6 +6824,11 @@
msgid "pack prefix to store a pack containing pruned objects"
msgstr "префікс для зберігання пакунка з обрізаними обʼєктами"
+msgid "skip maintenance tasks typically done in the foreground"
+msgstr ""
+"пропустити завдання обслуговування, які зазвичай виконуються у фоновому "
+"режимі"
+
#, c-format
msgid "failed to parse gc.logExpiry value %s"
msgstr "не вдалося розібрати gc.logExpiry значення %s"
@@ -6879,14 +6905,14 @@
"пропуск incremental-repack завдання, оскільки core.multiPackIndex вимкнено"
#, c-format
-msgid "lock file '%s' exists, skipping maintenance"
-msgstr "файл блокування \"%s\" існує, пропуск обслуговування"
-
-#, c-format
msgid "task '%s' failed"
msgstr "завдання \"%s\" завершилося невдало"
#, c-format
+msgid "lock file '%s' exists, skipping maintenance"
+msgstr "файл блокування \"%s\" існує, пропуск обслуговування"
+
+#, c-format
msgid "'%s' is not a valid task"
msgstr "\"%s\" не є припустимим завданням"
@@ -6915,9 +6941,6 @@
msgid "run a specific task"
msgstr "запустити певне завдання"
-msgid "use at most one of --auto and --schedule=<frequency>"
-msgstr "використовуйте щонайбільше одну з опцій --auto та --schedule=<частота>"
-
#, c-format
msgid "unable to add '%s' value of '%s'"
msgstr "не вдалося додати \"%s\" значення до \"%s\""
@@ -7802,10 +7825,6 @@
msgstr "-L<діапазон>:<файл> не можна використовувати з визначником шляху"
#, c-format
-msgid "Final output: %d %s\n"
-msgstr "Кінцевий результат: %d %s\n"
-
-#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: невірний файл"
@@ -8517,6 +8536,9 @@
msgid "(synonym to --stat)"
msgstr "(синонім до --stat)"
+msgid "show a compact-summary at the end of the merge"
+msgstr "показати стислий підсумок наприкінці злиття"
+
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"додати (не більше <н>) записів з короткого журналу у допис до коміту злиття"
@@ -8784,10 +8806,6 @@
msgstr "помилка: вхідний тег не пройшов fsck: %s"
#, c-format
-msgid "%d (FSCK_IGNORE?) should never trigger this callback"
-msgstr "%d (FSCK_IGNORE?) ніколи не мав спричинити цей зворотній виклик"
-
-#, c-format
msgid "could not read tagged object '%s'"
msgstr "не вдалося прочитати тегований об’єкт \"%s\""
@@ -9304,16 +9322,27 @@
msgid "unknown subcommand: `%s'"
msgstr "невідома підкоманда: \"%s\""
-msgid "git pack-objects --stdout [<options>] [< <ref-list> | < <object-list>]"
-msgstr ""
-"git pack-objects --stdout [<опції>] [< <список-посилань> | < <список-"
-"обʼєктів>]"
-
msgid ""
-"git pack-objects [<options>] <base-name> [< <ref-list> | < <object-list>]"
+"git pack-objects [-q | --progress | --all-progress] [--all-progress-"
+"implied]\n"
+" [--no-reuse-delta] [--delta-base-offset] [--non-empty]\n"
+" [--local] [--incremental] [--window=<n>] [--depth=<n>]\n"
+" [--revs [--unpacked | --all]] [--keep-pack=<pack-name>]\n"
+" [--cruft] [--cruft-expiration=<time>]\n"
+" [--stdout [--filter=<filter-spec>] | <base-name>]\n"
+" [--shallow] [--keep-true-parents] [--[no-]sparse]\n"
+" [--name-hash-version=<n>] [--path-walk] < <object-list>"
msgstr ""
-"git pack-objects [<опції>] <базова-назва> [< <список-посилань> | < <список-"
-"обʼєктів>]"
+"git pack-objects [-q | --progress | --all-progress] [--all-progress-"
+"implied]\n"
+" [--no-reuse-delta] [--delta-base-offset] [--non-empty]\n"
+" [--local] [--incremental] [--window=<н>] [--depth=<н>]\n"
+" [--revs [--unpacked | --all]] [--keep-pack=<назва-"
+"пакунка>]\n"
+" [--cruft] [--cruft-expiration=<час>]\n"
+" [--stdout [--filter=<визначник-фільтру>] | <базова-назва>]\n"
+" [--shallow] [--keep-true-parents] [--[no-]sparse]\n"
+" [--name-hash-version=<н>] [--path-walk] < <список-обʼєктів>"
#, c-format
msgid "invalid --name-hash-version option: %d"
@@ -9418,6 +9447,16 @@
msgid "unable to get type of object %s"
msgstr "не вдалося отримати тип обʼєкта %s"
+msgid "Compressing objects by path"
+msgstr "Стиснення обʼєктів за шляхом"
+
+#, c-format
+msgid "Path-based delta compression using up to %d thread"
+msgid_plural "Path-based delta compression using up to %d threads"
+msgstr[0] "Дельта-стиснення на основі шляху з використанням до %d потоку"
+msgstr[1] "Дельта-стиснення на основі шляху з використанням до %d потоків"
+msgstr[2] "Дельта-стиснення на основі шляху з використанням до %d потоків"
+
msgid "Compressing objects"
msgstr "Компресія обʼєктів"
@@ -9493,6 +9532,9 @@
msgid "unable to force loose object"
msgstr "не вдалося примусово вивільнити обʼєкт"
+msgid "failed to pack objects via path-walk"
+msgstr "не вдалося запакувати обʼєкти за допомогою path-walk"
+
#, c-format
msgid "not a rev '%s'"
msgstr "не є ревізією \"%s\""
@@ -9603,6 +9645,10 @@
msgid "create thin packs"
msgstr "створити тонкі пакунки"
+msgid "use the path-walk API to walk objects when possible"
+msgstr ""
+"використовувати API path-walk для проходження обʼєктів, коли це можливо"
+
msgid "create packs suitable for shallow fetches"
msgstr "створювати пакунки, придатні для неглибокого отримання"
@@ -9660,6 +9706,10 @@
msgstr "pack.deltaCacheLimit занадто великий, примусове %d"
#, c-format
+msgid "cannot use %s with %s"
+msgstr "неможливо використовувати %s з %s"
+
+#, c-format
msgid "bad pack compression level %d"
msgstr "невірний рівень стиснення пакунка %d"
@@ -9673,18 +9723,12 @@
msgid "--thin cannot be used to build an indexable pack"
msgstr "--thin не можна використовувати для створення індексованого пакунка"
-msgid "cannot use --filter with --stdin-packs"
-msgstr "неможливо використовувати --filter з --stdin-packs"
-
msgid "cannot use internal rev list with --stdin-packs"
msgstr "неможливо використовувати внутрішній список ревізій з --stdin-packs"
msgid "cannot use internal rev list with --cruft"
msgstr "неможливо використовувати внутрішній список ревізій з --cruft"
-msgid "cannot use --stdin-packs with --cruft"
-msgstr "неможливо використовувати --stdin-packs з --cruft"
-
msgid "Enumerating objects"
msgstr "Перерахування обʼєктів"
@@ -9697,23 +9741,6 @@
"%<PRIu32>), повторно використано пакунків %<PRIu32> (з %<PRIuMAX>)"
msgid ""
-"'git pack-redundant' is nominated for removal.\n"
-"If you still use this command, please add an extra\n"
-"option, '--i-still-use-this', on the command line\n"
-"and let us know you still use it by sending an e-mail\n"
-"to <git@vger.kernel.org>. Thanks.\n"
-msgstr ""
-"Команду \"git pack-redundant\" номіновано на вилучення.\n"
-"Якщо ви все ще використовуєте цю команду, будь ласка, додайте додатковий "
-"параметр\n"
-"\"--i-still-use-this\" у командному рядку\n"
-"і повідомте нам, що ви все ще використовуєте її, надіславши листа\n"
-"на адресу <git@vger.kernel.org>. Дякуємо.\n"
-
-msgid "refusing to run without --i-still-use-this"
-msgstr "відмовлено в запуску без --i-still-use-this"
-
-msgid ""
"git pack-refs [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude "
"<pattern>]"
msgstr ""
@@ -11032,6 +11059,14 @@
msgid "unknown --mirror argument: %s"
msgstr "невідомий --mirror аргумент: %s"
+#, c-format
+msgid "remote name '%s' is a subset of existing remote '%s'"
+msgstr "віддалена назва \"%s\" є підмножиною існуючого віддаленого \"%s\""
+
+#, c-format
+msgid "remote name '%s' is a superset of existing remote '%s'"
+msgstr "віддалена назва \"%s\" є надмножиною існуючого віддаленого \"%s\""
+
msgid "fetch the remote branches"
msgstr "отримати віддалені гілки"
@@ -11344,14 +11379,6 @@
msgstr "Не вдалося налаштувати %s"
#, c-format
-msgid " %s will become dangling!"
-msgstr " %s стануть висячими!"
-
-#, c-format
-msgid " %s has become dangling!"
-msgstr " %s став висячим!"
-
-#, c-format
msgid "Pruning %s"
msgstr "Видалення %s"
@@ -11415,11 +11442,11 @@
msgid ""
"git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"
"[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n"
-"[--write-midx] [--name-hash-version=<n>]"
+"[--write-midx] [--name-hash-version=<n>] [--path-walk]"
msgstr ""
"git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"
"[--window=<н>] [--depth=<н>] [--threads=<н>] [--keep-pack=<назва-пакунка>]\n"
-"[--write-midx] [--name-hash-version=<н>]"
+"[--write-midx] [--name-hash-version=<н>] [--path-walk]"
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
@@ -11486,7 +11513,8 @@
msgstr "з --cruft видалити обʼєкти, старіші за цей термін"
msgid "with --cruft, only repack cruft packs smaller than this"
-msgstr "з параметром --cruft, перепакувати лише марні пакунки, менші за цей розмір"
+msgstr ""
+"з параметром --cruft, перепакувати лише марні пакунки, менші за цей розмір"
msgid "remove redundant packs, and run git-prune-packed"
msgstr "видалити зайві пакунки і запустити git-prune-packed"
@@ -11501,6 +11529,9 @@
"specify the name hash version to use for grouping similar objects by path"
msgstr "вказати версію назви хешу для групування схожих обʼєктів за шляхом"
+msgid "pass --path-walk to git-pack-objects"
+msgstr "передати --path-walk до git-pack-objects"
+
msgid "do not run git-update-server-info"
msgstr "не запускати git-update-server-info"
@@ -12669,17 +12700,23 @@
msgid "git stash create [<message>]"
msgstr "git stash create [<допис>]"
+msgid "git stash export (--print | --to-ref <ref>) [<stash>...]"
+msgstr "git stash export (--print | --to-ref <посилання>) [<схов>...]"
+
+msgid "git stash import <commit>"
+msgstr "git stash import <коміт>"
+
#, c-format
msgid "'%s' is not a stash-like commit"
msgstr "\"%s\" не є сховоподібним комітом"
+msgid "No stash entries found."
+msgstr "Записи схову не знайдені."
+
#, c-format
msgid "Too many revisions specified:%s"
msgstr "Вказано забагато ревізій:%s"
-msgid "No stash entries found."
-msgstr "Записи схова не знайдені."
-
#, c-format
msgid "%s is not a valid reference"
msgstr "%s не є припустимим посиланням"
@@ -12832,6 +12869,69 @@
msgid "include ignore files"
msgstr "в тому числи файли ігнорування"
+#, c-format
+msgid "cannot parse commit %s"
+msgstr "неможливо розібрати коміт %s"
+
+#, c-format
+msgid "invalid author or committer for %s"
+msgstr "неприпустимий автор або комітер для %s"
+
+msgid "could not write commit"
+msgstr "не вдалося записати коміт"
+
+#, c-format
+msgid "not a valid revision: %s"
+msgstr "неприпустима редакція: %s"
+
+#, c-format
+msgid "not a commit: %s"
+msgstr "не є комітом: %s"
+
+#, c-format
+msgid "%s is not a valid exported stash commit"
+msgstr "%s не є припустимим експортованим комітом схову"
+
+#, c-format
+msgid "found root commit %s with invalid data"
+msgstr "знайдено кореневий коміт %s з неприпустими даними"
+
+#, c-format
+msgid "found stash commit %s without expected prefix"
+msgstr "знайдено коміт схову %s без очікуваного префікса"
+
+#, c-format
+msgid "cannot parse parents of commit: %s"
+msgstr "неможливо розібрати батьків коміту: %s"
+
+#, c-format
+msgid "%s does not look like a stash commit"
+msgstr "%s не схожий на коміт схову"
+
+#, c-format
+msgid "cannot read commit buffer for %s"
+msgstr "неможливо прочитати буфер комітів для %s"
+
+#, c-format
+msgid "cannot save the stash for %s"
+msgstr "неможливо зберегти схов для %s"
+
+msgid "unable to write base commit"
+msgstr "не вдалося записати базовий коміт"
+
+#, c-format
+msgid "unable to find stash entry %s"
+msgstr "не вдалося знайти запис схову %s"
+
+msgid "print the object ID instead of writing it to a ref"
+msgstr "виводити ідентифікатор обʼєкта замість записування його в посилання"
+
+msgid "save the data to the given ref"
+msgstr "зберегти дані у вказаному посиланні"
+
+msgid "exactly one of --print and --to-ref is required"
+msgstr "потрібно вказати лише один з параметрів --print та --to-ref"
+
msgid "skip and remove all lines starting with comment character"
msgstr "пропустити та видалити всі рядки, що починаються з символу коментаря"
@@ -12839,14 +12939,6 @@
msgstr "додати символ коментаря та пробіл до кожного рядка"
#, c-format
-msgid "Expecting a full ref name, got %s"
-msgstr "Очікувалась повна назва посилання, отримано %s"
-
-#, c-format
-msgid "could not get a repository handle for submodule '%s'"
-msgstr "не вдалося отримати обʼєкт сховища для підмодуля \"%s\""
-
-#, c-format
msgid ""
"could not look up configuration '%s'. Assuming this repository is its own "
"authoritative upstream."
@@ -12855,6 +12947,10 @@
"першоджерельне сховище."
#, c-format
+msgid "could not get a repository handle for submodule '%s'"
+msgstr "не вдалося отримати обʼєкт сховища для підмодуля \"%s\""
+
+#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "Не знайдено URL для шляху підмодуля \"%s\" у .gitmodules"
@@ -13213,6 +13309,10 @@
"суперпроект не знаходиться у жодній гілці"
#, c-format
+msgid "Expecting a full ref name, got %s"
+msgstr "Очікувалась повна назва посилання, отримано %s"
+
+#, c-format
msgid "Unable to find current revision in submodule path '%s'"
msgstr "Не вдалося знайти поточну ревізію у шляху підмодуля \"%s\""
@@ -13416,6 +13516,10 @@
msgstr "URL сховища: \"%s\" має бути абсолютним або починатися з ./|../."
#, c-format
+msgid "submodule name '%s' already used for path '%s'"
+msgstr "назва підмодуля \"%s\" вже використовується для шляху \"%s\""
+
+#, c-format
msgid "'%s' is not a valid submodule name"
msgstr "\"%s\" не є припустимою назвою підмодуля"
@@ -14049,10 +14153,6 @@
msgstr "Підготовка робочого дерева (перехід до \"%s\")"
#, c-format
-msgid "unreachable: invalid reference: %s"
-msgstr "недосяжне: неприпустиме посилання: %s"
-
-#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Підготовка робочого дерева (відокремлений HEAD %s)"
@@ -15660,14 +15760,6 @@
msgstr "невірне числове значення конфігурації \"%s\" для \"%s\" у \"%s\": %s"
#, c-format
-msgid "invalid value for variable %s"
-msgstr "неприпустиме значення для змінної %s"
-
-#, c-format
-msgid "ignoring unknown core.fsync component '%s'"
-msgstr "ігнорування невідомого компонента core.fsync \"%s\""
-
-#, c-format
msgid "bad boolean config value '%s' for '%s'"
msgstr "невірне булеве значення конфігурації \"%s\" для \"%s\""
@@ -15680,44 +15772,6 @@
msgstr "\"%s\" для \"%s\" не є припустимою міткою часу"
#, c-format
-msgid "abbrev length out of range: %d"
-msgstr "довжина скорочення поза діапазоном: %d"
-
-#, c-format
-msgid "bad zlib compression level %d"
-msgstr "невірний рівень zlib компресії %d"
-
-#, c-format
-msgid "%s cannot contain newline"
-msgstr "%s не може містити символи нового рядка"
-
-#, c-format
-msgid "%s must have at least one character"
-msgstr "%s повинен мати принаймні один символ"
-
-#, c-format
-msgid "ignoring unknown core.fsyncMethod value '%s'"
-msgstr "ігнорування невідомого значення core.fsyncMethod \"%s\""
-
-msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
-msgstr "core.fsyncObjectFiles застаріла; натомість використовуйте core.fsync"
-
-#, c-format
-msgid "invalid mode for object creation: %s"
-msgstr "неприпустимий режим створення обʼєкта: %s"
-
-#, c-format
-msgid "malformed value for %s"
-msgstr "невірно сформоване значення для %s"
-
-#, c-format
-msgid "malformed value for %s: %s"
-msgstr "невірно сформоване значення для %s: %s"
-
-msgid "must be one of nothing, matching, simple, upstream or current"
-msgstr "має бути одним з nothing, matching, simple, upstream або current"
-
-#, c-format
msgid "unable to load config blob object '%s'"
msgstr "не вдалося завантажити config blob обʼєкт \"%s\""
@@ -16238,8 +16292,8 @@
msgid "cannot compare a named pipe to a directory"
msgstr "неможливо порівняти іменований канал з директорією"
-msgid "git diff --no-index [<options>] <path> <path>"
-msgstr "git diff --no-index [<опції>] <шлях> <шлях>"
+msgid "git diff --no-index [<options>] <path> <path> [<pathspec>...]"
+msgstr "git diff --no-index [<опції>] <шлях> <шлях> [<визначник шляху>...]"
msgid ""
"Not a git repository. Use --no-index to compare two paths outside a working "
@@ -16248,6 +16302,13 @@
"Це не git сховище. Скористайтесь --no-index для порівняння двох шляхів поза "
"робочим деревом"
+msgid ""
+"Limiting comparison with pathspecs is only supported if both paths are "
+"directories."
+msgstr ""
+"Обмеження порівняння з pathspecs підтримується тільки в тому випадку, якщо "
+"обидва шляхи є директоріями."
+
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " Не вдалося розібрати відсоток відсікання dirstat \"%s\"\n"
@@ -16829,6 +16890,52 @@
msgstr "невірний шлях до простору імен git \"%s\""
#, c-format
+msgid "invalid value for variable %s"
+msgstr "неприпустиме значення для змінної %s"
+
+#, c-format
+msgid "ignoring unknown core.fsync component '%s'"
+msgstr "ігнорування невідомого компонента core.fsync \"%s\""
+
+#, c-format
+msgid "abbrev length out of range: %d"
+msgstr "довжина скорочення поза діапазоном: %d"
+
+#, c-format
+msgid "bad zlib compression level %d"
+msgstr "невірний рівень zlib компресії %d"
+
+#, c-format
+msgid "%s cannot contain newline"
+msgstr "%s не може містити символи нового рядка"
+
+#, c-format
+msgid "%s must have at least one character"
+msgstr "%s повинен мати принаймні один символ"
+
+#, c-format
+msgid "ignoring unknown core.fsyncMethod value '%s'"
+msgstr "ігнорування невідомого значення core.fsyncMethod \"%s\""
+
+msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
+msgstr "core.fsyncObjectFiles застаріла; натомість використовуйте core.fsync"
+
+#, c-format
+msgid "invalid mode for object creation: %s"
+msgstr "неприпустимий режим створення обʼєкта: %s"
+
+#, c-format
+msgid "malformed value for %s"
+msgstr "невірно сформоване значення для %s"
+
+#, c-format
+msgid "malformed value for %s: %s"
+msgstr "невірно сформоване значення для %s: %s"
+
+msgid "must be one of nothing, matching, simple, upstream or current"
+msgstr "має бути одним з nothing, matching, simple, upstream або current"
+
+#, c-format
msgid "too many args to run %s"
msgstr "забагато аргументів для запуску %s"
@@ -17547,6 +17654,31 @@
msgid "name consists only of disallowed characters: %s"
msgstr "імʼя складається лише з заборонених символів: %s"
+msgid "git imap-send [-v] [-q] [--[no-]curl] [(--folder|-f) <folder>] < <mbox>"
+msgstr ""
+"git imap-send [-v] [-q] [--[no-]curl] [(--folder|-f) <директорія>] < <mbox>"
+
+msgid "no IMAP host specified"
+msgstr "не вказано хост IMAP"
+
+msgid ""
+"set the IMAP host with 'git config imap.host <host>'.\n"
+"(e.g., 'git config imap.host imaps://imap.example.com')"
+msgstr ""
+"встановіть хост IMAP за допомогою команди \"git config imap.host <хост>\".\n"
+"(наприклад, \"git config imap.host imaps://imap.example.com\")"
+
+msgid "no IMAP folder specified"
+msgstr "не вказано директорію IMAP"
+
+msgid ""
+"set the target folder with 'git config imap.folder <folder>'.\n"
+"(e.g., 'git config imap.folder Drafts')"
+msgstr ""
+"встановіть цільову директорію за допомогою команди \"git config imap.folder "
+"<директорія>\".\n"
+"(наприклад, \"git config imap.folder Drafts\")"
+
msgid "expected 'tree:<depth>'"
msgstr "очікувалось \"tree:<глибина>\""
@@ -18510,6 +18642,26 @@
msgstr "неприпустима назва обʼєкта \"%.*s\"."
#, c-format
+msgid "invalid object type \"%s\""
+msgstr "неприпустимий тип обʼєкту \"%s\""
+
+#, c-format
+msgid "object %s is a %s, not a %s"
+msgstr "обʼєкт %s є %s, а не %s"
+
+#, c-format
+msgid "object %s has unknown type id %d"
+msgstr "обʼєкт %s має невідомий тип ідентифікатора %d"
+
+#, c-format
+msgid "unable to parse object: %s"
+msgstr "не вдалося розібрати обʼєкт: %s"
+
+#, c-format
+msgid "hash mismatch %s"
+msgstr "невідповідність хешу %s"
+
+#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr "директорія об’єкта %s не існує; перевірте .git/objects/info/alternates"
@@ -18577,26 +18729,6 @@
msgstr "%s не є допустимим \"%s\" обʼєктом"
#, c-format
-msgid "invalid object type \"%s\""
-msgstr "неприпустимий тип обʼєкту \"%s\""
-
-#, c-format
-msgid "object %s is a %s, not a %s"
-msgstr "обʼєкт %s є %s, а не %s"
-
-#, c-format
-msgid "object %s has unknown type id %d"
-msgstr "обʼєкт %s має невідомий тип ідентифікатора %d"
-
-#, c-format
-msgid "unable to parse object: %s"
-msgstr "не вдалося розібрати обʼєкт: %s"
-
-#, c-format
-msgid "hash mismatch %s"
-msgstr "невідповідність хешу %s"
-
-#, c-format
msgid "duplicate entry when writing bitmap index: %s"
msgstr "дубльований елемент під час запису bitmap індексу: \"%s\""
@@ -18607,9 +18739,6 @@
msgid "too many pseudo-merges"
msgstr "занадто багато псевдозлиття"
-msgid "trying to write commit not in index"
-msgstr "спроба записати коміт, якого немає в індексі"
-
msgid "failed to load bitmap index (corrupted?)"
msgstr "не вдалося завантажити bitmap індекс (пошкоджено?)"
@@ -18863,6 +18992,10 @@
msgstr "%s недоступний"
#, c-format
+msgid "value for %s exceeds %<PRIdMAX>"
+msgstr "значення для %s перевищує %<PRIdMAX>"
+
+#, c-format
msgid "value %s for %s not in range [%<PRIdMAX>,%<PRIdMAX>]"
msgstr "значення %s для %s не в діапазоні [%<PRIdMAX>,%<PRIdMAX>]"
@@ -19837,6 +19970,14 @@
msgstr "%s не вказує на допустимий обʼєкт!"
#, c-format
+msgid "%s%s will become dangling after %s is deleted\n"
+msgstr "%s%s стане висячим після видалення %s\n"
+
+#, c-format
+msgid "%s%s has become dangling after %s was deleted\n"
+msgstr "%s%s став висячим після видалення %s\n"
+
+#, c-format
msgid ""
"Using '%s' as the name for the initial branch. This default branch name\n"
"is subject to change. To configure the initial branch name to use in all\n"
@@ -22201,6 +22342,9 @@
msgid "toggle pruning of uninteresting paths"
msgstr "перемикач обрізання нецікавих шляхів"
+msgid "toggle aggressive edge walk"
+msgstr "перемикач агресивного ходіння по краю"
+
msgid "read a pattern list over stdin"
msgstr "читати список шаблонів через stdin"
@@ -22845,6 +22989,24 @@
msgstr "попередження: "
#, c-format
+msgid ""
+"'%s' is nominated for removal.\n"
+"If you still use this command, please add an extra\n"
+"option, '--i-still-use-this', on the command line\n"
+"and let us know you still use it by sending an e-mail\n"
+"to <git@vger.kernel.org>. Thanks.\n"
+msgstr ""
+"\"%s\" запропоновано для видалення.\n"
+"Якщо ви все ще використовуєте цю команду, додайте додаткову\n"
+"опцію \"--i-still-use-this\" у командний рядок\n"
+"і повідомте нас про те, що ви все ще її використовуєте, надіславши "
+"електронного листа\n"
+"на адресу <git@vger.kernel.org>. Дякуємо.\n"
+
+msgid "refusing to run without --i-still-use-this"
+msgstr "відмовлено в запуску без --i-still-use-this"
+
+#, c-format
msgid "uname() failed with error '%s' (%d)\n"
msgstr "uname() завершився невдало з помилкою \"%s\" (%d)\n"
@@ -23087,9 +23249,9 @@
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
-msgstr[0] "У вашій схованці наразі є %d запис"
-msgstr[1] "У вашій схованці наразі є %d записи"
-msgstr[2] "У вашій схованці наразі є %d записів"
+msgstr[0] "У вашому схові наразі є %d запис"
+msgstr[1] "У вашому схові наразі є %d записи"
+msgstr[2] "У вашому схові наразі є %d записів"
msgid "Submodules changed but not updated:"
msgstr "Підмодулі змінено, але не оновлено:"
@@ -23780,6 +23942,10 @@
msgstr "(тіло) Додавання cc: %s з рядка \"%s\"\n"
#, perl-format
+msgid "error: invalid SMTP port '%s'\n"
+msgstr "помилка: неприпустимий порт SMTP \"%s\"\n"
+
+#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) Не вдалося виконати \"%s\""
diff --git a/po/vi.po b/po/vi.po
index 803a68e..caf714a 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -66,10 +66,10 @@
# +------------------------------------------------------------------+
msgid ""
msgstr ""
-"Project-Id-Version: git 2.49\n"
+"Project-Id-Version: git 2.51\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2025-03-05 22:57+0000\n"
-"PO-Revision-Date: 2025-03-06 08:20+0700\n"
+"POT-Creation-Date: 2025-08-12 17:01+0000\n"
+"PO-Revision-Date: 2025-08-14 16:16+0700\n"
"Last-Translator: Vũ Tiến Hưng <newcomerminecraft@gmail.com>\n"
"Language-Team: Vietnamese <https://github.com/Nekosha/git-po>\n"
"Language: vi\n"
@@ -79,6 +79,10 @@
"Plural-Forms: nplurals=1; plural=0\n"
#, c-format
+msgid "%s cannot be negative"
+msgstr "%s phải không âm"
+
+#, c-format
msgid "Huh (%s)?"
msgstr "Hả (%s)?"
@@ -1978,6 +1982,10 @@
msgstr "thêm tập tin gặp lỗi"
#, c-format
+msgid "'%s' cannot be negative"
+msgstr "'%s' phải không âm"
+
+#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "--chmod tham số '%s' phải hoặc là -x hay +x"
@@ -2952,7 +2960,7 @@
msgstr "hiển thị mã băm và chủ đề, đưa ra hai lần cho nhánh thượng nguồn"
msgid "suppress informational messages"
-msgstr "không xuất các thông tin"
+msgstr "không in ra các thông tin phản hồi"
msgid "set branch tracking configuration"
msgstr "đặt cấu hình thao dõi nhánh"
@@ -3261,7 +3269,7 @@
msgstr "không hiển thị chi tiết bundle (bó)"
msgid "need a repository to verify a bundle"
-msgstr "cần một kho chứa để thẩm tra một bundle"
+msgstr "cần một kho chứa để xác minh một bundle"
#, c-format
msgid "%s is okay\n"
@@ -3301,11 +3309,8 @@
msgid "git cat-file <type> <object>"
msgstr "git cat-file <kiểu> <đối tượng>"
-msgid "git cat-file (-e | -p) <object>"
-msgstr "git cat-file (-e | -p) <đối tượng>"
-
-msgid "git cat-file (-t | -s) [--allow-unknown-type] <object>"
-msgstr "git cat-file (-t | -s) [--allow-unknown-type] <đối_tượng>"
+msgid "git cat-file (-e | -p | -t | -s) <object>"
+msgstr "git cat-file (-e | -p | -t | -s) <đối tượng>"
msgid ""
"git cat-file (--textconv | --filters)\n"
@@ -3345,9 +3350,6 @@
msgid "show object size"
msgstr "hiển thị kích thước đối tượng"
-msgid "allow -s and -t to work with broken/corrupt objects"
-msgstr "cho phép -s và -t để làm việc với các đối tượng sai/hỏng"
-
msgid "use mail map file"
msgstr "sử dụng tập tin ánh xạ thư"
@@ -3404,6 +3406,13 @@
msgstr ""
"dùng một </đường/dẫn/> rõ ràng cho (--textconv/--filters); Không với 'batch'"
+msgid "objects filter only supported in batch mode"
+msgstr "chỉ hỗ trợ lọc đối tượng trong chế độ batch"
+
+#, c-format
+msgid "objects filter not supported: '%s'"
+msgstr "không hỗ trợ lọc đối tượng: '%s'"
+
#, c-format
msgid "'%s=<%s>' needs '%s' or '%s'"
msgstr "'%s=<%s>' cần '%s' hoặc '%s'"
@@ -4500,7 +4509,7 @@
msgstr "thư mục đối tượng để lưu đồ thị"
msgid "if the commit-graph is split, only verify the tip file"
-msgstr "nếu đồ-thị-chuyển-giao bị chia cắt, thì chỉ thẩm tra tập tin đỉnh"
+msgstr "nếu đồ-thị-chuyển-giao bị chia cắt, thì chỉ xác minh tập tin đỉnh"
#, c-format
msgid "Could not open commit-graph '%s'"
@@ -4932,7 +4941,7 @@
msgstr "các đường dẫn '%s ...' với tùy chọn -a không hợp lý"
msgid "show status concisely"
-msgstr "hiển thị trạng thái ở dạng súc tích"
+msgstr "hiển thị trạng thái ở dạng tóm lược"
msgid "show branch information"
msgstr "hiển thị thông tin nhánh"
@@ -5135,58 +5144,61 @@
"và sau đó \"git restore --staged :/\" để khắc phục."
msgid "git config list [<file-option>] [<display-option>] [--includes]"
-msgstr "git config list [<tuỳ-chọn>] [<tuỳ-chọn-hiển-thị>] [--includes]"
+msgstr ""
+"git config list [<tuỳ-chọn-tập-tin>] [<tuỳ-chọn-hiển-thị>] [--includes]"
msgid ""
"git config get [<file-option>] [<display-option>] [--includes] [--all] [--"
-"regexp] [--value=<value>] [--fixed-value] [--default=<default>] <name>"
+"regexp] [--value=<pattern>] [--fixed-value] [--default=<default>] [--"
+"url=<url>] <name>"
msgstr ""
-"git config get [<tuỳ-chọn>] [<tuỳ-chọn-hiển-thị>] [--includes] [--all] [--"
-"regexp] [--value=<giá-trị>] [--fixed-value] [--default=<giá-trị-mặc-định>] "
-"<tên>"
+"git config get [<tuỳ-chọn-tập-tin>] [<tuỳ-chọn-hiển-thị>] [--includes] [--"
+"all] [--regexp] [--value=<giá-trị>] [--fixed-value] [--default=<giá-trị-mặc-"
+"định>] [--url=<url>] <tên>"
msgid ""
-"git config set [<file-option>] [--type=<type>] [--all] [--value=<value>] [--"
-"fixed-value] <name> <value>"
+"git config set [<file-option>] [--type=<type>] [--all] [--value=<pattern>] "
+"[--fixed-value] <name> <value>"
msgstr ""
-"git config set [<tuỳ-chọn>] [--type=<kiểu>] [--all] [--value=<giá-trị>] [--"
-"fixed-value] <khoá> <giá-trị>"
+"git config set [<tuỳ-chọn-tập-tin>] [--type=<kiểu>] [--all] [--value=<giá-"
+"trị>] [--fixed-value] <khoá> <giá-trị>"
msgid ""
-"git config unset [<file-option>] [--all] [--value=<value>] [--fixed-value] "
+"git config unset [<file-option>] [--all] [--value=<pattern>] [--fixed-value] "
"<name>"
msgstr ""
-"git config unset [<tuỳ-chọn>] [--all] [--value=<giá-trị>] [--fixed-value] "
-"<khoá>"
+"git config unset [<tuỳ-chọn-tập-tin>] [--all] [--value=<giá-trị>] [--fixed-"
+"value] <khoá>"
msgid "git config rename-section [<file-option>] <old-name> <new-name>"
-msgstr "git config rename-section [<tuỳ-chọn>] <tên-cũ> <tên-mới>"
+msgstr "git config rename-section [<tuỳ-chọn-tập-tin>] <tên-cũ> <tên-mới>"
msgid "git config remove-section [<file-option>] <name>"
-msgstr "git config remove-section [<tuỳ-chọn>] <tên>"
+msgstr "git config remove-section [<tuỳ-chọn-tập-tin>] <tên>"
msgid "git config edit [<file-option>]"
-msgstr "git config edit [<tùy-chọn>]"
+msgstr "git config edit [<tùy-chọn-tập-tin>]"
msgid "git config [<file-option>] --get-colorbool <name> [<stdout-is-tty>]"
msgstr ""
-"git config [<tuỳ-chọn>] --get-colorbool <tên> [<stdout-là-tty-hay-không>]"
+"git config [<tuỳ-chọn-tập-tin>] --get-colorbool <tên> [<stdout-là-tty-hay-"
+"không>]"
msgid ""
"git config get [<file-option>] [<display-option>] [--includes] [--all] [--"
-"regexp=<regexp>] [--value=<value>] [--fixed-value] [--default=<default>] "
+"regexp=<regexp>] [--value=<pattern>] [--fixed-value] [--default=<default>] "
"<name>"
msgstr ""
-"git config get [<tuỳ-chọn>] [<tuỳ-chọn-hiển-thị>] [--includes] [--all] [--"
-"regexp=<biểu-thức-chính-quy>] [--value=<giá-trị>] [--fixed-value] [--"
+"git config get [<tuỳ-chọn-tập-tin>] [<tuỳ-chọn-hiển-thị>] [--includes] [--"
+"all] [--regexp=<biểu-thức-chính-quy>] [--value=<giá-trị>] [--fixed-value] [--"
"default=<giá-trị-mặc-định>] <khoá>"
msgid ""
"git config set [<file-option>] [--type=<type>] [--comment=<message>] [--all] "
-"[--value=<value>] [--fixed-value] <name> <value>"
+"[--value=<pattern>] [--fixed-value] <name> <value>"
msgstr ""
-"git config set [<tuỳ-chọn>] [--type=<kiểu>] [--comment=<chú-thích>] [--all] "
-"[--value=<giá-trị>] [--fixed-value] <khoá> <giá-trị>"
+"git config set [<tuỳ-chọn-tập-tin>] [--type=<kiểu>] [--comment=<chú-thích>] "
+"[--all] [--value=<giá-trị>] [--fixed-value] <khoá> <giá-trị>"
msgid "Config file location"
msgstr "Vị trí tập tin cấu hình"
@@ -5672,6 +5684,50 @@
msgid "specify the content of the diagnostic archive"
msgstr "chỉ định nội dung bản báo cáo"
+#, c-format
+msgid "unable to parse mode: %s"
+msgstr "không thể đọc chế độ: %s"
+
+#, c-format
+msgid "unable to parse object id: %s"
+msgstr "không thể đọc đối tượng: %s"
+
+msgid "git diff-pairs -z [<diff-options>]"
+msgstr "git diff-pairs -z [<các tùy chọn>]"
+
+#, c-format
+msgid "unrecognized argument: %s"
+msgstr "đối số không được thừa nhận: %s"
+
+msgid "working without -z is not supported"
+msgstr "không hỗ trợ bỏ tuỳ chọn -z"
+
+msgid "pathspec arguments not supported"
+msgstr "đặc tả đường dẫn chưa được hỗ trợ"
+
+msgid "revision arguments not allowed"
+msgstr "không cho phép dùng tên lần cải biên"
+
+msgid "invalid raw diff input"
+msgstr "dòng diff không hợp lệ"
+
+msgid "tree objects not supported"
+msgstr "không hỗ trợ đối tượng cây"
+
+msgid "got EOF while reading path"
+msgstr "gặp EOF khi đọc đường dẫn"
+
+msgid "got EOF while reading destination path"
+msgstr "gặp EOF khi đọc đường dẫn đích"
+
+#, c-format
+msgid "unable to parse rename/copy score: %s"
+msgstr "không thể đọc rename/copy score:%s"
+
+#, c-format
+msgid "unknown diff status: %c"
+msgstr "trạng thái diff không rõ: %c"
+
msgid "--merge-base only works with two commits"
msgstr "--merge-base chỉ hoạt động với hai lần chuyển giao"
@@ -5809,17 +5865,20 @@
msgstr "hiển thị tiến triển sau <n> đối tượng"
msgid "select handling of signed tags"
-msgstr "chọn điều khiển của thẻ đã ký"
+msgstr "chọn cách xử lý thẻ đã ký"
+
+msgid "select handling of signed commits"
+msgstr "chọn cách xử lý lần chuyển giao đã ký"
msgid "select handling of tags that tag filtered objects"
-msgstr "chọn sự xử lý của các thẻ, cái mà đánh thẻ các đối tượng được lọc ra"
+msgstr "chọn cách xử lý của các thẻ trên các đối tượng đã bị lọc ra"
msgid "select handling of commit messages in an alternate encoding"
msgstr ""
-"chọn bộ xử lý cho các ghi chú của lần chuyển giao theo một bộ mã thay thế"
+"chọn cách xử lý cho các ghi chú lần chuyển giao được mã hoá theo bộ mã khác"
msgid "dump marks to this file"
-msgstr "đổ các đánh dấu này vào tập-tin"
+msgstr "xuất các đánh dấu này vào tập-tin"
msgid "import marks from this file"
msgstr "nhập vào đánh dấu từ tập tin này"
@@ -5985,22 +6044,6 @@
msgid "rejected %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"
-#, c-format
-msgid ""
-"some local refs could not be updated; try running\n"
-" 'git remote prune %s' to remove any old, conflicting branches"
-msgstr ""
-"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"
-
-#, c-format
-msgid " (%s will become dangling)"
-msgstr " (%s sẽ trở thành không đầu (không được quản lý))"
-
-#, c-format
-msgid " (%s has become dangling)"
-msgstr " (%s đã trở thành không đầu (không được quản lý))"
-
msgid "[deleted]"
msgstr "[đã xóa]"
@@ -6040,6 +6083,18 @@
"thông báo này. Cụ thể, 'git config set remote.%s.followRemoteHEAD %s'\n"
"sẽ vô hiệu cảnh báo này tới khi máy chủ đổi HEAD về chỗ khác."
+#, c-format
+msgid ""
+"some local refs could not be updated; try running\n"
+" 'git remote prune %s' to remove any old, conflicting branches"
+msgstr ""
+"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"
+
+#, c-format
+msgid "fetching ref %s failed: %s"
+msgstr "gặp lỗi khi tải gói %s: %s"
+
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "phát hiện nhiều nhánh, không tương thích với --set-upstream"
@@ -6284,6 +6339,9 @@
"git for-each-ref [--contains [<lần-chuyển-giao>]] [--no-contains [<lần-"
"chuyển-giao>]]"
+msgid "git for-each-ref [--start-after <marker>]"
+msgstr "git for-each-ref [--start-after <dấu>]"
+
msgid "quote placeholders suitably for shells"
msgstr "trích dẫn dạng phù hợp cho shell"
@@ -6299,6 +6357,12 @@
msgid "show only <n> matched refs"
msgstr "hiển thị chỉ <n> tham chiếu khớp"
+msgid "marker"
+msgstr "dấu"
+
+msgid "start iteration after the provided marker"
+msgstr "bắt đầu duyệt sau dấu chỉ định"
+
msgid "respect format colors"
msgstr "các màu định dạng lưu tâm"
@@ -6323,9 +6387,15 @@
msgid "also include HEAD ref and pseudorefs"
msgstr "bao gồm tham chiếu HEAD và giả tham chiếu"
+msgid "cannot use --start-after with custom sort options"
+msgstr "không thể dùng tùy chọn --start-after với tuỳ chọn sắp xếp"
+
msgid "unknown arguments supplied with --stdin"
msgstr "đối số không rõ được chỉ định cùng với --stdin"
+msgid "cannot use --start-after with patterns"
+msgstr "không thể dùng tùy chọn --start-after với mẫu"
+
msgid "git for-each-repo --config=<config> [--] <arguments>"
msgstr "git for-each-repo --config=<tùy chọn> [--] <đối số>"
@@ -6454,10 +6524,6 @@
msgstr "%s: thiếu đối tượng hoặc hỏng: %s"
#, c-format
-msgid "%s: object is of unknown type '%s': %s"
-msgstr "%s: đối tượng có kiểu chưa biết '%s': %s"
-
-#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "%s: không thể đọc cú đối tượng: %s"
@@ -6514,11 +6580,14 @@
msgid "invalid rev-index for pack '%s'"
msgstr "giá trị rev-index cho gói '%s' không hợp lệ"
+msgid "Checking ref database"
+msgstr "Đang kiểm tra database tham chiếu"
+
msgid ""
"git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n"
" [--[no-]full] [--strict] [--verbose] [--lost-found]\n"
" [--[no-]dangling] [--[no-]progress] [--connectivity-only]\n"
-" [--[no-]name-objects] [<object>...]"
+" [--[no-]name-objects] [--[no-]references] [<object>...]"
msgstr ""
"git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n"
" [--[no-]full] [--strict] [--verbose] [--lost-found]\n"
@@ -6561,6 +6630,9 @@
msgid "show verbose names for reachable objects"
msgstr "hiển thị tên chi tiết cho các đối tượng đọc được"
+msgid "check reference database consistency"
+msgstr "Đang kiểm tra tính nhất quán database tham chiếu"
+
msgid "Checking objects"
msgstr "Đang kiểm tra các đối tượng"
@@ -6719,6 +6791,9 @@
msgid "pack prefix to store a pack containing pruned objects"
msgstr "tiền tố của gói để lưu gói gồm những đối tượng đã loại bỏ"
+msgid "skip maintenance tasks typically done in the foreground"
+msgstr "bỏ qua các tác vụ bảo trì trong nền"
+
#, c-format
msgid "failed to parse gc.logExpiry value %s"
msgstr "gặp lỗi khi đọc giá trị gc.logExpiry %s"
@@ -6792,14 +6867,14 @@
msgstr "bỏ qua tác vụ incremental-repack vì core.multiPackIndex bị vô hiệu hóa"
#, c-format
-msgid "lock file '%s' exists, skipping maintenance"
-msgstr "đã có khóa của tập tin '%s', bỏ qua bảo trì"
-
-#, c-format
msgid "task '%s' failed"
msgstr "gặp lỗi khi thực hiện nhiệm vụ '%s'"
#, c-format
+msgid "lock file '%s' exists, skipping maintenance"
+msgstr "đã có khóa của tập tin '%s', bỏ qua bảo trì"
+
+#, c-format
msgid "'%s' is not a valid task"
msgstr "'%s' không phải một nhiệm vụ hợp lệ"
@@ -6828,9 +6903,6 @@
msgid "run a specific task"
msgstr "chạy một nhiệm vụ cụ thể"
-msgid "use at most one of --auto and --schedule=<frequency>"
-msgstr "dùng nhiều nhất là một trong --auto và --schedule=<frequency>"
-
#, c-format
msgid "unable to add '%s' value of '%s'"
msgstr "không thể thêm giá trị '%s' của '%s'"
@@ -7667,7 +7739,7 @@
msgstr "tùy chọn --decorate không hợp lệ: %s"
msgid "suppress diff output"
-msgstr "chặn mọi đầu ra từ diff"
+msgstr "không in ra kết quả diff"
msgid "show source"
msgstr "hiển thị mã nguồn"
@@ -7691,18 +7763,10 @@
"theo vết sự tiến hóa của phạm vi dòng <start>,<end>, hoặc hàm :<tên hàm> "
"trong <tập tin>"
-#, c-format
-msgid "unrecognized argument: %s"
-msgstr "đối số không được thừa nhận: %s"
-
msgid "-L<range>:<file> cannot be used with pathspec"
msgstr "-L<vùng>:<tập tin> không thể được sử dụng với đặc tả đường dẫn"
#, c-format
-msgid "Final output: %d %s\n"
-msgstr "Đầu ra cuối cùng: %d %s\n"
-
-#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: sai tập tin"
@@ -8085,7 +8149,7 @@
msgstr "hiển thị dữ liệu gỡ lỗi"
msgid "suppress duplicate entries"
-msgstr "chặn các mục tin trùng lặp"
+msgstr "không in ra các mục tin trùng lặp"
msgid "show sparse directories in the presence of a sparse index"
msgstr "hiển thị thư mục thưa trong sự có mặt của chỉ mục thưa"
@@ -8278,7 +8342,7 @@
msgstr "chọn thuật toán diff"
msgid "for conflicts, use this marker size"
-msgstr "nếu xung đột, hãy sử dụng kích thước bộ tạo này"
+msgstr "nếu xung đột, hãy sử dụng kích thước dấu này"
msgid "do not warn about conflicts"
msgstr "không cảnh báo về các xung đột xảy ra"
@@ -8345,6 +8409,9 @@
msgid "also show informational/conflict messages"
msgstr "hiển thị thông báo chú thích/xung đột"
+msgid "suppress all output; only exit status wanted"
+msgstr "không in ra kết quả; chỉ trả về kết quả thực thi"
+
msgid "list filenames without modes/oids/stages"
msgstr "liệt kê tên tập tin không kèm chế độ/oid/stage"
@@ -8405,6 +8472,9 @@
msgid "(synonym to --stat)"
msgstr "(đồng nghĩa với --stat)"
+msgid "show a compact-summary at the end of the merge"
+msgstr "hiển thị compact-summary (tổng hợp tóm lược) phía dưới hòa trộn"
+
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"
@@ -8424,7 +8494,7 @@
msgstr "huỷ lệnh nếu không thể chuyển-tiếp-nhanh"
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"
+msgstr "xác minh xem lần chuyển giao có tên đó có chữ ký GPG hợp lệ hay không"
msgid "strategy"
msgstr "chiến lược"
@@ -8677,10 +8747,6 @@
msgstr "lỗi: đầu vào thẻ không qua kiểm tra fsck: %s"
#, c-format
-msgid "%d (FSCK_IGNORE?) should never trigger this callback"
-msgstr "%d (FSCK_IGNORE?) không bao giờ nên kích hoạt callback này"
-
-#, c-format
msgid "could not read tagged object '%s'"
msgstr "không thể đọc đối tượng được đánh thẻ %s"
@@ -8754,12 +8820,15 @@
"trong suốt quá trình đóng gói lại, gom các tập tin gói có kích cỡ nhỏ hơn "
"vào một bó cái mà lớn hơn kích thước này"
-msgid "git mv [<options>] <source>... <destination>"
-msgstr "git mv [<các tùy chọn>] <nguồn>... <đích>"
+msgid "git mv [-v] [-f] [-n] [-k] <source> <destination>"
+msgstr "git mv [-v] [-f] [-n] [-k] <nguồn> <đích>"
+
+msgid "git mv [-v] [-f] [-n] [-k] <source>... <destination-directory>"
+msgstr "git mv [-v] [-f] [-n] [-k] <nguồn>... <thư-mục-đích>"
#, c-format
msgid "Directory %s is in index and no submodule?"
-msgstr "Thư mục '%s' có ở trong chỉ mục mà không có mô-đun con?"
+msgstr "Thư mục %s có ở trong chỉ mục mà không có mô-đun con?"
msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
@@ -8825,6 +8894,10 @@
msgstr "%s, nguồn=%s, đích=%s"
#, c-format
+msgid "cannot move both '%s' and its parent directory '%s'"
+msgstr "Không thể di chuyển cả %s và thư mục cha %s"
+
+#, c-format
msgid "Renaming %s to %s\n"
msgstr "Đổi tên %s thành %s\n"
@@ -9189,16 +9262,26 @@
msgid "unknown subcommand: `%s'"
msgstr "không hiểu câu lệnh con: `%s'"
-msgid "git pack-objects --stdout [<options>] [< <ref-list> | < <object-list>]"
-msgstr ""
-"git pack-objects --stdout [<các tùy chọn>] [< <danh-sách-tham-chiếu> | < "
-"<danh-sách-đối-tượng>]"
-
msgid ""
-"git pack-objects [<options>] <base-name> [< <ref-list> | < <object-list>]"
+"git pack-objects [-q | --progress | --all-progress] [--all-progress-"
+"implied]\n"
+" [--no-reuse-delta] [--delta-base-offset] [--non-empty]\n"
+" [--local] [--incremental] [--window=<n>] [--depth=<n>]\n"
+" [--revs [--unpacked | --all]] [--keep-pack=<pack-name>]\n"
+" [--cruft] [--cruft-expiration=<time>]\n"
+" [--stdout [--filter=<filter-spec>] | <base-name>]\n"
+" [--shallow] [--keep-true-parents] [--[no-]sparse]\n"
+" [--name-hash-version=<n>] [--path-walk] < <object-list>"
msgstr ""
-"git pack-objects [<các tùy chọn>] <base-name> [< <danh-sách-ref> | < <danh-"
-"sách-đối-tượng>]"
+"git pack-objects [-q | --progress | --all-progress] [--all-progress-"
+"implied]\n"
+" [--no-reuse-delta] [--delta-base-offset] [--non-empty]\n"
+" [--local] [--incremental] [--window=<n>] [--depth=<n>]\n"
+" [--revs [--unpacked | --all]] [--keep-pack=<pack-name>]\n"
+" [--cruft] [--cruft-expiration=<time>]\n"
+" [--stdout [--filter=<filter-spec>] | <base-name>]\n"
+" [--shallow] [--keep-true-parents] [--[no-]sparse]\n"
+" [--name-hash-version=<n>] [--path-walk] < <object-list>"
#, c-format
msgid "invalid --name-hash-version option: %d"
@@ -9303,6 +9386,14 @@
msgid "unable to get type of object %s"
msgstr "không thể lấy kiểu của đối tượng '%s'"
+msgid "Compressing objects by path"
+msgstr "Đang nén các đối tượng theo đường dẫn"
+
+#, c-format
+msgid "Path-based delta compression using up to %d thread"
+msgid_plural "Path-based delta compression using up to %d threads"
+msgstr[0] "Nén delta đường dẫn dùng tới %d tuyến trình"
+
msgid "Compressing objects"
msgstr "Đang nén các đối tượng"
@@ -9378,6 +9469,9 @@
msgid "unable to force loose object"
msgstr "không thể buộc mất đối tượng"
+msgid "failed to pack objects via path-walk"
+msgstr "gặp lỗi khi nén đối tượng theo thuật toán duyệt cây"
+
#, c-format
msgid "not a rev '%s'"
msgstr "không phải một rev '%s'"
@@ -9488,6 +9582,9 @@
msgid "create thin packs"
msgstr "tạo gói nhẹ"
+msgid "use the path-walk API to walk objects when possible"
+msgstr "dùng API path-walk để duyệt đối tượng nếu có thể"
+
msgid "create packs suitable for shallow fetches"
msgstr "tạo gói để phù hợp cho lấy về nông (shallow)"
@@ -9542,6 +9639,10 @@
msgstr "pack.deltaCacheLimit là quá cao, ép dùng %d"
#, c-format
+msgid "cannot use %s with %s"
+msgstr "Không thể dùng %s với %s"
+
+#, c-format
msgid "bad pack compression level %d"
msgstr "mức nén gói %d không hợp lệ"
@@ -9555,18 +9656,12 @@
msgid "--thin cannot be used to build an indexable pack"
msgstr "không thể dùng --thin để xây dựng gói đánh chỉ mục được"
-msgid "cannot use --filter with --stdin-packs"
-msgstr "không thể dùng tùy chọn --filter với --stdin-packs"
-
msgid "cannot use internal rev list with --stdin-packs"
msgstr "không thể dùng danh sách rev nội bộ với --stdin-packs"
msgid "cannot use internal rev list with --cruft"
msgstr "không thể dùng danh sách rev nội bộ với --cruft"
-msgid "cannot use --stdin-packs with --cruft"
-msgstr "không thể dùng tùy chọn --stdin-packs với --cruft"
-
msgid "Enumerating objects"
msgstr "Duyệt các đối tượng"
@@ -9579,22 +9674,6 @@
"lại pack %<PRIu32> (trong số %<PRIuMAX>)"
msgid ""
-"'git pack-redundant' is nominated for removal.\n"
-"If you still use this command, please add an extra\n"
-"option, '--i-still-use-this', on the command line\n"
-"and let us know you still use it by sending an e-mail\n"
-"to <git@vger.kernel.org>. Thanks.\n"
-msgstr ""
-"'git pack-redundant' đã được đề cử để loại bỏ.\n"
-"Nếu bạn vẫn còn sử dụng lệnh này, vui lòng bổ sung\n"
-"thêm một tùy chọn, '--i-still-use-this', trên dòng lệnh\n"
-"và cho chúng tôi biết bạn vẫn sử dụng nó bằng cách gửi e-mail\n"
-"đến <git@vger.kernel.org>. Xin cảm ơn.\n"
-
-msgid "refusing to run without --i-still-use-this"
-msgstr "từ chối chạy lệnh này mà không có --i-still-use-this"
-
-msgid ""
"git pack-refs [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude "
"<pattern>]"
msgstr ""
@@ -9751,6 +9830,10 @@
msgid "unable to access commit %s"
msgstr "không thể truy cập lần chuyển giao '%s'"
+#, c-format
+msgid "invalid refspec '%s'"
+msgstr "refspec không hợp lệ '%s'"
+
msgid "ignoring --verify-signatures for rebase"
msgstr "bỏ qua --verify-signatures khi cải tổ"
@@ -10218,7 +10301,7 @@
msgstr "gỡ lỗi 'unpack-trees'"
msgid "suppress feedback messages"
-msgstr "không xuất các thông tin phản hồi"
+msgstr "không in ra các thông tin phản hồi"
msgid "You need to resolve your current index first"
msgstr "Bạn cần phải giải quyết chỉ mục hiện tại của bạn trước đã"
@@ -10716,6 +10799,9 @@
msgid "git reflog exists <ref>"
msgstr "git reflog exists <tham_chiếu>"
+msgid "git reflog drop [--all [--single-worktree] | <refs>...]"
+msgstr "git reflog drop [--all [--single-worktree] | <tham_chiếu>...]"
+
#, c-format
msgid "invalid timestamp '%s' given to '--%s'"
msgstr "dấu vết thời gian không hợp lệ '%s' đưa cho '--%s'"
@@ -10764,8 +10850,8 @@
msgstr "Đánh dấu các đối tượng tiếp cận được..."
#, c-format
-msgid "%s points nowhere!"
-msgstr "%s chẳng chỉ đến đâu cả!"
+msgid "reflog could not be found: '%s'"
+msgstr "không tìm thấy reflog: '%s'"
msgid "no reflog specified to delete"
msgstr "chưa chỉ ra reflog để xóa"
@@ -10774,6 +10860,15 @@
msgid "invalid ref format: %s"
msgstr "định dạng tham chiếu không hợp lệ: %s"
+msgid "drop the reflogs of all references"
+msgstr "bỏ các reflogs của mọi tham chiếu"
+
+msgid "drop reflogs from the current worktree only"
+msgstr "bỏ reflogs chỉ từ thư mục làm việc hiện tại"
+
+msgid "references specified along with --all"
+msgstr "chỉ định tham chiếu với tùy chọn --all"
+
msgid "git refs migrate --ref-format=<format> [--no-reflog] [--dry-run]"
msgstr "git refs migrate --ref-format=<định dạng> [--no-reflog] [--dry-run]"
@@ -10881,6 +10976,14 @@
msgid "unknown --mirror argument: %s"
msgstr "không hiểu tham số --mirror: %s"
+#, c-format
+msgid "remote name '%s' is a subset of existing remote '%s'"
+msgstr "máy chủ '%s' là tập con của máy chủ đã sẵn có '%s'"
+
+#, c-format
+msgid "remote name '%s' is a superset of existing remote '%s'"
+msgstr "máy chủ '%s' là tập cha của máy chủ đã sẵn có '%s'"
+
msgid "fetch the remote branches"
msgstr "lấy về các nhánh từ máy chủ"
@@ -11175,14 +11278,6 @@
msgstr "Không thể cài đặt %s"
#, c-format
-msgid " %s will become dangling!"
-msgstr " %s sẽ trở thành không đầu (không được quản lý)!"
-
-#, c-format
-msgid " %s has become dangling!"
-msgstr " %s đã trở thành không đầu (không được quản lý)!"
-
-#, c-format
msgid "Pruning %s"
msgstr "Đang xén bớt %s"
@@ -11246,11 +11341,11 @@
msgid ""
"git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"
"[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n"
-"[--write-midx] [--name-hash-version=<n>]"
+"[--write-midx] [--name-hash-version=<n>] [--path-walk]"
msgstr ""
"git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"
"[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<tên-pack>]\n"
-"[--write-midx] [--name-hash-version=<n>]"
+"[--write-midx] [--name-hash-version=<n>] [--path-walk]"
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
@@ -11317,6 +11412,9 @@
msgid "with --cruft, expire objects older than this"
msgstr "với --cruft, đánh dấu hết hạn các đối tượng cũ hơn khoảng này"
+msgid "with --cruft, only repack cruft packs smaller than this"
+msgstr "với --cruft, chỉ nén các gói nhỏ hơn khoảng này"
+
msgid "remove redundant packs, and run git-prune-packed"
msgstr "xóa bỏ các gói dư thừa, và chạy git-prune-packed"
@@ -11328,7 +11426,10 @@
msgid ""
"specify the name hash version to use for grouping similar objects by path"
-msgstr "phiên bản hàm băm để nhóm đối tượng giống nhau theo đường dẫn"
+msgstr "chọn phiên bản hàm băm để nhóm đối tượng giống nhau theo đường dẫn"
+
+msgid "pass --path-walk to git-pack-objects"
+msgstr "chuyển --path-walk cho git-pack-objects"
msgid "do not run git-update-server-info"
msgstr "không chạy git-update-server-info"
@@ -11786,6 +11887,9 @@
msgid "invalid value for '%s': '%s', the only allowed format is '%s'"
msgstr "giá trị không hợp lệ cho '%s': '%s', chỉ cho phép định dạng là '%s'"
+msgid "-z option used with unsupported option"
+msgstr "tuỳ chọn -z dùng với tuỳ chọn không hỗ trợ"
+
msgid "rev-list does not support display of notes"
msgstr "rev-list không hỗ trợ hiển thị các ghi chú"
@@ -12080,7 +12184,7 @@
msgstr "sắp xếp kết quả theo số lượng chuyển giao trên mỗi tác giả"
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"
+msgstr "không in ra mô tả, chỉ đưa ra số lượng lần chuyển giao"
msgid "show the email address of each author"
msgstr "hiển thị thư điện tử cho từng tác giả"
@@ -12141,7 +12245,7 @@
msgstr "đồng nghĩa với more=-1"
msgid "suppress naming strings"
-msgstr "chặn các chuỗi đặt tên"
+msgstr "không in ra các chuỗi đặt tên"
msgid "include the current branch"
msgstr "bao gồm nhánh hiện hành"
@@ -12463,17 +12567,23 @@
msgid "git stash create [<message>]"
msgstr "git stash create [<ghi chú>]"
+msgid "git stash export (--print | --to-ref <ref>) [<stash>...]"
+msgstr "git stash export (--print | --to-ref <ref>) [<stash>...]"
+
+msgid "git stash import <commit>"
+msgstr "git stash import <lần-chuyển-giao>"
+
#, c-format
msgid "'%s' is not a stash-like commit"
msgstr "'%s' không phải là lần chuyển giao kiểu-stash"
+msgid "No stash entries found."
+msgstr "Không tìm thấy các mục tạm cất (stash) nào."
+
#, c-format
msgid "Too many revisions specified:%s"
msgstr "Chỉ ra quá nhiều lần cải biên: %s"
-msgid "No stash entries found."
-msgstr "Không tìm thấy các mục tạm cất (stash) nào."
-
#, c-format
msgid "%s is not a valid reference"
msgstr "'%s' không phải một tham chiếu hợp lệ"
@@ -12625,6 +12735,69 @@
msgid "include ignore files"
msgstr "bao gồm các tập tin bị bỏ qua"
+#, c-format
+msgid "cannot parse commit %s"
+msgstr "không thể đọc lần chuyển giao %s"
+
+#, c-format
+msgid "invalid author or committer for %s"
+msgstr "danh tính tác giả/người chuyển giao không hợp lệ cho %s"
+
+msgid "could not write commit"
+msgstr "không thể ghi lần chuyển giao"
+
+#, c-format
+msgid "not a valid revision: %s"
+msgstr "không phải revision hợp lệ: %s"
+
+#, c-format
+msgid "not a commit: %s"
+msgstr "không phải là lần chuyển giao: %s"
+
+#, c-format
+msgid "%s is not a valid exported stash commit"
+msgstr "%s không phải một lần chuyển giao tạm cất hợp lệ"
+
+#, c-format
+msgid "found root commit %s with invalid data"
+msgstr "lần chuyển giao gốc %s có dữ liệu không hợp lệ"
+
+#, c-format
+msgid "found stash commit %s without expected prefix"
+msgstr "lần chuyển giao tạm cất %s không có tiền tố"
+
+#, c-format
+msgid "cannot parse parents of commit: %s"
+msgstr "không thể đọc lần chuyển giao cha: %s"
+
+#, c-format
+msgid "%s does not look like a stash commit"
+msgstr "'%s' không phải lần chuyển giao tạm cất"
+
+#, c-format
+msgid "cannot read commit buffer for %s"
+msgstr "không thể đọc buffer chuyển giao cho %s"
+
+#, c-format
+msgid "cannot save the stash for %s"
+msgstr "không thể cất tạm cho %s"
+
+msgid "unable to write base commit"
+msgstr "không thể ghi gốc chuyển giao"
+
+#, c-format
+msgid "unable to find stash entry %s"
+msgstr "không tìm thấy stash entry %s"
+
+msgid "print the object ID instead of writing it to a ref"
+msgstr "in ID đối tượng thay vì ghi ra tham chiếu"
+
+msgid "save the data to the given ref"
+msgstr "lưu dữ liệu về tham chiếu chỉ định"
+
+msgid "exactly one of --print and --to-ref is required"
+msgstr "yêu cầu một trong hai tuỳ chọn --print và --to-ref"
+
msgid "skip and remove all lines starting with comment character"
msgstr "giữ và xóa bỏ mọi dòng bắt đầu bằng ký tự ghi chú"
@@ -12632,14 +12805,6 @@
msgstr "treo trước ký tự ghi chú và ký tự khoảng trắng cho từng dòng"
#, 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 có %s"
-
-#, c-format
-msgid "could not get a repository handle for submodule '%s'"
-msgstr "không thể lấy thẻ quản kho cho mô-đun-con '%s'"
-
-#, c-format
msgid ""
"could not look up configuration '%s'. Assuming this repository is its own "
"authoritative upstream."
@@ -12648,6 +12813,10 @@
"sở hữu chính nó."
#, c-format
+msgid "could not get a repository handle for submodule '%s'"
+msgstr "không thể lấy thẻ quản kho cho mô-đun-con '%s'"
+
+#, 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"
@@ -12799,7 +12968,7 @@
"with a .git file by using absorbgitdirs."
msgstr ""
"Cây làm việc mô-đun-con '%s' có chứa thư mục .git. Việc này sẽ được thay thế "
-"với một tập tin .git bằng các sử dụng absorbgitdirs."
+"với một tập tin .git bằng cách sử dụng absorbgitdirs."
#, c-format
msgid ""
@@ -12829,7 +12998,7 @@
msgstr "gỡ bỏ cây làm việc của mô-đun-con ngay cả khi nó có thay đổi nội bộ"
msgid "unregister all submodules"
-msgstr "bỏ đăng ký tất cả các trong mô-đun-con"
+msgstr "bỏ đăng ký tất cả các mô-đun-con"
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
@@ -12887,7 +13056,7 @@
msgstr "không thể lấy thư mục mô-đun-con cho '%s'"
msgid "alternative anchor for relative paths"
-msgstr "điểm neo thay thế cho các đường dẫn tương đối"
+msgstr "điểm gốc thay thế cho các đường dẫn tương đối"
msgid "where the new submodule will be cloned to"
msgstr "nhân bản mô-đun-con mới vào chỗ nào"
@@ -13007,6 +13176,10 @@
"project cha lại không trên bất kỳ nhánh nào"
#, 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 có %s"
+
+#, c-format
msgid "Unable to find current revision in submodule path '%s'"
msgstr "Không tìm thấy lần cải biên hiện hành trong đường dẫn mô-đun-con '%s'"
@@ -13130,7 +13303,7 @@
#, c-format
msgid "A git directory for '%s' is found locally with remote(s):\n"
-msgstr "Thư mục git cho '%s' được tìm thấy một cách cục bộ với các máy chủ:\n"
+msgstr "Thư mục git cho '%s' được tìm thấy tại cục bộ với các máy chủ:\n"
#, c-format
msgid ""
@@ -13208,6 +13381,10 @@
msgstr "repo URL: '%s' phải là đường dẫn tuyệt đối hoặc là bắt đầu bằng ./|../"
#, c-format
+msgid "submodule name '%s' already used for path '%s'"
+msgstr "Mô-đun-con '%s' đã dùng cho đường dẫn '%s'"
+
+#, c-format
msgid "'%s' is not a valid submodule name"
msgstr "'%s' không phải là một tên mô-đun-con hợp lệ"
@@ -13338,7 +13515,7 @@
msgstr "xóa thẻ"
msgid "verify tags"
-msgstr "thẩm tra thẻ"
+msgstr "xác minh thẻ"
msgid "Tag creation options"
msgstr "Tùy chọn tạo thẻ"
@@ -13356,7 +13533,7 @@
msgstr "thẻ chú giải và ký kiểu GPG"
msgid "use another key to sign the tag"
-msgstr "dùng kháo khác để ký thẻ"
+msgstr "dùng khoá khác để ký thẻ"
msgid "replace the tag if exists"
msgstr "thay thế nếu thẻ đó đã có trước"
@@ -13368,7 +13545,7 @@
msgstr "Các tùy chọn liệt kê thẻ"
msgid "show tag list in columns"
-msgstr "hiển thị danh sách thẻ trong các cột"
+msgstr "hiển thị danh sách thẻ theo cột"
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"
@@ -13503,7 +13680,7 @@
msgstr "xóa bít assumed-unchanged (giả định là không thay đổi)"
msgid "mark files as \"index-only\""
-msgstr "đánh dấu các tập tin là 'chỉ-đọc'"
+msgstr "đánh dấu các tập tin là \"chỉ-đọc\""
msgid "clear skip-worktree bit"
msgstr "xóa bít skip-worktree"
@@ -13529,19 +13706,19 @@
msgstr "không thể đọc các mục từ stdin vào chỉ mục"
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ê"
+msgstr "phục hồi giai đoạn #2 và #3 cho các đường dẫn được liệt kê"
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"
msgid "ignore files missing from worktree"
-msgstr "bỏ qua các tập-tin thiếu trong thư-mục làm việc"
+msgstr "bỏ qua các tập tin thiếu trong thư mục làm việc"
msgid "report actions to standard output"
msgstr "ghi các thao tác ra stdout"
msgid "(for porcelains) forget saved unresolved conflicts"
-msgstr "(cho 'porcelains') quên các xung đột chưa được giải quyết đã ghi"
+msgstr "(cho lệnh porcelain) quên các xung đột chưa được giải quyết đã ghi"
msgid "write index in this format"
msgstr "ghi chỉ mục ở định dạng này"
@@ -13603,7 +13780,7 @@
"sự muốn tắt bộ đệm chưa theo dõi"
msgid "Untracked cache disabled"
-msgstr "Nhớ đệm không theo vết bị tắt"
+msgstr "Bộ đệm không theo vết bị tắt"
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
@@ -13639,8 +13816,8 @@
msgid "git update-ref [<options>] <refname> <new-oid> [<old-oid>]"
msgstr "git update-ref [<các tùy chọn>] <refname> <oid-mới> [<oid-cũ>]"
-msgid "git update-ref [<options>] --stdin [-z]"
-msgstr "git update-ref [<các tùy chọn>] --stdin [-z]"
+msgid "git update-ref [<options>] --stdin [-z] [--batch-updates]"
+msgstr "git update-ref [<các tùy chọn>] --stdin [-z] [--batch-updates]"
msgid "delete the reference"
msgstr "xóa tham chiếu"
@@ -13654,8 +13831,11 @@
msgid "read updates from stdin"
msgstr "đọc cập nhật từ stdin"
+msgid "batch reference updates"
+msgstr "cập nhật tham chiếu theo lô"
+
msgid "update the info files from scratch"
-msgstr "cập nhật các tập tin thông tin từ điểm xuất phát"
+msgstr "cập nhật các tập tin thông tin lại từ đầu"
msgid ""
"git-upload-pack [--[no-]strict] [--timeout=<n>] [--stateless-rpc]\n"
@@ -13831,10 +14011,6 @@
msgstr "Đang chuẩn bị cây làm việc (đang checkout '%s')"
#, c-format
-msgid "unreachable: invalid reference: %s"
-msgstr "không tham chiếu được: tham chiếu không hợp lệ: %s"
-
-#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Đang chuẩn bị cây làm việc (HEAD đã tách rời '%s')"
@@ -13903,9 +14079,7 @@
msgstr "hiển thị chú thích và lý do mở rộng, nếu có"
msgid "add 'prunable' annotation to worktrees older than <time>"
-msgstr ""
-"thêm chú thích kiểu 'prunable' cho các cây làm việc hết hạn cũ hơn khoảng "
-"<thời gian>"
+msgstr "thêm chú thích 'prunable' cho các cây làm việc cũ hơn <thời gian>"
msgid "terminate records with a NUL character"
msgstr "kết thúc các bản ghi bằng ký tự NULL"
@@ -13960,7 +14134,7 @@
#, c-format
msgid "validation failed, cannot move working tree: %s"
-msgstr "thẩm tra gặp lỗi, không thể di chuyển một cây-làm-việc: %s"
+msgstr "xác minh gặp lỗi, không thể di chuyển một cây-làm-việc: %s"
#, c-format
msgid "failed to move '%s' to '%s'"
@@ -14000,7 +14174,7 @@
#, c-format
msgid "validation failed, cannot remove working tree: %s"
-msgstr "thẩm tra gặp lỗi, không thể gỡ bỏ một cây-làm-việc: %s"
+msgstr "xác minh gặp lỗi, không thể gỡ bỏ một cây-làm-việc: %s"
#, c-format
msgid "repair: %s: %s"
@@ -14282,7 +14456,7 @@
msgstr "Ghi các thay đổi vào kho chứa"
msgid "Write and verify Git commit-graph files"
-msgstr "Ghi và thẩm tra các tập tin đồ họa các lần chuyển giao Git"
+msgstr "Ghi và xác minh các tập tin đồ họa các lần chuyển giao Git"
msgid "Create a new commit object"
msgstr "Tạo một đối tượng chuyển giao"
@@ -14334,6 +14508,9 @@
msgid "Compare a tree to the working tree or index"
msgstr "So sánh các cây trong cây làm việc hoặc chỉ mục"
+msgid "Compare the content and mode of provided blob pairs"
+msgstr "So sánh nội dung và chế độ của hai blob"
+
msgid "Compares the content and mode of blobs found via two tree objects"
msgstr ""
"So sánh nội dung và chế độ của các blob tìm thấy thông qua hai đối tượng cây"
@@ -14370,7 +14547,7 @@
msgid "Verifies the connectivity and validity of the objects in the database"
msgstr ""
-"Thẩm tra lại tính kết nối và tính hiệu lực cảu các đối tượng trong cơ sở dữ "
+"xác minh lại tính kết nối và tính hiệu lực cảu các đối tượng trong cơ sở dữ "
"liệu"
msgid "Cleanup unnecessary files and optimize the local repository"
@@ -14469,7 +14646,7 @@
msgstr "Xây dựng một tree-object từ văn bản định dạng ls-tree"
msgid "Write and verify multi-pack-indexes"
-msgstr "Ghi và thẩm tra các multi-pack-indexes"
+msgstr "Ghi và xác minh các multi-pack-indexes"
msgid "Move or rename a file, a directory, or a symlink"
msgstr "Di chuyển hay đổi tên một tập tin, thư mục hoặc liên kết mềm"
@@ -14627,7 +14804,7 @@
msgstr "Đọc, sửa và xóa tham chiếu mềm"
msgid "Create, list, delete or verify a tag object signed with GPG"
-msgstr "Tạo, liệt kê, xóa hay xác thực một đối tượng thẻ được ký bằng GPG"
+msgstr "Tạo, liệt kê, xóa hay xác minh một đối tượng thẻ được ký bằng GPG"
msgid "Creates a temporary file with a blob's contents"
msgstr "Tạo một tập tin tạm với nội dung của blob"
@@ -15041,7 +15218,7 @@
"'%s' và '%s')"
msgid "Verifying commits in commit graph"
-msgstr "Đang thẩm tra các lần chuyển giao trong đồ thị lần chuyển giao"
+msgstr "Đang xác minh các lần chuyển giao trong đồ thị lần chuyển giao"
#, c-format
msgid "could not parse commit %s"
@@ -15447,14 +15624,6 @@
msgstr "sai giá trị bằng số của cấu hình '%s' cho '%s' trong %s: %s"
#, c-format
-msgid "invalid value for variable %s"
-msgstr "giá trị không hợp lệ cho biến %s"
-
-#, c-format
-msgid "ignoring unknown core.fsync component '%s'"
-msgstr "bỏ qua thành phần core.fsync chưa biết '%s'"
-
-#, c-format
msgid "bad boolean config value '%s' for '%s'"
msgstr "sai giá trị kiểu boolean của cấu hình '%s' cho '%s'"
@@ -15467,44 +15636,6 @@
msgstr "'%s' dành cho '%s' không phải là dấu vết thời gian hợp lệ"
#, c-format
-msgid "abbrev length out of range: %d"
-msgstr "chiều dài abbrev nằm ngoài phạm vi: %d"
-
-#, c-format
-msgid "bad zlib compression level %d"
-msgstr "mức nén zlib %d là sai"
-
-#, c-format
-msgid "%s cannot contain newline"
-msgstr "%s không thể chứa ký tự xuống dòng"
-
-#, c-format
-msgid "%s must have at least one character"
-msgstr "%s phải có ít nhất một ký tự"
-
-#, c-format
-msgid "ignoring unknown core.fsyncMethod value '%s'"
-msgstr "bỏ qua giá trị core.fsyncMethod chưa biết '%s'"
-
-msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
-msgstr "core.fsyncObjectFiles đã lạc hậu; hãy dùng core.fsync để thay thế"
-
-#, 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"
-
-#, c-format
-msgid "malformed value for %s"
-msgstr "giá trị cho %s sai dạng"
-
-#, c-format
-msgid "malformed value for %s: %s"
-msgstr "giá trị cho %s sai dạng: %s"
-
-msgid "must be one of nothing, matching, simple, upstream or current"
-msgstr "phải là một trong số nothing, matching, simple, upstream hay current"
-
-#, c-format
msgid "unable to load config blob object '%s'"
msgstr "không thể tải đối tượng blob cấu hình '%s'"
@@ -16004,8 +16135,10 @@
msgid "cannot compare a named pipe to a directory"
msgstr "không thể so sánh pipe có tên và thư mục"
-msgid "git diff --no-index [<options>] <path> <path>"
-msgstr "git diff --no-index [<các tùy chọn>] </đường/dẫn> </đường/dẫn>"
+msgid "git diff --no-index [<options>] <path> <path> [<pathspec>...]"
+msgstr ""
+"git diff --no-index [<các tùy chọn>] </đường/dẫn> </đường/dẫn> [<đặc tả "
+"đường dẫn>...]"
msgid ""
"Not a git repository. Use --no-index to compare two paths outside a working "
@@ -16014,6 +16147,11 @@
"Không phải là một thư mục git. Dùng --no-index để so sánh hai đường dẫn bên "
"ngoài cây làm việc"
+msgid ""
+"Limiting comparison with pathspecs is only supported if both paths are "
+"directories."
+msgstr "Giới hạn so sánh theo đường dẫn chỉ hỗ trợ với hai thư mục."
+
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " Gặp lỗi khi đọc phần trăm cắt bỏ dirstat '%s'\n"
@@ -16193,20 +16331,19 @@
msgstr "đồng nghĩa với --dirstat=files,<tham_số_1>,<tham_số_2>..."
msgid "warn if changes introduce conflict markers or whitespace errors"
-msgstr ""
-"cảnh báo nếu các thay đổi đưa ra các bộ tạo xung đột hay lỗi khoảng trắng"
+msgstr "cảnh báo nếu các thay đổi chứa dấu xung đột hay lỗi khoảng trắng"
msgid "condensed summary such as creations, renames and mode changes"
-msgstr "tổng hợp dạng xúc tích như là tạo, đổi tên và các thay đổi chế độ"
+msgstr "tổng hợp ngắn gọn gồm việc tạo, đổi tên và thay đổi chế độ"
msgid "show only names of changed files"
-msgstr "chỉ hiển thị tên của các tập tin đổi"
+msgstr "chỉ hiển thị tên của các tập tin thay đổi"
msgid "show only names and status of changed files"
-msgstr "chỉ hiển thị tên tập tin và tình trạng của các tập tin bị thay đổi"
+msgstr "chỉ hiển thị tên tập tin và trạng thái của các tập tin thay đổi"
msgid "<width>[,<name-width>[,<count>]]"
-msgstr "<rộng>[,<name-width>[,<số-lượng>]]"
+msgstr "<độ-rộng>[,<độ-rộng-tên>[,<số-lượng>]]"
msgid "generate diffstat"
msgstr "tạo diffstat"
@@ -16589,6 +16726,52 @@
msgstr "đường dẫn không gian tên git \"%s\" sai"
#, c-format
+msgid "invalid value for variable %s"
+msgstr "giá trị không hợp lệ cho biến %s"
+
+#, c-format
+msgid "ignoring unknown core.fsync component '%s'"
+msgstr "bỏ qua thành phần core.fsync chưa biết '%s'"
+
+#, c-format
+msgid "abbrev length out of range: %d"
+msgstr "chiều dài abbrev nằm ngoài phạm vi: %d"
+
+#, c-format
+msgid "bad zlib compression level %d"
+msgstr "mức nén zlib %d là sai"
+
+#, c-format
+msgid "%s cannot contain newline"
+msgstr "%s không thể chứa ký tự xuống dòng"
+
+#, c-format
+msgid "%s must have at least one character"
+msgstr "%s phải có ít nhất một ký tự"
+
+#, c-format
+msgid "ignoring unknown core.fsyncMethod value '%s'"
+msgstr "bỏ qua giá trị core.fsyncMethod chưa biết '%s'"
+
+msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
+msgstr "core.fsyncObjectFiles đã lạc hậu; hãy dùng core.fsync để thay thế"
+
+#, 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"
+
+#, c-format
+msgid "malformed value for %s"
+msgstr "giá trị cho %s sai dạng"
+
+#, c-format
+msgid "malformed value for %s: %s"
+msgstr "giá trị cho %s sai dạng: %s"
+
+msgid "must be one of nothing, matching, simple, upstream or current"
+msgstr "phải là một trong số nothing, matching, simple, upstream hay current"
+
+#, c-format
msgid "too many args to run %s"
msgstr "quá nhiều tham số để chạy %s"
@@ -17207,6 +17390,10 @@
msgstr "không hiểu giá trị cho http.proactiveauth"
#, c-format
+msgid "failed to parse %s"
+msgstr "gặp lỗi khi đọc cú pháp %s"
+
+#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr ""
"Không hỗ trợ ứng dụng SSL chạy phía sau '%s'. Hỗ trợ ứng dụng SSL chạy phía "
@@ -17291,6 +17478,30 @@
msgid "name consists only of disallowed characters: %s"
msgstr "tên chỉ được phép bao gồm các ký tự sau: %s"
+msgid "git imap-send [-v] [-q] [--[no-]curl] [(--folder|-f) <folder>] < <mbox>"
+msgstr ""
+"git imap-send [-v] [-q] [--[no-]curl] [(--folder|-f) <folder>] < <mbox>"
+
+msgid "no IMAP host specified"
+msgstr "chưa chỉ ra máy chủ IMAP nào"
+
+msgid ""
+"set the IMAP host with 'git config imap.host <host>'.\n"
+"(e.g., 'git config imap.host imaps://imap.example.com')"
+msgstr ""
+"chỉ định máy chủ IMAP với 'git config imap.host <host>'.\n"
+"(v.d., 'git config imap.host imaps://imap.example.com')"
+
+msgid "no IMAP folder specified"
+msgstr "chưa chỉ ra thư mục IMAP nào"
+
+msgid ""
+"set the target folder with 'git config imap.folder <folder>'.\n"
+"(e.g., 'git config imap.folder Drafts')"
+msgstr ""
+"chỉ định thư mục với 'git config imap.folder <folder>'.\n"
+"(v.d., 'git config imap.folder Drafts')"
+
msgid "expected 'tree:<depth>'"
msgstr "cần 'tree:<depth>'"
@@ -17396,6 +17607,10 @@
msgstr "marker-size không hợp lệ '%s', cần số nguyên"
#, c-format
+msgid "Could not parse object '%s'"
+msgstr "Không thể đọc đối tượng '%s'"
+
+#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "Gặp lỗi khi hòa trộn mô-đun-con %s (không checkout)"
@@ -17519,7 +17734,8 @@
#, c-format
msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
msgstr ""
-"XUNG ĐỘT (đổi-tên/đổi-tên): Đổi tên %s->%s trong %s và thành %s trong %s."
+"XUNG ĐỘT (đổi tên/đổi tên): Đổi tên %s thành %s trong %s và thành %s trong "
+"%s."
#, c-format
msgid ""
@@ -17527,14 +17743,14 @@
"conflicts AND collides with another path; this may result in nested conflict "
"markers."
msgstr ""
-"XUNG ĐỘT (đổi tên liên quan đến va chạm): đổi tên %s -> %s xung đột nội dung "
-"VÀ va chạm với một đường dẫn khác; điều này có thể dẫn đến tạo ra các xung "
-"đột lồng nhau."
+"XUNG ĐỘT (đổi tên cùng va chạm): đổi tên %s -> %s xung đột nội dung VÀ xung "
+"đột với một đường dẫn khác; điều này có thể tạo ra các dấu xung đột lồng "
+"nhau."
#, c-format
msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
msgstr ""
-"XUNG ĐỘT (đổi-tên/xóa): Đổi tên %s->%s trong %s, nhưng lại bị xóa trong %s."
+"XUNG ĐỘT (đổi tên/xóa): Đổi tên %s->%s trong %s, nhưng lại bị xóa trong %s."
#, c-format
msgid "error: cannot read object %s"
@@ -17634,270 +17850,6 @@
msgid "collecting merge info failed for trees %s, %s, %s"
msgstr "thu thập thông tin hòa trộn gặp lỗi cho cây %s, %s, %s"
-msgid "(bad commit)\n"
-msgstr "(commit sai)\n"
-
-#, c-format
-msgid "add_cacheinfo failed for path '%s'; merge aborting."
-msgstr "add_cacheinfo gặp lỗi đối với đường dẫn '%s'; huỷ bỏ việc hòa trộn."
-
-#, c-format
-msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
-msgstr ""
-"add_cacheinfo gặp lỗi khi làm mới đối với đường dẫn '%s'; huỷ bỏ việc hòa "
-"trộn."
-
-#, c-format
-msgid "failed to create path '%s'%s"
-msgstr "gặp lỗi khi tạo đường dẫn '%s'%s"
-
-#, c-format
-msgid "Removing %s to make room for subdirectory\n"
-msgstr "Gỡ bỏ %s để tạo chỗ (room) cho thư mục con\n"
-
-msgid ": perhaps a D/F conflict?"
-msgstr ": có lẽ là xung đột D/F (tập tin/thư mục)?"
-
-#, c-format
-msgid "refusing to lose untracked file at '%s'"
-msgstr "từ chối đóng tập tin không được theo dõi tại '%s'"
-
-#, c-format
-msgid "blob expected for %s '%s'"
-msgstr "mong đợi đối tượng blob cho %s '%s'"
-
-#, c-format
-msgid "failed to open '%s': %s"
-msgstr "gặp lỗi khi mở '%s': %s"
-
-#, c-format
-msgid "failed to symlink '%s': %s"
-msgstr "gặp lỗi khi tạo liên kết mềm (symlink) '%s': %s"
-
-#, c-format
-msgid "do not know what to do with %06o %s '%s'"
-msgstr "không hiểu phải làm gì với %06o %s '%s'"
-
-#, c-format
-msgid "Failed to merge submodule %s (repository corrupt)"
-msgstr "Gặp lỗi khi hòa trộn mô-đun-con %s (kho chứa hỏng)"
-
-#, c-format
-msgid "Fast-forwarding submodule %s to the following commit:"
-msgstr "Chuyển-tiếp-nhanh mô-đun-con '%s' đến lần chuyển giao sau đây:"
-
-#, c-format
-msgid "Fast-forwarding submodule %s"
-msgstr "Chuyển-tiếp-nhanh mô-đun-con '%s'"
-
-#, c-format
-msgid "Failed to merge submodule %s (merge following commits not found)"
-msgstr ""
-"Gặp lỗi khi hòa trộn mô-đun-con '%s' (không tìm thấy các lần chuyển giao "
-"theo sau hòa trộn)"
-
-#, c-format
-msgid "Failed to merge submodule %s (not fast-forward)"
-msgstr "Gặp lỗi khi hòa trộn mô-đun-con '%s' (không chuyển tiếp nhanh được)"
-
-msgid "Found a possible merge resolution for the submodule:\n"
-msgstr "Tìm thấy một giải pháp hòa trộn khả thi cho mô-đun-con:\n"
-
-#, c-format
-msgid ""
-"If this is correct simply add it to the index for example\n"
-"by using:\n"
-"\n"
-" git update-index --cacheinfo 160000 %s \"%s\"\n"
-"\n"
-"which will accept this suggestion.\n"
-msgstr ""
-"Nếu đây là đúng đơn giản thêm nó vào chỉ mục ví dụ\n"
-"bằng cách dùng:\n"
-"\n"
-" git update-index --cacheinfo 160000 %s \"%s\"\n"
-"\n"
-"cái mà sẽ chấp nhận gợi ý này.\n"
-
-#, c-format
-msgid "Failed to merge submodule %s (multiple merges found)"
-msgstr "Gặp lỗi khi hòa trộn mô-đun-con '%s' (thấy nhiều hòa trộn đa trùng)"
-
-msgid "failed to execute internal merge"
-msgstr "Gặp lỗi khi thực hiện trộn nội bộ"
-
-#, c-format
-msgid "unable to add %s to database"
-msgstr "Không thể thêm %s vào cơ sở dữ liệu"
-
-#, c-format
-msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
-msgstr ""
-"Lỗi: từ chối đóng tập tin không được theo dõi tại '%s'; thay vào đó ghi vào "
-"%s."
-
-#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree."
-msgstr ""
-"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)."
-
-#, 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)."
-
-#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %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 trong %s. Phiên bản %s của %s "
-"còn lại trong cây (tree) tại %s."
-
-#, 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."
-
-msgid "rename"
-msgstr "đổi tên"
-
-msgid "renamed"
-msgstr "đã đổi tên"
-
-#, c-format
-msgid "Refusing to lose dirty file at %s"
-msgstr "Từ chối đóng tập tin không được theo dõi tại '%s'"
-
-#, c-format
-msgid "Refusing to lose untracked file at %s, even though it's in the way."
-msgstr ""
-"Từ chối đóng tập tin không được theo dõi tại '%s', ngay cả khi nó ở trên "
-"đường."
-
-#, c-format
-msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
-msgstr ""
-"XUNG ĐỘT (đổi-tên/thêm): Đổi tên %s->%s trong %s. %s được thêm trong %s"
-
-#, 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"
-
-#, c-format
-msgid "Refusing to lose untracked file at %s; adding as %s instead"
-msgstr ""
-"Từ chối đóng tập tin không được theo dõi tại '%s'; thay vào đó đang thêm "
-"thành %s"
-
-#, c-format
-msgid ""
-"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename "
-"\"%s\"->\"%s\" in \"%s\"%s"
-msgstr ""
-"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"
-
-msgid " (left unresolved)"
-msgstr " (cần giải quyết)"
-
-#, 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"
-
-#, c-format
-msgid ""
-"CONFLICT (directory rename split): Unclear where to place %s because "
-"directory %s was renamed to multiple other directories, with no destination "
-"getting a majority of the files."
-msgstr ""
-"XUNG ĐỘT: (phân hoá đổi tên thư mục): Không rõ đặt %s ở đâu bởi vì thư mục "
-"%s đã bị đổi tên thành nhiều thư mục khác, mà không bên nào nhận phần lớn "
-"các tập tin gốc."
-
-#, c-format
-msgid ""
-"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
-">%s in %s"
-msgstr ""
-"XUNG ĐỘT (đổi-tên/đổi-tên): Đổi tên thư mục %s->%s trong %s. Đổi tên thư mục "
-"%s->%s trong %s"
-
-#, c-format
-msgid "cannot read object %s"
-msgstr "không thể đọc đối tượng %s"
-
-#, c-format
-msgid "object %s is not a blob"
-msgstr "đối tượng %s không phải là một blob"
-
-msgid "modify"
-msgstr "sửa đổi"
-
-msgid "modified"
-msgstr "đã sửa"
-
-#, c-format
-msgid "Skipped %s (merged same as existing)"
-msgstr "Đã bỏ qua %s (đã có sẵn lần hòa trộn này)"
-
-#, c-format
-msgid "Adding as %s instead"
-msgstr "Thay vào đó thêm vào %s"
-
-#, c-format
-msgid "Removing %s"
-msgstr "Đang xóa %s"
-
-msgid "file/directory"
-msgstr "tập-tin/thư-mục"
-
-msgid "directory/file"
-msgstr "thư-mục/tập-tin"
-
-#, 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"
-
-#, c-format
-msgid "Adding %s"
-msgstr "Thêm \"%s\""
-
-#, c-format
-msgid "CONFLICT (add/add): Merge conflict in %s"
-msgstr "XUNG ĐỘT (thêm/thêm): Xung đột hòa trộn trong %s"
-
-#, 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"
-
-msgid "Merging:"
-msgstr "Đang trộn:"
-
-#, c-format
-msgid "found %u common ancestor:"
-msgid_plural "found %u common ancestors:"
-msgstr[0] "tìm thấy %u tổ tiên chung:"
-
-msgid "merge returned no commit"
-msgstr "hòa trộn không trả về lần chuyển giao nào"
-
-#, c-format
-msgid "Could not parse object '%s'"
-msgstr "Không thể đọc đối tượng '%s'"
-
msgid "failed to read the cache"
msgstr "gặp lỗi khi đọc bộ nhớ đệm"
@@ -17939,12 +17891,13 @@
msgid "failed to clear multi-pack-index at %s"
msgstr "gặp lỗi khi xóa multi-pack-index tại %s"
-msgid "cannot write incremental MIDX with bitmap"
-msgstr "không thể ghi incremental MIDX với bitmap"
-
msgid "ignoring existing multi-pack-index; checksum mismatch"
msgstr "bỏ qua multi-pack-index sẵn có; tổng kiểm không khớp"
+#, c-format
+msgid "could not load reverse index for MIDX %s"
+msgstr "không thể mở chỉ mục ngược cho MIDX %s"
+
msgid "Adding packfiles to multi-pack-index"
msgstr "Đang thêm tập tin gói từ multi-pack-index"
@@ -18104,7 +18057,7 @@
msgstr "midx chẳng chứa oid nào"
msgid "Verifying OID order in multi-pack-index"
-msgstr "Thẩm tra thứ tự OID trong multi-pack-index"
+msgstr "xác minh thứ tự OID trong multi-pack-index"
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
@@ -18114,7 +18067,7 @@
msgstr "Đang sắp xếp các đối tượng theo tập tin gói"
msgid "Verifying object offsets"
-msgstr "Đang thẩm tra các khoảng bù đối tượng"
+msgstr "Đang xác minh các khoảng bù đối tượng"
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
@@ -18196,64 +18149,6 @@
msgstr "Chuyển đổi đối tượng từ %s sang %s thất bại"
#, c-format
-msgid "object directory %s does not exist; check .git/objects/info/alternates"
-msgstr ""
-"thư mục đối tượng %s không tồn tại; kiểm tra .git/objects/info/alternates"
-
-#, c-format
-msgid "unable to normalize alternate object path: %s"
-msgstr "không thể thường hóa đường dẫn đối tượng thay thế: '%s'"
-
-#, c-format
-msgid "%s: ignoring alternate object stores, nesting too deep"
-msgstr "%s: đang bỏ qua kho đối tượng thay thế, lồng nhau quá sâu"
-
-msgid "unable to fdopen alternates lockfile"
-msgstr "không thể fdopen tập tin khóa thay thế"
-
-msgid "unable to read alternates file"
-msgstr "không thể đọc tập tin thay thế"
-
-msgid "unable to move new alternates file into place"
-msgstr "không thể di chuyển tập tin thay thế vào chỗ"
-
-#, c-format
-msgid "path '%s' does not exist"
-msgstr "đường dẫn '%s' không tồn tại"
-
-#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr "kho tham chiếu '%s' như là checkout liên kết vẫn chưa được hỗ trợ."
-
-#, 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ộ."
-
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr "kho tham chiếu '%s' là nông"
-
-#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr "kho tham chiếu '%s' bị cấy ghép"
-
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "không thể tìm thấy thư mục đối tượng khớp với '%s'"
-
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr "dòng không hợp lệ trong khi đọc các tham chiếu thay thế: %s"
-
-#, c-format
-msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
-msgstr "đang cố để mmap %<PRIuMAX> vượt quá giới hạn %<PRIuMAX>"
-
-#, c-format
-msgid "mmap failed%s"
-msgstr "mmap gặp lỗi%s"
-
-#, c-format
msgid "object file %s is empty"
msgstr "tập tin đối tượng %s trống rỗng"
@@ -18289,18 +18184,6 @@
msgstr "đối tượng mất %s (được lưu trong %s) bị hỏng"
#, c-format
-msgid "replacement %s not found for %s"
-msgstr "c%s thay thế không được tìm thấy cho %s"
-
-#, c-format
-msgid "packed object %s (stored in %s) is corrupt"
-msgstr "đối tượng đã đóng gói %s (được lưu trong %s) bị hỏng"
-
-#, c-format
-msgid "missing mapping of %s to %s"
-msgstr "thiếu ánh xạ %s sang %s"
-
-#, c-format
msgid "unable to open %s"
msgstr "không thể mở %s"
@@ -18394,10 +18277,6 @@
msgstr "%s: kiểu tập tin không được hỗ trợ"
#, 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ệ"
-
-#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "mã băm không khớp cho %s (cần %s)"
@@ -18407,15 +18286,19 @@
#, c-format
msgid "unable to unpack header of %s"
-msgstr "không thể giải gói phần đầu của '%s'"
+msgstr "không thể giải gói phần đầu của %s"
#, c-format
msgid "unable to parse header of %s"
-msgstr "không thể đọc phần đầu của '%s'"
+msgstr "không thể đọc phần đầu của %s"
+
+#, c-format
+msgid "unable to parse type from header '%s' of %s"
+msgstr "không thể đọc phần đầu '%s' của %s"
#, c-format
msgid "unable to unpack contents of %s"
-msgstr "không thể giải gói nội dung của '%s'"
+msgstr "không thể giải gói nội dung của %s"
#. TRANSLATORS: This is a line of ambiguous object
#. output shown when we cannot look up or parse the
@@ -18423,7 +18306,7 @@
#.
#, c-format
msgid "%s [bad object]"
-msgstr "%s [đối tượng sai.]"
+msgstr "%s [đối tượng sai]"
#. TRANSLATORS: This is a line of ambiguous commit
#. object output. E.g.:
@@ -18457,7 +18340,7 @@
#.
#, c-format
msgid "%s [bad tag, could not parse it]"
-msgstr "%s [thẻ sai, không hiểu cú pháp nó]"
+msgstr "%s [thẻ sai, không hiểu cú pháp]"
#. TRANSLATORS: This is a line of ambiguous <type>
#. object output. E.g. "deadbeef tree".
@@ -18591,6 +18474,72 @@
msgstr "mã băm không khớp %s"
#, c-format
+msgid "object directory %s does not exist; check .git/objects/info/alternates"
+msgstr ""
+"thư mục đối tượng %s không tồn tại; kiểm tra .git/objects/info/alternates"
+
+#, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr "không thể thường hóa đường dẫn đối tượng thay thế: '%s'"
+
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
+msgstr "%s: đang bỏ qua kho đối tượng thay thế, lồng nhau quá sâu"
+
+msgid "unable to fdopen alternates lockfile"
+msgstr "không thể fdopen tập tin khóa thay thế"
+
+msgid "unable to read alternates file"
+msgstr "không thể đọc tập tin thay thế"
+
+msgid "unable to move new alternates file into place"
+msgstr "không thể di chuyển tập tin thay thế vào chỗ"
+
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "đường dẫn '%s' không tồn tại"
+
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr "kho tham chiếu '%s' như là checkout liên kết vẫn chưa được hỗ trợ."
+
+#, 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ộ."
+
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "kho tham chiếu '%s' là nông"
+
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "kho tham chiếu '%s' bị cấy ghép"
+
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "không thể tìm thấy thư mục đối tượng khớp với '%s'"
+
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "dòng không hợp lệ trong khi đọc các tham chiếu thay thế: %s"
+
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr "c%s thay thế không được tìm thấy cho %s"
+
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "đối tượng đã đóng gói %s (được lưu trong %s) bị hỏng"
+
+#, c-format
+msgid "missing mapping of %s to %s"
+msgstr "thiếu ánh xạ %s sang %s"
+
+#, 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ệ"
+
+#, c-format
msgid "duplicate entry when writing bitmap index: %s"
msgstr "đối tượng trùng lặp khi ghi chỉ mục bitmap: %s"
@@ -18601,9 +18550,6 @@
msgid "too many pseudo-merges"
msgstr "có quá nhiều lần pseudo-merge"
-msgid "trying to write commit not in index"
-msgstr "đã thử ghi lần chuyển giao nằm ngoài chỉ mục"
-
msgid "failed to load bitmap index (corrupted?)"
msgstr "không thể đọc chỉ mục bitmap (bị hỏng?)"
@@ -18845,8 +18791,20 @@
msgstr "%s không sẵn có"
#, c-format
+msgid "value for %s exceeds %<PRIdMAX>"
+msgstr "giá trị %s vượt quá %<PRIdMAX>"
+
+#, c-format
+msgid "value %s for %s not in range [%<PRIdMAX>,%<PRIdMAX>]"
+msgstr "giá trị %s cho %s không nằm trong khoảng [%<PRIdMAX>, %<PRIdMAX>]"
+
+#, c-format
+msgid "%s expects an integer value with an optional k/m/g suffix"
+msgstr "%s cần một giá trị dạng số nguyên với hậu tố tùy chọn k/m/g"
+
+#, c-format
msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
-msgstr "%s cần một giá trị dạng số không âm với một hậu tố tùy chọn k/m/g"
+msgstr "%s cần một giá trị dạng số không âm với hậu tố tùy chọn k/m/g"
#, c-format
msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
@@ -19004,10 +18962,6 @@
msgstr "sai giá trị kiểu boolean của cấu hình '%s' cho '%s'"
#, c-format
-msgid "failed to parse %s"
-msgstr "gặp lỗi khi đọc cú pháp %s"
-
-#, c-format
msgid "failed to walk children of tree %s: not found"
msgstr "gặp lỗi khi duyệt nhánh của cây %s: không tìm thấy"
@@ -19167,12 +19121,16 @@
msgstr "không thể tải %s từ máy chủ promisor"
#, c-format
-msgid "known remote named '%s' but with url '%s' instead of '%s'"
-msgstr "có máy chủ '%s' nhưng với url '%s' thay vì '%s'"
+msgid "no or empty URL advertised for remote '%s'"
+msgstr "URL máy chủ '%s' rỗng hoặc không có"
+
+#, c-format
+msgid "known remote named '%s' but with URL '%s' instead of '%s'"
+msgstr "có máy chủ '%s' nhưng với URL '%s' thay vì '%s'"
#, c-format
msgid "unknown '%s' value for '%s' config option"
-msgstr "không hiểu giá trị '%s' cho cho cấu hình '%s'"
+msgstr "không hiểu giá trị '%s' cho cấu hình '%s'"
#, c-format
msgid "unknown element '%s' from remote info"
@@ -19805,6 +19763,14 @@
msgstr "'%s' không chỉ đến một lần chuyển giao hợp lệ nào cả!"
#, c-format
+msgid "%s%s will become dangling after %s is deleted\n"
+msgstr " %s%s sẽ trở thành không đầu sau khi xoá %s!\n"
+
+#, c-format
+msgid "%s%s has become dangling after %s was deleted\n"
+msgstr "%s%s đã trở thành không đầu sau khi xoá %s!\n"
+
+#, c-format
msgid ""
"Using '%s' as the name for the initial branch. This default branch name\n"
"is subject to change. To configure the initial branch name to use in all\n"
@@ -19932,6 +19898,10 @@
msgstr "Đang kiểm tra tính nhất quán các tham chiếu"
#, c-format
+msgid "unable to open '%s'"
+msgstr "không thể mở '%s'"
+
+#, c-format
msgid "refname is dangerous: %s"
msgstr "tên tham chiếu không an toàn: %s"
@@ -19999,10 +19969,6 @@
msgstr "tên tham chiếu %s là tham chiếu biểu trưng, không hỗ trợ sao chép"
#, c-format
-msgid "invalid refspec '%s'"
-msgstr "refspec không hợp lệ '%s'"
-
-#, c-format
msgid "pattern '%s' has no '*'"
msgstr "giá trị '%s' không có '*'"
@@ -20540,7 +20506,7 @@
msgid "could not set recommended config"
msgstr "không thể đặt cấu hình đề nghị"
-msgid "could not turn on maintenance"
+msgid "could not toggle maintenance"
msgstr "không thể bật chế độ bảo trì"
msgid "could not start the FSMonitor daemon"
@@ -20586,12 +20552,15 @@
msgid "specify if tags should be fetched during clone"
msgstr "có nên lấy về thẻ khi nhân bản"
+msgid "specify if background maintenance should be enabled"
+msgstr "có nên bật bảo trì nền"
+
msgid ""
"scalar clone [--single-branch] [--branch <main-branch>] [--full-clone]\n"
-"\t[--[no-]src] [--[no-]tags] <url> [<enlistment>]"
+"\t[--[no-]src] [--[no-]tags] [--[no-]maintenance] <url> [<enlistment>]"
msgstr ""
"scalar clone [--single-branch] [--branch <nhánh-chính>] [--full-clone]\n"
-"\t[--[no-]src] [--[no-]tags] <url> [<enlistment>]"
+"\t[--[no-]src] [--[no-]tags] [--[no-]maintenance] <url> [<enlistment>]"
#, c-format
msgid "cannot deduce worktree name from '%s'"
@@ -20629,19 +20598,33 @@
msgid "`scalar list` does not take arguments"
msgstr "`scalar list` không nhận các tham số"
-msgid "scalar register [<enlistment>]"
-msgstr "scalar register [<enlistment>]"
+msgid "scalar register [--[no-]maintenance] [<enlistment>]"
+msgstr "scalar register [--[no-]maintenance] [<enlistment>]"
msgid "reconfigure all registered enlistments"
msgstr "cấu hình mọi enlistments đã đăng ký"
-msgid "scalar reconfigure [--all | <enlistment>]"
-msgstr "scalar reconfigure [--all | <enlistment>]"
+msgid "(enable|disable|keep)"
+msgstr "(enable|disable|keep)"
+
+msgid "signal how to adjust background maintenance"
+msgstr "điều chỉnh kế hoạch bảo trì nền"
+
+msgid ""
+"scalar reconfigure [--maintenance=(enable|disable|keep)] [--all | "
+"<enlistment>]"
+msgstr ""
+"scalar reconfigure [--maintenance=(enable|disable|keep)] [--all | "
+"<enlistment>]"
msgid "--all or <enlistment>, but not both"
msgstr "--all hoặc <enlistment>, không thể là cả hai"
#, c-format
+msgid "unknown mode for --maintenance option: %s"
+msgstr "không hiểu chế độ cho tuỳ chọn --maintenance: %s"
+
+#, c-format
msgid "could not remove stale scalar.repo '%s'"
msgstr "không thể xoá scalar.repo đã cũ '%s'"
@@ -21021,11 +21004,11 @@
#, c-format
msgid "could not parse parent commit %s"
-msgstr "không thể đọc lần chuyển giao mẹ '%s'"
+msgstr "không thể đọc lần chuyển giao cha %s"
#, c-format
msgid "unknown command: %d"
-msgstr "không hiểu câu lệnh %d"
+msgstr "không hiểu câu lệnh: %d"
msgid "This is the 1st commit message:"
msgstr "Đây là chú thích cho lần chuyển giao thứ nhất:"
@@ -21085,7 +21068,7 @@
#. "revert" or "pick", the second %s a SHA1.
#, c-format
msgid "%s: cannot parse parent commit %s"
-msgstr "%s: không thể đọc lần chuyển giao mẹ của %s"
+msgstr "%s: không thể đọc lần chuyển giao cha của %s"
#, c-format
msgid "could not revert %s... %s"
@@ -22075,6 +22058,9 @@
msgid "number of entries in the cache tree to invalidate (default 0)"
msgstr "số mục cần huỷ trong câu nhớ tạm (mặc định 0)"
+msgid "the number of objects to write"
+msgstr "số đối tượng tối thiểu cần ghi"
+
msgid "test-tool path-walk <options> -- <revision-options>"
msgstr "test-tool path-walk <tuỳ chọn> -- <tuỳ chọn cải biên>"
@@ -22093,6 +22079,9 @@
msgid "toggle pruning of uninteresting paths"
msgstr "lược bỏ những đường dẫn ít ý nghĩa"
+msgid "toggle aggressive edge walk"
+msgstr "duyệt cạnh tích cực"
+
msgid "read a pattern list over stdin"
msgstr "đọc các mẫu từ stdin"
@@ -22741,6 +22730,23 @@
msgstr "cảnh báo: "
#, c-format
+msgid ""
+"'%s' is nominated for removal.\n"
+"If you still use this command, please add an extra\n"
+"option, '--i-still-use-this', on the command line\n"
+"and let us know you still use it by sending an e-mail\n"
+"to <git@vger.kernel.org>. Thanks.\n"
+msgstr ""
+"'%s' đã được đề cử để loại bỏ.\n"
+"Nếu bạn vẫn còn sử dụng lệnh này, vui lòng bổ sung\n"
+"thêm một tùy chọn, '--i-still-use-this', trên dòng lệnh\n"
+"và cho chúng tôi biết bạn vẫn sử dụng nó bằng cách gửi e-mail\n"
+"đến <git@vger.kernel.org>. Xin cảm ơn.\n"
+
+msgid "refusing to run without --i-still-use-this"
+msgstr "từ chối chạy lệnh này mà không có --i-still-use-this"
+
+#, c-format
msgid "uname() failed with error '%s' (%d)\n"
msgstr "uname() gặp lỗi '%s' (%d)\n"
@@ -22860,6 +22866,14 @@
msgid "unable to get random bytes"
msgstr "không thể lấy byte ngẫu nhiên"
+#, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr "đang cố để mmap %<PRIuMAX> vượt quá giới hạn %<PRIuMAX>"
+
+#, c-format
+msgid "mmap failed%s"
+msgstr "mmap gặp lỗi%s"
+
msgid "Unmerged paths:"
msgstr "Những đường dẫn chưa được hòa trộn:"
@@ -23606,6 +23620,13 @@
"Không thể khởi tạo SMTP đúng cách. Kiểm tra cấu hình và dùng --smtp-debug."
#, perl-format
+msgid "Outlook reassigned Message-ID to: %s\n"
+msgstr "Outlook đổi Message-ID thành: %s\n"
+
+msgid "Warning: Could not retrieve Message-ID from server response.\n"
+msgstr "Cảnh báo: Không thể lấy Message-ID từ máy chủ.\n"
+
+#, perl-format
msgid "Failed to send %s\n"
msgstr "Gặp lỗi khi gửi %s\n"
@@ -23650,6 +23671,10 @@
msgstr "(body) Thêm cc: %s từ dòng '%s'\n"
#, perl-format
+msgid "error: invalid SMTP port '%s'\n"
+msgstr "lỗi: SMTP port không hợp lệ '%s'\n"
+
+#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) Không thể thực thi '%s'"
@@ -23702,6 +23727,332 @@
msgid "Do you really want to send %s? [y|N]: "
msgstr "Bạn có thực sự muốn gửi %s? [y|N](có/KHÔNG): "
+#~ msgid "start-after"
+#~ msgstr "start-after"
+
+#~ msgid "compact-summary"
+#~ msgstr "tổng hợp tóm lược"
+
+#~ msgid "git cat-file (-t | -s) [--allow-unknown-type] <object>"
+#~ msgstr "git cat-file (-t | -s) [--allow-unknown-type] <đối_tượng>"
+
+#~ msgid "allow -s and -t to work with broken/corrupt objects"
+#~ msgstr "cho phép -s và -t để làm việc với các đối tượng sai/hỏng"
+
+#, c-format
+#~ msgid " (%s will become dangling)"
+#~ msgstr " (%s sẽ trở thành không đầu (không được quản lý))"
+
+#, c-format
+#~ msgid " (%s has become dangling)"
+#~ msgstr " (%s đã trở thành không đầu (không được quản lý))"
+
+#, c-format
+#~ msgid "%s: object is of unknown type '%s': %s"
+#~ msgstr "%s: đối tượng có kiểu chưa biết '%s': %s"
+
+#~ msgid "use at most one of --auto and --schedule=<frequency>"
+#~ msgstr "dùng nhiều nhất là một trong --auto và --schedule=<frequency>"
+
+#, c-format
+#~ msgid "Final output: %d %s\n"
+#~ msgstr "Đầu ra cuối cùng: %d %s\n"
+
+#, c-format
+#~ msgid "%d (FSCK_IGNORE?) should never trigger this callback"
+#~ msgstr "%d (FSCK_IGNORE?) không bao giờ nên kích hoạt callback này"
+
+#~ msgid ""
+#~ "git pack-objects --stdout [<options>] [< <ref-list> | < <object-list>]"
+#~ msgstr ""
+#~ "git pack-objects --stdout [<các tùy chọn>] [< <danh-sách-tham-chiếu> | < "
+#~ "<danh-sách-đối-tượng>]"
+
+#~ msgid ""
+#~ "git pack-objects [<options>] <base-name> [< <ref-list> | < <object-list>]"
+#~ msgstr ""
+#~ "git pack-objects [<các tùy chọn>] <base-name> [< <danh-sách-ref> | < "
+#~ "<danh-sách-đối-tượng>]"
+
+#~ msgid "cannot use --stdin-packs with --cruft"
+#~ msgstr "không thể dùng tùy chọn --stdin-packs với --cruft"
+
+#, c-format
+#~ msgid "%s points nowhere!"
+#~ msgstr "%s chẳng chỉ đến đâu cả!"
+
+#, c-format
+#~ msgid "unreachable: invalid reference: %s"
+#~ msgstr "không tham chiếu được: tham chiếu không hợp lệ: %s"
+
+#~ msgid "(bad commit)\n"
+#~ msgstr "(commit sai)\n"
+
+#, c-format
+#~ msgid "add_cacheinfo failed for path '%s'; merge aborting."
+#~ msgstr "add_cacheinfo gặp lỗi đối với đường dẫn '%s'; huỷ bỏ việc hòa trộn."
+
+#, c-format
+#~ msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
+#~ msgstr ""
+#~ "add_cacheinfo gặp lỗi khi làm mới đối với đường dẫn '%s'; huỷ bỏ việc hòa "
+#~ "trộn."
+
+#, c-format
+#~ msgid "failed to create path '%s'%s"
+#~ msgstr "gặp lỗi khi tạo đường dẫn '%s'%s"
+
+#, c-format
+#~ msgid "Removing %s to make room for subdirectory\n"
+#~ msgstr "Gỡ bỏ %s để tạo chỗ (room) cho thư mục con\n"
+
+#~ msgid ": perhaps a D/F conflict?"
+#~ msgstr ": có lẽ là xung đột D/F (tập tin/thư mục)?"
+
+#, c-format
+#~ msgid "refusing to lose untracked file at '%s'"
+#~ msgstr "từ chối đóng tập tin không được theo dõi tại '%s'"
+
+#, c-format
+#~ msgid "blob expected for %s '%s'"
+#~ msgstr "mong đợi đối tượng blob cho %s '%s'"
+
+#, c-format
+#~ msgid "failed to open '%s': %s"
+#~ msgstr "gặp lỗi khi mở '%s': %s"
+
+#, c-format
+#~ msgid "failed to symlink '%s': %s"
+#~ msgstr "gặp lỗi khi tạo liên kết mềm (symlink) '%s': %s"
+
+#, c-format
+#~ msgid "do not know what to do with %06o %s '%s'"
+#~ msgstr "không hiểu phải làm gì với %06o %s '%s'"
+
+#, c-format
+#~ msgid "Failed to merge submodule %s (repository corrupt)"
+#~ msgstr "Gặp lỗi khi hòa trộn mô-đun-con %s (kho chứa hỏng)"
+
+#, c-format
+#~ msgid "Fast-forwarding submodule %s to the following commit:"
+#~ msgstr "Chuyển-tiếp-nhanh mô-đun-con '%s' đến lần chuyển giao sau đây:"
+
+#, c-format
+#~ msgid "Fast-forwarding submodule %s"
+#~ msgstr "Chuyển-tiếp-nhanh mô-đun-con '%s'"
+
+#, c-format
+#~ msgid "Failed to merge submodule %s (merge following commits not found)"
+#~ msgstr ""
+#~ "Gặp lỗi khi hòa trộn mô-đun-con '%s' (không tìm thấy các lần chuyển giao "
+#~ "theo sau hòa trộn)"
+
+#, c-format
+#~ msgid "Failed to merge submodule %s (not fast-forward)"
+#~ msgstr "Gặp lỗi khi hòa trộn mô-đun-con '%s' (không chuyển tiếp nhanh được)"
+
+#~ msgid "Found a possible merge resolution for the submodule:\n"
+#~ msgstr "Tìm thấy một giải pháp hòa trộn khả thi cho mô-đun-con:\n"
+
+#, c-format
+#~ msgid ""
+#~ "If this is correct simply add it to the index for example\n"
+#~ "by using:\n"
+#~ "\n"
+#~ " git update-index --cacheinfo 160000 %s \"%s\"\n"
+#~ "\n"
+#~ "which will accept this suggestion.\n"
+#~ msgstr ""
+#~ "Nếu đây là đúng đơn giản thêm nó vào chỉ mục ví dụ\n"
+#~ "bằng cách dùng:\n"
+#~ "\n"
+#~ " git update-index --cacheinfo 160000 %s \"%s\"\n"
+#~ "\n"
+#~ "cái mà sẽ chấp nhận gợi ý này.\n"
+
+#, c-format
+#~ msgid "Failed to merge submodule %s (multiple merges found)"
+#~ msgstr "Gặp lỗi khi hòa trộn mô-đun-con '%s' (thấy nhiều hòa trộn đa trùng)"
+
+#~ msgid "failed to execute internal merge"
+#~ msgstr "Gặp lỗi khi thực hiện trộn nội bộ"
+
+#, c-format
+#~ msgid "unable to add %s to database"
+#~ msgstr "Không thể thêm %s vào cơ sở dữ liệu"
+
+#, c-format
+#~ msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
+#~ msgstr ""
+#~ "Lỗi: từ chối đóng tập tin không được theo dõi tại '%s'; thay vào đó ghi "
+#~ "vào %s."
+
+#, c-format
+#~ msgid ""
+#~ "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s "
+#~ "left in tree."
+#~ msgstr ""
+#~ "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)."
+
+#, 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)."
+
+#, c-format
+#~ msgid ""
+#~ "CONFLICT (%s/delete): %s deleted in %s and %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 trong %s. Phiên bản %s của %s "
+#~ "còn lại trong cây (tree) tại %s."
+
+#, 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."
+
+#~ msgid "rename"
+#~ msgstr "đổi tên"
+
+#~ msgid "renamed"
+#~ msgstr "đã đổi tên"
+
+#, c-format
+#~ msgid "Refusing to lose dirty file at %s"
+#~ msgstr "Từ chối đóng tập tin không được theo dõi tại '%s'"
+
+#, c-format
+#~ msgid "Refusing to lose untracked file at %s, even though it's in the way."
+#~ msgstr ""
+#~ "Từ chối đóng tập tin không được theo dõi tại '%s', ngay cả khi nó ở trên "
+#~ "đường."
+
+#, c-format
+#~ msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
+#~ msgstr ""
+#~ "XUNG ĐỘT (đổi-tên/thêm): Đổi tên %s->%s trong %s. %s được thêm trong %s"
+
+#, 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"
+
+#, c-format
+#~ msgid "Refusing to lose untracked file at %s; adding as %s instead"
+#~ msgstr ""
+#~ "Từ chối đóng tập tin không được theo dõi tại '%s'; thay vào đó đang thêm "
+#~ "thành %s"
+
+#, c-format
+#~ msgid ""
+#~ "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename "
+#~ "\"%s\"->\"%s\" in \"%s\"%s"
+#~ msgstr ""
+#~ "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"
+
+#~ msgid " (left unresolved)"
+#~ msgstr " (cần giải quyết)"
+
+#, 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"
+
+#, c-format
+#~ msgid ""
+#~ "CONFLICT (directory rename split): Unclear where to place %s because "
+#~ "directory %s was renamed to multiple other directories, with no "
+#~ "destination getting a majority of the files."
+#~ msgstr ""
+#~ "XUNG ĐỘT: (phân hoá đổi tên thư mục): Không rõ đặt %s ở đâu bởi vì thư "
+#~ "mục %s đã bị đổi tên thành nhiều thư mục khác, mà không bên nào nhận phần "
+#~ "lớn các tập tin gốc."
+
+#, c-format
+#~ msgid ""
+#~ "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory "
+#~ "%s->%s in %s"
+#~ msgstr ""
+#~ "XUNG ĐỘT (đổi-tên/đổi-tên): Đổi tên thư mục %s->%s trong %s. Đổi tên thư "
+#~ "mục %s->%s trong %s"
+
+#, c-format
+#~ msgid "cannot read object %s"
+#~ msgstr "không thể đọc đối tượng %s"
+
+#, c-format
+#~ msgid "object %s is not a blob"
+#~ msgstr "đối tượng %s không phải là một blob"
+
+#~ msgid "modify"
+#~ msgstr "sửa đổi"
+
+#~ msgid "modified"
+#~ msgstr "đã sửa"
+
+#, c-format
+#~ msgid "Skipped %s (merged same as existing)"
+#~ msgstr "Đã bỏ qua %s (đã có sẵn lần hòa trộn này)"
+
+#, c-format
+#~ msgid "Adding as %s instead"
+#~ msgstr "Thay vào đó thêm vào %s"
+
+#, c-format
+#~ msgid "Removing %s"
+#~ msgstr "Đang xóa %s"
+
+#~ msgid "file/directory"
+#~ msgstr "tập-tin/thư-mục"
+
+#~ msgid "directory/file"
+#~ msgstr "thư-mục/tập-tin"
+
+#, 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"
+
+#, c-format
+#~ msgid "Adding %s"
+#~ msgstr "Thêm \"%s\""
+
+#, c-format
+#~ msgid "CONFLICT (add/add): Merge conflict in %s"
+#~ msgstr "XUNG ĐỘT (thêm/thêm): Xung đột hòa trộn trong %s"
+
+#, 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"
+
+#~ msgid "Merging:"
+#~ msgstr "Đang trộn:"
+
+#, c-format
+#~ msgid "found %u common ancestor:"
+#~ msgid_plural "found %u common ancestors:"
+#~ msgstr[0] "tìm thấy %u tổ tiên chung:"
+
+#~ msgid "merge returned no commit"
+#~ msgstr "hòa trộn không trả về lần chuyển giao nào"
+
+#~ msgid "cannot write incremental MIDX with bitmap"
+#~ msgstr "không thể ghi incremental MIDX với bitmap"
+
+#~ msgid "trying to write commit not in index"
+#~ msgstr "đã thử ghi lần chuyển giao nằm ngoài chỉ mục"
+
#, 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)."
@@ -23710,9 +24061,6 @@
#~ msgid "merging cannot continue; got unclean result of %d"
#~ msgstr "không thể tiếp tục hoà trộn; kết quả không hoàn toàn %d"
-#~ msgid "git repack [<options>]"
-#~ msgstr "git repack [<các tùy chọn>]"
-
#~ msgid "--onto and --advance are incompatible"
#~ msgstr "--onto và --advance xung khắc"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 139ae33..a0d43c5 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -155,8 +155,8 @@
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2025-06-08 20:30+0800\n"
-"PO-Revision-Date: 2025-06-12 14:50+0800\n"
+"POT-Creation-Date: 2025-08-12 20:20-0400\n"
+"PO-Revision-Date: 2025-08-17 08:14-0400\n"
"Last-Translator: Teng Long <dyroneteng@gmail.com>\n"
"Language-Team: GitHub <https://github.com/dyrone/git/>\n"
"Language: zh_CN\n"
@@ -168,6 +168,11 @@
#: add-interactive.c
#, c-format
+msgid "%s cannot be negative"
+msgstr "%s 不能为负数"
+
+#: add-interactive.c
+#, c-format
msgid "Huh (%s)?"
msgstr "嗯（%s）？"
@@ -1074,10 +1079,10 @@
#: builtin/describe.c builtin/diff-tree.c builtin/difftool.c
#: builtin/fast-export.c builtin/fetch.c builtin/help.c builtin/index-pack.c
#: builtin/init-db.c builtin/log.c builtin/ls-files.c builtin/merge-base.c
-#: builtin/merge-tree.c builtin/merge.c builtin/pack-objects.c builtin/rebase.c
-#: builtin/repack.c builtin/replay.c builtin/reset.c builtin/rev-parse.c
-#: builtin/show-branch.c builtin/stash.c builtin/submodule--helper.c
-#: builtin/tag.c builtin/worktree.c parse-options.c range-diff.c revision.c
+#: builtin/merge-tree.c builtin/merge.c builtin/rebase.c builtin/repack.c
+#: builtin/replay.c builtin/reset.c builtin/rev-parse.c builtin/show-branch.c
+#: builtin/stash.c builtin/submodule--helper.c builtin/tag.c builtin/worktree.c
+#: parse-options.c range-diff.c revision.c
#, c-format
msgid "options '%s' and '%s' cannot be used together"
msgstr "选项 '%s' 和 '%s' 不能同时使用"
@@ -2459,6 +2464,12 @@
msgid "adding files failed"
msgstr "添加文件失败"
+#: builtin/add.c builtin/checkout.c builtin/commit.c builtin/reset.c
+#: builtin/stash.c
+#, c-format
+msgid "'%s' cannot be negative"
+msgstr "'%s' 不能为负数"
+
#: builtin/add.c
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
@@ -2497,7 +2508,7 @@
msgstr "'%2$s' 的错误动作 '%1$s'"
#: builtin/am.c builtin/blame.c builtin/fetch.c builtin/pack-objects.c
-#: builtin/pull.c builtin/revert.c config.c diff-merges.c gpg-interface.c
+#: builtin/pull.c builtin/revert.c diff-merges.c environment.c gpg-interface.c
#: ls-refs.c parallel-checkout.c sequencer.c setup.c
#, c-format
msgid "invalid value for '%s': '%s'"
@@ -3819,8 +3830,8 @@
#: builtin/branch.c
msgid ""
-"branch with --recurse-submodules can only be used if "
-"submodule.propagateBranches is enabled"
+"branch with --recurse-submodules can only be used if submodule."
+"propagateBranches is enabled"
msgstr ""
"带有 --recurse-submodules 的分支只能在 submodule.propagateBranches 启用时使用"
@@ -3963,8 +3974,8 @@
"请检查下面错误报告中余下的内容。\n"
"您可以删除任何您不想共享的内容。\n"
-#: builtin/bugreport.c builtin/commit.c builtin/fast-export.c builtin/rebase.c
-#: parse-options.h
+#: builtin/bugreport.c builtin/commit.c builtin/fast-export.c
+#: builtin/pack-objects.c builtin/rebase.c parse-options.h
msgid "mode"
msgstr "模式"
@@ -6373,25 +6384,26 @@
#: builtin/config.c
msgid ""
"git config get [<file-option>] [<display-option>] [--includes] [--all] [--"
-"regexp] [--value=<value>] [--fixed-value] [--default=<default>] <name>"
+"regexp] [--value=<pattern>] [--fixed-value] [--default=<default>] [--"
+"url=<url>] <name>"
msgstr ""
"git config get [<文件选项>] [<显示选项>] [--includes] [--all] [--regexp] [--"
-"value=<值>] [--fixed-value] [--default=<默认值>] <名称>"
+"value=<模式>] [--fixed-value] [--default=<默认值>] [--url=<url>] <名称>"
#: builtin/config.c
msgid ""
-"git config set [<file-option>] [--type=<type>] [--all] [--value=<value>] [--"
-"fixed-value] <name> <value>"
+"git config set [<file-option>] [--type=<type>] [--all] [--value=<pattern>] "
+"[--fixed-value] <name> <value>"
msgstr ""
-"git config set [<文件选项>] [--type=<类型>] [--all] [--value=<值>] [--fixed-"
-"value] <名称> <值>"
+"git config set [<文件选项>] [--type=<类型>] [--all] [--value=<模式>] [--"
+"fixed-value] <名称> <值>"
#: builtin/config.c
msgid ""
-"git config unset [<file-option>] [--all] [--value=<value>] [--fixed-value] "
+"git config unset [<file-option>] [--all] [--value=<pattern>] [--fixed-value] "
"<name>"
msgstr ""
-"git config unset [<文件选项>] [--all] [--value=<值>] [--fixed-value] <名称>"
+"git config unset [<文件选项>] [--all] [--value=<模式>] [--fixed-value] <名称>"
#: builtin/config.c
msgid "git config rename-section [<file-option>] <old-name> <new-name>"
@@ -6412,19 +6424,19 @@
#: builtin/config.c
msgid ""
"git config get [<file-option>] [<display-option>] [--includes] [--all] [--"
-"regexp=<regexp>] [--value=<value>] [--fixed-value] [--default=<default>] "
+"regexp=<regexp>] [--value=<pattern>] [--fixed-value] [--default=<default>] "
"<name>"
msgstr ""
"git config get [<文件选项>] [<显示选项>] [--includes] [--all] [--regexp=<正则"
-"表达式>] [--value=<值>] [--fixed-value] [--default=<默认值>] <名称>"
+"表达式>] [--value=<模式>] [--fixed-value] [--default=<默认值>] <名称>"
#: builtin/config.c
msgid ""
"git config set [<file-option>] [--type=<type>] [--comment=<message>] [--all] "
-"[--value=<value>] [--fixed-value] <name> <value>"
+"[--value=<pattern>] [--fixed-value] <name> <value>"
msgstr ""
"git config set [<文件选项>] [--type=<类型>] [--comment=<消息>] [--all] [--"
-"value=<值>] [--fixed-value] <名称> <值>"
+"value=<模式>] [--fixed-value] <名称> <值>"
#: builtin/config.c
msgid "Config file location"
@@ -7046,7 +7058,7 @@
#: builtin/diff-pairs.c
#, c-format
msgid "unable to parse object id: %s"
-msgstr "不能解析对象ID：%s"
+msgstr "不能解析对象 ID：%s"
#: builtin/diff-pairs.c
msgid "git diff-pairs -z [<diff-options>]"
@@ -7493,27 +7505,6 @@
msgstr "拒绝 %s 因为浅克隆的根不允许被更新"
#: builtin/fetch.c
-#, c-format
-msgid ""
-"some local refs could not be updated; try running\n"
-" 'git remote prune %s' to remove any old, conflicting branches"
-msgstr ""
-"一些本地引用不能被更新；尝试运行\n"
-" 'git remote prune %s' 来删除旧的、有冲突的分支"
-
-# 译者：注意保持前导空格
-#: builtin/fetch.c
-#, c-format
-msgid " (%s will become dangling)"
-msgstr " （%s 将成为悬空状态）"
-
-# 译者：注意保持前导空格
-#: builtin/fetch.c
-#, c-format
-msgid " (%s has become dangling)"
-msgstr " （%s 已成为悬空状态）"
-
-#: builtin/fetch.c
msgid "[deleted]"
msgstr "[已删除]"
@@ -7536,7 +7527,7 @@
msgid "option \"%s\" is ignored for %s"
msgstr "选项 \"%s\" 为 %s 所忽略"
-#: builtin/fetch.c object-store.c
+#: builtin/fetch.c odb.c
#, c-format
msgid "%s is not a valid object"
msgstr "%s 不是一个有效的对象"
@@ -7561,6 +7552,20 @@
"以禁用该警告，直到远程将 HEAD 更改为其他内容。"
#: builtin/fetch.c
+#, c-format
+msgid ""
+"some local refs could not be updated; try running\n"
+" 'git remote prune %s' to remove any old, conflicting branches"
+msgstr ""
+"一些本地引用不能被更新；尝试运行\n"
+" 'git remote prune %s' 来删除旧的、有冲突的分支"
+
+#: builtin/fetch.c
+#, c-format
+msgid "fetching ref %s failed: %s"
+msgstr "获取引用 %s 失败：%s"
+
+#: builtin/fetch.c
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "检测到多分支，和 --set-upstream 不兼容"
@@ -7799,8 +7804,8 @@
#: builtin/fetch.c
msgid ""
-"--filter can only be used with the remote configured in "
-"extensions.partialclone"
+"--filter can only be used with the remote configured in extensions."
+"partialclone"
msgstr "只可以将 --filter 用于在 extensions.partialclone 中配置的远程仓库"
#: builtin/fetch.c
@@ -7857,6 +7862,10 @@
msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]"
#: builtin/for-each-ref.c
+msgid "git for-each-ref [--start-after <marker>]"
+msgstr "git for-each-ref [--start-after <标记>]"
+
+#: builtin/for-each-ref.c
msgid "quote placeholders suitably for shells"
msgstr "引用占位符适用于 shells"
@@ -7876,6 +7885,14 @@
msgid "show only <n> matched refs"
msgstr "只显示 <n> 个匹配的引用"
+#: builtin/for-each-ref.c
+msgid "marker"
+msgstr "标记"
+
+#: builtin/for-each-ref.c
+msgid "start iteration after the provided marker"
+msgstr "从指定标记之后开始迭代"
+
#: builtin/for-each-ref.c builtin/tag.c
msgid "respect format colors"
msgstr "遵照格式中的颜色输出"
@@ -7909,9 +7926,17 @@
msgstr "还包括 HEAD 引用和伪引用"
#: builtin/for-each-ref.c
+msgid "cannot use --start-after with custom sort options"
+msgstr "不能将 --start-after 与自定义排序选项一同使用"
+
+#: builtin/for-each-ref.c
msgid "unknown arguments supplied with --stdin"
msgstr "为 --stdin 提供了未知的命令参数"
+#: builtin/for-each-ref.c
+msgid "cannot use --start-after with patterns"
+msgstr "不能将 --start-after 与模式匹配一同使用"
+
#: builtin/for-each-repo.c
msgid "git for-each-repo --config=<config> [--] <arguments>"
msgstr "git for-each-repo --config=<配置> [--] <命令参数>"
@@ -8414,6 +8439,10 @@
msgstr "用于存储修剪对象的包前缀"
#: builtin/gc.c
+msgid "skip maintenance tasks typically done in the foreground"
+msgstr "跳过通常在前台执行的维护任务"
+
+#: builtin/gc.c
#, c-format
msgid "failed to parse gc.logExpiry value %s"
msgstr "无法解析 gc.logExpiry 的值 %s"
@@ -8500,13 +8529,13 @@
#: builtin/gc.c
#, c-format
-msgid "lock file '%s' exists, skipping maintenance"
-msgstr "锁文件 '%s' 已存在，跳过维护"
+msgid "task '%s' failed"
+msgstr "任务 '%s' 失败"
#: builtin/gc.c
#, c-format
-msgid "task '%s' failed"
-msgstr "任务 '%s' 失败"
+msgid "lock file '%s' exists, skipping maintenance"
+msgstr "锁文件 '%s' 已存在，跳过维护"
#: builtin/gc.c
#, c-format
@@ -8547,10 +8576,6 @@
msgstr "运行一个特定的任务"
#: builtin/gc.c
-msgid "use at most one of --auto and --schedule=<frequency>"
-msgstr "最多使用 --auto 和 --schedule=<频率> 其中之一"
-
-#: builtin/gc.c
#, c-format
msgid "unable to add '%s' value of '%s'"
msgstr "无法添加 '%2$s' 的 '%1$s' 值"
@@ -9651,11 +9676,6 @@
#: builtin/log.c
#, c-format
-msgid "Final output: %d %s\n"
-msgstr "最终输出：%d %s\n"
-
-#: builtin/log.c
-#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: 损坏的文件"
@@ -10562,6 +10582,10 @@
msgstr "（和 --stat 同义）"
#: builtin/merge.c builtin/pull.c
+msgid "show a compact-summary at the end of the merge"
+msgstr "在合并结束时显示简洁摘要"
+
+#: builtin/merge.c builtin/pull.c
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr "在合并提交信息中添加（最多 <n> 条）精简提交记录"
@@ -10890,11 +10914,6 @@
#: builtin/mktag.c
#, c-format
-msgid "%d (FSCK_IGNORE?) should never trigger this callback"
-msgstr "%d (FSCK_IGNORE?) 永远不应该触发这个回调"
-
-#: builtin/mktag.c
-#, c-format
msgid "could not read tagged object '%s'"
msgstr "不能读取被标记的对象 '%s'"
@@ -11537,13 +11556,26 @@
msgstr "未知子命令：`%s'"
#: builtin/pack-objects.c
-msgid "git pack-objects --stdout [<options>] [< <ref-list> | < <object-list>]"
-msgstr "git pack-objects --stdout [<选项>] [< <引用列表> | < <对象列表>]"
-
-#: builtin/pack-objects.c
msgid ""
-"git pack-objects [<options>] <base-name> [< <ref-list> | < <object-list>]"
-msgstr "git pack-objects [<选项>] <前缀名称> [< <引用列表> | < <对象列表>]"
+"git pack-objects [-q | --progress | --all-progress] [--all-progress-"
+"implied]\n"
+" [--no-reuse-delta] [--delta-base-offset] [--non-empty]\n"
+" [--local] [--incremental] [--window=<n>] [--depth=<n>]\n"
+" [--revs [--unpacked | --all]] [--keep-pack=<pack-name>]\n"
+" [--cruft] [--cruft-expiration=<time>]\n"
+" [--stdout [--filter=<filter-spec>] | <base-name>]\n"
+" [--shallow] [--keep-true-parents] [--[no-]sparse]\n"
+" [--name-hash-version=<n>] [--path-walk] < <object-list>"
+msgstr ""
+"git pack-objects [-q | --progress | --all-progress] [--all-progress-"
+"implied]\n"
+" [--no-reuse-delta] [--delta-base-offset] [--non-empty]\n"
+" [--local] [--incremental] [--window=<n>] [--depth=<n>]\n"
+" [--revs [--unpacked | --all]] [--keep-pack=<包名>]\n"
+" [--cruft] [--cruft-expiration=<时间>]\n"
+" [--stdout [--filter=<过滤规格>] | <基线名称>]\n"
+" [--shallow] [--keep-true-parents] [--[no-]sparse]\"\n"
+" [--name-hash-version=<n>] [--path-walk] < <对象列表>"
#: builtin/pack-objects.c
#, c-format
@@ -11672,6 +11704,17 @@
msgstr "无法获得对象 %s 类型"
#: builtin/pack-objects.c
+msgid "Compressing objects by path"
+msgstr "按路径压缩对象"
+
+#: builtin/pack-objects.c
+#, c-format
+msgid "Path-based delta compression using up to %d thread"
+msgid_plural "Path-based delta compression using up to %d threads"
+msgstr[0] "基于路径的差值压缩，最多使用 %d 个线程"
+msgstr[1] "基于路径的差值压缩，最多使用 %d 个线程"
+
+#: builtin/pack-objects.c
msgid "Compressing objects"
msgstr "压缩对象中"
@@ -11762,6 +11805,10 @@
msgstr "无法强制松散对象"
#: builtin/pack-objects.c
+msgid "failed to pack objects via path-walk"
+msgstr "通过 path-walk 打包对象失败"
+
+#: builtin/pack-objects.c
#, c-format
msgid "not a rev '%s'"
msgstr "不是一个版本 '%s'"
@@ -11906,6 +11953,10 @@
msgstr "创建精简包"
#: builtin/pack-objects.c
+msgid "use the path-walk API to walk objects when possible"
+msgstr "在可能的情况下使用 path-walk API 遍历对象"
+
+#: builtin/pack-objects.c
msgid "create packs suitable for shallow fetches"
msgstr "创建适合浅克隆仓库获取的包"
@@ -11975,7 +12026,12 @@
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "配置 pack.deltaCacheLimit 太高了，强制为 %d"
-#: builtin/pack-objects.c config.c
+#: builtin/pack-objects.c
+#, c-format
+msgid "cannot use %s with %s"
+msgstr "不能将 %s 与 %s 一同使用"
+
+#: builtin/pack-objects.c environment.c
#, c-format
msgid "bad pack compression level %d"
msgstr "错误的打包压缩级别 %d"
@@ -11993,10 +12049,6 @@
msgstr "--thin 不能用于创建一个可索引包"
#: builtin/pack-objects.c
-msgid "cannot use --filter with --stdin-packs"
-msgstr "不能同时使用 --filter 和 --stdin-packs"
-
-#: builtin/pack-objects.c
msgid "cannot use internal rev list with --stdin-packs"
msgstr "不能同时使用内部版本列表和 --stdin-packs"
@@ -12005,10 +12057,6 @@
msgstr "不能同时使用内部版本列表和 --cruft"
#: builtin/pack-objects.c
-msgid "cannot use --stdin-packs with --cruft"
-msgstr "不能将 --stdin-packs 和 --cruft 同时使用"
-
-#: builtin/pack-objects.c
msgid "Enumerating objects"
msgstr "枚举对象中"
@@ -12021,23 +12069,6 @@
"总共 %<PRIu32>（差异 %<PRIu32>），复用 %<PRIu32>（差异 %<PRIu32>），包复用 "
"%<PRIu32>（来自 %<PRIuMAX> 个包）"
-#: builtin/pack-redundant.c
-msgid ""
-"'git pack-redundant' is nominated for removal.\n"
-"If you still use this command, please add an extra\n"
-"option, '--i-still-use-this', on the command line\n"
-"and let us know you still use it by sending an e-mail\n"
-"to <git@vger.kernel.org>. Thanks.\n"
-msgstr ""
-"准备移除 'git pack-redundant' 命令。如果您仍旧使用这个\n"
-"命令，请在命令行中添加额外参数：'--i-still-use-this'，\n"
-"并通过发送邮件到 <git@vger.kernel.org> 让我们知道您仍旧\n"
-"使用它。 谢谢。\n"
-
-#: builtin/pack-redundant.c
-msgid "refusing to run without --i-still-use-this"
-msgstr "拒绝在未指定 --i-still-use-this 选项时运行"
-
#: builtin/pack-refs.c
msgid ""
"git pack-refs [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude "
@@ -12395,8 +12426,8 @@
"upstream, see 'push.autoSetupRemote' in 'git help config'.\n"
msgstr ""
"\n"
-"为了让没有追踪上游的分支自动配置，参见 'git help config' 中的 "
-"push.autoSetupRemote。\n"
+"为了让没有追踪上游的分支自动配置，参见 'git help config' 中的 'push."
+"autoSetupRemote'。\n"
#: builtin/push.c
#, c-format
@@ -12862,8 +12893,8 @@
#: builtin/rebase.c
#, c-format
msgid ""
-"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and "
-"\"stop\"."
+"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"stop"
+"\"."
msgstr "无法识别的空类型 '%s'；有效值有 \"drop\"、\"keep\" 和 \"stop\"。"
#: builtin/rebase.c
@@ -13558,6 +13589,16 @@
msgstr "未知的 --mirror 参数：%s"
#: builtin/remote.c
+#, c-format
+msgid "remote name '%s' is a subset of existing remote '%s'"
+msgstr "远程名称 '%s' 是现有远程 '%s' 的子集"
+
+#: builtin/remote.c
+#, c-format
+msgid "remote name '%s' is a superset of existing remote '%s'"
+msgstr "远程名称 '%s' 是现有远程 '%s' 的超集"
+
+#: builtin/remote.c
msgid "fetch the remote branches"
msgstr "抓取远程的分支"
@@ -13920,18 +13961,6 @@
msgid "Could not set up %s"
msgstr "不能设置 %s"
-# 译者：注意保持前导空格
-#: builtin/remote.c
-#, c-format
-msgid " %s will become dangling!"
-msgstr " %s 将成为悬空状态！"
-
-# 译者：注意保持前导空格
-#: builtin/remote.c
-#, c-format
-msgid " %s has become dangling!"
-msgstr " %s 已成为悬空状态！"
-
#: builtin/remote.c
#, c-format
msgid "Pruning %s"
@@ -14015,11 +14044,11 @@
msgid ""
"git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"
"[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n"
-"[--write-midx] [--name-hash-version=<n>]"
+"[--write-midx] [--name-hash-version=<n>] [--path-walk]"
msgstr ""
"git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"
"[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<包名>]\n"
-"[--write-midx] [--name-hash-version=<n>]"
+"[--write-midx] [--name-hash-version=<n>] [--path-walk]"
#: builtin/repack.c
msgid ""
@@ -14121,6 +14150,10 @@
msgstr "指定要使用的名称哈希算法，以实现按照路径对相似对象分组"
#: builtin/repack.c
+msgid "pass --path-walk to git-pack-objects"
+msgstr "向 git-pack-objects 传递参数 --path-walk"
+
+#: builtin/repack.c
msgid "do not run git-update-server-info"
msgstr "不运行 git-update-server-info"
@@ -15537,20 +15570,28 @@
msgstr "git stash create [<消息>]"
#: builtin/stash.c
+msgid "git stash export (--print | --to-ref <ref>) [<stash>...]"
+msgstr "git stash export (--print | --to-ref <引用>) [<贮藏>...]"
+
+#: builtin/stash.c
+msgid "git stash import <commit>"
+msgstr "git stash import <提交>"
+
+#: builtin/stash.c
#, c-format
msgid "'%s' is not a stash-like commit"
msgstr "'%s' 不像是一个贮藏提交"
#: builtin/stash.c
+msgid "No stash entries found."
+msgstr "未发现贮藏条目。"
+
+#: builtin/stash.c
#, c-format
msgid "Too many revisions specified:%s"
msgstr "指定了太多的版本：%s"
#: builtin/stash.c
-msgid "No stash entries found."
-msgstr "未发现贮藏条目。"
-
-#: builtin/stash.c
#, c-format
msgid "%s is not a valid reference"
msgstr "%s 不是一个有效的引用名"
@@ -15745,6 +15786,86 @@
msgid "include ignore files"
msgstr "包含忽略的文件"
+#: builtin/stash.c
+#, c-format
+msgid "cannot parse commit %s"
+msgstr "不能解析提交 %s"
+
+#: builtin/stash.c
+#, c-format
+msgid "invalid author or committer for %s"
+msgstr "%s 的作者或提交者信息无效"
+
+#: builtin/stash.c
+msgid "could not write commit"
+msgstr "无法写入提交"
+
+#: builtin/stash.c
+#, c-format
+msgid "not a valid revision: %s"
+msgstr "不是有效版本：%s"
+
+#: builtin/stash.c
+#, c-format
+msgid "not a commit: %s"
+msgstr "不是提交：%s"
+
+#: builtin/stash.c
+#, c-format
+msgid "%s is not a valid exported stash commit"
+msgstr "%s 不是一个有效的且已导出的贮藏提交"
+
+#: builtin/stash.c
+#, c-format
+msgid "found root commit %s with invalid data"
+msgstr "发现根提交 %s 包含无效数据"
+
+#: builtin/stash.c
+#, c-format
+msgid "found stash commit %s without expected prefix"
+msgstr "发现贮藏提交 %s 缺少预期前缀"
+
+#: builtin/stash.c
+#, c-format
+msgid "cannot parse parents of commit: %s"
+msgstr "无法解析该提交的父提交：%s"
+
+#: builtin/stash.c
+#, c-format
+msgid "%s does not look like a stash commit"
+msgstr "%s 看起来不像是一个贮藏提交"
+
+#: builtin/stash.c
+#, c-format
+msgid "cannot read commit buffer for %s"
+msgstr "无法读取提交的缓冲区：%s"
+
+#: builtin/stash.c
+#, c-format
+msgid "cannot save the stash for %s"
+msgstr "无法保存 %s 的贮藏"
+
+#: builtin/stash.c
+msgid "unable to write base commit"
+msgstr "无法写入基线提交"
+
+#: builtin/stash.c
+#, c-format
+msgid "unable to find stash entry %s"
+msgstr "无法找到贮藏条目 %s"
+
+#: builtin/stash.c
+msgid "print the object ID instead of writing it to a ref"
+msgstr "打印对象 ID，而不是写入引用"
+
+#: builtin/stash.c
+msgid "save the data to the given ref"
+msgstr "将数据保存到指定引用"
+
+#: builtin/stash.c
+msgid "exactly one of --print and --to-ref is required"
+msgstr "参数 --print 和 --to-ref 必须二选一"
+
#: builtin/stripspace.c
msgid "skip and remove all lines starting with comment character"
msgstr "跳过和移除所有的注释行"
@@ -15755,8 +15876,10 @@
#: builtin/submodule--helper.c
#, c-format
-msgid "Expecting a full ref name, got %s"
-msgstr "期望一个完整的引用名称，却得到 %s"
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。"
#: builtin/submodule--helper.c
#, c-format
@@ -15765,13 +15888,6 @@
#: builtin/submodule--helper.c
#, c-format
-msgid ""
-"could not look up configuration '%s'. Assuming this repository is its own "
-"authoritative upstream."
-msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。"
-
-#: builtin/submodule--helper.c
-#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "在 .gitmodules 中未找到子模组路径 '%s' 的 url"
@@ -16189,6 +16305,11 @@
#: builtin/submodule--helper.c
#, c-format
+msgid "Expecting a full ref name, got %s"
+msgstr "期望一个完整的引用名称，却得到 %s"
+
+#: builtin/submodule--helper.c
+#, c-format
msgid "Unable to find current revision in submodule path '%s'"
msgstr "无法在子模组路径 '%s' 中找到当前版本"
@@ -16434,6 +16555,11 @@
#: builtin/submodule--helper.c
#, c-format
+msgid "submodule name '%s' already used for path '%s'"
+msgstr "子模组名称 '%s' 已被用于路径 '%s'"
+
+#: builtin/submodule--helper.c
+#, c-format
msgid "'%s' is not a valid submodule name"
msgstr "'%s' 不是一个有效的子模组名称"
@@ -16988,7 +17114,7 @@
#: builtin/update-ref.c
msgid "batch reference updates"
-msgstr "批量引用更新"
+msgstr "批量处理引用更新"
#: builtin/update-server-info.c
msgid "update the info files from scratch"
@@ -17207,11 +17333,6 @@
#: builtin/worktree.c
#, c-format
-msgid "unreachable: invalid reference: %s"
-msgstr "不可达：无效引用：%s"
-
-#: builtin/worktree.c
-#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "准备工作区（分离头指针 %s）"
@@ -18657,8 +18778,8 @@
#: commit-graph.c
#, c-format
msgid ""
-"attempting to write a commit-graph, but 'commitGraph.changedPathsVersion' "
-"(%d) is not supported"
+"attempting to write a commit-graph, but 'commitGraph."
+"changedPathsVersion' (%d) is not supported"
msgstr "尝试写入提交图，但不支持 'commitGraph.changedPathsVersion' (%d)"
#: commit-graph.c
@@ -19081,8 +19202,8 @@
"remote URLs cannot be configured in file directly or indirectly included by "
"includeIf.hasconfig:remote.*.url"
msgstr ""
-"远程 URL 不能在文件中配置，不管直接地还是通过 "
-"includeIf.hasconfig:remote.*.url 间接地包含。"
+"远程 URL 不能在文件中配置，不管直接地还是通过 includeIf.hasconfig:remote.*."
+"url 间接地包含"
#: config.c
#, c-format
@@ -19228,16 +19349,6 @@
#: config.c
#, c-format
-msgid "invalid value for variable %s"
-msgstr "变量 %s 的值无效"
-
-#: config.c
-#, c-format
-msgid "ignoring unknown core.fsync component '%s'"
-msgstr "忽略未知的 core.fsync 组件 '%s'"
-
-#: config.c
-#, c-format
msgid "bad boolean config value '%s' for '%s'"
msgstr "'%2$s' 的错误的布尔取值 '%1$s'"
@@ -19253,54 +19364,6 @@
#: config.c
#, c-format
-msgid "abbrev length out of range: %d"
-msgstr "缩写长度超出范围：%d"
-
-#: config.c
-#, c-format
-msgid "bad zlib compression level %d"
-msgstr "错误的 zlib 压缩级别 %d"
-
-#: config.c
-#, c-format
-msgid "%s cannot contain newline"
-msgstr "%s 不能包含换行符"
-
-#: config.c
-#, c-format
-msgid "%s must have at least one character"
-msgstr "%s 必须至少有一个字符"
-
-#: config.c
-#, c-format
-msgid "ignoring unknown core.fsyncMethod value '%s'"
-msgstr "忽略未知的 core.fsyncMethod 值 '%s'"
-
-#: config.c
-msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
-msgstr "core.fsyncObjectFiles 已经被弃用；取而代之使用 core.fsync"
-
-#: config.c
-#, c-format
-msgid "invalid mode for object creation: %s"
-msgstr "无效的对象创建模式：%s"
-
-#: config.c
-#, c-format
-msgid "malformed value for %s"
-msgstr "%s 的取值格式错误"
-
-#: config.c
-#, c-format
-msgid "malformed value for %s: %s"
-msgstr "%s 的取值格式错误：%s"
-
-#: config.c
-msgid "must be one of nothing, matching, simple, upstream or current"
-msgstr "必须是其中之一：nothing、matching、simple、upstream 或 current"
-
-#: config.c
-#, c-format
msgid "unable to load config blob object '%s'"
msgstr "无法从数据对象 '%s' 加载配置"
@@ -19922,8 +19985,8 @@
msgstr "无法将命名管道和目录进行比较"
#: diff-no-index.c
-msgid "git diff --no-index [<options>] <path> <path>"
-msgstr "git diff --no-index [<选项>] <路径> <路径>"
+msgid "git diff --no-index [<options>] <path> <path> [<pathspec>...]"
+msgstr "git diff --no-index [<选项>] <路径> <路径> [<路径规格>...]"
#: diff-no-index.c
msgid ""
@@ -19931,6 +19994,12 @@
"tree"
msgstr "不是 git 仓库。使用 --no-index 比较工作区之外的两个路径"
+#: diff-no-index.c
+msgid ""
+"Limiting comparison with pathspecs is only supported if both paths are "
+"directories."
+msgstr "仅当两个路径均为目录时，才支持使用路径表达式限制比较范围。"
+
# 译者：注意保持前导空格
#: diff.c
#, c-format
@@ -20109,7 +20178,7 @@
msgid "<n>"
msgstr "<n>"
-#: diff.c
+#: diff.c parse-options.h
msgid "generate diffs with <n> lines context"
msgstr "生成含 <n> 行上下文的差异"
@@ -20256,7 +20325,7 @@
msgid "use default prefixes a/ and b/"
msgstr "使用 a/ 和 b/ 作为默认前缀"
-#: diff.c
+#: diff.c parse-options.h
msgid "show context between diff hunks up to the specified number of lines"
msgstr "显示指定行数的差异块间的上下文"
@@ -20641,6 +20710,64 @@
msgid "bad git namespace path \"%s\""
msgstr "错误的 git 名字空间路径 \"%s\""
+#: environment.c
+#, c-format
+msgid "invalid value for variable %s"
+msgstr "变量 %s 的值无效"
+
+#: environment.c
+#, c-format
+msgid "ignoring unknown core.fsync component '%s'"
+msgstr "忽略未知的 core.fsync 组件 '%s'"
+
+#: environment.c
+#, c-format
+msgid "abbrev length out of range: %d"
+msgstr "缩写长度超出范围：%d"
+
+#: environment.c
+#, c-format
+msgid "bad zlib compression level %d"
+msgstr "错误的 zlib 压缩级别 %d"
+
+#: environment.c
+#, c-format
+msgid "%s cannot contain newline"
+msgstr "%s 不能包含换行符"
+
+#: environment.c
+#, c-format
+msgid "%s must have at least one character"
+msgstr "%s 必须至少有一个字符"
+
+#: environment.c
+#, c-format
+msgid "ignoring unknown core.fsyncMethod value '%s'"
+msgstr "忽略未知的 core.fsyncMethod 值 '%s'"
+
+#: environment.c
+msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
+msgstr "core.fsyncObjectFiles 已经被弃用；取而代之使用 core.fsync"
+
+#: environment.c
+#, c-format
+msgid "invalid mode for object creation: %s"
+msgstr "无效的对象创建模式：%s"
+
+#: environment.c
+#, c-format
+msgid "malformed value for %s"
+msgstr "%s 的取值格式错误"
+
+#: environment.c
+#, c-format
+msgid "malformed value for %s: %s"
+msgstr "%s 的取值格式错误：%s"
+
+#: environment.c
+msgid "must be one of nothing, matching, simple, upstream or current"
+msgstr "必须是其中之一：nothing、matching、simple、upstream 或 current"
+
#: exec-cmd.c
#, c-format
msgid "too many args to run %s"
@@ -21499,6 +21626,35 @@
msgid "name consists only of disallowed characters: %s"
msgstr "姓名中仅包含禁用字符：%s"
+#: imap-send.c
+msgid "git imap-send [-v] [-q] [--[no-]curl] [(--folder|-f) <folder>] < <mbox>"
+msgstr ""
+"git imap-send [-v] [-q] [--[no-]curl] [(--folder|-f) <文件夹>] < <mbox>"
+
+#: imap-send.c
+msgid "no IMAP host specified"
+msgstr "未指定 IMAP 主机"
+
+#: imap-send.c
+msgid ""
+"set the IMAP host with 'git config imap.host <host>'.\n"
+"(e.g., 'git config imap.host imaps://imap.example.com')"
+msgstr ""
+"通过 'git config imap.host <主机>' 设置 IMAP 主机。\n"
+"(例如：'git config imap.host imaps://imap.example.com')"
+
+#: imap-send.c
+msgid "no IMAP folder specified"
+msgstr "未指定 IMAP 文件夹"
+
+#: imap-send.c
+msgid ""
+"set the target folder with 'git config imap.folder <folder>'.\n"
+"(e.g., 'git config imap.folder Drafts')"
+msgstr ""
+"通过 'git config imap.folder <文件夹>' 设置目标文件夹。\n"
+"(例如：'git config imap.folder Drafts')"
+
#: list-objects-filter-options.c
msgid "expected 'tree:<depth>'"
msgstr "期望 'tree:<深度>'"
@@ -22455,7 +22611,7 @@
#: object-file.c
#, c-format
msgid "unable to parse type from header '%s' of %s"
-msgstr "无法从 %s 的包头 '%s' 中解析类型"
+msgstr "无法从 %2$s 的包头 '%1$s' 中解析类型"
#: object-file.c
#, c-format
@@ -22634,88 +22790,6 @@
msgid "invalid object name '%.*s'."
msgstr "无效的对象名 '%.*s'。"
-#: object-store.c
-#, c-format
-msgid "object directory %s does not exist; check .git/objects/info/alternates"
-msgstr "对象目录 %s 不存在，检查 .git/objects/info/alternates"
-
-#: object-store.c
-#, c-format
-msgid "unable to normalize alternate object path: %s"
-msgstr "无法规范化备用对象路径：%s"
-
-#: object-store.c
-#, c-format
-msgid "%s: ignoring alternate object stores, nesting too deep"
-msgstr "%s：忽略备用对象库，嵌套太深"
-
-#: object-store.c
-msgid "unable to fdopen alternates lockfile"
-msgstr "无法 fdopen alternates 的锁文件"
-
-#: object-store.c
-msgid "unable to read alternates file"
-msgstr "无法读取 alternates 文件"
-
-#: object-store.c
-msgid "unable to move new alternates file into place"
-msgstr "无法将新的 alternates 文件移动到位"
-
-#: object-store.c
-#, c-format
-msgid "path '%s' does not exist"
-msgstr "路径 '%s' 不存在"
-
-#: object-store.c
-#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr "尚不支持将参考仓库 '%s' 作为链接检出。"
-
-#: object-store.c
-#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr "参考仓库 '%s' 不是本地仓库。"
-
-#: object-store.c
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr "参考仓库 '%s' 是浅克隆"
-
-#: object-store.c
-#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr "参考仓库 '%s' 已被移植"
-
-#: object-store.c
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "无法找到和 %s 匹配的对象目录"
-
-#: object-store.c
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr "解析备用引用时遇到无效的行：%s"
-
-#: object-store.c
-#, c-format
-msgid "replacement %s not found for %s"
-msgstr "找不到 %2$s 的替代 %1$s"
-
-#: object-store.c
-#, c-format
-msgid "packed object %s (stored in %s) is corrupt"
-msgstr "打包对象 %s（保存在 %s）已损坏"
-
-#: object-store.c
-#, c-format
-msgid "missing mapping of %s to %s"
-msgstr "缺少 %s 到 %s 的映射"
-
-#: object-store.c
-#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr "%s 不是有效的 '%s' 对象"
-
#: object.c
#, c-format
msgid "invalid object type \"%s\""
@@ -22741,6 +22815,88 @@
msgid "hash mismatch %s"
msgstr "哈希值与 %s 不匹配"
+#: odb.c
+#, c-format
+msgid "object directory %s does not exist; check .git/objects/info/alternates"
+msgstr "对象目录 %s 不存在，检查 .git/objects/info/alternates"
+
+#: odb.c
+#, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr "无法规范化备用对象路径：%s"
+
+#: odb.c
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
+msgstr "%s：忽略备用对象库，嵌套太深"
+
+#: odb.c
+msgid "unable to fdopen alternates lockfile"
+msgstr "无法 fdopen alternates 的锁文件"
+
+#: odb.c
+msgid "unable to read alternates file"
+msgstr "无法读取 alternates 文件"
+
+#: odb.c
+msgid "unable to move new alternates file into place"
+msgstr "无法将新的 alternates 文件移动到位"
+
+#: odb.c
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "路径 '%s' 不存在"
+
+#: odb.c
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr "尚不支持将参考仓库 '%s' 作为链接检出。"
+
+#: odb.c
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "参考仓库 '%s' 不是本地仓库。"
+
+#: odb.c
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "参考仓库 '%s' 是浅克隆"
+
+#: odb.c
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "参考仓库 '%s' 已被移植"
+
+#: odb.c
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "无法找到和 %s 匹配的对象目录"
+
+#: odb.c
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "解析备用引用时遇到无效的行：%s"
+
+#: odb.c
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr "找不到 %2$s 的替代 %1$s"
+
+#: odb.c
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "打包对象 %s（保存在 %s）已损坏"
+
+#: odb.c
+#, c-format
+msgid "missing mapping of %s to %s"
+msgstr "缺少 %s 到 %s 的映射"
+
+#: odb.c
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "%s 不是有效的 '%s' 对象"
+
#: pack-bitmap-write.c
#, c-format
msgid "duplicate entry when writing bitmap index: %s"
@@ -22755,10 +22911,6 @@
msgid "too many pseudo-merges"
msgstr "太多伪合并"
-#: pack-bitmap-write.c
-msgid "trying to write commit not in index"
-msgstr "尝试写入未在索引中的提交"
-
#: pack-bitmap.c
msgid "failed to load bitmap index (corrupted?)"
msgstr "无法载入位图索引（已损坏？）"
@@ -23063,6 +23215,11 @@
#: parse-options.c
#, c-format
+msgid "value for %s exceeds %<PRIdMAX>"
+msgstr "%s 的值超出了 %<PRIdMAX>"
+
+#: parse-options.c
+#, c-format
msgid "value %s for %s not in range [%<PRIdMAX>,%<PRIdMAX>]"
msgstr "%2$s 的值 %1$s 不在范围 [%3$<PRIdMAX>,%4$<PRIdMAX>] 内"
@@ -24215,6 +24372,18 @@
msgid "%s does not point to a valid object!"
msgstr "%s 没有指向一个有效的对象！"
+# 译者：注意保持前导空格
+#: refs.c
+#, c-format
+msgid "%s%s will become dangling after %s is deleted\n"
+msgstr "%s%s 将在 %s 被删除后变为悬空引用\n"
+
+# 译者：注意保持前导空格
+#: refs.c
+#, c-format
+msgid "%s%s has become dangling after %s was deleted\n"
+msgstr "%s%s 已在 %s 被删除后变为悬空引用\n"
+
#: refs.c
#, c-format
msgid ""
@@ -26992,6 +27161,10 @@
msgstr "切换对无趣路径的修剪"
#: t/helper/test-path-walk.c
+msgid "toggle aggressive edge walk"
+msgstr "切换激进边遍历模式"
+
+#: t/helper/test-path-walk.c
msgid "read a pattern list over stdin"
msgstr "从标准输入读取模式列表"
@@ -27742,6 +27915,24 @@
msgid "warning: "
msgstr "警告："
+#: usage.c
+#, c-format
+msgid ""
+"'%s' is nominated for removal.\n"
+"If you still use this command, please add an extra\n"
+"option, '--i-still-use-this', on the command line\n"
+"and let us know you still use it by sending an e-mail\n"
+"to <git@vger.kernel.org>. Thanks.\n"
+msgstr ""
+"'%s' 命令已被提名移除。\n"
+"如果您仍在使用该命令，请在命令行中添加额外选项\n"
+"'--i-still-use-this'，并通过发送邮件至 <git@vger.kernel.org> \n"
+"通知我们您仍在使用它。谢谢。\n"
+
+#: usage.c
+msgid "refusing to run without --i-still-use-this"
+msgstr "拒绝在未指定 --i-still-use-this 选项时运行"
+
#: version.c
#, c-format
msgid "uname() failed with error '%s' (%d)\n"
@@ -28890,6 +29081,11 @@
#: git-send-email.perl
#, perl-format
+msgid "error: invalid SMTP port '%s'\n"
+msgstr "错误：无效的 SMTP 端口 '%s'\n"
+
+#: git-send-email.perl
+#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) 不能执行 '%s'"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 4fcbb71..6fe5dbc 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -19,22 +19,22 @@
# - Yichao Yu <yyc1992 AT gmail.com>
# - Zhuang Ya <zhuangya AT me.com>
#
-# Yi-Jyun Pan <pan93412@gmail.com>, 2021, 2022, 2023, 2024.
+# Yi-Jyun Pan <pan93412@gmail.com>, 2021, 2022, 2023, 2024, 2025.
# Kaiyang Wu <self@origincode.me>, 2022.
-# Lumynous <lumynou5.tw@gmail.com>, 2023, 2024.
+# Lumynous <lumynou5.tw@gmail.com>, 2023, 2024, 2025.
# Kisaragi Hiu <mail@kisaragi-hiu.com>, 2024.
# Ngoo Ka-iu <willy04wu69@gmail.com>, 2024.
# Nightfeather Chen <slat@nightfeather.me>, 2024.
-# hms5232 <hms5232@hhming.moe>, 2024.
+# hms5232 <hms5232@hhming.moe>, 2024, 2025.
msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2025-06-12 22:09+0800\n"
-"PO-Revision-Date: 2025-06-12 22:25+0800\n"
-"Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n"
-"Language-Team: Chinese (Traditional) <http://weblate.slat.org/projects/git-"
-"po/git-cli/zh_Hant/>\n"
+"POT-Creation-Date: 2025-08-16 12:10+0800\n"
+"PO-Revision-Date: 2025-08-16 12:11+0800\n"
+"Last-Translator: hms5232 <hms5232@hhming.moe>\n"
+"Language-Team: Chinese (Traditional Han script) <https://weblate.slat.org/"
+"projects/git-po/git-cli/zh_Hant/>\n"
"Language: zh_TW\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -46,6 +46,11 @@
#: add-interactive.c
#, c-format
+msgid "%s cannot be negative"
+msgstr "%s 不能是負數"
+
+#: add-interactive.c
+#, c-format
msgid "Huh (%s)?"
msgstr "嗯（%s）？"
@@ -131,12 +136,12 @@
#: add-interactive.c
#, c-format
msgid "Only binary files changed.\n"
-msgstr "只有二進位檔案更動了。\n"
+msgstr "只有二進位檔案變更了。\n"
#: add-interactive.c
#, c-format
msgid "No changes.\n"
-msgstr "沒有更動。\n"
+msgstr "沒有變更。\n"
#: add-interactive.c
msgid "Patch update"
@@ -148,15 +153,15 @@
#: add-interactive.c
msgid "show paths with changes"
-msgstr "顯示有更動的路徑"
+msgstr "顯示有變更的路徑"
#: add-interactive.c
msgid "add working tree state to the staged set of changes"
-msgstr "將工作區狀態加入至暫存更動集"
+msgstr "將工作區狀態加入至暫存變更暫存集"
#: add-interactive.c
msgid "revert staged set of changes back to the HEAD version"
-msgstr "將暫存的更動集還原回 HEAD 版本"
+msgstr "將變更暫存集還原至 HEAD 版本"
#: add-interactive.c
msgid "pick hunks and update selectively"
@@ -168,7 +173,7 @@
#: add-interactive.c
msgid "add contents of untracked files to the staged set of changes"
-msgstr "將未追蹤檔案的內容加入至更動暫存集"
+msgstr "將未追蹤檔案的內容加入至變更暫存集"
#: add-interactive.c
msgid "Prompt help:"
@@ -244,7 +249,7 @@
#: add-patch.c
#, c-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
-msgstr "暫存模式更動 [y,n,q,a,d%s,?]? "
+msgstr "暫存模式變更 [y,n,q,a,d%s,?]？ "
#: add-patch.c
#, c-format
@@ -284,7 +289,7 @@
#: add-patch.c
#, c-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
-msgstr "貯存模式更動 [y,n,q,a,d%s,?]? "
+msgstr "貯存模式變更 [y,n,q,a,d%s,?]？ "
#: add-patch.c
#, c-format
@@ -324,7 +329,7 @@
#: add-patch.c
#, c-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
-msgstr "取消暫存模式更動 [y,n,q,a,d%s,?]? "
+msgstr "取消暫存模式變更 [y,n,q,a,d%s,?]？ "
#: add-patch.c
#, c-format
@@ -364,7 +369,7 @@
#: add-patch.c
#, c-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
-msgstr "將模式更動套用到索引 [y,n,q,a,d%s,?]? "
+msgstr "將模式變更套用至索引區 [y,n,q,a,d%s,?]？ "
#: add-patch.c
#, c-format
@@ -404,7 +409,7 @@
#: add-patch.c
#, c-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
-msgstr "從工作區捨棄模式更動 [y,n,q,a,d%s,?]? "
+msgstr "從工作區捨棄模式變更 [y,n,q,a,d%s,?]？ "
#: add-patch.c
#, c-format
@@ -444,7 +449,7 @@
#: add-patch.c
#, c-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
-msgstr "從索引和工作區捨棄模式更動 [y,n,q,a,d%s,?]? "
+msgstr "從索引區和工作區捨棄模式變更 [y,n,q,a,d%s,?]？ "
#: add-patch.c
#, c-format
@@ -478,7 +483,7 @@
#: add-patch.c
#, c-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
-msgstr "將模式更動套用到索引和工作區 [y,n,q,a,d%s,?]? "
+msgstr "將模式變更套用至索引區和工作區 [y,n,q,a,d%s,?]？ "
#: add-patch.c
#, c-format
@@ -512,7 +517,7 @@
#: add-patch.c
#, c-format
msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
-msgstr "將模式更動套用到工作區 [y,n,q,a,d%s,?]? "
+msgstr "將模式變更套用至工作區 [y,n,q,a,d%s,?]？ "
#: add-patch.c
#, c-format
@@ -608,9 +613,9 @@
"Lines starting with %s will be removed.\n"
msgstr ""
"---\n"
-"要刪除「%c」開頭的列，請將列首（上下文）改成空白。\n"
-"要刪除「%c」開頭的列，請直接刪除。\n"
-"開頭是 %s 的列將會被移除。\n"
+"要移除「%c」開頭的列，請將列首（上下文）改成空白。\n"
+"要移除「%c」開頭的列，請直接刪除。\n"
+"開頭是 %s 的列會被移除。\n"
#: add-patch.c
msgid ""
@@ -754,11 +759,11 @@
#: add-patch.c
msgid "No changes."
-msgstr "沒有更動。"
+msgstr "沒有變更。"
#: add-patch.c
msgid "Only binary files changed."
-msgstr "只有二進位檔案更動了。"
+msgstr "只有二進位檔案變更了。"
#: advice.c
#, c-format
@@ -816,7 +821,7 @@
#: advice.c
msgid "Please, commit your changes before merging."
-msgstr "請在合併前先提交您的更動。"
+msgstr "請在合併前先提交您的變更。"
#: advice.c
msgid "Exiting because of unfinished merge."
@@ -912,8 +917,8 @@
"sparse-checkout definition but are not sparse due to local\n"
"modifications.\n"
msgstr ""
-"以下路徑已經移到稀疏簽出定義之外的地方，\n"
-"但因為有本機更動，因此路徑不是稀疏的。\n"
+"以下路徑已移動至稀疏簽出定義以外的位置，\n"
+"但因本機修改而不是稀疏的。\n"
#: advice.c
msgid ""
@@ -941,22 +946,22 @@
#: apply.c
#, c-format
msgid "unrecognized whitespace option '%s'"
-msgstr "空白字元選項「%s」不認識"
+msgstr "無法識別空白字元選項「%s」"
#: apply.c
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
-msgstr "空白字元忽略選項「%s」不認識"
+msgstr "無法辨識空白字元忽略選項「%s」"
#: apply.c archive.c builtin/add.c builtin/branch.c builtin/checkout-index.c
#: builtin/checkout.c builtin/clean.c builtin/clone.c builtin/commit.c
#: builtin/describe.c builtin/diff-tree.c builtin/difftool.c
#: builtin/fast-export.c builtin/fetch.c builtin/help.c builtin/index-pack.c
#: builtin/init-db.c builtin/log.c builtin/ls-files.c builtin/merge-base.c
-#: builtin/merge-tree.c builtin/merge.c builtin/pack-objects.c builtin/rebase.c
-#: builtin/repack.c builtin/replay.c builtin/reset.c builtin/rev-parse.c
-#: builtin/show-branch.c builtin/stash.c builtin/submodule--helper.c
-#: builtin/tag.c builtin/worktree.c parse-options.c range-diff.c revision.c
+#: builtin/merge-tree.c builtin/merge.c builtin/rebase.c builtin/repack.c
+#: builtin/replay.c builtin/reset.c builtin/rev-parse.c builtin/show-branch.c
+#: builtin/stash.c builtin/submodule--helper.c builtin/tag.c builtin/worktree.c
+#: parse-options.c range-diff.c revision.c
#, c-format
msgid "options '%s' and '%s' cannot be used together"
msgstr "無法同時使用「%s」和「%s」選項"
@@ -1080,7 +1085,7 @@
#: apply.c
#, c-format
msgid "unrecognized binary patch at line %d"
-msgstr "第 %d 列的二進位修補檔不認識"
+msgstr "無法辨識第 %d 列的二進位修補檔"
#: apply.c
#, c-format
@@ -1294,7 +1299,7 @@
#: apply.c
#, c-format
msgid "mode change for %s, which is not in current HEAD"
-msgstr "%s 的模式有更動，但其不在目前 HEAD 中"
+msgstr "有 %s 的模式變更，但其不在目前的 HEAD 中"
#: apply.c
#, c-format
@@ -1428,11 +1433,11 @@
#: apply.c
msgid "don't apply changes matching the given path"
-msgstr "不要套用符合提供路徑的更動"
+msgstr "不套用符合提供路徑的變更"
#: apply.c
msgid "apply changes matching the given path"
-msgstr "套用符合提供路徑的更動"
+msgstr "套用符合提供路徑的變更"
#: apply.c builtin/am.c
msgid "num"
@@ -1488,15 +1493,15 @@
#: apply.c builtin/merge-file.c
msgid "for conflicts, use our version"
-msgstr "如果衝突，使用我們的版本"
+msgstr "如有衝突，使用我方版本"
#: apply.c builtin/merge-file.c
msgid "for conflicts, use their version"
-msgstr "如果衝突，使用他們的版本"
+msgstr "如有衝突，使用他方版本"
#: apply.c builtin/merge-file.c
msgid "for conflicts, use a union version"
-msgstr "如果衝突，使用聯合版本"
+msgstr "如有衝突，使用聯集版本"
#: apply.c
msgid "build a temporary index based on embedded index information"
@@ -1521,7 +1526,7 @@
#: apply.c
msgid "ignore changes in whitespace when finding context"
-msgstr "尋找上下文時忽略空白字元更動"
+msgstr "尋找上下文時忽略空白字元變更"
#: apply.c
msgid "apply the patch in reverse"
@@ -1831,7 +1836,7 @@
#: attr.c
msgid "cannot use --attr-source or GIT_ATTR_SOURCE without repo"
-msgstr "沒有版本庫無法使用 --attr-source 或 GIT_ATTR_SOURCE"
+msgstr "沒有版本庫不能使用 --attr-source 或 GIT_ATTR_SOURCE"
#: attr.c
msgid "bad --attr-source or GIT_ATTR_SOURCE"
@@ -1840,7 +1845,7 @@
#: attr.c read-cache.c refs/packed-backend.c
#, c-format
msgid "unable to stat '%s'"
-msgstr "無法統計「%s」"
+msgstr "無法 stat「%s」"
#: bisect.c builtin/cat-file.c builtin/index-pack.c builtin/notes.c
#: builtin/pack-objects.c combine-diff.c object-file.c rerere.c
@@ -1930,7 +1935,7 @@
#: bisect.c builtin/notes.c
#, c-format
msgid "unable to start 'show' for object '%s'"
-msgstr "無法為物件「%s」開始「show」"
+msgstr "無法對物件「%s」執行「show」"
#: bisect.c builtin/merge.c
#, c-format
@@ -2190,7 +2195,7 @@
#: builtin/add.c
msgid "Unstaged changes after refreshing the index:"
-msgstr "重新整理索引之後，尚未被暫存的更動："
+msgstr "重新整理索引之後未暫存的變更："
#: builtin/add.c
msgid "could not read the index"
@@ -2203,7 +2208,7 @@
#: builtin/add.c read-cache.c
#, c-format
msgid "could not stat '%s'"
-msgstr "無法統計「%s」"
+msgstr "無法 stat「%s」"
#: builtin/add.c
msgid "empty patch. aborted"
@@ -2260,7 +2265,7 @@
#: builtin/add.c
msgid "add changes from all tracked and untracked files"
-msgstr "從所有已追蹤和未追蹤檔案加入更動"
+msgstr "加入所有已追蹤和未追蹤檔案的變更"
#: builtin/add.c
msgid "ignore paths removed in the working tree (same as --no-all)"
@@ -2334,6 +2339,12 @@
msgid "adding files failed"
msgstr "加入檔案失敗"
+#: builtin/add.c builtin/checkout.c builtin/commit.c builtin/reset.c
+#: builtin/stash.c
+#, c-format
+msgid "'%s' cannot be negative"
+msgstr "「%s」不能是負數"
+
#: builtin/add.c
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
@@ -2372,7 +2383,7 @@
msgstr "「%s」動作對「%s」無效"
#: builtin/am.c builtin/blame.c builtin/fetch.c builtin/pack-objects.c
-#: builtin/pull.c builtin/revert.c config.c diff-merges.c gpg-interface.c
+#: builtin/pull.c builtin/revert.c diff-merges.c environment.c gpg-interface.c
#: ls-refs.c parallel-checkout.c sequencer.c setup.c
#, c-format
msgid "invalid value for '%s': '%s'"
@@ -2463,7 +2474,7 @@
#: builtin/am.c
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead.\n"
-msgstr "若要略過此修補，請改執行「%s --skip」。\n"
+msgstr "若要略過此修補檔，請改執行「%s --skip」。\n"
#: builtin/am.c
#, c-format
@@ -2517,7 +2528,7 @@
#: builtin/am.c
msgid "Failed to merge in the changes."
-msgstr "無法合併更動。"
+msgstr "合併變更失敗。"
#: builtin/am.c builtin/merge.c sequencer.c
msgid "git write-tree failed to write a tree"
@@ -2952,7 +2963,7 @@
#: builtin/bisect.c
#, c-format
msgid "Invalid command: you're currently in a %s/%s bisect"
-msgstr "命令無效：您正處於二分搜尋 %s/%s 的狀態"
+msgstr "命令無效：您正處於採用 %s/%s 術語的二分搜尋"
#: builtin/bisect.c
#, c-format
@@ -3036,7 +3047,7 @@
#: builtin/bisect.c
#, c-format
msgid "unrecognized option: '%s'"
-msgstr "不認識選項：「%s」"
+msgstr "無法辨識選項：「%s」"
#: builtin/bisect.c
#, c-format
@@ -3129,7 +3140,7 @@
#: builtin/bisect.c
#, c-format
msgid "bisect run failed: exit code %d from %s is < 0 or >= 128"
-msgstr "二分搜尋執行失敗：%2$s 回傳的結束代碼 %1$d 小於 0 或大於 128"
+msgstr "二分搜尋執行失敗：%2$s 的結束代碼 %1$d 小於 0 或大於 128"
#: builtin/bisect.c
#, c-format
@@ -3316,11 +3327,11 @@
#: builtin/blame.c
msgid "find line copies within and across files"
-msgstr "找到檔案內及跨檔案的列拷貝動作"
+msgstr "尋找檔案內及跨檔案拷貝的列"
#: builtin/blame.c
msgid "find line movements within and across files"
-msgstr "找到檔案內及跨檔案的列移動動作"
+msgstr "尋找檔案內及跨檔案移動的列"
#: builtin/blame.c
msgid "range"
@@ -3399,7 +3410,7 @@
"deleting branch '%s' that has been merged to\n"
" '%s', but not yet merged to HEAD"
msgstr ""
-"將要刪除的分支「%s」已經被合併到\n"
+"要刪除的分支「%s」已經被合併到\n"
" 「%s」，但尚未合併到 HEAD"
# 譯者：保持原換行格式，在輸出時 %s 的替代內容會讓字串變長
@@ -3475,7 +3486,7 @@
#: builtin/branch.c
msgid "could not resolve HEAD"
-msgstr "無法解析 HEAD"
+msgstr "無法解析 HEAD 指標"
#: builtin/branch.c
#, c-format
@@ -3514,34 +3525,34 @@
#: builtin/branch.c
msgid "branch rename failed"
-msgstr "分支重新命名失敗"
+msgstr "重新命名分支失敗"
#: builtin/branch.c
msgid "branch copy failed"
-msgstr "分支拷貝失敗"
+msgstr "拷貝分支失敗"
#: builtin/branch.c
#, c-format
msgid "created a copy of a misnamed branch '%s'"
-msgstr "已為誤命名的分支「%s」建立拷貝"
+msgstr "已為誤命名的分支「%s」建立複本"
#: builtin/branch.c
#, c-format
msgid "renamed a misnamed branch '%s' away"
-msgstr "已更改誤命名的分支「%s」的名稱"
+msgstr "已將誤命名的分支「%s」重新命名"
#: builtin/branch.c
#, c-format
msgid "branch renamed to %s, but HEAD is not updated"
-msgstr "分支已重新命名為 %s，但 HEAD 指標尚未更新"
+msgstr "分支已重新命名為 %s，但 HEAD 指標並未更新"
#: builtin/branch.c
msgid "branch is renamed, but update of config-file failed"
-msgstr "分支已重新命名，但無法更新組態檔案"
+msgstr "分支已重新命名，但組態檔案更新失敗"
#: builtin/branch.c
msgid "branch is copied, but update of config-file failed"
-msgstr "分支已拷貝，但無法更新組態檔案"
+msgstr "分支已拷貝，但組態檔案更新失敗"
#: builtin/branch.c
#, c-format
@@ -3550,9 +3561,9 @@
" %s\n"
"Lines starting with '%s' will be stripped.\n"
msgstr ""
-"請編輯下述分支的描述\n"
+"請編輯以下分支的描述\n"
" %s\n"
-"開頭是「%s」的列將被刪除。\n"
+"開頭是「%s」的列將被濾除。\n"
#: builtin/branch.c
msgid "Generic options"
@@ -3628,7 +3639,7 @@
#: builtin/branch.c builtin/for-each-ref.c builtin/tag.c
msgid "do not output a newline after empty formatted refs"
-msgstr "在格式化結果為空的引用之後，不要輸出換列符號"
+msgstr "在格式化為空字串的引用之後不輸出換列符號"
#: builtin/branch.c
msgid "copy a branch and its reflog"
@@ -3724,11 +3735,11 @@
#: builtin/branch.c
msgid "cannot copy the current branch while not on any"
-msgstr "不在任何分支上，無法拷貝目前分支"
+msgstr "不在任何分支上，不能拷貝目前分支"
#: builtin/branch.c
msgid "cannot rename the current branch while not on any"
-msgstr "不在任何分支上，無法重新命名目前分支"
+msgstr "不在任何分支上，不能重新命名目前分支"
#: builtin/branch.c
msgid "too many branches for a copy operation"
@@ -3746,7 +3757,7 @@
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch"
-msgstr "無法將 HEAD 的上游設為 %s：其未指向任何分支"
+msgstr "HEAD 不指向任何分支時無法將其上游設為 %s"
#: builtin/branch.c
#, c-format
@@ -3764,7 +3775,7 @@
#: builtin/branch.c
msgid "could not unset upstream of HEAD when it does not point to any branch"
-msgstr "無法取消設定 HEAD 的上游：其未指向任何分支"
+msgstr "HEAD 不指向任何分支時無法取消設定其上游"
#: builtin/branch.c
#, c-format
@@ -3777,7 +3788,7 @@
"Did you mean to use: -a|-r --list <pattern>?"
msgstr ""
"「git branch」的 -a 和 -r 選項不取分支名稱。\n"
-"您是想使用：-a|-r --list <pattern> 嗎？"
+"您是想使用：-a|-r --list <模式> 嗎？"
#: builtin/branch.c
msgid ""
@@ -3846,8 +3857,8 @@
"請檢閱臭蟲報告下方的剩餘部分。\n"
"您可刪除任何您不想分享的地方。\n"
-#: builtin/bugreport.c builtin/commit.c builtin/fast-export.c builtin/rebase.c
-#: parse-options.h
+#: builtin/bugreport.c builtin/commit.c builtin/fast-export.c
+#: builtin/pack-objects.c builtin/rebase.c parse-options.h
msgid "mode"
msgstr "mode"
@@ -4003,7 +4014,6 @@
msgstr "git cat-file <type> <object>"
#: builtin/cat-file.c
-#| msgid "git cat-file (-e | -p) <object>"
msgid "git cat-file (-e | -p | -t | -s) <object>"
msgstr "git cat-file (-e | -p | -t | -s) <object>"
@@ -4124,7 +4134,7 @@
#: builtin/cat-file.c
msgid "objects filter only supported in batch mode"
-msgstr "物件過濾器僅支援批次模式"
+msgstr "僅批次模式支援物件過濾器"
#: builtin/cat-file.c
#, c-format
@@ -4205,7 +4215,7 @@
#: builtin/check-attr.c
msgid "which tree-ish to check attributes at"
-msgstr "要用哪一個樹狀物件檢查屬性"
+msgstr "要檢查屬性的樹狀物件指示元"
#: builtin/check-ignore.c builtin/checkout.c builtin/gc.c builtin/worktree.c
msgid "suppress progress reporting"
@@ -4253,7 +4263,7 @@
#: builtin/check-mailmap.c
msgid "read additional mailmap entries from file"
-msgstr "從檔案讀取其他 mailmap 項目"
+msgstr "從檔案讀取額外 mailmap 項目"
#: builtin/check-mailmap.c
msgid "blob"
@@ -4411,12 +4421,12 @@
#: builtin/checkout.c
#, c-format
msgid "'%s' or '%s' cannot be used with %s"
-msgstr "「%s」或「%s」無法與 %s 一起使用"
+msgstr "「%s」或「%s」不能與 %s 同時使用"
#: builtin/checkout.c
#, c-format
msgid "'%s', '%s', or '%s' cannot be used when checking out of a tree"
-msgstr "「%s」、「%s」或「%s」無法在簽出樹狀物件時使用"
+msgstr "「%s」、「%s」或「%s」不能在簽出樹狀物件時使用"
#: builtin/checkout.c
#, c-format
@@ -4427,7 +4437,7 @@
#: merge-ort.c reset.c sequencer.c tree-walk.c
#, c-format
msgid "unable to read tree (%s)"
-msgstr "無法讀取樹（%s）"
+msgstr "無法讀取樹狀物件（%s）"
#: builtin/checkout.c
msgid "you need to resolve your current index first"
@@ -4439,7 +4449,7 @@
"cannot continue with staged changes in the following files:\n"
"%s"
msgstr ""
-"無法繼續，下列檔案有暫存的更動：\n"
+"無法繼續，下列檔案有暫存的變更：\n"
"%s"
#: builtin/checkout.c
@@ -4620,53 +4630,53 @@
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
msgstr ""
-"無法在合併時切換分支\n"
-"請試試「git merge --quit」或「git worktree add」。"
+"不能在合併時切換分支\n"
+"請考慮使用「git merge --quit」或「git worktree add」。"
#: builtin/checkout.c
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
msgstr ""
-"無法在 am 工作階段期間時切換分支\n"
-"請試試「git am --quit」或「git worktree add」。"
+"不能在 am 工作階段中切換分支\n"
+"請考慮使用「git am --quit」或「git worktree add」。"
#: builtin/checkout.c
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
msgstr ""
-"無法在重定基底時切換分支\n"
-"請試試「git rebase --quit」或「git worktree add」。"
+"不能在重定基底時切換分支\n"
+"請考慮使用「git rebase --quit」或「git worktree add」。"
#: builtin/checkout.c
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
msgstr ""
-"無法在揀選時切換分支\n"
-"請試試「git cherry-pick --quit」或「git worktree add」。"
+"不能在揀選時切換分支\n"
+"請考慮使用「git cherry-pick --quit」或「git worktree add」。"
#: builtin/checkout.c
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
msgstr ""
-"無法在還原時切換分支\n"
-"請試試「git revert --quit」或「git worktree add」。"
+"不能在還原時切換分支\n"
+"請考慮使用「git revert --quit」或「git worktree add」。"
#: builtin/checkout.c
msgid "you are switching branch while bisecting"
-msgstr "您在進行二分搜尋時切換分支"
+msgstr "在進行二分搜尋時切換分支"
#: builtin/checkout.c
msgid "paths cannot be used with switching branches"
-msgstr "路徑不能與切換分支同時使用"
+msgstr "切換分支時不能指定路徑"
#: builtin/checkout.c
#, c-format
msgid "'%s' cannot be used with switching branches"
-msgstr "「%s」不能與切換分支同時使用"
+msgstr "切換分支時不能指定「%s」"
#: builtin/checkout.c
#, c-format
@@ -4681,12 +4691,12 @@
#: builtin/checkout.c
#, c-format
msgid "'%s' cannot take <start-point>"
-msgstr "「%s」不取 <start-point>"
+msgstr "「%s」不能與 <start-point> 同時使用"
#: builtin/checkout.c
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
-msgstr "無法將分支切換至非提交項目「%s」"
+msgstr "不能將分支切換至非提交的「%s」"
#: builtin/checkout.c
msgid "missing branch or commit argument"
@@ -4711,7 +4721,7 @@
#: builtin/checkout.c builtin/worktree.c
msgid "detach HEAD at named commit"
-msgstr "自指定提交分離 HEAD 指標"
+msgstr "使 HEAD 指標在指定提交分離"
#: builtin/checkout.c
msgid "force checkout (throw away local modifications)"
@@ -4731,24 +4741,24 @@
#: builtin/checkout.c
msgid "do not check if another worktree is using this branch"
-msgstr "不檢查其他工作區是否正在使用此分支"
+msgstr "不檢查是否有其他工作區在使用此分支"
#: builtin/checkout.c
msgid "checkout our version for unmerged files"
-msgstr "對尚未合併的檔案簽出我們的版本"
+msgstr "簽出未合併檔案的我方版本"
#: builtin/checkout.c
msgid "checkout their version for unmerged files"
-msgstr "對尚未合併的檔案簽出他們的版本"
+msgstr "簽出未合併檔案的他方版本"
#: builtin/checkout.c
msgid "do not limit pathspecs to sparse entries only"
-msgstr "對路徑規格不做稀疏簽出的限制"
+msgstr "不將路徑規格限制為僅稀疏項目"
#: builtin/checkout.c
#, c-format
msgid "options '-%c', '-%c', and '%s' cannot be used together"
-msgstr "「-%c」、「-%c」和「%s」選項不得同時使用"
+msgstr "「-%c」、「-%c」和「%s」選項不能同時使用"
#: builtin/checkout.c
msgid "--track needs a branch name"
@@ -4757,7 +4767,7 @@
#: builtin/checkout.c
#, c-format
msgid "missing branch name; try -%c"
-msgstr "缺少分支名稱，請嘗試 -%c"
+msgstr "缺少分支名稱；請嘗試 -%c"
#: builtin/checkout.c
#, c-format
@@ -4766,25 +4776,24 @@
#: builtin/checkout.c
msgid "invalid path specification"
-msgstr "無效的路徑規格"
+msgstr "路徑規格無效"
#: builtin/checkout.c
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
-msgstr "「%s」不是提交，因此不能以這為基礎建立「%s」分支"
+msgstr "「%s」不是提交，不能建立以其為基底的分支「%s」"
#: builtin/checkout.c
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
-msgstr "git checkout：--detach 不取路徑引數「%s」"
+msgstr "git checkout: --detach 不取路徑引數「%s」"
#: builtin/checkout.c
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgstr ""
-"git checkout：在從索引簽出時，--ours/--theirs、--force\n"
-"和 --merge 不相容。"
+"git checkout: 從索引簽出時，--ours/--theirs、--force 和 --merge 不相容。"
#: builtin/checkout.c
msgid "you must specify path(s) to restore"
@@ -4809,7 +4818,7 @@
#: builtin/checkout.c
msgid "second guess 'git checkout <no-such-branch>' (default)"
-msgstr "二次猜測「git checkout <無此分支>」（預設值）"
+msgstr "接著猜測「git checkout <不存在的分支>」（預設值）"
#: builtin/checkout.c
msgid "use overlay mode (default)"
@@ -5074,7 +5083,7 @@
#: builtin/clone.c
#, c-format
msgid "failed to copy file to '%s'"
-msgstr "複製檔案至「%s」失敗"
+msgstr "拷貝檔案至「%s」失敗"
#: builtin/clone.c refs/files-backend.c
#, c-format
@@ -6255,25 +6264,27 @@
#: builtin/config.c
msgid ""
"git config get [<file-option>] [<display-option>] [--includes] [--all] [--"
-"regexp] [--value=<value>] [--fixed-value] [--default=<default>] <name>"
+"regexp] [--value=<pattern>] [--fixed-value] [--default=<default>] [--"
+"url=<url>] <name>"
msgstr ""
-"git config get [<檔案選項>] [<顯示選項>] [--includes] [--all] [--regexp] [--"
-"value=<值>] [--fixed-value] [--default=<預設值>] <名稱>"
+"git config get [<file-option>] [<display-option>] [--includes] [--all] [--"
+"regexp] [--value=<pattern>] [--fixed-value] [--default=<default>] [--"
+"url=<url>] <name>"
#: builtin/config.c
msgid ""
-"git config set [<file-option>] [--type=<type>] [--all] [--value=<value>] [--"
-"fixed-value] <name> <value>"
+"git config set [<file-option>] [--type=<type>] [--all] [--value=<pattern>] "
+"[--fixed-value] <name> <value>"
msgstr ""
-"git config set [<檔案選項>] [--type=<類型>] [--all] [--value=<值>] [--fixed-"
-"value] <名稱> <值>"
+"git config set [<file-option>] [--type=<type>] [--all] [--value=<pattern>] "
+"[--fixed-value] <name> <value>"
#: builtin/config.c
msgid ""
-"git config unset [<file-option>] [--all] [--value=<value>] [--fixed-value] "
+"git config unset [<file-option>] [--all] [--value=<pattern>] [--fixed-value] "
"<name>"
msgstr ""
-"git config unset [<file-option>] [--all] [--value=<value>] [--fixed-value] "
+"git config unset [<file-option>] [--all] [--value=<pattern>] [--fixed-value] "
"<name>"
#: builtin/config.c
@@ -6295,19 +6306,20 @@
#: builtin/config.c
msgid ""
"git config get [<file-option>] [<display-option>] [--includes] [--all] [--"
-"regexp=<regexp>] [--value=<value>] [--fixed-value] [--default=<default>] "
+"regexp=<regexp>] [--value=<pattern>] [--fixed-value] [--default=<default>] "
"<name>"
msgstr ""
-"git config get [<檔案選項>] [<顯示選項>] [--includes] [--all] [--regexp=<常規"
-"表示式>] [--value=<值>] [--fixed-value] [--default=<預設值>] <名稱>"
+"git config get [<file-option>] [<display-option>] [--includes] [--all] [--"
+"regexp=<regexp>] [--value=<pattern>] [--fixed-value] [--default=<default>] "
+"<name>"
#: builtin/config.c
msgid ""
"git config set [<file-option>] [--type=<type>] [--comment=<message>] [--all] "
-"[--value=<value>] [--fixed-value] <name> <value>"
+"[--value=<pattern>] [--fixed-value] <name> <value>"
msgstr ""
-"git config set [<檔案選項>] [--type=<類型>] [--comment=<備註>] [--all] [--"
-"value=<值>] [--fixed-value] <名稱> <值>"
+"git config set [<file-option>] [--type=<type>] [--comment=<message>] [--all] "
+"[--value=<pattern>] [--fixed-value] <name> <value>"
#: builtin/config.c
msgid "Config file location"
@@ -6934,7 +6946,6 @@
msgstr "無法解析物件 ID：%s"
#: builtin/diff-pairs.c
-#| msgid "git repack [<options>]"
msgid "git diff-pairs -z [<diff-options>]"
msgstr "git diff-pairs -z [<diff-options>]"
@@ -6975,7 +6986,7 @@
#: builtin/diff-pairs.c
#, c-format
msgid "unable to parse rename/copy score: %s"
-msgstr "無法解析重新命名/複製分數：%s"
+msgstr "無法解析重新命名/拷貝分數：%s"
#: builtin/diff-pairs.c
#, c-format
@@ -7068,7 +7079,7 @@
#: builtin/difftool.c sequencer.c
#, c-format
msgid "could not copy '%s' to '%s'"
-msgstr "無法將「%s」複製到「%s」"
+msgstr "無法將「%s」拷貝至「%s」"
#: builtin/difftool.c
#, c-format
@@ -7379,27 +7390,6 @@
msgstr "已拒絕 %s，不允許更新淺複製"
#: builtin/fetch.c
-#, c-format
-msgid ""
-"some local refs could not be updated; try running\n"
-" 'git remote prune %s' to remove any old, conflicting branches"
-msgstr ""
-"一些本機引用不能被更新；嘗試執行\n"
-" 'git remote prune %s' 來刪除舊的、有衝突的分支"
-
-# 譯者：請維持前導空格
-#: builtin/fetch.c
-#, c-format
-msgid " (%s will become dangling)"
-msgstr " （%s 將成為懸空狀態）"
-
-# 譯者：請維持前導空格
-#: builtin/fetch.c
-#, c-format
-msgid " (%s has become dangling)"
-msgstr " （%s 已成為懸空狀態）"
-
-#: builtin/fetch.c
msgid "[deleted]"
msgstr "[已刪除]"
@@ -7422,7 +7412,7 @@
msgid "option \"%s\" is ignored for %s"
msgstr "選項「%s」被 %s 忽略"
-#: builtin/fetch.c object-store.c
+#: builtin/fetch.c odb.c
#, c-format
msgid "%s is not a valid object"
msgstr "%s 不是一個有效的物件"
@@ -7441,13 +7431,27 @@
"'git config set remote.%s.followRemoteHEAD warn-if-not-branch-%s'\n"
"will disable the warning until the remote changes HEAD to something else."
msgstr ""
-"執行「git remote set-head %s %s」來跟進此差異，或者\n"
+"執行「git remote set-head %s %s」來追蹤此差異，或者\n"
"如果您不想看到這則訊息，請將「remote.%s.followRemoteHEAD」組態選項\n"
"設定成別的值。更具體些來說，執行\n"
"「git config set remote.%s.followRemoteHEAD warn-if-not-branch-%s」\n"
"會停用這個警告，直到遠端將 HEAD 改為指向其他東西。"
#: builtin/fetch.c
+#, c-format
+msgid ""
+"some local refs could not be updated; try running\n"
+" 'git remote prune %s' to remove any old, conflicting branches"
+msgstr ""
+"一些本機引用不能被更新；嘗試執行\n"
+" 'git remote prune %s' 來刪除舊的、有衝突的分支"
+
+#: builtin/fetch.c
+#, c-format
+msgid "fetching ref %s failed: %s"
+msgstr "取回 %s 引用失敗：%s"
+
+#: builtin/fetch.c
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "檢測到多分支，和 --set-upstream 不相容"
@@ -7747,6 +7751,10 @@
msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]"
#: builtin/for-each-ref.c
+msgid "git for-each-ref [--start-after <marker>]"
+msgstr "git for-each-ref [--start-after <marker>]"
+
+#: builtin/for-each-ref.c
msgid "quote placeholders suitably for shells"
msgstr "引用占位符適用於 shells"
@@ -7766,6 +7774,14 @@
msgid "show only <n> matched refs"
msgstr "只顯示 <n> 個符合的引用"
+#: builtin/for-each-ref.c
+msgid "marker"
+msgstr "標記點"
+
+#: builtin/for-each-ref.c
+msgid "start iteration after the provided marker"
+msgstr "在指定標記點後開始迭代"
+
#: builtin/for-each-ref.c builtin/tag.c
msgid "respect format colors"
msgstr "遵照格式中的顏色輸出"
@@ -7799,9 +7815,17 @@
msgstr "包含 HEAD 引用和偽引用"
#: builtin/for-each-ref.c
+msgid "cannot use --start-after with custom sort options"
+msgstr "無法將 --start-after 和自訂排序選項結合使用"
+
+#: builtin/for-each-ref.c
msgid "unknown arguments supplied with --stdin"
msgstr "為 --stdin 提供的引數未知"
+#: builtin/for-each-ref.c
+msgid "cannot use --start-after with patterns"
+msgstr "--start-after 無法搭配 pattern 使用"
+
#: builtin/for-each-repo.c
msgid "git for-each-repo --config=<config> [--] <arguments>"
msgstr "git for-each-repo --config=<config> [--] <arguments>"
@@ -8040,11 +8064,6 @@
msgstr "正在檢查引用資料庫"
#: builtin/fsck.c
-#| msgid ""
-#| "git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n"
-#| " [--[no-]full] [--strict] [--verbose] [--lost-found]\n"
-#| " [--[no-]dangling] [--[no-]progress] [--connectivity-only]\n"
-#| " [--[no-]name-objects] [<object>...]"
msgid ""
"git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n"
" [--[no-]full] [--strict] [--verbose] [--lost-found]\n"
@@ -8309,6 +8328,10 @@
msgstr "將前綴打包並儲存為包含已剪除物件的包"
#: builtin/gc.c
+msgid "skip maintenance tasks typically done in the foreground"
+msgstr "略過通常在前景完成的維護作業"
+
+#: builtin/gc.c
#, c-format
msgid "failed to parse gc.logExpiry value %s"
msgstr "無法解析 gc.logExpiry 的值 %s"
@@ -8394,13 +8417,13 @@
#: builtin/gc.c
#, c-format
-msgid "lock file '%s' exists, skipping maintenance"
-msgstr "已存在 '%s' 鎖定檔案，略過維護"
+msgid "task '%s' failed"
+msgstr "作業 '%s' 失敗"
#: builtin/gc.c
#, c-format
-msgid "task '%s' failed"
-msgstr "作業 '%s' 失敗"
+msgid "lock file '%s' exists, skipping maintenance"
+msgstr "已存在 '%s' 鎖定檔案，略過維護"
#: builtin/gc.c
#, c-format
@@ -8441,10 +8464,6 @@
msgstr "執行指定作業"
#: builtin/gc.c
-msgid "use at most one of --auto and --schedule=<frequency>"
-msgstr "--auto 和 --schedule=<頻率> 請任選一"
-
-#: builtin/gc.c
#, c-format
msgid "unable to add '%s' value of '%s'"
msgstr "無法為「%2$s」的值加上「%1$s」"
@@ -9287,7 +9306,7 @@
#: builtin/index-pack.c
msgid "failed to feed local object to pack-objects"
-msgstr "無法將本機物件喂給 pack-objects"
+msgstr "無法將本機物件餵給 pack-objects"
#: builtin/index-pack.c
msgid "index-pack: Expecting full hex object ID lines only from pack-objects."
@@ -9540,11 +9559,6 @@
#: builtin/log.c
#, c-format
-msgid "Final output: %d %s\n"
-msgstr "最終輸出：%d %s\n"
-
-#: builtin/log.c
-#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: 損壞的檔案"
@@ -10155,7 +10169,7 @@
#: builtin/mailinfo.c
msgid "copy Message-ID to the end of commit message"
-msgstr "複製 Message-ID 至提交說明末尾"
+msgstr "拷貝 Message-ID 至提交說明末尾"
#: builtin/mailinfo.c
msgid "re-code metadata to i18n.commitEncoding"
@@ -10448,6 +10462,10 @@
msgstr "（和 --stat 同義）"
#: builtin/merge.c builtin/pull.c
+msgid "show a compact-summary at the end of the merge"
+msgstr "在合併結尾顯示精要摘要 (compact-summary)"
+
+#: builtin/merge.c builtin/pull.c
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr "在合併提交說明中新增（最多 <n> 條）精簡提交記錄"
@@ -10777,11 +10795,6 @@
#: builtin/mktag.c
#, c-format
-msgid "%d (FSCK_IGNORE?) should never trigger this callback"
-msgstr "%d (FSCK_IGNORE?) 不應觸發這個回呼函式"
-
-#: builtin/mktag.c
-#, c-format
msgid "could not read tagged object '%s'"
msgstr "無法讀取有標籤的物件「%s」"
@@ -10873,12 +10886,10 @@
msgstr "在 repack 期間，將較小尺寸的包檔案收集到大於此大小的批次中"
#: builtin/mv.c
-#| msgid "git mv [<options>] <source>... <destination>"
msgid "git mv [-v] [-f] [-n] [-k] <source> <destination>"
msgstr "git mv [-v] [-f] [-n] [-k] <source> <destination>"
#: builtin/mv.c
-#| msgid "git mv [<options>] <source>... <destination>"
msgid "git mv [-v] [-f] [-n] [-k] <source>... <destination-directory>"
msgstr "git mv [-v] [-f] [-n] [-k] <source>... <destination-directory>"
@@ -11047,7 +11058,7 @@
#: builtin/notes.c
msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
-msgstr "git notes [--ref <註解引用>] copy [-f] <來源物件> <目標物件>"
+msgstr "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
#: builtin/notes.c
msgid ""
@@ -11094,11 +11105,11 @@
#: builtin/notes.c
msgid "git notes copy [<options>] <from-object> <to-object>"
-msgstr "git notes copy [<選項>] <來源物件> <目標物件>"
+msgstr "git notes copy [<options>] <from-object> <to-object>"
#: builtin/notes.c
msgid "git notes copy --stdin [<from-object> <to-object>]..."
-msgstr "git notes copy --stdin [<來源物件> <目標物件>]..."
+msgstr "git notes copy --stdin [<from-object> <to-object>]..."
#: builtin/notes.c
msgid "git notes append [<options>] [<object>]"
@@ -11181,7 +11192,7 @@
#: builtin/notes.c
#, c-format
msgid "failed to copy notes from '%s' to '%s'"
-msgstr "從 '%s' 複製註解到 '%s' 時失敗"
+msgstr "將註解從「%s」拷貝至「%s」失敗"
#. TRANSLATORS: the first %s will be replaced by a git
#. notes command: 'add', 'merge', 'remove', etc.
@@ -11270,12 +11281,12 @@
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
-msgstr "不能複製註解。發現物件 %s 已存在註解。使用 '-f' 覆蓋現存註解"
+msgstr "無法拷貝註解。物件 %s 已有註解。使用「-f」覆寫現有的註解"
#: builtin/notes.c
#, c-format
msgid "missing notes on source object %s. Cannot copy."
-msgstr "來源物件 %s 缺少註解。不能複製。"
+msgstr "來源物件 %s 缺少註解。無法拷貝。"
#: builtin/notes.c
#, c-format
@@ -11426,13 +11437,26 @@
msgstr "未知子指令：「%s」"
#: builtin/pack-objects.c
-msgid "git pack-objects --stdout [<options>] [< <ref-list> | < <object-list>]"
-msgstr "git pack-objects --stdout [<選項>] [< <引用列表> | < <物件列表>]"
-
-#: builtin/pack-objects.c
msgid ""
-"git pack-objects [<options>] <base-name> [< <ref-list> | < <object-list>]"
-msgstr "git pack-objects [<選項>] <前綴名稱> [< <引用列表> | < <物件列表>]"
+"git pack-objects [-q | --progress | --all-progress] [--all-progress-"
+"implied]\n"
+" [--no-reuse-delta] [--delta-base-offset] [--non-empty]\n"
+" [--local] [--incremental] [--window=<n>] [--depth=<n>]\n"
+" [--revs [--unpacked | --all]] [--keep-pack=<pack-name>]\n"
+" [--cruft] [--cruft-expiration=<time>]\n"
+" [--stdout [--filter=<filter-spec>] | <base-name>]\n"
+" [--shallow] [--keep-true-parents] [--[no-]sparse]\n"
+" [--name-hash-version=<n>] [--path-walk] < <object-list>"
+msgstr ""
+"git pack-objects [-q | --progress | --all-progress] [--all-progress-"
+"implied]\n"
+" [--no-reuse-delta] [--delta-base-offset] [--non-empty]\n"
+" [--local] [--incremental] [--window=<n>] [--depth=<n>]\n"
+" [--revs [--unpacked | --all]] [--keep-pack=<pack-name>]\n"
+" [--cruft] [--cruft-expiration=<time>]\n"
+" [--stdout [--filter=<filter-spec>] | <base-name>]\n"
+" [--shallow] [--keep-true-parents] [--[no-]sparse]\n"
+" [--name-hash-version=<n>] [--path-walk] < <object-list>"
#: builtin/pack-objects.c
#, c-format
@@ -11561,6 +11585,16 @@
msgstr "無法獲得物件 %s 類型"
#: builtin/pack-objects.c
+msgid "Compressing objects by path"
+msgstr "正在根據路徑壓縮物件"
+
+#: builtin/pack-objects.c
+#, c-format
+msgid "Path-based delta compression using up to %d thread"
+msgid_plural "Path-based delta compression using up to %d threads"
+msgstr[0] "使用最多 %d 個執行緒進行路徑式差異壓縮"
+
+#: builtin/pack-objects.c
msgid "Compressing objects"
msgstr "壓縮物件中"
@@ -11651,6 +11685,10 @@
msgstr "無法強制鬆散物件"
#: builtin/pack-objects.c
+msgid "failed to pack objects via path-walk"
+msgstr "無法使用 path-walk 封裝物件"
+
+#: builtin/pack-objects.c
#, c-format
msgid "not a rev '%s'"
msgstr "不是一個版本 '%s'"
@@ -11795,6 +11833,10 @@
msgstr "建立精簡包"
#: builtin/pack-objects.c
+msgid "use the path-walk API to walk objects when possible"
+msgstr "可行時使用 path-walk API 走訪物件"
+
+#: builtin/pack-objects.c
msgid "create packs suitable for shallow fetches"
msgstr "建立適合淺複製版本庫取得的包"
@@ -11864,7 +11906,12 @@
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "設定 pack.deltaCacheLimit 太高了，強制為 %d"
-#: builtin/pack-objects.c config.c
+#: builtin/pack-objects.c
+#, c-format
+msgid "cannot use %s with %s"
+msgstr "無法將 %s 與 %s 一起使用"
+
+#: builtin/pack-objects.c environment.c
#, c-format
msgid "bad pack compression level %d"
msgstr "錯誤的打包壓縮級別 %d"
@@ -11882,10 +11929,6 @@
msgstr "--thin 不能用於建立一個可索引包"
#: builtin/pack-objects.c
-msgid "cannot use --filter with --stdin-packs"
-msgstr "無法將 --filter 及 --stdin-packs 結合使用"
-
-#: builtin/pack-objects.c
msgid "cannot use internal rev list with --stdin-packs"
msgstr "無法將內部版本清單與 --stdin-packs 結合使用"
@@ -11894,10 +11937,6 @@
msgstr "無法透過 --cruft 使用內部修訂清單"
#: builtin/pack-objects.c
-msgid "cannot use --stdin-packs with --cruft"
-msgstr "無法將 --stdin-packs 與 --cruft 組合使用"
-
-#: builtin/pack-objects.c
msgid "Enumerating objects"
msgstr "枚舉物件"
@@ -11910,24 +11949,6 @@
"總共 %<PRIu32> (差異 %<PRIu32>)，復用 %<PRIu32> (差異 %<PRIu32>)，重用包 "
"%<PRIu32> (總共 %<PRIuMAX>)"
-#: builtin/pack-redundant.c
-msgid ""
-"'git pack-redundant' is nominated for removal.\n"
-"If you still use this command, please add an extra\n"
-"option, '--i-still-use-this', on the command line\n"
-"and let us know you still use it by sending an e-mail\n"
-"to <git@vger.kernel.org>. Thanks.\n"
-msgstr ""
-"「git pack-redundant」已被提名準備移除。\n"
-"如果您仍在使用這條命令，請在命令列多加一個選項\n"
-"「--i-still-use-this」，然後寄封電子信到\n"
-"<git@vger.kernel.org> 讓我們知道您還在使用。\n"
-"感謝。\n"
-
-#: builtin/pack-redundant.c
-msgid "refusing to run without --i-still-use-this"
-msgstr "傳入 --i-still-use-this 前拒絕執行"
-
#: builtin/pack-refs.c
msgid ""
"git pack-refs [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude "
@@ -13451,6 +13472,16 @@
msgstr "未知的 --mirror 引數：%s"
#: builtin/remote.c
+#, c-format
+msgid "remote name '%s' is a subset of existing remote '%s'"
+msgstr "名為「%s」的遠端是「%s」現有遠端的子集"
+
+#: builtin/remote.c
+#, c-format
+msgid "remote name '%s' is a superset of existing remote '%s'"
+msgstr "名為「%s」的遠端是「%s」現有遠端的超集"
+
+#: builtin/remote.c
msgid "fetch the remote branches"
msgstr "抓取遠端的分支"
@@ -13812,18 +13843,6 @@
msgid "Could not set up %s"
msgstr "無法配置 %s"
-# 譯者：請維持前導空格
-#: builtin/remote.c
-#, c-format
-msgid " %s will become dangling!"
-msgstr " %s 將成為懸空狀態！"
-
-# 譯者：請維持前導空格
-#: builtin/remote.c
-#, c-format
-msgid " %s has become dangling!"
-msgstr " %s 已成為懸空狀態！"
-
#: builtin/remote.c
#, c-format
msgid "Pruning %s"
@@ -13907,11 +13926,11 @@
msgid ""
"git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"
"[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n"
-"[--write-midx] [--name-hash-version=<n>]"
+"[--write-midx] [--name-hash-version=<n>] [--path-walk]"
msgstr ""
"git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"
"[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n"
-"[--write-midx] [--name-hash-version=<n>]"
+"[--write-midx] [--name-hash-version=<n>] [--path-walk]"
#: builtin/repack.c
msgid ""
@@ -14013,6 +14032,10 @@
msgstr "指定要用來以路徑為相似物件分組的名稱雜湊版本"
#: builtin/repack.c
+msgid "pass --path-walk to git-pack-objects"
+msgstr "將 --path-walk 傳遞給 git-pack-objects"
+
+#: builtin/repack.c
msgid "do not run git-update-server-info"
msgstr "不執行 git-update-server-info"
@@ -15429,20 +15452,28 @@
msgstr "git stash create [<message>]"
#: builtin/stash.c
+msgid "git stash export (--print | --to-ref <ref>) [<stash>...]"
+msgstr "git stash export (--print | --to-ref <ref>) [<stash>...]"
+
+#: builtin/stash.c
+msgid "git stash import <commit>"
+msgstr "git stash import <commit>"
+
+#: builtin/stash.c
#, c-format
msgid "'%s' is not a stash-like commit"
msgstr "'%s' 不像是一個貯存提交"
#: builtin/stash.c
+msgid "No stash entries found."
+msgstr "未發現貯存條目。"
+
+#: builtin/stash.c
#, c-format
msgid "Too many revisions specified:%s"
msgstr "指定了太多的版本：%s"
#: builtin/stash.c
-msgid "No stash entries found."
-msgstr "未發現貯存條目。"
-
-#: builtin/stash.c
#, c-format
msgid "%s is not a valid reference"
msgstr "%s 不是一個有效的引用名"
@@ -15637,6 +15668,86 @@
msgid "include ignore files"
msgstr "包含忽略的檔案"
+#: builtin/stash.c
+#, c-format
+msgid "cannot parse commit %s"
+msgstr "無法解析提交 %s"
+
+#: builtin/stash.c
+#, c-format
+msgid "invalid author or committer for %s"
+msgstr "%s 的作者或提交者無效"
+
+#: builtin/stash.c
+msgid "could not write commit"
+msgstr "無法寫入提交"
+
+#: builtin/stash.c
+#, c-format
+msgid "not a valid revision: %s"
+msgstr "不是有效的修訂版：%s"
+
+#: builtin/stash.c
+#, c-format
+msgid "not a commit: %s"
+msgstr "不是提交：%s"
+
+#: builtin/stash.c
+#, c-format
+msgid "%s is not a valid exported stash commit"
+msgstr "%s 不是有效的匯出貯存提交"
+
+#: builtin/stash.c
+#, c-format
+msgid "found root commit %s with invalid data"
+msgstr "找到 %s 根提交，內有無效資料"
+
+#: builtin/stash.c
+#, c-format
+msgid "found stash commit %s without expected prefix"
+msgstr "找到 %s 貯存提交，裡面缺少預期的前綴"
+
+#: builtin/stash.c
+#, c-format
+msgid "cannot parse parents of commit: %s"
+msgstr "無法解析提交的父物件：%s"
+
+#: builtin/stash.c
+#, c-format
+msgid "%s does not look like a stash commit"
+msgstr "%s 似乎不是貯存提交"
+
+#: builtin/stash.c
+#, c-format
+msgid "cannot read commit buffer for %s"
+msgstr "無法讀取 %s 的提交緩衝區"
+
+#: builtin/stash.c
+#, c-format
+msgid "cannot save the stash for %s"
+msgstr "無法儲存 %s 的貯存"
+
+#: builtin/stash.c
+msgid "unable to write base commit"
+msgstr "無法寫入基礎提交"
+
+#: builtin/stash.c
+#, c-format
+msgid "unable to find stash entry %s"
+msgstr "找不到貯存項目 %s"
+
+#: builtin/stash.c
+msgid "print the object ID instead of writing it to a ref"
+msgstr "輸出物件 ID 而非將其寫入引用"
+
+#: builtin/stash.c
+msgid "save the data to the given ref"
+msgstr "將資料存入指定引用"
+
+#: builtin/stash.c
+msgid "exactly one of --print and --to-ref is required"
+msgstr "需要指定 --print 或 --to-ref 其中一個"
+
#: builtin/stripspace.c
msgid "skip and remove all lines starting with comment character"
msgstr "略過和移除所有的備註行"
@@ -15647,8 +15758,10 @@
#: builtin/submodule--helper.c
#, c-format
-msgid "Expecting a full ref name, got %s"
-msgstr "期望一個完整的引用名稱，卻得到 %s"
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr "找不到「%s」組態設定。假定這個版本庫是其自身的官方上游。"
#: builtin/submodule--helper.c
#, c-format
@@ -15657,13 +15770,6 @@
#: builtin/submodule--helper.c
#, c-format
-msgid ""
-"could not look up configuration '%s'. Assuming this repository is its own "
-"authoritative upstream."
-msgstr "找不到「%s」組態設定。假定這個版本庫是其自身的官方上游。"
-
-#: builtin/submodule--helper.c
-#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "在 .gitmodules 中未找到子模組 '%s' 的 url"
@@ -15920,7 +16026,7 @@
#: builtin/submodule--helper.c submodule.c
#, c-format
msgid "refusing to create/use '%s' in another submodule's git dir"
-msgstr "拒絕在其他子模組的 git 路徑建立／使用「%s」"
+msgstr "拒絕在其他子模組的 git 目錄中建立/使用「%s」"
#: builtin/submodule--helper.c
#, c-format
@@ -16080,6 +16186,11 @@
#: builtin/submodule--helper.c
#, c-format
+msgid "Expecting a full ref name, got %s"
+msgstr "期望一個完整的引用名稱，卻得到 %s"
+
+#: builtin/submodule--helper.c
+#, c-format
msgid "Unable to find current revision in submodule path '%s'"
msgstr "無法在子模組路徑「%s」中尋找目前的修訂版本"
@@ -16325,6 +16436,11 @@
#: builtin/submodule--helper.c
#, c-format
+msgid "submodule name '%s' already used for path '%s'"
+msgstr "「%s」子模組名稱已被「%s」路徑使用"
+
+#: builtin/submodule--helper.c
+#, c-format
msgid "'%s' is not a valid submodule name"
msgstr "「%s」不是有效的子模組名稱"
@@ -16856,7 +16972,6 @@
msgstr "git update-ref [<options>] <refname> <new-oid> [<old-oid>]"
#: builtin/update-ref.c
-#| msgid "git update-ref [<options>] --stdin [-z]"
msgid "git update-ref [<options>] --stdin [-z] [--batch-updates]"
msgstr "git update-ref [<options>] --stdin [-z] [--batch-updates]"
@@ -17054,12 +17169,12 @@
#: builtin/worktree.c
#, c-format
msgid "failed to copy '%s' to '%s'; sparse-checkout may not work correctly"
-msgstr "無法將「%s」複製到「%s」；稀疏簽出可能無法正常運作"
+msgstr "將「%s」拷貝至「%s」失敗；稀疏簽出可能無法正常運作"
#: builtin/worktree.c
#, c-format
msgid "failed to copy worktree config from '%s' to '%s'"
-msgstr "無法將工作區組態從「%s」複製到「%s」"
+msgstr "將工作區組態從「%s」拷貝至「%s」失敗"
#: builtin/worktree.c
#, c-format
@@ -17097,11 +17212,6 @@
#: builtin/worktree.c
#, c-format
-msgid "unreachable: invalid reference: %s"
-msgstr "不可達：無效引用：%s"
-
-#: builtin/worktree.c
-#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "準備工作區（分離開頭指標 %s）"
@@ -17629,7 +17739,7 @@
#: command-list.h
msgid "Copy files from the index to the working tree"
-msgstr "從索引複製檔案到工作區"
+msgstr "從索引區拷貝檔案至工作區"
#: command-list.h
msgid "Find commits yet to be applied to upstream"
@@ -18804,7 +18914,7 @@
#: compat/mingw.c
#, c-format
msgid "failed to copy SID (%ld)"
-msgstr "無法複製 SID (%ld)"
+msgstr "拷貝 SID 失敗（%ld）"
#: compat/mingw.c
#, c-format
@@ -19113,16 +19223,6 @@
#: config.c
#, c-format
-msgid "invalid value for variable %s"
-msgstr "%s 變數的值無效"
-
-#: config.c
-#, c-format
-msgid "ignoring unknown core.fsync component '%s'"
-msgstr "忽略未知的 core.fsync 元件「%s」"
-
-#: config.c
-#, c-format
msgid "bad boolean config value '%s' for '%s'"
msgstr "「%2$s」的「%1$s」布林設定值無效"
@@ -19138,54 +19238,6 @@
#: config.c
#, c-format
-msgid "abbrev length out of range: %d"
-msgstr "縮寫長度超出範圍：%d"
-
-#: config.c
-#, c-format
-msgid "bad zlib compression level %d"
-msgstr "錯誤的 zlib 壓縮級別 %d"
-
-#: config.c
-#, c-format
-msgid "%s cannot contain newline"
-msgstr "%s 不能包含換行符號"
-
-#: config.c
-#, c-format
-msgid "%s must have at least one character"
-msgstr "%s 得有至少 1 個字元"
-
-#: config.c
-#, c-format
-msgid "ignoring unknown core.fsyncMethod value '%s'"
-msgstr "忽略未知的 core.fsyncMethod 值「%s」"
-
-#: config.c
-msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
-msgstr "core.fsyncObjectFiles 已棄用。請改用 core.fsync"
-
-#: config.c
-#, c-format
-msgid "invalid mode for object creation: %s"
-msgstr "無效的物件建立模式：%s"
-
-#: config.c
-#, c-format
-msgid "malformed value for %s"
-msgstr "%s 的取值格式錯誤"
-
-#: config.c
-#, c-format
-msgid "malformed value for %s: %s"
-msgstr "%s 的取值格式錯誤：%s"
-
-#: config.c
-msgid "must be one of nothing, matching, simple, upstream or current"
-msgstr "必須是其中之一：nothing、matching、simple、upstream 或 current"
-
-#: config.c
-#, c-format
msgid "unable to load config blob object '%s'"
msgstr "無法從資料物件 '%s' 載入設定"
@@ -19509,7 +19561,7 @@
msgid ""
"in the working copy of '%s', CRLF will be replaced by LF the next time Git "
"touches it"
-msgstr "在「%s」的工作複本中，下次 Git 接觸到時會用 LF 取代 CRLF"
+msgstr "下次 Git 存取「%s」的工作複本時會以 LF 取代 CRLF"
#: convert.c
#, c-format
@@ -19521,7 +19573,7 @@
msgid ""
"in the working copy of '%s', LF will be replaced by CRLF the next time Git "
"touches it"
-msgstr "在「%s」的工作複本中，下次 Git 接觸到時會用 CRLF 取代 LF"
+msgstr "下次 Git 存取「%s」的工作複本時會以 CRLF 取代 LF"
#: convert.c
#, c-format
@@ -19797,8 +19849,8 @@
msgstr "無法比對命名管線 (pipe) 和目錄"
#: diff-no-index.c
-msgid "git diff --no-index [<options>] <path> <path>"
-msgstr "git diff --no-index [<選項>] <路徑> <路徑>"
+msgid "git diff --no-index [<options>] <path> <path> [<pathspec>...]"
+msgstr "git diff --no-index [<options>] <path> <path> [<pathspec>...]"
#: diff-no-index.c
msgid ""
@@ -19806,6 +19858,12 @@
"tree"
msgstr "不是一個 git 版本庫。使用 --no-index 比較工作區之外的兩個路徑"
+#: diff-no-index.c
+msgid ""
+"Limiting comparison with pathspecs is only supported if both paths are "
+"directories."
+msgstr "只當兩個路徑都是目錄時，才支援使用路徑規格限制比較項目。"
+
# 譯者：請維持前導空格
#: diff.c
#, c-format
@@ -19984,7 +20042,7 @@
msgid "<n>"
msgstr "<n>"
-#: diff.c
+#: diff.c parse-options.h
msgid "generate diffs with <n> lines context"
msgstr "生成含 <n> 行上下文的差異"
@@ -20131,7 +20189,7 @@
msgid "use default prefixes a/ and b/"
msgstr "使用預設的前置名稱 a/ 和 b/"
-#: diff.c
+#: diff.c parse-options.h
msgid "show context between diff hunks up to the specified number of lines"
msgstr "顯示指定行數的差異區塊間的上下文"
@@ -20173,11 +20231,11 @@
#: diff.c
msgid "detect copies"
-msgstr "檢測複製"
+msgstr "檢測拷貝"
#: diff.c
msgid "use unmodified files as source to find copies"
-msgstr "使用未修改的檔案做為發現拷貝的來源"
+msgstr "使用未修改的檔案作為尋找拷貝的來源"
#: diff.c
msgid "disable rename detection"
@@ -20195,7 +20253,7 @@
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
-msgstr "如果重新命名/複製目標超過提供的限制，禁止重新命名/複製檢測"
+msgstr "如果重新命名/拷貝的目標數量超出提供的限度，則防止檢測重新命名/拷貝"
#: diff.c
msgid "Diff algorithm options"
@@ -20405,7 +20463,7 @@
#: diff.c
msgid "only found copies from modified paths due to too many files."
-msgstr "因為檔案太多，只在修改的路徑中尋找複製。"
+msgstr "因為檔案太多，只在有修改的路徑中尋找了複本。"
#: diff.c
#, c-format
@@ -20516,6 +20574,64 @@
msgid "bad git namespace path \"%s\""
msgstr "錯誤的 git 名字空間路徑 \"%s\""
+#: environment.c
+#, c-format
+msgid "invalid value for variable %s"
+msgstr "%s 變數的值無效"
+
+#: environment.c
+#, c-format
+msgid "ignoring unknown core.fsync component '%s'"
+msgstr "忽略未知的 core.fsync 元件「%s」"
+
+#: environment.c
+#, c-format
+msgid "abbrev length out of range: %d"
+msgstr "縮寫長度超出範圍：%d"
+
+#: environment.c
+#, c-format
+msgid "bad zlib compression level %d"
+msgstr "錯誤的 zlib 壓縮級別 %d"
+
+#: environment.c
+#, c-format
+msgid "%s cannot contain newline"
+msgstr "%s 不能包含換行符號"
+
+#: environment.c
+#, c-format
+msgid "%s must have at least one character"
+msgstr "%s 得有至少 1 個字元"
+
+#: environment.c
+#, c-format
+msgid "ignoring unknown core.fsyncMethod value '%s'"
+msgstr "忽略未知的 core.fsyncMethod 值「%s」"
+
+#: environment.c
+msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
+msgstr "core.fsyncObjectFiles 已棄用。請改用 core.fsync"
+
+#: environment.c
+#, c-format
+msgid "invalid mode for object creation: %s"
+msgstr "無效的物件建立模式：%s"
+
+#: environment.c
+#, c-format
+msgid "malformed value for %s"
+msgstr "%s 的取值格式錯誤"
+
+#: environment.c
+#, c-format
+msgid "malformed value for %s: %s"
+msgstr "%s 的取值格式錯誤：%s"
+
+#: environment.c
+msgid "must be one of nothing, matching, simple, upstream or current"
+msgstr "必須是其中之一：nothing、matching、simple、upstream 或 current"
+
#: exec-cmd.c
#, c-format
msgid "too many args to run %s"
@@ -21372,6 +21488,35 @@
msgid "name consists only of disallowed characters: %s"
msgstr "姓名中僅包含停用字元：%s"
+#: imap-send.c
+msgid "git imap-send [-v] [-q] [--[no-]curl] [(--folder|-f) <folder>] < <mbox>"
+msgstr ""
+"git imap-send [-v] [-q] [--[no-]curl] [(--folder|-f) <folder>] < <mbox>"
+
+#: imap-send.c
+msgid "no IMAP host specified"
+msgstr "沒有指定 IMAP 主機"
+
+#: imap-send.c
+msgid ""
+"set the IMAP host with 'git config imap.host <host>'.\n"
+"(e.g., 'git config imap.host imaps://imap.example.com')"
+msgstr ""
+"使用「git config imap.host <主機>」來設定 IMAP 主機。\n"
+"（比如「git config imap.host imaps://imap.example.com」）"
+
+#: imap-send.c
+msgid "no IMAP folder specified"
+msgstr "沒有指定 IMAP 資料夾"
+
+#: imap-send.c
+msgid ""
+"set the target folder with 'git config imap.folder <folder>'.\n"
+"(e.g., 'git config imap.folder Drafts')"
+msgstr ""
+"使用「git config imap.folder <資料夾>」指定目的地資料夾。\n"
+"（比如「git config imap.folder Drafts」）"
+
#: list-objects-filter-options.c
msgid "expected 'tree:<depth>'"
msgstr "期望 'tree:<深度>'"
@@ -22511,88 +22656,6 @@
msgid "invalid object name '%.*s'."
msgstr "'%.*s' 物件名稱無效。"
-#: object-store.c
-#, c-format
-msgid "object directory %s does not exist; check .git/objects/info/alternates"
-msgstr "物件目錄 %s 不存在，檢查 .git/objects/info/alternates"
-
-#: object-store.c
-#, c-format
-msgid "unable to normalize alternate object path: %s"
-msgstr "無法規範化備用物件路徑：%s"
-
-#: object-store.c
-#, c-format
-msgid "%s: ignoring alternate object stores, nesting too deep"
-msgstr "%s：忽略備用物件庫，嵌套太深"
-
-#: object-store.c
-msgid "unable to fdopen alternates lockfile"
-msgstr "無法 fdopen 取代鎖檔案"
-
-#: object-store.c
-msgid "unable to read alternates file"
-msgstr "無法讀取替代檔案"
-
-#: object-store.c
-msgid "unable to move new alternates file into place"
-msgstr "無法將新的替代檔案移動到位"
-
-#: object-store.c
-#, c-format
-msgid "path '%s' does not exist"
-msgstr "路徑 '%s' 不存在"
-
-#: object-store.c
-#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr "尚不支援將引用版本庫 '%s' 作為一個連結簽出。"
-
-#: object-store.c
-#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr "引用版本庫 '%s' 不是一個本機版本庫。"
-
-#: object-store.c
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr "引用版本庫 '%s' 是一個淺複製"
-
-#: object-store.c
-#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr "引用版本庫 '%s' 已被移植"
-
-#: object-store.c
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "找不到符合 %s 的物件目錄"
-
-#: object-store.c
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr "解析備用引用時無效的行：%s"
-
-#: object-store.c
-#, c-format
-msgid "replacement %s not found for %s"
-msgstr "找不到 %2$s 的替代 %1$s"
-
-#: object-store.c
-#, c-format
-msgid "packed object %s (stored in %s) is corrupt"
-msgstr "打包物件 %s（儲存在 %s）已損壞"
-
-#: object-store.c
-#, c-format
-msgid "missing mapping of %s to %s"
-msgstr "缺少 %s 到 %s 的映射"
-
-#: object-store.c
-#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr "%s 不是一個有效的 '%s' 物件"
-
#: object.c
#, c-format
msgid "invalid object type \"%s\""
@@ -22618,6 +22681,88 @@
msgid "hash mismatch %s"
msgstr "雜湊值與 %s 不符合"
+#: odb.c
+#, c-format
+msgid "object directory %s does not exist; check .git/objects/info/alternates"
+msgstr "物件目錄 %s 不存在，檢查 .git/objects/info/alternates"
+
+#: odb.c
+#, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr "無法規範化備用物件路徑：%s"
+
+#: odb.c
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
+msgstr "%s：忽略備用物件庫，嵌套太深"
+
+#: odb.c
+msgid "unable to fdopen alternates lockfile"
+msgstr "無法 fdopen 取代鎖檔案"
+
+#: odb.c
+msgid "unable to read alternates file"
+msgstr "無法讀取替代檔案"
+
+#: odb.c
+msgid "unable to move new alternates file into place"
+msgstr "無法將新的替代檔案移動到位"
+
+#: odb.c
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "路徑 '%s' 不存在"
+
+#: odb.c
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr "尚不支援將引用版本庫 '%s' 作為一個連結簽出。"
+
+#: odb.c
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "引用版本庫 '%s' 不是一個本機版本庫。"
+
+#: odb.c
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "引用版本庫 '%s' 是一個淺複製"
+
+#: odb.c
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "引用版本庫 '%s' 已被移植"
+
+#: odb.c
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "找不到符合 %s 的物件目錄"
+
+#: odb.c
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "解析備用引用時無效的行：%s"
+
+#: odb.c
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr "找不到 %2$s 的替代 %1$s"
+
+#: odb.c
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "打包物件 %s（儲存在 %s）已損壞"
+
+#: odb.c
+#, c-format
+msgid "missing mapping of %s to %s"
+msgstr "缺少 %s 到 %s 的映射"
+
+#: odb.c
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "%s 不是一個有效的 '%s' 物件"
+
#: pack-bitmap-write.c
#, c-format
msgid "duplicate entry when writing bitmap index: %s"
@@ -22632,10 +22777,6 @@
msgid "too many pseudo-merges"
msgstr "偽合併過多"
-#: pack-bitmap-write.c
-msgid "trying to write commit not in index"
-msgstr "嘗試寫入不在索引的提交"
-
#: pack-bitmap.c
msgid "failed to load bitmap index (corrupted?)"
msgstr "無法載入位圖索引（損壞？）"
@@ -22940,6 +23081,11 @@
#: parse-options.c
#, c-format
+msgid "value for %s exceeds %<PRIdMAX>"
+msgstr "%s 的值超過 %<PRIdMAX>"
+
+#: parse-options.c
+#, c-format
msgid "value %s for %s not in range [%<PRIdMAX>,%<PRIdMAX>]"
msgstr "%2$s 的數值 %1$s 不在 [%3$<PRIdMAX>,%4$<PRIdMAX>] 範圍內"
@@ -24091,6 +24237,18 @@
msgid "%s does not point to a valid object!"
msgstr "%s 沒有指向一個有效的物件！"
+# 譯者：請維持前導空格
+#: refs.c
+#, c-format
+msgid "%s%s will become dangling after %s is deleted\n"
+msgstr "在刪除 %3$s 之後，%1$s%2$s 將進入懸空狀態\n"
+
+# 譯者：請維持前導空格
+#: refs.c
+#, c-format
+msgid "%s%s has become dangling after %s was deleted\n"
+msgstr "在刪除 %3$s 後，%1$s%2$s 已經是懸空狀態\n"
+
#: refs.c
#, c-format
msgid ""
@@ -24324,7 +24482,7 @@
#: refs/reftable-backend.c
#, c-format
msgid "refname %s is a symbolic ref, copying it is not supported"
-msgstr "引用名稱 %s 是符號引用，不支援複製"
+msgstr "引用名稱 %s 是象徵式引用，不支援拷貝"
#: refspec.c
#, c-format
@@ -25047,9 +25205,6 @@
msgstr "指定是否要啟用背景維護模式"
#: scalar.c
-#| msgid ""
-#| "scalar clone [--single-branch] [--branch <main-branch>] [--full-clone]\n"
-#| "\t[--[no-]src] [--[no-]tags] <url> [<enlistment>]"
msgid ""
"scalar clone [--single-branch] [--branch <main-branch>] [--full-clone]\n"
"\t[--[no-]src] [--[no-]tags] [--[no-]maintenance] <url> [<enlistment>]"
@@ -25104,7 +25259,6 @@
msgstr "`scalar list` 未取引數"
#: scalar.c
-#| msgid "scalar register [<enlistment>]"
msgid "scalar register [--[no-]maintenance] [<enlistment>]"
msgstr "scalar register [--[no-]maintenance] [<enlistment>]"
@@ -25113,7 +25267,6 @@
msgstr "重新設定所有註冊的編列名單"
#: scalar.c
-#| msgid "enable/disable untracked cache"
msgid "(enable|disable|keep)"
msgstr "(enable|disable|keep)"
@@ -25122,7 +25275,6 @@
msgstr "指示調整背景維護模式的方式"
#: scalar.c
-#| msgid "scalar reconfigure [--all | <enlistment>]"
msgid ""
"scalar reconfigure [--maintenance=(enable|disable|keep)] [--all | "
"<enlistment>]"
@@ -25137,7 +25289,7 @@
#: scalar.c
#, c-format
msgid "unknown mode for --maintenance option: %s"
-msgstr "--maintenance 選項的值無效：%s"
+msgstr "提供的 --maintenance 模式無效：%s"
#: scalar.c
#, c-format
@@ -25534,7 +25686,7 @@
#: sequencer.c
msgid "detached HEAD"
-msgstr "分離 HEAD"
+msgstr "分離 HEAD 指標"
# 譯者：中文字串拼接，可刪除前導空格
#: sequencer.c
@@ -26460,7 +26612,7 @@
#: setup.c
#, c-format
msgid "cannot copy '%s' to '%s'"
-msgstr "不能複製 '%s' 至 '%s'"
+msgstr "無法將「%s」拷貝至「%s」"
#: setup.c
#, c-format
@@ -26475,7 +26627,7 @@
#: setup.c
#, c-format
msgid "not copying templates from '%s': %s"
-msgstr "沒有從 '%s' 複製範本：%s"
+msgstr "未從「%s」拷貝範本：%s"
#: setup.c
#, c-format
@@ -26877,8 +27029,12 @@
msgstr "切換是否剪除不重要路徑"
#: t/helper/test-path-walk.c
+msgid "toggle aggressive edge walk"
+msgstr "切換是否更激進地走訪邊"
+
+#: t/helper/test-path-walk.c
msgid "read a pattern list over stdin"
-msgstr "從標準輸入讀取模式清單"
+msgstr "從 stdin 讀取模式清單"
#: t/helper/test-reach.c
#, c-format
@@ -27184,7 +27340,7 @@
#: transport-helper.c
#, c-format
msgid "can't start thread for copying data: %s"
-msgstr "不能啟動執行緒來複製資料：%s"
+msgstr "無法啟動執行緒來拷貝資料: %s"
#: transport-helper.c
#, c-format
@@ -27198,7 +27354,7 @@
#: transport-helper.c
msgid "can't start thread for copying data"
-msgstr "不能啟動執行緒來複製資料"
+msgstr "無法啟動執行緒來拷貝資料"
#: transport.c
#, c-format
@@ -27627,6 +27783,24 @@
msgid "warning: "
msgstr "警告: "
+#: usage.c
+#, c-format
+msgid ""
+"'%s' is nominated for removal.\n"
+"If you still use this command, please add an extra\n"
+"option, '--i-still-use-this', on the command line\n"
+"and let us know you still use it by sending an e-mail\n"
+"to <git@vger.kernel.org>. Thanks.\n"
+msgstr ""
+"「%s」命令已被提名移除。\n"
+"如果您仍在使用該命令，請多加上「--i-still-use-this」\n"
+"選項，然後寄封電子郵件到 <git@vger.kernel.org>，\n"
+"讓我們知道您還在使用，謝謝。\n"
+
+#: usage.c
+msgid "refusing to run without --i-still-use-this"
+msgstr "傳入 --i-still-use-this 前拒絕執行"
+
#: version.c
#, c-format
msgid "uname() failed with error '%s' (%d)\n"
@@ -27674,7 +27848,7 @@
#: worktree.c
msgid ".git file absolute/relative path mismatch"
-msgstr ".git 檔案的絕對或相對路徑不一致"
+msgstr ".git 檔案的絕對/相對路徑不一致"
#: worktree.c
msgid "not a valid path"
@@ -27698,7 +27872,7 @@
#: worktree.c
msgid "gitdir absolute/relative path mismatch"
-msgstr "gitdir 的絕對或相對路徑不一致"
+msgstr "gitdir 的絕對/相對路徑不一致"
#: worktree.c
msgid "gitdir incorrect"
@@ -28307,7 +28481,7 @@
#: wt-status.c
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
-msgstr "無檔案要提交（建立/複製檔案並使用 \"git add\" 建立追蹤）\n"
+msgstr "沒有東西提交（建立/拷貝檔案並使用「git add」追蹤之）\n"
#: wt-status.c
#, c-format
@@ -28688,7 +28862,7 @@
#: git-send-email.perl
msgid "Send this email reply required"
-msgstr "傳送要求的信件回復"
+msgstr "傳送要求的信件回覆"
#: git-send-email.perl
msgid "The required SMTP server is not properly defined."
@@ -28775,6 +28949,11 @@
#: git-send-email.perl
#, perl-format
+msgid "error: invalid SMTP port '%s'\n"
+msgstr "錯誤：SMTP 連線埠「%s」無效\n"
+
+#: git-send-email.perl
+#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) 不能執行 '%s'"
@@ -28815,7 +28994,7 @@
#: git-send-email.perl
#, perl-format
msgid "unable to open %s: %s\n"
-msgstr "不能開啟 %s：%s\n"
+msgstr "無法開啟 %s: %s\n"
#: git-send-email.perl
#, perl-format
@@ -28829,7 +29008,7 @@
#: git-send-email.perl
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
-msgstr "略過 %s 含備份後綴 '%s'。\n"
+msgstr "略過具有備份後綴「%2$s」的 %1$s。\n"
#. TRANSLATORS: please keep "[y|N]" as is.
#: git-send-email.perl
@@ -28837,6 +29016,51 @@
msgid "Do you really want to send %s? [y|N]: "
msgstr "您真的要傳送 %s？[y|N]： "
+#~ msgid "start-after"
+#~ msgstr "start-after"
+
+#~ msgid "compact-summary"
+#~ msgstr "精要摘要 (compact-summary)"
+
+# 譯者：請維持前導空格
+#, c-format
+#~ msgid " (%s will become dangling)"
+#~ msgstr " （%s 將成為懸空狀態）"
+
+# 譯者：請維持前導空格
+#, c-format
+#~ msgid " (%s has become dangling)"
+#~ msgstr " （%s 已成為懸空狀態）"
+
+#~ msgid "use at most one of --auto and --schedule=<frequency>"
+#~ msgstr "--auto 和 --schedule=<頻率> 請任選一"
+
+#, c-format
+#~ msgid "Final output: %d %s\n"
+#~ msgstr "最終輸出：%d %s\n"
+
+#, c-format
+#~ msgid "%d (FSCK_IGNORE?) should never trigger this callback"
+#~ msgstr "%d (FSCK_IGNORE?) 不應觸發這個回呼函式"
+
+#~ msgid ""
+#~ "git pack-objects --stdout [<options>] [< <ref-list> | < <object-list>]"
+#~ msgstr "git pack-objects --stdout [<選項>] [< <引用列表> | < <物件列表>]"
+
+#~ msgid ""
+#~ "git pack-objects [<options>] <base-name> [< <ref-list> | < <object-list>]"
+#~ msgstr "git pack-objects [<選項>] <前綴名稱> [< <引用列表> | < <物件列表>]"
+
+#~ msgid "cannot use --stdin-packs with --cruft"
+#~ msgstr "無法將 --stdin-packs 與 --cruft 組合使用"
+
+#, c-format
+#~ msgid "unreachable: invalid reference: %s"
+#~ msgstr "不可達：無效引用：%s"
+
+#~ msgid "trying to write commit not in index"
+#~ msgstr "嘗試寫入不在索引的提交"
+
#~ msgid "git cat-file (-t | -s) [--allow-unknown-type] <object>"
#~ msgstr "git cat-file (-t | -s) [--allow-unknown-type] <object>"
