diff options
| -rw-r--r-- | Documentation/RelNotes/2.53.0.adoc | 9 | ||||
| -rwxr-xr-x | GIT-VERSION-GEN | 2 | ||||
| -rw-r--r-- | po/bg.po | 576 | ||||
| -rw-r--r-- | po/fr.po | 534 | ||||
| -rw-r--r-- | po/ga.po | 627 | ||||
| -rw-r--r-- | po/sv.po | 484 | ||||
| -rw-r--r-- | po/tr.po | 499 |
7 files changed, 1658 insertions, 1073 deletions
diff --git a/Documentation/RelNotes/2.53.0.adoc b/Documentation/RelNotes/2.53.0.adoc index 8ae76e0f3e..a24677115c 100644 --- a/Documentation/RelNotes/2.53.0.adoc +++ b/Documentation/RelNotes/2.53.0.adoc @@ -38,9 +38,6 @@ UI, Workflows & Features `--onto` option of "git replay". Test coverage of "git replay" has been improved. - * The split command in "git subtree" (in contrib/) has been taught to - deal better with rebased history. - * The iconv library on macOS fails to correctly handle stateful ISO/IEC 2022:1994 encoded strings. Work it around instead of replacing it wholesale from homebrew. @@ -67,13 +64,13 @@ Performance, Internal Implementation, Development Support etc. * "make strip" has been taught to strip "scalar" as well as "git". - * Dockerised jobs at the GitHub Actions CI have been taught to show + * Dockerized jobs at the GitHub Actions CI have been taught to show more details of failed tests. * Code refactoring around object database sources. * Halve the memory consumed by artificial filepairs created during - "git diff --find-copioes-harder", also making the operation run + "git diff --find-copies-harder", also making the operation run faster. * The "git_istream" abstraction has been revamped to make it easier @@ -162,7 +159,7 @@ Fixes since v2.52 * Test leakfix. (merge 14b561e768 jk/test-mktemp-leakfix later to maint). - * Update a version of action used at the GitHub Actrions CI. + * Update a version of action used at the GitHub Actions CI. (merge cd99203f86 js/ci-github-setup-go-update later to maint). * The "return errno = EFOO, -1" construct, which is heavily used in diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 5adc4afd67..92eaab51c6 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,6 +1,6 @@ #!/bin/sh -DEF_VER=v2.53.0-rc0 +DEF_VER=v2.53.0-rc2 LF=' ' @@ -1,7 +1,7 @@ # Bulgarian translation of git po-file. -# Copyright (C) 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025 Alexander Shopov <ash@kambanaria.org>. +# Copyright (C) 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025, 2026 Alexander Shopov <ash@kambanaria.org>. # This file is distributed under the same license as the git package. -# Alexander Shopov <ash@kambanaria.org>, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025. +# Alexander Shopov <ash@kambanaria.org>, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025, 2026. # ======================== # DICTIONARY TO MERGE IN GIT GUI # ------------------------ @@ -244,6 +244,15 @@ # initial branch първоначален клон # garbage повредени данни # keep file файл за запазване на директория +# commit transaction завършвам транзакция +# ref transaction транзакция за указатели +# refspec указател на версия +# stage добавям в индекса +# unstage изваждам от индекса +# upstream branch следен клон +# revert отменям +# +# # # ------------------------ # „$var“ - може да не сработва за shell има gettext и eval_gettext - проверка - намират се лесно по „$ @@ -270,10 +279,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 v2.52.0-rc1\n" +"Project-Id-Version: git v2.53.0-rc0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2025-11-06 23:58+0000\n" -"PO-Revision-Date: 2025-11-09 18:23+0100\n" +"POT-Creation-Date: 2026-01-23 18:13+0100\n" +"PO-Revision-Date: 2026-01-24 11:18+0100\n" "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" "Language: bg\\n\"\n" @@ -1053,7 +1062,7 @@ msgid "" "modifications.\n" msgstr "" "Следните пътища са преместени извън дефинициите за частично\n" -"изтегляне, но вече не са частични заради локални промени.\n" +"изтегляне, но вече не са частични заради локални промѐни.\n" msgid "" "To correct the sparsity of these paths, do the following:\n" @@ -2051,11 +2060,11 @@ msgstr "" msgid "'%s' is not a valid branch name" msgstr "„%s“ не е позволено име за клон" -msgid "See `man git check-ref-format`" +msgid "See 'git help check-ref-format'" msgstr "" -"Вижте страницата в ръководството:\n" +"Вижте:\n" "\n" -" git check-ref-format" +" git help check-ref-format" #, c-format msgid "a branch named '%s' already exists" @@ -2988,6 +2997,18 @@ msgid "must end with a color" msgstr "трябва да завършва с цвят" #, c-format +msgid "unknown value for config '%s': %s" +msgstr "непозната стойност за настройката „%s“: „%s“" + +msgid "" +"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " +"\"histogram\"" +msgstr "" +"опцията приема следните варианти за алгоритъм за разлики: „myers“ (по " +"Майерс), „minimal“ (минимизиране на разликите), „patience“ (пасианс) и " +"„histogram“ (хистограмен)" + +#, c-format msgid "cannot find revision %s to ignore" msgstr "версията за прескачане „%s“ липсва" @@ -3053,6 +3074,12 @@ msgstr "" msgid "ignore whitespace differences" msgstr "без разлики в знаците за интервали" +msgid "<algorithm>" +msgstr "АЛГОРИТЪМ" + +msgid "choose a diff algorithm" +msgstr "избор на АЛГОРИТЪМа за разлики" + msgid "rev" msgstr "ВЕРС" @@ -3069,7 +3096,7 @@ msgstr "" msgid "color lines by age" msgstr "оцветяване на редовете по възраст" -msgid "spend extra cycles to find better match" +msgid "spend extra cycles to find a better match" msgstr "допълнителни изчисления за по-добри резултати" msgid "use revisions from <file> instead of calling git-rev-list" @@ -3301,13 +3328,13 @@ msgid "do not use" msgstr "да не се ползва" msgid "upstream" -msgstr "клон-източник" +msgstr "КЛОН_ИЗТОЧНИК" msgid "change the upstream info" msgstr "смяна на клона-източник" msgid "unset the upstream info" -msgstr "изчистване на информацията за клон-източник" +msgstr "изчистване на информацията за КЛОНа_ИЗТОЧНИК" msgid "use colored output" msgstr "цветен изход" @@ -4287,8 +4314,8 @@ msgid "missing branch name; try -%c" msgstr "липсва име на клон, използвайте опцията „-%c“" #, c-format -msgid "could not resolve %s" -msgstr "„%s“ не може да се проследи" +msgid "could not resolve '%s'" +msgstr "„%s“ липсва" msgid "invalid path specification" msgstr "указан е неправилен път" @@ -4696,7 +4723,7 @@ msgid "set config inside the new repository" msgstr "задаване на настройките на новото хранилище" msgid "server-specific" -msgstr "специфични за сървъра" +msgstr "СПЕЦИФИЧНИ_ЗА_СЪРВЪРА" msgid "option to transmit" msgstr "опция за пренос" @@ -4944,7 +4971,7 @@ msgstr "максимален брой подавания в небазово н msgid "maximum ratio between two levels of a split commit-graph" msgstr "" -"максимално отношение на броя подавания в две последователни нива в раздробен " +"максимално отношение на броя подавания в две последователни нива̀ в раздробен " "граф" msgid "only expire files older than a given date-time" @@ -5578,7 +5605,8 @@ msgid "" "<name>" msgstr "" "git config get [ОПЦИЯ_ЗА_ФАЙЛ] [ОПЦИЯ_ЗА_ИЗВЕЖДАНЕ] [--includes] [--all] [--" -"regexp=РЕГ_ИЗР][--value=ШАБЛОН] [--fixed-value] [--default=СТАНДАРТНО] ИМЕ" +"regexp=РЕГУЛЯРЕН_ИЗРАЗ] [--value=ШАБЛОН] [--fixed-value] [--" +"default=СТАНДАРТНО] ИМЕ" msgid "" "git config set [<file-option>] [--type=<type>] [--comment=<message>] [--all] " @@ -5814,21 +5842,31 @@ msgstr "опциитe „--append“ и „--value=ШАБЛОН_ЗА_СТОЙН #, c-format msgid "" "cannot overwrite multiple values with a single value\n" -" Use a regexp, --add or --replace-all to change %s." +" Use --value=<pattern>, --append or --all to change %s." msgstr "" -"множество стойности не може да се замени с една.\n" -"За да променѝте „%s“, ползвайте регулярен израз или опциите „--add“ и „--" -"replace-all“." +"множество стойности не може да се заменят с една.\n" +" За да променѝте „%s“, ползвайте --value=РЕГУЛЯРЕН_ИЗРАЗ, „--append“ или " +"„--all“." + +msgid "unset all multi-valued config options" +msgstr "" +"изчистване на всички стойности за конфигурационните опции, които поддържат " +"много стойности" + +msgid "unset multi-valued config options with matching values" +msgstr "" +"изчистване на всички напасващи стойности за конфигурационните опции, които " +"поддържат много стойности" #, c-format msgid "no such section: %s" msgstr "такъв раззел няма: %s" msgid "editing stdin is not supported" -msgstr "не се поддържа редактиране на стандартния вход" +msgstr "редактирането на стандартния вход не се поддържа" msgid "editing blobs is not supported" -msgstr "не се поддържа редактиране на обекти-BLOB" +msgstr "редактирането на обекти-BLOB не се поддържа" #, c-format msgid "cannot create configuration file %s" @@ -5910,6 +5948,15 @@ msgstr "" "опцията „--comment“ е съвместима само с действията „add“ (добавяне)/„set“ " "(задаване)/„replace“ (замяна)" +#, c-format +msgid "" +"cannot overwrite multiple values with a single value\n" +" Use a regexp, --add or --replace-all to change %s." +msgstr "" +"множество стойности не може да се замени с една.\n" +"За да променѝте „%s“, ползвайте регулярен израз или опциите „--add“ и „--" +"replace-all“." + msgid "print sizes in human readable format" msgstr "извеждане на размерите на обектите във формат четим от хора" @@ -6119,16 +6166,16 @@ msgid "working without -z is not supported" msgstr "опцията „-z“ е задължителна" msgid "pathspec arguments not supported" -msgstr "не се поддържат аргументи с шаблони за пътища" +msgstr "аргументи с шаблони за пътища не се поддържат" msgid "revision arguments not allowed" -msgstr "не се поддържат опции за версии" +msgstr "опциите за версии не се поддържат" msgid "invalid raw diff input" msgstr "неправилен необработен вход за разлики" msgid "tree objects not supported" -msgstr "не се поддържат обекти-дървета" +msgstr "обектите-дървета не се поддържат" msgid "got EOF while reading path" msgstr "край на файл (EOF) при изчитане на път" @@ -6325,12 +6372,6 @@ msgstr "" "reencode=[yes|no]“ за обработка" #, c-format -msgid "encountered signed commit %s; use --signed-commits=<mode> to handle it" -msgstr "" -"получено е подписано подаване „%s“ — ползвайте „--signed-commits=РЕЖИМ“ за " -"обработка" - -#, c-format msgid "exporting %<PRIuMAX> signature(s) for commit %s" msgstr "изнасят се %<PRIuMAX> подпис(а) за подаването „%s“" @@ -6339,6 +6380,19 @@ msgid "stripping signature(s) from commit %s" msgstr "пропускане на подписите към подаването „%s“" #, c-format +msgid "encountered signed commit %s; use --signed-commits=<mode> to handle it" +msgstr "" +"получено е подписано подаване „%s“ — ползвайте „--signed-commits=РЕЖИМ“ за " +"обработка" + +msgid "" +"'strip-if-invalid' is not a valid mode for git fast-export with --signed-" +"commits=<mode>" +msgstr "" +"„strip-if-invalid“ е грешен РЕЖИМ за „git fast-export“ с опцията „--signed-" +"commits=РЕЖИМ“" + +#, c-format msgid "" "omitting tag %s,\n" "since tags of trees (or tags of tags of trees, etc.) are not supported." @@ -6352,11 +6406,6 @@ msgid "could not read tag %s" msgstr "етикетът „%s“ не може да се прочете" #, c-format -msgid "encountered signed tag %s; use --signed-tags=<mode> to handle it" -msgstr "" -"получен е подписан етикет „%s“ — ползвайте „--signed-tags=РЕЖИМ“ за обработка" - -#, c-format msgid "exporting signed tag %s" msgstr "изнасяне на подписан етикет „%s“" @@ -6365,6 +6414,18 @@ msgid "stripping signature from tag %s" msgstr "пропускане на подписите към етикета „%s“" #, c-format +msgid "encountered signed tag %s; use --signed-tags=<mode> to handle it" +msgstr "" +"получен е подписан етикет „%s“ — ползвайте „--signed-tags=РЕЖИМ“ за обработка" + +msgid "" +"'strip-if-invalid' is not a valid mode for git fast-export with --signed-" +"tags=<mode>" +msgstr "" +"„strip-if-invalid“ е грешен РЕЖИМ за „git fast-export“ с опцията „--signed-" +"tags=РЕЖИМ“" + +#, c-format msgid "" "tag %s tags unexported object; use --tag-of-filtered-object=<mode> to handle " "it" @@ -6756,6 +6817,33 @@ msgstr "открити са много подписи „%s“. Допълни msgid "parse_one_signature() returned unknown hash algo" msgstr "„parse_one_signature()“ върна непознат алгоритъм за контролна сума" +msgid "unknown" +msgstr "непознат" + +#, c-format +msgid "" +"stripping invalid signature for commit '%.100s...'\n" +" allegedly by %s" +msgstr "" +"пропускане на грешния подпис към подаването „%.100s…“,\n" +" вероятно е на %s" + +#, c-format +msgid "" +"stripping invalid signature for commit '%.*s'\n" +" allegedly by %s" +msgstr "" +"пропускане на грешния подпис към подаването „%.*s“,\n" +" вероятно е на %s" + +#, c-format +msgid "" +"stripping invalid signature for commit\n" +" allegedly by %s" +msgstr "" +"пропускане на грешен подпис към подаване,\n" +" вероятно е на %s" + msgid "expected committer but didn't get one" msgstr "очакваше се подаващ, но такъв липсва" @@ -6770,10 +6858,6 @@ msgstr "пропускане на подпис на подаване" msgid "importing a commit signature verbatim" msgstr "дословно внасяне на подпис на подаване" -msgid "encountered signed tag; use --signed-tags=<mode> to handle it" -msgstr "" -"получен е подписан етикет — ползвайте „--signed-tags=РЕЖИМ“ за обработка" - #, c-format msgid "importing a tag signature verbatim for tag '%s'" msgstr "дословно внасяне на подпис на етикет за „%s“" @@ -6782,6 +6866,17 @@ msgstr "дословно внасяне на подпис на етикет за msgid "stripping a tag signature for tag '%s'" msgstr "пропускане на подписа на етикета „%s“" +msgid "encountered signed tag; use --signed-tags=<mode> to handle it" +msgstr "" +"получен е подписан етикет — ползвайте „--signed-tags=РЕЖИМ“ за обработка" + +msgid "" +"'strip-if-invalid' is not a valid mode for git fast-import with --signed-" +"tags=<mode>" +msgstr "" +"„strip-if-invalid“ е грешен РЕЖИМ за „git fast-import“ с опцията „--signed-" +"tags=РЕЖИМ“" + #, c-format msgid "expected 'from' command, got '%s'" msgstr "очаква се команда „from“, а бе получена: „%s“" @@ -6941,7 +7036,7 @@ msgstr "git fetch [ОПЦИЯ…] [ХРАНИЛИЩЕ [УКАЗАТЕЛ…]]" msgid "git fetch [<options>] <group>" msgstr "git fetch [ОПЦИЯ…] ГРУПА" -msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" +msgid "git fetch --multiple [<options>] [(<repository>|<group>)...]" msgstr "git fetch --multiple [ОПЦИЯ…] [(ХРАНИЛИЩЕ|ГРУПА)…]" msgid "git fetch --all [<options>]" @@ -7188,7 +7283,7 @@ msgid "use atomic transaction to update references" msgstr "изискване на атомарни операции за обновяване на указателите" msgid "path to upload pack on remote end" -msgstr "отдалечен път, където да се качи пакетът" +msgstr "отдалечен ПЪТ, където да се качи пакетът" msgid "force overwrite of local reference" msgstr "принудително презаписване на локален указател" @@ -7219,7 +7314,7 @@ msgstr "" "хранилище и презаписване на променените" msgid "on-demand" -msgstr "ПРИ НУЖДА" +msgstr "ПРИ_НУЖДА" msgid "control recursive fetching of submodules" msgstr "управление на рекурсивното доставяне на подмодулите" @@ -7436,9 +7531,6 @@ msgstr "липсва --config=НАСТРОЙКА" msgid "got bad config --config=%s" msgstr "получена е неправилна настройка „--config=%s“" -msgid "unknown" -msgstr "непознат" - #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> #, c-format msgid "error in %s %s: %s" @@ -7533,8 +7625,12 @@ msgstr "„%s“: неправилен указател за SHA1: „%s“" msgid "%s: not a commit" msgstr "%s: не е подаване!" +#, c-format +msgid "invalid parameter: expected sha1, got '%s'" +msgstr "неправилен параметър: очаква се SHA1, а бе получено: „%s“" + msgid "notice: No default references" -msgstr "внимание: няма указатели по подразбиране" +msgstr "ВНИМАНИЕ: няма указатели по подразбиране" #, c-format msgid "%s: hash-path mismatch, found at: %s" @@ -7559,26 +7655,6 @@ msgid "Checking object directories" msgstr "Проверка на директориите с обекти" #, c-format -msgid "Checking %s link" -msgstr "Проверка на връзките на „%s“" - -#, c-format -msgid "invalid %s" -msgstr "неправилен указател „%s“" - -#, c-format -msgid "%s points to something strange (%s)" -msgstr "„%s“ сочи към нещо необичайно (%s)" - -#, c-format -msgid "%s: detached HEAD points at nothing" -msgstr "%s: отделеният връх „HEAD“ не сочи към нищо" - -#, c-format -msgid "notice: %s points to an unborn branch (%s)" -msgstr "предупреждение: „%s“ сочи към неродѐн клон (%s)" - -#, c-format msgid "Checking cache tree of %s" msgstr "Проверка на кеша на обектите-дървета на „%s“" @@ -7657,14 +7733,6 @@ msgstr "проверка на валидността на базата от да msgid "Checking objects" msgstr "Проверка на обектите" -#, c-format -msgid "%s: object missing" -msgstr "„%s“: липсващ обект" - -#, c-format -msgid "invalid parameter: expected sha1, got '%s'" -msgstr "неправилен параметър: очаква се SHA1, а бе получено: „%s“" - msgid "git fsmonitor--daemon start [<options>]" msgstr "git fsmonitor--daemon start [ОПЦИЯ…]" @@ -8056,6 +8124,9 @@ msgstr "неуспешно насрочване на задачите по по msgid "failed to add repo to global config" msgstr "неуспешно добавяне на хранилище към файла с глобални настройки" +msgid "check a specific task" +msgstr "проверка на определена задача" + msgid "git maintenance <subcommand> [<options>]" msgstr "git maintenance ПОДКОМАНДА [ОПЦИЯ…]" @@ -8467,7 +8538,7 @@ msgstr "несъответствие в подписа към пакетния #, c-format msgid "pack version %<PRIu32> unsupported" -msgstr "не се поддържа пакетиране вeрсия „%<PRIu32>“" +msgstr "пакетирането на вeрсия „%<PRIu32>“ не се поддържа" #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" @@ -8520,6 +8591,10 @@ msgid "fsck error in packed object" msgstr "грешка при проверката на пакетирани обекти" #, c-format +msgid "invalid %s" +msgstr "неправилен указател „%s“" + +#, c-format msgid "Not all child objects of %s are reachable" msgstr "Някои обекти, наследници на „%s“, не може да бъдат достигнати" @@ -8665,6 +8740,9 @@ msgstr "„--stdin“ изисква хранилище на git" msgid "--verify with no packfile name given" msgstr "опцията „--verify“ изисква име на пакетен файл" +msgid "cannot perform queued object checks outside of a repository" +msgstr "проверките на обекта в опашката не може да се изпълнят извън хранилище" + msgid "fsck error in pack objects" msgstr "грешка при проверка с „fsck“ на пакетните обекти" @@ -9442,14 +9520,6 @@ msgstr "" "git merge-file [ОПЦИЯ…] [-L ИМЕ_1 [-L ОРИГИНАЛ [-L ИМЕ_2]]] ФАЙЛ_1 ОРИГ_ФАЙЛ " "ФАЙЛ_2" -msgid "" -"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " -"\"histogram\"" -msgstr "" -"опцията приема следните варианти за алгоритъм за разлики: „myers“ (по " -"Майерс), „minimal“ (минимизиране на разликите), „patience“ (пасианс) и " -"„histogram“ (хистограмен)" - msgid "send results to standard output" msgstr "извеждане на резултатите на стандартния изход" @@ -9462,12 +9532,6 @@ msgstr "сливане на базата на „diff3“" msgid "use a zealous diff3 based merge" msgstr "засилено сливане на базата на „diff3“" -msgid "<algorithm>" -msgstr "АЛГОРИТЪМ" - -msgid "choose a diff algorithm" -msgstr "избор на АЛГОРИТЪМа за разлики" - msgid "for conflicts, use this marker size" msgstr "при конфликти да се ползва маркер с такъв БРОЙ знаци" @@ -9860,7 +9924,7 @@ msgstr "" #, c-format msgid "When finished, apply stashed changes with `git stash pop`\n" -msgstr "При завършване скатаните промени да се приложат с „git stash pop“\n" +msgstr "При завършване скатаните промѐни да се приложат с „git stash pop“\n" #, c-format msgid "warning: tag input does not pass fsck: %s" @@ -10572,6 +10636,11 @@ msgid "could not get type of object %s in pack %s" msgstr "видът на обекта „%s“ в пакет „%s“ не може да се определи" #, c-format +msgid "packfile %s is a promisor but --exclude-promisor-objects was given" +msgstr "" +"пакетът „%s“ е гарантиращ, но е зададена опцията „--exclude-promisor-objects“" + +#, c-format msgid "could not find pack '%s'" msgstr "пакетът „%s“ не може да се открие" @@ -10850,11 +10919,11 @@ msgstr "git pack-refs " 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 unstable patch ID algorithm" +msgstr "използване на нестабилния алгоритъм за идентифициране на кръпки" -msgid "use the stable patch-id algorithm" -msgstr "използване на стабилния алгоритъм за идентифициране на кръпка" +msgid "use the stable patch ID algorithm" +msgstr "използване на стабилния алгоритъм за идентифициране на кръпки" msgid "don't strip whitespace from the patch" msgstr "без махане на празните знаци в кръпката" @@ -10877,41 +10946,6 @@ msgstr "хранилище с важни обекти не може да се о msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git push [ОПЦИЯ…] [ХРАНИЛИЩЕ [УКАЗАТЕЛ_НА_ВЕРСИЯ…]]" -msgid "control for recursive fetching of submodules" -msgstr "управление на рекурсивното доставяне на подмодулите" - -msgid "Options related to merging" -msgstr "Опции при сливане" - -msgid "incorporate changes by rebasing rather than merging" -msgstr "внасяне на промѐните чрез пребазиране, а не чрез сливане" - -msgid "allow fast-forward" -msgstr "позволяване на превъртания" - -msgid "control use of pre-merge-commit and commit-msg hooks" -msgstr "" -"дали куките преди подаване и сливане и при промяна на съобщението за " -"подаване (pre-merge-commit и commit-msg) да се изпълнят" - -msgid "automatically stash/stash pop before and after" -msgstr "автоматично скатаване/прилагане на скатаното преди и след пребазиране" - -msgid "Options related to fetching" -msgstr "Опции при доставяне" - -msgid "force overwrite of local branch" -msgstr "принудително презаписване на локалния клон" - -msgid "number of submodules pulled in parallel" -msgstr "брой подмодули издърпани паралелно" - -msgid "use IPv4 addresses only" -msgstr "само адреси IPv4" - -msgid "use IPv6 addresses only" -msgstr "само адреси IPv6" - msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -11016,6 +11050,41 @@ msgstr "" "използвайте опциите „--rebase“, „--no-rebase“, „--ff-only“. Те са с\n" "приоритет пред настройките.\n" +msgid "control for recursive fetching of submodules" +msgstr "управление на рекурсивното доставяне на подмодулите" + +msgid "Options related to merging" +msgstr "Опции при сливане" + +msgid "incorporate changes by rebasing rather than merging" +msgstr "внасяне на промѐните чрез пребазиране, а не чрез сливане" + +msgid "allow fast-forward" +msgstr "позволяване на превъртания" + +msgid "control use of pre-merge-commit and commit-msg hooks" +msgstr "" +"дали куките преди подаване и сливане и при промяна на съобщението за " +"подаване (pre-merge-commit и commit-msg) да се изпълнят" + +msgid "automatically stash/stash pop before and after" +msgstr "автоматично скатаване/прилагане на скатаното преди и след пребазиране" + +msgid "Options related to fetching" +msgstr "Опции при доставяне" + +msgid "force overwrite of local branch" +msgstr "принудително презаписване на локалния клон" + +msgid "number of submodules pulled in parallel" +msgstr "брой подмодули издърпани паралелно" + +msgid "use IPv4 addresses only" +msgstr "само адреси IPv4" + +msgid "use IPv6 addresses only" +msgstr "само адреси IPv6" + msgid "Updating an unborn branch with changes added to the index." msgstr "Обновяване на неродѐн клон с промѐните от индекса" @@ -11247,7 +11316,7 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" "Обновяването е отхвърлено, защото върхът на отдалечения клон съдържа " -"промени\n" +"промѐни\n" "след последното изтегляне. Внесете отдалечените промѐни (напр. с командата\n" "„git pull…“), преди отново да изтласкате промѐните.\n" "За повече информация вижте раздела „Note about fast-forwards“ в страницата\n" @@ -11266,7 +11335,7 @@ msgid "" "instead" msgstr "" "рекурсивно обхождане на подмодулите чрез „push.recurseSubmodules=only“. " -"Вместо това се ползва ПРИ НУЖДА" +"Вместо това се ползва ПРИ_НУЖДА" #, c-format msgid "invalid value for '%s'" @@ -12941,6 +13010,10 @@ msgstr "опцията „--convert-graft-file“ не приема аргуме msgid "only one pattern can be given with -l" msgstr "опцията „-l“ приема точно един шаблон" +#, c-format +msgid "'%s' is not a valid commit-ish for %s" +msgstr "„%s“ не прилича на подаване за %s" + msgid "need some commits to replay" msgstr "необходимо е да има подавания за прилагане отново" @@ -12957,27 +13030,16 @@ msgstr "" "цели с множество източници не може да се придвижат напред, защото подредбата " "не е добре дефинирана" -msgid "" -"cannot implicitly determine whether this is an --advance or --onto operation" -msgstr "" -"не може да се определи дали това действие е за „--advance“ или „--onto“" - -msgid "" -"cannot advance target with multiple source branches because ordering would " -"be ill-defined" -msgstr "" -"цели с множество клони-източници не може да се придвижат напред, защото " -"подредбата не е добре дефинирана" - -msgid "cannot implicitly determine correct base for --onto" -msgstr "правилната база за „--onto“ не може да се определи" +#, c-format +msgid "invalid %s value: '%s'" +msgstr "неправилна стойност за „%s“: „%s“" msgid "" "(EXPERIMENTAL!) git replay ([--contained] --onto <newbase> | --advance " -"<branch>) <revision-range>..." +"<branch>) [--ref-action[=<mode>]] <revision-range>" msgstr "" "(ЕКСПЕРИМЕНТАЛНО!) git replay ([--contained] --onto НОВА_БАЗА | --advance " -"КЛОН) ДИАПАЗОН_ПОДАВАНИЯ…" +"КЛОН) [--ref-action[=РЕЖИМ]] ДИАПАЗОН_ПОДАВАНИЯ…" msgid "make replay advance given branch" msgstr "прилагането наново придвижва дадения КЛОН напред" @@ -12985,8 +13047,14 @@ msgstr "прилагането наново придвижва дадения К msgid "replay onto given commit" msgstr "прилагането наново върху даденото ПОДАВАНЕ" -msgid "advance all branches contained in revision-range" -msgstr "придвижване на всички КЛОНи в ДИАПАЗОНа_ПОДАВАНИЯ" +msgid "update all branches that point at commits in <revision-range>" +msgstr "" +"обновяване на всички клони, които сочат към подавания в ДИАПАЗОНа_ПОДАВАНИЯ" + +msgid "control ref update behavior (update|print)" +msgstr "" +"поведение при обновяването на указател: „update“ (обновяване)/„print“ " +"(извеждане)" msgid "option --onto or --advance is mandatory" msgstr "изисква се някоя от опциите „--onto“ или „--advance“" @@ -12999,14 +13067,26 @@ msgstr "" "някои опции за проследяване на указатели ще бъдат променени, защото битът " "„%s“ в структурата „struct rev_info“ има превес" +#, c-format +msgid "failed to begin ref transaction: %s" +msgstr "неуспешно начало на транзакция за указатели: %s" + msgid "error preparing revisions" msgstr "грешка при подготовката на версии" -msgid "replaying down to root commit is not supported yet!" -msgstr "не се поддържа прилагане наново и на началното подаване!" +msgid "replaying down from root commit is not supported yet!" +msgstr "прилагането наново от началното подаване не се поддържа" msgid "replaying merge commits is not supported yet!" -msgstr "не се поддържа прилагане наново и на подавания със сливане!" +msgstr "прилагането наново на подавания със сливане не се поддържа!" + +#, c-format +msgid "failed to update ref '%s': %s" +msgstr "указателят „%s“ не може да се обнови: %s" + +#, c-format +msgid "failed to commit ref transaction: %s" +msgstr "транзакцията за указатели не може да се завърши: %s" #, c-format msgid "key '%s' not found" @@ -13022,9 +13102,15 @@ msgstr "изходен формат" msgid "synonym for --format=nul" msgstr "псевдоним на „--format=nul“" +msgid "print all keys/values" +msgstr "извеждане на всички ключове/стойности" + msgid "unsupported output format" msgstr "неподдържан изходен формат" +msgid "--all and <key> cannot be used together" +msgstr "опцията „--all“ и изричен КЛЮЧ са несъвместими" + msgid "References" msgstr "Указатели" @@ -13055,6 +13141,12 @@ msgstr "Дървета" msgid "Blobs" msgstr "Обекти-BLOB" +msgid "Inflated size" +msgstr "Декомпресиран размер" + +msgid "Disk size" +msgstr "Размер на диска" + msgid "Repository structure" msgstr "Структура на хранилището" @@ -14309,7 +14401,7 @@ msgstr "неуспешно регистриране на адрес за път #, c-format msgid "failed to update remote for submodule '%s'" -msgstr "отдалеченият адрес на подмодула „%s“ не може да се промени" +msgstr "отдалеченият адрес на подмодула „%s“ не може да се променѝ" msgid "suppress output of synchronizing submodule url" msgstr "без извеждане на информация при синхронизирането на подмодул" @@ -15604,6 +15696,10 @@ msgstr "" msgid "bundle list at '%s' has no mode" msgstr "липсва режим в списъка от пратки „%s“" +#, c-format +msgid "bundle list at '%s': bundle '%s' has no uri" +msgstr "списък от пратки при „%s“: липсва адрес за пратка „%s“" + msgid "failed to create temporary file" msgstr "не може да се създаде временен файл" @@ -15627,6 +15723,10 @@ msgstr "" "преминато е ограничениeто за рекурсивно обхождане на адреси на пратки (%d)" #, c-format +msgid "bundle '%s' has no uri" +msgstr "липсва адрес за пратка „%s“" + +#, c-format msgid "failed to download bundle from URI '%s'" msgstr "неуспешно изтегляне на пратка от адрес: „%s“" @@ -16041,7 +16141,7 @@ msgid "The standard helper program to use with git-merge-index" msgstr "Стандартната помощна програма за „git-merge-index“" msgid "Perform merge without touching index or working tree" -msgstr "Извършване на сливането без промени по индекса или работното време" +msgstr "Извършване на сливането без промѐни по индекса или работното време" msgid "Run merge conflict resolution tools to resolve merge conflicts" msgstr "Изпълнение на програмите за коригиране на конфликтите при сливане" @@ -16135,8 +16235,8 @@ msgstr "Обобщение на предстоящите промѐни" msgid "Reuse recorded resolution of conflicted merges" msgstr "Преизползване на вече запазено коригиране на конфликт при сливане" -msgid "Reset current HEAD to the specified state" -msgstr "Привеждане на указателя „HEAD“ към зададеното състояние" +msgid "Set `HEAD` or the index to a known state" +msgstr "Задаване на указателя „HEAD“ или индекса към известно състояние" msgid "Restore working tree files" msgstr "Възстановяване на файловете в работното дърво" @@ -16488,7 +16588,7 @@ msgid "Clearing commit marks in commit graph" msgstr "Изчистване на отбелязванията на подаванията в гра̀фа с подаванията" msgid "Computing commit graph topological levels" -msgstr "Изчисляване на топологичните нива в гра̀фа с подаванията" +msgstr "Изчисляване на топологичните нива̀ в гра̀фа с подаванията" msgid "Computing commit graph generation numbers" msgstr "Изчисляване на номерата на поколенията в гра̀фа с подаванията" @@ -17717,10 +17817,6 @@ msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Непозната стойност „%s“ за настройката „diff.submodule“" #, c-format -msgid "unknown value for config '%s': %s" -msgstr "непозната стойност за настройката „%s“: „%s“" - -#, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" @@ -17797,7 +17893,7 @@ msgstr "неправилен аргумент за „--color-moved“: „%s“ #, c-format msgid "invalid mode '%s' in --color-moved-ws" -msgstr "неправилен режим „%s“ за „ --color-moved-ws“" +msgstr "грешен режим „%s“ за „ --color-moved-ws“" #, c-format msgid "invalid argument to %s" @@ -18309,7 +18405,7 @@ msgstr "" #, c-format msgid "invalid mode for object creation: %s" -msgstr "неправилен режим за създаването на обекти: %s" +msgstr "грешен режим за създаването на обекти: %s" #, c-format msgid "malformed value for %s" @@ -19425,7 +19521,7 @@ msgid "" msgstr "" " ⁃ преминаване към подмодула (%s), след които или де се слее подаването\n" " „%s“, или да се обнови към съществуващо подаване, в които\n" -" тези промени са слети\n" +" тези промѐни са слети\n" #, c-format msgid "" @@ -19923,6 +20019,9 @@ msgstr "непълно прочитане по време на индексир msgid "%s: failed to insert into database" msgstr "„%s“ не може да се вмъкне в базата от данни" +msgid "cannot add a submodule of a different hash algorithm" +msgstr "не може да добавите подмодул с различен алгоритъм за контролни суми" + #, c-format msgid "%s: unsupported file type" msgstr "неподдържан вид файл: „%s“" @@ -20772,7 +20871,7 @@ msgid "flush packet write failed" msgstr "неуспешно изчистване на буферите при запис на пакет" msgid "protocol error: impossibly long line" -msgstr "протоколна грешка: прекалено дълъг ред" +msgstr "ПРОТОКОЛНА ГРЕШКА: прекалено дълъг ред" msgid "packet write with format failed" msgstr "неуспешен запис на пакет с формат" @@ -20794,15 +20893,15 @@ msgstr "отдалеченото хранилище неочаквано пре #, c-format msgid "protocol error: bad line length character: %.4s" -msgstr "протоколна грешка: неправилeн знак за дължина на ред: %.4s" +msgstr "ПРОТОКОЛНА ГРЕШКА: неправилeн знак за дължина на ред: %.4s" #, c-format msgid "protocol error: bad line length %d" -msgstr "протоколна грешка: неправилна дължина на ред: %d" +msgstr "ПРОТОКОЛНА ГРЕШКА: неправилна дължина на ред: %d" #, c-format msgid "remote error: %s" -msgstr "отдалечена грешка: %s" +msgstr "ОТДАЛЕЧЕНА ГРЕШКА: %s" msgid "Refreshing index" msgstr "Обновяване на индекса" @@ -21436,6 +21535,10 @@ msgid "--format=%.*s cannot be used with --python, --shell, --tcl" msgstr "" "опцията „--format=%.*s“ е несъвместима с „--python“, „--shell“, „--tcl“" +#, c-format +msgid "parse_object_buffer failed on %s for %s" +msgstr "неуспешно анализиране чрез „parse_object_buffer“ на „%s“ за „%s“" + msgid "failed to run 'describe'" msgstr "неуспешно изпълнение на „describe“" @@ -21467,10 +21570,6 @@ msgid "missing object %s for %s" msgstr "обектът „%s“ липсва за „%s“" #, c-format -msgid "parse_object_buffer failed on %s for %s" -msgstr "неуспешно анализиране чрез „parse_object_buffer“ на „%s“ за „%s“" - -#, c-format msgid "malformed object at '%s'" msgstr "обект със сгрешен формат при „%s“" @@ -21777,6 +21876,18 @@ msgid "refname %s is a symbolic ref, copying it is not supported" msgstr "името на указател „%s“ е символен указател, не може да се копира" #, c-format +msgid "reftable stack for worktree '%s' is broken" +msgstr "таблицата с указатели за работното дърво в „%s“ е повредена" + +#, c-format +msgid "could not create iterator for worktree '%s'" +msgstr "не може да се създаде итератор за работното дърво в „%s“" + +#, c-format +msgid "could not read record for worktree '%s'" +msgstr "не може да се създаде запис за работното дърво в „%s“" + +#, c-format msgid "pattern '%s' has no '*'" msgstr "шаблонът „%s“ не съдържа „*“" @@ -21878,14 +21989,14 @@ msgstr "умният вариант на http не може да доставя #, c-format msgid "protocol error: expected sha/ref, got '%s'" -msgstr "протоколна грешка: очаква се SHA1 или указател, а бе получено: „%s“" +msgstr "ПРОТОКОЛНА ГРЕШКА: очаква се SHA1 или указател, а бе получено: „%s“" #, c-format msgid "http transport does not support %s" msgstr "транспортът по http не поддържа „%s“" msgid "protocol error: expected '<url> <path>', missing space" -msgstr "протоколна грешка: очаква се „АДРЕС ПЪТ“, липсва интервал" +msgstr "ПРОТОКОЛНА ГРЕШКА: очаква се „АДРЕС ПЪТ“, липсва интервал" #, c-format msgid "failed to download file at URL '%s'" @@ -22212,6 +22323,11 @@ msgstr "" "командата „pack-objects“ не може да завърши за препакетирането на " "гарантиращите обекти" +msgid "could not start pack-objects to repack promisor packs" +msgstr "" +"командата „pack-objects“ не може да се стартира за препакетирането на " +"гарантиращите обекти" + #, c-format msgid "pack prefix %s does not begin with objdir %s" msgstr "името на пакетния файл „%s“ не започва с директорията за обекти с „%s“" @@ -22502,7 +22618,7 @@ msgid "(enable|disable|keep)" msgstr "(enable=включване|disable=изключване|keep=запазване)" msgid "signal how to adjust background maintenance" -msgstr "как да се промени поддръжката на заден фон" +msgstr "как да се променѝ поддръжката на заден фон" msgid "" "scalar reconfigure [--maintenance=(enable|disable|keep)] [--all | " @@ -23044,7 +23160,7 @@ msgid "" "'merge -c' on the commit" msgstr "" "„reword“ не приема подаване със сливане. Ако искате да приложите\n" -"сливането наново и да промените съобщението при подаване, изпълнете\n" +"сливането наново и да променѝте съобщението при подаване, изпълнете\n" "\n" " git merge -C ПОДАВАНЕ" @@ -23265,10 +23381,6 @@ msgstr "" msgid "illegal label name: '%.*s'" msgstr "неправилно име на етикет: „%.*s“" -#, c-format -msgid "could not resolve '%s'" -msgstr "„%s“ липсва" - msgid "writing fake root commit" msgstr "запазване на фалшиво начално подаване" @@ -23370,7 +23482,7 @@ msgid "autostash reference is a symref" msgstr "указателят за автоматично скатано e файл с указател" msgid "could not detach HEAD" -msgstr "указателят „HEAD“ не може да се отдели" +msgstr "указателят „HEAD“ не може да се отделѝ" #, c-format msgid "Stopped at HEAD\n" @@ -23762,49 +23874,68 @@ msgstr "неправилен формат за „%s“: елементът „% msgid "bad %s format: %%%.*s" msgstr "неправилен формат за „%s“: %%%.*s" -#. TRANSLATORS: IEC 80000-13:2008 gibibyte #, c-format -msgid "%u.%2.2u GiB" -msgstr "%u.%2.2u GiB" +msgid "%u.%2.2u" +msgstr "%u.%2.2u" -#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#, c-format -msgid "%u.%2.2u GiB/s" -msgstr "%u.%2.2u GiB/s" +#. TRANSLATORS: SI decimal prefix symbol for 10^9 +msgid "G" +msgstr "G" -#. TRANSLATORS: IEC 80000-13:2008 mebibyte -#, c-format -msgid "%u.%2.2u MiB" -msgstr "%u.%2.2u MiB" +#. TRANSLATORS: SI decimal prefix symbol for 10^6 +msgid "M" +msgstr "M" -#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#, c-format -msgid "%u.%2.2u MiB/s" -msgstr "%u.%2.2u MiB/s" +#. TRANSLATORS: SI decimal prefix symbol for 10^3 +msgid "k" +msgstr "k" -#. TRANSLATORS: IEC 80000-13:2008 kibibyte -#, c-format -msgid "%u.%2.2u KiB" -msgstr "%u.%2.2u KiB" +#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second and gibibyte +msgid "GiB/s" +msgstr "GiB/s" -#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#, c-format -msgid "%u.%2.2u KiB/s" -msgstr "%u.%2.2u KiB/s" +msgid "GiB" +msgstr "GiB" -#. TRANSLATORS: IEC 80000-13:2008 byte -#, c-format -msgid "%u byte" -msgid_plural "%u bytes" -msgstr[0] "%u байт" -msgstr[1] "%u байта" +#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second and mebibyte +msgid "MiB/s" +msgstr "MiB/s" + +msgid "MiB" +msgstr "MiB" + +#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second and kibibyte +msgid "KiB/s" +msgstr "KiB/s" + +msgid "KiB" +msgstr "KiB" + +#. TRANSLATORS: IEC 80000-13:2008 byte/second and byte +msgid "B/s" +msgstr "B/s" + +msgid "B" +msgstr "B" #. TRANSLATORS: IEC 80000-13:2008 byte/second +msgid "byte/s" +msgid_plural "bytes/s" +msgstr[0] "byte/s" +msgstr[1] "byte/s" + +#. TRANSLATORS: IEC 80000-13:2008 byte +msgid "byte" +msgid_plural "bytes" +msgstr[0] "байт" +msgstr[1] "байта" + +#. TRANSLATORS: The first argument is the number string. The second +#. argument is the unit string (i.e. "12.34 MiB/s"). +#. #, c-format -msgid "%u byte/s" -msgid_plural "%u bytes/s" -msgstr[0] "%u байт/сек." -msgstr[1] "%u байта/сек." +msgid "%s %s" +msgstr "%s %s" #, c-format msgid "ignoring suspicious submodule name: %s" @@ -23821,7 +23952,7 @@ msgstr "" #, c-format msgid "Could not update .gitmodules entry %s" -msgstr "Записът „%s“ във файла „.gitmodules“ не може да се промени" +msgstr "Записът „%s“ във файла „.gitmodules“ не може да се променѝ" msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" @@ -24102,9 +24233,6 @@ msgstr "брой байтове" msgid "number of requests per thread" msgstr "брой заявки на нишка" -msgid "byte" -msgstr "байта" - msgid "ballast character" msgstr "знаци за пращане" @@ -24666,16 +24794,16 @@ msgid "error: unable to format message: %s\n" msgstr "ГРЕШКА: съобщението не може да се форматира: %s\n" msgid "usage: " -msgstr "употреба: " +msgstr "УПОТРЕБА: " msgid "fatal: " -msgstr "фатална грешка: " +msgstr "ФАТАЛНА ГРЕШКА: " msgid "error: " msgstr "ГРЕШКА: " msgid "warning: " -msgstr "предупреждение: " +msgstr "ПРЕДУПРЕЖДЕНИЕ: " #, c-format msgid "'%s' is nominated for removal.\n" @@ -25611,7 +25739,7 @@ msgstr "" #, perl-format msgid "Outlook reassigned Message-ID to: %s\n" -msgstr "Outlook промени „Message-ID“ да е: %s\n" +msgstr "Outlook променѝ „Message-ID“ да е: %s\n" msgid "Warning: Could not retrieve Message-ID from server response.\n" msgstr "ПРЕДУПРЕЖДЕНИЕ: в отговора на сървъра липсва „Message-ID“.\n" @@ -87,8 +87,8 @@ msgid "" msgstr "" "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2025-11-07 21:01+0100\n" -"PO-Revision-Date: 2025-11-09 14:56+0100\n" +"POT-Creation-Date: 2026-01-22 23:57+0000\n" +"PO-Revision-Date: 2026-01-28 19:43+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" @@ -1851,8 +1851,8 @@ msgstr "" msgid "'%s' is not a valid branch name" msgstr "'%s' n'est pas un nom de branche valide" -msgid "See `man git check-ref-format`" -msgstr "Voir `man git check-ref-format`" +msgid "See 'git help check-ref-format'" +msgstr "Voir 'git help check-ref-format'" #, c-format msgid "a branch named '%s' already exists" @@ -2766,6 +2766,17 @@ msgid "must end with a color" msgstr "doit finir avec une couleur" #, c-format +msgid "unknown value for config '%s': %s" +msgstr "valeur inconnue pour la config '%s' : %s" + +msgid "" +"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " +"\"histogram\"" +msgstr "" +"l'option diff-algorithm accept \"myers\", \"minimal\", \"patience\" et " +"\"histogram\"" + +#, c-format msgid "cannot find revision %s to ignore" msgstr "référence à ignorer %s introuvable" @@ -2822,6 +2833,12 @@ msgstr "afficher le courriel de l'auteur au lieu du nom (Défaut : désactivé)" msgid "ignore whitespace differences" msgstr "ignorer les différences d'espace" +msgid "<algorithm>" +msgstr "<algorithme>" + +msgid "choose a diff algorithm" +msgstr "choisir un algorithme de différence" + msgid "rev" msgstr "rév" @@ -2838,7 +2855,7 @@ msgstr "" msgid "color lines by age" msgstr "colorier les lignes par âge" -msgid "spend extra cycles to find better match" +msgid "spend extra cycles to find a better match" msgstr "" "dépenser des cycles supplémentaires pour trouver une meilleure correspondance" @@ -4054,8 +4071,8 @@ msgid "missing branch name; try -%c" msgstr "nom de branche manquant ; essayez -%c" #, c-format -msgid "could not resolve %s" -msgstr "impossible de résoudre %s" +msgid "could not resolve '%s'" +msgstr "impossible de résoudre '%s'" msgid "invalid path specification" msgstr "spécification de chemin invalide" @@ -5561,10 +5578,18 @@ msgstr "--append ne s'applique pas avec --value=<motif>" #, c-format msgid "" "cannot overwrite multiple values with a single value\n" -" Use a regexp, --add or --replace-all to change %s." +" Use --value=<pattern>, --append or --all to change %s." msgstr "" "impossible de surcharger des valeurs multiples avec une seule valeur\n" -" Utilisez une regex, --add ou --replace-all pour modifier %s." +" Utilisez --value=<motif>, --append ou --all pour modifier %s." + +msgid "unset all multi-valued config options" +msgstr "réinitialiser toutes les options de configuration multi-valeurs" + +msgid "unset multi-valued config options with matching values" +msgstr "" +"réinitialiser toutes les options de configuration multi-valeurs ayant des " +"valeurs correspondantes" #, c-format msgid "no such section: %s" @@ -5651,6 +5676,14 @@ msgstr "--default n'est applicable qu'avec --get" msgid "--comment is only applicable to add/set/replace operations" msgstr "--comment n'est applicable qu'avec les opérations add/set/replace" +#, c-format +msgid "" +"cannot overwrite multiple values with a single value\n" +" Use a regexp, --add or --replace-all to change %s." +msgstr "" +"impossible de surcharger des valeurs multiples avec une seule valeur\n" +" Utilisez une regex, --add ou --replace-all pour modifier %s." + msgid "print sizes in human readable format" msgstr "affiche les tailles dans un format humainement lisible" @@ -6058,11 +6091,6 @@ msgstr "" "--reencode=(yes|no) pour le gérer" #, c-format -msgid "encountered signed commit %s; use --signed-commits=<mode> to handle it" -msgstr "" -"commit signé %s rencontré ; utilisez --signed-commits=<mode> pour le gérer" - -#, c-format msgid "exporting %<PRIuMAX> signature(s) for commit %s" msgstr "export de %<PRIuMAX> signature(s) pour le commit %s" @@ -6071,6 +6099,18 @@ msgid "stripping signature(s) from commit %s" msgstr "suppression de signature(s) du commit %s" #, c-format +msgid "encountered signed commit %s; use --signed-commits=<mode> to handle it" +msgstr "" +"commit signé %s rencontré ; utilisez --signed-commits=<mode> pour le gérer" + +msgid "" +"'strip-if-invalid' is not a valid mode for git fast-export with --signed-" +"commits=<mode>" +msgstr "" +"'strip-if-invalid' n'est pas un mode valide pour git fast-export avec --" +"signed-commits=<mode>" + +#, c-format msgid "" "omitting tag %s,\n" "since tags of trees (or tags of tags of trees, etc.) are not supported." @@ -6084,11 +6124,6 @@ msgid "could not read tag %s" msgstr "impossible de lire l'étiquette %s" #, c-format -msgid "encountered signed tag %s; use --signed-tags=<mode> to handle it" -msgstr "" -"étiquette signée %s rencontrée ; utilisez --signed-tags=<mode> pour la gérer" - -#, c-format msgid "exporting signed tag %s" msgstr "export de l'étiquette signée %s" @@ -6097,6 +6132,18 @@ msgid "stripping signature from tag %s" msgstr "suppression de la signature dans l'étiquette %s" #, c-format +msgid "encountered signed tag %s; use --signed-tags=<mode> to handle it" +msgstr "" +"étiquette signée %s rencontrée ; utilisez --signed-tags=<mode> pour la gérer" + +msgid "" +"'strip-if-invalid' is not a valid mode for git fast-export with --signed-" +"tags=<mode>" +msgstr "" +"'strip-if-invalid' n'est pas un mode valide pour git fast-export avec --" +"signed-tags=<mode>" + +#, c-format msgid "" "tag %s tags unexported object; use --tag-of-filtered-object=<mode> to handle " "it" @@ -6491,6 +6538,33 @@ msgstr "multiple signatures %s trouvées, signatures additionnelles ignorées" msgid "parse_one_signature() returned unknown hash algo" msgstr "parse_one_signature() a renvoyé un algo d'empreinte inconnu" +msgid "unknown" +msgstr "inconnu" + +#, c-format +msgid "" +"stripping invalid signature for commit '%.100s...'\n" +" allegedly by %s" +msgstr "" +"suppression de la signature invalide pour le commit '%.100s...'\n" +" prétendument par %s" + +#, c-format +msgid "" +"stripping invalid signature for commit '%.*s'\n" +" allegedly by %s" +msgstr "" +"suppression de la signature invalide pour le commit '%.*s'\n" +" prétendument par %s" + +#, c-format +msgid "" +"stripping invalid signature for commit\n" +" allegedly by %s" +msgstr "" +"suppression de la signature invalide pour le commit\n" +" prétendument par %s" + msgid "expected committer but didn't get one" msgstr "validateur attendu mais aucune information fournie" @@ -6504,10 +6578,6 @@ msgstr "une signature de commit ignorée" msgid "importing a commit signature verbatim" msgstr "import d'une signature de commit verbatim" -msgid "encountered signed tag; use --signed-tags=<mode> to handle it" -msgstr "" -"étiquette signée rencontrée ; utilisez --signed-tags=<mode> pour la gérer" - #, c-format msgid "importing a tag signature verbatim for tag '%s'" msgstr "import d'une signature d'étiquette verbatim pour l'étiquette '%s'" @@ -6516,6 +6586,17 @@ msgstr "import d'une signature d'étiquette verbatim pour l'étiquette '%s'" msgid "stripping a tag signature for tag '%s'" msgstr "suppression d'une signature d'étiquette de l'étiquette '%s'" +msgid "encountered signed tag; use --signed-tags=<mode> to handle it" +msgstr "" +"étiquette signée rencontrée ; utilisez --signed-tags=<mode> pour la gérer" + +msgid "" +"'strip-if-invalid' is not a valid mode for git fast-import with --signed-" +"tags=<mode>" +msgstr "" +"'strip-if-invalid' n'est pas un mode valide pour git fast-import avec --" +"signed-tags=<mode>" + #, c-format msgid "expected 'from' command, got '%s'" msgstr "Commande 'from' attendue, '%s' trouvé" @@ -6675,8 +6756,8 @@ msgstr "git fetch [<options>] [<dépôt> [<spécification-de-référence>...]]" msgid "git fetch [<options>] <group>" msgstr "git fetch [<options>] <groupe>" -msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" -msgstr "git fetch --multiple [<options>] [(<dépôt> | <groupe>)...]" +msgid "git fetch --multiple [<options>] [(<repository>|<group>)...]" +msgstr "git fetch --multiple [<options>] [(<dépôt>|<groupe>)...]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<options>]" @@ -7159,9 +7240,6 @@ msgstr "--config=<config> manquant" msgid "got bad config --config=%s" msgstr "config incorrecte --config=%s" -msgid "unknown" -msgstr "inconnu" - #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> #, c-format msgid "error in %s %s: %s" @@ -7256,6 +7334,10 @@ msgstr "%s : pointeur de sha1 invalide %s" msgid "%s: not a commit" msgstr "l'objet %s n'est pas un commit" +#, c-format +msgid "invalid parameter: expected sha1, got '%s'" +msgstr "paramètre invalide : sha-1 attendu, '%s' trouvé" + msgid "notice: No default references" msgstr "note : pas de référence par défaut" @@ -7282,26 +7364,6 @@ msgid "Checking object directories" msgstr "Vérification des répertoires d'objet" #, c-format -msgid "Checking %s link" -msgstr "Vérification du lien %s" - -#, c-format -msgid "invalid %s" -msgstr "%s invalide" - -#, c-format -msgid "%s points to something strange (%s)" -msgstr "%s pointe sur quelque chose bizarre (%s)" - -#, c-format -msgid "%s: detached HEAD points at nothing" -msgstr "%s : la HEAD détachée ne pointe sur rien" - -#, c-format -msgid "notice: %s points to an unborn branch (%s)" -msgstr "note : %s pointe sur une branche non-née (%s)" - -#, c-format msgid "Checking cache tree of %s" msgstr "Vérification de l'arbre cache de %s" @@ -7381,14 +7443,6 @@ msgstr "vérifier la cohérence de la base de données des références" msgid "Checking objects" msgstr "Vérification des objets" -#, c-format -msgid "%s: object missing" -msgstr "%s : objet manquant" - -#, c-format -msgid "invalid parameter: expected sha1, got '%s'" -msgstr "paramètre invalide : sha-1 attendu, '%s' trouvé" - msgid "git fsmonitor--daemon start [<options>]" msgstr "git fsmonitor--daemon start [<options>]" @@ -7777,6 +7831,9 @@ msgstr "impossible de mettre en place la planification de maintenance" msgid "failed to add repo to global config" msgstr "échec de l'ajout du dépôt à la config globale" +msgid "check a specific task" +msgstr "vérifier une tâche spécifique" + msgid "git maintenance <subcommand> [<options>]" msgstr "git maintenance <subcommand> [<options>]" @@ -8238,6 +8295,10 @@ msgid "fsck error in packed object" msgstr "erreur de fsck dans l'objet empaqueté" #, c-format +msgid "invalid %s" +msgstr "%s invalide" + +#, c-format msgid "Not all child objects of %s are reachable" msgstr "Tous les objets enfants de %s ne sont pas accessibles" @@ -8380,6 +8441,11 @@ msgstr "--stdin requiert un dépôt git" msgid "--verify with no packfile name given" msgstr "--verify sans nom de fichier paquet donné" +msgid "cannot perform queued object checks outside of a repository" +msgstr "" +"impossible d'effectuer les vérifications des objets en attentes hors d'un " +"dépôt" + msgid "fsck error in pack objects" msgstr "erreur de fsck dans les objets paquets" @@ -9155,13 +9221,6 @@ msgstr "" "git merge-file [<options>] [-L <nom1> [-L <orig> [-L <nom2>]]] <fichier1> " "<fichier-orig> <fichier2>" -msgid "" -"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " -"\"histogram\"" -msgstr "" -"l'option diff-algorithm accept \"myers\", \"minimal\", \"patience\" et " -"\"histogram\"" - msgid "send results to standard output" msgstr "envoyer les résultats sur la sortie standard" @@ -9174,12 +9233,6 @@ msgstr "utiliser une fusion basée sur diff3" msgid "use a zealous diff3 based merge" msgstr "utiliser une fusion basée sur un diff3 zélée" -msgid "<algorithm>" -msgstr "<algorithme>" - -msgid "choose a diff algorithm" -msgstr "choisir un algorithme de différence" - msgid "for conflicts, use this marker size" msgstr "pour les conflits, utiliser cette taille de marqueur" @@ -10271,6 +10324,12 @@ msgid "could not get type of object %s in pack %s" msgstr "impossible d'obtenir le type de l'objet %s dans le paquet %s" #, c-format +msgid "packfile %s is a promisor but --exclude-promisor-objects was given" +msgstr "" +"le fichier paquet %s est un prometteur mais --exclude-promisor-objects a été " +"spécifé" + +#, c-format msgid "could not find pack '%s'" msgstr "impossible de trouver le paquet '%s'" @@ -10539,10 +10598,10 @@ msgstr "git pack-refs " 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 unstable patch ID algorithm" +msgstr "utiliser l'algorithme patch-id instable" -msgid "use the stable patch-id algorithm" +msgid "use the stable patch ID algorithm" msgstr "utiliser l'algorithme stable patch-id" msgid "don't strip whitespace from the patch" @@ -10566,39 +10625,6 @@ 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>...]]" -msgid "control for recursive fetching of submodules" -msgstr "contrôler la récupération récursive dans les sous-modules" - -msgid "Options related to merging" -msgstr "Options relatives à la fusion" - -msgid "incorporate changes by rebasing rather than merging" -msgstr "incorporer les modifications en rebasant plutôt qu'en fusionnant" - -msgid "allow fast-forward" -msgstr "autoriser l'avance rapide" - -msgid "control use of pre-merge-commit and commit-msg hooks" -msgstr "contrôler l'utilisation des crochets pre-merge-commit et commit-msg" - -msgid "automatically stash/stash pop before and after" -msgstr "remiser et réappliquer automatiquement avant et après" - -msgid "Options related to fetching" -msgstr "Options relatives au rapatriement" - -msgid "force overwrite of local branch" -msgstr "forcer l'écrasement de la branche locale" - -msgid "number of submodules pulled in parallel" -msgstr "nombre de sous-modules tirés en parallèle" - -msgid "use IPv4 addresses only" -msgstr "n'utiliser que des adresses IPv4" - -msgid "use IPv6 addresses only" -msgstr "n'utiliser que des adresses IPv6" - msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -10705,6 +10731,39 @@ msgstr "" "passer --rebase, --no-rebase ou --ff-only sur la ligne de commande pour\n" "remplacer à l'invocation la valeur par défaut configurée.\n" +msgid "control for recursive fetching of submodules" +msgstr "contrôler la récupération récursive dans les sous-modules" + +msgid "Options related to merging" +msgstr "Options relatives à la fusion" + +msgid "incorporate changes by rebasing rather than merging" +msgstr "incorporer les modifications en rebasant plutôt qu'en fusionnant" + +msgid "allow fast-forward" +msgstr "autoriser l'avance rapide" + +msgid "control use of pre-merge-commit and commit-msg hooks" +msgstr "contrôler l'utilisation des crochets pre-merge-commit et commit-msg" + +msgid "automatically stash/stash pop before and after" +msgstr "remiser et réappliquer automatiquement avant et après" + +msgid "Options related to fetching" +msgstr "Options relatives au rapatriement" + +msgid "force overwrite of local branch" +msgstr "forcer l'écrasement de la branche locale" + +msgid "number of submodules pulled in parallel" +msgstr "nombre de sous-modules tirés en parallèle" + +msgid "use IPv4 addresses only" +msgstr "n'utiliser que des adresses IPv4" + +msgid "use IPv6 addresses only" +msgstr "n'utiliser que des adresses IPv6" + msgid "Updating an unborn branch with changes added to the index." msgstr "" "Mise à jour d'une branche non encore créée avec les changements ajoutés dans " @@ -12600,6 +12659,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" +#, c-format +msgid "'%s' is not a valid commit-ish for %s" +msgstr "'%s' n'est pas un commit-esque valide pour l'option %s" + msgid "need some commits to replay" msgstr "commits requis pour pouvoir rejouer" @@ -12616,28 +12679,16 @@ msgstr "" "impossible d'avancer la cible avec des sources multiples parce l'ordre ne " "serait pas total" -msgid "" -"cannot implicitly determine whether this is an --advance or --onto operation" -msgstr "" -"impossible de déterminer implicitement s'il y a une opération --advance ou --" -"onto" - -msgid "" -"cannot advance target with multiple source branches because ordering would " -"be ill-defined" -msgstr "" -"impossible d'avancer la cible sur des branches sources multiples parce que " -"l'ordre ne serait pas total" - -msgid "cannot implicitly determine correct base for --onto" -msgstr "impossible de déterminer implicitement une base correcte pour --onto" +#, c-format +msgid "invalid %s value: '%s'" +msgstr "valeur invalide de %s : '%s'" msgid "" "(EXPERIMENTAL!) git replay ([--contained] --onto <newbase> | --advance " -"<branch>) <revision-range>..." +"<branch>) [--ref-action[=<mode>]] <revision-range>" msgstr "" "(EXPERIMENTAL!) git replay ([--contained] --onto <nouvelle-base> | --advance " -"<branche>) <plage-de-révision>..." +"<branche>) [--ref-action[=<mode>]] <plage-de-révision>" msgid "make replay advance given branch" msgstr "faire rejouer en avançant la branche indiquée" @@ -12645,8 +12696,13 @@ msgstr "faire rejouer en avançant la branche indiquée" msgid "replay onto given commit" msgstr "rejouer par-dessus le commit indiqué" -msgid "advance all branches contained in revision-range" -msgstr "avancer toutes les branches contenues dans la plage-de-révisions" +msgid "update all branches that point at commits in <revision-range>" +msgstr "" +"mettre à jour les branches qui pointent sur les commits dans <plage-de-" +"révisions>" + +msgid "control ref update behavior (update|print)" +msgstr "contrôler le comportement de mise à jour de ref (update|print)" msgid "option --onto or --advance is mandatory" msgstr "une option --onto ou --advance est obligatoire" @@ -12659,16 +12715,28 @@ msgstr "" "certaines options de parcours de révs seront surchargées car le bit '%s' " "dans 'struct rev_info' sera forcé" +#, c-format +msgid "failed to begin ref transaction: %s" +msgstr "impossible de commencer la transaction de réf ; %s" + msgid "error preparing revisions" msgstr "erreur lors de la préparation des révisions" -msgid "replaying down to root commit is not supported yet!" -msgstr "rejouer jusqu'au commit racine n'est pas encore géré !" +msgid "replaying down from root commit is not supported yet!" +msgstr "rejouer depuis le commit racine n'est pas encore géré !" msgid "replaying merge commits is not supported yet!" msgstr "rejouer des commits de fusion n'est pas encore géré !" #, c-format +msgid "failed to update ref '%s': %s" +msgstr "échec de la mise à jour de la réf '%s' : %s" + +#, c-format +msgid "failed to commit ref transaction: %s" +msgstr "impossible de valider la transaction de réf : %s" + +#, c-format msgid "key '%s' not found" msgstr "clé '%s' non trouvée" @@ -12682,9 +12750,15 @@ msgstr "format de sortie" msgid "synonym for --format=nul" msgstr "synonymes de --format=nul" +msgid "print all keys/values" +msgstr "afficher toutes les clés/valeurs" + msgid "unsupported output format" msgstr "format de sortie non géré" +msgid "--all and <key> cannot be used together" +msgstr "--all et <clé> ne peuvent pas être utilisées ensemble" + msgid "References" msgstr "Références" @@ -12715,6 +12789,12 @@ msgstr "Arbres" msgid "Blobs" msgstr "Blobs" +msgid "Inflated size" +msgstr "taille décompressée" + +msgid "Disk size" +msgstr "Taille sur disque" + msgid "Repository structure" msgstr "Structure de dépôt" @@ -15271,6 +15351,10 @@ msgstr "impossible d'analyser la clé de liste de colis %s avec la valeur '%s'" msgid "bundle list at '%s' has no mode" msgstr "la liste de colis n'a pas de mode à '%s'" +#, c-format +msgid "bundle list at '%s': bundle '%s' has no uri" +msgstr "la liste de colis à '%s' ; le colis '%s' n'a pas d'URI" + msgid "failed to create temporary file" msgstr "impossible de créer un fichier temporaire" @@ -15293,6 +15377,10 @@ msgid "exceeded bundle URI recursion limit (%d)" msgstr "limite de récursion d'URI de colis dépassée (%d)" #, c-format +msgid "bundle '%s' has no uri" +msgstr "le colis '%s' n'a pas d'URI" + +#, c-format msgid "failed to download bundle from URI '%s'" msgstr "impossible de télécharger le colis depuis l'URI '%s'" @@ -15805,8 +15893,8 @@ msgstr "Générer une résumé des modifications en attentes" msgid "Reuse recorded resolution of conflicted merges" msgstr "Réutiliser une résolution enregistrée de fusions conflictuelles" -msgid "Reset current HEAD to the specified state" -msgstr "Réinitialiser la HEAD courante à l'état spécifié" +msgid "Set `HEAD` or the index to a known state" +msgstr "Positionner `HEAD` ou l'index à un état connu" msgid "Restore working tree files" msgstr "Restaurer les fichiers l'arbre de travail" @@ -17376,10 +17464,6 @@ msgstr "" "Valeur inconnue pour la variable de configuration 'diff.submodule' : '%s'" #, c-format -msgid "unknown value for config '%s': %s" -msgstr "valeur inconnue pour la config '%s' : %s" - -#, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" @@ -19555,6 +19639,10 @@ msgstr "lecture tronquée pendant l'indexation de %s" msgid "%s: failed to insert into database" msgstr "%s : échec de l'insertion dans la base de données" +msgid "cannot add a submodule of a different hash algorithm" +msgstr "" +"impossible d'ajouter un sous-module ayant un algorithme d'empreinte différent" + #, c-format msgid "%s: unsupported file type" msgstr "%s : type de fichier non supporté" @@ -21037,6 +21125,10 @@ msgstr "cette commande rejette l'atome %%(%.*s)" msgid "--format=%.*s cannot be used with --python, --shell, --tcl" msgstr "--format=%.*s ne peut pas être utilisé avec --python, --shell, --tcl" +#, c-format +msgid "parse_object_buffer failed on %s for %s" +msgstr "échec de parse_object_buffer sur %s pour %s" + msgid "failed to run 'describe'" msgstr "échec pour lancer 'describe'" @@ -21068,10 +21160,6 @@ msgid "missing object %s for %s" msgstr "objet manquant %s pour %s" #, c-format -msgid "parse_object_buffer failed on %s for %s" -msgstr "échec de parse_object_buffer sur %s pour %s" - -#, c-format msgid "malformed object at '%s'" msgstr "objet malformé à '%s'" @@ -21377,6 +21465,18 @@ msgstr "" "le nom de réf %s est une réf symbolique, la copie n'est pas prise en charge" #, c-format +msgid "reftable stack for worktree '%s' is broken" +msgstr "la pile de reftable pour l'arbre-de-travail '%s' est cassée" + +#, c-format +msgid "could not create iterator for worktree '%s'" +msgstr "impossible de créer l'itérateur l'arbre-de-travail '%s'" + +#, c-format +msgid "could not read record for worktree '%s'" +msgstr "impossible de lire l'enregistrement pour l'arbre-de-travail '%s'" + +#, c-format msgid "pattern '%s' has no '*'" msgstr "la valeur '%s' du motif n'a pas de '*'" @@ -21800,10 +21900,11 @@ msgstr "impossible de revenir la bitmap obsolète : %s" msgid "could not start pack-objects to repack promisor objects" msgstr "" -"ne pas démarrer pack-objects pour ré-empaqueter les objects de prometteur" +"échec du démarrage de pack-objects pour ré-empaqueter les objets de " +"prometteur" msgid "failed to feed promisor objects to pack-objects" -msgstr "Échéc de la fourniture les objets du prometteur à pack-objects" +msgstr "échec de la fourniture les objets du prometteur à pack-objects" msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" @@ -21815,6 +21916,11 @@ msgstr "" "impossible de terminer pack-objects pour ré-empaqueter les objets de " "prometteur" +msgid "could not start pack-objects to repack promisor packs" +msgstr "" +"échec du démarrage de pack-objects pour ré-empaqueter les paquets de " +"prometteur" + #, c-format msgid "pack prefix %s does not begin with objdir %s" msgstr "le préfixe %s ne commence pas avec objdir %s" @@ -22820,10 +22926,6 @@ 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" @@ -23309,49 +23411,68 @@ msgstr "mauvais format '%s' : l'élément '%s' ne se termine pas ')'" msgid "bad %s format: %%%.*s" msgstr "mauvais format %s : %%%.*s" -#. TRANSLATORS: IEC 80000-13:2008 gibibyte #, c-format -msgid "%u.%2.2u GiB" -msgstr "%u.%2.2u Gio" +msgid "%u.%2.2u" +msgstr "%u.%2.2u" -#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#, c-format -msgid "%u.%2.2u GiB/s" -msgstr "%u.%2.2u Gio/s" +#. TRANSLATORS: SI decimal prefix symbol for 10^9 +msgid "G" +msgstr "G" -#. TRANSLATORS: IEC 80000-13:2008 mebibyte -#, c-format -msgid "%u.%2.2u MiB" -msgstr "%u.%2.2u Mio" +#. TRANSLATORS: SI decimal prefix symbol for 10^6 +msgid "M" +msgstr "M" -#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#, c-format -msgid "%u.%2.2u MiB/s" -msgstr "%u.%2.2u Mio/s" +#. TRANSLATORS: SI decimal prefix symbol for 10^3 +msgid "k" +msgstr "k" -#. TRANSLATORS: IEC 80000-13:2008 kibibyte -#, c-format -msgid "%u.%2.2u KiB" -msgstr "%u.%2.2u Kio" +#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second and gibibyte +msgid "GiB/s" +msgstr "GiO/s" -#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#, c-format -msgid "%u.%2.2u KiB/s" -msgstr "%u.%2.2u Kio/s" +msgid "GiB" +msgstr "GiO" -#. TRANSLATORS: IEC 80000-13:2008 byte -#, c-format -msgid "%u byte" -msgid_plural "%u bytes" -msgstr[0] "%u octet" -msgstr[1] "%u octets" +#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second and mebibyte +msgid "MiB/s" +msgstr "MiO/s" + +msgid "MiB" +msgstr "MiO" + +#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second and kibibyte +msgid "KiB/s" +msgstr "KiO/s" + +msgid "KiB" +msgstr "KiO" + +#. TRANSLATORS: IEC 80000-13:2008 byte/second and byte +msgid "B/s" +msgstr "Octets/s" + +msgid "B" +msgstr "Octets" #. TRANSLATORS: IEC 80000-13:2008 byte/second +msgid "byte/s" +msgid_plural "bytes/s" +msgstr[0] "octet/s" +msgstr[1] "octets/s" + +#. TRANSLATORS: IEC 80000-13:2008 byte +msgid "byte" +msgid_plural "bytes" +msgstr[0] "octet" +msgstr[1] "octets" + +#. TRANSLATORS: The first argument is the number string. The second +#. argument is the unit string (i.e. "12.34 MiB/s"). +#. #, c-format -msgid "%u byte/s" -msgid_plural "%u bytes/s" -msgstr[0] "%u octet/s" -msgstr[1] "%u octets/s" +msgid "%s %s" +msgstr "%s %s" #, c-format msgid "ignoring suspicious submodule name: %s" @@ -23651,9 +23772,6 @@ msgstr "nombre d'octets" msgid "number of requests per thread" msgstr "nombre de requêtes par fil d'exécution" -msgid "byte" -msgstr "octet" - msgid "ballast character" msgstr "caractère ballast" @@ -25268,63 +25386,3 @@ msgstr "%s sauté avec un suffix de sauvegarde '%s'.\n" #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : " - -#~ msgid "No previous hunk" -#~ msgstr "Pas de section précédente" - -#~ msgid "No next hunk" -#~ msgstr "Pas de section suivante" - -#~ msgid "git for-each-ref [<options>] [<pattern>]" -#~ msgstr "git for-each-ref [<options>] [<motif>]" - -#~ msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]" -#~ msgstr "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]" - -#~ msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" -#~ msgstr "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" - -#~ msgid "git for-each-ref [--start-after <marker>]" -#~ msgstr "git for-each-ref [--start-after <marqueur>]" - -#~ msgid "" -#~ "git pack-refs [--all] [--no-prune] [--auto] [--include <pattern>] [--" -#~ "exclude <pattern>]" -#~ msgstr "" -#~ "git pack-refs [--all] [--no-prune] [--auto] [--include <motif>] [--" -#~ "exclude <motif>]" - -#, c-format -#~ msgid "deleting '%s' failed" -#~ msgstr "échec de suppression de '%s'" - -#, c-format -#~ msgid "creating '%s' failed" -#~ msgstr "échec de création de '%s'" - -#, c-format -#~ msgid "could not open index for %s" -#~ msgstr "impossible d'ouvrir l'index pour %s" - -#~ msgid "cannot handle pushes this big" -#~ msgstr "impossible de gérer des poussées aussi grosses" - -#, c-format -#~ msgid "" -#~ "'%s' is nominated for removal.\n" -#~ "If you still use this command, please add an extra\n" -#~ "option, '--i-still-use-this', on the command line\n" -#~ "and let us know you still use it by sending an e-mail\n" -#~ "to <git@vger.kernel.org>. Thanks.\n" -#~ msgstr "" -#~ "La suppression de '%s' est prévue.\n" -#~ "Si vous utilisez cette commande, veuillez ajouter\n" -#~ "une option supplémentaire, '--i-still-use-this',\n" -#~ "sur la ligne de commande pour nous avertir par\n" -#~ "un courriel à <git@vger.kernel.org>. Merci.\n" - -#~ msgid "start-after" -#~ msgstr "start-after" - -#~ msgid "compact-summary" -#~ msgstr "résumé-compact" @@ -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: 2025-11-06 23:58+0000\n" -"PO-Revision-Date: 2025-11-07 21:39+0000\n" +"POT-Creation-Date: 2026-01-22 23:57+0000\n" +"PO-Revision-Date: 2026-01-23 10:47+0000\n" "Last-Translator: Aindriú Mac Giolla Eoin <aindriu80@gmail.com>\n" "Language-Team: none\n" "Language: ga\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n==2 ? 1 : 2;\n" -"X-Generator: Poedit 3.7\n" +"X-Generator: Poedit 3.8\n" #, c-format msgid "%s cannot be negative" @@ -382,8 +382,8 @@ msgstr "Caitheamh breisiú ó innéacs agus crann oibre [y, n, q, a, d %s,?]? " #, c-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " msgstr "" -"An bhfuil an píosa beag seo le fáil réidh ón innéacs agus ón gcrann oibre " -"[y,n,q,a,d%s,?]? " +"An bhfuil an píosa beag seo le fáil réidh ón innéacs agus ón gcrann oibre [y," +"n,q,a,d%s,?]? " msgid "" "y - discard this hunk from index and worktree\n" @@ -402,8 +402,8 @@ msgstr "" #, c-format msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " msgstr "" -"Cuir athrú mód i bhfeidhm ar an innéacs agus ar an gcrann oibre " -"[y,n,q,a,d%s,?]? " +"Cuir athrú mód i bhfeidhm ar an innéacs agus ar an gcrann oibre [y,n,q,a," +"d%s,?]? " #, c-format msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " @@ -413,14 +413,14 @@ msgstr "" #, c-format msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " msgstr "" -"Cuir an breiseán i bhfeidhm ar an innéacs agus ar an gcrann oibre " -"[y,n,q,a,d%s,?]? " +"Cuir an breiseán i bhfeidhm ar an innéacs agus ar an gcrann oibre [y,n,q,a," +"d%s,?]? " #, c-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " msgstr "" -"Cuir an píosa seo i bhfeidhm ar an innéacs agus ar an gcrann oibre " -"[y,n,q,a,d%s,?]? " +"Cuir an píosa seo i bhfeidhm ar an innéacs agus ar an gcrann oibre [y,n,q,a," +"d%s,?]? " msgid "" "y - apply this hunk to index and worktree\n" @@ -618,9 +618,9 @@ msgstr "Uimhir neamhbhailí: '%s'" #, c-format msgid "Sorry, only %d hunk available." msgid_plural "Sorry, only %d hunks available." -msgstr[0] "Tá brón orm, níl ach %d píosa ar fáil." -msgstr[1] "Tá brón orm, níl ach %d hunks ar fáil." -msgstr[2] "Tá brón orm, níl ach %d hunks ar fáil." +msgstr[0] "Ár leithscéal, níl ach %d píosa ar fáil." +msgstr[1] "Ár leithscéal, níl ach %d hunks ar fáil." +msgstr[2] "Ár leithscéal, níl ach %d hunks ar fáil." msgid "No other hunks to search" msgstr "Níl aon phíosa eile le cuardach" @@ -636,14 +636,14 @@ msgid "No hunk matches the given pattern" msgstr "Níl aon hunk ag teacht leis an bpatrún tugtha" msgid "Sorry, cannot split this hunk" -msgstr "Tá brón orainn, ní féidir an hunk seo a roinnt" +msgstr "Ár leithscéal, ní féidir an hunk seo a roinnt" #, c-format msgid "Split into %d hunks." msgstr "Roinn ina %d hunks." msgid "Sorry, cannot edit this hunk" -msgstr "Tá brón orainn, ní féidir an hunk seo a chur in eagar" +msgstr "Ár leithscéal, ní féidir an hunk seo a chur in eagar" #, c-format msgid "Unknown command '%s' (use '?' for help)" @@ -1755,12 +1755,10 @@ msgstr "" msgid "not tracking: ambiguous information for ref '%s'" msgstr "gan rianú: faisnéis dhébhríoch le haghaidh tagairt '%s'" -#. #-#-#-#-# branch.c.po #-#-#-#-# #. TRANSLATORS: This is a line listing a remote with duplicate #. refspecs in the advice message below. For RTL languages you'll #. probably want to swap the "%s" and leading " " space around. #. -#. #-#-#-#-# object-name.c.po #-#-#-#-# #. TRANSLATORS: This is line item of ambiguous object output #. from describe_ambiguous_object() above. For RTL languages #. you'll probably want to swap the "%s" and leading " " space @@ -1798,8 +1796,8 @@ msgstr "" msgid "'%s' is not a valid branch name" msgstr "Ní ainm brainse bailí é '%s'" -msgid "See `man git check-ref-format`" -msgstr "Féach `man git check-ref-format`" +msgid "See 'git help check-ref-format'" +msgstr "Féach 'git help check-ref-format'" #, c-format msgid "a branch named '%s' already exists" @@ -2715,6 +2713,16 @@ msgid "must end with a color" msgstr "caithfidh deireadh a chur le dath" #, c-format +msgid "unknown value for config '%s': %s" +msgstr "luach anaithnid do chumraíocht '%s': %s" + +msgid "" +"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " +"\"histogram\"" +msgstr "" +"glacann difr-algartam rogha le “myers”, “íosta”, “foighne” agus “histogram”" + +#, c-format msgid "cannot find revision %s to ignore" msgstr "ní féidir athbhreithniú %s a fháil le neamhair" @@ -2769,6 +2777,12 @@ msgstr "taispeáin ríomhphost an údair in ionad ainm (Réamhshocraithe: as)" msgid "ignore whitespace differences" msgstr "neamhaird a dhéanamh ar dhifríochtaí spás b" +msgid "<algorithm>" +msgstr "<algorithm>" + +msgid "choose a diff algorithm" +msgstr "roghnaigh algartam diff" + msgid "rev" msgstr "rev" @@ -2784,8 +2798,8 @@ msgstr "meiteashonraí iomarcach dath ó líne roimhe seo ar bheal" msgid "color lines by age" msgstr "línte datha de réir aois" -msgid "spend extra cycles to find better match" -msgstr "timthriallta breise a chaitheamh chun meaitseáil níos fearr" +msgid "spend extra cycles to find a better match" +msgstr "caith timthriallta breise chun meaitseáil níos fearr a aimsiú" msgid "use revisions from <file> instead of calling git-rev-list" msgstr "athbhreithnithe a úsáid as in <file>ionad glaoch ar git-rev-list" @@ -3100,11 +3114,11 @@ msgid "HEAD not found below refs/heads!" msgstr "Ní fhaightear CEAD thíos na refs/heads!" msgid "" -"branch with --recurse-submodules can only be used if " -"submodule.propagateBranches is enabled" +"branch with --recurse-submodules can only be used if submodule." +"propagateBranches is enabled" msgstr "" -"ní féidir brainse le --recurse-submodules a úsáid ach amháin má tá " -"submodule.propagateBranches cumasaithe" +"ní féidir brainse le --recurse-submodules a úsáid ach amháin má tá submodule." +"propagateBranches cumasaithe" msgid "--recurse-submodules can only be used to create branches" msgstr "Ní féidir --recurse-submodules a úsáid ach chun brainsí a chruthú" @@ -3997,8 +4011,8 @@ msgid "missing branch name; try -%c" msgstr "ainm brainse ar iarraidh; iarracht -%c" #, c-format -msgid "could not resolve %s" -msgstr "ní fhéadfaí %s a réiteach" +msgid "could not resolve '%s'" +msgstr "ní fhéadfaí '%s' a réiteach" msgid "invalid path specification" msgstr "sonraíocht chosáin neamhbhailí" @@ -5493,10 +5507,17 @@ msgstr "Ní féidir --append a úsáid le --value=<pattern>" #, c-format msgid "" "cannot overwrite multiple values with a single value\n" -" Use a regexp, --add or --replace-all to change %s." +" Use --value=<pattern>, --append or --all to change %s." msgstr "" -"ní féidir luachanna iolracha a fhorscríobh le luach amháin\n" -" Úsáid regexp, --add nó --replace-all chun %s a athrú." +"ní féidir luachanna iolracha a athscríobh le luach amháin. \n" +" Úsáid --value=<patrún>, --append nó --all chun %s a athrú." + +msgid "unset all multi-valued config options" +msgstr "dísocraigh gach rogha cumraíochta illuachmhar" + +msgid "unset multi-valued config options with matching values" +msgstr "" +"roghanna cumraíochta illuachacha a dhíshuiteáil le luachanna comhoiriúnacha" #, c-format msgid "no such section: %s" @@ -5583,6 +5604,14 @@ msgid "--comment is only applicable to add/set/replace operations" msgstr "" "Níl --comment infheidhme ach le hoibríochtaí a chur leis /socraí/athsholáthar" +#, c-format +msgid "" +"cannot overwrite multiple values with a single value\n" +" Use a regexp, --add or --replace-all to change %s." +msgstr "" +"ní féidir luachanna iolracha a fhorscríobh le luach amháin\n" +" Úsáid regexp, --add nó --replace-all chun %s a athrú." + msgid "print sizes in human readable format" msgstr "méideanna priontála i bhformáid inléite don duine" @@ -5988,12 +6017,6 @@ msgstr "" "as --reencode=[yes|no] chun é a láimhseáil" #, c-format -msgid "encountered signed commit %s; use --signed-commits=<mode> to handle it" -msgstr "" -"bhuail an tiomantas sínithe %s; bain úsáid as --signed-commits=<mode> chun é " -"a láimhseáil" - -#, c-format msgid "exporting %<PRIuMAX> signature(s) for commit %s" msgstr "ag easpórtáil %<PRIuMAX> sínithe le haghaidh tiomnú %s" @@ -6002,6 +6025,19 @@ msgid "stripping signature(s) from commit %s" msgstr "ag baint sínithe ó thiomnadh %s" #, c-format +msgid "encountered signed commit %s; use --signed-commits=<mode> to handle it" +msgstr "" +"bhuail an tiomantas sínithe %s; bain úsáid as --signed-commits=<mode> chun é " +"a láimhseáil" + +msgid "" +"'strip-if-invalid' is not a valid mode for git fast-export with --signed-" +"commits=<mode>" +msgstr "" +"'strip-if-invalid' ní mód bailí é seo le haghaidh easpórtáil le haghaidh git fast-export le --signed-" +"commits=<mód>" + +#, c-format msgid "" "omitting tag %s,\n" "since tags of trees (or tags of tags of trees, etc.) are not supported." @@ -6014,12 +6050,6 @@ msgid "could not read tag %s" msgstr "níorbh fhéidir an clib %s a léamh" #, c-format -msgid "encountered signed tag %s; use --signed-tags=<mode> to handle it" -msgstr "" -"bhuail mé le clib shínithe %s; bain úsáid as --signed-tags=<mode> chun é a " -"láimhseáil" - -#, c-format msgid "exporting signed tag %s" msgstr "clib shínithe %s á onnmhairiú" @@ -6028,6 +6058,19 @@ msgid "stripping signature from tag %s" msgstr "ag baint síniú ón gclib %s" #, c-format +msgid "encountered signed tag %s; use --signed-tags=<mode> to handle it" +msgstr "" +"bhuail mé le clib shínithe %s; bain úsáid as --signed-tags=<mode> chun é a " +"láimhseáil" + +msgid "" +"'strip-if-invalid' is not a valid mode for git fast-export with --signed-" +"tags=<mode>" +msgstr "" +"'strip-if-invalid' ní mód bailí é seo le haghaidh git fast-export le --signed-" +"tags=<mode>" + +#, c-format msgid "" "tag %s tags unexported object; use --tag-of-filtered-object=<mode> to handle " "it" @@ -6419,6 +6462,33 @@ msgstr "aimsithe iolracha %s sínithe, ag déanamh neamhaird de shínithe breise msgid "parse_one_signature() returned unknown hash algo" msgstr "d’fhill parse_one_signature() algartam haise anaithnid" +msgid "unknown" +msgstr "anaithnid" + +#, c-format +msgid "" +"stripping invalid signature for commit '%.100s...'\n" +" allegedly by %s" +msgstr "" +"ag baint síniú neamhbhailí don tiomantas '%.100s...' \n" +" de réir dealraimh le %s" + +#, c-format +msgid "" +"stripping invalid signature for commit '%.*s'\n" +" allegedly by %s" +msgstr "" +"ag baint síniú neamhbhailí don tiomantas '%.*s'\n" +" de réir dealraimh le %s" + +#, c-format +msgid "" +"stripping invalid signature for commit\n" +" allegedly by %s" +msgstr "" +"ag baint síniú neamhbhailí don tiomnú\n" +" de réir dealraimh ag %s" + msgid "expected committer but didn't get one" msgstr "bhí mé ag súil le gealltóir ach ní bhfuair mé ceann" @@ -6433,11 +6503,6 @@ msgstr "síniú tiomantais a bhaint" msgid "importing a commit signature verbatim" msgstr "síniú tiomantais a allmhairiú focal ar fhocal" -msgid "encountered signed tag; use --signed-tags=<mode> to handle it" -msgstr "" -"bhuail mé le clib shínithe; bain úsáid as --signed-tags=<mode> chun é a " -"láimhseáil" - #, c-format msgid "importing a tag signature verbatim for tag '%s'" msgstr "ag allmhairiú síniú clibe focal ar fhocal don chlib '%s'" @@ -6446,6 +6511,18 @@ msgstr "ag allmhairiú síniú clibe focal ar fhocal don chlib '%s'" msgid "stripping a tag signature for tag '%s'" msgstr "ag baint síniú clibe don chlib '%s'" +msgid "encountered signed tag; use --signed-tags=<mode> to handle it" +msgstr "" +"bhuail mé le clib shínithe; bain úsáid as --signed-tags=<mode> chun é a " +"láimhseáil" + +msgid "" +"'strip-if-invalid' is not a valid mode for git fast-import with --signed-" +"tags=<mode>" +msgstr "" +"Ní mód bailí é 'strip-if-invalid' le haghaidh git fast-import le --signed-" +"tags=<mode>" + #, c-format msgid "expected 'from' command, got '%s'" msgstr "ag súil le hordú 'from', fuarthas '%s'" @@ -6603,8 +6680,8 @@ msgstr "git fetch [<options>] [<repository> [<refspec>...]]" msgid "git fetch [<options>] <group>" msgstr "git fetch [<options>] <group>" -msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" -msgstr "git fetch --multiple [<options>] [(<repository> | <group>)...]" +msgid "git fetch --multiple [<options>] [(<repository>|<group>)...]" +msgstr "git fetch --multiple [<roghanna>] [(<stór>|<grúpa>)...]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<options>]" @@ -6971,8 +7048,8 @@ msgid "protocol does not support --negotiate-only, exiting" msgstr "ní thacaíonn an prótacal le --negotiate-only, ag scoir" msgid "" -"--filter can only be used with the remote configured in " -"extensions.partialclone" +"--filter can only be used with the remote configured in extensions." +"partialclone" msgstr "" "--filter Ní féidir ach an scagaire a úsáid ach leis an iargúlta cumraithe in " "extensions.partialclone" @@ -7085,9 +7162,6 @@ msgstr "ar iarraidh --config=<config>" msgid "got bad config --config=%s" msgstr "fuair cumraíocht go dona --config=%s" -msgid "unknown" -msgstr "anaithnid" - #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> #, c-format msgid "error in %s %s: %s" @@ -7182,6 +7256,10 @@ msgstr "%s: pointeoir sha1 neamhbhailí %s" msgid "%s: not a commit" msgstr "%s: ní gealltanas" +#, c-format +msgid "invalid parameter: expected sha1, got '%s'" +msgstr "paraiméadar neamhbhailí: súil le sha1, fuair '%s'" + msgid "notice: No default references" msgstr "fógra: Gan aon tagairtí réamhshocraithe" @@ -7208,26 +7286,6 @@ msgid "Checking object directories" msgstr "Seiceáil eolairí réada" #, c-format -msgid "Checking %s link" -msgstr "Nasc %s a sheiceáil" - -#, c-format -msgid "invalid %s" -msgstr "%s neamhbhailí" - -#, c-format -msgid "%s points to something strange (%s)" -msgstr "Léiríonn %s rud éigin aisteach (%s)" - -#, c-format -msgid "%s: detached HEAD points at nothing" -msgstr "%s: pointí HEAD scoite ag aon rud" - -#, c-format -msgid "notice: %s points to an unborn branch (%s)" -msgstr "fógra: Díríonn %s chuig brainse neamhbhreithe (%s)" - -#, c-format msgid "Checking cache tree of %s" msgstr "Crann taisce de %s a sheiceáil" @@ -7306,14 +7364,6 @@ msgstr "seiceáil comhsheasmhacht bunachair" msgid "Checking objects" msgstr "Rud a sheiceáil" -#, c-format -msgid "%s: object missing" -msgstr "%s: réad ar iarraidh" - -#, c-format -msgid "invalid parameter: expected sha1, got '%s'" -msgstr "paraiméadar neamhbhailí: súil le sha1, fuair '%s'" - msgid "git fsmonitor--daemon start [<options>]" msgstr "git fsmonitor--daemon start [<options>]" @@ -7534,8 +7584,8 @@ msgstr "Theip ar 'git multi-pack-index repack'" msgid "" "skipping incremental-repack task because core.multiPackIndex is disabled" msgstr "" -"ag scipeáil an tasc athphacála incriminteach mar go bhfuil " -"core.multiPackIndex díchumasaithe" +"ag scipeáil an tasc athphacála incriminteach mar go bhfuil core." +"multiPackIndex díchumasaithe" msgid "failed to perform geometric repack" msgstr "theip ar athphacáil gheoiméadrach a dhéanamh" @@ -7698,6 +7748,9 @@ msgstr "theip ar sceideal cothabhála a chur ar bun" msgid "failed to add repo to global config" msgstr "theip ar repo a chur le cumraíocht domhanda" +msgid "check a specific task" +msgstr "seiceáil tasc ar leith" + msgid "git maintenance <subcommand> [<options>]" msgstr "git maintenance <subcommand> [<options>]" @@ -7712,7 +7765,6 @@ msgstr "grep: theip ar shnáithe a chruthú: %s" msgid "invalid number of threads specified (%d) for %s" msgstr "líon neamhbhailí na snáitheanna a shonraítear (%d) do %s" -#. #-#-#-#-# grep.c.po #-#-#-#-# #. TRANSLATORS: %s is the configuration #. variable for tweaking threads, currently #. grep.threads @@ -8156,6 +8208,10 @@ msgid "fsck error in packed object" msgstr "earráid fsck i réad pacáilte" #, c-format +msgid "invalid %s" +msgstr "%s neamhbhailí" + +#, c-format msgid "Not all child objects of %s are reachable" msgstr "Ní féidir rochtain a fháil ar gach réad linbh de %s" @@ -8299,6 +8355,9 @@ msgstr "--stdin teastaíonn stórlann git" msgid "--verify with no packfile name given" msgstr "--verify gan ainm comhaid pacáiste tugtha" +msgid "cannot perform queued object checks outside of a repository" +msgstr "ní féidir seiceálacha réada scuaine a dhéanamh lasmuigh de stórlann" + msgid "fsck error in pack objects" msgstr "fsck earráid i rudaí pacáiste" @@ -9055,12 +9114,6 @@ msgstr "" "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " "<orig-file> <file2>" -msgid "" -"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " -"\"histogram\"" -msgstr "" -"glacann difr-algartam rogha le “myers”, “íosta”, “foighne” agus “histogram”" - msgid "send results to standard output" msgstr "torthaí a sheoladh chuig aschur caigh" @@ -9073,12 +9126,6 @@ msgstr "bain úsáid as cumaisc atá bunaithe ar diff3" msgid "use a zealous diff3 based merge" msgstr "bain úsáid as cumaisc díograiseach bunaithe ar diff3" -msgid "<algorithm>" -msgstr "<algorithm>" - -msgid "choose a diff algorithm" -msgstr "roghnaigh algartam diff" - msgid "for conflicts, use this marker size" msgstr "le haghaidh coinbhleachtaí, bain úsáid as an méid marcóra" @@ -10050,8 +10097,8 @@ msgstr "" msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" -"scríobh bitmap a dhíchumasú, roinntear pacáistí mar gheall ar " -"pack.packSizeLimit" +"scríobh bitmap a dhíchumasú, roinntear pacáistí mar gheall ar pack." +"packSizeLimit" msgid "Writing objects" msgstr "Rudaí a scríobh" @@ -10158,6 +10205,10 @@ msgid "could not get type of object %s in pack %s" msgstr "ní fhéadfaí cineál réada %s a fháil i bpacáiste %s" #, c-format +msgid "packfile %s is a promisor but --exclude-promisor-objects was given" +msgstr "is gealltóir é an comhad paca %s ach tugadh --exclude-promisor-objects" + +#, c-format msgid "could not find pack '%s'" msgstr "ní raibh an pacáiste '%s' in ann a aimsiú" @@ -10417,11 +10468,11 @@ msgstr "git pack-refs " msgid "git patch-id [--stable | --unstable | --verbatim]" msgstr "git patch-id [--seasmhach | --éagobhsaí | --verbatim]" -msgid "use the unstable patch-id algorithm" -msgstr "bain úsáid as an algartam paith-id éagobhsaí" +msgid "use the unstable patch ID algorithm" +msgstr "bain úsáid as an algartam aitheantais paiste éagobhsaí" -msgid "use the stable patch-id algorithm" -msgstr "bain úsáid as an algartam paith-id cobhsaí" +msgid "use the stable patch ID algorithm" +msgstr "bain úsáid as an algartam ID paiste cobhsaí" msgid "don't strip whitespace from the patch" msgstr "ná tarraingt spás bán ón bpaiste" @@ -10444,39 +10495,6 @@ msgstr "ní féidir le bearradh i repo rudaí luachmhara" msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<options>] [<repository> [<refspec>...]]" -msgid "control for recursive fetching of submodules" -msgstr "rialú maidir le fo-mhodúil a fháil athshlánach" - -msgid "Options related to merging" -msgstr "Roghanna a bhaineann le cumasc" - -msgid "incorporate changes by rebasing rather than merging" -msgstr "athruithe a ionchorprú trí athbhunú seachas cumasc" - -msgid "allow fast-forward" -msgstr "ligean go tapa ar aghaidh" - -msgid "control use of pre-merge-commit and commit-msg hooks" -msgstr "úsáid crúcaí réamh-chumaisc agus comh-msg a rialú" - -msgid "automatically stash/stash pop before and after" -msgstr "pop a stash/stash go huathoibríoch roimh agus tar éis" - -msgid "Options related to fetching" -msgstr "Roghanna a bhaineann le tarraingt" - -msgid "force overwrite of local branch" -msgstr "forscríobh fórsa ar bhrainse áitiúil" - -msgid "number of submodules pulled in parallel" -msgstr "líon na bhfo-mhodúil tarraingthe go comhthreom" - -msgid "use IPv4 addresses only" -msgstr "bain úsáid as seoltaí IPv4 amháin" - -msgid "use IPv6 addresses only" -msgstr "bain úsáid as seoltaí IPv6 amháin" - msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -10585,6 +10603,39 @@ msgstr "" "shárú\n" "ionghairm.\n" +msgid "control for recursive fetching of submodules" +msgstr "rialú maidir le fo-mhodúil a fháil athshlánach" + +msgid "Options related to merging" +msgstr "Roghanna a bhaineann le cumasc" + +msgid "incorporate changes by rebasing rather than merging" +msgstr "athruithe a ionchorprú trí athbhunú seachas cumasc" + +msgid "allow fast-forward" +msgstr "ligean go tapa ar aghaidh" + +msgid "control use of pre-merge-commit and commit-msg hooks" +msgstr "úsáid crúcaí réamh-chumaisc agus comh-msg a rialú" + +msgid "automatically stash/stash pop before and after" +msgstr "pop a stash/stash go huathoibríoch roimh agus tar éis" + +msgid "Options related to fetching" +msgstr "Roghanna a bhaineann le tarraingt" + +msgid "force overwrite of local branch" +msgstr "forscríobh fórsa ar bhrainse áitiúil" + +msgid "number of submodules pulled in parallel" +msgstr "líon na bhfo-mhodúil tarraingthe go comhthreom" + +msgid "use IPv4 addresses only" +msgstr "bain úsáid as seoltaí IPv4 amháin" + +msgid "use IPv6 addresses only" +msgstr "bain úsáid as seoltaí IPv6 amháin" + msgid "Updating an unborn branch with changes added to the index." msgstr "Brainse breithe a nuashonrú le hathruithe curtha leis an innéacs." @@ -11853,8 +11904,8 @@ msgid "" msgstr "" "Tá tagairtí contrártha sa\n" "tagarmharc sprice nua ag an gcianrialtán atá tú ag iarraidh a athainmniú. Is " -"dóichí gur mar gheall ar iarracht a dhéanamh cianrialtán a neadú ann féin, " -"e.g. trí 'tuismitheoir' a athainmniú go 'tuismitheoir/leanbh'\n" +"dóichí gur mar gheall ar iarracht a dhéanamh cianrialtán a neadú ann féin, e." +"g. trí 'tuismitheoir' a athainmniú go 'tuismitheoir/leanbh'\n" "nó trí chianrialtán a dhí-neadú, e.g. an bealach eile.\n" "\n" "Más amhlaidh atá, is féidir leat é seo a réiteach tríd an\n" @@ -12463,6 +12514,10 @@ msgstr "Ní ghlacann --convert-graft-file aon argóint" msgid "only one pattern can be given with -l" msgstr "ní féidir ach patrún amháin a thabhairt le -l" +#, c-format +msgid "'%s' is not a valid commit-ish for %s" +msgstr "Ní comhartha bailí commit-ish é '%s' do %s" + msgid "need some commits to replay" msgstr "teastaíonn roinnt gealltanais chun athsheinm" @@ -12479,27 +12534,16 @@ msgstr "" "ní féidir leis an sprioc a chur chun cinn le foinsí iolracha toisc go mbeadh " "ordú" -msgid "" -"cannot implicitly determine whether this is an --advance or --onto operation" -msgstr "" -"ní féidir a chinneadh go hinneach an oibríocht --advance nó --onto é seo" - -msgid "" -"cannot advance target with multiple source branches because ordering would " -"be ill-defined" -msgstr "" -"ní féidir leis an sprioc a chur chun cinn le brainsí foinse iolracha mar go " -"mbeadh ordú" - -msgid "cannot implicitly determine correct base for --onto" -msgstr "ní féidir leis an mbonn ceart do --onto a chinneadh go hinneach" +#, c-format +msgid "invalid %s value: '%s'" +msgstr "luach neamhbhailí %s: '%s'" msgid "" "(EXPERIMENTAL!) git replay ([--contained] --onto <newbase> | --advance " -"<branch>) <revision-range>..." +"<branch>) [--ref-action[=<mode>]] <revision-range>" msgstr "" -"(TURGNAMHACH!) git replay ([--contained] --onto <newbase> | --advance " -"<branch>) <revision-range>..." +"(TURGNAMHACH!) athsheinm git ([--contained] --onto <newbase> | --advance " +"<brainse>) [--ref-action[=<mód>]] <raon-athbhreithnithe>" msgid "make replay advance given branch" msgstr "athsheoladh a dhéanamh roimh ré brainse ar leith" @@ -12507,8 +12551,12 @@ msgstr "athsheoladh a dhéanamh roimh ré brainse ar leith" msgid "replay onto given commit" msgstr "athsheoladh ar thiomantas a thugtar" -msgid "advance all branches contained in revision-range" -msgstr "gach brainse atá sa raon athbhreithnithe a chur chun cinn" +msgid "update all branches that point at commits in <revision-range>" +msgstr "" +"nuashonraigh na brainsí uile a dhíríonn ar thiomnuithe i <revision-range>" + +msgid "control ref update behavior (update|print)" +msgstr "iompar nuashonraithe tag rialaithe (nuashonrú|priontáil)" msgid "option --onto or --advance is mandatory" msgstr "tá rogha --onto nó --advance éigeantach" @@ -12521,16 +12569,28 @@ msgstr "" "cuirfear roinnt roghanna siúil rev a athshealbhú mar go gcuirfear giotán " "'%s' i 'struct rev_info' iallach" +#, c-format +msgid "failed to begin ref transaction: %s" +msgstr "theip ar thosú an idirbhirt tagartha: %s" + msgid "error preparing revisions" msgstr "earráid ag ullmhú athbhreith" -msgid "replaying down to root commit is not supported yet!" -msgstr "ní thacaítear le athsheinm síos go dtí tiomantas fréimhe fós!" +msgid "replaying down from root commit is not supported yet!" +msgstr "ní thacaítear le hathsheinm anuas ó fréamh-thiomantas go fóill!" msgid "replaying merge commits is not supported yet!" msgstr "ní thacaítear le gealltanna cumaisc athsheinm fós!" #, c-format +msgid "failed to update ref '%s': %s" +msgstr "theip ar an tagairt '%s' a nuashonrú: %s" + +#, c-format +msgid "failed to commit ref transaction: %s" +msgstr "theip ar an idirbheart tagartha a dhéanamh: %s" + +#, c-format msgid "key '%s' not found" msgstr "níor aimsíodh an eochair '%s'" @@ -12544,9 +12604,15 @@ msgstr "formáid aschuir" msgid "synonym for --format=nul" msgstr "comhchiallach le --format=nul" +msgid "print all keys/values" +msgstr "priontáil na heochracha/luachanna go léir" + msgid "unsupported output format" msgstr "formáid aschuir neamhthacaithe" +msgid "--all and <key> cannot be used together" +msgstr "Ní féidir --all agus <eochair> a úsáid le chéile" + msgid "References" msgstr "Tagairtí" @@ -12577,6 +12643,12 @@ msgstr "Crainn" msgid "Blobs" msgstr "Blobaí" +msgid "Inflated size" +msgstr "Méid insilte" + +msgid "Disk size" +msgstr "Méid diosca" + msgid "Repository structure" msgstr "Struchtúr an stórais" @@ -15087,6 +15159,10 @@ msgstr "ní fhéadfaí eochair liosta beartán %s a pháirseáil le luach '%s'" msgid "bundle list at '%s' has no mode" msgstr "níl aon mhodh ag liosta beartán ag '%s'" +#, c-format +msgid "bundle list at '%s': bundle '%s' has no uri" +msgstr "liosta beartán ag '%s': níl aon uri ag an mbeartán '%s'" + msgid "failed to create temporary file" msgstr "theip ar chomhad sealadach a chruthú" @@ -15109,6 +15185,10 @@ msgid "exceeded bundle URI recursion limit (%d)" msgstr "sháraigh teorainn athshlánaithe URI beartán (%d)" #, c-format +msgid "bundle '%s' has no uri" +msgstr "níl aon URI ag an bpacáiste '%s'" + +#, c-format msgid "failed to download bundle from URI '%s'" msgstr "theip ar an mbeartán a íoslódáil ó URI '%s'" @@ -15615,8 +15695,8 @@ msgstr "Gineann achoimre ar athruithe ar feitheamh" msgid "Reuse recorded resolution of conflicted merges" msgstr "Réiteach taifeadta ar chumaisc coinbhleachta a athúsáid" -msgid "Reset current HEAD to the specified state" -msgstr "Athshocraigh HEAD reatha go dtí an stát sonraithe" +msgid "Set `HEAD` or the index to a known state" +msgstr "Socraigh `HEAD` nó an t-innéacs go staid aitheanta" msgid "Restore working tree files" msgstr "Athchóirigh comhaid crann oibre" @@ -16034,11 +16114,11 @@ msgstr "" #, c-format msgid "" -"attempting to write a commit-graph, but 'commitGraph.changedPathsVersion' " -"(%d) is not supported" +"attempting to write a commit-graph, but 'commitGraph." +"changedPathsVersion' (%d) is not supported" msgstr "" -"ag iarraidh commit-graph a scríobh, ach tá 'commitGraph.changedPathsVersion' " -"(%d) ní thacaítear leis" +"ag iarraidh commit-graph a scríobh, ach tá 'commitGraph." +"changedPathsVersion' (%d) ní thacaítear leis" msgid "too many commits to write graph" msgstr "an iomarca gealltanais graf a scríobh" @@ -17131,10 +17211,6 @@ msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Luach anaithnid d'athróg cumraithe 'diff.submodule': '%s'" #, c-format -msgid "unknown value for config '%s': %s" -msgstr "luach anaithnid do chumraíocht '%s': %s" - -#, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" @@ -18190,8 +18266,8 @@ msgid "" "given pattern contains NULL byte (via -f <file>). This is only supported " "with -P under PCRE v2" msgstr "" -"tá byte NULL (trí -f<file>) i bpatrún tugtha. Ní thacaítear leis seo ach le " -"-P faoi PCRE v2" +"tá byte NULL (trí -f<file>) i bpatrún tugtha. Ní thacaítear leis seo ach le -" +"P faoi PCRE v2" #, c-format msgid "'%s': unable to read %s" @@ -18357,8 +18433,8 @@ msgid "" msgstr "" "Rinneadh neamhaird ar an gcroca '%s' toisc nach bhfuil sé socraithe mar " "infheidhmithe.\n" -"Is féidir leat an rabhadh seo a dhíchumasú le `git config set " -"advice.ignoredHook false `." +"Is féidir leat an rabhadh seo a dhíchumasú le `git config set advice." +"ignoredHook false `." msgid "not a git repository" msgstr "ní stór git é" @@ -19282,6 +19358,9 @@ msgstr "léamh gearr agus %s á innéacsú" msgid "%s: failed to insert into database" msgstr "%s: theip ort a chur isteach sa bhunachar sonraí" +msgid "cannot add a submodule of a different hash algorithm" +msgstr "ní féidir fomhodúl d'algartam haise difriúil a chur leis" + #, c-format msgid "%s: unsupported file type" msgstr "%s: cineál comhaid gan tacaíocht" @@ -20757,6 +20836,10 @@ msgstr "diúltú an t-ordú seo adamh %%(%.*s)" msgid "--format=%.*s cannot be used with --python, --shell, --tcl" msgstr "--format=%.*s ní féidir é a úsáid le --python, --shell, --tcl" +#, c-format +msgid "parse_object_buffer failed on %s for %s" +msgstr "theip ar parse_object_buffer ar %s do %s" + msgid "failed to run 'describe'" msgstr "theip ar 'cur síos' a rith" @@ -20788,10 +20871,6 @@ msgid "missing object %s for %s" msgstr "réad atá ar iarraidh %s do %s" #, c-format -msgid "parse_object_buffer failed on %s for %s" -msgstr "theip ar parse_object_buffer ar %s do %s" - -#, c-format msgid "malformed object at '%s'" msgstr "réad mífhoirmithe ag '%s'" @@ -21099,6 +21178,18 @@ msgid "refname %s is a symbolic ref, copying it is not supported" msgstr "rs tagairt siombalach é refname %s, ní thacaítear leis a chóipeáil" #, c-format +msgid "reftable stack for worktree '%s' is broken" +msgstr "tá an stac ath-inúsáidte don chrann oibre '%s' briste" + +#, c-format +msgid "could not create iterator for worktree '%s'" +msgstr "níorbh fhéidir athrá a chruthú don chrann oibre '%s'" + +#, c-format +msgid "could not read record for worktree '%s'" +msgstr "níorbh fhéidir taifead a léamh don chrann oibre '%s'" + +#, c-format msgid "pattern '%s' has no '*'" msgstr "níl aon '*' ag patrún '%s'" @@ -21537,6 +21628,10 @@ msgid "could not finish pack-objects to repack promisor objects" msgstr "" "ní fhéadfadh sé rudaí pacáiste a chríochnú chun rudaí geallta a athphacáil" +msgid "could not start pack-objects to repack promisor packs" +msgstr "" +"níorbh fhéidir pacáistí-réada a thosú chun pacáistí gealltanais a athphacáil" + #, c-format msgid "pack prefix %s does not begin with objdir %s" msgstr "ní thosaíonn réimír pacáiste %s le objdir %s" @@ -22540,10 +22635,6 @@ msgstr "" msgid "illegal label name: '%.*s'" msgstr "ainm lipéid neamhdhleathach: '%.*s'" -#, c-format -msgid "could not resolve '%s'" -msgstr "ní fhéadfaí '%s' a réiteach" - msgid "writing fake root commit" msgstr "tiomantas fréamh bréige a scríobh" @@ -23029,51 +23120,70 @@ msgstr "droch-fhormáid %s: ní chríochnaíonn eilimint '%s' i ')'" msgid "bad %s format: %%%.*s" msgstr "fhormáid %s olc: %%%.*s" -#. TRANSLATORS: IEC 80000-13:2008 gibibyte #, c-format -msgid "%u.%2.2u GiB" -msgstr "%u.%2.2u GiB" +msgid "%u.%2.2u" +msgstr "%u.%2.2u" -#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#, c-format -msgid "%u.%2.2u GiB/s" -msgstr "%u.%2.2u GiB/s" +#. TRANSLATORS: SI decimal prefix symbol for 10^9 +msgid "G" +msgstr "G" -#. TRANSLATORS: IEC 80000-13:2008 mebibyte -#, c-format -msgid "%u.%2.2u MiB" -msgstr "%u.%2.2u MiB" +#. TRANSLATORS: SI decimal prefix symbol for 10^6 +msgid "M" +msgstr "M" -#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#, c-format -msgid "%u.%2.2u MiB/s" -msgstr "%u.%2.2u MiB/s" +#. TRANSLATORS: SI decimal prefix symbol for 10^3 +msgid "k" +msgstr "k" -#. TRANSLATORS: IEC 80000-13:2008 kibibyte -#, c-format -msgid "%u.%2.2u KiB" -msgstr "%u.%2.2u KiB" +#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second and gibibyte +msgid "GiB/s" +msgstr "GiB/s" -#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#, c-format -msgid "%u.%2.2u KiB/s" -msgstr "%u.%2.2u KiB/s" +msgid "GiB" +msgstr "GiB" -#. TRANSLATORS: IEC 80000-13:2008 byte -#, c-format -msgid "%u byte" -msgid_plural "%u bytes" -msgstr[0] "%u beart" -msgstr[1] "%u beart" -msgstr[2] "%u beart" +#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second and mebibyte +msgid "MiB/s" +msgstr "MiB/s" + +msgid "MiB" +msgstr "MiB" + +#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second and kibibyte +msgid "KiB/s" +msgstr "KiB/s" + +msgid "KiB" +msgstr "KiB" + +#. TRANSLATORS: IEC 80000-13:2008 byte/second and byte +msgid "B/s" +msgstr "B/s" + +msgid "B" +msgstr "B" #. TRANSLATORS: IEC 80000-13:2008 byte/second +msgid "byte/s" +msgid_plural "bytes/s" +msgstr[0] "beart/s" +msgstr[1] "bearta/s" +msgstr[2] "bearta/s" + +#. TRANSLATORS: IEC 80000-13:2008 byte +msgid "byte" +msgid_plural "bytes" +msgstr[0] "beart" +msgstr[1] "bearta" +msgstr[2] "bearta" + +#. TRANSLATORS: The first argument is the number string. The second +#. argument is the unit string (i.e. "12.34 MiB/s"). +#. #, c-format -msgid "%u byte/s" -msgid_plural "%u bytes/s" -msgstr[0] "%u beart/s" -msgstr[1] "%u beart/s" -msgstr[2] "%u beart/s" +msgid "%s %s" +msgstr "%s %s" #, c-format msgid "ignoring suspicious submodule name: %s" @@ -23368,9 +23478,6 @@ msgstr "líon na mbetaí" msgid "number of requests per thread" msgstr "líon iarratais in aghaidh an snáithe" -msgid "byte" -msgstr "beart" - msgid "ballast character" msgstr "carachtar balasta" @@ -24989,6 +25096,86 @@ msgstr "Ag scipeáil %s leis an iarmhír chúltaca '%s'.\n" msgid "Do you really want to send %s? [y|N]: " msgstr "An bhfuil tú ag iarraidh %s a sheoladh i ndáiríre? [y|N]: " +#, c-format +#~ msgid "could not resolve %s" +#~ msgstr "ní fhéadfaí %s a réiteach" + +#, c-format +#~ msgid "Checking %s link" +#~ msgstr "Nasc %s a sheiceáil" + +#, c-format +#~ msgid "%s points to something strange (%s)" +#~ msgstr "Léiríonn %s rud éigin aisteach (%s)" + +#, c-format +#~ msgid "%s: detached HEAD points at nothing" +#~ msgstr "%s: pointí HEAD scoite ag aon rud" + +#, c-format +#~ msgid "notice: %s points to an unborn branch (%s)" +#~ msgstr "fógra: Díríonn %s chuig brainse neamhbhreithe (%s)" + +#, c-format +#~ msgid "%s: object missing" +#~ msgstr "%s: réad ar iarraidh" + +#~ msgid "" +#~ "cannot implicitly determine whether this is an --advance or --onto " +#~ "operation" +#~ msgstr "" +#~ "ní féidir a chinneadh go hinneach an oibríocht --advance nó --onto é seo" + +#~ msgid "" +#~ "cannot advance target with multiple source branches because ordering " +#~ "would be ill-defined" +#~ msgstr "" +#~ "ní féidir leis an sprioc a chur chun cinn le brainsí foinse iolracha mar " +#~ "go mbeadh ordú" + +#~ msgid "cannot implicitly determine correct base for --onto" +#~ msgstr "ní féidir leis an mbonn ceart do --onto a chinneadh go hinneach" + +#~ msgid "advance all branches contained in revision-range" +#~ msgstr "gach brainse atá sa raon athbhreithnithe a chur chun cinn" + +#~ msgid "Reset current HEAD to the specified state" +#~ msgstr "Athshocraigh HEAD reatha go dtí an stát sonraithe" + +#, c-format +#~ msgid "%u.%2.2u GiB/s" +#~ msgstr "%u.%2.2u GiB/s" + +#, c-format +#~ msgid "%u.%2.2u MiB" +#~ msgstr "%u.%2.2u MiB" + +#, c-format +#~ msgid "%u.%2.2u MiB/s" +#~ msgstr "%u.%2.2u MiB/s" + +#, c-format +#~ msgid "%u.%2.2u KiB" +#~ msgstr "%u.%2.2u KiB" + +#, c-format +#~ msgid "%u.%2.2u KiB/s" +#~ msgstr "%u.%2.2u KiB/s" + +#, c-format +#~ msgid "%u byte" +#~ msgid_plural "%u bytes" +#~ msgstr[0] "%u beart" +#~ msgstr[1] "%u beart" +#~ msgstr[2] "%u beart" + +#, c-format +#~ msgid "%u byte/s" +#~ msgid_plural "%u bytes/s" +#~ msgstr[0] "%u beart/s" +#~ msgstr[1] "%u beart/s" +#~ msgstr[2] "%u beart/s" + #~ msgid "No previous hunk" #~ msgstr "Níl aon hunk roimhe seo" @@ -1,14 +1,14 @@ # Swedish translations for Git. -# Copyright (C) 2010-2025 Peter Krefting <peter@softwolves.pp.se> +# Copyright (C) 2010-2026 Peter Krefting <peter@softwolves.pp.se> # This file is distributed under the same license as the Git package. -# Peter Krefting <peter@softwolves.pp.se>, 2010-2025. +# Peter Krefting <peter@softwolves.pp.se>, 2010-2026. # msgid "" msgstr "" -"Project-Id-Version: git 2.52.0\n" +"Project-Id-Version: git 2.53.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2025-11-06 23:58+0000\n" -"PO-Revision-Date: 2025-11-07 15:54+0100\n" +"POT-Creation-Date: 2026-01-22 23:57+0000\n" +"PO-Revision-Date: 2026-01-27 19:33+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Svenska <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -552,7 +552,7 @@ msgstr "" "j - gå till nästa obestämda stycke, börja om vid slutet\n" "J - gå till nästa stycke, börja om vid slutet\n" "k - gå till föregående obestämda stycke, börja om vid början\n" -"K - gå till föregående styckem, börja om vid början\n" +"K - gå till föregående stycken, börja om vid början\n" "g - välj ett stycke att gå till\n" "/ - sök efter stycke som motsvarar angivet reguljärt uttryck\n" "s - dela aktuellt stycke i mindre styckens\n" @@ -1733,8 +1733,8 @@ msgstr "" msgid "'%s' is not a valid branch name" msgstr "”%s” är inte ett giltigt grennamn" -msgid "See `man git check-ref-format`" -msgstr "Se ”man git check-ref-format”" +msgid "See 'git help check-ref-format'" +msgstr "Se ”git help check-ref-format”" #, c-format msgid "a branch named '%s' already exists" @@ -2628,6 +2628,16 @@ msgid "must end with a color" msgstr "måste sluta med en färg" #, c-format +msgid "unknown value for config '%s': %s" +msgstr "okänt värde för inställningen ”%s”: %s" + +msgid "" +"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " +"\"histogram\"" +msgstr "" +"flaggan diff-algorithm godtar ”myers”, ”minimal”, ”patience” och ”histogram”" + +#, c-format msgid "cannot find revision %s to ignore" msgstr "kan inte hitta revision %s att ignorera" @@ -2679,6 +2689,12 @@ msgstr "visa författarens e-post istället för namn (Standard: av)" msgid "ignore whitespace differences" msgstr "ignorera ändringar i blanksteg" +msgid "<algorithm>" +msgstr "<algoritm>" + +msgid "choose a diff algorithm" +msgstr "välj en diff-algoritm" + msgid "rev" msgstr "incheckning" @@ -2694,8 +2710,8 @@ msgstr "färglägg redundant metadata från tidigare rader annorlunda" msgid "color lines by age" msgstr "färglägg rader efter ålder" -msgid "spend extra cycles to find better match" -msgstr "slösa extra cykler med att hitta bättre träff" +msgid "spend extra cycles to find a better match" +msgstr "slösa extra cykler med att hitta en bättre träff" msgid "use revisions from <file> instead of calling git-rev-list" msgstr "använd revisioner från <fil> istället för att anropa git-rev-list" @@ -3877,8 +3893,8 @@ msgid "missing branch name; try -%c" msgstr "grennamn saknas; försök med -%c" #, c-format -msgid "could not resolve %s" -msgstr "kunde inte upplösa %s" +msgid "could not resolve '%s'" +msgstr "kunde inte upplösa ”%s”" msgid "invalid path specification" msgstr "felaktig sökvägsangivelse" @@ -5341,10 +5357,16 @@ msgstr "--append kan inte användas med --value=<mönster>" #, c-format msgid "" "cannot overwrite multiple values with a single value\n" -" Use a regexp, --add or --replace-all to change %s." +" Use --value=<pattern>, --append or --all to change %s." msgstr "" "kan inte skriva över flera värden med ett ensamt värde\n" -" Använd en regexp, --add eller --replace-all för att ändra %s." +" Använd --value=<mönster>, --append eller --all för att ändra %s." + +msgid "unset all multi-valued config options" +msgstr "ta bort alla värden för konfigurationsflagga med flera värden" + +msgid "unset multi-valued config options with matching values" +msgstr "ta bort konfigurationsflagga med flera värden för träffade värden" #, c-format msgid "no such section: %s" @@ -5429,6 +5451,14 @@ msgstr "--default gäller bara för --get" msgid "--comment is only applicable to add/set/replace operations" msgstr "--comment gäller bara för ”get”/”set”/”replace”-operationerna" +#, c-format +msgid "" +"cannot overwrite multiple values with a single value\n" +" Use a regexp, --add or --replace-all to change %s." +msgstr "" +"kan inte skriva över flera värden med ett ensamt värde\n" +" Använd en regexp, --add eller --replace-all för att ändra %s." + msgid "print sizes in human readable format" msgstr "skriv storlekar i människoläsbart format" @@ -5788,7 +5818,7 @@ msgstr "git fast-export [<rev-list-flaggor>]" #, c-format msgid "unknown %s mode: %s" -msgstr "okänd läge för %s: %s" +msgstr "okänt läge för %s: %s" #, c-format msgid "unknown tag-of-filtered mode: %s" @@ -5830,14 +5860,8 @@ msgid "" "encountered commit-specific encoding %.*s in commit %s; use --reencode=[yes|" "no] to handle it" msgstr "" -"påträffade incheckningsspecifik teckenkodning %.*s i incheckningen %s; " -"använd --reencode=[yes|no] för att hantera den" - -#, c-format -msgid "encountered signed commit %s; use --signed-commits=<mode> to handle it" -msgstr "" -"påträffade en signerad incheckning %s; använd --signed-commits=<läge> för " -"att hantera den" +"påträffade den incheckningsspecifika teckenkodningen %.*s i incheckningen " +"%s; använd --reencode=[yes|no] för att hantera den" #, c-format msgid "exporting %<PRIuMAX> signature(s) for commit %s" @@ -5848,6 +5872,19 @@ msgid "stripping signature(s) from commit %s" msgstr "tar bort signatur(er) från incheckning %s" #, c-format +msgid "encountered signed commit %s; use --signed-commits=<mode> to handle it" +msgstr "" +"påträffade den signerade incheckningen %s; använd --signed-commits=<läge> " +"för att hantera den" + +msgid "" +"'strip-if-invalid' is not a valid mode for git fast-export with --signed-" +"commits=<mode>" +msgstr "" +"”strip-if-invalid” är inte ett giltigt läge för git fast-export med --signed-" +"commits=<läge>" + +#, c-format msgid "" "omitting tag %s,\n" "since tags of trees (or tags of tags of trees, etc.) are not supported." @@ -5860,12 +5897,6 @@ msgid "could not read tag %s" msgstr "kunde inte läsa taggen %s" #, c-format -msgid "encountered signed tag %s; use --signed-tags=<mode> to handle it" -msgstr "" -"påträffade signerade taggen %s; använd --signed-tags=<läge> för att hantera " -"den" - -#, c-format msgid "exporting signed tag %s" msgstr "exporterar signerad tagg %s" @@ -5874,6 +5905,19 @@ msgid "stripping signature from tag %s" msgstr "tar bort signatur från taggen %s" #, c-format +msgid "encountered signed tag %s; use --signed-tags=<mode> to handle it" +msgstr "" +"påträffade den signerade taggen %s; använd --signed-tags=<läge> för att " +"hantera den" + +msgid "" +"'strip-if-invalid' is not a valid mode for git fast-export with --signed-" +"tags=<mode>" +msgstr "" +"”strip-if-invalid” är inte ett giltigt läge för git fast-export med --signed-" +"tags=<läge>" + +#, c-format msgid "" "tag %s tags unexported object; use --tag-of-filtered-object=<mode> to handle " "it" @@ -6261,6 +6305,33 @@ msgstr "multipla %s-signaturer hittade, ignorerar ytterligare signatur" msgid "parse_one_signature() returned unknown hash algo" msgstr "parse_one_signature() returnerade okänd hashningsalgoritm" +msgid "unknown" +msgstr "okänd" + +#, c-format +msgid "" +"stripping invalid signature for commit '%.100s...'\n" +" allegedly by %s" +msgstr "" +"tar bort ogiltig signatur från incheckning ”%.100s...”\n" +" påstås vara av %s" + +#, c-format +msgid "" +"stripping invalid signature for commit '%.*s'\n" +" allegedly by %s" +msgstr "" +"tar bort ogiltig signatur från incheckning ”%.*s”\n" +" påstås vara av %s" + +#, c-format +msgid "" +"stripping invalid signature for commit\n" +" allegedly by %s" +msgstr "" +"tar bort ogiltig signatur från incheckning\n" +" påstås vara av %s" + msgid "expected committer but didn't get one" msgstr "förväntade incheckare men fick ingen" @@ -6275,10 +6346,6 @@ msgstr "tar bort en incheckningssignatur" msgid "importing a commit signature verbatim" msgstr "importerar en incheckningssignatur oförändrad" -msgid "encountered signed tag; use --signed-tags=<mode> to handle it" -msgstr "" -"upptäckte en signerad tagg; använd --signed-tags=<läge> för att hantera den" - #, c-format msgid "importing a tag signature verbatim for tag '%s'" msgstr "importerar en taggsignatur oförändrad för taggen ”%s”" @@ -6287,6 +6354,17 @@ msgstr "importerar en taggsignatur oförändrad för taggen ”%s”" msgid "stripping a tag signature for tag '%s'" msgstr "tar bort en taggsignatur för taggen ”%s”" +msgid "encountered signed tag; use --signed-tags=<mode> to handle it" +msgstr "" +"upptäckte en signerad tagg; använd --signed-tags=<läge> för att hantera den" + +msgid "" +"'strip-if-invalid' is not a valid mode for git fast-import with --signed-" +"tags=<mode>" +msgstr "" +"”strip-if-invalid” är inte ett giltigt läge för git fast-import med --signed-" +"tags=<läge>" + #, c-format msgid "expected 'from' command, got '%s'" msgstr "förväntade ”from”-kommando, fick %s" @@ -6443,8 +6521,8 @@ msgstr "git fetch [<flaggor>] [<arkiv> [<refspec>...]]" msgid "git fetch [<options>] <group>" msgstr "git fetch [<flaggor>] <grupp>" -msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" -msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]" +msgid "git fetch --multiple [<options>] [(<repository>|<group>)...]" +msgstr "git fetch --multiple [<flaggor>] [(<arkiv>|<grupp>)...]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<flaggor>]" @@ -6912,9 +6990,6 @@ msgstr "saknar --config=<konfig>" msgid "got bad config --config=%s" msgstr "fick felaktig konfiguration --config=%s" -msgid "unknown" -msgstr "okänd" - #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> #, c-format msgid "error in %s %s: %s" @@ -7013,6 +7088,10 @@ msgstr "%s: ogiltig sha1-pekare %s" msgid "%s: not a commit" msgstr "%s: inte en incheckning!" +#, c-format +msgid "invalid parameter: expected sha1, got '%s'" +msgstr "ogiltig parameter: förväntade sha1, fick ”%s”" + msgid "notice: No default references" msgstr "obs: Inga förvalda referenser" @@ -7039,26 +7118,6 @@ msgid "Checking object directories" msgstr "Kontrollerar objektkataloger" #, c-format -msgid "Checking %s link" -msgstr "Kontrollerar %s-länk" - -#, c-format -msgid "invalid %s" -msgstr "ogiltigt %s" - -#, c-format -msgid "%s points to something strange (%s)" -msgstr "%s pekar på något konstigt (%s)" - -#, c-format -msgid "%s: detached HEAD points at nothing" -msgstr "%s: frånkopplat HEAD pekar på ingenting" - -#, c-format -msgid "notice: %s points to an unborn branch (%s)" -msgstr "obs: %s pekar på en ofödd gren (%s)" - -#, c-format msgid "Checking cache tree of %s" msgstr "Kontrollerar cacheträd för %s" @@ -7139,14 +7198,6 @@ msgstr "kontrollerar referensdatabasens konsistens" msgid "Checking objects" msgstr "Kontrollerar objekt" -#, c-format -msgid "%s: object missing" -msgstr "%s: objekt saknas" - -#, c-format -msgid "invalid parameter: expected sha1, got '%s'" -msgstr "ogiltig parameter: förväntade sha1, fick ”%s”" - msgid "git fsmonitor--daemon start [<options>]" msgstr "git fsmonitor--daemon start [<flaggor>]" @@ -7523,6 +7574,9 @@ msgstr "misslyckades uppdatera underhållsschema" msgid "failed to add repo to global config" msgstr "misslyckades lägga till arkiv till global konfiguration" +msgid "check a specific task" +msgstr "kontrollera en specifik uppgift" + msgid "git maintenance <subcommand> [<options>]" msgstr "git maintenance <underkommando> [<flaggor>]" @@ -7972,6 +8026,10 @@ msgid "fsck error in packed object" msgstr "fsck-fel i packat objekt" #, c-format +msgid "invalid %s" +msgstr "ogiltigt %s" + +#, c-format msgid "Not all child objects of %s are reachable" msgstr "Inte alla barnobjekt för %s kan nås" @@ -8110,6 +8168,9 @@ msgstr "--stdin kräver ett git-arkiv" msgid "--verify with no packfile name given" msgstr "--verify angavs utan paketfilnamn" +msgid "cannot perform queued object checks outside of a repository" +msgstr "kan inte utföra köade objektkontroller utanför ett arkiv" + msgid "fsck error in pack objects" msgstr "fsck-fel i packat objekt" @@ -8361,7 +8422,7 @@ msgid "insane in-reply-to: %s" msgstr "tokigt in-reply-to: %s" msgid "git format-patch [<options>] [<since> | <revision-range>]" -msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]" +msgstr "git format-patch [<flaggor>] [<sedan> | <revisions-intervall>]" msgid "two output directories?" msgstr "två utdatakataloger?" @@ -8852,12 +8913,6 @@ msgstr "" "git merge-file [<alternativ>] [-L <namn1> [-L <orig> [-L <namn2>]]] <fil1> " "<origfil> <fil2>" -msgid "" -"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " -"\"histogram\"" -msgstr "" -"flaggan diff-algorithm godtar ”myers”, ”minimal”, ”patience” och ”histogram”" - msgid "send results to standard output" msgstr "sänd resultat till standard ut" @@ -8870,12 +8925,6 @@ msgstr "använd diff3-baserad sammanslagning" msgid "use a zealous diff3 based merge" msgstr "använd nitisk diff3-baserad sammanslagning" -msgid "<algorithm>" -msgstr "<algoritm>" - -msgid "choose a diff algorithm" -msgstr "välj en diff-algoritm" - msgid "for conflicts, use this marker size" msgstr "för konflikter, använd denna markörstorlek" @@ -9943,6 +9992,10 @@ msgid "could not get type of object %s in pack %s" msgstr "kunde inte hämta typ för objektet %s i paketet %s" #, c-format +msgid "packfile %s is a promisor but --exclude-promisor-objects was given" +msgstr "packfilen %s är ett kontrakt men --exclude-promisor-objects angavs" + +#, c-format msgid "could not find pack '%s'" msgstr "kunde inte hitta paketet ”%s”" @@ -10199,11 +10252,11 @@ msgstr "git pack-refs " 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 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 "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" @@ -10226,39 +10279,6 @@ msgstr "kan inte rensa i ett ”precious-objekt”-arkiv" msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<flaggor>] [<arkiv> [<refspec>...]]" -msgid "control for recursive fetching of submodules" -msgstr "styrning för rekursiv hämtning av undermoduler" - -msgid "Options related to merging" -msgstr "Alternativ gällande sammanslagning" - -msgid "incorporate changes by rebasing rather than merging" -msgstr "inlemma ändringar genom ombasering i stället för sammanslagning" - -msgid "allow fast-forward" -msgstr "tillåt snabbspolning" - -msgid "control use of pre-merge-commit and commit-msg hooks" -msgstr "styr användning av pre-merge-commit- och commit-msg-krokar" - -msgid "automatically stash/stash pop before and after" -msgstr "utför automatiskt stash/stash pop före och efter" - -msgid "Options related to fetching" -msgstr "Alternativ gällande hämtningar" - -msgid "force overwrite of local branch" -msgstr "tvinga överskrivning av lokal gren" - -msgid "number of submodules pulled in parallel" -msgstr "antal undermoduler som hämtas parallellt" - -msgid "use IPv4 addresses only" -msgstr "använd endast IPv4-adresser" - -msgid "use IPv6 addresses only" -msgstr "använd endast IPv6-adresser" - msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -10361,6 +10381,39 @@ msgstr "" "eller --ff-only på kommandoraden för att överstyra det konfigurerade\n" "förvalet vid körning.\n" +msgid "control for recursive fetching of submodules" +msgstr "styrning för rekursiv hämtning av undermoduler" + +msgid "Options related to merging" +msgstr "Alternativ gällande sammanslagning" + +msgid "incorporate changes by rebasing rather than merging" +msgstr "inlemma ändringar genom ombasering i stället för sammanslagning" + +msgid "allow fast-forward" +msgstr "tillåt snabbspolning" + +msgid "control use of pre-merge-commit and commit-msg hooks" +msgstr "styr användning av pre-merge-commit- och commit-msg-krokar" + +msgid "automatically stash/stash pop before and after" +msgstr "utför automatiskt stash/stash pop före och efter" + +msgid "Options related to fetching" +msgstr "Alternativ gällande hämtningar" + +msgid "force overwrite of local branch" +msgstr "tvinga överskrivning av lokal gren" + +msgid "number of submodules pulled in parallel" +msgstr "antal undermoduler som hämtas parallellt" + +msgid "use IPv4 addresses only" +msgstr "använd endast IPv4-adresser" + +msgid "use IPv6 addresses only" +msgstr "använd endast IPv6-adresser" + msgid "Updating an unborn branch with changes added to the index." msgstr "Uppdaterar en ofödd gren med ändringar som lagts till i indexet." @@ -11344,7 +11397,7 @@ msgstr "Markerar nåbara objekt..." #, c-format msgid "reflog could not be found: '%s'" -msgstr "refernsloggen hittades inte: ”%s”" +msgstr "referensloggen hittades inte: ”%s”" msgid "no reflog specified to delete" msgstr "ingen referenslogg att ta bort angavs" @@ -12206,6 +12259,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" +#, c-format +msgid "'%s' is not a valid commit-ish for %s" +msgstr "”%s” är inte en giltig incheckning-igt för %s" + msgid "need some commits to replay" msgstr "behöver några incheckningar för omspelning" @@ -12222,27 +12279,16 @@ msgstr "" "kan inte flytta målet framåt när det finns flera källor eftersom ordningen " "inte kan fastställas" -msgid "" -"cannot implicitly determine whether this is an --advance or --onto operation" -msgstr "" -"kan inte avgöra om den underförstådda processen är --advance eller --onto" - -msgid "" -"cannot advance target with multiple source branches because ordering would " -"be ill-defined" -msgstr "" -"kan inte flytta målet framåt när det finns flera källgrenar eftersom " -"ordningen inte kan fastställas" - -msgid "cannot implicitly determine correct base for --onto" -msgstr "kan inte avgöra den underförstådda basen för --onto" +#, c-format +msgid "invalid %s value: '%s'" +msgstr "ogiltigt värde för %s: ”%s”" msgid "" "(EXPERIMENTAL!) git replay ([--contained] --onto <newbase> | --advance " -"<branch>) <revision-range>..." +"<branch>) [--ref-action[=<mode>]] <revision-range>" msgstr "" "(EXPERIMENTELLT!) git replay ([--contained] --onto <nybas> | --advance " -"<gren>) <revisions-intervall>..." +"<gren>) [--ref-action[=<läge>]] <revisions-intervall>" msgid "make replay advance given branch" msgstr "låt omspelningen flytta den givna grenen framåt" @@ -12250,8 +12296,12 @@ msgstr "låt omspelningen flytta den givna grenen framåt" msgid "replay onto given commit" msgstr "spela om ovanpå en given incheckning" -msgid "advance all branches contained in revision-range" -msgstr "flytta alla grenar som finns i revisionsintervallet framåt" +msgid "update all branches that point at commits in <revision-range>" +msgstr "" +"uppdatera alla grenar som pekar på incheckningar i <revisions-intervall>" + +msgid "control ref update behavior (update|print)" +msgstr "styr beteende för referensuppdatering (update|print)" msgid "option --onto or --advance is mandatory" msgstr "flaggan --onto eller --advance måste anges" @@ -12264,16 +12314,28 @@ msgstr "" "några flaggor för revisionstraversering kommer överstyras eftersom ”%s”-" "biten i ”struct rev_info” kommer att tvingas" +#, c-format +msgid "failed to begin ref transaction: %s" +msgstr "misslyckades påbörja ref-transaktion: %s" + msgid "error preparing revisions" msgstr "fel när revisioner skulle förberedas" -msgid "replaying down to root commit is not supported yet!" -msgstr "kan ännu inte spela om hela vägen ned till rotincheckningen!" +msgid "replaying down from root commit is not supported yet!" +msgstr "kan ännu inte spela om hela vägen ned från rotincheckningen!" msgid "replaying merge commits is not supported yet!" msgstr "kan ännu inte spela om sammanslagningsincheckningar!" #, c-format +msgid "failed to update ref '%s': %s" +msgstr "misslyckades uppdatera referensen ”%s”: %s" + +#, c-format +msgid "failed to commit ref transaction: %s" +msgstr "misslyckades checka in referenstransaktionen: %s" + +#, c-format msgid "key '%s' not found" msgstr "nyckeln ”%s” hittades inte" @@ -12287,9 +12349,15 @@ msgstr "utdataformat" msgid "synonym for --format=nul" msgstr "synonym till --format=nul" +msgid "print all keys/values" +msgstr "visa alla nycklar/värden" + msgid "unsupported output format" msgstr "utdataformatet stöds ej" +msgid "--all and <key> cannot be used together" +msgstr "--all och <nyckel> kan inte användas samtidigt" + msgid "References" msgstr "Referenser" @@ -12320,6 +12388,12 @@ msgstr "Träd" msgid "Blobs" msgstr "Blob:ar" +msgid "Inflated size" +msgstr "Uppackad storlek" + +msgid "Disk size" +msgstr "Diskstorlek" + msgid "Repository structure" msgstr "Arkivstruktur" @@ -14786,6 +14860,10 @@ msgstr "kunde inte tolka listnyckeln %s med värdet ”%s”" msgid "bundle list at '%s' has no mode" msgstr "buntlistan på ”%s” har inget läge" +#, c-format +msgid "bundle list at '%s': bundle '%s' has no uri" +msgstr "buntlistan på ”%s”: bunten ”%s” har ingen uri" + msgid "failed to create temporary file" msgstr "misslyckades skapa temporär fil" @@ -14808,6 +14886,10 @@ msgid "exceeded bundle URI recursion limit (%d)" msgstr "överskred buntens URI-rekursionsgräns (%d)" #, c-format +msgid "bundle '%s' has no uri" +msgstr "buntlistan ”%s” har ingen uri" + +#, c-format msgid "failed to download bundle from URI '%s'" msgstr "misslyckades hämta bunt från URI:en ”%s”" @@ -15302,8 +15384,8 @@ msgstr "Skapar en sammanfattning av väntande ändringar" msgid "Reuse recorded resolution of conflicted merges" msgstr "Återanvänd sparad lösning av sammanslagningskonflikter" -msgid "Reset current HEAD to the specified state" -msgstr "Återställ aktuell HEAD till angivet tillstånd" +msgid "Set `HEAD` or the index to a known state" +msgstr "Sätt ”HEAD” eller indexet till ett känt tillstånd" msgid "Restore working tree files" msgstr "Återställ filer i arbetskatalogen" @@ -16812,10 +16894,6 @@ msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Okänt värde för konfigurationsvariabeln ”diff.submodule”: ”%s”" #, c-format -msgid "unknown value for config '%s': %s" -msgstr "okänt värde för inställningen ”%s”: %s" - -#, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" @@ -18921,6 +18999,9 @@ msgstr "för lite lästes vid indexering av %s" msgid "%s: failed to insert into database" msgstr "%s: misslyckades lägga in i databasen" +msgid "cannot add a submodule of a different hash algorithm" +msgstr "kan inte lägga till submodul med annan hashningsalgoritm" + #, c-format msgid "%s: unsupported file type" msgstr "%s: filtypen stöds ej" @@ -20371,6 +20452,10 @@ msgstr "kommandot förkastar atom %%(%.*s)" msgid "--format=%.*s cannot be used with --python, --shell, --tcl" msgstr "--format=%.*s kan inte användas med --python, --shell, --tcl" +#, c-format +msgid "parse_object_buffer failed on %s for %s" +msgstr "parse_object_buffer misslyckades på %s för %s" + msgid "failed to run 'describe'" msgstr "misslyckades att köra ”describe”" @@ -20402,10 +20487,6 @@ msgid "missing object %s for %s" msgstr "objektet %s saknas för %s" #, c-format -msgid "parse_object_buffer failed on %s for %s" -msgstr "parse_object_buffer misslyckades på %s för %s" - -#, c-format msgid "malformed object at '%s'" msgstr "felformat objekt vid ”%s”" @@ -20700,6 +20781,18 @@ msgid "refname %s is a symbolic ref, copying it is not supported" msgstr "referensnamnet %s är en symbolisk referens, kopiering stöds inte" #, c-format +msgid "reftable stack for worktree '%s' is broken" +msgstr "referensstacken för arbetskatalogen ”%s” är trasig" + +#, c-format +msgid "could not create iterator for worktree '%s'" +msgstr "kunde inte skapa iterator för arbetskatalogen ”%s”" + +#, c-format +msgid "could not read record for worktree '%s'" +msgstr "kunde inte läsa posten för arbetskatalogen ”%s”" + +#, c-format msgid "pattern '%s' has no '*'" msgstr "mönstret ”%s” innehåller ingen ”*”" @@ -21116,6 +21209,9 @@ msgstr "" msgid "could not finish pack-objects to repack promisor objects" msgstr "kunde inte avsluta pack-objects för att packa om kontraktsobjekt" +msgid "could not start pack-objects to repack promisor packs" +msgstr "kunde inte starta pack-objects för att packa om kontraktspaket" + #, c-format msgid "pack prefix %s does not begin with objdir %s" msgstr "paketprefixet %s börjar inte med objkat %s" @@ -21904,7 +22000,7 @@ msgid "" msgstr "" "”reword” tar inte en sammanslagningsincheckning. Om du\n" "ville spela upp sammanslagningen på nytt och ändra texten\n" -"i incheckningsmeddelandet använder du ”merge -C” på\n" +"i incheckningsmeddelandet använder du ”merge -c” på\n" "incheckningen" #. TRANSLATORS: 'edit', 'merge -C' and 'break' should @@ -22114,10 +22210,6 @@ 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" @@ -22592,49 +22684,68 @@ msgstr "felaktigt %s-format: elementet ”%s” slutar inte med ”)”" msgid "bad %s format: %%%.*s" msgstr "felaktigt %s-format: %%%.*s" -#. TRANSLATORS: IEC 80000-13:2008 gibibyte #, c-format -msgid "%u.%2.2u GiB" -msgstr "%u,%2.2u GiB" +msgid "%u.%2.2u" +msgstr "%u,%2.2u" -#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#, c-format -msgid "%u.%2.2u GiB/s" -msgstr "%u,%2.2u GiB/s" +#. TRANSLATORS: SI decimal prefix symbol for 10^9 +msgid "G" +msgstr "G" -#. TRANSLATORS: IEC 80000-13:2008 mebibyte -#, c-format -msgid "%u.%2.2u MiB" -msgstr "%u,%2.2u MiB" +#. TRANSLATORS: SI decimal prefix symbol for 10^6 +msgid "M" +msgstr "M" -#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#, c-format -msgid "%u.%2.2u MiB/s" -msgstr "%u,%2.2u MiB/s" +#. TRANSLATORS: SI decimal prefix symbol for 10^3 +msgid "k" +msgstr "k" -#. TRANSLATORS: IEC 80000-13:2008 kibibyte -#, c-format -msgid "%u.%2.2u KiB" -msgstr "%u,%2.2u KiB" +#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second and gibibyte +msgid "GiB/s" +msgstr "GiB/s" -#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#, c-format -msgid "%u.%2.2u KiB/s" -msgstr "%u,%2.2u KiB/s" +msgid "GiB" +msgstr "GiB" -#. TRANSLATORS: IEC 80000-13:2008 byte -#, c-format -msgid "%u byte" -msgid_plural "%u bytes" -msgstr[0] "%u byte" -msgstr[1] "%u bytes" +#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second and mebibyte +msgid "MiB/s" +msgstr "MiB/s" + +msgid "MiB" +msgstr "MiB" + +#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second and kibibyte +msgid "KiB/s" +msgstr "KiB/s" + +msgid "KiB" +msgstr "KiB" + +#. TRANSLATORS: IEC 80000-13:2008 byte/second and byte +msgid "B/s" +msgstr "B/s" + +msgid "B" +msgstr "B" #. TRANSLATORS: IEC 80000-13:2008 byte/second +msgid "byte/s" +msgid_plural "bytes/s" +msgstr[0] "byte/s" +msgstr[1] "byte/s" + +#. TRANSLATORS: IEC 80000-13:2008 byte +msgid "byte" +msgid_plural "bytes" +msgstr[0] "byte" +msgstr[1] "byte" + +#. TRANSLATORS: The first argument is the number string. The second +#. argument is the unit string (i.e. "12.34 MiB/s"). +#. #, c-format -msgid "%u byte/s" -msgid_plural "%u bytes/s" -msgstr[0] "%u byte/s" -msgstr[1] "%u bytes/s" +msgid "%s %s" +msgstr "%s %s" #, c-format msgid "ignoring suspicious submodule name: %s" @@ -22926,9 +23037,6 @@ msgstr "antal byte" msgid "number of requests per thread" msgstr "antal frågor per tråd" -msgid "byte" -msgstr "byte" - msgid "ballast character" msgstr "ballasttecken" @@ -97,8 +97,8 @@ msgid "" msgstr "" "Project-Id-Version: Git Turkish Localization Project\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2025-11-15 01:30+0300\n" -"PO-Revision-Date: 2025-11-15 02:00+0300\n" +"POT-Creation-Date: 2026-01-27 22:54+0300\n" +"PO-Revision-Date: 2026-01-27 22:00+0300\n" "Last-Translator: Emir SARI <emir_sari@icloud.com>\n" "Language-Team: Turkish <kde-i18n-doc@kde.org>\n" "Language: tr\n" @@ -642,16 +642,16 @@ msgid "" "P - print the current hunk using the pager\n" "? - print help\n" msgstr "" -"j - bu parça için sonra karar ver, bir sonraki karar verilmemiş parçayı gör\n" -"J - bu parça için sonra karar ver, bir sonraki parçayı gör\n" -"k - bu parça için sonra karar ver, bir önceki karar verilmemiş parçayı gör\n" -"K - bu parça için sonra karar ver, bir önceki parçayı gör\n" +"j - sonraki karar verilmemiş parçaya git, bitince başa dön\n" +"J - sonraki parçaya git, bitince başa dön\n" +"k - önceki karar verilmemiş parçaya git, bitince sona dön\n" +"K - önceki parçaya git, bitince sona dön\n" "g - gidilecek bir parça seç\n" "/ - verilen düzenli ifade ile eşleşen bir parça ara\n" "s - geçerli parçayı daha ufak parçalara böl\n" "e - geçerli parçayı elle düzenle\n" "p - geçerli parçayı yazdır\n" -"P - geçerli sayfayı sayfalayıcı kullanarak yazdır\n" +"P - geçerli sayfayı sayfalayıcıyı kullanarak yazdır\n" "? - yardımı yazdır\n" #, c-format @@ -1821,26 +1821,26 @@ msgstr "" msgid "'%s' is not a valid branch name" msgstr "'%s' geçerli bir dal adı değil" -msgid "See `man git check-ref-format`" -msgstr "'man git check-ref-format' kılavuz sayfasına bakın" +msgid "See 'git help check-ref-format'" +msgstr "\"git help check-ref-format\" bölümüne bakın" #, c-format msgid "a branch named '%s' already exists" -msgstr "'%s' adında bir dal halihazırda var" +msgstr "\"%s\" adında bir dal halihazırda var" #, c-format msgid "cannot force update the branch '%s' used by worktree at '%s'" msgstr "" -"şuradaki çalışma ağacı tarafından kullanılan '%s' dalı zorla " -"güncellenemiyor: '%s'" +"\"%2$s\" konumundaki çalışma ağacı tarafından kullanılan \"%1$s\" dalı zorla " +"güncellenemiyor" #, c-format msgid "cannot set up tracking information; starting point '%s' is not a branch" -msgstr "izleme bilgisi ayarlanamıyor; başlangıç noktası '%s' bir dal değil" +msgstr "izleme bilgisi ayarlanamıyor; başlangıç noktası \"%s\" bir dal değil" #, c-format msgid "the requested upstream branch '%s' does not exist" -msgstr "istenen üstkaynak dalı '%s' yok" +msgstr "istenen üstkaynak dalı \"%s\" yok" msgid "" "\n" @@ -2720,6 +2720,17 @@ msgid "must end with a color" msgstr "bir renk ile bitmeli" #, c-format +msgid "unknown value for config '%s': %s" +msgstr "'%s' yapılandırması için bilinmeyen değer: %s" + +msgid "" +"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " +"\"histogram\"" +msgstr "" +"diff-algorithm seçeneği şunları kabul eder: \"myers\", \"minimal\", " +"\"patience\" ve \"histogram\"" + +#, c-format msgid "cannot find revision %s to ignore" msgstr "yok saymak için %s revizyonu bulunamıyor" @@ -2771,6 +2782,12 @@ msgstr "yazar adı yerine e-postasını göster (Öntanımlı: Kapalı)" msgid "ignore whitespace differences" msgstr "boşluk ayrımlarını yok say" +msgid "<algorithm>" +msgstr "<algoritma>" + +msgid "choose a diff algorithm" +msgstr "bir diff algoritması seç" + msgid "rev" msgstr "revizyon" @@ -2786,7 +2803,7 @@ msgstr "bir önceki dosyadan gereksiz üstveriyi başka biçimde renklendir" msgid "color lines by age" msgstr "satırları yaşına göre renklendir" -msgid "spend extra cycles to find better match" +msgid "spend extra cycles to find a better match" msgstr "daha iyi eşleşme bulmak için ek döngüler harca" msgid "use revisions from <file> instead of calling git-rev-list" @@ -3971,8 +3988,8 @@ msgid "missing branch name; try -%c" msgstr "eksik dal adı; -%c deneyin" #, c-format -msgid "could not resolve %s" -msgstr "%s çözülemedi" +msgid "could not resolve '%s'" +msgstr "'%s' çözülemedi" msgid "invalid path specification" msgstr "geçersiz yol belirtimi" @@ -5452,11 +5469,16 @@ msgstr "--append, --value=<dizgi> ile kullanılamaz" #, c-format msgid "" "cannot overwrite multiple values with a single value\n" -" Use a regexp, --add or --replace-all to change %s." +" Use --value=<pattern>, --append or --all to change %s." msgstr "" "Tek bir değer ile birden çok değerin üzerine yazılamıyor.\n" -" %s değerini değiştirmek için bir düzenli ifade, --add veya --replace-" -"all kullanın." +" %s değişikliği için --value=<dizgi>, --append veya --all kullanın." + +msgid "unset all multi-valued config options" +msgstr "birden çok değerli yapılandırma seçeneklerinin tüm değerlerini kaldır" + +msgid "unset multi-valued config options with matching values" +msgstr "birden çok değerli yapılandırma seçeneğini eşleşen değerlerle değiştir" #, c-format msgid "no such section: %s" @@ -5542,6 +5564,15 @@ msgstr "--default yalnızca --get için uygulanabilir" msgid "--comment is only applicable to add/set/replace operations" msgstr "--comment yalnızca ekle/ayarla/değiştir işlemlerine uygulanabilir" +#, c-format +msgid "" +"cannot overwrite multiple values with a single value\n" +" Use a regexp, --add or --replace-all to change %s." +msgstr "" +"Tek bir değer ile birden çok değerin üzerine yazılamıyor.\n" +" %s değerini değiştirmek için bir düzenli ifade, --add veya --replace-" +"all kullanın." + msgid "print sizes in human readable format" msgstr "yazdırma boyutları kişi tarafından okunabilir biçimde" @@ -5945,12 +5976,6 @@ msgstr "" "reencode[yes|no] kullanın: %s" #, c-format -msgid "encountered signed commit %s; use --signed-commits=<mode> to handle it" -msgstr "" -"imzalanmış %s işlemesine denk gelindi; işlemek için --signed-commits=<kip> " -"kullanın" - -#, c-format msgid "exporting %<PRIuMAX> signature(s) for commit %s" msgstr "şu işleme için %<PRIuMAX> imza dışa aktarılıyor: %s" @@ -5959,6 +5984,19 @@ msgid "stripping signature(s) from commit %s" msgstr "%s işlemesinden imzalar soyuluyor" #, c-format +msgid "encountered signed commit %s; use --signed-commits=<mode> to handle it" +msgstr "" +"imzalanmış %s işlemesine denk gelindi; işlemek için --signed-commits=<kip> " +"kullanın" + +msgid "" +"'strip-if-invalid' is not a valid mode for git fast-export with --signed-" +"commits=<mode>" +msgstr "" +"\"strip-if-invalid\", git fast-export için --signed-commits=<kip> ile " +"geçerli bir kip değil" + +#, c-format msgid "" "omitting tag %s,\n" "since tags of trees (or tags of tags of trees, etc.) are not supported." @@ -5971,12 +6009,6 @@ msgid "could not read tag %s" msgstr "%s etiketi okunamadı" #, c-format -msgid "encountered signed tag %s; use --signed-tags=<mode> to handle it" -msgstr "" -"imzalanmış %s etiketinee denk gelindi; işlemek için --signed-tags=<kip> " -"kullanın" - -#, c-format msgid "exporting signed tag %s" msgstr "imzalanmış %s etiketi dışa aktarılıyor" @@ -5985,6 +6017,19 @@ msgid "stripping signature from tag %s" msgstr "%s etiketinden imza soyuluyor" #, c-format +msgid "encountered signed tag %s; use --signed-tags=<mode> to handle it" +msgstr "" +"imzalanmış %s etiketinee denk gelindi; işlemek için --signed-tags=<kip> " +"kullanın" + +msgid "" +"'strip-if-invalid' is not a valid mode for git fast-export with --signed-" +"tags=<mode>" +msgstr "" +"\"strip-if-invalid\", git fast-export için --signed-tags=<kip> ile geçerli " +"bir kip değil" + +#, c-format msgid "" "tag %s tags unexported object; use --tag-of-filtered-object=<mode> to handle " "it" @@ -6374,6 +6419,33 @@ msgstr "birden çok %s imzası bulundu, ek imzalar yok sayılıyor" msgid "parse_one_signature() returned unknown hash algo" msgstr "parse_one_signature(), bilinmeyen bir sağlama algoritması döndürdü" +msgid "unknown" +msgstr "bilinmeyen" + +#, c-format +msgid "" +"stripping invalid signature for commit '%.100s...'\n" +" allegedly by %s" +msgstr "" +"\"%.100s...\" işlemesi için olan geçersiz imzalar soyuluyor;\n" +" görünüşe göre %s tarafından" + +#, c-format +msgid "" +"stripping invalid signature for commit '%.*s'\n" +" allegedly by %s" +msgstr "" +"\"%.*s...\" işlemesi için olan geçersiz imza soyuluyor;\n" +" görünüşe göre %s tarafından" + +#, c-format +msgid "" +"stripping invalid signature for commit\n" +" allegedly by %s" +msgstr "" +"işleme için olan geçersiz imza soyuluyor;\n" +" görünüşe göre %s tarafından" + msgid "expected committer but didn't get one" msgstr "işlemeci bekleniyordu; ancak bir tane bulunamadı" @@ -6387,10 +6459,6 @@ msgstr "bir işleme imzası soyuluyor" msgid "importing a commit signature verbatim" msgstr "bir işleme imzası olduğu gibi içe aktarılıyor" -msgid "encountered signed tag; use --signed-tags=<mode> to handle it" -msgstr "" -"imzalanmış etikete denk gelindi; işlemek için --signed-tags=<kip> kullanın" - #, c-format msgid "importing a tag signature verbatim for tag '%s'" msgstr "\"%s\" etiketi için bir etiket imzası olduğu gibi içe aktarılıyor" @@ -6399,6 +6467,17 @@ msgstr "\"%s\" etiketi için bir etiket imzası olduğu gibi içe aktarılıyor" msgid "stripping a tag signature for tag '%s'" msgstr "\"%s\" etiketi için bir etiket imzası soyuluyor" +msgid "encountered signed tag; use --signed-tags=<mode> to handle it" +msgstr "" +"imzalanmış etikete denk gelindi; işlemek için --signed-tags=<kip> kullanın" + +msgid "" +"'strip-if-invalid' is not a valid mode for git fast-import with --signed-" +"tags=<mode>" +msgstr "" +"\"strip-if-invalid\", git fast-import için --signed-tags=<kip> ile geçerli " +"bir kip değil" + #, c-format msgid "expected 'from' command, got '%s'" msgstr "\"from\" komutu bekleniyordu, \"%s\" alındı" @@ -6555,8 +6634,8 @@ msgstr "git fetch [<seçenekler>] [<depo> [<bşvr-blrtç>...]]" msgid "git fetch [<options>] <group>" msgstr "git fetch [<seçenekler>] <grup>" -msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" -msgstr "git fetch --multiple [<seçenekler>] [(<depo> | <grup>)...]" +msgid "git fetch --multiple [<options>] [(<repository>|<group>)...]" +msgstr "git fetch --multiple [<seçenekler>] [(<depo>|<grup>)...]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<seçenekler>]" @@ -7031,9 +7110,6 @@ msgstr "--config=<yapılandırma> eksik" msgid "got bad config --config=%s" msgstr "hatayı yapılandırma alındı, --config=%s" -msgid "unknown" -msgstr "bilinmeyen" - #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> #, c-format msgid "error in %s %s: %s" @@ -7128,6 +7204,10 @@ msgstr "%s: geçersiz sha1 işaretçisi %s" msgid "%s: not a commit" msgstr "%s: bir işleme değil" +#, c-format +msgid "invalid parameter: expected sha1, got '%s'" +msgstr "geçersiz parametre: sha1 bekleniyordu, '%s' alındı" + msgid "notice: No default references" msgstr "Uyarı: Öntanımlı başvurular yok" @@ -7154,26 +7234,6 @@ msgid "Checking object directories" msgstr "Nesne dizinleri denetleniyor" #, c-format -msgid "Checking %s link" -msgstr "%s bağ denetleniyor" - -#, c-format -msgid "invalid %s" -msgstr "geçersiz %s" - -#, c-format -msgid "%s points to something strange (%s)" -msgstr "%s garip bir şeye işaret ediyor (%s)" - -#, c-format -msgid "%s: detached HEAD points at nothing" -msgstr "%s: ayrık HEAD bir şeye işaret etmiyor" - -#, c-format -msgid "notice: %s points to an unborn branch (%s)" -msgstr "Uyarı: %s henüz doğmamış bir dala işaret ediyor (%s)" - -#, c-format msgid "Checking cache tree of %s" msgstr "%s ögesinin önbellek ağacı denetleniyor" @@ -7252,14 +7312,6 @@ msgstr "başvuru veritabanı tutarlılığını denetle" msgid "Checking objects" msgstr "Nesneler denetleniyor" -#, c-format -msgid "%s: object missing" -msgstr "%s: nesne kayıp" - -#, c-format -msgid "invalid parameter: expected sha1, got '%s'" -msgstr "geçersiz parametre: sha1 bekleniyordu, '%s' alındı" - msgid "git fsmonitor--daemon start [<options>]" msgstr "git fsmonitor--daemon start [<seçenekler>]" @@ -7637,6 +7689,9 @@ msgstr "bakım programı ayarlanamadı" msgid "failed to add repo to global config" msgstr "depo, global yapılandırmaya eklenemedi" +msgid "check a specific task" +msgstr "belirli bir görevi denetle" + msgid "git maintenance <subcommand> [<options>]" msgstr "git maintenance <altkomut> [<seçenekler>]" @@ -8092,6 +8147,10 @@ msgid "fsck error in packed object" msgstr "paketlenmiş nesne içinde fsck hatası" #, c-format +msgid "invalid %s" +msgstr "geçersiz %s" + +#, c-format msgid "Not all child objects of %s are reachable" msgstr "%s ögesinin tüm alt ögeleri ulaşılabilir değil" @@ -8231,6 +8290,9 @@ msgstr "--stdin bir git dizini gerektirir" msgid "--verify with no packfile name given" msgstr "--verify ile bir paket dosyası adı verilmedi" +msgid "cannot perform queued object checks outside of a repository" +msgstr "depo dışında kuyruğa alınmış nesne denetimleri gerçekleştirilemez" + msgid "fsck error in pack objects" msgstr "paket nesnelerinde fsck hatası" @@ -8978,13 +9040,6 @@ msgstr "" "git merge-file [<seçenekler>] [-L <ad1> [-L <orij> [-L <ad2>]]] <dosya1> " "<orij-dosya> <dosya2>" -msgid "" -"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " -"\"histogram\"" -msgstr "" -"diff-algorithm seçeneği şunları kabul eder: \"myers\", \"minimal\", " -"\"patience\" ve \"histogram\"" - msgid "send results to standard output" msgstr "sonuçları standart çıktıya gönder" @@ -8997,12 +9052,6 @@ msgstr "diff3 tabanlı birleştirme kullan" msgid "use a zealous diff3 based merge" msgstr "gayretli bir diff3 tabanlı birleştirme kullan" -msgid "<algorithm>" -msgstr "<algoritma>" - -msgid "choose a diff algorithm" -msgstr "bir diff algoritması seç" - msgid "for conflicts, use this marker size" msgstr "çakışmalarda bu imleyici boyutunu kullan" @@ -10067,6 +10116,10 @@ msgid "could not get type of object %s in pack %s" msgstr "%s nesnesinin türü alınamıyor (%s paketinde)" #, c-format +msgid "packfile %s is a promisor but --exclude-promisor-objects was given" +msgstr "paket dosyası %s bir vaatçi; ancak --exclude-promisor-objects verildi" + +#, c-format msgid "could not find pack '%s'" msgstr "'%s' paketi bulunamadı" @@ -10323,10 +10376,10 @@ msgstr "git pack-refs " msgid "git patch-id [--stable | --unstable | --verbatim]" msgstr "git patch-id [--stable | --unstable | --verbatim]" -msgid "use the unstable patch-id algorithm" -msgstr "kararlı olmayan yama kimliği algoritmasını kullan" +msgid "use the unstable patch ID algorithm" +msgstr "kararsız yama kimliği algoritmasını kullan" -msgid "use the stable patch-id algorithm" +msgid "use the stable patch ID algorithm" msgstr "kararlı yama kimliği algoritmasını kullan" msgid "don't strip whitespace from the patch" @@ -10351,39 +10404,6 @@ msgstr "bir precious-objects deposu içinde budama yapılamıyor" msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<seçenekler>] [<depo> [<bşvr-blrtç>...]]" -msgid "control for recursive fetching of submodules" -msgstr "altmodüllerin özyineli getirilmesi için denetleme" - -msgid "Options related to merging" -msgstr "Birleştirme ile ilgili seçenekler" - -msgid "incorporate changes by rebasing rather than merging" -msgstr "değişiklikleri birleştirme yerine yeniden temellendirme ile kat" - -msgid "allow fast-forward" -msgstr "ileri sarıma izin ver" - -msgid "control use of pre-merge-commit and commit-msg hooks" -msgstr "pre-merge-commit ve commit-msg kancalarının kullanımını denetle" - -msgid "automatically stash/stash pop before and after" -msgstr "öncesinde ve sonrasında kendiliğinden zulala/zulaları patlat" - -msgid "Options related to fetching" -msgstr "Getirme ile ilgili seçenekler" - -msgid "force overwrite of local branch" -msgstr "zorla yerel dalın üzerine yaz" - -msgid "number of submodules pulled in parallel" -msgstr "paralelde çekilen altmodüllerin sayısı" - -msgid "use IPv4 addresses only" -msgstr "yalnızca IPv4 adresleri kullan" - -msgid "use IPv6 addresses only" -msgstr "yalnızca IPv6 adresleri kullan" - msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -10485,6 +10505,39 @@ msgstr "" "yapılandırmayı yürütme sırasında --rebase, --no-rebase veya\n" "--ff-only ile bir kerelik geçersiz kılabilirsiniz.\n" +msgid "control for recursive fetching of submodules" +msgstr "altmodüllerin özyineli getirilmesi için denetleme" + +msgid "Options related to merging" +msgstr "Birleştirme ile ilgili seçenekler" + +msgid "incorporate changes by rebasing rather than merging" +msgstr "değişiklikleri birleştirme yerine yeniden temellendirme ile kat" + +msgid "allow fast-forward" +msgstr "ileri sarıma izin ver" + +msgid "control use of pre-merge-commit and commit-msg hooks" +msgstr "pre-merge-commit ve commit-msg kancalarının kullanımını denetle" + +msgid "automatically stash/stash pop before and after" +msgstr "öncesinde ve sonrasında kendiliğinden zulala/zulaları patlat" + +msgid "Options related to fetching" +msgstr "Getirme ile ilgili seçenekler" + +msgid "force overwrite of local branch" +msgstr "zorla yerel dalın üzerine yaz" + +msgid "number of submodules pulled in parallel" +msgstr "paralelde çekilen altmodüllerin sayısı" + +msgid "use IPv4 addresses only" +msgstr "yalnızca IPv4 adresleri kullan" + +msgid "use IPv6 addresses only" +msgstr "yalnızca IPv6 adresleri kullan" + msgid "Updating an unborn branch with changes added to the index." msgstr "İndekse eklenen değişikliklerle henüz doğmamış bir dal güncelleniyor." @@ -12346,6 +12399,10 @@ msgstr "--convert-graft-file argüman almaz" msgid "only one pattern can be given with -l" msgstr "-l ile yalnızca bir dizgi verilebilir" +#, c-format +msgid "'%s' is not a valid commit-ish for %s" +msgstr "\"%s\", %s için geçerli bir işlememsi değil" + msgid "need some commits to replay" msgstr "yeniden oynatmak için birkaç işleme gerekli" @@ -12362,27 +12419,16 @@ msgstr "" "birden çok kaynaklı hedef ilerletilemiyor; çünkü sıralama hatalı tanımlanmış " "olurdu" -msgid "" -"cannot implicitly determine whether this is an --advance or --onto operation" -msgstr "" -"bunun --advance veya --onto işlemi olup olmadığı örtük olarak algılanamıyor" - -msgid "" -"cannot advance target with multiple source branches because ordering would " -"be ill-defined" -msgstr "" -"birden çok kaynak dallı hedef ilerletilemiyor; çünkü sıralama hatalı " -"tanımlanmış olurdu" - -msgid "cannot implicitly determine correct base for --onto" -msgstr "--onto için olan doğru temel örtük olarak algılanamıyor" +#, c-format +msgid "invalid %s value: '%s'" +msgstr "geçersiz %s değeri: \"%s\"" msgid "" "(EXPERIMENTAL!) git replay ([--contained] --onto <newbase> | --advance " -"<branch>) <revision-range>..." +"<branch>) [--ref-action[=<mode>]] <revision-range>" msgstr "" "(DENEYSEL!) git replay ([--contained] --onto <yeni-temel> | --advance <dal>) " -"<revizyon-erimi>..." +"[--ref-action[=<kip>]] <revizyon-erimi>..." msgid "make replay advance given branch" msgstr "verilen dalı önceden yeniden oynat" @@ -12390,8 +12436,11 @@ msgstr "verilen dalı önceden yeniden oynat" msgid "replay onto given commit" msgstr "verilen işlemeye yeniden oynat" -msgid "advance all branches contained in revision-range" -msgstr "revizyon eriminde içerilen tüm dalları ilerlet" +msgid "update all branches that point at commits in <revision-range>" +msgstr "<revizyon-erimi>'ndeki işlemelere işaret eden tüm dalları güncelle" + +msgid "control ref update behavior (update|print)" +msgstr "başvuru güncelleme davranışını denetle (update|print)" msgid "option --onto or --advance is mandatory" msgstr "--onto veya --advance seçeneğinin kullanımı zorunlu" @@ -12404,16 +12453,28 @@ msgstr "" "'struct rev_info' içindeki '%s' biti zorlanacağından kimi revizyon yürütme " "seçenekleri geçersiz kılınacak" +#, c-format +msgid "failed to begin ref transaction: %s" +msgstr "başvuru işlemine başlanılamadı: %s" + msgid "error preparing revisions" msgstr "revizyonlar hazırlanırken hata" -msgid "replaying down to root commit is not supported yet!" -msgstr "kök işlemeye kadar yeniden oynatma henüz desteklenmiyor!" +msgid "replaying down from root commit is not supported yet!" +msgstr "kök işlemeden aşağı yeniden oynatma henüz desteklenmiyor!" msgid "replaying merge commits is not supported yet!" msgstr "birleştirme işlemelerini yeniden oynatma henüz desteklenmiyor!" #, c-format +msgid "failed to update ref '%s': %s" +msgstr "\"%s\" başvurusu güncellenemedi: %s" + +#, c-format +msgid "failed to commit ref transaction: %s" +msgstr "başvuru işlemi işlenemedi: %s" + +#, c-format msgid "key '%s' not found" msgstr "'%s' anahtarı bulunamadı" @@ -12427,9 +12488,15 @@ msgstr "çıktı biçimi" msgid "synonym for --format=nul" msgstr "--format=nul eşanlamlısı" +msgid "print all keys/values" +msgstr "tüm anahtarları/değerleri yazdır" + msgid "unsupported output format" msgstr "desteklenmeyen çıktı biçimi" +msgid "--all and <key> cannot be used together" +msgstr "--all ve <anahtar> birlikte kullanılamaz" + msgid "References" msgstr "Başvurular" @@ -12460,6 +12527,12 @@ msgstr "Ağaçlar" msgid "Blobs" msgstr "İkili geniş nesneler" +msgid "Inflated size" +msgstr "Şişirilmiş boyut" + +msgid "Disk size" +msgstr "Disk boyutu" + msgid "Repository structure" msgstr "Depo yapısı" @@ -14920,11 +14993,15 @@ msgstr "yalnızca hata ayıklama için yararlı" #, c-format msgid "could not parse bundle list key %s with value '%s'" -msgstr "demet liste anahtarı %s ile '%s' değeri ayrıştırılamıyor" +msgstr "demet liste anahtarı %s ile \"%s\" değeri ayrıştırılamıyor" #, c-format msgid "bundle list at '%s' has no mode" -msgstr "'%s' konumundaki demet listesinin kipi yok" +msgstr "\"%s\" konumundaki demet listesinin kipi yok" + +#, c-format +msgid "bundle list at '%s': bundle '%s' has no uri" +msgstr "\"%s\" konumundaki demet: \"%s\" demetinde URI yok" msgid "failed to create temporary file" msgstr "geçici dosya oluşturulamadı" @@ -14948,16 +15025,20 @@ msgid "exceeded bundle URI recursion limit (%d)" msgstr "demet URI özyineleme sınırı aşıldı (%d)" #, c-format +msgid "bundle '%s' has no uri" +msgstr "\"%s\" demetinde URI yok" + +#, c-format msgid "failed to download bundle from URI '%s'" -msgstr "'%s' URI'sinden demet indirilemedi" +msgstr "\"%s\" URI'sinden demet indirilemedi" #, c-format msgid "file at URI '%s' is not a bundle or bundle list" -msgstr "'%s' URI'sindeki dosya bir demet veya demet listesi değil" +msgstr "\"%s\" URI'sindeki dosya bir demet veya demet listesi değil" #, c-format msgid "bundle-uri: unexpected argument: '%s'" -msgstr "bundle-uri: beklenmedik argüman: '%s'" +msgstr "bundle-uri: beklenmedik argüman: \"%s\"" msgid "bundle-uri: expected flush after arguments" msgstr "bundle-uri: argümanlardan sonra floş bekleniyordu" @@ -15439,8 +15520,8 @@ msgstr "Bekleyen değişikliklerin bir özetini çıkart" msgid "Reuse recorded resolution of conflicted merges" msgstr "Çakışmaların kayıtlı çözümlerini yeniden kullan" -msgid "Reset current HEAD to the specified state" -msgstr "Geçerli HEAD'i belirtilen duruma sıfırla" +msgid "Set `HEAD` or the index to a known state" +msgstr "\"HEAD\"i veya indeksi bilinen bir duruma ayarla" msgid "Restore working tree files" msgstr "Çalışma ağacı dosyalarını eski durumuna getir" @@ -16951,10 +17032,6 @@ msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "'diff.submodule' yapılandırma değişkeni için bilinmeyen değer: '%s'" #, c-format -msgid "unknown value for config '%s': %s" -msgstr "'%s' yapılandırması için bilinmeyen değer: %s" - -#, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" @@ -19065,6 +19142,9 @@ msgstr "%s indekslenirken kısa read" msgid "%s: failed to insert into database" msgstr "%s: veritabanına ekleme başarısız" +msgid "cannot add a submodule of a different hash algorithm" +msgstr "başka bir sağlama algoritmalı altmodül eklenemiyor" + #, c-format msgid "%s: unsupported file type" msgstr "%s: desteklenmeyen dosya türü" @@ -20510,6 +20590,10 @@ msgstr "bu komut atom %%(%.*s) reddediyor" msgid "--format=%.*s cannot be used with --python, --shell, --tcl" msgstr "--format=%.*s, --python, --shell ve --tcl ile kullanılamaz" +#, c-format +msgid "parse_object_buffer failed on %s for %s" +msgstr "parse_object_buffer %s üzerinde başarısız oldu (%s için)" + msgid "failed to run 'describe'" msgstr "'describe' çalıştırılamadı" @@ -20541,10 +20625,6 @@ msgid "missing object %s for %s" msgstr "eksik nesne %s (%s için)" #, c-format -msgid "parse_object_buffer failed on %s for %s" -msgstr "parse_object_buffer %s üzerinde başarısız oldu (%s için)" - -#, c-format msgid "malformed object at '%s'" msgstr "'%s' konumunda hatalı oluşturulmuş nesne" @@ -20845,16 +20925,28 @@ msgid "refname %s is a symbolic ref, copying it is not supported" msgstr "başvuru adı %s bir sembolik bağ, onu kopyalamak desteklenmiyor" #, c-format +msgid "reftable stack for worktree '%s' is broken" +msgstr "\"%s\" çalışma ağacı için başvuru tablosu yığını bozuk" + +#, c-format +msgid "could not create iterator for worktree '%s'" +msgstr "\"%s\" çalışma ağacı için yineleyici oluşturulamadı" + +#, c-format +msgid "could not read record for worktree '%s'" +msgstr "\"%s\" çalışma ağacı için kayıt okunamadı" + +#, c-format msgid "pattern '%s' has no '*'" -msgstr "'%s' dizgisinde '*' yok" +msgstr "\"%s\" dizgisinde \"*\" yok" #, c-format msgid "replacement '%s' has no '*'" -msgstr "'%s' yedeğinde '*' yok" +msgstr "\"%s\" ikamesinde \"*\" yok" #, c-format msgid "invalid quoting in push-option value: '%s'" -msgstr "push-option değerinde geçersiz tırnak içine alım: '%s'" +msgstr "push-option değerinde geçersiz tırnak içine alım: \"%s\"" #, c-format msgid "unknown value for object-format: %s" @@ -21267,6 +21359,9 @@ msgstr "" msgid "could not finish pack-objects to repack promisor objects" msgstr "vaatçi nesneleri yeniden paketleme için pack-objects bitirilemedi" +msgid "could not start pack-objects to repack promisor packs" +msgstr "vaatçi paketleri yeniden paketlemek üzere pack-objects başlatılamadı" + #, c-format msgid "pack prefix %s does not begin with objdir %s" msgstr "paket öneki %s, nesne dizini %s ile başlamıyor" @@ -22261,10 +22356,6 @@ msgstr "" msgid "illegal label name: '%.*s'" msgstr "izin verilmeyen etiket adı: '%.*s'" -#, c-format -msgid "could not resolve '%s'" -msgstr "'%s' çözülemedi" - msgid "writing fake root commit" msgstr "sahte kök işlemesi yazılıyor" @@ -22739,49 +22830,68 @@ msgstr "hatalı %s biçimi: '%s' ögesi ')' ile sonlanmıyor" msgid "bad %s format: %%%.*s" msgstr "hatalı %s biçimi: %%%.*s" -#. TRANSLATORS: IEC 80000-13:2008 gibibyte #, c-format -msgid "%u.%2.2u GiB" -msgstr "%u.%2.2u GiB" +msgid "%u.%2.2u" +msgstr "%u.%2.2u" -#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#, c-format -msgid "%u.%2.2u GiB/s" -msgstr "%u.%2.2u GiB/sn" +#. TRANSLATORS: SI decimal prefix symbol for 10^9 +msgid "G" +msgstr "G" -#. TRANSLATORS: IEC 80000-13:2008 mebibyte -#, c-format -msgid "%u.%2.2u MiB" -msgstr "%u.%2.2u MiB" +#. TRANSLATORS: SI decimal prefix symbol for 10^6 +msgid "M" +msgstr "M" -#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#, c-format -msgid "%u.%2.2u MiB/s" -msgstr "%u.%2.2u MiB/sn" +#. TRANSLATORS: SI decimal prefix symbol for 10^3 +msgid "k" +msgstr "k" -#. TRANSLATORS: IEC 80000-13:2008 kibibyte -#, c-format -msgid "%u.%2.2u KiB" -msgstr "%u.%2.2u KiB" +#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second and gibibyte +msgid "GiB/s" +msgstr "GiB/sn" -#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#, c-format -msgid "%u.%2.2u KiB/s" -msgstr "%u.%2.2u KiB/sn" +msgid "GiB" +msgstr "GiB" -#. TRANSLATORS: IEC 80000-13:2008 byte -#, c-format -msgid "%u byte" -msgid_plural "%u bytes" -msgstr[0] "%u bayt" -msgstr[1] "%u bayt" +#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second and mebibyte +msgid "MiB/s" +msgstr "MiB/sn" + +msgid "MiB" +msgstr "MiB" + +#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second and kibibyte +msgid "KiB/s" +msgstr "KiB/sn" + +msgid "KiB" +msgstr "KiB" + +#. TRANSLATORS: IEC 80000-13:2008 byte/second and byte +msgid "B/s" +msgstr "B/sn" + +msgid "B" +msgstr "B" #. TRANSLATORS: IEC 80000-13:2008 byte/second +msgid "byte/s" +msgid_plural "bytes/s" +msgstr[0] "bayt/sn" +msgstr[1] "bayt/sn" + +#. TRANSLATORS: IEC 80000-13:2008 byte +msgid "byte" +msgid_plural "bytes" +msgstr[0] "bayt" +msgstr[1] "bayt" + +#. TRANSLATORS: The first argument is the number string. The second +#. argument is the unit string (i.e. "12.34 MiB/s"). +#. #, c-format -msgid "%u byte/s" -msgid_plural "%u bytes/s" -msgstr[0] "%u bayt/sn" -msgstr[1] "%u bayt/sn" +msgid "%s %s" +msgstr "%s %s" #, c-format msgid "ignoring suspicious submodule name: %s" @@ -23072,9 +23182,6 @@ msgstr "bayt sayısı" msgid "number of requests per thread" msgstr "iş parçacığı başına düşen istek sayısı" -msgid "byte" -msgstr "bayt" - msgid "ballast character" msgstr "dengeleyici karakter" |