diff options
Diffstat (limited to 'po')
| -rw-r--r-- | po/bg.po | 856 | ||||
| -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 |
5 files changed, 2750 insertions, 1661 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 "празно име на файл в запис в дърво" @@ -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" |