diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-12-12 03:20:49 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-12-12 03:20:49 +0300 |
| commit | 31cc8be91dea07d97884cd0f27c8e7181dbc84e7 (patch) | |
| tree | 213d21a08c4b16230ef1a49a0c501954a99394fb | |
| parent | 694cb1b2abfda78e60c8c74f1e761de6e852f0a2 (diff) | |
| parent | 6d0497d526d0d13680e912b385cddbd52d9f3825 (diff) | |
Merge tag 'l10n-2.39.0-rnd1' of https://github.com/git-l10n/git-po
l10n-2.39.0-rnd1
* tag 'l10n-2.39.0-rnd1' of https://github.com/git-l10n/git-po:
l10n: zh_TW.po: Git 2.39-rc2
l10n: tr: v2.39.0 updates
l10n: Update Catalan translation
l10n: bg.po: Updated Bulgarian translation (5501t)
l10n: de.po: update German translation
l10n: zh_CN v2.39.0 round 1
l10n: fr: v2.39 rnd 1
l10n: po-id for 2.39 (round 1)
l10n: sv.po: Update Swedish translation (5501t0f0)
| -rw-r--r-- | po/bg.po | 856 | ||||
| -rw-r--r-- | po/ca.po | 958 | ||||
| -rw-r--r-- | po/de.po | 814 | ||||
| -rw-r--r-- | po/fr.po | 927 | ||||
| -rw-r--r-- | po/id.po | 1048 | ||||
| -rw-r--r-- | po/sv.po | 766 | ||||
| -rw-r--r-- | po/tr.po | 848 | ||||
| -rw-r--r-- | po/zh_CN.po | 853 | ||||
| -rw-r--r-- | po/zh_TW.po | 2161 |
9 files changed, 5514 insertions, 3717 deletions
@@ -193,6 +193,9 @@ # out of range извън диапазона # checksum сума за проверка # superproject обхващащ проект +# scalar repo скаларно хранилище +# unclean завършвам работа/задача с грешка +# cache tree кеш за обекти-дървета # ------------------------ # „$var“ - може да не сработва за shell има gettext и eval_gettext - проверка - намират се лесно по „$ # ------------------------ @@ -209,10 +212,10 @@ # for i in `sort -u FILES`; do cnt=`grep $i FILES | wc -l`; echo $cnt $i ;done | sort -n msgid "" msgstr "" -"Project-Id-Version: git 2.38\n" +"Project-Id-Version: git 2.39\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2022-09-28 10:59+0200\n" -"PO-Revision-Date: 2022-09-28 10:59+0200\n" +"POT-Creation-Date: 2022-12-06 15:52+0100\n" +"PO-Revision-Date: 2022-12-06 16:55+0200\n" "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" "Language: bg\n" @@ -376,7 +379,7 @@ msgstr "Изход.\n" #, c-format, perl-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,?]? " #, c-format, perl-format msgid "Stage deletion [y,n,q,a,d%s,?]? " @@ -412,7 +415,7 @@ msgstr "" #, c-format, perl-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,?]? " #, c-format, perl-format msgid "Stash deletion [y,n,q,a,d%s,?]? " @@ -448,7 +451,7 @@ msgstr "" #, c-format, perl-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,?]? " #, c-format, perl-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " @@ -485,7 +488,7 @@ msgstr "" #, c-format, perl-format msgid "Apply mode change to index [y,n,q,a,d%s,?]? " msgstr "" -"Прилагане на промяната на правата за достъп към индекса [y,n,q,a,d%s,?]? " +"Прилагане на промяната на права̀та за достъп към индекса [y,n,q,a,d%s,?]? " #, c-format, perl-format msgid "Apply deletion to index [y,n,q,a,d%s,?]? " @@ -522,8 +525,8 @@ msgstr "" #, c-format, perl-format msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " msgstr "" -"Премахване на промяната в правата за достъп от работното дърво [y,n,q,a,d" -"%s,?]? " +"Премахване на промяната в права̀та за достъп от работното дърво [y,n,q,a," +"d%s,?]? " #, c-format, perl-format msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " @@ -563,7 +566,7 @@ msgstr "" #, c-format, perl-format msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " msgstr "" -"Премахване на промяната в правата за достъп от индекса и работното дърво [y," +"Премахване на промяната в права̀та за достъп от индекса и работното дърво [y," "n,q,a,d%s,?]? " #, c-format, perl-format @@ -599,7 +602,7 @@ msgstr "" #, c-format, perl-format msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " msgstr "" -"Прилагане на промяната в правата за достъп от индекса и работното дърво [y,n," +"Прилагане на промяната в права̀та за достъп от индекса и работното дърво [y,n," "q,a,d%s,?]? " #, c-format, perl-format @@ -634,8 +637,8 @@ msgstr "" #, c-format, perl-format msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " msgstr "" -"Прилагане на промяната в правата за достъп към работното дърво [y,n,q,a,d" -"%s,?]? " +"Прилагане на промяната в права̀та за достъп към работното дърво [y,n,q,a," +"d%s,?]? " #, c-format, perl-format msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " @@ -985,6 +988,9 @@ msgstr "командният ред завършва с „/“" msgid "unclosed quote" msgstr "кавичка без еш" +msgid "too many arguments" +msgstr "прекалено много аргументи" + #, c-format msgid "unrecognized whitespace option '%s'" msgstr "непозната опция за знаците за интервали „%s“" @@ -1258,12 +1264,12 @@ msgstr "„%s“: вече съществува в работното дърво #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" -msgstr "новите права за достъп (%o) на „%s“ не съвпадат със старите (%o)" +msgstr "новите права̀ за достъп (%o) на „%s“ не съвпадат със старите (%o)" #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" -"новите права за достъп (%o) на „%s“ не съвпадат със старите (%o) на „%s“" +"новите права̀ за достъп (%o) на „%s“ не съвпадат със старите (%o) на „%s“" #, c-format msgid "affected file '%s' is beyond a symbolic link" @@ -1501,7 +1507,7 @@ msgstr "обектът-BLOB „%s“ не може да бъде обработ #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" -msgstr "неподдържани права за достъп до файл: 0%o (SHA1: %s)" +msgstr "неподдържани права̀ за достъп до файл: 0%o (SHA1: %s)" #, c-format msgid "deflate error (%d)" @@ -1969,7 +1975,7 @@ msgstr "git add [ОПЦИЯ…] [--] ПЪТ…" #, c-format msgid "cannot chmod %cx '%s'" -msgstr "правата на „%2$s“ не може да се зададат да са %1$cx" +msgstr "права̀та на „%2$s“ не може да се зададат да са %1$cx" #, c-format msgid "unexpected diff status %c" @@ -2385,7 +2391,7 @@ msgid "options '%s=%s' and '%s=%s' cannot be used together" msgstr "опциите „%s=%s“ и „%s=%s“ са несъвместими" msgid "git am [<options>] [(<mbox> | <Maildir>)...]" -msgstr "git am [ОПЦИЯ…] [(ФАЙЛ_С_ПОЩА|ДИРЕКТОРИЯ_С_ПОЩА)…]" +msgstr "git am [ОПЦИЯ…] [(ФАЙЛ_С_ПОЩА | ДИРЕКТОРИЯ_С_ПОЩА)…]" msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [ОПЦИЯ…] (--continue | --skip | --abort)" @@ -2811,42 +2817,6 @@ msgstr "" "неуспешно двоично търсене: „git bisect--helper --bisect-state %s“ завърши с " "код за грешка: %d" -msgid "reset the bisection state" -msgstr "изчистване на състоянието на двоичното търсене" - -msgid "check whether bad or good terms exist" -msgstr "проверка дали съществуват одобряващи/отхвърлящи управляващи думи" - -msgid "print out the bisect terms" -msgstr "извеждане на управляващите думи" - -msgid "start the bisect session" -msgstr "начало на двоично търсене" - -msgid "find the next bisection commit" -msgstr "откриване на следващото подаване при двоично търсене" - -msgid "mark the state of ref (or refs)" -msgstr "задаване на състоянието на указателя/ите" - -msgid "list the bisection steps so far" -msgstr "извеждане на стъпките на двоичното търсене досега" - -msgid "replay the bisection process from the given file" -msgstr "наново изпълнение на двоичното търсене чрез дадения файл" - -msgid "skip some commits for checkout" -msgstr "прескачане на някои подавания при изтегляне" - -msgid "visualize the bisection" -msgstr "визуализиране на двоичното търсене" - -msgid "use <cmd>... to automatically bisect" -msgstr "за автоматично двоично търсене да се ползва тази КОМАНДА…" - -msgid "no log for BISECT_WRITE" -msgstr "липсва запис за „BISECT_WRITE“" - msgid "--bisect-reset requires either no argument or a commit" msgstr "опцията „--bisect-reset“ изисква или 0 аргументи, или 1 — подаване" @@ -2865,6 +2835,9 @@ msgstr "не е зададен журнален файл" msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [ОПЦИЯ…] [ОПЦИЯ_ЗА_ВЕРСИЯТА…] [ВЕРСИЯ] [--] ФАЙЛ" +msgid "git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>" +msgstr "git annotate [ОПЦИЯ…] [ОПЦИЯ_ЗА_ВЕРСИЯТА…] [ВЕРСИЯ] [--] ФАЙЛ" + msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "ОПЦИИте_ЗА_ВЕРСИЯТА са документирани в ръководството git-rev-list(1)" @@ -3071,9 +3044,6 @@ msgstr "Неуспешно обновяване на конфигурацион msgid "cannot use -a with -d" msgstr "опциите „-a“ и „-d“ са несъвместими" -msgid "Couldn't look up commit object for HEAD" -msgstr "Обектът-подаване, сочен от указателя „HEAD“, не може да бъде открит" - #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "Не може да изтриете клона „%s“, който е изтеглен в пътя „%s“" @@ -3112,17 +3082,18 @@ msgstr "Клонът „%s“ се пребазира върху „%s“" msgid "Branch %s is being bisected at %s" msgstr "Търси се двоично в клона „%s“ при „%s“" -msgid "cannot copy the current branch while not on any." -msgstr "не може да копирате текущия клон, защото сте извън който и да е клон" - -msgid "cannot rename the current branch while not on any." -msgstr "" -"не може да преименувате текущия клон, защото сте извън който и да е клон" - #, c-format msgid "Invalid branch name: '%s'" msgstr "Неправилно име на клон: „%s“" +#, c-format +msgid "No commit on branch '%s' yet." +msgstr "В клона „%s“ все още няма подавания." + +#, c-format +msgid "No branch named '%s'." +msgstr "Липсва клон на име „%s“." + msgid "Branch rename failed" msgstr "Неуспешно преименуване на клон" @@ -3285,13 +3256,12 @@ msgstr "Не може да зададете описание на несвърз msgid "cannot edit description of more than one branch" msgstr "Не може да редактирате описанието на повече от един клон едновременно" -#, c-format -msgid "No commit on branch '%s' yet." -msgstr "В клона „%s“ все още няма подавания." +msgid "cannot copy the current branch while not on any." +msgstr "не може да копирате текущия клон, защото сте извън който и да е клон" -#, c-format -msgid "No branch named '%s'." -msgstr "Липсва клон на име „%s“." +msgid "cannot rename the current branch while not on any." +msgstr "" +"не може да преименувате текущия клон, защото сте извън който и да е клон" msgid "too many branches for a copy operation" msgstr "прекалено много клони за копиране" @@ -3358,13 +3328,12 @@ msgstr "библиотека на C: " msgid "not run from a git repository - no hooks to show\n" msgstr "командата е стартирана извън хранилище на Git, затова няма куки\n" -# FIXME msgid "" -"git bugreport [-o|--output-directory <file>] [-s|--suffix <format>] [--" -"diagnose[=<mode>]" +"git bugreport [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n" +" [--diagnose[=<mode>]]" msgstr "" -"git bugreport [-o|--output-directory ФАЙЛ] [-s|--suffix ФОРМАТ] [--" -"diagnose[=РЕЖИМ]]" +"git bugreport [(-o | --output-directory) ПЪТ] [(-s | --suffix) ФОРМАТ]\n" +" [--diagnose[=РЕЖИМ]]" msgid "" "Thank you for filling out a Git bug report!\n" @@ -3438,17 +3407,23 @@ msgstr "в „%s“ не може да се пише" msgid "Created new report at '%s'.\n" msgstr "Новият доклад е създаден в „%s“.\n" -msgid "git bundle create [<options>] <file> <git-rev-list args>" -msgstr "git bundle create [ОПЦИЯ…] ФАЙЛ АРГУМЕНТ_ЗА_git_rev-list…" +msgid "" +"git bundle create [-q | --quiet | --progress | --all-progress] [--all-" +"progress-implied]\n" +" [--version=<version>] <file> <git-rev-list-args>" +msgstr "" +"git bundle create [-q | --quiet | --progress | --all-progress] [--all-" +"progress-implied]\n" +" [--version=ВЕРСИЯ] ФАЙЛ ОПЦИЯ_ЗА_git-rev-list…" -msgid "git bundle verify [<options>] <file>" -msgstr "git bundle verify [ОПЦИЯ…] ФАЙЛ…" +msgid "git bundle verify [-q | --quiet] <file>" +msgstr "git bundle verify [-q | --quiet] ФАЙЛ" msgid "git bundle list-heads <file> [<refname>...]" msgstr "git bundle list-heads ФАЙЛ [ИМЕ_НА_УКАЗАТЕЛ…]" -msgid "git bundle unbundle <file> [<refname>...]" -msgstr "git bundle unbundle ФАЙЛ [ИМЕ_НА_УКАЗАТЕЛ…]" +msgid "git bundle unbundle [--progress] <file> [<refname>...]" +msgstr "git bundle unbundle [--progress] ФАЙЛ [ИМЕ_НА_УКАЗАТЕЛ…]" msgid "do not show progress meter" msgstr "без извеждане на напредъка" @@ -3524,12 +3499,12 @@ msgid "" "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" "objects]\n" " [--buffer] [--follow-symlinks] [--unordered]\n" -" [--textconv | --filters]" +" [--textconv | --filters] [-z]" msgstr "" "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" "objects]\n" " [--buffer] [--follow-symlinks] [--unordered]\n" -" [--textconv | --filters]" +" [--textconv | --filters] [-z]" msgid "" "git cat-file (--textconv | --filters)\n" @@ -3646,9 +3621,6 @@ msgstr "опцията „%s“ изисква версия" msgid "<object> required with '-%c'" msgstr "опцията „-%c“ изисква обект" -msgid "too many arguments" -msgstr "прекалено много аргументи" - #, c-format msgid "only two arguments allowed in <type> <object> mode, not %d" msgstr "в режим с посочен ВИД ОБЕКТ се изискват точно два аргумента, а не %d" @@ -4193,8 +4165,9 @@ msgid "use overlay mode" msgstr "използване на припокриващ режим" msgid "" -"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." -msgstr "git clean [-d] [-f] [-i] [-n] [-q] [-e ШАБЛОН] [-x | -X] [--] ПЪТ…" +"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] " +"[<pathspec>...]" +msgstr "git clean [-d] [-f] [-i] [-n] [-q] [-e ШАБЛОН] [-x | -X] [--] [ПЪТ…]" #, c-format msgid "Removing %s\n" @@ -4493,6 +4466,11 @@ msgid "failed to start iterator over '%s'" msgstr "неуспешно итериране по „%s“" #, c-format +msgid "symlink '%s' exists, refusing to clone with --local" +msgstr "" +"символната връзка „%s“ съществува, не може да се клонира с опцията „--local“" + +#, c-format msgid "failed to unlink '%s'" msgstr "неуспешно изтриване на „%s“" @@ -4563,10 +4541,6 @@ msgstr "Прекалено много аргументи." msgid "You must specify a repository to clone." msgstr "Трябва да укажете кое хранилище искате да клонирате." -#, c-format -msgid "options '%s' and '%s %s' cannot be used together" -msgstr "опциите „%s“ и „%s %s“ са несъвместими" - msgid "" "--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-" "exclude" @@ -4696,19 +4670,25 @@ msgid "--command must be the first argument" msgstr "опцията „--command“ трябва да е първият аргумент" msgid "" -"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" +"git commit-graph verify [--object-dir <dir>] [--shallow] [--[no-]progress]" msgstr "" -"git commit-graph verify [--object-dir ДИР_ОБЕКТИ] [--shallow] [--" +"git commit-graph verify [--object-dir ДИРЕКТОРИЯ] [--shallow] [--" "[no-]progress]" msgid "" -"git commit-graph write [--object-dir <objdir>] [--append] [--" -"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" -"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>" +"git commit-graph write [--object-dir <dir>] [--append]\n" +" [--split[=<strategy>]] [--reachable | --stdin-packs | " +"--stdin-commits]\n" +" [--changed-paths] [--[no-]max-new-filters <n>] [--" +"[no-]progress]\n" +" <split options>" msgstr "" -"git commit-graph write [--object-dir ДИР_ОБЕКТИ] [--append] [--" -"split[=СТРАТЕГИЯ]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" -"paths] [--[no-]max-new-filters <n>] [--[no-]progress] ОПЦИИ_ЗА_РАЗДЕЛЯНЕ" +"git commit-graph write [--object-dir ДИРЕКТОРИЯ] [--append]\n" +" [--split[=СТРАТЕГИЯ]] [--reachable | --stdin-packs | " +"--stdin-commits]\n" +" [--changed-paths] [--[no-]max-new-filters БРОЙ] [--" +"[no-]progress]\n" +" ОПЦИИ_ЗА_РАЗДЕЛЯНЕ" msgid "dir" msgstr "директория" @@ -4781,12 +4761,16 @@ msgstr "" msgid "Collecting commits from input" msgstr "Получаване на подаванията от входа" +msgid "git commit-tree <tree> [(-p <parent>)...]" +msgstr "git commit-tree ДЪРВО [(-p РОДИТЕЛ)…]" + msgid "" -"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " -"<file>)...] <tree>" +"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...]\n" +" [(-F <file>)...] <tree>" msgstr "" -"git commit-tree [(-p РОДИТЕЛ)…] [-S[ИДЕНТИФИКАТОР]] [(-m СЪОБЩЕНИЕ)…] [(-F " -"ФАЙЛ)…] ДЪРВО" +"git commit-tree [(-p РОДИТЕЛ)…] [-S[ИДЕНТИФИКАТОР_НА_КЛЮЧ]] [(-m " +"СЪОБЩЕНИЕ)…]\n" +" [(-F ФАЙЛ)…] ДЪРВО" #, c-format msgid "duplicate parent %s ignored" @@ -4828,11 +4812,30 @@ msgstr "трябва да е точно едно дърво" msgid "git commit-tree: failed to read" msgstr "git commit-tree: не може да се прочете" -msgid "git commit [<options>] [--] <pathspec>..." -msgstr "git commit [ОПЦИЯ…] [--] ПЪТ…" +msgid "" +"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" +" [--allow-empty-message] [--no-verify] [-e] [--author=<author>]\n" +" [--date=<date>] [--cleanup=<mode>] [--[no-]status]\n" +" [-i | -o] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" +" [(--trailer <token>[(=|:)<value>])...] [-S[<keyid>]]\n" +" [--] [<pathspec>...]" +msgstr "" +"git commit [-a | --interactive | --patch] [-s] [-v] [-u РЕЖИМ] [--amend]\n" +" [--dry-run] [(-c | -C | --squash) ПОДАВАНЕ | --fixup [(amend|" +"reword):]ПОДАВАНЕ)]\n" +" [-F ФАЙЛ | -m СЪОБЩЕНИЕ] [--reset-author] [--allow-empty]\n" +" [--allow-empty-message] [--no-verify] [-e] [--author=АВТОР]\n" +" [--date=ДАТА] [--cleanup=РЕЖИМ] [--[no-]status]\n" +" [-i | -o] [--pathspec-from-file=ФАЙЛ> [--pathspec-file-nul]]\n" +" [(--trailer ЛЕКСЕМА[(=|:)СТОЙНОСТ])…] [-" +"S[ИДЕНТИФИКАТОР_НА_КЛЮЧ]]\n" +" [--] [ПЪТ…]" -msgid "git status [<options>] [--] <pathspec>..." -msgstr "git status [ОПЦИЯ…] [--] ПЪТ…" +msgid "git status [<options>] [--] [<pathspec>...]" +msgstr "git status [ОПЦИЯ…] [--] [ПЪТ…]" msgid "" "You asked to amend the most recent commit, but doing so would make\n" @@ -4908,7 +4911,7 @@ msgid "unable to update temporary index" msgstr "временният индекс не може да бъде обновен" msgid "Failed to update main cache tree" -msgstr "Дървото на основния кеш не може да бъде обновено" +msgstr "Кешът за обектите-дървета не може да бъде обновен" msgid "unable to write new_index file" msgstr "новият индекс (new_index) не може да бъде записан" @@ -5613,7 +5616,7 @@ msgid "" "\n" "\tchmod 0700 %s" msgstr "" -"Правата за достъп до директорията за програмните гнезда са прекалено " +"Права̀та за достъп до директорията за програмните гнезда са прекалено " "свободни —\n" "другите потребители може да получат достъп до кешираните ви пароли. За да\n" "коригирате това, изпълнете:\n" @@ -5638,11 +5641,19 @@ msgstr "" "ключалката на хранилището на идентификациите не бе получена в рамките на %d " "ms" -msgid "git describe [<options>] [<commit-ish>...]" -msgstr "git describe [ОПЦИЯ…] [УКАЗАТЕЛ_КЪМ_ПОДАВАНЕ…]" +msgid "" +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] [<commit-ish>...]" +msgstr "" +"git describe [--all] [--tags] [--contains] [--abbrev=БРОЙ] " +"[УКАЗАТЕЛ_КЪМ_ПОДАВАНЕ…]" + +msgid "" +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<mark>]" +msgstr "" +"git describe [--all] [--tags] [--contains] [--abbrev=БРОЙ] --dirty[=МАРКЕР]" -msgid "git describe [<options>] --dirty" -msgstr "git describe [ОПЦИЯ…] --dirty" +msgid "git describe <blob>" +msgstr "git describe обект-BLOB" msgid "head" msgstr "основно" @@ -5766,11 +5777,11 @@ msgid "option '%s' and commit-ishes cannot be used together" msgstr "опциите „%s“ и указателите към обекти са несъвместими" msgid "" -"git diagnose [-o|--output-directory <path>] [-s|--suffix <format>] [--" -"mode=<mode>]" +"git diagnose [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n" +" [--mode=<mode>]" msgstr "" -"git diagnose [-o|--output-directory ФАЙЛ] [-s|--suffix ФОРМАТ] [--" -"diagnose[=РЕЖИМ]]" +"git diagnose [(-o | --output-directory) ПЪТ] [(-s | --suffix) ФОРМАТ]\n" +" [--diagnose[=РЕЖИМ]]" msgid "specify a destination for the diagnostics archive" msgstr "укажете местоположение на архива с диагностичната информация" @@ -5788,6 +5799,9 @@ msgstr "опцията „--merge-base“ изисква точно две по msgid "'%s': not a regular file or symlink" msgstr "„%s“: не е нито обикновен файл, нито символна връзка" +msgid "no merge given, only parents." +msgstr "липсва сливане, зададени са само родителски подавания." + #, c-format msgid "invalid option: %s" msgstr "неправилна опция: %s" @@ -5921,8 +5935,8 @@ msgstr "" #, c-format msgid "" -"option `--default' expects an unsigned long value with `--type=ulong`, not `" -"%s`" +"option `--default' expects an unsigned long value with `--type=ulong`, not " +"`%s`" msgstr "" "опцията „--default“ изисква целочислена стойност без знак при „--" "type=ulong“, а не „%s“" @@ -6438,8 +6452,8 @@ msgstr "извеждане само на указателите, които съ msgid "print only refs which don't contain the commit" msgstr "извеждане само на указателите, които не съдържат това ПОДАВАНЕ" -msgid "git for-each-repo --config=<config> <command-args>" -msgstr "git for-each-repo --config=НАСТРОЙКА АРГУМЕНТ…" +msgid "git for-each-repo --config=<config> [--] <arguments>" +msgstr "git for-each-repo --config=НАСТРОЙКА [--] АРГУМЕНТ…" msgid "config" msgstr "настройка" @@ -6597,21 +6611,29 @@ msgid "notice: %s points to an unborn branch (%s)" msgstr "предупреждение: „%s“ сочи към все още несъществуващ клон (%s)" msgid "Checking cache tree" -msgstr "Проверка на дървото на кеша" +msgstr "Проверка на кеша на обектите-дървета" #, c-format msgid "%s: invalid sha1 pointer in cache-tree" -msgstr "„%s“: неправилен указател за SHA1 в дървото на кеша" +msgstr "„%s“: неправилен указател за SHA1 в кеша на обектите-дървета" msgid "non-tree in cache-tree" -msgstr "в дървото на кеша има нещо, което не е дърво" +msgstr "в кеша на обектите-дървета има нещо, което не е дърво" #, c-format msgid "%s: invalid sha1 pointer in resolve-undo" msgstr "„%s“: неправилен указател за отмяна на разрешените подавания" -msgid "git fsck [<options>] [<object>...]" -msgstr "git fsck [ОПЦИЯ…] [ОБЕКТ…]" +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>...]" +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] [ОБЕКТ…]" msgid "show unreachable objects" msgstr "показване на недостижимите обекти" @@ -6666,12 +6688,6 @@ msgstr "git fsmonitor--daemon start [ОПЦИЯ…]" msgid "git fsmonitor--daemon run [<options>]" msgstr "git fsmonitor--daemon run [ОПЦИЯ…]" -msgid "git fsmonitor--daemon stop" -msgstr "git fsmonitor--daemon stop" - -msgid "git fsmonitor--daemon status" -msgstr "git fsmonitor--daemon status" - #, c-format msgid "value of '%s' out of range: %d" msgstr "дължината на „%s“ e извън диапазона: %d" @@ -6923,8 +6939,20 @@ msgstr "изпълнение на определена задача" msgid "use at most one of --auto and --schedule=<frequency>" msgstr "опциите „--auto“ и „--schedule=ЧЕСТОТА“ са несъвместими" -msgid "failed to run 'git config'" -msgstr "неуспешно изпълнение на „git config“" +#, c-format +msgid "unable to add '%s' value of '%s'" +msgstr "неуспешно добавяне на стойност на „%s“ за „%s“" + +msgid "return success even if repository was not registered" +msgstr "успешно завършване, дори ако хранилището не бъде регистрирано" + +#, c-format +msgid "unable to unset '%s' value of '%s'" +msgstr "неуспешно изчистване на стойност на „%s“ за „%s“" + +#, c-format +msgid "repository '%s' is not registered" +msgstr "хранилището „%s“ не е регистрирано" #, c-format msgid "failed to expand path '%s'" @@ -7227,11 +7255,14 @@ msgid "both --cached and trees are given" msgstr "опцията „--cached“ е несъвместима със задаване на дърво" msgid "" -"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " -"[--] <file>..." +"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters]\n" +" [--stdin [--literally]] [--] <file>..." msgstr "" -"git hash-object [-t ВИД] [-w] [--path=ФАЙЛ | --no-filters] [--stdin] [--] " -"ФАЙЛ…" +"git hash-object [-t ВИД] [-w] [--path=ФАЙЛ | --no-filters]\n" +" [--stdin [--literally]] [--] ФАЙЛ…" + +msgid "git hash-object [-t <type>] [-w] --stdin-paths [--no-filters]" +msgstr "git hash-object [-t ВИД] [-w] --stdin-paths [--no-filters]" msgid "object type" msgstr "ВИД на обекта" @@ -7662,14 +7693,18 @@ msgid "Initialized empty Git repository in %s%s\n" msgstr "Инициализиране на празно хранилище на Git в „%s%s“\n" msgid "" -"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" -"shared[=<permissions>]] [<directory>]" +"git init [-q | --quiet] [--bare] [--template=<template-directory>]\n" +" [--separate-git-dir <git-dir>] [--object-format=<format>]\n" +" [-b <branch-name> | --initial-branch=<branch-name>]\n" +" [--shared[=<permissions>]] [<directory>]" msgstr "" -"git init [-q | --quiet] [--bare] [--template=ДИРЕКТОРИЯ_С_ШАБЛОНИ] [--" -"shared[=ПРАВА]] [ДИРЕКТОРИЯ]" +"git init [-q | --quiet] [--bare] [--template=ДИРЕКТОРИЯ_С_ШАБЛОНИ]\n" +" [--separate-git-dir ДИРЕКТОРИЯ_НА_GIT] [--object-format=ФОРМАТ]\n" +" [-b КЛОН | --initial-branch=КЛОН]\n" +" [--shared[=ПРАВА̀]] [ДИРЕКТОРИЯ]" msgid "permissions" -msgstr "права" +msgstr "права̀" msgid "specify that the git repository is to be shared amongst several users" msgstr "" @@ -7709,11 +7744,13 @@ msgid "--separate-git-dir incompatible with bare repository" msgstr "опцията „--separate-git-dir“ е несъвместима с голо хранилище" msgid "" -"git interpret-trailers [--in-place] [--trim-empty] [(--trailer " -"<token>[(=|:)<value>])...] [<file>...]" +"git interpret-trailers [--in-place] [--trim-empty]\n" +" [(--trailer <token>[(=|:)<value>])...]\n" +" [--parse] [<file>...]" msgstr "" -"git interpret-trailers [--in-place] [--trim-empty] [(--trailer " -"ЛЕКСЕМА[(=|:)СТОЙНОСТ])…] [ФАЙЛ…]" +"git interpret-trailers [--in-place] [--trim-empty]\n" +" [(--trailer ЛЕКСЕМА[(=|:)СТОЙНОСТ])…]\n" +" [--parse] [ФАЙЛ…]" msgid "edit files in place" msgstr "директно редактиране на файловете" @@ -8213,11 +8250,11 @@ msgstr "" msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" -" [-q | --quiet] [--exit-code] [--get-url]\n" +" [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n" " [--symref] [<repository> [<refs>...]]" msgstr "" -"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" -" [-q | --quiet] [--exit-code] [--get-url]\n" +"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=КОМАНДА]\n" +" [-q | --quiet] [--exit-code] [--get-url] [--sort=КЛЮЧ]\n" " [--symref] [ХРАНИЛИЩЕ [УКАЗАТЕЛ…]]" msgid "do not print remote URL" @@ -8352,12 +8389,12 @@ msgstr "git merge-base [-a | --all] ПОДАВАНЕ ПОДАВАНЕ…" msgid "git merge-base [-a | --all] --octopus <commit>..." msgstr "git merge-base [-a | --all] --octopus ПОДАВАНЕ…" -msgid "git merge-base --independent <commit>..." -msgstr "git merge-base --independent ПОДАВАНЕ…" - msgid "git merge-base --is-ancestor <commit> <commit>" msgstr "git merge-base --is-ancestor ПОДАВАНЕ_1 ПОДАВАНЕ_2" +msgid "git merge-base --independent <commit>..." +msgstr "git merge-base --independent ПОДАВАНЕ…" + msgid "git merge-base --fork-point <ref> [<commit>]" msgstr "git merge-base --fork-point УКАЗАТЕЛ [ПОДАВАНЕ]" @@ -8467,9 +8504,20 @@ msgstr "" msgid "allow merging unrelated histories" msgstr "позволяване на сливане на независими истории" +msgid "perform multiple merges, one per line of input" +msgstr "извършване на множество сливания, по едно на ред" + msgid "--trivial-merge is incompatible with all other options" msgstr "„--trivial-merge“ е несъвместима с другите опции" +#, c-format +msgid "malformed input line: '%s'." +msgstr "входен ред с неправилен формат: „%s“." + +#, c-format +msgid "merging cannot continue; got unclean result of %d" +msgstr "сливането не може да продължи — %d-тото завърши с грешка" + msgid "git merge [<options>] [<commit>...]" msgstr "git merge [ОПЦИЯ…] [ПОДАВАНЕ…]" @@ -9105,10 +9153,6 @@ msgstr "" "съдържанието на бележка не може да се вземе от обект, който не е BLOB: „%s“." #, c-format -msgid "malformed input line: '%s'." -msgstr "входен ред с неправилен формат: „%s“." - -#, c-format msgid "failed to copy notes from '%s' to '%s'" msgstr "бележката не може да се копира от „%s“ към „%s“" @@ -9305,13 +9349,12 @@ msgstr "да се използва бележката сочена от този msgid "unknown subcommand: `%s'" msgstr "непозната подкоманда: „%s“" -msgid "" -"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" +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 [<options>] <base-name> [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects [ОПЦИЯ…] ПРЕФИКС_НА_ИМЕТО [< СПИСЪК_С_УКАЗАТЕЛИ | < " "СПИСЪК_С_ОБЕКТИ]" @@ -9712,8 +9755,8 @@ msgstr "" "ни известите с е-писмо до пощенския списък:\n" "<git@vger.kernel.org>.\n" -msgid "git pack-refs [<options>]" -msgstr "git pack-refs [ОПЦИЯ…]" +msgid "git pack-refs [--all] [--no-prune]" +msgstr "git pack-refs [--all] [--no-prune]" msgid "pack everything" msgstr "пакетиране на всичко" @@ -9721,6 +9764,18 @@ msgstr "пакетиране на всичко" msgid "prune loose refs (default)" msgstr "окастряне на недостижимите указатели (стандартно)" +msgid "git patch-id [--stable | --unstable | --verbatim]" +msgstr "git patch-id [--stable | --unstable | --verbatim]" + +msgid "use the unstable patch-id algorithm" +msgstr "използване на нестабилен алгоритъм за идентифициране на кръпка" + +msgid "use the stable patch-id algorithm" +msgstr "използване на стабилен алгоритъм за идентифициране на кръпка" + +msgid "don't strip whitespace from the patch" +msgstr "без махане на празните знаци в кръпката" + msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--progress] [--expire ВРЕМЕ] [--] [ВРЪХ…]" @@ -9938,14 +9993,13 @@ msgstr "" msgid "" "\n" -"To avoid automatically configuring upstream branches when their name\n" -"doesn't match the local branch, see option 'simple' of branch." -"autoSetupMerge\n" +"To avoid automatically configuring an upstream branch when its name\n" +"won't match the local branch, see option 'simple' of branch.autoSetupMerge\n" "in 'git help config'.\n" msgstr "" "\n" -"За да избегнете автоматичното задаване на следени клони, когато името им не " -"съвпада с това на локалния клон, погледнете документацията за стойността " +"За да избегнете автоматичното задаване на следени клони, когато името им\n" +"не съвпада с това на локалния клон, погледнете документацията за стойността\n" "„simple“ на настройката „branch.autoSetupMerge“ в „git help config“.\n" #, c-format @@ -10109,6 +10163,13 @@ msgstr "Изтласкване към „%s“\n" msgid "failed to push some refs to '%s'" msgstr "част от указателите не бяха изтласкани към „%s“" +msgid "" +"recursing into submodule with push.recurseSubmodules=only; using on-demand " +"instead" +msgstr "" +"рекурсивно обхождане на подмодулите чрез „push.recurseSubmodules=only“. " +"Вместо това се ползва ПРИ НУЖДА" + #, c-format msgid "invalid value for '%s'" msgstr "Неправилна стойност за „%s“" @@ -10247,13 +10308,15 @@ msgid "need two commit ranges" msgstr "необходими са два диапазона с подавания" msgid "" -"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " -"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-" -"ish1> [<tree-ish2> [<tree-ish3>]])" +"git read-tree [(-m [--trivial] [--aggressive] | --reset | --" +"prefix=<prefix>)\n" +" [-u | -i]] [--index-output=<file>] [--no-sparse-checkout]\n" +" (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" msgstr "" -"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=ПРЕФИКС) " -"[-u | -i]] [--no-sparse-checkout] [--index-output=ФАЙЛ] (--empty | " -"УКАЗАТЕЛ_КЪМ_ДЪРВО_1 [УКАЗАТЕЛ_КЪМ_ДЪРВО_2 [УКАЗАТЕЛ_КЪМ_ДЪРВО_3]])" +"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=ПРЕФИКС)\n" +" [-u | -i]] [--index-output=ФАЙЛ] [--no-sparse-checkout]\n" +" (--empty | УКАЗАТЕЛ_КЪМ_ДЪРВО_1 [УКАЗАТЕЛ_КЪМ_ДЪРВО_2 " +"[УКАЗАТЕЛ_КЪМ_ДЪРВО_3]])" msgid "write resulting index to <file>" msgstr "запазване на индекса в този ФАЙЛ" @@ -10343,8 +10406,8 @@ msgid "%s requires the merge backend" msgstr "„%s“ изисква пребазиране" #, c-format -msgid "could not get 'onto': '%s'" -msgstr "не може да се премине към новата база, зададена с „onto“: „%s“" +msgid "invalid onto: '%s'" +msgstr "неправилен указател върху какво да се пребазира: „%s“" #, c-format msgid "invalid orig-head: '%s'" @@ -10394,8 +10457,8 @@ msgstr "не може да се премине към „%s“" #, c-format msgid "" -"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" -"\"." +"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and " +"\"ask\"." msgstr "" "неправилна стойност „%s“: вариантите са „drop“ (прескачане), " "„keep“ (запазване) и „ask“ (питане)" @@ -10664,7 +10727,7 @@ msgstr "не съществува клон/подаване „%s“" msgid "No such ref: %s" msgstr "Такъв указател няма: %s" -msgid "Could not resolve HEAD to a revision" +msgid "Could not resolve HEAD to a commit" msgstr "Подаването, сочено от указателя „HEAD“, не може да бъде открито" #, c-format @@ -11346,6 +11409,10 @@ msgstr "временният файл „%s“ не може да бъде от msgid "could not close refs snapshot tempfile" msgstr "временният файл със снимка на указателите не може да се затвори" +#, c-format +msgid "could not remove stale bitmap: %s" +msgstr "изтриването на остарялата битова маска „%s“ е невъзможно" + msgid "pack everything in a single pack" msgstr "пакетиране на всичко в пакет" @@ -11430,6 +11497,9 @@ msgstr "откриване на геометрична прогресия с ч msgid "write a multi-pack index of the resulting packs" msgstr "запазване на многопакетен индекс за създадените пакети" +msgid "pack prefix to store a pack containing pruned objects" +msgstr "префикс на името на пакетния за пакети за окастрени обекти" + msgid "cannot delete packs in a precious-objects repo" msgstr "пакетите в хранилище с важни обекти не може да се трият" @@ -11441,8 +11511,12 @@ msgid "pack prefix %s does not begin with objdir %s" msgstr "името на пакетния файл „%s“ не започва с директорията за обекти с „%s“" #, c-format -msgid "missing required file: %s" -msgstr "липсва задължителния файл „%s“" +msgid "renaming pack to '%s' failed" +msgstr "неуспешно преименуване на пакетния файл на „%s“" + +#, c-format +msgid "pack-objects did not write a '%s' file for pack %s-%s" +msgstr "Командата „git pack-objects“ не записа файл „%s“ за пакета „%s-%s“" #, c-format msgid "could not unlink: %s" @@ -11636,8 +11710,9 @@ msgstr "опцията „--convert-graft-file“ не приема аргуме msgid "only one pattern can be given with -l" msgstr "опцията „-l“ приема точно един шаблон" -msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" -msgstr "git rerere [clear | forget ПЪТ… | status | remaining | diff | gc]" +msgid "" +"git rerere [clear | forget <pathspec>... | diff | status | remaining | gc]" +msgstr "git rerere [clear | forget ПЪТ… | diff | status | remaining | gc]" msgid "register clean resolutions in index" msgstr "регистриране на чисти корекции на конфликти в индекса" @@ -11843,6 +11918,15 @@ msgstr "опцията „--prefix“ изисква аргумент" msgid "unknown mode for --abbrev-ref: %s" msgstr "непознат режим за „--abbrev-ref“: „%s“" +msgid "--exclude-hidden cannot be used together with --branches" +msgstr "опциите „--exclude-hidden“ и „--branches“ са несъвместими" + +msgid "--exclude-hidden cannot be used together with --tags" +msgstr "опциите „--exclude-hidden“ и „--tags“ са несъвместими" + +msgid "--exclude-hidden cannot be used together with --remotes" +msgstr "опциите „--exclude-hidden“ и „--remotes“ са несъвместими" + msgid "this operation must be run in a work tree" msgstr "тази команда трябва да се изпълни в работно дърво" @@ -11850,17 +11934,25 @@ msgstr "тази команда трябва да се изпълни в раб msgid "unknown mode for --show-object-format: %s" msgstr "непознат режим за „--show-object-format“: „%s“" -msgid "git revert [<options>] <commit-ish>..." -msgstr "git revert [ОПЦИЯ…] УКАЗАТЕЛ_КЪМ_ПОДАВАНЕ…" +msgid "" +"git revert [--[no-]edit] [-n] [-m <parent-number>] [-s] [-S[<keyid>]] " +"<commit>..." +msgstr "" +"git revert [--[no-]edit] [-n] [-m НОМЕР_НА_РОДИТЕЛ] [-s]\n" +" [-S[ИДЕНТИФИКАТОР_НА_КЛЮЧ]] ПОДАВАНЕ…" -msgid "git revert <subcommand>" -msgstr "git revert ПОДКОМАНДА" +msgid "git revert (--continue | --skip | --abort | --quit)" +msgstr "git revert (--continue | --skip | --abort | --quit)" -msgid "git cherry-pick [<options>] <commit-ish>..." -msgstr "git cherry-pick [ОПЦИЯ…] УКАЗАТЕЛ_КЪМ_ПОДАВАНЕ…" +msgid "" +"git cherry-pick [--edit] [-n] [-m <parent-number>] [-s] [-x] [--ff]\n" +" [-S[<keyid>]] <commit>..." +msgstr "" +"git cherry-pick [--edit] [-n] [-m НОМЕР_НА_РОДИТЕЛ] [-s] [-x] [--ff]\n" +" [-S[ИДЕНТИФИКАТОР_НА_КЛЮЧ]] ПОДАВАНЕ…" -msgid "git cherry-pick <subcommand>" -msgstr "git cherry-pick ПОДКОМАНДА" +msgid "git cherry-pick (--continue | --skip | --abort | --quit)" +msgstr "git cherry-pick (--continue | --skip | --abort | --quit)" #, c-format msgid "option `%s' expects a number greater than zero" @@ -11889,7 +11981,7 @@ msgid "edit the commit message" msgstr "редактиране на съобщението при подаване" msgid "parent-number" -msgstr "номер на родителя" +msgstr "номер на родител" msgid "select mainline parent" msgstr "избор на основния родител" @@ -11921,8 +12013,14 @@ msgstr "неуспешна отмяна" msgid "cherry-pick failed" msgstr "неуспешно отбиране" -msgid "git rm [<options>] [--] <file>..." -msgstr "git rm [ОПЦИЯ…] [--] ФАЙЛ…" +msgid "" +"git rm [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n" +" [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" +" [--] [<pathspec>...]" +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" @@ -12001,12 +12099,14 @@ msgid "" "git send-pack [--mirror] [--dry-run] [--force]\n" " [--receive-pack=<git-receive-pack>]\n" " [--verbose] [--thin] [--atomic]\n" +" [--[no-]signed | --signed=(true|false|if-asked)]\n" " [<host>:]<directory> (--all | <ref>...)" msgstr "" "git send-pack [--mirror] [--dry-run] [--force]\n" " [--receive-pack=ПАКЕТ]\n" " [--verbose] [--thin] [--atomic]\n" -" [ХОСТ:]ДИРЕКТОРИЯ (--all | УКАЗАТЕЛ…])" +" [--[no-]signed | --signed=(true|false|if-asked)]\n" +" [ХОСТ:]ДИРЕКТОРИЯ (--all | УКАЗАТЕЛ…)" msgid "remote name" msgstr "име на отдалечено хранилище" @@ -12029,8 +12129,9 @@ msgstr "git log --pretty=short | git shortlog [ОПЦИЯ…]" msgid "using multiple --group options with stdin is not supported" msgstr "повече от една опции „--group“ са несъвместими със стандартния вход" -msgid "using --group=trailer with stdin is not supported" -msgstr "опцията „--group=trailer“ е несъвместима със стандартния вход" +#, c-format +msgid "using %s with stdin is not supported" +msgstr "„%s“ не поддържа стандартния вход" #, c-format msgid "unknown group type: %s" @@ -12067,12 +12168,14 @@ msgid "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" " [--current] [--color[=<when>] | --no-color] [--sparse]\n" " [--more=<n> | --list | --independent | --merge-base]\n" -" [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" +" [--no-name | --sha1-name] [--topics]\n" +" [(<rev> | <glob>)...]" msgstr "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" " [--current] [--color[=КОГА] | --no-color] [--sparse]\n" -" [--more=БРОЙ | --list | --independent | --merge-base]\n" -" [--no-name | --sha1-name] [--topics] [(РЕВИЗИЯ | УКАЗАТЕЛ)…]" +" [--more=<n> | --list | --independent | --merge-base]\n" +" [--no-name | --sha1-name] [--topics]\n" +" [(РЕВИЗИЯ | УКАЗАТЕЛ)…]" msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g | --reflog)[=БРОЙ[,БАЗА]] [--list] [УКАЗАТЕЛ]" @@ -12174,11 +12277,13 @@ msgid "Unknown hash algorithm" msgstr "Непознат алгоритъм за контролни суми" msgid "" -"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference]\n" +" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n" +" [--heads] [--] [<pattern>...]" msgstr "" -"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" -"hash[=ЧИСЛО]] [--abbrev[=ЧИСЛО]] [--tags] [--heads] [--] [ШАБЛОН…]" +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference]\n" +" [-s | --hash[=БРОЙ]] [--abbrev[=БРОЙ]] [--tags]\n" +" [--heads] [--] [ШАБЛОН…]" msgid "git show-ref --exclude-existing[=<pattern>]" msgstr "git show-ref --exclude-existing[=ШАБЛОН]" @@ -12211,8 +12316,10 @@ msgstr "" "извеждане на указателите приети от стандартния вход, които липсват в " "локалното хранилище" -msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" -msgstr "git sparse-checkout (init|list|set|add|reapply|disable) ОПЦИЯ…" +msgid "" +"git sparse-checkout (init | list | set | add | reapply | disable) [<options>]" +msgstr "" +"git sparse-checkout (init | list | set | add | reapply | disable) ОПЦИЯ…" msgid "this worktree is not sparse" msgstr "това работно дърво не е частично" @@ -12338,67 +12445,57 @@ msgstr "" msgid "error while refreshing working directory" msgstr "грешка при обновяване на работната директория" -msgid "git stash list [<options>]" -msgstr "git stash list [ОПЦИЯ…]" +msgid "git stash list [<log-options>]" +msgstr "git stash list [ОПЦИЯ_ЗА_ЖУРНАЛ…]" + +msgid "" +"git stash show [-u | --include-untracked | --only-untracked] [<diff-" +"options>] [<stash>]" +msgstr "" +"git stash show [-u | --include-untracked | --only-untracked] " +"[ОПЦИЯ_ЗА_РАЗЛИКА…] [СКАТАНО]" -msgid "git stash show [<options>] [<stash>]" -msgstr "git stash show [ОПЦИЯ…] [СКАТАНО]" +msgid "git stash drop [-q | --quiet] [<stash>]" +msgstr "git stash drop [-q | --quiet] [СКАТАНО]" -msgid "git stash drop [-q|--quiet] [<stash>]" -msgstr "git stash drop [-q|--quiet] [СКАТАНО]" +msgid "git stash pop [--index] [-q | --quiet] [<stash>]" +msgstr "git stash pop [--index] [-q | --quiet] [СКАТАНО]" -msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" -msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [СКАТАНО]" +msgid "git stash apply [--index] [-q | --quiet] [<stash>]" +msgstr "git stash apply [--index] [-q | --quiet] [СКАТАНО]" msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch КЛОН [СКАТАНО]" +msgid "git stash store [(-m | --message) <message>] [-q | --quiet] <commit>" +msgstr "git stash store [-m | --message СЪОБЩЕНИЕ] [-q | --quiet] ПОДАВАНЕ" + msgid "" -"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" -"quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" +"git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q " +"| --quiet]\n" +" [-u | --include-untracked] [-a | --all] [(-m | --message) " +"<message>]\n" " [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" " [--] [<pathspec>...]]" msgstr "" -"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" -"quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message СЪОБЩЕНИЕ]\n" +"git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q " +"| --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|--" -"quiet]\n" -" [-u|--include-untracked] [-a|--all] [<message>]" -msgstr "" -"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" -"quiet]\n" -" [-u|--include-untracked] [-a|--all] [СЪОБЩЕНИЕ]" - -msgid "git stash pop [--index] [-q|--quiet] [<stash>]" -msgstr "git stash pop [--index] [-q|--quiet] [СКАТАНО]" - -msgid "git stash apply [--index] [-q|--quiet] [<stash>]" -msgstr "git stash apply [--index] [-q|--quiet] [СКАТАНО]" - -msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" -msgstr "git stash store [-m|--message СЪОБЩЕНИЕ] [-q|--quiet] ПОДАВАНЕ" - -msgid "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" -" [--] [<pathspec>...]]" +"git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | " +"--quiet]\n" +" [-u | --include-untracked] [-a | --all] [<message>]" msgstr "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message СЪОБЩЕНИЕ]\n" -" [--] [ПЪТ…]]" +"git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | " +"--quiet]\n" +" [-u | --include-untracked] [-a | --all] [СЪОБЩЕНИЕ]" -msgid "" -"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [<message>]" -msgstr "" -"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [СЪОБЩЕНИЕ]]" +msgid "git stash create [<message>]" +msgstr "git stash create [СЪОБЩЕНИЕ]" #, c-format msgid "'%s' is not a stash-like commit" @@ -12973,9 +13070,6 @@ msgstr "рекурсивно обхождане на подмодулите" msgid "don't fetch new objects from the remote site" msgstr "без доставяне на новите обекти от отдалеченото хранилище" -msgid "path into the working tree" -msgstr "път към работното дърво" - msgid "use the 'checkout' update strategy (default)" msgstr "" "използване на стратегията за обновяване „checkout“ (изтегляне — стандартно)" @@ -13012,27 +13106,9 @@ msgstr "" "shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] " "[--] [ПЪТ…]" -msgid "recurse into submodules" -msgstr "рекурсивно обхождане подмодулите" - msgid "git submodule absorbgitdirs [<options>] [<path>...]" msgstr "git submodule absorbgitdirs [ОПЦИЯ…] [ПЪТ…]" -msgid "check if it is safe to write to the .gitmodules file" -msgstr "проверка дали писането във файла „.gitmodules“ е безопасно" - -msgid "unset the config in the .gitmodules file" -msgstr "изтриване на настройка във файла „.gitmodules“" - -msgid "git submodule--helper config <name> [<value>]" -msgstr "git submodule--helper config ИМЕ [СТОЙНОСТ]" - -msgid "git submodule--helper config --unset <name>" -msgstr "git submodule--helper config --unset ИМЕ" - -msgid "please make sure that the .gitmodules file is in the working tree" -msgstr "файлът „.gitmodules“ трябва да е в работното дърво" - msgid "suppress output for setting url of a submodule" msgstr "без извеждане на информация при задаването на адреса на подмодул" @@ -13112,6 +13188,9 @@ msgstr "Активиране на локалното хранилище за п msgid "unable to checkout submodule '%s'" msgstr "Подмодулът „%s“ не може да бъде изтеглен" +msgid "please make sure that the .gitmodules file is in the working tree" +msgstr "файлът „.gitmodules“ трябва да е в работното дърво" + #, c-format msgid "Failed to add submodule '%s'" msgstr "Неуспешно добавяне на подмодула „%s“" @@ -13165,19 +13244,21 @@ msgstr "" msgid "'%s' is not a valid submodule name" msgstr "„%s“ е неправилно име за подмодул" +msgid "git submodule--helper <command>" +msgstr "git submodule--helper КОМАНДА" + #, c-format msgid "%s doesn't support --super-prefix" msgstr "„%s“ не поддържа опцията „--super-prefix“" -#, c-format -msgid "'%s' is not a valid submodule--helper subcommand" -msgstr "„%s“ не е подкоманда на „submodule--helper“" +msgid "git symbolic-ref [-m <reason>] <name> <ref>" +msgstr "git symbolic-ref [-m ПРИЧИНА] ИМЕ УКАЗАТЕЛ" -msgid "git symbolic-ref [<options>] <name> [<ref>]" -msgstr "git symbolic-ref [ОПЦИЯ…] ИМЕ [УКАЗАТЕЛ]" +msgid "git symbolic-ref [-q] [--short] [--no-recurse] <name>" +msgstr "git symbolic-ref [-q] [--short] [--no-recurse] ИМЕ" -msgid "git symbolic-ref -d [-q] <name>" -msgstr "git symbolic-ref -d [-q] ИМЕ" +msgid "git symbolic-ref --delete [-q] <name>" +msgstr "git symbolic-ref --delete [-q] ИМЕ" msgid "suppress error message for non-symbolic (detached) refs" msgstr "без извеждане на грешка за несвързани (несимволни) указатели" @@ -13188,6 +13269,9 @@ msgstr "изтриване на символен указател" msgid "shorten ref output" msgstr "кратка информация за указателя" +msgid "recursively dereference (default)" +msgstr "рекурсивно извеждане на идентификатори (стандартно)" + msgid "reason" msgstr "причина" @@ -13195,24 +13279,26 @@ msgid "reason of the update" msgstr "причина за обновяването" msgid "" -"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n" -" <tagname> [<head>]" +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n" +" <tagname> [<commit> | <object>]" msgstr "" -"git tag [-a | -s | -u ИДЕНТИФИКАТОР_НА_КЛЮЧ] [-f] [-m СЪОБЩЕНИЕ | -F ФАЙЛ]\n" -" ЕТИКЕТ [ВРЪХ]" +"git tag [-a | -s | -u ИДЕНТИФИКАТОР_НА_КЛЮЧ] [-f] [-m СЪОБЩЕНИЕ | -F ФАЙЛ] [-" +"e]\n" +" ЕТИКЕТ [ПОДАВАНЕ | ОБЕКТ]" msgid "git tag -d <tagname>..." msgstr "git tag -d ЕТИКЕТ…" msgid "" -"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" -"points-at <object>]\n" -" [--format=<format>] [--merged <commit>] [--no-merged <commit>] " -"[<pattern>...]" +"git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]\n" +" [--points-at <object>] [--column[=<options>] | --no-column]\n" +" [--create-reflog] [--sort=<key>] [--format=<format>]\n" +" [--merged <commit>] [--no-merged <commit>] [<pattern>...]" msgstr "" -"git tag -l [-n[БРОЙ]] [--contains ПОДАВАНЕ] [--no-contains ПОДАВАНЕ]\n" -" [--points-at ОБЕКТ] [--format=ФОРМАТ] [--merged ПОДАВАНЕ]\n" -" [--no-merged ПОДАВАНЕ] [ШАБЛОН…]" +"git tag [-n[БРОЙ]] -l [--contains ПОДАВАНЕ] [--no-contains ПОДАВАНЕ]\n" +" [--points-at ОБЕКТ] [--column[=ОПЦИЯ…] | --no-column]\n" +" [--create-reflog] [--sort=<key>] [--format=ФОРМАТ]\n" +" [--merged ПОДАВАНЕ] [--no-merged ПОДАВАНЕ] [ШАБЛОН…]" msgid "git tag -v [--format=<format>] <tagname>..." msgstr "git tag -v [--format=ФОРМАТ] ЕТИКЕТ…" @@ -13614,8 +13700,12 @@ msgstr "изчитане на указателите от стандартния msgid "update the info files from scratch" msgstr "обновяване на информационните файлове от нулата" -msgid "git upload-pack [<options>] <dir>" -msgstr "git upload-pack [ОПЦИЯ…] ДИРЕКТОРИЯ" +msgid "" +"git-upload-pack [--[no-]strict] [--timeout=<n>] [--stateless-rpc]\n" +" [--advertise-refs] <directory>" +msgstr "" +"git-upload-pack [--[no-]strict] [--timeout=БРОЙ] [--stateless-rpc]\n" +" [--advertise-refs] ДИРЕКТОРИЯ" msgid "quit after a single request/response exchange" msgstr "изход след първоначалната размяна на заявка и отговор" @@ -13630,8 +13720,8 @@ msgstr "" msgid "interrupt transfer after <n> seconds of inactivity" msgstr "трансферът да се преустанови след този БРОЙ секунди" -msgid "git verify-commit [-v | --verbose] <commit>..." -msgstr "git verify-commit [-v | --verbose] ПОДАВАНЕ…" +msgid "git verify-commit [-v | --verbose] [--raw] <commit>..." +msgstr "git verify-commit [-v | --verbose] [--raw] ПОДАВАНЕ…" msgid "print commit contents" msgstr "извеждане на съдържанието на подаването" @@ -13639,8 +13729,8 @@ msgstr "извеждане на съдържанието на подаванет msgid "print raw gpg status output" msgstr "извеждане на необработения изход от състоянието на „gpg“" -msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." -msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] ПАКЕТ…" +msgid "git verify-pack [-v | --verbose] [-s | --stat-only] [--] <pack>.idx..." +msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] [--] ПАКЕТ.idx…" msgid "verbose" msgstr "извеждане на подробна информация" @@ -13648,35 +13738,39 @@ msgstr "извеждане на подробна информация" msgid "show statistics only" msgstr "извеждане само на статистиката" -msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." -msgstr "git verify-tag [-v | --verbose] [--format=ФОРМАТ] ЕТИКЕТ…" +msgid "git verify-tag [-v | --verbose] [--format=<format>] [--raw] <tag>..." +msgstr "git verify-tag [-v | --verbose] [--format=ФОРМАТ] [--raw] ЕТИКЕТ…" msgid "print tag contents" msgstr "извеждане на съдържанието на ЕТИКЕТи" -msgid "git worktree add [<options>] <path> [<commit-ish>]" -msgstr "git worktree add [ОПЦИЯ…] ПЪТ [УКАЗАТЕЛ_КЪМ_ПОДАВАНЕ]" +msgid "" +"git worktree add [-f] [--detach] [--checkout] [--lock [--reason <string>]]\n" +" [-b <new-branch>] <path> [<commit-ish>]" +msgstr "" +"git worktree add [-f] [--detach] [--checkout] [--lock [--reason НИЗ]]\n" +" [-b НОВ_КЛОН] ПЪТ [УКАЗАТЕЛ_КЪМ_ПОДАВАНЕ]" -msgid "git worktree list [<options>]" -msgstr "git worktree list [ОПЦИЯ…]" +msgid "git worktree list [-v | --porcelain [-z]]" +msgstr "git worktree list [-v | --porcelain [-z]]" -msgid "git worktree lock [<options>] <path>" -msgstr "git worktree lock [ОПЦИЯ…] [ПЪТ]" +msgid "git worktree lock [--reason <string>] <worktree>" +msgstr "git worktree lock [--reason ПРИЧИНА] ФОРМАТ" msgid "git worktree move <worktree> <new-path>" msgstr "git worktree move [ДЪРВО] [НОВ_ПЪТ]" -msgid "git worktree prune [<options>]" -msgstr "git worktree prune [ОПЦИЯ…]" +msgid "git worktree prune [-n] [-v] [--expire <expire>]" +msgstr "git worktree prune [-n] [-v] [--expire ВРЕМЕ]" -msgid "git worktree remove [<options>] <worktree>" -msgstr "git worktree remove [ОПЦИЯ…] [ДЪРВО]" +msgid "git worktree remove [-f] <worktree>" +msgstr "git worktree remove [-f] ДЪРВО" msgid "git worktree repair [<path>...]" msgstr "git worktree repair [ПЪТ…]" -msgid "git worktree unlock <path>" -msgstr "git worktree unlock [ПЪТ]" +msgid "git worktree unlock <worktree>" +msgstr "git worktree unlock ДЪРВО" #, c-format msgid "Removing %s/%s: %s" @@ -13918,6 +14012,10 @@ msgstr "само за изчистване на грешки" msgid "core.fsyncMethod = batch is unsupported on this platform" msgstr "„core.fsyncMethod = batch“ не се поддържа на тази платформа" +#, c-format +msgid "bundle list at '%s' has no mode" +msgstr "липсва режим в списъка от пратки „%s“" + msgid "failed to create temporary file" msgstr "не може да се създаде временен файл" @@ -13925,16 +14023,30 @@ msgid "insufficient capabilities" msgstr "недостатъчно възможности" #, c-format +msgid "unrecognized bundle mode from URI '%s'" +msgstr "непознат режим на пратки от адрес „%s“" + +#, c-format +msgid "exceeded bundle URI recursion limit (%d)" +msgstr "" +"преминато е ограничениeто за рекурсивно обхождане на адреси на пратки (%d)" + +#, c-format msgid "failed to download bundle from URI '%s'" msgstr "неуспешно изтегляне на пратка от адрес: „%s“" #, c-format -msgid "file at URI '%s' is not a bundle" -msgstr "файлът на адрес „%s“ не е пратка" +msgid "file at URI '%s' is not a bundle or bundle list" +msgstr "файлът на адрес „%s“ не е нито пратка, нито списък с пратки" -#, c-format -msgid "failed to unbundle bundle from URI '%s'" -msgstr "неуспешно разпакетиране на пратка от адрес „%s“" +msgid "bundle-uri: got an empty line" +msgstr "bundle-uri: получен е празен ред" + +msgid "bundle-uri: line is not of the form 'key=value'" +msgstr "bundle-uri: редът не е във формат „КЛЮЧ=СТОЙНОСТ“" + +msgid "bundle-uri: line has empty key or value" +msgstr "bundle-uri: редът съдържа празен ключ или стойност" #, c-format msgid "unrecognized bundle hash algorithm: %s" @@ -14163,7 +14275,7 @@ msgstr "Сравняване на обекти-дърво с работното msgid "Compares the content and mode of blobs found via two tree objects" msgstr "" -"Сравняване на съдържанието и правата за достъп на обектите-BLOB чрез два " +"Сравняване на съдържанието и права̀та за достъп на обектите-BLOB чрез два " "обекта-дърво" msgid "Show changes using common diff tools" @@ -14521,7 +14633,7 @@ msgstr "Формат на пратките" msgid "Chunk-based file formats" msgstr "Формати на откъсите" -msgid "Git commit graph format" +msgid "Git commit-graph format" msgstr "Формат на гра̀фа с подаванията" msgid "Git index format" @@ -14691,7 +14803,7 @@ msgstr "не може да бъде създаден временен слой #, c-format msgid "unable to adjust shared permissions for '%s'" -msgstr "правата за споделен достъп до „%s“ не може да бъдат зададени" +msgstr "права̀та за споделен достъп до „%s“ не може да бъдат зададени" #, c-format msgid "Writing out commit graph in %d pass" @@ -14888,8 +15000,12 @@ msgstr "необработен случай в „has_worktree_moved“: %d" #, c-format msgid "health thread wait failed [GLE %ld]" msgstr "" -"грешка в нишката за следене на състоянието [последна грешка в нишката: GLE=" -"%1$ld]" +"грешка в нишката за следене на състоянието [последна грешка в нишката: " +"GLE=%1$ld]" + +#, c-format +msgid "Invalid path: %s" +msgstr "Неправилен път: „%s“" msgid "Unable to create FSEventStream." msgstr "Неуспешно създаване на „FSEventStream“." @@ -14911,8 +15027,8 @@ msgstr "„%2$s“ не може да се наблюдава [последна #, c-format msgid "[GLE %ld] could not get longname of '%s'" msgstr "" -"дългото име на „%2$s“ те може да се получи [последна грешка в нишката: GLE=" -"%1$ld]" +"дългото име на „%2$s“ те може да се получи [последна грешка в нишката: " +"GLE=%1$ld]" #, c-format msgid "ReadDirectoryChangedW failed on '%s' [GLE %ld]" @@ -14933,6 +15049,22 @@ msgstr "" "нишката: GLE=%ld]" #, c-format +msgid "opendir('%s') failed" +msgstr "неуспешно изпълнение на opendir(„%s“)" + +#, c-format +msgid "lstat('%s') failed" +msgstr "неуспешно изпълнение на lstat(„%s“)" + +#, c-format +msgid "strbuf_readlink('%s') failed" +msgstr "неуспешно изпълнение на strbuf_readlink(„%s“)" + +#, c-format +msgid "closedir('%s') failed" +msgstr "неуспешно изпълнение на closedir(„%s“)" + +#, c-format msgid "[GLE %ld] unable to open for read '%ls'" msgstr "" "файлът „%2$ls“ не може да бъде отворен за четене [последна грешка в нишката: " @@ -15324,7 +15456,7 @@ msgstr "неуспешно изпълнение на „mmap“ върху „%s #, c-format msgid "chmod on %s failed" -msgstr "неуспешна смяна на права с „chmod“ върху „%s“" +msgstr "неуспешна смяна на права̀ с „chmod“ върху „%s“" #, c-format msgid "could not write config file %s" @@ -15353,7 +15485,7 @@ msgid "" msgstr "" "Не може да се чете от отдалеченото хранилище.\n" "\n" -"Проверете дали то съществува и дали имате права\n" +"Проверете дали то съществува и дали имате права̀\n" "за достъп." #, c-format @@ -16576,9 +16708,11 @@ msgstr "виртуалното хранилище „%s“ е несъвмест #, c-format msgid "" -"repository '%s' is incompatible with fsmonitor due to lack of Unix sockets" +"socket directory '%s' is incompatible with fsmonitor due to lack of Unix " +"sockets support" msgstr "" -"хранилището „%s“ е несъвместимо с fsmonitor заради липсата на гнезда на unix" +"директорията за гнезда „%s“ е несъвместима с fsmonitor заради липсата на " +"гнезда на Unix" msgid "" "git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]\n" @@ -16915,8 +17049,8 @@ msgstr[1] "" "\n" "Най-близките команди са" -msgid "git version [<options>]" -msgstr "git version [ОПЦИЯ…]" +msgid "git version [--build-options]" +msgstr "git version [--build-options]" #, c-format msgid "%s: %s - %s" @@ -16940,7 +17074,7 @@ 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`." msgstr "" -"Куката „%s“ се прескача, защото липсват права за изпълнение.\n" +"Куката „%s“ се прескача, защото липсват права̀ за изпълнение.\n" "За да изключите това предупреждение, изпълнете:\n" " git config advice.ignoredHook false" @@ -17420,7 +17554,7 @@ msgstr "неуспешно създаване на символната връз #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "" -"не е ясно какво да се прави с обекта „%2$s“ (%3$s) с права за достъп „%1$06o“" +"не е ясно какво да се прави с обекта „%2$s“ (%3$s) с права̀ за достъп „%1$06o“" #, c-format msgid "Fast-forwarding submodule %s to the following commit:" @@ -17533,8 +17667,8 @@ msgstr "" #, c-format msgid "" -"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" -"\"->\"%s\" in \"%s\"%s" +"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename " +"\"%s\"->\"%s\" in \"%s\"%s" msgstr "" "КОНФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон " "„%s“, а „%s“ е преименуван на „%s“ в „%s“/%s." @@ -17877,10 +18011,6 @@ msgstr "" "%s: алтернативните хранилища за обекти се пренебрегват поради прекалено " "дълбоко влагане" -#, c-format -msgid "unable to normalize object directory: %s" -msgstr "директорията за обекти „%s“ не може да бъде нормализирана" - msgid "unable to fdopen alternates lockfile" msgstr "заключващият файл за алтернативите не може да се отвори с „fdopen“" @@ -17976,7 +18106,7 @@ msgstr "файлът „%s“ не може да бъде записан" #, c-format msgid "unable to set permission to '%s'" -msgstr "правата за достъп до „%s“ не може да бъдат зададени" +msgstr "права̀та за достъп до „%s“ не може да бъдат зададени" msgid "file write error" msgstr "грешка при запис на файл" @@ -17987,7 +18117,7 @@ msgstr "грешка при затварянето на файла с непак #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" -"няма права за добавяне на обект към базата от данни на хранилището „%s“" +"няма права̀ за добавяне на обект към базата от данни на хранилището „%s“" msgid "unable to create temporary file" msgstr "не може да бъде създаден временен файл" @@ -18436,7 +18566,7 @@ msgstr "не може да се получи информация чрез „st #, c-format msgid "failed to make %s readable" -msgstr "не може да се дадат права за четене на „%s“" +msgstr "не може да се дадат права̀ за четене на „%s“" #, c-format msgid "could not write '%s' promisor file" @@ -18605,7 +18735,7 @@ msgstr "" #, c-format msgid "Could not make %s writable by group" -msgstr "Не може да се дадат права за запис в директорията „%s“ на групата" +msgstr "Не може да се дадат права̀ за запис в директорията „%s“ на групата" msgid "Escape character '\\' not allowed as last character in attr value" msgstr "" @@ -18741,6 +18871,10 @@ msgid "promisor remote name cannot begin with '/': %s" msgstr "" "името отдалеченото хранилище-гарант не може за започва със знака „/“: %s" +#, c-format +msgid "could not fetch %s from promisor remote" +msgstr "„%s“ не може да се достави от гарантиращото хранилище" + msgid "object-info: expected flush after arguments" msgstr "object-info: след аргументите се очаква изчистване на буферите" @@ -18934,7 +19068,7 @@ msgstr "неуспешно изтриване на „%s“" #, c-format msgid "cannot fix permission bits on '%s'" -msgstr "правата за достъп до „%s“ не може да бъдат поправени" +msgstr "права̀та за достъп до „%s“ не може да бъдат поправени" #, c-format msgid "%s: cannot drop to stage #0" @@ -19838,6 +19972,13 @@ msgid "failed to find tree of %s" msgstr "дървото, сочено от „%s“, не може да бъде открито" #, c-format +msgid "unsupported section for hidden refs: %s" +msgstr "неподдържан раздел за скрити указатели: „%s“" + +msgid "--exclude-hidden= passed more than once" +msgstr "опцията „--exclude-hidden=“ не може да се подава повече от веднъж" + +#, c-format msgid "resolve-undo records `%s` which is missing" msgstr "" "в информацията за отмяна на разрешените подавания присъства „%s“, който " @@ -19986,6 +20127,14 @@ msgid "--all or <enlistment>, but not both" msgstr "опцията „--all“ и указването на зачислена директория не са съвместими" #, c-format +msgid "could not remove stale scalar.repo '%s'" +msgstr "остарялото скаларно хранилище (scalar.repo) „%s“ не може да се изтрие" + +#, c-format +msgid "removing stale scalar.repo '%s'" +msgstr "изтриване на остарялото скаларно хранилище (scalar.repo) „%s“" + +#, c-format msgid "git repository gone in '%s'" msgstr "вече няма хранилище на git в „%s“" @@ -20194,7 +20343,7 @@ msgid "%s: Unable to write new index file" msgstr "%s: новият индекс не може да бъде запазен" msgid "unable to update cache tree" -msgstr "дървото на кеша не може да бъде обновено" +msgstr "кешът на обектите-дървета не може да бъде обновен" msgid "could not resolve HEAD commit" msgstr "подаването, сочено от указателя „HEAD“, не може да бъде открито" @@ -20652,16 +20801,16 @@ msgstr "" msgid "illegal label name: '%.*s'" msgstr "неправилно име на етикет: „%.*s“" +#, c-format +msgid "could not resolve '%s'" +msgstr "„%s“ не може да бъде открит" + msgid "writing fake root commit" msgstr "запазване на фалшиво начално подаване" msgid "writing squash-onto" msgstr "запазване на подаването, в което другите да се вкарат" -#, c-format -msgid "could not resolve '%s'" -msgstr "„%s“ не може да бъде открит" - msgid "cannot merge without a current revision" msgstr "без текущо подаване не може да се слива" @@ -21032,7 +21181,7 @@ msgid "" msgstr "" "зададеният в „core.sharedRepository“ режим за достъп до файлове е неправилен " "(0%.3o).\n" -"Собственикът на файла трябва да има права за писане и четене." +"Собственикът на файла трябва да има права̀ за писане и четене." msgid "fork failed" msgstr "неуспешно създаване на процес чрез „fork“" @@ -21277,6 +21426,17 @@ msgstr "„ls-tree“ завърши с неочакван изходен код msgid "failed to lstat '%s'" msgstr "не може да бъде получена информация чрез „lstat“ за „%s“" +msgid "test-tool cache-tree <options> (control|prime|update)" +msgstr "test-tool cache-tree ОПЦИЯ… (control|prime|update)" + +msgid "clear the cache tree before each iteration" +msgstr "изчистване на кеша на обектите-дървета преди всяка итерация" + +msgid "number of entries in the cache tree to invalidate (default 0)" +msgstr "" +"какъв брой записи в кеша на обектите-дървета да се отбележат като невалидни " +"(стандартно е 0)" + msgid "unhandled options" msgstr "неподдържани опции" @@ -21377,7 +21537,7 @@ msgstr "„%s“ не е обикновен файл" #, c-format msgid "file %s is not writable by user" -msgstr "„%s“: няма права за записване на файла" +msgstr "„%s“: няма права̀ за записване на файла" msgid "could not open temporary file" msgstr "временният файл не може да се отвори" @@ -21629,7 +21789,7 @@ msgid "too-short tree object" msgstr "прекалено кратък обект-дърво" msgid "malformed mode in tree entry" -msgstr "неправилни права за достъп в запис в дърво" +msgstr "неправилни права̀ за достъп в запис в дърво" msgid "empty filename in tree entry" msgstr "празно име на файл в запис в дърво" @@ -68,8 +68,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2022-09-28 18:55+0200\n" -"PO-Revision-Date: 2022-09-28 19:00-0600\n" +"POT-Creation-Date: 2022-12-07 07:33+0100\n" +"PO-Revision-Date: 2022-12-07 19:00-0600\n" "Last-Translator: Jordi Mas i Hernàndez <jmas@softcatala.org>\n" "Language-Team: Catalan\n" "Language: ca\n" @@ -818,7 +818,10 @@ msgid "cmdline ends with \\" msgstr "la línia d'ordres acaba amb \\" msgid "unclosed quote" -msgstr "commetes no tancades" +msgstr "cometes no tancades" + +msgid "too many arguments" +msgstr "hi ha massa arguments" #, c-format msgid "unrecognized whitespace option '%s'" @@ -1878,7 +1881,7 @@ msgstr "" "comprova si els fitxers, fins i tot els absents, s'ignoren en fer una prova" msgid "allow updating entries outside of the sparse-checkout cone" -msgstr "permet actualitzar entrada fora del con del «sparse-checkout»" +msgstr "permet actualitzar les entrades fora del con del «sparse-checkout»" msgid "override the executable bit of the listed files" msgstr "sobreescriu el bit executable dels fitxers llistats" @@ -2408,7 +2411,7 @@ msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." msgstr "" "no s'ha pogut agafar la HEAD original «%s». Proveu «git bisect reset " -"<commit>»." +"<comissió>»." #, c-format msgid "Bad bisect_write argument: %s" @@ -2606,42 +2609,6 @@ msgstr "" "l'execució de la bisecció ha fallat: «git bisect--helper --bisect-state %s» " "ha sortit amb el codi d'error %d" -msgid "reset the bisection state" -msgstr "restableix l'estat de la bisecció" - -msgid "check whether bad or good terms exist" -msgstr "comprova si existeixen termes correctes o incorrectes" - -msgid "print out the bisect terms" -msgstr "imprimeix els termes de la bisecció" - -msgid "start the bisect session" -msgstr "inicia la sessió bisecció" - -msgid "find the next bisection commit" -msgstr "troba la comissió de bisecció següent" - -msgid "mark the state of ref (or refs)" -msgstr "marca l'estat de la referència o referències" - -msgid "list the bisection steps so far" -msgstr "mostra les passes de la bisecció fins ara" - -msgid "replay the bisection process from the given file" -msgstr "torna a reproduir el procés de bisecció des del fitxer donat" - -msgid "skip some commits for checkout" -msgstr "omet algunes comissions en agafar" - -msgid "visualize the bisection" -msgstr "visualitza la bisecció" - -msgid "use <cmd>... to automatically bisect" -msgstr "useu <cmd>... per a fer una bisecció automàticament" - -msgid "no log for BISECT_WRITE" -msgstr "no hi ha registre per a BISECT_WRITE" - msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-reset no requereix cap argument ni comissió" @@ -2660,6 +2627,9 @@ msgstr "no s'ha donat cap fitxer de registre" msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<opcions>] [<opcions-de-revisió>] [<revisió>] [--] fitxer" +msgid "git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>" +msgstr "git annotate [<opcions>] [<rev-opts>] [<rev>] [--] <fitxer>" + msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "es documenten les <opcions-de-revisió> en git-rev-list(1)" @@ -2799,11 +2769,11 @@ msgid "" "git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-" "point>]" msgstr "" -"git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-" +"git branch [<opcions>] [-f] [--recurse-submodules] <branch-name> [<start-" "point>]" msgid "git branch [<options>] [-l] [<pattern>...]" -msgstr "git branch [<options>] [-l] [<pattern>...]" +msgstr "git branch [<opcions>] [-l] [<patró>...]" msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "git branch [<opcions>] [-r] (-d | -D) <nom-de-branca>..." @@ -2856,9 +2826,6 @@ msgstr "L'actualització del fitxer de configuració ha fallat" msgid "cannot use -a with -d" msgstr "no es pot usar -a amb -d" -msgid "Couldn't look up commit object for HEAD" -msgstr "No s'ha pogut trobar l'objecte de comissió de HEAD" - #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "No es pot suprimir la branca «%s» agafada a «%s»" @@ -2897,16 +2864,18 @@ msgstr "S'està fent «rebase» en la branca %s a %s" msgid "Branch %s is being bisected at %s" msgstr "La branca %s s'està bisecant a %s" -msgid "cannot copy the current branch while not on any." -msgstr "no es pot copiar branca actual mentre no s'és a cap." - -msgid "cannot rename the current branch while not on any." -msgstr "no es pot canviar el nom de la branca actual mentre no s'és a cap." - #, c-format msgid "Invalid branch name: '%s'" msgstr "Nom de branca no vàlid: «%s»" +#, c-format +msgid "No commit on branch '%s' yet." +msgstr "Encara no hi ha cap comissió en la branca «%s»." + +#, c-format +msgid "No branch named '%s'." +msgstr "No hi ha cap branca amb nom «%s»." + msgid "Branch rename failed" msgstr "El canvi de nom de branca ha fallat" @@ -3039,7 +3008,7 @@ msgid "sorting and filtering are case insensitive" msgstr "ordenació i filtratge distingeixen entre majúscules i minúscules" msgid "recurse through submodules" -msgstr "inclou recursivament als submòduls" +msgstr "inclou recursivament els submòduls" msgid "format to use for the output" msgstr "format a usar en la sortida" @@ -3069,13 +3038,11 @@ msgstr "No es pot donar descripció a una HEAD separada" msgid "cannot edit description of more than one branch" msgstr "no es pot editar la descripció de més d'una branca" -#, c-format -msgid "No commit on branch '%s' yet." -msgstr "Encara no hi ha cap comissió en la branca «%s»." +msgid "cannot copy the current branch while not on any." +msgstr "no es pot copiar branca actual mentre no s'és a cap." -#, c-format -msgid "No branch named '%s'." -msgstr "No hi ha cap branca amb nom «%s»." +msgid "cannot rename the current branch while not on any." +msgstr "no es pot canviar el nom de la branca actual mentre no s'és a cap." msgid "too many branches for a copy operation" msgstr "hi ha massa branques per a una operació de còpia" @@ -3116,7 +3083,7 @@ msgid "" "Did you mean to use: -a|-r --list <pattern>?" msgstr "" "Les opcions -a i -r a «git branch» no prenen un nom de branca.\n" -"Volíeu usar -a|-r --list <pattern>?" +"Volíeu usar -a|-r --list <patró>?" msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " @@ -3143,11 +3110,11 @@ msgstr "" "no s'està executant en un repositori de git - no hi ha lligams a mostrar\n" msgid "" -"git bugreport [-o|--output-directory <file>] [-s|--suffix <format>] [--" -"diagnose[=<mode>]" +"git bugreport [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n" +" [--diagnose[=<mode>]]" msgstr "" -"git bugreport [-o|--output-directory <file>] [-s|--suffix <format>] [--" -"diagnose[=<mode>]" +"git bugreport [(-o | --output-directory) <camí>] [(-s | --suffix) <format>]\n" +" [--diagnose[=<mode>]]" msgid "" "Thank you for filling out a Git bug report!\n" @@ -3218,17 +3185,23 @@ msgstr "no s'ha pogut escriure a %s" msgid "Created new report at '%s'.\n" msgstr "S'ha creat un nou informe a «%s».\n" -msgid "git bundle create [<options>] <file> <git-rev-list args>" -msgstr "git bundle create [<opcions>] <fitxer> <git-rev-list args>" +msgid "" +"git bundle create [-q | --quiet | --progress | --all-progress] [--all-" +"progress-implied]\n" +" [--version=<version>] <file> <git-rev-list-args>" +msgstr "" +"git bundle create [-q | --quiet | --progress | --all-progress] [--all-" +"progress-implied]\n" +" [--version=<versió>] <fitxer> <git-rev-list-args>" -msgid "git bundle verify [<options>] <file>" -msgstr "git bundle verify [<opcions>] <fitxer>" +msgid "git bundle verify [-q | --quiet] <file>" +msgstr "git bundle verify [-q | --quiet] <fitxer>" msgid "git bundle list-heads <file> [<refname>...]" msgstr "git bundle list-heads <fitxer> [<refname>...]" -msgid "git bundle unbundle <file> [<refname>...]" -msgstr "git bundle unbundle <fitxer> [<refname>...]" +msgid "git bundle unbundle [--progress] <file> [<refname>...]" +msgstr "git bundle unbundle [--progress] <fitxer> [<refname>...]" msgid "do not show progress meter" msgstr "no mostris l'indicador de progrés" @@ -3291,24 +3264,24 @@ msgid "only one batch option may be specified" msgstr "només es pot especificar una opció per lots" msgid "git cat-file <type> <object>" -msgstr "git cat-file <type> <object>" +msgstr "git cat-file <tipus> <objecte>" msgid "git cat-file (-e | -p) <object>" -msgstr "git cat-file (-e | -p) <object>" +msgstr "git cat-file (-e | -p) <objecte>" msgid "git cat-file (-t | -s) [--allow-unknown-type] <object>" -msgstr "git cat-file (-t | -s) [--allow-unknown-type] <object>" +msgstr "git cat-file (-t | -s) [--allow-unknown-type] <objecte>" msgid "" "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" "objects]\n" " [--buffer] [--follow-symlinks] [--unordered]\n" -" [--textconv | --filters]" +" [--textconv | --filters] [-z]" msgstr "" "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" "objects]\n" " [--buffer] [--follow-symlinks] [--unordered]\n" -" [--textconv | --filters]" +" [--textconv | --filters] [-z]" msgid "" "git cat-file (--textconv | --filters)\n" @@ -3321,7 +3294,7 @@ msgid "Check object existence or emit object contents" msgstr "Comprova l'existència de l'objecte o emet el contingut de l'objecte" msgid "check if <object> exists" -msgstr "comprova si <object> existeix" +msgstr "comprova si <objecte> existeix" msgid "pretty-print <object> content" msgstr "impressió embellida del contingut de l'<objecte>" @@ -3390,7 +3363,7 @@ msgid "blob|tree" msgstr "blob|tree" msgid "use a <path> for (--textconv | --filters); Not with 'batch'" -msgstr "useu un <path> per a (--textconv | --filters); no amb «batch»" +msgstr "useu un <camí> per a (--textconv | --filters); no amb «batch»" #, c-format msgid "'%s=<%s>' needs '%s' or '%s'" @@ -3416,14 +3389,11 @@ msgstr "<rev> requerida amb «%s»" #, c-format msgid "<object> required with '-%c'" -msgstr "<object> requerit amb «-%c»" - -msgid "too many arguments" -msgstr "hi ha massa arguments" +msgstr "<objecte> requerit amb «-%c»" #, c-format msgid "only two arguments allowed in <type> <object> mode, not %d" -msgstr "només es permeten dos arguments en el mode <type> <object>, no %d" +msgstr "només es permeten dos arguments en el mode <tipus> <objecte>, no %d" msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." msgstr "git check-attr [-a | --all | <atribut>...] [--] <nom-de-camí>..." @@ -3533,7 +3503,7 @@ msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<opcions>] [<branca>] -- <fitxer>..." msgid "git switch [<options>] [<branch>]" -msgstr "git switch [<options>] [<branch>]" +msgstr "git switch [<opcions>] [<branca>]" msgid "git restore [<options>] [--source=<branch>] <file>..." msgstr "git restore [<opcions>] [--source=<branca>] <fitxer>..." @@ -3955,9 +3925,11 @@ msgid "use overlay mode" msgstr "utilitza el mode de superposició" msgid "" -"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." +"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] " +"[<pathspec>...]" msgstr "" -"git clean [-d] [-f] [-i] [-n] [-q] [-e <patró>] [-x | -X] [--] <camins>..." +"git clean [-d] [-f] [-i] [-n] [-q] [-e <patró>] [-x | -X] [--] " +"[<pathspec>...]" #, c-format msgid "Removing %s\n" @@ -4250,6 +4222,10 @@ msgid "failed to start iterator over '%s'" msgstr "no s'ha pogut iniciar l'iterador sobre «%s»" #, c-format +msgid "symlink '%s' exists, refusing to clone with --local" +msgstr "l'enllaç simbòlic «%s» existeix, es nega a clonar amb --local" + +#, c-format msgid "failed to unlink '%s'" msgstr "s'ha produït un error en desenllaçar «%s»" @@ -4315,10 +4291,6 @@ msgstr "Hi ha massa arguments." msgid "You must specify a repository to clone." msgstr "Heu d'especificar un repositori per a clonar." -#, c-format -msgid "options '%s' and '%s %s' cannot be used together" -msgstr "les opcions «%s» i «%s %s» no es poden usar juntes" - msgid "" "--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-" "exclude" @@ -4440,18 +4412,24 @@ msgid "--command must be the first argument" msgstr "--command ha de ser el primer argument" msgid "" -"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" +"git commit-graph verify [--object-dir <dir>] [--shallow] [--[no-]progress]" msgstr "" -"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" +"git commit-graph verify [--object-dir <dir>] [--shallow] [--[no-]progress]" msgid "" -"git commit-graph write [--object-dir <objdir>] [--append] [--" -"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" -"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>" +"git commit-graph write [--object-dir <dir>] [--append]\n" +" [--split[=<strategy>]] [--reachable | --stdin-packs | " +"--stdin-commits]\n" +" [--changed-paths] [--[no-]max-new-filters <n>] [--" +"[no-]progress]\n" +" <split options>" msgstr "" -"git commit-graph write [--object-dir <objdir>] [--append] [--" -"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" -"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>" +"git commit-graph write [--object-dir <dir>] [--append]\n" +" [--split[=<strategy>]] [--reachable | --stdin-packs | " +"--stdin-commits]\n" +" [--changed-paths] [--[no-]max-new-filters <n>] [--" +"[no-]progress]\n" +" <split options>" msgid "dir" msgstr "directori" @@ -4520,12 +4498,15 @@ msgstr "usa com a màxim un --reachable, --stdin-commits, o --stdin-packs" msgid "Collecting commits from input" msgstr "S'estan recollint les comissions de l'entrada" +msgid "git commit-tree <tree> [(-p <parent>)...]" +msgstr "git commit-tree <tree> [(-p <pare>)...]" + msgid "" -"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " -"<file>)...] <tree>" +"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...]\n" +" [(-F <file>)...] <tree>" msgstr "" -"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " -"<file>)...] <tree>" +"git commit-tree [(-p <pare>)...] [-S[<keyid>]] [(-m <missatge>)...]\n" +" [(-F <fitxer>)...] <tree>" #, c-format msgid "duplicate parent %s ignored" @@ -4567,11 +4548,29 @@ msgstr "ha de donar exactament un arbre" msgid "git commit-tree: failed to read" msgstr "git commit-tree: ha fallat en llegir" -msgid "git commit [<options>] [--] <pathspec>..." -msgstr "git commit [<opcions>] [--] <especificació-de-camí>..." +msgid "" +"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" +" [--allow-empty-message] [--no-verify] [-e] [--author=<author>]\n" +" [--date=<date>] [--cleanup=<mode>] [--[no-]status]\n" +" [-i | -o] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" +" [(--trailer <token>[(=|:)<value>])...] [-S[<keyid>]]\n" +" [--] [<pathspec>...]" +msgstr "" +"git commit [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]\n" +" [--dry-run] [(-c | -C | --squash) <comissió> | --fixup [(amend|" +"reword):]<comissió>)]\n" +" [-F <fitxer> | -m <msg>] [--reset-author] [--allow-empty]\n" +" [--allow-empty-message] [--no-verify] [-e] [--author=<author>]\n" +" [--date=<date>] [--cleanup=<mode>] [--[no-]status]\n" +" [-i | -o] [--pathspec-from-file=<fitxer> [--pathspec-file-nul]]\n" +" [(--trailer <token>[(=|:)<value>])...] [-S[<keyid>]]\n" +" [--] [<pathspec>...]" -msgid "git status [<options>] [--] <pathspec>..." -msgstr "git status [<opcions>] [--] <especificació-de-camí>..." +msgid "git status [<options>] [--] [<pathspec>...]" +msgstr "git status [<opcions>] [--] [<pathspec>...]" msgid "" "You asked to amend the most recent commit, but doing so would make\n" @@ -5352,11 +5351,18 @@ 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" -msgid "git describe [<options>] [<commit-ish>...]" -msgstr "git describe [<opcions>] [<comissió>...]" +msgid "" +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] [<commit-ish>...]" +msgstr "" +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] [<commit-ish>...]" -msgid "git describe [<options>] --dirty" -msgstr "git describe [<opcions>] --dirty" +msgid "" +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<mark>]" +msgstr "" +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<mark>]" + +msgid "git describe <blob>" +msgstr "git describe <blob>" msgid "head" msgstr "davant per" @@ -5479,11 +5485,11 @@ msgid "option '%s' and commit-ishes cannot be used together" msgstr "les opcions «%s» i de comissió no es poden usar juntes" msgid "" -"git diagnose [-o|--output-directory <path>] [-s|--suffix <format>] [--" -"mode=<mode>]" +"git diagnose [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n" +" [--mode=<mode>]" msgstr "" -"git diagnose [-o|--output-directory <path>] [-s|--suffix <format>] [--" -"mode=<mode>]" +"git diagnose [(-o | --output-directory) <camí>] [(-s | --suffix) <format>]\n" +" [--mode=<mode>]" msgid "specify a destination for the diagnostics archive" msgstr "especifiqueu una destinació per a l'arxiu de diagnòstic" @@ -5501,6 +5507,9 @@ msgstr "--merge-base només funciona amb dues comissions" msgid "'%s': not a regular file or symlink" msgstr "«%s»: no és ni fitxer regular ni enllaç simbòlic" +msgid "no merge given, only parents." +msgstr "no s'ha donat cap fusió, només els pares." + #, c-format msgid "invalid option: %s" msgstr "opció no vàlida: %s" @@ -5529,7 +5538,7 @@ msgid "%s...%s: multiple merge bases, using %s" msgstr "%s...%s: múltiples bases de fusió, utilitzant %s" msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" -msgstr "git difftool [<opcions>] [<commit> [<commit>]] [--] [<camí>...]" +msgstr "git difftool [<opcions>] [<comissió> [<comissió>]] [--] [<camí>...]" #, c-format msgid "could not read symlink %s" @@ -6108,7 +6117,7 @@ msgid "git for-each-ref [--points-at <object>]" msgstr "git for-each-ref [--points-at <objecte>]" msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]" -msgstr "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]" +msgstr "git for-each-ref [--merged [<comissió>]] [--no-merged [<comissió>]]" msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" msgstr "" @@ -6149,8 +6158,8 @@ msgstr "imprimeix només les referències que continguin la comissió" msgid "print only refs which don't contain the commit" msgstr "imprimeix només les referències que no continguin la comissió" -msgid "git for-each-repo --config=<config> <command-args>" -msgstr "git for-each-repo --config=<config> <command-args>" +msgid "git for-each-repo --config=<config> [--] <arguments>" +msgstr "git for-each-repo --config=<config> [--] <arguments>" msgid "config" msgstr "config" @@ -6321,8 +6330,16 @@ msgstr "un no arbre en l'arbre de la memòria cau" msgid "%s: invalid sha1 pointer in resolve-undo" msgstr "%s: el punter sha1 no és vàlid a «resolve-undo»" -msgid "git fsck [<options>] [<object>...]" -msgstr "git fsck [<opcions>] [<objecte>...]" +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>...]" +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] [<objecte>...]" msgid "show unreachable objects" msgstr "mostra els objectes inabastables" @@ -6372,16 +6389,10 @@ msgid "invalid parameter: expected sha1, got '%s'" msgstr "paràmetre no vàlid: s'esperava sha1, s'ha obtingut «%s»" msgid "git fsmonitor--daemon start [<options>]" -msgstr "git fsmonitor--daemon start [<options>]" +msgstr "git fsmonitor--daemon start [<opcions>]" msgid "git fsmonitor--daemon run [<options>]" -msgstr "git fsmonitor--daemon run [<options>]" - -msgid "git fsmonitor--daemon stop" -msgstr "git fsmonitor--daemon stop" - -msgid "git fsmonitor--daemon status" -msgstr "git fsmonitor--daemon status" +msgstr "git fsmonitor--daemon run [<opcions>]" #, c-format msgid "value of '%s' out of range: %d" @@ -6576,7 +6587,7 @@ msgid "failed to finish 'git pack-objects' process" msgstr "no s'ha pogut finalitzar el procés «git pack-objects»" msgid "failed to write multi-pack-index" -msgstr "no s'han pogut escriu l'índex del multipaquet" +msgstr "no s'ha pogut escriure l'índex del multipaquet" msgid "'git multi-pack-index expire' failed" msgstr "ha fallat el venciment de «git multi-pack-index expire»" @@ -6627,8 +6638,20 @@ msgstr "executa una tasca específica" msgid "use at most one of --auto and --schedule=<frequency>" msgstr "usa com a màxim un entre --auto i --schedule=<frequency>" -msgid "failed to run 'git config'" -msgstr "no s'ha pogut executar «git config»" +#, c-format +msgid "unable to add '%s' value of '%s'" +msgstr "no es pot afegir el valor «%s» de «%s»" + +msgid "return success even if repository was not registered" +msgstr "retorna èxit encara que el repositori no estigui registrat" + +#, c-format +msgid "unable to unset '%s' value of '%s'" +msgstr "no es pot desassignar el valor «%s» de «%s»" + +#, c-format +msgid "repository '%s' is not registered" +msgstr "el repositori «%s» no està registrat" #, c-format msgid "failed to expand path '%s'" @@ -6710,7 +6733,7 @@ msgid "failed to add repo to global config" msgstr "no s'ha pogut afegir un repositori a la configuració global" msgid "git maintenance <subcommand> [<options>]" -msgstr "git maintenance <subcommand> [<options>]" +msgstr "git maintenance <subcommand> [<opcions>]" msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<opcions>] [-e] <patró> [<revisió>...] [[--] <camí>...]" @@ -6922,11 +6945,14 @@ msgid "both --cached and trees are given" msgstr "ambdós --cached i arbres venen donats" msgid "" -"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " -"[--] <file>..." +"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters]\n" +" [--stdin [--literally]] [--] <file>..." msgstr "" -"git hash-object [-t <tipus>] [-w] [--path=<fitxer> | --no-filters] [--stdin] " -"[--] <fitxer>..." +"git hash-object [-t <tipus>] [-w] [--path=<fitxer> | --no-filters]\n" +" [--stdin [--literally]] [--] <fitxer>..." + +msgid "git hash-object [-t <type>] [-w] --stdin-paths [--no-filters]" +msgstr "git hash-object [-t <tipus>] [-w] --stdin-paths [--no-filters]" msgid "object type" msgstr "tipus d'objecte" @@ -7357,11 +7383,15 @@ msgid "Initialized empty Git repository in %s%s\n" msgstr "S'ha inicialitzat un repositori buit del Git en %s%s\n" msgid "" -"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" -"shared[=<permissions>]] [<directory>]" +"git init [-q | --quiet] [--bare] [--template=<template-directory>]\n" +" [--separate-git-dir <git-dir>] [--object-format=<format>]\n" +" [-b <branch-name> | --initial-branch=<branch-name>]\n" +" [--shared[=<permissions>]] [<directory>]" msgstr "" -"git init [-q | --quiet] [--bare] [--template=<directori-de-plantilla>] [--" -"shared[=<permisos>]] [<directori>]" +"git init [-q | --quiet] [--bare] [--template=<template-directory>]\n" +" [--separate-git-dir <git-dir>] [--object-format=<format>]\n" +" [-b <branch-name> | --initial-branch=<branch-name>]\n" +" [--shared[=<permissions>]] [<directory>]" msgid "permissions" msgstr "permisos" @@ -7403,11 +7433,13 @@ msgid "--separate-git-dir incompatible with bare repository" msgstr "--separate-git-dir és incompatible amb un repositori nu" msgid "" -"git interpret-trailers [--in-place] [--trim-empty] [(--trailer " -"<token>[(=|:)<value>])...] [<file>...]" +"git interpret-trailers [--in-place] [--trim-empty]\n" +" [(--trailer <token>[(=|:)<value>])...]\n" +" [--parse] [<file>...]" msgstr "" -"git interpret-trailers [--in-place] [--trim-empty] [(--trailer " -"<testimoni>[(=|:)<valor>])...] [<fitxer>...]" +"git interpret-trailers [--in-place] [--trim-empty]\n" +" [(--trailer <token>[(=|:)<value>])...]\n" +" [--parse] [<fitxer>...]" msgid "edit files in place" msgstr "edita els fitxers in situ" @@ -7481,14 +7513,14 @@ msgid "" "<file>" msgstr "" "traça l'evolució del rang de línia <start>,<end> o funcions :<funcname> a " -"<file>" +"<fitxer>" #, c-format msgid "unrecognized argument: %s" msgstr "argument no reconegut: %s" msgid "-L<range>:<file> cannot be used with pathspec" -msgstr "-L<range>:<file> no es pot usar amb una especificació de camí" +msgstr "-L<range>:<fitxer> no es pot usar amb una especificació de camí" #, c-format msgid "Final output: %d %s\n" @@ -7857,7 +7889,7 @@ msgid "skip files matching pattern" msgstr "omet els fitxers coincidents amb el patró" msgid "read exclude patterns from <file>" -msgstr "llegeix els patrons des de <file>" +msgstr "llegeix els patrons des de <fitxer>" msgid "read additional per-directory exclude patterns in <file>" msgstr "llegeix els patrons addicionals d'exclusió per directori en <fitxer>" @@ -7896,11 +7928,11 @@ msgstr "" msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" -" [-q | --quiet] [--exit-code] [--get-url]\n" +" [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n" " [--symref] [<repository> [<refs>...]]" msgstr "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" -" [-q | --quiet] [--exit-code] [--get-url]\n" +" [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n" " [--symref] [<repository> [<refs>...]]" msgid "do not print remote URL" @@ -7982,7 +8014,7 @@ msgstr "--format no es pot combinar amb altres opcions d'alteració de format" #. TRANSLATORS: keep <> in "<" mail ">" info. msgid "git mailinfo [<options>] <msg> <patch> < mail >info" -msgstr "git mailinfo [<options>] <msg> <patch> < mail >info" +msgstr "git mailinfo [<opcions>] <msg> <pedaç> < mail >info" msgid "keep subject" msgstr "mantén l'assumpte" @@ -8030,12 +8062,12 @@ msgstr "git merge-base [-a | --all] <comissió> <comissió>..." msgid "git merge-base [-a | --all] --octopus <commit>..." msgstr "git merge-base [-a | --all] --octopus <comissió>..." -msgid "git merge-base --independent <commit>..." -msgstr "git merge-base --independent <comissió>..." - msgid "git merge-base --is-ancestor <commit> <commit>" msgstr "git merge-base --is-ancestor <comissió> <comissió>" +msgid "git merge-base --independent <commit>..." +msgstr "git merge-base --independent <comissió>..." + msgid "git merge-base --fork-point <ref> [<commit>]" msgstr "git merge-base --fork-point <referència> [<comissió>]" @@ -8124,7 +8156,7 @@ msgid "failure to merge" msgstr "s'ha produït un error en fusionar" msgid "git merge-tree [--write-tree] [<options>] <branch1> <branch2>" -msgstr "git merge-tree [--write-tree] [<options>] <branch1> <branch2>" +msgstr "git merge-tree [--write-tree] [<opcions>] <branch1> <branch2>" msgid "git merge-tree [--trivial-merge] <base-tree> <branch1> <branch2>" msgstr "git merge-tree [--trivial-merge] <base-tree> <branch1> <branch2>" @@ -8144,9 +8176,20 @@ msgstr "llista els noms de fitxer sense modes/oids/stages" msgid "allow merging unrelated histories" msgstr "permet fusionar històries no relacionades" +msgid "perform multiple merges, one per line of input" +msgstr "realitza múltiples fusions, una per línia d'entrada" + msgid "--trivial-merge is incompatible with all other options" msgstr "--trivial-merge és incompatible amb totes les altres opcions" +#, c-format +msgid "malformed input line: '%s'." +msgstr "línia d'entrada mal formada: «%s»." + +#, 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" + msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<opcions>] [<comissió>...]" @@ -8492,8 +8535,8 @@ msgid "" "git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-" "snapshot=<path>]" msgstr "" -"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-" -"snapshot=<path>]" +"git multi-pack-index [<opcions>] write [--preferred-pack=<pack>][--refs-" +"snapshot=<camí>]" msgid "git multi-pack-index [<options>] verify" msgstr "git multi-pack-index [<opcions>] verify" @@ -8622,7 +8665,7 @@ msgid "git name-rev [<options>] --all" msgstr "git name-rev [<opcions>] --all" msgid "git name-rev [<options>] --annotate-stdin" -msgstr "git name-rev [<options>] --annotate-stdin" +msgstr "git name-rev [<opcions>] --annotate-stdin" msgid "print only ref-based names (no object names)" msgstr "imprimeix només els noms basats en referències (no els noms d'objecte)" @@ -8772,10 +8815,6 @@ msgid "cannot read note data from non-blob object '%s'." msgstr "no es poden llegir les dades de node de l'objecte no de blob «%s»." #, c-format -msgid "malformed input line: '%s'." -msgstr "línia d'entrada mal formada: «%s»." - -#, c-format msgid "failed to copy notes from '%s' to '%s'" msgstr "s'ha produït un error en copiar les notes de «%s» a «%s»" @@ -8968,17 +9007,13 @@ msgstr "usa les notes de <referència-de-notes>" msgid "unknown subcommand: `%s'" msgstr "subordre desconeguda: «%s»" -msgid "" -"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" -msgstr "" -"git pack-objects --stdout [<opcions>...] [< <llista-de-referències> | < " -"<llista-de-objectes>]" +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>]" +"git pack-objects [<options>] <base-name> [< <ref-list> | < <object-list>]" msgstr "" -"git pack-objects [<opcions>...] <nom-base> [< <llista-de-referències> | < " -"<llista-de-objectes>]" +"git pack-objects [<opcions>] <base-name> [< <ref-list> | < <object-list>]" #, c-format msgid "" @@ -9369,8 +9404,8 @@ msgstr "" "i feu-nos saber que encara l'useu enviant un correu electrònic\n" "a <git@vger.kernel.org>. Gràcies.\n" -msgid "git pack-refs [<options>]" -msgstr "git pack-refs [<opcions>]" +msgid "git pack-refs [--all] [--no-prune]" +msgstr "git pack-refs [--all] [--no-prune]" msgid "pack everything" msgstr "empaqueta-ho tot" @@ -9378,6 +9413,18 @@ msgstr "empaqueta-ho tot" msgid "prune loose refs (default)" msgstr "poda les referències soltes (per defecte)" +msgid "git patch-id [--stable | --unstable | --verbatim]" +msgstr "git patch-id [--stable | --unstable | --verbatim]" + +msgid "use the unstable patch-id algorithm" +msgstr "utilitza l'algorisme inestable de patch-id" + +msgid "use the stable patch-id algorithm" +msgstr "utilitza l'algorisme estable de patch-id" + +msgid "don't strip whitespace from the patch" +msgstr "no eliminis els espais en blanc del pedaç" + msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--progress] [--expire <data>] [--] [<head>...]" @@ -9597,16 +9644,14 @@ msgstr "" msgid "" "\n" -"To avoid automatically configuring upstream branches when their name\n" -"doesn't match the local branch, see option 'simple' of branch." -"autoSetupMerge\n" +"To avoid automatically configuring an upstream branch when its name\n" +"won't match the local branch, see option 'simple' of branch.autoSetupMerge\n" "in 'git help config'.\n" msgstr "" "\n" "Per a evitar configurar automàticament les branques font quan el seu nom\n" -"no coincideix amb el de la branca local, vegeu l'opció «simple» de «branch." -"autoSetupMerge»\n" -"a «git help config».\n" +"no coincideix amb el de la branca local, vegeu l'opció «simple» de\n" +"«branch.autoSetupMerge» a «git help config».\n" #, c-format msgid "" @@ -9764,6 +9809,13 @@ msgstr "S'està pujant a %s\n" msgid "failed to push some refs to '%s'" msgstr "s'ha produït un error en pujar algunes referències a «%s»" +msgid "" +"recursing into submodule with push.recurseSubmodules=only; using on-demand " +"instead" +msgstr "" +"cerca recursivament en el submòdul amb push.recurseSubmodules=only; " +"utilitzant «on-demand» en el seu lloc" + #, c-format msgid "invalid value for '%s'" msgstr "valor no vàlid per a «%s»" @@ -9899,13 +9951,15 @@ msgid "need two commit ranges" msgstr "calen dos rangs de comissió" msgid "" -"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " -"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-" -"ish1> [<tree-ish2> [<tree-ish3>]])" +"git read-tree [(-m [--trivial] [--aggressive] | --reset | --" +"prefix=<prefix>)\n" +" [-u | -i]] [--index-output=<file>] [--no-sparse-checkout]\n" +" (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" msgstr "" -"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " -"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-" -"ish1> [<tree-ish2> [<tree-ish3>]])" +"git read-tree [(-m [--trivial] [--aggressive] | --reset | --" +"prefix=<prefix>)\n" +" [-u | -i]] [--index-output=<fitxer>] [--no-sparse-checkout]\n" +" (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" msgid "write resulting index to <file>" msgstr "escriu l'índex resultant al <fitxer>" @@ -9965,13 +10019,14 @@ msgid "" "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " "[<upstream> [<branch>]]" msgstr "" -"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " -"[<upstream> [<branch>]]" +"git rebase [-i] [options] [--exec <ordre>] [--onto <newbase> | --keep-base] " +"[<upstream> [<branca>]]" msgid "" "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]" msgstr "" -"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]" +"git rebase [-i] [options] [--exec <ordre>] [--onto <newbase>] --root " +"[<branca>]" #, c-format msgid "could not read '%s'." @@ -9995,8 +10050,8 @@ msgid "%s requires the merge backend" msgstr "%s requereix un rerefons de fusió" #, c-format -msgid "could not get 'onto': '%s'" -msgstr "no s'ha pogut obtenir «onto»: «%s»" +msgid "invalid onto: '%s'" +msgstr "no vàlid a: «%s»" #, c-format msgid "invalid orig-head: '%s'" @@ -10300,8 +10355,8 @@ msgstr "no existeix aquesta branca o comissió «%s»" msgid "No such ref: %s" msgstr "No hi ha tal referència: %s" -msgid "Could not resolve HEAD to a revision" -msgstr "No s'ha pogut resoldre HEAD a una revisió" +msgid "Could not resolve HEAD to a commit" +msgstr "No s'ha pogut resoldre HEAD com a una comissió" #, c-format msgid "'%s': need exactly one merge base with branch" @@ -10498,7 +10553,7 @@ msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" msgstr "" -"git remote add [-t <branca>] [-m <mestra>] [-f] [--tags | --no-tags] [--" +"git remote add [-t <branca>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <nom> <url>" msgid "git remote rename [--[no-]progress] <old> <new>" @@ -10973,6 +11028,10 @@ msgid "could not close refs snapshot tempfile" msgstr "" "no s'ha pogut tancar el fitxer temporal amb la instantània de referències" +#, c-format +msgid "could not remove stale bitmap: %s" +msgstr "no s'ha pogut eliminar el mapa de bits estancat: %s" + msgid "pack everything in a single pack" msgstr "empaqueta-ho tot en un únic paquet" @@ -11049,6 +11108,10 @@ msgstr "troba una progressió geomètrica amb el factor <N>" msgid "write a multi-pack index of the resulting packs" msgstr "escriu un índex multipaquet dels paquets resultants" +msgid "pack prefix to store a pack containing pruned objects" +msgstr "" +"prefix del paquet per a emmagatzemar un paquet que contingui objectes podats" + msgid "cannot delete packs in a precious-objects repo" msgstr "no es poden suprimir paquets en un repositori d'objectes preciosos" @@ -11060,8 +11123,13 @@ msgid "pack prefix %s does not begin with objdir %s" msgstr "el prefix de paquet %s no comença amb objdir %s" #, c-format -msgid "missing required file: %s" -msgstr "falta el fitxer requerit: %s" +msgid "renaming pack to '%s' failed" +msgstr "el canvi del nom a «%s» ha fallat" + +#, c-format +msgid "pack-objects did not write a '%s' file for pack %s-%s" +msgstr "" +"els objectes de paquet no han escrit a un fitxer «%s» per al paquet %s-%s" #, c-format msgid "could not unlink: %s" @@ -11074,7 +11142,7 @@ msgid "git replace [-f] --edit <object>" msgstr "git replace [-f] --edit <objecte>" msgid "git replace [-f] --graft <commit> [<parent>...]" -msgstr "git replace [-f] --graft <comissió> [<parent>...]" +msgstr "git replace [-f] --graft <comissió> [<pare>...]" msgid "git replace -d <object>..." msgstr "git replace -d <objecte>..." @@ -11255,8 +11323,10 @@ msgstr "--convert-graft-file arguments" msgid "only one pattern can be given with -l" msgstr "només es pot especificar un patró amb -l" -msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" -msgstr "git rerere [clear | forget <camí>... | status | remaining | diff | gc]" +msgid "" +"git rerere [clear | forget <pathspec>... | diff | status | remaining | gc]" +msgstr "" +"git rerere [clear | forget <pathspec>... | diff | status | remaining | gc]" msgid "register clean resolutions in index" msgstr "registra les resolucions netes en l'índex" @@ -11424,9 +11494,9 @@ msgid "" "\n" "Run \"git rev-parse --parseopt -h\" for more information on the first usage." msgstr "" -"git rev-parse --parseopt [<options>] -- [<args>...]\n" +"git rev-parse --parseopt [<opcions>] -- [<args>...]\n" " o bé: git rev-parse --sq-quote [<arg>...]\n" -" o bé: git rev-parse [<options>] [<arg>...]\n" +" o bé: git rev-parse [<opcions>] [<arg>...]\n" "\n" "Executeu «git rev-parse --parseopt -h» per a més informació sobre el primer " "ús." @@ -11461,6 +11531,15 @@ msgstr "--prefix requereix un argument" msgid "unknown mode for --abbrev-ref: %s" msgstr "mode desconegut per a --abbrev-ref: %s" +msgid "--exclude-hidden cannot be used together with --branches" +msgstr "--exclude-hidden no es pot utilitzar juntament amb --branches" + +msgid "--exclude-hidden cannot be used together with --tags" +msgstr "--exclude-hidden no es pot utilitzar juntament amb --tags" + +msgid "--exclude-hidden cannot be used together with --remotes" +msgstr "--exclude-hidden no es pot utilitzar juntament amb --remotes" + msgid "this operation must be run in a work tree" msgstr "aquesta operació s'ha d'executar en un arbre de treball" @@ -11468,17 +11547,25 @@ msgstr "aquesta operació s'ha d'executar en un arbre de treball" msgid "unknown mode for --show-object-format: %s" msgstr "mode desconegut per a --show-object-format: %s" -msgid "git revert [<options>] <commit-ish>..." -msgstr "git revert [<opcions>] <comissió>..." +msgid "" +"git revert [--[no-]edit] [-n] [-m <parent-number>] [-s] [-S[<keyid>]] " +"<commit>..." +msgstr "" +"git revert [--[no-]edit] [-n] [-m <parent-number>] [-s] [-S[<keyid>]] " +"<comissió>..." -msgid "git revert <subcommand>" -msgstr "git revert <subordre>" +msgid "git revert (--continue | --skip | --abort | --quit)" +msgstr "git revert (--continue | --skip | --abort | --quit)" -msgid "git cherry-pick [<options>] <commit-ish>..." -msgstr "git cherry-pick [<opcions>] <comissió>..." +msgid "" +"git cherry-pick [--edit] [-n] [-m <parent-number>] [-s] [-x] [--ff]\n" +" [-S[<keyid>]] <commit>..." +msgstr "" +"git cherry-pick [--edit] [-n] [-m <parent-number>] [-s] [-x] [--ff]\n" +" [-S[<keyid>]] <comissió>..." -msgid "git cherry-pick <subcommand>" -msgstr "git cherry-pick <subordre>" +msgid "git cherry-pick (--continue | --skip | --abort | --quit)" +msgstr "git cherry-pick (--continue | --skip | --abort | --quit)" #, c-format msgid "option `%s' expects a number greater than zero" @@ -11539,8 +11626,14 @@ msgstr "la reversió ha fallat" msgid "cherry-pick failed" msgstr "el «cherry pick» ha fallat" -msgid "git rm [<options>] [--] <file>..." -msgstr "git rm [<opcions>] [--] <fitxer>..." +msgid "" +"git rm [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n" +" [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" +" [--] [<pathspec>...]" +msgstr "" +"git rm [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n" +" [--quiet] [--pathspec-from-file=<fitxer> [--pathspec-file-nul]]\n" +" [--] [<pathspec>...]" msgid "" "the following file has staged content different from both the\n" @@ -11614,11 +11707,13 @@ msgid "" "git send-pack [--mirror] [--dry-run] [--force]\n" " [--receive-pack=<git-receive-pack>]\n" " [--verbose] [--thin] [--atomic]\n" +" [--[no-]signed | --signed=(true|false|if-asked)]\n" " [<host>:]<directory> (--all | <ref>...)" msgstr "" "git send-pack [--mirror] [--dry-run] [--force]\n" " [--receive-pack=<git-receive-pack>]\n" " [--verbose] [--thin] [--atomic]\n" +" [--[no-]signed | --signed=(true|false|if-asked)]\n" " [<host>:]<directory> (--all | <ref>...)" msgid "remote name" @@ -11642,8 +11737,9 @@ msgstr "git log --pretty=short | git shortlog [<opcions>]" msgid "using multiple --group options with stdin is not supported" msgstr "no s'admet l'ús de múltiples opcions --group amb stdin" -msgid "using --group=trailer with stdin is not supported" -msgstr "no s'admet l'ús de --group=trailer amb stdin" +#, c-format +msgid "using %s with stdin is not supported" +msgstr "no s'admet l'ús de %s amb stdin" #, c-format msgid "unknown group type: %s" @@ -11682,12 +11778,14 @@ msgid "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" " [--current] [--color[=<when>] | --no-color] [--sparse]\n" " [--more=<n> | --list | --independent | --merge-base]\n" -" [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" +" [--no-name | --sha1-name] [--topics]\n" +" [(<rev> | <glob>)...]" msgstr "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" " [--current] [--color[=<when>] | --no-color] [--sparse]\n" " [--more=<n> | --list | --independent | --merge-base]\n" -" [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" +" [--no-name | --sha1-name] [--topics]\n" +" [(<rev> | <glob>)...]" msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<referència>]" @@ -11787,11 +11885,13 @@ msgid "Unknown hash algorithm" msgstr "Algorisme de resum desconegut" msgid "" -"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference]\n" +" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n" +" [--heads] [--] [<pattern>...]" msgstr "" -"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<patró>...]" +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference]\n" +" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n" +" [--heads] [--] [<patró>...]" msgid "git show-ref --exclude-existing[=<pattern>]" msgstr "git show-ref --exclude-existing[=<patró>]" @@ -11822,8 +11922,10 @@ msgstr "no imprimeixis els resultats a stdout (útil amb --verify)" msgid "show refs from stdin that aren't in local repository" msgstr "mostra les referències de stdin que no siguin en el repositori local" -msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" -msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <opcions>" +msgid "" +"git sparse-checkout (init | list | set | add | reapply | disable) [<options>]" +msgstr "" +"git sparse-checkout (init | list | set | add | reapply | disable) [<opcions>]" msgid "this worktree is not sparse" msgstr "aquest arbre de treball no és dispers" @@ -11947,67 +12049,58 @@ msgstr "" msgid "error while refreshing working directory" msgstr "s'ha produït un error en actualitzar el directori de treball" -msgid "git stash list [<options>]" -msgstr "git stash list [<opcions>]" +msgid "git stash list [<log-options>]" +msgstr "git stash list [<log-options>]" -msgid "git stash show [<options>] [<stash>]" -msgstr "git stash show [<opcions>] [<stash>]" +msgid "" +"git stash show [-u | --include-untracked | --only-untracked] [<diff-" +"options>] [<stash>]" +msgstr "" +"git stash show [-u | --include-untracked | --only-untracked] [<diff-" +"options>] [<stash>]" -msgid "git stash drop [-q|--quiet] [<stash>]" -msgstr "git stash drop [-q|--quiet] [<stash>]" +msgid "git stash drop [-q | --quiet] [<stash>]" +msgstr "git stash drop [-q | --quiet] [<stash>]" -msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" -msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" +msgid "git stash pop [--index] [-q | --quiet] [<stash>]" +msgstr "git stash pop [--index] [-q | --quiet] [<stash>]" + +msgid "git stash apply [--index] [-q | --quiet] [<stash>]" +msgstr "git stash apply [--index] [-q | --quiet] [<stash>]" msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <nom-de-branca> [<stash>]" +msgid "git stash store [(-m | --message) <message>] [-q | --quiet] <commit>" +msgstr "" +"git stash store [(-m | --message) <missatge>] [-q | --quiet] <comissió>" + msgid "" -"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" -"quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" +"git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q " +"| --quiet]\n" +" [-u | --include-untracked] [-a | --all] [(-m | --message) " +"<message>]\n" " [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" " [--] [<pathspec>...]]" msgstr "" -"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" -"quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <missatge>]\n" +"git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q " +"| --quiet]\n" +" [-u | --include-untracked] [-a | --all] [(-m | --message) " +"<missatge>]\n" " [--pathspec-from-file=<fitxer> [--pathspec-file-nul]]\n" " [--] [<pathspec>...]]" msgid "" -"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" -"quiet]\n" -" [-u|--include-untracked] [-a|--all] [<message>]" -msgstr "" -"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" -"quiet]\n" -" [-u|--include-untracked] [-a|--all] [<missatge>]" - -msgid "git stash pop [--index] [-q|--quiet] [<stash>]" -msgstr "git stash pop [--index] [-q|--quiet] [<stash>]" - -msgid "git stash apply [--index] [-q|--quiet] [<stash>]" -msgstr "git stash apply [--index] [-q|--quiet] [<stash>]" - -msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" -msgstr "git stash store [-m|--message <missatge>] [-q|--quiet] <commit>" - -msgid "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" -" [--] [<pathspec>...]]" +"git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | " +"--quiet]\n" +" [-u | --include-untracked] [-a | --all] [<message>]" msgstr "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <missatge>]\n" -" [--] [<pathspec>...]]" +"git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | " +"--quiet]\n" +" [-u | --include-untracked] [-a | --all] [<missatge>]" -msgid "" -"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [<message>]" -msgstr "" -"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [<missatge>]" +msgid "git stash create [<message>]" +msgstr "git stash create [<missatge>]" #, c-format msgid "'%s' is not a stash-like commit" @@ -12223,7 +12316,7 @@ msgid "suppress output of entering each submodule command" msgstr "omet la sortida en entrar a cada ordre del submòdul" msgid "recurse into nested submodules" -msgstr "inclou recursivament els submòduls imbricats" +msgstr "cerca recursivament als submòduls imbricats" msgid "git submodule foreach [--quiet] [--recursive] [--] <command>" msgstr "git submodule foreach [--quiet] [--recursive] [--] <ordre>" @@ -12316,7 +12409,7 @@ msgid "limit the summary size" msgstr "limita la mida del resum" msgid "git submodule summary [<options>] [<commit>] [--] [<path>]" -msgstr "git submodule summary [<options>] [<commit>] [--] [<path>]" +msgstr "git submodule summary [<opcions>] [<comissió>] [--] [<camí>]" msgid "could not fetch a revision for HEAD" msgstr "no s'ha pogut obtenir una revisió per a HEAD" @@ -12337,7 +12430,7 @@ msgid "suppress output of synchronizing submodule url" msgstr "omet la sortida de la sincronització de l'URL del submòdul" msgid "git submodule sync [--quiet] [--recursive] [<path>]" -msgstr "git submodule sync [--quiet] [--recursive] [<path>]" +msgstr "git submodule sync [--quiet] [--recursive] [<camí>]" #, c-format msgid "" @@ -12457,9 +12550,9 @@ msgid "" "<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--filter " "<filter-spec>] --url <url> --path <path>" msgstr "" -"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " +"git submodule--helper clone [--prefix=<camí>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--filter " -"<filter-spec>] --url <url> --path <path>" +"<filter-spec>] --url <url> --path <camí>" #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" @@ -12579,9 +12672,6 @@ msgstr "recorre els submòduls recursivament" msgid "don't fetch new objects from the remote site" msgstr "no obtinguis els objectes nous del lloc remot" -msgid "path into the working tree" -msgstr "camí a l'arbre de treball" - msgid "use the 'checkout' update strategy (default)" msgstr "utilitza l'estratègia d'actualització «checkout» (predeterminada)" @@ -12615,34 +12705,16 @@ msgstr "" "git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] " "[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-" "shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] " -"[--] [<path>...]" - -msgid "recurse into submodules" -msgstr "inclou recursivament als submòduls" +"[--] [<camí>...]" msgid "git submodule absorbgitdirs [<options>] [<path>...]" -msgstr "git submodule absorbgitdirs [<options>] [<path>...]" - -msgid "check if it is safe to write to the .gitmodules file" -msgstr "comprova si és segur escriure al fitxer .gitmodules" - -msgid "unset the config in the .gitmodules file" -msgstr "desconfigura l'opció de configuració al fitxer .gitmodules" - -msgid "git submodule--helper config <name> [<value>]" -msgstr "git submodule--helper config <nom> [<valor>]" - -msgid "git submodule--helper config --unset <name>" -msgstr "git submodule--helper config --unset <nom>" - -msgid "please make sure that the .gitmodules file is in the working tree" -msgstr "assegureu-vos que el fitxer .gitmodules és a l'arbre de treball" +msgstr "git submodule absorbgitdirs [<opcions>] [<camí>...]" msgid "suppress output for setting url of a submodule" msgstr "omet la sortida en configurar un URL d'un submòdul" msgid "git submodule set-url [--quiet] <path> <newurl>" -msgstr "git submodule set-url [--quiet] <path> <newurl>" +msgstr "git submodule set-url [--quiet] <camí> <newurl>" msgid "set the default tracking branch to master" msgstr "estableix la branca de seguiment per defecte a «master»" @@ -12651,10 +12723,10 @@ msgid "set the default tracking branch" msgstr "estableix la branca de seguiment per defecte" msgid "git submodule set-branch [-q|--quiet] (-d|--default) <path>" -msgstr "git submodule set-branch [-q|--quiet] (-d|--default) <path>" +msgstr "git submodule set-branch [-q|--quiet] (-d|--default) <camí>" msgid "git submodule set-branch [-q|--quiet] (-b|--branch) <branch> <path>" -msgstr "git submodule set-branch [-q|--quiet] (-b|--branch) <branch> <path>" +msgstr "git submodule set-branch [-q|--quiet] (-b|--branch) <branca> <camí>" msgid "--branch or --default required" msgstr "cal --branch o --default" @@ -12716,6 +12788,9 @@ msgstr "S'està reactivant el directori de git local per al submòdul «%s»\n" msgid "unable to checkout submodule '%s'" msgstr "no s'ha pogut agafar el submòdul «%s»" +msgid "please make sure that the .gitmodules file is in the working tree" +msgstr "assegureu-vos que el fitxer .gitmodules és a l'arbre de treball" + #, c-format msgid "Failed to add submodule '%s'" msgstr "S'ha produït un error en afegir el submòdul «%s»" @@ -12753,7 +12828,7 @@ msgstr "" "seu camí" msgid "git submodule add [<options>] [--] <repository> [<path>]" -msgstr "git submodule add [<options>] [--] <repository> [<path>]" +msgstr "git submodule add [<opcions>] [--] <repository> [<camí>]" msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" @@ -12768,19 +12843,21 @@ msgstr "URL de repositori: «%s» ha de ser absolut o començar amb ./|../" msgid "'%s' is not a valid submodule name" msgstr "«%s» no és un nom de submòdul vàlid" +msgid "git submodule--helper <command>" +msgstr "git submodule--helper <command>" + #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s no admet --super-prefix" -#, c-format -msgid "'%s' is not a valid submodule--helper subcommand" -msgstr "«%s» no és una subordre vàlida de submodule--helper" +msgid "git symbolic-ref [-m <reason>] <name> <ref>" +msgstr "git symbolic-ref [-m <reason>] <name> <ref>" -msgid "git symbolic-ref [<options>] <name> [<ref>]" -msgstr "git symbolic-ref [<opcions>] <nom> [<referència>]" +msgid "git symbolic-ref [-q] [--short] [--no-recurse] <name>" +msgstr "git symbolic-ref [-q] [--short] [--no-recurse] <name>" -msgid "git symbolic-ref -d [-q] <name>" -msgstr "git symbolic-ref -d [-q] <nom>" +msgid "git symbolic-ref --delete [-q] <name>" +msgstr "git symbolic-ref --delete [-q] <name>" msgid "suppress error message for non-symbolic (detached) refs" msgstr "omet el missatge d'error de referències no simbòliques (separades)" @@ -12791,6 +12868,9 @@ msgstr "suprimeix la referència simbòlica" msgid "shorten ref output" msgstr "escurça la sortida de referències" +msgid "recursively dereference (default)" +msgstr "desreferencia recursivament (per defecte)" + msgid "reason" msgstr "raó" @@ -12798,25 +12878,25 @@ msgid "reason of the update" msgstr "raó de l'actualització" msgid "" -"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n" -" <tagname> [<head>]" +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n" +" <tagname> [<commit> | <object>]" msgstr "" -"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <fitxer>]\n" -" <tagname> [<head>]" +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <fitxer>] [-e]\n" +" <tagname> [<comissió> | <objecte>]" msgid "git tag -d <tagname>..." msgstr "git tag -d <nom-d'etiqueta>..." msgid "" -"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" -"points-at <object>]\n" -" [--format=<format>] [--merged <commit>] [--no-merged <commit>] " -"[<pattern>...]" +"git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]\n" +" [--points-at <object>] [--column[=<options>] | --no-column]\n" +" [--create-reflog] [--sort=<key>] [--format=<format>]\n" +" [--merged <commit>] [--no-merged <commit>] [<pattern>...]" msgstr "" -"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" -"points-at <object>]\n" -" [--format=<format>] [--merged <comissió>] [--no-merged <comissió>] " -"[<patró>...]" +"git tag [-n[<num>]] -l [--contains <comissió>] [--no-contains <comissió>]\n" +" [--points-at <objecte>] [--column[=<opcions>] | --no-column]\n" +" [--create-reflog] [--sort=<key>] [--format=<format>]\n" +" [--merged <comissió>] [--no-merged <comissió>] [<patró>...]" msgid "git tag -v [--format=<format>] <tagname>..." msgstr "git tag -v [--format=<format>] <nom-d'etiqueta>..." @@ -13206,8 +13286,12 @@ msgstr "llegeix les actualitzacions des de stdin" msgid "update the info files from scratch" msgstr "actualitza els fitxers d'informació des de zero" -msgid "git upload-pack [<options>] <dir>" -msgstr "git upload-pack [<opcions>] <directori>" +msgid "" +"git-upload-pack [--[no-]strict] [--timeout=<n>] [--stateless-rpc]\n" +" [--advertise-refs] <directory>" +msgstr "" +"git-upload-pack [--[no-]strict] [--timeout=<n>] [--stateless-rpc]\n" +" [--advertise-refs] <directory>" msgid "quit after a single request/response exchange" msgstr "surt després d'un sol intercanvi de sol·licitud/resposta" @@ -13222,8 +13306,8 @@ msgstr "" msgid "interrupt transfer after <n> seconds of inactivity" msgstr "interromp la transferència després de <n> segons d'inactivitat" -msgid "git verify-commit [-v | --verbose] <commit>..." -msgstr "git verify-commit [-v | --verbose] <comissió>..." +msgid "git verify-commit [-v | --verbose] [--raw] <commit>..." +msgstr "git verify-commit [-v | --verbose] [--raw] <comissió>..." msgid "print commit contents" msgstr "imprimeix els continguts de la comissió" @@ -13231,8 +13315,8 @@ msgstr "imprimeix els continguts de la comissió" msgid "print raw gpg status output" msgstr "imprimeix la sortida crua de l'estat gpg" -msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." -msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <paquet>..." +msgid "git verify-pack [-v | --verbose] [-s | --stat-only] [--] <pack>.idx..." +msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] [--] <pack>.idx..." msgid "verbose" msgstr "detallat" @@ -13240,35 +13324,39 @@ msgstr "detallat" msgid "show statistics only" msgstr "mostra només estadístiques" -msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." -msgstr "git verify-tag [-v | --verbose] [--format=<format>] <etiqueta>..." +msgid "git verify-tag [-v | --verbose] [--format=<format>] [--raw] <tag>..." +msgstr "git verify-tag [-v | --verbose] [--format=<format>] [--raw] <tag>..." msgid "print tag contents" msgstr "imprimeix els continguts de l'etiqueta" -msgid "git worktree add [<options>] <path> [<commit-ish>]" -msgstr "git worktree add [<opcions>] <camí> [<commit-ish>]" +msgid "" +"git worktree add [-f] [--detach] [--checkout] [--lock [--reason <string>]]\n" +" [-b <new-branch>] <path> [<commit-ish>]" +msgstr "" +"git worktree add [-f] [--detach] [--checkout] [--lock [--reason <string>]]\n" +" [-b <new-branch>] <camí> [<commit-ish>]" -msgid "git worktree list [<options>]" -msgstr "git worktree list [<opcions>]" +msgid "git worktree list [-v | --porcelain [-z]]" +msgstr "git worktree list [-v | --porcelain [-z]]" -msgid "git worktree lock [<options>] <path>" -msgstr "git worktree lock [<opcions>] <camí>" +msgid "git worktree lock [--reason <string>] <worktree>" +msgstr "git worktree lock [--reason <string>] <worktree>" msgid "git worktree move <worktree> <new-path>" msgstr "git worktree move <arbre de treball> <camí-nou>" -msgid "git worktree prune [<options>]" -msgstr "git worktree prune [<opcions>]" +msgid "git worktree prune [-n] [-v] [--expire <expire>]" +msgstr "git worktree prune [-n] [-v] [--expire <expire>]" -msgid "git worktree remove [<options>] <worktree>" -msgstr "git worktree remove [<opcions>] <arbre de treball>" +msgid "git worktree remove [-f] <worktree>" +msgstr "git worktree remove [-f] <worktree>" msgid "git worktree repair [<path>...]" -msgstr "git worktree repair [<path>...]" +msgstr "git worktree repair [<camí>...]" -msgid "git worktree unlock <path>" -msgstr "git worktree unlock <camí>" +msgid "git worktree unlock <worktree>" +msgstr "git worktree unlock <worktree>" #, c-format msgid "Removing %s/%s: %s" @@ -13508,6 +13596,10 @@ msgstr "només útil per a la depuració" msgid "core.fsyncMethod = batch is unsupported on this platform" msgstr "core.fsyncMethod = batch no és compatible amb aquesta plataforma" +#, c-format +msgid "bundle list at '%s' has no mode" +msgstr "la llista de farcells a «%s» no té mode" + msgid "failed to create temporary file" msgstr "no s'ha pogut crear un fitxer temporal" @@ -13515,16 +13607,29 @@ msgid "insufficient capabilities" msgstr "capacitats insuficients" #, c-format +msgid "unrecognized bundle mode from URI '%s'" +msgstr "no s'ha reconegut el model del farcell de l'URI «%s»" + +#, c-format +msgid "exceeded bundle URI recursion limit (%d)" +msgstr "s'ha excedit el límit de recursió URI del paquet (%d)" + +#, c-format msgid "failed to download bundle from URI '%s'" msgstr "no s'ha pogut baixar el paquet de l'URI «%s»" #, c-format -msgid "file at URI '%s' is not a bundle" -msgstr "el fitxer a l'URI «%s» no és farcell" +msgid "file at URI '%s' is not a bundle or bundle list" +msgstr "el fitxer a l'URI «%s» no és farcell o una llista de farcells" -#, c-format -msgid "failed to unbundle bundle from URI '%s'" -msgstr "s'ha produït un error en desempaquetar el farcell de l'URI «%s»" +msgid "bundle-uri: got an empty line" +msgstr "bundle-uri: té una línia buida" + +msgid "bundle-uri: line is not of the form 'key=value'" +msgstr "bundle-uri: la línia no és de la forma «key=value»" + +msgid "bundle-uri: line has empty key or value" +msgstr "bundle-uri: la línia té una clau o un valor buit" #, c-format msgid "unrecognized bundle hash algorithm: %s" @@ -14112,7 +14217,7 @@ msgstr "El format del fitxer de farcell" msgid "Chunk-based file formats" msgstr "Formats de fitxer basats en blocs" -msgid "Git commit graph format" +msgid "Git commit-graph format" msgstr "Format de graf de comissions del Git" msgid "Git index format" @@ -14485,6 +14590,10 @@ msgstr "cas no gestionat a «has_worktree_moved»: %d" msgid "health thread wait failed [GLE %ld]" msgstr "ha fallat l'espera del fil de salut [GLE %ld]" +#, c-format +msgid "Invalid path: %s" +msgstr "Camí no vàlid: «%s»" + msgid "Unable to create FSEventStream." msgstr "No s'ha pogut crear el FSEventStream." @@ -14516,6 +14625,22 @@ msgid "could not read directory changes [GLE %ld]" msgstr "no s'han pogut llegir els canvis de directori [GLE %ld]" #, c-format +msgid "opendir('%s') failed" +msgstr "ha fallat opendir(«%s»)" + +#, c-format +msgid "lstat('%s') failed" +msgstr "ha fallat lstat(«%s»)" + +#, c-format +msgid "strbuf_readlink('%s') failed" +msgstr "ha fallat strbuf_readlink(«%s»)" + +#, c-format +msgid "closedir('%s') failed" +msgstr "ha fallat closedir(«%s»)" + +#, c-format msgid "[GLE %ld] unable to open for read '%ls'" msgstr "[GLE %ld] no s'ha pogut obrir per a llegir «%ls»" @@ -16147,10 +16272,11 @@ msgstr "el repositori virtual «%s» és incompatible amb fsmonitor" #, c-format msgid "" -"repository '%s' is incompatible with fsmonitor due to lack of Unix sockets" +"socket directory '%s' is incompatible with fsmonitor due to lack of Unix " +"sockets support" msgstr "" -"el repositori «%s» és incompatible amb fsmonitor a causa de la manca de " -"sòcols Unix" +"el directori del sòcol «%s» és incompatible amb fsmonitor a causa de la " +"manca de compatibilitat amb els sòcols Unix" msgid "" "git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]\n" @@ -16161,12 +16287,12 @@ msgid "" " [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n" " <command> [<args>]" msgstr "" -"git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]\n" -" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" +"git [-v | --version] [-h | --help] [-C <camí>] [-c <name>=<value>]\n" +" [--exec-path[=<camí>]] [--html-path] [--man-path] [--info-path]\n" " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" "bare]\n" -" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" -" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n" +" [--git-dir=<camí>] [--work-tree=<camí>] [--namespace=<name>]\n" +" [--super-prefix=<camí>] [--config-env=<name>=<envvar>]\n" " <command> [<args>]" msgid "" @@ -16471,8 +16597,8 @@ msgstr[1] "" "\n" "Les ordres més similars són" -msgid "git version [<options>]" -msgstr "git version [<opcions>]" +msgid "git version [--build-options]" +msgstr "git version [--build-options]" #, c-format msgid "%s: %s - %s" @@ -16608,7 +16734,7 @@ msgstr "sparse: s'ha eliminat la implementació de filtres de camí sparse" #, c-format msgid "'%s' for 'object:type=<type>' is not a valid object type" -msgstr "«%s» per a «object:type=<type>» no és un tipus d'objecte vàlid" +msgstr "«%s» per a «object:type=<tipus>» no és un tipus d'objecte vàlid" #, c-format msgid "invalid filter-spec '%s'" @@ -17419,10 +17545,6 @@ msgstr "" "%s: s'estan ignorant els emmagatzematges alternatius d'objectes, imbricació " "massa profunda" -#, c-format -msgid "unable to normalize object directory: %s" -msgstr "no s'ha pogut normalitzar el directori de l'objecte: %s" - msgid "unable to fdopen alternates lockfile" msgstr "no s'ha pogut fer «fdopen» al fitxer de bloqueig alternatiu" @@ -17770,7 +17892,7 @@ msgstr "" #, c-format msgid "<object>:<path> required, only <object> '%s' given" -msgstr "<object>:<path> requerit, només s'ha donat <object> «%s»" +msgstr "<objecte>:<camí> requerit, només s'ha donat <objecte> «%s»" #, c-format msgid "invalid object name '%.*s'." @@ -18269,6 +18391,10 @@ msgstr "promisor-remote: no s'ha pogut tancar stdin al subprocés d'obtenció" msgid "promisor remote name cannot begin with '/': %s" msgstr "el nom remot «promisor» no pot començar amb «/»: %s" +#, c-format +msgid "could not fetch %s from promisor remote" +msgstr "no s'ha pogut obtenir «%s» del «promisor» remot" + msgid "object-info: expected flush after arguments" msgstr "object-info: s'esperava una neteja després dels arguments" @@ -19005,7 +19131,7 @@ msgstr "El transport http no admet %s" msgid "protocol error: expected '<url> <path>', missing space" msgstr "" -"s'ha produït un error de protocol: s'esperava «<url> <path>», falta espai" +"s'ha produït un error de protocol: s'esperava «<url> <camí>», falta espai" #, c-format msgid "failed to download file at URL '%s'" @@ -19355,6 +19481,13 @@ msgid "failed to find tree of %s" msgstr "s'ha produït un error en cercar l'arbre de %s" #, c-format +msgid "unsupported section for hidden refs: %s" +msgstr "secció d'índex no compatible per a les referències ocultes: %s" + +msgid "--exclude-hidden= passed more than once" +msgstr "--exclude-hidden= passat més d'una vegada" + +#, c-format msgid "resolve-undo records `%s` which is missing" msgstr "resolve-undo indica «%s» que manquen" @@ -19452,7 +19585,7 @@ msgid "only download metadata for the branch that will be checked out" msgstr "només baixa les metadades per a la branca que s'agafarà" msgid "scalar clone [<options>] [--] <repo> [<dir>]" -msgstr "scalar clone [<opcions>] [--] <repo> [<dir>]" +msgstr "scalar clone [<opcions>] [--] <repositori> [<dir>]" #, c-format msgid "cannot deduce worktree name from '%s'" @@ -19499,6 +19632,14 @@ msgid "--all or <enlistment>, but not both" msgstr "--all o <enlistment>, però no ambdós" #, c-format +msgid "could not remove stale scalar.repo '%s'" +msgstr "no s'ha pogut suprimir el scalar.repo «%s» estancat" + +#, c-format +msgid "removing stale scalar.repo '%s'" +msgstr "s'està eliminant el scalar.repo «%s» estancat" + +#, c-format msgid "git repository gone in '%s'" msgstr "no existeix un repositori de git a: «%s»" @@ -19546,7 +19687,7 @@ msgid "" "\n" "Commands:\n" msgstr "" -"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n" +"scalar [-C <directory>] [-c <key>=<value>] <command> [<opcions>]\n" "\n" "Ordres:\n" @@ -19853,7 +19994,7 @@ msgid "unknown command: %d" msgstr "ordre desconeguda: %d" msgid "This is the 1st commit message:" -msgstr "Aquest és el missatge de la 1ra comissió:" +msgstr "Aquest és el missatge de la 1a comissió:" #, c-format msgid "This is the commit message #%d:" @@ -20124,16 +20265,16 @@ msgstr "" msgid "illegal label name: '%.*s'" msgstr "nom d'etiqueta no permès: «%.*s»" +#, c-format +msgid "could not resolve '%s'" +msgstr "no s'ha pogut resoldre «%s»" + msgid "writing fake root commit" msgstr "s'està escrivint una comissió arrel falsa" msgid "writing squash-onto" msgstr "s'està escrivint «squash-onto»" -#, c-format -msgid "could not resolve '%s'" -msgstr "no s'ha pogut resoldre «%s»" - msgid "cannot merge without a current revision" msgstr "no es pot fusionar sense una revisió actual" @@ -20741,6 +20882,16 @@ msgstr "ls-tree ha retornat un codi de retorn %d no esperat" msgid "failed to lstat '%s'" msgstr "s'ha produït un error en fer lstat a «%s»" +msgid "test-tool cache-tree <options> (control|prime|update)" +msgstr "test-tool cache-tree <opcions> (control|prime|update)" + +msgid "clear the cache tree before each iteration" +msgstr "neteja l'arbre de la memòria cau abans de cada iteració" + +msgid "number of entries in the cache tree to invalidate (default 0)" +msgstr "" +"nombre d'entrades a l'arbre de la memòria cau a invalidar (per defecte 0)" + msgid "unhandled options" msgstr "opcions no gestionades" @@ -21520,7 +21671,7 @@ msgstr " (useu «git add/rm <fitxer>...» per a actualitzar què es cometrà)" msgid "" " (use \"git restore <file>...\" to discard changes in working directory)" msgstr "" -" (useu «git restore <file>...» per a descartar canvis en el directori de " +" (useu «git restore <fitxer>...» per a descartar canvis en el directori de " "treball)" msgid " (commit or discard the untracked or modified content in submodules)" @@ -22577,83 +22728,6 @@ msgstr "S'està ometent %s amb el sufix de còpia de seguretat «%s».\n" msgid "Do you really want to send %s? [y|N]: " msgstr "Esteu segur que voleu enviar %s? [y|N]: " -#~ msgid "(stats|all)" -#~ msgstr "(stats|all)" - -#~ msgid "git maintenance register" -#~ msgstr "git maintenance register" - -#~ msgid "git maintenance unregister" -#~ msgstr "git maintenance unregister" - -#~ msgid "git maintenance stop" -#~ msgstr "git maintenance stop" - -#, c-format -#~ msgid "could not parse colored hunk header '%.*s'" -#~ msgstr "no s'ha pogut analitzar la capçalera del tros acolorida «%.*s»" - -#, c-format -#~ msgid "Unknown subcommand: %s" -#~ msgstr "Subordre desconeguda: %s" - -#~ msgid "checked out in another worktree" -#~ msgstr "s'ha agafat en un altre arbre de treball" - -#~ msgid "failed to open stdin of 'crontab'" -#~ msgstr "s'ha produït un error en obrir stdin de «crontab»" - -#, c-format -#~ msgid "invalid subcommand: %s" -#~ msgstr "subordre no vàlida: %s" - -#~ msgid "single arg format must be symmetric range" -#~ msgstr "el format de l'argument únic ha de ser de rang simètric" - -#~ msgid "git submodule--helper list [--prefix=<path>] [<path>...]" -#~ msgstr "git submodule--helper list [--prefix=<camí>] [<camí>...]" - -#~ msgid "git submodule--helper name <path>" -#~ msgstr "git submodule--helper name <camí>" - -#, c-format -#~ msgid "failed to get the default remote for submodule '%s'" -#~ msgstr "" -#~ "s'ha produït un error en obtenir el remot per defecte pel submòdul «%s»" - -#, c-format -#~ msgid "Invalid update mode '%s' for submodule path '%s'" -#~ msgstr "Mode d'actualització «%s» no vàlid per al camí de submòdul «%s»" - -#~ msgid "path into the working tree, across nested submodule boundaries" -#~ msgstr "camí a l'arbre de treball, a través de fronteres de submòduls niats" - -#~ msgid "rebase, merge, checkout or none" -#~ msgstr "rebase, merge, checkout o none" - -#~ msgid "bad value for update parameter" -#~ msgstr "valor incorrecte per al paràmetre update" - -#~ msgid "Show three-way merge without touching index" -#~ msgstr "Mostra la fusió de tres vies sense tocar l'índex" - -# c-format -#, c-format -#~ msgid "could not create directory for '%s'" -#~ msgstr "no s'ha pogut crear el directori per a «%s»" - -#, c-format -#~ msgid "Couldn't start hook '%s'\n" -#~ msgstr "No s'ha pogut iniciar el lligam «%s»'\n" - -#, c-format -#~ msgid "" -#~ "Note: %s not up to date and in way of checking out conflicted version; " -#~ "old copy renamed to %s" -#~ msgstr "" -#~ "Nota: %s no està actualitzat i en forma de comprovar la versió en " -#~ "conflicte; còpia antiga reanomenada a %s" - #, c-format -#~ msgid "%s: fast-forward" -#~ msgstr "%s: avanç ràpid" +#~ msgid "unable to normalize object directory: %s" +#~ msgstr "no s'ha pogut normalitzar el directori de l'objecte: %s" @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2022-09-28 17:09+0200\n" -"PO-Revision-Date: 2022-09-28 17:10+0200\n" +"POT-Creation-Date: 2022-12-02 17:16+0100\n" +"PO-Revision-Date: 2022-12-02 17:19+0100\n" "Last-Translator: Ralf Thielow <ralf.thielow@gmail.com>\n" "Language-Team: German\n" "Language: de\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" -"X-Generator: Poedit 3.1.1\n" +"X-Generator: Poedit 3.2\n" #, c-format msgid "Huh (%s)?" @@ -379,8 +379,8 @@ msgstr "Ergänzung im Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? " #, c-format, perl-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " msgstr "" -"Diesen Patch-Block vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d" -"%s,?]? " +"Diesen Patch-Block vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a," +"d%s,?]? " msgid "" "y - discard this hunk from index and worktree\n" @@ -411,8 +411,8 @@ msgstr "Ergänzung auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? " #, c-format, perl-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " msgstr "" -"Diesen Patch-Block auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d" -"%s,?]? " +"Diesen Patch-Block auf Index und Arbeitsverzeichnis anwenden [y,n,q,a," +"d%s,?]? " msgid "" "y - apply this hunk to index and worktree\n" @@ -786,6 +786,9 @@ msgstr "Befehlszeile endet mit \\" msgid "unclosed quote" msgstr "nicht geschlossene Anführungszeichen" +msgid "too many arguments" +msgstr "zu viele Argumente" + #, c-format msgid "unrecognized whitespace option '%s'" msgstr "Nicht erkannte Whitespace-Option: '%s'" @@ -2018,8 +2021,8 @@ msgstr "" #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "" -"Falls Sie diesen Patch auslassen möchten, führen Sie stattdessen \"%s --skip" -"\" aus." +"Falls Sie diesen Patch auslassen möchten, führen Sie stattdessen \"%s --" +"skip\" aus." #, c-format msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"." @@ -2593,42 +2596,6 @@ msgstr "" "'bisect run' fehlgeschlagen: 'git bisect--helper --bisect-state %s' mit " "Fehlercode %d beendet" -msgid "reset the bisection state" -msgstr "den Zustand der binären Suche zurücksetzen" - -msgid "check whether bad or good terms exist" -msgstr "prüfen, ob Begriffe für gute und schlechte Commits existieren" - -msgid "print out the bisect terms" -msgstr "die Begriffe für die binäre Suche ausgeben" - -msgid "start the bisect session" -msgstr "Sitzung für binäre Suche starten" - -msgid "find the next bisection commit" -msgstr "nächsten Commit für die binäre Suche finden" - -msgid "mark the state of ref (or refs)" -msgstr "den Status der Referenz(en) markieren" - -msgid "list the bisection steps so far" -msgstr "die bisherigen Schritte der binären Suche auflisten" - -msgid "replay the bisection process from the given file" -msgstr "binäre Suche aus der angegebenen Datei wiederholen" - -msgid "skip some commits for checkout" -msgstr "einige Commits für das Auschecken überspringen" - -msgid "visualize the bisection" -msgstr "binäre Suche visualisieren" - -msgid "use <cmd>... to automatically bisect" -msgstr "verwende <Programm>... für die automatische binäre Suche" - -msgid "no log for BISECT_WRITE" -msgstr "kein Log für BISECT_WRITE" - msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-reset benötigt entweder kein Argument oder ein Commit" @@ -2647,6 +2614,9 @@ msgstr "keine Log-Datei angegeben" msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<Optionen>] [<rev-opts>] [<Commit>] [--] <Datei>" +msgid "git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>" +msgstr "git annotate [<Optionen>] [<rev-opts>] [<Commit>] [--] <Datei>" + msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<rev-opts> sind dokumentiert in git-rev-list(1)" @@ -2842,9 +2812,6 @@ msgstr "Aktualisierung der Konfigurationsdatei fehlgeschlagen." msgid "cannot use -a with -d" msgstr "kann -a nicht mit -d benutzen" -msgid "Couldn't look up commit object for HEAD" -msgstr "Konnte Commit-Objekt für HEAD nicht nachschlagen." - #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "Kann Branch '%s' nicht entfernen, ausgecheckt in '%s'." @@ -2883,19 +2850,18 @@ msgstr "Branch %s wird auf %s umgesetzt" msgid "Branch %s is being bisected at %s" msgstr "Binäre Suche von Branch %s zu %s im Gange" -msgid "cannot copy the current branch while not on any." -msgstr "" -"Kann den aktuellen Branch nicht kopieren, solange Sie sich auf keinem " -"befinden." - -msgid "cannot rename the current branch while not on any." -msgstr "" -"Kann aktuellen Branch nicht umbenennen, solange Sie sich auf keinem befinden." - #, c-format msgid "Invalid branch name: '%s'" msgstr "Ungültiger Branchname: '%s'" +#, c-format +msgid "No commit on branch '%s' yet." +msgstr "Noch kein Commit in Branch '%s'." + +#, c-format +msgid "No branch named '%s'." +msgstr "Branch '%s' nicht vorhanden." + msgid "Branch rename failed" msgstr "Umbenennung des Branches fehlgeschlagen" @@ -3059,13 +3025,14 @@ msgstr "zu losgelöstem HEAD kann keine Beschreibung hinterlegt werden" msgid "cannot edit description of more than one branch" msgstr "Beschreibung von mehr als einem Branch kann nicht bearbeitet werden" -#, c-format -msgid "No commit on branch '%s' yet." -msgstr "Noch kein Commit in Branch '%s'." +msgid "cannot copy the current branch while not on any." +msgstr "" +"Kann den aktuellen Branch nicht kopieren, solange Sie sich auf keinem " +"befinden." -#, c-format -msgid "No branch named '%s'." -msgstr "Branch '%s' nicht vorhanden." +msgid "cannot rename the current branch while not on any." +msgstr "" +"Kann aktuellen Branch nicht umbenennen, solange Sie sich auf keinem befinden." msgid "too many branches for a copy operation" msgstr "zu viele Branches für eine Kopieroperation angegeben" @@ -3137,11 +3104,11 @@ msgid "not run from a git repository - no hooks to show\n" msgstr "nicht in einem Git-Repository ausgeführt - keine Hooks zum Anzeigen\n" msgid "" -"git bugreport [-o|--output-directory <file>] [-s|--suffix <format>] [--" -"diagnose[=<mode>]" +"git bugreport [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n" +" [--diagnose[=<mode>]]" msgstr "" -"git bugreport [-o|--output-directory <Datei>] [-s|--suffix <Format>] [--" -"diagnose[=<Modus>]" +"git bugreport [(-o | --output-directory) <Pfad>] [(-s | --suffix) <Format>]\n" +" [--diagnose[=<Modus>]]" msgid "" "Thank you for filling out a Git bug report!\n" @@ -3216,17 +3183,23 @@ msgstr "konnte nicht nach %s schreiben" msgid "Created new report at '%s'.\n" msgstr "Neuer Bericht unter '%s' erstellt.\n" -msgid "git bundle create [<options>] <file> <git-rev-list args>" -msgstr "git bundle create [<Optionen>] <Datei> <git-rev-list Argumente>" +msgid "" +"git bundle create [-q | --quiet | --progress | --all-progress] [--all-" +"progress-implied]\n" +" [--version=<version>] <file> <git-rev-list-args>" +msgstr "" +"git bundle create [-q | --quiet | --progress | --all-progress] [--all-" +"progress-implied]\n" +" [--version=<Version>] <Datei> <git-rev-list-Argumente>" -msgid "git bundle verify [<options>] <file>" -msgstr "git bundle verify [<Optionen>] <Datei>" +msgid "git bundle verify [-q | --quiet] <file>" +msgstr "git bundle verify [-q | --quiet] <Datei>" msgid "git bundle list-heads <file> [<refname>...]" msgstr "git bundle list-heads <Datei> [<Referenzname>...]" -msgid "git bundle unbundle <file> [<refname>...]" -msgstr "git bundle unbundle <Datei> [<Referenzname>...]" +msgid "git bundle unbundle [--progress] <file> [<refname>...]" +msgstr "git bundle unbundle [--progress] <Datei> [<Referenzname>...]" msgid "do not show progress meter" msgstr "keine Fortschrittsanzeige anzeigen" @@ -3301,12 +3274,12 @@ msgid "" "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" "objects]\n" " [--buffer] [--follow-symlinks] [--unordered]\n" -" [--textconv | --filters]" +" [--textconv | --filters] [-z]" msgstr "" "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" "objects]\n" " [--buffer] [--follow-symlinks] [--unordered]\n" -" [--textconv | --filters]" +" [--textconv | --filters] [-z]" msgid "" "git cat-file (--textconv | --filters)\n" @@ -3419,9 +3392,6 @@ msgstr "<Commit> benötigt mit '%s'" msgid "<object> required with '-%c'" msgstr "<Objekt> benötigt mit '-%c'" -msgid "too many arguments" -msgstr "zu viele Argumente" - #, c-format msgid "only two arguments allowed in <type> <object> mode, not %d" msgstr "nur zwei Argumente im <Typ> <Objekt> Modus erlaubt, nicht %d" @@ -3968,9 +3938,11 @@ msgid "use overlay mode" msgstr "benutze Overlay-Modus" msgid "" -"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." +"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] " +"[<pathspec>...]" msgstr "" -"git clean [-d] [-f] [-i] [-n] [-q] [-e <Muster>] [-x | -X] [--] <Pfade>..." +"git clean [-d] [-f] [-i] [-n] [-q] [-e <Muster>] [-x | -X] [--] " +"[<Pfadspezifikation>...]" #, c-format msgid "Removing %s\n" @@ -4270,6 +4242,11 @@ msgid "failed to start iterator over '%s'" msgstr "Fehler beim Starten der Iteration über '%s'" #, c-format +msgid "symlink '%s' exists, refusing to clone with --local" +msgstr "" +"symbolische Verknüpfung '%s' existiert, verweigere das Klonen mit --local" + +#, c-format msgid "failed to unlink '%s'" msgstr "Konnte '%s' nicht entfernen." @@ -4335,10 +4312,6 @@ msgstr "Zu viele Argumente." msgid "You must specify a repository to clone." msgstr "Sie müssen ein Repository zum Klonen angeben." -#, c-format -msgid "options '%s' and '%s %s' cannot be used together" -msgstr "die Optionen '%s' und '%s %s' können nicht gemeinsam verwendet werden" - msgid "" "--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-" "exclude" @@ -4472,19 +4445,25 @@ msgid "--command must be the first argument" msgstr "--command muss an erster Stelle stehen" msgid "" -"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" +"git commit-graph verify [--object-dir <dir>] [--shallow] [--[no-]progress]" msgstr "" -"git commit-graph verify [--object-dir <Objektverzeichnis>] [--shallow] [--" +"git commit-graph verify [--object-dir <Verzeichnis>] [--shallow] [--" "[no-]progress]" msgid "" -"git commit-graph write [--object-dir <objdir>] [--append] [--" -"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" -"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>" +"git commit-graph write [--object-dir <dir>] [--append]\n" +" [--split[=<strategy>]] [--reachable | --stdin-packs | " +"--stdin-commits]\n" +" [--changed-paths] [--[no-]max-new-filters <n>] [--" +"[no-]progress]\n" +" <split options>" msgstr "" -"git commit-graph write [--object-dir <Objektverzeichnis>] [--append] [--" -"split[=<Strategie>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" -"paths] [--[no-]max-new-filters <Anzahl>] [--[no-]progress] <Split-Optionen>" +"git commit-graph write [--object-dir <Verzeichnis>] [--append]\n" +" [--split[=<Strategie>]] [--reachable | --stdin-packs " +"| --stdin-commits]\n" +" [--changed-paths] [--[no-]max-new-filters <n>] [--" +"[no-]progress]\n" +" <Split-Optionen>" msgid "dir" msgstr "Verzeichnis" @@ -4558,12 +4537,15 @@ msgstr "" msgid "Collecting commits from input" msgstr "Sammle Commits von der Standard-Eingabe" +msgid "git commit-tree <tree> [(-p <parent>)...]" +msgstr "git commit-tree <Tree-Objekt> [(-p <Elternteil>)...]" + msgid "" -"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " -"<file>)...] <tree>" +"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...]\n" +" [(-F <file>)...] <tree>" msgstr "" -"git commit-tree [(-p <Eltern-Commit>)...] [-S[<Key-ID>]] [(-m " -"<Nachricht>)...] [(-F <Datei>)...] <Tree-Objekt>" +"git commit-tree [(-p <Elternteil>)...] [-S[<Key-ID>]] [(-m <Nachricht>)...]\n" +" [(-F <Datei>)...] <Tree-Objekt>" #, c-format msgid "duplicate parent %s ignored" @@ -4605,11 +4587,29 @@ msgstr "Brauche genau ein Tree-Objekt." msgid "git commit-tree: failed to read" msgstr "git commit-tree: Fehler beim Lesen" -msgid "git commit [<options>] [--] <pathspec>..." -msgstr "git commit [<Optionen>] [--] <Pfadspezifikation>..." +msgid "" +"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" +" [--allow-empty-message] [--no-verify] [-e] [--author=<author>]\n" +" [--date=<date>] [--cleanup=<mode>] [--[no-]status]\n" +" [-i | -o] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" +" [(--trailer <token>[(=|:)<value>])...] [-S[<keyid>]]\n" +" [--] [<pathspec>...]" +msgstr "" +"git commit [-a | --interactive | --patch] [-s] [-v] [-u<Modus>] [--amend]\n" +" [--dry-run] [(-c | -C | --squash) <Commit> | --fixup [(amend|" +"reword):]<Commit>)]\n" +" [-F <Datei> | -m <Nachricht>] [--reset-author] [--allow-empty]\n" +" [--allow-empty-message] [--no-verify] [-e] [--author=<Autor>]\n" +" [--date=<Datum>] [--cleanup=<Modus>] [--[no-]status]\n" +" [-i | -o] [--pathspec-from-file=<Datei> [--pathspec-file-nul]]\n" +" [(--trailer <Token>[(=|:)<Wert>])...] [-S[<Key-Id>]]\n" +" [--] [<Pfadspezifikation>...]" -msgid "git status [<options>] [--] <pathspec>..." -msgstr "git status [<Optionen>] [--] <Pfadspezifikation>..." +msgid "git status [<options>] [--] [<pathspec>...]" +msgstr "git status [<Optionen>] [--] [<Pfadspezifikation>...]" msgid "" "You asked to amend the most recent commit, but doing so would make\n" @@ -5396,11 +5396,20 @@ msgstr "credential-cache nicht verfügbar; Unix-Socket wird nicht unterstützt" msgid "unable to get credential storage lock in %d ms" msgstr "konnte Sperre für Zugangsdatenspeicher nicht in %d ms bekommen" -msgid "git describe [<options>] [<commit-ish>...]" -msgstr "git describe [<Optionen>] [<Commit-Angabe>...]" +msgid "" +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] [<commit-ish>...]" +msgstr "" +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] [<Commit-" +"Angabe>...]" + +msgid "" +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<mark>]" +msgstr "" +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] --" +"dirty[=<Markierung>]" -msgid "git describe [<options>] --dirty" -msgstr "git describe [<Optionen>] --dirty" +msgid "git describe <blob>" +msgstr "git describe <Blob>" msgid "head" msgstr "Branch" @@ -5511,8 +5520,8 @@ msgstr "Markierung" msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "" -"<Markierung> bei geändertem Arbeitsverzeichnis anhängen (Standard: \"-dirty" -"\")" +"<Markierung> bei geändertem Arbeitsverzeichnis anhängen (Standard: \"-" +"dirty\")" msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "" @@ -5526,11 +5535,11 @@ msgid "option '%s' and commit-ishes cannot be used together" msgstr "Option '%s' und Commit-Angaben können nicht gemeinsam verwendet werden" msgid "" -"git diagnose [-o|--output-directory <path>] [-s|--suffix <format>] [--" -"mode=<mode>]" +"git diagnose [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n" +" [--mode=<mode>]" msgstr "" -"git diagnose [-o|--output-directory <Pfad>] [-s|--suffix <Format>] [--" -"mode=<Modus>]" +"git diagnose [(-o | --output-directory) <Pfad>] [(-s | --suffix) <Format>]\n" +" [--mode=<Modus>]" msgid "specify a destination for the diagnostics archive" msgstr "einen Zielort für das Diagnosearchiv angeben" @@ -5548,6 +5557,9 @@ msgstr "--merge-base funktioniert nur mit zwei Commits" msgid "'%s': not a regular file or symlink" msgstr "'%s': keine reguläre Datei oder symbolische Verknüpfung" +msgid "no merge given, only parents." +msgstr "kein Merge gegeben, nur Eltern." + #, c-format msgid "invalid option: %s" msgstr "Ungültige Option: %s" @@ -5675,13 +5687,13 @@ msgstr "Ausgaben unterdrücken; nur git_env_*() Werte als Exit-Code verwenden" #, c-format msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" msgstr "" -"Option `--default' erwartet einen booleschen Wert bei `--type=bool`, nicht `" -"%s`" +"Option `--default' erwartet einen booleschen Wert bei `--type=bool`, nicht " +"`%s`" #, c-format msgid "" -"option `--default' expects an unsigned long value with `--type=ulong`, not `" -"%s`" +"option `--default' expects an unsigned long value with `--type=ulong`, not " +"`%s`" msgstr "" "Option `--default' erwartet einen vorzeichenlosen Long-Wert bei `--" "type=ulong`, nicht `%s`" @@ -6206,8 +6218,8 @@ msgstr "nur Referenzen ausgeben, die diesen Commit enthalten" msgid "print only refs which don't contain the commit" msgstr "nur Referenzen ausgeben, die diesen Commit nicht enthalten" -msgid "git for-each-repo --config=<config> <command-args>" -msgstr "git for-each-repo --config=<Konfiguration> <Befehlsargumente>" +msgid "git for-each-repo --config=<config> [--] <arguments>" +msgstr "git for-each-repo --config=<Konfiguration> [--] <Argumente>" msgid "config" msgstr "Konfiguration" @@ -6378,8 +6390,16 @@ msgstr "non-tree in Cache-Verzeichnis" msgid "%s: invalid sha1 pointer in resolve-undo" msgstr "%s: Ungültiger sha1-Zeiger in resolve-undo" -msgid "git fsck [<options>] [<object>...]" -msgstr "git fsck [<Optionen>] [<Objekt>...]" +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>...]" +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>...]" msgid "show unreachable objects" msgstr "unerreichbare Objekte anzeigen" @@ -6434,12 +6454,6 @@ msgstr "git fsmonitor--daemon start [<Optionen>]" msgid "git fsmonitor--daemon run [<options>]" msgstr "git fsmonitor--daemon run [<Optionen>]" -msgid "git fsmonitor--daemon stop" -msgstr "git fsmonitor--daemon stop" - -msgid "git fsmonitor--daemon status" -msgstr "git fsmonitor--daemon status" - #, c-format msgid "value of '%s' out of range: %d" msgstr "Wert von '%s' außerhalb des Bereichs: %d" @@ -6689,8 +6703,20 @@ msgid "use at most one of --auto and --schedule=<frequency>" msgstr "" "nutzen Sie höchstens eine der Optionen --auto oder --schedule=<Häufigkeit>" -msgid "failed to run 'git config'" -msgstr "Fehler beim Ausführen von 'git config'" +#, c-format +msgid "unable to add '%s' value of '%s'" +msgstr "Wert '%s' von '%s' kann nicht hinzugefügt werden" + +msgid "return success even if repository was not registered" +msgstr "Erfolg zurückgeben, auch wenn das Repository nicht registriert wurde" + +#, c-format +msgid "unable to unset '%s' value of '%s'" +msgstr "Wert '%s' von '%s' kann nicht zurückgesetzt werden" + +#, c-format +msgid "repository '%s' is not registered" +msgstr "Repository '%s' ist nicht registriert" #, c-format msgid "failed to expand path '%s'" @@ -6988,11 +7014,14 @@ msgid "both --cached and trees are given" msgstr "--cached und \"Tree\"-Objekte angegeben" msgid "" -"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " -"[--] <file>..." +"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters]\n" +" [--stdin [--literally]] [--] <file>..." msgstr "" -"git hash-object [-t <Art>] [-w] [--path=<Datei> | --no-filters] [--stdin] " -"[--] <Datei>..." +"git hash-object [-t <Art>] [-w] [--path=<Datei> | --no-filters]\n" +" [--stdin [--literally]] [--] <Datei>..." + +msgid "git hash-object [-t <type>] [-w] --stdin-paths [--no-filters]" +msgstr "git hash-object [-t <Art>] [-w] --stdin-paths [--no-filters]" msgid "object type" msgstr "Art des Objektes" @@ -7422,11 +7451,15 @@ msgid "Initialized empty Git repository in %s%s\n" msgstr "Leeres Git-Repository in %s%s initialisiert\n" msgid "" -"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" -"shared[=<permissions>]] [<directory>]" +"git init [-q | --quiet] [--bare] [--template=<template-directory>]\n" +" [--separate-git-dir <git-dir>] [--object-format=<format>]\n" +" [-b <branch-name> | --initial-branch=<branch-name>]\n" +" [--shared[=<permissions>]] [<directory>]" msgstr "" -"git init [-q | --quiet] [--bare] [--template=<Vorlagenverzeichnis>] [--" -"shared[=<Berechtigungen>]] [<Verzeichnis>]" +"git init [-q | --quiet] [--bare] [--template=<Vorlagenverzeichnis>]\n" +" [--separate-git-dir <Git-Verzeichnis>] [--object-format=<Format>]\n" +" [-b <Branchname> | --initial-branch=<Branchname>]\n" +" [--shared[=<Berechtigungen>]] [<Verzeichnis>]" msgid "permissions" msgstr "Berechtigungen" @@ -7467,11 +7500,13 @@ msgid "--separate-git-dir incompatible with bare repository" msgstr "--separate-git-dir nicht kompatibel mit Bare-Repository" msgid "" -"git interpret-trailers [--in-place] [--trim-empty] [(--trailer " -"<token>[(=|:)<value>])...] [<file>...]" +"git interpret-trailers [--in-place] [--trim-empty]\n" +" [(--trailer <token>[(=|:)<value>])...]\n" +" [--parse] [<file>...]" msgstr "" -"git interpret-trailers [--in-place] [--trim-empty] [(--trailer " -"<Token>[(=|:)<Wert>])...] [<Datei>...]" +"git interpret-trailers [--in-place] [--trim-empty]\n" +" [(--trailer <Token>[(=|:)<Wert>])...]\n" +" [--parse] [<Datei>...]" msgid "edit files in place" msgstr "vorhandene Dateien direkt bearbeiten" @@ -7963,11 +7998,11 @@ msgstr "" msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" -" [-q | --quiet] [--exit-code] [--get-url]\n" +" [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n" " [--symref] [<repository> [<refs>...]]" msgstr "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<Programm>]\n" -" [-q | --quiet] [--exit-code] [--get-url]\n" +" [-q | --quiet] [--exit-code] [--get-url] [--sort=<Schlüssel>]\n" " [--symref] [<Repository> [<Referenzen>...]]" msgid "do not print remote URL" @@ -8101,12 +8136,12 @@ msgstr "git merge-base [-a | --all] <Commit> <Commit>..." msgid "git merge-base [-a | --all] --octopus <commit>..." msgstr "git merge-base [-a | --all] --octopus <Commit>..." -msgid "git merge-base --independent <commit>..." -msgstr "git merge-base --independent <Commit>..." - msgid "git merge-base --is-ancestor <commit> <commit>" msgstr "git merge-base --is-ancestor <Commit> <Commit>" +msgid "git merge-base --independent <commit>..." +msgstr "git merge-base --independent <Commit>..." + msgid "git merge-base --fork-point <ref> [<commit>]" msgstr "git merge-base --fork-point <Referenz> [<Commit>]" @@ -8215,9 +8250,21 @@ msgstr "Dateinamen ohne Modi/Oids/Stufen auflisten" msgid "allow merging unrelated histories" msgstr "erlaube das Zusammenführen von nicht zusammenhängenden Historien" +msgid "perform multiple merges, one per line of input" +msgstr "mehrere Merges durchführen, eine pro Eingabezeile" + msgid "--trivial-merge is incompatible with all other options" msgstr "--trivial-merge ist mit allen anderen Optionen inkompatibel" +#, c-format +msgid "malformed input line: '%s'." +msgstr "Fehlerhafte Eingabezeile: '%s'." + +#, c-format +msgid "merging cannot continue; got unclean result of %d" +msgstr "" +"Merge kann nicht fortgesetzt werden; unsauberes Ergebnis von %d erhalten" + msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<Optionen>] [<Commit>...]" @@ -8849,10 +8896,6 @@ msgid "cannot read note data from non-blob object '%s'." msgstr "Kann Notiz-Daten nicht von Nicht-Blob Objekt '%s' lesen." #, c-format -msgid "malformed input line: '%s'." -msgstr "Fehlerhafte Eingabezeile: '%s'." - -#, c-format msgid "failed to copy notes from '%s' to '%s'" msgstr "Fehler beim Kopieren der Notizen von '%s' nach '%s'" @@ -9049,16 +9092,14 @@ msgstr "Notizen von <Notiz-Referenz> verwenden" msgid "unknown subcommand: `%s'" msgstr "unbekannter Unterbefehl: `%s'" -msgid "" -"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" +msgid "git pack-objects --stdout [<options>] [< <ref-list> | < <object-list>]" msgstr "" -"git pack-objects --stdout [<Optionen>...] [< <Referenzliste> | < " -"<Objektliste>]" +"git pack-objects --stdout [<Optionen>] [< <Referenzliste> | < <Objektliste>]" msgid "" -"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" +"git pack-objects [<options>] <base-name> [< <ref-list> | < <object-list>]" msgstr "" -"git pack-objects [<Optionen>...] <Basis-Name> [< <Referenzliste> | < " +"git pack-objects [<Optionen>] <Basis-Name> [< <Referenzliste> | < " "<Objektliste>]" #, c-format @@ -9454,8 +9495,8 @@ msgstr "" "Sie es immer noch verwenden, indem Sie eine E-Mail an\n" "<git@vger.kernel.org> senden. Danke.\n" -msgid "git pack-refs [<options>]" -msgstr "git pack-refs [<Optionen>]" +msgid "git pack-refs [--all] [--no-prune]" +msgstr "git pack-refs [--all] [--no-prune]" msgid "pack everything" msgstr "alles packen" @@ -9463,6 +9504,18 @@ msgstr "alles packen" msgid "prune loose refs (default)" msgstr "lose Referenzen entfernen (Standard)" +msgid "git patch-id [--stable | --unstable | --verbatim]" +msgstr "git patch-id [--stable | --unstable | --verbatim]" + +msgid "use the unstable patch-id algorithm" +msgstr "den instabilen Patch-ID-Algorithmus verwenden" + +msgid "use the stable patch-id algorithm" +msgstr "den stabilen Patch-ID-Algorithmus verwenden" + +msgid "don't strip whitespace from the patch" +msgstr "keine Leerzeichen aus dem Patch entfernen" + msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--progress] [--expire <Zeit>] [--] [<Branch>...]" @@ -9690,13 +9743,12 @@ msgstr "" msgid "" "\n" -"To avoid automatically configuring upstream branches when their name\n" -"doesn't match the local branch, see option 'simple' of branch." -"autoSetupMerge\n" +"To avoid automatically configuring an upstream branch when its name\n" +"won't match the local branch, see option 'simple' of branch.autoSetupMerge\n" "in 'git help config'.\n" msgstr "" "\n" -"Um das automatische Konfigurieren von Upstream-Branches zu verhindern,\n" +"Um das automatische Konfigurieren eines Upstream-Branches zu verhindern,\n" "wenn deren Namen nicht mit dem lokalen Branch übereinstimmen, siehe\n" "Option 'simple' bei branch.autoSetupMerge in 'git help config'.\n" @@ -9861,6 +9913,13 @@ msgstr "Push nach %s\n" msgid "failed to push some refs to '%s'" msgstr "Fehler beim Versenden einiger Referenzen nach '%s'" +msgid "" +"recursing into submodule with push.recurseSubmodules=only; using on-demand " +"instead" +msgstr "" +"Rekursion in Submodule mit push.recurseSubmodules=only; stattdessen " +"Verwendung von on-demand" + #, c-format msgid "invalid value for '%s'" msgstr "ungültiger Wert für '%s'" @@ -9998,13 +10057,16 @@ msgid "need two commit ranges" msgstr "Benötige zwei Commit-Bereiche." msgid "" -"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " -"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-" -"ish1> [<tree-ish2> [<tree-ish3>]])" +"git read-tree [(-m [--trivial] [--aggressive] | --reset | --" +"prefix=<prefix>)\n" +" [-u | -i]] [--index-output=<file>] [--no-sparse-checkout]\n" +" (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" msgstr "" -"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<Präfix>) " -"[-u | -i]] [--no-sparse-checkout] [--index-output=<Datei>] (--empty | " -"<Commit-Referenz1> [<Commit-Referenz2> [<Commit-Referenz3>]])" +"git read-tree [(-m [--trivial] [--aggressive] | --reset | --" +"prefix=<Präfix>)\n" +" [-u | -i]] [--index-output=<Datei>] [--no-sparse-checkout]\n" +" (--empty | <Commit-Referenz1> [<Commit-Referenz2> [<Commit-" +"Referenz3>]])" msgid "write resulting index to <file>" msgstr "resultierenden Index nach <Datei> schreiben" @@ -10095,8 +10157,8 @@ msgid "%s requires the merge backend" msgstr "%s erfordert das Merge-Backend" #, c-format -msgid "could not get 'onto': '%s'" -msgstr "Konnte 'onto' nicht bestimmen: '%s'" +msgid "invalid onto: '%s'" +msgstr "ungültig auf: '%s'" #, c-format msgid "invalid orig-head: '%s'" @@ -10150,8 +10212,8 @@ msgstr "Konnte nicht zu %s wechseln." #, c-format msgid "" -"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" -"\"." +"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and " +"\"ask\"." msgstr "" "nicht erkannter leerer Typ '%s'; gültige Werte sind \"drop\", \"keep\", und " "\"ask\"." @@ -10415,8 +10477,8 @@ msgstr "Branch/Commit '%s' nicht gefunden" msgid "No such ref: %s" msgstr "Referenz nicht gefunden: %s" -msgid "Could not resolve HEAD to a revision" -msgstr "Konnte HEAD zu keinem Commit auflösen." +msgid "Could not resolve HEAD to a commit" +msgstr "HEAD konnte nicht in einen Commit aufgelöst werden" #, c-format msgid "'%s': need exactly one merge base with branch" @@ -11094,6 +11156,10 @@ msgstr "konnte temporäre Datei '%s' nicht zum Schreiben öffnen" msgid "could not close refs snapshot tempfile" msgstr "konnte temporäre Referenzen-Snapshot-Datei nicht schließen" +#, c-format +msgid "could not remove stale bitmap: %s" +msgstr "konnte veraltete Bitmap nicht entfernen: %s" + msgid "pack everything in a single pack" msgstr "alles in eine einzige Pack-Datei packen" @@ -11169,6 +11235,9 @@ msgstr "eine geometrische Progression mit Faktor <N> finden" msgid "write a multi-pack index of the resulting packs" msgstr "ein Multi-Pack-Index des resultierenden Pakets schreiben" +msgid "pack prefix to store a pack containing pruned objects" +msgstr "pack-Präfix zum Speichern eines Pakets mit gelöschten Objekten" + msgid "cannot delete packs in a precious-objects repo" msgstr "kann Pack-Dateien in precious-objects Repository nicht löschen" @@ -11180,8 +11249,12 @@ msgid "pack prefix %s does not begin with objdir %s" msgstr "Pack-Präfix %s fängt nicht mit objdir %s an" #, c-format -msgid "missing required file: %s" -msgstr "benötigte Datei fehlt: %s" +msgid "renaming pack to '%s' failed" +msgstr "Umbenennung des Pakets in '%s' fehlgeschlagen" + +#, c-format +msgid "pack-objects did not write a '%s' file for pack %s-%s" +msgstr "pack-objects hat keine '%s' Datei für Paket %s-%s geschrieben" #, c-format msgid "could not unlink: %s" @@ -11376,8 +11449,11 @@ msgstr "--convert-graft-file erwartet keine Argumente" msgid "only one pattern can be given with -l" msgstr "Mit -l kann nur ein Muster angegeben werden" -msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" -msgstr "git rerere [clean | forget <Pfad>... | status | remaining | diff | gc]" +msgid "" +"git rerere [clear | forget <pathspec>... | diff | status | remaining | gc]" +msgstr "" +"git rerere [clear | forget <Pfadspezifikation>... | diff | status | " +"remaining | gc]" msgid "register clean resolutions in index" msgstr "saubere Auflösungen im Index registrieren" @@ -11584,6 +11660,15 @@ msgstr "--prefix benötigt ein Argument" msgid "unknown mode for --abbrev-ref: %s" msgstr "unbekannter Modus für --abbrev-ref: %s" +msgid "--exclude-hidden cannot be used together with --branches" +msgstr "--exclude-hidden kann nicht zusammen mit --branches verwendet werden" + +msgid "--exclude-hidden cannot be used together with --tags" +msgstr "--exclude-hidden kann nicht zusammen mit --tags verwendet werden" + +msgid "--exclude-hidden cannot be used together with --remotes" +msgstr "--exclude-hidden kann nicht zusammen mit --remotes verwendet werden" + msgid "this operation must be run in a work tree" msgstr "Diese Operation muss in einem Arbeitsverzeichnis ausgeführt werden." @@ -11591,17 +11676,26 @@ msgstr "Diese Operation muss in einem Arbeitsverzeichnis ausgeführt werden." msgid "unknown mode for --show-object-format: %s" msgstr "unbekannter Modus für --show-object-format: %s" -msgid "git revert [<options>] <commit-ish>..." -msgstr "git revert [<Optionen>] <Commit-Angabe>..." +msgid "" +"git revert [--[no-]edit] [-n] [-m <parent-number>] [-s] [-S[<keyid>]] " +"<commit>..." +msgstr "" +"git revert [--[no-]edit] [-n] [-m <Nummer des Elterncommits>] [-s] [-S[<Key-" +"ID>]] <Commit>…" -msgid "git revert <subcommand>" -msgstr "git revert <Unterbefehl>" +msgid "git revert (--continue | --skip | --abort | --quit)" +msgstr "git revert (--continue | --skip | --abort | --quit)" -msgid "git cherry-pick [<options>] <commit-ish>..." -msgstr "git cherry-pick [<Optionen>] <Commit-Angabe>..." +msgid "" +"git cherry-pick [--edit] [-n] [-m <parent-number>] [-s] [-x] [--ff]\n" +" [-S[<keyid>]] <commit>..." +msgstr "" +"git cherry-pick [--edit] [-n] [-m <Nummer des Elterncommits>] [-s] [-x] [--" +"ff]\n" +" [-S[<Key-ID>]] <Commit>…" -msgid "git cherry-pick <subcommand>" -msgstr "git cherry-pick <Unterbefehl>" +msgid "git cherry-pick (--continue | --skip | --abort | --quit)" +msgstr "git cherry-pick (--continue | --skip | --abort | --quit)" #, c-format msgid "option `%s' expects a number greater than zero" @@ -11662,8 +11756,14 @@ msgstr "\"revert\" fehlgeschlagen" msgid "cherry-pick failed" msgstr "\"cherry-pick\" fehlgeschlagen" -msgid "git rm [<options>] [--] <file>..." -msgstr "git rm [<Optionen>] [--] <Datei>..." +msgid "" +"git rm [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n" +" [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" +" [--] [<pathspec>...]" +msgstr "" +"git rm [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n" +" [--quiet] [--pathspec-from-file=<Datei> [--pathspec-file-nul]]\n" +" [--] [<Pfadspezifikation>...]" msgid "" "the following file has staged content different from both the\n" @@ -11741,11 +11841,13 @@ msgid "" "git send-pack [--mirror] [--dry-run] [--force]\n" " [--receive-pack=<git-receive-pack>]\n" " [--verbose] [--thin] [--atomic]\n" +" [--[no-]signed | --signed=(true|false|if-asked)]\n" " [<host>:]<directory> (--all | <ref>...)" msgstr "" "git send-pack [--mirror] [--dry-run] [--force]\n" " [--receive-pack=<git-receive-pack>]\n" " [--verbose] [--thin] [--atomic]\n" +" [--[no-]signed | --signed=(true|false|if-asked)]\n" " [<Host>:]<Verzeichnis> (--all | <Referenz>...)" msgid "remote name" @@ -11769,9 +11871,9 @@ msgstr "git log --pretty=short | git shortlog [<Optionen>]" msgid "using multiple --group options with stdin is not supported" msgstr "mehrere Optionen --group mit Standard-Eingabe wird nicht unterstützt" -msgid "using --group=trailer with stdin is not supported" -msgstr "" -"Nutzung von --group=trailer mit Standard-Eingabe wird nicht unterstützt" +#, c-format +msgid "using %s with stdin is not supported" +msgstr "die Verwendung von %s mit stdin wird nicht unterstützt" #, c-format msgid "unknown group type: %s" @@ -11808,12 +11910,14 @@ msgid "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" " [--current] [--color[=<when>] | --no-color] [--sparse]\n" " [--more=<n> | --list | --independent | --merge-base]\n" -" [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" +" [--no-name | --sha1-name] [--topics]\n" +" [(<rev> | <glob>)...]" msgstr "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" -" [--current] [--color[=<Wann>] | --no-color] [--sparse]\n" +" [--current] [--color[=<wann>] | --no-color] [--sparse]\n" " [--more=<n> | --list | --independent | --merge-base]\n" -" [--no-name | --sha1-name] [--topics] [(<Commit> | <glob>)...]" +" [--no-name | --sha1-name] [--topics]\n" +" [(<Commit> | <Glob>)...]" msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g | --reflog)[=<n>[,<Basis>]] [--list] [<Referenz>]" @@ -11914,11 +12018,13 @@ msgid "Unknown hash algorithm" msgstr "Unbekannter Hash-Algorithmus" msgid "" -"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference]\n" +" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n" +" [--heads] [--] [<pattern>...]" msgstr "" -"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<Muster>...] " +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference]\n" +" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n" +" [--heads] [--] [<Muster>...]" msgid "git show-ref --exclude-existing[=<pattern>]" msgstr "git show-ref --exclude-existing[=<Muster>]" @@ -11951,8 +12057,11 @@ msgstr "" "Referenzen von der Standard-Eingabe anzeigen, die sich nicht im lokalen " "Repository befinden" -msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" -msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <Optionen>" +msgid "" +"git sparse-checkout (init | list | set | add | reapply | disable) [<options>]" +msgstr "" +"git sparse-checkout (init | list | set | add | reapply | disable) " +"[<Optionen>]" msgid "this worktree is not sparse" msgstr "dieses Arbeitsverzeichnis ist nicht partiell" @@ -12083,67 +12192,58 @@ msgstr "" msgid "error while refreshing working directory" msgstr "Fehler während der Aktualisierung des Arbeitsverzeichnisses." -msgid "git stash list [<options>]" -msgstr "git stash list [<Optionen>]" +msgid "git stash list [<log-options>]" +msgstr "git stash list [<log-Optionen>]" + +msgid "" +"git stash show [-u | --include-untracked | --only-untracked] [<diff-" +"options>] [<stash>]" +msgstr "" +"git stash show [-u | --include-untracked | --only-untracked] [<Diff-" +"Optionen>] [<Stash>]" -msgid "git stash show [<options>] [<stash>]" -msgstr "git stash show [<Optionen>] [<Stash>]" +msgid "git stash drop [-q | --quiet] [<stash>]" +msgstr "git stash drop [-q | --quiet] [<Stash>]" -msgid "git stash drop [-q|--quiet] [<stash>]" -msgstr "git stash drop [-q|--quiet] [<Stash>]" +msgid "git stash pop [--index] [-q | --quiet] [<stash>]" +msgstr "git stash pop [--index] [-q | --quiet] [<Stash>]" -msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" -msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<Stash>]" +msgid "git stash apply [--index] [-q | --quiet] [<stash>]" +msgstr "git stash apply [--index] [-q | --quiet] [<Stash>]" msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <Branch> [<Stash>]" +msgid "git stash store [(-m | --message) <message>] [-q | --quiet] <commit>" +msgstr "" +"git stash store [(-m | --message) <Beschreibung>] [-q | --quiet] <Commit>" + msgid "" -"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" -"quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" +"git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q " +"| --quiet]\n" +" [-u | --include-untracked] [-a | --all] [(-m | --message) " +"<message>]\n" " [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" " [--] [<pathspec>...]]" msgstr "" -"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" -"quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <Nachricht>]\n" +"git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q " +"| --quiet]\n" +" [-u | --include-untracked] [-a | --all] [(-m | --message) " +"<Nachricht>]\n" " [--pathspec-from-file=<Datei> [--pathspec-file-nul]]\n" " [--] [<Pfadspezifikation>...]]" msgid "" -"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" -"quiet]\n" -" [-u|--include-untracked] [-a|--all] [<message>]" +"git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | " +"--quiet]\n" +" [-u | --include-untracked] [-a | --all] [<message>]" msgstr "" -"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" -"quiet]\n" -" [-u|--include-untracked] [-a|--all] [<Nachricht>]" - -msgid "git stash pop [--index] [-q|--quiet] [<stash>]" -msgstr "git stash pop [--index] [-q|--quiet] [<Stash>]" +"git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | " +"--quiet]\n" +" [-u | --include-untracked] [-a | --all] [<Beschreibung>]" -msgid "git stash apply [--index] [-q|--quiet] [<stash>]" -msgstr "git stash apply [--index] [-q|--quiet] [<Stash>]" - -msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" -msgstr "git stash store [-m|--message <Nachricht>] [-q|--quiet] <Commit>" - -msgid "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" -" [--] [<pathspec>...]]" -msgstr "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <Nachricht>]\n" -" [--] [<Pfadspezifikation>...]]" - -msgid "" -"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [<message>]" -msgstr "" -"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [<Nachricht>]" +msgid "git stash create [<message>]" +msgstr "git stash create [<Beschreibung>]" #, c-format msgid "'%s' is not a stash-like commit" @@ -12721,9 +12821,6 @@ msgstr "Submodule rekursiv durchlaufen" msgid "don't fetch new objects from the remote site" msgstr "keine neuen Objekte von Remote abrufen" -msgid "path into the working tree" -msgstr "Pfad zum Arbeitsverzeichnis" - msgid "use the 'checkout' update strategy (default)" msgstr "die Aktualisierungsstrategie \"checkout\" verwenden (Standard)" @@ -12764,29 +12861,9 @@ msgstr "" "shallow] [--reference <Repository>] [--recursive] [--[no-]single-branch] " "[--] [<Pfad>...]" -msgid "recurse into submodules" -msgstr "Rekursion in Submodule durchführen" - msgid "git submodule absorbgitdirs [<options>] [<path>...]" msgstr "git submodule absorbgitdirs [<Optionen>] [<Pfad>...]" -msgid "check if it is safe to write to the .gitmodules file" -msgstr "prüfen, ob es sicher ist, in die Datei .gitmodules zu schreiben" - -msgid "unset the config in the .gitmodules file" -msgstr "Konfiguration in der .gitmodules-Datei entfernen" - -msgid "git submodule--helper config <name> [<value>]" -msgstr "git submodule--helper config <name> [<Wert>]" - -msgid "git submodule--helper config --unset <name>" -msgstr "git submodule--helper config --unset <Name>" - -msgid "please make sure that the .gitmodules file is in the working tree" -msgstr "" -"Bitte stellen Sie sicher, dass sich die Datei .gitmodules im " -"Arbeitsverzeichnis befindet." - msgid "suppress output for setting url of a submodule" msgstr "Ausgaben beim Setzen der URL eines Submoduls unterdrücken" @@ -12867,6 +12944,11 @@ msgstr "Reaktiviere lokales Git-Verzeichnis für Submodul '%s'\n" msgid "unable to checkout submodule '%s'" msgstr "kann Submodul '%s' nicht auschecken" +msgid "please make sure that the .gitmodules file is in the working tree" +msgstr "" +"Bitte stellen Sie sicher, dass sich die Datei .gitmodules im " +"Arbeitsverzeichnis befindet." + #, c-format msgid "Failed to add submodule '%s'" msgstr "Hinzufügen von Submodul '%s' fehlgeschlagen" @@ -12919,19 +13001,21 @@ msgstr "repo URL: '%s' muss absolut sein oder mit ./|../ beginnen" msgid "'%s' is not a valid submodule name" msgstr "'%s' ist kein gültiger Submodul-Name" +msgid "git submodule--helper <command>" +msgstr "git submodule--helper <Befehl>" + #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s unterstützt kein --super-prefix" -#, c-format -msgid "'%s' is not a valid submodule--helper subcommand" -msgstr "'%s' ist kein gültiger Unterbefehl von submodule--helper" +msgid "git symbolic-ref [-m <reason>] <name> <ref>" +msgstr "git symbolic-ref [-m <Grund>] <Name> <Referenz>" -msgid "git symbolic-ref [<options>] <name> [<ref>]" -msgstr "git symbolic-ref [<Optionen>] <Name> [<Referenz>]" +msgid "git symbolic-ref [-q] [--short] [--no-recurse] <name>" +msgstr "git symbolic-ref [-q] [--short] [--no-recurse] <Name>" -msgid "git symbolic-ref -d [-q] <name>" -msgstr "git symbolic-ref -d [-q] <Name>" +msgid "git symbolic-ref --delete [-q] <name>" +msgstr "git symbolic-ref --delete [-q] <Name>" msgid "suppress error message for non-symbolic (detached) refs" msgstr "" @@ -12943,6 +13027,9 @@ msgstr "symbolische Referenzen löschen" msgid "shorten ref output" msgstr "verkürzte Ausgabe der Referenzen" +msgid "recursively dereference (default)" +msgstr "rekursives Dereferenzieren (Standard)" + msgid "reason" msgstr "Grund" @@ -12950,25 +13037,25 @@ msgid "reason of the update" msgstr "Grund für die Aktualisierung" msgid "" -"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n" -" <tagname> [<head>]" +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n" +" <tagname> [<commit> | <object>]" msgstr "" -"git tag [-a | -s | -u <Schlüssel-ID>] [-f] [-m <Beschreibung> | -F <Datei>]\n" -" <Tagname> [<Commit>]" +"git tag [-a | -s | -u <Key-ID>] [-f] [-m <Beschreibung> | -F <Datei>] [-e]\n" +" <Tagname> [<Commit> | <Objekt>]" msgid "git tag -d <tagname>..." msgstr "git tag -d <Tagname>..." msgid "" -"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" -"points-at <object>]\n" -" [--format=<format>] [--merged <commit>] [--no-merged <commit>] " -"[<pattern>...]" +"git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]\n" +" [--points-at <object>] [--column[=<options>] | --no-column]\n" +" [--create-reflog] [--sort=<key>] [--format=<format>]\n" +" [--merged <commit>] [--no-merged <commit>] [<pattern>...]" msgstr "" -"git tag -l [-n[<Nummer>]] [--contains <Commit>] [--no-contains <Commit>] [--" -"points-at <Objekt>]\n" -" [--format=<format>] [--merged <Commit>] [--no-merged <Commit>] " -"[<Muster>...]" +"git tag [-n[<Nummer>]] -l [--contains <Commit>] [--no-contains <Commit>]\n" +" [--points-at <Objekt>] [--column[=<Optionen>] | --no-column]\n" +" [--create-reflog] [--sort=<Schlüssel>] [--format=<Format>]\n" +" [--merged <Commit>] [--no-merged <Commit>] [<Muster>...]" msgid "git tag -v [--format=<format>] <tagname>..." msgstr "git tag -v [--format=<Format>] <Tagname>..." @@ -13367,8 +13454,12 @@ msgstr "Aktualisierungen von der Standard-Eingabe lesen" msgid "update the info files from scratch" msgstr "die Informationsdateien von Grund auf aktualisieren" -msgid "git upload-pack [<options>] <dir>" -msgstr "git upload-pack [<Optionen>] <Verzeichnis>" +msgid "" +"git-upload-pack [--[no-]strict] [--timeout=<n>] [--stateless-rpc]\n" +" [--advertise-refs] <directory>" +msgstr "" +"git-upload-pack [--[no-]strict] [--timeout=<n>] [--stateless-rpc]\n" +" [--advertise-refs] <directory>" msgid "quit after a single request/response exchange" msgstr "nach einem einzigen Request/Response-Austausch beenden" @@ -13384,8 +13475,8 @@ msgstr "" msgid "interrupt transfer after <n> seconds of inactivity" msgstr "Übertragung nach <n> Sekunden Inaktivität unterbrechen" -msgid "git verify-commit [-v | --verbose] <commit>..." -msgstr "git verify-commit [-v | --verbose] <Commit>..." +msgid "git verify-commit [-v | --verbose] [--raw] <commit>..." +msgstr "git verify-commit [-v | --verbose] [--raw] <Commit>..." msgid "print commit contents" msgstr "Commit-Inhalte ausgeben" @@ -13393,8 +13484,9 @@ msgstr "Commit-Inhalte ausgeben" msgid "print raw gpg status output" msgstr "unbearbeitete Ausgabe des Status von gpg ausgeben" -msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." -msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <Paket>..." +msgid "git verify-pack [-v | --verbose] [-s | --stat-only] [--] <pack>.idx..." +msgstr "" +"git verify-pack [-v | --verbose] [-s | --stat-only] [--] <Paket>.idx..." msgid "verbose" msgstr "erweiterte Ausgaben" @@ -13402,35 +13494,40 @@ msgstr "erweiterte Ausgaben" msgid "show statistics only" msgstr "nur Statistiken anzeigen" -msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." -msgstr "git verify-tag [-v | --verbose] [--format=<Format>] <Tag>..." +msgid "git verify-tag [-v | --verbose] [--format=<format>] [--raw] <tag>..." +msgstr "git verify-tag [-v | --verbose] [--format=<Format>] [--raw] <Tag>..." msgid "print tag contents" msgstr "Tag-Inhalte ausgeben" -msgid "git worktree add [<options>] <path> [<commit-ish>]" -msgstr "git worktree add [<Optionen>] <Pfad> [<Commit-Angabe>]" +msgid "" +"git worktree add [-f] [--detach] [--checkout] [--lock [--reason <string>]]\n" +" [-b <new-branch>] <path> [<commit-ish>]" +msgstr "" +"git worktree add [-f] [--detach] [--checkout] [--lock [--reason " +"<Zeichenkette>]]\n" +" [-b <neuer-Branch>] <Pfad> [<Commit-Angabe>]" -msgid "git worktree list [<options>]" -msgstr "git worktree list [<Optionen>]" +msgid "git worktree list [-v | --porcelain [-z]]" +msgstr "git worktree list [-v | --porcelain [-z]]" -msgid "git worktree lock [<options>] <path>" -msgstr "git worktree lock [<Optionen>] <Pfad>" +msgid "git worktree lock [--reason <string>] <worktree>" +msgstr "git worktree lock [--reason <Zeichenkette>] <Arbeitsverzeichnis>" msgid "git worktree move <worktree> <new-path>" msgstr "git worktree move <Arbeitsverzeichnis> <neuer-Pfad>" -msgid "git worktree prune [<options>]" -msgstr "git worktree prune [<Optionen>]" +msgid "git worktree prune [-n] [-v] [--expire <expire>]" +msgstr "git worktree prune [-n] [-v] [--expire <Zeit>]" -msgid "git worktree remove [<options>] <worktree>" -msgstr "git worktree remove [<Optionen>] <Arbeitsverzeichnis>" +msgid "git worktree remove [-f] <worktree>" +msgstr "git worktree remove [-f] <Arbeitsverzeichnis>" msgid "git worktree repair [<path>...]" msgstr "git worktree repair [<Pfad>...]" -msgid "git worktree unlock <path>" -msgstr "git worktree unlock <Pfad>" +msgid "git worktree unlock <worktree>" +msgstr "git worktree unlock <Arbeitsverzeichnis>" #, c-format msgid "Removing %s/%s: %s" @@ -13681,6 +13778,10 @@ msgstr "nur nützlich für Fehlersuche" msgid "core.fsyncMethod = batch is unsupported on this platform" msgstr "core.fsyncMethod = batch wird auf dieser Plattform nicht unterstützt" +#, c-format +msgid "bundle list at '%s' has no mode" +msgstr "Paketliste bei '%s' hat keinen Modus" + msgid "failed to create temporary file" msgstr "temporäre Datei kann nicht erstellt werden" @@ -13688,16 +13789,29 @@ msgid "insufficient capabilities" msgstr "unzureichende Fähigkeiten" #, c-format +msgid "unrecognized bundle mode from URI '%s'" +msgstr "nicht erkannter Bundle-Modus von URI '%s'" + +#, c-format +msgid "exceeded bundle URI recursion limit (%d)" +msgstr "Rekursionsgrenze für Bundle-URI überschritten (%d)" + +#, c-format msgid "failed to download bundle from URI '%s'" msgstr "Download des Bundles von URI '%s' fehlgeschlagen" #, c-format -msgid "file at URI '%s' is not a bundle" -msgstr "Datei unter URI '%s' ist kein Bundle" +msgid "file at URI '%s' is not a bundle or bundle list" +msgstr "Datei unter URI '%s' ist kein Paket oder keine Paketliste" -#, c-format -msgid "failed to unbundle bundle from URI '%s'" -msgstr "Bundle von URI '%s' konnte nicht entpackt werden" +msgid "bundle-uri: got an empty line" +msgstr "bundle-uri: erhielt eine leere Zeile" + +msgid "bundle-uri: line is not of the form 'key=value'" +msgstr "bundle-uri: Zeile hat nicht die Form 'Schlüssel=Wert'" + +msgid "bundle-uri: line has empty key or value" +msgstr "bundle-uri: Zeile hat leeren Schlüssel oder Wert" #, c-format msgid "unrecognized bundle hash algorithm: %s" @@ -14301,8 +14415,8 @@ msgstr "Das Bundle-Dateiformat" msgid "Chunk-based file formats" msgstr "Chunk-basierte Dateiformate" -msgid "Git commit graph format" -msgstr "Git Commit Graph Format" +msgid "Git commit-graph format" +msgstr "Git Commit-Graph Format" msgid "Git index format" msgstr "Git-Index-Format" @@ -14653,6 +14767,10 @@ msgstr "unbehandelter Fall in 'has_worktree_moved': %d" msgid "health thread wait failed [GLE %ld]" msgstr "Warten des health Thread fehlgeschlagen [GLE %ld]" +#, c-format +msgid "Invalid path: %s" +msgstr "Ungültiger Pfad: %s" + msgid "Unable to create FSEventStream." msgstr "Konnte FSEventStream nicht erstellen." @@ -14684,6 +14802,22 @@ msgid "could not read directory changes [GLE %ld]" msgstr "konnte Verzeichnisveränderungen nicht lesen [GLE %ld]" #, c-format +msgid "opendir('%s') failed" +msgstr "opendir('%s') fehlgeschlagen" + +#, c-format +msgid "lstat('%s') failed" +msgstr "lstat('%s') fehlgeschlagen" + +#, c-format +msgid "strbuf_readlink('%s') failed" +msgstr "strbuf_readlink('%s') fehlgeschlagen" + +#, c-format +msgid "closedir('%s') failed" +msgstr "closedir('%s') fehlgeschlagen" + +#, c-format msgid "[GLE %ld] unable to open for read '%ls'" msgstr "[GLE %ld] '%ls' kann nicht zum Lesen geöffnet werden" @@ -16326,9 +16460,11 @@ msgstr "virtuelles Repository '%s' ist inkompatibel mit fsmonitor" #, c-format msgid "" -"repository '%s' is incompatible with fsmonitor due to lack of Unix sockets" +"socket directory '%s' is incompatible with fsmonitor due to lack of Unix " +"sockets support" msgstr "" -"Repository '%s' is inkompatibel mit fsmonitor wegen fehlender Unix sockets" +"Socket-Verzeichnis '%s' ist mit fsmonitor inkompatibel, da es keine Unix-" +"Sockets unterstützt" msgid "" "git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]\n" @@ -16653,8 +16789,8 @@ msgstr[1] "" "\n" "Die ähnlichsten Befehle sind" -msgid "git version [<options>]" -msgstr "git version [<Optionen>]" +msgid "git version [--build-options]" +msgstr "git version [--build-options]" #, c-format msgid "%s: %s - %s" @@ -17272,8 +17408,8 @@ msgstr "" #, c-format msgid "" -"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" -"\"->\"%s\" in \"%s\"%s" +"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename " +"\"%s\"->\"%s\" in \"%s\"%s" msgstr "" "KONFLIKT (umbenennen/umbenennen): Benenne um \"%s\"->\"%s\" in Branch \"%s\" " "und \"%s\"->\"%s\" in Branch \"%s\"%s" @@ -17601,10 +17737,6 @@ msgstr "Konnte alternativen Objektpfad '%s' nicht normalisieren." msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s: ignoriere alternative Objektspeicher - Verschachtelung zu tief" -#, c-format -msgid "unable to normalize object directory: %s" -msgstr "Konnte Objektverzeichnis '%s' nicht normalisieren." - msgid "unable to fdopen alternates lockfile" msgstr "Konnte fdopen nicht auf Lock-Datei für \"alternates\" aufrufen." @@ -18450,6 +18582,10 @@ msgstr "" msgid "promisor remote name cannot begin with '/': %s" msgstr "Promisor-Remote-Name kann nicht mit '/' beginnen: %s" +#, c-format +msgid "could not fetch %s from promisor remote" +msgstr "konnte %s nicht von Promisor-Remote abrufen" + msgid "object-info: expected flush after arguments" msgstr "object-info: erwartete Flush nach Argumenten" @@ -19540,6 +19676,13 @@ msgid "failed to find tree of %s" msgstr "Fehler beim Finden des \"Tree\"-Objektes von %s." #, c-format +msgid "unsupported section for hidden refs: %s" +msgstr "nicht unterstützter Abschnitt für versteckte Referenzen: %s" + +msgid "--exclude-hidden= passed more than once" +msgstr "--exclude-hidden= mehr als einmal übergeben" + +#, c-format msgid "resolve-undo records `%s` which is missing" msgstr "resolve-undo zeichnet `%s` auf, das fehlt" @@ -19684,6 +19827,14 @@ msgid "--all or <enlistment>, but not both" msgstr "--all oder <Eintragung>, aber nicht beides" #, c-format +msgid "could not remove stale scalar.repo '%s'" +msgstr "konnte veraltetes scalar.repo '%s' nicht entfernen" + +#, c-format +msgid "removing stale scalar.repo '%s'" +msgstr "entferne veraltetes scalar.repo '%s'" + +#, c-format msgid "git repository gone in '%s'" msgstr "Git-Repository entfernt in '%s'" @@ -20317,16 +20468,16 @@ msgstr "" msgid "illegal label name: '%.*s'" msgstr "unerlaubter Beschriftungsname: '%.*s'" +#, c-format +msgid "could not resolve '%s'" +msgstr "konnte '%s' nicht auflösen" + msgid "writing fake root commit" msgstr "unechten Root-Commit schreiben" msgid "writing squash-onto" msgstr "squash-onto schreiben" -#, c-format -msgid "could not resolve '%s'" -msgstr "konnte '%s' nicht auflösen" - msgid "cannot merge without a current revision" msgstr "kann nicht ohne einen aktuellen Commit mergen" @@ -20936,6 +21087,17 @@ msgstr "ls-tree mit unerwartetem Rückgabewert %d beendet" msgid "failed to lstat '%s'" msgstr "'lstat' für '%s' fehlgeschlagen" +msgid "test-tool cache-tree <options> (control|prime|update)" +msgstr "test-tool cache-tree <Optionen> (control|prime|update)" + +msgid "clear the cache tree before each iteration" +msgstr "das Cache-Verzeichnis vor jeder Iteration löschen" + +msgid "number of entries in the cache tree to invalidate (default 0)" +msgstr "" +"Anzahl der Einträge im Cache-Verzeichnis, die ungültig gemacht werden sollen " +"(Standardwert 0)" + msgid "unhandled options" msgstr "unbehandelte Optionen" @@ -21970,8 +22132,8 @@ msgstr "Sie führen gerade \"cherry-pick\" von Commit %s aus." msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" -" (beheben Sie die Konflikte und führen Sie dann \"git cherry-pick --continue" -"\" aus)" +" (beheben Sie die Konflikte und führen Sie dann \"git cherry-pick --" +"continue\" aus)" msgid " (run \"git cherry-pick --continue\" to continue)" msgstr " (Führen Sie \"git cherry-pick --continue\" aus, um weiterzumachen)" @@ -48,7 +48,7 @@ # pack | paquet # patches | patchs # pattern | motif -# to prune | éliminer +# to prune | élaguer # to push | pousser # to rebase | rebaser # scheduler | planificateur @@ -78,8 +78,8 @@ msgid "" msgstr "" "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2022-09-28 21:43+0200\n" -"PO-Revision-Date: 2022-09-28 21:45+0200\n" +"POT-Creation-Date: 2022-11-30 19:40+0100\n" +"PO-Revision-Date: 2022-11-30 19:42+0100\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" @@ -841,6 +841,9 @@ msgstr "cmdline se termine par \\" msgid "unclosed quote" msgstr "citation non fermée" +msgid "too many arguments" +msgstr "trop d'arguments" + #, c-format msgid "unrecognized whitespace option '%s'" msgstr "option d'espace non reconnue '%s'" @@ -2633,42 +2636,6 @@ msgstr "" "la bissection a échoué : 'git bisect--helper --bisect-state %s' a retourné " "le code erreur %d" -msgid "reset the bisection state" -msgstr "réinitialiser l'état de la bissection" - -msgid "check whether bad or good terms exist" -msgstr "vérifier si les termes bons ou mauvais existent" - -msgid "print out the bisect terms" -msgstr "afficher les termes de bissection" - -msgid "start the bisect session" -msgstr "démarrer une session de bissection" - -msgid "find the next bisection commit" -msgstr "trouver le prochain commit de bissection" - -msgid "mark the state of ref (or refs)" -msgstr "marquer l'état d'une références (ou plusieurs)" - -msgid "list the bisection steps so far" -msgstr "lister les étapes de bissection jusqu'ici" - -msgid "replay the bisection process from the given file" -msgstr "rejouer le processus de bissection depuis le fichier fourni" - -msgid "skip some commits for checkout" -msgstr "sauter certains commits pour l'extraction" - -msgid "visualize the bisection" -msgstr "visualiser la bissection" - -msgid "use <cmd>... to automatically bisect" -msgstr "utiliser <cmd>... pour bissecter automatiquement" - -msgid "no log for BISECT_WRITE" -msgstr "pas de journal pour BISECT_WRITE" - msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-reset supporte soit aucun argument, soit un commit" @@ -2687,6 +2654,9 @@ msgstr "pas de fichier de log donné" msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<options>] [<rev-opts>] [<rev>] [--] <fichier>" +msgid "git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>" +msgstr "git annotate [<options>] [<options-de-rev>] [<rev>] [--] <fichier>" + msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<options-de-révision> sont documentés dans git-rev-list(1)" @@ -2887,9 +2857,6 @@ msgstr "Échec de la mise à jour du fichier de configuration" msgid "cannot use -a with -d" msgstr "impossible d'utiliser -a avec -d" -msgid "Couldn't look up commit object for HEAD" -msgstr "Impossible de rechercher l'objet commit pour HEAD" - #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "Impossible de supprimer la branche '%s' extraite dans '%s'" @@ -2928,16 +2895,18 @@ msgstr "La branche %s est en cours de rebasage sur %s" msgid "Branch %s is being bisected at %s" msgstr "La branche %s est en cours de bissection sur %s" -msgid "cannot copy the current branch while not on any." -msgstr "impossible de copier la branche actuelle, il n'y en a pas." - -msgid "cannot rename the current branch while not on any." -msgstr "impossible de renommer la branche actuelle, il n'y en a pas." - #, c-format msgid "Invalid branch name: '%s'" msgstr "Nom de branche invalide : '%s'" +#, c-format +msgid "No commit on branch '%s' yet." +msgstr "Aucun commit sur la branche '%s'." + +#, c-format +msgid "No branch named '%s'." +msgstr "Aucune branche nommée '%s'." + msgid "Branch rename failed" msgstr "Échec de renommage de la branche" @@ -3100,13 +3069,11 @@ msgstr "Impossible de décrire une HEAD détachée" msgid "cannot edit description of more than one branch" msgstr "impossible d'éditer la description de plus d'une branche" -#, c-format -msgid "No commit on branch '%s' yet." -msgstr "Aucun commit sur la branche '%s'." +msgid "cannot copy the current branch while not on any." +msgstr "impossible de copier la branche actuelle, il n'y en a pas." -#, c-format -msgid "No branch named '%s'." -msgstr "Aucune branche nommée '%s'." +msgid "cannot rename the current branch while not on any." +msgstr "impossible de renommer la branche actuelle, il n'y en a pas." msgid "too many branches for a copy operation" msgstr "trop de branches pour une opération de copie" @@ -3176,11 +3143,12 @@ msgid "not run from a git repository - no hooks to show\n" msgstr "lancé hors d'un dépôt git - aucun crochet à montrer\n" msgid "" -"git bugreport [-o|--output-directory <file>] [-s|--suffix <format>] [--" -"diagnose[=<mode>]" +"git bugreport [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n" +" [--diagnose[=<mode>]]" msgstr "" -"git bugreport [-o|--output-directory <fichier>] [-s|--suffix <format>] [--" -"diagnose[=<mode>]]" +"git bugreport [(-o | --output-directory) <chemin>] [(-s | --suffix) " +"<format>]\n" +" [--diagnose[=<mode>]]" msgid "" "Thank you for filling out a Git bug report!\n" @@ -3255,17 +3223,23 @@ msgstr "impossible d'écrire dans %s" msgid "Created new report at '%s'.\n" msgstr "Nouveau rapport créé à '%s'.\n" -msgid "git bundle create [<options>] <file> <git-rev-list args>" -msgstr "git bundle create [<options>] <fichier> <args git-rev-list>" +msgid "" +"git bundle create [-q | --quiet | --progress | --all-progress] [--all-" +"progress-implied]\n" +" [--version=<version>] <file> <git-rev-list-args>" +msgstr "" +"git bundle create [-q | --quiet | --progress | --all-progress] [--all-" +"progress-implied]\n" +" [--version=<version>] <file> <args-de-git-rev-list>" -msgid "git bundle verify [<options>] <file>" -msgstr "git bundle verify [<options>] <fichier>" +msgid "git bundle verify [-q | --quiet] <file>" +msgstr "git bundle verify [-q | --quiet] <fichier>" msgid "git bundle list-heads <file> [<refname>...]" msgstr "git bundle list-heads <fichier> [<nom-de-ref>...]" -msgid "git bundle unbundle <file> [<refname>...]" -msgstr "git bundle unbundle <fichier> [<nom-de-ref>...]" +msgid "git bundle unbundle [--progress] <file> [<refname>...]" +msgstr "git bundle unbundle [--progress] <fichier> [<nom-de-ref>...]" msgid "do not show progress meter" msgstr "ne pas afficher la barre de progression" @@ -3340,12 +3314,12 @@ msgid "" "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" "objects]\n" " [--buffer] [--follow-symlinks] [--unordered]\n" -" [--textconv | --filters]" +" [--textconv | --filters] [-z]" msgstr "" "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" "objects]\n" " [--buffer] [--follow-symlinks] [--unordered]\n" -" [--textconv | --filters]" +" [--textconv | --filters] [-z]" msgid "" "git cat-file (--textconv | --filters)\n" @@ -3456,9 +3430,6 @@ msgstr "<rev> nécessaire avec '%s'" msgid "<object> required with '-%c'" msgstr "<objet> nécessaire avec '-%c'" -msgid "too many arguments" -msgstr "trop d'arguments" - #, c-format msgid "only two arguments allowed in <type> <object> mode, not %d" msgstr "deux arguments seulement permis dans le mode <type> <objet>, pas %d" @@ -4001,9 +3972,11 @@ msgid "use overlay mode" msgstr "utiliser le mode de superposition" msgid "" -"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." +"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] " +"[<pathspec>...]" msgstr "" -"git clean [-d] [-f] [-i] [-n] [-q] [-e <motif>] [-x | -X] [--] <chemins>..." +"git clean [-d] [-f] [-i] [-n] [-q] [-e <motif>] [-x | -X] [--] [<spec-de-" +"chemins>...]" #, c-format msgid "Removing %s\n" @@ -4301,6 +4274,10 @@ msgid "failed to start iterator over '%s'" msgstr "échec du démarrage un itérateur sur '%s'" #, c-format +msgid "symlink '%s' exists, refusing to clone with --local" +msgstr "le lien symbolique '%s' existe, refus de cloner avec --local" + +#, c-format msgid "failed to unlink '%s'" msgstr "échec pour délier '%s'" @@ -4366,10 +4343,6 @@ msgstr "Trop d'arguments." msgid "You must specify a repository to clone." msgstr "Vous devez spécifier un dépôt à cloner." -#, c-format -msgid "options '%s' and '%s %s' cannot be used together" -msgstr "les options '%s' et '%s %s' ne peuvent pas être utilisées ensemble" - msgid "" "--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-" "exclude" @@ -4496,18 +4469,24 @@ msgid "--command must be the first argument" msgstr "--command doit être le premier argument" msgid "" -"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" +"git commit-graph verify [--object-dir <dir>] [--shallow] [--[no-]progress]" msgstr "" -"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" +"git commit-graph verify [--object-dir <rép>] [--shallow] [--[no-]progress]" msgid "" -"git commit-graph write [--object-dir <objdir>] [--append] [--" -"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" -"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>" +"git commit-graph write [--object-dir <dir>] [--append]\n" +" [--split[=<strategy>]] [--reachable | --stdin-packs | " +"--stdin-commits]\n" +" [--changed-paths] [--[no-]max-new-filters <n>] [--" +"[no-]progress]\n" +" <split options>" msgstr "" -"git commit-graph write [--object-dir <répertoire-d'objet>] [--append] [--" -"split[=<stratégie>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" -"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <options de division>" +"git commit-graph write [--object-dir <rép>] [--append]\n" +" [--split[=<stratégie>]] [--reachable | --stdin-packs " +"| --stdin-commits]\n" +" [--changed-paths] [--[no-]max-new-filters <n>] [--" +"[no-]progress]\n" +" <options de division>" msgid "dir" msgstr "répertoire" @@ -4577,12 +4556,15 @@ msgstr "utilisez un seul parmi --reachable, --stdin-commits ou --stdin-packs" msgid "Collecting commits from input" msgstr "Collecte des commits depuis l'entrée" +msgid "git commit-tree <tree> [(-p <parent>)...]" +msgstr "git commit-tree <arbre> [(-p <parent>)...]" + msgid "" -"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " -"<file>)...] <tree>" +"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...]\n" +" [(-F <file>)...] <tree>" msgstr "" -"git commit-tree [(-p <parent>)...] [-S[<idclé>]] [(-m <message>)...] [(-F " -"<fichier>)...] <arbre>" +"git commit-tree [(-p <parent>)...] [-S[<idclé>]] [(-m <message>)...]\n" +" [(-F <fichier>)...] <arbre>" #, c-format msgid "duplicate parent %s ignored" @@ -4624,11 +4606,29 @@ msgstr "exactement un arbre obligatoire" msgid "git commit-tree: failed to read" msgstr "git commit-tree : échec de la lecture" -msgid "git commit [<options>] [--] <pathspec>..." -msgstr "git commit [<options>] [--] <spécification-de-chemin>..." +msgid "" +"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" +" [--allow-empty-message] [--no-verify] [-e] [--author=<author>]\n" +" [--date=<date>] [--cleanup=<mode>] [--[no-]status]\n" +" [-i | -o] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" +" [(--trailer <token>[(=|:)<value>])...] [-S[<keyid>]]\n" +" [--] [<pathspec>...]" +msgstr "" +"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" +" [--allow-empty-message] [--no-verify] [-e] [--author=<auteur>]\n" +" [--date=<date>] [--cleanup=<mode>] [--[no-]status]\n" +" [-i | -o] [--pathspec-from-file=<fichier> [--pathspec-file-nul]]\n" +" [(--trailer <symbole>[(=|:)<valeur>])...] [-S[<id-clé>]]\n" +" [--] [<spéc-de-chemin>...]" -msgid "git status [<options>] [--] <pathspec>..." -msgstr "git status [<options>] [--] <spécification-de-chemin>..." +msgid "git status [<options>] [--] [<pathspec>...]" +msgstr "git status [<options>] [--] [<spécification-de-chemin>...]" msgid "" "You asked to amend the most recent commit, but doing so would make\n" @@ -5412,11 +5412,18 @@ msgstr "credential-cache non disponible ; pas de gestion des socket unix" msgid "unable to get credential storage lock in %d ms" msgstr "impossible d'accéder au verrou de stockage d'identification en %d ms" -msgid "git describe [<options>] [<commit-ish>...]" -msgstr "git describe [<options>] <commit ou apparenté>*" +msgid "" +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] [<commit-ish>...]" +msgstr "" +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] [<commit-esque>...]" -msgid "git describe [<options>] --dirty" -msgstr "git describe [<options>] --dirty" +msgid "" +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<mark>]" +msgstr "" +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<marque>]" + +msgid "git describe <blob>" +msgstr "git describe <blob>" msgid "head" msgstr "tête" @@ -5543,11 +5550,11 @@ msgstr "" "l'option '%s' et des commit-esques ne peuvent pas être utilisées ensemble" msgid "" -"git diagnose [-o|--output-directory <path>] [-s|--suffix <format>] [--" -"mode=<mode>]" +"git diagnose [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n" +" [--mode=<mode>]" msgstr "" -"git diagnose [-o|--output-directory <fichier>] [-s|--suffix <format>] [--" -"mode=<mode>]" +"git diagnose [-o | --output-directory <fichier>] [(-s | --suffix) <format>]\n" +" [--mode=<mode>]" msgid "specify a destination for the diagnostics archive" msgstr "spécifier la destination de l'archive de diagnostique" @@ -5565,6 +5572,9 @@ msgstr "--merge-base ne fonctionne qu'avec deux commits" msgid "'%s': not a regular file or symlink" msgstr "'%s' : n'est pas un fichier régulier ni un lien symbolique" +msgid "no merge given, only parents." +msgstr "pas de fusion fournie, seulement des parents." + #, c-format msgid "invalid option: %s" msgstr "option invalide : %s" @@ -5858,12 +5868,12 @@ msgstr "" msgid "prune remote-tracking branches no longer on remote" msgstr "" -"éliminer les branches de suivi distant si la branche n'existe plus dans le " +"élaguer les branches de suivi distant si la branche n'existe plus dans le " "dépôt distant" msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" -"éliminer les étiquettes locales qui ont disparu du dépôt distant et qui " +"élaguer les étiquettes locales qui ont disparu du dépôt distant et qui " "encombrent les étiquettes modifiées" msgid "on-demand" @@ -6214,8 +6224,8 @@ msgstr "afficher seulement les références qui contiennent le commit" msgid "print only refs which don't contain the commit" msgstr "afficher seulement les références qui ne contiennent pas le commit" -msgid "git for-each-repo --config=<config> <command-args>" -msgstr "git for-each-repo --config=<config> <arguments-de-commande>" +msgid "git for-each-repo --config=<config> [--] <arguments>" +msgstr "git for-each-repo --config=<config> [--] <arguments>" msgid "config" msgstr "config" @@ -6386,8 +6396,16 @@ msgstr "non-arbre dans l'arbre de cache" msgid "%s: invalid sha1 pointer in resolve-undo" msgstr "%s : pointeur sha1 invalide dans resolve-undo" -msgid "git fsck [<options>] [<object>...]" -msgstr "git fsck [<options>] [<objet>...]" +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>...]" +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] [<objec>...]" msgid "show unreachable objects" msgstr "afficher les objets inaccessibles" @@ -6443,12 +6461,6 @@ msgstr "git fsmonitor--daemon start [<options>]" msgid "git fsmonitor--daemon run [<options>]" msgstr "git fsmonitor--daemon run [<options>]" -msgid "git fsmonitor--daemon stop" -msgstr "git fsmonitor--daemon stop" - -msgid "git fsmonitor--daemon status" -msgstr "git fsmonitor--daemon status" - #, c-format msgid "value of '%s' out of range: %d" msgstr "valeur de '%s' hors de gamme : %d" @@ -6565,7 +6577,7 @@ msgstr "" "%s" msgid "prune unreferenced objects" -msgstr "éliminer les objets non référencés" +msgstr "élaguer les objets non référencés" msgid "pack unreferenced objects separately" msgstr "empaqueter les objets non référencés séparément" @@ -6694,8 +6706,20 @@ 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" -msgid "failed to run 'git config'" -msgstr "échec du lancement de 'git config'" +#, c-format +msgid "unable to add '%s' value of '%s'" +msgstr "impossible d'ajouter la valeur '%s' de '%s'" + +msgid "return success even if repository was not registered" +msgstr "renvoyer un succès même si le dépôt n'était pas enregistré" + +#, c-format +msgid "unable to unset '%s' value of '%s'" +msgstr "impossible de retirer la valeur '%s' de '%s'" + +#, c-format +msgid "repository '%s' is not registered" +msgstr "le dépôt '%s' n'est pas enregistré" #, c-format msgid "failed to expand path '%s'" @@ -6996,11 +7020,14 @@ msgid "both --cached and trees are given" msgstr "--cached et des arbres sont fournis en même temps" msgid "" -"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " -"[--] <file>..." +"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters]\n" +" [--stdin [--literally]] [--] <file>..." msgstr "" -"git hash-object [-t <type>] [-w] [--path=<fichier> | --no-filters] [--stdin] " -"[--] <fichier>..." +"git hash-object [-t <type>] [-w] [--path=<fichier> | --no-filters]\n" +" [--stdin [--literally]] [--] <fichier>..." + +msgid "git hash-object [-t <type>] [-w] --stdin-paths [--no-filters]" +msgstr "git hash-object [-t <type>] [-w] --stdin-paths [--no-filters]" msgid "object type" msgstr "type d'objet" @@ -7429,11 +7456,15 @@ msgid "Initialized empty Git repository in %s%s\n" msgstr "Dépôt Git vide initialisé dans %s%s\n" msgid "" -"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" -"shared[=<permissions>]] [<directory>]" +"git init [-q | --quiet] [--bare] [--template=<template-directory>]\n" +" [--separate-git-dir <git-dir>] [--object-format=<format>]\n" +" [-b <branch-name> | --initial-branch=<branch-name>]\n" +" [--shared[=<permissions>]] [<directory>]" msgstr "" -"git init [-q | --quiet] [--bare] [--template=<répertoire-modèle>] [--" -"shared[=<permissions>]] [<répertoire>]" +"git init [-q | --quiet] [--bare] [--template=<répertoire-modèle>]\n" +" [--separate-git-dir <rép-git>] [--object-format=<format>]\\n\"\n" +" [-b <nom-de-branche> | --initial-branch=<nom-de-branche>]\\n\"\n" +" [--shared[=<permissions>]] [<répertoire>]" msgid "permissions" msgstr "permissions" @@ -7474,11 +7505,13 @@ msgid "--separate-git-dir incompatible with bare repository" msgstr "--separate-git-dir est incompatible avec un dépôt nu" msgid "" -"git interpret-trailers [--in-place] [--trim-empty] [(--trailer " -"<token>[(=|:)<value>])...] [<file>...]" +"git interpret-trailers [--in-place] [--trim-empty]\n" +" [(--trailer <token>[(=|:)<value>])...]\n" +" [--parse] [<file>...]" msgstr "" -"git interpret-trailers [--in-place] [--trim-empty] [(--trailer " -"<symbole>[(=|:)<valeur>])...] [<fichier>...]" +"git interpret-trailers [--in-place] [--trim-empty]\n" +" [(--trailer <symbole>[(=|:)<valeur>])...]\n" +" [--parse] [<fichier>...]" msgid "edit files in place" msgstr "éditer les fichiers sur place" @@ -7977,11 +8010,11 @@ msgstr "" msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" -" [-q | --quiet] [--exit-code] [--get-url]\n" +" [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n" " [--symref] [<repository> [<refs>...]]" msgstr "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" -" [-q | --quiet] [--exit-code] [--get-url]\n" +" [-q | --quiet] [--exit-code] [--get-url] [--sort=<clé>]\n" " [--symref] [<dépôt> [<réf>...]]" msgid "do not print remote URL" @@ -8116,12 +8149,12 @@ msgstr "git merge-base [-a | --all] <commit> <commit>..." msgid "git merge-base [-a | --all] --octopus <commit>..." msgstr "git merge-base [-a | --all] --octopus <commit>..." -msgid "git merge-base --independent <commit>..." -msgstr "git merge-base --independent <validation>..." - msgid "git merge-base --is-ancestor <commit> <commit>" msgstr "git merge-base --is-ancestor <validation> <validation>" +msgid "git merge-base --independent <commit>..." +msgstr "git merge-base --independent <validation>..." + msgid "git merge-base --fork-point <ref> [<commit>]" msgstr "git merge-base --fork-point <référence> [<validation>]" @@ -8229,9 +8262,20 @@ msgstr "lister les noms de fichier sans modes/oids/indexation" msgid "allow merging unrelated histories" msgstr "permettre la fusion d'historiques sans rapport" +msgid "perform multiple merges, one per line of input" +msgstr "réaliser des fusions multiples, une par ligne d'entrée" + msgid "--trivial-merge is incompatible with all other options" msgstr "--trivial-merge est incompatible avec d'autres options" +#, c-format +msgid "malformed input line: '%s'." +msgstr "ligne en entrée malformée : '%s'." + +#, 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 "git merge [<options>] [<commit>...]" msgstr "git merge [<options>] [<commit>...]" @@ -8860,10 +8904,6 @@ msgid "cannot read note data from non-blob object '%s'." msgstr "impossible de lire les informations de note d'un objet non-blob '%s'." #, c-format -msgid "malformed input line: '%s'." -msgstr "ligne en entrée malformée : '%s'." - -#, c-format msgid "failed to copy notes from '%s' to '%s'" msgstr "impossible de copier les notes de '%s' vers '%s'" @@ -9055,16 +9095,15 @@ msgstr "utiliser les notes depuis <références-notes>" msgid "unknown subcommand: `%s'" msgstr "sous-commande inconnue : `%s'" -msgid "" -"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" +msgid "git pack-objects --stdout [<options>] [< <ref-list> | < <object-list>]" msgstr "" -"git pack-objects --stdout [options...] [< <liste-références> | < <liste-" +"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 [<options>] <base-name> [< <ref-list> | < <object-list>]" msgstr "" -"git pack-objects [options...] base-name [< <liste-références> | < <liste-" +"git pack-objects [<options>] <nom-de-base> [< <liste-références> | < <liste-" "objets>]" #, c-format @@ -9453,20 +9492,32 @@ msgstr "" "sur la ligne de commande pour nous avertir par\n" "un courriel à <git@vger.kernel.org>. Merci.\n" -msgid "git pack-refs [<options>]" -msgstr "git pack-refs [<options>]" +msgid "git pack-refs [--all] [--no-prune]" +msgstr "git pack-refs [--all] [--no-prune]" msgid "pack everything" msgstr "empaqueter tout" msgid "prune loose refs (default)" -msgstr "éliminer les références perdues (défaut)" +msgstr "élaguer les références perdues (défaut)" + +msgid "git patch-id [--stable | --unstable | --verbatim]" +msgstr "git patch-id [--stable | --unstable | --verbatim]" + +msgid "use the unstable patch-id algorithm" +msgstr "utiliser l'algorithme instable patch-id" + +msgid "use the stable patch-id algorithm" +msgstr "utiliser l'algorithme stable patch-id" + +msgid "don't strip whitespace from the patch" +msgstr "ne pas retirer les espaces blancs de la rustine" msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--progress] [--expire <heure>] [--] [<head>…]" msgid "report pruned objects" -msgstr "afficher les objets éliminés" +msgstr "afficher les objets élagués" msgid "expire objects older than <time>" msgstr "faire expirer les objets plus vieux que <heure>" @@ -9475,7 +9526,7 @@ msgid "limit traversal to objects outside promisor packfiles" msgstr "limiter la traversée aux objets hors des fichiers paquets prometteurs" msgid "cannot prune in a precious-objects repo" -msgstr "impossible de nettoyer dans un dépôt d'objets précieux" +msgstr "impossible d'élaguer dans un dépôt d'objets précieux" msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<options>] [<dépôt> [<spécification-de-référence>...]]" @@ -9682,9 +9733,8 @@ msgstr "" msgid "" "\n" -"To avoid automatically configuring upstream branches when their name\n" -"doesn't match the local branch, see option 'simple' of branch." -"autoSetupMerge\n" +"To avoid automatically configuring an upstream branch when its name\n" +"won't match the local branch, see option 'simple' of branch.autoSetupMerge\n" "in 'git help config'.\n" msgstr "" "\n" @@ -9856,6 +9906,13 @@ msgstr "Poussée vers %s\n" msgid "failed to push some refs to '%s'" msgstr "impossible de pousser des références vers '%s'" +msgid "" +"recursing into submodule with push.recurseSubmodules=only; using on-demand " +"instead" +msgstr "" +"la récursion dans le sous-module avec push.recurseSubmodules=only ; " +"utilisation de on-demande à la place" + #, c-format msgid "invalid value for '%s'" msgstr "valeur invalide pour '%s'" @@ -9901,7 +9958,7 @@ msgid "set upstream for git pull/status" msgstr "définir la branche amont pour git pull/status" msgid "prune locally removed refs" -msgstr "éliminer les références locales supprimées" +msgstr "élaguer les références locales supprimées" msgid "bypass pre-push hook" msgstr "éviter d'utiliser le crochet pre-push" @@ -9996,14 +10053,15 @@ msgid "need two commit ranges" msgstr "plage entre deux commits requise" msgid "" -"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " -"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-" -"ish1> [<tree-ish2> [<tree-ish3>]])" +"git read-tree [(-m [--trivial] [--aggressive] | --reset | --" +"prefix=<prefix>)\n" +" [-u | -i]] [--index-output=<file>] [--no-sparse-checkout]\n" +" (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" msgstr "" "git read-tree [(-m [--trivial] [--aggressive] | --reset | --" -"prefix=<préfixe>) [-u | -i]] [--no-sparse-checkout] [--index-" -"output=<fichier>] (--empty | <arbre-esque1> [<arbre-esque2> [<arbre-" -"esque3>]])" +"prefix=<préfixe>)\n" +" [-u | -i]] [--index-output=<fichier>] [--no-sparse-checkout]\n" +" (--empty | <arbre-esque1> [<arbre-esque2> [<arbre-esque3>]])" msgid "write resulting index to <file>" msgstr "écrire l'index résultant dans <fichier>" @@ -10094,8 +10152,8 @@ msgid "%s requires the merge backend" msgstr "%s requiert un moteur de fusion" #, c-format -msgid "could not get 'onto': '%s'" -msgstr "impossible d'accéder 'onto' : '%s'" +msgid "invalid onto: '%s'" +msgstr "destination invalide : '%s'" #, c-format msgid "invalid orig-head: '%s'" @@ -10405,8 +10463,8 @@ msgstr "pas de branche ou commit '%s'" msgid "No such ref: %s" msgstr "Référence inexistante : %s" -msgid "Could not resolve HEAD to a revision" -msgstr "Impossible de résoudre le commit HEAD vers un révision" +msgid "Could not resolve HEAD to a commit" +msgstr "impossible de résoudre HEAD en un commit" #, c-format msgid "'%s': need exactly one merge base with branch" @@ -10981,14 +11039,14 @@ msgstr "URL : %s" #, c-format msgid " * [would prune] %s" -msgstr " * [serait éliminé] %s" +msgstr " * [élaguerait] %s" #, c-format msgid " * [pruned] %s" -msgstr " * [éliminé] %s" +msgstr " * [élagué] %s" msgid "prune remotes after fetching" -msgstr "éliminer les distants après le rapatriement" +msgstr "élagué les distants après la récupération" #, c-format msgid "No such remote '%s'" @@ -11082,6 +11140,10 @@ msgstr "impossible d'ouvrir le fichier temporaire %s en écriture" msgid "could not close refs snapshot tempfile" msgstr "impossible de fermer le fichier temporaire d'instantané des réfs" +#, c-format +msgid "could not remove stale bitmap: %s" +msgstr "impossible de revenir la bitmap obsolète : %s" + msgid "pack everything in a single pack" msgstr "empaqueter tout dans un seul paquet" @@ -11156,6 +11218,9 @@ msgstr "trouver une progression géométrique avec un facteur <N>" msgid "write a multi-pack index of the resulting packs" msgstr "écrire un index de multi-paquet des paquets résultants" +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 "cannot delete packs in a precious-objects repo" msgstr "impossible de supprimer les paquets dans un dépôt d'objets précieux" @@ -11167,8 +11232,12 @@ msgid "pack prefix %s does not begin with objdir %s" msgstr "le préfixe %s ne commence pas avec objdir %s" #, c-format -msgid "missing required file: %s" -msgstr "fichier nécessaire manquant : %s" +msgid "renaming pack to '%s' failed" +msgstr "le renommage du paquet en '%s' a échoué" + +#, c-format +msgid "pack-objects did not write a '%s' file for pack %s-%s" +msgstr "pack-objects n'a pas écrit un fichier '%s' pour la paquet %s-%s" #, c-format msgid "could not unlink: %s" @@ -11362,9 +11431,10 @@ msgstr "--convert-graft-file ne supporte aucun argument" msgid "only one pattern can be given with -l" msgstr "-l n'accepte qu'un motifs" -msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" +msgid "" +"git rerere [clear | forget <pathspec>... | diff | status | remaining | gc]" msgstr "" -"git rerere [clear | forget <chemin>... | status | remaining | diff | gc]" +"git rerere [clear | forget <chemin>... | diff | status | remaining | gc]" msgid "register clean resolutions in index" msgstr "enregistrer des résolutions propres dans l'index" @@ -11572,6 +11642,15 @@ msgstr "--prefix exige un argument" msgid "unknown mode for --abbrev-ref: %s" msgstr "mode inconnu pour --abbrev-ref : %s" +msgid "--exclude-hidden cannot be used together with --branches" +msgstr "--exclude-hidden ne peut être utilisé avec --branches" + +msgid "--exclude-hidden cannot be used together with --tags" +msgstr "--exclude-hidden ne peut pas être utilisé avec --tags" + +msgid "--exclude-hidden cannot be used together with --remotes" +msgstr "--exclude-hidden ne peut pas être utilisé avec --remotes" + msgid "this operation must be run in a work tree" msgstr "cette opération doit être effectuée dans un arbre de travail" @@ -11579,17 +11658,25 @@ msgstr "cette opération doit être effectuée dans un arbre de travail" msgid "unknown mode for --show-object-format: %s" msgstr "mode inconnu pour --show-object-format : %s" -msgid "git revert [<options>] <commit-ish>..." -msgstr "git revert [<options>] <commit ou apparenté>..." +msgid "" +"git revert [--[no-]edit] [-n] [-m <parent-number>] [-s] [-S[<keyid>]] " +"<commit>..." +msgstr "" +"git revert [--[no-]edit] [-n] [-m <numéro-de-parent>] [-s] [-S[<id-clé>]] " +"<commit>..." -msgid "git revert <subcommand>" -msgstr "git revert <sous-commande>" +msgid "git revert (--continue | --skip | --abort | --quit)" +msgstr "git revert (--continue | --skip | --abort | --quit)" -msgid "git cherry-pick [<options>] <commit-ish>..." -msgstr "git cherry-pick [<options>] <commit ou apparenté>..." +msgid "" +"git cherry-pick [--edit] [-n] [-m <parent-number>] [-s] [-x] [--ff]\n" +" [-S[<keyid>]] <commit>..." +msgstr "" +"git cherry-pick [--edit] [-n] [-m <numéro-de-parent>] [-s] [-x] [--ff]\n" +" [-S[<clé-id>]] <commit>..." -msgid "git cherry-pick <subcommand>" -msgstr "git cherry-pick <sous-commande>" +msgid "git cherry-pick (--continue | --skip | --abort | --quit)" +msgstr "git cherry-pick (--continue | --skip | --abort | --quit)" #, c-format msgid "option `%s' expects a number greater than zero" @@ -11650,8 +11737,14 @@ msgstr "revert a échoué" msgid "cherry-pick failed" msgstr "le picorage a échoué" -msgid "git rm [<options>] [--] <file>..." -msgstr "git rm [<options>] [--] <fichier>..." +msgid "" +"git rm [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n" +" [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" +" [--] [<pathspec>...]" +msgstr "" +"git rm [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n" +" [--quiet] [--pathspec-from-file=<fichier> [--pathspec-file-nul]]\n" +" [--] [<spéc-de-chemin>...]" msgid "" "the following file has staged content different from both the\n" @@ -11726,11 +11819,13 @@ msgid "" "git send-pack [--mirror] [--dry-run] [--force]\n" " [--receive-pack=<git-receive-pack>]\n" " [--verbose] [--thin] [--atomic]\n" +" [--[no-]signed | --signed=(true|false|if-asked)]\n" " [<host>:]<directory> (--all | <ref>...)" msgstr "" "git send-pack [--mirror] [--dry-run] [--force]\n" " [--receive-pack=<git-receive-pack>]\n" " [--verbose] [--thin] [--atomic]\n" +" [--[no-]signed | --signed=(true | false | if-asked)]\n" " [<hôte>:]<répertoire> (--all | <réf>...)" msgid "remote name" @@ -11755,8 +11850,9 @@ msgid "using multiple --group options with stdin is not supported" msgstr "" "l'utilisation de plusieurs options --group avec stdin n'est pas supportée" -msgid "using --group=trailer with stdin is not supported" -msgstr "l'utilisation de --group=trailer avec stdin n'est pas supportée" +#, c-format +msgid "using %s with stdin is not supported" +msgstr "l'utilisation de %s avec stdin n'est pas supportée" #, c-format msgid "unknown group type: %s" @@ -11795,12 +11891,14 @@ msgid "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" " [--current] [--color[=<when>] | --no-color] [--sparse]\n" " [--more=<n> | --list | --independent | --merge-base]\n" -" [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" +" [--no-name | --sha1-name] [--topics]\n" +" [(<rev> | <glob>)...]" msgstr "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" " [--current] [--color[=<quand>] | --no-color] [--sparse]\n" " [--more=<n> | --list | --independent | --merge-base]\n" -" [--no-name | --sha1-name] [--topics] [(<rév> | <glob>)...]" +" [--no-name | --sha1-name] [--topics]\n" +" [(<rév> | <glob>)...]" msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<référence>]" @@ -11902,11 +12000,13 @@ msgid "Unknown hash algorithm" msgstr "Algorithme d'empreinte inconnu" msgid "" -"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference]\n" +" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n" +" [--heads] [--] [<pattern>...]" msgstr "" -"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<motif>...]" +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference]\n" +" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n" +" [--heads] [--] [<motif>...]" msgid "git show-ref --exclude-existing[=<pattern>]" msgstr "git show-ref --exclude-existing[=<motif>]" @@ -11940,8 +12040,10 @@ msgstr "" "afficher les références de l'entrée standard qui ne sont pas dans le dépôt " "local" -msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" -msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <options>" +msgid "" +"git sparse-checkout (init | list | set | add | reapply | disable) [<options>]" +msgstr "" +"git sparse-checkout (init | list | set | add | reapply | disable) [<options>]" msgid "this worktree is not sparse" msgstr "cet arbre de travail n'est pas clairsemé" @@ -12071,67 +12173,57 @@ msgstr "" msgid "error while refreshing working directory" msgstr "erreur lors du rafraîchissement du répertoire de travail" -msgid "git stash list [<options>]" -msgstr "git stash list [<options>]" +msgid "git stash list [<log-options>]" +msgstr "git stash list [<options-de-log>]" + +msgid "" +"git stash show [-u | --include-untracked | --only-untracked] [<diff-" +"options>] [<stash>]" +msgstr "" +"git stash show [-u | --include-untracked | --only-untracked] [<options-de-" +"diff>] [<stash>]" -msgid "git stash show [<options>] [<stash>]" -msgstr "git stash show [<options>] [<remise>]" +msgid "git stash drop [-q | --quiet] [<stash>]" +msgstr "git stash drop [-q | --quiet] [<remise>]" -msgid "git stash drop [-q|--quiet] [<stash>]" -msgstr "git stash drop [-q|--quiet] [<remise>]" +msgid "git stash pop [--index] [-q | --quiet] [<stash>]" +msgstr "git stash pop [--index] [-q | --quiet] [<remise>]" -msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" -msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<remise>]" +msgid "git stash apply [--index] [-q | --quiet] [<stash>]" +msgstr "git stash apply [--index] [-q | --quiet] [<remise>]" msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <nom-de-branche> [<remise>]" +msgid "git stash store [(-m | --message) <message>] [-q | --quiet] <commit>" +msgstr "git stash store [(-m | --message) <message>] [-q | --quiet] <remise>" + msgid "" -"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" -"quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" +"git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q " +"| --quiet]\n" +" [-u | --include-untracked] [-a | --all] [(-m | --message) " +"<message>]\n" " [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" " [--] [<pathspec>...]]" msgstr "" -"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" -"quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" +"git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q " +"| --quiet]\n" +" [-u | --include-untracked] [-a | --all] [(-m | --message) " +"<message>]\n" " [--pathspec-from-file=<fichier> [--pathspec-file-nul]]\n" " [--] [<spécificateur-de-chemin>...]]" msgid "" -"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" -"quiet]\n" -" [-u|--include-untracked] [-a|--all] [<message>]" -msgstr "" -"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" -"quiet]\n" -" [-u|--include-untracked] [-a|--all] [<message>]" - -msgid "git stash pop [--index] [-q|--quiet] [<stash>]" -msgstr "git stash pop [--index] [-q|--quiet] [<remise>]" - -msgid "git stash apply [--index] [-q|--quiet] [<stash>]" -msgstr "git stash apply [--index] [-q|--quiet] [<remise>]" - -msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" -msgstr "git stash store [-m|--message <message>] [-q|--quiet] <remise>" - -msgid "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" -" [--] [<pathspec>...]]" +"git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | " +"--quiet]\n" +" [-u | --include-untracked] [-a | --all] [<message>]" msgstr "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" -" [--] [<spécificateur-de-chemin>...]]" +"git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | " +"--quiet]\n" +" [-u | --include-untracked] [-a | --all] [<message>]" -msgid "" -"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [<message>]" -msgstr "" -"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [<message>]" +msgid "git stash create [<message>]" +msgstr "git stash create [<message>]" #, c-format msgid "'%s' is not a stash-like commit" @@ -12712,9 +12804,6 @@ msgstr "traverser les sous-modules récursivement" msgid "don't fetch new objects from the remote site" msgstr "ne pas récupérer les nouveaux objets depuis le site distant" -msgid "path into the working tree" -msgstr "chemin dans la copie de travail" - msgid "use the 'checkout' update strategy (default)" msgstr "utiliser la stratégie de mise à jour 'checkout' (valeur par défaut)" @@ -12750,28 +12839,9 @@ msgstr "" "[no-]recommend-shallow] [--reference <dépôt>] [--recursive] [--[no-]single-" "branch] [--] [<chemin>...]" -msgid "recurse into submodules" -msgstr "parcourir récursivement les sous-modules" - msgid "git submodule absorbgitdirs [<options>] [<path>...]" msgstr "git submodule absorbgitdirs [<options>] [<chemin>...]" -msgid "check if it is safe to write to the .gitmodules file" -msgstr "vérifier si écrire dans le fichier .gitmodules est sur" - -msgid "unset the config in the .gitmodules file" -msgstr "désactiver la configuration dans le fichier .gitmodules" - -msgid "git submodule--helper config <name> [<value>]" -msgstr "git submodule--helper config name [<valeur>]" - -msgid "git submodule--helper config --unset <name>" -msgstr "git submodule--helper config --unset <nom>" - -msgid "please make sure that the .gitmodules file is in the working tree" -msgstr "" -"veuillez vous assurer que le fichier .gitmodules est dans l'arbre de travail" - msgid "suppress output for setting url of a submodule" msgstr "supprimer la sortie lors du paramétrage de l'url d'un sous-module" @@ -12851,6 +12921,10 @@ msgstr "Réactivation du répertoire git local pour le sous-module '%s'\n" msgid "unable to checkout submodule '%s'" msgstr "Impossible d'extraire le sous-module '%s'" +msgid "please make sure that the .gitmodules file is in the working tree" +msgstr "" +"veuillez vous assurer que le fichier .gitmodules est dans l'arbre de travail" + #, c-format msgid "Failed to add submodule '%s'" msgstr "Échec d'ajout du sous-module '%s'" @@ -12903,19 +12977,21 @@ msgstr "l'URL de dépôt : '%s' doit être absolu ou commencer par ./|../" msgid "'%s' is not a valid submodule name" msgstr "'%s' n'est pas un nom valide de sous-module" +msgid "git submodule--helper <command>" +msgstr "git submodule--helper <commande>" + #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s ne gère pas --super-prefix" -#, c-format -msgid "'%s' is not a valid submodule--helper subcommand" -msgstr "'%s' n'est pas une sous-commande valide de submodule--helper" +msgid "git symbolic-ref [-m <reason>] <name> <ref>" +msgstr "git symbolic-ref [-m <raison>] <nom> <réf>" -msgid "git symbolic-ref [<options>] <name> [<ref>]" -msgstr "git symbolic-ref [<options>] <nom> [<référence>]" +msgid "git symbolic-ref [-q] [--short] [--no-recurse] <name>" +msgstr "git symbolic-ref [-q] [--short] [--no-recurse] <nom>" -msgid "git symbolic-ref -d [-q] <name>" -msgstr "git symbolic-ref -d [-q] <nom>" +msgid "git symbolic-ref --delete [-q] <name>" +msgstr "git symbolic-ref --delete [-q] <nom>" msgid "suppress error message for non-symbolic (detached) refs" msgstr "" @@ -12927,6 +13003,9 @@ msgstr "supprimer la référence symbolique" msgid "shorten ref output" msgstr "raccourcir l'affichage de la référence" +msgid "recursively dereference (default)" +msgstr "déréférencer récursivement (défaut)" + msgid "reason" msgstr "raison" @@ -12934,25 +13013,25 @@ msgid "reason of the update" msgstr "raison de la mise à jour" msgid "" -"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n" -" <tagname> [<head>]" +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n" +" <tagname> [<commit> | <object>]" msgstr "" -"git tag [-a | -s | -u <id-clé>] [-f] [-m <msg> | -F <fichier>]\n" -" <nom-d-étiquette> [<tête>]" +"git tag [-a | -s | -u <id-clé>] [-f] [-m <msg> | -F <fichier>] [-e]\n" +" <nom-d-étiquette> [<commit> | <objet>]" msgid "git tag -d <tagname>..." msgstr "git tag -d <nom-d-étiquette>..." msgid "" -"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" -"points-at <object>]\n" -" [--format=<format>] [--merged <commit>] [--no-merged <commit>] " -"[<pattern>...]" +"git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]\n" +" [--points-at <object>] [--column[=<options>] | --no-column]\n" +" [--create-reflog] [--sort=<key>] [--format=<format>]\n" +" [--merged <commit>] [--no-merged <commit>] [<pattern>...]" msgstr "" -"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" -"points-at <objet>]\n" -" [--format=<format>] [--merged <commit>] [--no-merged <commit>] " -"[<motif>...]" +"git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]\n" +" [--points-at <objet>] [--column[=<options>] | --no-column]\n" +" [--create-reflog] [--sort=<clé>] [--format=<format>]\n" +" [--merged <commit>] [--no-merged <commit>] [<motif>...]" msgid "git tag -v [--format=<format>] <tagname>..." msgstr "git tag -v [--format=<format>] <nom-d-étiquette>..." @@ -13345,8 +13424,12 @@ msgstr "lire les mises à jour depuis l'entrée standard" msgid "update the info files from scratch" msgstr "mettre à jour les fichiers d'information à partir de zéro" -msgid "git upload-pack [<options>] <dir>" -msgstr "git upload-pack [<options>] <répertoire>" +msgid "" +"git-upload-pack [--[no-]strict] [--timeout=<n>] [--stateless-rpc]\n" +" [--advertise-refs] <directory>" +msgstr "" +"git-upload-pack [--[no-]strict] [--timeout=<n>] [--stateless-rpc]\n" +" [--advertise-refs] <répertoire>" msgid "quit after a single request/response exchange" msgstr "quitter après un unique échange requête/réponse" @@ -13361,8 +13444,8 @@ msgstr "" msgid "interrupt transfer after <n> seconds of inactivity" msgstr "interrompre le transfert après <n> secondes d'inactivité" -msgid "git verify-commit [-v | --verbose] <commit>..." -msgstr "git verify-commit [-v | --verbose] <commit>..." +msgid "git verify-commit [-v | --verbose] [--raw] <commit>..." +msgstr "git verify-commit [-v | --verbose] [--raw] <commit>..." msgid "print commit contents" msgstr "afficher le contenu du commit" @@ -13370,8 +13453,9 @@ msgstr "afficher le contenu du commit" msgid "print raw gpg status output" msgstr "afficher les messages bruts de gpg" -msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." -msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." +msgid "git verify-pack [-v | --verbose] [-s | --stat-only] [--] <pack>.idx..." +msgstr "" +"git verify-pack [-v | --verbose] [-s | --stat-only] [--] <paquet>.idx..." msgid "verbose" msgstr "verbeux" @@ -13379,42 +13463,47 @@ msgstr "verbeux" msgid "show statistics only" msgstr "afficher seulement les statistiques" -msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." -msgstr "git verify-tag [-v | --verbose] [--format=<format>] <étiquette>..." +msgid "git verify-tag [-v | --verbose] [--format=<format>] [--raw] <tag>..." +msgstr "" +"git verify-tag [-v | --verbose] [--format=<format>] [--raw] <étiquette>..." msgid "print tag contents" msgstr "afficher le contenu de l'étiquette" -msgid "git worktree add [<options>] <path> [<commit-ish>]" -msgstr "git worktree add [<options>] <chemin> [<commit>]" +msgid "" +"git worktree add [-f] [--detach] [--checkout] [--lock [--reason <string>]]\n" +" [-b <new-branch>] <path> [<commit-ish>]" +msgstr "" +"git worktree add [-f] [--detach] [--checkout] [--lock [--reason <chaîne>]]\n" +" [-b <nouvelle-branche>] <chemin> [<commit-esque>]" -msgid "git worktree list [<options>]" -msgstr "git worktree list [<options>]" +msgid "git worktree list [-v | --porcelain [-z]]" +msgstr "git worktree list [-v | --porcelain [-z]]" -msgid "git worktree lock [<options>] <path>" -msgstr "git worktree lock [<options>] <chemin>" +msgid "git worktree lock [--reason <string>] <worktree>" +msgstr "git worktree lock [--reason <chaîne>] <arbre-de-travail>" msgid "git worktree move <worktree> <new-path>" msgstr "git worktree move <arbre-de-travail> <nouveau-chemin>" -msgid "git worktree prune [<options>]" -msgstr "git worktree prune [<options>]" +msgid "git worktree prune [-n] [-v] [--expire <expire>]" +msgstr "git worktree prune [-n] [-v] [--expire <date>]" -msgid "git worktree remove [<options>] <worktree>" -msgstr "git worktree remove [<options>] <arbre-de-travail>" +msgid "git worktree remove [-f] <worktree>" +msgstr "git worktree remove [-f] <arbre-de-travail>" msgid "git worktree repair [<path>...]" msgstr "git worktree repair [<chemin>...]" -msgid "git worktree unlock <path>" -msgstr "git worktree unlock <chemin>" +msgid "git worktree unlock <worktree>" +msgstr "git worktree unlock <arbre-de-travail>" #, c-format msgid "Removing %s/%s: %s" msgstr "Suppression de %s/%s : %s" msgid "report pruned working trees" -msgstr "afficher les arbres de travail éliminés" +msgstr "afficher les arbres de travail élagués" msgid "expire working trees older than <time>" msgstr "faire expirer les arbres de travail plus vieux que <temps>" @@ -13654,6 +13743,10 @@ msgstr "seulement utile pour le débogage" msgid "core.fsyncMethod = batch is unsupported on this platform" msgstr "core.fsyncMethod = batch non géré sur cette plateforme" +#, c-format +msgid "bundle list at '%s' has no mode" +msgstr "la liste de colis n'a pas de mode à '%s'" + msgid "failed to create temporary file" msgstr "impossible de créer un fichier temporaire" @@ -13661,16 +13754,29 @@ msgid "insufficient capabilities" msgstr "capacités insuffisantes" #, c-format +msgid "unrecognized bundle mode from URI '%s'" +msgstr "mode de colisage non reconnu depuis l'URI '%s'" + +#, c-format +msgid "exceeded bundle URI recursion limit (%d)" +msgstr "limite de récursion d'URI de colis dépassée (%d)" + +#, c-format msgid "failed to download bundle from URI '%s'" msgstr "impossible de télécharger le colis depuis l'URI '%s'" #, c-format -msgid "file at URI '%s' is not a bundle" -msgstr "le fichier à l'URI '%s' n'est pas un colis" +msgid "file at URI '%s' is not a bundle or bundle list" +msgstr "le fichier à l'URI '%s' n'est pas un colis ou une liste de colis" -#, c-format -msgid "failed to unbundle bundle from URI '%s'" -msgstr "échec pour ouvrir le colis de l'URI '%s'" +msgid "bundle-uri: got an empty line" +msgstr "bundle-uri : ligne vide rencontrée" + +msgid "bundle-uri: line is not of the form 'key=value'" +msgstr "bundle-uri : la ligne n'est pas de la forme 'clé=valeur'" + +msgid "bundle-uri: line has empty key or value" +msgstr "bundle-uri : la ligne a une clé ou une valeur vide" #, c-format msgid "unrecognized bundle hash algorithm: %s" @@ -14062,8 +14168,7 @@ msgid "Compute unique ID for a patch" msgstr "Calculer l'ID unique d'un patch" msgid "Prune all unreachable objects from the object database" -msgstr "" -"Éliminer les objets inatteignables depuis la base de données des objets" +msgstr "Élaguer les objets inatteignables depuis la base de données des objets" msgid "Remove extra objects that are already in pack files" msgstr "Éliminer les objets qui sont déjà présents dans les fichiers pack" @@ -14265,8 +14370,8 @@ msgstr "le format du fichier de colis" msgid "Chunk-based file formats" msgstr "format de fichier avec des sections" -msgid "Git commit graph format" -msgstr "format de graphe de commit de Gti" +msgid "Git commit-graph format" +msgstr "format de graphe de commit de Git" msgid "Git index format" msgstr "format d'index Git" @@ -14634,6 +14739,10 @@ msgstr "cas non géré dans 'has_worktree_moved': %d" msgid "health thread wait failed [GLE %ld]" msgstr "l'attente du fil de santé a échoué [GLE %ld]" +#, c-format +msgid "Invalid path: %s" +msgstr "chemin invalide : '%s'" + msgid "Unable to create FSEventStream." msgstr "impossible de créer FSEVEntStream." @@ -14665,6 +14774,22 @@ msgid "could not read directory changes [GLE %ld]" msgstr "impossible de lire les modifications du répertoire [GLE %ld]" #, c-format +msgid "opendir('%s') failed" +msgstr "échec de opendir(%s)" + +#, c-format +msgid "lstat('%s') failed" +msgstr "échec de lstat('%s')" + +#, c-format +msgid "strbuf_readlink('%s') failed" +msgstr "échec de strbuf_readlink('%s')" + +#, c-format +msgid "closedir('%s') failed" +msgstr "échec de closedir('%s')" + +#, c-format msgid "[GLE %ld] unable to open for read '%ls'" msgstr "[GLE %ld] impossible d'ouvrir pour lire '%ls'" @@ -16322,9 +16447,11 @@ msgstr "le dépôt virtuel '%s' est incompatible avec fsmonitor" #, c-format msgid "" -"repository '%s' is incompatible with fsmonitor due to lack of Unix sockets" +"socket directory '%s' is incompatible with fsmonitor due to lack of Unix " +"sockets support" msgstr "" -"le dépôt '%s' est incompatible avec fsmonitor par manque de sockets Unix" +"le répertoire de socket '%s' est incompatible avec fsmonitor par manque de " +"sockets Unix" msgid "" "git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]\n" @@ -16650,8 +16777,8 @@ msgstr[1] "" "\n" "Les commandes les plus ressemblantes sont" -msgid "git version [<options>]" -msgstr "git version [<options>]" +msgid "git version [--build-options]" +msgstr "git version [--build-options]" #, c-format msgid "%s: %s - %s" @@ -17584,10 +17711,6 @@ msgstr "impossible de normaliser le chemin d'objet alternatif : %s" msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s : magasins d'objets alternatifs ignorés, récursion trop profonde" -#, c-format -msgid "unable to normalize object directory: %s" -msgstr "impossible de normaliser le répertoire d'objet : %s" - msgid "unable to fdopen alternates lockfile" msgstr "impossible d'ouvrir (fdopen) le fichier verrou des alternatives" @@ -18433,6 +18556,10 @@ msgstr "" msgid "promisor remote name cannot begin with '/': %s" msgstr "un nom de prometteur distant ne peut pas commencer par '/' : %s" +#, c-format +msgid "could not fetch %s from promisor remote" +msgstr "impossible de récupérer %s depuis le distant de prometteur" + msgid "object-info: expected flush after arguments" msgstr "object-info : vidage attendu après les arguments" @@ -19519,6 +19646,13 @@ msgid "failed to find tree of %s" msgstr "impossible de trouver l'arbre de %s" #, c-format +msgid "unsupported section for hidden refs: %s" +msgstr "section non géree pour les réfs cachées : %s" + +msgid "--exclude-hidden= passed more than once" +msgstr "--exclude-hidden= présent plus d'une fois" + +#, c-format msgid "resolve-undo records `%s` which is missing" msgstr "resolve-undo enregistre `%s` qui manque" @@ -19664,6 +19798,14 @@ msgid "--all or <enlistment>, but not both" msgstr "--all ou <enrôlement>, mais pas les deux" #, c-format +msgid "could not remove stale scalar.repo '%s'" +msgstr "impossible de supprimé le scalar.repo obsolète '%s'" + +#, c-format +msgid "removing stale scalar.repo '%s'" +msgstr "suppression du scalar.repo obsolète '%s'" + +#, c-format msgid "git repository gone in '%s'" msgstr "dépôt git parti dans '%s'" @@ -20291,16 +20433,16 @@ msgstr "" msgid "illegal label name: '%.*s'" msgstr "nom de label illégal '%.*s'" +#, c-format +msgid "could not resolve '%s'" +msgstr "impossible de résoudre '%s'" + msgid "writing fake root commit" msgstr "écriture d'un commit racine bidon" msgid "writing squash-onto" msgstr "écriture de 'écraser-sur'" -#, c-format -msgid "could not resolve '%s'" -msgstr "impossible de résoudre '%s'" - msgid "cannot merge without a current revision" msgstr "impossible de fusionner avec une révision courante" @@ -20911,6 +21053,15 @@ msgstr "ls-tree a renvoyé un code de retour inattendu %d" msgid "failed to lstat '%s'" msgstr "échec du lstat de '%s'" +msgid "test-tool cache-tree <options> (control|prime|update)" +msgstr "test-tool cache-tree <options> (control|prime|update)" + +msgid "clear the cache tree before each iteration" +msgstr "effacer l'arbre de cache avant chaque itération" + +msgid "number of entries in the cache tree to invalidate (default 0)" +msgstr "nombre d'entrées dans l'arbre de cache à invalider (par défaut, 0)" + msgid "unhandled options" msgstr "options non gérées" @@ -22768,6 +22919,153 @@ msgstr "%s sauté avec un suffix de sauvegarde '%s'.\n" msgid "Do you really want to send %s? [y|N]: " msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : " +#, c-format +#~ msgid "unable to normalize object directory: %s" +#~ msgstr "impossible de normaliser le répertoire d'objet : %s" + +#~ msgid "reset the bisection state" +#~ msgstr "réinitialiser l'état de la bissection" + +#~ msgid "check whether bad or good terms exist" +#~ msgstr "vérifier si les termes bons ou mauvais existent" + +#~ msgid "print out the bisect terms" +#~ msgstr "afficher les termes de bissection" + +#~ msgid "start the bisect session" +#~ msgstr "démarrer une session de bissection" + +#~ msgid "find the next bisection commit" +#~ msgstr "trouver le prochain commit de bissection" + +#~ msgid "mark the state of ref (or refs)" +#~ msgstr "marquer l'état d'une références (ou plusieurs)" + +#~ msgid "list the bisection steps so far" +#~ msgstr "lister les étapes de bissection jusqu'ici" + +#~ msgid "replay the bisection process from the given file" +#~ msgstr "rejouer le processus de bissection depuis le fichier fourni" + +#~ msgid "skip some commits for checkout" +#~ msgstr "sauter certains commits pour l'extraction" + +#~ msgid "visualize the bisection" +#~ msgstr "visualiser la bissection" + +#~ msgid "use <cmd>... to automatically bisect" +#~ msgstr "utiliser <cmd>... pour bissecter automatiquement" + +#~ msgid "no log for BISECT_WRITE" +#~ msgstr "pas de journal pour BISECT_WRITE" + +#~ msgid "Couldn't look up commit object for HEAD" +#~ msgstr "Impossible de rechercher l'objet commit pour HEAD" + +#~ msgid "git bundle create [<options>] <file> <git-rev-list args>" +#~ msgstr "git bundle create [<options>] <fichier> <args git-rev-list>" + +#, c-format +#~ msgid "options '%s' and '%s %s' cannot be used together" +#~ msgstr "les options '%s' et '%s %s' ne peuvent pas être utilisées ensemble" + +#~ msgid "git commit [<options>] [--] <pathspec>..." +#~ msgstr "git commit [<options>] [--] <spécification-de-chemin>..." + +#~ msgid "git fsck [<options>] [<object>...]" +#~ msgstr "git fsck [<options>] [<objet>...]" + +#~ msgid "git fsmonitor--daemon stop" +#~ msgstr "git fsmonitor--daemon stop" + +#~ msgid "git fsmonitor--daemon status" +#~ msgstr "git fsmonitor--daemon status" + +#~ msgid "failed to run 'git config'" +#~ msgstr "échec du lancement de 'git config'" + +#, c-format +#~ msgid "could not get 'onto': '%s'" +#~ msgstr "impossible d'accéder 'onto' : '%s'" + +#~ msgid "Could not resolve HEAD to a revision" +#~ msgstr "Impossible de résoudre le commit HEAD vers un révision" + +#, c-format +#~ msgid "missing required file: %s" +#~ msgstr "fichier nécessaire manquant : %s" + +#~ msgid "git revert [<options>] <commit-ish>..." +#~ msgstr "git revert [<options>] <commit ou apparenté>..." + +#~ msgid "git revert <subcommand>" +#~ msgstr "git revert <sous-commande>" + +#~ msgid "git cherry-pick [<options>] <commit-ish>..." +#~ msgstr "git cherry-pick [<options>] <commit ou apparenté>..." + +#~ msgid "git cherry-pick <subcommand>" +#~ msgstr "git cherry-pick <sous-commande>" + +#~ msgid "git rm [<options>] [--] <file>..." +#~ msgstr "git rm [<options>] [--] <fichier>..." + +#~ msgid "using --group=trailer with stdin is not supported" +#~ msgstr "l'utilisation de --group=trailer avec stdin n'est pas supportée" + +#~ msgid "git stash show [<options>] [<stash>]" +#~ msgstr "git stash show [<options>] [<remise>]" + +#~ msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" +#~ msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<remise>]" + +#~ msgid "" +#~ "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +#~ " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" +#~ " [--] [<pathspec>...]]" +#~ msgstr "" +#~ "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +#~ " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" +#~ " [--] [<spécificateur-de-chemin>...]]" + +#~ msgid "" +#~ "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +#~ " [-u|--include-untracked] [-a|--all] [<message>]" +#~ msgstr "" +#~ "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +#~ " [-u|--include-untracked] [-a|--all] [<message>]" + +#~ msgid "path into the working tree" +#~ msgstr "chemin dans la copie de travail" + +#~ msgid "recurse into submodules" +#~ msgstr "parcourir récursivement les sous-modules" + +#~ msgid "check if it is safe to write to the .gitmodules file" +#~ msgstr "vérifier si écrire dans le fichier .gitmodules est sur" + +#~ msgid "unset the config in the .gitmodules file" +#~ msgstr "désactiver la configuration dans le fichier .gitmodules" + +#~ msgid "git submodule--helper config <name> [<value>]" +#~ msgstr "git submodule--helper config name [<valeur>]" + +#~ msgid "git submodule--helper config --unset <name>" +#~ msgstr "git submodule--helper config --unset <nom>" + +#, c-format +#~ msgid "'%s' is not a valid submodule--helper subcommand" +#~ msgstr "'%s' n'est pas une sous-commande valide de submodule--helper" + +#~ msgid "git upload-pack [<options>] <dir>" +#~ msgstr "git upload-pack [<options>] <répertoire>" + +#~ msgid "git worktree add [<options>] <path> [<commit-ish>]" +#~ msgstr "git worktree add [<options>] <chemin> [<commit>]" + +#~ msgid "git worktree lock [<options>] <path>" +#~ msgstr "git worktree lock [<options>] <chemin>" + #~ msgid "(stats|all)" #~ msgstr "(stats|all)" @@ -22804,9 +23102,6 @@ msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : " #~ msgid "git submodule--helper list [--prefix=<path>] [<path>...]" #~ msgstr "git submodule--helper list [--prefix=<chemin>] [<chemin>...]" -#~ msgid "git submodule--helper name <path>" -#~ msgstr "git submodule--helper <nom> <chemin>" - #, c-format #~ msgid "failed to get the default remote for submodule '%s'" #~ msgstr "" @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2022-09-28 14:31+0700\n" -"PO-Revision-Date: 2022-09-28 14:50+0700\n" +"POT-Creation-Date: 2022-11-30 11:05+0700\n" +"PO-Revision-Date: 2022-11-30 20:45+0700\n" "Last-Translator: Bagas Sanjaya <bagasdotme@gmail.com>\n" "Language-Team: Indonesian\n" "Language: id\n" @@ -900,6 +900,11 @@ msgstr "baris perintah diakhiri dengan \\" msgid "unclosed quote" msgstr "tanda kutip tak ditutup" +#: alias.c builtin/cat-file.c builtin/notes.c builtin/prune-packed.c +#: builtin/receive-pack.c builtin/tag.c +msgid "too many arguments" +msgstr "terlalu banyak argumen" + #: apply.c #, c-format msgid "unrecognized whitespace option '%s'" @@ -1364,7 +1369,7 @@ msgid "No valid patches in input (allow with \"--allow-empty\")" msgstr "" "Tidak ada tambalan valid dalam masukan (perbolehkan dengan \"--allow-empty\")" -#: apply.c +#: apply.c t/helper/test-cache-tree.c msgid "unable to read index file" msgstr "tidak dapa membaca berkas indeks" @@ -1599,7 +1604,7 @@ msgstr "tidak ada referensi seperti: %.*s" msgid "not a valid object name: %s" msgstr "bukan nama objek valid: %s" -#: archive.c +#: archive.c t/helper/test-cache-tree.c #, c-format msgid "not a tree object: %s" msgstr "bukan objek pohon: %s" @@ -1650,7 +1655,7 @@ msgid "prepend prefix to each pathname in the archive" msgstr "tambahkan prefiks di depan setiap nama jalur dalam arsip" #: archive.c builtin/blame.c builtin/commit-tree.c builtin/config.c -#: builtin/fast-export.c builtin/grep.c builtin/hash-object.c +#: builtin/fast-export.c builtin/gc.c builtin/grep.c builtin/hash-object.c #: builtin/ls-files.c builtin/notes.c builtin/read-tree.c parse-options.h msgid "file" msgstr "berkas" @@ -3116,54 +3121,6 @@ msgstr "" "keluar %d" #: builtin/bisect--helper.c -msgid "reset the bisection state" -msgstr "setel ulang keadaan pembagian dua" - -#: builtin/bisect--helper.c -msgid "check whether bad or good terms exist" -msgstr "periksa apakah ada istilah jelek atau bagus" - -#: builtin/bisect--helper.c -msgid "print out the bisect terms" -msgstr "cetak istilah pembagian dua" - -#: builtin/bisect--helper.c -msgid "start the bisect session" -msgstr "mulai sesi pembagian dua" - -#: builtin/bisect--helper.c -msgid "find the next bisection commit" -msgstr "temukan komit pembagian dua berikutnya" - -#: builtin/bisect--helper.c -msgid "mark the state of ref (or refs)" -msgstr "tandai keadaan referensi" - -#: builtin/bisect--helper.c -msgid "list the bisection steps so far" -msgstr "daftar langkah pembagian dua sejauh ini" - -#: builtin/bisect--helper.c -msgid "replay the bisection process from the given file" -msgstr "mainkan ulang proses pembagian dua dari berkas yang diberikan" - -#: builtin/bisect--helper.c -msgid "skip some commits for checkout" -msgstr "lewati beberapa komit untuk checkout" - -#: builtin/bisect--helper.c -msgid "visualize the bisection" -msgstr "visualisasikan pembagian dua" - -#: builtin/bisect--helper.c -msgid "use <cmd>... to automatically bisect" -msgstr "gunakan <cmd>... untuk bagi dua otomatis." - -#: builtin/bisect--helper.c -msgid "no log for BISECT_WRITE" -msgstr "tidak ada log untuk BISECT_WRITE" - -#: builtin/bisect--helper.c msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-reset butuh baik tanpa argumen atau sebuah komit" @@ -3188,6 +3145,10 @@ msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<opsi>] [<opsi revisi>] [<revisi>] [--] <berkas>" #: builtin/blame.c +msgid "git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>" +msgstr "git annotate [<opsi>] [<opsi revisi>] [<revisi>] [--] <berkas>" + +#: builtin/blame.c msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<opsi revisi> didokumentasikan dalam git-rev-list(1)" @@ -3427,10 +3388,6 @@ msgid "cannot use -a with -d" msgstr "tidak dapat gunakan -a dengan -d" #: builtin/branch.c -msgid "Couldn't look up commit object for HEAD" -msgstr "Tidak dapat mencari objek komit untuk HEAD" - -#: builtin/branch.c #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "Tidak dapat menghapus cabang '%s' yang ter-checkout pada '%s'" @@ -3479,17 +3436,19 @@ msgid "Branch %s is being bisected at %s" msgstr "Cabang %s sedang dibagi dua pada %s" #: builtin/branch.c -msgid "cannot copy the current branch while not on any." -msgstr "tidak dapat menyalin cabang saat ini ketika tidak ada." +#, c-format +msgid "Invalid branch name: '%s'" +msgstr "Nama cabang tidak valid: '%s'" #: builtin/branch.c -msgid "cannot rename the current branch while not on any." -msgstr "tidak dapat mengganti nama cabang saat ini ketika tidak ada." +#, c-format +msgid "No commit on branch '%s' yet." +msgstr "Belum ada komit pada cabang '%s'." #: builtin/branch.c #, c-format -msgid "Invalid branch name: '%s'" -msgstr "Nama cabang tidak valid: '%s'" +msgid "No branch named '%s'." +msgstr "Tidak ada cabang bernama '%s'." #: builtin/branch.c msgid "Branch rename failed" @@ -3699,14 +3658,12 @@ msgid "cannot edit description of more than one branch" msgstr "tidak dapat menyunting deskripsi lebih dari satu cabang" #: builtin/branch.c -#, c-format -msgid "No commit on branch '%s' yet." -msgstr "Belum ada komit pada cabang '%s'." +msgid "cannot copy the current branch while not on any." +msgstr "tidak dapat menyalin cabang saat ini ketika tidak ada." #: builtin/branch.c -#, c-format -msgid "No branch named '%s'." -msgstr "Tidak ada cabang bernama '%s'." +msgid "cannot rename the current branch while not on any." +msgstr "tidak dapat mengganti nama cabang saat ini ketika tidak ada." #: builtin/branch.c msgid "too many branches for a copy operation" @@ -3794,11 +3751,12 @@ msgstr "" #: builtin/bugreport.c msgid "" -"git bugreport [-o|--output-directory <file>] [-s|--suffix <format>] [--" -"diagnose[=<mode>]" +"git bugreport [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n" +" [--diagnose[=<mode>]]" msgstr "" -"git bugreport [-o|--output-directory <berkas>] [-s|--suffix <format>] [--" -"diagnose[=<mode>]]" +"git bugreport [(-o | --output-directory) <berkas>] [(-s |-- suffix) " +"<format>]\n" +" [--diagnose[=<mode>]]" #: builtin/bugreport.c msgid "" @@ -3881,20 +3839,26 @@ msgid "Created new report at '%s'.\n" msgstr "Laporan baru dibuat pada '%s'.\n" #: builtin/bundle.c -msgid "git bundle create [<options>] <file> <git-rev-list args>" -msgstr "git bundle create [<opsi>] <berkas> <argumen git-rev-list>" +msgid "" +"git bundle create [-q | --quiet | --progress | --all-progress] [--all-" +"progress-implied]\n" +" [--version=<version>] <file> <git-rev-list-args>" +msgstr "" +"git bundle create [-q | --quiet | --progress | --all-progress] [-all-" +"progress-implied]\n" +" [--version=<versi>] <berkas> <argumen git-rev-list>" #: builtin/bundle.c -msgid "git bundle verify [<options>] <file>" -msgstr "git bundle verify [<opsi>] <berkas>" +msgid "git bundle verify [-q | --quiet] <file>" +msgstr "git bundle verify [-q | --quiet] <berkas>" #: builtin/bundle.c msgid "git bundle list-heads <file> [<refname>...]" msgstr "git bundle list-heads <berkas> [<nama referensi>...]" #: builtin/bundle.c -msgid "git bundle unbundle <file> [<refname>...]" -msgstr "git bundle unbundle <berkas> [<nama referensi>...]" +msgid "git bundle unbundle [--progress] <file> [<refname>...]" +msgstr "git bundle unbundle [--progress] <berkas> [<nama referensi>...]" #: builtin/bundle.c builtin/pack-objects.c msgid "do not show progress meter" @@ -3991,12 +3955,12 @@ msgid "" "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" "objects]\n" " [--buffer] [--follow-symlinks] [--unordered]\n" -" [--textconv | --filters]" +" [--textconv | --filters] [-z]" msgstr "" "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" "objects]\n" " [--buffer] [--follow-symlinks] [--unordered]\n" -" [--textconv | --filters]" +" [--textconv | --filters] [-z]" #: builtin/cat-file.c msgid "" @@ -4138,11 +4102,6 @@ msgstr "<revisi> diperlukan dengan '%s'" msgid "<object> required with '-%c'" msgstr "<objek> diperlukan dengan '-%c'" -#: builtin/cat-file.c builtin/notes.c builtin/prune-packed.c -#: builtin/receive-pack.c builtin/tag.c -msgid "too many arguments" -msgstr "terlalu banyak argumen" - #: builtin/cat-file.c #, c-format msgid "only two arguments allowed in <type> <object> mode, not %d" @@ -4810,9 +4769,11 @@ msgstr "gunakan mode hamparan" #: builtin/clean.c msgid "" -"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." +"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] " +"[<pathspec>...]" msgstr "" -"git clean [-d] [-f] [-i] [-n] [-q] [-e <pola>] [-x | -X] [--] <jalur>..." +"git clean [-d] [-f] [-i] [-n] [-q] [-e <pola>] [-x | -X] [--] [<spek " +"jalur>...]" #: builtin/clean.c #, c-format @@ -5181,6 +5142,11 @@ msgstr "%s ada dan bukan direktori" msgid "failed to start iterator over '%s'" msgstr "gagal memulai iterator pada '%s'" +#: builtin/clone.c +#, c-format +msgid "symlink '%s' exists, refusing to clone with --local" +msgstr "tautan simbolik '%s' ada, menolak mengkloning dengan --local" + #: builtin/clone.c compat/precompose_utf8.c #, c-format msgid "failed to unlink '%s'" @@ -5263,11 +5229,6 @@ msgid "You must specify a repository to clone." msgstr "Anda harus sebutkan repositori untuk diklon." #: builtin/clone.c -#, c-format -msgid "options '%s' and '%s %s' cannot be used together" -msgstr "opsi '%s' dan '%s %s' tidak dapat digunakan bersamaan" - -#: builtin/clone.c msgid "" "--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-" "exclude" @@ -5423,22 +5384,28 @@ msgstr "--command harus menjadi argumen pertama" #: builtin/commit-graph.c msgid "" -"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" +"git commit-graph verify [--object-dir <dir>] [--shallow] [--[no-]progress]" msgstr "" -"git commit-graph verify [--object-dir <direktori objek>] [--shallow] [--" +"git commit-graph verify [--object-dir <direktori>] [--shallow] [--" "[no-]progress]" #: builtin/commit-graph.c msgid "" -"git commit-graph write [--object-dir <objdir>] [--append] [--" -"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" -"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>" -msgstr "" -"git commit-graph write [--object-dir <direktori objek>] [--append] [--" -"split[=<strategi>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" -"paths] [--[no-]max-new-filters <n>] [--[-no-]progrss] <opsi pemisah>" - -#: builtin/commit-graph.c builtin/fetch.c builtin/log.c +"git commit-graph write [--object-dir <dir>] [--append]\n" +" [--split[=<strategy>]] [--reachable | --stdin-packs | " +"--stdin-commits]\n" +" [--changed-paths] [--[no-]max-new-filters <n>] [--" +"[no-]progress]\n" +" <split options>" +msgstr "" +"git commit-graph write [--object-dir <direktori>] [--append]\n" +" [--split[=<strategi>]] [--reachable | --stdin-packs | " +"--stdin-commits]\n" +" [--changed-paths] [--[no-]max-new-filters <n>] [--[-" +"no-]progress]\n" +" <opsi pemisahan>" + +#: builtin/commit-graph.c builtin/fetch.c builtin/log.c builtin/repack.c msgid "dir" msgstr "direktori" @@ -5526,12 +5493,16 @@ msgid "Collecting commits from input" msgstr "Mengumpulkan komit dari masukan" #: builtin/commit-tree.c +msgid "git commit-tree <tree> [(-p <parent>)...]" +msgstr "git commit-tree <pohon> [(-p <induk>)...]" + +#: builtin/commit-tree.c msgid "" -"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " -"<file>)...] <tree>" +"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...]\n" +" [(-F <file>)...] <tree>" msgstr "" -"git commit-tree [(-p <induk>)...] [-S[<id kunci>]] [(-m <pesan>)...] [(-F " -"<berkas>)...] <pohon>" +"git commit-tree [(-p <induk>)...] [-S[<id kunci>]] [(-m <pesan>)...]\n" +" [(-F <berkas>)...] <pohon>" #: builtin/commit-tree.c #, c-format @@ -5588,12 +5559,31 @@ msgid "git commit-tree: failed to read" msgstr "git commit-tree: gagal membaca" #: builtin/commit.c -msgid "git commit [<options>] [--] <pathspec>..." -msgstr "git commit [<opsi>] [--] <spek jalur>..." +msgid "" +"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" +" [--allow-empty-message] [--no-verify] [-e] [--author=<author>]\n" +" [--date=<date>] [--cleanup=<mode>] [--[no-]status]\n" +" [-i | -o] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" +" [(--trailer <token>[(=|:)<value>])...] [-S[<keyid>]]\n" +" [--] [<pathspec>...]" +msgstr "" +"git commit [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]\n" +" [--dry-run] [(-c | -C | --squash) <komit> | --fixup [(amend|" +"reword):]<komit>)]\n" +" [-F <berkas> | -m <pesan>] [--reset-author] [--allow-empty]\n" +" [--allow-empty-message] [--no-verify] [-e] [--" +"author=<pengarang>]\n" +" [--date=<tanggal>] [--cleanup=<mode>] [--[no-]status]\n" +" [-i | -o] [--pathspec-from-file=<berkas> [--pathspec-file-nul]]\n" +" [(--trailer <token>[(=|:)<nilai>])...] [-S[<id kunci>]]\n" +" [--] [<spek jalur>...]" #: builtin/commit.c -msgid "git status [<options>] [--] <pathspec>..." -msgstr "git status [<opsi>] [--] <spek jalur>..." +msgid "git status [<options>] [--] [<pathspec>...]" +msgstr "git status [<opsi>] [--] [<spek jalur>...]" #: builtin/commit.c msgid "" @@ -6215,7 +6205,7 @@ msgstr "gunakan berkas konfigurasi repositori" msgid "use per-worktree config file" msgstr "gunakan berkas konfigurasi per pohon kerja" -#: builtin/config.c +#: builtin/config.c builtin/gc.c msgid "use given config file" msgstr "gunakan berkas konfigurasi yang diberikan" @@ -6439,7 +6429,7 @@ msgstr "--blob hanya dapat digunakan di dalam repositori git" msgid "--worktree can only be used inside a git repository" msgstr "--worktree hanya dapat digunakan di dalam repositori git" -#: builtin/config.c +#: builtin/config.c builtin/gc.c msgid "$HOME not set" msgstr "$HOME tak disetel" @@ -6553,12 +6543,20 @@ msgstr "" "tidak dapat mendapatkan kunci penyimpanan kredensial dalam %d milidetik" #: builtin/describe.c -msgid "git describe [<options>] [<commit-ish>...]" -msgstr "git describe [<opsi>] [<mirip-komit>...]" +msgid "" +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] [<commit-ish>...]" +msgstr "" +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] [<mirip-komit>...]" + +#: builtin/describe.c +msgid "" +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<mark>]" +msgstr "" +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<penanda>]" #: builtin/describe.c -msgid "git describe [<options>] --dirty" -msgstr "git describe [<opsi>] --dirty" +msgid "git describe <blob>" +msgstr "git describe <blob>" #: builtin/describe.c msgid "head" @@ -6713,11 +6711,11 @@ msgstr "opsi '%s' dan mirip-komit tidak dapat digunakan bersamaan" #: builtin/diagnose.c msgid "" -"git diagnose [-o|--output-directory <path>] [-s|--suffix <format>] [--" -"mode=<mode>]" +"git diagnose [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n" +" [--mode=<mode>]" msgstr "" -"git diagnose [-o|--output-directory <jalur>] [-s|--suffix <format>] [--" -"mode=<mode>]" +"git diagnose [(-o | --output-directory) <jalur>] [(-s | --suffix) <format>]\n" +" [--mode=<mode>]" #: builtin/diagnose.c msgid "specify a destination for the diagnostics archive" @@ -6741,6 +6739,10 @@ msgid "'%s': not a regular file or symlink" msgstr "'%s': bukan berkas reguler atau tautan simbolik" #: builtin/diff.c +msgid "no merge given, only parents." +msgstr "tidak ada penggabungan yang diberikan, hanya induk." + +#: builtin/diff.c #, c-format msgid "invalid option: %s" msgstr "opsi tidak valid: %s" @@ -7552,8 +7554,8 @@ msgid "print only refs which don't contain the commit" msgstr "hanya cetak referensi yang tidak berisi komit" #: builtin/for-each-repo.c -msgid "git for-each-repo --config=<config> <command-args>" -msgstr "git for-each-repo --config=<konfigurasi> <argumen perintah>" +msgid "git for-each-repo --config=<config> [--] <arguments>" +msgstr "git for-each-repo --config=<konfigurasi> [--] <argumen perintah>" #: builtin/for-each-repo.c msgid "config" @@ -7770,8 +7772,16 @@ msgid "%s: invalid sha1 pointer in resolve-undo" msgstr "%s: penunjuk sha1 tidak valid di resolve-undo" #: builtin/fsck.c -msgid "git fsck [<options>] [<object>...]" -msgstr "git fsck [<opsi>] [<objek>...]" +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>...]" +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] [<objek>...]" #: builtin/fsck.c msgid "show unreachable objects" @@ -7844,14 +7854,6 @@ msgid "git fsmonitor--daemon run [<options>]" msgstr "git fsmonitor--daemon run [<opsi>]" #: builtin/fsmonitor--daemon.c -msgid "git fsmonitor--daemon stop" -msgstr "git fsmonitor--daemon stop" - -#: builtin/fsmonitor--daemon.c -msgid "git fsmonitor--daemon status" -msgstr "git fsmonitor--daemon status" - -#: builtin/fsmonitor--daemon.c #, c-format msgid "value of '%s' out of range: %d" msgstr "nilai '%s' di luar jangkauan: %d" @@ -7952,7 +7954,7 @@ msgstr "" msgid "invalid 'ipc-threads' value (%d)" msgstr "nilai 'ipc-threads' tidak valid (%d)" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c t/helper/test-cache-tree.c #, c-format msgid "Unhandled subcommand '%s'" msgstr "Subperintah tidak tertangani '%s'" @@ -8157,8 +8159,23 @@ msgid "use at most one of --auto and --schedule=<frequency>" msgstr "gunakan paling banyak satu dari --auto dan --schedule=<frekuensi>" #: builtin/gc.c -msgid "failed to run 'git config'" -msgstr "gagal menjalankan 'git config'" +#, c-format +msgid "unable to add '%s' value of '%s'" +msgstr "tidak dapat menambahkan nilai '%s' dari '%s'" + +#: builtin/gc.c +msgid "return success even if repository was not registered" +msgstr "kembalikan sukses bahkan jika repositori tidak terdaftar" + +#: builtin/gc.c +#, c-format +msgid "unable to unset '%s' value of '%s'" +msgstr "tidak dapat membatal-setel nilai '%s' dari '%s'" + +#: builtin/gc.c +#, c-format +msgid "repository '%s' is not registered" +msgstr "repositori '%s' tidak terdaftar" #: builtin/gc.c #, c-format @@ -8537,11 +8554,15 @@ msgstr "baik --cached dan pohon diberikan" #: builtin/hash-object.c msgid "" -"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " -"[--] <file>..." +"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters]\n" +" [--stdin [--literally]] [--] <file>..." msgstr "" -"git hash-object [-t <tipe>] [-w] [--path=<berkas> | --no-filters] [--stdin] " -"[--] <berkas>..." +"git hash-object [-t <tipe>] [-w] [--path=<berkas> | --no-filters]\n" +" [--stdin [--literally]] [--] <berkas>..." + +#: builtin/hash-object.c +msgid "git hash-object [-t <type>] [-w] --stdin-paths [--no-filters]" +msgstr "git hash-object [-t <tipe>] [-w] --stdin-paths [--no-filters]" #: builtin/hash-object.c msgid "object type" @@ -9080,11 +9101,15 @@ msgstr "Repositori Git kosong dinisialisasi di %s%s\n" #: builtin/init-db.c msgid "" -"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" -"shared[=<permissions>]] [<directory>]" +"git init [-q | --quiet] [--bare] [--template=<template-directory>]\n" +" [--separate-git-dir <git-dir>] [--object-format=<format>]\n" +" [-b <branch-name> | --initial-branch=<branch-name>]\n" +" [--shared[=<permissions>]] [<directory>]" msgstr "" -"git init [-q | --quiet] [--bare] [--template=<direktori-templat>][--" -"shared[=<perizinan>]] [<direktori>]" +"git init [-q | --quiet] [--bare] [--template=<direktori templat>]\n" +" [--separate-git-dir <direktori git>] [--object-format=<format>]\n" +" [-b <nama cabang> | --initial-branch=<nama cabang>]\n" +" [--shared[=<perizinan>]] [<direktori>]" #: builtin/init-db.c msgid "permissions" @@ -9137,11 +9162,13 @@ msgstr "--separate-git-dir tidak kompatibel dengan repositori bare" #: builtin/interpret-trailers.c msgid "" -"git interpret-trailers [--in-place] [--trim-empty] [(--trailer " -"<token>[(=|:)<value>])...] [<file>...]" +"git interpret-trailers [--in-place] [--trim-empty]\n" +" [(--trailer <token>[(=|:)<value>])...]\n" +" [--parse] [<file>...]" msgstr "" -"git interpret-trailers [--in-place] [--trim-empty] [(--trailer " -"<token>[(=|:)<nilai>])...] [<berkas>...]" +"git interpret-trailers [--in-place] [--trim-empty]\n" +" [(--trailer <token>[(=|:)<nilai>])...]\n" +" [--parse] [<berkas>...]" #: builtin/interpret-trailers.c msgid "edit files in place" @@ -9771,11 +9798,11 @@ msgstr "" #: builtin/ls-remote.c msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" -" [-q | --quiet] [--exit-code] [--get-url]\n" +" [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n" " [--symref] [<repository> [<refs>...]]" msgstr "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" -" [-q | --quiet] [--exit-code] [--get-url]\n" +" [-q | --quiet] [--exit-code] [--get-url] [--sort=<kunci>]\n" " [--symref] [<repositori> [<referensi>...]]" #: builtin/ls-remote.c @@ -9948,14 +9975,14 @@ msgid "git merge-base [-a | --all] --octopus <commit>..." msgstr "git merge-base [-a | --all] --octopus <komit>..." #: builtin/merge-base.c -msgid "git merge-base --independent <commit>..." -msgstr "git merge-base --independent <komit>..." - -#: builtin/merge-base.c msgid "git merge-base --is-ancestor <commit> <commit>" msgstr "git merge-base --is-ancestor <komit> <komit>" #: builtin/merge-base.c +msgid "git merge-base --independent <commit>..." +msgstr "git merge-base --independent <komit>..." + +#: builtin/merge-base.c msgid "git merge-base --fork-point <ref> [<commit>]" msgstr "git merge-base --fork-point <referensi> [<komit>]" @@ -10095,9 +10122,23 @@ msgid "allow merging unrelated histories" msgstr "perbolehkan penggabungan riwayat yang tak terkait" #: builtin/merge-tree.c +msgid "perform multiple merges, one per line of input" +msgstr "lakukan banyak penggabungan, satu per baris masukan" + +#: builtin/merge-tree.c msgid "--trivial-merge is incompatible with all other options" msgstr "--trivial-merge tidak kompatibel dengan semua opsi lainnya" +#: builtin/merge-tree.c builtin/notes.c +#, c-format +msgid "malformed input line: '%s'." +msgstr "baris masukan jelek: '%s'." + +#: builtin/merge-tree.c +#, c-format +msgid "merging cannot continue; got unclean result of %d" +msgstr "penggabungan tidak dapat berlanjut; dapat hasil kotor dari %d" + #: builtin/merge.c msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<opsi>] [<komit>...]" @@ -10680,7 +10721,7 @@ msgstr "%s, source=%s, destination=%s" msgid "Renaming %s to %s\n" msgstr "Mengganti nama %s ke %s\n" -#: builtin/mv.c builtin/remote.c builtin/repack.c +#: builtin/mv.c builtin/remote.c #, c-format msgid "renaming '%s' failed" msgstr "gagal mengganti nama '%s'" @@ -10886,11 +10927,6 @@ msgstr "gagal membaca data catatan dari objek bukan blob '%s'." #: builtin/notes.c #, c-format -msgid "malformed input line: '%s'." -msgstr "baris masukan jelek: '%s'." - -#: builtin/notes.c -#, c-format msgid "failed to copy notes from '%s' to '%s'" msgstr "gagal menyalin catatan dari '%s' ke '%s'" @@ -11130,15 +11166,14 @@ msgid "unknown subcommand: `%s'" msgstr "subperintah tidak dikenal: `%s'" #: builtin/pack-objects.c -msgid "" -"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" +msgid "git pack-objects --stdout [<options>] [< <ref-list> | < <object-list>]" msgstr "" -"git pack-objects --stdout [<opsi>...] [< <daftar referensi>| < <daftar-" +"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 [<options>] <base-name> [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects [<opsi>...] <nama dasar> [< <daftar referensi> | < <daftar-" "objek>]" @@ -11620,8 +11655,8 @@ msgstr "" "<git@vger.kernel.org>. Terima kasih.\n" #: builtin/pack-refs.c -msgid "git pack-refs [<options>]" -msgstr "git pack-refs [<opsi>]" +msgid "git pack-refs [--all] [--no-prune]" +msgstr "git pack-refs [--all] [--no-prune]" #: builtin/pack-refs.c msgid "pack everything" @@ -11631,6 +11666,22 @@ msgstr "pak semuanya" msgid "prune loose refs (default)" msgstr "pangkas referensi longgar (asali)" +#: builtin/patch-id.c +msgid "git patch-id [--stable | --unstable | --verbatim]" +msgstr "git patch-id [--stable | --unstable | --verbatim]" + +#: builtin/patch-id.c +msgid "use the unstable patch-id algorithm" +msgstr "gunakan algoritma id tambalan tidak stabil" + +#: builtin/patch-id.c +msgid "use the stable patch-id algorithm" +msgstr "gunakan algoritma id tambalan stabil" + +#: builtin/patch-id.c +msgid "don't strip whitespace from the patch" +msgstr "jangan kupas spasi dari tambalan" + #: builtin/prune.c msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--progress] [--expire <waktu>] [--] [<kepala>...]" @@ -11895,14 +11946,13 @@ msgstr "" #: builtin/push.c msgid "" "\n" -"To avoid automatically configuring upstream branches when their name\n" -"doesn't match the local branch, see option 'simple' of branch." -"autoSetupMerge\n" +"To avoid automatically configuring an upstream branch when its name\n" +"won't match the local branch, see option 'simple' of branch.autoSetupMerge\n" "in 'git help config'.\n" msgstr "" "\n" "Untuk menghindari konfigurasi cabang hulu otomatis ketika namanya\n" -"tidak cocok dengan cabang lokal, lihat opsi 'simple' dari branch." +"tidak akan cocok dengan cabang lokal, lihat opsi 'simple' dari branch." "autoSetupMerge\n" "di 'git help config'.\n" @@ -12068,6 +12118,14 @@ msgstr "Mendorong ke %s\n" msgid "failed to push some refs to '%s'" msgstr "gagal dorong beberapa referensi ke '%s'" +#: builtin/push.c +msgid "" +"recursing into submodule with push.recurseSubmodules=only; using on-demand " +"instead" +msgstr "" +"mengulangi ke dalam submodul dengan push.recurseSubmodules=only; menggunakan " +"on-demand sebagai gantinya" + #: builtin/push.c builtin/send-pack.c submodule-config.c #, c-format msgid "invalid value for '%s'" @@ -12242,14 +12300,15 @@ msgstr "butuh dua rentang komit" #: builtin/read-tree.c msgid "" -"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " -"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-" -"ish1> [<tree-ish2> [<tree-ish3>]])" +"git read-tree [(-m [--trivial] [--aggressive] | --reset | --" +"prefix=<prefix>)\n" +" [-u | -i]] [--index-output=<file>] [--no-sparse-checkout]\n" +" (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" msgstr "" "git read-tree [(-m [--trivial] [--aggressive] | --reset | --" -"prefix=<prefiks>) [-u | -i]] [--no-sparse-checkout] [--index-" -"output=<berkas>] (--empty | <mirip-pohon 1> [<mirip-pohon 2> <mirip-pohon " -"3>])" +"prefix=<awalan>)\n" +" [-u | -i]] [--index-output=<berkas>] [--no-sparse-checkout]\n" +" (--empty | <mirip pohon 1> [<mirip pohon 2> [mirip pohon 3]])" #: builtin/read-tree.c msgid "write resulting index to <file>" @@ -12368,8 +12427,8 @@ msgstr "%s butuh tulang belakang penggabungan" #: builtin/rebase.c #, c-format -msgid "could not get 'onto': '%s'" -msgstr "tidak dapat mendapatkan 'ke': '%s'" +msgid "invalid onto: '%s'" +msgstr "kepada tidak valid: '%s'" #: builtin/rebase.c #, c-format @@ -12742,8 +12801,8 @@ msgid "No such ref: %s" msgstr "Tidak ada referensi seperti: %s" #: builtin/rebase.c -msgid "Could not resolve HEAD to a revision" -msgstr "Tidak dapat menguraikan HEAD ke sebuah revisi" +msgid "Could not resolve HEAD to a commit" +msgstr "tidak dapat menguraikan komit HEAD ke sebuah komit" #: builtin/rebase.c #, c-format @@ -13558,6 +13617,11 @@ msgid "could not close refs snapshot tempfile" msgstr "tidak dapat menutup berkas sementara jepretan referensi" #: builtin/repack.c +#, c-format +msgid "could not remove stale bitmap: %s" +msgstr "tidak dapt memindahkan bitmap basi: %s" + +#: builtin/repack.c msgid "pack everything in a single pack" msgstr "pak semuanya dalam satu pak" @@ -13656,6 +13720,10 @@ msgid "write a multi-pack index of the resulting packs" msgstr "tulis indeks multipak dari pak yang dihasilkan" #: builtin/repack.c +msgid "pack prefix to store a pack containing pruned objects" +msgstr "awalan pak untuk menyimpan pak berisi objek terpangkas" + +#: builtin/repack.c msgid "cannot delete packs in a precious-objects repo" msgstr "tidak dapat menghapus pak dalam repositori objek berharga" @@ -13670,11 +13738,16 @@ msgstr "nama berkas paket %s tidak diawali dengan %s" #: builtin/repack.c #, c-format -msgid "missing required file: %s" -msgstr "berkas yang diperlukan hilang: %s" +msgid "renaming pack to '%s' failed" +msgstr "gagal mengganti nama pak ke '%s'" #: builtin/repack.c #, c-format +msgid "pack-objects did not write a '%s' file for pack %s-%s" +msgstr "pack-objects tidak menulis berkas '%s' untuk pak %s-%s" + +#: builtin/repack.c sequencer.c +#, c-format msgid "could not unlink: %s" msgstr "tidak dapat membatal taut: %s" @@ -13917,8 +13990,10 @@ msgid "only one pattern can be given with -l" msgstr "hanya satu pola yang dapat diberikan dengan -l" #: builtin/rerere.c -msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" -msgstr "git rerere [clear | forge <jalur>... | status | remaining | diff | gc]" +msgid "" +"git rerere [clear | forget <pathspec>... | diff | status | remaining | gc]" +msgstr "" +"git rerere [clear | forget <spek jalur>... | diff | status | remaining | gc]" #: builtin/rerere.c msgid "register clean resolutions in index" @@ -14176,6 +14251,18 @@ msgstr "--prefix butuh sebuah argumen" msgid "unknown mode for --abbrev-ref: %s" msgstr "mode untuk --abbrev-ref tidak dikenal: %s" +#: builtin/rev-parse.c revision.c +msgid "--exclude-hidden cannot be used together with --branches" +msgstr "--exclude-hidden tidak dapat digunakan bersamaan dengan --branches" + +#: builtin/rev-parse.c revision.c +msgid "--exclude-hidden cannot be used together with --tags" +msgstr "--exclude-hidden tidak dapat digunakan bersamaan dengan --tags" + +#: builtin/rev-parse.c revision.c +msgid "--exclude-hidden cannot be used together with --remotes" +msgstr "--exclude-hidden tidak dapat digunakan dengan --remotes" + #: builtin/rev-parse.c setup.c msgid "this operation must be run in a work tree" msgstr "operasi ini harus dijalankan di dalam pohon kerja" @@ -14186,20 +14273,28 @@ msgid "unknown mode for --show-object-format: %s" msgstr "mode untuk --show-object-format tidak dikenal: %s" #: builtin/revert.c -msgid "git revert [<options>] <commit-ish>..." -msgstr "git revert [<opsi>] <mirip-komit>..." +msgid "" +"git revert [--[no-]edit] [-n] [-m <parent-number>] [-s] [-S[<keyid>]] " +"<commit>..." +msgstr "" +"git revert [--[no-]edit] [-n] [-m <nomor induk>] [-s] [-S[<id kunci>]] " +"<komit>..." #: builtin/revert.c -msgid "git revert <subcommand>" -msgstr "git revert <subperintah>" +msgid "git revert (--continue | --skip | --abort | --quit)" +msgstr "git revert (--continue | --skip | --abort | --quit)" #: builtin/revert.c -msgid "git cherry-pick [<options>] <commit-ish>..." -msgstr "git cherry-pick [<opsi>] <mirip-komit>..." +msgid "" +"git cherry-pick [--edit] [-n] [-m <parent-number>] [-s] [-x] [--ff]\n" +" [-S[<keyid>]] <commit>..." +msgstr "" +"git cherry-pick [--edit] [-n] [-m <nomor induk>] [-s] [-x] [--ff]\n" +" [-S[<id kunci>]] <komit>..." #: builtin/revert.c -msgid "git cherry-pick <subcommand>" -msgstr "git cherry-pick <subperintah>" +msgid "git cherry-pick (--continue | --skip | --abort | --quit)" +msgstr "git cherry-pick (--continue | --skip | --abort | --quit)" #: builtin/revert.c #, c-format @@ -14280,8 +14375,14 @@ msgid "cherry-pick failed" msgstr "pemetikan ceri gagal" #: builtin/rm.c -msgid "git rm [<options>] [--] <file>..." -msgstr "git rm [<opsi>] [--] <berkas>..." +msgid "" +"git rm [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n" +" [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" +" [--] [<pathspec>...]" +msgstr "" +"git rm [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n" +" [--quiet] [--pathspec-from-file=<berkas> [--pathspec-file-nul]]\n" +" [--] [<spek jalur>...]" #: builtin/rm.c msgid "" @@ -14369,11 +14470,13 @@ msgid "" "git send-pack [--mirror] [--dry-run] [--force]\n" " [--receive-pack=<git-receive-pack>]\n" " [--verbose] [--thin] [--atomic]\n" +" [--[no-]signed | --signed=(true|false|if-asked)]\n" " [<host>:]<directory> (--all | <ref>...)" msgstr "" "git send-pack [--mirror] [--dry-run] [--force]\n" " [--receive-pack=<git-receive-pack>\n" -"] [--verbose] [--thin] [--atomic]\n" +" [--verbose] [--thin] [--atomic]\n" +" [--[no-]signed | --signed=(true|false|if-asked)]\n" " [<tuan rumah>:]<direktori> (--all | <referensi>...)" #: builtin/send-pack.c @@ -14405,8 +14508,9 @@ msgid "using multiple --group options with stdin is not supported" msgstr "menggunakan banyak opsi --group dengan masukan standar tidak didukung" #: builtin/shortlog.c -msgid "using --group=trailer with stdin is not supported" -msgstr "mengguanakn --group=trailer dengan stdin tidak didukung" +#, c-format +msgid "using %s with stdin is not supported" +msgstr "menggunakan %s dengan masukan standar tidak didukung" #: builtin/shortlog.c #, c-format @@ -14454,12 +14558,14 @@ msgid "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" " [--current] [--color[=<when>] | --no-color] [--sparse]\n" " [--more=<n> | --list | --independent | --merge-base]\n" -" [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" +" [--no-name | --sha1-name] [--topics]\n" +" [(<rev> | <glob>)...]" msgstr "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" " [--current] [--color[=<kapan>] | --no-color] [--sparse]\n" " [--more=<n> | --list | --independent | --merge-base]\n" -" [--no-name | --sha1-name] [--topics] [(<revisi> | <glob>)...]" +" [--no-name | --sha1-name] [--topics]\n" +" [(<revisi> | <glob>)...]" #: builtin/show-branch.c msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" @@ -14589,11 +14695,13 @@ msgstr "algoritma hash tidak dikenal" #: builtin/show-ref.c msgid "" -"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference]\n" +" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n" +" [--heads] [--] [<pattern>...]" msgstr "" -"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pola>...]" +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference]\n" +" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n" +" [--heads] [--] [<pola>...]" #: builtin/show-ref.c msgid "git show-ref --exclude-existing[=<pattern>]" @@ -14634,8 +14742,10 @@ msgstr "" "lokal" #: builtin/sparse-checkout.c -msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" -msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <opsi>" +msgid "" +"git sparse-checkout (init | list | set | add | reapply | disable) [<options>]" +msgstr "" +"git sparse-checkout (init | list | set | add | reapply | disable) [<opsi>]" #: builtin/sparse-checkout.c msgid "this worktree is not sparse" @@ -14787,76 +14897,66 @@ msgid "error while refreshing working directory" msgstr "kesalahan saat menyegarkan direktori kerja" #: builtin/stash.c -msgid "git stash list [<options>]" -msgstr "git stash list [<opsi>]" +msgid "git stash list [<log-options>]" +msgstr "git stash list [<opsi log>]" + +#: builtin/stash.c +msgid "" +"git stash show [-u | --include-untracked | --only-untracked] [<diff-" +"options>] [<stash>]" +msgstr "" +"git stash show [-u | --include-untracked | --only-untracked] [<opsi diff>] " +"[<stase>]" #: builtin/stash.c -msgid "git stash show [<options>] [<stash>]" -msgstr "git stash show [<opsi>] [<stase>]" +msgid "git stash drop [-q | --quiet] [<stash>]" +msgstr "git stash drop [-q | --quiet] [<stase>]" #: builtin/stash.c -msgid "git stash drop [-q|--quiet] [<stash>]" -msgstr "git stash drop [-q|--quiet] [<stase>]" +msgid "git stash pop [--index] [-q | --quiet] [<stash>]" +msgstr "git stash pop [--index] [-q | --quiet] [<stase>]" #: builtin/stash.c -msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" -msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stase>]" +msgid "git stash apply [--index] [-q | --quiet] [<stash>]" +msgstr "git stash apply [--index] [-q | --quiet] [<stase>]" #: builtin/stash.c msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <nama cabang> [<stase>]" #: builtin/stash.c -msgid "" -"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" -"quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" -" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" -" [--] [<pathspec>...]]" -msgstr "" -"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index]\n" -" [-q|--quiet] [-u|--include-untracked] [-a|--all]\n" -" [-m|--message <pesan>] [--pathspec-from-file=<berkas>\n" -" [--pathspec-file-nul]] [--] [<spek jalur>...]]" +msgid "git stash store [(-m | --message) <message>] [-q | --quiet] <commit>" +msgstr "git stash store [(-m | --message) <pesan>] [-q|--quiet] <komit>" #: builtin/stash.c msgid "" -"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" -"quiet]\n" -" [-u|--include-untracked] [-a|--all] [<message>]" +"git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q " +"| --quiet]\n" +" [-u | --include-untracked] [-a | --all] [(-m | --message) " +"<message>]\n" +" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" +" [--] [<pathspec>...]]" msgstr "" -"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index]\n" -" [-q|--quiet] [-u|--include-untracked] [-a|--all] [<pesan>]" - -#: builtin/stash.c -msgid "git stash pop [--index] [-q|--quiet] [<stash>]" -msgstr "git stash pop [--index] [-q|--quiet] [<stase>]" - -#: builtin/stash.c -msgid "git stash apply [--index] [-q|--quiet] [<stash>]" -msgstr "git stash apply [--index] [-q|--quiet] [<stase>]" - -#: builtin/stash.c -msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" -msgstr "git stash store [-m|--message <pesan>] [-q|--quiet] <komit>" +"git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q " +"| --quiet]\n" +" [-u | --include-untracked] [-a | --all] [(-m | --message) " +"<pesan>]\n" +" [--pathspec-from-file=<berkas> [--pathspec-file-nul]]\n" +" [--] [<spek jalur>...]]" #: builtin/stash.c msgid "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" -" [--] [<pathspec>...]]" +"git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | " +"--quiet]\n" +" [-u | --include-untracked] [-a | --all] [<message>]" msgstr "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <pesan>]\n" -" [--] [<spek jalur>...]" +"git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | " +"--quiet]\n" +" [-u | --include-untracked] [-a | --all] [<pesan>]" #: builtin/stash.c -msgid "" -"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [<message>]" -msgstr "" -"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [<pesan>]" +msgid "git stash create [<message>]" +msgstr "git stash create [<pesan>]" #: builtin/stash.c #, c-format @@ -15565,10 +15665,6 @@ msgid "don't fetch new objects from the remote site" msgstr "jangan ambil objek baru dari situs remote" #: builtin/submodule--helper.c -msgid "path into the working tree" -msgstr "jalur ke dalam pohon kerja" - -#: builtin/submodule--helper.c msgid "use the 'checkout' update strategy (default)" msgstr "gunakan strategi pembaruan 'checkout' (asali)" @@ -15614,34 +15710,10 @@ msgstr "" "[--] [<jalur>...]" #: builtin/submodule--helper.c -msgid "recurse into submodules" -msgstr "rekursi ke dalam submodul" - -#: builtin/submodule--helper.c msgid "git submodule absorbgitdirs [<options>] [<path>...]" msgstr "git submodule absorbgitdirs [<opsi>] [<jalur>...]" #: builtin/submodule--helper.c -msgid "check if it is safe to write to the .gitmodules file" -msgstr "periksa apakah itu aman untuk menulis ke berkas .gitmodules" - -#: builtin/submodule--helper.c -msgid "unset the config in the .gitmodules file" -msgstr "batal setel konfigurasi dalam berkas .gitmodules" - -#: builtin/submodule--helper.c -msgid "git submodule--helper config <name> [<value>]" -msgstr "git submodule--helper config <nama> [<nilai>]" - -#: builtin/submodule--helper.c -msgid "git submodule--helper config --unset <name>" -msgstr "git submodule--helper config --unset <nama>" - -#: builtin/submodule--helper.c -msgid "please make sure that the .gitmodules file is in the working tree" -msgstr "mohom pastikan berkas .gitmodules di dalam pohon kerja" - -#: builtin/submodule--helper.c msgid "suppress output for setting url of a submodule" msgstr "sembunyikan keluaran penyetelan url submodule" @@ -15737,6 +15809,10 @@ msgid "unable to checkout submodule '%s'" msgstr "Tidak dapat men-checkout submodul '%s'" #: builtin/submodule--helper.c +msgid "please make sure that the .gitmodules file is in the working tree" +msgstr "mohom pastikan berkas .gitmodules di dalam pohon kerja" + +#: builtin/submodule--helper.c #, c-format msgid "Failed to add submodule '%s'" msgstr "Tidak dapat menambahkan submodul '%s'" @@ -15798,23 +15874,26 @@ msgstr "URL repo: '%s' harus absolut atau diawali dengan ./|../" msgid "'%s' is not a valid submodule name" msgstr "'%s' bukan nama submodul yang valid" +#: builtin/submodule--helper.c +msgid "git submodule--helper <command>" +msgstr "git submodule--helper <nama>" + #: builtin/submodule--helper.c git.c #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s tidak mendukung --super-prefix" -#: builtin/submodule--helper.c -#, c-format -msgid "'%s' is not a valid submodule--helper subcommand" -msgstr "'%s' bukan subperintah submodule--helper valid" +#: builtin/symbolic-ref.c +msgid "git symbolic-ref [-m <reason>] <name> <ref>" +msgstr "git symbolic-ref [-m <alasan>] <nama> <referensi>" #: builtin/symbolic-ref.c -msgid "git symbolic-ref [<options>] <name> [<ref>]" -msgstr "git symbolic-ref [<opsi>] <nama> [<referensi>]" +msgid "git symbolic-ref [-q] [--short] [--no-recurse] <name>" +msgstr "git symbolic-ref [-q] [--short] [--no-recurse] <nama>" #: builtin/symbolic-ref.c -msgid "git symbolic-ref -d [-q] <name>" -msgstr "git symbolic-ref -d [-q] <nama>" +msgid "git symbolic-ref --delete [-q] <name>" +msgstr "git symbolic-ref --delete [-q] <nama>" #: builtin/symbolic-ref.c msgid "suppress error message for non-symbolic (detached) refs" @@ -15828,6 +15907,10 @@ msgstr "hapus referensi simbolik" msgid "shorten ref output" msgstr "pendekkan keluaran referensi" +#: builtin/symbolic-ref.c +msgid "recursively dereference (default)" +msgstr "derefensi secara rekursif (asali)" + #: builtin/symbolic-ref.c builtin/update-ref.c msgid "reason" msgstr "alasan" @@ -15838,11 +15921,11 @@ msgstr "alasan pembaruan" #: builtin/tag.c msgid "" -"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n" -" <tagname> [<head>]" +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n" +" <tagname> [<commit> | <object>]" msgstr "" -"git tag [-a | -s | -u <id kunci>] [-f] [-m <pesan | -F <berkas>]\n" -" <nama tag> [<kepala>]" +"git tag [-a | -s | -u <id kunci>] [-f] [-m <pesan> | -F <berkas>] [-e]\n" +" <nama tag> [<komit> | <objek>]" #: builtin/tag.c msgid "git tag -d <tagname>..." @@ -15850,15 +15933,15 @@ msgstr "git tag -d <nama tag>..." #: builtin/tag.c msgid "" -"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" -"points-at <object>]\n" -" [--format=<format>] [--merged <commit>] [--no-merged <commit>] " -"[<pattern>...]" +"git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]\n" +" [--points-at <object>] [--column[=<options>] | --no-column]\n" +" [--create-reflog] [--sort=<key>] [--format=<format>]\n" +" [--merged <commit>] [--no-merged <commit>] [<pattern>...]" msgstr "" -"git tag -l [-n[<angka>]] [--contains <komit>] [--no-contains <komit>] [--" -"points-at <objek>]\n" -" [--format=<format>] [--merged <komit>] [--no-merged <komit>] " -"[<pola>...]" +"git tag [-n[<angka>]] -l [--contains <komit>] [--no-contains <komit>]\n" +" [--points-at <objeck>] [--column[=<opsi>] | --no-column]\n" +" [--create-reflog] [--sort=<kunci>] [--format=<format>]\n" +" [--merged <komit>] [--no-merged <komit>] [<pola>...]" #: builtin/tag.c msgid "git tag -v [--format=<format>] <tagname>..." @@ -16340,8 +16423,12 @@ msgid "update the info files from scratch" msgstr "perbarui berkas info dari awal" #: builtin/upload-pack.c -msgid "git upload-pack [<options>] <dir>" -msgstr "git upload-pack [<opsi>] <direktori>" +msgid "" +"git-upload-pack [--[no-]strict] [--timeout=<n>] [--stateless-rpc]\n" +" [--advertise-refs] <directory>" +msgstr "" +"git-upload-pack [--[no-]strict] [--timeout=<n>] [--stateless-rpc]\n" +" [--advertise-refs] <direktori>" #: builtin/upload-pack.c t/helper/test-serve-v2.c msgid "quit after a single request/response exchange" @@ -16360,8 +16447,8 @@ msgid "interrupt transfer after <n> seconds of inactivity" msgstr "interupsi transfer setelah <n> detik niraktivitas" #: builtin/verify-commit.c -msgid "git verify-commit [-v | --verbose] <commit>..." -msgstr "git verify-commit [-v | --verbose] <komit>..." +msgid "git verify-commit [-v | --verbose] [--raw] <commit>..." +msgstr "git verify-commit [-v | --verbose] [--raw] <komit>..." #: builtin/verify-commit.c msgid "print commit contents" @@ -16372,8 +16459,8 @@ msgid "print raw gpg status output" msgstr "cetak keluaran status gpg mentah" #: builtin/verify-pack.c -msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." -msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <pak>..." +msgid "git verify-pack [-v | --verbose] [-s | --stat-only] [--] <pack>.idx..." +msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] [--] <pak>.idx..." #: builtin/verify-pack.c msgid "verbose" @@ -16384,44 +16471,48 @@ msgid "show statistics only" msgstr "hanya perlihatkan statistik" #: builtin/verify-tag.c -msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." -msgstr "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." +msgid "git verify-tag [-v | --verbose] [--format=<format>] [--raw] <tag>..." +msgstr "git verify-tag [-v | --verbose] [--format=<format>] [--raw] <tag>..." #: builtin/verify-tag.c msgid "print tag contents" msgstr "cetak isi tag" #: builtin/worktree.c -msgid "git worktree add [<options>] <path> [<commit-ish>]" -msgstr "git worktree add [<opsi>] <jalur> [<mirip komit>]" +msgid "" +"git worktree add [-f] [--detach] [--checkout] [--lock [--reason <string>]]\n" +" [-b <new-branch>] <path> [<commit-ish>]" +msgstr "" +"git worktree add [-f] [--detach] [--checkout] [--lock [--reason <untai>]]\n" +" [-b <cabang baru>] <jalur> [<mirip komit>]" #: builtin/worktree.c -msgid "git worktree list [<options>]" -msgstr "git worktree list [<opsi>]" +msgid "git worktree list [-v | --porcelain [-z]]" +msgstr "git worktree list [-v | --porcelain [-z]" #: builtin/worktree.c -msgid "git worktree lock [<options>] <path>" -msgstr "git worktree lock [<opsi>] <jalur>" +msgid "git worktree lock [--reason <string>] <worktree>" +msgstr "git worktree lock [--reason <untai>] <pohon kerja>" #: builtin/worktree.c msgid "git worktree move <worktree> <new-path>" msgstr "git worktree move <pohon kerja> <jalur baru>" #: builtin/worktree.c -msgid "git worktree prune [<options>]" -msgstr "git worktree prune [<opsi>]" +msgid "git worktree prune [-n] [-v] [--expire <expire>]" +msgstr "git worktree prune [-n] [-v] [--expire <kadaluarsa>]" #: builtin/worktree.c -msgid "git worktree remove [<options>] <worktree>" -msgstr "git worktree remove [<opsi>] <pohon kerja>" +msgid "git worktree remove [-f] <worktree>" +msgstr "git worktree remove [-f] <pohon kerja>" #: builtin/worktree.c msgid "git worktree repair [<path>...]" msgstr "git worktree repair [<jalur>...]" #: builtin/worktree.c -msgid "git worktree unlock <path>" -msgstr "git worktree unlock <jalur>" +msgid "git worktree unlock <worktree>" +msgstr "git worktree unlock <worktree>" #: builtin/worktree.c #, c-format @@ -16713,6 +16804,11 @@ msgid "core.fsyncMethod = batch is unsupported on this platform" msgstr "core.fsyncMethod = batch tidak didukung pada platform ini" #: bundle-uri.c +#, c-format +msgid "bundle list at '%s' has no mode" +msgstr "daftar bundel pada '%s' tidak punya mode" + +#: bundle-uri.c msgid "failed to create temporary file" msgstr "tidak dapat membuat berkas sementara" @@ -16722,18 +16818,35 @@ msgstr "tidak cukup kemampuan" #: bundle-uri.c #, c-format +msgid "unrecognized bundle mode from URI '%s'" +msgstr "mode bundel tidak dikenal dari URI '%s'" + +#: bundle-uri.c +#, c-format +msgid "exceeded bundle URI recursion limit (%d)" +msgstr "batas rekursi URI bundel (%d) terlewati" + +#: bundle-uri.c +#, c-format msgid "failed to download bundle from URI '%s'" msgstr "gagal mengunduh bundel dari URI '%s'" #: bundle-uri.c #, c-format -msgid "file at URI '%s' is not a bundle" -msgstr "berkas pada URI '%s' bukan sebuah bundle" +msgid "file at URI '%s' is not a bundle or bundle list" +msgstr "berkas pada URI '%s' bukan sebuah bundel atau daftar bundel" #: bundle-uri.c -#, c-format -msgid "failed to unbundle bundle from URI '%s'" -msgstr "gagal membongkar bundel dari URI '%s'" +msgid "bundle-uri: got an empty line" +msgstr "bundle-uri: dapat satu baris kosong" + +#: bundle-uri.c +msgid "bundle-uri: line is not of the form 'key=value'" +msgstr "bundle-uri: baris bukan berbentuk 'kunci=nilai'" + +#: bundle-uri.c +msgid "bundle-uri: line has empty key or value" +msgstr "bundle-uri: baris berisi kunci atau nilai kosong" #: bundle.c #, c-format @@ -17496,7 +17609,7 @@ msgid "Chunk-based file formats" msgstr "Berkas format berbasis bingkah" #: command-list.h -msgid "Git commit graph format" +msgid "Git commit-graph format" msgstr "Format grafik komit Git" #: command-list.h @@ -17929,6 +18042,11 @@ msgstr "kasus tak tertangani di 'has_worktree_moved': %d" msgid "health thread wait failed [GLE %ld]" msgstr "antri utas kesehatan gagal [GLE %ld]" +#: compat/fsmonitor/fsm-ipc-darwin.c +#, c-format +msgid "Invalid path: %s" +msgstr "Jalur tidak valid: %s" + #: compat/fsmonitor/fsm-listen-darwin.c msgid "Unable to create FSEventStream." msgstr "tidak dapat membuat FSEventStream." @@ -17967,12 +18085,32 @@ msgstr "GetOverlappedResult gagal pada '%s' [GLE %ld]" msgid "could not read directory changes [GLE %ld]" msgstr "tidak dapat membaca perubahan direktori [GLE %ld]" -#: compat/fsmonitor/fsm-settings-win32.c +#: compat/fsmonitor/fsm-path-utils-darwin.c +#, c-format +msgid "opendir('%s') failed" +msgstr "opendir('%s') gagal" + +#: compat/fsmonitor/fsm-path-utils-darwin.c +#, c-format +msgid "lstat('%s') failed" +msgstr "lstat('%s') gagal" + +#: compat/fsmonitor/fsm-path-utils-darwin.c +#, c-format +msgid "strbuf_readlink('%s') failed" +msgstr "strbuf_readlink('%s') gagal" + +#: compat/fsmonitor/fsm-path-utils-darwin.c +#, c-format +msgid "closedir('%s') failed" +msgstr "closedir('%s') gagal" + +#: compat/fsmonitor/fsm-path-utils-win32.c #, c-format msgid "[GLE %ld] unable to open for read '%ls'" msgstr "[GLE %ld] tidak dapat membuka untuk dibaca '%ls'" -#: compat/fsmonitor/fsm-settings-win32.c +#: compat/fsmonitor/fsm-path-utils-win32.c #, c-format msgid "[GLE %ld] unable to get protocol information for '%ls'" msgstr "[GLE %ld] tidak dapat mendapatkan informasi protokol untuk '%ls'" @@ -19983,10 +20121,11 @@ msgstr "repositori virtual '%s' tidka kompatibel dengan fsmonitor" #: fsmonitor-settings.c #, c-format msgid "" -"repository '%s' is incompatible with fsmonitor due to lack of Unix sockets" +"socket directory '%s' is incompatible with fsmonitor due to lack of Unix " +"sockets support" msgstr "" -"repositori '%s' tidak kompatibel dengan fsmonitor karena kekurangan soket " -"Unix" +"direktori soket '%s' tidak kompatibel dengan fsmonitor karena kekurangan " +"dukungan soket Unix" #: git.c msgid "" @@ -20380,8 +20519,8 @@ msgstr[1] "" "Perintah paling mirip adalah" #: help.c -msgid "git version [<options>]" -msgstr "git version [<opsi>]" +msgid "git version [--build-options]" +msgstr "git version [--build-options]" #: help.c #, c-format @@ -21493,11 +21632,6 @@ msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s: mengabaikan penyimpanan objek alternatif, bersarang terlalu dalam" #: object-file.c -#, c-format -msgid "unable to normalize object directory: %s" -msgstr "tidak dapat menormalisasikan direktori objek: %s" - -#: object-file.c msgid "unable to fdopen alternates lockfile" msgstr "tidak dapat men-fdopen berkas kunci alternatif" @@ -22520,6 +22654,11 @@ msgstr "" msgid "promisor remote name cannot begin with '/': %s" msgstr "nama remote penjanji tidak dapat diawali dengan '/': %s" +#: promisor-remote.c +#, c-format +msgid "could not fetch %s from promisor remote" +msgstr "tidak dapat mengambil %s dari remote penjanji" + #: protocol-caps.c msgid "object-info: expected flush after arguments" msgstr "object-info: bilasan diharapkan setelah argumen" @@ -23821,6 +23960,15 @@ msgstr "gagal menemukan pohon %s" #: revision.c #, c-format +msgid "unsupported section for hidden refs: %s" +msgstr "seksi tidak didukung untuk referensi tersembunyi: %s" + +#: revision.c +msgid "--exclude-hidden= passed more than once" +msgstr "--exclude-hidden= dilewatkan lebih dari sekali" + +#: revision.c +#, c-format msgid "resolve-undo records `%s` which is missing" msgstr "resolve-undo merekam `%s` yang dimana hilang" @@ -24007,6 +24155,16 @@ msgstr "--all atau <pendaftaran>, tetapi bukan kedua-duanya" #: scalar.c #, c-format +msgid "could not remove stale scalar.repo '%s'" +msgstr "tidak dapat menghapus scalar.repo basi '%s'" + +#: scalar.c +#, c-format +msgid "removing stale scalar.repo '%s'" +msgstr "menghapus scalar.repo basi '%s'" + +#: scalar.c +#, c-format msgid "git repository gone in '%s'" msgstr "repositori git pergi di '%s'" @@ -24763,6 +24921,11 @@ msgid "illegal label name: '%.*s'" msgstr "nama label ilegal: '%.*s'" #: sequencer.c +#, c-format +msgid "could not resolve '%s'" +msgstr "tidak dapat menguraikan '%s'" + +#: sequencer.c msgid "writing fake root commit" msgstr "menulis komit akar palsu" @@ -24771,11 +24934,6 @@ msgid "writing squash-onto" msgstr "menulis squash-onto" #: sequencer.c -#, c-format -msgid "could not resolve '%s'" -msgstr "tidak dapat menguraikan '%s'" - -#: sequencer.c msgid "cannot merge without a current revision" msgstr "tidak dapat menggabungkan tanpa revisi saat ini" @@ -25502,100 +25660,116 @@ msgstr "ls-tree kembalikan kode kembali %d yang tak diharapkan" msgid "failed to lstat '%s'" msgstr "gagal men-lstat '%s'" +#: t/helper/test-cache-tree.c +msgid "test-tool cache-tree <options> (control|prime|update)" +msgstr "test-tool cache-tree <opsi> (control|prime|update)" + +#: t/helper/test-cache-tree.c +msgid "clear the cache tree before each iteration" +msgstr "bersihkan pohon tembolok sebelum setiap iterasi" + +#: t/helper/test-cache-tree.c +msgid "number of entries in the cache tree to invalidate (default 0)" +msgstr "jumlah entri di dalam pohon tembolok untuk dinirvalidasi (asali 0)" + #: t/helper/test-fast-rebase.c msgid "unhandled options" -msgstr "" +msgstr "opsi tak tertangani" #: t/helper/test-fast-rebase.c msgid "error preparing revisions" -msgstr "" +msgstr "kesalahan menyiapkan revisi" #: t/helper/test-reach.c #, c-format msgid "commit %s is not marked reachable" -msgstr "" +msgstr "komit %s tidak ditandai sebagai dapat dicapai" #: t/helper/test-reach.c msgid "too many commits marked reachable" -msgstr "" +msgstr "terlalu banyak komit yang ditandai sebagai dapat dicapai" #: t/helper/test-serve-v2.c msgid "test-tool serve-v2 [<options>]" -msgstr "" +msgstr "test-tool serve-v2 [<opsi>]" #: t/helper/test-serve-v2.c msgid "exit immediately after advertising capabilities" -msgstr "" +msgstr "langsung keluar setelah mengiklankan kemampuan" #: t/helper/test-simple-ipc.c msgid "test-helper simple-ipc is-active [<name>] [<options>]" -msgstr "" +msgstr "test-helper simple-ipc is-active [<nama>] [<opsi>]" #: t/helper/test-simple-ipc.c msgid "test-helper simple-ipc run-daemon [<name>] [<threads>]" -msgstr "" +msgstr "test-helper simple-ipc run-daemon [<nama>] [<utas>]" #: t/helper/test-simple-ipc.c msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]" msgstr "" +"test-helper simple-ipc start-daemon [<nama>] [<utas>] [<tunggu maksimum>]" #: t/helper/test-simple-ipc.c msgid "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]" -msgstr "" +msgstr "test-helper simple-ipc stop-daemon [<nama> [<tunggu maksimum>]" #: t/helper/test-simple-ipc.c msgid "test-helper simple-ipc send [<name>] [<token>]" -msgstr "" +msgstr "test-helper simple-ipc send [<nama>] [<token>]" #: t/helper/test-simple-ipc.c msgid "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]" msgstr "" +"test-helper simple-ipc sendbytes [<nama>] [<hitungan bita>] [<bita>]" #: t/helper/test-simple-ipc.c msgid "" "test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] " "[<batchsize>]" msgstr "" +"test-helper simple-ipc multiple [<nama>] [<utas>] [<hitungan bita>] " +"[<ukuran batch>]" #: t/helper/test-simple-ipc.c msgid "name or pathname of unix domain socket" -msgstr "" +msgstr "nama atau nama jalur soket domain unix" #: t/helper/test-simple-ipc.c msgid "named-pipe name" -msgstr "" +msgstr "nama pipa bernama" #: t/helper/test-simple-ipc.c msgid "number of threads in server thread pool" -msgstr "" +msgstr "jumlah utas pada kolam utas peladen" #: t/helper/test-simple-ipc.c msgid "seconds to wait for daemon to start or stop" -msgstr "" +msgstr "waktu menunggu daemon dimulai atau dihentikan (dalam detik)" #: t/helper/test-simple-ipc.c msgid "number of bytes" -msgstr "" +msgstr "jumlah bita" #: t/helper/test-simple-ipc.c msgid "number of requests per thread" -msgstr "" +msgstr "jumlah permintaan tiap utas" #: t/helper/test-simple-ipc.c msgid "byte" -msgstr "" +msgstr "bita" #: t/helper/test-simple-ipc.c msgid "ballast character" -msgstr "" +msgstr "karakter pemberat" #: t/helper/test-simple-ipc.c msgid "token" -msgstr "" +msgstr "token" #: t/helper/test-simple-ipc.c msgid "command token to send to the server" -msgstr "" +msgstr "token perintah untuk dikirim ke peladen" #: trailer.c #, c-format @@ -27634,3 +27808,147 @@ msgstr "Melewati %s dengan akhiran cadangan '%s'.\n" #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Anda benar-benar ingin mengirim %s? [y|N]: " + +#, c-format +#~ msgid "unable to normalize object directory: %s" +#~ msgstr "tidak dapat menormalisasikan direktori objek: %s" + +#~ msgid "reset the bisection state" +#~ msgstr "setel ulang keadaan pembagian dua" + +#~ msgid "check whether bad or good terms exist" +#~ msgstr "periksa apakah ada istilah jelek atau bagus" + +#~ msgid "print out the bisect terms" +#~ msgstr "cetak istilah pembagian dua" + +#~ msgid "start the bisect session" +#~ msgstr "mulai sesi pembagian dua" + +#~ msgid "find the next bisection commit" +#~ msgstr "temukan komit pembagian dua berikutnya" + +#~ msgid "mark the state of ref (or refs)" +#~ msgstr "tandai keadaan referensi" + +#~ msgid "list the bisection steps so far" +#~ msgstr "daftar langkah pembagian dua sejauh ini" + +#~ msgid "replay the bisection process from the given file" +#~ msgstr "mainkan ulang proses pembagian dua dari berkas yang diberikan" + +#~ msgid "skip some commits for checkout" +#~ msgstr "lewati beberapa komit untuk checkout" + +#~ msgid "visualize the bisection" +#~ msgstr "visualisasikan pembagian dua" + +#~ msgid "use <cmd>... to automatically bisect" +#~ msgstr "gunakan <cmd>... untuk bagi dua otomatis." + +#~ msgid "no log for BISECT_WRITE" +#~ msgstr "tidak ada log untuk BISECT_WRITE" + +#~ msgid "Couldn't look up commit object for HEAD" +#~ msgstr "Tidak dapat mencari objek komit untuk HEAD" + +#~ msgid "git bundle create [<options>] <file> <git-rev-list args>" +#~ msgstr "git bundle create [<opsi>] <berkas> <argumen git-rev-list>" + +#, c-format +#~ msgid "options '%s' and '%s %s' cannot be used together" +#~ msgstr "opsi '%s' dan '%s %s' tidak dapat digunakan bersamaan" + +#~ msgid "git commit [<options>] [--] <pathspec>..." +#~ msgstr "git commit [<opsi>] [--] <spek jalur>..." + +#~ msgid "git fsck [<options>] [<object>...]" +#~ msgstr "git fsck [<opsi>] [<objek>...]" + +#~ msgid "git fsmonitor--daemon stop" +#~ msgstr "git fsmonitor--daemon stop" + +#~ msgid "git fsmonitor--daemon status" +#~ msgstr "git fsmonitor--daemon status" + +#~ msgid "failed to run 'git config'" +#~ msgstr "gagal menjalankan 'git config'" + +#, c-format +#~ msgid "could not get 'onto': '%s'" +#~ msgstr "tidak dapat mendapatkan 'ke': '%s'" + +#~ msgid "Could not resolve HEAD to a revision" +#~ msgstr "Tidak dapat menguraikan HEAD ke sebuah revisi" + +#, c-format +#~ msgid "missing required file: %s" +#~ msgstr "berkas yang diperlukan hilang: %s" + +#~ msgid "git revert [<options>] <commit-ish>..." +#~ msgstr "git revert [<opsi>] <mirip-komit>..." + +#~ msgid "git revert <subcommand>" +#~ msgstr "git revert <subperintah>" + +#~ msgid "git cherry-pick [<options>] <commit-ish>..." +#~ msgstr "git cherry-pick [<opsi>] <mirip-komit>..." + +#~ msgid "git cherry-pick <subcommand>" +#~ msgstr "git cherry-pick <subperintah>" + +#~ msgid "git rm [<options>] [--] <file>..." +#~ msgstr "git rm [<opsi>] [--] <berkas>..." + +#~ msgid "using --group=trailer with stdin is not supported" +#~ msgstr "mengguanakn --group=trailer dengan stdin tidak didukung" + +#~ msgid "git stash show [<options>] [<stash>]" +#~ msgstr "git stash show [<opsi>] [<stase>]" + +#~ msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" +#~ msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stase>]" + +#~ msgid "" +#~ "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +#~ " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" +#~ " [--] [<pathspec>...]]" +#~ msgstr "" +#~ "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +#~ " [-u|--include-untracked] [-a|--all] [-m|--message <pesan>]\n" +#~ " [--] [<spek jalur>...]" + +#~ msgid "" +#~ "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +#~ " [-u|--include-untracked] [-a|--all] [<message>]" +#~ msgstr "" +#~ "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +#~ " [-u|--include-untracked] [-a|--all] [<pesan>]" + +#~ msgid "path into the working tree" +#~ msgstr "jalur ke dalam pohon kerja" + +#~ msgid "recurse into submodules" +#~ msgstr "rekursi ke dalam submodul" + +#~ msgid "check if it is safe to write to the .gitmodules file" +#~ msgstr "periksa apakah itu aman untuk menulis ke berkas .gitmodules" + +#~ msgid "unset the config in the .gitmodules file" +#~ msgstr "batal setel konfigurasi dalam berkas .gitmodules" + +#~ msgid "git submodule--helper config --unset <name>" +#~ msgstr "git submodule--helper config --unset <nama>" + +#, c-format +#~ msgid "'%s' is not a valid submodule--helper subcommand" +#~ msgstr "'%s' bukan subperintah submodule--helper valid" + +#~ msgid "git upload-pack [<options>] <dir>" +#~ msgstr "git upload-pack [<opsi>] <direktori>" + +#~ msgid "git worktree add [<options>] <path> [<commit-ish>]" +#~ msgstr "git worktree add [<opsi>] <jalur> [<mirip komit>]" + +#~ msgid "git worktree lock [<options>] <path>" +#~ msgstr "git worktree lock [<opsi>] <jalur>" @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: git 2.38.0\n" +"Project-Id-Version: git 2.39.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2022-09-26 06:34+0100\n" -"PO-Revision-Date: 2022-09-26 06:35+0100\n" +"POT-Creation-Date: 2022-11-29 04:57+0000\n" +"PO-Revision-Date: 2022-11-29 22:50+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -764,6 +764,9 @@ msgstr "kommandorad avslutas med \\" msgid "unclosed quote" msgstr "citat ej stängt" +msgid "too many arguments" +msgstr "för många argument" + #, c-format msgid "unrecognized whitespace option '%s'" msgstr "okänt alternativ för whitespace: \"%s\"" @@ -2523,42 +2526,6 @@ msgstr "" "\"bisect\"-körningen misslyckades: \"git bisect--helper --bisect-state %s\" " "avslutades med felkoden %d" -msgid "reset the bisection state" -msgstr "återställ bisect-tillstånd" - -msgid "check whether bad or good terms exist" -msgstr "se efter om termer för rätt och fel finns" - -msgid "print out the bisect terms" -msgstr "skriv ut termer för bisect" - -msgid "start the bisect session" -msgstr "påbörja bisect-körningen" - -msgid "find the next bisection commit" -msgstr "hitta nästa incheckning i bisect" - -msgid "mark the state of ref (or refs)" -msgstr "markera tillståndet för en eller flera referenser" - -msgid "list the bisection steps so far" -msgstr "lista \"bisect\"-stegen som utförts så långt" - -msgid "replay the bisection process from the given file" -msgstr "spela upp \"bisect\"-processen från angiven fil" - -msgid "skip some commits for checkout" -msgstr "hoppa över ett par incheckningar" - -msgid "visualize the bisection" -msgstr "visualisera \"bisect\"-körningen" - -msgid "use <cmd>... to automatically bisect" -msgstr "använd <kommando>... för att utföra \"bisect\" automatiskt" - -msgid "no log for BISECT_WRITE" -msgstr "ingen logg för BISECT_WRITE" - msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-reset kräver antingen inget argument eller en incheckning" @@ -2577,6 +2544,9 @@ msgstr "ingen loggfil angiven" msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<flaggor>] [<rev-flaggor>] [<rev>] [--] <fil>" +msgid "git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>" +msgstr "git annotate [<flaggor>] [<rev-flaggor>] [<rev>] [--] <fil>" + msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)" @@ -2763,9 +2733,6 @@ msgstr "Misslyckades uppdatera konfigurationsfil" msgid "cannot use -a with -d" msgstr "kan inte ange -a med -d" -msgid "Couldn't look up commit object for HEAD" -msgstr "Kunde inte slå upp incheckningsobjekt för HEAD" - #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "Kan inte ta bort grenen \"%s\" som är utcheckad på \"%s\"" @@ -2804,17 +2771,18 @@ msgstr "Grenen %s ombaseras på %s" msgid "Branch %s is being bisected at %s" msgstr "Grenen %s är i en \"bisect\" på %s" -msgid "cannot copy the current branch while not on any." -msgstr "kunde inte kopiera aktuell gren när du inte befinner dig på någon." - -msgid "cannot rename the current branch while not on any." -msgstr "" -"kunde inte byta namn på aktuell gren när du inte befinner dig på någon." - #, c-format msgid "Invalid branch name: '%s'" msgstr "Felaktigt namn på gren: \"%s\"" +#, c-format +msgid "No commit on branch '%s' yet." +msgstr "Inga incheckningar på grenen \"%s\" ännu." + +#, c-format +msgid "No branch named '%s'." +msgstr "Ingen gren vid namnet \"%s\"." + msgid "Branch rename failed" msgstr "Misslyckades byta namn på gren" @@ -2962,7 +2930,7 @@ msgstr "" "propagateBranches har aktiverats" msgid "--recurse-submodules can only be used to create branches" -msgstr "--recurse-submodules jan endast användas för att skapa grenar" +msgstr "--recurse-submodules kan endast användas för att skapa grenar" msgid "branch name required" msgstr "grennamn krävs" @@ -2973,13 +2941,12 @@ msgstr "Kan inte beskriva frånkopplad HEAD" msgid "cannot edit description of more than one branch" msgstr "kan inte redigera beskrivning för mer än en gren" -#, c-format -msgid "No commit on branch '%s' yet." -msgstr "Inga incheckningar på grenen \"%s\" ännu." +msgid "cannot copy the current branch while not on any." +msgstr "kunde inte kopiera aktuell gren när du inte befinner dig på någon." -#, c-format -msgid "No branch named '%s'." -msgstr "Ingen gren vid namnet \"%s\"." +msgid "cannot rename the current branch while not on any." +msgstr "" +"kunde inte byta namn på aktuell gren när du inte befinner dig på någon." msgid "too many branches for a copy operation" msgstr "för många grenar för kopiering" @@ -3046,11 +3013,11 @@ msgid "not run from a git repository - no hooks to show\n" msgstr "körs inte från ett git-arkiv - inga krokar att visa\n" msgid "" -"git bugreport [-o|--output-directory <file>] [-s|--suffix <format>] [--" -"diagnose[=<mode>]" +"git bugreport [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n" +" [--diagnose[=<mode>]]" msgstr "" -"git bugreport [-o|--output-directory <fil>] [-s|--suffix <format>] [--" -"diagnose[=<läge>]" +"git bugreport [(-o | --output-directory) <fil>] [(-s | --suffix) <format>]\n" +" [--diagnose[=<läge>]" msgid "" "Thank you for filling out a Git bug report!\n" @@ -3124,17 +3091,23 @@ msgstr "kunde inte skriva till %s" msgid "Created new report at '%s'.\n" msgstr "Skapade ny rapport på \"%s\"\n" -msgid "git bundle create [<options>] <file> <git-rev-list args>" -msgstr "git bundle create [<flaggor>] <fil> <git-rev-list-flaggor>" +msgid "" +"git bundle create [-q | --quiet | --progress | --all-progress] [--all-" +"progress-implied]\n" +" [--version=<version>] <file> <git-rev-list-args>" +msgstr "" +"git bundle create [-q | --quiet | --progress | --all-progress] [--all-" +"progress-implied]\n" +" [--version=<version>] <fil> <git-rev-list-flaggor>" -msgid "git bundle verify [<options>] <file>" -msgstr "git bundle verify [<flaggor>] <fil>" +msgid "git bundle verify [-q | --quiet] <file>" +msgstr "git bundle verify [-q | --quiet] <fil>" msgid "git bundle list-heads <file> [<refname>...]" msgstr "git bundle list-heads <fil> [<refnamn>...]" -msgid "git bundle unbundle <file> [<refname>...]" -msgstr "git bundle unbundle <fil> [<refnamn>...]" +msgid "git bundle unbundle [--progress] <file> [<refname>...]" +msgstr "git bundle unbundle [--progress] <fil> [<refnamn>...]" msgid "do not show progress meter" msgstr "visa inte förloppsindikator" @@ -3209,12 +3182,12 @@ msgid "" "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" "objects]\n" " [--buffer] [--follow-symlinks] [--unordered]\n" -" [--textconv | --filters]" +" [--textconv | --filters] [-z]" msgstr "" "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" "objects]\n" " [--buffer] [--follow-symlinks] [--unordered]\n" -" [--textconv | --filters]" +" [--textconv | --filters] [-z]" msgid "" "git cat-file (--textconv | --filters)\n" @@ -3323,9 +3296,6 @@ msgstr "<rev> krävs med \"%s\"" msgid "<object> required with '-%c'" msgstr "<objekt> krävs med \"-%c\"" -msgid "too many arguments" -msgstr "för många argument" - #, c-format msgid "only two arguments allowed in <type> <object> mode, not %d" msgstr "endast två argument krävs i <typ> <objekt>-läge, inte %d" @@ -3858,10 +3828,10 @@ msgid "use overlay mode" msgstr "använd överläggsläge" msgid "" -"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." +"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] " +"[<pathspec>...]" msgstr "" -"git clean [-d] [-f] [-i] [-n] [-q] [-e <mönster>] [-x | -X] [--] " -"<sökvägar>..." +"git clean [-d] [-f] [-i] [-n] [-q] [-e <mönster>] [-x | -X] [--] <sökväg>..." #, c-format msgid "Removing %s\n" @@ -4151,6 +4121,10 @@ msgid "failed to start iterator over '%s'" msgstr "misslyckades starta iterator över \"%s\"" #, c-format +msgid "symlink '%s' exists, refusing to clone with --local" +msgstr "symbolisk länk \"%s\" finns redan, vägrar klona med --local" + +#, c-format msgid "failed to unlink '%s'" msgstr "misslyckades ta bort länken \"%s\"" @@ -4214,10 +4188,6 @@ msgstr "För många argument." msgid "You must specify a repository to clone." msgstr "Du måste ange ett arkiv att klona." -#, c-format -msgid "options '%s' and '%s %s' cannot be used together" -msgstr "flaggorna \"%s\" och \"%s %s\" kan inte användas samtidigt" - msgid "" "--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-" "exclude" @@ -4338,18 +4308,24 @@ msgid "--command must be the first argument" msgstr "--command måste vara första argument" msgid "" -"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" +"git commit-graph verify [--object-dir <dir>] [--shallow] [--[no-]progress]" msgstr "" -"git commit-graph verify [--object-dir <objkat>] [--shallow] [--[no-]progress]" +"git commit-graph verify [--object-dir <kat>] [--shallow] [--[no-]progress]" msgid "" -"git commit-graph write [--object-dir <objdir>] [--append] [--" -"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" -"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>" +"git commit-graph write [--object-dir <dir>] [--append]\n" +" [--split[=<strategy>]] [--reachable | --stdin-packs | " +"--stdin-commits]\n" +" [--changed-paths] [--[no-]max-new-filters <n>] [--" +"[no-]progress]\n" +" <split options>" msgstr "" -"git commit-graph write [--object-dir <objkat>] [--append] [--" -"split[=<strategi>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" -"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <delnings-flaggor>" +"git commit-graph write [--object-dir <kat>] [--append]\n" +" [--split[=<strategi>]] [--reachable | --stdin-packs | " +"--stdin-commits]\n" +" [--changed-paths] [--[no-]max-new-filters <n>] [--" +"[no-]progress]\n" +" <delnings-flaggor>" msgid "dir" msgstr "kat" @@ -4417,12 +4393,16 @@ msgstr "använd som mest en av --reachable, --stdin-commits och --stdin-packs" msgid "Collecting commits from input" msgstr "Hämtar incheckningar från indata" +msgid "git commit-tree <tree> [(-p <parent>)...]" +msgstr "git commit-tree <träd> [(-p <förälder>)...]" + msgid "" -"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " -"<file>)...] <tree>" +"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...]\n" +" [(-F <file>)...] <tree>" msgstr "" -"git commit-tree [(-p <föräldrer>)...] [-S[<nyckelid>]] [(-m " -"<meddelande>)...] [(-F <fil>)...] <träd>" +"git commit-tree [(-p <förälder>)...] [-S[<nyckelid>]] [(-m " +"<meddelande>)...]\n" +" [(-F <fil>)...] <träd>" #, c-format msgid "duplicate parent %s ignored" @@ -4464,10 +4444,29 @@ msgstr "måste ange exakt ett träd" msgid "git commit-tree: failed to read" msgstr "git commit-tree: misslyckades läsa" -msgid "git commit [<options>] [--] <pathspec>..." -msgstr "git commit [<flaggor>] [--] <sökväg>..." - -msgid "git status [<options>] [--] <pathspec>..." +msgid "" +"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" +" [--allow-empty-message] [--no-verify] [-e] [--author=<author>]\n" +" [--date=<date>] [--cleanup=<mode>] [--[no-]status]\n" +" [-i | -o] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" +" [(--trailer <token>[(=|:)<value>])...] [-S[<keyid>]]\n" +" [--] [<pathspec>...]" +msgstr "" +"git commit [-a | --interactive | --patch] [-s] [-v] [-u<läge>] [--amend]\n" +" [--dry-run] [(-c | -C | --squash) <incheckning> | --fixup [(amend|" +"reword):]<incheckning>)]\n" +" [-F <fil> | -m <medd>] [--reset-author] [--allow-empty]\n" +" [--allow-empty-message] [--no-verify] [-e] [--" +"author=<författare>]\n" +" [--date=<datum>] [--cleanup=<läge>] [--[no-]status]\n" +" [-i | -o] [--pathspec-from-file=<fil> [--pathspec-file-nul]]\n" +" [(--trailer <symbol>[(=|:)<värde>])...] [-S[<nyckel-id>]]\n" +" [--] [<sökväg>...]" + +msgid "git status [<options>] [--] [<pathspec>...]" msgstr "git status [<flaggor>] [--] <sökväg>..." msgid "" @@ -5233,11 +5232,19 @@ msgstr "\"credential-cache\" ej tillgänglig; stöd för unix-uttag saknas" msgid "unable to get credential storage lock in %d ms" msgstr "kunde inte erhålla låset för lagring av inlogginsuppgifter på %d ms" -msgid "git describe [<options>] [<commit-ish>...]" -msgstr "git describe [<flaggor>] [<incheckning-igt>...]" +msgid "" +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] [<commit-ish>...]" +msgstr "" +"git describe [--all] [--tag] [--contains] [--abbrev=<n>] [<incheckning-" +"igt>...]" + +msgid "" +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<mark>]" +msgstr "" +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<märke>]" -msgid "git describe [<options>] --dirty" -msgstr "git describe [<flaggor>] --dirty" +msgid "git describe <blob>" +msgstr "git describe <objekt>" msgid "head" msgstr "huvud" @@ -5359,11 +5366,12 @@ msgid "option '%s' and commit-ishes cannot be used together" msgstr "flaggorna \"%s\" och incheckning-igter kan inte användas samtidigt" msgid "" -"git diagnose [-o|--output-directory <path>] [-s|--suffix <format>] [--" -"mode=<mode>]" +"git diagnose [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n" +" [--mode=<mode>]" msgstr "" -"git diagnose [-o|--output-directory <sökväg>] [-s|--suffix <format>] [--" -"mode=<läge>]" +"git diagnose [(-o | --output-directory) <sökväg>] [(-s | --suffix) " +"<format>]\n" +" [--mode=<läge>]" msgid "specify a destination for the diagnostics archive" msgstr "ange mål för diagnostikarkivet" @@ -5381,6 +5389,9 @@ msgstr "--merge-base fungerar endast med två incheckningar" msgid "'%s': not a regular file or symlink" msgstr "\"%s\": inte en normal fil eller symbolisk länk" +msgid "no merge given, only parents." +msgstr "ingen sammanslagning angiven, endast föräldrar." + #, c-format msgid "invalid option: %s" msgstr "ogiltig flagga: %s" @@ -6013,8 +6024,8 @@ msgstr "visa endast referenser som innehåller incheckningen" msgid "print only refs which don't contain the commit" msgstr "visa endast referenser som inte innehåller incheckningen" -msgid "git for-each-repo --config=<config> <command-args>" -msgstr "git for-each-repo --config=<konfig> <kommandoargument>" +msgid "git for-each-repo --config=<config> [--] <arguments>" +msgstr "git for-each-repo --config=<konfig> [--] <argument>" msgid "config" msgstr "konfig" @@ -6189,8 +6200,16 @@ msgstr "icke-träd i cacheträd" msgid "%s: invalid sha1 pointer in resolve-undo" msgstr "%s: ogiltig sha1-pekare i resolve-undo" -msgid "git fsck [<options>] [<object>...]" -msgstr "git fsck [<flaggor>] [<objekt>...]" +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>...]" +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>...]" msgid "show unreachable objects" msgstr "visa onåbara objekt" @@ -6247,12 +6266,6 @@ msgstr "git fsmonitor--daemon start [<flaggor>]" msgid "git fsmonitor--daemon run [<options>]" msgstr "git fsmonitor--daemon run [<flaggor>]" -msgid "git fsmonitor--daemon stop" -msgstr "git fsmonitor--daemon stop" - -msgid "git fsmonitor--daemon status" -msgstr "git fsmonitor--daemon status" - #, c-format msgid "value of '%s' out of range: %d" msgstr "värdet för \"%s\" utanför intervallet: %d" @@ -6494,8 +6507,20 @@ 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>" -msgid "failed to run 'git config'" -msgstr "misslyckades köra \"git config\"" +#, c-format +msgid "unable to add '%s' value of '%s'" +msgstr "kan inte lägga till \"%s\"-värdet för \"%s\"" + +msgid "return success even if repository was not registered" +msgstr "returnera framgång även om arkivet inte var registrerat" + +#, c-format +msgid "unable to unset '%s' value of '%s'" +msgstr "kan inte ta bort \"%s\"-värdet för \"%s\"" + +#, c-format +msgid "repository '%s' is not registered" +msgstr "arkivet \"%s\" har inte registrerats" #, c-format msgid "failed to expand path '%s'" @@ -6783,11 +6808,14 @@ msgid "both --cached and trees are given" msgstr "både --cached och träd angavs" msgid "" -"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " -"[--] <file>..." +"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters]\n" +" [--stdin [--literally]] [--] <file>..." msgstr "" -"git hash-object [-t <typ>] [-w] [--path=<fil> | --no-filters] [--stdin] [--] " -"<fil>..." +"git hash-object [-t <typ>] [-w] [--path=<fil> | --no-filters]\n" +" [--stdin [--literally]] [--] <fil>..." + +msgid "git hash-object [-t <type>] [-w] --stdin-paths [--no-filters]" +msgstr "git hash-object [-t <typ>] [-w] --stdin-paths [--no-filters]" msgid "object type" msgstr "objekttyp" @@ -7211,11 +7239,15 @@ msgid "Initialized empty Git repository in %s%s\n" msgstr "Initierade tomt Git-arkiv i %s%s\n" msgid "" -"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" -"shared[=<permissions>]] [<directory>]" +"git init [-q | --quiet] [--bare] [--template=<template-directory>]\n" +" [--separate-git-dir <git-dir>] [--object-format=<format>]\n" +" [-b <branch-name> | --initial-branch=<branch-name>]\n" +" [--shared[=<permissions>]] [<directory>]" msgstr "" -"git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--" -"shared[=<behörigheter>]] [<katalog>]" +"git init [-q | --quiet] [--bare] [--template=<mallkatalog>]\n" +" [--separate-git-dir <git-kat>] [--object-format=<format>]\n" +" [-b <grennamn> | --initial-branch=<grennamn>]\n" +" [--shared[=<behörigheter>]] [<katalog>]" msgid "permissions" msgstr "behörigheter" @@ -7256,11 +7288,13 @@ msgid "--separate-git-dir incompatible with bare repository" msgstr "--separate-git-dir är inkompatibelt med naket arkiv" msgid "" -"git interpret-trailers [--in-place] [--trim-empty] [(--trailer " -"<token>[(=|:)<value>])...] [<file>...]" +"git interpret-trailers [--in-place] [--trim-empty]\n" +" [(--trailer <token>[(=|:)<value>])...]\n" +" [--parse] [<file>...]" msgstr "" -"git interpret-trailers [--in-place] [--trim-empty] [(--trailer " -"<symbol>[(=|:)<värde>])...] [<fil>...]" +"git interpret-trailers [--in-place] [--trim-empty]\n" +" [(--trailer <symbol>[(=|:)<värde>])...]\n" +" [--parse] [<fil>...]" msgid "edit files in place" msgstr "redigera filer på plats" @@ -7735,11 +7769,11 @@ msgstr "" msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" -" [-q | --quiet] [--exit-code] [--get-url]\n" +" [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n" " [--symref] [<repository> [<refs>...]]" msgstr "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" -" [-q | --quiet] [--exit-code] [--get-url]\n" +" [-q | --quiet] [--exit-code] [--get-url] [--sort=<nyckel>]\n" " [--symref] [<arkiv> [<referenser>...]]" msgid "do not print remote URL" @@ -7868,12 +7902,12 @@ msgstr "git merge-base [-a | --all] <incheckning> <incheckning>..." msgid "git merge-base [-a | --all] --octopus <commit>..." msgstr "git merge-base [-a | --all] --octopus <incheckning>..." -msgid "git merge-base --independent <commit>..." -msgstr "git merge-base --independent <incheckning>..." - msgid "git merge-base --is-ancestor <commit> <commit>" msgstr "git merge-base --is-ancestor <incheckning> <incheckning>" +msgid "git merge-base --independent <commit>..." +msgstr "git merge-base --independent <incheckning>..." + msgid "git merge-base --fork-point <ref> [<commit>]" msgstr "git merge-base --fork-point <ref> [<incheckning>]" @@ -7981,9 +8015,20 @@ msgstr "lista filnamn utan lägen/oid/köer" msgid "allow merging unrelated histories" msgstr "tillåt sammanslagning av orelaterade historier" +msgid "perform multiple merges, one per line of input" +msgstr "utför flera sammanslagningar, en per indatarad" + msgid "--trivial-merge is incompatible with all other options" msgstr "--trivial-merge är inkompatibelt med andra flaggor" +#, c-format +msgid "malformed input line: '%s'." +msgstr "felaktig indatarad: \"%s\"." + +#, c-format +msgid "merging cannot continue; got unclean result of %d" +msgstr "sammanslagning kan inte fortsätta; fick inte rent resultat från %d" + msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<flaggor>] [<incheckning>...]" @@ -8600,10 +8645,6 @@ msgid "cannot read note data from non-blob object '%s'." msgstr "kan inte läsa anteckningsdata från icke-blob-objektet \"%s\"." #, c-format -msgid "malformed input line: '%s'." -msgstr "felaktig indatarad: \"%s\"." - -#, c-format msgid "failed to copy notes from '%s' to '%s'" msgstr "misslyckades kopiera anteckningar från \"%s\" till \"%s\"" @@ -8794,15 +8835,13 @@ msgstr "använd anteckningar från <anteckningsref>" 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 --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 [<options>] <base-name> [< <ref-list> | < <object-list>]" msgstr "" -"git pack-objects [<flaggor>...] <basnamn> [< <reflista> | < <objektlista>]" +"git pack-objects [<flaggor>] <basnamn> [< <reflista> | < <objektlista>]" #, c-format msgid "" @@ -9176,8 +9215,8 @@ msgstr "" "oss att du fortfarande använder det på e-post till\n" "<git@vger.kernel.org>. Tack.\n" -msgid "git pack-refs [<options>]" -msgstr "git pack-refs [<flaggor>]" +msgid "git pack-refs [--all] [--no-prune]" +msgstr "git pack-refs [--all] [--no-prune]" msgid "pack everything" msgstr "packa allt" @@ -9185,6 +9224,18 @@ msgstr "packa allt" msgid "prune loose refs (default)" msgstr "ta bort lösa referenser (standard)" +msgid "git patch-id [--stable | --unstable | --verbatim]" +msgstr "git patch-id [--stable | --unstable | --verbatim]" + +msgid "use the unstable patch-id algorithm" +msgstr "använd den instabila patch-id-algoritmen" + +msgid "use the stable patch-id algorithm" +msgstr "använd den stabila patch-id-algoritmen" + +msgid "don't strip whitespace from the patch" +msgstr "ta inte bort blanksteg från patchen" + msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--progress] [--expire <tid>] [--] [<huvud>...]" @@ -9397,14 +9448,13 @@ msgstr "" msgid "" "\n" -"To avoid automatically configuring upstream branches when their name\n" -"doesn't match the local branch, see option 'simple' of branch." -"autoSetupMerge\n" +"To avoid automatically configuring an upstream branch when its name\n" +"won't match the local branch, see option 'simple' of branch.autoSetupMerge\n" "in 'git help config'.\n" msgstr "" "\n" -"För att undvika att uppströmsgrenar automatiskt konfigureras när deras\n" -"namn inte motsvarar en lokal gren, se värdet \"simple\" i branch." +"För att undvika att en uppströmsgren automatiskt konfigureras när dess namn\n" +"inte motsvarar den lokala grenen, se värdet \"simple\" i branch." "autoSetupMerge\n" "i \"git help config\".\n" @@ -9556,6 +9606,13 @@ msgstr "Sänder till %s\n" msgid "failed to push some refs to '%s'" msgstr "misslyckades sända vissa referenser till \"%s\"" +msgid "" +"recursing into submodule with push.recurseSubmodules=only; using on-demand " +"instead" +msgstr "" +"rekurserar in i undermoduler med push.recurseSubmodules=only; använder " +"istället vid behov" + #, c-format msgid "invalid value for '%s'" msgstr "ogiltigt värde för \"%s\"" @@ -9691,13 +9748,15 @@ msgid "need two commit ranges" msgstr "behöver två incheckningsintervall" msgid "" -"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " -"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-" -"ish1> [<tree-ish2> [<tree-ish3>]])" +"git read-tree [(-m [--trivial] [--aggressive] | --reset | --" +"prefix=<prefix>)\n" +" [-u | -i]] [--index-output=<file>] [--no-sparse-checkout]\n" +" (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" msgstr "" -"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " -"[-u | -i]] [--no-sparse-checkout] [--index-output=<fil>] (--empty | <träd-" -"igt1> [<träd-igt2> [<träd-igt3>]])" +"git read-tree [(-m [--trivial] [--aggressive] | --reset | --" +"prefix=<prefix>)\n" +" [-u | -i]] [--index-output=<fil>] [--no-sparse-checkout]\n" +" (--empty | <träd-igt1> [<träd-igt2> [<träd-igt3>]])" msgid "write resulting index to <file>" msgstr "skriv resulterande index till <fil>" @@ -9787,12 +9846,12 @@ msgid "%s requires the merge backend" msgstr "%s kräver \"merge\"-bakändan" #, c-format -msgid "could not get 'onto': '%s'" -msgstr "kunde inte hämta \"onto\": \"%s\"" +msgid "invalid onto: '%s'" +msgstr "ogiltig \"onto\": \"%s\"" #, c-format msgid "invalid orig-head: '%s'" -msgstr "ogiltigt orig-head: \"%s\"" +msgstr "ogiltig \"orig-head\": \"%s\"" #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" @@ -10091,8 +10150,8 @@ msgstr "ingen sådan gren/incheckning: \"%s\"" msgid "No such ref: %s" msgstr "Ingen sådan referens: %s" -msgid "Could not resolve HEAD to a revision" -msgstr "Kunde inte bestämma HEAD:s incheckning" +msgid "Could not resolve HEAD to a commit" +msgstr "Kunde inte bestämma en incheckning för HEAD" #, c-format msgid "'%s': need exactly one merge base with branch" @@ -10746,6 +10805,10 @@ msgstr "kunde inte öppna temporär fil %s för skrivning" msgid "could not close refs snapshot tempfile" msgstr "kunde inte stänga temporär fil för refs-ögonblicksbild" +#, c-format +msgid "could not remove stale bitmap: %s" +msgstr "kunde inte ta bort gammal bitkarta: %s" + msgid "pack everything in a single pack" msgstr "packa allt i ett enda paket" @@ -10818,6 +10881,9 @@ msgstr "hitta ett geometrisk förlopp med faktor <N>" msgid "write a multi-pack index of the resulting packs" msgstr "skriv ett flerpaketsindex för de skapade paketen" +msgid "pack prefix to store a pack containing pruned objects" +msgstr "paketprefix att lagra ett paket som innehåller bortrensade objekt" + msgid "cannot delete packs in a precious-objects repo" msgstr "kan inte ta bort paket i ett \"precious-objects\"-arkiv" @@ -10829,8 +10895,12 @@ msgid "pack prefix %s does not begin with objdir %s" msgstr "paketprefixet %s börjar inte med objkat %s" #, c-format -msgid "missing required file: %s" -msgstr "nödvändig fil saknas: %s" +msgid "renaming pack to '%s' failed" +msgstr "misslyckades byta namn på paket till \"%s\"" + +#, c-format +msgid "pack-objects did not write a '%s' file for pack %s-%s" +msgstr "pack-objects skrev inte en \"%s\"-fil för paketet %s-%s" #, c-format msgid "could not unlink: %s" @@ -11024,8 +11094,10 @@ msgstr "--convert-graft-file tar inga argument" msgid "only one pattern can be given with -l" msgstr "endast ett mönster kan anges med -l" -msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" -msgstr "git rerere [clear | forget <path>... | status | remaining | diff | gc]" +msgid "" +"git rerere [clear | forget <pathspec>... | diff | status | remaining | gc]" +msgstr "" +"git rerere [clear | forget <sökväg>... | diff | status | remaining | gc]" msgid "register clean resolutions in index" msgstr "registrera rena lösningar i indexet" @@ -11229,6 +11301,15 @@ msgstr "--prefix kräver ett argument" msgid "unknown mode for --abbrev-ref: %s" msgstr "okänt läge för --abbrev-ref: %s" +msgid "--exclude-hidden cannot be used together with --branches" +msgstr "--exclude-hidden kan endast användas tillsammans med --branches" + +msgid "--exclude-hidden cannot be used together with --tags" +msgstr "--exclude-hidden kan kan inte användas tillsammans med --tags" + +msgid "--exclude-hidden cannot be used together with --remotes" +msgstr "--exclude-hidden kan kan inte användas tillsammans med --remotes" + msgid "this operation must be run in a work tree" msgstr "funktionen måste köras i en arbetskatalog" @@ -11236,17 +11317,25 @@ msgstr "funktionen måste köras i en arbetskatalog" msgid "unknown mode for --show-object-format: %s" msgstr "okänt läge för --show-object-format: %s" -msgid "git revert [<options>] <commit-ish>..." -msgstr "git revert [<flaggor>] <incheckning-igt>..." +msgid "" +"git revert [--[no-]edit] [-n] [-m <parent-number>] [-s] [-S[<keyid>]] " +"<commit>..." +msgstr "" +"git revert [--[no-]edit] [-n] [-m <förälder-nummer>] [-s] [-S[<nyckelid>]] " +"<incheckning>..." -msgid "git revert <subcommand>" -msgstr "git revert <underkommando>" +msgid "git revert (--continue | --skip | --abort | --quit)" +msgstr "git revert (--continue | --skip | --abort | --quit)" -msgid "git cherry-pick [<options>] <commit-ish>..." -msgstr "git cherry-pick [<flaggor>] <incheckning-igt>..." +msgid "" +"git cherry-pick [--edit] [-n] [-m <parent-number>] [-s] [-x] [--ff]\n" +" [-S[<keyid>]] <commit>..." +msgstr "" +"git cherry-pick [--edit] [-n] [-m <förälder-nummer>] [-s] [-x] [--ff]\n" +" [-S[<nyckelid>]] <incheckning>..." -msgid "git cherry-pick <subcommand>" -msgstr "git cherry-pick <underkommando>" +msgid "git cherry-pick (--continue | --skip | --abort | --quit)" +msgstr "git cherry-pick (--continue | --skip | --abort | --quit)" #, c-format msgid "option `%s' expects a number greater than zero" @@ -11307,8 +11396,14 @@ msgstr "\"revert\" misslyckades" msgid "cherry-pick failed" msgstr "\"cherry-pick\" misslyckades" -msgid "git rm [<options>] [--] <file>..." -msgstr "git rm [<flaggor>] [--] <fil>..." +msgid "" +"git rm [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n" +" [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" +" [--] [<pathspec>...]" +msgstr "" +"git rm [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n" +" [--quiet] [--pathspec-from-file=<fil> [--pathspec-file-nul]]\n" +" [--] [<sökväg>...]" msgid "" "the following file has staged content different from both the\n" @@ -11379,11 +11474,13 @@ msgid "" "git send-pack [--mirror] [--dry-run] [--force]\n" " [--receive-pack=<git-receive-pack>]\n" " [--verbose] [--thin] [--atomic]\n" +" [--[no-]signed | --signed=(true|false|if-asked)]\n" " [<host>:]<directory> (--all | <ref>...)" msgstr "" "git send-pack [--mirror] [--dry-run] [--force]\n" " [--receive-pack=<git-receive-pack>]\n" " [--verbose] [--thin] [--atomic]\n" +" [--[no-]signed | --signed=(true|false|if-asked)]\n" " [<värd>:]<katalog> (--all | <ref>...)" msgid "remote name" @@ -11407,8 +11504,9 @@ msgstr "git log --pretty=short | git shortlog [<flaggor>]" msgid "using multiple --group options with stdin is not supported" msgstr "mer än en \"--group\"-flagga stöds inte med standard in" -msgid "using --group=trailer with stdin is not supported" -msgstr "att använda --group=trailer stöds inte med standard in" +#, c-format +msgid "using %s with stdin is not supported" +msgstr "använda %s med standard in stöds inte" #, c-format msgid "unknown group type: %s" @@ -11445,12 +11543,14 @@ msgid "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" " [--current] [--color[=<when>] | --no-color] [--sparse]\n" " [--more=<n> | --list | --independent | --merge-base]\n" -" [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" +" [--no-name | --sha1-name] [--topics]\n" +" [(<rev> | <glob>)...]" msgstr "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" " [--current] [--color[=<när>] | --no-color] [--sparse]\n" " [--more=<n> | --list | --independent | --merge-base]\n" -" [--no-name | --sha1-name] [--topics] [(<rev> | <mönster>)...]" +" [--no-name | --sha1-name] [--topics]\n" +" [(<rev> | <mönster>)...]" msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g | --reflog)[=<n>[,<bas>]] [--list] [<ref>]" @@ -11550,11 +11650,13 @@ msgid "Unknown hash algorithm" msgstr "okänd hashningsalgoritm" msgid "" -"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference]\n" +" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n" +" [--heads] [--] [<pattern>...]" msgstr "" -"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<mönster>...]" +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference]\n" +" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n" +" [--heads] [--] [<mönster>...]" msgid "git show-ref --exclude-existing[=<pattern>]" msgstr "git show-ref --exclude-existing[=<mönster>]" @@ -11583,8 +11685,10 @@ msgstr "visa inte resultat på standard ut (användbart med --verify)" msgid "show refs from stdin that aren't in local repository" msgstr "visa referenser från standard in som inte finns i lokalt arkiv" -msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" -msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <flaggor>" +msgid "" +"git sparse-checkout (init | list | set | add | reapply | disable) [<options>]" +msgstr "" +"git sparse-checkout (init | list | set | add | reapply | disable) <flaggor>" msgid "this worktree is not sparse" msgstr "arbetskatalogen är inte gren" @@ -11707,67 +11811,58 @@ msgstr "" msgid "error while refreshing working directory" msgstr "fel vid uppdatering av arbetskatalog" -msgid "git stash list [<options>]" -msgstr "git stash list [<flaggor>]" +msgid "git stash list [<log-options>]" +msgstr "git stash list [<\"log\"-flaggor>]" + +msgid "" +"git stash show [-u | --include-untracked | --only-untracked] [<diff-" +"options>] [<stash>]" +msgstr "" +"git stash show [-u | --include-untracked | --only-untracked] [<\"diff\"-" +"flaggor>] [<stash>]" -msgid "git stash show [<options>] [<stash>]" -msgstr "git stash show [<flaggor>] [<stash>]" +msgid "git stash drop [-q | --quiet] [<stash>]" +msgstr "git stash drop [-q | --quiet] [<stash>]" -msgid "git stash drop [-q|--quiet] [<stash>]" -msgstr "git stash drop [-q|--quiet] [<stash>]" +msgid "git stash pop [--index] [-q | --quiet] [<stash>]" +msgstr "git stash pop [--index] [-q | --quiet] [<stash>]" -msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" -msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" +msgid "git stash apply [--index] [-q | --quiet] [<stash>]" +msgstr "git stash apply [--index] [-q | --quiet] [<stash>]" msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <grennamn> [<stash>]" +msgid "git stash store [(-m | --message) <message>] [-q | --quiet] <commit>" +msgstr "" +"git stash store [(-m | --message) <meddelande>] [-q | --quiet] <incheckning>" + msgid "" -"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" -"quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" +"git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q " +"| --quiet]\n" +" [-u | --include-untracked] [-a | --all] [(-m | --message) " +"<message>]\n" " [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" " [--] [<pathspec>...]]" msgstr "" -"git stash [push [-p|--patch] [S|--staged] [-k|--[no-]keep-index] [-q|--" -"quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <meddelande>]\n" +"git stash [push [-p | --patch] [S | --staged] [-k | --[no-]keep-index] [-q | " +"--quiet]\n" +" [-u | --include-untracked] [-a | --all] [(-m | --message " +"<meddelande>]\n" " [--pathspec-from-file=<fil> [--pathspec-file-nul]]\n" " [--] [<sökväg>...]]" msgid "" -"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" -"quiet]\n" -" [-u|--include-untracked] [-a|--all] [<message>]" +"git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | " +"--quiet]\n" +" [-u | --include-untracked] [-a | --all] [<message>]" msgstr "" -"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" -"quiet]\n" -" [-u|--include-untracked] [-a|--all] [<meddelande>]" +"git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | " +"--quiet]\n" +" [-u | --include-untracked] [-a | --all] [<meddelande>]" -msgid "git stash pop [--index] [-q|--quiet] [<stash>]" -msgstr "git stash pop [--index] [-q|--quiet] [<stash>]" - -msgid "git stash apply [--index] [-q|--quiet] [<stash>]" -msgstr "git stash apply [--index] [-q|--quiet] [<stash>]" - -msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" -msgstr "git stash store [-m|--message <meddelande>] [-q|--quiet] <incheckning>" - -msgid "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" -" [--] [<pathspec>...]]" -msgstr "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <meddelande>]\n" -" [--] [<sökväg>...]]" - -msgid "" -"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [<message>]" -msgstr "" -"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [<meddelande>]" +msgid "git stash create [<message>]" +msgstr "git stash create [<meddelande>]" #, c-format msgid "'%s' is not a stash-like commit" @@ -12327,9 +12422,6 @@ msgstr "traversera undermoduler rekursivt" msgid "don't fetch new objects from the remote site" msgstr "hämta inte nya objekt från fjärrplatsen" -msgid "path into the working tree" -msgstr "sökväg inuti arbetskatalogen" - msgid "use the 'checkout' update strategy (default)" msgstr "använd uppdateringsstrategin \"checkout\" (utcheckning; förval)" @@ -12365,27 +12457,9 @@ msgstr "" "[no-]recommend-shallow] [--reference <arkiv>] [--recursive] [--[no-]single-" "branch] [--] [<sökväg>...]" -msgid "recurse into submodules" -msgstr "rekursera ner i undermoduler" - msgid "git submodule absorbgitdirs [<options>] [<path>...]" msgstr "git submodule absorbgitdirs [<flaggor>] [<sökväg>...]" -msgid "check if it is safe to write to the .gitmodules file" -msgstr "se om det är säkert att skriva till .gitmodules-filen" - -msgid "unset the config in the .gitmodules file" -msgstr "ta bort konfigurationen från .gitmodules-filen" - -msgid "git submodule--helper config <name> [<value>]" -msgstr "git submodule--helper config <namn> [<värde>]" - -msgid "git submodule--helper config --unset <name>" -msgstr "git submodule--helper config --unset <namn>" - -msgid "please make sure that the .gitmodules file is in the working tree" -msgstr "se till att .gitmodules finns i arbetskatalogen" - msgid "suppress output for setting url of a submodule" msgstr "dölj utdata från inställning av url för undermodul" @@ -12464,6 +12538,9 @@ msgstr "Aktiverar lokal git-katalog för undermodulen \"%s\" på nytt.\n" msgid "unable to checkout submodule '%s'" msgstr "Kan inte checka ut undermodulen \"%s\"" +msgid "please make sure that the .gitmodules file is in the working tree" +msgstr "se till att .gitmodules finns i arbetskatalogen" + #, c-format msgid "Failed to add submodule '%s'" msgstr "Misslyckades lägga till undermodulen \"%s\"" @@ -12514,19 +12591,21 @@ msgstr "arkiv-URL: \"%s\" måste vara absolut eller börja med ./|../" msgid "'%s' is not a valid submodule name" msgstr "\"%s\" är inte ett giltigt namn på undermodul" +msgid "git submodule--helper <command>" +msgstr "git submodule--helper <kommando>" + #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s stöder inte --super-prefix" -#, c-format -msgid "'%s' is not a valid submodule--helper subcommand" -msgstr "\"%s\" är inte ett giltigt underkommando till submodule--helper" +msgid "git symbolic-ref [-m <reason>] <name> <ref>" +msgstr "git symbolic-ref [-m <orsak>] <namn> <ref>" -msgid "git symbolic-ref [<options>] <name> [<ref>]" -msgstr "git symbolic-ref [<flaggor>] <namn> [<ref>]" +msgid "git symbolic-ref [-q] [--short] [--no-recurse] <name>" +msgstr "git symbolic-ref [-q] [--short] [--no-recurse] <namn>" -msgid "git symbolic-ref -d [-q] <name>" -msgstr "git symbolic-ref -d [-q] <namn>" +msgid "git symbolic-ref --delete [-q] <name>" +msgstr "git symbolic-ref --delete [-q] <namn>" msgid "suppress error message for non-symbolic (detached) refs" msgstr "" @@ -12538,6 +12617,9 @@ msgstr "ta bort symbolisk referens" msgid "shorten ref output" msgstr "förkorta ref-utdata" +msgid "recursively dereference (default)" +msgstr "avreferera rekursivt (standard)" + msgid "reason" msgstr "skäl" @@ -12545,25 +12627,26 @@ msgid "reason of the update" msgstr "skäl till uppdateringen" msgid "" -"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n" -" <tagname> [<head>]" +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n" +" <tagname> [<commit> | <object>]" msgstr "" -"git tag [-a | -s | -u <nyckel-id>] [-f] [-m <medd> | -F <fil>]\n" -" <taggnamn> [<huvud>]" +"git tag [-a | -s | -u <nyckel-id>] [-f] [-m <medd> | -F <fil>] [-e]\n" +" <taggnamn> [<incheckning> | <objekt>]" msgid "git tag -d <tagname>..." msgstr "git tag -d <taggnamn>..." msgid "" -"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" -"points-at <object>]\n" -" [--format=<format>] [--merged <commit>] [--no-merged <commit>] " -"[<pattern>...]" +"git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]\n" +" [--points-at <object>] [--column[=<options>] | --no-column]\n" +" [--create-reflog] [--sort=<key>] [--format=<format>]\n" +" [--merged <commit>] [--no-merged <commit>] [<pattern>...]" msgstr "" -"git tag -l [-n[<antal>]] [--contains <incheckning>] [--no-contains " -"<incheckning>] [--points-at <objekt>]\n" -" [--format=<format>] [--merged <incheckning>] [--no-merged " -"<incheckning>] [<mönster>...]" +"git tag [-n[<antal>]] -l [--contains <incheckning>] [--no-contains " +"<incheckning>\n" +" [--points-at <objekt>] [--column[=<flaggor>] | --no-column]\n" +" [--create-reflog] [--sort=<nyckel>] [--format=<format>]\n" +" [--merged <incheckning>] [--no-merged <incheckning>] [<mönster>...]" msgid "git tag -v [--format=<format>] <tagname>..." msgstr "git tag -v [--format=<format>] <taggnamn>..." @@ -12938,8 +13021,12 @@ msgstr "läs uppdateringar från standard in" msgid "update the info files from scratch" msgstr "uppdatera informationsfilerna från grunden" -msgid "git upload-pack [<options>] <dir>" -msgstr "git upload-pack [<flaggor>] <katalog>" +msgid "" +"git-upload-pack [--[no-]strict] [--timeout=<n>] [--stateless-rpc]\n" +" [--advertise-refs] <directory>" +msgstr "" +"git-upload-pack [--[no-]strict] [--timeout=<n>] [--stateless-rpc]\n" +" [--advertise-refs] <katalog>" msgid "quit after a single request/response exchange" msgstr "avsluta omedelbart efter första anrop/svar-utväxling" @@ -12953,8 +13040,8 @@ msgstr "testa inte <katalog>/.git/ om <katalog> inte är en Git-katalog" msgid "interrupt transfer after <n> seconds of inactivity" msgstr "avbryt överföringen efter <n> sekunders inaktivitet" -msgid "git verify-commit [-v | --verbose] <commit>..." -msgstr "git verify-commit [-v | --verbose] <incheckning>..." +msgid "git verify-commit [-v | --verbose] [--raw] <commit>..." +msgstr "git verify-commit [-v | --verbose] [--raw] <incheckning>..." msgid "print commit contents" msgstr "visa innehåll för incheckning" @@ -12962,8 +13049,9 @@ msgstr "visa innehåll för incheckning" msgid "print raw gpg status output" msgstr "visa råa gpg-statusdata" -msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." -msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <paket>..." +msgid "git verify-pack [-v | --verbose] [-s | --stat-only] [--] <pack>.idx..." +msgstr "" +"git verify-pack [-v | --verbose] [-s | --stat-only] [--] <paket>.idx..." msgid "verbose" msgstr "pratsam" @@ -12971,35 +13059,39 @@ msgstr "pratsam" msgid "show statistics only" msgstr "visa endast statistik" -msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." -msgstr "git verify-tag [-v | --verbose] [--format=<format>] <tagg>..." +msgid "git verify-tag [-v | --verbose] [--format=<format>] [--raw] <tag>..." +msgstr "git verify-tag [-v | --verbose] [--format=<format>] [--raw] <tagg>..." msgid "print tag contents" msgstr "visa innehåll för tag" -msgid "git worktree add [<options>] <path> [<commit-ish>]" -msgstr "git worktree add [<flaggor>] <sökväg> [<incheckning-igt>]" +msgid "" +"git worktree add [-f] [--detach] [--checkout] [--lock [--reason <string>]]\n" +" [-b <new-branch>] <path> [<commit-ish>]" +msgstr "" +"git worktree add [-f] [--detach] [--checkout] [--lock [--reason <sträng>]]\n" +" [-b <ny-gren>] <sökväg> [<incheckning-igt>]" -msgid "git worktree list [<options>]" -msgstr "git worktree list [<flaggor>]" +msgid "git worktree list [-v | --porcelain [-z]]" +msgstr "git worktree list [-v | --porcelain [-z]]" -msgid "git worktree lock [<options>] <path>" -msgstr "git worktree lock [<flaggor>] <sökväg>" +msgid "git worktree lock [--reason <string>] <worktree>" +msgstr "git worktree lock [--reason <sträng>] <arbetskatalog>" msgid "git worktree move <worktree> <new-path>" msgstr "git worktree move <arbetskatalog> <ny-sökväg>" -msgid "git worktree prune [<options>]" -msgstr "git worktree prune [<flaggor>]" +msgid "git worktree prune [-n] [-v] [--expire <expire>]" +msgstr "git worktree prune [-n] [-v] [--expire <utgår>]" -msgid "git worktree remove [<options>] <worktree>" -msgstr "git worktree remove [<flaggor>] <arbetskatalog>" +msgid "git worktree remove [-f] <worktree>" +msgstr "git worktree remove [-f] <arbetskatalog>" msgid "git worktree repair [<path>...]" msgstr "git worktree repair [<sökväg>...]" -msgid "git worktree unlock <path>" -msgstr "git worktree unlock <sökväg>" +msgid "git worktree unlock <worktree>" +msgstr "git worktree unlock <arbetskatalog>" #, c-format msgid "Removing %s/%s: %s" @@ -13235,6 +13327,10 @@ msgstr "endast användbart vid felsökning" msgid "core.fsyncMethod = batch is unsupported on this platform" msgstr "core.fsyncMethod = batch stöds inte på denna plattform" +#, c-format +msgid "bundle list at '%s' has no mode" +msgstr "buntlistan på \"%s\" har inget läge" + msgid "failed to create temporary file" msgstr "misslyckades skapa temporär fil" @@ -13242,16 +13338,29 @@ msgid "insufficient capabilities" msgstr "otillräckliga kapabiliteter" #, c-format +msgid "unrecognized bundle mode from URI '%s'" +msgstr "okänt buntlägre från URI:en \"%s\"" + +#, c-format +msgid "exceeded bundle URI recursion limit (%d)" +msgstr "överskred buntens URI-rekursionsgräns (%d)" + +#, c-format msgid "failed to download bundle from URI '%s'" msgstr "kunde inte hämta bunt från URI:en \"%s\"" #, c-format -msgid "file at URI '%s' is not a bundle" -msgstr "filen på URI \"%s\" är inte en bunt" +msgid "file at URI '%s' is not a bundle or bundle list" +msgstr "filen på URI:en \"%s\" är inte en bunt eller buntlista" -#, c-format -msgid "failed to unbundle bundle from URI '%s'" -msgstr "misslyckades packa upp bunten från URI:en \"%s\"" +msgid "bundle-uri: got an empty line" +msgstr "bunt-uri: fick en tom rad" + +msgid "bundle-uri: line is not of the form 'key=value'" +msgstr "bunt-uri: raden är inte på formen \"nyckel=värde\"" + +msgid "bundle-uri: line has empty key or value" +msgstr "bunt-uri: raden har tom nyckel eller värde" #, c-format msgid "unrecognized bundle hash algorithm: %s" @@ -13822,7 +13931,7 @@ msgstr "Filformat för bunt" msgid "Chunk-based file formats" msgstr "Styckebaserade filformat" -msgid "Git commit graph format" +msgid "Git commit-graph format" msgstr "Format för Git-incheckningsgraf" msgid "Git index format" @@ -14175,6 +14284,10 @@ msgstr "ohanterat fall i \"has_worktree_moved\": %d" msgid "health thread wait failed [GLE %ld]" msgstr "misslyckades vänta på hälsotråden [GLE %ld]" +#, c-format +msgid "Invalid path: %s" +msgstr "ogiltig sökväg: %s" + msgid "Unable to create FSEventStream." msgstr "kunde inte skapa FSEventStream." @@ -14206,6 +14319,22 @@ msgid "could not read directory changes [GLE %ld]" msgstr "kunde inte läsa katalogändringar [GLE %ld]" #, c-format +msgid "opendir('%s') failed" +msgstr "opendir('%s') misslyckades" + +#, c-format +msgid "lstat('%s') failed" +msgstr "lstat('%s') misslyckades" + +#, c-format +msgid "strbuf_readlink('%s') failed" +msgstr "strbuf_readlink('%s') misslyckades" + +#, c-format +msgid "closedir('%s') failed" +msgstr "closedir('%s') misslyckades" + +#, c-format msgid "[GLE %ld] unable to open for read '%ls'" msgstr "[GLE %ld] kunde inte öppna \"%ls\" för läsning" @@ -15804,10 +15933,11 @@ msgstr "det virtuella arkivet \"%s\" är inkompatibelt med fsmonitor" #, c-format msgid "" -"repository '%s' is incompatible with fsmonitor due to lack of Unix sockets" +"socket directory '%s' is incompatible with fsmonitor due to lack of Unix " +"sockets support" msgstr "" -"arkivet \"%s\" är inkompatibelt med fsmonitor på grund av avsaknad av Unix-" -"uttag" +"uttagskatalogen \"%s\" är inkompatibelt med fsmonitor på grund av avsaknad " +"av Unix-uttag" msgid "" "git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]\n" @@ -16128,8 +16258,8 @@ msgstr[1] "" "\n" "Mest lika kommandon är" -msgid "git version [<options>]" -msgstr "git version [<flaggor>]" +msgid "git version [--build-options]" +msgstr "git version [--build-options]" #, c-format msgid "%s: %s - %s" @@ -17041,10 +17171,6 @@ msgstr "kunde inte normalisera supplerande objektsökväg: %s" msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s: ignorerar supplerande objektlager, för djup nästling" -#, c-format -msgid "unable to normalize object directory: %s" -msgstr "kan inte normalisera objektkatalogen: %s" - msgid "unable to fdopen alternates lockfile" msgstr "kan inte utföra \"fdopen\" på suppleantlåsfil" @@ -17867,6 +17993,10 @@ msgstr "" msgid "promisor remote name cannot begin with '/': %s" msgstr "kontraktsfjärr kan inte börja med \"/\": %s" +#, c-format +msgid "could not fetch %s from promisor remote" +msgstr "kunde inte hämta %s från kontraktsfjärr" + msgid "object-info: expected flush after arguments" msgstr "object-info: förväntade \"flush\" efter argument" @@ -18937,6 +19067,13 @@ msgid "failed to find tree of %s" msgstr "kunde inte hitta trädet för %s." #, c-format +msgid "unsupported section for hidden refs: %s" +msgstr "sktionen för dolda referenser stöds ej: %s" + +msgid "--exclude-hidden= passed more than once" +msgstr "--exclude-hidden= angavs mer än en gång" + +#, c-format msgid "resolve-undo records `%s` which is missing" msgstr "resolve-undo registrerar \"%s\" som saknas" @@ -19080,6 +19217,14 @@ msgid "--all or <enlistment>, but not both" msgstr "--all eller <enrollering>, men inte bägge" #, c-format +msgid "could not remove stale scalar.repo '%s'" +msgstr "kunde inte ta bort gammal scalar.repo \"%s\"" + +#, c-format +msgid "removing stale scalar.repo '%s'" +msgstr "tar bort gammal scalar.repo \"%s\"" + +#, c-format msgid "git repository gone in '%s'" msgstr "git-arkiv försvunnet i \"%s\"" @@ -19702,16 +19847,16 @@ msgstr "" msgid "illegal label name: '%.*s'" msgstr "ogiltigt etikettnamn: \"%.*s\"" +#, c-format +msgid "could not resolve '%s'" +msgstr "kunde inte upplösa \"%s\"" + msgid "writing fake root commit" msgstr "skriver fejkad rotincheckning" msgid "writing squash-onto" msgstr "skriver squash-onto" -#, c-format -msgid "could not resolve '%s'" -msgstr "kunde inte upplösa \"%s\"" - msgid "cannot merge without a current revision" msgstr "kan inte slå ihop utan en aktuell incheckning" @@ -20308,6 +20453,15 @@ msgstr "ls-tree returnerade en oväntad returkod %d" msgid "failed to lstat '%s'" msgstr "misslyckades ta status (lstat) på \"%s\"" +msgid "test-tool cache-tree <options> (control|prime|update)" +msgstr "test-tool cache-tree <flaggor> (control|prime|update)" + +msgid "clear the cache tree before each iteration" +msgstr "töm cacheträdet före varje iteration" + +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 "unhandled options" msgstr "flaggor som inte hanterats" @@ -92,8 +92,8 @@ msgid "" msgstr "" "Project-Id-Version: Git Turkish Localization Project\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2022-09-28 10:54+0300\n" -"PO-Revision-Date: 2022-09-28 14:00+0300\n" +"POT-Creation-Date: 2022-12-07 17:32+0300\n" +"PO-Revision-Date: 2022-12-07 18:00+0300\n" "Last-Translator: Emir SARI <emir_sari@icloud.com>\n" "Language-Team: Turkish (https://github.com/bitigchi/git-po/)\n" "Language: tr\n" @@ -840,6 +840,9 @@ msgstr "komut satırı \\ ile bitiyor" msgid "unclosed quote" msgstr "kapatılmamış tırnak" +msgid "too many arguments" +msgstr "pek fazla argüman" + #, c-format msgid "unrecognized whitespace option '%s'" msgstr "tanımlanamayan boşluk seçeneği '%s'" @@ -1880,7 +1883,7 @@ msgid "allow updating entries outside of the sparse-checkout cone" msgstr "aralıklı çıkış konisi dışındaki girdileri güncellemeye izin ver" msgid "override the executable bit of the listed files" -msgstr "listelenen dosyaların çalıştırılabilir kısımlarını geçersiz kıl" +msgstr "listelenen dosyaların yürütülebilir kısımlarını geçersiz kıl" msgid "warn when adding an embedded repository" msgstr "gömülü bir depo eklenirken uyar" @@ -2597,42 +2600,6 @@ msgstr "" "ikili arama çalıştırılamadı: 'git bisect--helper --bisect-state %s', %d hata " "koduyla çıktı" -msgid "reset the bisection state" -msgstr "ikili arama durumunu sıfırla" - -msgid "check whether bad or good terms exist" -msgstr "iyi veya kötü terimlerin olup olmadığını denetle" - -msgid "print out the bisect terms" -msgstr "ikili arama terimlerini yazdır" - -msgid "start the bisect session" -msgstr "ikili arama oturumunu başlat" - -msgid "find the next bisection commit" -msgstr "bir sonraki ikili arama işlemesini bul" - -msgid "mark the state of ref (or refs)" -msgstr "başvurunun (veya başvuruların) durumunu imle" - -msgid "list the bisection steps so far" -msgstr "şu ana kadarki ikili arama durumunu listele" - -msgid "replay the bisection process from the given file" -msgstr "verilen dosyadan ikili arama işlemini yeniden oynat" - -msgid "skip some commits for checkout" -msgstr "çıkış için birkaç işlemeyi atla" - -msgid "visualize the bisection" -msgstr "ikili aramayı görselleştir" - -msgid "use <cmd>... to automatically bisect" -msgstr "kendiliğinden ikili aramak için <komut>... kullan" - -msgid "no log for BISECT_WRITE" -msgstr "BISECT_WRITE için günlük yok" - msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-reset bir argüman veya işleme gerektirmiyor" @@ -2651,6 +2618,9 @@ msgstr "hiçbir günlük dosyası verilmedi" msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<seçenekler>] [<rev-sçnk>] [<rev>] [--] <dosya>" +msgid "git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>" +msgstr "git annotate [<seçenekler>] [<rev-sçnk>] [<rev>] [--] <dosya>" + msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<rev-sçnk>, git-rev-list(1) içinde belgelendirilmiştir" @@ -2838,9 +2808,6 @@ msgstr "config-file güncellemesi başarısız" msgid "cannot use -a with -d" msgstr "-a, -d ile kullanılamıyor" -msgid "Couldn't look up commit object for HEAD" -msgstr "HEAD için işleme nesnesi aranamadı" - #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "'%s' dalı silinemiyor, şurada çıkış yapılmış: '%s'" @@ -2879,16 +2846,18 @@ msgstr "%s dalı %s konumunda yeniden temellendiriliyor" msgid "Branch %s is being bisected at %s" msgstr "%s dalı %s konumunda ikili aranıyor" -msgid "cannot copy the current branch while not on any." -msgstr "Bir dalın üzerinde değilken geçerli dal kopyalanamaz." - -msgid "cannot rename the current branch while not on any." -msgstr "Bir dalın üzerinde değilken geçerli dal yeniden adlandırılamaz." - #, c-format msgid "Invalid branch name: '%s'" msgstr "Geçersiz dal adı: '%s'" +#, c-format +msgid "No commit on branch '%s' yet." +msgstr "'%s' dalında henüz bir işleme yok." + +#, c-format +msgid "No branch named '%s'." +msgstr "'%s' adında bir dal yok." + msgid "Branch rename failed" msgstr "Dal yeniden adlandırması başarısız" @@ -3047,22 +3016,20 @@ msgstr "Ayrılmış HEAD'e açıklama verilemiyor" msgid "cannot edit description of more than one branch" msgstr "birden çok dalın açıklaması düzenlenemiyor" -#, c-format -msgid "No commit on branch '%s' yet." -msgstr "'%s' dalında henüz bir işleme yok." +msgid "cannot copy the current branch while not on any." +msgstr "Bir dalın üzerinde değilken geçerli dal kopyalanamaz." -#, c-format -msgid "No branch named '%s'." -msgstr "'%s' adında bir dal yok." +msgid "cannot rename the current branch while not on any." +msgstr "Bir dalın üzerinde değilken geçerli dal yeniden adlandırılamaz." msgid "too many branches for a copy operation" -msgstr "bir kopyalama işlemi için çok fazla dal" +msgstr "bir kopyalama işlemi için pek fazla dal" msgid "too many arguments for a rename operation" -msgstr "bir yeniden adlandırma işlemi için çok fazla argüman" +msgstr "bir yeniden adlandırma işlemi için pek fazla argüman" msgid "too many arguments to set new upstream" -msgstr "yeni üstkaynak ayarlamak için çok fazla argüman" +msgstr "yeni üstkaynak ayarlamak için pek fazla argüman" #, c-format msgid "" @@ -3080,7 +3047,7 @@ msgid "branch '%s' does not exist" msgstr "'%s' diye bir dal yok" msgid "too many arguments to unset upstream" -msgstr "üst kaynağı kaldırmak için çok fazla argüman" +msgstr "üst kaynağı kaldırmak için pek fazla argüman" msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" @@ -3121,11 +3088,11 @@ msgid "not run from a git repository - no hooks to show\n" msgstr "bir git deposundan çalıştırılmadı - gösterilecek kanca yok\n" msgid "" -"git bugreport [-o|--output-directory <file>] [-s|--suffix <format>] [--" -"diagnose[=<mode>]" +"git bugreport [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n" +" [--diagnose[=<mode>]]" msgstr "" -"git bugreport [-o|--output-directory <dosya>] [-s|--suffix <biçim>] [--" -"diagnose[=<kip>]" +"git bugreport [(-o | --output-directory) <yol>] [(-s | --suffix) <biçim>]\n" +" [--diagnose[=<kip>]]" msgid "" "Thank you for filling out a Git bug report!\n" @@ -3196,17 +3163,23 @@ msgstr "%s dosyasına yazılamıyor" msgid "Created new report at '%s'.\n" msgstr "Hata raporu '%s' dosyasına yazıldı.\n" -msgid "git bundle create [<options>] <file> <git-rev-list args>" -msgstr "git bundle create [<seçenekler>] <dosya> <git-rev-liste argümanlar>" +msgid "" +"git bundle create [-q | --quiet | --progress | --all-progress] [--all-" +"progress-implied]\n" +" [--version=<version>] <file> <git-rev-list-args>" +msgstr "" +"git bundle create [-q | --quiet | --progress | --all-progress] [--all-" +"progress-implied]\n" +" [--version=<sürüm>] <dosya> <git-rev-liste-argümanları>" -msgid "git bundle verify [<options>] <file>" -msgstr "git bundle verify [<seçenekler>] <dosya>" +msgid "git bundle verify [-q | --quiet] <file>" +msgstr "git bundle verify [-q | --quiet] <dosya>" msgid "git bundle list-heads <file> [<refname>...]" msgstr "git bundle list-heads <dosya> [<başvuru-adı>...]" -msgid "git bundle unbundle <file> [<refname>...]" -msgstr "git bundle unbundle <dosya> [<başvuru-adı>...]" +msgid "git bundle unbundle [--progress] <file> [<refname>...]" +msgstr "git bundle unbundle [--progress] <dosya> [<başvuru-adı>...]" msgid "do not show progress meter" msgstr "ilerleme çubuğunu gösterme" @@ -3281,12 +3254,12 @@ msgid "" "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" "objects]\n" " [--buffer] [--follow-symlinks] [--unordered]\n" -" [--textconv | --filters]" +" [--textconv | --filters] [-z]" msgstr "" "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" "objects]\n" " [--buffer] [--follow-symlinks] [--unordered]\n" -" [--textconv | --filters]" +" [--textconv | --filters] [-z]" msgid "" "git cat-file (--textconv | --filters)\n" @@ -3396,9 +3369,6 @@ msgstr "<revizyon>, '%s' ile gerekiyor" msgid "<object> required with '-%c'" msgstr "<nesne>, '-%c' ile gerekiyor" -msgid "too many arguments" -msgstr "çok fazla argüman" - #, c-format msgid "only two arguments allowed in <type> <object> mode, not %d" msgstr "<tür> <nesne> kipinde yalnızca iki argümana izin veriliyor, %d değil" @@ -3929,9 +3899,11 @@ msgid "use overlay mode" msgstr "yerpaylaşım kipini kullan" msgid "" -"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." +"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] " +"[<pathspec>...]" msgstr "" -"git clean [-d] [-f] [-i] [-n] [-q] [-e <dizgi>] [-x | -X] [--] <yollar>..." +"git clean [-d] [-f] [-i] [-n] [-q] [-e <dizgi>] [-x | -X] [--] [<yol-" +"blrtç>...]" #, c-format msgid "Removing %s\n" @@ -4223,6 +4195,10 @@ msgid "failed to start iterator over '%s'" msgstr "yineleyici '%s' üzerinden çalıştırılamadı" #, c-format +msgid "symlink '%s' exists, refusing to clone with --local" +msgstr "'%s' sembolik bağlantısı var, --local ile klonlama reddediliyor" + +#, c-format msgid "failed to unlink '%s'" msgstr "'%s' bağlantısı kesilemedi" @@ -4286,10 +4262,6 @@ msgstr "Çok fazla argüman." msgid "You must specify a repository to clone." msgstr "Klonlamak için bir depo belirtmelisiniz." -#, c-format -msgid "options '%s' and '%s %s' cannot be used together" -msgstr "'%s' ve '%s %s' seçenekleri birlikte kullanılamaz" - msgid "" "--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-" "exclude" @@ -4409,18 +4381,24 @@ msgid "--command must be the first argument" msgstr "--command ilk argüman olmalı" msgid "" -"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" +"git commit-graph verify [--object-dir <dir>] [--shallow] [--[no-]progress]" msgstr "" -"git commit-graph verify [--object-dir <nsndzn>] [--shallow] [--[no-]progress]" +"git commit-graph verify [--object-dir <dizin>] [--shallow] [--[no-]progress]" msgid "" -"git commit-graph write [--object-dir <objdir>] [--append] [--" -"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" -"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>" +"git commit-graph write [--object-dir <dir>] [--append]\n" +" [--split[=<strategy>]] [--reachable | --stdin-packs | " +"--stdin-commits]\n" +" [--changed-paths] [--[no-]max-new-filters <n>] [--" +"[no-]progress]\n" +" <split options>" msgstr "" -"git commit-graph write [--object-dir <nsndzn>] [--append] [--" -"split[=<strateji>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" -"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <bölme-seçenekleri>" +"git commit-graph write [--object-dir <dizin>] [--append]\n" +" [--split[=<<strateji>]] [--reachable | --stdin-packs " +"| --stdin-commits]\n" +" [--changed-paths] [--[no-]max-new-filters <n>] [--" +"[no-]progress]\n" +" <bölme-seçenekleri>" msgid "dir" msgstr "dizin" @@ -4491,12 +4469,16 @@ msgstr "" msgid "Collecting commits from input" msgstr "Girdiden işlemeler toplanıyor" +msgid "git commit-tree <tree> [(-p <parent>)...]" +msgstr "git commit-tree <ağaç> [(-p <üst-öge>)...]" + msgid "" -"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " -"<file>)...] <tree>" +"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...]\n" +" [(-F <file>)...] <tree>" msgstr "" -"git commit-tree [(-p <üst-öge>)...] [-S[<değer-no>]] [(-m <ileti>)...] [(-F " -"<dosya>)...] <ağaç>" +"git commit-tree [(-p <üst-öge>)...] [-S[<anahtar-kimliği>]] [(-m " +"<ileti>)...]\n" +" [(-F <dosya>)...] <ağaç>" #, c-format msgid "duplicate parent %s ignored" @@ -4538,11 +4520,29 @@ msgstr "bir tam ağaç vermeli" msgid "git commit-tree: failed to read" msgstr "git commit-tree: okunamadı" -msgid "git commit [<options>] [--] <pathspec>..." -msgstr "git commit [<seçenekler>] [--] <yol-blrtç>..." +msgid "" +"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" +" [--allow-empty-message] [--no-verify] [-e] [--author=<author>]\n" +" [--date=<date>] [--cleanup=<mode>] [--[no-]status]\n" +" [-i | -o] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" +" [(--trailer <token>[(=|:)<value>])...] [-S[<keyid>]]\n" +" [--] [<pathspec>...]" +msgstr "" +"git commit [-a | --interactive | --patch] [-s] [-v] [-u<kip>] [--amend]\n" +" [--dry-run] [(-c | -C | --squash) <işleme> | --fixup [(amend|" +"reword):]<işleme>)]\n" +" [-F <dosya> | -m <ileti>] [--reset-author] [--allow-empty]\n" +" [--allow-empty-message] [--no-verify] [-e] [--author=<author>]\n" +" [--date=<tarih>] [--cleanup=<kip>] [--[no-]status]\n" +" [-i | -o] [--pathspec-from-file=<dosya> [--pathspec-file-nul]]\n" +" [(--trailer <jeton>[(=|:)<değer>])...] [-S[<anahtar-kimliği>]]\n" +" [--] [<yol-blrtç>...]" -msgid "git status [<options>] [--] <pathspec>..." -msgstr "git status [<seçenekler>] [--] <yol-blrtç>..." +msgid "git status [<options>] [--] [<pathspec>...]" +msgstr "git status [<seçenekler>] [--] [<yol-blrtç>...]" msgid "" "You asked to amend the most recent commit, but doing so would make\n" @@ -5298,7 +5298,7 @@ msgid "" "\n" "\tchmod 0700 %s" msgstr "" -"Soket dizininizdeki izinler çok gevşek; diğer kullanıcılar sizin\n" +"Yuva dizininizdeki izinler çok gevşek; diğer kullanıcılar sizin\n" "önbelleğe alınmış yetkilerinizi okuyabilirler. Şunu çalıştırmayı düşünün:\n" "\n" "\tchmod 0700 %s" @@ -5307,20 +5307,27 @@ msgid "print debugging messages to stderr" msgstr "hata ayıklama iletilerini stderr'e yazdır" msgid "credential-cache--daemon unavailable; no unix socket support" -msgstr "credential-cache--daemon kullanılamıyor; unix soket desteği yok" +msgstr "credential-cache--daemon kullanılamıyor; unix yuva desteği yok" msgid "credential-cache unavailable; no unix socket support" -msgstr "credential-cache kullanılamıyor; unix soket desteği yok" +msgstr "credential-cache kullanılamıyor; unix yuva desteği yok" #, c-format msgid "unable to get credential storage lock in %d ms" msgstr "kimlik depo kilidi %d ms içinde alınamadı" -msgid "git describe [<options>] [<commit-ish>...]" -msgstr "git describe [<seçenekler>] [<işlememsi>...]" +msgid "" +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] [<commit-ish>...]" +msgstr "" +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] [<işlememsi>...]" + +msgid "" +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<mark>]" +msgstr "" +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<im>]" -msgid "git describe [<options>] --dirty" -msgstr "git describe [<seçenekler>] --dirty" +msgid "git describe <blob>" +msgstr "git describe <ikili>" msgid "head" msgstr "dal ucu" @@ -5442,11 +5449,11 @@ msgid "option '%s' and commit-ishes cannot be used together" msgstr "'%s' seçeneği ve işlememsiler birlikte kullanılamaz" msgid "" -"git diagnose [-o|--output-directory <path>] [-s|--suffix <format>] [--" -"mode=<mode>]" +"git diagnose [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n" +" [--mode=<mode>]" msgstr "" -"git diagnose [-o|--output-directory <yol>] [-s|--suffix <biçim>] [--" -"mode=<kip>]" +"git diagnose [(-o | --output-directory) <yol>] [(-s | --suffix) <biçim>]\n" +" [--mode=<kip>]" msgid "specify a destination for the diagnostics archive" msgstr "tanı arşivi için bir hedef konum belirtin" @@ -5464,6 +5471,9 @@ msgstr "--merge-base yalnızca iki işleme ile kullanılabilir" msgid "'%s': not a regular file or symlink" msgstr "'%s': Sıradan bir dosya veya sembolik bağ değil" +msgid "no merge given, only parents." +msgstr "birleştirme verilmedi, yalnızca üst ögeler." + #, c-format msgid "invalid option: %s" msgstr "geçersiz seçenek: %s" @@ -5596,8 +5606,8 @@ msgstr "" #, c-format msgid "" -"option `--default' expects an unsigned long value with `--type=ulong`, not `" -"%s`" +"option `--default' expects an unsigned long value with `--type=ulong`, not " +"`%s`" msgstr "" "--default seçeneği, --type=ulong ile birlikte bir imzalanmamış uzun değer " "bekliyor, '%s' değil" @@ -6101,8 +6111,8 @@ msgstr "yalnızca işlemeyi içeren başvuruları yazdır" msgid "print only refs which don't contain the commit" msgstr "yalnızca işlemeyi içermeyen başvuruları yazdır" -msgid "git for-each-repo --config=<config> <command-args>" -msgstr "git for-each-repo --config=<yapılandırma> <komut-argümanları>" +msgid "git for-each-repo --config=<config> [--] <arguments>" +msgstr "git for-each-repo --config=<yapılandırma> [--] <argümanlar>" msgid "config" msgstr "yapılandırma" @@ -6273,8 +6283,16 @@ msgstr "cache-tree içinde ağaç olmayan öge" msgid "%s: invalid sha1 pointer in resolve-undo" msgstr "%s: resolve-undo içinde geçersiz sha1 işaretçisi" -msgid "git fsck [<options>] [<object>...]" -msgstr "git fsck [<seçenekler>] [<nesne>...]" +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>...]" +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] [<nesne>...]" msgid "show unreachable objects" msgstr "ulaşılamayan nesneleri göster" @@ -6329,12 +6347,6 @@ msgstr "git fsmonitor--daemon start [<seçenekler>]" msgid "git fsmonitor--daemon run [<options>]" msgstr "git fsmonitor--daemon run [<seçenekler>]" -msgid "git fsmonitor--daemon stop" -msgstr "git fsmonitor--daemon stop" - -msgid "git fsmonitor--daemon status" -msgstr "git fsmonitor--daemon status" - #, c-format msgid "value of '%s' out of range: %d" msgstr "'%s' değeri erim dışında: %d" @@ -6574,8 +6586,20 @@ 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" -msgid "failed to run 'git config'" -msgstr "'git config' çalıştırılamadı" +#, c-format +msgid "unable to add '%s' value of '%s'" +msgstr "şunun için '%s' değeri eklenemiyor: '%s'" + +msgid "return success even if repository was not registered" +msgstr "depo kaydı yapılmamış olsa bile başarılı durum döndür" + +#, c-format +msgid "unable to unset '%s' value of '%s'" +msgstr "şunun '%s' değeri ayarı kaldırılamıyor: '%s'" + +#, c-format +msgid "repository '%s' is not registered" +msgstr "'%s' deposu kaydı yapılmamış" #, c-format msgid "failed to expand path '%s'" @@ -6863,11 +6887,14 @@ msgid "both --cached and trees are given" msgstr "hem --cached hem ağaçlar verilmiş" msgid "" -"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " -"[--] <file>..." +"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters]\n" +" [--stdin [--literally]] [--] <file>..." msgstr "" -"git hash-object [-t <tür>] [-w] [--path=<dosya> | --no-filters] [--stdin] " -"[--] <dosya>..." +"git hash-object [-t <tür>] [-w] [--path=<dosya> | --no-filters]\n" +" [--stdin [--literally]] [--] <dosya>..." + +msgid "git hash-object [-t <type>] [-w] --stdin-paths [--no-filters]" +msgstr "git hash-object [-t <tür>] [-w] --stdin-paths [--no-filters]" msgid "object type" msgstr "nesne türü" @@ -7295,11 +7322,15 @@ msgid "Initialized empty Git repository in %s%s\n" msgstr "%s%s içinde boş Git deposu ilklendirildi\n" msgid "" -"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" -"shared[=<permissions>]] [<directory>]" +"git init [-q | --quiet] [--bare] [--template=<template-directory>]\n" +" [--separate-git-dir <git-dir>] [--object-format=<format>]\n" +" [-b <branch-name> | --initial-branch=<branch-name>]\n" +" [--shared[=<permissions>]] [<directory>]" msgstr "" -"git init [-q | --quiet] [--bare] [--template=<şablon-dizini>] [--" -"shared[=<izinler>]] [<dizin>]" +"git init [-q | --quiet] [--bare] [--template=<şablon-dizini>]\n" +" [--separate-git-dir <git-dizini>] [--object-format=<biçim>]\n" +" [-b <dal-adı> | --initial-branch=<dal-adı>]\n" +" [--shared[=<izinler>]] [<dizin>]" msgid "permissions" msgstr "izinler" @@ -7340,11 +7371,13 @@ msgid "--separate-git-dir incompatible with bare repository" msgstr "--separate-git-dir, çıplak depo ile uyumsuz" msgid "" -"git interpret-trailers [--in-place] [--trim-empty] [(--trailer " -"<token>[(=|:)<value>])...] [<file>...]" +"git interpret-trailers [--in-place] [--trim-empty]\n" +" [(--trailer <token>[(=|:)<value>])...]\n" +" [--parse] [<file>...]" msgstr "" -"git interpret-trailers [--in-place] [--trim-empty] [(--trailer " -"<jeton>[(=|:)<değer>])...] [<dosya>...]" +"git interpret-trailers [--in-place] [--trim-empty]\n" +" [(--trailer <jeton>[(=|:)<değer>])...]\n" +" [--parse] [<dosya>...]" msgid "edit files in place" msgstr "dosyaları yerinde düzenle" @@ -7822,11 +7855,11 @@ msgstr "" msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" -" [-q | --quiet] [--exit-code] [--get-url]\n" +" [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n" " [--symref] [<repository> [<refs>...]]" msgstr "" -"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<çlştr>]\n" -" [-q | --quiet] [--exit-code] [--get-url]\n" +"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<yürütülebilir>]\n" +" [-q | --quiet] [--exit-code] [--get-url] [--sort=<anahtar>]\n" " [--symref] [<depo> [<başvurular>...]]" msgid "do not print remote URL" @@ -7955,12 +7988,12 @@ msgstr "git merge-base [-a | --all] <işleme> <işleme>..." msgid "git merge-base [-a | --all] --octopus <commit>..." msgstr "git merge-base [-a | --all] --octopus <işleme>..." -msgid "git merge-base --independent <commit>..." -msgstr "git merge-base --independent <işleme>..." - msgid "git merge-base --is-ancestor <commit> <commit>" msgstr "git merge-base --is-ancestor <işleme> <işleme>" +msgid "git merge-base --independent <commit>..." +msgstr "git merge-base --independent <işleme>..." + msgid "git merge-base --fork-point <ref> [<commit>]" msgstr "git merge-base --fork-point <başvuru> [<işleme>]" @@ -8068,9 +8101,20 @@ msgstr "kipi/oid'si/hazırlığı olmayan dosya adlarını listele" msgid "allow merging unrelated histories" msgstr "birbiriyle ilişkisi olmayan geçmişlerin birleştirilmesine izin ver" +msgid "perform multiple merges, one per line of input" +msgstr "girdi satırı başına bir adet çoklu birleştirmeler gerçekleştir" + msgid "--trivial-merge is incompatible with all other options" msgstr "--trivial-merge, tüm diğer seçeneklerle uyumsuz" +#, c-format +msgid "malformed input line: '%s'." +msgstr "hatalı oluşturulmuş girdi satırı: '%s'." + +#, c-format +msgid "merging cannot continue; got unclean result of %d" +msgstr "birleştirme sürdürülemiyor; %d için temiz olmayan sonuçlar alındı" + msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<seçenekler>] [<işleme>...]" @@ -8683,10 +8727,6 @@ msgid "cannot read note data from non-blob object '%s'." msgstr "İkili nesne olmayan '%s' nesnesinden not verisi okunamıyor." #, c-format -msgid "malformed input line: '%s'." -msgstr "hatalı oluşturulmuş girdi satırı: '%s'." - -#, c-format msgid "failed to copy notes from '%s' to '%s'" msgstr "notlar '%s' konumundan '%s' konumuna kopyalanamadı" @@ -8875,16 +8915,16 @@ msgstr "notları <not-bşvr>'ndan kullan" msgid "unknown subcommand: `%s'" msgstr "bilinmeyen altkomut: '%s'" -msgid "" -"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" +msgid "git pack-objects --stdout [<options>] [< <ref-list> | < <object-list>]" msgstr "" -"git pack-objects --stdout [<seçenekler>...] [< <bşvr-liste> | < <nesne-" -"liste>]" +"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 [<options>] <base-name> [< <ref-list> | < <object-list>]" msgstr "" -"git pack-objects [<sçnklr>...] <base-name> [< <bşvr-liste> | < <nesne-liste>]" +"git pack-objects [<sçnklr>] <temel-ad> [< <bşvru-listesi> | < <nesne-" +"listesi>]" #, c-format msgid "" @@ -9262,8 +9302,8 @@ msgstr "" "<git@vger.kernel.org> adresine bir e-posta atarak\n" "bize haber verin. Sağ olun.\n" -msgid "git pack-refs [<options>]" -msgstr "git pack-refs [<seçenekler>]" +msgid "git pack-refs [--all] [--no-prune]" +msgstr "git pack-refs [--all] [--no-prune]" msgid "pack everything" msgstr "her şeyi paketle" @@ -9271,6 +9311,18 @@ msgstr "her şeyi paketle" msgid "prune loose refs (default)" msgstr "gevşek başvuruları buda (öntanımlı)" +msgid "git patch-id [--stable | --unstable | --verbatim]" +msgstr "git patch-id [--stable | --unstable | --verbatim]" + +msgid "use the unstable patch-id algorithm" +msgstr "kararlı olmayan yama kimliği algoritmasını kullan" + +msgid "use the stable patch-id algorithm" +msgstr "kararlı yama kimliği algoritmasını kullan" + +msgid "don't strip whitespace from the patch" +msgstr "yamadan boşlukları çıkarma" + msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "" "git prune [-n] [-v] [--progress] [--expire <zaman>] [--] [<dal-ucu>...]" @@ -9484,9 +9536,8 @@ msgstr "" msgid "" "\n" -"To avoid automatically configuring upstream branches when their name\n" -"doesn't match the local branch, see option 'simple' of branch." -"autoSetupMerge\n" +"To avoid automatically configuring an upstream branch when its name\n" +"won't match the local branch, see option 'simple' of branch.autoSetupMerge\n" "in 'git help config'.\n" msgstr "" "\n" @@ -9643,6 +9694,13 @@ msgstr "İtme konumu: %s\n" msgid "failed to push some refs to '%s'" msgstr "bazı başvurular '%s' konumuna itilemedi" +msgid "" +"recursing into submodule with push.recurseSubmodules=only; using on-demand " +"instead" +msgstr "" +"altmodül içine push.recurseSubmodules=only ile özyineleniyor; yerine talep " +"başına kullanılıyor" + #, c-format msgid "invalid value for '%s'" msgstr "'%s' için geçersiz değer" @@ -9666,7 +9724,7 @@ msgid "force updates" msgstr "zorla güncelle" msgid "<refname>:<expect>" -msgstr "<başvuruadı>:<bekle>" +msgstr "<bşvr-adı>:<bekle>" msgid "require old value of ref to be at this value" msgstr "başvurunun eski değerinin bu değerde olmasını gerektir" @@ -9779,13 +9837,14 @@ msgid "need two commit ranges" msgstr "iki işleme erimi gerekli" msgid "" -"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " -"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-" -"ish1> [<tree-ish2> [<tree-ish3>]])" +"git read-tree [(-m [--trivial] [--aggressive] | --reset | --" +"prefix=<prefix>)\n" +" [-u | -i]] [--index-output=<file>] [--no-sparse-checkout]\n" +" (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" msgstr "" -"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<önek>) [-" -"u | -i]] [--no-sparse-checkout] [--index-output=<dosya>] (--empty | " -"<ağacımsı1> [<ağacımsı2> [<ağacımsı3>]])" +"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<önek>)\n" +" [-u | -i]] [--index-output=<dosya>] [--no-sparse-checkout]\n" +" (--empty | <ağacımsı1> [<ağacımsı2> [<ağacımsı3>]])" msgid "write resulting index to <file>" msgstr "ortaya çıkan indeksi <dosya>'ya yaz" @@ -9876,8 +9935,8 @@ msgid "%s requires the merge backend" msgstr "%s birleştirme arka ucunu gerektiriyor" #, c-format -msgid "could not get 'onto': '%s'" -msgstr "'onto' alınamadı: '%s'" +msgid "invalid onto: '%s'" +msgstr "üzerine geçersiz: '%s'" #, c-format msgid "invalid orig-head: '%s'" @@ -9928,8 +9987,8 @@ msgstr "şuraya geçilemedi: %s" #, c-format msgid "" -"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" -"\"." +"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and " +"\"ask\"." msgstr "" "Tanımlanamayan boş tür '%s'; geçerli türler: \"drop\", \"keep\" ve \"ask\"." @@ -10186,8 +10245,8 @@ msgstr "böyle bir dal/işleme yok: '%s'" msgid "No such ref: %s" msgstr "Böyle bir başvuru yok: %s" -msgid "Could not resolve HEAD to a revision" -msgstr "HEAD bir revizyona çözülemedi" +msgid "Could not resolve HEAD to a commit" +msgstr "HEAD, bir işlemeye çözülemedi" #, c-format msgid "'%s': need exactly one merge base with branch" @@ -10849,6 +10908,10 @@ msgstr "geçici dosya '%s', yazma için açılamadı" msgid "could not close refs snapshot tempfile" msgstr "başvurular anlık görüntü geçici dosyası kapatılamadı" +#, c-format +msgid "could not remove stale bitmap: %s" +msgstr "eskimiş biteşlem kaldırılamadı: %s" + msgid "pack everything in a single pack" msgstr "her şeyi tek bir pakete sığdır" @@ -10921,6 +10984,9 @@ msgstr "<N> faktörlü bir geometrik ilerleme bul" msgid "write a multi-pack index of the resulting packs" msgstr "ortaya çıkan paketlerin bir çoklu paket indeksini yaz" +msgid "pack prefix to store a pack containing pruned objects" +msgstr "budanan nesneler içeren paketi depolamak için paket öneki" + msgid "cannot delete packs in a precious-objects repo" msgstr "bir precious-objects deposundaki paketler silinemiyor" @@ -10932,8 +10998,12 @@ msgid "pack prefix %s does not begin with objdir %s" msgstr "paket öneki %s, nesne dizini %s ile başlamıyor" #, c-format -msgid "missing required file: %s" -msgstr "gereken dosya eksik: %s" +msgid "renaming pack to '%s' failed" +msgstr "paketi '%s' olarak yeniden adlandırma başarısız" + +#, c-format +msgid "pack-objects did not write a '%s' file for pack %s-%s" +msgstr "pack-objects, şu paket için bir '%s' dosyası yazmadı: %s-%s" #, c-format msgid "could not unlink: %s" @@ -11127,8 +11197,10 @@ msgstr "--convert-graft-file argüman almaz" msgid "only one pattern can be given with -l" msgstr "-l ile yalnızca bir dizgi verilebilir" -msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" -msgstr "git rerere [clear | forget <yol>... | status | remaining | diff | gc]" +msgid "" +"git rerere [clear | forget <pathspec>... | diff | status | remaining | gc]" +msgstr "" +"git rerere [clear | forget <yol-blrtç>... | diff | status | remaining | gc]" msgid "register clean resolutions in index" msgstr "indeksteki temiz çözümlerin kaydını yap" @@ -11333,6 +11405,15 @@ msgstr "--prefix bir argüman gerektiriyor" msgid "unknown mode for --abbrev-ref: %s" msgstr "--abbrev-ref için bilinmeyen kip: %s" +msgid "--exclude-hidden cannot be used together with --branches" +msgstr "--exclude-hidden, --branches ile birlikte kullanılamıyor" + +msgid "--exclude-hidden cannot be used together with --tags" +msgstr "--exclude-hidden, --tags ile birlikte kullanılamıyor" + +msgid "--exclude-hidden cannot be used together with --remotes" +msgstr "--exclude-hidden, --remotes ile birlikte kullanılamıyor" + msgid "this operation must be run in a work tree" msgstr "bu işlem bir çalışma ağacı içinde çalıştırılmalı" @@ -11340,17 +11421,25 @@ msgstr "bu işlem bir çalışma ağacı içinde çalıştırılmalı" msgid "unknown mode for --show-object-format: %s" msgstr "--show-object-format için bilinmeyen kip: %s" -msgid "git revert [<options>] <commit-ish>..." -msgstr "git revert [<seçenekler>] <işlememsi>..." +msgid "" +"git revert [--[no-]edit] [-n] [-m <parent-number>] [-s] [-S[<keyid>]] " +"<commit>..." +msgstr "" +"git revert [--[no-]edit] [-n] [-m <üst-öge-numarası>] [-s] [-S[<anahtar-" +"kimliği>]] <işleme>..." -msgid "git revert <subcommand>" -msgstr "git revert <altkomut>" +msgid "git revert (--continue | --skip | --abort | --quit)" +msgstr "git revert (--continue | --skip | --abort | --quit)" -msgid "git cherry-pick [<options>] <commit-ish>..." -msgstr "git cherry-pick [<seçenekler>] <işlememsi>..." +msgid "" +"git cherry-pick [--edit] [-n] [-m <parent-number>] [-s] [-x] [--ff]\n" +" [-S[<keyid>]] <commit>..." +msgstr "" +"git cherry-pick [--edit] [-n] [-m <üst-öge-numarası>] [-s] [-x] [--ff]\n" +" [-S[<anahtar-kimliği>]] <işleme>..." -msgid "git cherry-pick <subcommand>" -msgstr "git cherry-pick <altkomut>" +msgid "git cherry-pick (--continue | --skip | --abort | --quit)" +msgstr "git cherry-pick (--continue | --skip | --abort | --quit)" #, c-format msgid "option `%s' expects a number greater than zero" @@ -11411,8 +11500,14 @@ msgstr "geri al başarısız" msgid "cherry-pick failed" msgstr "seç-al başarısız" -msgid "git rm [<options>] [--] <file>..." -msgstr "git rm [<seçenekler>] [--] <dosya>..." +msgid "" +"git rm [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n" +" [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" +" [--] [<pathspec>...]" +msgstr "" +"git rm [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n" +" [--quiet] [--pathspec-from-file=<dosya> [--pathspec-file-nul]]\n" +" [--] [<yol-blrtç>...]" msgid "" "the following file has staged content different from both the\n" @@ -11486,12 +11581,14 @@ msgid "" "git send-pack [--mirror] [--dry-run] [--force]\n" " [--receive-pack=<git-receive-pack>]\n" " [--verbose] [--thin] [--atomic]\n" +" [--[no-]signed | --signed=(true|false|if-asked)]\n" " [<host>:]<directory> (--all | <ref>...)" msgstr "" "git send-pack [--mirror] [--dry-run] [--force]\n" -" [--receive-pack=<git-receive-pack>]\n" +" [--receive-pack=<git-paket-al>]\n" " [--verbose] [--thin] [--atomic]\n" -" [<makine>:]<dizin> (--all | <başvurular>...)" +" [--[no-]signed | --signed=(true|false|if-asked)]\n" +" [<makine>:]<dizin> (--all | <başvuru>...)" msgid "remote name" msgstr "uzak konum adı" @@ -11514,8 +11611,9 @@ msgstr "git log --pretty=short | git shortlog [<seçenekler>]" msgid "using multiple --group options with stdin is not supported" msgstr "stdin ile çoklu --group seçenekleri kullanımı desteklenmiyor" -msgid "using --group=trailer with stdin is not supported" -msgstr "stdin ile --group=trailer kullanımı desteklenmiyor" +#, c-format +msgid "using %s with stdin is not supported" +msgstr "stdin ile %s kullanma desteklenmiyor" #, c-format msgid "unknown group type: %s" @@ -11546,18 +11644,20 @@ msgid "group by field" msgstr "alan ile grupla" msgid "too many arguments given outside repository" -msgstr "depo dışında çok fazla argüman verildi" +msgstr "depo dışında pek fazla argüman verildi" msgid "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" " [--current] [--color[=<when>] | --no-color] [--sparse]\n" " [--more=<n> | --list | --independent | --merge-base]\n" -" [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" +" [--no-name | --sha1-name] [--topics]\n" +" [(<rev> | <glob>)...]" msgstr "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" -" [--current] [--color[=<nezaman>] | --no-color] [--sparse]\n" +" [--current] [--color[=<ne-zaman>] | --no-color] [--sparse]\n" " [--more=<n> | --list | --independent | --merge-base]\n" -" [--no-name | --sha1-name] [--topics] [(<bşvr> | <glob>)...]" +" [--no-name | --sha1-name] [--topics]\n" +" [(<rev> | <glob>)...]" msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g | --reflog)[=<n>[,<temel>]] [--list] [<başvuru>]" @@ -11657,11 +11757,13 @@ msgid "Unknown hash algorithm" msgstr "bilinmeyen sağlama algoritması '%s'" msgid "" -"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference]\n" +" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n" +" [--heads] [--] [<pattern>...]" msgstr "" -"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<dizgi>...]" +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference]\n" +" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n" +" [--heads] [--] [<dizgi>...]" msgid "git show-ref --exclude-existing[=<pattern>]" msgstr "git show-ref --exclude-existing[=<dizgi>]" @@ -11690,8 +11792,10 @@ msgstr "sonuçları stdout'a yazdırma (--verify ile birlikte kullanışlı)" msgid "show refs from stdin that aren't in local repository" msgstr "stdin'den yerel bir depoda olmayan başvuruları göster" -msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" -msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <seçenekler>" +msgid "" +"git sparse-checkout (init | list | set | add | reapply | disable) [<options>]" +msgstr "" +"git sparse-checkout (init | list | set | add | reapply | disable) [<sçnklr>]" msgid "this worktree is not sparse" msgstr "bu çalışma ağacı aralıklı değil" @@ -11813,67 +11917,56 @@ msgstr "" msgid "error while refreshing working directory" msgstr "çalışma dizini yenilenirken hata" -msgid "git stash list [<options>]" -msgstr "git stash list [<seçenekler>]" +msgid "git stash list [<log-options>]" +msgstr "git stash list [<günlük-seçenekleri>]" -msgid "git stash show [<options>] [<stash>]" -msgstr "git stash show [<seçenekler>] [<zula>]" +msgid "" +"git stash show [-u | --include-untracked | --only-untracked] [<diff-" +"options>] [<stash>]" +msgstr "" +"git stash show [-u | --include-untracked | --only-untracked] [<diff-" +"seçenekleri>] [<zula>]" + +msgid "git stash drop [-q | --quiet] [<stash>]" +msgstr "git stash drop [-q | --quiet] [<zula>]" -msgid "git stash drop [-q|--quiet] [<stash>]" -msgstr "git stash drop [-q|--quiet] [<zula>]" +msgid "git stash pop [--index] [-q | --quiet] [<stash>]" +msgstr "git stash pop [--index] [-q | --quiet] [<zula>]" -msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" -msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<zula>]" +msgid "git stash apply [--index] [-q | --quiet] [<stash>]" +msgstr "git stash apply [--index] [-q | --quiet] [<zula>]" msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <dal-adı> [<zula>]" +msgid "git stash store [(-m | --message) <message>] [-q | --quiet] <commit>" +msgstr "git stash store [(-m | --message) <ileti>] [-q | --quiet] <işleme>" + msgid "" -"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" -"quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" +"git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q " +"| --quiet]\n" +" [-u | --include-untracked] [-a | --all] [(-m | --message) " +"<message>]\n" " [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" " [--] [<pathspec>...]]" msgstr "" -"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" -"quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <ileti>]\n" -" [--pathspec-from-file=<dosya> [--pathspec-file-nul]]\n" +"git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q\n" +" | --quiet] [-u | --include-untracked] [-a | --all] [(-m | --" +"message)\n" +" <ileti>] [--pathspec-from-file=<dosya> [--pathspec-file-nul]]\n" " [--] [<yol-blrtç>...]]" msgid "" -"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" -"quiet]\n" -" [-u|--include-untracked] [-a|--all] [<message>]" +"git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | " +"--quiet]\n" +" [-u | --include-untracked] [-a | --all] [<message>]" msgstr "" -"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" -"quiet]\n" -" [-u|--include-untracked] [-a|--all] [<ileti>]" - -msgid "git stash pop [--index] [-q|--quiet] [<stash>]" -msgstr "git stash pop [--index] [-q|--quiet] [<zula>]" - -msgid "git stash apply [--index] [-q|--quiet] [<stash>]" -msgstr "git stash apply [--index] [-q|--quiet] [<zula>]" +"git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q " +"|\n" +" --quiet] [-u | --include-untracked] [-a | --all] [<ileti>]" -msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" -msgstr "git stash store [-m|--message <ileti>] [-q|--quiet] <işleme>" - -msgid "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" -" [--] [<pathspec>...]]" -msgstr "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <ileti>]\n" -" [--] [<yol-blrtç>...]]" - -msgid "" -"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [<message>]" -msgstr "" -"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [<ileti>]" +msgid "git stash create [<message>]" +msgstr "git stash create [<ileti>]" #, c-format msgid "'%s' is not a stash-like commit" @@ -12359,7 +12452,7 @@ msgstr "Şu altmodül yolunda '%s' birleştirilemedi: '%s'" #, c-format msgid "Execution of '%s %s' failed in submodule path '%s'" -msgstr "Şu altmodül yolunda '%s %s' çalıştırılamadı: '%s'" +msgstr "Şu altmodül yolunda '%s %s' yürütülemedi: '%s'" #, c-format msgid "Submodule path '%s': checked out '%s'\n" @@ -12434,9 +12527,6 @@ msgstr "altmodülleri özyineli basamaklandır" msgid "don't fetch new objects from the remote site" msgstr "yeni nesneleri uzak konumdan getirme" -msgid "path into the working tree" -msgstr "çalışma ağacına giden yol" - msgid "use the 'checkout' update strategy (default)" msgstr "'checkout' güncelleme stratejisini kullan (öntanımlı)" @@ -12472,27 +12562,9 @@ msgstr "" "shallow] [--reference <depo>] [--recursive] [--[no-]single-branch] [--] " "[<yol>...]" -msgid "recurse into submodules" -msgstr "altmodüllere özyinele" - msgid "git submodule absorbgitdirs [<options>] [<path>...]" msgstr "git submodule absorbgitdirs [<seçenekler>] [<yol>...]" -msgid "check if it is safe to write to the .gitmodules file" -msgstr ".gitmodules dosyasına yazım güvenli mi değil mi denetle" - -msgid "unset the config in the .gitmodules file" -msgstr ".gitmodules dosyasındaki yapılandırmayı kaldır" - -msgid "git submodule--helper config <name> [<value>]" -msgstr "git submodule--helper config <ad> [<değer>]" - -msgid "git submodule--helper config --unset <name>" -msgstr "git submodule--helper config --unset <ad>" - -msgid "please make sure that the .gitmodules file is in the working tree" -msgstr ".gitmodules dosyasının çalışma ağacında olduğundan lütfen emin ol" - msgid "suppress output for setting url of a submodule" msgstr "bir altmodül url ayarlanması çıktısını gizle" @@ -12570,6 +12642,9 @@ msgstr "'%s' altmodülü için yerel git dizini yeniden etkinleştiriliyor\n" msgid "unable to checkout submodule '%s'" msgstr "'%s' altmodülü çıkış yapılamıyor" +msgid "please make sure that the .gitmodules file is in the working tree" +msgstr ".gitmodules dosyasının çalışma ağacında olduğundan lütfen emin ol" + #, c-format msgid "Failed to add submodule '%s'" msgstr "'%s' altmodülü eklenemedi" @@ -12620,19 +12695,21 @@ msgstr "depo URL'si: '%s' mutlak olmalı veya ./|../ ile başlamalıdır" msgid "'%s' is not a valid submodule name" msgstr "'%s' geçerli bir altmodül adı değil" +msgid "git submodule--helper <command>" +msgstr "git submodule--helper <komut>" + #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s, --super-prefix desteklemiyor" -#, c-format -msgid "'%s' is not a valid submodule--helper subcommand" -msgstr "'%s' geçerli bir submodule--helper altkomutu değil" +msgid "git symbolic-ref [-m <reason>] <name> <ref>" +msgstr "git symbolic-ref [-m <neden>] <ad> <başvuru>" -msgid "git symbolic-ref [<options>] <name> [<ref>]" -msgstr "git symbolic-ref [<seçenekler>] <ad> [<başvuru>]" +msgid "git symbolic-ref [-q] [--short] [--no-recurse] <name>" +msgstr "git symbolic-ref [-q] [--short] [--no-recurse] <ad>" -msgid "git symbolic-ref -d [-q] <name>" -msgstr "git symbolic-ref -d [-q] <ad>" +msgid "git symbolic-ref --delete [-q] <name>" +msgstr "git symbolic-ref --delete [-q] <ad>" msgid "suppress error message for non-symbolic (detached) refs" msgstr "sembolik olmayan (ayrık) başvurular için hata iletisini gizle" @@ -12643,6 +12720,9 @@ msgstr "sembolik başvuruyu sil" msgid "shorten ref output" msgstr "başvuru çıktısını kısalt" +msgid "recursively dereference (default)" +msgstr "başvuruyu özyineli olarak kaldır (öntanımlı)" + msgid "reason" msgstr "neden" @@ -12650,24 +12730,26 @@ msgid "reason of the update" msgstr "güncelleme nedeni" msgid "" -"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n" -" <tagname> [<head>]" +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n" +" <tagname> [<commit> | <object>]" msgstr "" -"git tag [-a | -s | -u <anahtar-kimliği>] [-f] [-m <ileti> | -F <dosya>]\n" -" <etiket-adı> [<head>]" +"git tag [-a | -s | -u <anahtar-kimliği>] [-f] [-m <ileti> | -F <dosya>] [-" +"e]\n" +" <etiket-adı> [<işleme> | <nesne>]" msgid "git tag -d <tagname>..." msgstr "git tag -d <etiket-adı>..." msgid "" -"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" -"points-at <object>]\n" -" [--format=<format>] [--merged <commit>] [--no-merged <commit>] " -"[<pattern>...]" +"git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]\n" +" [--points-at <object>] [--column[=<options>] | --no-column]\n" +" [--create-reflog] [--sort=<key>] [--format=<format>]\n" +" [--merged <commit>] [--no-merged <commit>] [<pattern>...]" msgstr "" -"git tag -l [-n[<sayı>]] [--contains <işleme>] [--no-contains <işleme>]\n" -" [-- points-at <nesne>] [--format=<biçim>] [--merged <işleme>]\n" -" [--no-merged <işleme>] [<dizgi>...]" +"git tag [-n[<sayı>]] -l [--contains <işleme>] [--no-contains <işleme>]\n" +" [--points-at <nesne>] [--column[=<seçenekler>] | --no-column]\n" +" [--create-reflog] [--sort=<anahtar>] [--format=<biçim>]\n" +" [--merged <işleme>] [--no-merged <işleme>] [<dizgi>...]" msgid "git tag -v [--format=<format>] <tagname>..." msgstr "git tag -v [--format=<biçim>] <etiket-adı>..." @@ -13043,8 +13125,12 @@ msgstr "güncellemeleri stdin'den oku" msgid "update the info files from scratch" msgstr "bilgi dosyalarını en baştan güncelle" -msgid "git upload-pack [<options>] <dir>" -msgstr "git upload-pack [<seçenekler>] <dizin>" +msgid "" +"git-upload-pack [--[no-]strict] [--timeout=<n>] [--stateless-rpc]\n" +" [--advertise-refs] <directory>" +msgstr "" +"git-upload-pack [--[no-]strict] [--timeout=<n>] [--stateless-rpc]\n" +" [--advertise-refs] <dizin>" msgid "quit after a single request/response exchange" msgstr "tek bir istek/yanıt değiş tokuşundan sonra çık" @@ -13058,8 +13144,8 @@ msgstr "eğer <dizin> bir Git dizini değilse <dizin>/.git/ deneme" msgid "interrupt transfer after <n> seconds of inactivity" msgstr "aktarımı <n> saniye hareketsizlikten sonra kes" -msgid "git verify-commit [-v | --verbose] <commit>..." -msgstr "git verify-commit [-v | --verbose] <işleme>..." +msgid "git verify-commit [-v | --verbose] [--raw] <commit>..." +msgstr "git verify-commit [-v | --verbose] [--raw] <işleme>..." msgid "print commit contents" msgstr "işleme içeriğini yazdır" @@ -13067,8 +13153,9 @@ msgstr "işleme içeriğini yazdır" msgid "print raw gpg status output" msgstr "ham gpg durum çıktısını yazdır" -msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." -msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <paket>..." +msgid "git verify-pack [-v | --verbose] [-s | --stat-only] [--] <pack>.idx..." +msgstr "" +"git verify-pack [-v | --verbose] [-s | --stat-only] [--] <paket>.idx..." msgid "verbose" msgstr "ayrıntılı anlatım" @@ -13076,35 +13163,39 @@ msgstr "ayrıntılı anlatım" msgid "show statistics only" msgstr "yalnızca istatistikleri göster" -msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." -msgstr "git verify-tag [-v | --verbose] [--format=<biçim>] <etiket>..." +msgid "git verify-tag [-v | --verbose] [--format=<format>] [--raw] <tag>..." +msgstr "git verify-tag [-v | --verbose] [--format=<biçim>] [--raw] <etiket>..." msgid "print tag contents" msgstr "etiket içeriğini yazdır" -msgid "git worktree add [<options>] <path> [<commit-ish>]" -msgstr "git worktree add [<seçenekler>] <yol> [<işlememsi>]" +msgid "" +"git worktree add [-f] [--detach] [--checkout] [--lock [--reason <string>]]\n" +" [-b <new-branch>] <path> [<commit-ish>]" +msgstr "" +"git worktree add [-f] [--detach] [--checkout] [--lock [--reason <dizi>]]\n" +" [-b <yeni-dal>] <yol> [<işlememsi>]" -msgid "git worktree list [<options>]" -msgstr "git worktree list [<seçenekler>]" +msgid "git worktree list [-v | --porcelain [-z]]" +msgstr "git worktree list [-v | --porcelain [-z]]" -msgid "git worktree lock [<options>] <path>" -msgstr "git worktree lock [<seçenekler>] <yol>" +msgid "git worktree lock [--reason <string>] <worktree>" +msgstr "git worktree lock [--reason <dizi>] <çalışma-ağacı>" msgid "git worktree move <worktree> <new-path>" msgstr "git worktree move <ç-ağacı> <yeni-yol>" -msgid "git worktree prune [<options>]" -msgstr "git worktree prune [<seçenekler>]" +msgid "git worktree prune [-n] [-v] [--expire <expire>]" +msgstr "git worktree prune [-n] [-v] [--expire <süre-dolum>]" -msgid "git worktree remove [<options>] <worktree>" -msgstr "git worktree remove [<seçenekler>] <ç-ağacı>" +msgid "git worktree remove [-f] <worktree>" +msgstr "git worktree remove [-f] <çalışma-ağacı>" msgid "git worktree repair [<path>...]" msgstr "git worktree repair [<yol>...]" -msgid "git worktree unlock <path>" -msgstr "git worktree unlock <yol>" +msgid "git worktree unlock <worktree>" +msgstr "git worktree unlock <çalışma-ağacı>" #, c-format msgid "Removing %s/%s: %s" @@ -13334,6 +13425,10 @@ msgstr "yalnızca hata ayıklama için yararlı" msgid "core.fsyncMethod = batch is unsupported on this platform" msgstr "core.fsyncMethod = batch, bu platformda desteklenmiyor" +#, c-format +msgid "bundle list at '%s' has no mode" +msgstr "'%s' konumundaki demet listesinin kipi yok" + msgid "failed to create temporary file" msgstr "geçici dosya oluşturulamadı" @@ -13341,16 +13436,29 @@ msgid "insufficient capabilities" msgstr "yetersiz yetenekler" #, c-format +msgid "unrecognized bundle mode from URI '%s'" +msgstr "'%s' URI'sinden tanımlanamayan demet kipi" + +#, c-format +msgid "exceeded bundle URI recursion limit (%d)" +msgstr "demet URI özyineleme sınırı aşıldı (%d)" + +#, c-format msgid "failed to download bundle from URI '%s'" msgstr "'%s' URI'sinden demet indirilemedi" #, c-format -msgid "file at URI '%s' is not a bundle" -msgstr "'%s' URI'sindeki dosya bir demet değil" +msgid "file at URI '%s' is not a bundle or bundle list" +msgstr "'%s' URI'sindeki dosya bir demet veya demet listesi değil" -#, c-format -msgid "failed to unbundle bundle from URI '%s'" -msgstr "'%s' URI'sindeki demet çözülemedi" +msgid "bundle-uri: got an empty line" +msgstr "bundle-uri: boş bir satır alındı" + +msgid "bundle-uri: line is not of the form 'key=value'" +msgstr "bundle-uri: satır, 'anahtar=değer' olarak biçimlenmemiş" + +msgid "bundle-uri: line has empty key or value" +msgstr "bundle-uri: satırda boş anahtar veya değer var" #, c-format msgid "unrecognized bundle hash algorithm: %s" @@ -13920,8 +14028,8 @@ msgstr "Demet dosya biçimi" msgid "Chunk-based file formats" msgstr "geçersiz gitfile biçimi: %s" -msgid "Git commit graph format" -msgstr "Git işleme grafiği biçimi" +msgid "Git commit-graph format" +msgstr "Git commit-graph biçimi" msgid "Git index format" msgstr "Git indeks biçimi" @@ -14115,7 +14223,7 @@ msgstr "" "bir commit-graph yazılmaya çalışılıyor; ancak 'core.commitGraph' devre dışı" msgid "too many commits to write graph" -msgstr "grafik yazımı için çok fazla işleme" +msgstr "grafik yazımı için pek fazla işleme" msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" @@ -14269,6 +14377,10 @@ msgstr "'has_worktree_moved' içinde işlenmemiş senaryo: %d" msgid "health thread wait failed [GLE %ld]" msgstr "sağlık iş parçacığı bekleme başarısız oldu [GLE %ld]" +#, c-format +msgid "Invalid path: %s" +msgstr "Geçersiz yol %s" + msgid "Unable to create FSEventStream." msgstr "FSEventStream oluşturulamadı." @@ -14300,6 +14412,22 @@ msgid "could not read directory changes [GLE %ld]" msgstr "dizin değişiklikleri okunamadı [GLE %ld]" #, c-format +msgid "opendir('%s') failed" +msgstr "opendir('%s') başarısız oldu" + +#, c-format +msgid "lstat('%s') failed" +msgstr "lstat('%s') başarısız oldu" + +#, c-format +msgid "strbuf_readlink('%s') failed" +msgstr "strbuf_readlink('%s') başarısız oldu" + +#, c-format +msgid "closedir('%s') failed" +msgstr "closedir('%s') başarısız oldu" + +#, c-format msgid "[GLE %ld] unable to open for read '%ls'" msgstr "[GLE %ld] '%ls', okuma için açılamıyor" @@ -14484,7 +14612,7 @@ msgstr "%s içinde düzmece sayım" #, c-format msgid "too many entries in %s" -msgstr "%s içinde çok fazla girdi" +msgstr "%s içinde pek fazla girdi" #, c-format msgid "missing config key %s" @@ -14768,7 +14896,7 @@ msgid "protocol '%s' is not supported" msgstr "'%s' protokolü desteklenmiyor" msgid "unable to set SO_KEEPALIVE on socket" -msgstr "soket üzerinde SO_KEEPALIVE ayarlanamıyor" +msgstr "yuva üzerinde SO_KEEPALIVE ayarlanamıyor" #, c-format msgid "Looking up %s ... " @@ -15049,7 +15177,7 @@ msgstr "'%s' için delta adası düzenli ifadesi yüklenemedi: %s" #, c-format msgid "island regex from config has too many capture groups (max=%d)" msgstr "" -"yapılandırmanın delta adası düzenli ifadesinde çok fazla yakalama grubu var " +"yapılandırmanın delta adası düzenli ifadesinde pek fazla yakalama grubu var " "(en çok %d)" #, c-format @@ -15504,7 +15632,7 @@ msgid "disable all output of the program" msgstr "tüm program çıktısını devre dışı bırak" msgid "allow an external diff helper to be executed" -msgstr "bir dış diff yardımcısının çalıştırılmasına izin ver" +msgstr "bir dış diff yardımcısının yürütülmesine izin ver" msgid "run external text conversion filters when comparing binary files" msgstr "" @@ -15581,7 +15709,7 @@ msgstr "belirli bir dosyaya çıktıla" msgid "exhaustive rename detection was skipped due to too many files." msgstr "" -"Geniş kapsamlı yeniden adlandırma algılaması çok fazla dosya olmasından " +"Geniş kapsamlı yeniden adlandırma algılaması pek fazla dosya olmasından " "dolayı atlandı." msgid "only found copies from modified paths due to too many files." @@ -15672,7 +15800,7 @@ msgstr "hatalı git ad alanı yolu \"%s\"" #, c-format msgid "too many args to run %s" -msgstr "%s çalıştırmak için çok fazla argüman" +msgstr "%s çalıştırmak için pek fazla argüman" msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: sığ bir liste bekleniyordu" @@ -15902,9 +16030,10 @@ msgstr "sanal depo '%s', fsmonitor ile uyumsuz" #, c-format msgid "" -"repository '%s' is incompatible with fsmonitor due to lack of Unix sockets" +"socket directory '%s' is incompatible with fsmonitor due to lack of Unix " +"sockets support" msgstr "" -"Unix soketleri eksik olduğundan dolayı; '%s' deposu, fsmonitor ile uyumsuz" +"yuva dizini '%s', Unix yuva dasteği olmadığından dolayı fsmonitor ile uyumsuz" msgid "" "git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]\n" @@ -16189,7 +16318,7 @@ msgid "" "able to execute it. Maybe git-%s is broken?" msgstr "" "'%s' bir git komutu gibi görünüyor; ancak biz onu\n" -"çalıştıramadık. git-%s bozuk olabilir mi?" +"yürütemedik. git-%s bozuk olabilir mi?" #, c-format msgid "git: '%s' is not a git command. See 'git --help'." @@ -16228,8 +16357,8 @@ msgstr[1] "" "\n" "Buna en yakın komutlar:" -msgid "git version [<options>]" -msgstr "git version [<seçenekler>]" +msgid "git version [--build-options]" +msgstr "git version [--build-options]" #, c-format msgid "%s: %s - %s" @@ -16253,7 +16382,7 @@ 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`." msgstr "" -"'%s' kancası yok sayıldı; çünkü bir çalıştırılabilir olarak ayarlanmamış.\n" +"'%s' kancası yok sayıldı; çünkü bir yürütülebilir olarak ayarlanmamış.\n" "Bu uyarıyı 'git config advice.ignoredHook false' ile kapatabilirsiniz." #, c-format @@ -16479,7 +16608,7 @@ msgstr "" "%s" msgid "Failed to execute internal merge" -msgstr "İç birleştirme çalıştırılamadı" +msgstr "İç birleştirme yürütülemedi" #, c-format msgid "Unable to add %s to database" @@ -16833,8 +16962,8 @@ msgstr "" #, c-format msgid "" -"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" -"\"->\"%s\" in \"%s\"%s" +"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename " +"\"%s\"->\"%s\" in \"%s\"%s" msgstr "" "ÇAKIŞMA (y. adlandır/y. adlandır): \"%s\"->\"%s\" olarak adlandır (\"%s\" " "dalında), \"%s\"->\"%s\" olarak adlandır (\"%s\"%s içinde)" @@ -16845,8 +16974,8 @@ msgstr " (çözülmeden bırakıldı)" #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" -"ÇAKIŞMA (y. adlandır/y. adlandır): %s->%s olarak adlandır (%s içinde). %s->" -"%s olarak adlandır (%s içinde)" +"ÇAKIŞMA (y. adlandır/y. adlandır): %s->%s olarak adlandır (%s içinde). %s-" +">%s olarak adlandır (%s içinde)" #, c-format msgid "" @@ -17148,10 +17277,6 @@ msgstr "alternatif nesne yolu olağanlaştırılamıyor: %s" msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s: alternatif nesne depoları yok sayılıyor, iç içe geçme pek derin" -#, c-format -msgid "unable to normalize object directory: %s" -msgstr "nesne dizini olağanlaştırılamıyor: %s" - msgid "unable to fdopen alternates lockfile" msgstr "alternatifler kilit dosyası fdopen yapılamıyor" @@ -17974,6 +18099,10 @@ msgstr "promisor-remote: alt sürecine getirmek için stdin kapatılamıyor" msgid "promisor remote name cannot begin with '/': %s" msgstr "vaatçi uzak konum adı '/' ile başlayamaz: %s" +#, c-format +msgid "could not fetch %s from promisor remote" +msgstr "vaatçi uzak konumundan %s getirilemedi" + msgid "object-info: expected flush after arguments" msgstr "object-info: argümanlardan sonra floş bekleniyordu" @@ -18225,7 +18354,7 @@ msgstr "" " bir yer tutucu izle. <baş>, yeniden temellendirmenin\n" " sonunda güncellenir\n" "\n" -"Bu satırlar yeniden sıralanabilirler, yukarıdan aşağıya çalıştırılırlar.\n" +"Bu satırlar yeniden sıralanabilirler, yukarıdan aşağıya yürütülürler.\n" #, c-format msgid "Rebase %s onto %s (%d command)" @@ -19038,6 +19167,13 @@ msgid "failed to find tree of %s" msgstr "%s ögesinin ağacı bulunamadı" #, c-format +msgid "unsupported section for hidden refs: %s" +msgstr "gizli başvurular için desteklenmeyen bölüm: %s" + +msgid "--exclude-hidden= passed more than once" +msgstr "--exclude-hidden=, birden çok kez geçirildi" + +#, c-format msgid "resolve-undo records `%s` which is missing" msgstr "resolve-undo, kayıp olan '%s' ögesini kaydetmiş" @@ -19181,6 +19317,14 @@ msgid "--all or <enlistment>, but not both" msgstr "--all veya <gönüllükayıt>; ancak ikisi değil" #, c-format +msgid "could not remove stale scalar.repo '%s'" +msgstr "eskimiş scalar.repo '%s' kaldırılamadı" + +#, c-format +msgid "removing stale scalar.repo '%s'" +msgstr "eskimiş scalar.repo '%s' kaldırılıyor" + +#, c-format msgid "git repository gone in '%s'" msgstr "git deposu '%s' içinde gitti" @@ -19761,7 +19905,7 @@ msgstr "%.*s birleştirilemedi" #, c-format msgid "Executing: %s\n" -msgstr "Çalıştırılıyor: %s\n" +msgstr "Yürütülüyor: %s\n" #, c-format msgid "" @@ -19771,7 +19915,7 @@ msgid "" " git rebase --continue\n" "\n" msgstr "" -"Çalıştırma başarısız: %s\n" +"Yürütme başarısız: %s\n" "%sSorunu çözüp sürdürmek için şunu çalıştırın:\n" "\n" "\tgit rebase --continue\n" @@ -19789,7 +19933,7 @@ msgid "" " git rebase --continue\n" "\n" msgstr "" -"Çalıştırma başarılı oldu: %s,\n" +"Yürütme başarılı oldu: %s,\n" "ancak indeksinize ve/veya çalışma ağacınıza değişiklikler bıraktı\n" "Değişikliklerinizi işleyin veya zulalayın, ardından şunu çalıştırın:\n" "\n" @@ -19800,16 +19944,16 @@ msgstr "" msgid "illegal label name: '%.*s'" msgstr "izin verilmeyen etiket adı: '%.*s'" +#, c-format +msgid "could not resolve '%s'" +msgstr "'%s' çözülemedi" + msgid "writing fake root commit" msgstr "sahte kök işlemesi yazılıyor" msgid "writing squash-onto" msgstr "squash-onto yazılıyor" -#, c-format -msgid "could not resolve '%s'" -msgstr "'%s' çözülemedi" - msgid "cannot merge without a current revision" msgstr "güncel bir revizyon olmadan birleştirilemiyor" @@ -19822,7 +19966,7 @@ msgid "nothing to merge: '%.*s'" msgstr "birleştirilecek bir şey yok: '%.*s'" msgid "octopus merge cannot be executed on top of a [new root]" -msgstr "ahtapot birleştirmesi bir [yeni kök]ün üzerinde çalıştırılamaz" +msgstr "ahtapot birleştirmesi bir [yeni kök]ün üzerinde yürütülemez" #, c-format msgid "could not get commit message of '%s'" @@ -19920,7 +20064,7 @@ msgid "" " git rebase --edit-todo\n" " git rebase --continue\n" msgstr "" -"todo komutu çalıştırılamadı.\n" +"todo komutu yürütülemedi.\n" "\n" "\t%.*s\n" "Yeniden zamanlandı; sürdürmeden önce komutu düzenlemek için lütfen\n" @@ -20405,6 +20549,15 @@ msgstr "ls-tree beklenmedik bir biçimde %d kodu ile çıktı" msgid "failed to lstat '%s'" msgstr "'%s', lstat yapılamadı" +msgid "test-tool cache-tree <options> (control|prime|update)" +msgstr "test-tool cache-tree <seçenekler> (control|prime|update)" + +msgid "clear the cache tree before each iteration" +msgstr "her bir yinelemeden önce önbellek ağacını temizle" + +msgid "number of entries in the cache tree to invalidate (default 0)" +msgstr "önbellek ağacındaki geçersizleştirilecek girdi sayısı (öntanımlı 0)" + msgid "unhandled options" msgstr "beklenmeyen seçenekler" @@ -20416,7 +20569,7 @@ msgid "commit %s is not marked reachable" msgstr "%s işlemesi ulaşılabilir olarak imlenmedi" msgid "too many commits marked reachable" -msgstr "çok fazla işleme ulaşılabilir olarak imlenmiş" +msgstr "pek fazla işleme ulaşılabilir olarak imlenmiş" msgid "test-tool serve-v2 [<options>]" msgstr "test-tool serve-v2 [<seçenekler>]" @@ -21175,8 +21328,8 @@ msgstr " (işlenecekleri güncellemek için \"git add/rm <dosya>...\" kullanın msgid "" " (use \"git restore <file>...\" to discard changes in working directory)" msgstr "" -" (çalışma dizinindeki değişiklikleri atmak için \"git restore <dosya>...\" " -"kullanın)" +" (çalışma dizinindeki değişiklikleri atmak için\n" +" \"git restore <dosya>...\" kullanın)" msgid " (commit or discard the untracked or modified content in submodules)" msgstr " (altmodüllerdeki izlenmeyen/değiştirilen içeriği gönder veya at)" @@ -21497,8 +21650,7 @@ msgstr "Değişiklik yok" #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -"İşlemeye eklenen değişiklik yok (\"git add\" ve/veya \"git commit -a\" " -"kullanın)\n" +"İşlemeye eklenen değişiklik yok (\"git add\" ve/veya \"git commit -a\" kullanın)\n" #, c-format msgid "no changes added to commit\n" @@ -21509,8 +21661,8 @@ msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" -"işlemeye bir şey eklenmedi; ancak izlenmeyen dosyalar var (izlemek için " -"\"git add\" kullanın)\n" +"işlemeye bir şey eklenmedi; ancak izlenmeyen dosyalar var\n" +" (izlemek için \"git add\" kullanın)\n" #, c-format msgid "nothing added to commit but untracked files present\n" @@ -21519,8 +21671,8 @@ msgstr "işlemeye bir şey eklenmedi; ancak izlenmeyen dosyalar var\n" #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" -"İşlenecek bir şey yok (dosyalar oluşturun/kopyalayın ve izlemek için \"git " -"add\" kullanın)\n" +"İşlenecek bir şey yok\n" +" (dosyalar oluşturun/kopyalayın ve izlemek için \"git add\" kullanın)\n" #, c-format msgid "nothing to commit\n" @@ -22169,7 +22321,7 @@ msgstr "(body) Cc: %s, '%s' satırından ekleniyor\n" #, perl-format msgid "(%s) Could not execute '%s'" -msgstr "(%s) '%s' çalıştırılamadı" +msgstr "(%s) '%s' yürütülemedi" #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index b0832be695..1a0026a7dc 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -119,6 +119,7 @@ # smart HTTP protocol | 智能 HTTP 协议 # squash | 挤压 # stage | n. 暂存区（即索引）; v. 暂存 +# stale | 过期的 # stash | n. 贮藏区; v. 贮藏 # submodule | 子模组 # symref | 符号引用 @@ -144,8 +145,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2022-09-28 15:50+0100\n" -"PO-Revision-Date: 2022-09-23 14:53+0100\n" +"POT-Creation-Date: 2022-12-01 14:04+0000\n" +"PO-Revision-Date: 2022-12-01 14:17+0000\n" "Last-Translator: Fangyi Zhou <me@fangyi.io>\n" "Language-Team: GitHub <https://github.com/fangyi-zhou/git-po/>\n" "Language: zh_CN\n" @@ -1016,6 +1017,11 @@ msgstr "命令行以 \\ 结尾" msgid "unclosed quote" msgstr "未关闭的引号" +#: alias.c builtin/cat-file.c builtin/notes.c builtin/prune-packed.c +#: builtin/receive-pack.c builtin/tag.c +msgid "too many arguments" +msgstr "太多参数" + #: apply.c #, c-format msgid "unrecognized whitespace option '%s'" @@ -1467,7 +1473,7 @@ msgstr "略过补丁 '%s'。" msgid "No valid patches in input (allow with \"--allow-empty\")" msgstr "输入中没有合法的补丁 （使用 \"--allow-empty\" 来允许）" -#: apply.c +#: apply.c t/helper/test-cache-tree.c msgid "unable to read index file" msgstr "无法读取索引文件" @@ -1700,7 +1706,7 @@ msgstr "无此引用：%.*s" msgid "not a valid object name: %s" msgstr "不是一个有效的对象名：%s" -#: archive.c +#: archive.c t/helper/test-cache-tree.c #, c-format msgid "not a tree object: %s" msgstr "不是一个树对象：%s" @@ -1751,7 +1757,7 @@ msgid "prepend prefix to each pathname in the archive" msgstr "为归档中每个路径名加上前缀" #: archive.c builtin/blame.c builtin/commit-tree.c builtin/config.c -#: builtin/fast-export.c builtin/grep.c builtin/hash-object.c +#: builtin/fast-export.c builtin/gc.c builtin/grep.c builtin/hash-object.c #: builtin/ls-files.c builtin/notes.c builtin/read-tree.c parse-options.h msgid "file" msgstr "文件" @@ -3176,54 +3182,6 @@ msgid "" msgstr "二分查找运行失败：'git bisect--helper --bisect-state %s' 退出码为 %d" #: builtin/bisect--helper.c -msgid "reset the bisection state" -msgstr "清除二分查找状态" - -#: builtin/bisect--helper.c -msgid "check whether bad or good terms exist" -msgstr "检查坏的或好的术语是否存在" - -#: builtin/bisect--helper.c -msgid "print out the bisect terms" -msgstr "打印二分查找术语" - -#: builtin/bisect--helper.c -msgid "start the bisect session" -msgstr "启动二分查找过程" - -#: builtin/bisect--helper.c -msgid "find the next bisection commit" -msgstr "查询下一个二分查找提交" - -#: builtin/bisect--helper.c -msgid "mark the state of ref (or refs)" -msgstr "标记引用的状态" - -#: builtin/bisect--helper.c -msgid "list the bisection steps so far" -msgstr "列出到目前为止的二分查找步骤" - -#: builtin/bisect--helper.c -msgid "replay the bisection process from the given file" -msgstr "从给定文件重放二分查找进程" - -#: builtin/bisect--helper.c -msgid "skip some commits for checkout" -msgstr "跳过要检出的一些提交" - -#: builtin/bisect--helper.c -msgid "visualize the bisection" -msgstr "可视化二分查找过程" - -#: builtin/bisect--helper.c -msgid "use <cmd>... to automatically bisect" -msgstr "使用 <命令>... 来自动二分查找" - -#: builtin/bisect--helper.c -msgid "no log for BISECT_WRITE" -msgstr "BISECT_WRITE 无日志" - -#: builtin/bisect--helper.c msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-reset 无需参数或者需要一个提交" @@ -3248,6 +3206,10 @@ msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>" #: builtin/blame.c +msgid "git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>" +msgstr "git annotate [<选项>] [<版本选项>] [<版本>] [--] <文件>" + +#: builtin/blame.c msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中" @@ -3487,10 +3449,6 @@ msgid "cannot use -a with -d" msgstr "不能将 -a 和 -d 同时使用" #: builtin/branch.c -msgid "Couldn't look up commit object for HEAD" -msgstr "无法查询 HEAD 指向的提交对象" - -#: builtin/branch.c #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。" @@ -3539,17 +3497,19 @@ msgid "Branch %s is being bisected at %s" msgstr "分支 %s 正被二分查找于 %s" #: builtin/branch.c -msgid "cannot copy the current branch while not on any." -msgstr "无法拷贝当前分支因为不处于任何分支上。" +#, c-format +msgid "Invalid branch name: '%s'" +msgstr "无效的分支名：'%s'" #: builtin/branch.c -msgid "cannot rename the current branch while not on any." -msgstr "无法重命名当前分支因为不处于任何分支上。" +#, c-format +msgid "No commit on branch '%s' yet." +msgstr "分支 '%s' 尚无提交。" #: builtin/branch.c #, c-format -msgid "Invalid branch name: '%s'" -msgstr "无效的分支名：'%s'" +msgid "No branch named '%s'." +msgstr "没有分支 '%s'。" #: builtin/branch.c msgid "Branch rename failed" @@ -3758,14 +3718,12 @@ msgid "cannot edit description of more than one branch" msgstr "不能为一个以上的分支编辑描述" #: builtin/branch.c -#, c-format -msgid "No commit on branch '%s' yet." -msgstr "分支 '%s' 尚无提交。" +msgid "cannot copy the current branch while not on any." +msgstr "不处于任何分支上，无法拷贝当前分支。" #: builtin/branch.c -#, c-format -msgid "No branch named '%s'." -msgstr "没有分支 '%s'。" +msgid "cannot rename the current branch while not on any." +msgstr "不处于任何分支上，无法重命名当前分支。" #: builtin/branch.c msgid "too many branches for a copy operation" @@ -3846,11 +3804,11 @@ msgstr "不是在 git 仓库中执行 - 没有可显示的钩子\n" #: builtin/bugreport.c msgid "" -"git bugreport [-o|--output-directory <file>] [-s|--suffix <format>] [--" -"diagnose[=<mode>]" +"git bugreport [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n" +" [--diagnose[=<mode>]]" msgstr "" -"git bugreport [-o|--output-directory <文件>] [-s|--suffix <格式>] [--" -"diagnose[=<模式>]" +"git bugreport [-o|--output-directory <文件>] [(-s|--suffix) <格式>]\n" +" [--diagnose[=<模式>]" #: builtin/bugreport.c msgid "" @@ -3933,20 +3891,26 @@ msgid "Created new report at '%s'.\n" msgstr "在 '%s' 创建了新报告。\n" #: builtin/bundle.c -msgid "git bundle create [<options>] <file> <git-rev-list args>" -msgstr "git bundle create [<选项>] <文件> <git-rev-list 参数>" +msgid "" +"git bundle create [-q | --quiet | --progress | --all-progress] [--all-" +"progress-implied]\n" +" [--version=<version>] <file> <git-rev-list-args>" +msgstr "" +"git bundle create [-q | --quiet | --progress | --all-progress] [--all-" +"progress-implied]\n" +" [--version=<版本>] <文件> <git-rev-list-参数>" #: builtin/bundle.c -msgid "git bundle verify [<options>] <file>" -msgstr "git bundle verify [<选项>] <文件>" +msgid "git bundle verify [-q | --quiet] <file>" +msgstr "git bundle verify [-q | --quiet] <文件>" #: builtin/bundle.c msgid "git bundle list-heads <file> [<refname>...]" msgstr "git bundle list-heads <文件> [<引用名>...]" #: builtin/bundle.c -msgid "git bundle unbundle <file> [<refname>...]" -msgstr "git bundle unbundle <文件> [<引用名>...]" +msgid "git bundle unbundle [--progress] <file> [<refname>...]" +msgstr "git bundle unbundle [--progress] <文件> [<引用名>...]" #: builtin/bundle.c builtin/pack-objects.c msgid "do not show progress meter" @@ -4043,12 +4007,12 @@ msgid "" "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" "objects]\n" " [--buffer] [--follow-symlinks] [--unordered]\n" -" [--textconv | --filters]" +" [--textconv | --filters] [-z]" msgstr "" "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" "objects]\n" " [--buffer] [--follow-symlinks] [--unordered]\n" -" [--textconv | --filters]" +" [--textconv | --filters] [-z]" #: builtin/cat-file.c msgid "" @@ -4185,11 +4149,6 @@ msgstr "'%s' 需要 <版本>" msgid "<object> required with '-%c'" msgstr "'-%c' 需要 <对象>" -#: builtin/cat-file.c builtin/notes.c builtin/prune-packed.c -#: builtin/receive-pack.c builtin/tag.c -msgid "too many arguments" -msgstr "太多参数" - #: builtin/cat-file.c #, c-format msgid "only two arguments allowed in <type> <object> mode, not %d" @@ -4847,9 +4806,10 @@ msgstr "使用叠加模式" #: builtin/clean.c msgid "" -"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." +"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] " +"[<pathspec>...]" msgstr "" -"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..." +"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径规格>..." #: builtin/clean.c #, c-format @@ -5215,6 +5175,11 @@ msgstr "%s 存在且不是一个目录" msgid "failed to start iterator over '%s'" msgstr "无法在 '%s' 上启动迭代器" +#: builtin/clone.c +#, c-format +msgid "symlink '%s' exists, refusing to clone with --local" +msgstr "符号链接 '%s' 存在，拒绝用 --local 克隆" + #: builtin/clone.c compat/precompose_utf8.c #, c-format msgid "failed to unlink '%s'" @@ -5297,11 +5262,6 @@ msgid "You must specify a repository to clone." msgstr "您必须指定一个仓库来克隆。" #: builtin/clone.c -#, c-format -msgid "options '%s' and '%s %s' cannot be used together" -msgstr "选项 '%s' 和 '%s %s' 不能同时使用" - -#: builtin/clone.c msgid "" "--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-" "exclude" @@ -5451,22 +5411,27 @@ msgstr "--command 必须是第一个参数" #: builtin/commit-graph.c msgid "" -"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" +"git commit-graph verify [--object-dir <dir>] [--shallow] [--[no-]progress]" msgstr "" -"git commit-graph verify [--object-dir <对象目录>] [--shallow] [--" -"[no-]progress]" +"git commit-graph verify [--object-dir <目录>] [--shallow] [--[no-]progress]" #: builtin/commit-graph.c msgid "" -"git commit-graph write [--object-dir <objdir>] [--append] [--" -"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" -"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>" -msgstr "" -"git commit-graph write [--object-dir <对象目录>] [--append] [--split[=<策略" -">]] [--reachable|--stdin-packs|--stdin-commits] [--changed-paths] [--" -"[no-]max-new-filters <n>] [--[no-]progress] <切分选项>" - -#: builtin/commit-graph.c builtin/fetch.c builtin/log.c +"git commit-graph write [--object-dir <dir>] [--append]\n" +" [--split[=<strategy>]] [--reachable | --stdin-packs | " +"--stdin-commits]\n" +" [--changed-paths] [--[no-]max-new-filters <n>] [--" +"[no-]progress]\n" +" <split options>" +msgstr "" +"git commit-graph write [--object-dir <目录>] [--append]\n" +" [--split[=<策略>]] [--reachable | --stdin-packs | --" +"stdin-commits] \n" +" [--changed-paths] [--[no-]max-new-filters <n>] [--" +"[no-]progress]\n" +" <切分选项>" + +#: builtin/commit-graph.c builtin/fetch.c builtin/log.c builtin/repack.c msgid "dir" msgstr "目录" @@ -5552,12 +5517,16 @@ msgid "Collecting commits from input" msgstr "正从标准输入收集提交" #: builtin/commit-tree.c +msgid "git commit-tree <tree> [(-p <parent>)...]" +msgstr "git commit-tree <树> [(-p <父提交>)...]" + +#: builtin/commit-tree.c msgid "" -"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " -"<file>)...] <tree>" +"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...]\n" +" [(-F <file>)...] <tree>" msgstr "" -"git commit-tree [(-p <父提交>)...] [-S[<keyid>]] [(-m <消息>)...] [(-F <文件" -">)...] <树>" +"git commit-tree [(-p <父提交>)...] [-S[<私钥 ID>]] [(-m <消息>)...]\n" +" [(-F <文件>)...] <树>" #: builtin/commit-tree.c #, c-format @@ -5614,12 +5583,30 @@ msgid "git commit-tree: failed to read" msgstr "git commit-tree：无法读取" #: builtin/commit.c -msgid "git commit [<options>] [--] <pathspec>..." -msgstr "git commit [<选项>] [--] <路径规格>..." +msgid "" +"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" +" [--allow-empty-message] [--no-verify] [-e] [--author=<author>]\n" +" [--date=<date>] [--cleanup=<mode>] [--[no-]status]\n" +" [-i | -o] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" +" [(--trailer <token>[(=|:)<value>])...] [-S[<keyid>]]\n" +" [--] [<pathspec>...]" +msgstr "" +"git commit [-a | --interactive | --patch] [-s] [-v] [-u<模式>] [--amend]\n" +" [--dry-run] [(-c | -C | --squash) <提交> | --fixup [(amend|" +"reword):]<提交>)]\n" +" [-F <文件> | -m <消息>] [--reset-author] [--allow-empty]\n" +" [--allow-empty-message] [--no-verify] [-e] [--author=<作者>]\n" +" [--date=<日期>] [--cleanup=<模式>] [--[no-]status]\n" +" [-i | -o] [--pathspec-from-file=<文件> [--pathspec-file-nul]]\n" +" [(--trailer <键>[(=|:)<值>])...] [-S[<私钥 ID>]]\n" +" [--] [<路径规格>...]" #: builtin/commit.c -msgid "git status [<options>] [--] <pathspec>..." -msgstr "git status [<选项>] [--] <路径规格>..." +msgid "git status [<options>] [--] [<pathspec>...]" +msgstr "git status [<选项>] [--] [<路径规格>...]" #: builtin/commit.c msgid "" @@ -6228,7 +6215,7 @@ msgstr "使用仓库级配置文件" msgid "use per-worktree config file" msgstr "使用工作区级别的配置文件" -#: builtin/config.c +#: builtin/config.c builtin/gc.c msgid "use given config file" msgstr "使用指定的配置文件" @@ -6449,7 +6436,7 @@ msgstr "--blob 只能在 git 仓库内使用" msgid "--worktree can only be used inside a git repository" msgstr "--worktree 只能在 git 仓库内使用" -#: builtin/config.c +#: builtin/config.c builtin/gc.c msgid "$HOME not set" msgstr "$HOME 未设置" @@ -6559,12 +6546,20 @@ msgid "unable to get credential storage lock in %d ms" msgstr "无法在 %d ms 获得凭证存储锁" #: builtin/describe.c -msgid "git describe [<options>] [<commit-ish>...]" -msgstr "git describe [<选项>] [<提交号>...]" +msgid "" +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] [<commit-ish>...]" +msgstr "" +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] [<提交号>...]" + +#: builtin/describe.c +msgid "" +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<mark>]" +msgstr "" +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<标记>]" #: builtin/describe.c -msgid "git describe [<options>] --dirty" -msgstr "git describe [<选项>] --dirty" +msgid "git describe <blob>" +msgstr "git describe <数据对象>" #: builtin/describe.c msgid "head" @@ -6717,11 +6712,11 @@ msgstr "选项 '%s' 和提交号不能同时使用" #: builtin/diagnose.c msgid "" -"git diagnose [-o|--output-directory <path>] [-s|--suffix <format>] [--" -"mode=<mode>]" +"git diagnose [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n" +" [--mode=<mode>]" msgstr "" -"git diagnose [-o|--output-directory <文件>] [-s|--suffix <格式>] [--mode=<模" -"式>]" +"git diagnose [(-o | --output-directory) <路径>] [(-s | --suffix) <格式>]\n" +" [--mode=<模式>]" #: builtin/diagnose.c msgid "specify a destination for the diagnostics archive" @@ -6745,6 +6740,10 @@ msgid "'%s': not a regular file or symlink" msgstr "'%s'：不是一个正规文件或符号链接" #: builtin/diff.c +msgid "no merge given, only parents." +msgstr "没有给出合并，只有父提交。" + +#: builtin/diff.c #, c-format msgid "invalid option: %s" msgstr "无效选项：%s" @@ -7533,8 +7532,8 @@ msgid "print only refs which don't contain the commit" msgstr "只打印不包含该提交的引用" #: builtin/for-each-repo.c -msgid "git for-each-repo --config=<config> <command-args>" -msgstr "git for-each-repo --config=<配置> <命令参数>" +msgid "git for-each-repo --config=<config> [--] <arguments>" +msgstr "git for-each-repo --config=<配置> [--] <命令参数>" #: builtin/for-each-repo.c msgid "config" @@ -7751,8 +7750,16 @@ msgid "%s: invalid sha1 pointer in resolve-undo" msgstr "%s：resolve-undo 中无效的 sha1 指针" #: builtin/fsck.c -msgid "git fsck [<options>] [<object>...]" -msgstr "git fsck [<选项>] [<对象>...]" +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>...]" +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] [<对象>...]" #: builtin/fsck.c msgid "show unreachable objects" @@ -7825,14 +7832,6 @@ msgid "git fsmonitor--daemon run [<options>]" msgstr "git fsmonitor--daemon run [<选项>]" #: builtin/fsmonitor--daemon.c -msgid "git fsmonitor--daemon stop" -msgstr "git fsmonitor--daemon stop" - -#: builtin/fsmonitor--daemon.c -msgid "git fsmonitor--daemon status" -msgstr "git fsmonitor--daemon status" - -#: builtin/fsmonitor--daemon.c #, c-format msgid "value of '%s' out of range: %d" msgstr "'%s' 的值超出范围：%d" @@ -7932,7 +7931,7 @@ msgstr "等待守护进程启动的最大秒数" msgid "invalid 'ipc-threads' value (%d)" msgstr "无效的 'ipc-threads' 值（%d）" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c t/helper/test-cache-tree.c #, c-format msgid "Unhandled subcommand '%s'" msgstr "未处理的子命令 '%s'" @@ -8132,8 +8131,23 @@ msgid "use at most one of --auto and --schedule=<frequency>" msgstr "最多使用 --auto 和 --schedule=<频率> 其中之一" #: builtin/gc.c -msgid "failed to run 'git config'" -msgstr "无法运行 'git config'" +#, c-format +msgid "unable to add '%s' value of '%s'" +msgstr "无法添加 '%2$s' 的 '%1$s' 值" + +#: builtin/gc.c +msgid "return success even if repository was not registered" +msgstr "即便仓库非注册仍然返回成功" + +#: builtin/gc.c +#, c-format +msgid "unable to unset '%s' value of '%s'" +msgstr "无法取消设置 '%2$s' 的 '%1$s' 值" + +#: builtin/gc.c +#, c-format +msgid "repository '%s' is not registered" +msgstr "仓库 '%s' 未注册" #: builtin/gc.c #, c-format @@ -8509,11 +8523,15 @@ msgstr "同时给出了 --cached 和树对象" #: builtin/hash-object.c msgid "" -"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " -"[--] <file>..." +"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters]\n" +" [--stdin [--literally]] [--] <file>..." msgstr "" -"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] " -"[--] <文件>..." +"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters]\n" +" [--stdin [--literally]] [--] <文件>..." + +#: builtin/hash-object.c +msgid "git hash-object [-t <type>] [-w] --stdin-paths [--no-filters]" +msgstr "git hash-object [-t <类型>] [-w] --stdin-paths [--no-filters]" #: builtin/hash-object.c msgid "object type" @@ -9047,11 +9065,15 @@ msgstr "已初始化空的 Git 仓库于 %s%s\n" #: builtin/init-db.c msgid "" -"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" -"shared[=<permissions>]] [<directory>]" +"git init [-q | --quiet] [--bare] [--template=<template-directory>]\n" +" [--separate-git-dir <git-dir>] [--object-format=<format>]\n" +" [-b <branch-name> | --initial-branch=<branch-name>]\n" +" [--shared[=<permissions>]] [<directory>]" msgstr "" -"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] " -"[<目录>]" +"git init [-q | --quiet] [--bare] [--template=<模板目录>]\n" +" [--separate-git-dir <git 目录>] [--object-format=<格式>]\n" +" [-b <分支名> | --initial-branch=<分支名>]\n" +" [--shared[=<权限>]] [<目录>]" #: builtin/init-db.c msgid "permissions" @@ -9101,11 +9123,13 @@ msgstr "--separate-git-dir 不能用于纯仓库" #: builtin/interpret-trailers.c msgid "" -"git interpret-trailers [--in-place] [--trim-empty] [(--trailer " -"<token>[(=|:)<value>])...] [<file>...]" +"git interpret-trailers [--in-place] [--trim-empty]\n" +" [(--trailer <token>[(=|:)<value>])...]\n" +" [--parse] [<file>...]" msgstr "" -"git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值" -">])...] [<文件>...]" +"git interpret-trailers [--in-place] [--trim-empty]\n" +" [(--trailer <键>[(=|:)<值>])...]\n" +" [--parse] [<文件>...]" #: builtin/interpret-trailers.c msgid "edit files in place" @@ -9724,11 +9748,11 @@ msgstr "" #: builtin/ls-remote.c msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" -" [-q | --quiet] [--exit-code] [--get-url]\n" +" [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n" " [--symref] [<repository> [<refs>...]]" msgstr "" -"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" -" [-q | --quiet] [--exit-code] [--get-url]\n" +"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<可执行文件>]\n" +" [-q | --quiet] [--exit-code] [--get-url] [--sort=<键>]\n" " [--symref] [<仓库> [<引用>...]]" #: builtin/ls-remote.c @@ -9898,14 +9922,14 @@ msgid "git merge-base [-a | --all] --octopus <commit>..." msgstr "git merge-base [-a | --all] --octopus <提交>..." #: builtin/merge-base.c -msgid "git merge-base --independent <commit>..." -msgstr "git merge-base --independent <提交>..." - -#: builtin/merge-base.c msgid "git merge-base --is-ancestor <commit> <commit>" msgstr "git merge-base --is-ancestor <提交> <提交>" #: builtin/merge-base.c +msgid "git merge-base --independent <commit>..." +msgstr "git merge-base --independent <提交>..." + +#: builtin/merge-base.c msgid "git merge-base --fork-point <ref> [<commit>]" msgstr "git merge-base --fork-point <引用> [<提交>]" @@ -10045,9 +10069,23 @@ msgid "allow merging unrelated histories" msgstr "允许合并不相关的历史" #: builtin/merge-tree.c +msgid "perform multiple merges, one per line of input" +msgstr "实施多个合并，每输入行一个" + +#: builtin/merge-tree.c msgid "--trivial-merge is incompatible with all other options" msgstr "--trivial-merge 与其他所有选项不兼容" +#: builtin/merge-tree.c builtin/notes.c +#, c-format +msgid "malformed input line: '%s'." +msgstr "格式错误的输入行：'%s'。" + +#: builtin/merge-tree.c +#, c-format +msgid "merging cannot continue; got unclean result of %d" +msgstr "合并无法继续；得到不干净的结果 %d" + #: builtin/merge.c msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<选项>] [<提交>...]" @@ -10620,7 +10658,7 @@ msgstr "%s，源=%s，目标=%s" msgid "Renaming %s to %s\n" msgstr "重命名 %s 至 %s\n" -#: builtin/mv.c builtin/remote.c builtin/repack.c +#: builtin/mv.c builtin/remote.c #, c-format msgid "renaming '%s' failed" msgstr "重命名 '%s' 失败" @@ -10823,11 +10861,6 @@ msgstr "不能从非数据对象 '%s' 中读取注解数据。" #: builtin/notes.c #, c-format -msgid "malformed input line: '%s'." -msgstr "格式错误的输入行：'%s'。" - -#: builtin/notes.c -#, c-format msgid "failed to copy notes from '%s' to '%s'" msgstr "无法把注解从 '%s' 拷贝到 '%s'" @@ -11058,14 +11091,13 @@ msgid "unknown subcommand: `%s'" msgstr "未知子命令：`%s'" #: builtin/pack-objects.c -msgid "" -"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" -msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]" +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 [<options>] <base-name> [< <ref-list> | < <object-list>]" +msgstr "git pack-objects [<选项>] <前缀名称> [< <引用列表> | < <对象列表>]" #: builtin/pack-objects.c #, c-format @@ -11535,8 +11567,8 @@ msgstr "" "使用它。 谢谢。\n" #: builtin/pack-refs.c -msgid "git pack-refs [<options>]" -msgstr "git pack-refs [<选项>]" +msgid "git pack-refs [--all] [--no-prune]" +msgstr "git pack-refs [--all] [--no-prune]" #: builtin/pack-refs.c msgid "pack everything" @@ -11546,6 +11578,22 @@ msgstr "打包一切" msgid "prune loose refs (default)" msgstr "清除松散的引用（默认）" +#: builtin/patch-id.c +msgid "git patch-id [--stable | --unstable | --verbatim]" +msgstr "git patch-id [--stable | --unstable | --verbatim]" + +#: builtin/patch-id.c +msgid "use the unstable patch-id algorithm" +msgstr "使用不稳定的 patch-id 算法" + +#: builtin/patch-id.c +msgid "use the stable patch-id algorithm" +msgstr "使用稳定的 patch-id 算法" + +#: builtin/patch-id.c +msgid "don't strip whitespace from the patch" +msgstr "不要从补丁中删除空白字符" + #: builtin/prune.c msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--progress] [--expire <时间>] [--] [<head>...]" @@ -11793,9 +11841,8 @@ msgstr "" #: builtin/push.c msgid "" "\n" -"To avoid automatically configuring upstream branches when their name\n" -"doesn't match the local branch, see option 'simple' of branch." -"autoSetupMerge\n" +"To avoid automatically configuring an upstream branch when its name\n" +"won't match the local branch, see option 'simple' of branch.autoSetupMerge\n" "in 'git help config'.\n" msgstr "" "\n" @@ -11953,6 +12000,13 @@ msgstr "推送到 %s\n" msgid "failed to push some refs to '%s'" msgstr "无法推送一些引用到 '%s'" +#: builtin/push.c +msgid "" +"recursing into submodule with push.recurseSubmodules=only; using on-demand " +"instead" +msgstr "" +"在 push.recurseSubmodules=only 时递归进入子模组；取而代之使用 on-demand" + #: builtin/push.c builtin/send-pack.c submodule-config.c #, c-format msgid "invalid value for '%s'" @@ -12125,13 +12179,14 @@ msgstr "需要两个提交范围" #: builtin/read-tree.c msgid "" -"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " -"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-" -"ish1> [<tree-ish2> [<tree-ish3>]])" +"git read-tree [(-m [--trivial] [--aggressive] | --reset | --" +"prefix=<prefix>)\n" +" [-u | -i]] [--index-output=<file>] [--no-sparse-checkout]\n" +" (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" msgstr "" -"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-" -"u | -i]] [--no-sparse-checkout] [--index-output=<文件>] (--empty | <树对象一" -"> [<树对象二> [<树对象三>]])" +"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>)\n" +" [-u | -i]] [--index-output=<文件>] [--no-sparse-checkout]\n" +" (--empty | <树对象一> [<树对象二> [<树对象三>]])" #: builtin/read-tree.c msgid "write resulting index to <file>" @@ -12248,8 +12303,8 @@ msgstr "%s 需要合并后端" #: builtin/rebase.c #, c-format -msgid "could not get 'onto': '%s'" -msgstr "无法获取 'onto'：'%s'" +msgid "invalid onto: '%s'" +msgstr "无效新基线：'%s'" #: builtin/rebase.c #, c-format @@ -12613,8 +12668,8 @@ msgid "No such ref: %s" msgstr "没有这样的引用：%s" #: builtin/rebase.c -msgid "Could not resolve HEAD to a revision" -msgstr "无法将 HEAD 解析为一个版本" +msgid "Could not resolve HEAD to a commit" +msgstr "不能解析 HEAD 至一个提交" #: builtin/rebase.c #, c-format @@ -13084,7 +13139,7 @@ msgstr " 已跳过" #: builtin/remote.c msgid " stale (use 'git remote prune' to remove)" -msgstr " 过时（使用 'git remote prune' 来移除）" +msgstr " 已过期（使用 'git remote prune' 来移除）" #: builtin/remote.c msgid " ???" @@ -13416,6 +13471,11 @@ msgid "could not close refs snapshot tempfile" msgstr "不能关闭引用快照临时文件" #: builtin/repack.c +#, c-format +msgid "could not remove stale bitmap: %s" +msgstr "无法删除过期的位图： %s" + +#: builtin/repack.c msgid "pack everything in a single pack" msgstr "所有内容打包到一个包文件中" @@ -13512,6 +13572,10 @@ msgid "write a multi-pack index of the resulting packs" msgstr "写入结果包的多包索引" #: builtin/repack.c +msgid "pack prefix to store a pack containing pruned objects" +msgstr "储存被清除的对象的包的前缀" + +#: builtin/repack.c msgid "cannot delete packs in a precious-objects repo" msgstr "不能删除珍品仓库中的打包文件" @@ -13526,11 +13590,16 @@ msgstr "包前缀 %s 没有以对象目录 .%s 开始" #: builtin/repack.c #, c-format -msgid "missing required file: %s" -msgstr "缺少需要的文件：%s" +msgid "renaming pack to '%s' failed" +msgstr "重命名包至 '%s' 失败" #: builtin/repack.c #, c-format +msgid "pack-objects did not write a '%s' file for pack %s-%s" +msgstr "pack-objects 未为包 %2$s-%3$s 写入 '%1$s' 文件" + +#: builtin/repack.c sequencer.c +#, c-format msgid "could not unlink: %s" msgstr "不能删除：%s" @@ -13771,8 +13840,10 @@ msgid "only one pattern can be given with -l" msgstr "只能为 -l 提供一个模式" #: builtin/rerere.c -msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" -msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]" +msgid "" +"git rerere [clear | forget <pathspec>... | diff | status | remaining | gc]" +msgstr "" +"git rerere [clear | forget <路径规格>... | diff | status | remaining | gc]" #: builtin/rerere.c msgid "register clean resolutions in index" @@ -14027,6 +14098,18 @@ msgstr "--prefix 需要一个参数" msgid "unknown mode for --abbrev-ref: %s" msgstr "未知的 --abbrev-ref 模式：%s" +#: builtin/rev-parse.c revision.c +msgid "--exclude-hidden cannot be used together with --branches" +msgstr "--exclude-hidden 不能与 --branches 一起使用" + +#: builtin/rev-parse.c revision.c +msgid "--exclude-hidden cannot be used together with --tags" +msgstr "--exclude-hidden 不能与 --tags 一起使用" + +#: builtin/rev-parse.c revision.c +msgid "--exclude-hidden cannot be used together with --remotes" +msgstr "--exclude-hidden 不能与 --remotes 一起使用" + #: builtin/rev-parse.c setup.c msgid "this operation must be run in a work tree" msgstr "该操作必须在一个工作区中运行" @@ -14037,20 +14120,27 @@ msgid "unknown mode for --show-object-format: %s" msgstr "未知的 --show-object-format 模式：%s" #: builtin/revert.c -msgid "git revert [<options>] <commit-ish>..." -msgstr "git revert [<选项>] <提交号>..." +msgid "" +"git revert [--[no-]edit] [-n] [-m <parent-number>] [-s] [-S[<keyid>]] " +"<commit>..." +msgstr "" +"git revert [--[no-]edit] [-n] [-m <父编号>] [-s] [-S[<私钥 ID>]] <提交>..." #: builtin/revert.c -msgid "git revert <subcommand>" -msgstr "git revert <子命令>" +msgid "git revert (--continue | --skip | --abort | --quit)" +msgstr "git revert (--continue | --skip | --abort | --quit)" #: builtin/revert.c -msgid "git cherry-pick [<options>] <commit-ish>..." -msgstr "git cherry-pick [<选项>] <提交号>..." +msgid "" +"git cherry-pick [--edit] [-n] [-m <parent-number>] [-s] [-x] [--ff]\n" +" [-S[<keyid>]] <commit>..." +msgstr "" +"git cherry-pick [--edit] [-n] [-m <父编号>] [-s] [-x] [--ff]\n" +" [-S[<私钥 ID>]] <提交>..." #: builtin/revert.c -msgid "git cherry-pick <subcommand>" -msgstr "git cherry-pick <子命令>" +msgid "git cherry-pick (--continue | --skip | --abort | --quit)" +msgstr "git cherry-pick (--continue | --skip | --abort | --quit)" #: builtin/revert.c #, c-format @@ -14131,8 +14221,14 @@ msgid "cherry-pick failed" msgstr "拣选失败" #: builtin/rm.c -msgid "git rm [<options>] [--] <file>..." -msgstr "git rm [<选项>] [--] <文件>..." +msgid "" +"git rm [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n" +" [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" +" [--] [<pathspec>...]" +msgstr "" +"git rm [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n" +" [--quiet] [--pathspec-from-file=<文件> [--pathspec-file-nul]]\n" +" [--] [<路径规格>...]" #: builtin/rm.c msgid "" @@ -14215,11 +14311,13 @@ msgid "" "git send-pack [--mirror] [--dry-run] [--force]\n" " [--receive-pack=<git-receive-pack>]\n" " [--verbose] [--thin] [--atomic]\n" +" [--[no-]signed | --signed=(true|false|if-asked)]\n" " [<host>:]<directory> (--all | <ref>...)" msgstr "" "git send-pack [--mirror] [--dry-run] [--force]\n" " [--receive-pack=<git-receive-pack>]\n" " [--verbose] [--thin] [--atomic]\n" +" [--[no-]signed | --signed=(true|false|if-asked)]\n" " [<主机>:]<目录> (--all | <引用>...)" #: builtin/send-pack.c @@ -14251,8 +14349,9 @@ msgid "using multiple --group options with stdin is not supported" msgstr "不支持和标准输入一起使用多个 --group 选项" #: builtin/shortlog.c -msgid "using --group=trailer with stdin is not supported" -msgstr "不支持和标准输入一起使用 --group=trailer" +#, c-format +msgid "using %s with stdin is not supported" +msgstr "不支持对 %s 使用标准输入" #: builtin/shortlog.c #, c-format @@ -14300,12 +14399,14 @@ msgid "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" " [--current] [--color[=<when>] | --no-color] [--sparse]\n" " [--more=<n> | --list | --independent | --merge-base]\n" -" [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" +" [--no-name | --sha1-name] [--topics]\n" +" [(<rev> | <glob>)...]" msgstr "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" " [--current] [--color[=<何时>] | --no-color] [--sparse]\n" " [--more=<n> | --list | --independent | --merge-base]\n" -" [--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]" +" [--no-name | --sha1-name] [--topics]\n" +" [(<版本> | <通配符>)...]" #: builtin/show-branch.c msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" @@ -14434,11 +14535,13 @@ msgstr "未知的哈希算法" #: builtin/show-ref.c msgid "" -"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference]\n" +" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n" +" [--heads] [--] [<pattern>...]" msgstr "" -"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]" +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference]\n" +" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n" +" [--heads] [--] [<模式>...]" #: builtin/show-ref.c msgid "git show-ref --exclude-existing[=<pattern>]" @@ -14477,8 +14580,10 @@ msgid "show refs from stdin that aren't in local repository" msgstr "显示从标准输入中读入的不在本地仓库中的引用" #: builtin/sparse-checkout.c -msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" -msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <选项>" +msgid "" +"git sparse-checkout (init | list | set | add | reapply | disable) [<options>]" +msgstr "" +"git sparse-checkout (init | list | set | add | reapply | disable) [<选项>]" #: builtin/sparse-checkout.c msgid "this worktree is not sparse" @@ -14619,78 +14724,65 @@ msgid "error while refreshing working directory" msgstr "刷新工作目录时出错" #: builtin/stash.c -msgid "git stash list [<options>]" -msgstr "git stash list [<选项>]" +msgid "git stash list [<log-options>]" +msgstr "git stash list [<日志选项>]" + +#: builtin/stash.c +msgid "" +"git stash show [-u | --include-untracked | --only-untracked] [<diff-" +"options>] [<stash>]" +msgstr "" +"git stash show [-u | --include-untracked | --only-untracked] [<差异选项>] [<" +"贮存>]" #: builtin/stash.c -msgid "git stash show [<options>] [<stash>]" -msgstr "git stash show [<选项>] [<stash>]" +msgid "git stash drop [-q | --quiet] [<stash>]" +msgstr "git stash drop [-q | --quiet] [<贮存>]" #: builtin/stash.c -msgid "git stash drop [-q|--quiet] [<stash>]" -msgstr "git stash drop [-q|--quiet] [<stash>]" +msgid "git stash pop [--index] [-q | --quiet] [<stash>]" +msgstr "git stash pop [--index] [-q | --quiet] [<贮存>]" #: builtin/stash.c -msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" -msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" +msgid "git stash apply [--index] [-q | --quiet] [<stash>]" +msgstr "git stash apply [--index] [-q | --quiet] [<贮存>]" #: builtin/stash.c msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <分支名> [<stash>]" #: builtin/stash.c +msgid "git stash store [(-m | --message) <message>] [-q | --quiet] <commit>" +msgstr "git stash store [(-m | --message) <消息>] [-q | --quiet] <提交>" + +#: builtin/stash.c msgid "" -"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" -"quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" +"git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q " +"| --quiet]\n" +" [-u | --include-untracked] [-a | --all] [(-m | --message) " +"<message>]\n" " [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" " [--] [<pathspec>...]]" msgstr "" -"git stash [push [-p|--patch] [[-S|--staged] -k|--[no-]keep-index] [-q|--" -"quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n" +"git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q " +"| --quiet]\n" +" [-u | --include-untracked] [-a | --all] [(-m | --message <消息>]\n" " [--pathspec-from-file=<文件> [--pathspec-file-nul]]\n" " [--] [<路径规格>...]]" #: builtin/stash.c msgid "" -"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" -"quiet]\n" -" [-u|--include-untracked] [-a|--all] [<message>]" +"git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | " +"--quiet]\n" +" [-u | --include-untracked] [-a | --all] [<message>]" msgstr "" -"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" -"quiet]\n" -" [-u|--include-untracked] [-a|--all] [<消息>]" - -#: builtin/stash.c -msgid "git stash pop [--index] [-q|--quiet] [<stash>]" -msgstr "git stash pop [--index] [-q|--quiet] [<stash>]" - -#: builtin/stash.c -msgid "git stash apply [--index] [-q|--quiet] [<stash>]" -msgstr "git stash apply [--index] [-q|--quiet] [<stash>]" +"git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | " +"--quiet]\n" +" [-u | --include-untracked] [-a | --all] [<消息>]" #: builtin/stash.c -msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" -msgstr "git stash store [-m|--message <消息>] [-q|--quiet] <提交>" - -#: builtin/stash.c -msgid "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" -" [--] [<pathspec>...]]" -msgstr "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n" -" [--] [<路径规格>...]]" - -#: builtin/stash.c -msgid "" -"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [<message>]" -msgstr "" -"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [<消息>]" +msgid "git stash create [<message>]" +msgstr "git stash create [<消息>]" #: builtin/stash.c #, c-format @@ -15379,10 +15471,6 @@ msgid "don't fetch new objects from the remote site" msgstr "不要从远程地址获取新对象" #: builtin/submodule--helper.c -msgid "path into the working tree" -msgstr "到工作区的路径" - -#: builtin/submodule--helper.c msgid "use the 'checkout' update strategy (default)" msgstr "使用 'checkout' 更新策略（默认）" @@ -15427,34 +15515,10 @@ msgstr "" "径>...]" #: builtin/submodule--helper.c -msgid "recurse into submodules" -msgstr "在子模组中递归" - -#: builtin/submodule--helper.c msgid "git submodule absorbgitdirs [<options>] [<path>...]" msgstr "git submodule absorbgitdirs [<选项>] [<路径>...]" #: builtin/submodule--helper.c -msgid "check if it is safe to write to the .gitmodules file" -msgstr "检查写入 .gitmodules 文件是否安全" - -#: builtin/submodule--helper.c -msgid "unset the config in the .gitmodules file" -msgstr "取消 .gitmodules 文件中的设置" - -#: builtin/submodule--helper.c -msgid "git submodule--helper config <name> [<value>]" -msgstr "git submodule--helper config <名称> [<值>]" - -#: builtin/submodule--helper.c -msgid "git submodule--helper config --unset <name>" -msgstr "git submodule--helper config --unset <名称>" - -#: builtin/submodule--helper.c -msgid "please make sure that the .gitmodules file is in the working tree" -msgstr "请确认 .gitmodules 文件在工作区里" - -#: builtin/submodule--helper.c msgid "suppress output for setting url of a submodule" msgstr "抑制设置子模组 URL 的输出" @@ -15548,6 +15612,10 @@ msgid "unable to checkout submodule '%s'" msgstr "无法检出子模组 '%s'" #: builtin/submodule--helper.c +msgid "please make sure that the .gitmodules file is in the working tree" +msgstr "请确认 .gitmodules 文件在工作区里" + +#: builtin/submodule--helper.c #, c-format msgid "Failed to add submodule '%s'" msgstr "无法添加子模组 '%s'" @@ -15608,23 +15676,26 @@ msgstr "仓库 URL：'%s' 必须是绝对路径或以 ./|../ 起始" msgid "'%s' is not a valid submodule name" msgstr "'%s' 不是一个有效的子模组名称" +#: builtin/submodule--helper.c +msgid "git submodule--helper <command>" +msgstr "git submodule--helper <命令>" + #: builtin/submodule--helper.c git.c #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s 不支持 --super-prefix" -#: builtin/submodule--helper.c -#, c-format -msgid "'%s' is not a valid submodule--helper subcommand" -msgstr "'%s' 不是一个有效的 submodule--helper 子命令" +#: builtin/symbolic-ref.c +msgid "git symbolic-ref [-m <reason>] <name> <ref>" +msgstr "git symbolic-ref [-m <理由>] <名称> <引用>" #: builtin/symbolic-ref.c -msgid "git symbolic-ref [<options>] <name> [<ref>]" -msgstr "git symbolic-ref [<选项>] <名称> [<引用>]" +msgid "git symbolic-ref [-q] [--short] [--no-recurse] <name>" +msgstr "git symbolic-ref [-q] [--short] [--no-recurse] <名称>" #: builtin/symbolic-ref.c -msgid "git symbolic-ref -d [-q] <name>" -msgstr "git symbolic-ref -d [-q] <名称>" +msgid "git symbolic-ref --delete [-q] <name>" +msgstr "git symbolic-ref --delete [-q] <名称>" #: builtin/symbolic-ref.c msgid "suppress error message for non-symbolic (detached) refs" @@ -15638,6 +15709,10 @@ msgstr "删除符号引用" msgid "shorten ref output" msgstr "缩短引用输出" +#: builtin/symbolic-ref.c +msgid "recursively dereference (default)" +msgstr "递归解引用（默认）" + #: builtin/symbolic-ref.c builtin/update-ref.c msgid "reason" msgstr "原因" @@ -15648,11 +15723,11 @@ msgstr "更新的原因" #: builtin/tag.c msgid "" -"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n" -" <tagname> [<head>]" +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n" +" <tagname> [<commit> | <object>]" msgstr "" -"git tag [-a | -s | -u <key-id>] [-f] [-m <消息> | -F <文件>]\n" -" <标签名> [<头>]" +"git tag [-a | -s | -u <私钥 ID>] [-f] [-m <消息> | -F <文件>] [-e]\n" +" <标签名> [<提交> | <对象>]" #: builtin/tag.c msgid "git tag -d <tagname>..." @@ -15660,14 +15735,15 @@ msgstr "git tag -d <标签名>..." #: builtin/tag.c msgid "" -"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" -"points-at <object>]\n" -" [--format=<format>] [--merged <commit>] [--no-merged <commit>] " -"[<pattern>...]" +"git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]\n" +" [--points-at <object>] [--column[=<options>] | --no-column]\n" +" [--create-reflog] [--sort=<key>] [--format=<format>]\n" +" [--merged <commit>] [--no-merged <commit>] [<pattern>...]" msgstr "" -"git tag -l [-n[<数字>]] [--contains <提交>] [--no-contains <提交>] [--points-" -"at <对象>]\n" -" [--format=<格式>] [--merged <提交>] [--no-merged <提交>] [<模式>...]" +"git tag [-n[<数字>]] -l [--contains <提交>] [--no-contains <提交>]\n" +" [--points-at <对象>] [--column[=<选项>] | --no-column]\n" +" [--create-reflog] [--sort=<键>] [--format=<格式>]\n" +" [--merged <提交>] [--no-merged <提交>] [<模式>...]" #: builtin/tag.c msgid "git tag -v [--format=<format>] <tagname>..." @@ -16139,8 +16215,12 @@ msgid "update the info files from scratch" msgstr "从头开始更新文件信息" #: builtin/upload-pack.c -msgid "git upload-pack [<options>] <dir>" -msgstr "git upload-pack [<选项>] <目录>" +msgid "" +"git-upload-pack [--[no-]strict] [--timeout=<n>] [--stateless-rpc]\n" +" [--advertise-refs] <directory>" +msgstr "" +"git-upload-pack [--[no-]strict] [--timeout=<n>] [--stateless-rpc]\n" +" [--advertise-refs] <目录>" #: builtin/upload-pack.c t/helper/test-serve-v2.c msgid "quit after a single request/response exchange" @@ -16159,8 +16239,8 @@ msgid "interrupt transfer after <n> seconds of inactivity" msgstr "不活动 <n> 秒钟后终止传输" #: builtin/verify-commit.c -msgid "git verify-commit [-v | --verbose] <commit>..." -msgstr "git verify-commit [-v | --verbose] <提交>..." +msgid "git verify-commit [-v | --verbose] [--raw] <commit>..." +msgstr "git verify-commit [-v | --verbose] [--raw] <提交>..." #: builtin/verify-commit.c msgid "print commit contents" @@ -16171,8 +16251,8 @@ msgid "print raw gpg status output" msgstr "打印原始 gpg 状态输出" #: builtin/verify-pack.c -msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." -msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..." +msgid "git verify-pack [-v | --verbose] [-s | --stat-only] [--] <pack>.idx..." +msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] [--] <包>.idx..." #: builtin/verify-pack.c msgid "verbose" @@ -16183,44 +16263,48 @@ msgid "show statistics only" msgstr "只显示统计" #: builtin/verify-tag.c -msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." -msgstr "git verify-tag [-v | --verbose] [--format=<格式>] <标签>..." +msgid "git verify-tag [-v | --verbose] [--format=<format>] [--raw] <tag>..." +msgstr "git verify-tag [-v | --verbose] [--format=<格式>] [--raw] <标签>..." #: builtin/verify-tag.c msgid "print tag contents" msgstr "打印标签内容" #: builtin/worktree.c -msgid "git worktree add [<options>] <path> [<commit-ish>]" -msgstr "git worktree add [<选项>] <路径> [<提交>]" +msgid "" +"git worktree add [-f] [--detach] [--checkout] [--lock [--reason <string>]]\n" +" [-b <new-branch>] <path> [<commit-ish>]" +msgstr "" +"git worktree add [-f] [--detach] [--checkout] [--lock [--reason <字符串>]]\n" +" [-b <新分支>] <路径> [<提交号>]" #: builtin/worktree.c -msgid "git worktree list [<options>]" -msgstr "git worktree list [<选项>]" +msgid "git worktree list [-v | --porcelain [-z]]" +msgstr "git worktree list [-v | --porcelain [-z]]" #: builtin/worktree.c -msgid "git worktree lock [<options>] <path>" -msgstr "git worktree lock [<选项>] <路径>" +msgid "git worktree lock [--reason <string>] <worktree>" +msgstr "git worktree lock [--reason <字符串>] <工作区>" #: builtin/worktree.c msgid "git worktree move <worktree> <new-path>" msgstr "git worktree move <工作区> <新路径>" #: builtin/worktree.c -msgid "git worktree prune [<options>]" -msgstr "git worktree prune [<选项>]" +msgid "git worktree prune [-n] [-v] [--expire <expire>]" +msgstr "git worktree prune [-n] [-v] [--expire <过期>]" #: builtin/worktree.c -msgid "git worktree remove [<options>] <worktree>" -msgstr "git worktree remove [<选项>] <工作区>" +msgid "git worktree remove [-f] <worktree>" +msgstr "git worktree remove [-f] <工作区>" #: builtin/worktree.c msgid "git worktree repair [<path>...]" msgstr "git worktree repair [<路径>...]" #: builtin/worktree.c -msgid "git worktree unlock <path>" -msgstr "git worktree unlock <路径>" +msgid "git worktree unlock <worktree>" +msgstr "git worktree unlock <工作区>" #: builtin/worktree.c #, c-format @@ -16505,6 +16589,11 @@ msgid "core.fsyncMethod = batch is unsupported on this platform" msgstr "core.fsyncMethod = batch 不支持本平台" #: bundle-uri.c +#, c-format +msgid "bundle list at '%s' has no mode" +msgstr "在 '%s' 的归档包列表没有模式" + +#: bundle-uri.c msgid "failed to create temporary file" msgstr "无法创建临时文件" @@ -16514,18 +16603,35 @@ msgstr "缺乏能力" #: bundle-uri.c #, c-format +msgid "unrecognized bundle mode from URI '%s'" +msgstr "不可辨认的归档包模式来自 URI '%s'" + +#: bundle-uri.c +#, c-format +msgid "exceeded bundle URI recursion limit (%d)" +msgstr "超过了 URI 递归限制 (%d)" + +#: bundle-uri.c +#, c-format msgid "failed to download bundle from URI '%s'" msgstr "无法从 URI '%s' 下载归档包" #: bundle-uri.c #, c-format -msgid "file at URI '%s' is not a bundle" -msgstr "位于 URI '%s' 的文件不是归档包" +msgid "file at URI '%s' is not a bundle or bundle list" +msgstr "位于 URI '%s' 的文件不是归档包或归档包列表" #: bundle-uri.c -#, c-format -msgid "failed to unbundle bundle from URI '%s'" -msgstr "无法从 URI '%s' 解开归档包" +msgid "bundle-uri: got an empty line" +msgstr "bundle-uri: 获得了空行" + +#: bundle-uri.c +msgid "bundle-uri: line is not of the form 'key=value'" +msgstr "bundle-uri: 行不是以 'key=value' 格式" + +#: bundle-uri.c +msgid "bundle-uri: line has empty key or value" +msgstr "bundle-uri: 行有空的键或值" #: bundle.c #, c-format @@ -17280,7 +17386,7 @@ msgid "Chunk-based file formats" msgstr "块式文件格式" #: command-list.h -msgid "Git commit graph format" +msgid "Git commit-graph format" msgstr "Git 提交图格式" #: command-list.h @@ -17707,6 +17813,11 @@ msgstr "'has_worktree_moved' 中未处理的情况：%d" msgid "health thread wait failed [GLE %ld]" msgstr "健康监测线程等待失败 [GLE %ld]" +#: compat/fsmonitor/fsm-ipc-darwin.c +#, c-format +msgid "Invalid path: %s" +msgstr "无效路径： %s" + #: compat/fsmonitor/fsm-listen-darwin.c msgid "Unable to create FSEventStream." msgstr "无法创建 FSEventStream。" @@ -17745,12 +17856,32 @@ msgstr "GetOverlappedResult 失败于 '%s' [GLE %ld]" msgid "could not read directory changes [GLE %ld]" msgstr "无法获取目录变更 [GLE %ld]" -#: compat/fsmonitor/fsm-settings-win32.c +#: compat/fsmonitor/fsm-path-utils-darwin.c +#, c-format +msgid "opendir('%s') failed" +msgstr "opendir('%s') 失败" + +#: compat/fsmonitor/fsm-path-utils-darwin.c +#, c-format +msgid "lstat('%s') failed" +msgstr "lstat('%s') 失败" + +#: compat/fsmonitor/fsm-path-utils-darwin.c +#, c-format +msgid "strbuf_readlink('%s') failed" +msgstr "strbuf_readlink('%s') 失败" + +#: compat/fsmonitor/fsm-path-utils-darwin.c +#, c-format +msgid "closedir('%s') failed" +msgstr "closedir('%s') 失败" + +#: compat/fsmonitor/fsm-path-utils-win32.c #, c-format msgid "[GLE %ld] unable to open for read '%ls'" msgstr "[GLE %ld] 无法打开要读取的 '%ls'" -#: compat/fsmonitor/fsm-settings-win32.c +#: compat/fsmonitor/fsm-path-utils-win32.c #, c-format msgid "[GLE %ld] unable to get protocol information for '%ls'" msgstr "[GLE %ld] 无法获取 '%ls' 的协议信息 " @@ -19719,8 +19850,9 @@ msgstr "虚拟仓库 '%s' 与 fsmonitor 不兼容" #: fsmonitor-settings.c #, c-format msgid "" -"repository '%s' is incompatible with fsmonitor due to lack of Unix sockets" -msgstr "因为缺少 Unix 套接字，仓库 '%s' 与 fsmonitor 不兼容" +"socket directory '%s' is incompatible with fsmonitor due to lack of Unix " +"sockets support" +msgstr "因为缺少 Unix 套接字支持，套接字目录 '%s' 与 fsmonitor 不兼容" #: git.c msgid "" @@ -20107,8 +20239,8 @@ msgstr[1] "" "最相似的命令是" #: help.c -msgid "git version [<options>]" -msgstr "git version [<选项>]" +msgid "git version [--build-options]" +msgstr "git version [--build-options]" #: help.c #, c-format @@ -21181,11 +21313,6 @@ msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s：忽略备用对象库，嵌套太深" #: object-file.c -#, c-format -msgid "unable to normalize object directory: %s" -msgstr "无法规范化对象目录: %s" - -#: object-file.c msgid "unable to fdopen alternates lockfile" msgstr "无法 fdopen 替换锁文件" @@ -22194,6 +22321,11 @@ msgstr "promisor-remote：无法关闭至 fetch 子进程的标准输入" msgid "promisor remote name cannot begin with '/': %s" msgstr "promisor 远程名称不能以 '/' 开始：%s" +#: promisor-remote.c +#, c-format +msgid "could not fetch %s from promisor remote" +msgstr "无法从承诺者远程获取 %s" + #: protocol-caps.c msgid "object-info: expected flush after arguments" msgstr "object-info：在参数之后应有一个 flush" @@ -23468,6 +23600,15 @@ msgstr "无法找到 %s 指向的树" #: revision.c #, c-format +msgid "unsupported section for hidden refs: %s" +msgstr "不支持的隐藏引用片段： %s" + +#: revision.c +msgid "--exclude-hidden= passed more than once" +msgstr "--exclude-hidden= 传递了不止一次" + +#: revision.c +#, c-format msgid "resolve-undo records `%s` which is missing" msgstr "resolve-undo 记录 `%s`，现缺失" @@ -23653,6 +23794,16 @@ msgstr "--all 或者 <登记>，而不是两个一起" #: scalar.c #, c-format +msgid "could not remove stale scalar.repo '%s'" +msgstr "无法删除过期的 scalar.repo '%s'" + +#: scalar.c +#, c-format +msgid "removing stale scalar.repo '%s'" +msgstr "正在删除过期的 scalar.repo '%s'" + +#: scalar.c +#, c-format msgid "git repository gone in '%s'" msgstr "在 '%s' 的 git 仓库已消失" @@ -24398,6 +24549,11 @@ msgid "illegal label name: '%.*s'" msgstr "非法的标签名称：'%.*s'" #: sequencer.c +#, c-format +msgid "could not resolve '%s'" +msgstr "无法解析 '%s'" + +#: sequencer.c msgid "writing fake root commit" msgstr "写伪根提交" @@ -24406,11 +24562,6 @@ msgid "writing squash-onto" msgstr "写入 squash-onto" #: sequencer.c -#, c-format -msgid "could not resolve '%s'" -msgstr "无法解析 '%s'" - -#: sequencer.c msgid "cannot merge without a current revision" msgstr "没有当前版本不能合并" @@ -25123,6 +25274,18 @@ msgstr "ls-tree 返回未知返回值 %d" msgid "failed to lstat '%s'" msgstr "无法执行 lstat '%s'" +#: t/helper/test-cache-tree.c +msgid "test-tool cache-tree <options> (control|prime|update)" +msgstr "test-tool cache-tree <选项> (control|prime|update)" + +#: t/helper/test-cache-tree.c +msgid "clear the cache tree before each iteration" +msgstr "在每次迭代前清除缓存树" + +#: t/helper/test-cache-tree.c +msgid "number of entries in the cache tree to invalidate (default 0)" +msgstr "缓存树中无效化的条目数量（默认 0）" + #: t/helper/test-fast-rebase.c msgid "unhandled options" msgstr "未处理的选项" diff --git a/po/zh_TW.po b/po/zh_TW.po index 29b8089141..aa59a8e933 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -1,9 +1,11 @@ # Chinese (traditional) translations for Git package # Git 套裝軟體的繁體中文翻譯。 # Copyright (C) 2012-2021 Jiang Xin <worldhello.net AT gmail.com> -# Copyright (C) 2019-2021 Yi-Jyun Pan <pan93412@gmail.com> +# Copyright (C) 2019-2022 Yi-Jyun Pan <pan93412@gmail.com> # This file is distributed under the same license as the Git package. # +# The glossary can be found on https://github.com/l10n-tw/git-glossary +# # Contributors (CN): # - Fangyi Zhou <me AT fangyi.io> # - Jiang Xin <worldhello.net AT gmail.com> @@ -18,12 +20,13 @@ # - Zhuang Ya <zhuangya AT me.com> # # Yi-Jyun Pan <pan93412@gmail.com>, 2021, 2022. +# Kaiyang Wu <self@origincode.me>, 2022. msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2022-09-23 21:57+0000\n" -"PO-Revision-Date: 2022-10-01 19:02+0800\n" +"POT-Creation-Date: 2022-12-11 00:28+0800\n" +"PO-Revision-Date: 2022-12-10 17:12+0000\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" @@ -32,7 +35,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 3.1.1\n" +"X-Generator: Weblate 4.14.2\n" "X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://" "zhconvert.org\n" @@ -64,7 +67,7 @@ msgstr "更新" #: add-interactive.c #, c-format msgid "could not stage '%s'" -msgstr "無法暫存「%s」" +msgstr "無法暫存 “%s”" #: add-interactive.c builtin/stash.c reset.c sequencer.c msgid "could not write index" @@ -79,12 +82,12 @@ msgstr[0] "已更新 %d 個路徑\n" #: add-interactive.c git-add--interactive.perl #, c-format, perl-format msgid "note: %s is untracked now.\n" -msgstr "注意：%s 現已不再追蹤。\n" +msgstr "註：現已不再追蹤 %s。\n" #: add-interactive.c apply.c builtin/checkout.c builtin/reset.c #, c-format msgid "make_cache_entry failed for path '%s'" -msgstr "「%s」路徑執行 make_cache_entry 失敗" +msgstr "對 “%s” 路徑執行 make_cache_entry 失敗" #: add-interactive.c git-add--interactive.perl msgid "Revert" @@ -92,13 +95,13 @@ msgstr "還原" #: add-interactive.c msgid "Could not parse HEAD^{tree}" -msgstr "不能解析 HEAD^{樹}" +msgstr "無法解析 HEAD^{tree}" #: add-interactive.c git-add--interactive.perl #, c-format, perl-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" -msgstr[0] "還原了 %d 個路徑\n" +msgstr[0] "已還原 %d 個路徑\n" #: add-interactive.c git-add--interactive.perl #, c-format @@ -107,28 +110,28 @@ msgstr "沒有未追蹤的檔案。\n" #: add-interactive.c git-add--interactive.perl msgid "Add untracked" -msgstr "新增未追蹤的" +msgstr "加入未追蹤項目" #: add-interactive.c git-add--interactive.perl #, c-format, perl-format msgid "added %d path\n" msgid_plural "added %d paths\n" -msgstr[0] "增加了 %d 個路徑\n" +msgstr[0] "已加入 %d 個路徑\n" #: add-interactive.c #, c-format msgid "ignoring unmerged: %s" -msgstr "忽略未合併：%s" +msgstr "忽略未合併項目：%s" #: add-interactive.c add-patch.c git-add--interactive.perl #, c-format msgid "Only binary files changed.\n" -msgstr "只有二進位檔案被修改。\n" +msgstr "只變更二進位檔案。\n" #: add-interactive.c add-patch.c git-add--interactive.perl #, c-format msgid "No changes.\n" -msgstr "沒有修改。\n" +msgstr "沒有更動。\n" #: add-interactive.c git-add--interactive.perl msgid "Patch update" @@ -136,19 +139,19 @@ msgstr "修補檔更新" #: add-interactive.c git-add--interactive.perl msgid "Review diff" -msgstr "檢視 diff" +msgstr "檢閱差異" #: 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" @@ -160,7 +163,7 @@ msgstr "檢視 HEAD 及索引之間的差異" #: add-interactive.c msgid "add contents of untracked files to the staged set of changes" -msgstr "加入未追蹤檔案的內容至暫存列表" +msgstr "將未追蹤檔案的內容加入至更動暫存集" #: add-interactive.c msgid "Prompt help:" @@ -168,23 +171,23 @@ msgstr "提示說明：" #: add-interactive.c msgid "select a single item" -msgstr "選擇單一項目" +msgstr "選取一個項目" #: add-interactive.c msgid "select a range of items" -msgstr "選擇項目範圍" +msgstr "選取範圍中項目" #: add-interactive.c msgid "select multiple ranges" -msgstr "選擇多個範圍" +msgstr "選取多個範圍" #: add-interactive.c msgid "select item based on unique prefix" -msgstr "基於唯一前綴選擇項目" +msgstr "根據獨特前綴選取項目" #: add-interactive.c msgid "unselect specified items" -msgstr "取消選擇指定項目" +msgstr "取消選取指定項目" #: add-interactive.c msgid "choose all items" @@ -196,15 +199,15 @@ msgstr "（空）完成選取" #: add-interactive.c msgid "select a numbered item" -msgstr "選擇編號過的項目" +msgstr "選取編號過的項目" #: add-interactive.c msgid "(empty) select nothing" -msgstr "（空）全不選取" +msgstr "（空）全部不選取" #: add-interactive.c builtin/clean.c git-add--interactive.perl msgid "*** Commands ***" -msgstr "*** 指令 ***" +msgstr "*** 命令 ***" #: add-interactive.c builtin/clean.c git-add--interactive.perl msgid "What now" @@ -212,11 +215,11 @@ msgstr "請選擇" #: add-interactive.c git-add--interactive.perl msgid "staged" -msgstr "快取" +msgstr "已暫存" #: add-interactive.c git-add--interactive.perl msgid "unstaged" -msgstr "未快取" +msgstr "未暫存" #: add-interactive.c apply.c builtin/am.c builtin/bugreport.c builtin/clone.c #: builtin/diagnose.c builtin/fetch.c builtin/merge.c builtin/pull.c @@ -236,17 +239,17 @@ msgstr "再見。\n" #: add-patch.c git-add--interactive.perl #, c-format, perl-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 git-add--interactive.perl #, c-format, perl-format msgid "Stage deletion [y,n,q,a,d%s,?]? " -msgstr "暫存刪除變更 [y,n,q,a,d%s,?]? " +msgstr "暫存刪除動作 [y,n,q,a,d%s,?]? " #: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Stage addition [y,n,q,a,d%s,?]? " -msgstr "暫存新增變更 [y,n,q,a,d%s,?]? " +msgstr "暫存加入動作 [y,n,q,a,d%s,?]? " #: add-patch.c git-add--interactive.perl #, c-format, perl-format @@ -257,7 +260,7 @@ msgstr "暫存此區塊 [y,n,q,a,d%s,?]? " msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "staging." -msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為暫存。" +msgstr "如果修補檔能完全套用，編輯區塊將立即標記為暫存。" #: add-patch.c msgid "" @@ -276,28 +279,28 @@ msgstr "" #: add-patch.c git-add--interactive.perl #, c-format, perl-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 git-add--interactive.perl #, c-format, perl-format msgid "Stash deletion [y,n,q,a,d%s,?]? " -msgstr "儲藏刪除變更 [y,n,q,a,d%s,?]? " +msgstr "貯存刪除動作 [y,n,q,a,d%s,?]? " #: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Stash addition [y,n,q,a,d%s,?]? " -msgstr "儲藏新增變更 [y,n,q,a,d%s,?]? " +msgstr "貯存加入動作 [y,n,q,a,d%s,?]? " #: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " -msgstr "儲藏此區塊 [y,n,q,a,d%s,?]? " +msgstr "貯存此區塊 [y,n,q,a,d%s,?]? " #: add-patch.c msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "stashing." -msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為儲藏。" +msgstr "如果修補檔能完全套用，編輯區塊將立即標記為貯存。" #: add-patch.c msgid "" @@ -307,26 +310,26 @@ msgid "" "a - stash this hunk and all later hunks in the file\n" "d - do not stash this hunk or any of the later hunks in the file\n" msgstr "" -"y - 儲藏此區塊\n" -"n - 不要儲藏此區塊\n" -"q - 離開。不儲藏此區塊及後面的全部區塊\n" -"a - 儲藏此區塊和本檔案中後面的全部區塊\n" -"d - 不儲藏此區塊和本檔案中後面的全部區塊\n" +"y - 貯存此區塊\n" +"n - 不要貯存此區塊\n" +"q - 離開。不貯存此區塊及後面的全部區塊\n" +"a - 貯存此區塊和本檔案中後面的全部區塊\n" +"d - 不貯存此區塊和本檔案中後面的全部區塊\n" #: add-patch.c git-add--interactive.perl #, c-format, perl-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 git-add--interactive.perl #, c-format, perl-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " -msgstr "取消暫存刪除變更 [y,n,q,a,d%s,?]? " +msgstr "取消暫存刪除動作 [y,n,q,a,d%s,?]? " #: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Unstage addition [y,n,q,a,d%s,?]? " -msgstr "取消暫存新增變更 [y,n,q,a,d%s,?]? " +msgstr "取消暫存加入動作 [y,n,q,a,d%s,?]? " #: add-patch.c git-add--interactive.perl #, c-format, perl-format @@ -337,7 +340,7 @@ msgstr "取消暫存此區塊 [y,n,q,a,d%s,?]? " msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "unstaging." -msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為未暫存。" +msgstr "如果修補檔能完全套用，編輯區塊將立即標記為未暫存。" #: add-patch.c msgid "" @@ -356,17 +359,17 @@ msgstr "" #: add-patch.c git-add--interactive.perl #, c-format, perl-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 git-add--interactive.perl #, c-format, perl-format msgid "Apply deletion 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 git-add--interactive.perl #, c-format, perl-format msgid "Apply addition 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 git-add--interactive.perl #, c-format, perl-format @@ -377,7 +380,7 @@ msgstr "將此區塊套用到索引 [y,n,q,a,d%s,?]? " msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "applying." -msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為套用。" +msgstr "如果修補檔能完全套用，編輯區塊將立即標記為套用。" #: add-patch.c msgid "" @@ -396,28 +399,28 @@ msgstr "" #: add-patch.c git-add--interactive.perl #, c-format, perl-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 git-add--interactive.perl #, c-format, perl-format msgid "Discard deletion 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 git-add--interactive.perl #, c-format, perl-format msgid "Discard addition 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 git-add--interactive.perl #, c-format, perl-format msgid "Discard this hunk 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 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "discarding." -msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為捨棄。" +msgstr "如果修補檔能完全套用，編輯區塊將立即標記為捨棄。" #: add-patch.c msgid "" @@ -436,22 +439,22 @@ msgstr "" #: add-patch.c git-add--interactive.perl #, c-format, perl-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 git-add--interactive.perl #, c-format, perl-format msgid "Discard deletion 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 git-add--interactive.perl #, c-format, perl-format msgid "Discard addition 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 git-add--interactive.perl #, c-format, perl-format msgid "Discard this hunk 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 msgid "" @@ -470,17 +473,17 @@ msgstr "" #: add-patch.c git-add--interactive.perl #, c-format, perl-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 git-add--interactive.perl #, c-format, perl-format msgid "Apply deletion 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 git-add--interactive.perl #, c-format, perl-format msgid "Apply addition 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 git-add--interactive.perl #, c-format, perl-format @@ -504,17 +507,17 @@ msgstr "" #: add-patch.c git-add--interactive.perl #, c-format, perl-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 git-add--interactive.perl #, c-format, perl-format msgid "Apply deletion 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 git-add--interactive.perl #, c-format, perl-format msgid "Apply addition 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 git-add--interactive.perl #, c-format, perl-format @@ -538,20 +541,20 @@ msgstr "" #: add-patch.c #, c-format msgid "could not parse hunk header '%.*s'" -msgstr "無法解析區塊標頭 '%.*s'" +msgstr "無法解析區塊標頭 “%.*s”" #: add-patch.c msgid "could not parse diff" -msgstr "無法解析差異 (diff)" +msgstr "無法解析差異" #: add-patch.c msgid "could not parse colored diff" -msgstr "無法解析上色過的差異 (diff)" +msgstr "無法解析上色過的差異" #: add-patch.c #, c-format msgid "failed to run '%s'" -msgstr "無法執行 '%s'" +msgstr "無法執行 “%s”" #: add-patch.c msgid "mismatched output from interactive.diffFilter" @@ -562,7 +565,7 @@ msgid "" "Your filter must maintain a one-to-one correspondence\n" "between its input and output lines." msgstr "" -"您的過濾器必須在其輸入及輸出行\n" +"您的過濾器必須在其輸入及輸出列\n" "維持一對一的對應關係。" #: add-patch.c @@ -571,7 +574,7 @@ msgid "" "expected context line #%d in\n" "%.*s" msgstr "" -"應有上下文行 #%d 於\n" +"預期在下述位置有上下文列 #%d：\n" "%.*s" #: add-patch.c @@ -584,12 +587,12 @@ msgid "" msgstr "" "區塊未重疊：\n" "%.*s\n" -"\t不以下述結尾：\n" +"\t結尾不是：\n" "%.*s" #: add-patch.c git-add--interactive.perl msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" -msgstr "手動區塊編輯模式 -- 檢視底部的快速指南。\n" +msgstr "手動區塊編輯模式——檢視底部的快速指引。\n" #: add-patch.c #, c-format @@ -600,9 +603,9 @@ msgid "" "Lines starting with %c will be removed.\n" msgstr "" "---\n" -"要刪除 '%c' 開始的行，使其成為 ' ' 開始的行（上下文）。\n" -"要刪除 '%c' 開始的行，刪除它們。\n" -"以 %c 開始的行將被刪除。\n" +"要刪除 “%c” 開頭的列，請將列首（上下文）改成空白。\n" +"要刪除 “%c” 開頭的列，請直接刪除。\n" +"開頭是 %c 的列將會被移除。\n" #. #-#-#-#-# git-add--interactive.perl.po #-#-#-#-# #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. @@ -612,9 +615,9 @@ msgid "" "edit again. If all lines of the hunk are removed, then the edit is\n" "aborted and the hunk is left unchanged.\n" msgstr "" -"如果未乾淨套用，您就有機會重新編輯。\n" -"若刪掉此區塊的全部內容，則會中止\n" -"本次編輯，區塊則不會被修改。\n" +"如果沒有完全套用，您可以再次編輯。\n" +"若刪掉此區塊的所有內容，則會中止編輯，\n" +"區塊則不會變更。\n" #: add-patch.c msgid "could not parse hunk header" @@ -622,7 +625,7 @@ msgstr "無法解析區塊標頭" #: add-patch.c msgid "'git apply --cached' failed" -msgstr "「git apply --cached」失敗" +msgstr "“git apply --cached” 失敗" #. #-#-#-#-# add-patch.c.po #-#-#-#-# #. TRANSLATORS: do not translate [y/n] @@ -641,15 +644,15 @@ msgstr "「git apply --cached」失敗" #: add-patch.c git-add--interactive.perl msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " -msgstr "未套用編輯區塊。是否重新編輯（輸入 “no” 捨棄！） [y/n]? " +msgstr "未套用您編輯的區塊。是否重新編輯（輸入 “no” 捨棄！） [y/n]? " #: add-patch.c msgid "The selected hunks do not apply to the index!" -msgstr "選取的區塊不會套用進索引！" +msgstr "選取的區塊無法套用至索引！" #: add-patch.c git-add--interactive.perl msgid "Apply them to the worktree anyway? " -msgstr "無論如何都要套用到工作區嗎？ " +msgstr "無論如何都要套用到工作區嗎? " #: add-patch.c git-add--interactive.perl msgid "Nothing was applied.\n" @@ -687,20 +690,20 @@ msgstr "沒有下一個區塊" #: add-patch.c msgid "No other hunks to goto" -msgstr "沒有其它可供跳轉的區塊" +msgstr "沒有其它可以跳轉的區塊" #: add-patch.c git-add--interactive.perl msgid "go to which hunk (<ret> to see more)? " -msgstr "要跳轉到哪個區塊（<Enter> 檢視更多）？ " +msgstr "要跳轉到哪個區塊（<ret> 檢視更多）? " #: add-patch.c git-add--interactive.perl msgid "go to which hunk? " -msgstr "跳轉到哪個區塊？ " +msgstr "跳轉到哪個區塊? " #: add-patch.c #, c-format msgid "Invalid number: '%s'" -msgstr "無效數字：'%s'" +msgstr "無效數字：“%s”" #: add-patch.c #, c-format @@ -710,20 +713,20 @@ msgstr[0] "對不起，只有 %d 個可用區塊。" #: add-patch.c msgid "No other hunks to search" -msgstr "沒有其它可供尋找的區塊" +msgstr "沒有其它可以尋找的區塊" #: add-patch.c git-add--interactive.perl msgid "search for regex? " -msgstr "使用常規表示式搜尋？ " +msgstr "使用常規表示式搜尋? " #: add-patch.c #, c-format msgid "Malformed search regexp %s: %s" -msgstr "錯誤的常規表示式 %s：%s" +msgstr "格式錯誤的常規表示式 %s：%s" #: add-patch.c msgid "No hunk matches the given pattern" -msgstr "沒有和提供模式相符合的區塊" +msgstr "沒有符合提供模式的區塊" #: add-patch.c msgid "Sorry, cannot split this hunk" @@ -736,11 +739,11 @@ msgstr "分割為 %d 個區塊。" #: add-patch.c msgid "Sorry, cannot edit this hunk" -msgstr "對不起，不能編輯這個區塊" +msgstr "對不起，無法編輯這個區塊" #: add-patch.c msgid "'git apply' failed" -msgstr "'git apply' 失敗" +msgstr "“git apply” 失敗" #: advice.c #, c-format @@ -749,7 +752,7 @@ msgid "" "Disable this message with \"git config advice.%s false\"" msgstr "" "\n" -"請使用「git config advice.%s false」來停用此訊息" +"請使用 “git config advice.%s false” 停用此訊息" #: advice.c #, c-format @@ -758,56 +761,56 @@ msgstr "%s提示：%.*s%s\n" #: advice.c msgid "Cherry-picking is not possible because you have unmerged files." -msgstr "無法揀選，因為您有未合併的檔案。" +msgstr "無法揀選，有未合併的檔案。" #: advice.c msgid "Committing is not possible because you have unmerged files." -msgstr "無法提交，因為您有未合併的檔案。" +msgstr "無法提交，有未合併的檔案。" #: advice.c msgid "Merging is not possible because you have unmerged files." -msgstr "無法合併，因為您有未合併的檔案。" +msgstr "無法合併，有未合併的檔案。" #: advice.c msgid "Pulling is not possible because you have unmerged files." -msgstr "無法拉取，因為您有未合併的檔案。" +msgstr "無法拉取，有未合併的檔案。" #: advice.c msgid "Reverting is not possible because you have unmerged files." -msgstr "無法還原提交，因為您有未合併的檔案。" +msgstr "無法還原提交，有未合併的檔案。" #: advice.c #, c-format msgid "It is not possible to %s because you have unmerged files." -msgstr "無法 %s，因為您有未合併的檔案。" +msgstr "無法 %s，有未合併的檔案。" #: advice.c msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." msgstr "" -"請在工作區改正檔案，然後酌情使用 'git add/rm <檔案>' 指令標記\n" -"解決方案並提交。" +"請在工作區修正檔案，然後視情況使用 “git add/rm <file>”\n" +"命令標記解決方案並提交。" #: advice.c msgid "Exiting because of an unresolved conflict." -msgstr "因為存在未解決的衝突而離開。" +msgstr "存在未解決的衝突，離開。" #: advice.c builtin/merge.c msgid "You have not concluded your merge (MERGE_HEAD exists)." -msgstr "您尚未結束您的合併（存在 MERGE_HEAD）。" +msgstr "合併尚未結束（有 MERGE_HEAD）。" #: advice.c msgid "Please, commit your changes before merging." -msgstr "請在合併前先提交您的修改。" +msgstr "請在合併前先提交您的更動。" #: advice.c msgid "Exiting because of unfinished merge." -msgstr "因為存在未完成的合併而離開。" +msgstr "存在未完成的合併，離開。" #: advice.c msgid "Not possible to fast-forward, aborting." -msgstr "無法快轉，終止。" +msgstr "無法快轉，中止。" #: advice.c #, c-format @@ -852,18 +855,18 @@ msgid "" "false\n" "\n" msgstr "" -"注意：正在切換到 '%s'。\n" +"註：切換至 “%s”。\n" "\n" -"您正處於分離開頭指標狀態。您可以檢視、進行實驗性修改並提交，\n" -"而且您可以在切換回一個分支時，\n" -"捨棄在此狀態下所做的提交而不對分支造成影響。\n" +"您正處於「分離 HEAD」狀態。您可以檢視、進行實驗性修改並提交，\n" +"而且您可以在切回分支時，捨棄在此狀態下所做的提交\n" +"而不對分支造成影響。\n" "\n" "如果您想要透過建立分支來保留在此狀態下所做的提交，\n" "您可以現在或稍後在 switch 指令使用 -c 選項。例如：\n" "\n" " git switch -c <新分支名稱>\n" "\n" -"或者是復原此動作：\n" +"或者是使用下述命令復原此動作：\n" "\n" " git switch -\n" "\n" @@ -887,26 +890,31 @@ msgid "" "* Use \"git sparse-checkout reapply\" to apply the sparsity rules" msgstr "" "若要更正這些路徑的稀疏狀態，請：\n" -"* 使用 `git add --sparse <路徑>` 更新索引\n" -"* 使用 `git sparse-checkout reapply` 套用稀疏規則" +"* 使用 “git add --sparse <路徑” 更新索引\n" +"* 使用 “git sparse-checkout reapply” 套用稀疏規則" #: alias.c msgid "cmdline ends with \\" -msgstr "指令列以 \\ 結尾" +msgstr "命令列以 \\ 結尾" #: alias.c msgid "unclosed quote" msgstr "未閉合的引號" +#: alias.c builtin/cat-file.c builtin/notes.c builtin/prune-packed.c +#: builtin/receive-pack.c builtin/tag.c +msgid "too many arguments" +msgstr "引數過多" + #: 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.c #: builtin/clone.c builtin/commit.c builtin/describe.c builtin/diff-tree.c @@ -918,12 +926,12 @@ msgstr "無法識別的空白字元忽略選項 '%s'" #: 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' 選項" +msgstr "無法同時使用 “%s” 和 “%s” 選項" #: apply.c #, c-format msgid "'%s' outside a repository" -msgstr "'%s' 在版本庫之外" +msgstr "“%s” 在版本庫之外" #: apply.c #, c-format @@ -933,42 +941,42 @@ msgstr "無法準備時間戳常規表示式 %s" #: apply.c #, c-format msgid "regexec returned %d for input: %s" -msgstr "regexec 返回 %d，輸入為：%s" +msgstr "regexec 回傳 %d，輸入為：%s" #: apply.c #, c-format msgid "unable to find filename in patch at line %d" -msgstr "不能在修補檔的第 %d 行找到檔案名" +msgstr "無法在修補檔的第 %d 列找到檔案名稱" #: apply.c #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" -msgstr "git apply：錯誤的 git-diff - 應為 /dev/null，但在第 %2$d 行得到 %1$s" +msgstr "git apply：無效的 git-diff — 應為 /dev/null，但在第 %2$d 列得到 %1$s" #: apply.c #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" -msgstr "git apply：錯誤的 git-diff - 第 %d 行上新檔案名不一致" +msgstr "git apply：無效的 git-diff — 第 %d 列的新檔案名稱不一致" #: apply.c #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" -msgstr "git apply：錯誤的 git-diff - 第 %d 行上舊檔案名不一致" +msgstr "git apply：無效的 git-diff — 第 %d 列上舊檔案名稱不一致" #: apply.c #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" -msgstr "git apply：錯誤的 git-diff - 第 %d 行處應為 /dev/null" +msgstr "git apply：無效的 git-diff — 第 %d 列處預期是 /dev/null" #: apply.c #, c-format msgid "invalid mode on line %d: %s" -msgstr "第 %d 行包含無效檔案模式：%s" +msgstr "第 %d 列包含無效檔案模式：%s" #: apply.c #, c-format msgid "inconsistent header lines %d and %d" -msgstr "不一致的檔案頭，%d 行和 %d 行" +msgstr "不一致的檔案標頭（%d 列和 %d 列）" #: apply.c #, c-format @@ -978,22 +986,22 @@ msgid "" msgid_plural "" "git diff header lacks filename information when removing %d leading pathname " "components (line %d)" -msgstr[0] "當移除 %d 個前導路徑後 git diff 頭缺乏檔案名訊息（第 %d 行）" +msgstr[0] "移除 %d 個前導路徑部分後，git diff 標頭缺少檔案名稱資訊（第 %d 列）" #: apply.c #, c-format msgid "git diff header lacks filename information (line %d)" -msgstr "git diff 的標頭訊息中缺乏檔案名訊息（第 %d 行）" +msgstr "git diff 標頭缺少檔案名稱資訊（第 %d 列）" #: apply.c #, c-format msgid "recount: unexpected line: %.*s" -msgstr "recount：意外的行：%.*s" +msgstr "recount：遇到非預期的列：%.*s" #: apply.c #, c-format msgid "patch fragment without header at line %d: %.*s" -msgstr "第 %d 行的修補檔區塊沒有標頭訊息：%.*s" +msgstr "第 %d 列的修補檔區段沒有標頭：%.*s" #: apply.c msgid "new file depends on old contents" @@ -1006,7 +1014,7 @@ msgstr "刪除的檔案仍有內容" #: apply.c #, c-format msgid "corrupt patch at line %d" -msgstr "修補檔在第 %d 行發現損壞" +msgstr "修補檔在第 %d 列發現損壞" #: apply.c #, c-format @@ -1026,17 +1034,17 @@ msgstr "** 警告：檔案 %s 成為空檔案但並未刪除" #: apply.c #, c-format msgid "corrupt binary patch at line %d: %.*s" -msgstr "二進位修補檔在第 %d 行損壞：%.*s" +msgstr "二進位修補檔在第 %d 列損壞：%.*s" #: apply.c #, c-format msgid "unrecognized binary patch at line %d" -msgstr "無法識別的二進位修補檔位於第 %d 行" +msgstr "第 %d 列的二進位修補檔無法識別" #: apply.c #, c-format msgid "patch with only garbage at line %d" -msgstr "修補檔案的第 %d 行只有垃圾資料" +msgstr "修補檔案的第 %d 列只有垃圾資料" #: apply.c #, c-format @@ -1046,23 +1054,23 @@ msgstr "無法讀取符號連結 %s" #: apply.c #, c-format msgid "unable to open or read %s" -msgstr "不能開啟或讀取 %s" +msgstr "無法開啟或讀取 %s" #: apply.c #, c-format msgid "invalid start of line: '%c'" -msgstr "無效的行首字元：'%c'" +msgstr "無效的列首字元：“%c”" #: apply.c #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." -msgstr[0] "區塊 #%d 成功套用於 %d（位移 %d 行）。" +msgstr[0] "區塊 #%d 成功套用於 %d（偏移 %d 列）。" #: apply.c #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" -msgstr "上下文減少到（%ld/%ld）以在第 %d 行套用修補檔區塊" +msgstr "上下文減少到（%ld/%ld）以在第 %d 列套用修補檔區塊" #: apply.c #, c-format @@ -1076,53 +1084,53 @@ msgstr "" #: apply.c #, c-format msgid "missing binary patch data for '%s'" -msgstr "缺少 '%s' 的二進位修補檔資料" +msgstr "缺少 “%s” 的二進位修補檔資料" #: apply.c #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" -msgstr "不能反向套用一個缺少到 '%s' 的反向資料區塊的二進位修補檔" +msgstr "無法反向套用一個缺少至 “%s” 的反向資料區塊的二進位修補檔" #: apply.c #, c-format msgid "cannot apply binary patch to '%s' without full index line" -msgstr "不能在 '%s' 上套用沒有完整索引行的二進位修補檔" +msgstr "無法在 “%s” 上套用沒有完整索引列的二進位修補檔" #: apply.c #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." -msgstr "修補檔套用到 '%s'（%s），但是和目前內容不符合。" +msgstr "修補檔要套用到 “%s”（%s），但與目前內容不符。" #: apply.c #, c-format msgid "the patch applies to an empty '%s' but it is not empty" -msgstr "修補檔套用到空檔案 '%s'，但其並非空檔案" +msgstr "修補檔要套用至空檔案 “%s”，但其非空檔案" #: apply.c #, c-format msgid "the necessary postimage %s for '%s' cannot be read" -msgstr "無法讀取 '%2$s' 必需的目標檔案 %1$s" +msgstr "無法讀取 “%2$s” 必須的目標檔案 %1$s" #: apply.c #, c-format msgid "binary patch does not apply to '%s'" -msgstr "二進位修補檔未套用到 '%s'" +msgstr "二進位修補檔未套用到 “%s”" #: apply.c #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" -msgstr "到 '%s' 的二進位修補檔產生了不正確的結果（應為 %s，卻為 %s）" +msgstr "修補 “%s” 的二進位修補檔，產生了不正確的結果（預期 %s，卻為 %s）" #: apply.c #, c-format msgid "patch failed: %s:%ld" -msgstr "打修補檔失敗：%s:%ld" +msgstr "修補失敗：%s:%ld" #: apply.c builtin/mv.c #, c-format msgid "cannot checkout %s" -msgstr "不能簽出 %s" +msgstr "無法簽出 %s" #: apply.c midx.c pack-mtimes.c pack-revindex.c setup.c #, c-format @@ -1132,51 +1140,51 @@ msgstr "無法讀取 %s" #: apply.c #, c-format msgid "reading from '%s' beyond a symbolic link" -msgstr "讀取位於符號連結中的 '%s'" +msgstr "讀取符號連結背後的 “%s”" #: apply.c #, c-format msgid "path %s has been renamed/deleted" -msgstr "路徑 %s 已經被重新命名/刪除" +msgstr "路徑 %s 已被重新命名或刪除" #: apply.c #, c-format msgid "%s: does not exist in index" -msgstr "%s：不存在於索引中" +msgstr "%s：不在索引中" #: apply.c #, c-format msgid "%s: does not match index" -msgstr "%s：和索引不符合" +msgstr "%s：與索引不符" #: apply.c msgid "repository lacks the necessary blob to perform 3-way merge." -msgstr "版本庫缺少用來進行三方合併所需要的資料物件。" +msgstr "版本庫缺少用來進行三方合併，所需要的資料物件。" #: apply.c #, c-format msgid "Performing three-way merge...\n" -msgstr "正在進行三方合併⋯⋯\n" +msgstr "正在進行三方合併……\n" #: apply.c #, c-format msgid "cannot read the current contents of '%s'" -msgstr "無法讀取 '%s' 的目前內容" +msgstr "無法讀取 “%s” 目前的內容" #: apply.c #, c-format msgid "Failed to perform three-way merge...\n" -msgstr "無法進行三方合併⋯⋯\n" +msgstr "無法進行三方合併……\n" #: apply.c #, c-format msgid "Applied patch to '%s' with conflicts.\n" -msgstr "套用修補檔到 '%s' 存在衝突。\n" +msgstr "已套用對 “%s” 的修補檔，但有衝突。\n" #: apply.c #, c-format msgid "Applied patch to '%s' cleanly.\n" -msgstr "成功套用修補檔到 '%s'。\n" +msgstr "已完全套用對 “%s” 的修補檔。\n" #: apply.c #, c-format @@ -1185,7 +1193,7 @@ msgstr "回復至直接套用模式⋯⋯\n" #: apply.c msgid "removal patch leaves file contents" -msgstr "移除修補檔仍留下了檔案內容" +msgstr "移除性的修補檔仍有留下檔案內容" #: apply.c #, c-format @@ -1195,117 +1203,117 @@ msgstr "%s：錯誤類型" #: apply.c #, c-format msgid "%s has type %o, expected %o" -msgstr "%s 的類型是 %o，應為 %o" +msgstr "%s 的類型是 %o，預期是 %o" #: apply.c read-cache.c #, c-format msgid "invalid path '%s'" -msgstr "無效路徑 '%s'" +msgstr "路徑 “%s” 無效" #: apply.c #, c-format msgid "%s: already exists in index" -msgstr "%s：已經存在於索引中" +msgstr "%s：已存在於索引中" #: apply.c #, c-format msgid "%s: already exists in working directory" -msgstr "%s：已經存在於工作區中" +msgstr "%s：已存在於工作區中" #: apply.c #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" -msgstr "%2$s 的新模式（%1$o）和舊模式（%3$o）不符合" +msgstr "%2$s 的新模式 (%1$o) 和舊模式 (%3$o) 不符" #: apply.c #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" -msgstr "%2$s 的新模式（%1$o）和 %4$s 的舊模式（%3$o）不符合" +msgstr "%2$s 的新模式 (%1$o) 和 %4$s 的舊模式 (%3$o) 不符" #: apply.c #, c-format msgid "affected file '%s' is beyond a symbolic link" -msgstr "受影響的檔案 '%s' 位於符號連結中" +msgstr "受影響的檔案 “%s” 在符號連結後" #: apply.c #, c-format msgid "%s: patch does not apply" -msgstr "%s：修補檔未套用" +msgstr "%s：未套用修補檔" #: apply.c #, c-format msgid "Checking patch %s..." -msgstr "正在檢查修補檔 %s..." +msgstr "正在檢查修補檔 %s……" #: apply.c #, c-format msgid "sha1 information is lacking or useless for submodule %s" -msgstr "子模組 %s 的 sha1 訊息缺少或無效" +msgstr "%s 子模組缺少 sha1 資訊或沒有幫助" #: 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 msgid "sha1 information is lacking or useless (%s)." -msgstr "sha1 訊息缺少或無效（%s）。" +msgstr "缺少 sha1 資訊或沒有幫助 (%s)。" #: apply.c #, c-format msgid "could not add %s to temporary index" -msgstr "不能在暫時索引中新增 %s" +msgstr "無法將 %s 加進暫存索引" #: apply.c #, c-format msgid "could not write temporary index to %s" -msgstr "不能把暫時索引寫入到 %s" +msgstr "無法將暫存索引寫入 %s" #: apply.c #, c-format msgid "unable to remove %s from index" -msgstr "不能從索引中移除 %s" +msgstr "無法從索引移除 %s" #: apply.c #, c-format msgid "corrupt patch for submodule %s" -msgstr "子模組 %s 損壞的修補檔" +msgstr "修補 %s 子模組的修補檔損壞" #: apply.c #, c-format msgid "unable to stat newly created file '%s'" -msgstr "不能對建立檔案 '%s' 呼叫 stat" +msgstr "無法對剛建立的檔案 “%s” 執行 stat" #: apply.c #, c-format msgid "unable to create backing store for newly created file %s" -msgstr "不能為建立檔案 %s 建立後端儲存" +msgstr "無法對剛建立的檔案 %s 建立後端儲存" #: apply.c #, c-format msgid "unable to add cache entry for %s" -msgstr "無法為 %s 新增快取條目" +msgstr "無法為 %s 加入快取項目" #: apply.c builtin/bisect--helper.c builtin/gc.c #, c-format msgid "failed to write to '%s'" -msgstr "寫入 '%s' 失敗" +msgstr "無法寫入 “%s”" #: apply.c #, c-format msgid "closing file '%s'" -msgstr "關閉檔案 '%s'" +msgstr "關閉檔案 “%s”" #: apply.c #, c-format msgid "unable to write file '%s' mode %o" -msgstr "不能寫入檔案 '%s' 權限 %o" +msgstr "無法以模式 %2$o 寫入 “%1$s” 檔案" #: apply.c #, c-format msgid "Applied patch %s cleanly." -msgstr "成功套用修補檔 %s。" +msgstr "已完全套用 %s 修補檔。" #: apply.c msgid "internal error" @@ -1315,22 +1323,22 @@ msgstr "內部錯誤" #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." -msgstr[0] "套用 %%s 個修補檔，其中 %d 個被拒絕..." +msgstr[0] "套用 %%s 個修補檔，其中 %d 個被拒絕……" #: apply.c #, c-format msgid "truncating .rej filename to %.*s.rej" -msgstr "截短 .rej 檔案名為 %.*s.rej" +msgstr "正在將 .rej 檔案名稱截短為 %.*s.rej" #: apply.c #, c-format msgid "cannot open %s" -msgstr "不能開啟 %s" +msgstr "無法開啟 %s" #: apply.c #, c-format msgid "Hunk #%d applied cleanly." -msgstr "成功套用第 #%d 個區塊。" +msgstr "成功完全套用第 #%d 個區塊。" #: apply.c #, c-format @@ -1340,20 +1348,20 @@ msgstr "拒絕第 #%d 個區塊。" #: apply.c #, c-format msgid "Skipped patch '%s'." -msgstr "略過修補檔 '%s'。" +msgstr "略過修補檔 “%s”。" #: apply.c msgid "No valid patches in input (allow with \"--allow-empty\")" -msgstr "輸入中沒有有效的修補檔內容（傳入「--allow-empty」允許）" +msgstr "輸入沒有有效的修補檔內容（傳入 “--allow-empty” 允許此行為）" -#: apply.c +#: apply.c t/helper/test-cache-tree.c msgid "unable to read index file" msgstr "無法讀取索引檔案" #: apply.c #, c-format msgid "can't open patch '%s': %s" -msgstr "不能開啟修補檔 '%s'：%s" +msgstr "無法開啟修補檔 “%s”：%s" #: apply.c #, c-format @@ -1365,13 +1373,13 @@ msgstr[0] "抑制下仍有 %d 個空白字元誤用" #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." -msgstr[0] "%d 行新增了空白字元誤用。" +msgstr[0] "%d 列加入了空白字元誤用。" #: apply.c #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." -msgstr[0] "修復空白錯誤後，套用了 %d 行。" +msgstr[0] "修正空白誤用後，套用了 %d 列。" #: apply.c builtin/add.c builtin/mv.c builtin/rm.c msgid "Unable to write new index file" @@ -1379,11 +1387,11 @@ msgstr "無法寫入新索引檔案" #: 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" @@ -1391,19 +1399,19 @@ msgstr "數字" #: apply.c msgid "remove <num> leading slashes from traditional diff paths" -msgstr "從傳統的 diff 路徑中移除指定數量的前導斜線" +msgstr "從傳統的 diff 路徑中移除 <num> 個前導斜線" #: apply.c msgid "ignore additions made by the patch" -msgstr "忽略修補檔中的新增的檔案" +msgstr "忽略修補檔中的加入內容" #: apply.c msgid "instead of applying the patch, output diffstat for the input" -msgstr "不套用修補檔，而是顯示輸入的差異統計（diffstat）" +msgstr "不套用修補檔，而是顯示輸入的差異統計 (diffstat)" #: apply.c msgid "show number of added and deleted lines in decimal notation" -msgstr "以十進位數顯示新增和刪除的行數" +msgstr "以十進位數字，顯示加入和刪除的列數" #: apply.c msgid "instead of applying the patch, output a summary for the input" @@ -1419,7 +1427,7 @@ msgstr "確認修補檔可以套用到目前索引" #: apply.c msgid "mark new files with `git add --intent-to-add`" -msgstr "使用指令 `git add --intent-to-add` 標記新增檔案" +msgstr "使用 `git add --intent-to-add` 命令標記新檔案" #: apply.c msgid "apply a patch without touching the working tree" @@ -1431,15 +1439,15 @@ msgstr "接受修改工作區之外檔案的修補檔" #: apply.c msgid "also apply the patch (use with --stat/--summary/--check)" -msgstr "還套用此修補檔（與 --stat/--summary/--check 選項同時使用）" +msgstr "亦套用修補檔（與 --stat/--summary/--check 選項同時使用）" #: apply.c msgid "attempt three-way merge, fall back on normal patch if that fails" -msgstr "嘗試三方合併。如果失敗，則回到正常修補檔 (patch) 模式" +msgstr "嘗試三方合併，若失敗則回到正常修補模式" #: apply.c msgid "build a temporary index based on embedded index information" -msgstr "建立一個暫時索引基於嵌入的索引訊息" +msgstr "組建以嵌入索引資訊為基礎的暫存索引" #: apply.c builtin/checkout-index.c msgid "paths are separated with NUL character" @@ -1447,7 +1455,7 @@ msgstr "路徑以 NUL 字元分隔" #: apply.c msgid "ensure at least <n> lines of context match" -msgstr "確保至少符合 <n> 行上下文" +msgstr "確保至少符合 <n> 列上下文" #: apply.c builtin/am.c builtin/interpret-trailers.c builtin/pack-objects.c #: builtin/rebase.c @@ -1456,11 +1464,11 @@ msgstr "動作" #: apply.c msgid "detect new or modified lines that have whitespace errors" -msgstr "檢查新增和修改的行中間的空白字元濫用" +msgstr "檢查新增和修改的列中間，是否有空白字元誤用" #: apply.c msgid "ignore changes in whitespace when finding context" -msgstr "尋找上下文時忽略空白字元的變更" +msgstr "尋找上下文時忽略空白字元更動" #: apply.c msgid "apply the patch in reverse" @@ -1468,23 +1476,23 @@ msgstr "反向套用修補檔" #: apply.c msgid "don't expect at least one line of context" -msgstr "無需至少一行上下文" +msgstr "無需至少一列上下文" #: apply.c msgid "leave the rejected hunks in corresponding *.rej files" -msgstr "將拒絕的修補檔區塊儲存在對應的 *.rej 檔案中" +msgstr "將拒絕的修補檔區塊，留在對應的 *.rej 檔案中" #: apply.c msgid "allow overlapping hunks" -msgstr "允許重疊的修補檔區塊" +msgstr "允許重疊區塊" #: apply.c msgid "tolerate incorrectly detected missing new-line at the end of file" -msgstr "允許不正確的檔案末尾換行符號" +msgstr "允許不正確的檔案末尾換列符號" #: apply.c msgid "do not trust the line counts in the hunk headers" -msgstr "不信任修補檔區塊的標頭訊息中的行號" +msgstr "不信任區塊標頭中的列號" #: apply.c builtin/am.c msgid "root" @@ -1492,21 +1500,21 @@ msgstr "根目錄" #: apply.c msgid "prepend <root> to all filenames" -msgstr "為所有檔案名前新增 <根目錄>" +msgstr "在所有檔案名稱前加上 <root>" #: apply.c msgid "don't return error for empty patches" -msgstr "遇到空白修補檔時不回傳錯誤" +msgstr "遇到空白修補檔時，不回傳錯誤" #: archive-tar.c archive-zip.c #, c-format msgid "cannot stream blob %s" -msgstr "不能開啟資料物件 %s" +msgstr "無法串流資料物件 %s" #: archive-tar.c archive-zip.c #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" -msgstr "不支援的檔案模式：0%o (SHA1: %s)" +msgstr "不支援的檔案模式：0%o (SHA1：%s)" #: archive-tar.c archive-zip.c builtin/pack-objects.c #, c-format @@ -1516,16 +1524,16 @@ msgstr "壓縮錯誤 (%d)" #: archive-tar.c #, c-format msgid "unable to start '%s' filter" -msgstr "無法啟動 '%s' 過濾器" +msgstr "無法啟動 “%s” 過濾器" #: archive-tar.c msgid "unable to redirect descriptor" -msgstr "無法重定向描述符" +msgstr "無法重新導向描述元" #: archive-tar.c #, c-format msgid "'%s' filter reported error" -msgstr "'%s' 過濾器報告了錯誤" +msgstr "“%s” 過濾器回報錯誤" #: archive-zip.c #, c-format @@ -1535,36 +1543,36 @@ msgstr "路徑不是有效的 UTF-8：%s" #: archive-zip.c #, c-format msgid "path too long (%d chars, SHA1: %s): %s" -msgstr "路徑太長（%d 字元，SHA1：%s）：%s" +msgstr "路徑太長（%d 個字元，SHA1：%s）：%s" #: archive-zip.c #, c-format msgid "timestamp too large for this system: %<PRIuMAX>" -msgstr "對於本系統時間戳太大：%<PRIuMAX>" +msgstr "對本系統而言時間戳太大：%<PRIuMAX>" #: archive.c msgid "git archive [<options>] <tree-ish> [<path>...]" -msgstr "git archive [<選項>] <樹或提交> [<路徑>...]" +msgstr "git archive [<options>] <tree-ish> [<path>...]" #: archive.c msgid "" "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" msgstr "" -"git archive --remote <版本庫> [--exec <命令>] [<選項>] <樹或提交> [<路徑>...]" +"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" #: archive.c msgid "git archive --remote <repo> [--exec <cmd>] --list" -msgstr "git archive --remote <版本庫> [--exec <命令>] --list" +msgstr "git archive --remote <repo> [--exec <cmd>] --list" #: archive.c builtin/gc.c builtin/notes.c builtin/tag.c #, c-format msgid "cannot read '%s'" -msgstr "不能讀取 '%s'" +msgstr "無法讀取 “%s”" #: archive.c builtin/add.c builtin/rm.c #, c-format msgid "pathspec '%s' did not match any files" -msgstr "路徑規格 '%s' 未符合任何檔案" +msgstr "路徑規格 “%s” 未符合任何檔案" #: archive.c #, c-format @@ -1574,16 +1582,16 @@ msgstr "無此引用：%.*s" #: archive.c #, c-format msgid "not a valid object name: %s" -msgstr "不是一個有效的物件名：%s" +msgstr "非有效物件名稱：%s" -#: archive.c +#: archive.c t/helper/test-cache-tree.c #, c-format msgid "not a tree object: %s" -msgstr "不是一個樹狀物件：%s" +msgstr "非樹狀物件：%s" #: archive.c msgid "current working directory is untracked" -msgstr "目前工作目錄未被追蹤" +msgstr "尚未追蹤目前的工作目錄" #: archive.c #, c-format @@ -1598,25 +1606,25 @@ msgstr "不是一般檔案：%s" #: archive.c #, c-format msgid "unclosed quote: '%s'" -msgstr "未閉合的引號：「%s」" +msgstr "未閉合的引號：“%s”" #: archive.c #, c-format msgid "missing colon: '%s'" -msgstr "缺少冒號：「%s」" +msgstr "缺少冒號：“%s”" #: archive.c #, c-format msgid "empty file name: '%s'" -msgstr "檔案名稱空白：「%s」" +msgstr "檔案名稱空白：“%s”" #: archive.c msgid "fmt" -msgstr "格式" +msgstr "fmt" #: archive.c msgid "archive format" -msgstr "歸檔格式" +msgstr "封存格式" #: archive.c builtin/log.c msgid "prefix" @@ -1624,33 +1632,33 @@ msgstr "前綴" #: archive.c msgid "prepend prefix to each pathname in the archive" -msgstr "為歸檔中每個路徑名加上前綴" +msgstr "為封存中的每個路徑名稱加上前綴" #: archive.c builtin/blame.c builtin/commit-tree.c builtin/config.c -#: builtin/fast-export.c builtin/grep.c builtin/hash-object.c +#: builtin/fast-export.c builtin/gc.c builtin/grep.c builtin/hash-object.c #: builtin/ls-files.c builtin/notes.c builtin/read-tree.c parse-options.h msgid "file" -msgstr "檔案" +msgstr "file" #: archive.c msgid "add untracked file to archive" -msgstr "將未追蹤檔案加入歸檔" +msgstr "將未追蹤檔案加進封存" #: archive.c msgid "path:content" -msgstr "路徑:內容" +msgstr "path:content" #: archive.c builtin/archive.c msgid "write the archive to this file" -msgstr "歸檔寫入此檔案" +msgstr "將封存寫入此檔案" #: archive.c msgid "read .gitattributes in working directory" -msgstr "讀取工作區中的 .gitattributes" +msgstr "讀取工作目錄中的 .gitattributes" #: archive.c msgid "report archived files on stderr" -msgstr "在標準錯誤上報告歸檔檔案" +msgstr "在 stderr 上回報封存的檔案" #: archive.c msgid "set compression level" @@ -1658,27 +1666,27 @@ msgstr "設定壓縮級別" #: archive.c msgid "list supported archive formats" -msgstr "列出支援的歸檔格式" +msgstr "列出支援的封存格式" #: archive.c builtin/archive.c builtin/clone.c builtin/submodule--helper.c msgid "repo" -msgstr "版本庫" +msgstr "repo" #: archive.c builtin/archive.c msgid "retrieve the archive from remote repository <repo>" -msgstr "從遠端版本庫（<版本庫>）擷取歸檔檔案" +msgstr "從遠端版本庫 <repo> 擷取封存檔案" #: archive.c builtin/archive.c builtin/difftool.c builtin/notes.c msgid "command" -msgstr "指令" +msgstr "command" #: archive.c builtin/archive.c msgid "path to the remote git-upload-archive command" -msgstr "遠端 git-upload-archive 指令的路徑" +msgstr "遠端 git-upload-archive 命令的路徑" #: archive.c msgid "Unexpected option --remote" -msgstr "未知參數 --remote" +msgstr "非預期選項 --remote" #: archive.c builtin/add.c builtin/checkout.c builtin/clone.c builtin/commit.c #: builtin/fast-export.c builtin/index-pack.c builtin/log.c builtin/reset.c @@ -1686,26 +1694,26 @@ msgstr "未知參數 --remote" #: revision.c #, c-format msgid "the option '%s' requires '%s'" -msgstr "「%s」選項需要「%s」" +msgstr "“%s” 選項需要 “%s”" #: archive.c msgid "Unexpected option --output" -msgstr "未知參數 --output" +msgstr "非預期選項 --output" #: archive.c #, c-format msgid "Unknown archive format '%s'" -msgstr "未知歸檔格式 '%s'" +msgstr "封存格式 “%s” 未知" #: archive.c #, c-format msgid "Argument not supported for format '%s': -%d" -msgstr "參數不支援此格式 '%s'：-%d" +msgstr "引數不支援 “%s” 格式：-%d" #: attr.c #, c-format msgid "%.*s is not a valid attribute name" -msgstr "%.*s 不是一個有效的屬性名" +msgstr "%.*s 不是有效的屬性名稱" #: attr.c #, c-format @@ -1717,23 +1725,23 @@ msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." msgstr "" -"反向模式在 git attributes 中被忽略\n" -"當字串確定要以驚嘆號開始時，使用 '\\!'。" +"git attributes 會忽略反向模式\n" +"當字串確定要以驚嘆號開始時，請使用 “\\!”。" #: bisect.c #, c-format msgid "Badly quoted content in file '%s': %s" -msgstr "檔案 '%s' 包含錯誤的引用格式：%s" +msgstr "檔案 “%s” 包含無效的引用內容：%s" #: bisect.c #, c-format msgid "We cannot bisect more!\n" -msgstr "我們無法進行更多的二分搜尋！\n" +msgstr "已經無法繼續二分搜尋！\n" #: bisect.c #, c-format msgid "Not a valid commit name %s" -msgstr "不是一個有效的提交名 %s" +msgstr "%s 不是有效的提交名稱" #: bisect.c #, c-format @@ -1742,7 +1750,7 @@ msgid "" "This means the bug has been fixed between %s and [%s].\n" msgstr "" "合併基礎 %s 是壞的。\n" -"這意味著介於 %s 和 [%s] 之間的 bug 已經被修復。\n" +"這意味著 bug 已經在 %s 和 [%s] 之間被修正。\n" #: bisect.c #, c-format @@ -1751,7 +1759,7 @@ msgid "" "The property has changed between %s and [%s].\n" msgstr "" "合併基礎 %s 是新的。\n" -"介於 %s 和 [%s] 之間的屬性已經被修改。\n" +"介於 %s 和 [%s] 之間的屬性已被修改。\n" #: bisect.c #, c-format @@ -1760,7 +1768,7 @@ msgid "" "This means the first '%s' commit is between %s and [%s].\n" msgstr "" "合併基礎 %s 是 %s。\n" -"這意味著第一個 '%s' 提交位於 %s 和 [%s] 之間。\n" +"這意味著第一個 “%s” 提交位於 %s 和 [%s] 之間。\n" #: bisect.c #, c-format @@ -1769,9 +1777,9 @@ msgid "" "git bisect cannot work properly in this case.\n" "Maybe you mistook %s and %s revs?\n" msgstr "" -"一些 %s 版本不是 %s 版本的祖先。\n" -"這種情況下 git 二分搜尋無法正常工作。\n" -"您可能弄錯了 %s 和 %s 版本？\n" +"部分 %s 修訂版不是 %s 修訂版的祖先。\n" +"這種情況下 git bisect 無法正常運作。\n" +"您可能弄錯了 %s 和 %s 修訂版？\n" #: bisect.c #, c-format @@ -1780,33 +1788,33 @@ msgid "" "So we cannot be sure the first %s commit is between %s and %s.\n" "We continue anyway." msgstr "" -"介於 %s 和 [%s] 的合併基礎一定被忽略了。\n" +"介於 %s 和 [%s] 的合併基礎一定被略過了。\n" "所以我們無法確認第一個 %s 提交是否介於 %s 和 %s 之間。\n" "我們仍舊繼續。" #: bisect.c #, c-format msgid "Bisecting: a merge base must be tested\n" -msgstr "二分搜尋中：合併基礎必須是經過測試的\n" +msgstr "二分搜尋中：合併基礎必須經過測試\n" #: bisect.c #, c-format msgid "a %s revision is needed" -msgstr "需要一個 %s 版本" +msgstr "需要一個 %s 修訂版" #: bisect.c #, c-format msgid "could not create file '%s'" -msgstr "不能建立檔案 '%s'" +msgstr "無法建立 “%s” 檔案" #: bisect.c builtin/merge.c #, c-format msgid "could not read file '%s'" -msgstr "不能讀取檔案 '%s'" +msgstr "無法讀取 “%s” 檔案" #: bisect.c msgid "reading bisect refs failed" -msgstr "讀取二分搜尋引用失敗" +msgstr "無法讀取二分搜尋的引用" #: bisect.c #, c-format @@ -1820,13 +1828,13 @@ msgid "" "Maybe you started with bad path arguments?\n" msgstr "" "沒找到能夠測試的提交。\n" -"可能是執行傳入的路徑引數是錯誤的？\n" +"可能是傳入的路徑引數有誤？\n" #: bisect.c #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" -msgstr[0] "（大概 %d 步）" +msgstr[0] "（大約 %d 步）" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. @@ -1835,7 +1843,7 @@ msgstr[0] "（大概 %d 步）" #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" -msgstr[0] "二分搜尋中：在此之後，還剩 %d 個版本待測試 %s\n" +msgstr[0] "二分搜尋中：在此 (%2$s) 之後，尚餘 %1$d 個版本待測試\n" #: blame.c msgid "--contents and --reverse do not blend well." @@ -1843,7 +1851,7 @@ msgstr "--contents 和 --reverse 不能混用。" #: blame.c msgid "cannot use --contents with final commit object name" -msgstr "不能將 --contents 和最終的提交物件名共用" +msgstr "無法將 --contents 與最終的提交物件名稱共用" #: blame.c msgid "--reverse and --first-parent together require specified latest commit" @@ -1853,48 +1861,48 @@ msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交" #: builtin/pack-objects.c builtin/shortlog.c bundle.c midx.c pack-bitmap.c #: ref-filter.c remote.c sequencer.c submodule.c msgid "revision walk setup failed" -msgstr "版本遍歷設定失敗" +msgstr "修訂版遍歷設定失敗" #: blame.c msgid "" "--reverse --first-parent together require range along first-parent chain" -msgstr "--reverse 和 --first-parent 共用，需要第一祖先鏈上的提交範圍" +msgstr "--reverse 和 --first-parent 共用，需要第一上級鏈的提交範圍" #: blame.c #, c-format msgid "no such path %s in %s" -msgstr "在 %2$s 中無此路徑 %1$s" +msgstr "在 %2$s 中，沒有路徑 %1$s" #: blame.c #, c-format msgid "cannot read blob %s for path %s" -msgstr "不能為路徑 %2$s 讀取資料物件 %1$s" +msgstr "無法為 %2$s 路徑讀取資料物件 %1$s" #: branch.c msgid "" "cannot inherit upstream tracking configuration of multiple refs when " "rebasing is requested" -msgstr "請求重定基底時，無法繼承多個參照的上游追蹤設定" +msgstr "請求重定基底時，無法繼承多個引用的上游追蹤設定" #: branch.c #, c-format msgid "not setting branch '%s' as its own upstream" -msgstr "未將「%s」分支設定為其自己的上游" +msgstr "未將 “%s” 分支設為其自己的上游" #: branch.c #, c-format msgid "branch '%s' set up to track '%s' by rebasing." -msgstr "已將「%s」分支設定為透過重定基底追蹤「%s」。" +msgstr "已藉由重訂基底，將 “%s” 分支設定為追蹤 “%s”。" #: branch.c #, c-format msgid "branch '%s' set up to track '%s'." -msgstr "已將「%s」分支設定為追蹤「%s」。" +msgstr "已將 “%s” 分支設定為追蹤 “%s”。" #: branch.c #, c-format msgid "branch '%s' set up to track:" -msgstr "「%s」分支已設定追蹤：" +msgstr "“%s” 分支已設定追蹤：" #: branch.c msgid "unable to write upstream branch configuration" @@ -1907,23 +1915,23 @@ msgid "" "the remote tracking information by invoking:" msgstr "" "\n" -"修正錯誤後，您可以執行下述命令\n" -"命令修正遠端追蹤資訊：" +"修正病灶後，您可以執行下述命令\n" +"修正遠端追蹤資訊：" #: branch.c #, c-format msgid "asked to inherit tracking from '%s', but no remote is set" -msgstr "請求繼承「%s」的追蹤設定，但未設定遠端" +msgstr "請求繼承 “%s” 的追蹤設定，但未設定遠端" #: branch.c #, c-format msgid "asked to inherit tracking from '%s', but no merge configuration is set" -msgstr "請求繼承「%s」的追蹤設定，但未設定合併設定" +msgstr "請求繼承 “%s” 的追蹤設定，但未設定合併設定" #: branch.c #, c-format msgid "not tracking: ambiguous information for ref '%s'" -msgstr "未追蹤：「%s」引用有歧義" +msgstr "未追蹤：“%s” 引用有歧義" # 譯者：為保證在輸出中對齊，注意調整句中空格！ #. #-#-#-#-# branch.c.po #-#-#-#-# @@ -1957,37 +1965,38 @@ msgid "" "different remotes' fetch refspecs map into different\n" "tracking namespaces." msgstr "" -"有多個遠端的抓取引用規格映射到遠端追蹤引用「%s」的規格：\n" +"有多個遠端的抓取引用規格，映射到\n" +"遠端追蹤引用 “%s” 的規格：\n" "%s\n" "這通常是設定錯誤。\n" "\n" -"若要支援設定追蹤分支，請確定不同遠端的抓取引用規格\n" -"映射到不同的追蹤命名空間。" +"若要支援設定追蹤分支，請確定不同遠端的\n" +"抓取引用規格，映射到不同的追蹤命名空間。" #: branch.c #, c-format msgid "'%s' is not a valid branch name" -msgstr "「%s」不是一個有效的分支名稱" +msgstr "“%s” 不是有效的分支名稱" #: branch.c #, c-format msgid "a branch named '%s' already exists" -msgstr "已有同名「%s」分支" +msgstr "已有同名 “%s” 分支" #: branch.c #, c-format msgid "cannot force update the branch '%s' checked out at '%s'" -msgstr "無法強制更新在「%2$s」簽出的「%1$s」分支" +msgstr "無法強制更新在 “%2$s” 簽出的 “%1$s” 分支" #: branch.c #, c-format msgid "cannot set up tracking information; starting point '%s' is not a branch" -msgstr "無法設定追蹤資訊：起始點「%s」不是分支" +msgstr "無法設定追蹤資訊：起始點 “%s” 不是分支" #: branch.c #, c-format msgid "the requested upstream branch '%s' does not exist" -msgstr "請求的上游分支 '%s' 不存在" +msgstr "請求的上游分支 “%s” 不存在" #: branch.c msgid "" @@ -2002,31 +2011,31 @@ msgid "" msgstr "" "\n" "如果您打算以遠端現存的上游分支為基礎進行修改，\n" -"您或許需要執行「git fetch」取得分支。\n" +"您或許需要執行 `git fetch` 取得分支。\n" "\n" -"如果您打算將新建立的本機分支推送至對應的遠端分支，\n" -"且建立兩個分支間的追蹤關係，\n" -"您可能需要使用「git push -u」推送分支並設定和上游的關聯。" +"如果您打算將新建立的本機分支，推送至對應的遠端分支，\n" +"並建立兩個分支間的追蹤關係，您可能需要使用 `git push -u`\n" +"推送分支並設定和上游的關聯。" #: branch.c builtin/replace.c #, c-format msgid "not a valid object name: '%s'" -msgstr "不是一個有效的物件名：'%s'" +msgstr "物件名稱無效：“%s”" #: branch.c #, c-format msgid "ambiguous object name: '%s'" -msgstr "物件名稱有歧義：「%s」" +msgstr "物件名稱有歧義：“%s”" #: branch.c #, c-format msgid "not a valid branch point: '%s'" -msgstr "無效的分支點：「%s」" +msgstr "分支點無效：“%s”" #: branch.c #, c-format msgid "submodule '%s': unable to find submodule" -msgstr "「%s」子模組：找不到子模組" +msgstr "“%s” 子模組：找不到子模組" #: branch.c #, c-format @@ -2034,37 +2043,37 @@ msgid "" "You may try updating the submodules using 'git checkout %s && git submodule " "update --init'" msgstr "" -"您可以嘗試使用「git checkout %s && git submodule update --init」命令更新子模" -"組" +"您可以嘗試使用 “git checkout %s && git submodule update --init” 命令，更新子" +"模組" #: branch.c #, c-format msgid "submodule '%s': cannot create branch '%s'" -msgstr "「%s」子模組：無法建立「%s」分支" +msgstr "“%s” 子模組：無法建立 “%s” 分支" #: branch.c #, c-format msgid "'%s' is already checked out at '%s'" -msgstr "'%s' 已經簽出到 '%s'" +msgstr "“%s” 已在 “%s” 點簽出" #: branch.c #, c-format msgid "HEAD of working tree %s is not updated" -msgstr "工作區 %s 的 HEAD 指向沒有被更新" +msgstr "%s 工作區的 HEAD 指針未被更新" #: builtin/add.c msgid "git add [<options>] [--] <pathspec>..." -msgstr "git add [<選項>] [--] <路徑規格>..." +msgstr "git add [<options>] [--] <pathspec>..." #: builtin/add.c #, c-format msgid "cannot chmod %cx '%s'" -msgstr "無法 chmod %cx ‘%s’" +msgstr "無法 chmod %cx '%s'" #: builtin/add.c #, c-format msgid "unexpected diff status %c" -msgstr "意外的差異狀態 %c" +msgstr "非預期的 diff 狀態 %c" #: builtin/add.c builtin/commit.c msgid "updating files failed" @@ -2073,19 +2082,19 @@ msgstr "更新檔案失敗" #: builtin/add.c #, c-format msgid "remove '%s'\n" -msgstr "刪除 '%s'\n" +msgstr "移除 “%s”\n" #: builtin/add.c msgid "Unstaged changes after refreshing the index:" -msgstr "重新整理索引之後尚未被暫存的變更：" +msgstr "重新整理索引之後，尚未被暫存的更動：" #: builtin/add.c builtin/rev-parse.c msgid "Could not read the index" -msgstr "不能讀取索引" +msgstr "無法讀取索引" #: builtin/add.c msgid "Could not write patch" -msgstr "不能生成修補檔" +msgstr "無法寫入修補檔" #: builtin/add.c msgid "editing patch failed" @@ -2094,20 +2103,20 @@ msgstr "編輯修補檔失敗" #: builtin/add.c #, c-format msgid "Could not stat '%s'" -msgstr "不能對 '%s' 呼叫 stat" +msgstr "不能對 “%s” 執行 stat" #: builtin/add.c msgid "Empty patch. Aborted." -msgstr "空修補檔。異常終止。" +msgstr "修補檔空白。中止。" #: builtin/add.c #, c-format msgid "Could not apply '%s'" -msgstr "不能套用 '%s'" +msgstr "無法套用 “%s”" #: builtin/add.c msgid "The following paths are ignored by one of your .gitignore files:\n" -msgstr "下列路徑根據您的一個 .gitignore 檔案而被忽略：\n" +msgstr "下列路徑根據其中一個 .gitignore 檔案而被忽略：\n" #: builtin/add.c builtin/clean.c builtin/fetch.c builtin/mv.c #: builtin/prune-packed.c builtin/pull.c builtin/push.c builtin/remote.c @@ -2123,11 +2132,11 @@ msgstr "詳細輸出" #: builtin/add.c msgid "interactive picking" -msgstr "互動式揀選" +msgstr "互動式挑選" #: builtin/add.c builtin/checkout.c builtin/reset.c msgid "select hunks interactively" -msgstr "互動式挑選資料區塊" +msgstr "互動式選取區塊" #: builtin/add.c msgid "edit current diff and apply" @@ -2135,7 +2144,7 @@ msgstr "編輯目前差異並套用" #: builtin/add.c msgid "allow adding otherwise ignored files" -msgstr "允許新增忽略的檔案" +msgstr "允許加入原先被忽略的檔案" #: builtin/add.c msgid "update tracked files" @@ -2143,15 +2152,15 @@ msgstr "更新已追蹤的檔案" #: builtin/add.c msgid "renormalize EOL of tracked files (implies -u)" -msgstr "對已追蹤檔案（隱含 -u）重新歸一換行符號" +msgstr "對已追蹤檔案（隱含 -u）重新標準化 EOL" #: builtin/add.c msgid "record only the fact that the path will be added later" -msgstr "只記錄，該路徑稍後再新增" +msgstr "只記錄「路徑稍後會再加入」" #: 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)" @@ -2167,7 +2176,7 @@ msgstr "略過因發生錯誤不能新增的檔案" #: builtin/add.c msgid "check if - even missing - files are ignored in dry run" -msgstr "檢查在測試執行模式下檔案（即使不存在）是否被忽略" +msgstr "檢查（即使不存在的）檔案是否在測試執行模式中被忽略" #: builtin/add.c builtin/mv.c builtin/rm.c msgid "allow updating entries outside of the sparse-checkout cone" @@ -2175,11 +2184,11 @@ msgstr "允許更新稀疏簽出 cone 外的項目" #: builtin/add.c builtin/update-index.c msgid "override the executable bit of the listed files" -msgstr "覆蓋列表裡檔案的可執行位" +msgstr "覆寫列出檔案中的可執行位元" #: builtin/add.c msgid "warn when adding an embedded repository" -msgstr "建立一個嵌入式版本庫時給予警告" +msgstr "嵌入版本庫時發出警告" #: builtin/add.c #, c-format @@ -2198,22 +2207,24 @@ msgid "" "\n" "See \"git help submodule\" for more information." msgstr "" -"您在目前版本庫中新增了另外一個 Git 版本庫。複製外層的版本庫將不包含嵌入版本庫" -"的內容，並且不知道該如何取得它。\n" -"如果您要新增一個子模組，使用：\n" +"您在目前的版本庫中加進另一個 Git 版本庫。\n" +"複製外層的版本庫，將不包含嵌入版本庫的內容，\n" +"並且不包含取得此版本庫的方式。\n" +"如果您要加入子模組，請使用：\n" "\n" "\tgit submodule add <url> %s\n" "\n" -"如果您不小心新增了這個路徑，可以用下面的指令將其從索引中刪除：\n" +"如果您不小心加入了這個路徑，\n" +"可以用下面的命令，將其從索引中移除：\n" "\n" "\tgit rm --cached %s\n" "\n" -"參見 \"git help submodule\" 取得更多訊息。" +"參見 “git help submodule” 深入了解。" #: builtin/add.c #, c-format msgid "adding embedded git repository: %s" -msgstr "正在新增嵌入式 git 版本庫：%s" +msgstr "正在加入嵌入式 git 版本庫：%s" #: builtin/add.c msgid "" @@ -2221,29 +2232,29 @@ msgid "" "Turn this message off by running\n" "\"git config advice.addIgnoredFile false\"" msgstr "" -"如果您真的想加入，請使用 -f。\n" +"若您真的想加入，請傳入 -f。\n" "如要關閉此訊息，請執行\n" -"\"git config advice.addIgnoredFile false\"" +"“git config advice.addIgnoredFile false”" #: builtin/add.c msgid "adding files failed" -msgstr "新增檔案失敗" +msgstr "加入檔案失敗" #: builtin/add.c #, c-format msgid "--chmod param '%s' must be either -x or +x" -msgstr "參數 --chmod 取值 '%s' 必須是 -x 或 +x" +msgstr "--chmod 的參數 “%s” 必須是 -x 或 +x" #: builtin/add.c builtin/checkout.c builtin/commit.c builtin/reset.c #: builtin/rm.c builtin/stash.c #, c-format msgid "'%s' and pathspec arguments cannot be used together" -msgstr "「%s」和路徑規格引數不得同時使用" +msgstr "“%s” 和路徑規格引數不得同時使用" #: builtin/add.c #, c-format msgid "Nothing specified, nothing added.\n" -msgstr "沒有指定檔案，也沒有檔案被新增。\n" +msgstr "沒有指定，亦未加入檔案。\n" #: builtin/add.c msgid "" @@ -2251,9 +2262,9 @@ msgid "" "Turn this message off by running\n" "\"git config advice.addEmptyPathspec false\"" msgstr "" -"可能你要做的是 'git add .'？\n" +"可能您想做 “git add .”？\n" "如要關閉此訊息，請執行\n" -"\"git config advice.addEmptyPathspec false\"" +"“git config advice.addEmptyPathspec false”" #: builtin/add.c builtin/check-ignore.c builtin/checkout.c builtin/clean.c #: builtin/commit.c builtin/diff-tree.c builtin/grep.c builtin/mv.c @@ -2265,43 +2276,43 @@ msgstr "索引檔案損壞" #: builtin/am.c builtin/mailinfo.c mailinfo.c #, c-format msgid "bad action '%s' for '%s'" -msgstr "「%s」動作對「%s」無效" +msgstr "“%s” 動作對 “%s” 無效" #: builtin/am.c builtin/blame.c builtin/fetch.c builtin/pack-objects.c #: builtin/pull.c diff-merges.c gpg-interface.c ls-refs.c parallel-checkout.c #: sequencer.c setup.c #, c-format msgid "invalid value for '%s': '%s'" -msgstr "「%s」的值無效：「%s」" +msgstr "“%s” 的值無效：“%s”" #: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c #, c-format msgid "could not read '%s'" -msgstr "不能讀取 '%s'" +msgstr "無法讀取 “%s”" #: builtin/am.c msgid "could not parse author script" -msgstr "不能解析作者腳本" +msgstr "無法解析作者文稿" #: builtin/am.c builtin/replace.c commit.c sequencer.c #, c-format msgid "could not parse %s" -msgstr "不能解析 %s" +msgstr "無法解析 %s" #: builtin/am.c #, c-format msgid "'%s' was deleted by the applypatch-msg hook" -msgstr "'%s' 被 applypatch-msg 掛鉤刪除" +msgstr "“%s” 被 applypatch-msg 掛鉤刪除" #: builtin/am.c #, c-format msgid "Malformed input line: '%s'." -msgstr "非法的輸入行：'%s'。" +msgstr "格式錯誤的輸入列：“%s”。" #: builtin/am.c #, c-format msgid "Failed to copy notes from '%s' to '%s'" -msgstr "從 '%s' 複製註解到 '%s' 時失敗" +msgstr "從 “%s” 拷貝註解到 “%s” 失敗" #: builtin/am.c msgid "fseek failed" @@ -2310,21 +2321,21 @@ msgstr "fseek 失敗" #: builtin/am.c builtin/rebase.c sequencer.c wrapper.c #, c-format msgid "could not open '%s' for reading" -msgstr "無法開啟 '%s' 進行讀取" +msgstr "無法開啟 “%s” 進行讀取" #: builtin/am.c builtin/rebase.c sequencer.c strbuf.c wrapper.c #, c-format msgid "could not open '%s' for writing" -msgstr "無法開啟 '%s' 進行寫入" +msgstr "無法開啟 “%s” 進行寫入" #: builtin/am.c #, c-format msgid "could not parse patch '%s'" -msgstr "無法解析修補檔 '%s'" +msgstr "無法解析修補檔 “%s”" #: builtin/am.c msgid "Only one StGIT patch series can be applied at once" -msgstr "一次只能有一個 StGIT 修補檔佇列被套用" +msgstr "一次只能套用一個 StGIT 修補檔序列" #: builtin/am.c msgid "invalid timestamp" @@ -2332,11 +2343,11 @@ msgstr "無效的時間戳" #: builtin/am.c msgid "invalid Date line" -msgstr "無效的日期行" +msgstr "無效的 Date 列" #: builtin/am.c msgid "invalid timezone offset" -msgstr "無效的時區位移值" +msgstr "無效的時區偏移" #: builtin/am.c msgid "Patch format detection failed." @@ -2345,74 +2356,74 @@ msgstr "修補檔格式偵測失敗。" #: builtin/am.c builtin/clone.c #, c-format msgid "failed to create directory '%s'" -msgstr "建立目錄 '%s' 失敗" +msgstr "無法建立目錄 “%s”" #: builtin/am.c msgid "Failed to split patches." -msgstr "分割修補檔失敗。" +msgstr "無法切割修補檔。" #: builtin/am.c #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." -msgstr "當您解決這一問題，執行 \"%s --continue\"。" +msgstr "解決此問題後，請執行 “%s --continue”。" #: builtin/am.c #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." -msgstr "如果您想要略過這一修補檔，則執行 \"%s --skip\"。" +msgstr "若要略過此修補，請改執行 “%s --skip”。" #: builtin/am.c #, c-format msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"." -msgstr "若要將空白修補檔錄製為空白提交，請執行「%s --allow-empty」。" +msgstr "若要將空白修補檔錄入為空白提交，請執行 “%s --allow-empty”。" #: builtin/am.c #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." -msgstr "若要復原至原始分支並停止修補動作，執行 \"%s --abort\"。" +msgstr "若要還原至原始分支，並停止修補動作，請執行 “%s --abort”。" #: builtin/am.c msgid "Patch sent with format=flowed; space at the end of lines might be lost." -msgstr "修補檔使用 format=flowed 格式傳送，行尾的空格可能會遺失。" +msgstr "修補檔使用 format=flowed 格式傳送：列尾的空格可能會遺失。" #: builtin/am.c #, c-format msgid "missing author line in commit %s" -msgstr "在提交 %s 中缺少作者行" +msgstr "在提交 %s 中缺少作者列" #: builtin/am.c #, c-format msgid "invalid ident line: %.*s" -msgstr "無效的身份標記：%.*s" +msgstr "ident 列無效：%.*s" #: builtin/am.c builtin/checkout.c builtin/clone.c commit-graph.c #, c-format msgid "unable to parse commit %s" -msgstr "不能解析提交 %s" +msgstr "無法解析 %s 提交" #: builtin/am.c msgid "Repository lacks necessary blobs to fall back on 3-way merge." -msgstr "版本庫缺乏必要的資料物件以進行三方合併。" +msgstr "版本庫缺少必要的資料物件，無法進行三方合併。" #: builtin/am.c msgid "Using index info to reconstruct a base tree..." -msgstr "使用索引來重建一個（三方合併的）基礎目錄樹..." +msgstr "正在使用索引資訊重建基礎樹……" #: builtin/am.c msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "" -"您是否曾手動編輯過您的修補檔？\n" -"無法套用修補檔到索引中的資料物件上。" +"您是否曾自行編輯過您的修補檔？\n" +"未能套用至索引錄入的資料物件。" #: builtin/am.c msgid "Falling back to patching base and 3-way merge..." -msgstr "回落到基礎版本上修補及進行三方合併..." +msgstr "正在回復到修補基礎處，並進行三方合併……" #: 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" @@ -2420,12 +2431,12 @@ msgstr "git write-tree 無法寫入樹狀物件" #: builtin/am.c msgid "applying to an empty history" -msgstr "正套用到一個空歷史上" +msgstr "正在套用至空白歷史記錄上" #: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c #: t/helper/test-fast-rebase.c msgid "failed to write commit object" -msgstr "寫提交物件失敗" +msgstr "無法寫入提交物件" #: builtin/am.c #, c-format @@ -2434,7 +2445,7 @@ msgstr "無法繼續：%s 不存在。" #: builtin/am.c msgid "Commit Body is:" -msgstr "提交內容為：" +msgstr "提交內文為：" # 譯者：請維持句尾空格 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] @@ -2444,7 +2455,7 @@ msgstr "提交內容為：" #: builtin/am.c #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " -msgstr "套用？是[y]/否[n]/編輯[e]/檢視修補檔[v]/全部接受[a]： " +msgstr "是否套用？是[y]/否[n]/編輯[e]/檢視修補檔[v]/全部接受[a]: " #: builtin/am.c builtin/commit.c msgid "unable to write index file" @@ -2453,7 +2464,7 @@ msgstr "無法寫入索引檔案" #: builtin/am.c #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" -msgstr "髒索引：不能套用修補檔（髒檔案：%s）" +msgstr "有異動索引：無法套用修補檔（異動處：%s）" #: builtin/am.c #, c-format @@ -2467,7 +2478,7 @@ msgstr "建立空白提交：%.*s" #: builtin/am.c msgid "Patch is empty." -msgstr "修補檔為空。" +msgstr "修補檔空白。" #: builtin/am.c #, c-format @@ -2476,20 +2487,20 @@ msgstr "套用：%.*s" #: builtin/am.c msgid "No changes -- Patch already applied." -msgstr "沒有變更——修補檔已經套用過。" +msgstr "沒有變更——修補檔已套用過。" #: builtin/am.c #, c-format msgid "Patch failed at %s %.*s" -msgstr "打修補檔失敗於 %s %.*s" +msgstr "在 %s %.*s 處修補失敗" #: builtin/am.c msgid "Use 'git am --show-current-patch=diff' to see the failed patch" -msgstr "用 'git am --show-current-patch=diff' 命令檢視失敗的修補檔" +msgstr "使用 “git am --show-current-patch=diff” 命令檢視失敗的修補檔" #: builtin/am.c msgid "No changes - recorded it as an empty commit." -msgstr "沒有變更 － 將其錄製為空白提交。" +msgstr "沒有變更：將其錄入為空白提交。" #: builtin/am.c msgid "" @@ -2497,9 +2508,9 @@ msgid "" "If there is nothing left to stage, chances are that something else\n" "already introduced the same changes; you might want to skip this patch." msgstr "" -"沒有變更 —— 您是不是忘了執行 'git add'？\n" -"如果沒有什麼要新增到暫存區的，則很可能是其它提交已經引入了相同的變更。\n" -"您也許想要略過這個修補檔。" +"沒有變更：是否忘記執行 “git add”？\n" +"如果沒有其他要新增到暫存區的，則很可能是其它提交\n" +"已經引入了相同的變更。您也許想要略過這個修補檔。" #: builtin/am.c msgid "" @@ -2508,59 +2519,61 @@ msgid "" "such.\n" "You might run `git rm` on a file to accept \"deleted by them\" for it." msgstr "" -"在您的索引中仍存在未合併的路徑。\n" -"您應該對已經衝突解決的每一個檔案執行 'git add' 來標記已經完成。 \n" -"你可以對 \"由他們刪除\" 的檔案執行 `git rm` 指令。" +"索引中仍有未合併路徑。\n" +"您應該對已經解決衝突的每一個檔案執行 `git add`，標記為已經完成。\n" +"你可以對「由他們刪除」的檔案，執行 `git rm` 指令。" #: builtin/am.c builtin/checkout.c builtin/clone.c builtin/stash.c merge.c #: rerere.c msgid "unable to write new index file" -msgstr "無法寫新的索引檔案" +msgstr "無法寫入新的索引檔案" #: builtin/am.c builtin/reset.c #, c-format msgid "Could not parse object '%s'." -msgstr "不能解析物件 '%s'。" +msgstr "無法解析 “%s” 物件。" #: builtin/am.c msgid "failed to clean index" -msgstr "清空索引失敗" +msgstr "無法清除索引" #: builtin/am.c msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" -msgstr "您好像在上一次 'am' 失敗後移動了 HEAD。未還原至 ORIG_HEAD" +msgstr "" +"您似乎在上一次 “am” 失敗後移動了 HEAD。\n" +"未倒轉回 ORIG_HEAD" #: builtin/am.c builtin/bisect--helper.c worktree.c #, c-format msgid "failed to read '%s'" -msgstr "讀取 '%s' 失敗" +msgstr "無法讀取 “%s”" #: builtin/am.c #, c-format msgid "options '%s=%s' and '%s=%s' cannot be used together" -msgstr "「%s=%s」和「%s=%s」選項不得同時使用" +msgstr "“%s=%s” 和 “%s=%s” 選項不得同時使用" #: builtin/am.c msgid "git am [<options>] [(<mbox> | <Maildir>)...]" -msgstr "git am [<選項>] [(<mbox> | <Maildir>)...]" +msgstr "git am [<options>] [(<mbox> | <Maildir>)...]" #: builtin/am.c msgid "git am [<options>] (--continue | --skip | --abort)" -msgstr "git am [<選項>] (--continue | --skip | --abort)" +msgstr "git am [<options>] (--continue | --skip | --abort)" #: builtin/am.c msgid "run interactively" -msgstr "以互動式方式執行" +msgstr "互動式執行" #: builtin/am.c msgid "historical option -- no-op" -msgstr "老的參數 —— 無作用" +msgstr "歷史遺留選項——無作用" #: builtin/am.c msgid "allow fall back on 3way merging if needed" -msgstr "如果必要，允許使用三方合併" +msgstr "必要時允許回復至三方合併" #: builtin/am.c builtin/init-db.c builtin/prune-packed.c builtin/repack.c #: builtin/stash.c @@ -2569,7 +2582,7 @@ msgstr "靜默模式" #: builtin/am.c msgid "add a Signed-off-by trailer to the commit message" -msgstr "在提交說明結尾加入 Signed-off-by" +msgstr "在提交說明結尾處加入 Signed-off-by" #: builtin/am.c msgid "recode into utf8 (default)" @@ -2577,35 +2590,35 @@ msgstr "使用 utf8 字元集（預設）" #: builtin/am.c msgid "pass -k flag to git-mailinfo" -msgstr "向 git-mailinfo 傳遞 -k 參數" +msgstr "向 git-mailinfo 傳入 -k 參數" #: builtin/am.c msgid "pass -b flag to git-mailinfo" -msgstr "向 git-mailinfo 傳遞 -b 參數" +msgstr "向 git-mailinfo 傳入 -b 參數" #: builtin/am.c msgid "pass -m flag to git-mailinfo" -msgstr "向 git-mailinfo 傳遞 -m 參數" +msgstr "向 git-mailinfo 傳入 -m 參數" #: builtin/am.c msgid "pass --keep-cr flag to git-mailsplit for mbox format" -msgstr "針對 mbox 格式，向 git-mailsplit 傳遞 --keep-cr 參數" +msgstr "若為 mbox 格式，向 git-mailsplit 傳入 --keep-cr 標記" #: builtin/am.c msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" -msgstr "不向 git-mailsplit 傳遞 --keep-cr 參數，覆蓋 am.keepcr 的設定" +msgstr "不向 git-mailsplit 傳入 --keep-cr 標記，無視 am.keepcr 的設定" #: builtin/am.c msgid "strip everything before a scissors line" -msgstr "捨棄裁切線前的所有內容" +msgstr "截掉裁切線前的所有內容" #: builtin/am.c msgid "pass it through git-mailinfo" -msgstr "透過 git-mailinfo 傳遞" +msgstr "透過 git-mailinfo 傳入" #: builtin/am.c msgid "pass it through git-apply" -msgstr "傳遞給 git-apply" +msgstr "透過 git-apply 傳入" #: builtin/am.c builtin/commit.c builtin/fmt-merge-msg.c builtin/grep.c #: builtin/merge.c builtin/pull.c builtin/rebase.c builtin/repack.c @@ -2617,7 +2630,7 @@ msgstr "n" #: builtin/diagnose.c builtin/for-each-ref.c builtin/ls-files.c #: builtin/ls-tree.c builtin/replace.c builtin/tag.c builtin/verify-tag.c msgid "format" -msgstr "格式" +msgstr "format" #: builtin/am.c msgid "format the patch(es) are in" @@ -2625,7 +2638,7 @@ msgstr "修補檔的格式" #: builtin/am.c msgid "override error message when patch failure occurs" -msgstr "打修補檔失敗時顯示的錯誤訊息" +msgstr "覆蓋修補失敗時顯示的錯誤訊息" #: builtin/am.c msgid "continue applying patches after resolving a conflict" @@ -2645,7 +2658,7 @@ msgstr "還原原始分支並中止修補動作" #: builtin/am.c msgid "abort the patching operation but keep HEAD where it is" -msgstr "終止修補動作但保持 HEAD 不變" +msgstr "中止修補動作但保持 HEAD 不變" #: builtin/am.c msgid "show the patch being applied" @@ -2653,15 +2666,15 @@ msgstr "顯示正在套用的修補檔" #: builtin/am.c msgid "record the empty patch as an empty commit" -msgstr "將空白修補檔錄製為空白提交" +msgstr "將空白修補檔錄入為空白提交" #: builtin/am.c msgid "lie about committer date" -msgstr "將作者日期作為提交日期" +msgstr "將作者日期當作提交日期" #: builtin/am.c msgid "use current timestamp for author date" -msgstr "用目前時間作為作者日期" +msgstr "把目前時間戳當作是作者日期" #: builtin/am.c builtin/commit-tree.c builtin/commit.c builtin/merge.c #: builtin/pull.c builtin/rebase.c builtin/revert.c builtin/tag.c @@ -2685,8 +2698,8 @@ msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." msgstr "" -"參數 -b/--binary 已經很長時間不做任何實質動作了，並且將被移除。\n" -"請不要再使用它了。" +"-b/--binary 選項已經有很長時間不做任何實質動作了，\n" +"並且將被移除。請不要再使用它了。" #: builtin/am.c msgid "failed to read the index" @@ -2703,49 +2716,49 @@ msgid "" "Stray %s directory found.\n" "Use \"git am --abort\" to remove it." msgstr "" -"發現了錯誤的 %s 目錄。\n" -"使用 \"git am --abort\" 刪除它。" +"發現失散的 %s 目錄。\n" +"使用 “git am --abort” 移除。" #: builtin/am.c msgid "Resolve operation not in progress, we are not resuming." -msgstr "解決動作未進行，我們不會繼續。" +msgstr "未在進行解決動作，不會繼續。" #: builtin/am.c msgid "interactive mode requires patches on the command line" -msgstr "互動式模式需要指令列上提供修補檔" +msgstr "互動模式需要命令列上提供修補檔" #: builtin/apply.c msgid "git apply [<options>] [<patch>...]" -msgstr "git apply [<選項>] [<修補檔>...]" +msgstr "git apply [<options>] [<patch>...]" #: builtin/archive.c diagnose.c msgid "could not redirect output" -msgstr "不能重定向輸出" +msgstr "無法重新導向輸出" #: builtin/archive.c msgid "git archive: Remote with no URL" -msgstr "git archive：未提供遠端 URL" +msgstr "git archive: 未提供遠端 URL" #: builtin/archive.c msgid "git archive: expected ACK/NAK, got a flush packet" -msgstr "git archive：期望是 ACK/NAK，卻得到 flush 包" +msgstr "git archive：預期是 ACK/NAK，卻收到 flush 封包" #: builtin/archive.c #, c-format msgid "git archive: NACK %s" -msgstr "git archive：NACK %s" +msgstr "git archive: NACK %s" #: builtin/archive.c msgid "git archive: protocol error" -msgstr "git archive：協定錯誤" +msgstr "git archive：通訊協定錯誤" #: builtin/archive.c msgid "git archive: expected a flush" -msgstr "git archive：應有一個 flush 包" +msgstr "git archive：預期收到 flush 封包" #: builtin/bisect--helper.c msgid "git bisect--helper --bisect-reset [<commit>]" -msgstr "git bisect--helper --bisect-reset [<提交>]" +msgstr "git bisect--helper --bisect-reset [<commit>]" #: builtin/bisect--helper.c msgid "" @@ -2753,24 +2766,25 @@ msgid "" "=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " "[<paths>...]" msgstr "" -"git bisect--helper --bisect-start [--term-{new,bad}=<術語> --term-{old,good}" -"=<術語>] [--no-checkout] [--first-parent] [<壞> [<好>...]] [--] [<路徑>...]" +"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}" +"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " +"[<paths>...]" #: builtin/bisect--helper.c msgid "git bisect--helper --bisect-state (bad|new) [<rev>]" -msgstr "git bisect--helper --bisect-state (bad|new) [<修訂版>]" +msgstr "git bisect--helper --bisect-state (bad|new) [<rev>]" #: builtin/bisect--helper.c msgid "git bisect--helper --bisect-state (good|old) [<rev>...]" -msgstr "git bisect--helper --bisect-state (good|old) [<修訂版>...]" +msgstr "git bisect--helper --bisect-state (good|old) [<rev>...]" #: builtin/bisect--helper.c msgid "git bisect--helper --bisect-replay <filename>" -msgstr "git bisect--helper --bisect-replay <檔名>" +msgstr "git bisect--helper --bisect-replay <filename>" #: builtin/bisect--helper.c msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]" -msgstr "git bisect--helper --bisect-skip [(<修訂版>|<範圍>)...]" +msgstr "git bisect--helper --bisect-skip [(<rev>|<range>)...]" #: builtin/bisect--helper.c msgid "git bisect--helper --bisect-run <cmd>..." @@ -2779,32 +2793,32 @@ msgstr "git bisect--helper --bisect-run <cmd>..." #: builtin/bisect--helper.c #, c-format msgid "cannot open file '%s' in mode '%s'" -msgstr "無法以 '%2$s' 模式開啟 '%1$s' 檔案" +msgstr "無法以 “%2$s” 模式開啟 “%1$s” 檔案" #: builtin/bisect--helper.c #, c-format msgid "could not write to file '%s'" -msgstr "無法寫入 '%s' 檔案" +msgstr "無法寫入 “%s” 檔案" #: builtin/bisect--helper.c #, c-format msgid "cannot open file '%s' for reading" -msgstr "無法開啟「%s」檔案進行讀取" +msgstr "無法開啟 “%s” 檔案進行讀取" #: builtin/bisect--helper.c #, c-format msgid "'%s' is not a valid term" -msgstr "'%s' 不是一個有效的術語" +msgstr "“%s” 不是有效術語" #: builtin/bisect--helper.c #, c-format msgid "can't use the builtin command '%s' as a term" -msgstr "不能使用內建指令 '%s' 作為術語" +msgstr "不能將內建命令 “%s” 當作術語使用" #: builtin/bisect--helper.c #, c-format msgid "can't change the meaning of the term '%s'" -msgstr "不能修改術語 '%s' 的含義" +msgstr "不能變更術語 “%s” 的含義" #: builtin/bisect--helper.c msgid "please use two different terms" @@ -2818,33 +2832,33 @@ msgstr "我們沒有在二分搜尋。\n" #: builtin/bisect--helper.c #, c-format msgid "'%s' is not a valid commit" -msgstr "'%s' 不是一個有效的提交" +msgstr "“%s” 不是有效的提交" #: builtin/bisect--helper.c #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." -msgstr "不能簽出原始 HEAD '%s'。嘗試 'git bisect reset <提交>'。" +msgstr "不能簽出原始 HEAD “%s”。請嘗試 “git bisect reset <commit>”。" #: builtin/bisect--helper.c #, c-format msgid "Bad bisect_write argument: %s" -msgstr "壞的 bisect_write 參數：%s" +msgstr "bisect_write 引數無效：%s" #: builtin/bisect--helper.c #, c-format msgid "couldn't get the oid of the rev '%s'" -msgstr "無法取得版本 '%s' 的物件 ID" +msgstr "無法取得修訂版 “%s” 的物件 ID" #: builtin/bisect--helper.c #, c-format msgid "couldn't open the file '%s'" -msgstr "無法開啟檔案 '%s'" +msgstr "無法開啟檔案 “%s”" #: builtin/bisect--helper.c #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" -msgstr "無效的指令：您目前正處於一個 %s/%s 二分搜尋中" +msgstr "命令無效：您目前正處於二分搜尋 %s/%s 的狀態" #: builtin/bisect--helper.c #, c-format @@ -2852,8 +2866,8 @@ msgid "" "You need to give me at least one %s and %s revision.\n" "You can use \"git bisect %s\" and \"git bisect %s\" for that." msgstr "" -"您需要給我至少一個 %s 和一個 %s 版本。\n" -"為此您可以用 \"git bisect %s\" 和 \"git bisect %s\"。" +"需指定至少一個 %s 和一個 %s 修訂版。\n" +"為此您可以用 “git bisect %s” 和 “git bisect %s”。" #: builtin/bisect--helper.c #, c-format @@ -2862,9 +2876,9 @@ msgid "" "You then need to give me at least one %s and %s revision.\n" "You can use \"git bisect %s\" and \"git bisect %s\" for that." msgstr "" -"您需要執行 \"git bisect start\" 來開始。\n" -"然後需要提供我至少一個 %s 和一個 %s 版本。\n" -"為此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 指令。" +"要開始，請執行 “git bisect start”。\n" +"接著提供至少一個 %s 和一個 %s 修訂版。\n" +"為此您可以用 “git bisect %s” 和 “git bisect %s”。" #: builtin/bisect--helper.c #, c-format @@ -2878,7 +2892,7 @@ msgstr "在只有一個 %s 提交的情況下二分搜尋" #. #: builtin/bisect--helper.c msgid "Are you sure [Y/n]? " -msgstr "您確認嗎[Y/n]？ " +msgstr "是否確定 [Y/n]? " #: builtin/bisect--helper.c msgid "status: waiting for both good and bad commits\n" @@ -2903,7 +2917,9 @@ msgstr "未定義術語" msgid "" "Your current terms are %s for the old state\n" "and %s for the new state.\n" -msgstr "您目前針對舊狀態的術語是 %s，對新狀態的術語是 %s。\n" +msgstr "" +"您目前針對舊狀態的術語是 %s；\n" +"對新狀態的術語是 %s。\n" #: builtin/bisect--helper.c #, c-format @@ -2911,57 +2927,57 @@ msgid "" "invalid argument %s for 'git bisect terms'.\n" "Supported options are: --term-good|--term-old and --term-bad|--term-new." msgstr "" -"指令 'git bisect terms' 的參數 %s 無效。\n" +"傳入 “git bisect terms” 的 %s 引數無效。\n" "支援的選項有：--term-good|--term-old 和 --term-bad|--term-new。" #: builtin/bisect--helper.c msgid "revision walk setup failed\n" -msgstr "版本遍歷設定失敗\n" +msgstr "修訂版遍歷設定失敗\n" #: builtin/bisect--helper.c #, c-format msgid "could not open '%s' for appending" -msgstr "無法開啟 '%s' 進行附加" +msgstr "無法開啟 “%s” 進行附加" #: builtin/bisect--helper.c msgid "'' is not a valid term" -msgstr "'' 不是一個有效的術語" +msgstr "“ ” 不是有效術語" #: builtin/bisect--helper.c #, c-format msgid "unrecognized option: '%s'" -msgstr "未識別的選項：'%s'" +msgstr "無法識別選項：“%s”" #: builtin/bisect--helper.c #, c-format msgid "'%s' does not appear to be a valid revision" -msgstr "'%s' 看起來不是一個有效的版本" +msgstr "“%s” 似乎不是有效修訂版" #: builtin/bisect--helper.c msgid "bad HEAD - I need a HEAD" -msgstr "壞的 HEAD - 我需要一個 HEAD" +msgstr "HEAD 無效 — 需要一個 HEAD" #: builtin/bisect--helper.c #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." -msgstr "簽出 '%s' 失敗。嘗試 'git bisect start <有效分支>'。" +msgstr "簽出 “%s” 失敗。請嘗試 “git bisect start <valid-branch>”。" #: builtin/bisect--helper.c msgid "won't bisect on cg-seek'ed tree" -msgstr "不會在做了 cg-seek 的樹上做二分搜尋" +msgstr "不會在做了 cg-seek 的樹狀物件上進行二分搜尋" #: builtin/bisect--helper.c msgid "bad HEAD - strange symbolic ref" -msgstr "壞的 HEAD - 奇怪的符號引用" +msgstr "HEAD 無效 — 異常符號引用" #: builtin/bisect--helper.c #, c-format msgid "invalid ref: '%s'" -msgstr "無效的引用：'%s'" +msgstr "引用無效：“%s”" #: builtin/bisect--helper.c msgid "You need to start by \"git bisect start\"\n" -msgstr "您需要執行 \"git bisect start\" 來開始\n" +msgstr "要開始，請執行 “git bisect start”\n" # 譯者：請維持句尾空格 #. TRANSLATORS: Make sure to include [Y] and [n] in your @@ -2970,7 +2986,7 @@ msgstr "您需要執行 \"git bisect start\" 來開始\n" #. #: builtin/bisect--helper.c msgid "Do you want me to do it for you [Y/n]? " -msgstr "您想讓我為您這樣做嗎[Y/n]？ " +msgstr "是否要這麼做 [Y/n]? " #: builtin/bisect--helper.c msgid "Please call `--bisect-state` with at least one argument" @@ -2979,17 +2995,17 @@ msgstr "要呼叫 `--bisect-state`，請傳入一個以上的引數" #: builtin/bisect--helper.c #, c-format msgid "'git bisect %s' can take only one argument." -msgstr "'git bisect %s' 只能有一個參數。" +msgstr "“git bisect %s” 只取一個引數。" #: builtin/bisect--helper.c #, c-format msgid "Bad rev input: %s" -msgstr "<修訂版> 輸入格式錯誤：%s" +msgstr "rev 輸入格式錯誤：%s" #: builtin/bisect--helper.c #, c-format msgid "Bad rev input (not a commit): %s" -msgstr "修訂版輸入有誤（不是提交）：%s" +msgstr "rev 輸入有誤（不是提交）：%s" #: builtin/bisect--helper.c msgid "We are not bisecting." @@ -3003,7 +3019,7 @@ msgstr "「%s」？？您在說什麼？" #: builtin/bisect--helper.c #, c-format msgid "cannot read file '%s' for replaying" -msgstr "無法讀取「%s」檔案來重放" +msgstr "無法讀取「%s」檔案進行重放" #: builtin/bisect--helper.c #, c-format @@ -3012,27 +3028,27 @@ msgstr "正在執行 %s\n" #: builtin/bisect--helper.c msgid "bisect run failed: no command provided." -msgstr "二分搜尋執行失敗：沒有提供指令。" +msgstr "二分搜尋執行失敗：沒有提供命令。" #: builtin/bisect--helper.c #, c-format msgid "unable to verify '%s' on good revision" -msgstr "無法在正確修訂版上驗證「%s」" +msgstr "無法在好的修訂版上驗證 “%s”" #: builtin/bisect--helper.c #, c-format msgid "bogus exit code %d for good revision" -msgstr "正確修訂版回傳偽造的錯誤代碼 %d" +msgstr "好的修訂版回傳偽造的錯誤碼 %d" #: builtin/bisect--helper.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--helper.c #, c-format msgid "cannot open file '%s' for writing" -msgstr "無法開啟「%s」檔案進行寫入" +msgstr "無法開啟 “%s” 檔案進行寫入" #: builtin/bisect--helper.c msgid "bisect run cannot continue any more" @@ -3054,63 +3070,15 @@ msgid "" "bisect run failed: 'git bisect--helper --bisect-state %s' exited with error " "code %d" msgstr "" -"二分搜尋執行失敗：'git bisect--helper --bisect-state %s' 以錯誤代碼 %d 離開" - -#: builtin/bisect--helper.c -msgid "reset the bisection state" -msgstr "清除二分搜尋狀態" - -#: builtin/bisect--helper.c -msgid "check whether bad or good terms exist" -msgstr "檢查壞的或好的術語是否存在" - -#: builtin/bisect--helper.c -msgid "print out the bisect terms" -msgstr "列印二分搜尋術語" - -#: builtin/bisect--helper.c -msgid "start the bisect session" -msgstr "啟動二分搜尋過程" - -#: builtin/bisect--helper.c -msgid "find the next bisection commit" -msgstr "尋找下一個二分搜尋提交" - -#: builtin/bisect--helper.c -msgid "mark the state of ref (or refs)" -msgstr "標記 ref (或 refs) 的狀態" - -#: builtin/bisect--helper.c -msgid "list the bisection steps so far" -msgstr "列出迄今的二分搜尋步驟" - -#: builtin/bisect--helper.c -msgid "replay the bisection process from the given file" -msgstr "從指定檔案重放二分搜尋過程" - -#: builtin/bisect--helper.c -msgid "skip some commits for checkout" -msgstr "略過要簽出的部分提交" - -#: builtin/bisect--helper.c -msgid "visualize the bisection" -msgstr "視覺化二分搜尋過程" - -#: builtin/bisect--helper.c -msgid "use <cmd>... to automatically bisect" -msgstr "使用 <cmd>... 自動進行二分搜尋" - -#: builtin/bisect--helper.c -msgid "no log for BISECT_WRITE" -msgstr "BISECT_WRITE 無日誌" +"二分搜尋執行失敗：“git bisect--helper --bisect-state %s” 以錯誤碼 %d 離開" #: builtin/bisect--helper.c msgid "--bisect-reset requires either no argument or a commit" -msgstr "--bisect-reset 無需參數或者需要一個提交" +msgstr "--bisect-reset 可以不需要引數，或者得傳入一個提交" #: builtin/bisect--helper.c msgid "--bisect-terms requires 0 or 1 argument" -msgstr "--bisect-terms 需要 0 或 1 個參數" +msgstr "--bisect-terms 需要 0 或 1 個引數" #: builtin/bisect--helper.c msgid "--bisect-next requires 0 arguments" @@ -3129,6 +3097,10 @@ msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<選項>] [<版本選項>] [<版本>] [--] <檔案>" #: builtin/blame.c +msgid "git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>" +msgstr "git annotate [<選項>] [<版本選項>] [<版本>] [--] <檔案>" + +#: builtin/blame.c msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<版本選項> 的檔案記錄在 git-rev-list(1) 中" @@ -3367,10 +3339,6 @@ msgid "cannot use -a with -d" msgstr "不能將 -a 和 -d 同時使用" #: builtin/branch.c -msgid "Couldn't look up commit object for HEAD" -msgstr "無法查詢 HEAD 指向的提交物件" - -#: builtin/branch.c #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "無法刪除在「%2$s」簽出的「%1$s」分支" @@ -3419,17 +3387,19 @@ msgid "Branch %s is being bisected at %s" msgstr "分支 %s 正被二分搜尋於 %s" #: builtin/branch.c -msgid "cannot copy the current branch while not on any." -msgstr "無法複製目前分支因為不處於任何分支上。" +#, c-format +msgid "Invalid branch name: '%s'" +msgstr "無效的分支名：'%s'" #: builtin/branch.c -msgid "cannot rename the current branch while not on any." -msgstr "無法重新命名目前分支因為不處於任何分支上。" +#, c-format +msgid "No commit on branch '%s' yet." +msgstr "分支 '%s' 尚無提交。" #: builtin/branch.c #, c-format -msgid "Invalid branch name: '%s'" -msgstr "無效的分支名：'%s'" +msgid "No branch named '%s'." +msgstr "沒有分支 '%s'。" #: builtin/branch.c msgid "Branch rename failed" @@ -3638,14 +3608,12 @@ msgid "cannot edit description of more than one branch" msgstr "不能為一個以上的分支編輯描述" #: builtin/branch.c -#, c-format -msgid "No commit on branch '%s' yet." -msgstr "分支 '%s' 尚無提交。" +msgid "cannot copy the current branch while not on any." +msgstr "無法複製目前分支因為不處於任何分支上。" #: builtin/branch.c -#, c-format -msgid "No branch named '%s'." -msgstr "沒有分支 '%s'。" +msgid "cannot rename the current branch while not on any." +msgstr "無法重新命名目前分支因為不處於任何分支上。" #: builtin/branch.c msgid "too many branches for a copy operation" @@ -3726,11 +3694,11 @@ msgstr "不是從 git 版本庫執行 - 沒有可顯示的掛鉤\n" #: builtin/bugreport.c msgid "" -"git bugreport [-o|--output-directory <file>] [-s|--suffix <format>] [--" -"diagnose[=<mode>]" +"git bugreport [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n" +" [--diagnose[=<mode>]]" msgstr "" -"git bugreport [-o|--output-directory <file>] [-s|--suffix <format>] [--" -"diagnose[=<mode>]" +"git bugreport [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n" +" [--diagnose[=<mode>]]" #: builtin/bugreport.c msgid "" @@ -3778,7 +3746,7 @@ msgstr "建立詳細診斷資訊的額外 zip 封存檔案（預設值是 “sta #: builtin/bugreport.c msgid "specify a destination for the bugreport file(s)" -msgstr "指定錯誤報告檔案的目的地" +msgstr "請指定臭蟲報告檔案的目的地" #: builtin/bugreport.c msgid "specify a strftime format suffix for the filename(s)" @@ -3813,20 +3781,26 @@ msgid "Created new report at '%s'.\n" msgstr "已在「%s」建立新報告。\n" #: builtin/bundle.c -msgid "git bundle create [<options>] <file> <git-rev-list args>" -msgstr "git bundle create [<選項>] <檔案> <git-rev-list 參數>" +msgid "" +"git bundle create [-q | --quiet | --progress | --all-progress] [--all-" +"progress-implied]\n" +" [--version=<version>] <file> <git-rev-list-args>" +msgstr "" +"git bundle create [-q | --quiet | --progress | --all-progress] [--all-" +"progress-implied]\n" +" [--version=<version>] <file> <git-rev-list-args>" #: builtin/bundle.c -msgid "git bundle verify [<options>] <file>" -msgstr "git bundle verify [<選項>] <檔案>" +msgid "git bundle verify [-q | --quiet] <file>" +msgstr "git bundle verify [-q | --quiet] <file>" #: builtin/bundle.c msgid "git bundle list-heads <file> [<refname>...]" msgstr "git bundle list-heads <檔案> [<引用名稱>...]" #: builtin/bundle.c -msgid "git bundle unbundle <file> [<refname>...]" -msgstr "git bundle unbundle <檔案> [<引用名稱>...]" +msgid "git bundle unbundle [--progress] <file> [<refname>...]" +msgstr "git bundle unbundle [--progress] <file> [<refname>...]" #: builtin/bundle.c builtin/pack-objects.c msgid "do not show progress meter" @@ -3846,15 +3820,15 @@ msgstr "當進度表顯示時類似於 --all-progress" #: builtin/bundle.c msgid "specify bundle format version" -msgstr "指定套件的格式版本" +msgstr "指定套件包的格式版本" #: builtin/bundle.c msgid "Need a repository to create a bundle." -msgstr "需要版本庫來建立套件。" +msgstr "需要版本庫來建立套件包。" #: builtin/bundle.c msgid "do not show bundle details" -msgstr "不顯示套件詳細資訊" +msgstr "不顯示套件包的詳細資訊" #: builtin/bundle.c #, c-format @@ -3863,7 +3837,7 @@ msgstr "%s 可以\n" #: builtin/bundle.c msgid "Need a repository to unbundle." -msgstr "需要版本庫才能拆分套件。" +msgstr "需要版本庫才能拆分套件包。" #: builtin/bundle.c msgid "Unbundling objects" @@ -3923,12 +3897,12 @@ msgid "" "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" "objects]\n" " [--buffer] [--follow-symlinks] [--unordered]\n" -" [--textconv | --filters]" +" [--textconv | --filters] [-z]" msgstr "" "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" "objects]\n" " [--buffer] [--follow-symlinks] [--unordered]\n" -" [--textconv | --filters]" +" [--textconv | --filters] [-z]" #: builtin/cat-file.c msgid "" @@ -3984,7 +3958,7 @@ msgstr "類似 --batch 但不輸出 <contents>" #: builtin/cat-file.c msgid "stdin is NUL-terminated" -msgstr "標準輸入的結尾是 NUL" +msgstr "標準輸入以 NUL 字元終止" #: builtin/cat-file.c msgid "read commands from stdin" @@ -4065,11 +4039,6 @@ msgstr "<rev> 需要搭配「%s」" msgid "<object> required with '-%c'" msgstr "<object> 需要搭配「-%c」" -#: builtin/cat-file.c builtin/notes.c builtin/prune-packed.c -#: builtin/receive-pack.c builtin/tag.c -msgid "too many arguments" -msgstr "太多參數" - #: builtin/cat-file.c #, c-format msgid "only two arguments allowed in <type> <object> mode, not %d" @@ -4714,9 +4683,10 @@ msgstr "使用疊加模式" #: builtin/clean.c msgid "" -"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." +"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] " +"[<pathspec>...]" msgstr "" -"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路徑>..." +"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] [<路徑規格>...]" #: builtin/clean.c #, c-format @@ -5059,7 +5029,7 @@ msgstr "uri" #: builtin/clone.c msgid "a URI for downloading bundles before fetching from origin remote" -msgstr "在從 origin 遠端抓取前，用來下載套件的 URI" +msgstr "在從 origin 遠端抓取前，用來下載套件包的 URI" #: builtin/clone.c #, c-format @@ -5081,6 +5051,11 @@ msgstr "%s 存在且不是一個目錄" msgid "failed to start iterator over '%s'" msgstr "無法在 '%s' 上啟動疊代器" +#: builtin/clone.c +#, c-format +msgid "symlink '%s' exists, refusing to clone with --local" +msgstr "「%s」符號連結已存在，拒絕使用 --local 複製" + #: builtin/clone.c compat/precompose_utf8.c #, c-format msgid "failed to unlink '%s'" @@ -5136,7 +5111,7 @@ msgstr "無法初始化稀疏簽出" #: builtin/clone.c msgid "remote HEAD refers to nonexistent ref, unable to checkout" -msgstr "遠端 HEAD 指向不存在的引用，無法簽出" +msgstr "遠端 HEAD 指向一個不存在的引用，無法簽出" #: builtin/clone.c msgid "unable to checkout working tree" @@ -5163,11 +5138,6 @@ msgid "You must specify a repository to clone." msgstr "您必須指定要複製的版本庫。" #: builtin/clone.c -#, c-format -msgid "options '%s' and '%s %s' cannot be used together" -msgstr "「%s」和「%s %s」選項不得同時使用" - -#: builtin/clone.c msgid "" "--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-" "exclude" @@ -5259,16 +5229,16 @@ msgstr "--local 被忽略" #: builtin/clone.c msgid "cannot clone from filtered bundle" -msgstr "無法從過濾後的套件複製" +msgstr "無法從過濾後的套件包複製" #: builtin/clone.c msgid "failed to initialize the repo, skipping bundle URI" -msgstr "無法初始化版本庫，略過套件 URI" +msgstr "無法初始化版本庫，略過套件包 URI" #: builtin/clone.c #, c-format msgid "failed to fetch objects from bundle URI '%s'" -msgstr "無法從套件 URL “%s” 抓取物件" +msgstr "無法從套件包 URL “%s” 抓取物件" #: builtin/clone.c msgid "remote transport reported error" @@ -5317,22 +5287,27 @@ msgstr "--command 必須是第一個參數" #: builtin/commit-graph.c msgid "" -"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" +"git commit-graph verify [--object-dir <dir>] [--shallow] [--[no-]progress]" msgstr "" -"git commit-graph verify [--object-dir <物件目錄>] [--shallow] [--" -"[no-]progress]" +"git commit-graph verify [--object-dir <目錄>] [--shallow] [--[no-]progress]" #: builtin/commit-graph.c msgid "" -"git commit-graph write [--object-dir <objdir>] [--append] [--" -"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" -"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>" -msgstr "" -"git commit-graph write [--object-dir <objdir>] [--append] [--" -"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" -"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>" - -#: builtin/commit-graph.c builtin/fetch.c builtin/log.c +"git commit-graph write [--object-dir <dir>] [--append]\n" +" [--split[=<strategy>]] [--reachable | --stdin-packs | " +"--stdin-commits]\n" +" [--changed-paths] [--[no-]max-new-filters <n>] [--" +"[no-]progress]\n" +" <split options>" +msgstr "" +"git commit-graph write [--object-dir <dir>] [--append]\n" +" [--split[=<strategy>]] [--reachable | --stdin-packs | " +"--stdin-commits]\n" +" [--changed-paths] [--[no-]max-new-filters <n>] [--" +"[no-]progress]\n" +" <split options>" + +#: builtin/commit-graph.c builtin/fetch.c builtin/log.c builtin/repack.c msgid "dir" msgstr "目錄" @@ -5418,12 +5393,16 @@ msgid "Collecting commits from input" msgstr "正在從輸入收集提交" #: builtin/commit-tree.c +msgid "git commit-tree <tree> [(-p <parent>)...]" +msgstr "git commit-tree <tree> [(-p <parent>)...]" + +#: builtin/commit-tree.c msgid "" -"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " -"<file>)...] <tree>" +"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...]\n" +" [(-F <file>)...] <tree>" msgstr "" -"git commit-tree [(-p <父提交>)...] [-S[<keyid>]] [(-m <消息>)...] [(-F <檔案" -">)...] <樹>" +"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...]\n" +" [(-F <file>)...] <tree>" #: builtin/commit-tree.c #, c-format @@ -5480,12 +5459,30 @@ msgid "git commit-tree: failed to read" msgstr "git commit-tree：讀取失敗" #: builtin/commit.c -msgid "git commit [<options>] [--] <pathspec>..." -msgstr "git commit [<選項>] [--] <路徑規格>..." +msgid "" +"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" +" [--allow-empty-message] [--no-verify] [-e] [--author=<author>]\n" +" [--date=<date>] [--cleanup=<mode>] [--[no-]status]\n" +" [-i | -o] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" +" [(--trailer <token>[(=|:)<value>])...] [-S[<keyid>]]\n" +" [--] [<pathspec>...]" +msgstr "" +"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" +" [--allow-empty-message] [--no-verify] [-e] [--author=<author>]\n" +" [--date=<date>] [--cleanup=<mode>] [--[no-]status]\n" +" [-i | -o] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" +" [(--trailer <token>[(=|:)<value>])...] [-S[<keyid>]]\n" +" [--] [<pathspec>...]" #: builtin/commit.c -msgid "git status [<options>] [--] <pathspec>..." -msgstr "git status [<選項>] [--] <路徑規格>..." +msgid "git status [<options>] [--] [<pathspec>...]" +msgstr "git status [<選項>] [--] [<路徑規格>...]" #: builtin/commit.c msgid "" @@ -5827,7 +5824,7 @@ msgstr "顯示分支訊息" #: builtin/commit.c msgid "show stash information" -msgstr "顯示儲藏區訊息" +msgstr "顯示貯存區訊息" #: builtin/commit.c msgid "compute full ahead/behind values" @@ -6100,7 +6097,7 @@ msgstr "使用版本庫級設定檔案" msgid "use per-worktree config file" msgstr "使用工作區級別的設定檔案" -#: builtin/config.c +#: builtin/config.c builtin/gc.c msgid "use given config file" msgstr "使用指定的設定檔案" @@ -6226,11 +6223,11 @@ msgstr "只顯示變數名" #: builtin/config.c msgid "respect include directives on lookup" -msgstr "查詢時參照 include 指令遞迴尋找" +msgstr "查詢時引用 include 指令遞迴尋找" #: builtin/config.c msgid "show origin of config (file, standard input, blob, command line)" -msgstr "顯示設定的來源（檔案、標準輸入、資料物件，或指令列）" +msgstr "顯示設定的來源（檔案、標準輸入、資料物件，或命令列）" #: builtin/config.c msgid "show scope of config (worktree, local, global, system, command)" @@ -6323,7 +6320,7 @@ msgstr "--blob 只能在一個版本庫內使用" msgid "--worktree can only be used inside a git repository" msgstr "--worktree 只能在 git 版本庫中使用" -#: builtin/config.c +#: builtin/config.c builtin/gc.c msgid "$HOME not set" msgstr "$HOME 未設定" @@ -6433,12 +6430,20 @@ msgid "unable to get credential storage lock in %d ms" msgstr "無法在 %d 毫秒內取得憑證儲存空間的鎖" #: builtin/describe.c -msgid "git describe [<options>] [<commit-ish>...]" -msgstr "git describe [<選項>] [<提交號>...]" +msgid "" +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] [<commit-ish>...]" +msgstr "" +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] [<commit-ish>...]" + +#: builtin/describe.c +msgid "" +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<mark>]" +msgstr "" +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<mark>]" #: builtin/describe.c -msgid "git describe [<options>] --dirty" -msgstr "git describe [<選項>] --dirty" +msgid "git describe <blob>" +msgstr "git describe <blob>" #: builtin/describe.c msgid "head" @@ -6591,15 +6596,15 @@ msgstr "「%s」選項和提交號不得同時使用" #: builtin/diagnose.c msgid "" -"git diagnose [-o|--output-directory <path>] [-s|--suffix <format>] [--" -"mode=<mode>]" +"git diagnose [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n" +" [--mode=<mode>]" msgstr "" -"git diagnose [-o|--output-directory <path>] [-s|--suffix <format>] [--" -"mode=<mode>]" +"git diagnose [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n" +" [--mode=<mode>]" #: builtin/diagnose.c msgid "specify a destination for the diagnostics archive" -msgstr "指定診斷封存檔的目的地" +msgstr "請指定診斷封存檔的目的地" #: builtin/diagnose.c msgid "specify a strftime format suffix for the filename" @@ -6619,6 +6624,10 @@ msgid "'%s': not a regular file or symlink" msgstr "'%s'：不是一個正規檔案或符號連結" #: builtin/diff.c +msgid "no merge given, only parents." +msgstr "沒有提供合併提交，只有提供父提交。" + +#: builtin/diff.c #, c-format msgid "invalid option: %s" msgstr "無效選項：%s" @@ -6781,8 +6790,8 @@ msgstr "選項「--default」預期收到「--type=bool」的布林值，而非 #: builtin/env--helper.c #, c-format msgid "" -"option `--default' expects an unsigned long value with `--type=ulong`, not `" -"%s`" +"option `--default' expects an unsigned long value with `--type=ulong`, not " +"`%s`" msgstr "選項「--default」預期收到「--type=ulong」的無號 long 數值，而非「%s」" #: builtin/fast-export.c @@ -7410,8 +7419,8 @@ msgid "print only refs which don't contain the commit" msgstr "只列印不包含該提交的引用" #: builtin/for-each-repo.c -msgid "git for-each-repo --config=<config> <command-args>" -msgstr "git for-each-repo --config=<設定> <命令引數>" +msgid "git for-each-repo --config=<config> [--] <arguments>" +msgstr "git for-each-repo --config=<config> [--] <arguments>" #: builtin/for-each-repo.c msgid "config" @@ -7628,8 +7637,16 @@ msgid "%s: invalid sha1 pointer in resolve-undo" msgstr "%s：resolve-undo 的 sha1 指針無效" #: builtin/fsck.c -msgid "git fsck [<options>] [<object>...]" -msgstr "git fsck [<選項>] [<物件>...]" +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>...]" +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] [<object>...]" #: builtin/fsck.c msgid "show unreachable objects" @@ -7702,14 +7719,6 @@ msgid "git fsmonitor--daemon run [<options>]" msgstr "git fsmonitor--daemon run [<options>]" #: builtin/fsmonitor--daemon.c -msgid "git fsmonitor--daemon stop" -msgstr "git fsmonitor--daemon stop" - -#: builtin/fsmonitor--daemon.c -msgid "git fsmonitor--daemon status" -msgstr "git fsmonitor--daemon status" - -#: builtin/fsmonitor--daemon.c #, c-format msgid "value of '%s' out of range: %d" msgstr "「%s」的數值超出範圍：%d" @@ -7809,7 +7818,7 @@ msgstr "要等待背景守護程式啟動的最長秒數" msgid "invalid 'ipc-threads' value (%d)" msgstr "無效的「ipc-threads」數值（%d）" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c t/helper/test-cache-tree.c #, c-format msgid "Unhandled subcommand '%s'" msgstr "未處理的子命令「%s」" @@ -7857,7 +7866,7 @@ msgstr "清除未引用的物件" #: builtin/gc.c msgid "pack unreferenced objects separately" -msgstr "獨立封裝無參照物件" +msgstr "獨立封裝無引用物件" #: builtin/gc.c msgid "be more thorough (increased runtime)" @@ -8008,8 +8017,23 @@ msgid "use at most one of --auto and --schedule=<frequency>" msgstr "--auto 和 --schedule=<頻率> 請任選一" #: builtin/gc.c -msgid "failed to run 'git config'" -msgstr "無法執行 ‘git config’" +#, c-format +msgid "unable to add '%s' value of '%s'" +msgstr "無法為「%2$s」的值加上「%1$s」" + +#: builtin/gc.c +msgid "return success even if repository was not registered" +msgstr "即便版本庫未註冊仍回傳成功狀態" + +#: builtin/gc.c +#, c-format +msgid "unable to unset '%s' value of '%s'" +msgstr "無法取消設定「%2$s」的「%1$s」值" + +#: builtin/gc.c +#, c-format +msgid "repository '%s' is not registered" +msgstr "版本庫「%s」未註冊" #: builtin/gc.c #, c-format @@ -8386,11 +8410,15 @@ msgstr "同時給出了 --cached 和樹狀物件" #: builtin/hash-object.c msgid "" -"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " -"[--] <file>..." +"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters]\n" +" [--stdin [--literally]] [--] <file>..." msgstr "" -"git hash-object [-t <類型>] [-w] [--path=<檔案> | --no-filters] [--stdin] " -"[--] <檔案>..." +"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters]\n" +" [--stdin [--literally]] [--] <file>..." + +#: builtin/hash-object.c +msgid "git hash-object [-t <type>] [-w] --stdin-paths [--no-filters]" +msgstr "git hash-object [-t <type>] [-w] --stdin-paths [--no-filters]" #: builtin/hash-object.c msgid "object type" @@ -8918,11 +8946,15 @@ msgstr "已初始化空的 Git 版本庫於 %s%s\n" #: builtin/init-db.c msgid "" -"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" -"shared[=<permissions>]] [<directory>]" +"git init [-q | --quiet] [--bare] [--template=<template-directory>]\n" +" [--separate-git-dir <git-dir>] [--object-format=<format>]\n" +" [-b <branch-name> | --initial-branch=<branch-name>]\n" +" [--shared[=<permissions>]] [<directory>]" msgstr "" -"git init [-q | --quiet] [--bare] [--template=<範本目錄>] [--shared[=<權限>]] " -"[<目錄>]" +"git init [-q | --quiet] [--bare] [--template=<template-directory>]\n" +" [--separate-git-dir <git-dir>] [--object-format=<format>]\n" +" [-b <branch-name> | --initial-branch=<branch-name>]\n" +" [--shared[=<permissions>]] [<directory>]" #: builtin/init-db.c msgid "permissions" @@ -8972,11 +9004,13 @@ msgstr "--separate-git-dir 與純版本庫不相容" #: builtin/interpret-trailers.c msgid "" -"git interpret-trailers [--in-place] [--trim-empty] [(--trailer " -"<token>[(=|:)<value>])...] [<file>...]" +"git interpret-trailers [--in-place] [--trim-empty]\n" +" [(--trailer <token>[(=|:)<value>])...]\n" +" [--parse] [<file>...]" msgstr "" -"git interpret-trailers [--in-place] [--trim-empty] [(--trailer <鍵>[(=|:)<值" -">])...] [<檔案>...]" +"git interpret-trailers [--in-place] [--trim-empty]\n" +" [(--trailer <token>[(=|:)<value>])...]\n" +" [--parse] [<file>...]" #: builtin/interpret-trailers.c msgid "edit files in place" @@ -9594,12 +9628,12 @@ msgstr "" #: builtin/ls-remote.c msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" -" [-q | --quiet] [--exit-code] [--get-url]\n" +" [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n" " [--symref] [<repository> [<refs>...]]" msgstr "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" -" [-q | --quiet] [--exit-code] [--get-url]\n" -" [--symref] [<版本庫> [<引用>...]]" +" [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n" +" [--symref] [<repository> [<refs>...]]" #: builtin/ls-remote.c msgid "do not print remote URL" @@ -9752,7 +9786,7 @@ msgstr "在訊息內文中使用標頭" #: builtin/mailsplit.c msgid "reading patches from stdin/tty..." -msgstr "正在從標準輸入或 tty 讀取修補檔內容⋯⋯" +msgstr "正在從標準輸入或 tty 讀取修補檔內容……" #: builtin/mailsplit.c #, c-format @@ -9768,14 +9802,14 @@ msgid "git merge-base [-a | --all] --octopus <commit>..." msgstr "git merge-base [-a | --all] --octopus <提交>..." #: builtin/merge-base.c -msgid "git merge-base --independent <commit>..." -msgstr "git merge-base --independent <提交>..." - -#: builtin/merge-base.c msgid "git merge-base --is-ancestor <commit> <commit>" msgstr "git merge-base --is-ancestor <提交> <提交>" #: builtin/merge-base.c +msgid "git merge-base --independent <commit>..." +msgstr "git merge-base --independent <提交>..." + +#: builtin/merge-base.c msgid "git merge-base --fork-point <ref> [<commit>]" msgstr "git merge-base --fork-point <引用> [<提交>]" @@ -9914,9 +9948,23 @@ msgid "allow merging unrelated histories" msgstr "允許合並不相關的歷史" #: builtin/merge-tree.c +msgid "perform multiple merges, one per line of input" +msgstr "執行多次合併，一次執行輸入一列" + +#: builtin/merge-tree.c msgid "--trivial-merge is incompatible with all other options" msgstr "--trivial-merge 和其他所有選項都不相容" +#: builtin/merge-tree.c builtin/notes.c +#, c-format +msgid "malformed input line: '%s'." +msgstr "格式錯誤的輸入行：'%s'。" + +#: builtin/merge-tree.c +#, c-format +msgid "merging cannot continue; got unclean result of %d" +msgstr "無法繼續合併：從 %d 收到的結果不乾淨" + #: builtin/merge.c msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<選項>] [<提交>...]" @@ -10029,11 +10077,11 @@ msgstr "繞過 pre-merge-commit 和 commit-msg 掛鉤" #: builtin/merge.c msgid "could not run stash." -msgstr "不能執行儲藏。" +msgstr "不能執行貯存。" #: builtin/merge.c msgid "stash failed" -msgstr "儲藏失敗" +msgstr "貯存失敗" #: builtin/merge.c #, c-format @@ -10286,7 +10334,7 @@ msgstr "自動合併進展順利，按要求在提交前停止\n" #: builtin/merge.c #, c-format msgid "When finished, apply stashed changes with `git stash pop`\n" -msgstr "完成時，使用 `git stash pop` 套用儲藏更改\n" +msgstr "完成時，使用 `git stash pop` 套用貯存更改\n" #: builtin/mktag.c #, c-format @@ -10406,7 +10454,7 @@ msgstr "目錄 %s 在索引中並且不是子模組？" #: builtin/mv.c msgid "Please stage your changes to .gitmodules or stash them to proceed" -msgstr "請將您的修改暫存到 .gitmodules 中或儲藏後再繼續" +msgstr "請將您的修改暫存到 .gitmodules 中或貯存後再繼續" #: builtin/mv.c #, c-format @@ -10490,7 +10538,7 @@ msgstr "%s，來源=%s，目的地=%s" msgid "Renaming %s to %s\n" msgstr "重新命名 %s 至 %s\n" -#: builtin/mv.c builtin/remote.c builtin/repack.c +#: builtin/mv.c builtin/remote.c #, c-format msgid "renaming '%s' failed" msgstr "重新命名 '%s' 失敗" @@ -10693,11 +10741,6 @@ msgstr "不能從非資料物件 '%s' 中讀取註解資料。" #: builtin/notes.c #, c-format -msgid "malformed input line: '%s'." -msgstr "格式錯誤的輸入行：'%s'。" - -#: builtin/notes.c -#, c-format msgid "failed to copy notes from '%s' to '%s'" msgstr "從 '%s' 複製註解到 '%s' 時失敗" @@ -10928,14 +10971,13 @@ msgid "unknown subcommand: `%s'" msgstr "未知子指令：「%s」" #: builtin/pack-objects.c -msgid "" -"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" -msgstr "git pack-objects --stdout [<選項>...] [< <引用列表> | < <物件列表>]" +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 [<options>] <base-name> [< <ref-list> | < <object-list>]" +msgstr "git pack-objects [<選項>] <前綴名稱> [< <引用列表> | < <物件列表>]" #: builtin/pack-objects.c #, c-format @@ -11406,8 +11448,8 @@ msgstr "" "感謝。\n" #: builtin/pack-refs.c -msgid "git pack-refs [<options>]" -msgstr "git pack-refs [<選項>]" +msgid "git pack-refs [--all] [--no-prune]" +msgstr "git pack-refs [--all] [--no-prune]" #: builtin/pack-refs.c msgid "pack everything" @@ -11417,6 +11459,22 @@ msgstr "打包一切" msgid "prune loose refs (default)" msgstr "剪除鬆散引用（預設）" +#: builtin/patch-id.c +msgid "git patch-id [--stable | --unstable | --verbatim]" +msgstr "git patch-id [--stable | --unstable | --verbatim]" + +#: builtin/patch-id.c +msgid "use the unstable patch-id algorithm" +msgstr "使用不穩定的 patch-id 演算法" + +#: builtin/patch-id.c +msgid "use the stable patch-id algorithm" +msgstr "使用穩定的 patch-id 演算法" + +#: builtin/patch-id.c +msgid "don't strip whitespace from the patch" +msgstr "不要去除修補檔的空白字元" + #: builtin/prune.c msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--progress] [--expire <時間>] [--] [<head>...]" @@ -11463,7 +11521,7 @@ msgstr "控制 pre-merge-commit 和 commit-msg 掛鉤的使用" #: builtin/pull.c parse-options.h msgid "automatically stash/stash pop before and after" -msgstr "在動作前後執行自動儲藏和彈出儲藏" +msgstr "在動作前後執行自動貯存和彈出貯存" #: builtin/pull.c msgid "Options related to fetching" @@ -11502,7 +11560,7 @@ msgid "" "for your current branch, you must specify a branch on the command line." msgstr "" "您要求從遠端 '%s' 拉取，但是未指定一個分支。因為這不是目前\n" -"分支預設的遠端版本庫，您必須在指令列中指定一個分支名。" +"分支預設的遠端版本庫，您必須在命令列中指定一個分支名。" #: builtin/pull.c builtin/rebase.c msgid "You are not currently on a branch." @@ -11594,7 +11652,7 @@ msgstr "重定基底式拉取" #: builtin/pull.c msgid "please commit or stash them." -msgstr "請提交或儲藏它們。" +msgstr "請提交或貯存它們。" #: builtin/pull.c #, c-format @@ -11666,14 +11724,14 @@ msgstr "" #: builtin/push.c msgid "" "\n" -"To avoid automatically configuring upstream branches when their name\n" -"doesn't match the local branch, see option 'simple' of branch." -"autoSetupMerge\n" +"To avoid automatically configuring an upstream branch when its name\n" +"won't match the local branch, see option 'simple' of branch.autoSetupMerge\n" "in 'git help config'.\n" msgstr "" "\n" -"為了避免自動在上游分支的名稱與本機不符時，設定上游的分支，請參閱\n" -"“git help config” 中 branch.autoSetupMerge 的 “simple” 選項。\n" +"若要避免在名稱與本機分支不同時自動設定上游分支，\n" +"請參閱 “git help config” 中 branch.autoSetupMerge 的\n" +"“simple” 選項。\n" #: builtin/push.c #, c-format @@ -11827,6 +11885,12 @@ msgstr "推送到 %s\n" msgid "failed to push some refs to '%s'" msgstr "推送一些引用到 '%s' 失敗" +#: builtin/push.c +msgid "" +"recursing into submodule with push.recurseSubmodules=only; using on-demand " +"instead" +msgstr "在有 push.recurseSubmodules=only; 的情況嘗試遞迴子模組；改用 on-demand" + #: builtin/push.c builtin/send-pack.c submodule-config.c #, c-format msgid "invalid value for '%s'" @@ -11999,13 +12063,15 @@ msgstr "需要兩個提交範圍" #: builtin/read-tree.c msgid "" -"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " -"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-" -"ish1> [<tree-ish2> [<tree-ish3>]])" +"git read-tree [(-m [--trivial] [--aggressive] | --reset | --" +"prefix=<prefix>)\n" +" [-u | -i]] [--index-output=<file>] [--no-sparse-checkout]\n" +" (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" msgstr "" -"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前綴>) [-" -"u | -i]] [--no-sparse-checkout] [--index-output=<檔案>] (--empty | <樹狀物件" -"1> [<樹狀物件2> [<樹狀物件3>]])" +"git read-tree [(-m [--trivial] [--aggressive] | --reset | --" +"prefix=<prefix>)\n" +" [-u | -i]] [--index-output=<file>] [--no-sparse-checkout]\n" +" (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" #: builtin/read-tree.c msgid "write resulting index to <file>" @@ -12122,8 +12188,8 @@ msgstr "%s 需要合併後端" #: builtin/rebase.c #, c-format -msgid "could not get 'onto': '%s'" -msgstr "無法取得 'onto'：'%s'" +msgid "invalid onto: '%s'" +msgstr "無效的 onto：「%s」" #: builtin/rebase.c #, c-format @@ -12179,8 +12245,8 @@ msgstr "無法切換到 %s" #: builtin/rebase.c #, c-format msgid "" -"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" -"\"." +"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and " +"\"ask\"." msgstr "無法識別的 '%s' 空類型；有效的數值有 \"drop\"、\"keep\" 跟 \"ask\"。" #: builtin/rebase.c @@ -12488,8 +12554,8 @@ msgid "No such ref: %s" msgstr "沒有這樣的引用：%s" #: builtin/rebase.c -msgid "Could not resolve HEAD to a revision" -msgstr "無法將 HEAD 解析為一個版本" +msgid "Could not resolve HEAD to a commit" +msgstr "無法將 HEAD 解析成提交" #: builtin/rebase.c #, c-format @@ -12508,7 +12574,7 @@ msgstr "沒有指向一個有效的提交 '%s'" #: builtin/rebase.c msgid "Please commit or stash them." -msgstr "請提交或儲藏修改。" +msgstr "請提交或貯存修改。" #: builtin/rebase.c msgid "HEAD is up to date." @@ -13288,6 +13354,11 @@ msgid "could not close refs snapshot tempfile" msgstr "無法關閉 refs 的快照暫存檔" #: builtin/repack.c +#, c-format +msgid "could not remove stale bitmap: %s" +msgstr "無法移除過時位圖：%s" + +#: builtin/repack.c msgid "pack everything in a single pack" msgstr "所有內容打包到一個包檔案中" @@ -13384,6 +13455,10 @@ msgid "write a multi-pack index of the resulting packs" msgstr "寫入結果包的多包索引" #: builtin/repack.c +msgid "pack prefix to store a pack containing pruned objects" +msgstr "封裝前綴，儲存為包含過時物件的套件包" + +#: builtin/repack.c msgid "cannot delete packs in a precious-objects repo" msgstr "不能刪除珍品版本庫中的封包" @@ -13398,11 +13473,16 @@ msgstr "封包前綴 %s 不以 objdir %s 開頭" #: builtin/repack.c #, c-format -msgid "missing required file: %s" -msgstr "缺少必要檔案：%s" +msgid "renaming pack to '%s' failed" +msgstr "無法將包重新命名為「%s」" #: builtin/repack.c #, c-format +msgid "pack-objects did not write a '%s' file for pack %s-%s" +msgstr "pack-objects 沒有為 %2$s-%3$s 套件包寫入 “%1$s” 檔案" + +#: builtin/repack.c sequencer.c +#, c-format msgid "could not unlink: %s" msgstr "無法取消連結：%s" @@ -13643,8 +13723,10 @@ msgid "only one pattern can be given with -l" msgstr "只能為 -l 提供一個模式" #: builtin/rerere.c -msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" -msgstr "git rerere [clear | forget <路徑>... | status | remaining | diff | gc]" +msgid "" +"git rerere [clear | forget <pathspec>... | diff | status | remaining | gc]" +msgstr "" +"git rerere [clear | forget <pathspec>... | diff | status | remaining | gc]" #: builtin/rerere.c msgid "register clean resolutions in index" @@ -13902,6 +13984,18 @@ msgstr "--prefix 需要 1 個引數" msgid "unknown mode for --abbrev-ref: %s" msgstr "--abbrev-ref 的模式未知：%s" +#: builtin/rev-parse.c revision.c +msgid "--exclude-hidden cannot be used together with --branches" +msgstr "--exclude-hidden 無法與 --branches 同時使用" + +#: builtin/rev-parse.c revision.c +msgid "--exclude-hidden cannot be used together with --tags" +msgstr "--exclude-hidden 無法與 --tags 同時使用" + +#: builtin/rev-parse.c revision.c +msgid "--exclude-hidden cannot be used together with --remotes" +msgstr "--exclude-hidden 無法與 --remotes 同時使用" + #: builtin/rev-parse.c setup.c msgid "this operation must be run in a work tree" msgstr "該動作必須在一個工作區中執行" @@ -13912,20 +14006,28 @@ msgid "unknown mode for --show-object-format: %s" msgstr "--show-object-format 的模式未知：%s" #: builtin/revert.c -msgid "git revert [<options>] <commit-ish>..." -msgstr "git revert [<選項>] <提交號>..." +msgid "" +"git revert [--[no-]edit] [-n] [-m <parent-number>] [-s] [-S[<keyid>]] " +"<commit>..." +msgstr "" +"git revert [--[no-]edit] [-n] [-m <parent-number>] [-s] [-S[<keyid>]] " +"<commit>..." #: builtin/revert.c -msgid "git revert <subcommand>" -msgstr "git revert <子指令>" +msgid "git revert (--continue | --skip | --abort | --quit)" +msgstr "git revert (--continue | --skip | --abort | --quit)" #: builtin/revert.c -msgid "git cherry-pick [<options>] <commit-ish>..." -msgstr "git cherry-pick [<選項>] <提交號>..." +msgid "" +"git cherry-pick [--edit] [-n] [-m <parent-number>] [-s] [-x] [--ff]\n" +" [-S[<keyid>]] <commit>..." +msgstr "" +"git cherry-pick [--edit] [-n] [-m <parent-number>] [-s] [-x] [--ff]\n" +" [-S[<keyid>]] <commit>..." #: builtin/revert.c -msgid "git cherry-pick <subcommand>" -msgstr "git cherry-pick <子指令>" +msgid "git cherry-pick (--continue | --skip | --abort | --quit)" +msgstr "git cherry-pick (--continue | --skip | --abort | --quit)" #: builtin/revert.c #, c-format @@ -14006,8 +14108,14 @@ msgid "cherry-pick failed" msgstr "揀選失敗" #: builtin/rm.c -msgid "git rm [<options>] [--] <file>..." -msgstr "git rm [<選項>] [--] <檔案>..." +msgid "" +"git rm [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n" +" [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" +" [--] [<pathspec>...]" +msgstr "" +"git rm [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n" +" [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" +" [--] [<pathspec>...]" #: builtin/rm.c msgid "" @@ -14070,7 +14178,7 @@ msgstr "沒有提供路徑規格。我該移除哪個檔案？" #: builtin/rm.c msgid "please stage your changes to .gitmodules or stash them to proceed" -msgstr "請將您的修改暫存到 .gitmodules 中或儲藏後再繼續" +msgstr "請將您的修改暫存到 .gitmodules 中或貯存後再繼續" #: builtin/rm.c #, c-format @@ -14087,12 +14195,14 @@ msgid "" "git send-pack [--mirror] [--dry-run] [--force]\n" " [--receive-pack=<git-receive-pack>]\n" " [--verbose] [--thin] [--atomic]\n" +" [--[no-]signed | --signed=(true|false|if-asked)]\n" " [<host>:]<directory> (--all | <ref>...)" msgstr "" "git send-pack [--mirror] [--dry-run] [--force]\n" " [--receive-pack=<git-receive-pack>]\n" " [--verbose] [--thin] [--atomic]\n" -" [<主機>:]<目錄> (--all | <引用>...)" +" [--[no-]signed | --signed=(true|false|if-asked)]\n" +" [<host>:]<directory> (--all | <ref>...)" #: builtin/send-pack.c msgid "remote name" @@ -14123,8 +14233,9 @@ msgid "using multiple --group options with stdin is not supported" msgstr "不支援在標準輸入使用多個 --group 選項" #: builtin/shortlog.c -msgid "using --group=trailer with stdin is not supported" -msgstr "不支援在標準輸入使用 --group=trailer" +#, c-format +msgid "using %s with stdin is not supported" +msgstr "不支援對 %s 使用 stdin" #: builtin/shortlog.c #, c-format @@ -14172,13 +14283,14 @@ msgid "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" " [--current] [--color[=<when>] | --no-color] [--sparse]\n" " [--more=<n> | --list | --independent | --merge-base]\n" -" [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" +" [--no-name | --sha1-name] [--topics]\n" +" [(<rev> | <glob>)...]" msgstr "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" -" [--current] [--color[=<何時>] | --no-color] [--sparse]\n" +" [--current] [--color[=<when>] | --no-color] [--sparse]\n" " [--more=<n> | --list | --independent | --merge-base]\n" -" [--no-name | --sha1-name] [--topics] [(<版本> | <萬用字元" -">)...]" +" [--no-name | --sha1-name] [--topics]\n" +" [(<rev> | <glob>)...]" #: builtin/show-branch.c msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" @@ -14304,11 +14416,13 @@ msgstr "未知的雜湊算法" #: builtin/show-ref.c msgid "" -"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference]\n" +" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n" +" [--heads] [--] [<pattern>...]" msgstr "" -"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]" +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference]\n" +" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n" +" [--heads] [--] [<pattern>...]" #: builtin/show-ref.c msgid "git show-ref --exclude-existing[=<pattern>]" @@ -14347,8 +14461,10 @@ msgid "show refs from stdin that aren't in local repository" msgstr "顯示從標準輸入中讀入的不在本機版本庫中的引用" #: builtin/sparse-checkout.c -msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" -msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <選項>" +msgid "" +"git sparse-checkout (init | list | set | add | reapply | disable) [<options>]" +msgstr "" +"git sparse-checkout (init | list | set | add | reapply | disable) [<options>]" #: builtin/sparse-checkout.c msgid "this worktree is not sparse" @@ -14490,83 +14606,71 @@ msgid "error while refreshing working directory" msgstr "重新整理工作目錄時發生錯誤" #: builtin/stash.c -msgid "git stash list [<options>]" -msgstr "git stash list [<選項>]" +msgid "git stash list [<log-options>]" +msgstr "git stash list [<log-options>]" #: builtin/stash.c -msgid "git stash show [<options>] [<stash>]" -msgstr "git stash show [<選項>] [<stash>]" +msgid "" +"git stash show [-u | --include-untracked | --only-untracked] [<diff-" +"options>] [<stash>]" +msgstr "" +"git stash show [-u | --include-untracked | --only-untracked] [<diff-" +"options>] [<stash>]" #: builtin/stash.c -msgid "git stash drop [-q|--quiet] [<stash>]" -msgstr "git stash drop [-q|--quiet] [<stash>]" +msgid "git stash drop [-q | --quiet] [<stash>]" +msgstr "git stash drop [-q | --quiet] [<stash>]" #: builtin/stash.c -msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" -msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" +msgid "git stash pop [--index] [-q | --quiet] [<stash>]" +msgstr "git stash pop [--index] [-q | --quiet] [<stash>]" + +#: builtin/stash.c +msgid "git stash apply [--index] [-q | --quiet] [<stash>]" +msgstr "git stash apply [--index] [-q | --quiet] [<stash>]" #: builtin/stash.c msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <分支名> [<stash>]" #: builtin/stash.c -msgid "" -"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" -"quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" -" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" -" [--] [<pathspec>...]]" -msgstr "" -"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" -"quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <訊息>]\n" -" [--pathspec-from-file=<檔案> [--pathspec-file-nul]]\n" -" [--] [<路徑規格>...]]" +msgid "git stash store [(-m | --message) <message>] [-q | --quiet] <commit>" +msgstr "git stash store [(-m | --message) <message>] [-q | --quiet] <commit>" #: builtin/stash.c msgid "" -"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" -"quiet]\n" -" [-u|--include-untracked] [-a|--all] [<message>]" +"git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q " +"| --quiet]\n" +" [-u | --include-untracked] [-a | --all] [(-m | --message) " +"<message>]\n" +" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" +" [--] [<pathspec>...]]" msgstr "" -"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" -"quiet]\n" -" [-u|--include-untracked] [-a|--all] [<訊息>]" - -#: builtin/stash.c -msgid "git stash pop [--index] [-q|--quiet] [<stash>]" -msgstr "git stash pop [--index] [-q|--quiet] [<stash>]" - -#: builtin/stash.c -msgid "git stash apply [--index] [-q|--quiet] [<stash>]" -msgstr "git stash apply [--index] [-q|--quiet] [<stash>]" - -#: builtin/stash.c -msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" -msgstr "git stash store [-m|--message <消息>] [-q|--quiet] <提交>" +"git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q " +"| --quiet]\n" +" [-u | --include-untracked] [-a | --all] [(-m | --message) " +"<message>]\n" +" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" +" [--] [<pathspec>...]]" #: builtin/stash.c msgid "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" -" [--] [<pathspec>...]]" +"git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | " +"--quiet]\n" +" [-u | --include-untracked] [-a | --all] [<message>]" msgstr "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n" -" [--] [<路徑規格>...]]" +"git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | " +"--quiet]\n" +" [-u | --include-untracked] [-a | --all] [<message>]" #: builtin/stash.c -msgid "" -"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [<message>]" -msgstr "" -"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [<消息>]" +msgid "git stash create [<message>]" +msgstr "git stash create [<message>]" #: builtin/stash.c #, c-format msgid "'%s' is not a stash-like commit" -msgstr "'%s' 不像是一個儲藏提交" +msgstr "'%s' 不像是一個貯存提交" #: builtin/stash.c #, c-format @@ -14575,7 +14679,7 @@ msgstr "指定了太多的版本：%s" #: builtin/stash.c msgid "No stash entries found." -msgstr "未發現儲藏條目。" +msgstr "未發現貯存條目。" #: builtin/stash.c #, c-format @@ -14599,7 +14703,7 @@ msgstr "" #: builtin/stash.c msgid "cannot apply a stash in the middle of a merge" -msgstr "無法在合併過程套用儲藏" +msgstr "無法在合併過程套用貯存" #: builtin/stash.c #, c-format @@ -14621,11 +14725,11 @@ msgstr "正在合併 %s 和 %s" #: builtin/stash.c msgid "Index was not unstashed." -msgstr "索引未從儲藏中復原。" +msgstr "索引未從貯存中復原。" #: builtin/stash.c msgid "could not restore untracked files from stash" -msgstr "無法從儲藏條目中復原未追蹤檔案" +msgstr "無法從貯存條目中復原未追蹤檔案" #: builtin/stash.c msgid "attempt to recreate the index" @@ -14639,16 +14743,16 @@ msgstr "捨棄了 %s（%s）" #: builtin/stash.c #, c-format msgid "%s: Could not drop stash entry" -msgstr "%s：無法捨棄儲藏條目" +msgstr "%s：無法捨棄貯存條目" #: builtin/stash.c #, c-format msgid "'%s' is not a stash reference" -msgstr "'%s' 不是一個儲藏引用" +msgstr "'%s' 不是一個貯存引用" #: builtin/stash.c msgid "The stash entry is kept in case you need it again." -msgstr "儲藏條目被保留以備您再次需要。" +msgstr "貯存條目被保留以備您再次需要。" #: builtin/stash.c msgid "No branch name specified" @@ -14664,11 +14768,11 @@ msgstr "無法解包樹" #: builtin/stash.c msgid "include untracked files in the stash" -msgstr "在儲藏區包含未追蹤檔案" +msgstr "在貯存區包含未追蹤檔案" #: builtin/stash.c msgid "only show untracked files in the stash" -msgstr "只在儲藏區顯示未追蹤檔案" +msgstr "只在貯存區顯示未追蹤檔案" #: builtin/stash.c #, c-format @@ -14677,7 +14781,7 @@ msgstr "無法用 %2$s 更新 %1$s" #: builtin/stash.c msgid "stash message" -msgstr "儲藏說明" +msgstr "貯存說明" #: builtin/stash.c msgid "\"git stash store\" requires one <commit> argument" @@ -14733,7 +14837,7 @@ msgstr "沒有要儲存的本機修改" #: builtin/stash.c msgid "Cannot initialize stash" -msgstr "無法初始化儲藏" +msgstr "無法初始化貯存" #: builtin/stash.c msgid "Cannot save the current status" @@ -14754,11 +14858,11 @@ msgstr "保持索引" #: builtin/stash.c msgid "stash staged changes only" -msgstr "只儲藏暫存變更" +msgstr "只貯存暫存變更" #: builtin/stash.c msgid "stash in patch mode" -msgstr "以修補檔模式儲藏" +msgstr "以修補檔模式貯存" #: builtin/stash.c msgid "quiet mode" @@ -14766,7 +14870,7 @@ msgstr "靜默模式" #: builtin/stash.c msgid "include untracked files in stash" -msgstr "儲藏中包含未追蹤檔案" +msgstr "貯存中包含未追蹤檔案" #: builtin/stash.c msgid "include ignore files" @@ -15249,10 +15353,6 @@ msgid "don't fetch new objects from the remote site" msgstr "不從遠端站台取得新物件" #: builtin/submodule--helper.c -msgid "path into the working tree" -msgstr "到工作區的路徑" - -#: builtin/submodule--helper.c msgid "use the 'checkout' update strategy (default)" msgstr "使用 “checkout” 更新策略（預設值）" @@ -15297,34 +15397,10 @@ msgstr "" "[--] [<path>...]" #: builtin/submodule--helper.c -msgid "recurse into submodules" -msgstr "在子模組中遞迴" - -#: builtin/submodule--helper.c msgid "git submodule absorbgitdirs [<options>] [<path>...]" msgstr "git submodule absorbgitdirs [<options>] [<path>...]" #: builtin/submodule--helper.c -msgid "check if it is safe to write to the .gitmodules file" -msgstr "檢查寫入 .gitmodules 檔案是否安全" - -#: builtin/submodule--helper.c -msgid "unset the config in the .gitmodules file" -msgstr "取消 .gitmodules 檔案中的設定" - -#: builtin/submodule--helper.c -msgid "git submodule--helper config <name> [<value>]" -msgstr "git submodule--helper config <名稱> [<值>]" - -#: builtin/submodule--helper.c -msgid "git submodule--helper config --unset <name>" -msgstr "git submodule--helper config --unset <名稱>" - -#: builtin/submodule--helper.c -msgid "please make sure that the .gitmodules file is in the working tree" -msgstr "請確認 .gitmodules 檔案在工作區裡" - -#: builtin/submodule--helper.c msgid "suppress output for setting url of a submodule" msgstr "隱藏子模組設定 URL 的輸出" @@ -15418,6 +15494,10 @@ msgid "unable to checkout submodule '%s'" msgstr "無法簽出「%s」子模組" #: builtin/submodule--helper.c +msgid "please make sure that the .gitmodules file is in the working tree" +msgstr "請確認 .gitmodules 檔案在工作區裡" + +#: builtin/submodule--helper.c #, c-format msgid "Failed to add submodule '%s'" msgstr "無法加入子模組「%s」" @@ -15478,23 +15558,26 @@ msgstr "版本庫 URL：「%s」必須是絕對路徑，或開頭是 ./|../" msgid "'%s' is not a valid submodule name" msgstr "「%s」不是有效的子模組名稱" +#: builtin/submodule--helper.c +msgid "git submodule--helper <command>" +msgstr "git submodule--helper <command>" + #: builtin/submodule--helper.c git.c #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s 不支援 --super-prefix" -#: builtin/submodule--helper.c -#, c-format -msgid "'%s' is not a valid submodule--helper subcommand" -msgstr "'%s' 不是一個有效的 submodule--helper 子指令" +#: builtin/symbolic-ref.c +msgid "git symbolic-ref [-m <reason>] <name> <ref>" +msgstr "git symbolic-ref [-m <reason>] <name> <ref>" #: builtin/symbolic-ref.c -msgid "git symbolic-ref [<options>] <name> [<ref>]" -msgstr "git symbolic-ref [<選項>] <名稱> [<引用>]" +msgid "git symbolic-ref [-q] [--short] [--no-recurse] <name>" +msgstr "git symbolic-ref [-q] [--short] [--no-recurse] <name>" #: builtin/symbolic-ref.c -msgid "git symbolic-ref -d [-q] <name>" -msgstr "git symbolic-ref -d [-q] <名稱>" +msgid "git symbolic-ref --delete [-q] <name>" +msgstr "git symbolic-ref --delete [-q] <name>" #: builtin/symbolic-ref.c msgid "suppress error message for non-symbolic (detached) refs" @@ -15508,6 +15591,10 @@ msgstr "刪除符號引用" msgid "shorten ref output" msgstr "縮短引用輸出" +#: builtin/symbolic-ref.c +msgid "recursively dereference (default)" +msgstr "遞迴反解引用（預設）" + #: builtin/symbolic-ref.c builtin/update-ref.c msgid "reason" msgstr "原因" @@ -15518,11 +15605,11 @@ msgstr "更新的原因" #: builtin/tag.c msgid "" -"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n" -" <tagname> [<head>]" +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n" +" <tagname> [<commit> | <object>]" msgstr "" -"git tag [-a | -s | -u <key-id>] [-f] [-m <消息> | -F <檔案>]\n" -" <標籤名> [<head>]" +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n" +" <tagname> [<commit> | <object>]" #: builtin/tag.c msgid "git tag -d <tagname>..." @@ -15530,14 +15617,15 @@ msgstr "git tag -d <標籤名>..." #: builtin/tag.c msgid "" -"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" -"points-at <object>]\n" -" [--format=<format>] [--merged <commit>] [--no-merged <commit>] " -"[<pattern>...]" +"git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]\n" +" [--points-at <object>] [--column[=<options>] | --no-column]\n" +" [--create-reflog] [--sort=<key>] [--format=<format>]\n" +" [--merged <commit>] [--no-merged <commit>] [<pattern>...]" msgstr "" -"git tag -l [-n[<數字>]] [--contains <提交>] [--no-contains <提交>] [--points-" -"at <物件>]\n" -" [--format=<格式>] [--merged <提交>] [--no-merged <提交>] [<模式>...]" +"git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]\n" +" [--points-at <object>] [--column[=<options>] | --no-column]\n" +" [--create-reflog] [--sort=<key>] [--format=<format>]\n" +" [--merged <commit>] [--no-merged <commit>] [<pattern>...]" #: builtin/tag.c msgid "git tag -v [--format=<format>] <tagname>..." @@ -16007,8 +16095,12 @@ msgid "update the info files from scratch" msgstr "從頭開始更新檔案訊息" #: builtin/upload-pack.c -msgid "git upload-pack [<options>] <dir>" -msgstr "git upload-pack [<選項>] <目錄>" +msgid "" +"git-upload-pack [--[no-]strict] [--timeout=<n>] [--stateless-rpc]\n" +" [--advertise-refs] <directory>" +msgstr "" +"git-upload-pack [--[no-]strict] [--timeout=<n>] [--stateless-rpc]\n" +" [--advertise-refs] <directory>" #: builtin/upload-pack.c t/helper/test-serve-v2.c msgid "quit after a single request/response exchange" @@ -16027,8 +16119,8 @@ msgid "interrupt transfer after <n> seconds of inactivity" msgstr "不活動 <n> 秒鐘後終止傳輸" #: builtin/verify-commit.c -msgid "git verify-commit [-v | --verbose] <commit>..." -msgstr "git verify-commit [-v | --verbose] <提交>..." +msgid "git verify-commit [-v | --verbose] [--raw] <commit>..." +msgstr "git verify-commit [-v | --verbose] [--raw] <commit>..." #: builtin/verify-commit.c msgid "print commit contents" @@ -16039,8 +16131,8 @@ msgid "print raw gpg status output" msgstr "列印原始 gpg 狀態輸出" #: builtin/verify-pack.c -msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." -msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..." +msgid "git verify-pack [-v | --verbose] [-s | --stat-only] [--] <pack>.idx..." +msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] [--] <pack>.idx..." #: builtin/verify-pack.c msgid "verbose" @@ -16051,44 +16143,48 @@ msgid "show statistics only" msgstr "只顯示統計" #: builtin/verify-tag.c -msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." -msgstr "git verify-tag [-v | --verbose] [--format=<格式>] <標籤>..." +msgid "git verify-tag [-v | --verbose] [--format=<format>] [--raw] <tag>..." +msgstr "git verify-tag [-v | --verbose] [--format=<format>] [--raw] <tag>..." #: builtin/verify-tag.c msgid "print tag contents" msgstr "列印標籤內容" #: builtin/worktree.c -msgid "git worktree add [<options>] <path> [<commit-ish>]" -msgstr "git worktree add [<選項>] <路徑> [<提交>]" +msgid "" +"git worktree add [-f] [--detach] [--checkout] [--lock [--reason <string>]]\n" +" [-b <new-branch>] <path> [<commit-ish>]" +msgstr "" +"git worktree add [-f] [--detach] [--checkout] [--lock [--reason <string>]]\n" +" [-b <new-branch>] <path> [<commit-ish>]" #: builtin/worktree.c -msgid "git worktree list [<options>]" -msgstr "git worktree list [<選項>]" +msgid "git worktree list [-v | --porcelain [-z]]" +msgstr "git worktree list [-v | --porcelain [-z]]" #: builtin/worktree.c -msgid "git worktree lock [<options>] <path>" -msgstr "git worktree lock [<選項>] <路徑>" +msgid "git worktree lock [--reason <string>] <worktree>" +msgstr "git worktree lock [--reason <string>] <worktree>" #: builtin/worktree.c msgid "git worktree move <worktree> <new-path>" msgstr "git worktree move <工作區> <新路徑>" #: builtin/worktree.c -msgid "git worktree prune [<options>]" -msgstr "git worktree prune [<選項>]" +msgid "git worktree prune [-n] [-v] [--expire <expire>]" +msgstr "git worktree prune [-n] [-v] [--expire <expire>]" #: builtin/worktree.c -msgid "git worktree remove [<options>] <worktree>" -msgstr "git worktree remove [<選項>] <工作區>" +msgid "git worktree remove [-f] <worktree>" +msgstr "git worktree remove [-f] <worktree>" #: builtin/worktree.c msgid "git worktree repair [<path>...]" msgstr "git worktree repair [<路徑>...]" #: builtin/worktree.c -msgid "git worktree unlock <path>" -msgstr "git worktree unlock <路徑>" +msgid "git worktree unlock <worktree>" +msgstr "git worktree unlock <worktree>" #: builtin/worktree.c #, c-format @@ -16373,6 +16469,11 @@ msgid "core.fsyncMethod = batch is unsupported on this platform" msgstr "core.fsyncMethod = batch 不支援本平台" #: bundle-uri.c +#, c-format +msgid "bundle list at '%s' has no mode" +msgstr "位於 “%s” 的套件包清單沒有模式" + +#: bundle-uri.c msgid "failed to create temporary file" msgstr "無法建立暫存檔" @@ -16382,23 +16483,40 @@ msgstr "功能不足" #: bundle-uri.c #, c-format -msgid "failed to download bundle from URI '%s'" -msgstr "無法從 “%s” URI 下載套件" +msgid "unrecognized bundle mode from URI '%s'" +msgstr "無法識別從 URI “%s” 取回的套件包模式" + +#: bundle-uri.c +#, c-format +msgid "exceeded bundle URI recursion limit (%d)" +msgstr "超出套件包 URI 遞迴限制 (%d)" #: bundle-uri.c #, c-format -msgid "file at URI '%s' is not a bundle" -msgstr "位於 URI “%s” 的檔案不是套件" +msgid "failed to download bundle from URI '%s'" +msgstr "無法從 “%s” URI 下載套件包" #: bundle-uri.c #, c-format -msgid "failed to unbundle bundle from URI '%s'" -msgstr "無法解開源自 URI “%s” 的套件" +msgid "file at URI '%s' is not a bundle or bundle list" +msgstr "位於 URI “%s” 的檔案不是套件包或套件包清單" + +#: bundle-uri.c +msgid "bundle-uri: got an empty line" +msgstr "bundle-uri: 收到空白列" + +#: bundle-uri.c +msgid "bundle-uri: line is not of the form 'key=value'" +msgstr "bundle-uri: 列的格式不是 “key=value”" + +#: bundle-uri.c +msgid "bundle-uri: line has empty key or value" +msgstr "bundle-uri: 列有空鍵或空值" #: bundle.c #, c-format msgid "unrecognized bundle hash algorithm: %s" -msgstr "無法識別的套件雜湊演算法：%s" +msgstr "無法識別的套件包雜湊演算法：%s" #: bundle.c #, c-format @@ -16408,7 +16526,7 @@ msgstr "未知功能 '%s'" #: bundle.c #, c-format msgid "'%s' does not look like a v2 or v3 bundle file" -msgstr "'%s' 不像是一個 v2 或 v3 版本的套件檔案" +msgstr "“%s” 不像是一個 v2 或 v3 版本的套件包檔案" #: bundle.c #, c-format @@ -16421,27 +16539,27 @@ msgstr "版本庫中缺少這些必備的提交：" #: bundle.c msgid "need a repository to verify a bundle" -msgstr "需要版本庫驗證套件" +msgstr "需要版本庫驗證套件包" #: bundle.c #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %<PRIuMAX> refs:" -msgstr[0] "這個套件含有這 %<PRIuMAX> 個引用：" +msgstr[0] "這個套件包，含有這 %<PRIuMAX> 個引用：" #: bundle.c msgid "The bundle records a complete history." -msgstr "這個套件記錄完整歷史紀錄。" +msgstr "這個套件包記下了完整歷史紀錄。" #: bundle.c #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %<PRIuMAX> refs:" -msgstr[0] "這個套件需要這 %<PRIuMAX> 個引用：" +msgstr[0] "這個套件包需要這 %<PRIuMAX> 個引用：" #: bundle.c msgid "unable to dup bundle descriptor" -msgstr "無法複製套件描述符" +msgstr "無法複製套件包描述元" #: bundle.c msgid "Could not spawn pack-objects" @@ -16459,16 +16577,16 @@ msgstr "引用 '%s' 被 rev-list 選項排除" #: bundle.c #, c-format msgid "unsupported bundle version %d" -msgstr "不支援的套件版本 %d" +msgstr "不支援的套件包版本 %d" #: bundle.c #, c-format msgid "cannot write bundle version %d with algorithm %s" -msgstr "無法寫入 %2$s 演算法的套件版本 %1$d" +msgstr "無法寫入使用 %2$s 演算法的套件包版本 %1$d" #: bundle.c msgid "Refusing to create empty bundle." -msgstr "不能建立空套件。" +msgstr "不能建立空套件包。" #: bundle.c #, c-format @@ -17015,7 +17133,7 @@ msgstr "將檔案內容新增到索引" #: command-list.h msgid "Stash the changes in a dirty working directory away" -msgstr "儲藏髒工作區中的修改" +msgstr "貯存髒工作區中的修改" #: command-list.h msgid "Show the working tree status" @@ -17111,7 +17229,7 @@ msgstr "定義路徑的屬性" #: command-list.h msgid "Git command-line interface and conventions" -msgstr "Git 指令列介面和約定" +msgstr "Git 命令列介面和約定" #: command-list.h msgid "A Git core tutorial for developers" @@ -17139,14 +17257,14 @@ msgstr "Git 使用的常見問題" #: command-list.h msgid "The bundle file format" -msgstr "套件檔案格式" +msgstr "套件包檔案格式" #: command-list.h msgid "Chunk-based file formats" msgstr "以區塊為基礎的檔案格式" #: command-list.h -msgid "Git commit graph format" +msgid "Git commit-graph format" msgstr "Git 提交圖格式" #: command-list.h @@ -17571,6 +17689,11 @@ msgstr "“has_worktree_moved” 中有未處置的情況：%d" msgid "health thread wait failed [GLE %ld]" msgstr "健康監聽執行緒等待失敗 [GLE %ld]" +#: compat/fsmonitor/fsm-ipc-darwin.c +#, c-format +msgid "Invalid path: %s" +msgstr "無效路徑：%s" + #: compat/fsmonitor/fsm-listen-darwin.c msgid "Unable to create FSEventStream." msgstr "無法建立 FSEventStream。" @@ -17609,12 +17732,32 @@ msgstr "在 “%s” 上呼叫 GetOverlappedResult 失敗 [GLE %ld]" msgid "could not read directory changes [GLE %ld]" msgstr "無法讀取目錄變化 [GLE %ld]" -#: compat/fsmonitor/fsm-settings-win32.c +#: compat/fsmonitor/fsm-path-utils-darwin.c +#, c-format +msgid "opendir('%s') failed" +msgstr "opendir('%s') 失敗" + +#: compat/fsmonitor/fsm-path-utils-darwin.c +#, c-format +msgid "lstat('%s') failed" +msgstr "lstat('%s') 失敗" + +#: compat/fsmonitor/fsm-path-utils-darwin.c +#, c-format +msgid "strbuf_readlink('%s') failed" +msgstr "strbuf_readlink('%s') 失敗" + +#: compat/fsmonitor/fsm-path-utils-darwin.c +#, c-format +msgid "closedir('%s') failed" +msgstr "closedir('%s') 失敗" + +#: compat/fsmonitor/fsm-path-utils-win32.c #, c-format msgid "[GLE %ld] unable to open for read '%ls'" msgstr "[GLE %ld] 無法開啟以讀取「%ls」" -#: compat/fsmonitor/fsm-settings-win32.c +#: compat/fsmonitor/fsm-path-utils-win32.c #, c-format msgid "[GLE %ld] unable to get protocol information for '%ls'" msgstr "[GLE %ld] 無法取得「%ls」的通訊協定資訊" @@ -17879,7 +18022,7 @@ msgstr "子模組資料物件 %2$s 中錯誤的設定行 %1$d" #: config.c #, c-format msgid "bad config line %d in command line %s" -msgstr "指令列 %2$s 中錯誤的設定行 %1$d" +msgstr "命令列 %2$s 中錯誤的設定行 %1$d" #: config.c #, c-format @@ -17922,7 +18065,7 @@ msgstr "子模組資料 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$ #: config.c #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" -msgstr "指令列 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s" +msgstr "命令列 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s" #: config.c #, c-format @@ -18018,7 +18161,7 @@ msgstr "解析 %s 失敗" #: config.c msgid "unable to parse command-line config" -msgstr "無法解析指令列中的設定" +msgstr "無法解析命令列中的設定" #: config.c msgid "unknown error occurred while reading the configuration files" @@ -18037,7 +18180,7 @@ msgstr "splitIndex.maxPercentChange 的取值 '%d' 應該介於 0 和 100 之間 #: config.c #, c-format msgid "unable to parse '%s' from command-line config" -msgstr "無法解析指令列設定中的 '%s'" +msgstr "無法解析命令列設定中的 '%s'" #: config.c #, c-format @@ -19242,7 +19385,7 @@ msgid "" "Please specify a directory on the command line" msgstr "" "無法猜到目錄名。\n" -"請在指令列指定一個目錄" +"請在命令列指定一個目錄" #: dir.c #, c-format @@ -19573,8 +19716,9 @@ msgstr "虛擬版本庫 “%s” 與 fsmonitor 不相容" #: fsmonitor-settings.c #, c-format msgid "" -"repository '%s' is incompatible with fsmonitor due to lack of Unix sockets" -msgstr "版本庫 “%s” 因缺少 Unix 通訊端而與 fsmonitor 不相容" +"socket directory '%s' is incompatible with fsmonitor due to lack of Unix " +"sockets support" +msgstr "通訊端 “%s” 因缺少 Unix 通訊端支援，而與 fsmonitor 不相容" #: git.c msgid "" @@ -19609,7 +19753,7 @@ msgstr "" #: git.c help.c #, c-format msgid "unsupported command listing type '%s'" -msgstr "不支援的指令列表類型 '%s'" +msgstr "不支援的命令列表類型 '%s'" #: git.c #, c-format @@ -19958,8 +20102,8 @@ msgstr[0] "" "最類似的指令有" #: help.c -msgid "git version [<options>]" -msgstr "git version [<選項>]" +msgid "git version [--build-options]" +msgstr "git version [--build-options]" #: help.c #, c-format @@ -20642,8 +20786,8 @@ msgstr "拒絕遺失未追蹤檔案 '%s'，而是新增為 %s" #: merge-recursive.c #, c-format msgid "" -"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" -"\"->\"%s\" in \"%s\"%s" +"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename " +"\"%s\"->\"%s\" in \"%s\"%s" msgstr "" "衝突（重新命名/重新命名）：在分支 \"%3$s\" 中重新命名 \"%1$s\"->\"%2$s\"，在" "分支 \"%6$s\" 中重新命名 \"%4$s\"->\"%5$s\"%7$s" @@ -21033,11 +21177,6 @@ msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s：忽略備用物件庫，嵌套太深" #: object-file.c -#, c-format -msgid "unable to normalize object directory: %s" -msgstr "無法規範化物件目錄: %s" - -#: object-file.c msgid "unable to fdopen alternates lockfile" msgstr "無法 fdopen 取代鎖檔案" @@ -22047,6 +22186,11 @@ msgstr "promisor-remote: 無法關閉 fetch 子處理程序的 stdin" msgid "promisor remote name cannot begin with '/': %s" msgstr "promisor 遠端名稱不能以 '/' 開始：%s" +#: promisor-remote.c +#, c-format +msgid "could not fetch %s from promisor remote" +msgstr "無法從承諾者遠端抓取 %s" + #: protocol-caps.c msgid "object-info: expected flush after arguments" msgstr "object-info：引數後預期要有 flush" @@ -23320,6 +23464,15 @@ msgstr "無法找到 %s 指向的樹" #: revision.c #, c-format +msgid "unsupported section for hidden refs: %s" +msgstr "不支援的隱藏引用區塊：%s" + +#: revision.c +msgid "--exclude-hidden= passed more than once" +msgstr "--exclude-hidden= 傳入了不止一次" + +#: revision.c +#, c-format msgid "resolve-undo records `%s` which is missing" msgstr "resolve-undo 不存在的「%s」記錄" @@ -23505,6 +23658,16 @@ msgstr "--all 或 <enlistment> 但不能傳入兩者" #: scalar.c #, c-format +msgid "could not remove stale scalar.repo '%s'" +msgstr "無法移除過時的 scalar.repo “%s”" + +#: scalar.c +#, c-format +msgid "removing stale scalar.repo '%s'" +msgstr "正在移除過時的 scalar.repo “%s”" + +#: scalar.c +#, c-format msgid "git repository gone in '%s'" msgstr "git 版本庫在「%s」遺失" @@ -23636,7 +23799,7 @@ msgstr "摘取" #: sequencer.c msgid "rebase" -msgstr "rebase" +msgstr "重定基底" #: sequencer.c #, c-format @@ -23710,7 +23873,7 @@ msgstr "您的本機修改將被%s覆蓋。" #: sequencer.c msgid "commit your changes or stash them to proceed." -msgstr "提交您的修改或儲藏後再繼續。" +msgstr "提交您的修改或貯存後再繼續。" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase". @@ -24244,7 +24407,7 @@ msgid "" msgstr "" "執行成功：%s\n" "但是在索引和/或工作區中存在變更\n" -"提交或儲藏修改，然後執行\n" +"提交或貯存修改，然後執行\n" "\n" " git rebase --continue\n" "\n" @@ -24255,6 +24418,11 @@ msgid "illegal label name: '%.*s'" msgstr "非法的標籤名稱：'%.*s'" #: sequencer.c +#, c-format +msgid "could not resolve '%s'" +msgstr "無法解析 '%s'" + +#: sequencer.c msgid "writing fake root commit" msgstr "寫偽根提交" @@ -24263,11 +24431,6 @@ msgid "writing squash-onto" msgstr "寫入 squash-onto" #: sequencer.c -#, c-format -msgid "could not resolve '%s'" -msgstr "無法解析 '%s'" - -#: sequencer.c msgid "cannot merge without a current revision" msgstr "沒有目前版本不能合併" @@ -24364,16 +24527,16 @@ msgid "" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" "%s\n" -"您的修改安全地儲存在儲藏區中。\n" +"您的修改安全地儲存在貯存區中。\n" "您可以在任何時候執行 \"git stash pop\" 或 \"git stash drop\"。\n" #: sequencer.c msgid "Applying autostash resulted in conflicts." -msgstr "因套用自動儲藏而導致衝突。" +msgstr "因套用自動貯存而導致衝突。" #: sequencer.c msgid "Autostash exists; creating a new stash entry." -msgstr "已有自動儲藏；建立新儲藏項目。" +msgstr "已有自動貯存；建立新貯存項目。" #: sequencer.c msgid "could not detach HEAD" @@ -24778,7 +24941,7 @@ msgstr "submodule.fetchJobs 不允許為負值" #: submodule-config.c #, c-format msgid "ignoring '%s' which may be interpreted as a command-line option: %s" -msgstr "忽略可能被解析為指令列選項的 '%s'：%s" +msgstr "忽略可能被解析為命令列選項的 '%s'：%s" #: submodule-config.c #, c-format @@ -24976,6 +25139,18 @@ msgstr "ls-tree 返回未知返回值 %d" msgid "failed to lstat '%s'" msgstr "無法 lstat “%s”" +#: t/helper/test-cache-tree.c +msgid "test-tool cache-tree <options> (control|prime|update)" +msgstr "test-tool cache-tree <options> (control|prime|update)" + +#: t/helper/test-cache-tree.c +msgid "clear the cache tree before each iteration" +msgstr "每次迭代前清除快取樹狀物件" + +#: t/helper/test-cache-tree.c +msgid "number of entries in the cache tree to invalidate (default 0)" +msgstr "在快取樹狀物件中，要使失效的項目數量（預設值為 0）" + #: t/helper/test-fast-rebase.c msgid "unhandled options" msgstr "未處理選項" @@ -25317,7 +25492,7 @@ msgstr "將要設定 '%1$s' 的上游為 '%3$s' 的 '%2$s'\n" #: transport.c #, c-format msgid "could not read bundle '%s'" -msgstr "無法讀取「%s」套件" +msgstr "無法讀取「%s」套件包" #: transport.c #, c-format @@ -25423,7 +25598,7 @@ msgid "" "%%sPlease commit your changes or stash them before you switch branches." msgstr "" "您對下列檔案的本機修改將被簽出動作覆蓋：\n" -"%%s請在切換分支前提交或儲藏您的修改。" +"%%s請在切換分支前提交或貯存您的修改。" #: unpack-trees.c #, c-format @@ -25441,7 +25616,7 @@ msgid "" "%%sPlease commit your changes or stash them before you merge." msgstr "" "您對下列檔案的本機修改將被合併動作覆蓋：\n" -"%%s請在合併前提交或儲藏您的修改。" +"%%s請在合併前提交或貯存您的修改。" #: unpack-trees.c #, c-format @@ -25459,7 +25634,7 @@ msgid "" "%%sPlease commit your changes or stash them before you %s." msgstr "" "您對下列檔案的本機修改將被 %s 覆蓋：\n" -"%%s請在 %s 之前提交或儲藏您的修改。" +"%%s請在 %s 之前提交或貯存您的修改。" #: unpack-trees.c #, c-format @@ -25710,19 +25885,19 @@ msgstr "無效的 '..' 路徑區塊" #: usage.c msgid "usage: " -msgstr "用法：" +msgstr "用法: " #: usage.c msgid "fatal: " -msgstr "致命錯誤：" +msgstr "致命錯誤: " #: usage.c msgid "error: " -msgstr "錯誤：" +msgstr "錯誤: " #: usage.c msgid "warning: " -msgstr "警告：" +msgstr "警告: " #: walker.c msgid "Fetching objects" @@ -26001,7 +26176,7 @@ msgstr "未追蹤的內容, " #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" -msgstr[0] "您的儲藏區目前有 %d 條紀錄" +msgstr[0] "您的貯存區目前有 %d 條紀錄" #: wt-status.c msgid "Submodules changed but not updated:" @@ -26511,31 +26686,31 @@ msgstr[0] "建立了 %d 個路徑\n" msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." -msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為暫存。" +msgstr "如果修補檔能完全套用，編輯區塊將立即標記為暫存。" #: git-add--interactive.perl msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." -msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為儲藏。" +msgstr "如果修補檔能完全套用，編輯區塊將立即標記為貯存。" #: git-add--interactive.perl msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." -msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為未暫存。" +msgstr "如果修補檔能完全套用，編輯區塊將立即標記為未暫存。" #: git-add--interactive.perl msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." -msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為套用。" +msgstr "如果修補檔能完全套用，編輯區塊將立即標記為套用。" #: git-add--interactive.perl msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." -msgstr "如果修補檔能乾淨地套用，編輯塊將立即標記為捨棄。" +msgstr "如果修補檔能完全套用，編輯塊將立即標記為捨棄。" #: git-add--interactive.perl #, perl-format @@ -26582,11 +26757,11 @@ msgid "" "a - stash this hunk and all later hunks in the file\n" "d - do not stash this hunk or any of the later hunks in the file" msgstr "" -"y - 儲藏此區塊\n" -"n - 不要儲藏此區塊\n" -"q - 離開。不儲藏此區塊及後面的全部區塊\n" -"a - 儲藏此區塊和本檔案中後面的全部區塊\n" -"d - 不儲藏此區塊和本檔案中後面的全部區塊" +"y - 貯存此區塊\n" +"n - 不要貯存此區塊\n" +"q - 離開。不貯存此區塊及後面的全部區塊\n" +"a - 貯存此區塊和本檔案中後面的全部區塊\n" +"d - 不貯存此區塊和本檔案中後面的全部區塊" #: git-add--interactive.perl msgid "" @@ -26801,7 +26976,7 @@ msgstr "致命錯誤：命令「%s」中止，結束碼：%d" #: git-send-email.perl msgid "the editor exited uncleanly, aborting everything" -msgstr "編輯器非正常離開，終止所有動作" +msgstr "編輯器非正常離開，中止所有動作" #: git-send-email.perl #, perl-format @@ -26836,7 +27011,7 @@ msgstr "不能在版本庫之外執行 git format-patch\n" msgid "" "`batch-size` and `relogin` must be specified together (via command-line or " "configuration option)\n" -msgstr "`batch-size` 和 `relogin` 必須同時定義（透過指令列或者設定選項）\n" +msgstr "`batch-size` 和 `relogin` 必須同時定義（透過命令列或者設定選項）\n" #: git-send-email.perl #, perl-format @@ -27158,3 +27333,147 @@ msgstr "略過 %s 含備份後綴 '%s'。\n" #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "您真的要傳送 %s？[y|N]： " + +#, c-format +#~ msgid "unable to normalize object directory: %s" +#~ msgstr "無法規範化物件目錄: %s" + +#~ msgid "reset the bisection state" +#~ msgstr "清除二分搜尋狀態" + +#~ msgid "check whether bad or good terms exist" +#~ msgstr "檢查壞的或好的術語是否存在" + +#~ msgid "print out the bisect terms" +#~ msgstr "列印二分搜尋術語" + +#~ msgid "start the bisect session" +#~ msgstr "啟動二分搜尋過程" + +#~ msgid "find the next bisection commit" +#~ msgstr "尋找下一個二分搜尋提交" + +#~ msgid "mark the state of ref (or refs)" +#~ msgstr "標記 ref (或 refs) 的狀態" + +#~ msgid "list the bisection steps so far" +#~ msgstr "列出迄今的二分搜尋步驟" + +#~ msgid "replay the bisection process from the given file" +#~ msgstr "從指定檔案重放二分搜尋過程" + +#~ msgid "skip some commits for checkout" +#~ msgstr "略過要簽出的部分提交" + +#~ msgid "visualize the bisection" +#~ msgstr "視覺化二分搜尋過程" + +#~ msgid "use <cmd>... to automatically bisect" +#~ msgstr "使用 <cmd>... 自動進行二分搜尋" + +#~ msgid "no log for BISECT_WRITE" +#~ msgstr "BISECT_WRITE 無日誌" + +#~ msgid "Couldn't look up commit object for HEAD" +#~ msgstr "無法查詢 HEAD 指向的提交物件" + +#~ msgid "git bundle create [<options>] <file> <git-rev-list args>" +#~ msgstr "git bundle create [<選項>] <檔案> <git-rev-list 參數>" + +#, c-format +#~ msgid "options '%s' and '%s %s' cannot be used together" +#~ msgstr "「%s」和「%s %s」選項不得同時使用" + +#~ msgid "git commit [<options>] [--] <pathspec>..." +#~ msgstr "git commit [<選項>] [--] <路徑規格>..." + +#~ msgid "git fsck [<options>] [<object>...]" +#~ msgstr "git fsck [<選項>] [<物件>...]" + +#~ msgid "git fsmonitor--daemon stop" +#~ msgstr "git fsmonitor--daemon stop" + +#~ msgid "git fsmonitor--daemon status" +#~ msgstr "git fsmonitor--daemon status" + +#~ msgid "failed to run 'git config'" +#~ msgstr "無法執行 ‘git config’" + +#, c-format +#~ msgid "could not get 'onto': '%s'" +#~ msgstr "無法取得 'onto'：'%s'" + +#~ msgid "Could not resolve HEAD to a revision" +#~ msgstr "無法將 HEAD 解析為一個版本" + +#, c-format +#~ msgid "missing required file: %s" +#~ msgstr "缺少必要檔案：%s" + +#~ msgid "git revert [<options>] <commit-ish>..." +#~ msgstr "git revert [<選項>] <提交號>..." + +#~ msgid "git revert <subcommand>" +#~ msgstr "git revert <子指令>" + +#~ msgid "git cherry-pick [<options>] <commit-ish>..." +#~ msgstr "git cherry-pick [<選項>] <提交號>..." + +#~ msgid "git cherry-pick <subcommand>" +#~ msgstr "git cherry-pick <子指令>" + +#~ msgid "git rm [<options>] [--] <file>..." +#~ msgstr "git rm [<選項>] [--] <檔案>..." + +#~ msgid "using --group=trailer with stdin is not supported" +#~ msgstr "不支援在標準輸入使用 --group=trailer" + +#~ msgid "git stash show [<options>] [<stash>]" +#~ msgstr "git stash show [<選項>] [<stash>]" + +#~ msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" +#~ msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" + +#~ msgid "" +#~ "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +#~ " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" +#~ " [--] [<pathspec>...]]" +#~ msgstr "" +#~ "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +#~ " [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n" +#~ " [--] [<路徑規格>...]]" + +#~ msgid "" +#~ "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +#~ " [-u|--include-untracked] [-a|--all] [<message>]" +#~ msgstr "" +#~ "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +#~ " [-u|--include-untracked] [-a|--all] [<消息>]" + +#~ msgid "path into the working tree" +#~ msgstr "到工作區的路徑" + +#~ msgid "recurse into submodules" +#~ msgstr "在子模組中遞迴" + +#~ msgid "check if it is safe to write to the .gitmodules file" +#~ msgstr "檢查寫入 .gitmodules 檔案是否安全" + +#~ msgid "unset the config in the .gitmodules file" +#~ msgstr "取消 .gitmodules 檔案中的設定" + +#~ msgid "git submodule--helper config --unset <name>" +#~ msgstr "git submodule--helper config --unset <名稱>" + +#, c-format +#~ msgid "'%s' is not a valid submodule--helper subcommand" +#~ msgstr "'%s' 不是一個有效的 submodule--helper 子指令" + +#~ msgid "git upload-pack [<options>] <dir>" +#~ msgstr "git upload-pack [<選項>] <目錄>" + +#~ msgid "git worktree add [<options>] <path> [<commit-ish>]" +#~ msgstr "git worktree add [<選項>] <路徑> [<提交>]" + +#~ msgid "git worktree lock [<options>] <path>" +#~ msgstr "git worktree lock [<選項>] <路徑>" |