diff --git a/Documentation/RelNotes/2.49.0.adoc b/Documentation/RelNotes/2.49.0.adoc index a173eb193075c2..494c83096fae8d 100644 --- a/Documentation/RelNotes/2.49.0.adoc +++ b/Documentation/RelNotes/2.49.0.adoc @@ -285,3 +285,4 @@ Fixes since v2.48 (merge 832f56f06a jc/doc-boolean-synonyms later to maint). (merge 3eeed876a9 ac/doc-http-ssl-type-config later to maint). (merge c268e3285d jc/breaking-changes-early-adopter-option later to maint). + (merge 0d03fda6a5 pb/doc-follow-remote-head later to maint). diff --git a/Documentation/config/remote.adoc b/Documentation/config/remote.adoc index 4118c219c13ac6..25fe219d103cc4 100644 --- a/Documentation/config/remote.adoc +++ b/Documentation/config/remote.adoc @@ -101,21 +101,21 @@ remote..serverOption:: The default set of server options used when fetching from this remote. These server options can be overridden by the `--server-option=` command line arguments. ++ +This is a multi-valued variable, and an empty value can be used in a higher +priority configuration file (e.g. `.git/config` in a repository) to clear +the values inherited from a lower priority configuration files (e.g. +`$HOME/.gitconfig`). remote..followRemoteHEAD:: How linkgit:git-fetch[1] should handle updates to `remotes//HEAD`. The default value is "create", which will create `remotes//HEAD` - if it exists on the remote, but not locally, but will not touch an - already existing local reference. Setting to "warn" will print - a message if the remote has a different value, than the local one and + if it exists on the remote, but not locally; this will not touch an + already existing local reference. Setting it to "warn" will print + a message if the remote has a different value than the local one; in case there is no local reference, it behaves like "create". A variant on "warn" is "warn-if-not-$branch", which behaves like "warn", but if `HEAD` on the remote is `$branch` it will be silent. - Setting to "always" will silently update it to the value on the remote. - Finally, setting it to "never" will never change or create the local - reference. -+ -This is a multi-valued variable, and an empty value can be used in a higher -priority configuration file (e.g. `.git/config` in a repository) to clear -the values inherited from a lower priority configuration files (e.g. -`$HOME/.gitconfig`). + Setting it to "always" will silently update `remotes//HEAD` to + the value on the remote. Finally, setting it to "never" will never + change or create the local reference. diff --git a/Documentation/git-clone.adoc b/Documentation/git-clone.adoc index 510b91b5c04a3d..222d558290ed6b 100644 --- a/Documentation/git-clone.adoc +++ b/Documentation/git-clone.adoc @@ -288,9 +288,9 @@ corresponding `--mirror` and `--no-tags` options instead. `remote..tagOpt=--no-tags` configuration. This ensures that future `git pull` and `git fetch` won't follow any tags. Subsequent explicit tag fetches will still work (see linkgit:git-fetch[1]). - - By default, tags are cloned and passing `--tags` is thus typically a - no-op, unless it cancels out a previous `--no-tags`. ++ +By default, tags are cloned and passing `--tags` is thus typically a +no-op, unless it cancels out a previous `--no-tags`. + Can be used in conjunction with `--single-branch` to clone and maintain a branch with no references other than a single cloned diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 8979fb2803285a..3abfe7d3d7e79d 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,6 +1,6 @@ #!/bin/sh -DEF_VER=v2.49.0-rc2 +DEF_VER=v2.49.0 LF=' ' diff --git a/help.c b/help.c index 8d91afe851d1f7..c54bd9918a5be8 100644 --- a/help.c +++ b/help.c @@ -2,6 +2,7 @@ #define DISABLE_SIGN_COMPARE_WARNINGS #include "git-compat-util.h" +#include "git-zlib.h" #include "config.h" #include "builtin.h" #include "exec-cmd.h" @@ -797,7 +798,9 @@ void get_version_info(struct strbuf *buf, int show_build_options) #if defined OPENSSL_VERSION_TEXT strbuf_addf(buf, "OpenSSL: %s\n", OPENSSL_VERSION_TEXT); #endif -#if defined ZLIB_VERSION +#if defined ZLIBNG_VERSION + strbuf_addf(buf, "zlib-ng: %s\n", ZLIBNG_VERSION); +#elif defined ZLIB_VERSION strbuf_addf(buf, "zlib: %s\n", ZLIB_VERSION); #endif } diff --git a/po/bg.po b/po/bg.po index 2fc6c2b60ca2e9..37d127faac7169 100644 --- a/po/bg.po +++ b/po/bg.po @@ -1,7 +1,7 @@ # Bulgarian translation of git po-file. -# Copyright (C) 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024 Alexander Shopov . +# Copyright (C) 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025 Alexander Shopov . # This file is distributed under the same license as the git package. -# Alexander Shopov , 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024. +# Alexander Shopov , 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025. # ======================== # DICTIONARY TO MERGE IN GIT GUI # ------------------------ @@ -233,6 +233,7 @@ # cache-tree кеша на обектите-дървета # acquire lock придобивам ключалка # detached отделѐн, несвързан +# revision walk обхождане на версиите # # ------------------------ # „$var“ - може да не сработва за shell има gettext и eval_gettext - проверка - намират се лесно по „$ @@ -261,8 +262,8 @@ msgid "" msgstr "" "Project-Id-Version: git 2.48\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2024-12-27 22:37+0100\n" -"PO-Revision-Date: 2024-12-27 22:40+0100\n" +"POT-Creation-Date: 2025-03-05 22:57+0000\n" +"PO-Revision-Date: 2025-03-06 09:15+0100\n" "Last-Translator: Alexander Shopov \n" "Language-Team: Bulgarian \n" "Language: bg\n" @@ -2655,6 +2656,18 @@ msgstr "git archive: протоколна грешка" msgid "git archive: expected a flush" msgstr "git archive: очакваше се изчистване на буферите чрез „flush“" +msgid "git backfill [--min-batch-size=] [--[no-]sparse]" +msgstr "git backfill [--min-batch-size=БРОЙ] [--[no-]sparse]" + +msgid "problem loading sparse-checkout" +msgstr "проблем при зареждане на частично хранилище" + +msgid "Minimum number of objects to request at a time" +msgstr "Минимален БРОЙ обекти заявявани наведнъж" + +msgid "Restrict the missing objects to the current sparse-checkout" +msgstr "Ограничаване на липсващите обекти до текущото частично хранилище" + msgid "" "git bisect start [--term-(new|bad)= --term-(old|good)=] [--no-" "checkout] [--first-parent] [ [...]] [--] [...]" @@ -3434,10 +3447,6 @@ msgstr "" msgid "git version:\n" msgstr "версия на git:\n" -#, c-format -msgid "uname() failed with error '%s' (%d)\n" -msgstr "грешка при изпълнението на „uname()“ — „%s“ (%d)\n" - msgid "compiler info: " msgstr "компилатор: " @@ -4466,8 +4475,98 @@ msgstr "" "Настройката „clean.requireForce“ е зададена, което изисква опцията „-f“. " "Няма да се извърши изчистване" -msgid "git clone [] [--] []" -msgstr "git clone [ОПЦИЯ…] [--] ХРАНИЛИЩЕ [ДИРЕКТОРИЯ]" +#, c-format +msgid "info: Could not add alternate for '%s': %s\n" +msgstr "" +"ПРЕДУПРЕЖДЕНИЕ: не може да се добави алтернативен източник на „%s“: %s\n" + +#, c-format +msgid "failed to stat '%s'" +msgstr "не може да бъде получена информация чрез „stat“ за „%s“" + +#, c-format +msgid "%s exists and is not a directory" +msgstr "„%s“ съществува и не е директория" + +#, c-format +msgid "'%s' is a symlink, refusing to clone with --local" +msgstr "„%s“ е символна връзка, не може да се клонира с опцията „--local“" + +#, c-format +msgid "failed to start iterator over '%s'" +msgstr "неуспешно итериране по „%s“" + +#, c-format +msgid "symlink '%s' exists, refusing to clone with --local" +msgstr "" +"символната връзка „%s“ съществува, не може да се клонира с опцията „--local“" + +#, c-format +msgid "failed to unlink '%s'" +msgstr "неуспешно изтриване на „%s“" + +#, c-format +msgid "hardlink cannot be checked at '%s'" +msgstr "твърдата връзка не може да се провери при „%s“" + +#, c-format +msgid "hardlink different from source at '%s'" +msgstr "твърдата връзка е различна от източника „%s“" + +#, c-format +msgid "failed to create link '%s'" +msgstr "връзката „%s“ не може да бъде създадена" + +#, c-format +msgid "failed to copy file to '%s'" +msgstr "файлът не може да бъде копиран като „%s“" + +#, c-format +msgid "failed to iterate over '%s'" +msgstr "неуспешно итериране по „%s“" + +#, c-format +msgid "done.\n" +msgstr "действието завърши.\n" + +msgid "" +"Clone succeeded, but checkout failed.\n" +"You can inspect what was checked out with 'git status'\n" +"and retry with 'git restore --source=HEAD :/'\n" +msgstr "" +"Клонирането бе успешно за разлика от подготовката на работното дърво\n" +"за определен клон. Все пак може да проверите кои файлове и от кой\n" +"клон в момента са изтеглени с командата „git status“. Може да\n" +"завършите изтеглянето на клона с командата:\n" +"\n" +" git restore --source=HEAD :/\n" + +msgid "remote did not send all necessary objects" +msgstr "отдалеченото хранилище не изпрати всички необходими обекти." + +#, c-format +msgid "unable to update %s" +msgstr "обектът „%s“ не може да бъде обновен" + +msgid "failed to initialize sparse-checkout" +msgstr "частичното изтегляне не може да се инициализира" + +msgid "remote HEAD refers to nonexistent ref, unable to checkout" +msgstr "" +"указателят „HEAD“ от отдалеченото хранилище сочи към нещо, което не " +"съществува. Изтегляне не може да се извърши" + +msgid "unable to checkout working tree" +msgstr "работното дърво не може да бъде подготвено" + +msgid "unable to write parameters to config file" +msgstr "настройките не може да бъдат записани в конфигурационния файл" + +msgid "cannot repack to clean up" +msgstr "не може да се извърши пакетиране за изчистване на файловете" + +msgid "cannot unlink temporary alternates file" +msgstr "временният файл за алтернативни обекти не може да бъде изтрит" msgid "don't clone shallow repository" msgstr "без клониране на плитко хранилище" @@ -4521,6 +4620,9 @@ msgstr "използване на това ИМЕ вместо „origin“ пр msgid "checkout instead of the remote's HEAD" msgstr "изтегляне на този КЛОН, а не соченият от отдалечения указател „HEAD“" +msgid "clone single revision and check out" +msgstr "клониране на единствена ВЕРСИЯ и изтегляне в работната директория" + msgid "path to git-upload-pack on the remote" msgstr "път към командата „git-upload-pack“ на отдалеченото хранилище" @@ -4544,9 +4646,8 @@ msgstr "" "клониране само на един клон — или сочения от отдалечения „HEAD“, или изрично " "зададения с „--branch“" -msgid "don't clone any tags, and make later fetches not to follow them" -msgstr "" -"без клониране на етикети, като последващите доставяния няма да ги следят" +msgid "clone tags, and make later fetches not to follow them" +msgstr "клониране на етикети, като последващите доставяния няма да ги следят" msgid "any cloned submodules will be shallow" msgstr "всички клонирани подмодули ще са плитки" @@ -4590,104 +4691,8 @@ msgid "a URI for downloading bundles before fetching from origin remote" msgstr "" "АДРЕС за доставяне на пратки на git преди доставяне от отдалеченото хранилище" -#, c-format -msgid "info: Could not add alternate for '%s': %s\n" -msgstr "" -"ПРЕДУПРЕЖДЕНИЕ: не може да се добави алтернативен източник на „%s“: %s\n" - -#, c-format -msgid "failed to stat '%s'" -msgstr "не може да бъде получена информация чрез „stat“ за „%s“" - -#, c-format -msgid "%s exists and is not a directory" -msgstr "„%s“ съществува и не е директория" - -#, c-format -msgid "'%s' is a symlink, refusing to clone with --local" -msgstr "„%s“ е символна връзка, не може да се клонира с опцията „--local“" - -#, c-format -msgid "failed to start iterator over '%s'" -msgstr "неуспешно итериране по „%s“" - -#, c-format -msgid "symlink '%s' exists, refusing to clone with --local" -msgstr "" -"символната връзка „%s“ съществува, не може да се клонира с опцията „--local“" - -#, c-format -msgid "failed to unlink '%s'" -msgstr "неуспешно изтриване на „%s“" - -#, c-format -msgid "hardlink cannot be checked at '%s'" -msgstr "твърдата връзка не може да се провери при „%s“" - -#, c-format -msgid "hardlink different from source at '%s'" -msgstr "твърдата връзка е различна от източника „%s“" - -#, c-format -msgid "failed to create link '%s'" -msgstr "връзката „%s“ не може да бъде създадена" - -#, c-format -msgid "failed to copy file to '%s'" -msgstr "файлът не може да бъде копиран като „%s“" - -#, c-format -msgid "failed to iterate over '%s'" -msgstr "неуспешно итериране по „%s“" - -#, c-format -msgid "done.\n" -msgstr "действието завърши.\n" - -msgid "" -"Clone succeeded, but checkout failed.\n" -"You can inspect what was checked out with 'git status'\n" -"and retry with 'git restore --source=HEAD :/'\n" -msgstr "" -"Клонирането бе успешно за разлика от подготовката на работното дърво\n" -"за определен клон. Все пак може да проверите кои файлове и от кой\n" -"клон в момента са изтеглени с командата „git status“. Може да\n" -"завършите изтеглянето на клона с командата:\n" -"\n" -" git restore --source=HEAD :/\n" - -#, c-format -msgid "Could not find remote branch %s to clone." -msgstr "" -"Клонът „%s“ от отдалеченото хранилище, което клонирате,\n" -"и който следва да бъде изтеглен, не съществува." - -msgid "remote did not send all necessary objects" -msgstr "отдалеченото хранилище не изпрати всички необходими обекти." - -#, c-format -msgid "unable to update %s" -msgstr "обектът „%s“ не може да бъде обновен" - -msgid "failed to initialize sparse-checkout" -msgstr "частичното изтегляне не може да се инициализира" - -msgid "remote HEAD refers to nonexistent ref, unable to checkout" -msgstr "" -"указателят „HEAD“ от отдалеченото хранилище сочи към нещо, което не " -"съществува. Изтегляне не може да се извърши" - -msgid "unable to checkout working tree" -msgstr "работното дърво не може да бъде подготвено" - -msgid "unable to write parameters to config file" -msgstr "настройките не може да бъдат записани в конфигурационния файл" - -msgid "cannot repack to clean up" -msgstr "не може да се извърши пакетиране за изчистване на файловете" - -msgid "cannot unlink temporary alternates file" -msgstr "временният файл за алтернативни обекти не може да бъде изтрит" +msgid "git clone [] [--] []" +msgstr "git clone [ОПЦИЯ…] [--] ХРАНИЛИЩЕ [ДИРЕКТОРИЯ]" msgid "Too many arguments." msgstr "Прекалено много аргументи." @@ -4796,6 +4801,10 @@ msgstr "отдалеченият транспорт върна грешка" msgid "Remote branch %s not found in upstream %s" msgstr "Отдалеченият клон „%s“ липсва в клонираното хранилище „%s“" +#, c-format +msgid "Remote revision %s not found in upstream %s" +msgstr "Отдалечената версия „%s“ липсва в клонираното хранилище „%s“" + msgid "You appear to have cloned an empty repository." msgstr "Изглежда клонирахте празно хранилище." @@ -4975,7 +4984,7 @@ msgid "git commit-tree: failed to read" msgstr "git commit-tree: не може да се прочете" msgid "" -"git commit [-a | --interactive | --patch] [-s] [-v] [-u] [--amend]\n" +"git commit [-a | --interactive | --patch] [-s] [-v] [-u[]] [--amend]\n" " [--dry-run] [(-c | -C | --squash) | --fixup [(amend|" "reword):]]\n" " [-F | -m ] [--reset-author] [--allow-empty]\n" @@ -4985,7 +4994,7 @@ msgid "" " [(--trailer [(=|:)])...] [-S[]]\n" " [--] [...]" msgstr "" -"git commit [-a|--interactive|--patch] [-s] [-v] [-u РЕЖИМ] [--amend]\n" +"git commit [-a|--interactive|--patch] [-s] [-v] [-u[РЕЖИМ]] [--amend]\n" " [--dry-run] [(-c|-C|--squash) ПОДАВАНЕ |--fixup [(amend|" "reword):]ПОДАВАНЕ]\n" " [-F ФАЙЛ|-m СЪОБЩЕНИЕ] [--reset-author] [--allow-empty]\n" @@ -6424,8 +6433,8 @@ msgid "" "Run 'git remote set-head %s %s' to follow the change, or set\n" "'remote.%s.followRemoteHEAD' configuration option to a different value\n" "if you do not want to see this message. Specifically running\n" -"'git config set remote.%s.followRemoteHEAD %s' will disable the warning\n" -"until the remote changes HEAD to something else." +"'git config set remote.%s.followRemoteHEAD warn-if-not-branch-%s'\n" +"will disable the warning until the remote changes HEAD to something else." msgstr "" "Изпълнете\n" "\n" @@ -6435,7 +6444,7 @@ msgstr "" "„remote.%s.followRemoteHEAD, ако не искате тези съобщения.\n" "Изпълнението на\n" "\n" -" git config set remote.%s.followRemoteHEAD %s\n" +" git config set remote.%s.followRemoteHEAD warn-if-not-branch-%s\n" "\n" "ще изключи предупреждението, докато отдалеченият указател HEAD не\n" "започне да сочи нещо друго." @@ -7124,6 +7133,9 @@ msgstr "" msgid "repack all other packs except the largest pack" msgstr "препакетиране на всичко без най-големия пакет" +msgid "pack prefix to store a pack containing pruned objects" +msgstr "префикс на имената на пакетите за окастрени обекти" + #, c-format msgid "failed to parse gc.logExpiry value %s" msgstr "неразпозната стойност на „gc.logExpiry“ %s" @@ -7943,6 +7955,10 @@ msgstr "" msgid "Cannot come back to cwd" msgstr "Процесът не може да се върне към предишната работна директория" +#, c-format +msgid "bad --pack_header: %s" +msgstr "неправилна стойност за „--pack_header“: „%s“" + #, c-format msgid "bad %s" msgstr "неправилна стойност „%s“" @@ -8835,10 +8851,6 @@ msgstr "непозната опция за стратегия: -X%s" msgid "malformed input line: '%s'." msgstr "входен ред с неправилен формат: „%s“." -#, c-format -msgid "merging cannot continue; got unclean result of %d" -msgstr "сливането не може да продължи — %d-тото завърши с грешка" - msgid "git merge [] [...]" msgstr "git merge [ОПЦИЯ…] [ПОДАВАНЕ…]" @@ -9684,6 +9696,13 @@ msgstr "" "git pack-objects [ОПЦИЯ…] ПРЕФИКС_НА_ИМЕТО [< СПИСЪК_С_УКАЗАТЕЛИ|< " "СПИСЪК_С_ОБЕКТИ]" +#, c-format +msgid "invalid --name-hash-version option: %d" +msgstr "неправилна опция „--name-hash-version“: %d" + +msgid "currently, --write-bitmap-index requires --name-hash-version=1" +msgstr "текущо опцията „--write-bitmap-index“ изисква „--name-hash-version=1“" + #, c-format msgid "" "write_reuse_object: could not locate %s, expected at offset % in " @@ -10025,6 +10044,11 @@ msgstr "протокол" msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" msgstr "без ползване на настройки „uploadpack.blobpackfileuri“ с този протокол" +msgid "use the specified name-hash function to group similar objects" +msgstr "" +"използване на указаната функция за контролни суми за групиране на подобните " +"обекти" + #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "веригата с разлики е прекалено дълбока — %d, ще се ползва %d" @@ -11304,8 +11328,8 @@ msgstr "не е указан журнал с подавания за изтри msgid "invalid ref format: %s" msgstr "неправилен формат на указател: %s" -msgid "git refs migrate --ref-format= [--dry-run]" -msgstr "git refs migrate --ref-format=ФОРМАТ [--dry-run]" +msgid "git refs migrate --ref-format= [--no-reflog] [--dry-run]" +msgstr "git refs migrate --ref-format=ФОРМАТ [--no-reflog] [--dry-run]" msgid "git refs verify [--strict] [--verbose]" msgstr "git refs verify [--strict] [--verbose]" @@ -11316,6 +11340,9 @@ msgstr "указване на форма̀та за указател, към к msgid "perform a non-destructive dry-run" msgstr "пробно изпълнение — без промяна на данни" +msgid "drop reflogs entirely during the migration" +msgstr "журналът на указателите да се изтрие изцяло по време на миграцията" + msgid "missing --ref-format=" msgstr "липсва опцията --ref-format=ФОРМАТ" @@ -11786,8 +11813,14 @@ msgstr "Никой от адресите, които не са за изтлас msgid "be verbose; must be placed before a subcommand" msgstr "повече подробности. Поставя се пред подкоманда" -msgid "git repack []" -msgstr "git repack [ОПЦИЯ…]" +msgid "" +"git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" +"[--window=] [--depth=] [--threads=] [--keep-pack=]\n" +"[--write-midx] [--name-hash-version=]" +msgstr "" +"git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" +"[--window=БРОЙ] [--depth=БРОЙ] [--threads=БРОЙ] [--keep-pack=ИМЕ_НА_ПАКЕТ]\n" +"[--write-midx] [--name-hash-version=БРОЙ]" msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" @@ -11875,6 +11908,11 @@ msgid "pass --no-reuse-object to git-pack-objects" msgstr "" "подаване на опцията „--no-reuse-object“ на командата „git-pack-objects“" +msgid "" +"specify the name hash version to use for grouping similar objects by path" +msgstr "" +"укажете функция за контролни суми за групиране на подобните обекти по път" + msgid "do not run git-update-server-info" msgstr "без изпълнение на командата „git-update-server-info“" @@ -11927,9 +11965,6 @@ msgstr "откриване на геометрична прогресия с ч msgid "write a multi-pack index of the resulting packs" msgstr "запазване на многопакетен индекс за създадените пакети" -msgid "pack prefix to store a pack containing pruned objects" -msgstr "префикс на имената на пакетите за окастрени обекти" - msgid "pack prefix to store a pack containing filtered out objects" msgstr "префикс на имената на пакетите за филтрирани обекти" @@ -12146,9 +12181,6 @@ msgstr "опцията „-l“ приема точно един шаблон" msgid "need some commits to replay" msgstr "необходимо е да има подавания за прилагане отново" -msgid "--onto and --advance are incompatible" -msgstr "опциите „--onto“ и „--advance“ са несъвместими" - msgid "all positive revisions given must be references" msgstr "всички зададени положителни версии трябва да са указатели" @@ -14852,6 +14884,9 @@ msgstr "Внасяне на хранилище на GNU Arch в Git" msgid "Create an archive of files from a named tree" msgstr "Създаване на архив с файловете от именовано дърво" +msgid "Download missing objects in a partial clone" +msgstr "Изтегляне на липсващите обекти в частично хранилище" + msgid "Use binary search to find the commit that introduced a bug" msgstr "Двоично търсене на промяната, която е причинила грешка" @@ -16852,6 +16887,12 @@ msgstr "неправилен аргумент към „%s“" msgid "invalid regex given to -I: '%s'" msgstr "неправилен регулярен израз подаден към „-I“: „%s“" +msgid "-G requires a non-empty argument" +msgstr "опцията „-G“ изисква аргумент" + +msgid "-S requires a non-empty argument" +msgstr "опцията „-S“ изисква аргумент" + #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "неразпознат параметър към опцията „--submodule“: „%s“" @@ -19122,6 +19163,10 @@ msgstr "съдържанието на файловете „%s“ и „%s“ е msgid "unable to write file %s" msgstr "файлът „%s“ не може да бъде записан" +#, c-format +msgid "unable to write repeatedly vanishing file %s" +msgstr "смаляващият се файл „%s“ не може да бъде записван" + #, c-format msgid "unable to set permission to '%s'" msgstr "права̀та за достъп до „%s“ не може да бъдат зададени" @@ -19722,6 +19767,52 @@ msgstr "непознат флаг „%c“" msgid "unknown non-ascii option in string: `%s'" msgstr "непозната стойност извън „ascii“ в низа: „%s“" +#. TRANSLATORS: The "<%s>" part of this string +#. stands for an optional value given to a command +#. line option in the long form, and "<>" is there +#. as a convention to signal that it is a +#. placeholder (i.e. the user should substitute it +#. with the real value). If your language uses a +#. different convention, you can change "<%s>" part +#. to match yours, e.g. it might use "|%s|" instead, +#. or if the alphabet is different enough it may use +#. "%s" without any placeholder signal. Most +#. translations leave this message as is. +#. +#, c-format +msgid "[=<%s>]" +msgstr "[=%s]" + +#. TRANSLATORS: The "<%s>" part of this string +#. stands for an optional value given to a command +#. line option in the short form, and "<>" is there +#. as a convention to signal that it is a +#. placeholder (i.e. the user should substitute it +#. with the real value). If your language uses a +#. different convention, you can change "<%s>" part +#. to match yours, e.g. it might use "|%s|" instead, +#. or if the alphabet is different enough it may use +#. "%s" without any placeholder signal. Most +#. translations leave this message as is. +#. +#, c-format +msgid "[<%s>]" +msgstr "[%s]" + +#. TRANSLATORS: The "<%s>" part of this string stands for a +#. value given to a command line option, and "<>" is there +#. as a convention to signal that it is a placeholder +#. (i.e. the user should substitute it with the real value). +#. If your language uses a different convention, you can +#. change "<%s>" part to match yours, e.g. it might use +#. "|%s|" instead, or if the alphabet is different enough it +#. may use "%s" without any placeholder signal. Most +#. translations leave this message as is. +#. +#, c-format +msgid " <%s>" +msgstr " %s" + msgid "..." msgstr "…" @@ -19808,6 +19899,21 @@ msgstr "неправилна булева стойност „%s“ за „%s msgid "failed to parse %s" msgstr "„%s“ не може да бъде анализиран" +#, c-format +msgid "failed to walk children of tree %s: not found" +msgstr "неуспешно обхождане на дъщерните елементи на дървото „%s“: то липсва" + +#, c-format +msgid "failed to find object %s" +msgstr "обектът „%s“ липсва" + +#, c-format +msgid "failed to find tag %s" +msgstr "етикетът „%s“ липсва" + +msgid "failed to setup revision walk" +msgstr "неуспешно настройване на обхождането на версиите" + #, c-format msgid "Could not make %s writable by group" msgstr "Не може да се дадат права̀ за запис в директорията „%s“ на групата" @@ -19957,6 +20063,22 @@ msgstr "" msgid "could not fetch %s from promisor remote" msgstr "„%s“ не може да се достави от гарантиращото хранилище" +#, c-format +msgid "known remote named '%s' but with url '%s' instead of '%s'" +msgstr "има хранилище с име „%s“, но адресът му сочи към „%s“, а не към „%s“" + +#, c-format +msgid "unknown '%s' value for '%s' config option" +msgstr "непозната стойност „%s“ за настройката „%s“" + +#, c-format +msgid "unknown element '%s' from remote info" +msgstr "непознат елемент „%s“ в информацията за отдалеченото хранилище" + +#, c-format +msgid "accepted promisor remote '%s' not found" +msgstr "липсва приетото вече хранилище-гарант „%s“" + msgid "object-info: expected flush after arguments" msgstr "object-info: след аргументите се очаква изчистване на буферите" @@ -20802,6 +20924,14 @@ msgstr "името на указател „%s“ е символен указа msgid "invalid refspec '%s'" msgstr "неправилен указател: „%s“" +#, c-format +msgid "pattern '%s' has no '*'" +msgstr "шаблонът „%s“ не съдържа „*“" + +#, c-format +msgid "replacement '%s' has no '*'" +msgstr "заместителят „%s“ не съдържа „*“" + #, c-format msgid "invalid quoting in push-option value: '%s'" msgstr "" @@ -20929,6 +21059,28 @@ msgstr "remote-curl: опит за доставяне без локално хр msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl: непозната команда „%s“ от git" +#, c-format +msgid "" +"reading remote from \"%s/%s\", which is nominated for removal.\n" +"\n" +"If you still use the \"remotes/\" directory it is recommended to\n" +"migrate to config-based remotes:\n" +"\n" +"\tgit remote rename %s %s\n" +"\n" +"If you cannot, please let us know why you still need to use it by\n" +"sending an e-mail to ." +msgstr "" +"изчитането на отдалеченото хранилище от „%s/%s“ предстои да бъде " +"премахнато.\n" +"Ако все още ползвате директорията „remotes/“, препоръчваме да я мигрирате\n" +"към следящи директории на база настройки чрез командата:\n" +"\n" +" git remote rename %s %s\n" +"\n" +"Ако не може поради някаква причина, молим да ни известите за нея с\n" +"е-писмо до пощенския списък: ." + #, c-format msgid "config remote shorthand cannot begin with '/': %s" msgstr "" @@ -20964,14 +21116,6 @@ msgstr "„%s“ обикновено следи „%s“, а не „%s“" msgid "%s tracks both %s and %s" msgstr "„%s“ следи както „%s“, така и „%s“" -#, c-format -msgid "key '%s' of pattern had no '*'" -msgstr "ключ „%s“ на шаблона не съдържа „*“" - -#, c-format -msgid "value '%s' of pattern has no '*'" -msgstr "стойност „%s“ на шаблона не съдържа „*“" - #, c-format msgid "src refspec %s does not match any" msgstr "указателят на версия-източник „%s“ не съвпада с никой обект" @@ -22945,6 +23089,28 @@ msgstr "" "какъв брой записи в кеша на обектите-дървета да се отбележат като невалидни " "(стандартно е 0)" +msgid "test-tool path-walk -- " +msgstr "test-tool path-walk ОПЦИЯ… -- ОПЦИЯ_ЗА_ВЕРСИИ…" + +msgid "toggle inclusion of blob objects" +msgstr "превключване на поместването на обекти-BLOB" + +msgid "toggle inclusion of commit objects" +msgstr "превключване на поместването на обекти-подавания" + +msgid "toggle inclusion of tag objects" +msgstr "превключване на поместването на обекти-етикети" + +msgid "toggle inclusion of tree objects" +msgstr "превключване на поместването на обекти-дърво" + +msgid "toggle pruning of uninteresting paths" +msgstr "" +"превключване на окастрянето на пътищата, които не представляват интерес" + +msgid "read a pattern list over stdin" +msgstr "изчитане на списък с шаблони от стандартния вход" + #, c-format msgid "commit %s is not marked reachable" msgstr "подаването „%s“ не е отбелязано като достижимо" @@ -23581,6 +23747,10 @@ msgstr "грешка: " msgid "warning: " msgstr "предупреждение: " +#, c-format +msgid "uname() failed with error '%s' (%d)\n" +msgstr "грешка при изпълнението на „uname()“ — „%s“ (%d)\n" + msgid "Fetching objects" msgstr "Доставяне на обектите" diff --git a/po/de.po b/po/de.po index addd5919bdb015..4d9c46fb19de01 100644 --- a/po/de.po +++ b/po/de.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2024-12-20 17:44+0100\n" -"PO-Revision-Date: 2024-12-27 16:43+0100\n" +"POT-Creation-Date: 2025-03-06 18:29+0100\n" +"PO-Revision-Date: 2025-03-07 17:28+0100\n" "Last-Translator: Ralf Thielow \n" "Language-Team: German\n" "Language: de\n" @@ -2400,6 +2400,18 @@ msgstr "git archive: Protokollfehler" msgid "git archive: expected a flush" msgstr "git archive: erwartete eine Spülung (flush)" +msgid "git backfill [--min-batch-size=] [--[no-]sparse]" +msgstr "git backfill [--min-batch-size=] [--[no-]sparse]" + +msgid "problem loading sparse-checkout" +msgstr "Problem beim Laden von sparse-checkout" + +msgid "Minimum number of objects to request at a time" +msgstr "Mindestanzahl der gleichzeitig anzufordernden Objekte" + +msgid "Restrict the missing objects to the current sparse-checkout" +msgstr "fehlenden Objekte im aktuellen sparse-checkout beschränken" + msgid "" "git bisect start [--term-(new|bad)= --term-(old|good)=] [--no-" "checkout] [--first-parent] [ [...]] [--] [...]" @@ -3167,10 +3179,6 @@ msgstr "" msgid "git version:\n" msgstr "git Version:\n" -#, c-format -msgid "uname() failed with error '%s' (%d)\n" -msgstr "uname() ist fehlgeschlagen mit Fehler '%s' (%d)\n" - msgid "compiler info: " msgstr "Compiler Info: " @@ -4201,8 +4209,95 @@ msgstr "" "clean.requireForce ist 'true' und -f ist nicht angegeben: clean wird " "verweigert" -msgid "git clone [] [--] []" -msgstr "git clone [] [--] []" +#, c-format +msgid "info: Could not add alternate for '%s': %s\n" +msgstr "info: Konnte Alternative für '%s' nicht hinzufügen: %s\n" + +#, c-format +msgid "failed to stat '%s'" +msgstr "Konnte '%s' nicht lesen" + +#, c-format +msgid "%s exists and is not a directory" +msgstr "%s existiert und ist kein Verzeichnis" + +#, c-format +msgid "'%s' is a symlink, refusing to clone with --local" +msgstr "" +"'%s' ist eine symbolische Verknüpfung, verweigere das Klonen mit --local" + +#, c-format +msgid "failed to start iterator over '%s'" +msgstr "Fehler beim Starten der Iteration über '%s'" + +#, c-format +msgid "symlink '%s' exists, refusing to clone with --local" +msgstr "" +"symbolische Verknüpfung '%s' existiert, verweigere das Klonen mit --local" + +#, c-format +msgid "failed to unlink '%s'" +msgstr "Konnte '%s' nicht entfernen." + +#, c-format +msgid "hardlink cannot be checked at '%s'" +msgstr "Hardlink bei '%s' kann nicht geprüft werden" + +#, c-format +msgid "hardlink different from source at '%s'" +msgstr "Hardlink unterscheidet sich von der Quelle bei '%s'" + +#, c-format +msgid "failed to create link '%s'" +msgstr "Konnte Verweis '%s' nicht erstellen" + +#, c-format +msgid "failed to copy file to '%s'" +msgstr "Konnte Datei nicht nach '%s' kopieren" + +#, c-format +msgid "failed to iterate over '%s'" +msgstr "Fehler beim Iterieren über '%s'" + +#, c-format +msgid "done.\n" +msgstr "Fertig.\n" + +msgid "" +"Clone succeeded, but checkout failed.\n" +"You can inspect what was checked out with 'git status'\n" +"and retry with 'git restore --source=HEAD :/'\n" +msgstr "" +"Klonen erfolgreich, Auschecken ist aber fehlgeschlagen.\n" +"Sie können mit 'git status' prüfen, was ausgecheckt worden ist\n" +"und das Auschecken mit 'git restore --source=HEAD :/' erneut versuchen.\n" + +msgid "remote did not send all necessary objects" +msgstr "Remote-Repository hat nicht alle erforderlichen Objekte gesendet" + +#, c-format +msgid "unable to update %s" +msgstr "kann %s nicht aktualisieren" + +msgid "failed to initialize sparse-checkout" +msgstr "Fehler beim Initialisieren vom partiellen Checkout." + +msgid "remote HEAD refers to nonexistent ref, unable to checkout" +msgstr "" +"HEAD des Remote-Repositories verweist auf nicht existierende Referenz, kann " +"nicht ausgecheckt werden" + +msgid "unable to checkout working tree" +msgstr "Arbeitsverzeichnis konnte nicht ausgecheckt werden" + +msgid "unable to write parameters to config file" +msgstr "konnte Parameter nicht in Konfigurationsdatei schreiben" + +msgid "cannot repack to clean up" +msgstr "Kann \"repack\" zum Aufräumen nicht aufrufen" + +msgid "cannot unlink temporary alternates file" +msgstr "Kann temporäre \"alternates\"-Datei nicht entfernen" msgid "don't clone shallow repository" msgstr "Repository mit unvollständiger Historie nicht klonen" @@ -4255,6 +4350,9 @@ msgstr " statt 'origin' für Upstream-Repository verwenden" msgid "checkout instead of the remote's HEAD" msgstr " auschecken, anstatt HEAD des Remote-Repositories" +msgid "clone single revision and check out" +msgstr "einzelnen Commit klonen und auschecken" + msgid "path to git-upload-pack on the remote" msgstr "Pfad zu \"git-upload-pack\" auf der Gegenseite" @@ -4280,8 +4378,8 @@ msgstr "Historie eines flachen Klons vertiefen, Referenz exkludiert" msgid "clone only one branch, HEAD or --branch" msgstr "nur einen Branch klonen, HEAD oder --branch" -msgid "don't clone any tags, and make later fetches not to follow them" -msgstr "keine Tags klonen, und auch bei späteren Abrufen nicht beachten" +msgid "clone tags, and make later fetches not to follow them" +msgstr "Tags klonen und dafür sorgen, dass spätere Abrufe ihnen nicht folgen" msgid "any cloned submodules will be shallow" msgstr "jedes geklonte Submodul mit unvollständiger Historie (shallow)" @@ -4326,99 +4424,8 @@ msgstr "" "eine URI für das Herunterladen von Bundles vor dem Abruf\n" "aus dem ursprünglichen Remote-Repository" -#, c-format -msgid "info: Could not add alternate for '%s': %s\n" -msgstr "info: Konnte Alternative für '%s' nicht hinzufügen: %s\n" - -#, c-format -msgid "failed to stat '%s'" -msgstr "Konnte '%s' nicht lesen" - -#, c-format -msgid "%s exists and is not a directory" -msgstr "%s existiert und ist kein Verzeichnis" - -#, c-format -msgid "'%s' is a symlink, refusing to clone with --local" -msgstr "" -"'%s' ist eine symbolische Verknüpfung, verweigere das Klonen mit --local" - -#, c-format -msgid "failed to start iterator over '%s'" -msgstr "Fehler beim Starten der Iteration über '%s'" - -#, c-format -msgid "symlink '%s' exists, refusing to clone with --local" -msgstr "" -"symbolische Verknüpfung '%s' existiert, verweigere das Klonen mit --local" - -#, c-format -msgid "failed to unlink '%s'" -msgstr "Konnte '%s' nicht entfernen." - -#, c-format -msgid "hardlink cannot be checked at '%s'" -msgstr "Hardlink bei '%s' kann nicht geprüft werden" - -#, c-format -msgid "hardlink different from source at '%s'" -msgstr "Hardlink unterscheidet sich von der Quelle bei '%s'" - -#, c-format -msgid "failed to create link '%s'" -msgstr "Konnte Verweis '%s' nicht erstellen" - -#, c-format -msgid "failed to copy file to '%s'" -msgstr "Konnte Datei nicht nach '%s' kopieren" - -#, c-format -msgid "failed to iterate over '%s'" -msgstr "Fehler beim Iterieren über '%s'" - -#, c-format -msgid "done.\n" -msgstr "Fertig.\n" - -msgid "" -"Clone succeeded, but checkout failed.\n" -"You can inspect what was checked out with 'git status'\n" -"and retry with 'git restore --source=HEAD :/'\n" -msgstr "" -"Klonen erfolgreich, Auschecken ist aber fehlgeschlagen.\n" -"Sie können mit 'git status' prüfen, was ausgecheckt worden ist\n" -"und das Auschecken mit 'git restore --source=HEAD :/' erneut versuchen.\n" - -#, c-format -msgid "Could not find remote branch %s to clone." -msgstr "Konnte zu klonenden Remote-Branch %s nicht finden." - -msgid "remote did not send all necessary objects" -msgstr "Remote-Repository hat nicht alle erforderlichen Objekte gesendet" - -#, c-format -msgid "unable to update %s" -msgstr "kann %s nicht aktualisieren" - -msgid "failed to initialize sparse-checkout" -msgstr "Fehler beim Initialisieren vom partiellen Checkout." - -msgid "remote HEAD refers to nonexistent ref, unable to checkout" -msgstr "" -"HEAD des Remote-Repositories verweist auf nicht existierende Referenz, kann " -"nicht ausgecheckt werden" - -msgid "unable to checkout working tree" -msgstr "Arbeitsverzeichnis konnte nicht ausgecheckt werden" - -msgid "unable to write parameters to config file" -msgstr "konnte Parameter nicht in Konfigurationsdatei schreiben" - -msgid "cannot repack to clean up" -msgstr "Kann \"repack\" zum Aufräumen nicht aufrufen" - -msgid "cannot unlink temporary alternates file" -msgstr "Kann temporäre \"alternates\"-Datei nicht entfernen" +msgid "git clone [] [--] []" +msgstr "git clone [] [--] []" msgid "Too many arguments." msgstr "Zu viele Argumente." @@ -4531,6 +4538,10 @@ msgstr "Remoteübertragung meldete Fehler" msgid "Remote branch %s not found in upstream %s" msgstr "Remote-Branch %s nicht im Upstream-Repository %s gefunden" +#, c-format +msgid "Remote revision %s not found in upstream %s" +msgstr "Remote-Commit %s nicht im Upstream-Repository %s gefunden" + msgid "You appear to have cloned an empty repository." msgstr "Sie scheinen ein leeres Repository geklont zu haben." @@ -4710,7 +4721,7 @@ msgid "git commit-tree: failed to read" msgstr "git commit-tree: Fehler beim Lesen" msgid "" -"git commit [-a | --interactive | --patch] [-s] [-v] [-u] [--amend]\n" +"git commit [-a | --interactive | --patch] [-s] [-v] [-u[]] [--amend]\n" " [--dry-run] [(-c | -C | --squash) | --fixup [(amend|" "reword):]]\n" " [-F | -m ] [--reset-author] [--allow-empty]\n" @@ -4720,14 +4731,14 @@ msgid "" " [(--trailer [(=|:)])...] [-S[]]\n" " [--] [...]" msgstr "" -"git commit [-a | --interactive | --patch] [-s] [-v] [-u] [--amend]\n" +"git commit [-a | --interactive | --patch] [-s] [-v] [-u[]] [--amend]\n" " [--dry-run] [(-c | -C | --squash) | --fixup [(amend|" "reword):]]\n" " [-F | -m ] [--reset-author] [--allow-empty]\n" " [--allow-empty-message] [--no-verify] [-e] [--author=]\n" " [--date=] [--cleanup=] [--[no-]status]\n" " [-i | -o] [--pathspec-from-file= [--pathspec-file-nul]]\n" -" [(--trailer [(=|:)])...] [-S[]]\n" +" [(--trailer [(=|:)])...] [-S[>]]\n" " [--] [...]" msgid "git status [] [--] [...]" @@ -6139,14 +6150,15 @@ msgid "" "Run 'git remote set-head %s %s' to follow the change, or set\n" "'remote.%s.followRemoteHEAD' configuration option to a different value\n" "if you do not want to see this message. Specifically running\n" -"'git config set remote.%s.followRemoteHEAD %s' will disable the warning\n" -"until the remote changes HEAD to something else." +"'git config set remote.%s.followRemoteHEAD warn-if-not-branch-%s'\n" +"will disable the warning until the remote changes HEAD to something else." msgstr "" "Führen Sie 'git remote set-head %s %s' aus, um der Änderung zu folgen,\n" "oder setzen Sie die Konfiguration 'remote.%s.followRemoteHEAD' auf einen\n" -"anderen Wert, wenn Sie diese Meldung nicht sehen wollen. Konkret wird diese\n" -"Warnung mit 'git config set remote.%s.followRemoteHEAD %s' deaktiviert\n" -"bis die Gegenstelle HEAD in etwas anderes ändert." +"anderen Wert wenn Sie diese Meldung nicht sehen wollen. Speziell der Befehl\n" +"'git config set remote.%s.followRemoteHEAD warn-if-not-branch-%s'\n" +"wird die Warnung deaktivieren, bis das Remote-Repository HEAD in etwas\n" +"anderes ändert." msgid "multiple branches detected, incompatible with --set-upstream" msgstr "mehrere Branches erkannt, inkompatibel mit --set-upstream" @@ -6842,6 +6854,9 @@ msgstr "" msgid "repack all other packs except the largest pack" msgstr "alle anderen Pakete, außer das größte Paket, neu packen" +msgid "pack prefix to store a pack containing pruned objects" +msgstr "pack-Präfix zum Speichern eines Pakets mit gelöschten Objekten" + #, c-format msgid "failed to parse gc.logExpiry value %s" msgstr "Fehler beim Parsen des Wertes '%s' von gc.logExpiry" @@ -7658,6 +7673,10 @@ msgstr "" msgid "Cannot come back to cwd" msgstr "Kann nicht zurück zum Arbeitsverzeichnis wechseln" +#, c-format +msgid "bad --pack_header: %s" +msgstr "ungültiger --pack_header: %s" + #, c-format msgid "bad %s" msgstr "%s ist ungültig" @@ -8537,11 +8556,6 @@ msgstr "unbekannte Strategie-Option: -X%s" msgid "malformed input line: '%s'." msgstr "Fehlerhafte Eingabezeile: '%s'." -#, c-format -msgid "merging cannot continue; got unclean result of %d" -msgstr "" -"Merge kann nicht fortgesetzt werden; unsauberes Ergebnis von %d erhalten" - msgid "git merge [] [...]" msgstr "git merge [] [...]" @@ -9381,6 +9395,13 @@ msgstr "" "git pack-objects [] [< | < " "]" +#, c-format +msgid "invalid --name-hash-version option: %d" +msgstr "ungültige Option für --name-hash-version: %d" + +msgid "currently, --write-bitmap-index requires --name-hash-version=1" +msgstr "derzeit erfordert --write-bitmap-index --name-hash-version=1" + #, c-format msgid "" "write_reuse_object: could not locate %s, expected at offset % in " @@ -9718,6 +9739,11 @@ msgstr "" "jegliche konfigurierte uploadpack.blobpackfileuri für dieses Protkoll " "ausschließen" +msgid "use the specified name-hash function to group similar objects" +msgstr "" +"die angegebene Name-Hash-Funktion verwenden, um ähnliche Objekte zu " +"gruppieren" + #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "Tiefe für Verkettung von Unterschieden %d ist zu tief, erzwinge %d" @@ -11006,8 +11032,8 @@ msgstr "Kein Reflog zum Löschen angegeben." msgid "invalid ref format: %s" msgstr "Ungültiges Format für Referenzen: %s" -msgid "git refs migrate --ref-format= [--dry-run]" -msgstr "git refs migrate --ref-format= [--dry-run]" +msgid "git refs migrate --ref-format= [--no-reflog] [--dry-run]" +msgstr "git refs migrate --ref-format= [--no-reflog] [--dry-run]" msgid "git refs verify [--strict] [--verbose]" msgstr "git refs verify [--strict] [--verbose]" @@ -11018,6 +11044,9 @@ msgstr "das Referenzformat angeben, in das konvertiert werden soll" msgid "perform a non-destructive dry-run" msgstr "einen zerstörungsfreien Trockenlauf durchführen" +msgid "drop reflogs entirely during the migration" +msgstr "Reflogs während der Migration vollständig zu löschen" + msgid "missing --ref-format=" msgstr "fehlendes --ref-format=" @@ -11488,8 +11517,14 @@ msgstr "Werde keine URLs entfernen, die nicht für \"push\" bestimmt sind" msgid "be verbose; must be placed before a subcommand" msgstr "erweiterte Ausgaben; muss vor einem Unterbefehl angegeben werden" -msgid "git repack []" -msgstr "git repack []" +msgid "" +"git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" +"[--window=] [--depth=] [--threads=] [--keep-pack=]\n" +"[--write-midx] [--name-hash-version=]" +msgstr "" +"git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" +"[--window=] [--depth=] [--threads=] [--keep-pack=]\n" +"[--write-midx] [--name-hash-version=]" msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" @@ -11568,6 +11603,12 @@ msgstr "--no-reuse-delta an git-pack-objects übergeben" msgid "pass --no-reuse-object to git-pack-objects" msgstr "--no-reuse-object an git-pack-objects übergeben" +msgid "" +"specify the name hash version to use for grouping similar objects by path" +msgstr "" +"die Version des Hash-Namens angeben, die für die Gruppierung ähnlicher " +"Objekte nach Pfad verwendet werden soll" + msgid "do not run git-update-server-info" msgstr "git-update-server-info nicht ausführen" @@ -11619,9 +11660,6 @@ msgstr "eine geometrische Progression mit Faktor finden" msgid "write a multi-pack index of the resulting packs" msgstr "ein Multi-Pack-Index des resultierenden Pakets schreiben" -msgid "pack prefix to store a pack containing pruned objects" -msgstr "pack-Präfix zum Speichern eines Pakets mit gelöschten Objekten" - msgid "pack prefix to store a pack containing filtered out objects" msgstr "Paketpräfix, um ein Paket mit herausgefilterten Objekten zu speichern" @@ -11839,9 +11877,6 @@ msgstr "Mit -l kann nur ein Muster angegeben werden" msgid "need some commits to replay" msgstr "zum erneuten Abspielen werden Commits benötigt" -msgid "--onto and --advance are incompatible" -msgstr "--onto und --advance sind inkompatibel" - msgid "all positive revisions given must be references" msgstr "alle angegebenen positiven Commits müssen Referenzen sein" @@ -14571,6 +14606,9 @@ msgstr "ein GNU Arch Repository in Git importieren" msgid "Create an archive of files from a named tree" msgstr "Dateiarchiv von angegebenem Verzeichnis erstellen" +msgid "Download missing objects in a partial clone" +msgstr "fehlender Objekte in einem partiellen Klon herunterladen" + msgid "Use binary search to find the commit that introduced a bug" msgstr "" "Binärsuche verwenden, um den Commit zu finden, der einen Fehler verursacht " @@ -16543,6 +16581,12 @@ msgstr "ungültiges Argument für %s" msgid "invalid regex given to -I: '%s'" msgstr "ungültiger regulärer Ausdruck für -I gegeben: '%s'" +msgid "-G requires a non-empty argument" +msgstr "-G erfordert ein nicht leeres Argument" + +msgid "-S requires a non-empty argument" +msgstr "-S erfordert ein nicht leeres Argument" + #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "Fehler beim Parsen des --submodule Optionsparameters: '%s'" @@ -18781,6 +18825,10 @@ msgstr "die Dateien '%s' und '%s' unterscheiden sich im Inhalt" msgid "unable to write file %s" msgstr "Konnte Datei %s nicht schreiben." +#, c-format +msgid "unable to write repeatedly vanishing file %s" +msgstr "konnte nicht in eine wiederholt verschwindende Datei %s schreiben" + #, c-format msgid "unable to set permission to '%s'" msgstr "Konnte Zugriffsberechtigung auf '%s' nicht setzen." @@ -19355,6 +19403,52 @@ msgstr "Unbekannter Schalter `%c'" msgid "unknown non-ascii option in string: `%s'" msgstr "Unbekannte nicht-Ascii Option in String: `%s'" +#. TRANSLATORS: The "<%s>" part of this string +#. stands for an optional value given to a command +#. line option in the long form, and "<>" is there +#. as a convention to signal that it is a +#. placeholder (i.e. the user should substitute it +#. with the real value). If your language uses a +#. different convention, you can change "<%s>" part +#. to match yours, e.g. it might use "|%s|" instead, +#. or if the alphabet is different enough it may use +#. "%s" without any placeholder signal. Most +#. translations leave this message as is. +#. +#, c-format +msgid "[=<%s>]" +msgstr "[=<%s>]" + +#. TRANSLATORS: The "<%s>" part of this string +#. stands for an optional value given to a command +#. line option in the short form, and "<>" is there +#. as a convention to signal that it is a +#. placeholder (i.e. the user should substitute it +#. with the real value). If your language uses a +#. different convention, you can change "<%s>" part +#. to match yours, e.g. it might use "|%s|" instead, +#. or if the alphabet is different enough it may use +#. "%s" without any placeholder signal. Most +#. translations leave this message as is. +#. +#, c-format +msgid "[<%s>]" +msgstr "[<%s>]" + +#. TRANSLATORS: The "<%s>" part of this string stands for a +#. value given to a command line option, and "<>" is there +#. as a convention to signal that it is a placeholder +#. (i.e. the user should substitute it with the real value). +#. If your language uses a different convention, you can +#. change "<%s>" part to match yours, e.g. it might use +#. "|%s|" instead, or if the alphabet is different enough it +#. may use "%s" without any placeholder signal. Most +#. translations leave this message as is. +#. +#, c-format +msgid " <%s>" +msgstr " <%s>" + msgid "..." msgstr "..." @@ -19441,6 +19535,21 @@ msgstr "falscher boolescher Wert von Umgebungsvariable '%s' für '%s'" msgid "failed to parse %s" msgstr "Fehler beim Parsen von %s." +#, c-format +msgid "failed to walk children of tree %s: not found" +msgstr "Fehlen beim Durchlaufen der Kinder von Baum %s: nicht gefunden" + +#, c-format +msgid "failed to find object %s" +msgstr "Objekt nicht gefunden: %s" + +#, c-format +msgid "failed to find tag %s" +msgstr "Tag nicht gefunden: %s" + +msgid "failed to setup revision walk" +msgstr "Einrichtung des Revisionsgangs fehlgeschlagen" + #, c-format msgid "Could not make %s writable by group" msgstr "Konnte Gruppenschreibrecht für %s nicht setzen." @@ -19591,6 +19700,25 @@ msgstr "Promisor-Remote-Name kann nicht mit '/' beginnen: %s" msgid "could not fetch %s from promisor remote" msgstr "konnte %s nicht von Promisor-Remote abrufen" +#, c-format +msgid "known remote named '%s' but with url '%s' instead of '%s'" +msgstr "" +"bekanntes Remote-Repository mit dem Namen '%s', aber mit der URL '%s' statt " +"'%s'" + +#, c-format +msgid "unknown '%s' value for '%s' config option" +msgstr "unbekannter '%s'-Wert für '%s'-Konfigurationsoption" + +#, c-format +msgid "unknown element '%s' from remote info" +msgstr "unbekanntes Element '%s' aus Information aus Remote-Repository" + +#, c-format +msgid "accepted promisor remote '%s' not found" +msgstr "" +"akzeptiertes partiell geklontes \"Remote-Repository '%s' nicht gefunden" + msgid "object-info: expected flush after arguments" msgstr "object-info: erwartete Flush nach Argumenten" @@ -20427,6 +20555,14 @@ msgstr "" msgid "invalid refspec '%s'" msgstr "ungültige Refspec '%s'" +#, c-format +msgid "pattern '%s' has no '*'" +msgstr "Muster '%s' hat keinen '*'" + +#, c-format +msgid "replacement '%s' has no '*'" +msgstr "Ersetzung '%s' hat keinen '*'" + #, c-format msgid "invalid quoting in push-option value: '%s'" msgstr "Ungültiges Quoting beim \"push-option\"-Wert: '%s'" @@ -20549,6 +20685,28 @@ msgstr "remote-curl: \"fetch\" ohne lokales Repository versucht" msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl: Unbekannter Befehl '%s' von Git" +#, c-format +msgid "" +"reading remote from \"%s/%s\", which is nominated for removal.\n" +"\n" +"If you still use the \"remotes/\" directory it is recommended to\n" +"migrate to config-based remotes:\n" +"\n" +"\tgit remote rename %s %s\n" +"\n" +"If you cannot, please let us know why you still need to use it by\n" +"sending an e-mail to ." +msgstr "" +"Lese von Remote-Repository \"%s/%s\", das zum Entfernen vorgeschlagen wird.\n" +"\n" +"Wenn Sie noch das Verzeichnis \"remotes/\" verwenden, wird empfohlen\n" +"auf konfigurationsbasierte Remote-Repositories umzusteigen:\n" +"\n" +"\tgit remote rename %s %s\n" +"\n" +"Wenn dies nicht möglich ist, teilen Sie uns bitte mit, warum Sie das noch\n" +"verwenden müssen, indem Sie eine E-Mail an senden." + #, c-format msgid "config remote shorthand cannot begin with '/': %s" msgstr "" @@ -20585,14 +20743,6 @@ msgstr "%s folgt üblicherweise %s, nicht %s" msgid "%s tracks both %s and %s" msgstr "%s folgt sowohl %s als auch %s" -#, c-format -msgid "key '%s' of pattern had no '*'" -msgstr "Schlüssel '%s' des Musters hatte kein '*'." - -#, c-format -msgid "value '%s' of pattern has no '*'" -msgstr "Wert '%s' des Musters hat kein '*'." - #, c-format msgid "src refspec %s does not match any" msgstr "Src-Refspec %s entspricht keiner Referenz." @@ -22519,6 +22669,27 @@ msgstr "" "Anzahl der Einträge im Cache-Verzeichnis, die ungültig gemacht werden sollen " "(Standardwert 0)" +msgid "test-tool path-walk -- " +msgstr "test-tool path-walk -- " + +msgid "toggle inclusion of blob objects" +msgstr "Einbeziehung von Blob-Objekten umschalten" + +msgid "toggle inclusion of commit objects" +msgstr "Einbeziehung von Commit-Objekten umschalten" + +msgid "toggle inclusion of tag objects" +msgstr "Einbeziehung von Tag-Objekten umschalten" + +msgid "toggle inclusion of tree objects" +msgstr "Einbeziehung von Tree-Objekten umschalten" + +msgid "toggle pruning of uninteresting paths" +msgstr "Auslassen von uninteressanten Pfaden umschalten" + +msgid "read a pattern list over stdin" +msgstr "Liste von Mustern von der Standard-Eingabe lesen" + #, c-format msgid "commit %s is not marked reachable" msgstr "Commit %s ist nicht als erreichbar gekennzeichnet." @@ -23168,6 +23339,10 @@ msgstr "Fehler: " msgid "warning: " msgstr "Warnung: " +#, c-format +msgid "uname() failed with error '%s' (%d)\n" +msgstr "uname() ist fehlgeschlagen mit Fehler '%s' (%d)\n" + msgid "Fetching objects" msgstr "Anfordern der Objekte" @@ -24190,7 +24365,3 @@ msgstr "Lasse %s mit Backup-Suffix '%s' aus.\n" #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Wollen Sie %s wirklich versenden? [y|N]: " - -#, c-format -#~ msgid "preferred pack (%s) is invalid" -#~ msgstr "bevorzugtes Paket (%s) ist ungültig" diff --git a/po/fr.po b/po/fr.po index 64a75aecf5859c..8e3339030761a1 100644 --- a/po/fr.po +++ b/po/fr.po @@ -87,8 +87,8 @@ msgid "" msgstr "" "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2024-12-23 18:57+0000\n" -"PO-Revision-Date: 2024-12-29 18:26+0100\n" +"POT-Creation-Date: 2025-03-05 22:57+0000\n" +"PO-Revision-Date: 2025-03-06 16:46+0100\n" "Last-Translator: Cédric Malard \n" "Language-Team: Jean-Noël Avila \n" "Language: fr\n" @@ -2452,6 +2452,18 @@ msgstr "git archive : erreur de protocole" msgid "git archive: expected a flush" msgstr "git archive : vidage attendu" +msgid "git backfill [--min-batch-size=] [--[no-]sparse]" +msgstr "git backfill [--min-batch-size=] [--[no-]sparse]" + +msgid "problem loading sparse-checkout" +msgstr "problème lors du chargement de l'extraction clairsemée" + +msgid "Minimum number of objects to request at a time" +msgstr "Nombre minimum d'objets à demander à chaque fois" + +msgid "Restrict the missing objects to the current sparse-checkout" +msgstr "Restreindre les objets manquants à l'extraction clairsemée actuelle" + msgid "" "git bisect start [--term-(new|bad)= --term-(old|good)=] [--no-" "checkout] [--first-parent] [ [...]] [--] [...]" @@ -3217,10 +3229,6 @@ msgstr "" msgid "git version:\n" msgstr "version git ::\n" -#, c-format -msgid "uname() failed with error '%s' (%d)\n" -msgstr "échec de uname() avec l'erreur '%s' (%d)\n" - msgid "compiler info: " msgstr "info compilateur : " @@ -4243,8 +4251,93 @@ msgid "clean.requireForce is true and -f not given: refusing to clean" msgstr "" "clean.requireForce positionné est true et -f non fourni ; refus de nettoyer" -msgid "git clone [] [--] []" -msgstr "git clone [] [--] []" +#, c-format +msgid "info: Could not add alternate for '%s': %s\n" +msgstr "info : impossible d'ajouter une alternative pour '%s' : %s\n" + +#, c-format +msgid "failed to stat '%s'" +msgstr "échec du stat de '%s'" + +#, c-format +msgid "%s exists and is not a directory" +msgstr "%s existe et n'est pas un répertoire" + +#, c-format +msgid "'%s' is a symlink, refusing to clone with --local" +msgstr "'%s' est un lien symbolique, refus de cloner avec --local" + +#, c-format +msgid "failed to start iterator over '%s'" +msgstr "échec du démarrage un itérateur sur '%s'" + +#, c-format +msgid "symlink '%s' exists, refusing to clone with --local" +msgstr "le lien symbolique '%s' existe, refus de cloner avec --local" + +#, c-format +msgid "failed to unlink '%s'" +msgstr "échec pour délier '%s'" + +#, c-format +msgid "hardlink cannot be checked at '%s'" +msgstr "le lien dur ne peut pas être vérifié à '%s'" + +#, c-format +msgid "hardlink different from source at '%s'" +msgstr "le lien dur est différent de la source à '%s'" + +#, c-format +msgid "failed to create link '%s'" +msgstr "échec de la création du lien '%s'" + +#, c-format +msgid "failed to copy file to '%s'" +msgstr "échec de la copie vers '%s'" + +#, c-format +msgid "failed to iterate over '%s'" +msgstr "échec de l'itération sur '%s'" + +#, c-format +msgid "done.\n" +msgstr "fait.\n" + +msgid "" +"Clone succeeded, but checkout failed.\n" +"You can inspect what was checked out with 'git status'\n" +"and retry with 'git restore --source=HEAD :/'\n" +msgstr "" +"Le clone a réussi, mais l'extraction a échoué.\n" +"Vous pouvez inspecter ce qui a été extrait avec 'git status'\n" +"et réessayer avec 'git restore --source=HEAD :/'\n" + +msgid "remote did not send all necessary objects" +msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires" + +#, c-format +msgid "unable to update %s" +msgstr "impossible de mettre à jour %s" + +msgid "failed to initialize sparse-checkout" +msgstr "échec lors de l'initialisation l'extraction clairsemée" + +msgid "remote HEAD refers to nonexistent ref, unable to checkout" +msgstr "" +"la HEAD distante réfère à une référence non existante, impossible de " +"l'extraire" + +msgid "unable to checkout working tree" +msgstr "impossible d'extraire la copie de travail" + +msgid "unable to write parameters to config file" +msgstr "impossible d'écrire les paramètres dans le fichier de configuration" + +msgid "cannot repack to clean up" +msgstr "impossible de remballer pour nettoyer" + +msgid "cannot unlink temporary alternates file" +msgstr "impossible de délier le fichier temporaire alternates" msgid "don't clone shallow repository" msgstr "ne pas cloner un dépôt superficiel" @@ -4297,6 +4390,9 @@ msgstr "utiliser au lieu de 'origin' pour suivre la branche amont" msgid "checkout instead of the remote's HEAD" msgstr "extraire au lieu de la HEAD du répertoire distant" +msgid "clone single revision and check out" +msgstr "cloner la révision unique et l'extraire" + msgid "path to git-upload-pack on the remote" msgstr "chemin vers git-upload-pack sur le serveur distant" @@ -4318,10 +4414,9 @@ msgstr "approfondit l'historique d'un clone superficiel en excluant une ref" msgid "clone only one branch, HEAD or --branch" msgstr "cloner seulement une branche, HEAD ou --branch" -msgid "don't clone any tags, and make later fetches not to follow them" +msgid "clone tags, and make later fetches not to follow them" msgstr "" -"ne pas cloner les tags et indiquer aux récupérations futures de ne pas le " -"faire" +"cloner les tags et indiquer aux récupérations futures de ne pas le faire" msgid "any cloned submodules will be shallow" msgstr "tous les sous-modules clonés seront superficiels" @@ -4367,97 +4462,8 @@ msgstr "" "un URI pour télécharger des paquets avant de récupérer depuis le distant " "d'origine" -#, c-format -msgid "info: Could not add alternate for '%s': %s\n" -msgstr "info : impossible d'ajouter une alternative pour '%s' : %s\n" - -#, c-format -msgid "failed to stat '%s'" -msgstr "échec du stat de '%s'" - -#, c-format -msgid "%s exists and is not a directory" -msgstr "%s existe et n'est pas un répertoire" - -#, c-format -msgid "'%s' is a symlink, refusing to clone with --local" -msgstr "'%s' est un lien symbolique, refus de cloner avec --local" - -#, c-format -msgid "failed to start iterator over '%s'" -msgstr "échec du démarrage un itérateur sur '%s'" - -#, c-format -msgid "symlink '%s' exists, refusing to clone with --local" -msgstr "le lien symbolique '%s' existe, refus de cloner avec --local" - -#, c-format -msgid "failed to unlink '%s'" -msgstr "échec pour délier '%s'" - -#, c-format -msgid "hardlink cannot be checked at '%s'" -msgstr "le lien dur ne peut pas être vérifié à '%s'" - -#, c-format -msgid "hardlink different from source at '%s'" -msgstr "le lien dur est différent de la source à '%s'" - -#, c-format -msgid "failed to create link '%s'" -msgstr "échec de la création du lien '%s'" - -#, c-format -msgid "failed to copy file to '%s'" -msgstr "échec de la copie vers '%s'" - -#, c-format -msgid "failed to iterate over '%s'" -msgstr "échec de l'itération sur '%s'" - -#, c-format -msgid "done.\n" -msgstr "fait.\n" - -msgid "" -"Clone succeeded, but checkout failed.\n" -"You can inspect what was checked out with 'git status'\n" -"and retry with 'git restore --source=HEAD :/'\n" -msgstr "" -"Le clone a réussi, mais l'extraction a échoué.\n" -"Vous pouvez inspecter ce qui a été extrait avec 'git status'\n" -"et réessayer avec 'git restore --source=HEAD :/'\n" - -#, c-format -msgid "Could not find remote branch %s to clone." -msgstr "Impossible de trouver la branche distante '%s' à cloner." - -msgid "remote did not send all necessary objects" -msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires" - -#, c-format -msgid "unable to update %s" -msgstr "impossible de mettre à jour %s" - -msgid "failed to initialize sparse-checkout" -msgstr "échec lors de l'initialisation l'extraction clairsemée" - -msgid "remote HEAD refers to nonexistent ref, unable to checkout" -msgstr "" -"la HEAD distante réfère à une référence non existante, impossible de " -"l'extraire" - -msgid "unable to checkout working tree" -msgstr "impossible d'extraire la copie de travail" - -msgid "unable to write parameters to config file" -msgstr "impossible d'écrire les paramètres dans le fichier de configuration" - -msgid "cannot repack to clean up" -msgstr "impossible de remballer pour nettoyer" - -msgid "cannot unlink temporary alternates file" -msgstr "impossible de délier le fichier temporaire alternates" +msgid "git clone [] [--] []" +msgstr "git clone [] [--] []" msgid "Too many arguments." msgstr "Trop d'arguments." @@ -4563,6 +4569,10 @@ msgstr "le transport distant a retourné une erreur" msgid "Remote branch %s not found in upstream %s" msgstr "La branche distante %s n'a pas été trouvée dans le dépôt amont %s" +#, c-format +msgid "Remote revision %s not found in upstream %s" +msgstr "La révision distante %s n'a pas été trouvée dans le dépôt amont %s" + msgid "You appear to have cloned an empty repository." msgstr "Vous semblez avoir cloné un dépôt vide." @@ -4737,7 +4747,7 @@ msgid "git commit-tree: failed to read" msgstr "git commit-tree : échec de la lecture" msgid "" -"git commit [-a | --interactive | --patch] [-s] [-v] [-u] [--amend]\n" +"git commit [-a | --interactive | --patch] [-s] [-v] [-u[]] [--amend]\n" " [--dry-run] [(-c | -C | --squash) | --fixup [(amend|" "reword):]]\n" " [-F | -m ] [--reset-author] [--allow-empty]\n" @@ -4747,14 +4757,14 @@ msgid "" " [(--trailer [(=|:)])...] [-S[]]\n" " [--] [...]" msgstr "" -"git commit [-a | --interactive | --patch] [-s] [-v] [-u] [--amend]\n" +"git commit [-a | --interactive | --patch] [-s] [-v] [-u[]] [--amend]\n" " [--dry-run] [(-c | -C | --squash) | --fixup [(amend|" -"reword):])]\n" +"reword):]]\n" " [-F | -m ] [--reset-author] [--allow-empty]\n" " [--allow-empty-message] [--no-verify] [-e] [--author=]\n" " [--date=] [--cleanup=] [--[no-]status]\n" " [-i | -o] [--pathspec-from-file= [--pathspec-file-nul]]\n" -" [(--trailer [(=|:)])...] [-S[]]\n" +" [(--trailer [(=|:)])...] [-S[]]\n" " [--] [...]" msgid "git status [] [--] [...]" @@ -6168,13 +6178,14 @@ msgid "" "Run 'git remote set-head %s %s' to follow the change, or set\n" "'remote.%s.followRemoteHEAD' configuration option to a different value\n" "if you do not want to see this message. Specifically running\n" -"'git config set remote.%s.followRemoteHEAD %s' will disable the warning\n" -"until the remote changes HEAD to something else." +"'git config set remote.%s.followRemoteHEAD warn-if-not-branch-%s'\n" +"will disable the warning until the remote changes HEAD to something else." msgstr "" "Lancez 'git remote set-head %s %s' pour suivre la modification, ou\n" "réglez l'option de configuration 'remote.%s.followRemoteHEAD' à une\n" "valeur différente si vous ne souhaitez pas voir ce message. Lancer\n" -"spécifiquement 'git config set remote.%s.followRemoteHEAD %s'\n" +"spécifiquement 'git config set remote.%s.followRemoteHEAD warn-if-not-branch-" +"%s'\n" "va désactiver l'alerte jusqu'à ce que le distant change HEAD." msgid "multiple branches detected, incompatible with --set-upstream" @@ -6860,6 +6871,9 @@ msgstr "" msgid "repack all other packs except the largest pack" msgstr "recompacter tous les autres paquets excepté le plus gros paquet" +msgid "pack prefix to store a pack containing pruned objects" +msgstr "préfixe de paquet pour stocker un paquet contenant les objets élagués" + #, c-format msgid "failed to parse gc.logExpiry value %s" msgstr "impossible d'analyser gc.logExpiry %s" @@ -7673,6 +7687,10 @@ msgstr "" msgid "Cannot come back to cwd" msgstr "Impossible de revenir au répertoire de travail courant" +#, c-format +msgid "bad --pack_header: %s" +msgstr "mauvais --pack_header : %s" + #, c-format msgid "bad %s" msgstr "mauvais %s" @@ -8561,10 +8579,6 @@ msgstr "option de stratégie inconnue : -X%s" msgid "malformed input line: '%s'." msgstr "ligne en entrée malformée : '%s'." -#, c-format -msgid "merging cannot continue; got unclean result of %d" -msgstr "la fusion ne peut pas continuer ; résultat non propre retourné %d" - msgid "git merge [] [...]" msgstr "git merge [] [...]" @@ -9397,6 +9411,13 @@ msgstr "" "git pack-objects [] [< | < ]" +#, c-format +msgid "invalid --name-hash-version option: %d" +msgstr "option --name-hash-version invalide : %d" + +msgid "currently, --write-bitmap-index requires --name-hash-version=1" +msgstr "actuellement, --write-bitmap-index nécessite --name-hash-version=1" + #, c-format msgid "" "write_reuse_object: could not locate %s, expected at offset % in " @@ -9730,6 +9751,11 @@ msgstr "protocole" msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" msgstr "exclure tout uploadpack.blobpackfileuri configuré avec ce protocole" +msgid "use the specified name-hash function to group similar objects" +msgstr "" +"utiliser la fonction d'empreinte de nom spécifiée pour grouper les objets " +"similaires" + #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "la profondeur %d de chaîne de delta est trop grande, forcée à %d" @@ -10992,8 +11018,8 @@ msgstr "pas de journal de références à supprimer spécifié" msgid "invalid ref format: %s" msgstr "format de référence invalide : %s" -msgid "git refs migrate --ref-format= [--dry-run]" -msgstr "git refs migrate --ref-format= [--dry-run]" +msgid "git refs migrate --ref-format= [--no-reflog] [--dry-run]" +msgstr "git refs migrate --ref-format= [--no-reflog] [--dry-run]" msgid "git refs verify [--strict] [--verbose]" msgstr "git refs verify [--strict] [--verbose]" @@ -11004,6 +11030,9 @@ msgstr "spécifier le format de réference vers lequel convertir" msgid "perform a non-destructive dry-run" msgstr "faire l'action en mode simulé non destructif" +msgid "drop reflogs entirely during the migration" +msgstr "abandonner complètement le reflog pendant la migration" + msgid "missing --ref-format=" msgstr "--ref-format= manquant" @@ -11475,8 +11504,14 @@ msgstr "Pas de suppression de toutes les URLs non-push" msgid "be verbose; must be placed before a subcommand" msgstr "être verbeux : doit être placé avant une sous-commande" -msgid "git repack []" -msgstr "git repack []" +msgid "" +"git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" +"[--window=] [--depth=] [--threads=] [--keep-pack=]\n" +"[--write-midx] [--name-hash-version=]" +msgstr "" +"git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" +"[--window=] [--depth=] [--threads=] [--keep-pack=]\n" +"[--write-midx] [--name-hash-version=]" msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" @@ -11557,6 +11592,12 @@ msgstr "passer --no-reuse-delta à git-pack-objects" msgid "pass --no-reuse-object to git-pack-objects" msgstr "passer --no-reuse-object à git-pack-objects" +msgid "" +"specify the name hash version to use for grouping similar objects by path" +msgstr "" +"spécifier la verison d'empreinte de nom à utiliser pour grouper les objets " +"similaires par chemin" + msgid "do not run git-update-server-info" msgstr "ne pas lancer git-update-server-info" @@ -11606,9 +11647,6 @@ msgstr "trouver une progression géométrique avec un facteur " msgid "write a multi-pack index of the resulting packs" msgstr "écrire un index de multi-paquet des paquets résultants" -msgid "pack prefix to store a pack containing pruned objects" -msgstr "préfixe de paquet pour stocker un paquet contenant les objets élagués" - msgid "pack prefix to store a pack containing filtered out objects" msgstr "préfixe de paquet pour stocker un paquet contenant les objets filtrés" @@ -11825,9 +11863,6 @@ msgstr "-l n'accepte qu'un motifs" msgid "need some commits to replay" msgstr "commits requis pour pouvoir rejouer" -msgid "--onto and --advance are incompatible" -msgstr "--onto et --advance sont incompatibles" - msgid "all positive revisions given must be references" msgstr "toutes les révisions positives fournies doivent être des références" @@ -14539,6 +14574,9 @@ msgstr "Importer dans Git un dépôt GNU Arch" msgid "Create an archive of files from a named tree" msgstr "Créer une archive des fichiers depuis un arbre nommé" +msgid "Download missing objects in a partial clone" +msgstr "Télécharger les objets manquants dans un clone partiel" + msgid "Use binary search to find the commit that introduced a bug" msgstr "Trouver par recherche binaire la modification qui a introduit un bogue" @@ -16531,6 +16569,12 @@ msgstr "argument invalide pour %s" msgid "invalid regex given to -I: '%s'" msgstr "regex invalide fournie à -I : '%s'" +msgid "-G requires a non-empty argument" +msgstr "-G exige un argument non vide" + +msgid "-S requires a non-empty argument" +msgstr "-S exige un argument non vide" + #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "échec de l'analyse du paramètre de l'option --submodule : '%s'" @@ -18766,6 +18810,10 @@ msgstr "les fichiers '%s' et '%s' diffèrent par leur contenu" msgid "unable to write file %s" msgstr "impossible d'écrire le fichier %s" +#, c-format +msgid "unable to write repeatedly vanishing file %s" +msgstr "impossible d'écrire le fichier %s qui disparaît répétitivement" + #, c-format msgid "unable to set permission to '%s'" msgstr "impossible de régler les droits de '%s'" @@ -19338,6 +19386,52 @@ msgstr "bascule inconnue « %c »" msgid "unknown non-ascii option in string: `%s'" msgstr "option non-ascii inconnue dans la chaîne : '%s'" +#. TRANSLATORS: The "<%s>" part of this string +#. stands for an optional value given to a command +#. line option in the long form, and "<>" is there +#. as a convention to signal that it is a +#. placeholder (i.e. the user should substitute it +#. with the real value). If your language uses a +#. different convention, you can change "<%s>" part +#. to match yours, e.g. it might use "|%s|" instead, +#. or if the alphabet is different enough it may use +#. "%s" without any placeholder signal. Most +#. translations leave this message as is. +#. +#, c-format +msgid "[=<%s>]" +msgstr "[=<%s>]" + +#. TRANSLATORS: The "<%s>" part of this string +#. stands for an optional value given to a command +#. line option in the short form, and "<>" is there +#. as a convention to signal that it is a +#. placeholder (i.e. the user should substitute it +#. with the real value). If your language uses a +#. different convention, you can change "<%s>" part +#. to match yours, e.g. it might use "|%s|" instead, +#. or if the alphabet is different enough it may use +#. "%s" without any placeholder signal. Most +#. translations leave this message as is. +#. +#, c-format +msgid "[<%s>]" +msgstr "[<%s>]" + +#. TRANSLATORS: The "<%s>" part of this string stands for a +#. value given to a command line option, and "<>" is there +#. as a convention to signal that it is a placeholder +#. (i.e. the user should substitute it with the real value). +#. If your language uses a different convention, you can +#. change "<%s>" part to match yours, e.g. it might use +#. "|%s|" instead, or if the alphabet is different enough it +#. may use "%s" without any placeholder signal. Most +#. translations leave this message as is. +#. +#, c-format +msgid " <%s>" +msgstr " <%s>" + msgid "..." msgstr "..." @@ -19424,6 +19518,21 @@ msgstr "valeur booléenne d'environnement invalide '%s' pour '%s'" msgid "failed to parse %s" msgstr "échec de l'analyse de %s" +#, c-format +msgid "failed to walk children of tree %s: not found" +msgstr "échec de parcours des enfants de l'arbre %s : non trouvé" + +#, c-format +msgid "failed to find object %s" +msgstr "échec de la recherche de l'objet %s" + +#, c-format +msgid "failed to find tag %s" +msgstr "impossible de trouver l'étiquette %s" + +msgid "failed to setup revision walk" +msgstr "impossible définir un parcours de révisions" + #, c-format msgid "Could not make %s writable by group" msgstr "Impossible de rendre %s inscriptible pour le groupe" @@ -19581,6 +19690,22 @@ msgstr "un nom de prometteur distant ne peut pas commencer par '/' : %s" msgid "could not fetch %s from promisor remote" msgstr "impossible de récupérer %s depuis le distant de prometteur" +#, c-format +msgid "known remote named '%s' but with url '%s' instead of '%s'" +msgstr "distant connu nommé '%s' mais avec l'url '%s' au lieu de '%s'" + +#, c-format +msgid "unknown '%s' value for '%s' config option" +msgstr "valeur inconnue '%s' pour l'option de config '%s'" + +#, c-format +msgid "unknown element '%s' from remote info" +msgstr "élément inconnu '%s' pour l'info de distant" + +#, c-format +msgid "accepted promisor remote '%s' not found" +msgstr "distant accpté de prometteur '%s' non trouvé" + msgid "object-info: expected flush after arguments" msgstr "object-info : vidage attendu après les arguments" @@ -20417,6 +20542,14 @@ msgstr "" msgid "invalid refspec '%s'" msgstr "spécificateur de réference invalide : '%s'" +#, c-format +msgid "pattern '%s' has no '*'" +msgstr "la valeur '%s' du motif n'a pas de '*'" + +#, c-format +msgid "replacement '%s' has no '*'" +msgstr "le remplacement '%s' n'a pas de '*'" + #, c-format msgid "invalid quoting in push-option value: '%s'" msgstr "citation invalide dans la valeur push-option : '%s'" @@ -20538,6 +20671,28 @@ msgstr "remote-curl : récupération tentée sans dépôt local" msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl : commande inconnue '%s' depuis git" +#, c-format +msgid "" +"reading remote from \"%s/%s\", which is nominated for removal.\n" +"\n" +"If you still use the \"remotes/\" directory it is recommended to\n" +"migrate to config-based remotes:\n" +"\n" +"\tgit remote rename %s %s\n" +"\n" +"If you cannot, please let us know why you still need to use it by\n" +"sending an e-mail to ." +msgstr "" +"lecture depuis \"%s/%s\", dont la suppression est programmée.\n" +"\n" +"Si vous utilisez encore le répertoire \"remotes\", il est recommandé de\n" +"migrer vers une gestion à base de configuration :\n" +"\n" +"\tgit remote rename %s %s\n" +"\n" +"S'il vous est impossible de migrer, veuillez nous avertir par\n" +"un courriel à ." + #, c-format msgid "config remote shorthand cannot begin with '/': %s" msgstr "" @@ -20573,14 +20728,6 @@ msgstr "%s suit habituellement %s, pas %s" msgid "%s tracks both %s and %s" msgstr "%s suit à la fois %s et %s" -#, c-format -msgid "key '%s' of pattern had no '*'" -msgstr "la clé '%s' du modèle n'a pas de '*'" - -#, c-format -msgid "value '%s' of pattern has no '*'" -msgstr "la valeur '%s' du modèle n'a pas de '*'" - #, c-format msgid "src refspec %s does not match any" msgstr "" @@ -22505,6 +22652,27 @@ msgstr "effacer l'arbre de cache avant chaque itération" msgid "number of entries in the cache tree to invalidate (default 0)" msgstr "nombre d'entrées dans l'arbre de cache à invalider (par défaut, 0)" +msgid "test-tool path-walk -- " +msgstr "test-tool path-walk -- " + +msgid "toggle inclusion of blob objects" +msgstr "activer l'inclusion des objets blob" + +msgid "toggle inclusion of commit objects" +msgstr "activer l'inclusion des objets commit" + +msgid "toggle inclusion of tag objects" +msgstr "activer l'inclusion des objets étiquette" + +msgid "toggle inclusion of tree objects" +msgstr "activer l'inclusion des objets arbre" + +msgid "toggle pruning of uninteresting paths" +msgstr "activer l'élagage des chemins inintéressants" + +msgid "read a pattern list over stdin" +msgstr "lire les motifs depuis stdin" + #, c-format msgid "commit %s is not marked reachable" msgstr "le commit %s n'est pas marqué joignable" @@ -23151,6 +23319,10 @@ msgstr "erreur : " msgid "warning: " msgstr "avertissement : " +#, c-format +msgid "uname() failed with error '%s' (%d)\n" +msgstr "échec de uname() avec l'erreur '%s' (%d)\n" + msgid "Fetching objects" msgstr "Récupération des objets" @@ -24127,6 +24299,24 @@ msgstr "%s sauté avec un suffix de sauvegarde '%s'.\n" msgid "Do you really want to send %s? [y|N]: " msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : " +#, c-format +#~ msgid "Could not find remote branch %s to clone." +#~ msgstr "Impossible de trouver la branche distante '%s' à cloner." + +#, c-format +#~ msgid "merging cannot continue; got unclean result of %d" +#~ msgstr "la fusion ne peut pas continuer ; résultat non propre retourné %d" + +#~ msgid "git repack []" +#~ msgstr "git repack []" + +#~ msgid "--onto and --advance are incompatible" +#~ msgstr "--onto et --advance sont incompatibles" + +#, c-format +#~ msgid "key '%s' of pattern had no '*'" +#~ msgstr "la clé '%s' du modèle n'a pas de '*'" + #, c-format #~ msgid "preferred pack (%s) is invalid" #~ msgstr "le paquet préféré (%s) est invalide" diff --git a/po/id.po b/po/id.po index 3965c9e941d9c6..7d32c51ac77f04 100644 --- a/po/id.po +++ b/po/id.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2024-12-23 18:57+0000\n" -"PO-Revision-Date: 2025-01-06 15:50+0700\n" +"POT-Creation-Date: 2025-03-05 22:57+0000\n" +"PO-Revision-Date: 2025-03-09 17:44+0700\n" "Last-Translator: Bagas Sanjaya \n" "Language-Team: Indonesian\n" "Language: id\n" @@ -2890,6 +2890,22 @@ msgstr "git archive: kesalahan protokol" msgid "git archive: expected a flush" msgstr "git archive: sebuah bilasan diharapkan" +#: builtin/backfill.c +msgid "git backfill [--min-batch-size=] [--[no-]sparse]" +msgstr "git backfill [--min-batch-size=] [--[no-]sparse]" + +#: builtin/backfill.c +msgid "problem loading sparse-checkout" +msgstr "galat memuat sparse-checkout" + +#: builtin/backfill.c +msgid "Minimum number of objects to request at a time" +msgstr "Jumlah objek minum yang diminta pada suatu waktu" + +#: builtin/backfill.c +msgid "Restrict the missing objects to the current sparse-checkout" +msgstr "Batasi objek yang hilang ke sparse-checkout saat ini" + #: builtin/bisect.c msgid "" "git bisect start [--term-(new|bad)= --term-(old|good)=] [--no-" @@ -3312,7 +3328,7 @@ msgstr "perlihatkan email pengarang daripada nama (asali: off)" msgid "ignore whitespace differences" msgstr "abaikan perbedaan spasi putih" -#: builtin/blame.c builtin/log.c +#: builtin/blame.c builtin/clone.c builtin/log.c msgid "rev" msgstr "revisi" @@ -3828,11 +3844,6 @@ msgstr "" msgid "git version:\n" msgstr "versi git:\n" -#: builtin/bugreport.c -#, c-format -msgid "uname() failed with error '%s' (%d)\n" -msgstr "uname() gagal dengan kesalahan '%s' (%d)\n" - #: builtin/bugreport.c msgid "compiler info: " msgstr "info pengompilasi: " @@ -5090,8 +5101,112 @@ msgid "clean.requireForce is true and -f not given: refusing to clean" msgstr "clean.requireForce 'true' dan -f tidak diberikan: menolak membersihkan" #: builtin/clone.c -msgid "git clone [] [--] []" -msgstr "git clone [] [--] []" +#, c-format +msgid "info: Could not add alternate for '%s': %s\n" +msgstr "info: Tidak dapat menambahkan alternatif untuk '%s': %s\n" + +#: builtin/clone.c builtin/diff.c builtin/rm.c grep.c setup.c +#, c-format +msgid "failed to stat '%s'" +msgstr "gagal men-stat '%s'" + +#: builtin/clone.c +#, c-format +msgid "%s exists and is not a directory" +msgstr "%s ada dan bukan direktori" + +#: builtin/clone.c +#, c-format +msgid "'%s' is a symlink, refusing to clone with --local" +msgstr "'%s' tautan simbolik, menolak mengkloning dengan --local" + +#: builtin/clone.c +#, c-format +msgid "failed to start iterator over '%s'" +msgstr "gagal memulai iterator pada '%s'" + +#: builtin/clone.c +#, c-format +msgid "symlink '%s' exists, refusing to clone with --local" +msgstr "tautan simbolik '%s' ada, menolak mengkloning dengan --local" + +#: builtin/clone.c compat/precompose_utf8.c +#, c-format +msgid "failed to unlink '%s'" +msgstr "gagal menghapus tautan '%s'" + +#: builtin/clone.c +#, c-format +msgid "hardlink cannot be checked at '%s'" +msgstr "tautan keras tidak dapat diperiksa pada '%s'" + +#: builtin/clone.c +#, c-format +msgid "hardlink different from source at '%s'" +msgstr "tautan keras berbeda dari sumber pada '%s'" + +#: builtin/clone.c +#, c-format +msgid "failed to create link '%s'" +msgstr "gagal membuat tautan '%s'" + +#: builtin/clone.c +#, c-format +msgid "failed to copy file to '%s'" +msgstr "gagal menyalin berkas ke '%s'" + +#: builtin/clone.c refs/files-backend.c +#, c-format +msgid "failed to iterate over '%s'" +msgstr "gagal iterasi pada '%s'" + +#: builtin/clone.c +#, c-format +msgid "done.\n" +msgstr "selesai.\n" + +#: builtin/clone.c +msgid "" +"Clone succeeded, but checkout failed.\n" +"You can inspect what was checked out with 'git status'\n" +"and retry with 'git restore --source=HEAD :/'\n" +msgstr "" +"Klon sukses, tapi checkout gagal.\n" +"Anda dapat periksa apa yang dicheckout dengan 'git status'\n" +"dan coba lagi dengan 'git restore --source=HEAD :/'\n" + +#: builtin/clone.c fetch-pack.c +msgid "remote did not send all necessary objects" +msgstr "remote tidak mengirim semua objek yang dibutuhkan" + +#: builtin/clone.c +#, c-format +msgid "unable to update %s" +msgstr "tidak dapat memperbarui %s" + +#: builtin/clone.c +msgid "failed to initialize sparse-checkout" +msgstr "gagal menginisalisasi checkout tipis" + +#: builtin/clone.c +msgid "remote HEAD refers to nonexistent ref, unable to checkout" +msgstr "HEAD remote merujuk pada ref yang tidak ada, tidak dapat men-checkout" + +#: builtin/clone.c +msgid "unable to checkout working tree" +msgstr "tidak dapat men-checkout pohon kerja" + +#: builtin/clone.c +msgid "unable to write parameters to config file" +msgstr "tidak dapat menulis parameter ke berkas konfigurasi" + +#: builtin/clone.c +msgid "cannot repack to clean up" +msgstr "tidak dapat memaket ulang untuk pembersihan" + +#: builtin/clone.c +msgid "cannot unlink temporary alternates file" +msgstr "tidak dapat batal-taut berkas alternatif sementara" #: builtin/clone.c msgid "don't clone shallow repository" @@ -5163,6 +5278,10 @@ msgstr "gunakan daripada 'origin' untuk lacak hulu" msgid "checkout instead of the remote's HEAD" msgstr "checkout daripada HEAD remote" +#: builtin/clone.c +msgid "clone single revision and check out" +msgstr "klon satu revisi dan check out" + #: builtin/clone.c msgid "path to git-upload-pack on the remote" msgstr "jalur ke git-upload-pack pada remote" @@ -5192,8 +5311,8 @@ msgid "clone only one branch, HEAD or --branch" msgstr "klon hanya satu cabang, HEAD atau --branch" #: builtin/clone.c -msgid "don't clone any tags, and make later fetches not to follow them" -msgstr "jangan klon tag apapun, dan buat pengambilan nanti tidak mengikutinya" +msgid "clone tags, and make later fetches not to follow them" +msgstr "klon tag dan jangan ikuti mereka pada pengambilan berikutnya" #: builtin/clone.c msgid "any cloned submodules will be shallow" @@ -5251,117 +5370,8 @@ msgid "a URI for downloading bundles before fetching from origin remote" msgstr "sebuah URI untuk mengunduh bundel sebelum mengambil dari remote asal" #: builtin/clone.c -#, c-format -msgid "info: Could not add alternate for '%s': %s\n" -msgstr "info: Tidak dapat menambahkan alternatif untuk '%s': %s\n" - -#: builtin/clone.c builtin/diff.c builtin/rm.c grep.c setup.c -#, c-format -msgid "failed to stat '%s'" -msgstr "gagal men-stat '%s'" - -#: builtin/clone.c -#, c-format -msgid "%s exists and is not a directory" -msgstr "%s ada dan bukan direktori" - -#: builtin/clone.c -#, c-format -msgid "'%s' is a symlink, refusing to clone with --local" -msgstr "'%s' tautan simbolik, menolak mengkloning dengan --local" - -#: builtin/clone.c -#, c-format -msgid "failed to start iterator over '%s'" -msgstr "gagal memulai iterator pada '%s'" - -#: builtin/clone.c -#, c-format -msgid "symlink '%s' exists, refusing to clone with --local" -msgstr "tautan simbolik '%s' ada, menolak mengkloning dengan --local" - -#: builtin/clone.c compat/precompose_utf8.c -#, c-format -msgid "failed to unlink '%s'" -msgstr "gagal menghapus tautan '%s'" - -#: builtin/clone.c -#, c-format -msgid "hardlink cannot be checked at '%s'" -msgstr "tautan keras tidak dapat diperiksa pada '%s'" - -#: builtin/clone.c -#, c-format -msgid "hardlink different from source at '%s'" -msgstr "tautan keras berbeda dari sumber pada '%s'" - -#: builtin/clone.c -#, c-format -msgid "failed to create link '%s'" -msgstr "gagal membuat tautan '%s'" - -#: builtin/clone.c -#, c-format -msgid "failed to copy file to '%s'" -msgstr "gagal menyalin berkas ke '%s'" - -#: builtin/clone.c refs/files-backend.c -#, c-format -msgid "failed to iterate over '%s'" -msgstr "gagal iterasi pada '%s'" - -#: builtin/clone.c -#, c-format -msgid "done.\n" -msgstr "selesai.\n" - -#: builtin/clone.c -msgid "" -"Clone succeeded, but checkout failed.\n" -"You can inspect what was checked out with 'git status'\n" -"and retry with 'git restore --source=HEAD :/'\n" -msgstr "" -"Klon sukses, tapi checkout gagal.\n" -"Anda dapat periksa apa yang dicheckout dengan 'git status'\n" -"dan coba lagi dengan 'git restore --source=HEAD :/'\n" - -#: builtin/clone.c -#, c-format -msgid "Could not find remote branch %s to clone." -msgstr "Tidak dapat menemukan cabang remote %s untuk diklon." - -#: builtin/clone.c fetch-pack.c -msgid "remote did not send all necessary objects" -msgstr "remote tidak mengirim semua objek yang dibutuhkan" - -#: builtin/clone.c -#, c-format -msgid "unable to update %s" -msgstr "tidak dapat memperbarui %s" - -#: builtin/clone.c -msgid "failed to initialize sparse-checkout" -msgstr "gagal menginisalisasi checkout tipis" - -#: builtin/clone.c -msgid "remote HEAD refers to nonexistent ref, unable to checkout" -msgstr "HEAD remote merujuk pada ref yang tidak ada, tidak dapat men-checkout" - -#: builtin/clone.c -msgid "unable to checkout working tree" -msgstr "tidak dapat men-checkout pohon kerja" - -#: builtin/clone.c -msgid "unable to write parameters to config file" -msgstr "tidak dapat menulis parameter ke berkas konfigurasi" - -#: builtin/clone.c -msgid "cannot repack to clean up" -msgstr "tidak dapat memaket ulang untuk pembersihan" - -#: builtin/clone.c -msgid "cannot unlink temporary alternates file" -msgstr "tidak dapat batal-taut berkas alternatif sementara" +msgid "git clone [] [--] []" +msgstr "git clone [] [--] []" #: builtin/clone.c msgid "Too many arguments." @@ -5491,6 +5501,11 @@ msgstr "transportasi remote melaporkan kesalahan" msgid "Remote branch %s not found in upstream %s" msgstr "Cabang remote %s tidak ditemukan di hulu %s" +#: builtin/clone.c +#, c-format +msgid "Remote revision %s not found in upstream %s" +msgstr "Revisi remote %s tidak ditemukan di hulu %s" + #: builtin/clone.c msgid "You appear to have cloned an empty repository." msgstr "Anda tampaknya mengklon repositori kosong." @@ -5555,7 +5570,8 @@ msgstr "" "[no-]progress]\n" " " -#: builtin/commit-graph.c builtin/fetch.c builtin/log.c builtin/repack.c +#: builtin/commit-graph.c builtin/fetch.c builtin/gc.c builtin/log.c +#: builtin/repack.c msgid "dir" msgstr "direktori" @@ -5715,7 +5731,7 @@ msgstr "git commit-tree: gagal membaca" #: builtin/commit.c msgid "" -"git commit [-a | --interactive | --patch] [-s] [-v] [-u] [--amend]\n" +"git commit [-a | --interactive | --patch] [-s] [-v] [-u[]] [--amend]\n" " [--dry-run] [(-c | -C | --squash) | --fixup [(amend|" "reword):]]\n" " [-F | -m ] [--reset-author] [--allow-empty]\n" @@ -5725,7 +5741,7 @@ msgid "" " [(--trailer [(=|:)])...] [-S[]]\n" " [--] [...]" msgstr "" -"git commit [-a | --interactive | --patch] [-s] [-v] [-u] [--amend]\n" +"git commit [-a | --interactive | --patch] [-s] [-v] [-u[]] [--amend]\n" " [--dry-run] [(-c | -C | --squash) | --fixup [(amend|" "reword):]]\n" " [-F | -m ] [--reset-author] [--allow-empty]\n" @@ -7472,14 +7488,14 @@ msgid "" "Run 'git remote set-head %s %s' to follow the change, or set\n" "'remote.%s.followRemoteHEAD' configuration option to a different value\n" "if you do not want to see this message. Specifically running\n" -"'git config set remote.%s.followRemoteHEAD %s' will disable the warning\n" -"until the remote changes HEAD to something else." +"'git config set remote.%s.followRemoteHEAD warn-if-not-branch-%s'\n" +"will disable the warning until the remote changes HEAD to something else." msgstr "" "Jalankan 'git remote set-head %s %s' untuk mengikuti perubahan, atau setel\n" "opsi konfigurasi 'remote.%s.followRemoteHEAD' ke nilai yang berbeda jika\n" -"Anda tidak ingin melihat pesan ini lagi. Secara rinci menjalakan\n" -"'git config set remote.%s followRemoteHEAD %s' akan mematikan peringatan\n" -"ini sampai remote mengubah HEAD ke yang lain." +"Anda tidak ingin melihat pesan ini lagi. Secara rinci menjalankan\n" +"'git config set remote.%s.followRemoteHEAD warn-if-not-branch-%s' akan\n" +"mematikan peringatan ini sampai remote mengubah HEAD ke yang lain." #: builtin/fetch.c msgid "multiple branches detected, incompatible with --set-upstream" @@ -8341,6 +8357,10 @@ msgstr "paksa jalankan gc bahkan jika mungkin ada gc lain yang berjalan" msgid "repack all other packs except the largest pack" msgstr "pak ulang semua pak yang lain kecuali pak terbesar" +#: builtin/gc.c builtin/repack.c +msgid "pack prefix to store a pack containing pruned objects" +msgstr "awalan pak untuk menyimpan pak berisi objek terpangkas" + #: builtin/gc.c #, c-format msgid "failed to parse gc.logExpiry value %s" @@ -9353,6 +9373,11 @@ msgstr "tidak dapat menyelesaikan pack-objects untuk mempak ulang tautan lokal" msgid "Cannot come back to cwd" msgstr "tidak dapat kembali ke direktori kerja saat ini" +#: builtin/index-pack.c builtin/unpack-objects.c +#, c-format +msgid "bad --pack_header: %s" +msgstr "--pack_header jelek: %s" + #: builtin/index-pack.c #, c-format msgid "bad %s" @@ -10476,11 +10501,6 @@ msgstr "opsi strategi tidak dikenal: -X%s" msgid "malformed input line: '%s'." msgstr "baris masukan jelek: '%s'." -#: builtin/merge-tree.c -#, c-format -msgid "merging cannot continue; got unclean result of %d" -msgstr "penggabungan tidak dapat berlanjut; dapat hasil kotor dari %d" - #: builtin/merge.c msgid "git merge [] [...]" msgstr "git merge [] [...]" @@ -11522,6 +11542,15 @@ msgstr "" "git pack-objects [...] [< | < ]" +#: builtin/pack-objects.c +#, c-format +msgid "invalid --name-hash-version option: %d" +msgstr "opsi --name-hash-version tidak valid: %d" + +#: builtin/pack-objects.c +msgid "currently, --write-bitmap-index requires --name-hash-version=1" +msgstr "saat ini, --write-bitmap-index memerlukan --name-hash-version=1" + #: builtin/pack-objects.c #, c-format msgid "" @@ -11934,6 +11963,12 @@ msgstr "" "abaikan uploadpack.blobpackfileuri apapun yang dikonfigurasikan dengan " "protokol ini" +#: builtin/pack-objects.c +msgid "use the specified name-hash function to group similar objects" +msgstr "" +"gunakan fungsi nama-hash yang dirincikan untuk mengelompokan objek yang " +"serupa" + #: builtin/pack-objects.c #, c-format msgid "delta chain depth %d is too deep, forcing %d" @@ -13428,8 +13463,8 @@ msgid "invalid ref format: %s" msgstr "format referensi tidak valid: %s" #: builtin/refs.c -msgid "git refs migrate --ref-format= [--dry-run]" -msgstr "git refs migrate --ref-format= [--dry-run]" +msgid "git refs migrate --ref-format= [--no-reflog] [--dry-run]" +msgstr "git refs migrate --ref-format= [--no-reflog] [--dry-run]" #: builtin/refs.c msgid "git refs verify [--strict] [--verbose]" @@ -13443,6 +13478,10 @@ msgstr "sebutkan format referensi untuk dikonversi" msgid "perform a non-destructive dry-run" msgstr "lakukan uji coba non desktruktif" +#: builtin/refs.c +msgid "drop reflogs entirely during the migration" +msgstr "buang keseluruhan log referensi selama migrasi" + #: builtin/refs.c msgid "missing --ref-format=" msgstr "--ref-format= hilang" @@ -14024,8 +14063,14 @@ msgid "be verbose; must be placed before a subcommand" msgstr "jadi lebih bertele-tele; harus ditempatkan sebelum subperintah" #: builtin/repack.c -msgid "git repack []" -msgstr "git repack []" +msgid "" +"git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" +"[--window=] [--depth=] [--threads=] [--keep-pack=]\n" +"[--write-midx] [--name-hash-version=]" +msgstr "" +"git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" +"[--window=] [--depth=] [--threads=] [--keep-pack=]\n" +"[--write-midx] [--name-hash-version=]" #: builtin/repack.c msgid "" @@ -14118,6 +14163,13 @@ msgstr "lewatkan --no-reuse-delta ke git-pack-objects" msgid "pass --no-reuse-object to git-pack-objects" msgstr "lewatkan --no-reuse-object ke git-pack-objects" +#: builtin/repack.c +msgid "" +"specify the name hash version to use for grouping similar objects by path" +msgstr "" +"tentukan versi nama hash yang digunakan untuk mengelompokan objek yang " +"serupa berdasarkan jalur" + #: builtin/repack.c msgid "do not run git-update-server-info" msgstr "jangan jalankan git-update-server-info" @@ -14184,10 +14236,6 @@ msgstr "temukan deret geometri dengan faktor " msgid "write a multi-pack index of the resulting packs" msgstr "tulis indeks multipak dari pak yang dihasilkan" -#: builtin/repack.c -msgid "pack prefix to store a pack containing pruned objects" -msgstr "awalan pak untuk menyimpan pak berisi objek terpangkas" - #: builtin/repack.c msgid "pack prefix to store a pack containing filtered out objects" msgstr "awalan pak untuk menyimpan pak berisi objek tersaring" @@ -14462,10 +14510,6 @@ msgstr "hanya satu pola yang dapat diberikan dengan -l" msgid "need some commits to replay" msgstr "butuh beberapa komit untuk dimainkan ulang" -#: builtin/replay.c -msgid "--onto and --advance are incompatible" -msgstr "--onto dan --advance tidak kompatibel" - #: builtin/replay.c msgid "all positive revisions given must be references" msgstr "semua revisi positif yang diberikan haruslah referensi" @@ -17767,6 +17811,10 @@ msgstr "Impor repositori GNU Arch ke dalam Git" msgid "Create an archive of files from a named tree" msgstr "Buat arsip berkas dari pohon bernama" +#: command-list.h +msgid "Download missing objects in a partial clone" +msgstr "Unduh objek yang hilang dalam klon parsial" + #: command-list.h msgid "Use binary search to find the commit that introduced a bug" msgstr "Gunakan pencarian biner untuk mencari komit yang memasukkan bug" @@ -20190,6 +20238,14 @@ msgstr "argumen tidak valid ke %s" msgid "invalid regex given to -I: '%s'" msgstr "regex tidak valid diberikan ke -I: '%s'" +#: diff.c +msgid "-G requires a non-empty argument" +msgstr "-G butuh sebuah argumen bukan kosong" + +#: diff.c +msgid "-S requires a non-empty argument" +msgstr "-S butuh sebuah argumen bukan kosong" + #: diff.c #, c-format msgid "failed to parse --submodule option parameter: '%s'" @@ -22886,6 +22942,11 @@ msgstr "berkas '%s' dan '%s' berbeda konteks" msgid "unable to write file %s" msgstr "tidak dapat menulis berkas %s" +#: object-file.c +#, c-format +msgid "unable to write repeatedly vanishing file %s" +msgstr "tidak dapat menulis berkas yang menghilang %s terus-menerus" + #: object-file.c #, c-format msgid "unable to set permission to '%s'" @@ -23579,6 +23640,55 @@ msgstr "sakelar tidak dikenal `%c'" msgid "unknown non-ascii option in string: `%s'" msgstr "opsi non-ascii di dalam untai tidak dikenal: `%s'" +#. TRANSLATORS: The "<%s>" part of this string +#. stands for an optional value given to a command +#. line option in the long form, and "<>" is there +#. as a convention to signal that it is a +#. placeholder (i.e. the user should substitute it +#. with the real value). If your language uses a +#. different convention, you can change "<%s>" part +#. to match yours, e.g. it might use "|%s|" instead, +#. or if the alphabet is different enough it may use +#. "%s" without any placeholder signal. Most +#. translations leave this message as is. +#. +#: parse-options.c +#, c-format +msgid "[=<%s>]" +msgstr "[=<%s>]" + +#. TRANSLATORS: The "<%s>" part of this string +#. stands for an optional value given to a command +#. line option in the short form, and "<>" is there +#. as a convention to signal that it is a +#. placeholder (i.e. the user should substitute it +#. with the real value). If your language uses a +#. different convention, you can change "<%s>" part +#. to match yours, e.g. it might use "|%s|" instead, +#. or if the alphabet is different enough it may use +#. "%s" without any placeholder signal. Most +#. translations leave this message as is. +#. +#: parse-options.c +#, c-format +msgid "[<%s>]" +msgstr "[<%s>]" + +#. TRANSLATORS: The "<%s>" part of this string stands for a +#. value given to a command line option, and "<>" is there +#. as a convention to signal that it is a placeholder +#. (i.e. the user should substitute it with the real value). +#. If your language uses a different convention, you can +#. change "<%s>" part to match yours, e.g. it might use +#. "|%s|" instead, or if the alphabet is different enough it +#. may use "%s" without any placeholder signal. Most +#. translations leave this message as is. +#. +#: parse-options.c +#, c-format +msgid " <%s>" +msgstr " <%s>" + #: parse-options.c msgid "..." msgstr "..." @@ -23682,6 +23792,25 @@ msgstr "nilai lingkungan boolean '%s' jelek untuk '%s'" msgid "failed to parse %s" msgstr "gagal menguraikan %s" +#: path-walk.c +#, c-format +msgid "failed to walk children of tree %s: not found" +msgstr "gagal berjalan anak pohon %s: tidak ditemukan" + +#: path-walk.c +#, c-format +msgid "failed to find object %s" +msgstr "gagal menemukan objek %s" + +#: path-walk.c +#, c-format +msgid "failed to find tag %s" +msgstr "gagal menemukan tag %s" + +#: path-walk.c +msgid "failed to setup revision walk" +msgstr "gagal men-setup jalan revisi" + #: path.c #, c-format msgid "Could not make %s writable by group" @@ -23868,6 +23997,26 @@ msgstr "nama remote penjanji tidak dapat diawali dengan '/': %s" msgid "could not fetch %s from promisor remote" msgstr "tidak dapat mengambil %s dari remote penjanji" +#: promisor-remote.c +#, c-format +msgid "known remote named '%s' but with url '%s' instead of '%s'" +msgstr "remote yang terkenal bernama '%s' tapi dengan url '%s' daripada '%s'" + +#: promisor-remote.c +#, c-format +msgid "unknown '%s' value for '%s' config option" +msgstr "nilai '%s' tidak dikenal untuk opsi konfigurasi '%s'" + +#: promisor-remote.c +#, c-format +msgid "unknown element '%s' from remote info" +msgstr "elemen '%s' dari info remote tidak dikenal" + +#: promisor-remote.c +#, c-format +msgid "accepted promisor remote '%s' not found" +msgstr "remote penjanji yang diterima '%s' tidak ditemukan" + #: protocol-caps.c msgid "object-info: expected flush after arguments" msgstr "object-info: bilasan diharapkan setelah argumen" @@ -24870,6 +25019,16 @@ msgstr "nama referensi %s simbolik, menyalinnya tidak didukung" msgid "invalid refspec '%s'" msgstr "spek referensi tidak valid '%s'" +#: refspec.c +#, c-format +msgid "pattern '%s' has no '*'" +msgstr "pola '%s' tidak mempunyai '*'" + +#: refspec.c +#, c-format +msgid "replacement '%s' has no '*'" +msgstr "pengganti '%s' tidak mempunyai '*'" + #: remote-curl.c #, c-format msgid "invalid quoting in push-option value: '%s'" @@ -25023,6 +25182,28 @@ msgstr "remote-curl: pengambilan dicoba tanpa repositori lokal" msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl: perintah tidak dikenal '%s' dari git" +#: remote.c +#, c-format +msgid "" +"reading remote from \"%s/%s\", which is nominated for removal.\n" +"\n" +"If you still use the \"remotes/\" directory it is recommended to\n" +"migrate to config-based remotes:\n" +"\n" +"\tgit remote rename %s %s\n" +"\n" +"If you cannot, please let us know why you still need to use it by\n" +"sending an e-mail to ." +msgstr "" +"membaca remote dari \"%s/%s\", yang dinominasikan untuk dihapus.\n" +"\n" +"Jika Anda masih menggunakan direktori \"remotes/\" disarankan untuk\n" +"migrasi ke remote berdasarkan konfigurasi:\n" +"\n" +"\tgit remote rename %s %s\n" +"Jika tidak, mohon beri tahu kami mengapa Anda masih menggunakannya dengan\n" +"mengirimkan surel ke ." + #: remote.c #, c-format msgid "config remote shorthand cannot begin with '/': %s" @@ -25066,16 +25247,6 @@ msgstr "%s biasanya melacak %s, bukan %s" msgid "%s tracks both %s and %s" msgstr "%s melacak baik %s dan %s" -#: remote.c -#, c-format -msgid "key '%s' of pattern had no '*'" -msgstr "kunci '%s' dari pola tidak ada '*'" - -#: remote.c -#, c-format -msgid "value '%s' of pattern has no '*'" -msgstr "nilai '%s' dari pola tidak ada '*'" - #: remote.c #, c-format msgid "src refspec %s does not match any" @@ -27389,6 +27560,34 @@ msgstr "bersihkan pohon tembolok sebelum setiap iterasi" msgid "number of entries in the cache tree to invalidate (default 0)" msgstr "jumlah entri di dalam pohon tembolok untuk dinirvalidasi (asali 0)" +#: t/helper/test-path-walk.c +msgid "test-tool path-walk -- " +msgstr "test-tool path-walk -- " + +#: t/helper/test-path-walk.c +msgid "toggle inclusion of blob objects" +msgstr "sertakan objek blob" + +#: t/helper/test-path-walk.c +msgid "toggle inclusion of commit objects" +msgstr "sertakan objek komit" + +#: t/helper/test-path-walk.c +msgid "toggle inclusion of tag objects" +msgstr "sertakan objek tag" + +#: t/helper/test-path-walk.c +msgid "toggle inclusion of tree objects" +msgstr "sertakan objek pohon" + +#: t/helper/test-path-walk.c +msgid "toggle pruning of uninteresting paths" +msgstr "pangkas jalur yang tidak menarik" + +#: t/helper/test-path-walk.c +msgid "read a pattern list over stdin" +msgstr "baca daftar pola dari masukan standar" + #: t/helper/test-reach.c #, c-format msgid "commit %s is not marked reachable" @@ -28148,6 +28347,11 @@ msgstr "kesalahan: " msgid "warning: " msgstr "peringatan: " +#: version.c +#, c-format +msgid "uname() failed with error '%s' (%d)\n" +msgstr "uname() gagal dengan kesalahan '%s' (%d)\n" + #: walker.c msgid "Fetching objects" msgstr "Mengambil objek" diff --git a/po/it.po b/po/it.po index c31560834d8f2b..20fd8bb28d8589 100644 --- a/po/it.po +++ b/po/it.po @@ -17602,7 +17602,7 @@ msgstr "Controllo la ridenominazione di '%s' in '%s'\n" #: builtin/mv.c:185 msgid "bad source" -msgstr "sourgente errata" +msgstr "sorgente errata" #: builtin/mv.c:188 msgid "can not move directory into itself" diff --git a/po/ko.po b/po/ko.po index 5d190e52380864..7a6847f0236711 100644 --- a/po/ko.po +++ b/po/ko.po @@ -7,6 +7,7 @@ # Changwoo Ryu , 2015-2018. # Sihyeon Jang , 2018. # Gwan-gyeong Mun , 2018. +# Seoyeon Kwon , 2025. # # - 작업자는 위 Contributors 목록에 추가해 주세요. # - 번역하면서 80컬럼을 넘어가지 않도록 해 주세요. @@ -7666,7 +7667,7 @@ msgid "" " git commit --allow-empty\n" "\n" msgstr "" -"이전 커맷 빼오기가 비어 있습니다. 아마도 충돌 해결 과정에서 그렇게 됐을\n" +"이전 커밋 빼오기가 비어 있습니다. 아마도 충돌 해결 과정에서 그렇게 됐을\n" "것입니다. 그래도 커밋하려면 다음과 같이 하십시오:\n" "\n" " git commit --allow-empty\n" diff --git a/po/sv.po b/po/sv.po index 5377b3ece7d6e2..42c357e54f093e 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,14 +1,14 @@ # Swedish translations for Git. -# Copyright (C) 2010-2024 Peter Krefting +# Copyright (C) 2010-2025 Peter Krefting # This file is distributed under the same license as the Git package. -# Peter Krefting , 2010-2024. +# Peter Krefting , 2010-2025. # msgid "" msgstr "" -"Project-Id-Version: git 2.48.0\n" +"Project-Id-Version: git 2.49.0\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2024-12-30 11:57+0100\n" -"PO-Revision-Date: 2024-12-30 12:03+0100\n" +"POT-Creation-Date: 2025-03-10 17:45+0100\n" +"PO-Revision-Date: 2025-03-10 17:48+0100\n" "Last-Translator: Peter Krefting \n" "Language-Team: Svenska \n" "Language: sv\n" @@ -1477,7 +1477,7 @@ msgid "" "Use '\\!' for literal leading exclamation." msgstr "" "Negativa mönster ignoreras i git-attribut\n" -"Använd '\\!' för att inleda med ett utropstecken." +"Använd ”\\!” för att inleda med ett utropstecken." #, c-format msgid "cannot fstat gitattributes file '%s'" @@ -2060,7 +2060,7 @@ msgid "" "It does not apply to blobs recorded in its index." msgstr "" "Har du handredigerat din patch?\n" -"Den kan inte tillämpas på blobbar som antecknats i dess index." +"Den kan inte tillämpas på blob:ar som antecknats i dess index." msgid "Falling back to patching base and 3-way merge..." msgstr "" @@ -2316,6 +2316,18 @@ msgstr "git archive: protokollfel" msgid "git archive: expected a flush" msgstr "git archive: förväntade en tömning (flush)" +msgid "git backfill [--min-batch-size=] [--[no-]sparse]" +msgstr "git backfill [--min-batch-size=] [--[no-]sparse]" + +msgid "problem loading sparse-checkout" +msgstr "problem med att läsa filen sparse-checkout" + +msgid "Minimum number of objects to request at a time" +msgstr "Minsta antal objekt att be om varje gång" + +msgid "Restrict the missing objects to the current sparse-checkout" +msgstr "Begränsa saknade objekt till befintlig ”sparse-checkout”" + msgid "" "git bisect start [--term-(new|bad)= --term-(old|good)=] [--no-" "checkout] [--first-parent] [ [...]] [--] [...]" @@ -2921,7 +2933,7 @@ msgid "delete branch (even if not merged)" msgstr "ta bort gren (även om inte helt sammanslagen)" msgid "move/rename a branch and its reflog" -msgstr "flytta/ta bort en gren och dess reflogg" +msgstr "flytta/ta bort en gren och dess referenslogg" msgid "move/rename a branch, even if target exists" msgstr "flytta/ta bort en gren, även om målet finns" @@ -2930,7 +2942,7 @@ msgid "do not output a newline after empty formatted refs" msgstr "skriv inte ut ett nyradstecken efter tomma formaterade referenser" msgid "copy a branch and its reflog" -msgstr "kopiera en gren och dess reflogg" +msgstr "kopiera en gren och dess referenslogg" msgid "copy a branch, even if target exists" msgstr "kopiera en gren, även om målet finns" @@ -2942,7 +2954,7 @@ msgid "show current branch name" msgstr "visa namn på aktuell gren" msgid "create the branch's reflog" -msgstr "skapa grenens reflogg" +msgstr "skapa grenens referenslogg" msgid "edit the description for the branch" msgstr "redigera beskrivning för grenen" @@ -3055,10 +3067,6 @@ msgstr "" msgid "git version:\n" msgstr "git version:\n" -#, c-format -msgid "uname() failed with error '%s' (%d)\n" -msgstr "uname() misslyckades med felet ”%s” (%d)\n" - msgid "compiler info: " msgstr "kompilatorinfo:" @@ -3095,7 +3103,7 @@ msgid "" "You can delete any lines you don't wish to share.\n" msgstr "" "Tack för att du skriver en buggraport för Git!\n" -"Om du svarar på följande frågor är det lättare för oss att första " +"Om du svarar på följande frågor är det lättare för oss att förstå " "problemet.\n" "Skriv gärna på engelska\n" "\n" @@ -3332,11 +3340,11 @@ msgid "blob|tree" msgstr "blob|träd" msgid "use a for (--textconv | --filters); Not with 'batch'" -msgstr "använd en för (--textconv | --filters): Inte med 'batch'" +msgstr "använd en för (--textconv | --filters): Inte med ”batch”" #, c-format msgid "'%s=<%s>' needs '%s' or '%s'" -msgstr "'%s=<%s>' behöver '%s' eller '%s'" +msgstr "”%s=<%s>” behöver ”%s” eller ”%s”" msgid "path|tree-ish" msgstr "sökväg|träd-igt" @@ -3368,13 +3376,13 @@ msgid "" "git check-attr [--source ] [-a | --all | ...] [--] " "..." msgstr "" -"git check-attr [--source ] [-a | --all | ...] [--] " +"git check-attr [--source ] [-a | --all | ...] [--] " "..." msgid "" "git check-attr --stdin [-z] [--source ] [-a | --all | ...]" msgstr "" -"git check-attr --stdin [-z] [--source ] [-a | --all | ...]" +"git check-attr --stdin [-z] [--source ] [-a | --all | ...]" msgid "report all attributes set on file" msgstr "visa alla attribut som satts på filen" @@ -3887,7 +3895,7 @@ msgid "create/reset and checkout a branch" msgstr "skapa/nollställ och checka ut en gren" msgid "create reflog for new branch" -msgstr "skapa reflogg för ny gren" +msgstr "skapa referenslogg för ny gren" msgid "second guess 'git checkout ' (default)" msgstr "förutspå ”git checkout ” (förval)" @@ -4062,8 +4070,91 @@ msgstr "ta endast bort ignorerade filer" msgid "clean.requireForce is true and -f not given: refusing to clean" msgstr "clean.requireForce är true och -f angavs inte: vägrar städa" -msgid "git clone [] [--] []" -msgstr "git clone [] [--] []" +#, c-format +msgid "info: Could not add alternate for '%s': %s\n" +msgstr "info: Kan inte skapa suppleant för ”%s”: %s\n" + +#, c-format +msgid "failed to stat '%s'" +msgstr "misslyckades ta status på ”%s”" + +#, c-format +msgid "%s exists and is not a directory" +msgstr "%s finns och är ingen katalog" + +#, c-format +msgid "'%s' is a symlink, refusing to clone with --local" +msgstr "”%s” är en symbolisk länk, vägrar klona med --local" + +#, c-format +msgid "failed to start iterator over '%s'" +msgstr "misslyckades starta iterator över ”%s”" + +#, c-format +msgid "symlink '%s' exists, refusing to clone with --local" +msgstr "symbolisk länk ”%s” finns redan, vägrar klona med --local" + +#, c-format +msgid "failed to unlink '%s'" +msgstr "misslyckades ta bort länken ”%s”" + +#, c-format +msgid "hardlink cannot be checked at '%s'" +msgstr "hård länk kan inte kontrolleras vid ”%s”" + +#, c-format +msgid "hardlink different from source at '%s'" +msgstr "hård länk skiljer sig från källan vid ”%s”" + +#, c-format +msgid "failed to create link '%s'" +msgstr "misslyckades skapa länken ”%s”" + +#, c-format +msgid "failed to copy file to '%s'" +msgstr "misslyckades kopiera filen till ”%s”" + +#, c-format +msgid "failed to iterate over '%s'" +msgstr "misslyckades iterera över ”%s”" + +#, c-format +msgid "done.\n" +msgstr "klart.\n" + +msgid "" +"Clone succeeded, but checkout failed.\n" +"You can inspect what was checked out with 'git status'\n" +"and retry with 'git restore --source=HEAD :/'\n" +msgstr "" +"Klonen lyckades, men utcheckningen misslyckades.\n" +"Du kan inspektera det som checkades ut med ”git status”\n" +"och försöka med ”git restore --source=HEAD :/”\n" + +msgid "remote did not send all necessary objects" +msgstr "fjärren sände inte alla nödvändiga objekt" + +#, c-format +msgid "unable to update %s" +msgstr "kan inte uppdatera %s" + +msgid "failed to initialize sparse-checkout" +msgstr "misslyckades initiera sparse-checkout" + +msgid "remote HEAD refers to nonexistent ref, unable to checkout" +msgstr "HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut" + +msgid "unable to checkout working tree" +msgstr "kan inte checka ut arbetskatalogen" + +msgid "unable to write parameters to config file" +msgstr "kan inte skriva parametrar till konfigurationsfilen" + +msgid "cannot repack to clean up" +msgstr "kan inte packa om för att städa upp" + +msgid "cannot unlink temporary alternates file" +msgstr "kunde inte ta bort temporär ”alternates”-fil" msgid "don't clone shallow repository" msgstr "klona inte grunt arkiv" @@ -4116,6 +4207,9 @@ msgstr "använd istället för ”origin” för att spåra uppströms" msgid "checkout instead of the remote's HEAD" msgstr "checka ut istället för fjärrens HEAD" +msgid "clone single revision and check out" +msgstr "klona ensam revision och checka ut" + msgid "path to git-upload-pack on the remote" msgstr "sökväg till git-upload-pack på fjärren" @@ -4137,8 +4231,8 @@ msgstr "fördjupa historik för grund klon, exkludera ref" msgid "clone only one branch, HEAD or --branch" msgstr "klona endast en gren, HEAD eller --branch" -msgid "don't clone any tags, and make later fetches not to follow them" -msgstr "klona inga taggar och gör att senare hämtningar inte följer dem" +msgid "clone tags, and make later fetches not to follow them" +msgstr "klona taggar och gör att senare hämtningar inte följer dem" msgid "any cloned submodules will be shallow" msgstr "klonade undermoduler kommer vara grunda" @@ -4179,95 +4273,8 @@ msgstr "uri" msgid "a URI for downloading bundles before fetching from origin remote" msgstr "en URI för att hämta buntar innan de hämtas från ursprungsfjärr" -#, c-format -msgid "info: Could not add alternate for '%s': %s\n" -msgstr "info: Kan inte skapa suppleant för ”%s”: %s\n" - -#, c-format -msgid "failed to stat '%s'" -msgstr "misslyckades ta status på ”%s”" - -#, c-format -msgid "%s exists and is not a directory" -msgstr "%s finns och är ingen katalog" - -#, c-format -msgid "'%s' is a symlink, refusing to clone with --local" -msgstr "”%s” är en symbolisk länk, vägrar klona med --local" - -#, c-format -msgid "failed to start iterator over '%s'" -msgstr "misslyckades starta iterator över ”%s”" - -#, c-format -msgid "symlink '%s' exists, refusing to clone with --local" -msgstr "symbolisk länk ”%s” finns redan, vägrar klona med --local" - -#, c-format -msgid "failed to unlink '%s'" -msgstr "misslyckades ta bort länken ”%s”" - -#, c-format -msgid "hardlink cannot be checked at '%s'" -msgstr "hård länk kan inte kontrolleras vid ”%s”" - -#, c-format -msgid "hardlink different from source at '%s'" -msgstr "hård länk skiljer sig från källan vid ”%s”" - -#, c-format -msgid "failed to create link '%s'" -msgstr "misslyckades skapa länken ”%s”" - -#, c-format -msgid "failed to copy file to '%s'" -msgstr "misslyckades kopiera filen till ”%s”" - -#, c-format -msgid "failed to iterate over '%s'" -msgstr "misslyckades iterera över ”%s”" - -#, c-format -msgid "done.\n" -msgstr "klart.\n" - -msgid "" -"Clone succeeded, but checkout failed.\n" -"You can inspect what was checked out with 'git status'\n" -"and retry with 'git restore --source=HEAD :/'\n" -msgstr "" -"Klonen lyckades, men utcheckningen misslyckades.\n" -"Du kan inspektera det som checkades ut med ”git status”\n" -"och försöka med ”git restore --source=HEAD :/”\n" - -#, c-format -msgid "Could not find remote branch %s to clone." -msgstr "Kunde inte hitta fjärrgrenen %s för att klona." - -msgid "remote did not send all necessary objects" -msgstr "fjärren sände inte alla nödvändiga objekt" - -#, c-format -msgid "unable to update %s" -msgstr "kan inte uppdatera %s" - -msgid "failed to initialize sparse-checkout" -msgstr "misslyckades initiera sparse-checkout" - -msgid "remote HEAD refers to nonexistent ref, unable to checkout" -msgstr "HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut" - -msgid "unable to checkout working tree" -msgstr "kan inte checka ut arbetskatalogen" - -msgid "unable to write parameters to config file" -msgstr "kan inte skriva parametrar till konfigurationsfilen" - -msgid "cannot repack to clean up" -msgstr "kan inte packa om för att städa upp" - -msgid "cannot unlink temporary alternates file" -msgstr "kunde inte ta bort temporär ”alternates”-fil" +msgid "git clone [] [--] []" +msgstr "git clone [] [--] []" msgid "Too many arguments." msgstr "För många argument." @@ -4367,6 +4374,10 @@ msgstr "fjärrtransport rapporterade fel" msgid "Remote branch %s not found in upstream %s" msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s" +#, c-format +msgid "Remote revision %s not found in upstream %s" +msgstr "Fjärr-revisionen %s hittades inte i uppströmsarkivet %s" + msgid "You appear to have cloned an empty repository." msgstr "Du verkar ha klonat ett tomt arkiv." @@ -4540,7 +4551,7 @@ msgid "git commit-tree: failed to read" msgstr "git commit-tree: misslyckades läsa" msgid "" -"git commit [-a | --interactive | --patch] [-s] [-v] [-u] [--amend]\n" +"git commit [-a | --interactive | --patch] [-s] [-v] [-u[]] [--amend]\n" " [--dry-run] [(-c | -C | --squash) | --fixup [(amend|" "reword):]]\n" " [-F | -m ] [--reset-author] [--allow-empty]\n" @@ -4550,7 +4561,7 @@ msgid "" " [(--trailer [(=|:)])...] [-S[]]\n" " [--] [...]" msgstr "" -"git commit [-a | --interactive | --patch] [-s] [-v] [-u] [--amend]\n" +"git commit [-a | --interactive | --patch] [-s] [-v] [-u[]] [--amend]\n" " [--dry-run] [(-c | -C | --squash) | --fixup [(amend|" "reword):]]\n" " [-F | -m ] [--reset-author] [--allow-empty]\n" @@ -4791,7 +4802,7 @@ msgstr "Ange meddelandet en av flaggorna -m eller -F.\n" #, c-format msgid "--author '%s' is not 'Name ' and matches no existing author" msgstr "" -"--author '%s' är inte 'Namn ' och motsvarar ingen befintlig författare" +"--author ”%s” är inte ”Namn ” och motsvarar ingen befintlig författare" #, c-format msgid "Invalid ignored mode '%s'" @@ -5202,7 +5213,7 @@ msgid "writing to stdin is not supported" msgstr "skriva till standard in stöds inte" msgid "writing config blobs is not supported" -msgstr "skriva konfigurations-blobbar stöds inte" +msgstr "skriva konfigurations-blob:ar stöds inte" #, c-format msgid "" @@ -5239,7 +5250,7 @@ msgid "" "section in \"git help worktree\" for details" msgstr "" "--worktree kan inte användas med flera arbetskataloger om inte\n" -"konfigurationsutöknignen worktreeConfig har aktiverats. Läsa stycket\n" +"konfigurationsutökningen worktreeConfig har aktiverats. Läsa stycket\n" "”KONFIGURATIONSFIL” i ”git help worktree” för detaljer" msgid "Other" @@ -5325,7 +5336,7 @@ msgid "editing stdin is not supported" msgstr "redigering av standard in stöds ej" msgid "editing blobs is not supported" -msgstr "redigering av blobbar stöds ej" +msgstr "redigering av blob:ar stöds ej" #, c-format msgid "cannot create configuration file %s" @@ -5601,7 +5612,7 @@ msgstr "objektet ”%s” som angavs är felaktigt." #, c-format msgid "more than two blobs given: '%s'" -msgstr "mer än två blobbar angavs: ”%s”" +msgstr "mer än två blob:ar angavs: ”%s”" #, c-format msgid "unhandled object '%s' given." @@ -5760,7 +5771,7 @@ msgid "reference parents which are not in fast-export stream by object id" msgstr "referera föräldrar som inte finns i fast-export-ström med objekt-id" msgid "show original object ids of blobs/commits" -msgstr "visa ursprungliga objekt-id för blobbar/incheckningar" +msgstr "visa ursprungliga objekt-id för blob:ar/incheckningar" msgid "label tags with mark ids" msgstr "märk taggar med märke-id" @@ -5931,14 +5942,14 @@ msgid "" "Run 'git remote set-head %s %s' to follow the change, or set\n" "'remote.%s.followRemoteHEAD' configuration option to a different value\n" "if you do not want to see this message. Specifically running\n" -"'git config set remote.%s.followRemoteHEAD %s' will disable the warning\n" -"until the remote changes HEAD to something else." +"'git config set remote.%s.followRemoteHEAD warn-if-not-branch-%s'\n" +"will disable the warning until the remote changes HEAD to something else." msgstr "" "Kör ”git remote set-head %s %s” för att följa ändringen, eller sätt\n" "konfigurationsflaggan ”remote %s.followRemoteHEAD” till ett annat värde\n" "om du inte vill se det här meddelandet. Du kan specifikt inaktivera\n" "varningen till fjärren ändrar HEAD till något annat genom att köra\n" -"”git config set remote %s.followRemoteHEAD %s”." +"”git config set remote %s.followRemoteHEAD warn-if-not-branch-%s”." msgid "multiple branches detected, incompatible with --set-upstream" msgstr "flera grenar upptäcktes, inkompatibelt med --set-upstream" @@ -6328,11 +6339,11 @@ msgstr "%s: objekt trasigt eller saknas" #, c-format msgid "%s: invalid reflog entry %s" -msgstr "%s: ogiltig reflog-post %s" +msgstr "%s: ogiltig referensloggpost %s" #, c-format msgid "Checking reflog %s->%s" -msgstr "Kontrollerar reflog %s→%s" +msgstr "Kontrollerar referenslogg %s→%s" #, c-format msgid "%s: invalid sha1 pointer %s" @@ -6441,7 +6452,7 @@ msgid "make index objects head nodes" msgstr "gör indexobjekt till huvudnoder" msgid "make reflogs head nodes (default)" -msgstr "gör refloggar till huvudnoder (standard)" +msgstr "gör referensloggar till huvudnoder (standard)" msgid "also consider packs and alternate objects" msgstr "ta även hänsyn till paket och supplerande objekt" @@ -6502,11 +6513,11 @@ msgstr "kunde inte skapa fsmonitor-kaka ”%s”" #, c-format msgid "fsmonitor: cookie_result '%d' != SEEN" -msgstr "fsmonitor: cookie_result '%d' != SEEN" +msgstr "fsmonitor: cookie_result ”%d” != SEEN" #, c-format msgid "could not start IPC thread pool on '%s'" -msgstr "kunde inte starta IPC-trådpol på ”%s”" +msgstr "kunde inte starta IPC-trådpool på ”%s”" msgid "could not start fsmonitor listener thread" msgstr "kunde inte starta fsmonitor-lyssnartråd" @@ -6618,6 +6629,9 @@ msgstr "tvinga gc-körning även om en annan gc kanske körs" msgid "repack all other packs except the largest pack" msgstr "packa om alla paket förutom det största paketet" +msgid "pack prefix to store a pack containing pruned objects" +msgstr "paketprefix att lagra ett paket som innehåller bortrensade objekt" + #, c-format msgid "failed to parse gc.logExpiry value %s" msgstr "misslyckades tolka värdet %s för gc.logExpiry" @@ -7176,7 +7190,7 @@ msgstr "flaggan ”%s” tar inte några argument som inte är flaggor" msgid "" "the '--no-[external-commands|aliases]' options can only be used with '--all'" msgstr "" -"flaggorna '--no-[external-commands|aliases]' kan endast användas med ”--all”" +"flaggorna ”--no-[external-commands|aliases]” kan endast användas med ”--all”" #, c-format msgid "usage: %s%s" @@ -7406,6 +7420,10 @@ msgstr "kunde inte avsluta pack-objects för att packa om lokala länkar" msgid "Cannot come back to cwd" msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)" +#, c-format +msgid "bad --pack_header: %s" +msgstr "felaktig --pack_header: %s" + #, c-format msgid "bad %s" msgstr "felaktig %s" @@ -7977,7 +7995,7 @@ msgid "suppress duplicate entries" msgstr "undertryck dublettposter" msgid "show sparse directories in the presence of a sparse index" -msgstr "visa glesa kataloger när et glest index existerar" +msgstr "visa glesa kataloger när ett glest index existerar" msgid "" "--format cannot be used with -s, -o, -k, -t, --resolve-undo, --deduplicate, " @@ -8261,10 +8279,6 @@ msgstr "okänd strategiflagga: -X%s" msgid "malformed input line: '%s'." msgstr "felaktig indatarad: ”%s”." -#, c-format -msgid "merging cannot continue; got unclean result of %d" -msgstr "sammanslagning kan inte fortsätta; fick inte rent resultat från %d" - msgid "git merge [] [...]" msgstr "git merge [] [...]" @@ -8969,7 +8983,7 @@ msgid "failed to remove 'git notes merge' worktree" msgstr "misslyckades ta bort arbetskatalogen för ”git notes merge”" msgid "failed to read ref NOTES_MERGE_PARTIAL" -msgstr "misslyckades läsa references NOTES_MERGE_PARTIAL" +msgstr "misslyckades läsa referensen NOTES_MERGE_PARTIAL" msgid "could not find commit from NOTES_MERGE_PARTIAL." msgstr "kunde inte hitta incheckning från NOTES_MERGE_PARTIAL." @@ -9080,6 +9094,13 @@ msgid "" msgstr "" "git pack-objects [] [< | < ]" +#, c-format +msgid "invalid --name-hash-version option: %d" +msgstr "ogiltig flagga för --name-hash-version: %d" + +msgid "currently, --write-bitmap-index requires --name-hash-version=1" +msgstr "--write-bitmap-index kräver för närvarande, --name-hash-version=1" + #, c-format msgid "" "write_reuse_object: could not locate %s, expected at offset % in " @@ -9190,14 +9211,14 @@ msgid "" "value of uploadpack.blobpackfileuri must be of the form ' ' (got '%s')" msgstr "" -"värdet på uploadpack.blobpackfileuri måste vara på formen ' " -" ' (fick '%s')" +"värdet på uploadpack.blobpackfileuri måste vara på formen ” " +" ” (fick ”%s”)" #, c-format msgid "" "object already configured in another uploadpack.blobpackfileuri (got '%s')" msgstr "" -"objektet redan konfigurerat i et annat uploadpack.blobpackfileuri (fick '%s)" +"objektet redan konfigurerat i ett annat uploadpack.blobpackfileuri (fick ”%s”" #, c-format msgid "could not get type of object %s in pack %s" @@ -9401,6 +9422,10 @@ msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" msgstr "" "uteslut redan konfigurerade uploadpack.blobpackfileuri med detta protokoll" +msgid "use the specified name-hash function to group similar objects" +msgstr "" +"använd den angivna namn-hash-funktionen för att gruppera liknande objekt" + #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "deltakedjedjupet %d är för djupt, påtvingar %d" @@ -10189,7 +10214,7 @@ msgstr "" "Ange vilken gren du vill ombasera mot.\n" "Se git-rebase(1) för detaljer.\n" "\n" -" git rebase ''\n" +" git rebase ””\n" "\n" #, c-format @@ -10603,7 +10628,8 @@ msgid "process the reflogs of all references" msgstr "hantera referensloggar för alla referenser" msgid "limits processing to reflogs from the current worktree only" -msgstr "begränsar hantering av referensloggar till endast aktuell arbetskatalog" +msgstr "" +"begränsar hantering av referensloggar till endast aktuell arbetskatalog" #, c-format msgid "Marking reachable objects..." @@ -10620,8 +10646,8 @@ msgstr "ingen referenslogg att ta bort angavs" msgid "invalid ref format: %s" msgstr "felaktigt referensformat: %s" -msgid "git refs migrate --ref-format= [--dry-run]" -msgstr "git refs migrate --ref-format= [--dry-run]" +msgid "git refs migrate --ref-format= [--no-reflog] [--dry-run]" +msgstr "git refs migrate --ref-format= [--no-reflog] [--dry-run]" msgid "git refs verify [--strict] [--verbose]" msgstr "git refs verify [--strict] [--verbose]" @@ -10632,6 +10658,9 @@ msgstr "ange referensformatet att konvertera till" msgid "perform a non-destructive dry-run" msgstr "utför ett icke-destruktiv testkörning" +msgid "drop reflogs entirely during the migration" +msgstr "kasta referensloggar helt under migreringen" + msgid "missing --ref-format=" msgstr "saknad --ref-format=" @@ -11091,8 +11120,14 @@ msgstr "Kommer inte ta bort alla icke-sänd-URL:er" msgid "be verbose; must be placed before a subcommand" msgstr "var pratsam; måste skrivas före ett underkommando" -msgid "git repack []" -msgstr "git repack []" +msgid "" +"git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" +"[--window=] [--depth=] [--threads=] [--keep-pack=]\n" +"[--write-midx] [--name-hash-version=]" +msgstr "" +"git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" +"[--window=] [--depth=] [--threads=] [--keep-pack=]\n" +"[--write-midx] [--name-hash-version=]" msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" @@ -11166,6 +11201,12 @@ msgstr "sänd --no-reuse-delta till git-pack-objects" msgid "pass --no-reuse-object to git-pack-objects" msgstr "sänd --no-reuse-object till git-pack-objects" +msgid "" +"specify the name hash version to use for grouping similar objects by path" +msgstr "" +"ange den namnhash-version som ska användas för att gruppera liknande objekt " +"efter sökväg" + msgid "do not run git-update-server-info" msgstr "kör inte git-update-server-info" @@ -11214,9 +11255,6 @@ msgstr "hitta ett geometrisk förlopp med faktor " msgid "write a multi-pack index of the resulting packs" msgstr "skriv ett flerpaketsindex för de skapade paketen" -msgid "pack prefix to store a pack containing pruned objects" -msgstr "paketprefix att lagra ett paket som innehåller bortrensade objekt" - msgid "pack prefix to store a pack containing filtered out objects" msgstr "paketprefix att lagra ett paket som innehåller utfiltrerade objekt" @@ -11433,9 +11471,6 @@ msgstr "endast ett mönster kan anges med -l" msgid "need some commits to replay" msgstr "behöver några incheckningar för omspelning" -msgid "--onto and --advance are incompatible" -msgstr "--onto och --advance kan inte kombineras" - msgid "all positive revisions given must be references" msgstr "alla positiva revisioner som anges måste vara referenser" @@ -12020,7 +12055,7 @@ msgid "[,]" msgstr "[,]" msgid "show most recent ref-log entries starting at base" -msgstr "visa nyaste refloggposter med början på bas" +msgstr "visa nyaste referensloggposter med början på bas" msgid "no branches given, and HEAD is not valid" msgstr "inga grenar angavs, och HEAD är inte giltigt" @@ -12134,7 +12169,7 @@ msgid "" "directory '%s' contains untracked files, but is not in the sparse-checkout " "cone" msgstr "" -"katalogen ”%s” innehåller ospårade filer, men är inte i området som ages i " +"katalogen ”%s” innehåller ospårade filer, men är inte i området som anges i " "”sparse-checkout”" #, c-format @@ -12726,7 +12761,7 @@ msgstr "misslyckades klona ”%s” till undermodulsökvägen ”%s”" #, c-format msgid "could not get submodule directory for '%s'" -msgstr "kunde inte få tag i undermodulkatalog för ”%s”" +msgstr "kunde inte få tag i undermodulskatalog för ”%s”" msgid "alternative anchor for relative paths" msgstr "alternativa ankare för relativa sökvägar" @@ -12830,8 +12865,8 @@ msgid "" "Fetched in submodule path '%s', but it did not contain %s. Direct fetching " "of that commit failed." msgstr "" -"Hämtade i undermodulssökvägen ”%s”, men den innehöll inte %s. Direkt " -"hämtning av incheckningen misslyckades." +"Hämtade i undermodulsökvägen ”%s”, men den innehöll inte %s. Direkt hämtning " +"av incheckningen misslyckades." #, c-format msgid "could not initialize submodule at path '%s'" @@ -13199,7 +13234,7 @@ msgid "replace the tag if exists" msgstr "ersätt taggen om den finns" msgid "create a reflog" -msgstr "skapa en reflog" +msgstr "skapa en referenslogg" msgid "Tag listing options" msgstr "Alternativ för listning av taggar" @@ -13924,7 +13959,7 @@ msgstr "okänd kapabilitet ”%s”" #, c-format msgid "'%s' does not look like a v2 or v3 bundle file" -msgstr "'%s' ser inte ut som en v2- eller v3-bunt-fil" +msgstr "”%s” ser inte ut som en v2- eller v3-bunt-fil" #, c-format msgid "unrecognized header: %s%s (%d)" @@ -14058,6 +14093,9 @@ msgstr "Importera ett GNU Arch-arkiv till Git" msgid "Create an archive of files from a named tree" msgstr "Skapa ett arkiv över filer från ett namngivet träd" +msgid "Download missing objects in a partial clone" +msgstr "Hämta saknade objekt i en delvis kloning" + msgid "Use binary search to find the commit that introduced a bug" msgstr "Använd binärsökning för att hitta ändringen som introducerade ett fel" @@ -14164,7 +14202,7 @@ msgid "Compare a tree to the working tree or index" msgstr "Jämför en träd med arbetskatalogen eller indexet" msgid "Compares the content and mode of blobs found via two tree objects" -msgstr "Visar innehåll och läge för blobbar som hittats via två trädobjekt" +msgstr "Visar innehåll och läge för blob:ar som hittats via två trädobjekt" msgid "Show changes using common diff tools" msgstr "Visa ändringar med vanliga diff-verktyg" @@ -14996,19 +15034,19 @@ msgstr "kunde inte läsa katalogändringar [GLE %ld]" #, c-format msgid "opendir('%s') failed" -msgstr "opendir('%s') misslyckades" +msgstr "opendir(”%s”) misslyckades" #, c-format msgid "lstat('%s') failed" -msgstr "lstat('%s') misslyckades" +msgstr "lstat(”%s”) misslyckades" #, c-format msgid "strbuf_readlink('%s') failed" -msgstr "strbuf_readlink('%s') misslyckades" +msgstr "strbuf_readlink(”%s”) misslyckades" #, c-format msgid "closedir('%s') failed" -msgstr "closedir('%s') misslyckades" +msgstr "closedir(”%s”) misslyckades" #, c-format msgid "[GLE %ld] unable to open for read '%ls'" @@ -15335,7 +15373,7 @@ msgstr "referensen ”%s” pekar inte på en blob" #, c-format msgid "unable to resolve config blob '%s'" -msgstr "kan inte slå upp konfigurerings-blobben ”%s”" +msgstr "kan inte slå upp konfigurerings-blob:en ”%s”" msgid "unable to parse command-line config" msgstr "kan inte tolka kommandoradskonfiguration" @@ -15968,6 +16006,12 @@ msgstr "ogiltigt argument för %s" msgid "invalid regex given to -I: '%s'" msgstr "ogiltigt reguljärt uttryck angavs för -I: ”%s”" +msgid "-G requires a non-empty argument" +msgstr "-G kräver ett icke-tomt argument" + +msgid "-S requires a non-empty argument" +msgstr "-S kräver ett icke-tomt argument" + #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "misslyckades tolka argument till flaggan --submodule: ”%s”" @@ -16080,7 +16124,7 @@ msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" msgstr "" -"skriv inte om sökvägsnamn och använd NUL-tecken som fältseparerare i --raw " +"skriv inte om sökvägsnamn och använd NUL-tecken som fältavdelare i --raw " "eller --numstat" msgid "" @@ -16495,7 +16539,7 @@ msgid "already have %s (%s)" msgstr "har redan %s (%s)" msgid "fetch-pack: unable to fork off sideband demultiplexer" -msgstr "fetch-patch: kan inte grena (fork) av sidbandsmultiplexare" +msgstr "fetch-patch: kan inte grena (fork) av sidbands-avmultiplexare" msgid "protocol error: bad pack header" msgstr "protokollfel: felaktigt packhuvud" @@ -16689,7 +16733,7 @@ msgstr "" "”git help -a” och ”git help -g” visar tillgängliga underkommandon och\n" "några konceptvägledningar. Se ”git help ” eller ”git help\n" "” för att läsa mer om specifika underkommandon och koncept.\n" -"See ”git help git” för en översikt över systemet." +"Se ”git help git” för en översikt över systemet." #, c-format msgid "unsupported command listing type '%s'" @@ -17020,7 +17064,7 @@ msgstr "inte ett git-arkiv" #, c-format msgid "argument to --packfile must be a valid hash (got '%s')" msgstr "" -"argumentet till --packfile måste vara ett giltigt hashvärde (fick '%s')" +"argumentet till --packfile måste vara ett giltigt hashvärde (fick ”%s”)" #, c-format msgid "negative value for http.postBuffer; defaulting to %d" @@ -17056,7 +17100,7 @@ msgid "" " asked for: %s\n" " redirect: %s" msgstr "" -"kan inte uppdatera urlbas från omdirigerin:\n" +"kan inte uppdatera urlbas från omdirigering:\n" " bad om: %s\n" " omdirigering: %s" @@ -17914,7 +17958,7 @@ msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "multi-pack-index innehåller 64-bitars offset, men off_t är för liten" msgid "multi-pack-index large offset out of bounds" -msgstr "stort offset för mult-pack-index utanför gränsen" +msgstr "stort offset för multi-pack-index utanför gränsen" msgid "multi-pack-index file exists, but failed to parse" msgstr "multi-pack-indexfilen finns, men kunde inte tolkas" @@ -17985,7 +18029,7 @@ msgstr "Kan inte checka in oinitierat/orefererat anteckningsträd" #, c-format msgid "Bad notes.rewriteMode value: '%s'" -msgstr "Felaktigt värde för notes.rewriteMode: '%s'" +msgstr "Felaktigt värde för notes.rewriteMode: ”%s”" #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" @@ -18134,6 +18178,10 @@ msgstr "filerna ”%s” och ”%s” har olika innehåll" msgid "unable to write file %s" msgstr "kan inte skriva filen %s" +#, c-format +msgid "unable to write repeatedly vanishing file %s" +msgstr "kan inte skriva till filen %s som hela tiden försvinner" + #, c-format msgid "unable to set permission to '%s'" msgstr "kan inte sätta behörigheten till ”%s”" @@ -18538,7 +18586,8 @@ msgstr "bitkarteresultat stämmer inte överens" #, c-format msgid "pseudo-merge index out of range (% >= %)" -msgstr "pseudosammanslagningsindex utanför intervallet (% ≥ %)" +msgstr "" +"pseudosammanslagningsindex utanför intervallet (% ≥ %)" #, c-format msgid "could not find '%s' in pack '%s' at offset %" @@ -18694,6 +18743,52 @@ msgstr "okänd flagga ”%c”" msgid "unknown non-ascii option in string: `%s'" msgstr "okänd icke-ascii-flagga i strängen: ”%s”" +#. TRANSLATORS: The "<%s>" part of this string +#. stands for an optional value given to a command +#. line option in the long form, and "<>" is there +#. as a convention to signal that it is a +#. placeholder (i.e. the user should substitute it +#. with the real value). If your language uses a +#. different convention, you can change "<%s>" part +#. to match yours, e.g. it might use "|%s|" instead, +#. or if the alphabet is different enough it may use +#. "%s" without any placeholder signal. Most +#. translations leave this message as is. +#. +#, c-format +msgid "[=<%s>]" +msgstr "[=<%s>]" + +#. TRANSLATORS: The "<%s>" part of this string +#. stands for an optional value given to a command +#. line option in the short form, and "<>" is there +#. as a convention to signal that it is a +#. placeholder (i.e. the user should substitute it +#. with the real value). If your language uses a +#. different convention, you can change "<%s>" part +#. to match yours, e.g. it might use "|%s|" instead, +#. or if the alphabet is different enough it may use +#. "%s" without any placeholder signal. Most +#. translations leave this message as is. +#. +#, c-format +msgid "[<%s>]" +msgstr "[<%s>]" + +#. TRANSLATORS: The "<%s>" part of this string stands for a +#. value given to a command line option, and "<>" is there +#. as a convention to signal that it is a placeholder +#. (i.e. the user should substitute it with the real value). +#. If your language uses a different convention, you can +#. change "<%s>" part to match yours, e.g. it might use +#. "|%s|" instead, or if the alphabet is different enough it +#. may use "%s" without any placeholder signal. Most +#. translations leave this message as is. +#. +#, c-format +msgid " <%s>" +msgstr " <%s>" + msgid "..." msgstr "..." @@ -18778,6 +18873,21 @@ msgstr "felaktigt booleskt miljövariabelvärde ”%s” för ”%s”" msgid "failed to parse %s" msgstr "misslyckades tolka %s" +#, c-format +msgid "failed to walk children of tree %s: not found" +msgstr "misslyckades traversera löven i trädet %s: hittades inte" + +#, c-format +msgid "failed to find object %s" +msgstr "misslyckades hitta objektet %s" + +#, c-format +msgid "failed to find tag %s" +msgstr "misslyckades hitta taggen %s" + +msgid "failed to setup revision walk" +msgstr "misslyckades starta revisionstraversering" + #, c-format msgid "Could not make %s writable by group" msgstr "Kunde inte göra %s skrivbar för gruppen" @@ -18923,6 +19033,22 @@ msgstr "kontraktsfjärr kan inte börja med ”/”: %s" msgid "could not fetch %s from promisor remote" msgstr "kunde inte hämta %s från kontraktsfjärr" +#, c-format +msgid "known remote named '%s' but with url '%s' instead of '%s'" +msgstr "känd fjärr som heter ”%s” med med url:en ”%s” istället för ”%s”" + +#, c-format +msgid "unknown '%s' value for '%s' config option" +msgstr "okänt värde ”%s” för inställningen ”%s”" + +#, c-format +msgid "unknown element '%s' from remote info" +msgstr "okänt värde ”%s” från fjärrinformation" + +#, c-format +msgid "accepted promisor remote '%s' not found" +msgstr "godkänd kontraktsfjärr ”%s” hittades inte" + msgid "object-info: expected flush after arguments" msgstr "object-info: förväntade ”flush” efter argument" @@ -19248,7 +19374,7 @@ msgstr "" " enrads, om inget incheckningsmeddelande angavs); använd\n" " -c för att skriva om meddelandet.\n" "u, update-ref = spåra en platshållare för att uppdatera\n" -" till denna position bland nya inchecknngar.\n" +" till denna position bland nya incheckningar.\n" " uppdateras i slutet av ombaseringen.\n" "\n" "Du kan byta ordning på raderna; de utförs uppifrån och ned.\n" @@ -19616,7 +19742,7 @@ msgid "refusing to update ref with bad name '%s'" msgstr "vägrar uppdatera referens med trasigt namn ”%s”" msgid "refusing to force and skip creation of reflog" -msgstr "vägrar att tvinga och hoppa över skapande av reflogg" +msgstr "vägrar att tvinga och hoppa över skapande av referenslogg" #, c-format msgid "update_ref failed for ref '%s': %s" @@ -19748,6 +19874,14 @@ msgstr "referensnamnet %s är en symbolisk referens, kopiering stöds inte" msgid "invalid refspec '%s'" msgstr "felaktig referensspecifikation: ”%s”" +#, c-format +msgid "pattern '%s' has no '*'" +msgstr "mönstret ”%s” innehåller ingen ”*”" + +#, c-format +msgid "replacement '%s' has no '*'" +msgstr "ersättningen ”%s” innehåller ingen ”*”" + #, c-format msgid "invalid quoting in push-option value: '%s'" msgstr "felaktig citering på värde för push-option: ”%s”" @@ -19866,6 +20000,28 @@ msgstr "remote-curl: försökte ta emot utan lokalt arkiv" msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl: okänt kommando ”%s” från git" +#, c-format +msgid "" +"reading remote from \"%s/%s\", which is nominated for removal.\n" +"\n" +"If you still use the \"remotes/\" directory it is recommended to\n" +"migrate to config-based remotes:\n" +"\n" +"\tgit remote rename %s %s\n" +"\n" +"If you cannot, please let us know why you still need to use it by\n" +"sending an e-mail to ." +msgstr "" +"läser fjärren från ”%s/%s”, som har nominerats för borttagning.\n" +"\n" +"Om du fortfarande använder ”remotes/”-katalogen rekommenderas du\n" +"migrera till konfigurationsbaserade fjärrar:\n" +"\n" +"\tgit remote rename %s %s\n" +"\n" +"Om du inte kan det, berätta för oss varför du fortfarande behöver\n" +"använda det på e-post till ." + #, c-format msgid "config remote shorthand cannot begin with '/': %s" msgstr "konfigurerad kortform för fjärr kan inte börja med ”/”: %s" @@ -19900,14 +20056,6 @@ msgstr "%s spårar vanligtvis %s, inte %s" msgid "%s tracks both %s and %s" msgstr "%s spårar både %s och %s" -#, c-format -msgid "key '%s' of pattern had no '*'" -msgstr "nyckeln ”%s” i mönstret innehåller ingen ”*”" - -#, c-format -msgid "value '%s' of pattern has no '*'" -msgstr "värdet ”%s” i mönstret innehåller ingen ”*”" - #, c-format msgid "src refspec %s does not match any" msgstr "käll-referensspecifikationen %s motsvarar ingen" @@ -21798,6 +21946,27 @@ msgstr "töm cacheträdet före varje iteration" msgid "number of entries in the cache tree to invalidate (default 0)" msgstr "antal poster i cacheträdet att ogiltigförklara (förval är 0)" +msgid "test-tool path-walk -- " +msgstr "test-tool path-walk -- " + +msgid "toggle inclusion of blob objects" +msgstr "växla om blob-objekt ska vara med eller inte" + +msgid "toggle inclusion of commit objects" +msgstr "växla om incheckningsobjekt ska vara med eller inte" + +msgid "toggle inclusion of tag objects" +msgstr "växla om taggobjekt ska vara med eller inte" + +msgid "toggle inclusion of tree objects" +msgstr "växla om trädobjekt ska vara med eller inte" + +msgid "toggle pruning of uninteresting paths" +msgstr "växla bortrensning av ointressanta sökvägar" + +msgid "read a pattern list over stdin" +msgstr "läs en mönsterlista från standard in" + #, c-format msgid "commit %s is not marked reachable" msgstr "incheckning %s är inte märkt nåbar" @@ -22431,6 +22600,10 @@ msgstr "fel: " msgid "warning: " msgstr "varning: " +#, c-format +msgid "uname() failed with error '%s' (%d)\n" +msgstr "uname() misslyckades med felet ”%s” (%d)\n" + msgid "Fetching objects" msgstr "Hämtar objekt" @@ -23265,7 +23438,7 @@ msgstr "Nödvändig SMTP-server har inte angivits korrekt." #, perl-format msgid "Server does not support STARTTLS! %s" -msgstr "Servern stöder inte SMARTTLS! %s" +msgstr "Servern stöder inte STARTTLS! %s" #, perl-format msgid "STARTTLS failed! %s" diff --git a/po/tr.po b/po/tr.po index 1bc43453aa7e21..4ed91cbd975c89 100644 --- a/po/tr.po +++ b/po/tr.po @@ -96,8 +96,8 @@ msgid "" msgstr "" "Project-Id-Version: Git Turkish Localization Project\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2024-12-23 18:57+0000\n" -"PO-Revision-Date: 2025-01-01 15:00+0300\n" +"POT-Creation-Date: 2025-03-11 15:01+0300\n" +"PO-Revision-Date: 2025-03-11 15:00+0300\n" "Last-Translator: Emir SARI \n" "Language-Team: Turkish (https://github.com/bitigchi/git-po/)\n" "Language: tr\n" @@ -2408,6 +2408,18 @@ msgstr "git archive: Protokol hatası" msgid "git archive: expected a flush" msgstr "git archive: Floş bekleniyordu" +msgid "git backfill [--min-batch-size=] [--[no-]sparse]" +msgstr "git backfill [--min-batch-size=] [--[no-]sparse]" + +msgid "problem loading sparse-checkout" +msgstr "aralıklı çıkış yüklenirken sorun" + +msgid "Minimum number of objects to request at a time" +msgstr "Bir kerede istenecek en çok nesne sayısı" + +msgid "Restrict the missing objects to the current sparse-checkout" +msgstr "Eksik nesneleri geçerli aralıklı çıkışa sınırla" + msgid "" "git bisect start [--term-(new|bad)= --term-(old|good)=] [--no-" "checkout] [--first-parent] [ [...]] [--] [...]" @@ -3149,10 +3161,6 @@ msgstr "" msgid "git version:\n" msgstr "git sürümü:\n" -#, c-format -msgid "uname() failed with error '%s' (%d)\n" -msgstr "uname() '%s' hatasını verip çıktı (%d)\n" - msgid "compiler info: " msgstr "derleyici bilgisi: " @@ -4158,8 +4166,91 @@ msgstr "" "clean.requireForce 'true' olarak ayarlı ve -f verilmedi; temizlik " "reddediliyor" -msgid "git clone [] [--] []" -msgstr "git clone [] [--] []" +#, c-format +msgid "info: Could not add alternate for '%s': %s\n" +msgstr "info: '%s' için alternatif eklenemedi: %s\n" + +#, c-format +msgid "failed to stat '%s'" +msgstr "'%s' dosyasının bilgileri alınamadı" + +#, c-format +msgid "%s exists and is not a directory" +msgstr "%s var ve bir dizin değil" + +#, c-format +msgid "'%s' is a symlink, refusing to clone with --local" +msgstr "'%s' bir sembolik bağ; --local ile klonlama reddediliyor" + +#, c-format +msgid "failed to start iterator over '%s'" +msgstr "yineleyici '%s' üzerinden çalıştırılamadı" + +#, c-format +msgid "symlink '%s' exists, refusing to clone with --local" +msgstr "'%s' sembolik bağı var, --local ile klonlama reddediliyor" + +#, c-format +msgid "failed to unlink '%s'" +msgstr "'%s' bağlantısı kesilemedi" + +#, c-format +msgid "hardlink cannot be checked at '%s'" +msgstr "sabit bağlantı, '%s' konumunda denetlenemiyor" + +#, c-format +msgid "hardlink different from source at '%s'" +msgstr "sabit bağlantı, '%s' konumundaki kaynaktan farklı" + +#, c-format +msgid "failed to create link '%s'" +msgstr "'%s' bağı oluşturulamadı" + +#, c-format +msgid "failed to copy file to '%s'" +msgstr "dosya şuraya kopyalanamadı: '%s'" + +#, c-format +msgid "failed to iterate over '%s'" +msgstr "'%s' üzerinde yinelenemedi" + +#, c-format +msgid "done.\n" +msgstr "bitti.\n" + +msgid "" +"Clone succeeded, but checkout failed.\n" +"You can inspect what was checked out with 'git status'\n" +"and retry with 'git restore --source=HEAD :/'\n" +msgstr "" +"Klonlama başarılı oldu; ancak çıkış yapılamadı.\n" +"Neyin çıkış yapılıp yapılmadığını 'git status' ile inceleyebilir\n" +"ve 'git restore --source=HEAD' ile yeniden deneyebilirsiniz.\n" + +msgid "remote did not send all necessary objects" +msgstr "uzak konum gereken tüm nesneleri göndermedi" + +#, c-format +msgid "unable to update %s" +msgstr "%s güncellenemiyor" + +msgid "failed to initialize sparse-checkout" +msgstr "sparse-checkout ilklendirilemedi" + +msgid "remote HEAD refers to nonexistent ref, unable to checkout" +msgstr "uzak konum HEAD'i, var olmayan başvuruya başvuruyor; çıkış yapılamıyor" + +msgid "unable to checkout working tree" +msgstr "çalışma ağacı çıkış yapılamıyor" + +msgid "unable to write parameters to config file" +msgstr "parametreler yapılandırma dosyasına yazılamıyor" + +msgid "cannot repack to clean up" +msgstr "temizlik için yeniden paketlenemiyor" + +msgid "cannot unlink temporary alternates file" +msgstr "geçici alternatifler dosyasının bağlantısı kesilemiyor" msgid "don't clone shallow repository" msgstr "sığ depoyu klonlama" @@ -4212,6 +4303,9 @@ msgstr "üstkaynağı izlemek için 'origin' yerine kullan" msgid "checkout instead of the remote's HEAD" msgstr "uzak konumun HEAD'i yerine 'ı çıkış yap" +msgid "clone single revision and check out" +msgstr "tek revizyonlu 'i klonla ve çıkış yap" + msgid "path to git-upload-pack on the remote" msgstr "uzak konumdaki git-upload-pack'e olan yol" @@ -4233,8 +4327,8 @@ msgstr "başvuru hariç tutarak sığ klonun geçmişini derinleştir" msgid "clone only one branch, HEAD or --branch" msgstr "yalnızca bir dal klonla, HEAD veya --branch" -msgid "don't clone any tags, and make later fetches not to follow them" -msgstr "etiket klonlama ve sonraki getirmeler de onları izlemesin" +msgid "clone tags, and make later fetches not to follow them" +msgstr "etiketleri klonla ve sonraki getirmelerin onları izlememesini sağla" msgid "any cloned submodules will be shallow" msgstr "klonlanan altmodüller sığ olacak" @@ -4277,95 +4371,8 @@ msgstr "uri" msgid "a URI for downloading bundles before fetching from origin remote" msgstr "uzak konum kökeninden getirmeden önce demetleri indirmek için bir URI" -#, c-format -msgid "info: Could not add alternate for '%s': %s\n" -msgstr "info: '%s' için alternatif eklenemedi: %s\n" - -#, c-format -msgid "failed to stat '%s'" -msgstr "'%s' dosyasının bilgileri alınamadı" - -#, c-format -msgid "%s exists and is not a directory" -msgstr "%s var ve bir dizin değil" - -#, c-format -msgid "'%s' is a symlink, refusing to clone with --local" -msgstr "'%s' bir sembolik bağ; --local ile klonlama reddediliyor" - -#, c-format -msgid "failed to start iterator over '%s'" -msgstr "yineleyici '%s' üzerinden çalıştırılamadı" - -#, c-format -msgid "symlink '%s' exists, refusing to clone with --local" -msgstr "'%s' sembolik bağı var, --local ile klonlama reddediliyor" - -#, c-format -msgid "failed to unlink '%s'" -msgstr "'%s' bağlantısı kesilemedi" - -#, c-format -msgid "hardlink cannot be checked at '%s'" -msgstr "sabit bağlantı, '%s' konumunda denetlenemiyor" - -#, c-format -msgid "hardlink different from source at '%s'" -msgstr "sabit bağlantı, '%s' konumundaki kaynaktan farklı" - -#, c-format -msgid "failed to create link '%s'" -msgstr "'%s' bağı oluşturulamadı" - -#, c-format -msgid "failed to copy file to '%s'" -msgstr "dosya şuraya kopyalanamadı: '%s'" - -#, c-format -msgid "failed to iterate over '%s'" -msgstr "'%s' üzerinde yinelenemedi" - -#, c-format -msgid "done.\n" -msgstr "bitti.\n" - -msgid "" -"Clone succeeded, but checkout failed.\n" -"You can inspect what was checked out with 'git status'\n" -"and retry with 'git restore --source=HEAD :/'\n" -msgstr "" -"Klonlama başarılı oldu; ancak çıkış yapılamadı.\n" -"Neyin çıkış yapılıp yapılmadığını 'git status' ile inceleyebilir\n" -"ve 'git restore --source=HEAD' ile yeniden deneyebilirsiniz.\n" - -#, c-format -msgid "Could not find remote branch %s to clone." -msgstr "Klonlanacak %s uzak dal bulunamadı." - -msgid "remote did not send all necessary objects" -msgstr "uzak konum gereken tüm nesneleri göndermedi" - -#, c-format -msgid "unable to update %s" -msgstr "%s güncellenemiyor" - -msgid "failed to initialize sparse-checkout" -msgstr "sparse-checkout ilklendirilemedi" - -msgid "remote HEAD refers to nonexistent ref, unable to checkout" -msgstr "uzak konum HEAD'i, var olmayan başvuruya başvuruyor; çıkış yapılamıyor" - -msgid "unable to checkout working tree" -msgstr "çalışma ağacı çıkış yapılamıyor" - -msgid "unable to write parameters to config file" -msgstr "parametreler yapılandırma dosyasına yazılamıyor" - -msgid "cannot repack to clean up" -msgstr "temizlik için yeniden paketlenemiyor" - -msgid "cannot unlink temporary alternates file" -msgstr "geçici alternatifler dosyasının bağlantısı kesilemiyor" +msgid "git clone [] [--] []" +msgstr "git clone [] [--] []" msgid "Too many arguments." msgstr "Çok fazla argüman." @@ -4465,6 +4472,10 @@ msgstr "uzak konum taşıması hata bildirdi" msgid "Remote branch %s not found in upstream %s" msgstr "%s uzak dalı %s üstkaynağında bulunamadı" +#, c-format +msgid "Remote revision %s not found in upstream %s" +msgstr "%s uzak revizyonu, %s üstkaynağında bulunamadı" + msgid "You appear to have cloned an empty repository." msgstr "Boş bir depoyu klonlamış görünüyorsunuz." @@ -4641,7 +4652,7 @@ msgid "git commit-tree: failed to read" msgstr "git commit-tree: okunamadı" msgid "" -"git commit [-a | --interactive | --patch] [-s] [-v] [-u] [--amend]\n" +"git commit [-a | --interactive | --patch] [-s] [-v] [-u[]] [--amend]\n" " [--dry-run] [(-c | -C | --squash) | --fixup [(amend|" "reword):]]\n" " [-F | -m ] [--reset-author] [--allow-empty]\n" @@ -4651,11 +4662,11 @@ msgid "" " [(--trailer [(=|:)])...] [-S[]]\n" " [--] [...]" msgstr "" -"git commit [-a | --interactive | --patch] [-s] [-v] [-u] [--amend]\n" -" [--dry-run] [(-c | -C | --squash) | --fixup\n" -" [(amend|reword):]] [-F | -m ] [--" -"reset-author] [--allow-empty]\n" -" [--allow-empty-message] [--no-verify] [-e] [--author=]\n" +"git commit [-a | --interactive | --patch] [-s] [-v] [-u[]] [--amend]\n" +" [--dry-run] [(-c | -C | --squash) |\n" +" --fixup [(amend|reword):]]\n" +" [-F | -m ] [--reset-author] [--allow-empty]\n" +" [--allow-empty-message] [--no-verify] [-e] [--author=]\n" " [--date=] [--cleanup=] [--[no-]status]\n" " [-i | -o] [--pathspec-from-file= [--pathspec-file-nul]]\n" " [(--trailer [(=|:)])...] [-S[]]\n" @@ -6044,15 +6055,15 @@ msgid "" "Run 'git remote set-head %s %s' to follow the change, or set\n" "'remote.%s.followRemoteHEAD' configuration option to a different value\n" "if you do not want to see this message. Specifically running\n" -"'git config set remote.%s.followRemoteHEAD %s' will disable the warning\n" -"until the remote changes HEAD to something else." +"'git config set remote.%s.followRemoteHEAD warn-if-not-branch-%s'\n" +"will disable the warning until the remote changes HEAD to something else." msgstr "" "Değişikliği izlemek için 'git remote set-head %s %s' yapın veya\n" "'remote.%s.followRemoteHEAD' yapılandırma seçeneğini başka bir\n" "değere ayarlayın (bu iletiyi görmek istemiyorsanız). Özellikle\n" -"'git config set remote.%s.followRemoteHEAD %s' komutunu çalıştırmak\n" -"uyarıyı HEAD'e veya başka bir şeye uzaktan değişiklik olana dek\n" -"devre dışı bırakır." +"'git config set remote.%s.followRemoteHEAD warn-if-not-branch-%s'\n" +"komutunu çalıştırmak, uyarıyı HEAD'e veya başka bir şeye uzaktan\n" +"değişiklik olana dek devre dışı bırakır." msgid "multiple branches detected, incompatible with --set-upstream" msgstr "birden çok dal algılandı, --set-upstream ile uyumsuz" @@ -6729,6 +6740,9 @@ msgstr "başka bir gc çalışıyor olsa bile zorla gc çalıştır" msgid "repack all other packs except the largest pack" msgstr "en büyük paket dışındaki diğer tüm paketleri yeniden paketle" +msgid "pack prefix to store a pack containing pruned objects" +msgstr "budanan nesneler içeren paketi depolamak için paket öneki" + #, c-format msgid "failed to parse gc.logExpiry value %s" msgstr "gc.logExpiry değeri %s ayrıştırılamadı" @@ -7525,6 +7539,10 @@ msgstr "yerel bağlantıları yeniden paketleme için pack-objects bitirilemedi" msgid "Cannot come back to cwd" msgstr "Geçerli çalışma dizinine geri gelinemiyor" +#, c-format +msgid "bad --pack_header: %s" +msgstr "hatalı --pack_header: %s" + #, c-format msgid "bad %s" msgstr "hatalı %s" @@ -8384,10 +8402,6 @@ msgstr "bilinmeyen strateji seçeneği: -X%s" msgid "malformed input line: '%s'." msgstr "hatalı oluşturulmuş girdi satırı: '%s'." -#, c-format -msgid "merging cannot continue; got unclean result of %d" -msgstr "birleştirme sürdürülemiyor; %d için temiz olmayan sonuçlar alındı" - msgid "git merge [] [...]" msgstr "git merge [] [...]" @@ -9201,6 +9215,13 @@ msgstr "" "git pack-objects [] [< | < ]" +#, c-format +msgid "invalid --name-hash-version option: %d" +msgstr "geçersiz --name-hash-version seçeneği: %d" + +msgid "currently, --write-bitmap-index requires --name-hash-version=1" +msgstr "şu anda --write-bitmap-index, --name-hash-version=1 gerektiriyor" + #, c-format msgid "" "write_reuse_object: could not locate %s, expected at offset % in " @@ -9526,6 +9547,9 @@ msgstr "" "bu protokol ile herhangi bir yapılandırılmış uploadpack.blobpackfileuri " "ögesini hariç tut" +msgid "use the specified name-hash function to group similar objects" +msgstr "benzer nesneleri gruplamak için belirtilen name-hash işlevini kullan" + #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "delta zincir derinliği %d çok derin, %d zorlanıyor" @@ -10756,8 +10780,8 @@ msgstr "silmek için bir başvuru günlüğü belirtilmedi" msgid "invalid ref format: %s" msgstr "geçersiz başvuru biçimi: %s" -msgid "git refs migrate --ref-format= [--dry-run]" -msgstr "git refs migrate --ref-format= [--dry-run]" +msgid "git refs migrate --ref-format= [--no-reflog] [--dry-run]" +msgstr "git refs migrate --ref-format= [--no-reflog] [--dry-run]" msgid "git refs verify [--strict] [--verbose]" msgstr "git refs verify [--strict] [--verbose]" @@ -10768,6 +10792,9 @@ msgstr "dönüştürülecek başvuru biçimini belirt" msgid "perform a non-destructive dry-run" msgstr "yıkıcı olmayan bir deneme gerçekleştir" +msgid "drop reflogs entirely during the migration" +msgstr "göç sırasında başvuru günlüklerini tümüyle bırak" + msgid "missing --ref-format=" msgstr "--ref-format= eksik" @@ -11234,8 +11261,14 @@ msgstr "Tüm itme olmayan URL'ler silinmeyecek" msgid "be verbose; must be placed before a subcommand" msgstr "ayrıntılı anlat; bir altkomuttan önce yerleştirilmelidir" -msgid "git repack []" -msgstr "git repack []" +msgid "" +"git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" +"[--window=] [--depth=] [--threads=] [--keep-pack=]\n" +"[--write-midx] [--name-hash-version=]" +msgstr "" +"git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" +"[--window=] [--depth=] [--threads=] [--keep-pack=]\n" +"[--write-midx] [--name-hash-version=]" msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" @@ -11309,6 +11342,11 @@ msgstr "'git-pack-objects'e --no-reuse-delta geçir" msgid "pass --no-reuse-object to git-pack-objects" msgstr "'git-pack-objects'e --no-reuse-object geçir" +msgid "" +"specify the name hash version to use for grouping similar objects by path" +msgstr "" +"benzer nesneleri yola göre gruplamada kullanılacak name-hash sürümünü belirt" + msgid "do not run git-update-server-info" msgstr "'git-update-server-info' çalıştırma" @@ -11357,9 +11395,6 @@ msgstr " faktörlü bir geometrik ilerleme bul" msgid "write a multi-pack index of the resulting packs" msgstr "ortaya çıkan paketlerin bir çoklu paket indeksini yaz" -msgid "pack prefix to store a pack containing pruned objects" -msgstr "budanan nesneler içeren paketi depolamak için paket öneki" - msgid "pack prefix to store a pack containing filtered out objects" msgstr "süzülen nesneler içeren paketi depolamak için paket öneki" @@ -11576,9 +11611,6 @@ msgstr "-l ile yalnızca bir dizgi verilebilir" msgid "need some commits to replay" msgstr "yeniden oynatmak için birkaç işleme gerekli" -msgid "--onto and --advance are incompatible" -msgstr "--onto ve --advance birbiriyle uyumsuz" - msgid "all positive revisions given must be references" msgstr "verilen tüm pozitif revizyonlar, başvuru olmalı" @@ -14200,6 +14232,9 @@ msgstr "Git'e bir GNU Arch deposu içe aktar" msgid "Create an archive of files from a named tree" msgstr "Ad verilmiş ağaçtan bir dosyalar arşivi oluştur" +msgid "Download missing objects in a partial clone" +msgstr "Eksik nesneleri kısımsal bir klonda indir" + msgid "Use binary search to find the commit that introduced a bug" msgstr "Hatalara neden olan işlemeyi bulmada ikili arama kullan" @@ -16111,6 +16146,12 @@ msgstr "%s için geçersiz argüman" msgid "invalid regex given to -I: '%s'" msgstr "-I'ya geçersiz düzenli ifade verildi: '%s'" +msgid "-G requires a non-empty argument" +msgstr "-G, boş olmayan bir argüman gerektiriyor" + +msgid "-S requires a non-empty argument" +msgstr "-S, boş olmayan bir argüman gerektiriyor" + #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "--submodule seçenek parametresi ayrıştırılamadı: '%s'" @@ -18289,6 +18330,10 @@ msgstr "'%s' ve '%s' dosyalarının içeriği farklı" msgid "unable to write file %s" msgstr "%s dosyası yazılamıyor" +#, c-format +msgid "unable to write repeatedly vanishing file %s" +msgstr "sürekli olarak kaybolan %s dosyası yazılamıyor" + #, c-format msgid "unable to set permission to '%s'" msgstr "'%s' ögesine izin ayarlanamıyor" @@ -18851,6 +18896,52 @@ msgstr "bilinmeyen anahtar '%c'" msgid "unknown non-ascii option in string: `%s'" msgstr "dizi içinde bilinmeyen ascii dışı seçenek: '%s'" +#. TRANSLATORS: The "<%s>" part of this string +#. stands for an optional value given to a command +#. line option in the long form, and "<>" is there +#. as a convention to signal that it is a +#. placeholder (i.e. the user should substitute it +#. with the real value). If your language uses a +#. different convention, you can change "<%s>" part +#. to match yours, e.g. it might use "|%s|" instead, +#. or if the alphabet is different enough it may use +#. "%s" without any placeholder signal. Most +#. translations leave this message as is. +#. +#, c-format +msgid "[=<%s>]" +msgstr "[=<%s>]" + +#. TRANSLATORS: The "<%s>" part of this string +#. stands for an optional value given to a command +#. line option in the short form, and "<>" is there +#. as a convention to signal that it is a +#. placeholder (i.e. the user should substitute it +#. with the real value). If your language uses a +#. different convention, you can change "<%s>" part +#. to match yours, e.g. it might use "|%s|" instead, +#. or if the alphabet is different enough it may use +#. "%s" without any placeholder signal. Most +#. translations leave this message as is. +#. +#, c-format +msgid "[<%s>]" +msgstr "[<%s>]" + +#. TRANSLATORS: The "<%s>" part of this string stands for a +#. value given to a command line option, and "<>" is there +#. as a convention to signal that it is a placeholder +#. (i.e. the user should substitute it with the real value). +#. If your language uses a different convention, you can +#. change "<%s>" part to match yours, e.g. it might use +#. "|%s|" instead, or if the alphabet is different enough it +#. may use "%s" without any placeholder signal. Most +#. translations leave this message as is. +#. +#, c-format +msgid " <%s>" +msgstr " <%s>" + msgid "..." msgstr "..." @@ -18936,6 +19027,21 @@ msgstr "hatalı Boole çevre değeri '%s', '%s' için" msgid "failed to parse %s" msgstr "%s ayrıştırılamadı" +#, c-format +msgid "failed to walk children of tree %s: not found" +msgstr "%s ağacının alt ögeleri yürütülemedi: bulunamadı" + +#, c-format +msgid "failed to find object %s" +msgstr "%s nesnesi bulunamadı" + +#, c-format +msgid "failed to find tag %s" +msgstr "%s etiketi bulunamadı" + +msgid "failed to setup revision walk" +msgstr "revizyon yürüyüşü ayarlanamadı" + #, c-format msgid "Could not make %s writable by group" msgstr "%s grup ile yazılabilir yapılamadı" @@ -19079,6 +19185,22 @@ msgstr "vaatçi uzak konum adı '/' ile başlayamaz: %s" msgid "could not fetch %s from promisor remote" msgstr "vaatçi uzak konumundan %s getirilemedi" +#, c-format +msgid "known remote named '%s' but with url '%s' instead of '%s'" +msgstr "bilinen uzak konum adı '%s'; ancak url'si '%s'; '%s' olmalı" + +#, c-format +msgid "unknown '%s' value for '%s' config option" +msgstr "'%s' yapılandırma seçeneği için bilinmeyen değer: '%s'" + +#, c-format +msgid "unknown element '%s' from remote info" +msgstr "uzak bilgiden bilinmeyen öge '%s'" + +#, c-format +msgid "accepted promisor remote '%s' not found" +msgstr "kabul edilmiş vaatçi uzak konum '%s' bulunamadı" + msgid "object-info: expected flush after arguments" msgstr "object-info: argümanlardan sonra floş bekleniyordu" @@ -19901,6 +20023,14 @@ msgstr "başvuru adı %s bir sembolik bağ, onu kopyalamak desteklenmiyor" msgid "invalid refspec '%s'" msgstr "geçersiz başvuru belirteci '%s'" +#, c-format +msgid "pattern '%s' has no '*'" +msgstr "'%s' dizgisinde '*' yok" + +#, c-format +msgid "replacement '%s' has no '*'" +msgstr "'%s' yedeğinde '*' 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'" @@ -20020,6 +20150,31 @@ msgstr "remote-curl: yerel bir depo olmadan getirme yapılmaya çalışıldı" msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl: git'ten bilinmeyen komut '%s'" +#, c-format +msgid "" +"reading remote from \"%s/%s\", which is nominated for removal.\n" +"\n" +"If you still use the \"remotes/\" directory it is recommended to\n" +"migrate to config-based remotes:\n" +"\n" +"\tgit remote rename %s %s\n" +"\n" +"If you cannot, please let us know why you still need to use it by\n" +"sending an e-mail to ." +msgstr "" +"Kaldırma için aday gösterilmiş \"%s/%s\" konumundan\n" +"uzak konum okunuyor.\n" +"\n" +"Eğer hâlâ \"remotes\" dizinini kullanıyorsanız\n" +"yapılandırma tabanlı uzak konumlara geçiş yapmanız\n" +"önerilir:\n" +"\n" +"\tgit remote rename %s %s\n" +"\n" +"Eğer geçiş yapamıyorsanız bunu neden kullandığınıza\n" +"dair bir iletiyi adresine\n" +"gönderin." + #, c-format msgid "config remote shorthand cannot begin with '/': %s" msgstr "uzak konum yapılandırma stenografisi '/' ile başlayamaz: %s" @@ -20054,14 +20209,6 @@ msgstr "%s genelde %s ögesini izler, %s değil" msgid "%s tracks both %s and %s" msgstr "%s hem %s hem %s ögelerini izler" -#, c-format -msgid "key '%s' of pattern had no '*'" -msgstr "dizginin '%s' anahtarında '*' yoktu" - -#, c-format -msgid "value '%s' of pattern has no '*'" -msgstr "dizginin '%s' değerinde '*' yok" - #, c-format msgid "src refspec %s does not match any" msgstr "kaynak başvuru belirteci %s başka hiçbir şeyle eşleşmiyor" @@ -21948,6 +22095,27 @@ msgstr "her bir yinelemeden önce önbellek ağacını temizle" msgid "number of entries in the cache tree to invalidate (default 0)" msgstr "önbellek ağacındaki geçersizleştirilecek girdi sayısı (öntanımlı 0)" +msgid "test-tool path-walk -- " +msgstr "test-tool path-walk -- " + +msgid "toggle inclusion of blob objects" +msgstr "ikili nesnelerin içerilmesini aç/kapat" + +msgid "toggle inclusion of commit objects" +msgstr "işleme nesnelerinin içerilmesini aç/kapat" + +msgid "toggle inclusion of tag objects" +msgstr "etiket nesnelerinin içerilmesini aç/kapat" + +msgid "toggle inclusion of tree objects" +msgstr "ağaç nesnelerinin içerilmesini aç/kapat" + +msgid "toggle pruning of uninteresting paths" +msgstr "ilgisiz yolların budanmasını aç/kapat" + +msgid "read a pattern list over stdin" +msgstr "stdin'den bir dizgi listesi oku" + #, c-format msgid "commit %s is not marked reachable" msgstr "%s işlemesi ulaşılabilir olarak imlenmedi" @@ -22575,6 +22743,10 @@ msgstr "hata: " msgid "warning: " msgstr "uyarı: " +#, c-format +msgid "uname() failed with error '%s' (%d)\n" +msgstr "uname() '%s' hatasını verip çıktı (%d)\n" + msgid "Fetching objects" msgstr "Nesneler getiriliyor" diff --git a/po/uk.po b/po/uk.po index 5f68f36c7db024..39c22289fa62d5 100644 --- a/po/uk.po +++ b/po/uk.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Git v2.46\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2025-01-04 19:26-0800\n" -"PO-Revision-Date: 2025-01-03 14:17-0800\n" +"POT-Creation-Date: 2025-03-09 15:40-0700\n" +"PO-Revision-Date: 2025-03-09 16:53-0700\n" "Last-Translator: Kateryna Golovanova \n" "Language-Team: Ukrainian \n" "Language: uk\n" @@ -1433,7 +1433,7 @@ msgid "write the archive to this file" msgstr "записати архів до цього файлу" msgid "read .gitattributes in working directory" -msgstr "прочитати .gitattributes робочої директорії" +msgstr "читати .gitattributes робочої директорії" msgid "report archived files on stderr" msgstr "звітувати про заархівовані файли в stderr" @@ -2357,6 +2357,18 @@ msgstr "git archive: помилка протоколу" msgid "git archive: expected a flush" msgstr "git archive: очікувалось flush" +msgid "git backfill [--min-batch-size=] [--[no-]sparse]" +msgstr "git backfill [--min-batch-size=<н>] [--[no-]sparse]" + +msgid "problem loading sparse-checkout" +msgstr "проблема із завантаженням розрідженого переходу" + +msgid "Minimum number of objects to request at a time" +msgstr "Мінімальна кількість обʼєктів для запиту за один раз" + +msgid "Restrict the missing objects to the current sparse-checkout" +msgstr "Обмежити відсутні обʼєкти поточним розрідженим переходом" + msgid "" "git bisect start [--term-(new|bad)= --term-(old|good)=] [--no-" "checkout] [--first-parent] [ [...]] [--] [...]" @@ -3117,15 +3129,11 @@ msgstr "" msgid "git version:\n" msgstr "версія git:\n" -#, c-format -msgid "uname() failed with error '%s' (%d)\n" -msgstr "uname() завершився невдало з помилкою \"%s\" (%d)\n" - msgid "compiler info: " msgstr "інформація щодо компілятора: " msgid "libc info: " -msgstr "информація щодо libc: " +msgstr "інформація щодо libc: " msgid "not run from a git repository - no hooks to show\n" msgstr "запущено не з git сховища - немає гачків для показу\n" @@ -3448,7 +3456,7 @@ msgid "use .gitattributes only from the index" msgstr "використовувати .gitattributes тільки з індексу" msgid "read file names from stdin" -msgstr "зчитувати назви файлів з stdin" +msgstr "читати назви файлів з stdin" msgid "terminate input and output records by a NUL character" msgstr "завершувати вхідні та вихідні записи символом NUL" @@ -3493,13 +3501,13 @@ msgid "also read contacts from stdin" msgstr "також читати контакти з stdin" msgid "read additional mailmap entries from file" -msgstr "зчитувати додаткові записи mailmap з файлу" +msgstr "читати додаткові записи mailmap з файлу" msgid "blob" msgstr "blob" msgid "read additional mailmap entries from blob" -msgstr "зчитувати додаткові записи mailmap з blob" +msgstr "читати додаткові записи mailmap з blob" msgid "no contacts specified" msgstr "контакти не вказані" @@ -3538,10 +3546,10 @@ msgid "update stat information in the index file" msgstr "оновити статистичну інформацію в індексному файлі" msgid "read list of paths from the standard input" -msgstr "зчитати список шляхів зі стандартного вводу" +msgstr "читати список шляхів зі стандартного вводу" msgid "write the content to temporary files" -msgstr "записати вміст у тимчасові файли" +msgstr "записати вміст до тимчасових файлів" msgid "copy out the files from named stage" msgstr "скопіювати файли з іменованої стадії" @@ -4146,11 +4154,94 @@ msgid "clean.requireForce is true and -f not given: refusing to clean" msgstr "" "clean.requireForce встановлено у true і -f не задано: відмовлено в прибиранні" -msgid "git clone [] [--] []" -msgstr "git clone [<опції>] [--] <сховище> [<директорія>]" +#, c-format +msgid "info: Could not add alternate for '%s': %s\n" +msgstr "інфо: Не вдалося додати запозичений обʼєкт для \"%s\": %s\n" + +#, c-format +msgid "failed to stat '%s'" +msgstr "не вдалося виконати stat \"%s\"" + +#, c-format +msgid "%s exists and is not a directory" +msgstr "%s існує і не є директорією" + +#, c-format +msgid "'%s' is a symlink, refusing to clone with --local" +msgstr "\"%s\" є символьним посиланням, відмовлено в клонуванні з --local" + +#, c-format +msgid "failed to start iterator over '%s'" +msgstr "не вдалося запустити ітератор для \"%s\"" + +#, c-format +msgid "symlink '%s' exists, refusing to clone with --local" +msgstr "символьне посилання \"%s\" існує, відмовлено в клонуванні з --local" + +#, c-format +msgid "failed to unlink '%s'" +msgstr "не вдалося видалити \"%s\"" + +#, c-format +msgid "hardlink cannot be checked at '%s'" +msgstr "неможливо перевірити жорстке посилання \"%s\"" + +#, c-format +msgid "hardlink different from source at '%s'" +msgstr "жорстке посилання відрізняється від джерела в \"%s\"" + +#, c-format +msgid "failed to create link '%s'" +msgstr "не вдалося створити посилання \"%s\"" + +#, c-format +msgid "failed to copy file to '%s'" +msgstr "не вдалося скопіювати файл у \"%s\"" + +#, c-format +msgid "failed to iterate over '%s'" +msgstr "не вдалося здійснити перебір для \"%s\"" + +#, c-format +msgid "done.\n" +msgstr "готово.\n" + +msgid "" +"Clone succeeded, but checkout failed.\n" +"You can inspect what was checked out with 'git status'\n" +"and retry with 'git restore --source=HEAD :/'\n" +msgstr "" +"Клонування пройшло успішно, але не вдалося перейти на гілку.\n" +"Ви можете перевірити, що було додано за допомогою 'git status'\n" +"і повторити спробу за допомогою \"git restore --source=HEAD :/\"\n" + +msgid "remote did not send all necessary objects" +msgstr "віддалене сховище не надіслало всі необхідні обʼєкти" + +#, c-format +msgid "unable to update %s" +msgstr "не вдалося оновити %s" + +msgid "failed to initialize sparse-checkout" +msgstr "не вдалося ініціалізувати розріджений перехід" + +msgid "remote HEAD refers to nonexistent ref, unable to checkout" +msgstr "віддалений HEAD вказує на неіснуюче посилання, неможливо перейти" + +msgid "unable to checkout working tree" +msgstr "не вдалося завантажити стан робочої директорії" + +msgid "unable to write parameters to config file" +msgstr "не вдалося записати параметри до конфігураційного файлу" + +msgid "cannot repack to clean up" +msgstr "неможливо перепакувати для очищення" + +msgid "cannot unlink temporary alternates file" +msgstr "неможливо видалити тимчасовий файл запозичених обʼєктів" msgid "don't clone shallow repository" -msgstr "не клонувати неглибоке сховище" +msgstr "не клонувати поверхневе сховище" msgid "don't create a checkout" msgstr "не переходити на гілку" @@ -4202,6 +4293,9 @@ msgstr "" msgid "checkout instead of the remote's HEAD" msgstr "перейти до <гілки> замість HEAD віддаленого сховища" +msgid "clone single revision and check out" +msgstr "клонувати одну ревізію і перейти на неї" + msgid "path to git-upload-pack on the remote" msgstr "шлях до git-upload-pack на віддаленому сервері" @@ -4223,9 +4317,8 @@ msgstr "поглибити історію неглибокого клону, з msgid "clone only one branch, HEAD or --branch" msgstr "клонувати лише одну гілку, HEAD або --branch" -msgid "don't clone any tags, and make later fetches not to follow them" -msgstr "" -"не клонувати жодних тегів і не слідувати за ними під час отримувань пізніше" +msgid "clone tags, and make later fetches not to follow them" +msgstr "клонувати теги і більше не слідкувати за ними" msgid "any cloned submodules will be shallow" msgstr "будь-які клоновані підмодулі будуть неглибокими" @@ -4269,95 +4362,8 @@ msgstr "uri" msgid "a URI for downloading bundles before fetching from origin remote" msgstr "URI для завантаження пакунків перед отриманням з віддаленого джерела" -#, c-format -msgid "info: Could not add alternate for '%s': %s\n" -msgstr "инфо: Не вдалося додати запозичений обʼєкт для \"%s\": %s\n" - -#, c-format -msgid "failed to stat '%s'" -msgstr "не вдалося виконати stat \"%s\"" - -#, c-format -msgid "%s exists and is not a directory" -msgstr "%s існує і не є директорією" - -#, c-format -msgid "'%s' is a symlink, refusing to clone with --local" -msgstr "\"%s\" є символьним посиланням, відмовлено в клонуванні з --local" - -#, c-format -msgid "failed to start iterator over '%s'" -msgstr "не вдалося запустити перебір для \"%s\"" - -#, c-format -msgid "symlink '%s' exists, refusing to clone with --local" -msgstr "символьне посилання \"%s\" існує, не можу клонувати з --local" - -#, c-format -msgid "failed to unlink '%s'" -msgstr "не вдалося видалити \"%s\"" - -#, c-format -msgid "hardlink cannot be checked at '%s'" -msgstr "неможливо перевірити жорстке посилання \"%s\"" - -#, c-format -msgid "hardlink different from source at '%s'" -msgstr "жорстке посилання відрізняється від джерела в \"%s\"" - -#, c-format -msgid "failed to create link '%s'" -msgstr "не вдалося створити посилання \"%s\"" - -#, c-format -msgid "failed to copy file to '%s'" -msgstr "не вдалося скопіювати файл у \"%s\"" - -#, c-format -msgid "failed to iterate over '%s'" -msgstr "не вдалося перебрати \"%s\"" - -#, c-format -msgid "done.\n" -msgstr "готово.\n" - -msgid "" -"Clone succeeded, but checkout failed.\n" -"You can inspect what was checked out with 'git status'\n" -"and retry with 'git restore --source=HEAD :/'\n" -msgstr "" -"Клонування пройшло успішно, але не вдалося перейти на гілку.\n" -"Ви можете перевірити, що було додано за допомогою 'git status'\n" -"і повторити спробу за допомогою 'git restore --source=HEAD :/'\n" - -#, c-format -msgid "Could not find remote branch %s to clone." -msgstr "Не вдалося знайти віддалену гілку %s для клонування." - -msgid "remote did not send all necessary objects" -msgstr "віддалене сховище не надіслало всі необхідні обʼєкти" - -#, c-format -msgid "unable to update %s" -msgstr "не вдалося оновити %s" - -msgid "failed to initialize sparse-checkout" -msgstr "не вдалося ініціалізувати розріджений перехід" - -msgid "remote HEAD refers to nonexistent ref, unable to checkout" -msgstr "віддалений HEAD посилається на неіснуючого рефа, неможливо перейти" - -msgid "unable to checkout working tree" -msgstr "не вдалося завантажити стан робочої директорії" - -msgid "unable to write parameters to config file" -msgstr "не вдалося записати параметри до конфігураційного файлу" - -msgid "cannot repack to clean up" -msgstr "неможливо перепакувати, щоб очистити" - -msgid "cannot unlink temporary alternates file" -msgstr "неможливо видалити тимчасовий файл запозичених обʼєктів" +msgid "git clone [] [--] []" +msgstr "git clone [<опції>] [--] <сховище> [<директорія>]" msgid "Too many arguments." msgstr "Забагато аргументів." @@ -4463,6 +4469,10 @@ msgstr "операція віддаленого отримання повідо msgid "Remote branch %s not found in upstream %s" msgstr "Віддалену гілку %s не знайдено у першоджерельному сховищі %s" +#, c-format +msgid "Remote revision %s not found in upstream %s" +msgstr "Віддалена ревізія %s не знайдена у першоджерельному сховищі %s" + msgid "You appear to have cloned an empty repository." msgstr "Здається, ви клонували порожнє сховище." @@ -4639,7 +4649,7 @@ msgid "git commit-tree: failed to read" msgstr "git commit-tree: не вдалося прочитати" msgid "" -"git commit [-a | --interactive | --patch] [-s] [-v] [-u] [--amend]\n" +"git commit [-a | --interactive | --patch] [-s] [-v] [-u[]] [--amend]\n" " [--dry-run] [(-c | -C | --squash) | --fixup [(amend|" "reword):]]\n" " [-F | -m ] [--reset-author] [--allow-empty]\n" @@ -4649,7 +4659,7 @@ msgid "" " [(--trailer [(=|:)])...] [-S[]]\n" " [--] [...]" msgstr "" -"git commit [-a | --interactive | --patch] [-s] [-v] [-u<режим>] [--amend]\n" +"git commit [-a | --interactive | --patch] [-s] [-v] [-u[<режим>]] [--amend]\n" " [--dry-run] [(-c | -C | --squash) <коміт> | --fixup [(amend|" "reword):]<коміт>]\n" " [-F <файл> | -m <допис>] [--reset-author] [--allow-empty]\n" @@ -5214,7 +5224,7 @@ msgid "blob-id" msgstr "blob-id" msgid "read config from given blob object" -msgstr "прочитати конфігурацію з наданого blob-обʼєкту" +msgstr "читати конфігурацію з наданого blob-обʼєкту" msgid "Type" msgstr "Тип" @@ -6050,15 +6060,15 @@ msgid "" "Run 'git remote set-head %s %s' to follow the change, or set\n" "'remote.%s.followRemoteHEAD' configuration option to a different value\n" "if you do not want to see this message. Specifically running\n" -"'git config set remote.%s.followRemoteHEAD %s' will disable the warning\n" -"until the remote changes HEAD to something else." +"'git config set remote.%s.followRemoteHEAD warn-if-not-branch-%s'\n" +"will disable the warning until the remote changes HEAD to something else." msgstr "" "Запустіть \"git remote set-head %s %s\", щоб відстежити зміни, або " "встановіть\n" "\"remote.%s.followRemoteHEAD\" параметр конфігурації на інше значення\n" -"якщо ви не хочете бачити це повідомлення. Зокрема, виконання команди\n" -"\"git config set remote.%s.followRemoteHEAD %s\" вимкне попередження\n" -"доки віддалений сервер не змінить HEAD на щось інше." +"якщо ви не хочете бачити це повідомлення. Зокрема, виконання\n" +"\"git config set remote.%s.followRemoteHEAD warn-if-not-branch-%s\"\n" +"вимкне попередження, доки віддалене призначення не змінить HEAD на щось інше." msgid "multiple branches detected, incompatible with --set-upstream" msgstr "виявлено кілька гілок, несумісних з --set-upstream" @@ -6740,6 +6750,9 @@ msgstr "примусово запускати збирач сміття, нав msgid "repack all other packs except the largest pack" msgstr "перепакувати всі пакунки, крім найбільшого" +msgid "pack prefix to store a pack containing pruned objects" +msgstr "префікс для зберігання пакунка з обрізаними обʼєктами" + #, c-format msgid "failed to parse gc.logExpiry value %s" msgstr "не вдалося розібрати gc.logExpiry значення %s" @@ -7120,7 +7133,7 @@ msgid "show the surrounding function" msgstr "показати навколишню функцію" msgid "read patterns from file" -msgstr "зчитувати шаблони з файлу" +msgstr "читати шаблони з файлу" msgid "match " msgstr "зіставляти <шаблон>" @@ -7196,7 +7209,7 @@ msgid "write the object into the object database" msgstr "записати об’єкт до бази даних об’єктів" msgid "read the object from stdin" -msgstr "прочитати об’єкт з stdin" +msgstr "читати об’єкт з stdin" msgid "store file as is without filters" msgstr "зберегти файл як є без фільтрів" @@ -7547,6 +7560,10 @@ msgstr "не вдалося завершити pack-objects для перепа msgid "Cannot come back to cwd" msgstr "Неможливо повернутися до поточної робочої директорії" +#, c-format +msgid "bad --pack_header: %s" +msgstr "невірний --pack_header: %s" + #, c-format msgid "bad %s" msgstr "невірний %s" @@ -8420,10 +8437,6 @@ msgstr "невідомий варіант стратегії: -X%s" msgid "malformed input line: '%s'." msgstr "невірно сформований рядок вводу: \"%s\"." -#, c-format -msgid "merging cannot continue; got unclean result of %d" -msgstr "неможливо продовжити злиття; отримано брудний результат для %d" - msgid "git merge [] [...]" msgstr "git merge [<опції>] [<коміт>...]" @@ -9094,7 +9107,7 @@ msgid "Removing note for object %s\n" msgstr "Видалення нотатки для обʼєкта %s\n" msgid "read objects from stdin" -msgstr "зчитати обʼєкти з stdin" +msgstr "читати обʼєкти з stdin" msgid "load rewriting config for (implies --stdin)" msgstr "" @@ -9216,7 +9229,7 @@ msgid "attempt to remove non-existent note is not an error" msgstr "спроба видалити неіснуючу нотатку не є помилкою" msgid "read object names from the standard input" -msgstr "зчитати імена обʼєктів зі стандартного вводу" +msgstr "читати імена обʼєктів зі стандартного вводу" msgid "do not remove, show only" msgstr "не видаляти, тільки показувати" @@ -9245,6 +9258,13 @@ msgstr "" "git pack-objects [<опції>] <базова-назва> [< <список-посилань> | < <список-" "обʼєктів>]" +#, c-format +msgid "invalid --name-hash-version option: %d" +msgstr "неприпустима --name-hash-version опція: %d" + +msgid "currently, --write-bitmap-index requires --name-hash-version=1" +msgstr "наразі --write-bitmap-index потребує --name-hash-version=1" + #, c-format msgid "" "write_reuse_object: could not locate %s, expected at offset % in " @@ -9481,7 +9501,7 @@ msgid "do not create an empty pack output" msgstr "не створювати вивід порожнього пакунка" msgid "read revision arguments from standard input" -msgstr "зчитувати аргументи ревізії зі стандартного вводу" +msgstr "читати аргументи ревізії зі стандартного вводу" msgid "limit the objects to those that are not yet packed" msgstr "обмежувати обʼєкти тільки тими, які ще не запаковані" @@ -9570,6 +9590,10 @@ msgstr "протокол" msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" msgstr "вилучити всі налаштовані uploadpack.blobpackfileuri з цим протоколом" +msgid "use the specified name-hash function to group similar objects" +msgstr "" +"використовувати вказану name-hash функцію для групування схожих обʼєктів" + #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "глибина дельта ланцюжка %d занадто глибока, примусове %d" @@ -10826,8 +10850,8 @@ msgstr "не вказано журнал посилань для видален msgid "invalid ref format: %s" msgstr "неприпустимий формат посилання: %s" -msgid "git refs migrate --ref-format= [--dry-run]" -msgstr "git refs migrate --ref-format=<формат> [--dry-run]" +msgid "git refs migrate --ref-format= [--no-reflog] [--dry-run]" +msgstr "git refs migrate --ref-format=<формат> [--no-reflog] [--dry-run]" msgid "git refs verify [--strict] [--verbose]" msgstr "git refs verify [--strict] [--verbose]" @@ -10838,6 +10862,9 @@ msgstr "вкажіть формат посилання, в який потріб msgid "perform a non-destructive dry-run" msgstr "виконати неруйнівний пробний запуск" +msgid "drop reflogs entirely during the migration" +msgstr "повністю видалити журнал посилань під час міграції" + msgid "missing --ref-format=" msgstr "відсутній --ref-format=<формат>" @@ -11312,8 +11339,14 @@ msgstr "Не видалятиме всі URL-адреси, що не є приз msgid "be verbose; must be placed before a subcommand" msgstr "розгорнутий вивід; має стояти перед підкомандою" -msgid "git repack []" -msgstr "git repack [<опції>]" +msgid "" +"git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" +"[--window=] [--depth=] [--threads=] [--keep-pack=]\n" +"[--write-midx] [--name-hash-version=]" +msgstr "" +"git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" +"[--window=<н>] [--depth=<н>] [--threads=<н>] [--keep-pack=<назва-пакунка>]\n" +"[--write-midx] [--name-hash-version=<н>]" msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" @@ -11388,6 +11421,10 @@ msgstr "передати --no-reuse-delta до git-pack-objects" msgid "pass --no-reuse-object to git-pack-objects" msgstr "передати --no-reuse-object до git-pack-objects" +msgid "" +"specify the name hash version to use for grouping similar objects by path" +msgstr "вказати версію назви хешу для групування схожих обʼєктів за шляхом" + msgid "do not run git-update-server-info" msgstr "не запускати git-update-server-info" @@ -11437,9 +11474,6 @@ msgstr "знайти геометричну прогресію з факторо msgid "write a multi-pack index of the resulting packs" msgstr "записати multi-pack-index результуючих пакунків" -msgid "pack prefix to store a pack containing pruned objects" -msgstr "префікс для зберігання пакунка з обрізаними обʼєктами" - msgid "pack prefix to store a pack containing filtered out objects" msgstr "префікс для зберігання пакунка з відфільтрованими обʼєктами" @@ -11656,9 +11690,6 @@ msgstr "тільки один шаблон може бути заданий з - msgid "need some commits to replay" msgstr "потрібні деякі коміти для відтворення" -msgid "--onto and --advance are incompatible" -msgstr "--onto та --advance несумісні" - msgid "all positive revisions given must be references" msgstr "всі надані позитивні ревізії мають бути посиланнями" @@ -12135,7 +12166,7 @@ msgid "use stateless RPC protocol" msgstr "використовувати протокол RPC без збереження стану" msgid "read refs from stdin" -msgstr "прочитати посилання з stdin" +msgstr "читати посилання з stdin" msgid "print status from remote helper" msgstr "вивести статус з віддаленого помічника" @@ -13623,7 +13654,7 @@ msgid "with --stdin: input lines are terminated by null bytes" msgstr "з --stdin: вхідні рядки завершуються нульовими байтами" msgid "read list of paths to be updated from standard input" -msgstr "прочитати список шляхів для оновлення зі стандартного вводу" +msgstr "читати список шляхів для оновлення зі стандартного вводу" msgid "add entries from standard input to the index" msgstr "додати записи зі стандартного вводу до індексу" @@ -14335,8 +14366,11 @@ msgstr "Імпортувати GNU Arch сховище до Git" msgid "Create an archive of files from a named tree" msgstr "Створити архів файлів з названого дерева" +msgid "Download missing objects in a partial clone" +msgstr "Завантажити відсутні обʼєкти у частковому клонуванні" + msgid "Use binary search to find the commit that introduced a bug" -msgstr "Використати бінарний пошук, щоб знайти коміт, який вніс помилку" +msgstr "Використати бінарний пошук, щоб знайти коміт, який ввів помилку" msgid "Show what revision and author last modified each line of a file" msgstr "Показати, яка ревізія та автор востаннє змінювали кожен рядок файлу" @@ -15728,7 +15762,7 @@ msgstr "помилка протоколу: неочікувані здібнос #, c-format msgid "protocol error: expected shallow sha-1, got '%s'" -msgstr "помилка протоколу: очікувалось неглибоке sha-1, отримано \"%s\"" +msgstr "помилка протоколу: очікувалось поверхневе sha-1, отримано \"%s\"" msgid "repository on the other end cannot be shallow" msgstr "сховище на іншому кінці не може бути неглибоким" @@ -16256,6 +16290,12 @@ msgstr "неприпустимий аргумент до %s" msgid "invalid regex given to -I: '%s'" msgstr "неприпустимий regex, переданий до -I: \"%s\"" +msgid "-G requires a non-empty argument" +msgstr "-G потребує непорожнього аргументу" + +msgid "-S requires a non-empty argument" +msgstr "-S потребує непорожнього аргументу" + #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "не вдалося розібрати параметр опції --submodule: \"%s\"" @@ -17247,7 +17287,7 @@ msgstr "" #, c-format msgid "git: '%s' is not a git command. See 'git --help'." -msgstr "git: \"%s\" не є командою git. Дивітья git --help." +msgstr "git: \"%s\" не є командою git. Дивіться git --help." msgid "Uh oh. Your system reports no Git commands at all." msgstr "Ой-ой. Ваша система повідомляє про повну відсутність Git команд." @@ -18447,6 +18487,10 @@ msgstr "файли \"%s\" та \"%s\" відрізняються за вміст msgid "unable to write file %s" msgstr "не вдалося записати файл %s" +#, c-format +msgid "unable to write repeatedly vanishing file %s" +msgstr "не вдалося записати файл %s, який постійно зникає" + #, c-format msgid "unable to set permission to '%s'" msgstr "не вдалося встановити дозволи для \"%s\"" @@ -19020,6 +19064,52 @@ msgstr "невідомий перемикач \"%c\"" msgid "unknown non-ascii option in string: `%s'" msgstr "невідомий non-ascii параметр у рядку: \"%s\"" +#. TRANSLATORS: The "<%s>" part of this string +#. stands for an optional value given to a command +#. line option in the long form, and "<>" is there +#. as a convention to signal that it is a +#. placeholder (i.e. the user should substitute it +#. with the real value). If your language uses a +#. different convention, you can change "<%s>" part +#. to match yours, e.g. it might use "|%s|" instead, +#. or if the alphabet is different enough it may use +#. "%s" without any placeholder signal. Most +#. translations leave this message as is. +#. +#, c-format +msgid "[=<%s>]" +msgstr "[=<%s>]" + +#. TRANSLATORS: The "<%s>" part of this string +#. stands for an optional value given to a command +#. line option in the short form, and "<>" is there +#. as a convention to signal that it is a +#. placeholder (i.e. the user should substitute it +#. with the real value). If your language uses a +#. different convention, you can change "<%s>" part +#. to match yours, e.g. it might use "|%s|" instead, +#. or if the alphabet is different enough it may use +#. "%s" without any placeholder signal. Most +#. translations leave this message as is. +#. +#, c-format +msgid "[<%s>]" +msgstr "[<%s>]" + +#. TRANSLATORS: The "<%s>" part of this string stands for a +#. value given to a command line option, and "<>" is there +#. as a convention to signal that it is a placeholder +#. (i.e. the user should substitute it with the real value). +#. If your language uses a different convention, you can +#. change "<%s>" part to match yours, e.g. it might use +#. "|%s|" instead, or if the alphabet is different enough it +#. may use "%s" without any placeholder signal. Most +#. translations leave this message as is. +#. +#, c-format +msgid " <%s>" +msgstr " <%s>" + msgid "..." msgstr "..." @@ -19106,6 +19196,21 @@ msgstr "невірне булеве значення оточення \"%s\" д msgid "failed to parse %s" msgstr "не вдалося розібрати %s" +#, c-format +msgid "failed to walk children of tree %s: not found" +msgstr "не вдалося пройти дочірні елементи дерева %s: не знайдено" + +#, c-format +msgid "failed to find object %s" +msgstr "не вдалося знайти обʼєкт %s" + +#, c-format +msgid "failed to find tag %s" +msgstr "не вдалося знайти тег %s" + +msgid "failed to setup revision walk" +msgstr "не вдалося налаштувати проходження по ревізіям" + #, c-format msgid "Could not make %s writable by group" msgstr "Не вдалося зробити %s доступним для запису групою" @@ -19255,6 +19360,22 @@ msgstr "назва віддаленого promisor не може починат msgid "could not fetch %s from promisor remote" msgstr "не вдалося отримати %s з віддаленого promisor" +#, c-format +msgid "known remote named '%s' but with url '%s' instead of '%s'" +msgstr "відоме віддалене сховище з імʼям \"%s\" має URL \"%s\" замість \"%s\"" + +#, c-format +msgid "unknown '%s' value for '%s' config option" +msgstr "невідоме значення \"%s\" для параметра конфігурації \"%s\"" + +#, c-format +msgid "unknown element '%s' from remote info" +msgstr "невідомий елемент \"%s\" з віддаленої інформації" + +#, c-format +msgid "accepted promisor remote '%s' not found" +msgstr "прийнятий віддалений promisor \"%s\" не знайдено" + msgid "object-info: expected flush after arguments" msgstr "object-info: очікувався flush після аргументів" @@ -20083,6 +20204,14 @@ msgstr "" msgid "invalid refspec '%s'" msgstr "неприпустимий визначник посилання \"%s\"" +#, c-format +msgid "pattern '%s' has no '*'" +msgstr "шаблон \"%s\" не має \"*\"" + +#, c-format +msgid "replacement '%s' has no '*'" +msgstr "заміна \"%s\" не має \"*\"" + #, c-format msgid "invalid quoting in push-option value: '%s'" msgstr "неприпустимі лапки у значенні push-опції: \"%s\"" @@ -20132,7 +20261,7 @@ msgstr "віддалений сервер надіслав неочікуван msgid "unable to rewind rpc post data - try increasing http.postBuffer" msgstr "" -"не вдалося перемотати вперед rpc post дані - спробуйте збільшити " +"не вдалося перемотати вперед rpc post дані - спробуйте збільшити " "http.postBuffer" #, c-format @@ -20206,9 +20335,32 @@ msgstr "remote-curl: спроба отримання без локального msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl: невідома команда \"%s\" з git" +#, c-format +msgid "" +"reading remote from \"%s/%s\", which is nominated for removal.\n" +"\n" +"If you still use the \"remotes/\" directory it is recommended to\n" +"migrate to config-based remotes:\n" +"\n" +"\tgit remote rename %s %s\n" +"\n" +"If you cannot, please let us know why you still need to use it by\n" +"sending an e-mail to ." +msgstr "" +"читання віддаленого призначення з \"%s/%s\", який номіновано на вилучення.\n" +"\n" +"Якщо ви все ще використовуєте директорію \"remotes/\", рекомендується\n" +"перейти віддалені призначення на основі конфігурації:\n" +"\n" +"\tgit remote rename %s %s\n" +"\n" +"Якщо ви не можете цього зробити, будь ласка, дайте нам знати, чому ви все ще " +"використовуєте її\n" +"надіславши листа на адресу ." + #, c-format msgid "config remote shorthand cannot begin with '/': %s" -msgstr "скорочення віддаленої конфігураціі не може починатися з \"/\": %s" +msgstr "скорочене ім'я віддаленої конфігураціі не може починатися з \"/\": %s" msgid "more than one receivepack given, using the first" msgstr "надано більше одного пакунка для отримання, використано перший" @@ -20240,14 +20392,6 @@ msgstr "%s зазвичай відстежує %s, а не %s" msgid "%s tracks both %s and %s" msgstr "%s відстежує як %s, так і %s" -#, c-format -msgid "key '%s' of pattern had no '*'" -msgstr "ключ \"%s\" шаблону не містив '*'" - -#, c-format -msgid "value '%s' of pattern has no '*'" -msgstr "значення \"%s\" шаблону не містить '*'" - #, c-format msgid "src refspec %s does not match any" msgstr "визначник посилання джерела %s не збігається з жодним" @@ -22179,6 +22323,27 @@ msgid "number of entries in the cache tree to invalidate (default 0)" msgstr "" "кількість записів у дереві кешу, які потрібно анулювати (за замовчуванням 0)" +msgid "test-tool path-walk -- " +msgstr "test-tool path-walk <опції> -- <опції-ревізії>." + +msgid "toggle inclusion of blob objects" +msgstr "перемикач включення обʼєктів blob" + +msgid "toggle inclusion of commit objects" +msgstr "перемикач включення обʼєктів коміту" + +msgid "toggle inclusion of tag objects" +msgstr "перемикач включення обʼєктів тегів" + +msgid "toggle inclusion of tree objects" +msgstr "перемикач включення обʼєктів дерева" + +msgid "toggle pruning of uninteresting paths" +msgstr "перемикач обрізання нецікавих шляхів" + +msgid "read a pattern list over stdin" +msgstr "читати список шаблонів через stdin" + #, c-format msgid "commit %s is not marked reachable" msgstr "коміт %s не позначений як досяжний" @@ -22819,6 +22984,10 @@ msgstr "помилка: " msgid "warning: " msgstr "попередження: " +#, c-format +msgid "uname() failed with error '%s' (%d)\n" +msgstr "uname() завершився невдало з помилкою \"%s\" (%d)\n" + msgid "Fetching objects" msgstr "Отримання обʼєктів" diff --git a/po/vi.po b/po/vi.po index 80a5f191a85c7a..803a68e1b6025d 100644 --- a/po/vi.po +++ b/po/vi.po @@ -11,7 +11,7 @@ # Vũ Tiến Hưng , 2024-2025. # --- # BẢNG THUẬT NGỮ / TERMINOLOGY -# Updated: 2024-07-26, git 2.46 +# Updated: 2025-03-06, git 2.49 # # Ghi chú: # - Bảng thuật ngữ này chưa hoàn thiện. @@ -59,15 +59,17 @@ # | (v.) rebase | cải tổ | # | (v.) squash | squash | # | (v.) amend | tu bổ | +# | (n.) revision | cải biên | +# | (n.) repo/repository | kho chứa | # | | | # | ... TODO ... | | # +------------------------------------------------------------------+ msgid "" msgstr "" -"Project-Id-Version: git 2.48\n" +"Project-Id-Version: git 2.49\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2024-12-23 18:57+0000\n" -"PO-Revision-Date: 2025-01-05 01:20+0700\n" +"POT-Creation-Date: 2025-03-05 22:57+0000\n" +"PO-Revision-Date: 2025-03-06 08:20+0700\n" "Last-Translator: Vũ Tiến Hưng \n" "Language-Team: Vietnamese \n" "Language: vi\n" @@ -1601,7 +1603,7 @@ msgid "" "git bisect cannot work properly in this case.\n" "Maybe you mistook %s and %s revs?\n" msgstr "" -"Một số điểm xét duyệt %s không phải tổ tiên của điểm xét duyệt %s.\n" +"Một số lần cải biên %s không phải tổ tiên của lần cải biên %s.\n" "git bisect không thể làm việc đúng trong trường hợp này.\n" "Liệu có phải bạn nhầm lẫn các điểm %s và %s không?\n" @@ -1621,7 +1623,7 @@ msgstr "Đang bisect: gốc hòa trộn cần phải được kiểm tra\n" #, c-format msgid "a %s revision is needed" -msgstr "cần một điểm xét duyệt %s" +msgstr "cần lần cải biên %s" #, c-format msgid "could not create file '%s'" @@ -1661,7 +1663,7 @@ msgstr[0] "(cần khoảng chừng %d bước)" #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" -msgstr[0] "Bisecting: còn %d điểm xét duyệt để kiểm tra %s\n" +msgstr[0] "Bisecting: còn %d lần cải biên để kiểm tra %s\n" msgid "--contents and --reverse do not blend well." msgstr "tùy chọn --contents và --reverse không nên đi với nhau." @@ -1671,7 +1673,7 @@ msgstr "" "cùng sử dụng --reverse và --first-parent cần chỉ định lần chuyển giao cuối" msgid "revision walk setup failed" -msgstr "cài đặt việc di chuyển qua các điểm xét duyệt gặp lỗi" +msgstr "cài đặt việc duyệt qua các lần cải biên gặp lỗi" msgid "" "--reverse --first-parent together require range along first-parent chain" @@ -2371,6 +2373,18 @@ msgstr "git archive: lỗi giao thức" msgid "git archive: expected a flush" msgstr "git archive: cần flush dữ liệu" +msgid "git backfill [--min-batch-size=] [--[no-]sparse]" +msgstr "git backfill [--min-batch-size=] [--[no-]sparse]" + +msgid "problem loading sparse-checkout" +msgstr "không thể tải checkout thưa" + +msgid "Minimum number of objects to request at a time" +msgstr "Số đối tượng tối thiểu mỗi lần yêu cầu" + +msgid "Restrict the missing objects to the current sparse-checkout" +msgstr "Chỉ lấy về đối tượng còn thiếu trong checkout thưa hiện tại" + msgid "" "git bisect start [--term-(new|bad)= --term-(old|good)=] [--no-" "checkout] [--first-parent] [ [...]] [--] [...]" @@ -2441,7 +2455,7 @@ msgstr "Đối số bisect_write sai: %s" #, c-format msgid "couldn't get the oid of the rev '%s'" -msgstr "không thể lấy oid của điểm xét duyệt '%s'" +msgstr "không thể lấy oid của lần cải biên '%s'" #, c-format msgid "couldn't open the file '%s'" @@ -2466,7 +2480,7 @@ msgid "" "You can use \"git bisect %s\" and \"git bisect %s\" for that." msgstr "" "Bạn cần bắt đầu bằng lệnh \"git bisect start\".\n" -"Bạn sau đó cần phải chỉ cho tôi ít nhất một điểm xét duyệt %s và một %s.\n" +"Bạn sau đó cần phải chỉ cho tôi ít nhất một lần cải biên %s và một %s.\n" "Bạn có thể sử dụng \"git bisect %s\" và \"git bisect %s\" cho chúng." #, c-format @@ -2526,7 +2540,7 @@ msgstr "không nhận ra tuỳ chọn: '%s'" #, c-format msgid "'%s' does not appear to be a valid revision" -msgstr "'%s' không có vẻ như là một điểm xét duyệt hợp lệ" +msgstr "'%s' không có vẻ như là một lần cải biên hợp lệ" msgid "bad HEAD - I need a HEAD" msgstr "sai HEAD - Tôi cần một HEAD" @@ -2587,11 +2601,11 @@ msgstr "bisect chạy gặp lỗi: không đưa ra lệnh." #, c-format msgid "unable to verify %s on good revision" -msgstr "không thể xác nhận '%s' trên điểm xét duyệt tốt" +msgstr "không thể xác nhận '%s' trên lần cải biên tốt" #, c-format msgid "bogus exit code %d for good revision" -msgstr "mã trả về %d bất thường cho điểm xét duyệt tốt" +msgstr "mã trả về %d bất thường cho lần cải biên tốt" #, c-format msgid "bisect run failed: exit code %d from %s is < 0 or >= 128" @@ -2658,7 +2672,7 @@ msgstr "phải kết thúc bằng một màu" #, c-format msgid "cannot find revision %s to ignore" -msgstr "không thể tìm thấy điểm xét duyệt %s để bỏ qua" +msgstr "không thể tìm thấy lần cải biên %s để bỏ qua" msgid "show blame entries as we find them, incrementally" msgstr "hiển thị các mục 'blame' theo thời gian, tăng dần" @@ -2717,7 +2731,7 @@ msgid "ignore when blaming" msgstr "bỏ qua khi blame" msgid "ignore revisions from " -msgstr "bỏ qua các điểm xét duyệt từ " +msgstr "bỏ qua các lần cải biên từ " msgid "color redundant metadata from previous line differently" msgstr "tô màu khác cho siêu dữ liệu dư thừa từ dòng trước" @@ -2730,7 +2744,7 @@ msgstr "tiêu thụ thêm tài nguyên để tìm kiếm tốt hơn nữa" msgid "use revisions from instead of calling git-rev-list" msgstr "" -"sử dụng các điểm xét duyệt (revision) từ thay vì gọi git-rev-list" +"sử dụng các lần cải biên (revision) từ thay vì gọi git-rev-list" msgid "use 's contents as the final image" msgstr "sử dụng nội dung của như là ảnh cuối cùng" @@ -3114,10 +3128,6 @@ msgstr "" msgid "git version:\n" msgstr "phiên bản git:\n" -#, c-format -msgid "uname() failed with error '%s' (%d)\n" -msgstr "uname() gặp lỗi '%s' (%d)\n" - msgid "compiler info: " msgstr "thông tin trình biên dịch: " @@ -3710,7 +3720,7 @@ msgstr[0] "" "\n" msgid "internal error in revision walk" -msgstr "lỗi nội bộ trong khi di chuyển qua các điểm xét duyệt" +msgstr "lỗi nội bộ trong khi di chuyển qua các lần cải biên" msgid "Previous HEAD position was" msgstr "Vị trí trước kia của HEAD là" @@ -4116,8 +4126,91 @@ msgstr "" "clean.requireForce được đặt thành true và không có tuỳ chọn -f; từ chối dọn " "dẹp" -msgid "git clone [] [--] []" -msgstr "git clone [] [--] []" +#, c-format +msgid "info: Could not add alternate for '%s': %s\n" +msgstr "thông tin: không thể thêm thay thế cho '%s': %s\n" + +#, c-format +msgid "failed to stat '%s'" +msgstr "gặp lỗi khi stat '%s'" + +#, c-format +msgid "%s exists and is not a directory" +msgstr "%s có tồn tại nhưng lại không phải là một thư mục" + +#, c-format +msgid "'%s' is a symlink, refusing to clone with --local" +msgstr "'%s' là liên kết mềm, từ chối sao chép với --local" + +#, c-format +msgid "failed to start iterator over '%s'" +msgstr "gặp lỗi khi bắt đầu lặp qua '%s'" + +#, c-format +msgid "symlink '%s' exists, refusing to clone with --local" +msgstr "liên kết mềm '%s' đã tồn tại, từ chối sao chép với --local" + +#, c-format +msgid "failed to unlink '%s'" +msgstr "gặp lỗi khi unlink '%s'" + +#, c-format +msgid "hardlink cannot be checked at '%s'" +msgstr "không thể kiểm tra liên kết cứng '%s'" + +#, c-format +msgid "hardlink different from source at '%s'" +msgstr "liên kết cứng '%s' khác với nguồn" + +#, c-format +msgid "failed to create link '%s'" +msgstr "gặp lỗi khi tạo liên kết mềm %s" + +#, c-format +msgid "failed to copy file to '%s'" +msgstr "gặp lỗi khi sao chép tập tin tới '%s'" + +#, c-format +msgid "failed to iterate over '%s'" +msgstr "gặp lỗi khi lặp qua '%s'" + +#, c-format +msgid "done.\n" +msgstr "hoàn tất.\n" + +msgid "" +"Clone succeeded, but checkout failed.\n" +"You can inspect what was checked out with 'git status'\n" +"and retry with 'git restore --source=HEAD :/'\n" +msgstr "" +"Việc nhân bản thành công, nhưng checkout gặp lỗi.\n" +"Kiểm tra xem cái gì đã được checkout bằng lệnh 'git status'\n" +"và thử lại với lệnh 'git restore --source=HEAD :/'\n" + +msgid "remote did not send all necessary objects" +msgstr "máy chủ đã không gửi tất cả các đối tượng cần thiết" + +#, c-format +msgid "unable to update %s" +msgstr "không thể cập nhật %s" + +msgid "failed to initialize sparse-checkout" +msgstr "gặp lỗi khi khởi tạo sparse-checkout" + +msgid "remote HEAD refers to nonexistent ref, unable to checkout" +msgstr "HEAD ở máy chủ chỉ đến ref không tồn tại, không thể checkout" + +msgid "unable to checkout working tree" +msgstr "không thể checkout cây làm việc" + +msgid "unable to write parameters to config file" +msgstr "không thể ghi các tham số vào tập tin cấu hình" + +msgid "cannot repack to clean up" +msgstr "không thể đóng gói để dọn dẹp" + +msgid "cannot unlink temporary alternates file" +msgstr "không thể bỏ liên kết tập tin thay thế tạm thời" msgid "don't clone shallow repository" msgstr "đừng nhân bản từ kho nông" @@ -4170,6 +4263,9 @@ msgstr "dùng thay cho 'origin' để theo dõi thượng nguồn" msgid "checkout instead of the remote's HEAD" msgstr "checkout thay cho HEAD của máy chủ" +msgid "clone single revision and check out" +msgstr "nhân bản chỉ lần cải biên and check out" + msgid "path to git-upload-pack on the remote" msgstr "đường dẫn đến git-upload-pack trên máy chủ" @@ -4191,10 +4287,8 @@ msgstr "làm sâu hơn lịch sử của bản sao shallow, loại trừ tham ch msgid "clone only one branch, HEAD or --branch" msgstr "chỉ nhân bản một nhánh, HEAD hoặc --branch" -msgid "don't clone any tags, and make later fetches not to follow them" -msgstr "" -"đứng có nhân bản bất kỳ nhánh nào, và làm cho những lần lấy về sau không " -"theo chúng nữa" +msgid "clone tags, and make later fetches not to follow them" +msgstr "nhân bản thẻ, và làm cho những lần lấy về sau không theo chúng nữa" msgid "any cloned submodules will be shallow" msgstr "mọi mô-đun-con nhân bản sẽ là shallow (nông)" @@ -4235,95 +4329,8 @@ msgstr "uri" msgid "a URI for downloading bundles before fetching from origin remote" msgstr "URI để tải xuống bundle trước khi lấy về từ máy chủ origin" -#, c-format -msgid "info: Could not add alternate for '%s': %s\n" -msgstr "thông tin: không thể thêm thay thế cho '%s': %s\n" - -#, c-format -msgid "failed to stat '%s'" -msgstr "gặp lỗi khi stat '%s'" - -#, c-format -msgid "%s exists and is not a directory" -msgstr "%s có tồn tại nhưng lại không phải là một thư mục" - -#, c-format -msgid "'%s' is a symlink, refusing to clone with --local" -msgstr "'%s' là liên kết mềm, từ chối sao chép với --local" - -#, c-format -msgid "failed to start iterator over '%s'" -msgstr "gặp lỗi khi bắt đầu lặp qua '%s'" - -#, c-format -msgid "symlink '%s' exists, refusing to clone with --local" -msgstr "liên kết mềm '%s' đã tồn tại, từ chối sao chép với --local" - -#, c-format -msgid "failed to unlink '%s'" -msgstr "gặp lỗi khi unlink '%s'" - -#, c-format -msgid "hardlink cannot be checked at '%s'" -msgstr "không thể kiểm tra liên kết cứng '%s'" - -#, c-format -msgid "hardlink different from source at '%s'" -msgstr "liên kết cứng '%s' khác với nguồn" - -#, c-format -msgid "failed to create link '%s'" -msgstr "gặp lỗi khi tạo liên kết mềm %s" - -#, c-format -msgid "failed to copy file to '%s'" -msgstr "gặp lỗi khi sao chép tập tin tới '%s'" - -#, c-format -msgid "failed to iterate over '%s'" -msgstr "gặp lỗi khi lặp qua '%s'" - -#, c-format -msgid "done.\n" -msgstr "hoàn tất.\n" - -msgid "" -"Clone succeeded, but checkout failed.\n" -"You can inspect what was checked out with 'git status'\n" -"and retry with 'git restore --source=HEAD :/'\n" -msgstr "" -"Việc nhân bản thành công, nhưng checkout gặp lỗi.\n" -"Kiểm tra xem cái gì đã được checkout bằng lệnh 'git status'\n" -"và thử lại với lệnh 'git restore --source=HEAD :/'\n" - -#, c-format -msgid "Could not find remote branch %s to clone." -msgstr "Không tìm thấy nhánh máy chủ %s để nhân bản (clone)." - -msgid "remote did not send all necessary objects" -msgstr "máy chủ đã không gửi tất cả các đối tượng cần thiết" - -#, c-format -msgid "unable to update %s" -msgstr "không thể cập nhật %s" - -msgid "failed to initialize sparse-checkout" -msgstr "gặp lỗi khi khởi tạo sparse-checkout" - -msgid "remote HEAD refers to nonexistent ref, unable to checkout" -msgstr "HEAD ở máy chủ chỉ đến ref không tồn tại, không thể checkout" - -msgid "unable to checkout working tree" -msgstr "không thể checkout cây làm việc" - -msgid "unable to write parameters to config file" -msgstr "không thể ghi các tham số vào tập tin cấu hình" - -msgid "cannot repack to clean up" -msgstr "không thể đóng gói để dọn dẹp" - -msgid "cannot unlink temporary alternates file" -msgstr "không thể bỏ liên kết tập tin thay thế tạm thời" +msgid "git clone [] [--] []" +msgstr "git clone [] [--] []" msgid "Too many arguments." msgstr "Quá nhiều đối số." @@ -4430,6 +4437,10 @@ msgstr "trình vận chuyển đã báo lỗi" msgid "Remote branch %s not found in upstream %s" msgstr "Nhánh máy chủ %s không tìm thấy trong thượng nguồn %s" +#, c-format +msgid "Remote revision %s not found in upstream %s" +msgstr "Lần cải biên %s không tìm thấy trong thượng nguồn %s" + msgid "You appear to have cloned an empty repository." msgstr "Bạn hình như là đã nhân bản một kho trống rỗng." @@ -4605,7 +4616,7 @@ msgid "git commit-tree: failed to read" msgstr "git commit-tree: gặp lỗi khi đọc" msgid "" -"git commit [-a | --interactive | --patch] [-s] [-v] [-u] [--amend]\n" +"git commit [-a | --interactive | --patch] [-s] [-v] [-u[]] [--amend]\n" " [--dry-run] [(-c | -C | --squash) | --fixup [(amend|" "reword):]]\n" " [-F | -m ] [--reset-author] [--allow-empty]\n" @@ -5576,7 +5587,7 @@ msgstr "" #, c-format msgid "traversed %lu commits\n" -msgstr "đã xuyên %lu qua lần chuyển giao\n" +msgstr "đã chạy qua %lu lần chuyển giao\n" #, c-format msgid "found %i tags; gave up search at %s\n" @@ -6021,8 +6032,8 @@ msgid "" "Run 'git remote set-head %s %s' to follow the change, or set\n" "'remote.%s.followRemoteHEAD' configuration option to a different value\n" "if you do not want to see this message. Specifically running\n" -"'git config set remote.%s.followRemoteHEAD %s' will disable the warning\n" -"until the remote changes HEAD to something else." +"'git config set remote.%s.followRemoteHEAD warn-if-not-branch-%s'\n" +"will disable the warning until the remote changes HEAD to something else." msgstr "" "Chạy 'git remote set-head %s %s' để làm theo thay đổi, hoặc đặt tuỳ chọn\n" "'remote.%s.followRemoteHEAD' sang giá trị khác nếu bạn không muốn thấy\n" @@ -6073,7 +6084,7 @@ msgid "" "remote name from which new revisions should be fetched" msgstr "" "chưa chỉ ra kho chứa máy chủ; xin hãy chỉ định hoặc là URL hoặc\n" -"tên máy chủ từ cái mà những điểm xét duyệt mới có thể được fetch (lấy về)" +"tên máy chủ từ cái mà những lần cải biên mới có thể được fetch (lấy về)" msgid "you need to specify a tag name" msgstr "bạn cần chỉ định một tên thẻ" @@ -6167,7 +6178,7 @@ msgid "specify fetch refmap" msgstr "chỉ ra refmap cần lấy về" msgid "revision" -msgstr "điểm xét duyệt" +msgstr "lần cải biên" msgid "report that we have only objects reachable from this object" msgstr "báo rằng ta chỉ có các đối tượng tiếp cận được từ đối tượng này" @@ -6705,6 +6716,9 @@ msgstr "buộc gc chạy ngay cả khi có tiến trình gc khác đang chạy" msgid "repack all other packs except the largest pack" msgstr "đóng gói lại tất cả các gói khác ngoại trừ gói lớn nhất" +msgid "pack prefix to store a pack containing pruned objects" +msgstr "tiền tố của gói để lưu gói gồm những đối tượng đã loại bỏ" + #, c-format msgid "failed to parse gc.logExpiry value %s" msgstr "gặp lỗi khi đọc giá trị gc.logExpiry %s" @@ -7113,7 +7127,7 @@ msgstr "--no-index hay --untracked không được sử dụng cùng với revs" #, c-format msgid "unable to resolve revision: %s" -msgstr "không thể phân giải điểm xét duyệt: %s" +msgstr "không thể phân giải lần cải biên: %s" msgid "--untracked not supported with --recurse-submodules" msgstr "tùy chọn --untracked không được hỗ trợ với --recurse-submodules" @@ -7490,6 +7504,10 @@ msgstr "không thể hoàn tất pack-objects để đóng gói các link cục msgid "Cannot come back to cwd" msgstr "Không thể quay lại thư mục hiện hành" +#, c-format +msgid "bad --pack_header: %s" +msgstr "--pack_header sai: %s" + #, c-format msgid "bad %s" msgstr "%s sai" @@ -7758,10 +7776,10 @@ msgid "failed to find exact merge base" msgstr "gặp lỗi khi tìm gốc hòa trộn chính xác" msgid "base commit should be the ancestor of revision list" -msgstr "lần chuyển giao nền không là tổ tiên của danh sách điểm xét duyệt" +msgstr "lần chuyển giao nền không là tổ tiên của danh sách lần cải biên" msgid "base commit shouldn't be in revision list" -msgstr "lần chuyển giao nền không được trong danh sách điểm xét duyệt" +msgstr "lần chuyển giao nền không được trong danh sách lần cải biên" msgid "cannot get patch id" msgstr "không thể lấy mã bản vá" @@ -8356,10 +8374,6 @@ msgstr "không hiểu chiến lược: -X%s" msgid "malformed input line: '%s'." msgstr "dòng đầu vào sai quy cách: '%s'." -#, c-format -msgid "merging cannot continue; got unclean result of %d" -msgstr "không thể tiếp tục hoà trộn; kết quả không hoàn toàn %d" - msgid "git merge [] [...]" msgstr "git merge [] [...]" @@ -9186,6 +9200,13 @@ msgstr "" "git pack-objects [] [< | < ]" +#, c-format +msgid "invalid --name-hash-version option: %d" +msgstr "tùy chọn --name-hash-version không hợp lệ: %d" + +msgid "currently, --write-bitmap-index requires --name-hash-version=1" +msgstr "--write-bitmap-index hiện cần --name-hash-version=1" + #, c-format msgid "" "write_reuse_object: could not locate %s, expected at offset % in " @@ -9363,7 +9384,7 @@ msgstr "không phải một rev '%s'" #, c-format msgid "bad revision '%s'" -msgstr "điểm xem xét sai '%s'" +msgstr "lần cải biên sai '%s'" msgid "unable to add recent objects" msgstr "không thể thêm các đối tượng mới dùng" @@ -9509,6 +9530,9 @@ msgstr "giao thức" msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" msgstr "loại trừ bất kỳ cấu hình uploadpack.blobpackfileuri với giao thức này" +msgid "use the specified name-hash function to group similar objects" +msgstr "dùng hàm băm này để nhóm các đối tượng giống nhau" + #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "mức delta chain %d là quá sâu, buộc dùng %d" @@ -10261,7 +10285,7 @@ msgid "" msgstr "" "\n" "git gặp phải một lỗi trong khi đang chuẩn bị các bản vá để diễn lại\n" -"những điểm xét duyệt này:\n" +"những lần cải biên này:\n" "\n" " %s\n" "\n" @@ -10750,8 +10774,8 @@ msgstr "chưa chỉ ra reflog để xóa" msgid "invalid ref format: %s" msgstr "định dạng tham chiếu không hợp lệ: %s" -msgid "git refs migrate --ref-format= [--dry-run]" -msgstr "git refs migrate --ref-format=<định dạng> [--dry-run]" +msgid "git refs migrate --ref-format= [--no-reflog] [--dry-run]" +msgstr "git refs migrate --ref-format=<định dạng> [--no-reflog] [--dry-run]" msgid "git refs verify [--strict] [--verbose]" msgstr "git refs verify [--strict] [--verbose]" @@ -10762,6 +10786,9 @@ msgstr "chỉ định định dạng tham chiếu để chuyển đổi sang" msgid "perform a non-destructive dry-run" msgstr "chạy thử mà không thay đổi gì" +msgid "drop reflogs entirely during the migration" +msgstr "bỏ reflog khi chuyển đổi" + msgid "missing --ref-format=" msgstr "thiếu --ref-format=<định dạng>" @@ -11216,8 +11243,14 @@ msgstr "Sẽ không xóa những địa chỉ URL không-push" msgid "be verbose; must be placed before a subcommand" msgstr "chi tiết; phải được đặt trước một lệnh-con" -msgid "git repack []" -msgstr "git repack []" +msgid "" +"git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" +"[--window=] [--depth=] [--threads=] [--keep-pack=]\n" +"[--write-midx] [--name-hash-version=]" +msgstr "" +"git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" +"[--window=] [--depth=] [--threads=] [--keep-pack=]\n" +"[--write-midx] [--name-hash-version=]" msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" @@ -11293,6 +11326,10 @@ msgstr "chuyển --no-reuse-delta cho git-pack-objects" msgid "pass --no-reuse-object to git-pack-objects" msgstr "chuyển --no-reuse-object cho git-pack-objects" +msgid "" +"specify the name hash version to use for grouping similar objects by path" +msgstr "phiên bản hàm băm để nhóm đối tượng giống nhau theo đường dẫn" + msgid "do not run git-update-server-info" msgstr "không chạy git-update-server-info" @@ -11341,9 +11378,6 @@ msgstr "tìm một tiến trình hình học với hệ số " msgid "write a multi-pack index of the resulting packs" msgstr "ghi chỉ mục 'multi-pack' của các gói kết quả" -msgid "pack prefix to store a pack containing pruned objects" -msgstr "tiền tố của gói để lưu gói gồm những đối tượng đã loại bỏ" - msgid "pack prefix to store a pack containing filtered out objects" msgstr "tiền tố của gói để lưu gói gồm những đối tượng đã lọc bỏ" @@ -11560,11 +11594,8 @@ msgstr "chỉ được chỉ định một mẫu cùng với tùy chọn -l" msgid "need some commits to replay" msgstr "cần các chuyển giao để phát lại" -msgid "--onto and --advance are incompatible" -msgstr "--onto và --advance xung khắc" - msgid "all positive revisions given must be references" -msgstr "mọi điểm xét duyệt cộng thêm phải là tên tham chiếu" +msgstr "mọi lần cải biên cộng thêm phải là tên tham chiếu" msgid "argument to --advance must be a reference" msgstr "tham số cho --advance phải là tham chiếu" @@ -11610,11 +11641,11 @@ msgid "" "some rev walking options will be overridden as '%s' bit in 'struct rev_info' " "will be forced" msgstr "" -"một số tuỳ chọn duyệt qua điểm xét duyệt sẽ bị bỏ qua do bit '%s' trong " +"một số tuỳ chọn duyệt qua lần cải biên sẽ bị bỏ qua do bit '%s' trong " "'struct rev_info' bị ép bật/tắt" msgid "error preparing revisions" -msgstr "gặp lỗi khi chuẩn bị các điểm xét duyệt" +msgstr "gặp lỗi khi chuẩn bị các lần cải biên" msgid "replaying down to root commit is not supported yet!" msgstr "chưa hỗ trợ phát lại đến lần chuyển giao gốc!" @@ -11709,7 +11740,7 @@ msgstr "chỉ ghi lại những đường dẫn thực sự sẽ được thêm #, c-format msgid "Failed to resolve '%s' as a valid revision." -msgstr "Gặp lỗi khi phân giải '%s' thành điểm xét duyệt hợp lệ." +msgstr "Gặp lỗi khi phân giải '%s' thành lần cải biên hợp lệ." #, c-format msgid "Failed to resolve '%s' as a valid tree." @@ -11742,7 +11773,7 @@ msgstr "" #, c-format msgid "Could not reset index file to revision '%s'." -msgstr "Không thể đặt lại (reset) chỉ mục thành điểm xét duyệt '%s'." +msgstr "Không thể đặt lại (reset) chỉ mục thành lần cải biên '%s'." msgid "Could not write new index file." msgstr "Không thể ghi tập tin chỉ mục mới." @@ -11784,7 +11815,7 @@ msgid "missing opt-spec before option flags" msgstr "thiếu opt-spec trước các tuỳ chọn" msgid "Needed a single revision" -msgstr "Cần một điểm xét duyệt đơn" +msgstr "Cần một lần cải biên đơn" msgid "" "git rev-parse --parseopt [] -- [...]\n" @@ -12160,7 +12191,7 @@ msgstr "không có tham chiếu nào như thế %s" #, c-format msgid "cannot handle more than %d rev." msgid_plural "cannot handle more than %d revs." -msgstr[0] "không thể xử lý nhiều hơn %d điểm xét duyệt." +msgstr[0] "không thể xử lý nhiều hơn %d lần cải biên." #, c-format msgid "'%s' is not a valid ref." @@ -12438,7 +12469,7 @@ msgstr "'%s' không phải là lần chuyển giao kiểu-stash" #, c-format msgid "Too many revisions specified:%s" -msgstr "Chỉ ra quá nhiều điểm xét duyệt: %s" +msgstr "Chỉ ra quá nhiều lần cải biên: %s" msgid "No stash entries found." msgstr "Không tìm thấy các mục tạm cất (stash) nào." @@ -12742,7 +12773,7 @@ msgstr "" "dẫn>]" msgid "could not fetch a revision for HEAD" -msgstr "không thể lấy về một điểm xem xét cho HEAD" +msgstr "không thể lấy về một lần cải biên cho HEAD" #, c-format msgid "Synchronizing submodule url for '%s'\n" @@ -12977,8 +13008,7 @@ msgstr "" #, c-format msgid "Unable to find current revision in submodule path '%s'" -msgstr "" -"Không tìm thấy điểm xét duyệt hiện hành trong đường dẫn mô-đun-con '%s'" +msgstr "Không tìm thấy lần cải biên hiện hành trong đường dẫn mô-đun-con '%s'" #, c-format msgid "Unable to fetch in submodule path '%s'" @@ -12986,7 +13016,7 @@ msgstr "Không thể lấy về trong đường dẫn mô-đun-con '%s'" #, c-format msgid "Unable to find %s revision in submodule path '%s'" -msgstr "Không tìm thấy điểm xét duyệt %s trong đường dẫn mô-đun-con '%s'" +msgstr "Không tìm thấy lần cải biên %s trong đường dẫn mô-đun-con '%s'" #, c-format msgid "Failed to recurse into submodule path '%s'" @@ -13017,8 +13047,7 @@ msgid "use the 'rebase' update strategy" msgstr "dùng chiến lược hòa trộn 'rebase'" msgid "create a shallow clone truncated to the specified number of revisions" -msgstr "" -"tạo một bản sao nông được cắt ngắn thành số lượng điểm xét duyệt đã cho" +msgstr "tạo một bản sao nông được cắt ngắn thành số lượng lần cải biên đã cho" msgid "parallel jobs" msgstr "công việc đồng thời" @@ -14190,6 +14219,9 @@ msgstr "Nhập một kho GNU Arch vào một kho Git" msgid "Create an archive of files from a named tree" msgstr "Tạo một kho nén các tập tin từ cây làm việc có tên" +msgid "Download missing objects in a partial clone" +msgstr "Tải về các đối tượng còn thiếu khi nhân bản một phần" + msgid "Use binary search to find the commit that introduced a bug" msgstr "Tìm kiếm dạng nhị phân để tìm ra lần chuyển giao nào đưa ra lỗi" @@ -14727,7 +14759,7 @@ msgid "Git Repository Layout" msgstr "Bố cục kho Git" msgid "Specifying revisions and ranges for Git" -msgstr "Chỉ định điểm xét duyệt và vùng cho Git" +msgstr "Chỉ định lần cải biên và vùng cho Git" msgid "Mounting one repository inside another" msgstr "Gắn một kho chứa vào trong một cái khác" @@ -15482,7 +15514,7 @@ msgstr "tham chiếu '%s' không chỉ đến một blob nào cả" #, c-format msgid "unable to resolve config blob '%s'" -msgstr "không thể phân giải điểm xét duyệt '%s'" +msgstr "không thể phân giải lần cải biên '%s'" msgid "unable to parse command-line config" msgstr "không thể đọc cấu hình dòng lệnh" @@ -16106,6 +16138,12 @@ msgstr "tham số cho %s không hợp lệ" msgid "invalid regex given to -I: '%s'" msgstr "đưa cho -I biểu thức chính quy không hợp lệ: '%s'" +msgid "-G requires a non-empty argument" +msgstr "-G cần một tham số" + +msgid "-S requires a non-empty argument" +msgstr "-S cần một tham số" + #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "gặp lỗi khi đọc đối số tùy chọn --submodule: '%s'" @@ -18274,6 +18312,10 @@ msgstr "tập tin '%s' và '%s' có nội dung khác nhau" msgid "unable to write file %s" msgstr "không thể ghi tập tin %s" +#, c-format +msgid "unable to write repeatedly vanishing file %s" +msgstr "không thể ghi vào tập tin biến mất liên tục %s" + #, c-format msgid "unable to set permission to '%s'" msgstr "không thể đặt quyền thành '%s'" @@ -18735,7 +18777,7 @@ msgstr "checksum không hợp lệ" #, c-format msgid "invalid rev-index position at %: % != %" -msgstr "vị trí mục xét duyệt không hợp lệ %: % != %" +msgstr "vị trí mục cải biên không hợp lệ %: % != %" msgid "multi-pack-index reverse-index chunk is the wrong size" msgstr "chunk chỉ mục ngược của chỉ mục đa gói có kích thước sai" @@ -18833,6 +18875,52 @@ msgstr "không hiểu tùy chọn '%c'" msgid "unknown non-ascii option in string: `%s'" msgstr "không hiểu tùy chọn non-ascii trong chuỗi: '%s'" +#. TRANSLATORS: The "<%s>" part of this string +#. stands for an optional value given to a command +#. line option in the long form, and "<>" is there +#. as a convention to signal that it is a +#. placeholder (i.e. the user should substitute it +#. with the real value). If your language uses a +#. different convention, you can change "<%s>" part +#. to match yours, e.g. it might use "|%s|" instead, +#. or if the alphabet is different enough it may use +#. "%s" without any placeholder signal. Most +#. translations leave this message as is. +#. +#, c-format +msgid "[=<%s>]" +msgstr "[=<%s>]" + +#. TRANSLATORS: The "<%s>" part of this string +#. stands for an optional value given to a command +#. line option in the short form, and "<>" is there +#. as a convention to signal that it is a +#. placeholder (i.e. the user should substitute it +#. with the real value). If your language uses a +#. different convention, you can change "<%s>" part +#. to match yours, e.g. it might use "|%s|" instead, +#. or if the alphabet is different enough it may use +#. "%s" without any placeholder signal. Most +#. translations leave this message as is. +#. +#, c-format +msgid "[<%s>]" +msgstr "[<%s>]" + +#. TRANSLATORS: The "<%s>" part of this string stands for a +#. value given to a command line option, and "<>" is there +#. as a convention to signal that it is a placeholder +#. (i.e. the user should substitute it with the real value). +#. If your language uses a different convention, you can +#. change "<%s>" part to match yours, e.g. it might use +#. "|%s|" instead, or if the alphabet is different enough it +#. may use "%s" without any placeholder signal. Most +#. translations leave this message as is. +#. +#, c-format +msgid " <%s>" +msgstr " <%s>" + msgid "..." msgstr "..." @@ -18919,6 +19007,21 @@ msgstr "sai giá trị kiểu boolean của cấu hình '%s' cho '%s'" msgid "failed to parse %s" msgstr "gặp lỗi khi đọc cú pháp %s" +#, c-format +msgid "failed to walk children of tree %s: not found" +msgstr "gặp lỗi khi duyệt nhánh của cây %s: không tìm thấy" + +#, c-format +msgid "failed to find object %s" +msgstr "gặp lỗi khi tìm đối tượng '%s'." + +#, c-format +msgid "failed to find tag %s" +msgstr "gặp lỗi khi tìm thẻ %s" + +msgid "failed to setup revision walk" +msgstr "gặp lỗi khi thiết lập duyệt lần cải biên" + #, c-format msgid "Could not make %s writable by group" msgstr "Không thể làm %s được ghi bởi nhóm" @@ -19063,6 +19166,22 @@ msgstr "tên máy chủ promisor không thể bắt đầu bằng '/': %s" msgid "could not fetch %s from promisor remote" msgstr "không thể tải %s từ máy chủ promisor" +#, c-format +msgid "known remote named '%s' but with url '%s' instead of '%s'" +msgstr "có máy chủ '%s' nhưng với url '%s' thay vì '%s'" + +#, c-format +msgid "unknown '%s' value for '%s' config option" +msgstr "không hiểu giá trị '%s' cho cho cấu hình '%s'" + +#, c-format +msgid "unknown element '%s' from remote info" +msgstr "không hiểu phần '%s' từ thông tin máy chủ" + +#, c-format +msgid "accepted promisor remote '%s' not found" +msgstr "không tìm thấy accepted promisor remote '%s'" + msgid "object-info: expected flush after arguments" msgstr "object-info: cần đẩy dữ liệu lên đĩa sau các tham số" @@ -19750,7 +19869,7 @@ msgid "refusing to update ref with bad name '%s'" msgstr "từ chối cập nhật tham chiếu với tên sai '%s'" msgid "refusing to force and skip creation of reflog" -msgstr "từ chối bỏ qua việc tạo log tham chiếu" +msgstr "từ chối bỏ qua việc tạo reflog" #, c-format msgid "update_ref failed for ref '%s': %s" @@ -19883,6 +20002,14 @@ msgstr "tên tham chiếu %s là tham chiếu biểu trưng, không hỗ trợ s msgid "invalid refspec '%s'" msgstr "refspec không hợp lệ '%s'" +#, c-format +msgid "pattern '%s' has no '*'" +msgstr "giá trị '%s' không có '*'" + +#, c-format +msgid "replacement '%s' has no '*'" +msgstr "thay thế '%s' không có '*'" + #, c-format msgid "invalid quoting in push-option value: '%s'" msgstr "sai trích dẫn trong giá trị push-option :'%s'" @@ -20002,6 +20129,27 @@ msgstr "remote-curl: đã cố gắng fetch mà không có kho nội bộ" msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl: không hiểu lệnh '%s' từ git" +#, c-format +msgid "" +"reading remote from \"%s/%s\", which is nominated for removal.\n" +"\n" +"If you still use the \"remotes/\" directory it is recommended to\n" +"migrate to config-based remotes:\n" +"\n" +"\tgit remote rename %s %s\n" +"\n" +"If you cannot, please let us know why you still need to use it by\n" +"sending an e-mail to ." +msgstr "" +"đang đọc máy chủ từ \"%s/%s\", đã được đề cử để loại bỏ.\n" +"Nếu bạn vẫn còn sử dụng thư mục \"remotes\", chúng tôi khuyên bạn\n" +"hãy chuyển đổi sang sử dụng máy chủ qua tập tin cấu hình:\n" +"\n" +"\tgit remote rename %s %s\n" +"\n" +"Nếu bạn không thể đổi, hãy cho chúng tôi biết tại sao bạn cần nó\n" +"bằng cách gửi e-mail đến ." + #, c-format msgid "config remote shorthand cannot begin with '/': %s" msgstr "cấu hình viết tắt máy chủ không thể bắt đầu bằng '/': %s" @@ -20036,14 +20184,6 @@ msgstr "%s thường theo dõi %s, không phải %s" msgid "%s tracks both %s and %s" msgstr "%s theo dõi cả %s và %s" -#, c-format -msgid "key '%s' of pattern had no '*'" -msgstr "khóa '%s' của mẫu k có '*'" - -#, c-format -msgid "value '%s' of pattern has no '*'" -msgstr "giá trị '%s' của mẫu k có '*'" - #, c-format msgid "src refspec %s does not match any" msgstr "refspec (đặc tả tham chiếu) nguồn %s không khớp bất kỳ cái gì" @@ -20317,7 +20457,7 @@ msgid "update the index with reused conflict resolution if possible" msgstr "cập nhật chỉ mục với phân giải xung đột dùng lại nếu được" msgid "could not determine HEAD revision" -msgstr "không thể dò tìm điểm xét duyệt HEAD" +msgstr "không thể dò tìm lần cải biên HEAD" #, c-format msgid "failed to find tree of %s" @@ -21456,10 +21596,10 @@ msgid "" "Use '--' to separate paths from revisions, like this:\n" "'git [...] -- [...]'" msgstr "" -"tham số chưa rõ ràng '%s': chưa biết điểm xét duyệt hay đường dẫn không " -"trong cây làm việc.\n" -"Dùng '--' để ngăn cách các đường dẫn khỏi điểm xét duyệt, như thế này:\n" -"'git [<điểm xét duyệt>...] -- [...]'" +"tham số chưa rõ ràng '%s': chưa biết lần cải biên hay đường dẫn không trong " +"cây làm việc.\n" +"Dùng '--' để ngăn cách các đường dẫn khỏi lần cải biên, như thế này:\n" +"'git [...] -- [...]'" #, c-format msgid "option '%s' must come before non-option arguments" @@ -21471,9 +21611,9 @@ msgid "" "Use '--' to separate paths from revisions, like this:\n" "'git [...] -- [...]'" msgstr "" -"tham số chưa rõ ràng '%s': cả điểm xem xét và tên tập tin.\n" -"Dùng '--' để ngăn cách các đường dẫn khỏi điểm xem xét, như thế này:\n" -"'git [<điểm xem xét>...] -- [...]'" +"tham số chưa rõ ràng '%s': cả lần cải biên và tên tập tin.\n" +"Dùng '--' để ngăn cách các đường dẫn khỏi lần cải biên, như thế này:\n" +"'git [...] -- [...]'" msgid "unable to set up work tree using invalid config" msgstr "không thể thiết lập thư mục làm việc với cấu hình không hợp lệ" @@ -21935,6 +22075,27 @@ msgstr "dọn cây nhớ tạm trước mỗi chu kỳ" msgid "number of entries in the cache tree to invalidate (default 0)" msgstr "số mục cần huỷ trong câu nhớ tạm (mặc định 0)" +msgid "test-tool path-walk -- " +msgstr "test-tool path-walk -- " + +msgid "toggle inclusion of blob objects" +msgstr "bao gồm các đối tượng blob" + +msgid "toggle inclusion of commit objects" +msgstr "bao gồm các đối tượng chuyển giao" + +msgid "toggle inclusion of tag objects" +msgstr "bao gồm các đối tượng thẻ" + +msgid "toggle inclusion of tree objects" +msgstr "bao gồm các đối tượng cây" + +msgid "toggle pruning of uninteresting paths" +msgstr "lược bỏ những đường dẫn ít ý nghĩa" + +msgid "read a pattern list over stdin" +msgstr "đọc các mẫu từ stdin" + #, c-format msgid "commit %s is not marked reachable" msgstr "lần chuyển giao %s chưa được đánh dấu là tiếp cận được" @@ -22579,6 +22740,10 @@ msgstr "lỗi: " msgid "warning: " msgstr "cảnh báo: " +#, c-format +msgid "uname() failed with error '%s' (%d)\n" +msgstr "uname() gặp lỗi '%s' (%d)\n" + msgid "Fetching objects" msgstr "Đang lấy về các đối tượng" @@ -23536,3 +23701,21 @@ msgstr "Bỏ qua %s với hậu tố sao lưu '%s'.\n" #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Bạn có thực sự muốn gửi %s? [y|N](có/KHÔNG): " + +#, c-format +#~ msgid "Could not find remote branch %s to clone." +#~ msgstr "Không tìm thấy nhánh máy chủ %s để nhân bản (clone)." + +#, c-format +#~ msgid "merging cannot continue; got unclean result of %d" +#~ msgstr "không thể tiếp tục hoà trộn; kết quả không hoàn toàn %d" + +#~ msgid "git repack []" +#~ msgstr "git repack []" + +#~ msgid "--onto and --advance are incompatible" +#~ msgstr "--onto và --advance xung khắc" + +#, c-format +#~ msgid "key '%s' of pattern had no '*'" +#~ msgstr "khóa '%s' của mẫu k có '*'" diff --git a/po/zh_CN.po b/po/zh_CN.po index 12a0fb510b10cc..5cde4011e750ce 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -93,6 +93,7 @@ # pack index | 包索引 # packfile | 包文件 # parent | 父提交 +# partial clone | 部分克隆 # patch | 补丁 # pathspec | 路径规格 # pattern | 模式 @@ -154,8 +155,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2025-01-02 20:43+0800\n" -"PO-Revision-Date: 2025-01-05 19:01+0800\n" +"POT-Creation-Date: 2025-03-09 20:34+0800\n" +"PO-Revision-Date: 2025-03-12 14:47+0800\n" "Last-Translator: Teng Long \n" "Language-Team: GitHub \n" "Language: zh_CN\n" @@ -2962,6 +2963,22 @@ msgstr "git archive：协议错误" msgid "git archive: expected a flush" msgstr "git archive：应有一个 flush 包" +#: builtin/backfill.c +msgid "git backfill [--min-batch-size=] [--[no-]sparse]" +msgstr "git backfill [--min-batch-size=] [--[no-]sparse]" + +#: builtin/backfill.c +msgid "problem loading sparse-checkout" +msgstr "加载稀疏检出时出现问题" + +#: builtin/backfill.c +msgid "Minimum number of objects to request at a time" +msgstr "单次请求的最少对象数量" + +#: builtin/backfill.c +msgid "Restrict the missing objects to the current sparse-checkout" +msgstr "将缺少的对象限制在当前的稀疏检出中" + #: builtin/bisect.c msgid "" "git bisect start [--term-(new|bad)= --term-(old|good)=] [--no-" @@ -3381,7 +3398,7 @@ msgstr "显示作者的邮箱而不是名字（默认：关闭）" msgid "ignore whitespace differences" msgstr "忽略空白差异" -#: builtin/blame.c builtin/log.c +#: builtin/blame.c builtin/clone.c builtin/log.c msgid "rev" msgstr "版本" @@ -3803,8 +3820,8 @@ msgstr "HEAD 没有位于 /refs/heads 之下！" #: builtin/branch.c msgid "" -"branch with --recurse-submodules can only be used if submodule." -"propagateBranches is enabled" +"branch with --recurse-submodules can only be used if " +"submodule.propagateBranches is enabled" msgstr "" "带有 --recurse-submodules 的分支只能在 submodule.propagateBranches 启用时使用" @@ -3891,11 +3908,6 @@ msgstr "不再支持选项 '--set-upstream'。请使用 '--track' 或 '--set-ups msgid "git version:\n" msgstr "git 版本：\n" -#: builtin/bugreport.c -#, c-format -msgid "uname() failed with error '%s' (%d)\n" -msgstr "uname() 失败，错误为 '%s'（%d）\n" - #: builtin/bugreport.c msgid "compiler info: " msgstr "编译器信息：" @@ -5134,8 +5146,112 @@ msgid "clean.requireForce is true and -f not given: refusing to clean" msgstr "clean.requireForce 设置为 true 且未提供 -f 选项：拒绝执行清理动作" #: builtin/clone.c -msgid "git clone [] [--] []" -msgstr "git clone [<选项>] [--] <仓库> [<路径>]" +#, c-format +msgid "info: Could not add alternate for '%s': %s\n" +msgstr "info: 不能为 '%s' 添加一个备用：%s\n" + +#: builtin/clone.c builtin/diff.c builtin/rm.c grep.c setup.c +#, c-format +msgid "failed to stat '%s'" +msgstr "无法对 '%s' 调用 stat" + +#: builtin/clone.c +#, c-format +msgid "%s exists and is not a directory" +msgstr "%s 存在且不是一个目录" + +#: builtin/clone.c +#, c-format +msgid "'%s' is a symlink, refusing to clone with --local" +msgstr "'%s' 为符号链接，拒绝用 --local 克隆" + +#: builtin/clone.c +#, c-format +msgid "failed to start iterator over '%s'" +msgstr "无法在 '%s' 上启动迭代器" + +#: builtin/clone.c +#, c-format +msgid "symlink '%s' exists, refusing to clone with --local" +msgstr "符号链接 '%s' 存在，拒绝用 --local 克隆" + +#: builtin/clone.c compat/precompose_utf8.c +#, c-format +msgid "failed to unlink '%s'" +msgstr "无法删除 '%s'" + +#: builtin/clone.c +#, c-format +msgid "hardlink cannot be checked at '%s'" +msgstr "无法检查 '%s' 处的硬链接" + +#: builtin/clone.c +#, c-format +msgid "hardlink different from source at '%s'" +msgstr "硬链接与 '%s' 处的来源不同" + +#: builtin/clone.c +#, c-format +msgid "failed to create link '%s'" +msgstr "无法创建链接 '%s'" + +#: builtin/clone.c +#, c-format +msgid "failed to copy file to '%s'" +msgstr "无法拷贝文件至 '%s'" + +#: builtin/clone.c refs/files-backend.c +#, c-format +msgid "failed to iterate over '%s'" +msgstr "无法在 '%s' 上迭代" + +#: builtin/clone.c +#, c-format +msgid "done.\n" +msgstr "完成。\n" + +#: builtin/clone.c +msgid "" +"Clone succeeded, but checkout failed.\n" +"You can inspect what was checked out with 'git status'\n" +"and retry with 'git restore --source=HEAD :/'\n" +msgstr "" +"克隆成功，但是检出失败。\n" +"您可以通过 'git status' 检查哪些已被检出，然后使用命令\n" +"'git restore --source=HEAD :/' 重试\n" + +#: builtin/clone.c fetch-pack.c +msgid "remote did not send all necessary objects" +msgstr "远程没有发送所有必需的对象" + +#: builtin/clone.c +#, c-format +msgid "unable to update %s" +msgstr "不能更新 %s" + +#: builtin/clone.c +msgid "failed to initialize sparse-checkout" +msgstr "无法初始化稀疏检出" + +#: builtin/clone.c +msgid "remote HEAD refers to nonexistent ref, unable to checkout" +msgstr "远程 HEAD 指向一个不存在的引用，无法检出" + +#: builtin/clone.c +msgid "unable to checkout working tree" +msgstr "不能检出工作区" + +#: builtin/clone.c +msgid "unable to write parameters to config file" +msgstr "无法将参数写入配置文件" + +#: builtin/clone.c +msgid "cannot repack to clean up" +msgstr "无法执行 repack 来清理" + +#: builtin/clone.c +msgid "cannot unlink temporary alternates file" +msgstr "无法删除临时的备用文件" #: builtin/clone.c msgid "don't clone shallow repository" @@ -5207,6 +5323,10 @@ msgstr "使用 <名称> 而不是 'origin' 去跟踪上游" msgid "checkout instead of the remote's HEAD" msgstr "检出 <分支> 而不是远程 HEAD" +#: builtin/clone.c +msgid "clone single revision and check out" +msgstr "克隆单个版本 <版本> 并检出" + #: builtin/clone.c msgid "path to git-upload-pack on the remote" msgstr "远程 git-upload-pack 路径" @@ -5236,8 +5356,8 @@ msgid "clone only one branch, HEAD or --branch" msgstr "只克隆一个分支、HEAD 或 --branch" #: builtin/clone.c -msgid "don't clone any tags, and make later fetches not to follow them" -msgstr "不要克隆任何标签，并且后续获取操作也不下载它们" +msgid "clone tags, and make later fetches not to follow them" +msgstr "克隆标签，并在后续获取时不跟随它们" #: builtin/clone.c msgid "any cloned submodules will be shallow" @@ -5294,117 +5414,8 @@ msgid "a URI for downloading bundles before fetching from origin remote" msgstr "用于在从 origin 远程获取之前下载归档包的 URI" #: builtin/clone.c -#, c-format -msgid "info: Could not add alternate for '%s': %s\n" -msgstr "info: 不能为 '%s' 添加一个备用：%s\n" - -#: builtin/clone.c builtin/diff.c builtin/rm.c grep.c setup.c -#, c-format -msgid "failed to stat '%s'" -msgstr "无法对 '%s' 调用 stat" - -#: builtin/clone.c -#, c-format -msgid "%s exists and is not a directory" -msgstr "%s 存在且不是一个目录" - -#: builtin/clone.c -#, c-format -msgid "'%s' is a symlink, refusing to clone with --local" -msgstr "'%s' 为符号链接，拒绝用 --local 克隆" - -#: builtin/clone.c -#, c-format -msgid "failed to start iterator over '%s'" -msgstr "无法在 '%s' 上启动迭代器" - -#: builtin/clone.c -#, c-format -msgid "symlink '%s' exists, refusing to clone with --local" -msgstr "符号链接 '%s' 存在，拒绝用 --local 克隆" - -#: builtin/clone.c compat/precompose_utf8.c -#, c-format -msgid "failed to unlink '%s'" -msgstr "无法删除 '%s'" - -#: builtin/clone.c -#, c-format -msgid "hardlink cannot be checked at '%s'" -msgstr "无法检查 '%s' 处的硬链接" - -#: builtin/clone.c -#, c-format -msgid "hardlink different from source at '%s'" -msgstr "硬链接与 '%s' 处的源不同" - -#: builtin/clone.c -#, c-format -msgid "failed to create link '%s'" -msgstr "无法创建链接 '%s'" - -#: builtin/clone.c -#, c-format -msgid "failed to copy file to '%s'" -msgstr "无法拷贝文件至 '%s'" - -#: builtin/clone.c refs/files-backend.c -#, c-format -msgid "failed to iterate over '%s'" -msgstr "无法在 '%s' 上迭代" - -#: builtin/clone.c -#, c-format -msgid "done.\n" -msgstr "完成。\n" - -#: builtin/clone.c -msgid "" -"Clone succeeded, but checkout failed.\n" -"You can inspect what was checked out with 'git status'\n" -"and retry with 'git restore --source=HEAD :/'\n" -msgstr "" -"克隆成功，但是检出失败。\n" -"您可以通过 'git status' 检查哪些已被检出，然后使用命令\n" -"'git restore --source=HEAD :/' 重试\n" - -#: builtin/clone.c -#, c-format -msgid "Could not find remote branch %s to clone." -msgstr "不能发现要克隆的远程分支 %s。" - -#: builtin/clone.c fetch-pack.c -msgid "remote did not send all necessary objects" -msgstr "远程没有发送所有必需的对象" - -#: builtin/clone.c -#, c-format -msgid "unable to update %s" -msgstr "不能更新 %s" - -#: builtin/clone.c -msgid "failed to initialize sparse-checkout" -msgstr "无法初始化稀疏检出" - -#: builtin/clone.c -msgid "remote HEAD refers to nonexistent ref, unable to checkout" -msgstr "远程 HEAD 指向一个不存在的引用，无法检出" - -#: builtin/clone.c -msgid "unable to checkout working tree" -msgstr "不能检出工作区" - -#: builtin/clone.c -msgid "unable to write parameters to config file" -msgstr "无法将参数写入配置文件" - -#: builtin/clone.c -msgid "cannot repack to clean up" -msgstr "无法执行 repack 来清理" - -#: builtin/clone.c -msgid "cannot unlink temporary alternates file" -msgstr "无法删除临时的 alternates 文件" +msgid "git clone [] [--] []" +msgstr "git clone [<选项>] [--] <仓库> [<目录>]" #: builtin/clone.c msgid "Too many arguments." @@ -5530,6 +5541,11 @@ msgstr "远程传输报告错误" msgid "Remote branch %s not found in upstream %s" msgstr "远程分支 %s 在上游 %s 未发现" +#: builtin/clone.c +#, c-format +msgid "Remote revision %s not found in upstream %s" +msgstr "在上游 %2$s 未发现远程版本 %1$s" + #: builtin/clone.c msgid "You appear to have cloned an empty repository." msgstr "您似乎克隆了一个空仓库。" @@ -5593,7 +5609,8 @@ msgstr "" "[no-]progress]\n" " <切分选项>" -#: builtin/commit-graph.c builtin/fetch.c builtin/log.c builtin/repack.c +#: builtin/commit-graph.c builtin/fetch.c builtin/gc.c builtin/log.c +#: builtin/repack.c msgid "dir" msgstr "目录" @@ -5751,7 +5768,7 @@ msgstr "git commit-tree：无法读取" #: builtin/commit.c msgid "" -"git commit [-a | --interactive | --patch] [-s] [-v] [-u] [--amend]\n" +"git commit [-a | --interactive | --patch] [-s] [-v] [-u[]] [--amend]\n" " [--dry-run] [(-c | -C | --squash) | --fixup [(amend|" "reword):]]\n" " [-F | -m ] [--reset-author] [--allow-empty]\n" @@ -5761,7 +5778,7 @@ msgid "" " [(--trailer [(=|:)])...] [-S[]]\n" " [--] [...]" msgstr "" -"git commit [-a | --interactive | --patch] [-s] [-v] [-u<模式>] [--amend]\n" +"git commit [-a | --interactive | --patch] [-s] [-v] [-u[<模式>]] [--amend]\n" " [--dry-run] [(-c | -C | --squash) <提交> | --fixup [(amend|" "reword):]<提交>]\n" " [-F <文件> | -m <消息>] [--reset-author] [--allow-empty]\n" @@ -7473,14 +7490,13 @@ msgid "" "Run 'git remote set-head %s %s' to follow the change, or set\n" "'remote.%s.followRemoteHEAD' configuration option to a different value\n" "if you do not want to see this message. Specifically running\n" -"'git config set remote.%s.followRemoteHEAD %s' will disable the warning\n" -"until the remote changes HEAD to something else." +"'git config set remote.%s.followRemoteHEAD warn-if-not-branch-%s'\n" +"will disable the warning until the remote changes HEAD to something else." msgstr "" -"运行 'git remote set-head %s %s' 以跟随更改，或者\n" -"如果您不想看到此消息，则将'remote.%s.followRemoteHEAD' 配置选项设置为不同的" -"值。\n" -"特别地，运行 'git config set remote.%s.followRemoteHEAD %s' 将禁用警告，直到" -"远程将 HEAD 更改为其他内容。\"" +"运行 'git remote set-head %s %s' 同步变更，或通过配置选项\n" +"'remote.%s.followRemoteHEAD' 设置为其他值以屏蔽此提示。具体可通过\n" +"运行命令 'git config remote.%s.followRemoteHEAD warn-if-not-branch-%s'\n" +"以禁用该警告，直到远程将 HEAD 更改为其他内容。" #: builtin/fetch.c msgid "multiple branches detected, incompatible with --set-upstream" @@ -7721,8 +7737,8 @@ msgstr "协议不支持 --negotiate-only，退出" #: builtin/fetch.c msgid "" -"--filter can only be used with the remote configured in extensions." -"partialclone" +"--filter can only be used with the remote configured in " +"extensions.partialclone" msgstr "只可以将 --filter 用于在 extensions.partialclone 中配置的远程仓库" #: builtin/fetch.c @@ -8328,6 +8344,10 @@ msgstr "强制执行 gc 即使另外一个 gc 正在执行" msgid "repack all other packs except the largest pack" msgstr "除了最大的包之外，对所有其它包文件重新打包" +#: builtin/gc.c builtin/repack.c +msgid "pack prefix to store a pack containing pruned objects" +msgstr "用于存储修剪对象的包前缀" + #: builtin/gc.c #, c-format msgid "failed to parse gc.logExpiry value %s" @@ -9327,6 +9347,11 @@ msgstr "无法完成 pack-objects 来重新打包本地链接" msgid "Cannot come back to cwd" msgstr "无法返回当前工作目录" +#: builtin/index-pack.c builtin/unpack-objects.c +#, c-format +msgid "bad --pack_header: %s" +msgstr "错误的 --pack_header：%s" + #: builtin/index-pack.c #, c-format msgid "bad %s" @@ -10432,11 +10457,6 @@ msgstr "未知的策略选项：-X%s" msgid "malformed input line: '%s'." msgstr "格式错误的输入行：'%s'。" -#: builtin/merge-tree.c -#, c-format -msgid "merging cannot continue; got unclean result of %d" -msgstr "合并无法继续；得到不干净的结果 %d" - #: builtin/merge.c msgid "git merge [] [...]" msgstr "git merge [<选项>] [<提交>...]" @@ -11452,6 +11472,15 @@ msgid "" "git pack-objects [] [< | < ]" msgstr "git pack-objects [<选项>] <前缀名称> [< <引用列表> | < <对象列表>]" +#: builtin/pack-objects.c +#, c-format +msgid "invalid --name-hash-version option: %d" +msgstr "无效的 --name-hash-version 选项：%d" + +#: builtin/pack-objects.c +msgid "currently, --write-bitmap-index requires --name-hash-version=1" +msgstr "当前，--write-bitmap-index 要求 --name-hash-version=1" + #: builtin/pack-objects.c #, c-format msgid "" @@ -11857,7 +11886,11 @@ msgstr "协议" #: builtin/pack-objects.c msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" -msgstr "使用此协议排除任何已配置的 uploadpack.blobpackfileuri" +msgstr "排除掉采用该协议的 uploadpack.blobpackfileuri 配置项" + +#: builtin/pack-objects.c +msgid "use the specified name-hash function to group similar objects" +msgstr "使用指定的名称哈希函数对相似的对象进行分组" #: builtin/pack-objects.c #, c-format @@ -12284,8 +12317,8 @@ msgid "" "upstream, see 'push.autoSetupRemote' in 'git help config'.\n" msgstr "" "\n" -"为了让没有追踪上游的分支自动配置，参见 'git help config' 中的 push." -"autoSetupRemote。\n" +"为了让没有追踪上游的分支自动配置，参见 'git help config' 中的 " +"push.autoSetupRemote。\n" #: builtin/push.c #, c-format @@ -13294,8 +13327,8 @@ msgid "invalid ref format: %s" msgstr "无效的引用格式：%s" #: builtin/refs.c -msgid "git refs migrate --ref-format= [--dry-run]" -msgstr "git refs migrate --ref-format=<格式> [--dry-run]" +msgid "git refs migrate --ref-format= [--no-reflog] [--dry-run]" +msgstr "git refs migrate --ref-format=<格式> [--no-reflog] [--dry-run]" #: builtin/refs.c msgid "git refs verify [--strict] [--verbose]" @@ -13309,6 +13342,10 @@ msgstr "指定要转换的引用格式" msgid "perform a non-destructive dry-run" msgstr "进行非破坏性的试运行（dry-run）" +#: builtin/refs.c +msgid "drop reflogs entirely during the migration" +msgstr "在迁移期间丢弃引用日志" + #: builtin/refs.c msgid "missing --ref-format=" msgstr "缺少 --ref-format=<格式>" @@ -13881,8 +13918,14 @@ msgid "be verbose; must be placed before a subcommand" msgstr "冗长输出；必须置于子命令之前" #: builtin/repack.c -msgid "git repack []" -msgstr "git repack [<选项>]" +msgid "" +"git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" +"[--window=] [--depth=] [--threads=] [--keep-pack=]\n" +"[--write-midx] [--name-hash-version=]" +msgstr "" +"git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" +"[--window=] [--depth=] [--threads=] [--keep-pack=<包名>]\n" +"[--write-midx] [--name-hash-version=]" #: builtin/repack.c msgid "" @@ -13974,6 +14017,11 @@ msgstr "向 git-pack-objects 传递参数 --no-reuse-delta" msgid "pass --no-reuse-object to git-pack-objects" msgstr "向 git-pack-objects 传递参数 --no-reuse-object" +#: builtin/repack.c +msgid "" +"specify the name hash version to use for grouping similar objects by path" +msgstr "指定要使用的名称哈希算法，以实现按照路径对相似对象分组" + #: builtin/repack.c msgid "do not run git-update-server-info" msgstr "不运行 git-update-server-info" @@ -14038,10 +14086,6 @@ msgstr "使用因子 查找几何级数" msgid "write a multi-pack index of the resulting packs" msgstr "写入结果包的多包索引" -#: builtin/repack.c -msgid "pack prefix to store a pack containing pruned objects" -msgstr "储存被清除的对象的包的前缀" - #: builtin/repack.c msgid "pack prefix to store a pack containing filtered out objects" msgstr "储存被过滤的对象的包的前缀" @@ -14314,10 +14358,6 @@ msgstr "只能为 -l 提供一个模式" msgid "need some commits to replay" msgstr "需要一些提交来重放" -#: builtin/replay.c -msgid "--onto and --advance are incompatible" -msgstr "--onto 和 --advance 不兼容" - #: builtin/replay.c msgid "all positive revisions given must be references" msgstr "提供的所有正向版本必须为引用" @@ -17545,6 +17585,10 @@ msgstr "将一个 GNU Arch 仓库导入到 Git" msgid "Create an archive of files from a named tree" msgstr "基于一个指定的树创建文件存档" +#: command-list.h +msgid "Download missing objects in a partial clone" +msgstr "下载部分克隆中缺失的对象" + #: command-list.h msgid "Use binary search to find the commit that introduced a bug" msgstr "通过二分查找定位引入 bug 的提交" @@ -18927,8 +18971,8 @@ msgid "" "remote URLs cannot be configured in file directly or indirectly included by " "includeIf.hasconfig:remote.*.url" msgstr "" -"远程 URL 不能在文件中配置，不管直接地还是通过 includeIf.hasconfig:remote.*." -"url 间接地包含。" +"远程 URL 不能在文件中配置，不管直接地还是通过 " +"includeIf.hasconfig:remote.*.url 间接地包含。" #: config.c #, c-format @@ -19925,6 +19969,14 @@ msgstr "%s 的参数无效" msgid "invalid regex given to -I: '%s'" msgstr "选项 -I 的正则表达式无效：'%s'" +#: diff.c +msgid "-G requires a non-empty argument" +msgstr "-G 需要一个非空参数" + +#: diff.c +msgid "-S requires a non-empty argument" +msgstr "-S 需要一个非空参数" + #: diff.c #, c-format msgid "failed to parse --submodule option parameter: '%s'" @@ -22430,7 +22482,7 @@ msgstr "无法读取替代文件" #: object-file.c msgid "unable to move new alternates file into place" -msgstr "无法将新的替代文件移动到位" +msgstr "无法将新的备用文件移动到位" #: object-file.c #, c-format @@ -22551,6 +22603,11 @@ msgstr "文件 '%s' 和 '%s' 的内容不同" msgid "unable to write file %s" msgstr "无法写文件 %s" +#: object-file.c +#, c-format +msgid "unable to write repeatedly vanishing file %s" +msgstr "无法写入反复消失的文件 %s" + #: object-file.c #, c-format msgid "unable to set permission to '%s'" @@ -23233,6 +23290,55 @@ msgstr "未知开关 `%c'" msgid "unknown non-ascii option in string: `%s'" msgstr "字符串中未知的非 ascii 字符选项：`%s'" +#. TRANSLATORS: The "<%s>" part of this string +#. stands for an optional value given to a command +#. line option in the long form, and "<>" is there +#. as a convention to signal that it is a +#. placeholder (i.e. the user should substitute it +#. with the real value). If your language uses a +#. different convention, you can change "<%s>" part +#. to match yours, e.g. it might use "|%s|" instead, +#. or if the alphabet is different enough it may use +#. "%s" without any placeholder signal. Most +#. translations leave this message as is. +#. +#: parse-options.c +#, c-format +msgid "[=<%s>]" +msgstr "[=<%s>]" + +#. TRANSLATORS: The "<%s>" part of this string +#. stands for an optional value given to a command +#. line option in the short form, and "<>" is there +#. as a convention to signal that it is a +#. placeholder (i.e. the user should substitute it +#. with the real value). If your language uses a +#. different convention, you can change "<%s>" part +#. to match yours, e.g. it might use "|%s|" instead, +#. or if the alphabet is different enough it may use +#. "%s" without any placeholder signal. Most +#. translations leave this message as is. +#. +#: parse-options.c +#, c-format +msgid "[<%s>]" +msgstr "[<%s>]" + +#. TRANSLATORS: The "<%s>" part of this string stands for a +#. value given to a command line option, and "<>" is there +#. as a convention to signal that it is a placeholder +#. (i.e. the user should substitute it with the real value). +#. If your language uses a different convention, you can +#. change "<%s>" part to match yours, e.g. it might use +#. "|%s|" instead, or if the alphabet is different enough it +#. may use "%s" without any placeholder signal. Most +#. translations leave this message as is. +#. +#: parse-options.c +#, c-format +msgid " <%s>" +msgstr " <%s>" + #: parse-options.c msgid "..." msgstr "..." @@ -23336,6 +23442,25 @@ msgstr "对于 '%2$s' 的错误的布尔环境取值 '%1$s'" msgid "failed to parse %s" msgstr "无法解析 %s" +#: path-walk.c +#, c-format +msgid "failed to walk children of tree %s: not found" +msgstr "无法遍历树 %s 的子节点：未找到" + +#: path-walk.c +#, c-format +msgid "failed to find object %s" +msgstr "无法找到对象 %s" + +#: path-walk.c +#, c-format +msgid "failed to find tag %s" +msgstr "无法找到标签 %s" + +#: path-walk.c +msgid "failed to setup revision walk" +msgstr "无法设置版本遍历" + #: path.c #, c-format msgid "Could not make %s writable by group" @@ -23517,6 +23642,26 @@ msgstr "promisor 远程名称不能以 '/' 开始：%s" msgid "could not fetch %s from promisor remote" msgstr "无法从承诺者远程获取 %s" +#: promisor-remote.c +#, c-format +msgid "known remote named '%s' but with url '%s' instead of '%s'" +msgstr "已知远程名称为 '%s'，但 url 为 '%s' 而不是 '%s'" + +#: promisor-remote.c +#, c-format +msgid "unknown '%s' value for '%s' config option" +msgstr "配置项 '%2$s' 为未知的取值 '%1$s'" + +#: promisor-remote.c +#, c-format +msgid "unknown element '%s' from remote info" +msgstr "远程信息中的未知元素 '%s'" + +#: promisor-remote.c +#, c-format +msgid "accepted promisor remote '%s' not found" +msgstr "未找到已接受的承诺者远程 '%s'" + #: protocol-caps.c msgid "object-info: expected flush after arguments" msgstr "object-info：在参数之后应有一个 flush" @@ -24484,6 +24629,16 @@ msgstr "引用名 %s 是一个符号引用，不支持复制" msgid "invalid refspec '%s'" msgstr "无效的引用规格：'%s'" +#: refspec.c +#, c-format +msgid "pattern '%s' has no '*'" +msgstr "模式 '%s' 没有 '*'" + +#: refspec.c +#, c-format +msgid "replacement '%s' has no '*'" +msgstr "替换 '%s' 没有 '*'" + #: remote-curl.c #, c-format msgid "invalid quoting in push-option value: '%s'" @@ -24635,6 +24790,28 @@ msgstr "remote-curl：尝试没有本地仓库下获取" msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl：未知的来自 git 的命令 '%s'" +#: remote.c +#, c-format +msgid "" +"reading remote from \"%s/%s\", which is nominated for removal.\n" +"\n" +"If you still use the \"remotes/\" directory it is recommended to\n" +"migrate to config-based remotes:\n" +"\n" +"\tgit remote rename %s %s\n" +"\n" +"If you cannot, please let us know why you still need to use it by\n" +"sending an e-mail to ." +msgstr "" +"正在从 \"%s/%s\" 读取远程内容，该内容被提名删除。\n" +"\n" +"如果你仍然在使用 \"remotes/\" 目录，建议迁移为基于配置远程的方式：\n" +"\n" +"\tgit remote rename %s %s\n" +"\n" +"如果你无法迁移，请发送电子邮件至 告知我们你\n" +"仍然需要使用它的原因。" + #: remote.c #, c-format msgid "config remote shorthand cannot begin with '/': %s" @@ -24678,16 +24855,6 @@ msgstr "%s 通常跟踪 %s，而非 %s" msgid "%s tracks both %s and %s" msgstr "%s 同时跟踪 %s 和 %s" -#: remote.c -#, c-format -msgid "key '%s' of pattern had no '*'" -msgstr "模式的键 '%s' 没有 '*'" - -#: remote.c -#, c-format -msgid "value '%s' of pattern has no '*'" -msgstr "模式的值 '%s' 没有 '*'" - #: remote.c #, c-format msgid "src refspec %s does not match any" @@ -26956,6 +27123,34 @@ msgstr "在每次迭代前清除缓存树" msgid "number of entries in the cache tree to invalidate (default 0)" msgstr "缓存树中无效化的条目数量（默认 0）" +#: t/helper/test-path-walk.c +msgid "test-tool path-walk -- " +msgstr "test-tool path-walk <选项> -- <版本选项>" + +#: t/helper/test-path-walk.c +msgid "toggle inclusion of blob objects" +msgstr "切换是否包含数据对象" + +#: t/helper/test-path-walk.c +msgid "toggle inclusion of commit objects" +msgstr "切换是否包含提交对象" + +#: t/helper/test-path-walk.c +msgid "toggle inclusion of tag objects" +msgstr "切换是否包含标签对象" + +#: t/helper/test-path-walk.c +msgid "toggle inclusion of tree objects" +msgstr "切换是否包含树对象" + +#: t/helper/test-path-walk.c +msgid "toggle pruning of uninteresting paths" +msgstr "切换对无趣路径的修剪" + +#: t/helper/test-path-walk.c +msgid "read a pattern list over stdin" +msgstr "从标准输入读取模式列表" + #: t/helper/test-reach.c #, c-format msgid "commit %s is not marked reachable" @@ -27703,6 +27898,11 @@ msgstr "错误：" msgid "warning: " msgstr "警告：" +#: version.c +#, c-format +msgid "uname() failed with error '%s' (%d)\n" +msgstr "uname() 失败，错误为 '%s'（%d）\n" + #: walker.c msgid "Fetching objects" msgstr "正在获取对象" diff --git a/po/zh_TW.po b/po/zh_TW.po index a61f544304d34d..aa74d6537accf4 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -30,8 +30,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2024-12-28 13:16+0800\n" -"PO-Revision-Date: 2024-12-28 13:23+0800\n" +"POT-Creation-Date: 2025-03-09 10:39+0800\n" +"PO-Revision-Date: 2025-03-09 10:52+0800\n" "Last-Translator: Yi-Jyun Pan \n" "Language-Team: Chinese (Traditional) \n" @@ -2841,6 +2841,22 @@ msgstr "git archive：通訊協定錯誤" msgid "git archive: expected a flush" msgstr "git archive：預期收到 flush 封包" +#: builtin/backfill.c +msgid "git backfill [--min-batch-size=] [--[no-]sparse]" +msgstr "git backfill [--min-batch-size=] [--[no-]sparse]" + +#: builtin/backfill.c +msgid "problem loading sparse-checkout" +msgstr "載入稀疏簽出時發生問題" + +#: builtin/backfill.c +msgid "Minimum number of objects to request at a time" +msgstr "一次請求的最小物件數量" + +#: builtin/backfill.c +msgid "Restrict the missing objects to the current sparse-checkout" +msgstr "將缺少的物件限制於目前的稀疏簽出" + #: builtin/bisect.c msgid "" "git bisect start [--term-(new|bad)= --term-(old|good)=] [--no-" @@ -2872,22 +2888,22 @@ msgstr "git bisect run [...]" #: builtin/bisect.c #, c-format msgid "cannot open file '%s' in mode '%s'" -msgstr "無法以「%2$s」模式開啟「%1$s」檔案" +msgstr "無法以「%2$s」模式開啟檔案「%1$s」" #: builtin/bisect.c #, c-format msgid "could not write to file '%s'" -msgstr "無法寫入「%s」檔案" +msgstr "無法寫入檔案「%s」" #: builtin/bisect.c #, c-format msgid "cannot open file '%s' for reading" -msgstr "無法開啟「%s」檔案進行讀取" +msgstr "無法開啟檔案「%s」來讀取" #: builtin/bisect.c #, c-format msgid "'%s' is not a valid term" -msgstr "「%s」不是有效術語" +msgstr "「%s」不是有效的術語" #: builtin/bisect.c #, c-format @@ -2917,7 +2933,7 @@ msgstr "「%s」不是有效的提交" #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset '." -msgstr "無法簽出原始 HEAD「%s」。請嘗試「git bisect reset 」。" +msgstr "無法簽出原本的 HEAD「%s」。請嘗試「git bisect reset 」。" #: builtin/bisect.c #, c-format @@ -2937,7 +2953,7 @@ msgstr "無法開啟檔案「%s」" #: builtin/bisect.c #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" -msgstr "命令無效：您目前正處於二分搜尋 %s/%s 的狀態" +msgstr "命令無效：您正處於二分搜尋 %s/%s 的狀態" #: builtin/bisect.c #, c-format @@ -3263,7 +3279,7 @@ msgstr "顯示作者信箱而非名稱（預設值：off）" msgid "ignore whitespace differences" msgstr "忽略空白差異" -#: builtin/blame.c builtin/log.c +#: builtin/blame.c builtin/clone.c builtin/log.c msgid "rev" msgstr "rev" @@ -3775,11 +3791,6 @@ msgstr "" msgid "git version:\n" msgstr "git 版本：\n" -#: builtin/bugreport.c -#, c-format -msgid "uname() failed with error '%s' (%d)\n" -msgstr "uname() 失敗，錯誤：「%s」(%d)\n" - #: builtin/bugreport.c msgid "compiler info: " msgstr "編譯器資訊： " @@ -5010,8 +5021,112 @@ msgid "clean.requireForce is true and -f not given: refusing to clean" msgstr "clean.requireForce 是 true 且未給定 -f 選項：拒絕清理" #: builtin/clone.c -msgid "git clone [] [--] []" -msgstr "git clone [] [--] []" +#, c-format +msgid "info: Could not add alternate for '%s': %s\n" +msgstr "info: 不能為「%s」新增一個備用：%s\n" + +#: builtin/clone.c builtin/diff.c builtin/rm.c grep.c setup.c +#, c-format +msgid "failed to stat '%s'" +msgstr "對「%s」呼叫 stat 失敗" + +#: builtin/clone.c +#, c-format +msgid "%s exists and is not a directory" +msgstr "%s 存在且不是目錄" + +#: builtin/clone.c +#, c-format +msgid "'%s' is a symlink, refusing to clone with --local" +msgstr "「%s」是符號連結，故不能使用 --local 複製" + +#: builtin/clone.c +#, c-format +msgid "failed to start iterator over '%s'" +msgstr "無法在「%s」上啟動迭代器" + +#: builtin/clone.c +#, c-format +msgid "symlink '%s' exists, refusing to clone with --local" +msgstr "符號連結「%s」已存在，拒絕使用 --local 複製" + +#: builtin/clone.c compat/precompose_utf8.c +#, c-format +msgid "failed to unlink '%s'" +msgstr "無法刪除「%s」" + +#: builtin/clone.c +#, c-format +msgid "hardlink cannot be checked at '%s'" +msgstr "無法檢查位於「%s」的硬連結" + +#: builtin/clone.c +#, c-format +msgid "hardlink different from source at '%s'" +msgstr "硬連結與位於「%s」的來源不同" + +#: builtin/clone.c +#, c-format +msgid "failed to create link '%s'" +msgstr "建立連結「%s」失敗" + +#: builtin/clone.c +#, c-format +msgid "failed to copy file to '%s'" +msgstr "複製檔案至「%s」失敗" + +#: builtin/clone.c refs/files-backend.c +#, c-format +msgid "failed to iterate over '%s'" +msgstr "無法在「%s」上迭代" + +#: builtin/clone.c +#, c-format +msgid "done.\n" +msgstr "完成。\n" + +#: builtin/clone.c +msgid "" +"Clone succeeded, but checkout failed.\n" +"You can inspect what was checked out with 'git status'\n" +"and retry with 'git restore --source=HEAD :/'\n" +msgstr "" +"複製成功，但是簽出失敗。\n" +"您可以透過「git status」檢查哪些已被簽出，然後使用指令\n" +"「git restore --source=HEAD :/」重試\n" + +#: builtin/clone.c fetch-pack.c +msgid "remote did not send all necessary objects" +msgstr "遠端沒有傳送所有必需的物件" + +#: builtin/clone.c +#, c-format +msgid "unable to update %s" +msgstr "不能更新 %s" + +#: builtin/clone.c +msgid "failed to initialize sparse-checkout" +msgstr "無法初始化稀疏簽出" + +#: builtin/clone.c +msgid "remote HEAD refers to nonexistent ref, unable to checkout" +msgstr "遠端 HEAD 指向不存在的引用，無法簽出" + +#: builtin/clone.c +msgid "unable to checkout working tree" +msgstr "不能簽出工作區" + +#: builtin/clone.c +msgid "unable to write parameters to config file" +msgstr "無法將參數寫入組態檔案" + +#: builtin/clone.c +msgid "cannot repack to clean up" +msgstr "無法執行 repack 來清理" + +#: builtin/clone.c +msgid "cannot unlink temporary alternates file" +msgstr "無法刪除暫存 alternates 檔案" #: builtin/clone.c msgid "don't clone shallow repository" @@ -5083,6 +5198,10 @@ msgstr "使用 而不是「origin」追蹤上游" msgid "checkout instead of the remote's HEAD" msgstr "簽出 而不是遠端 HEAD" +#: builtin/clone.c +msgid "clone single revision and check out" +msgstr "複製單個修訂版 並簽出" + #: builtin/clone.c msgid "path to git-upload-pack on the remote" msgstr "遠端 git-upload-pack 路徑" @@ -5112,8 +5231,8 @@ msgid "clone only one branch, HEAD or --branch" msgstr "只複製一個分支、HEAD 或 --branch" #: builtin/clone.c -msgid "don't clone any tags, and make later fetches not to follow them" -msgstr "不要複製任何標籤，之後取得也不要追蹤這些標籤" +msgid "clone tags, and make later fetches not to follow them" +msgstr "複製標籤，並使後續抓取不要追蹤這些標籤" #: builtin/clone.c msgid "any cloned submodules will be shallow" @@ -5170,117 +5289,8 @@ msgid "a URI for downloading bundles before fetching from origin remote" msgstr "在從 origin 遠端抓取前，用來下載套件包的 URI" #: builtin/clone.c -#, c-format -msgid "info: Could not add alternate for '%s': %s\n" -msgstr "info: 不能為 '%s' 新增一個備用：%s\n" - -#: builtin/clone.c builtin/diff.c builtin/rm.c grep.c setup.c -#, c-format -msgid "failed to stat '%s'" -msgstr "對 '%s' 呼叫 stat 失敗" - -#: builtin/clone.c -#, c-format -msgid "%s exists and is not a directory" -msgstr "%s 存在且不是一個目錄" - -#: builtin/clone.c -#, c-format -msgid "'%s' is a symlink, refusing to clone with --local" -msgstr "「%s」是個符號連結，故不能使用 --local 複製" - -#: builtin/clone.c -#, c-format -msgid "failed to start iterator over '%s'" -msgstr "無法在 '%s' 上啟動疊代器" - -#: builtin/clone.c -#, c-format -msgid "symlink '%s' exists, refusing to clone with --local" -msgstr "「%s」符號連結已存在，拒絕使用 --local 複製" - -#: builtin/clone.c compat/precompose_utf8.c -#, c-format -msgid "failed to unlink '%s'" -msgstr "無法刪除「%s」" - -#: builtin/clone.c -#, c-format -msgid "hardlink cannot be checked at '%s'" -msgstr "無法檢查位於「%s」的硬連結" - -#: builtin/clone.c -#, c-format -msgid "hardlink different from source at '%s'" -msgstr "硬連結與位於 '%s' 的來源不同" - -#: builtin/clone.c -#, c-format -msgid "failed to create link '%s'" -msgstr "建立連結 '%s' 失敗" - -#: builtin/clone.c -#, c-format -msgid "failed to copy file to '%s'" -msgstr "複製檔案至 '%s' 失敗" - -#: builtin/clone.c refs/files-backend.c -#, c-format -msgid "failed to iterate over '%s'" -msgstr "無法在 '%s' 上疊代" - -#: builtin/clone.c -#, c-format -msgid "done.\n" -msgstr "完成。\n" - -#: builtin/clone.c -msgid "" -"Clone succeeded, but checkout failed.\n" -"You can inspect what was checked out with 'git status'\n" -"and retry with 'git restore --source=HEAD :/'\n" -msgstr "" -"複製成功，但是簽出失敗。\n" -"您可以透過 'git status' 檢查哪些已被簽出，然後使用指令\n" -"'git restore --source=HEAD :/' 重試\n" - -#: builtin/clone.c -#, c-format -msgid "Could not find remote branch %s to clone." -msgstr "找不到要複製的遠端分支 %s。" - -#: builtin/clone.c fetch-pack.c -msgid "remote did not send all necessary objects" -msgstr "遠端沒有傳送所有必需的物件" - -#: builtin/clone.c -#, c-format -msgid "unable to update %s" -msgstr "不能更新 %s" - -#: builtin/clone.c -msgid "failed to initialize sparse-checkout" -msgstr "無法初始化稀疏簽出" - -#: builtin/clone.c -msgid "remote HEAD refers to nonexistent ref, unable to checkout" -msgstr "遠端 HEAD 指向一個不存在的引用，無法簽出" - -#: builtin/clone.c -msgid "unable to checkout working tree" -msgstr "不能簽出工作區" - -#: builtin/clone.c -msgid "unable to write parameters to config file" -msgstr "無法將參數寫入設定檔案" - -#: builtin/clone.c -msgid "cannot repack to clean up" -msgstr "無法執行 repack 來清理" - -#: builtin/clone.c -msgid "cannot unlink temporary alternates file" -msgstr "無法刪除暫存 alternates 檔案" +msgid "git clone [] [--] []" +msgstr "git clone [] [--] []" #: builtin/clone.c msgid "Too many arguments." @@ -5404,7 +5414,12 @@ msgstr "遠端傳輸回報錯誤" #: builtin/clone.c #, c-format msgid "Remote branch %s not found in upstream %s" -msgstr "遠端分支 %s 在上游 %s 未發現" +msgstr "上游 %2$s 上找不到遠端分支 %1$s" + +#: builtin/clone.c +#, c-format +msgid "Remote revision %s not found in upstream %s" +msgstr "上游 %2$s 上找不到遠端修訂版 %1$s" #: builtin/clone.c msgid "You appear to have cloned an empty repository." @@ -5469,7 +5484,8 @@ msgstr "" "[no-]progress]\n" " " -#: builtin/commit-graph.c builtin/fetch.c builtin/log.c builtin/repack.c +#: builtin/commit-graph.c builtin/fetch.c builtin/gc.c builtin/log.c +#: builtin/repack.c msgid "dir" msgstr "目錄" @@ -5626,8 +5642,19 @@ msgid "git commit-tree: failed to read" msgstr "git commit-tree：讀取失敗" #: builtin/commit.c -msgid "" -"git commit [-a | --interactive | --patch] [-s] [-v] [-u] [--amend]\n" +#| msgid "" +#| "git commit [-a | --interactive | --patch] [-s] [-v] [-u] [--amend]\n" +#| " [--dry-run] [(-c | -C | --squash) | --fixup [(amend|" +#| "reword):]]\n" +#| " [-F | -m ] [--reset-author] [--allow-empty]\n" +#| " [--allow-empty-message] [--no-verify] [-e] [--" +#| "author=]\n" +#| " [--date=] [--cleanup=] [--[no-]status]\n" +#| " [-i | -o] [--pathspec-from-file= [--pathspec-file-nul]]\n" +#| " [(--trailer [(=|:)])...] [-S[]]\n" +#| " [--] [...]" +msgid "" +"git commit [-a | --interactive | --patch] [-s] [-v] [-u[]] [--amend]\n" " [--dry-run] [(-c | -C | --squash) | --fixup [(amend|" "reword):]]\n" " [-F | -m ] [--reset-author] [--allow-empty]\n" @@ -5637,7 +5664,7 @@ msgid "" " [(--trailer [(=|:)])...] [-S[]]\n" " [--] [...]" msgstr "" -"git commit [-a | --interactive | --patch] [-s] [-v] [-u] [--amend]\n" +"git commit [-a | --interactive | --patch] [-s] [-v] [-u[]] [--amend]\n" " [--dry-run] [(-c | -C | --squash) | --fixup [(amend|" "reword):]]\n" " [-F | -m ] [--reset-author] [--allow-empty]\n" @@ -7358,14 +7385,14 @@ msgid "" "Run 'git remote set-head %s %s' to follow the change, or set\n" "'remote.%s.followRemoteHEAD' configuration option to a different value\n" "if you do not want to see this message. Specifically running\n" -"'git config set remote.%s.followRemoteHEAD %s' will disable the warning\n" -"until the remote changes HEAD to something else." +"'git config set remote.%s.followRemoteHEAD warn-if-not-branch-%s'\n" +"will disable the warning until the remote changes HEAD to something else." msgstr "" -"執行「git remote set-head %s %s」以追蹤這個變更，或者\n" -"如果您不想看到這則訊息，請將「remote.%s.followRemoteHEAD」\n" -"組態選項設定成不同的值。更具體些來說，執行\n" -"「git config set remote.%s.followRemoteHEAD %s」會停用這個警告，\n" -"直到遠端將 HEAD 變更為其他內容。" +"執行「git remote set-head %s %s」來跟進此差異，或者\n" +"如果您不想看到這則訊息，請將「remote.%s.followRemoteHEAD」組態選項\n" +"設定成別的值。更具體些來說，執行\n" +"「git config set remote.%s.followRemoteHEAD warn-if-not-branch-%s」\n" +"會停用這個警告，直到遠端將 HEAD 改為指向其他東西。" #: builtin/fetch.c msgid "multiple branches detected, incompatible with --set-upstream" @@ -8216,6 +8243,10 @@ msgstr "強制執行 gc 即使另外一個 gc 正在執行" msgid "repack all other packs except the largest pack" msgstr "除了最大的包之外，對所有其它包重新打包" +#: builtin/gc.c builtin/repack.c +msgid "pack prefix to store a pack containing pruned objects" +msgstr "將前綴打包並儲存為包含已剪除物件的包" + #: builtin/gc.c #, c-format msgid "failed to parse gc.logExpiry value %s" @@ -9209,6 +9240,11 @@ msgstr "無法結束 pack-objects 來重新封包" msgid "Cannot come back to cwd" msgstr "無法返回目前工作目錄" +#: builtin/index-pack.c builtin/unpack-objects.c +#, c-format +msgid "bad --pack_header: %s" +msgstr "無效的 --pack_header：%s" + #: builtin/index-pack.c #, c-format msgid "bad %s" @@ -10311,11 +10347,6 @@ msgstr "未知的策略選項：-X%s" msgid "malformed input line: '%s'." msgstr "格式錯誤的輸入行：'%s'。" -#: builtin/merge-tree.c -#, c-format -msgid "merging cannot continue; got unclean result of %d" -msgstr "無法繼續合併：從 %d 收到的結果不乾淨" - #: builtin/merge.c msgid "git merge [] [...]" msgstr "git merge [<選項>] [<提交>...]" @@ -11332,6 +11363,15 @@ msgid "" "git pack-objects [] [< | < ]" msgstr "git pack-objects [<選項>] <前綴名稱> [< <引用列表> | < <物件列表>]" +#: builtin/pack-objects.c +#, c-format +msgid "invalid --name-hash-version option: %d" +msgstr "無效的 --name-hash-version 選項：%d" + +#: builtin/pack-objects.c +msgid "currently, --write-bitmap-index requires --name-hash-version=1" +msgstr "目前 --write-bitmap-index 需要指定 --name-hash-version=1" + #: builtin/pack-objects.c #, c-format msgid "" @@ -11468,8 +11508,8 @@ msgid "" "value of uploadpack.blobpackfileuri must be of the form ' ' (got '%s')" msgstr "" -"uploadpack.blobpackfileuri 的值格式必須為 ' " -"' (收到 '%s')" +"uploadpack.blobpackfileuri 的值格式必須為「 」" +"（收到「%s」）" #: builtin/pack-objects.c #, c-format @@ -11739,6 +11779,10 @@ msgstr "通訊協定" msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" msgstr "排除任何設定過，使用此通訊協定的 uploadpack.blobpackfileuri" +#: builtin/pack-objects.c +msgid "use the specified name-hash function to group similar objects" +msgstr "使用指定的名稱雜湊函式來為相似物件分組" + #: builtin/pack-objects.c #, c-format msgid "delta chain depth %d is too deep, forcing %d" @@ -13178,8 +13222,9 @@ msgid "invalid ref format: %s" msgstr "無效的引用格式：%s" #: builtin/refs.c -msgid "git refs migrate --ref-format= [--dry-run]" -msgstr "git refs migrate --ref-format=<格式> [--dry-run]" +#| msgid "git refs migrate --ref-format= [--dry-run]" +msgid "git refs migrate --ref-format= [--no-reflog] [--dry-run]" +msgstr "git refs migrate --ref-format= [--no-reflog] [--dry-run]" #: builtin/refs.c msgid "git refs verify [--strict] [--verbose]" @@ -13193,6 +13238,10 @@ msgstr "指定要轉換成的引用格式" msgid "perform a non-destructive dry-run" msgstr "進行非破壞性的試執行" +#: builtin/refs.c +msgid "drop reflogs entirely during the migration" +msgstr "在遷移過程中完全拋棄 reflog" + #: builtin/refs.c msgid "missing --ref-format=" msgstr "缺少 --ref-format=<格式>" @@ -13764,8 +13813,14 @@ msgid "be verbose; must be placed before a subcommand" msgstr "詳細輸出；必須置於子指令之前" #: builtin/repack.c -msgid "git repack []" -msgstr "git repack [<選項>]" +msgid "" +"git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" +"[--window=] [--depth=] [--threads=] [--keep-pack=]\n" +"[--write-midx] [--name-hash-version=]" +msgstr "" +"git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" +"[--window=] [--depth=] [--threads=] [--keep-pack=]\n" +"[--write-midx] [--name-hash-version=]" #: builtin/repack.c msgid "" @@ -13857,6 +13912,11 @@ msgstr "向 git-pack-objects 傳遞參數 --no-reuse-delta" msgid "pass --no-reuse-object to git-pack-objects" msgstr "向 git-pack-objects 傳遞參數 --no-reuse-object" +#: builtin/repack.c +msgid "" +"specify the name hash version to use for grouping similar objects by path" +msgstr "指定要用來以路徑為相似物件分組的名稱雜湊版本" + #: builtin/repack.c msgid "do not run git-update-server-info" msgstr "不執行 git-update-server-info" @@ -13921,10 +13981,6 @@ msgstr "尋找因數是 的等比數列" msgid "write a multi-pack index of the resulting packs" msgstr "寫入結果包的多包索引" -#: builtin/repack.c -msgid "pack prefix to store a pack containing pruned objects" -msgstr "封裝前綴，儲存為包含過時物件的套件包" - #: builtin/repack.c msgid "pack prefix to store a pack containing filtered out objects" msgstr "將前綴進行包裝，儲存為包含已過濾物件的封裝" @@ -14197,10 +14253,6 @@ msgstr "只能為 -l 提供一個模式" msgid "need some commits to replay" msgstr "需要一些提交才能重放" -#: builtin/replay.c -msgid "--onto and --advance are incompatible" -msgstr "--onto 和 --advance 不相容" - #: builtin/replay.c msgid "all positive revisions given must be references" msgstr "提供的所有正向修訂集必須為引用" @@ -17423,6 +17475,10 @@ msgstr "將一個 GNU Arch 版本庫匯入到 Git" msgid "Create an archive of files from a named tree" msgstr "基於命名過的樹建立檔案封存" +#: command-list.h +msgid "Download missing objects in a partial clone" +msgstr "在部分複製中下載缺少的物件" + #: command-list.h msgid "Use binary search to find the commit that introduced a bug" msgstr "透過二分搜尋定位引入 bug 的提交" @@ -18378,8 +18434,8 @@ msgstr "嘗試寫入提交圖，但「core.commitGraph」已停用" #: commit-graph.c #, c-format msgid "" -"attempting to write a commit-graph, but 'commitGraph." -"changedPathsVersion' (%d) is not supported" +"attempting to write a commit-graph, but 'commitGraph.changedPathsVersion' " +"(%d) is not supported" msgstr "嘗試寫入提交圖，但不支援「commitGraph.changedPathsVersion」（%d）" #: commit-graph.c @@ -19790,6 +19846,14 @@ msgstr "%s 的參數無效" msgid "invalid regex given to -I: '%s'" msgstr "傳入 -I 的常規表示式無效：「%s」" +#: diff.c +msgid "-G requires a non-empty argument" +msgstr "-G 需要非空白引數" + +#: diff.c +msgid "-S requires a non-empty argument" +msgstr "-S 需要非空白引數" + #: diff.c #, c-format msgid "failed to parse --submodule option parameter: '%s'" @@ -22417,6 +22481,11 @@ msgstr "「%s」和「%s」檔案內容不同" msgid "unable to write file %s" msgstr "無法寫檔案 %s" +#: object-file.c +#, c-format +msgid "unable to write repeatedly vanishing file %s" +msgstr "無法寫入重複消失的檔案 %s" + #: object-file.c #, c-format msgid "unable to set permission to '%s'" @@ -23100,6 +23169,55 @@ msgstr "未知開關 `%c'" msgid "unknown non-ascii option in string: `%s'" msgstr "字串中未知的非 ascii 字元選項：`%s'" +#. TRANSLATORS: The "<%s>" part of this string +#. stands for an optional value given to a command +#. line option in the long form, and "<>" is there +#. as a convention to signal that it is a +#. placeholder (i.e. the user should substitute it +#. with the real value). If your language uses a +#. different convention, you can change "<%s>" part +#. to match yours, e.g. it might use "|%s|" instead, +#. or if the alphabet is different enough it may use +#. "%s" without any placeholder signal. Most +#. translations leave this message as is. +#. +#: parse-options.c +#, c-format +msgid "[=<%s>]" +msgstr "[=<%s>]" + +#. TRANSLATORS: The "<%s>" part of this string +#. stands for an optional value given to a command +#. line option in the short form, and "<>" is there +#. as a convention to signal that it is a +#. placeholder (i.e. the user should substitute it +#. with the real value). If your language uses a +#. different convention, you can change "<%s>" part +#. to match yours, e.g. it might use "|%s|" instead, +#. or if the alphabet is different enough it may use +#. "%s" without any placeholder signal. Most +#. translations leave this message as is. +#. +#: parse-options.c +#, c-format +msgid "[<%s>]" +msgstr "[<%s>]" + +#. TRANSLATORS: The "<%s>" part of this string stands for a +#. value given to a command line option, and "<>" is there +#. as a convention to signal that it is a placeholder +#. (i.e. the user should substitute it with the real value). +#. If your language uses a different convention, you can +#. change "<%s>" part to match yours, e.g. it might use +#. "|%s|" instead, or if the alphabet is different enough it +#. may use "%s" without any placeholder signal. Most +#. translations leave this message as is. +#. +#: parse-options.c +#, c-format +msgid " <%s>" +msgstr " <%s>" + #: parse-options.c msgid "..." msgstr "..." @@ -23203,6 +23321,25 @@ msgstr "「%2$s」的「%1$s」布林環境值無效" msgid "failed to parse %s" msgstr "解析 %s 失敗" +#: path-walk.c +#, c-format +msgid "failed to walk children of tree %s: not found" +msgstr "無法走訪樹 %s 的子代：找不到" + +#: path-walk.c +#, c-format +msgid "failed to find object %s" +msgstr "找不到物件 %s" + +#: path-walk.c +#, c-format +msgid "failed to find tag %s" +msgstr "找不到標籤 %s" + +#: path-walk.c +msgid "failed to setup revision walk" +msgstr "無法設置修訂版走訪" + #: path.c #, c-format msgid "Could not make %s writable by group" @@ -23384,6 +23521,26 @@ msgstr "promisor 遠端名稱不能以 '/' 開始：%s" msgid "could not fetch %s from promisor remote" msgstr "無法從承諾者遠端抓取 %s" +#: promisor-remote.c +#, c-format +msgid "known remote named '%s' but with url '%s' instead of '%s'" +msgstr "已知有遠端名為「%s」，但其 URL 為「%s」而非「%s」" + +#: promisor-remote.c +#, c-format +msgid "unknown '%s' value for '%s' config option" +msgstr "「%2$s」組態選項的值「%1$s」未知" + +#: promisor-remote.c +#, c-format +msgid "unknown element '%s' from remote info" +msgstr "遠端資訊的元素「%s」未知" + +#: promisor-remote.c +#, c-format +msgid "accepted promisor remote '%s' not found" +msgstr "找不到接受的承諾者遠端「%s」" + #: protocol-caps.c msgid "object-info: expected flush after arguments" msgstr "object-info：引數後預期要有 flush" @@ -24351,6 +24508,16 @@ msgstr "引用名稱 %s 是符號引用，不支援複製" msgid "invalid refspec '%s'" msgstr "無效的引用規格：「%s」" +#: refspec.c +#, c-format +msgid "pattern '%s' has no '*'" +msgstr "符合模式「%s」中沒有「*」" + +#: refspec.c +#, c-format +msgid "replacement '%s' has no '*'" +msgstr "取代文字「%s」中沒有「*」" + #: remote-curl.c #, c-format msgid "invalid quoting in push-option value: '%s'" @@ -24502,6 +24669,28 @@ msgstr "remote-curl：嘗試沒有本機版本庫下取得" msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl：未知的來自 git 的指令 '%s'" +#: remote.c +#, c-format +msgid "" +"reading remote from \"%s/%s\", which is nominated for removal.\n" +"\n" +"If you still use the \"remotes/\" directory it is recommended to\n" +"migrate to config-based remotes:\n" +"\n" +"\tgit remote rename %s %s\n" +"\n" +"If you cannot, please let us know why you still need to use it by\n" +"sending an e-mail to ." +msgstr "" +"正在自「%s/%s」讀取遠端，該路徑已被標記為即將移除。\n" +"\n" +"如果您仍在使用「remotes/」目錄，建議您遷移至基於組態的遠端：\n" +"\n" +"\tgit remote rename %s %s\n" +"\n" +"如果您無法遷移，請告訴我們您為何仍需使用此功能，\n" +"請寄信至 。" + #: remote.c #, c-format msgid "config remote shorthand cannot begin with '/': %s" @@ -24545,16 +24734,6 @@ msgstr "%s 通常追蹤 %s，而非 %s" msgid "%s tracks both %s and %s" msgstr "%s 同時追蹤 %s 和 %s" -#: remote.c -#, c-format -msgid "key '%s' of pattern had no '*'" -msgstr "模式的鍵 '%s' 沒有 '*'" - -#: remote.c -#, c-format -msgid "value '%s' of pattern has no '*'" -msgstr "模式的值 '%s' 沒有 '*'" - #: remote.c #, c-format msgid "src refspec %s does not match any" @@ -26824,6 +27003,34 @@ msgstr "每次迭代前清除快取樹狀物件" msgid "number of entries in the cache tree to invalidate (default 0)" msgstr "在快取樹狀物件中，要使失效的項目數量（預設值為 0）" +#: t/helper/test-path-walk.c +msgid "test-tool path-walk -- " +msgstr "test-tool path-walk -- " + +#: t/helper/test-path-walk.c +msgid "toggle inclusion of blob objects" +msgstr "切換是否包含資料物件" + +#: t/helper/test-path-walk.c +msgid "toggle inclusion of commit objects" +msgstr "切換是否包含提交物件" + +#: t/helper/test-path-walk.c +msgid "toggle inclusion of tag objects" +msgstr "切換是否包含標籤物件" + +#: t/helper/test-path-walk.c +msgid "toggle inclusion of tree objects" +msgstr "切換是否包含樹狀物件" + +#: t/helper/test-path-walk.c +msgid "toggle pruning of uninteresting paths" +msgstr "切換是否剪除不重要路徑" + +#: t/helper/test-path-walk.c +msgid "read a pattern list over stdin" +msgstr "從標準輸入讀取模式清單" + #: t/helper/test-reach.c #, c-format msgid "commit %s is not marked reachable" @@ -27571,6 +27778,11 @@ msgstr "錯誤: " msgid "warning: " msgstr "警告: " +#: version.c +#, c-format +msgid "uname() failed with error '%s' (%d)\n" +msgstr "uname() 失敗，錯誤：「%s」(%d)\n" + #: walker.c msgid "Fetching objects" msgstr "正在抓取物件" @@ -28757,6 +28969,24 @@ msgstr "略過 %s 含備份後綴 '%s'。\n" msgid "Do you really want to send %s? [y|N]: " msgstr "您真的要傳送 %s？[y|N]： " +#, c-format +#~ msgid "Could not find remote branch %s to clone." +#~ msgstr "找不到要複製的遠端分支 %s。" + +#, c-format +#~ msgid "merging cannot continue; got unclean result of %d" +#~ msgstr "無法繼續合併：從 %d 收到的結果不乾淨" + +#~ msgid "git repack []" +#~ msgstr "git repack [<選項>]" + +#~ msgid "--onto and --advance are incompatible" +#~ msgstr "--onto 和 --advance 不相容" + +#, c-format +#~ msgid "key '%s' of pattern had no '*'" +#~ msgstr "模式的鍵 '%s' 沒有 '*'" + #, c-format #~ msgid "preferred pack (%s) is invalid" #~ msgstr "偏好的封包 (%s) 無效" diff --git a/t/t0091-bugreport.sh b/t/t0091-bugreport.sh index e11d819b62a150..e38ca7a9018751 100755 --- a/t/t0091-bugreport.sh +++ b/t/t0091-bugreport.sh @@ -47,7 +47,8 @@ test_expect_success 'sanity check "System Info" section' ' # This is bound to differ from environment to environment, # so we just do some rather high-level checks. grep "uname: ." system && - grep "compiler info: ." system + grep "compiler info: ." system && + grep "zlib." system ' test_expect_success 'dies if file with same name as report already exists' '