diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-06-28 08:28:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-06-28 08:28:08 -0700 |
| commit | 9aa172cd1f113276d360d4e48937dc95ef46b780 (patch) | |
| tree | 16499842f9fde3a88f0d7f1adb99c5777f6ad29c | |
| parent | 6c3d7b73556db708feb3b16232fab1efc4353428 (diff) | |
| parent | 08621c32d5536babd139ab1a9086349b3672edd6 (diff) | |
Merge tag 'l10n-2.55.0-v1' of https://github.com/git-l10n/git-po
l10n-2.55.0-v1
* tag 'l10n-2.55.0-v1' of https://github.com/git-l10n/git-po:
l10n: zh-TW.po: Update Chinese (Traditional) translation
l10n: uk: add 2.55 translation
l10n: ga.po: update for Git 2.55
l10n: fr: mass fix of typos
l10n: fr: version 2.55
l10n: po-id for 2.55
l10n: AGENTS.md: add quotation mark preservation guidelines
l10n: zh_CN: updated translation for 2.55
l10n: TEAMS: change Simplified Chinese team leader
l10n: sv.po: Update Swedish translation
l10n: ca.po: update Catalan translation
l10n: tr: Update Turkish translations
l10n: bg.po: Updated Bulgarian translation (6322t)
l10n: it: fix italian usage messages alignment
| -rw-r--r-- | po/AGENTS.md | 51 | ||||
| -rw-r--r-- | po/TEAMS | 6 | ||||
| -rw-r--r-- | po/bg.po | 796 | ||||
| -rw-r--r-- | po/ca.po | 1421 | ||||
| -rw-r--r-- | po/fr.po | 836 | ||||
| -rw-r--r-- | po/ga.po | 864 | ||||
| -rw-r--r-- | po/id.po | 2278 | ||||
| -rw-r--r-- | po/it.po | 2 | ||||
| -rw-r--r-- | po/sv.po | 784 | ||||
| -rw-r--r-- | po/tr.po | 752 | ||||
| -rw-r--r-- | po/uk.po | 2378 | ||||
| -rw-r--r-- | po/zh_CN.po | 1032 | ||||
| -rw-r--r-- | po/zh_TW.po | 2257 |
13 files changed, 9697 insertions, 3760 deletions
diff --git a/po/AGENTS.md b/po/AGENTS.md index feb90d4d24..94af128b46 100644 --- a/po/AGENTS.md +++ b/po/AGENTS.md @@ -127,6 +127,52 @@ etc.), and quotes exactly as in `msgid`. Only reorder placeholders with positional syntax when needed (see Placeholder Reordering below). +### Preserving Quotation Marks + +Some languages use language-specific UTF-8 quotation marks (curly/smart +quotes) rather than ASCII straight quotes. **Always preserve these +characters exactly as they appear in the source.** Do **not** convert them +to ASCII straight quotes. + +**Protected quotation marks** (non-exhaustive list): + +| Character | Unicode | Name | Languages | +|-----------|---------|------|-----------| +| „ | U+201E | DOUBLE LOW-9 QUOTATION MARK | Bulgarian, German, etc. | +| " | U+201C | LEFT DOUBLE QUOTATION MARK | Bulgarian, etc. | +| " | U+201D | RIGHT DOUBLE QUOTATION MARK | English, German, etc. | +| ' | U+2018 | LEFT SINGLE QUOTATION MARK | English, etc. | +| ' | U+2019 | RIGHT SINGLE QUOTATION MARK | English, etc. | +| « | U+00AB | LEFT-POINTING DOUBLE ANGLE QUOTATION MARK | French, Russian, etc. | +| » | U+00BB | RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK | French, Russian, etc. | +| ‹ | U+2039 | SINGLE LEFT-POINTING ANGLE QUOTATION MARK | French, etc. | +| › | U+203A | SINGLE RIGHT-POINTING ANGLE QUOTATION MARK | French, etc. | + +**Why this matters in PO files**: In PO file format, the ASCII straight +double quote `"` (U+0022) is the **string delimiter**. If a translation +contains a curly quote that is incorrectly converted to `"` (U+0022), +the PO parser will interpret it as the end of the string, causing: + +1. **String truncation**: The `msgstr` value is cut short at the + spurious quote character. +2. **Syntax errors**: `msgfmt --check` fails with parse errors at + the line where the string was prematurely terminated. +3. **Data loss**: Content after the accidental quote delimiter is + misinterpreted or lost. + +**Rules**: + +- **Never** replace language-specific quotation marks with ASCII + straight quotes `"` (U+0022) or `'` (U+0027). +- Apply this rule when translating PO files, PO multi-line strings, + and GETTEXT JSON `msgstr` array values. +- Apply this rule when generating suggested translations + (`suggest_msgstr`) during review. +- If the source `msgid` uses ASCII straight quotes, preserve them + as-is in the translation unless the target language convention + requires different quotation marks. + + ### Placeholder Reordering When reordering placeholders relative to `msgid`, use positional syntax (`%n$`) @@ -387,7 +433,10 @@ read and write this format. - **Placeholders**: Preserve variables (`%s`, `{name}`, `$1`) exactly; use positional parameters when reordering (see "Placeholder Reordering" above). - **Special characters**: Preserve escape sequences (`\n`, `\"`, `\\`, `\t`), - placeholders exactly as in `msgid`. See "Preserving Special Characters" above. + placeholders exactly as in `msgid`. Preserve language-specific quotation + marks (curly/smart quotes like „, ", ", ', ') — do not convert them to + ASCII straight quotes. See "Preserving Special Characters" and + "Preserving Quotation Marks" above. - **Plurals and gender**: Correct forms and agreement. - **Context fit**: Suitable for UI space, tone, and use (e.g. error vs. tooltip). - **Cultural appropriateness**: No offensive or ambiguous content. @@ -83,12 +83,12 @@ Members: Trần Ngọc Quân <vnwildman AT gmail.com> Nguyễn Thái Ngọc Duy <pclouds AT gmail.com> Language: zh_CN (Simplified Chinese) -Repository: https://github.com/dyrone/git/ -Leader: Teng Long <dyroneteng AT gmail.com> +Repository: https://github.com/lilydjwg/git-po +Leader: 依云 <lilydjwg AT gmail.com> Members: Ray Chen <oldsharp AT gmail.com> - 依云 <lilydjwg AT gmail.com> Fangyi Zhou <me AT fangyi.io> Jiang Xin <worldhello.net AT gmail.com> + Teng Long <dyroneteng AT gmail.com> Language: zh_TW (Traditional Chinese) Repository: https://github.com/l10n-tw/git-po @@ -266,6 +266,11 @@ # rate limited скоростта е ограничена # submodule подмодул # credential идентификационни данни +# backfill допълване на информация +# negotiate/negotiation договарям, договаряне +# API програмен интерфейс, библиотека +# compact уплътнявам +# compaction уплътняване # ------------------------ # „$var“ - може да не сработва за shell има gettext и eval_gettext - проверка - намират се лесно по „$ # ------------------------ @@ -296,8 +301,8 @@ msgid "" msgstr "" "Project-Id-Version: git v2.53.0-rc0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2026-04-19 16:08+0200\n" -"PO-Revision-Date: 2026-04-19 16:07+0200\n" +"POT-Creation-Date: 2026-06-24 13:30+0200\n" +"PO-Revision-Date: 2026-06-24 14:05+0200\n" "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" "Language: bg\n" @@ -1972,30 +1977,30 @@ msgstr "" #, c-format msgid "" -"The merge base %s is %s.\n" +"The merge base %s is '%s'.\n" "This means the first '%s' commit is between %s and [%s].\n" msgstr "" -"Базата за сливане „%s“ е %s.\n" -"Следователно първото %s подаване е между „%s“ и [%s].\n" +"Базата за сливане „%s“ е „%s“.\n" +"Следователно първото подаване „%s“ е между „%s“ и [%s].\n" #, c-format msgid "" -"Some %s revs are not ancestors of the %s rev.\n" +"Some '%s' revs are not ancestors of the '%s' rev.\n" "git bisect cannot work properly in this case.\n" -"Maybe you mistook %s and %s revs?\n" +"Maybe you mistook '%s' and '%s' revs?\n" msgstr "" -"Някои от указателите от „%s“ не са предшественици на указателя „%s“.\n" +"Някои от версиите от „%s“ не са предшественици на версията „%s“.\n" "Двоичното търсене с git bisect няма да работи правилно.\n" "Дали не сте объркали указателите „%s“ и „%s“?\n" #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" -"So we cannot be sure the first %s commit is between %s and %s.\n" +"So we cannot be sure the first '%s' commit is between %s and %s.\n" "We continue anyway." msgstr "" -"базата за сливане между „%s“ и [%s] трябва да се прескочи.\n" -"Не може да сме сигурни, че първото %s подаване е между „%s“ и „%s“.\n" +"базата за сливане между %s и [%s] трябва да се прескочи.\n" +"Не може да сме сигурни, че първото подаване „%s“ е между „%s“ и „%s“.\n" "Двоичното търсене продължава." #, c-format @@ -2003,7 +2008,7 @@ msgid "Bisecting: a merge base must be tested\n" msgstr "Двоично търсене: трябва да се провери база за сливане\n" #, c-format -msgid "a %s revision is needed" +msgid "a '%s' revision is needed" msgstr "необходима е версия „%s“" #, c-format @@ -2022,7 +2027,7 @@ msgid "reading bisect refs failed" msgstr "неуспешно прочитане на указателите за двоично търсене" #, c-format -msgid "%s was both %s and %s\n" +msgid "%s was both '%s' and '%s'\n" msgstr "„%s“ e както „%s“, така и „%s“\n" #, c-format @@ -2798,8 +2803,24 @@ msgstr "git archive: протоколна грешка" msgid "git archive: expected a flush" msgstr "git archive: очакваше се изчистване на буферите чрез „flush“" -msgid "git backfill [--min-batch-size=<n>] [--[no-]sparse]" -msgstr "git backfill [--min-batch-size=БРОЙ] [--[no-]sparse]" +msgid "" +"git backfill [--min-batch-size=<n>] [--[no-]sparse] [--[no-]include-edges] " +"[<revision-range>]" +msgstr "" +"git backfill [--min-batch-size=БРОЙ] [--[no-]sparse] [--[no-]include-edges] " +"[ДИАПАЗОН_НА_ВЕРСИИТЕ]" + +#, c-format +msgid "'%s' cannot be used with 'git backfill'" +msgstr "опцията „%s“ е несъвместима с „git backfill“" + +msgid "cannot backfill with these filter options" +msgstr "не може да се допълва информация с тези опции на филтър" + +msgid "cannot backfill with blob size limits" +msgstr "" +"не може да се допълва информация при такива граници на размерите на обекти-" +"BLOB" msgid "problem loading sparse-checkout" msgstr "проблем при зареждане на частично хранилище" @@ -2810,6 +2831,11 @@ msgstr "Минимален БРОЙ обекти заявявани наведн msgid "Restrict the missing objects to the current sparse-checkout" msgstr "Ограничаване на липсващите обекти до текущото частично хранилище" +msgid "Include blobs from boundary commits in the backfill" +msgstr "" +"Включване на обектите-BLOB от граничните подавания при допълването на " +"информацията" + #, c-format msgid "unrecognized argument: %s" msgstr "непознат аргумент: %s" @@ -2929,30 +2955,33 @@ msgstr "двоично търсене само по „%s“ подаване." msgid "Are you sure [Y/n]? " msgstr "Да се продължи ли? „Y“ — ДА, „n“ — не" -msgid "status: waiting for both good and bad commits\n" -msgstr "състояние: чакане и за добро, и за лошо подаване\n" +#, c-format +msgid "status: waiting for both '%s' and '%s' commits\n" +msgstr "състояние: чакане и за „%s“, и за „%s“ подаване\n" #, c-format -msgid "status: waiting for bad commit, %d good commit known\n" -msgid_plural "status: waiting for bad commit, %d good commits known\n" -msgstr[0] "състояние: чакане за лошо подаване, известно е %d добро подаване\n" +msgid "status: waiting for '%s' commit, %d '%s' commit known\n" +msgid_plural "status: waiting for '%s' commit, %d '%s' commits known\n" +msgstr[0] "" +"състояние: чакане за „%s“ подаване, известно е %d подаване означено „%s“\n" msgstr[1] "" -"състояние: чакане за лошо подаване, известни са %d добри подавания\n" +"състояние: чакане за „%s“ подаване, известни са %d подавания означени „%s“\n" -msgid "status: waiting for good commit(s), bad commit known\n" +#, c-format +msgid "status: waiting for '%s' commit(s), '%s' commit known\n" msgstr "" -"състояние: чакане за добро подаване, известно е поне едно лошо подаване\n" +"състояние: чакане за „%s“ подаване, известно е поне едно „%s“ подаване\n" msgid "no terms defined" msgstr "не са указани управляващи думи" #, c-format msgid "" -"Your current terms are %s for the old state\n" -"and %s for the new state.\n" +"Your current terms are '%s' for the old state\n" +"and '%s' for the new state.\n" msgstr "" -"Текущите управляващи думи са: %s за старото състояние\n" -"и %s за новото състояние.\n" +"Текущите управляващи думи са: „%s“ за старото състояние\n" +"и „%s“ за новото състояние.\n" #, c-format msgid "" @@ -3040,12 +3069,12 @@ msgid "bisect run failed: no command provided." msgstr "неуспешно двоично търсене, не е зададена команда." #, c-format -msgid "unable to verify %s on good revision" -msgstr "„%s“ не може да провери с добра версия" +msgid "unable to verify %s on '%s' revision" +msgstr "%s не може да се провери при версия „%s“" #, c-format -msgid "bogus exit code %d for good revision" -msgstr "неправилен изходен код %d за добро подаване" +msgid "bogus exit code %d for '%s' revision" +msgstr "неправилен изходен код %d при версия „%s“" #, c-format msgid "bisect run failed: exit code %d from %s is < 0 or >= 128" @@ -3063,8 +3092,9 @@ msgstr "двоичното търсене не може да продължи" msgid "bisect run success" msgstr "успешно двоично търсене" -msgid "bisect found first bad commit" -msgstr "двоичното търсене откри първото лошо подаване" +#, c-format +msgid "bisect found first '%s' commit\n" +msgstr "двоичното търсене откри първото „%s“ подаване\n" #, c-format msgid "bisect run failed: 'git bisect %s' exited with error code %d" @@ -3766,6 +3796,12 @@ msgstr "Разпакетиране на пратки от обекти" msgid "cannot read object %s '%s'" msgstr "обектът „%s“ (%s) не може да се прочете" +#, c-format +msgid "mailmap: invalid boolean '%s'" +msgstr "" +"файл за съответствията на имената и адресите на е-поща: неправилна булева " +"стойност „%s“" + msgid "flush is only for --buffer mode" msgstr "изчистването на буферите (flush) се ползва само за „--buffer“" @@ -4129,15 +4165,6 @@ msgid "you need to resolve your current index first" msgstr "първо трябва да коригирате индекса си" #, c-format -msgid "" -"cannot continue with staged changes in the following files:\n" -"%s" -msgstr "" -"не може да се продължи с промѐни в следните файлове, които са добавени в " -"индекса:\n" -"%s" - -#, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Журналът на указателите за „%s“ не може да се проследи: %s\n" @@ -4228,6 +4255,10 @@ msgid "You are on a branch yet to be born" msgstr "В момента сте на клон, който все още не е създаден" #, c-format +msgid "The following paths have local changes:\n" +msgstr "Следните пътища са с локални промени:\n" + +#, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" "Please use -- (and optionally --no-guess) to disambiguate" @@ -5822,6 +5853,22 @@ msgid "wrong number of arguments, should be from %d to %d" msgstr "неправилен брой аргументи, трябва да е от %d до %d включително" #, c-format +msgid "missing value to set to the variable '%s'" +msgstr "липсва стойност, която да се зададе на променливата „%s“" + +#, c-format +msgid "did you mean \"git config set %s %s\"?" +msgstr "" +"следната команда ли искахте да изпълните:\n" +"\n" +" git config set %s %s" + +#, c-format +msgid "missing value to set to a variable with an invalid name '%s'" +msgstr "" +"липсва стойност, която да се зададе на променливата с неправилно име „%s“" + +#, c-format msgid "invalid key pattern: %s" msgstr "неправилен шаблон за ключ: „%s“" @@ -7275,14 +7322,18 @@ msgid "option \"%s\" is ignored for %s" msgstr "опцията „%s“ се прескача при „%s“" #, c-format -msgid "%s is not a valid object" -msgstr "„%s“ е неправилен обект" - -#, c-format msgid "the object %s does not exist" msgstr "обектът „%s“ не съществува" #, c-format +msgid "ignoring %s=%s because it does not match any refs" +msgstr "„%s=%s“ се прескача, защото не съвпада с никой указател" + +#, c-format +msgid "ignoring %s because the protocol does not support it" +msgstr "„%s“ се прескача, защото протоколът не го поддържа" + +#, c-format msgid "" "Run 'git remote set-head %s %s' to follow the change, or set\n" "'remote.%s.followRemoteHEAD' configuration option to a different value\n" @@ -7494,6 +7545,10 @@ msgstr "ВЕРСИЯ" msgid "report that we have only objects reachable from this object" msgstr "докладване, че всички обекти може са достижими при започване от този" +msgid "ensure this ref is always sent as a negotiation have" +msgstr "" +"уверете се, че този указател винаги бива пращан по време на договарянето" + msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" msgstr "" "без доставяне на пакетни файлове, вместо това да се извеждат предшественици " @@ -7511,11 +7566,6 @@ msgstr "запазване на гра̀фа с подаванията след msgid "accept refspecs from stdin" msgstr "четене на указателите от стандартния вход" -msgid "--negotiate-only needs one or more --negotiation-tip=*" -msgstr "" -"Опцията „--negotiate-only“ изисква една или повече опции „--negotiation-" -"tip=*“" - msgid "negative depth in --deepen is not supported" msgstr "отрицателна дълбочина като аргумент на „--deepen“ не се поддържа" @@ -7545,6 +7595,10 @@ msgstr "опцията „--negotiate-only“ изисква хранилище" msgid "protocol does not support --negotiate-only, exiting" msgstr "протоколът не поддържа опцията „--negotiate-only“, изход от програмата" +#, c-format +msgid "%s needs one or more %s" +msgstr "опцията „%s“ изисква поне една опция „%s“" + msgid "" "--filter can only be used with the remote configured in " "extensions.partialclone" @@ -7877,6 +7931,10 @@ msgid "value of '%s' not bool or int: %d" msgstr "СТОЙНОСТТА на „%s“ не е нито булева, нито целочислена, а трябва: %d" #, c-format +msgid "daemon did not stop within %d seconds" +msgstr "демонът не спря в рамките на %d секунди" + +#, c-format msgid "fsmonitor-daemon is watching '%s'\n" msgstr "fsmonitor-daemon наблюдава „%s“\n" @@ -7922,6 +7980,9 @@ msgstr "процесът „fsmonitor--daemon“ вече е стартирал msgid "running fsmonitor-daemon in '%s'\n" msgstr "процесът „fsmonitor-daemon“ се стартира в „%s“\n" +msgid "setsid failed" +msgstr "неуспешно изпълнение на „setsid“" + #, c-format msgid "starting fsmonitor-daemon in '%s'\n" msgstr "стартиране на процеса „fsmonitor-daemon“ в „%s“\n" @@ -8616,6 +8677,13 @@ msgstr "употреба: %s%s" msgid "'git help config' for more information" msgstr "За повече информация изпълнете „git help config“" +msgid "" +"git history fixup <commit> [--dry-run] [--update-refs=(branches|head)] [--" +"reedit-message] [--empty=(drop|keep|abort)]" +msgstr "" +"git history fixup ПОДАВАНЕ [--dry-run] [--update-refs=(branches|head)] [--" +"reedit-message] [--empty=(drop|keep|abort)]" + msgid "git history reword <commit> [--dry-run] [--update-refs=(branches|head)]" msgstr "" "git history reword ПОДАВАНЕ [--dry-run] [--update-refs=(branches|head)]" @@ -8680,25 +8748,85 @@ msgstr "указателят „%s“ не може да се обнови: %s" msgid "failed to commit ref transaction: %s" msgstr "транзакцията за указатели не може да се завърши: %s" +#, c-format +msgid "unable to parse parent of %s" +msgstr "родителското подаване на „%s“ не може да се анализира" + +#, c-format +msgid "" +"unrecognized '--empty=' action '%s'; valid values are \"drop\", \"keep\", " +"and \"abort\"." +msgstr "" +"неправилно действие за „--empty=“: „%s“, вариантите са „drop“ (прескачане), " +"„keep“ (запазване) и „abort“ (преустановяване)" + msgid "control which refs should be updated" msgstr "кои указатели да се обновят" msgid "perform a dry-run without updating any refs" msgstr "пробно изпълнение без промяна на указатели" +msgid "open an editor to modify the commit message" +msgstr "отваряне на текстов редактор за промяна на съобщението при подаване" + +msgid "how to handle commits that become empty" +msgstr "как да се обработват оказалите се празни подавания" + msgid "command expects a single revision" msgstr "командата изисква точно една версия" +msgid "cannot run fixup in a bare repository" +msgstr "" +"вкарването на подаване в предходното не може да се изпълни в голо хранилище" + #, c-format msgid "commit cannot be found: %s" msgstr "подаването липсва: %s" -msgid "failed writing reworded commit" -msgstr "подаването с променено съобщение не може да се презапише" +msgid "cannot get tree for HEAD" +msgstr "дървото към указателя „HEAD“ не може да се получи" + +msgid "unable to read index" +msgstr "индексът не може да се прочете" + +msgid "nothing to fixup: no staged changes" +msgstr "няма какво да се добави към предходно подаване: в индекса няма промени" + +msgid "unable to write index as a tree" +msgstr "индексът не може да се запише като дърво" + +#, c-format +msgid "cannot get tree for commit %s" +msgstr "дървото към подаване „%s“ не може да се получи" + +msgid "merge failed while applying fixup" +msgstr "неуспешно сливане по време на вкарване на подаване в предходното му" + +msgid "fixup would produce conflicts; aborting" +msgstr "" +"вкарването на подаването в предходното ще доведе до конфликти, " +"преустановяване на действието" + +#, c-format +msgid "cannot drop root commit %s: it has no parent to replay onto" +msgstr "" +"първото подаване „%s“ не може да се прескочи, защото няма родителско " +"подаване, върху което да се пребазират другите" + +#, c-format +msgid "fixup makes commit %s empty" +msgstr "" +"вкарването на подаването в предходното ще доведе до празно подаване „%s“" + +msgid "failed writing fixed-up commit" +msgstr "неуспешно запазване на подаване, в което е вкарано друго" msgid "failed replaying descendants" msgstr "неуспешно повторно прилагане на наследниците" +msgid "failed writing reworded commit" +msgstr "подаването с променено съобщение не може да се презапише" + msgid "unable to populate index with tree" msgstr "индексът не може да се попълни с дървото" @@ -8734,9 +8862,11 @@ msgstr "подаване за сливане не може да се разде msgid "" "git hook run [--allow-unknown-hook-name] [--ignore-missing] [--to-" -"stdin=<path>] <hook-name> [-- <hook-args>]" +"stdin=<path>] [(-j|--jobs) <n>]\n" +"<hook-name> [-- <hook-args>]" msgstr "" "git hook run [--allow-unknown-hook-name] [--ignore-missing] [--to-stdin=ПЪТ] " +"[(-j|--jobs) БРОЙ]\n" "КУКА [-- АРГУМЕНТ_ЗА_КУКА…]" msgid "" @@ -8777,6 +8907,17 @@ msgstr "прескачане на заявена КУКА, която липсв msgid "file to read into hooks' stdin" msgstr "файл за изчитане от стандартния вход на куката" +msgid "run up to <n> hooks simultaneously (-1 for CPU count)" +msgstr "" +"изпълняване на максимално този БРОЙ куки едновременно (-1 ползва броя " +"налични процесори)" + +#, c-format +msgid "invalid value for -j: %d (use -1 for CPU count or a positive integer)" +msgstr "" +"неправилна стойност за „-j“: %d (ползвайте положително число или -1 за броя " +"налични процесори)" + #, c-format msgid "object type mismatch at %s" msgstr "неправилен вид на обекта „%s“" @@ -8826,6 +8967,9 @@ msgstr "повреден обект в пакетния файл при отме msgid "inflate returned %d" msgstr "декомпресирането с „inflate“ върна %d" +msgid "object size too large for this platform" +msgstr "размерът на обекта е прекалено голям за тази платформа" + msgid "offset value overflow for delta base object" msgstr "стойността на отместването за обекта-разлика води до препълване" @@ -9803,7 +9947,7 @@ msgstr "" "откриване на предшествениците за еднократно сливане на множество истории" msgid "list revs not reachable from others" -msgstr "извеждане на недостижимите от другите указатели" +msgstr "извеждане на недостижимите от другите версии" msgid "is the first one ancestor of the other?" msgstr "ПОДАВАНЕ_1 предшественик ли е на ПОДАВАНЕ_2?" @@ -10261,18 +10405,22 @@ msgstr "разрешаване на създаването на повече о msgid "" "git multi-pack-index [<options>] write [--preferred-pack=<pack>]\n" " [--[no-]bitmap] [--[no-]incremental] [--[no-]stdin-packs]\n" -" [--refs-snapshot=<path>]" +" [--refs-snapshot=<path>] [--[no-]write-chain-file]\n" +" [--base=<checksum>]" msgstr "" "git multi-pack-index [ОПЦИЯ…] write [--preferred-pack=ПАКЕТ]\n" " [--[no-]bitmap] [--[no-]incremental] [--[no-]stdin-packs]\n" -" [--refs-snapshot=ПЪТ]" +" [--refs-snapshot=ПЪТ] [--[no-]write-chain-file]\n" +" [--base=КОНТРОЛНА_СУМА]" msgid "" "git multi-pack-index [<options>] compact [--[no-]incremental]\n" -" [--[no-]bitmap] <from> <to>" +" [--[no-]bitmap] [--base=<checksum>] [--[no-]write-chain-file]\n" +" <from> <to>" msgstr "" "git multi-pack-index [ОПЦИЯ…] compact [--[no-]incremental]\n" -" [--[no-]bitmap] ОТ ДО" +" [--[no-]bitmap] [--base=КОНТРОЛНА_СУМА] [--[no-]write-chain-file]\n" +" ОТ ДО" msgid "git multi-pack-index [<options>] verify" msgstr "git multi-pack-index [ОПЦИЯ…] verify" @@ -10301,9 +10449,18 @@ msgstr "" msgid "write multi-pack bitmap" msgstr "запазване на многопакетната битова маска" +msgid "checksum" +msgstr "сума за проверка" + +msgid "base MIDX for incremental writes" +msgstr "базов индекс за множество пакети за нарастващи записи" + msgid "write a new incremental MIDX" msgstr "запазване на нов файл с нарастващ индекс за множество пакети" +msgid "write the multi-pack-index chain file" +msgstr "записване на верижния файл с индекса за множество пакети" + msgid "write multi-pack index containing only given indexes" msgstr "" "запазване на битовата маска за множество пакети, съдържаща само дадените " @@ -10313,11 +10470,20 @@ msgid "refs snapshot for selecting bitmap commits" msgstr "снимка на указателите за избор на подавания по битова маска" #, c-format +msgid "cannot use %s without %s" +msgstr "„%s“ изисква „%s“" + +msgid "cannot use --base without --no-write-chain-file" +msgstr "опцията „--base“ изисква „--no-write-chain-file“" + +#, c-format msgid "could not find MIDX: %s" msgstr "липсва индекс за множество пакети: %s" msgid "MIDX compaction endpoints must be unique" -msgstr "крайните точки на индекс за множество пакети трябва да са уникални" +msgstr "" +"крайните точки при уплътняване на индекс за множество пакети трябва да са " +"уникални" #, c-format msgid "MIDX %s must be an ancestor of %s" @@ -10455,6 +10621,50 @@ msgstr "да се извеждат и недефинираните имена ( msgid "dereference tags in the input (internal use)" msgstr "извеждане на идентификаторите на обекти-етикети (за вътрешни нужди)" +#, c-format +msgid "'%s' needs to be either text, revs, or rev" +msgstr "" +"„%s“ трябва да е „text“ (текст), „rev“ (една версия) или „revs“ (повече от " +"една версия)" + +msgid "" +"(EXPERIMENTAL!) git format-rev --stdin-mode=<mode> --format=<pretty> [--" +"[no-]notes=<ref>] [-z] [--[no-]null-output] [--[no-]null-input]" +msgstr "" +"(ЕКСПЕРИМЕНТАЛНО!) git format-rev --stdin-mode=РЕЖИМ --format=ФОРМАТ [--" +"[no-]notes=УКАЗАТЕЛ] [-z] [--[no-]null-output] [--[no-]null-input]" + +msgid "pretty format to use" +msgstr "ФОРМАТ, който да се ползва" + +msgid "stdin-mode" +msgstr "РЕЖИМ на стандартния вход" + +msgid "how revs are processed" +msgstr "как се обработват версиите" + +msgid "notes" +msgstr "бележки" + +msgid "display notes for pretty format" +msgstr "извеждане на бележките за ФОРМА̀ТА, който да се ползва" + +msgid "z" +msgstr "z" + +msgid "Use NUL for input and output termination" +msgstr "Входът и изходът да ползват нулевия знак „NUL“ за разделител" + +msgid "Use NUL for input termination" +msgstr "Входът да ползва нулевия знак „NUL“ за разделител" + +msgid "Use NUL for output termination" +msgstr "Изходът да ползва нулевия знак „NUL“ за разделител" + +#, c-format +msgid "'%s' is required" +msgstr "опцията „%s“ е задължителна" + msgid "git notes [--ref <notes-ref>] [list [<object>]]" msgstr "git notes [--ref УКАЗАТЕЛ_ЗА_БЕЛЕЖКА] [list [ОБЕКТ]]" @@ -10814,6 +11024,10 @@ msgid "currently, --write-bitmap-index requires --name-hash-version=1" msgstr "текущо опцията „--write-bitmap-index“ изисква „--name-hash-version=1“" #, c-format +msgid "write_reuse_object: unable to parse object header of %s" +msgstr "write_reuse_object: заглавната част на „%s“ не може да се анализира" + +#, c-format msgid "" "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in " "pack %s" @@ -10999,9 +11213,6 @@ msgstr "непакетираният обект в „%s“ не може да msgid "unable to force loose object" msgstr "оставането на обекта непакетиран не може да се наложи" -msgid "failed to pack objects via path-walk" -msgstr "неуспешно пакетиране на обекти чрез обхождане на дървото" - #, c-format msgid "not a rev '%s'" msgstr "„%s“ не е версия" @@ -11010,6 +11221,9 @@ msgstr "„%s“ не е версия" msgid "bad revision '%s'" msgstr "неправилна версия „%s“" +msgid "failed to pack objects via path-walk" +msgstr "неуспешно пакетиране на обекти чрез обхождане на дървото" + msgid "unable to add recent objects" msgstr "скорошните обекти не може да се добавят" @@ -11652,6 +11866,10 @@ msgstr "" msgid "invalid value for '%s'" msgstr "Неправилна стойност за „%s“" +#, c-format +msgid "could not push to %s" +msgstr "не може да се изтласка към „%s“" + msgid "repository" msgstr "хранилище" @@ -11728,6 +11946,14 @@ msgid "" "and then push using the remote name\n" "\n" " git push <name>\n" +"\n" +"To push to multiple remotes at once, configure a remote group using\n" +"\n" +" git config remotes.<groupname> \"<remote1> <remote2>\"\n" +"\n" +"and then push using the group name\n" +"\n" +" git push <groupname>\n" msgstr "" "Не е указано хранилище, към което да се изтласква.\n" "Или укажете адреса на командния ред, или настройте отдалечено хранилище с " @@ -11738,6 +11964,18 @@ msgstr "" "и след това изтласкайте, като укажете името на отдалеченото хранилище:\n" "\n" " git push ИМЕ\n" +"\n" +"За изтласкване едновременно към множество отдалечени хранилища, настройте " +"група за изтласкване:\n" +"\n" +" git config remotes.ИМЕ_НА_ГРУПА \"ИМЕ_НА_ХРАНИЛИЩЕ…\"\n" +"\n" +"и след това изтласкайте чрез:\n" +"\n" +" git push ИМЕ_НА_ГРУПА\n" + +msgid "push options must not have new line characters" +msgstr "опциите за изтласкване не трябва да съдържат знак за нов ред" msgid "--all can't be combined with refspecs" msgstr "опцията „--all“ е несъвместима с указването на версия" @@ -11745,8 +11983,9 @@ msgstr "опцията „--all“ е несъвместима с указван msgid "--mirror can't be combined with refspecs" msgstr "опцията „--mirror“ е несъвместима с указването на версия" -msgid "push options must not have new line characters" -msgstr "опциите за изтласкване не трябва да съдържат знак за нов ред" +msgid "--atomic can only be used when pushing to one remote" +msgstr "" +"опцията „--atomic“ поддържа изтласкване само към едно отдалечено хранилище" msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>" msgstr "git range-diff [ОПЦИЯ…] СТАРА_БАЗА..СТАР_ВРЪХ НОВА_БАЗА..НОВ_ВРЪХ" @@ -11764,9 +12003,6 @@ msgstr "неправилна стойност за максималната па msgid "use simple diff colors" msgstr "използване на прости цветове за разликите" -msgid "notes" -msgstr "бележки" - msgid "passed to 'git log'" msgstr "подава се на командата „git log“" @@ -12065,9 +12301,6 @@ msgid "(REMOVED) was: try to recreate merges instead of ignoring them" msgstr "" "(ОСТАРЯЛО) бе: опит за пресъздаване на сливанията вместо да се прескачат" -msgid "how to handle commits that become empty" -msgstr "как да се обработват оказалите се празни подавания" - msgid "keep commits which start empty" msgstr "запазванe на първоначално празните подавания" @@ -13009,11 +13242,11 @@ msgstr "повече подробности. Поставя се пред по msgid "" "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" "[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n" -"[--write-midx] [--name-hash-version=<n>] [--path-walk]" +"[--write-midx[=<mode>]] [--name-hash-version=<n>] [--path-walk]" msgstr "" "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" "[--window=БРОЙ] [--depth=БРОЙ] [--threads=БРОЙ] [--keep-pack=ИМЕ_НА_ПАКЕТ]\n" -"[--write-midx] [--name-hash-version=ВЕРСИЯ] [--path-walk]" +"[--write-midx[=РЕЖИМ]] [--name-hash-version=ВЕРСИЯ] [--path-walk]" msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" @@ -13023,6 +13256,10 @@ msgstr "" "Ползвайте опцията „--no-write-bitmap-index“ или изключете настройката\n" "„pack.writeBitmaps“." +#, c-format +msgid "unknown value for %s: %s" +msgstr "непозната стойност за „%s“: „%s“" + msgid "pack everything in a single pack" msgstr "пакетиране на всичко в пакет" @@ -13127,6 +13364,10 @@ msgid "cannot delete packs in a precious-objects repo" msgstr "пакетите в хранилище с важни обекти не може да се трият" #, c-format +msgid "invalid value for %s: %d" +msgstr "неправилна стойност за „%s“: %d" + +#, c-format msgid "option '%s' can only be used along with '%s'" msgstr "опцията „%s“ изисква „%s“" @@ -13332,11 +13573,11 @@ msgid "" msgstr "" "(ЕКСПЕРИМЕНТАЛНО!) git replay ([--contained] --onto=НОВА_БАЗА | --" "advance=КЛОН | --revert=КЛОН)\n" -"[--ref=УКАЗАТЕЛ] [--ref-action[=РЕЖИМ]] ДИАПАЗОН_ПОДАВАНИЯ" +"[--ref=УКАЗАТЕЛ] [--ref-action[=РЕЖИМ]] ДИАПАЗОН_НА_ВЕРСИИТЕ" msgid "update all branches that point at commits in <revision-range>" msgstr "" -"обновяване на всички кло̀ни, които сочат към подавания в ДИАПАЗОНа_ПОДАВАНИЯ" +"обновяване на всички кло̀ни, които сочат към подавания в ДИАПАЗОНа_НА_ВЕРСИИТЕ" msgid "replay onto given commit" msgstr "прилагането наново върху даденото ПОДАВАНЕ" @@ -14011,8 +14252,8 @@ msgstr "такъв указател няма: %s" #, c-format msgid "cannot handle more than %d rev." msgid_plural "cannot handle more than %d revs." -msgstr[0] "не може да се обработи повече от %d указател." -msgstr[1] "не може да се обработят повече от %d указатели." +msgstr[0] "не може да се обработи повече от %d версия." +msgstr[1] "не може да се обработят повече от %d версии." #, c-format msgid "'%s' is not a valid ref." @@ -14037,9 +14278,6 @@ msgstr "заглавната част не може да се прочете" msgid "unknown index version" msgstr "неподдържана версия на индекса" -msgid "unable to read index" -msgstr "индексът не може да се прочете" - msgid "corrupt index file" msgstr "повреден файл за индекса" @@ -14317,8 +14555,12 @@ msgstr "git stash drop [-q|--quiet] [СКАТАНО]" msgid "git stash pop [--index] [-q | --quiet] [<stash>]" msgstr "git stash pop [--index] [-q|--quiet] [СКАТАНО]" -msgid "git stash apply [--index] [-q | --quiet] [<stash>]" -msgstr "git stash apply [--index] [-q|--quiet] [СКАТАНО]" +msgid "" +"git stash apply [--index] [-q | --quiet] [--label-ours=<label>] [--label-" +"theirs=<label>] [--label-base=<label>] [<stash>]" +msgstr "" +"git stash apply [--index] [-q | --quiet] [--label-ours=ЕТИКЕТ] [--label-" +"theirs=ЕТИКЕТ] [--label-base=ЕТИКЕТ] [СКАТАНО]" msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch КЛОН [СКАТАНО]" @@ -14414,6 +14656,18 @@ msgstr "неследени файлове не може да се възстан msgid "attempt to recreate the index" msgstr "опит за повторно създаване на индекса" +msgid "label" +msgstr "ЕТИКЕТ" + +msgid "label for the upstream side in conflict markers" +msgstr "ЕТИКЕТ за следената страна в маркерите на конфликт" + +msgid "label for the stashed side in conflict markers" +msgstr "ЕТИКЕТ за скатаната страна в маркерите на конфликт" + +msgid "label for the base in diff3 conflict markers" +msgstr "ЕТИКЕТ за базата в маркерите на конфликт при тройна разлика с „diff3“" + #, c-format msgid "Dropped %s (%s)" msgstr "Изтрито: „%s“ (%s)" @@ -14943,7 +15197,7 @@ msgstr "Неуспешен опит за клониране на „%s“. На #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "" -"Втори неуспешен опит за клониране на „%s“. Действието се преустановява" +"Втори неуспешен опит за клониране на „%s“. Преустановяване на действието" #, c-format msgid "Unable to checkout '%s' in submodule path '%s'" @@ -15712,6 +15966,15 @@ msgstr "" msgid "interrupt transfer after <n> seconds of inactivity" msgstr "трансферът да се преустанови след този БРОЙ секунди" +msgid "git url-parse [-c <component>] [--] <url>..." +msgstr "git url-parse [-c КОМПОНЕНТ] [--] АДРЕС…" + +msgid "component" +msgstr "КОМПОНЕНТ" + +msgid "which URL component to extract" +msgstr "кой КОМПОНЕНТ на адреса да се извлече" + msgid "git verify-commit [-v | --verbose] [--raw] <commit>..." msgstr "git verify-commit [-v|--verbose] [--raw] ПОДАВАНЕ…" @@ -16424,6 +16687,9 @@ msgstr "Изпълняване на команда на git за всяко хр msgid "Prepare patches for e-mail submission" msgstr "Подготвяне на кръпки за изпращане по е-поща" +msgid "EXPERIMENTAL: Pretty format revisions on demand" +msgstr "ЕКСПЕРИМЕНТАЛНО: специфичен ФОРМАТ на версиите при поискване" + msgid "Verifies the connectivity and validity of the objects in the database" msgstr "Проверка на обектите и връзките тях в базата от данни за обектите" @@ -16449,8 +16715,8 @@ msgstr "Извеждане на помощта за Git" msgid "EXPERIMENTAL: Rewrite history" msgstr "ЕКСПЕРИМЕНТАЛНО: Презаписване на историята" -msgid "Run git hooks" -msgstr "Изпълнение на куки на git" +msgid "Run Git hooks" +msgstr "Изпълнение на куки на Git" msgid "Server side implementation of Git over HTTP" msgstr "Сървърна реализация на Git по HTTP" @@ -16535,7 +16801,7 @@ msgid "Move or rename a file, a directory, or a symlink" msgstr "Преместване или преименуване на файл, директория или символна връзка" msgid "Find symbolic names for given revs" -msgstr "Откриване на имената дадени на версия" +msgstr "Откриване на имената дадени на версии" msgid "Add or inspect object notes" msgstr "Добавяне или преглед на бележки към обект" @@ -16644,7 +16910,7 @@ msgstr "Настройки на Git за скриптовете на обвив msgid "Restricted login shell for Git-only SSH access" msgstr "Ограничена входна обвивка за достъп през SSH само до Git" -msgid "Summarize 'git log' output" +msgid "Summarize `git log` output" msgstr "Обобщен изход от „git log“" msgid "Show various types of objects" @@ -16711,6 +16977,9 @@ msgstr "Изпращане на архива обратно към „git-archiv msgid "Send objects packed back to git-fetch-pack" msgstr "Изпращане на пакетираните обекти обратно към „git-fetch-pack“" +msgid "Parse and extract git URL components" +msgstr "Анализ и извеждане на компоненти на адреси на git" + msgid "Show a Git logical variable" msgstr "Извеждане на логическа променлива на Git" @@ -17239,6 +17508,42 @@ msgstr "Неуспешно създаване на „FSEventStream“." msgid "Failed to start the FSEventStream" msgstr "Неуспешно стартиране на „FSEventStream“" +msgid "inotify watch limit reached; increase fs.inotify.max_user_watches" +msgstr "" +"Достигнат е максималният брой за наблюдение с „inotify“. Увеличете го чрез " +"„fs.inotify.max_user_watches“" + +#, c-format +msgid "inotify_add_watch('%s') failed" +msgstr "неуспешно изпълнение на inotify_add_watch(„%s“)" + +msgid "inotify_rm_watch() failed" +msgstr "неуспешно изпълнение на „inotify_rm_watch()“" + +#, c-format +msgid "opendir('%s') failed" +msgstr "неуспешно изпълнение на opendir(„%s“)" + +#, c-format +msgid "lstat('%s') failed" +msgstr "неуспешно изпълнение на lstat(„%s“)" + +#, c-format +msgid "closedir('%s') failed" +msgstr "неуспешно изпълнение на closedir(„%s“)" + +msgid "inotify_init1() failed" +msgstr "неуспешно изпълнение на „inotify_init1()“" + +msgid "closing inotify file descriptor failed" +msgstr "неуспешно затваряне на файловия дескриптор на „inotify“" + +msgid "reading inotify message stream failed" +msgstr "неуспешно изчитане на потока съобщения на „inotify“" + +msgid "polling inotify message stream failed" +msgstr "неуспешно асинхронно изчитане на потока съобщения на „inotify“" + # FIXME - как да обърна реда на форматите? Нито %2$.*ls, нито %.*2$ls, нито %2$.*2$ls работят #, c-format msgid "[GLE %ld] could not convert path to UTF-8: '%.*ls'" @@ -17275,22 +17580,10 @@ msgstr "" "GLE=%ld]" #, c-format -msgid "opendir('%s') failed" -msgstr "неуспешно изпълнение на opendir(„%s“)" - -#, c-format -msgid "lstat('%s') failed" -msgstr "неуспешно изпълнение на lstat(„%s“)" - -#, c-format msgid "strbuf_readlink('%s') failed" msgstr "неуспешно изпълнение на strbuf_readlink(„%s“)" #, c-format -msgid "closedir('%s') failed" -msgstr "неуспешно изпълнение на closedir(„%s“)" - -#, c-format msgid "[GLE %ld] unable to open for read '%ls'" msgstr "" "файлът „%2$ls“ не може да се отвори за четене [последна грешка в нишката: " @@ -17760,10 +18053,6 @@ msgstr "неправилен отговор на „ls-refs“: „%s“" msgid "expected flush after ref listing" msgstr "след изброяването на указателите се очаква изчистване на буферите" -#, c-format -msgid "protocol '%s' is not supported" -msgstr "протокол „%s“ не се поддържа" - msgid "unable to set SO_KEEPALIVE on socket" msgstr "неуспешно задаване на „SO_KEEPALIVE“ на гнездо" @@ -17816,6 +18105,10 @@ msgstr "необичайният порт „%s“ е блокиран" msgid "cannot start proxy %s" msgstr "посредникът „%s“ не може да се стартира" +#, c-format +msgid "protocol '%s' is not supported" +msgstr "протокол „%s“ не се поддържа" + msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "" "не е указан път. Проверете синтаксиса с командата:\n" @@ -18295,6 +18588,10 @@ msgid "failed to parse --submodule option parameter: '%s'" msgstr "неразпознат параметър към опцията „--submodule“: „%s“" #, c-format +msgid "%s expects a non-negative integer" +msgstr "%s: аргументът трябва да е неотрицателно цяло число" + +#, c-format msgid "bad --word-diff argument: %s" msgstr "неправилен аргумент към „--word-diff“: „%s“" @@ -19436,6 +19733,54 @@ msgstr "" " git config set advice.ignoredHook false" #, c-format +msgid "hook.jobs must be an integer, ignoring: '%s'" +msgstr "„hook.jobs“ трябва да е цяло число, „%s“ се прескача" + +#, c-format +msgid "hook.jobs must be a positive integer or -1, ignoring: '%s'" +msgstr "" +"„hook.jobs“ трябва да е положително цяло число или -1, „%s“ се прескача" + +#, c-format +msgid "" +"hook friendly-name '%s' collides with a known event name; please choose a " +"different friendly-name" +msgstr "" +"името, подходящо за куки „%s“ е в конфликт с името на известно събитие. " +"Изберете друго име подходящо за куки" + +#, c-format +msgid "" +"hook friendly-name '%s' is the same as its event; this may cause ambiguity " +"with hook.%s.enabled" +msgstr "" +"името, подходящо за куки „%s“ съвпада с името на събитието. Това ще " +"предизвика нееднозначност на настройката „hook.%s.enabled“" + +#, c-format +msgid "hook.%s.parallel must be a boolean, ignoring: '%s'" +msgstr "„hook.%s.parallel“ трябва да е булева стойност, „%s“ се прескача" + +#, c-format +msgid "hook.%s.jobs must be an integer, ignoring: '%s'" +msgstr "„hook.%s.jobs“ трябва да е цяло число, „%s“ се прескача" + +#, c-format +msgid "hook.%s.jobs must be a positive integer or -1, ignoring: '%s'" +msgstr "" +"„hook.%s.jobs“ трябва да е положително цяло число или -1, „%s“ се прескача" + +#, c-format +msgid "" +"hook.%s.jobs is set but '%s' looks like a hook friendly-name, not an event " +"name; hook.<event>.jobs uses the event name (e.g. hook.post-receive.jobs), " +"so this setting will be ignored" +msgstr "" +"Настройката „hook.%s.jobs“ е зададена, но „%s“ изглежда е име, подходящо за " +"куки, а не име на събитие. Настройката „hook.СЪБИТИЕ.jobs“ ползва името на " +"СЪБИТИЕ (напр. „hook.post-receive.jobs“), затова тя се прескача" + +#, c-format msgid "disabled hook '%s' has no command configured" msgstr "не е настроена команда за изключената кука „%s“" @@ -19447,6 +19792,18 @@ msgstr "" "трябва да настроите „hook.%s.command“ или да премахнете „hook.%s.event“, " "преустановяване на действието." +#, c-format +msgid "" +"hook '%s' is not marked as parallel=true, running in parallel anyway due to " +"-j%u" +msgstr "" +"Куката „%s“ не е отбелязана за паралелна работа с „parallel=true“. Заради " +"опцията „-j%u“ тя все пак се изпълнява в паралелен режим" + +#, c-format +msgid "%s must be a positive integer or -1, ignoring: %d" +msgstr "%s трябва да е положително число или -1, прескача се: %d" + msgid "not a git repository" msgstr "не е хранилище на Git" @@ -20029,7 +20386,7 @@ msgid "could not load pack %d" msgstr "пакет %d не може да се зареди" msgid "too many packs, unable to compact" -msgstr "прекалено много пакети, не може да се компресират" +msgstr "прекалено много пакети, не може да се уплътнят" msgid "could not determine preferred pack" msgstr "предпочитаният пакет не може да се определи" @@ -20049,7 +20406,7 @@ msgstr "неизвестна версия на индекса за множес msgid "cannot perform MIDX compaction with v1 format" msgstr "" "при ползване на формат v1 файловете с индекси за множество пакети не може да " -"се компресират" +"се уплътнят" msgid "ignoring existing multi-pack-index; checksum mismatch" msgstr "" @@ -20057,6 +20414,10 @@ msgstr "" "съвпада" #, c-format +msgid "could not find base MIDX '%s'" +msgstr "основният индекс за множество пакети липсва: %s" + +#, c-format msgid "could not load reverse index for MIDX %s" msgstr "файлът с обратния индекс за множество пакети „%s“ не може да се зареди" @@ -20241,6 +20602,10 @@ msgid "multi-pack-index large offset out of bounds" msgstr "" "стойността на отместването в индекса за множество пакети е извън диапазона" +#, c-format +msgid "failed to clear multi-pack-index chain at %s" +msgstr "веригата индекси за множество пакети не може да се изчисти при „%s“" + msgid "multi-pack-index file exists, but failed to parse" msgstr "" "файлът с индекса за множество пакети съществува, но не може да се анализира" @@ -20367,29 +20732,6 @@ msgid "garbage at end of loose object '%s'" msgstr "повредени данни в края на непакетирания обект „%s“" #, c-format -msgid "unable to open loose object %s" -msgstr "непакетираният обект „%s“ не може да се отвори" - -#, c-format -msgid "unable to parse %s header" -msgstr "заглавната част на „%s“ не може да се анализира" - -msgid "invalid object type" -msgstr "неправилен вид обект" - -#, c-format -msgid "unable to unpack %s header" -msgstr "заглавната част на „%s“ не може да се разпакетира" - -#, c-format -msgid "header for %s too long, exceeds %d bytes" -msgstr "заглавната част на „%s“ е прекалено дълга — надхвърля %d байта" - -#, c-format -msgid "loose object %s (stored in %s) is corrupt" -msgstr "непакетираният обект „%s“ (в „%s“) е повреден" - -#, c-format msgid "unable to open %s" msgstr "обектът „%s“ не може да се отвори" @@ -20435,8 +20777,8 @@ msgid "confused by unstable object source data for %s" msgstr "грешка поради нестабилния източник данни за обектите „%s“" #, c-format -msgid "write stream object %ld != %<PRIuMAX>" -msgstr "при записа на обект в потока: %ld != %<PRIuMAX>" +msgid "write stream object %<PRIuMAX> != %<PRIuMAX>" +msgstr "при записа на обект в потока: %<PRIuMAX> != %<PRIuMAX>" #, c-format msgid "unable to stream deflate new object (%d)" @@ -20740,6 +21082,10 @@ msgid "missing mapping of %s to %s" msgstr "липсва съответствие на „%s“ към „%s“" #, c-format +msgid "%s is not a valid object" +msgstr "„%s“ е неправилен обект" + +#, c-format msgid "%s is not a valid '%s' object" msgstr "„%s“ е неправилен обект от вид „%s“" @@ -20753,6 +21099,29 @@ msgid "unable to move new alternates file into place" msgstr "новият файл с алтернативите не може да се премести на мястото си" #, c-format +msgid "unable to open loose object %s" +msgstr "непакетираният обект „%s“ не може да се отвори" + +#, c-format +msgid "unable to parse %s header" +msgstr "заглавната част на „%s“ не може да се анализира" + +msgid "invalid object type" +msgstr "неправилен вид обект" + +#, c-format +msgid "unable to unpack %s header" +msgstr "заглавната част на „%s“ не може да се разпакетира" + +#, c-format +msgid "header for %s too long, exceeds %d bytes" +msgstr "заглавната част на „%s“ е прекалено дълга — надхвърля %d байта" + +#, c-format +msgid "loose object %s (stored in %s) is corrupt" +msgstr "непакетираният обект „%s“ (в „%s“) е повреден" + +#, c-format msgid "duplicate entry when writing bitmap index: %s" msgstr "повтарящ се запис при запазване на индекс на база битови маски: „%s“" @@ -21244,6 +21613,31 @@ msgstr "обектът „%s“ липсва" msgid "failed to find tag %s" msgstr "етикетът „%s“ липсва" +#, c-format +msgid "tree:%lu filter not supported by the path-walk API" +msgstr "" +"филтърът „tree:%lu“ не се поддържа от тази команда от програмния интерфейс " +"за обхождане на пътища" + +msgid "sparse filter cannot be combined with existing sparse patterns" +msgstr "" +"филтър за частично изтегляне и съществуващи шаблони за частично изтегляне са " +"несъвместими" + +#, c-format +msgid "unable to parse sparse filter data in '%s'" +msgstr "" +"данните от филтъра за частични изтегляния в „%s“ не може да се анализират" + +msgid "sparse filter is not cone-mode compatible" +msgstr "филтърът за частично изтегляне не е съвместим с пътеводния режим" + +#, c-format +msgid "object filter '%s' not supported by the path-walk API" +msgstr "" +"филтърът за обекти „%s“ не се поддържа от програмния интерфейс за обхождане " +"на пътища" + msgid "failed to setup revision walk" msgstr "неуспешно настройване на обхождането на версиите" @@ -21406,20 +21800,24 @@ msgid "unsupported field '%s' in '%s' config" msgstr "неподдържана поле „%s“ в настройките на „%s“" #, c-format -msgid "no or empty URL advertised for remote '%s'" -msgstr "липсващ или празен адрес за отдалечено хранилище „%s“" - -#, c-format -msgid "known remote named '%s' but with URL '%s' instead of '%s'" -msgstr "има хранилище с име „%s“, но адресът му е „%s“, а не „%s“" +msgid "" +"known remote named '%s' but with URL '%s' instead of '%s', ignoring this " +"remote" +msgstr "" +"има хранилище с име „%s“, но адресът му е „%s“, а не „%s“, това отдалечено " +"хранилище се прескача" #, c-format msgid "invalid element '%s' from remote info" msgstr "неправилен елемент „%s“ в информацията за отдалеченото хранилище" #, c-format -msgid "server advertised a promisor remote without a name or URL: %s" -msgstr "сървърът обяви за налично хранилище-гарант без име или адрес: %s" +msgid "" +"server advertised a promisor remote without a name or URL: '%s', ignoring " +"this remote" +msgstr "" +"сървърът обяви за налично хранилище-гарант без име или адрес: „%s“, това " +"отдалечено хранилище се прескача" #, c-format msgid "" @@ -21467,8 +21865,9 @@ msgid "%s must be non-negative, using default" msgstr "%s трябва да е неотрицателно, ще се ползва стандартната стойност" #, c-format -msgid "%s must be between 0 and 1, using default" -msgstr "%s трябва да е между 0 и 1, ще се ползва стандартната стойност" +msgid "%s must be between 0 (exclusive) and 1, using default" +msgstr "" +"следното трябва да е изпълнено: 0<%s≤1, ще се ползва стандартната стойност" #, c-format msgid "%s must be positive, using default" @@ -22212,6 +22611,14 @@ msgstr "" "приеме" #, c-format +msgid "trying to write ref '%s' with nonexistent object %s" +msgstr "опит за запис на указател „%s“ към обект, който не съществува: %s" + +#, c-format +msgid "trying to write non-commit object %s to branch '%s'" +msgstr "опит за записване на обект, който не е подаване — %s, в клона „%s“" + +#, c-format msgid "update_ref failed for ref '%s': %s" msgstr "неуспешно обновяване на указателя (update_ref) „%s“: %s" @@ -22300,14 +22707,6 @@ msgid "refname is dangerous: %s" msgstr "опасно име на указател: %s" #, c-format -msgid "trying to write ref '%s' with nonexistent object %s" -msgstr "опит за запис на указател „%s“ към обект, който не съществува: %s" - -#, c-format -msgid "trying to write non-commit object %s to branch '%s'" -msgstr "опит за записване на обект, който не е подаване — %s, в клона „%s“" - -#, c-format msgid "" "multiple updates for 'HEAD' (including one via its referent '%s') are not " "allowed" @@ -22363,7 +22762,7 @@ msgstr "таблица с указатели: неуспешна транзак #, c-format msgid "unable to compact stack: %s" -msgstr "стекът не може да се свие: %s" +msgstr "стекът не може да се уплътни: %s" #, c-format msgid "refname %s not found" @@ -22818,6 +23217,41 @@ msgstr "временният файл със снимка на указател msgid "could not remove stale bitmap: %s" msgstr "невъзможно изтриване на битовата маска с изтекла давност „%s“" +msgid "no packs to write MIDX during compaction" +msgstr "" +"няма пакети за запазване на индекс за множество пакети по време на " +"уплътняването" + +#, c-format +msgid "expected exactly one line during MIDX write, got: %<PRIuMAX>" +msgstr "" +"очаква се точно един ред при запис на индекс за множество пакети, а бяха " +"получени: %<PRIuMAX>" + +#, c-format +msgid "unexpected MIDX output: '%s'" +msgstr "неочакван изход от индекс за множество пакети: „%s“" + +#, c-format +msgid "could not load pack %<PRIu32> from MIDX" +msgstr "пакет %<PRIu32> не може да се зареди от индекса за множество пакети" + +msgid "too many objects in MIDX compaction step" +msgstr "" +"прекалено много обекти по време на стъпката по уплътняването на индекс за " +"множество пакети" + +#, c-format +msgid "could not find preferred pack for MIDX %s" +msgstr "предпочитаният пакет за индекса за множество пакети „%s“ липсва" + +msgid "unable to generate compaction plan" +msgstr "неуспешно създаване на план за уплътняване" + +#, c-format +msgid "unable to execute compaction step %<PRIuMAX>" +msgstr "стъпката за уплътняване не може да се изпълни %<PRIuMAX>" + msgid "could not start pack-objects to repack promisor objects" msgstr "" "командата „pack-objects“ не може да се стартира за препакетирането на " @@ -22892,6 +23326,10 @@ msgstr "необходимо е да има подавания за прилаг msgid "all positive revisions given must be references" msgstr "всички зададени положителни версии трябва да са указатели" +#, c-format +msgid "commit %s became empty after replay" +msgstr "подаването „%s“ остана празно при повторното прилагане" + msgid "'--ref' cannot be used with multiple revision ranges" msgstr "опцията „--ref“ е несъвместима с множество диапазони на версии" @@ -23023,10 +23461,8 @@ msgstr "Текущият клон „%s“ е без подавания " msgid "object filtering requires --objects" msgstr "филтрирането на обекти изисква опцията „--objects“" -msgid "-L does not yet support diff formats besides -p and -s" -msgstr "" -"опцията „-L“ поддържа единствено форматирането на разликите според опциите „-" -"p“ и „-s“" +msgid "-L does not yet support the requested diff format" +msgstr "опцията „-L“ не поддържа заявения формат за разлика" #, c-format msgid "cannot create async thread: %s" @@ -24018,21 +24454,37 @@ msgstr "„%s“ не може да се запази" #, c-format msgid "" -"%s\n" +"Your local changes are stashed, however applying them\n" +"resulted in conflicts. You can either resolve the conflicts\n" +"and then discard the stash with \"git stash drop\", or, if you\n" +"do not want to resolve them now, run \"git reset --hard\" and\n" +"apply the local changes later by running \"git stash pop\".\n" +msgstr "" +"Локалните промени са скатани, но прилагането им доведе до\n" +"конфликти. Или решете конфликтите, след което премахнете\n" +"скатаното с командата:\n" +"\n" +" git stash drop\n" +"\n" +"или, ако не искате да ги разрешите в момента, изпълнете:\n" +"\n" +" git reset --hard\n" +"\n" +"след което приложете локалните промени като изпълните:\n" +"\n" +" git stash pop\n" + +#, c-format +msgid "" +"Autostash exists; creating a new stash entry.\n" "Your changes are safe in the stash.\n" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" -"%s\n" +"Съществува автоматично скатано. Създава се нов запис за скатано.\n" "Промѐните ви са надеждно скатани. Може да пробвате да ги приложите чрез\n" "„git stash pop“ или да ги изхвърлите чрез „git stash drop“, когато " "поискате.\n" -msgid "Applying autostash resulted in conflicts." -msgstr "Конфликти при прилагането на автоматично скатаното." - -msgid "Autostash exists; creating a new stash entry." -msgstr "Вече има запис за автоматично скатано, затова се създава нов запис." - msgid "autostash reference is a symref" msgstr "указателят за автоматично скатано e файл с указател" @@ -24337,9 +24789,6 @@ msgstr "" msgid "fork failed" msgstr "неуспешно създаване на процес чрез „fork“" -msgid "setsid failed" -msgstr "неуспешно изпълнение на „setsid“" - #, c-format msgid "cannot stat template '%s'" msgstr "не може да се получи информация чрез „stat“ за шаблона „%s“" @@ -24420,6 +24869,10 @@ msgid "Initialized empty Git repository in %s%s\n" msgstr "Инициализиране на празно хранилище на Git в „%s%s“\n" #, c-format +msgid "unrecognized value for '%s': '%s'" +msgstr "неразпозната стойност за „%s“: „%s“" + +#, c-format msgid "index entry is a directory, but not sparse (%08x)" msgstr "обектът в индекса е директория, но не частично изтеглена (%08x)" @@ -24762,6 +25215,10 @@ msgstr "превключване на агресивно обхождане на msgid "read a pattern list over stdin" msgstr "изчитане на списък с шаблони от стандартния вход" +msgid "toggle pruning of trees by sparse patterns" +msgstr "" +"превключване на окастрянето на пътища с шаблоните за частично изтегляне" + #, c-format msgid "commit %s is not marked reachable" msgstr "подаването „%s“ не е отбелязано като достижимо" @@ -24836,6 +25293,13 @@ msgstr "лексема" msgid "command token to send to the server" msgstr "командна лексема за пращане" +msgid "write a pack with a single reachable large blob" +msgstr "запис на пакет с единствен, достижим, голям обект-BLOB" + +#, c-format +msgid "'%s' is not a valid blob size" +msgstr "„%s“ е неправилен размер на обект-BLOB" + msgid "unit-test [<options>]" msgstr "unit-test [ОПЦИЯ…]" @@ -24948,6 +25412,10 @@ msgstr "неуспешно свързване към подуслугата „% msgid "--negotiate-only requires protocol v2" msgstr "опцията „--negotiate-only“ изисква версия 2 на протокола" +#, c-format +msgid "ignoring %s because the protocol does not support it." +msgstr "прескачане на „%s“, защото протоколът не го поддържа." + msgid "'option' without a matching 'ok/error' directive" msgstr "опция без съответстваща директива за успех или грешка" @@ -8,64 +8,102 @@ # # Anglès | Català # -----------------+--------------------------------- +# abort v.tr | interrompre, abandonar +# abort v.intr. | abandonar # ahead | davant per # amend | esmenar +# bare adj. | nu +# bogus adj. | erroni +# boundary | limit # branch | branca # broken | malmès # bundle | farcell +# checksum | suma de verificació # check out | agafar # chunk | fragment # commit | comissió +# CPU | processador # cover letter | carta de presentació # cruft | superflu +# daemon | dimoni # delta | diferència # deprecated | en desús / obsolet # detached | separat +# drop v.tr | descartar +# drop v.intr | baixar # dry-run | fer una prova # fatal | fatal # fetch | obtenir +# fixup v.tr. | corregir +# fixup n. | correcció # flush | buidar / buidatge +# friendly-name | nom descriptiu +# got (", got X)" | s'ha rebut # graph | graf # graft | empelt / empeltar # hash | resum # hint | consell # hook | lligam # hunk | tros +# incremental adj. | incremental # lock | blocatge, blocar # multi-pack-index | índex multipaquet # not supported | no està admès +# parse v.tr. | analitzar +# path | camí +# poll | sondejar +# pretty-print v. | donar / mostrar amb format net, amb formatació +# promisor adj. | garant # pull | baixar # push | pujar # quote | cometes (ortogràfiques) +# replay v.tr. | reproduir +# replay n. | reproducció # repository | repositori +# required p.p. | [intentar amb "es requereix" o "cal"] +# required adj. | requerit [per]; obligatori +# [is] set [to] | [s'ha] definit [com a] # setting | paràmetre # shallow | superficial # skip | ometre # sparse | dispers # squelch | silenciar -# supported | admetre +# stream n. | flux +# support v.tr. | admetre +# - is supported | - s'admet +# support n. [for] | compatibilitat [amb]; intentar constr. verbal +# supported adj. | admès +# toggle | commutar # token | testimoni # unset | desassignar -# upstream | font +# use | utilitzar, usar [Guia afavoreix mots curts] +# unsupported adj. | no admès +# unsupported p.p. | [intentar "no s'admet"] +# upstream adj. | amunt [sense substantiu: branca o repositori] +# upstream adv. | amunt +# watch v.tr. | vigilar +# watch n. | vigilància # # Alguns termes que són ordres específiques del git i d'àmbit molt tècnic # hem decidit no traduir-los per a facilitar-ne la compressió a l'usuari i perquè # no tenen una transcendència al gran públic. Es tracta de casos similars # a «ping» en l'àmbit de xarxes. # -# Termes que mantenim en anglès: +# Termes que mantenim en anglès (de moment): # # # Anglès | Català # -----------------+--------------------------------- +# backfill | «backfill» (emplenar els forats?) # blame | «blame» +# cherry pick | «cherry pick» # fanout | «fanout» +# have (nom) | «have» # HEAD | HEAD (f, la branca actual) - (no s'apostrofa) -# cherry pick | «cherry pick» -# promisor | «promisor» # rebase | «rebase» -# stage | «stage» -# stash | «stash» +# reword | «reword» +# stage | «stage» [possible: preparar/preparació] +# stash | «stash» [possible: reservar/reserva] # squash | «squash» # trailer | «trailer» # unstage | «unstage» @@ -80,8 +118,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2026-04-15 07:38+0800\n" -"PO-Revision-Date: 2026-04-10 16:52+0200\n" +"POT-Creation-Date: 2026-06-21 09:29+0200\n" +"PO-Revision-Date: 2026-06-24 19:00+0200\n" "Last-Translator: Mikel Forcada <mikel.forcada@gmail.com>\n" "Language-Team: Catalan\n" "Language: ca\n" @@ -89,7 +127,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 3.2.2\n" +"X-Generator: Poedit 3.4.2\n" #: add-interactive.c #, c-format @@ -508,8 +546,8 @@ msgstr "" #, c-format msgid "Discard mode change from index and worktree%s [y,n,q,a,d%s,?]? " msgstr "" -"Descarta el canvi de mode de l'índex i de l'arbre de treball%s " -"[y,n,q,a,d%s,?]? " +"Descarta el canvi de mode de l'índex i de l'arbre de treball%s [y,n,q,a," +"d%s,?]? " #: add-patch.c #, c-format @@ -780,7 +818,7 @@ msgstr " (era: n)" #: add-patch.c #, c-format msgid "Only one letter is expected, got '%s'" -msgstr "S'espera una lletra, s'ha obtingut «%s»" +msgstr "S'espera una lletra, s'ha rebut «%s»" #: add-patch.c msgid "No next file" @@ -972,7 +1010,7 @@ msgstr "" #: advice.c msgid "Not possible to fast-forward, aborting." -msgstr "No és possible avançar ràpidament, s'està avortant." +msgstr "No és possible avançar ràpidament, s'abandona." #: advice.c #, c-format @@ -1065,9 +1103,9 @@ msgstr "la línia d'ordres acaba amb \\" msgid "unclosed quote" msgstr "cometes no tancades" -#: alias.c builtin/cat-file.c builtin/notes.c builtin/prune-packed.c -#: builtin/receive-pack.c builtin/refs.c builtin/repo.c builtin/tag.c -#: t/helper/test-pkt-line.c +#: alias.c builtin/cat-file.c builtin/name-rev.c builtin/notes.c +#: builtin/prune-packed.c builtin/receive-pack.c builtin/refs.c builtin/repo.c +#: builtin/tag.c t/helper/test-pkt-line.c msgid "too many arguments" msgstr "hi ha massa arguments" @@ -1541,7 +1579,7 @@ msgstr "no s'ha pogut afegir una entrada de cau per a %s" #: apply.c builtin/bisect.c builtin/gc.c #, c-format msgid "failed to write to '%s'" -msgstr "no s'ha pogut escriure a «%s»" +msgstr "no s'ha pogut escriure en «%s»" #: apply.c #, c-format @@ -1605,7 +1643,7 @@ msgstr "no es pot llegir el fitxer d'índex" #: apply.c #, c-format msgid "option -p expects a non-negative integer, got '%s'" -msgstr "l'opció -p espera un enter no negatiu, però ha rebut «%s»" +msgstr "l'opció -p espera un enter no negatiu, però s'ha rebut «%s»" #: apply.c #, c-format @@ -1794,7 +1832,7 @@ msgstr "no es pot transmetre el blob %s" #: archive-tar.c archive-zip.c #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" -msgstr "mode de fitxer no compatible: 0%o (SHA1: %s)" +msgstr "mode de fitxer no admès: 0%o (SHA1: %s)" #: archive-tar.c archive-zip.c builtin/pack-objects.c #, c-format @@ -2109,33 +2147,33 @@ msgstr "" #: bisect.c #, c-format msgid "" -"The merge base %s is %s.\n" +"The merge base %s is '%s'.\n" "This means the first '%s' commit is between %s and [%s].\n" msgstr "" -"La base de fusió %s és %s.\n" -"Això vol dir que la primera comissió «%s» és entre %s i [%s].\n" +"La base de fusió %s és «%s».\n" +"Això vol dir que la primera comissió de tipus «%s» és entre %s i [%s].\n" #: bisect.c #, c-format msgid "" -"Some %s revs are not ancestors of the %s rev.\n" +"Some '%s' revs are not ancestors of the '%s' rev.\n" "git bisect cannot work properly in this case.\n" -"Maybe you mistook %s and %s revs?\n" +"Maybe you mistook '%s' and '%s' revs?\n" msgstr "" -"Algunes revisions %s no són els avantpassats de la revisió %s.\n" +"Algunes revisions «%s» no són els avantpassats de la revisió «%s».\n" "git bisect no pot funcionar correctament en aquest cas.\n" -"Potser heu confós les revisions %s i %s?\n" +"Potser heu confós les revisions «%s» i «%s»?\n" #: bisect.c #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" -"So we cannot be sure the first %s commit is between %s and %s.\n" +"So we cannot be sure the first '%s' commit is between %s and %s.\n" "We continue anyway." msgstr "" "s'ha d'ometre la base de fusió entre %s i [%s].\n" -"Llavors, no podem estar segurs que la primera comissió %s sigui entre %s i " -"%s.\n" +"Per això, no podem estar segurs que la primera comissió «%s» estigui entre " +"%s i %s.\n" "Continuem de totes maneres." #: bisect.c @@ -2145,8 +2183,8 @@ msgstr "Bisecant: s'ha de provar una base de fusió\n" #: bisect.c #, c-format -msgid "a %s revision is needed" -msgstr "es necessita una revisió %s" +msgid "a '%s' revision is needed" +msgstr "es necessita una revisió «%s»" #: bisect.c #, c-format @@ -2169,8 +2207,8 @@ msgstr "la lectura de les referències de bisecció ha fallat" #: bisect.c #, c-format -msgid "%s was both %s and %s\n" -msgstr "%s era ambdós %s i %s\n" +msgid "%s was both '%s' and '%s'\n" +msgstr "%s era tant «%s» com «%s»\n" #: bisect.c #, c-format @@ -2260,7 +2298,7 @@ msgstr "la branca «%s» està configurada per a seguir:" #: branch.c msgid "unable to write upstream branch configuration" -msgstr "no es pot escriure la configuració de la branca font" +msgstr "no es pot escriure la configuració de la branca amunt" #: branch.c msgid "" @@ -2276,14 +2314,13 @@ msgstr "" #, c-format msgid "asked to inherit tracking from '%s', but no remote is set" msgstr "" -"s'ha demanat que hereti el seguiment de «%s», però no s'ha establert cap " -"remot" +"s'ha demanat que hereti el seguiment de «%s», però no s'ha definit cap remot" #: branch.c #, c-format msgid "asked to inherit tracking from '%s', but no merge configuration is set" msgstr "" -"s'ha demanat que hereti el seguiment de «%s», però no s'ha establert cap " +"s'ha demanat que hereti el seguiment de «%s», però no s'ha definit cap " "configuració de fusionat" #: branch.c @@ -2362,7 +2399,7 @@ msgstr "" #: branch.c #, c-format msgid "the requested upstream branch '%s' does not exist" -msgstr "la branca font demanada «%s» no existeix" +msgstr "la branca amunt sol·licitada «%s» no existeix" #: branch.c msgid "" @@ -2377,7 +2414,7 @@ msgid "" msgstr "" "\n" "Si teniu pensat basar el vostre treball en una branca\n" -"font que ja existeix al remot, pot ser que necessiteu\n" +"amunt que ja existeix al remot, pot ser que necessiteu\n" "executar «git fetch» per a obtenir-la.\n" "\n" "Si teniu pensat pujar una branca local nova que seguirà\n" @@ -2983,8 +3020,8 @@ msgstr "n" #: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c #: builtin/clone.c builtin/diagnose.c builtin/for-each-ref.c builtin/init-db.c -#: builtin/ls-files.c builtin/ls-tree.c builtin/refs.c builtin/replace.c -#: builtin/repo.c builtin/submodule--helper.c builtin/tag.c +#: builtin/ls-files.c builtin/ls-tree.c builtin/name-rev.c builtin/refs.c +#: builtin/replace.c builtin/repo.c builtin/submodule--helper.c builtin/tag.c #: builtin/verify-tag.c msgid "format" msgstr "format" @@ -3113,11 +3150,28 @@ msgstr "git archive: error de protocol" #: builtin/archive.c msgid "git archive: expected a flush" -msgstr "git archive: s'esperava una neteja" +msgstr "git archive: s'esperava un buidatge" + +#: builtin/backfill.c +msgid "" +"git backfill [--min-batch-size=<n>] [--[no-]sparse] [--[no-]include-edges] " +"[<revision-range>]" +msgstr "" +"git backfill [--min-batch-size=<n>] [--[no-]sparse] [--[no-]include-edges] " +"[<revision-range>]" #: builtin/backfill.c -msgid "git backfill [--min-batch-size=<n>] [--[no-]sparse]" -msgstr "git backfill [--min-batch-size=<n>] [--[no-]sparse]" +#, c-format +msgid "'%s' cannot be used with 'git backfill'" +msgstr "«%s» no es pot usar amb «git backfill»" + +#: builtin/backfill.c +msgid "cannot backfill with these filter options" +msgstr "no es pot fer el «backfill» amb aquestes opcions de filtre" + +#: builtin/backfill.c +msgid "cannot backfill with blob size limits" +msgstr "no puc fer «backfill» amb límits de grandària de blob" #: builtin/backfill.c msgid "problem loading sparse-checkout" @@ -3131,6 +3185,10 @@ msgstr "Nombre mínim d'objectes a sol·licitar d'una vegada" msgid "Restrict the missing objects to the current sparse-checkout" msgstr "Restringeix els objectes que manquen al sparse-checkout actual" +#: builtin/backfill.c +msgid "Include blobs from boundary commits in the backfill" +msgstr "inclou blobs de les comissions límit en el «backfill»" + #: builtin/backfill.c builtin/diff-pairs.c builtin/log.c builtin/replay.c #: builtin/shortlog.c bundle.c #, c-format @@ -3154,7 +3212,7 @@ msgstr "git bisect (bad|new|<term-nou>) [<revisió>]" #: builtin/bisect.c msgid "git bisect (good|old|<term-old>) [<rev>...]" -msgstr "git bisect (good|old|<term-nou>) [<revisió>...]" +msgstr "git bisect (good|old|<term-antic>) [<revisió>...]" #: builtin/bisect.c msgid "git bisect skip [(<rev>|<range>)...]" @@ -3180,7 +3238,7 @@ msgstr "no es pot obrir el fitxer «%s» en mode «%s»" #: builtin/bisect.c #, c-format msgid "could not write to file '%s'" -msgstr "no s'ha pogut escriure el fitxer «%s»" +msgstr "no s'ha pogut escriure al fitxer «%s»" #: builtin/bisect.c #, c-format @@ -3278,23 +3336,26 @@ msgid "Are you sure [Y/n]? " msgstr "N'esteu segur [Y/n]? " #: builtin/bisect.c -msgid "status: waiting for both good and bad commits\n" -msgstr "estat: s'estan esperant les comissions bones i dolentes\n" +#, c-format +msgid "status: waiting for both '%s' and '%s' commits\n" +msgstr "" +"estat: s'estan esperant tant les comissions de tipus «%s» com les de tipus " +"«%s»\n" #: builtin/bisect.c #, c-format -msgid "status: waiting for bad commit, %d good commit known\n" -msgid_plural "status: waiting for bad commit, %d good commits known\n" -msgstr[0] "" -"estat: s'està esperant una comissió incorrecta, es coneix %d comissió bona\n" +msgid "status: waiting for '%s' commit, %d '%s' commit known\n" +msgid_plural "status: waiting for '%s' commit, %d '%s' commits known\n" +msgstr[0] "estat: s'espera la comissió '%s', es coneix %d comissió '%s'\n" msgstr[1] "" -"estat: s'està esperant una comissió incorrecta, es coneixen %d comissions " -"bones\n" +"estat: s'esperen les comissions '%s', es coneixen %d comissions '%s'\n" #: builtin/bisect.c -msgid "status: waiting for good commit(s), bad commit known\n" +#, c-format +msgid "status: waiting for '%s' commit(s), '%s' commit known\n" msgstr "" -"estat: s'està esperant comissions bones, es coneix una comissió incorrecta\n" +"estat: s'esperen comissions de tipus «%s», es coneix la comissió de tipus " +"«%s»\n" #: builtin/bisect.c msgid "no terms defined" @@ -3303,11 +3364,11 @@ msgstr "cap terme definit" #: builtin/bisect.c #, c-format msgid "" -"Your current terms are %s for the old state\n" -"and %s for the new state.\n" +"Your current terms are '%s' for the old state\n" +"and '%s' for the new state.\n" msgstr "" -"Els termes actuals són %s per a l'estat antic\n" -"i %s per al nou estat.\n" +"Els termes actuals són «%s» per a l'estat antic\n" +"i «%s» per al nou estat.\n" #: builtin/bisect.c #, c-format @@ -3399,7 +3460,7 @@ msgstr "«%s»? Què voleu dir?" #: builtin/bisect.c #, c-format msgid "cannot read file '%s' for replaying" -msgstr "no es pot llegir «%s» per a reproducció" +msgstr "no es pot llegir «%s» per a la reproducció" #: builtin/bisect.c #, c-format @@ -3412,13 +3473,13 @@ msgstr "ha fallat l'execució de bisect: no s'ha proporcionat cap ordre." #: builtin/bisect.c #, c-format -msgid "unable to verify %s on good revision" -msgstr "no s'ha pogut verificar «%s» en una bona revisió" +msgid "unable to verify %s on '%s' revision" +msgstr "no s'ha pogut verificar %s en la revisió «%s»" #: builtin/bisect.c #, c-format -msgid "bogus exit code %d for good revision" -msgstr "codi d'error de sortida %d per a una bona revisió" +msgid "bogus exit code %d for '%s' revision" +msgstr "codi de sortida erroni %d per a la revisió «%s»" #: builtin/bisect.c #, c-format @@ -3441,8 +3502,9 @@ msgid "bisect run success" msgstr "execució de bisecció amb èxit" #: builtin/bisect.c -msgid "bisect found first bad commit" -msgstr "la bisecció ha trobat una primera comissió errònia" +#, c-format +msgid "bisect found first '%s' commit\n" +msgstr "la bisecció ha trobat la primera comissió «%s»\n" #: builtin/bisect.c #, c-format @@ -3529,7 +3591,7 @@ msgstr "mostra les entrades «blame» mentre les trobem, incrementalment" #: builtin/blame.c msgid "do not show object names of boundary commits (Default: off)" msgstr "" -"no mostris els noms d'objectes de les comissions de frontera (per defecte: " +"no mostris els noms d'objectes de les comissions límit (per defecte: " "desactivat)" #: builtin/blame.c @@ -3891,7 +3953,8 @@ msgstr "Opcions genèriques" #: builtin/branch.c msgid "show hash and subject, give twice for upstream branch" -msgstr "mostra el hash i l'assumpte, useu-lo dues vegades per a la branca font" +msgstr "" +"mostra el hash i l'assumpte, useu-lo dues vegades per a la branca amunt" #: builtin/branch.c msgid "suppress informational messages" @@ -3907,7 +3970,7 @@ msgstr "no usar" #: builtin/branch.c msgid "upstream" -msgstr "font" +msgstr "amunt" #: builtin/branch.c msgid "change the upstream info" @@ -4032,11 +4095,11 @@ msgstr "HEAD no trobat sota 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 "" -"la branca amb --recurse-submodules només es pot utilitzar si " -"submodule.propagateBranches està habilitat" +"la branca amb --recurse-submodules només es pot utilitzar si submodule." +"propagateBranches està habilitat" #: builtin/branch.c msgid "--recurse-submodules can only be used to create branches" @@ -4183,7 +4246,8 @@ msgstr "" "Podeu eliminar qualsevol línia que vulgueu.\n" #: builtin/bugreport.c builtin/commit.c builtin/fast-export.c -#: builtin/pack-objects.c builtin/rebase.c builtin/replay.c parse-options.h +#: builtin/pack-objects.c builtin/rebase.c builtin/repack.c builtin/replay.c +#: parse-options.h msgid "mode" msgstr "mode" @@ -4309,6 +4373,11 @@ msgid "cannot read object %s '%s'" msgstr "no es pot llegir l'objecte %s «%s»" #: builtin/cat-file.c +#, c-format +msgid "mailmap: invalid boolean '%s'" +msgstr "mailmap: booleà invàlid «%s»" + +#: builtin/cat-file.c msgid "flush is only for --buffer mode" msgstr "flush només és per al mode --buffer" @@ -4373,7 +4442,7 @@ msgstr "comprova si <objecte> existeix" #: builtin/cat-file.c msgid "pretty-print <object> content" -msgstr "impressió embellida del contingut de l'<objecte>" +msgstr "mostra el contingut de l'<objecte> amb un format net" #: builtin/cat-file.c msgid "Emit [broken] object attributes" @@ -4399,7 +4468,7 @@ msgstr "Objectes de lots sol·licitats a stdin (o --batch-all-objects)" #: builtin/cat-file.c msgid "show full <object> or <rev> contents" -msgstr "mostra el contingut complet de <objecte> o <rev>" +msgstr "mostra el contingut complet de <objecte> o <revisió>" #: builtin/cat-file.c msgid "like --batch, but don't emit <contents>" @@ -4496,12 +4565,12 @@ msgstr "el mode batch no accepta cap argument" #: builtin/cat-file.c #, c-format msgid "<rev> required with '%s'" -msgstr "<rev> requerida amb «%s»" +msgstr "es requereix <rev> amb «%s»" #: builtin/cat-file.c #, c-format msgid "<object> required with '-%c'" -msgstr "<objecte> requerit amb «-%c»" +msgstr "es requereix <objecte> amb «-%c»" #: builtin/cat-file.c #, c-format @@ -4663,7 +4732,7 @@ msgstr "escriu el contingut a fitxers temporals" #: builtin/checkout-index.c msgid "copy out the files from named stage" -msgstr "copia els fitxers des de «stage» amb nom" +msgstr "copia els fitxers des de l'«stage» amb nom" #: builtin/checkout.c #, c-format @@ -4764,15 +4833,6 @@ msgstr "heu de primer resoldre el vostre índex actual" #: builtin/checkout.c #, c-format -msgid "" -"cannot continue with staged changes in the following files:\n" -"%s" -msgstr "" -"no es pot continuar amb els canvis «staged» als fitxers següents:\n" -"%s" - -#: builtin/checkout.c -#, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "No es pot fer «reflog» per a «%s»: %s\n" @@ -4878,6 +4938,11 @@ msgstr "Sou en una branca que encara ha de néixer" #: builtin/checkout.c #, c-format +msgid "The following paths have local changes:\n" +msgstr "Els camins següents tenen modificacions locals:\n" + +#: builtin/checkout.c +#, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" "Please use -- (and optionally --no-guess) to disambiguate" @@ -4933,22 +4998,22 @@ msgstr "la referència no és un arbre: %s" #: builtin/checkout.c #, c-format msgid "a branch is expected, got tag '%s'" -msgstr "s'espera una branca, s'ha obtingut l'etiqueta «%s»" +msgstr "s'espera una branca, s'ha rebut l'etiqueta «%s»" #: builtin/checkout.c #, c-format msgid "a branch is expected, got remote branch '%s'" -msgstr "s'espera una branca, s'ha obtingut la branca remota «%s»" +msgstr "s'espera una branca, s'ha rebut la branca remota «%s»" #: builtin/checkout.c #, c-format msgid "a branch is expected, got '%s'" -msgstr "s'espera una branca, s'ha obtingut «%s»" +msgstr "s'espera una branca, s'ha rebut «%s»" #: builtin/checkout.c #, c-format msgid "a branch is expected, got commit '%s'" -msgstr "s'espera una branca, s'ha obtingut la comissió «%s»" +msgstr "s'espera una branca, s'ha rebut la comissió «%s»" #: builtin/checkout.c msgid "" @@ -5559,7 +5624,7 @@ msgstr "nom" #: builtin/clone.c msgid "use <name> instead of 'origin' to track upstream" -msgstr "usa <nom> en lloc d'«origin» per a seguir la font" +msgstr "useu <nom> en lloc d'«origin» per a seguir el repositori amunt" #: builtin/clone.c msgid "checkout <branch> instead of the remote's HEAD" @@ -5787,12 +5852,12 @@ msgstr "el transport remot ha informat d'un error" #: builtin/clone.c #, c-format msgid "Remote branch %s not found in upstream %s" -msgstr "La branca remota %s no es troba en la font %s" +msgstr "No s'ha trobat la branca remota %s al repositori amunt %s" #: builtin/clone.c #, c-format msgid "Remote revision %s not found in upstream %s" -msgstr "La branca remota %s no es troba en la font %s" +msgstr "La branca remota %s no es troba al repositori amunt %s" #: builtin/clone.c msgid "You appear to have cloned an empty repository." @@ -6508,14 +6573,14 @@ msgstr "[(amend|reword):]commit" msgid "" "use autosquash formatted message to fixup or amend/reword specified commit" msgstr "" -"usa un missatge amb format de «squash» automàtic per a fer amend/reword de " -"la comissió especificada" +"usa un missatge amb format d'«autosquash» per a corregir, esmenar o fer " +"«reword» de la comissió especificada" #: builtin/commit.c msgid "use autosquash formatted message to squash specified commit" msgstr "" -"usa un missatge amb format de «squash» automàtic per a fer «squash» de la " -"comissió especificada" +"usa un missatge amb format d'«autosquash» per a fer «squash» de la comissió " +"especificada" #: builtin/commit.c msgid "the commit is authored by me now (used with -C/-c/--amend)" @@ -6615,18 +6680,17 @@ msgstr "no s'ha pogut llegir el missatge de comissió: %s" #: builtin/commit.c builtin/history.c #, c-format msgid "Aborting commit due to empty commit message.\n" -msgstr "S'està avortant la comissió a causa d'un missatge de comissió buit.\n" +msgstr "S'interromp la comissió a causa d'un missatge de comissió buit.\n" #: builtin/commit.c #, c-format msgid "Aborting commit; you did not edit the message.\n" -msgstr "S'està avortant la comissió; no heu editat el missatge.\n" +msgstr "S'interromp la comissió; no heu editat el missatge.\n" #: builtin/commit.c #, c-format msgid "Aborting commit due to empty commit message body.\n" -msgstr "" -"S'està interrompent la comissió a causa d'un missatge de comissió buit.\n" +msgstr "S'interromp la comissió a causa d'un missatge de comissió buit.\n" #: builtin/commit.c msgid "" @@ -6829,6 +6893,21 @@ msgstr "nombre d'arguments erroni, ha de ser %d a %d" #: builtin/config.c #, c-format +msgid "missing value to set to the variable '%s'" +msgstr "hi manca el valor per assignar a «%s»" + +#: builtin/config.c +#, c-format +msgid "did you mean \"git config set %s %s\"?" +msgstr "volíeu dir «git config set %s %s»?" + +#: builtin/config.c +#, c-format +msgid "missing value to set to a variable with an invalid name '%s'" +msgstr "manca el valor per assignar a una variable amb un nom invàlid «%s»" + +#: builtin/config.c +#, c-format msgid "invalid key pattern: %s" msgstr "patró de la clau no vàlid: %s" @@ -6988,8 +7067,8 @@ msgstr "reemplaça l'opció de configuració multivalor amb el valor nou" #: builtin/config.c msgid "human-readable comment string (# will be prepended as needed)" msgstr "" -"cadena de comentari llegible per humans (es farà que comence per\n" -"# si cal)" +"cadena de comentari llegible per humans (s'hi afegirà \n" +"# al davant si cal)" #: builtin/config.c msgid "add a new line without altering any existing values" @@ -7281,7 +7360,7 @@ msgstr "no es pot cercar el blob «%s» en una branca no nascuda" #: builtin/describe.c #, c-format msgid "blob '%s' not reachable from HEAD" -msgstr "el tros «%s» no és accessible des de HEAD" +msgstr "el blob «%s» no és accessible des de HEAD" #: builtin/describe.c #, c-format @@ -7615,7 +7694,7 @@ msgstr "mode tag-of-filtered desconegut: %s" #: builtin/fast-export.c #, c-format msgid "unknown reencoding mode: %s" -msgstr "Mode de recodificació desconegut: %s" +msgstr "mode de recodificació desconegut: %s" #: builtin/fast-export.c #, c-format @@ -7841,7 +7920,7 @@ msgstr "des de:a" #: builtin/fast-export.c msgid "convert <from> to <to> in anonymized output" -msgstr "converteix <des-de> a <cap-a> en una sortida anònima" +msgstr "converteix <de> a <a> en la sortida anonimitzada" #: builtin/fast-export.c msgid "reference parents which are not in fast-export stream by object id" @@ -7905,7 +7984,7 @@ msgstr "no es pot emmagatzemar el fitxer d'índex" #: builtin/fast-import.c #, c-format msgid "failed seeking to start of '%s'" -msgstr "s'ha produït un error fent seek a l'inici de «%s»" +msgstr "s'ha produït un error cercant l'inici de «%s»" #: builtin/fast-import.c #, c-format @@ -7969,7 +8048,7 @@ msgid "not updating %s (new tip %s does not contain %s)" msgstr "no s'actualitza %s (la nova punta %s no conté %s)" #: builtin/fast-import.c builtin/sparse-checkout.c commit-graph.c midx-write.c -#: sequencer.c +#: repack-midx.c sequencer.c #, c-format msgid "unable to create leading directories of %s" msgstr "no s'han pogut crear els directoris inicials de «%s»" @@ -8268,7 +8347,7 @@ msgstr "" #: builtin/fast-import.c msgid "aborting due to invalid signature" -msgstr "s'està avortant la comissió a causa d'una signatura invàlida" +msgstr "s'interromp a causa d'una signatura invàlida" #: builtin/fast-import.c msgid "signing commits in interoperability mode is unsupported" @@ -8499,7 +8578,7 @@ msgstr "opció desconeguda --%s" #: builtin/fast-import.c #, c-format msgid "unsupported command: %s" -msgstr "ordre no compatible: %s" +msgstr "ordre no admesa: %s" #: builtin/fast-import.c msgid "stream ends early" @@ -8651,15 +8730,20 @@ msgstr "l'opció «%s» amb valor «%s» no és vàlida per a %s" msgid "option \"%s\" is ignored for %s" msgstr "l'opció «%s» s'ignora per a «%s»" -#: builtin/fetch.c odb.c +#: builtin/fetch.c fetch-pack.c #, c-format -msgid "%s is not a valid object" -msgstr "%s no és un objecte vàlid" +msgid "the object %s does not exist" +msgstr "l'objecte %s no existeix" #: builtin/fetch.c #, c-format -msgid "the object %s does not exist" -msgstr "l'objecte %s no existeix" +msgid "ignoring %s=%s because it does not match any refs" +msgstr "s'ignora %s=%s perquè no coincideix amb cap referència" + +#: builtin/fetch.c +#, c-format +msgid "ignoring %s because the protocol does not support it" +msgstr "s'està ignorant %s perquè el protocol no l'admet" #: builtin/fetch.c #, c-format @@ -8733,17 +8817,16 @@ msgid "" "could not set upstream of HEAD to '%s' from '%s' when it does not point to " "any branch." msgstr "" -"no s'ha pogut establir la font de HEAD a «%s» des de «%s» quan no assenyala " -"cap branca." +"no s'ha pogut establir la branca amunt de HEAD a «%s» des de «%s» quan no " +"apunta a cap branca." #: builtin/fetch.c msgid "not setting upstream for a remote remote-tracking branch" -msgstr "" -"no s'està configurant la font per a una branca remota amb seguiment remot" +msgstr "no s'estableix el repositori amunt per a una branca de seguiment remot" #: builtin/fetch.c msgid "not setting upstream for a remote tag" -msgstr "no s'està configurant la font d'una etiqueta remota" +msgstr "no s'estableix el repositori amunt per a una etiqueta remota" #: builtin/fetch.c msgid "unknown branch type" @@ -8790,7 +8873,7 @@ msgstr "obtén de tots els remots" #: builtin/fetch.c builtin/pull.c msgid "set upstream for git pull/fetch" -msgstr "estableix la font per a git pull/fetch" +msgstr "estableix la branca amunt per a git pull/fetch" #: builtin/fetch.c builtin/pull.c msgid "append to .git/FETCH_HEAD instead of overwriting" @@ -8908,6 +8991,11 @@ msgstr "revisió" msgid "report that we have only objects reachable from this object" msgstr "informa que només hi ha objectes abastables des d'aquest objecte" +#: builtin/fetch.c builtin/pull.c +msgid "ensure this ref is always sent as a negotiation have" +msgstr "" +"assegura que aquesta referència s'enviï sempre com un «have» de negociació" + #: builtin/fetch.c msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" msgstr "" @@ -8932,10 +9020,6 @@ msgid "accept refspecs from stdin" msgstr "llegeix les especificacions de referència des de stdin" #: builtin/fetch.c -msgid "--negotiate-only needs one or more --negotiation-tip=*" -msgstr "--negotiate-only necessita un o més --negotiation-tip=*" - -#: builtin/fetch.c msgid "negative depth in --deepen is not supported" msgstr "no s'admet una profunditat negativa en --deepen" @@ -8956,7 +9040,7 @@ msgstr "fetch --all no accepta un argument de repositori" msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all no té sentit amb especificacions de referència" -#: builtin/fetch.c +#: builtin/fetch.c builtin/push.c #, c-format msgid "no such remote or remote group: %s" msgstr "no existeix un remot ni un grup remot: %s" @@ -8974,12 +9058,17 @@ msgid "protocol does not support --negotiate-only, exiting" msgstr "el protocol no admet --negotiate-only, se surt" #: builtin/fetch.c +#, c-format +msgid "%s needs one or more %s" +msgstr "%s necessita un o més %s" + +#: 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 només es pot utilitzar amb el remot configurat en " -"extensions.partialclone" +"--filter només es pot utilitzar amb el remot configurat en extensions." +"partialclone" #: builtin/fetch.c msgid "--atomic can only be used when fetching from one remote" @@ -9121,7 +9210,7 @@ msgstr "hi manca --config=<config>" #: builtin/for-each-repo.c #, c-format msgid "got bad config --config=%s" -msgstr "s'ha obtingut una configuració incorrecta --config=%s" +msgstr "s'ha rebut una configuració incorrecta --config=%s" #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> #: builtin/fsck.c @@ -9244,7 +9333,7 @@ msgstr "%s: no és una comissió" #: builtin/fsck.c #, c-format msgid "invalid parameter: expected sha1, got '%s'" -msgstr "paràmetre no vàlid: s'esperava sha1, s'ha obtingut «%s»" +msgstr "paràmetre no vàlid: s'esperava sha1, s'ha rebut «%s»" #: builtin/fsck.c msgid "notice: No default references" @@ -9399,8 +9488,13 @@ msgstr "valor de «%s» no és booleà ni enter: %d" #: builtin/fsmonitor--daemon.c #, c-format +msgid "daemon did not stop within %d seconds" +msgstr "el dimoni no s'ha aturat en menys de %d segons" + +#: builtin/fsmonitor--daemon.c +#, c-format msgid "fsmonitor-daemon is watching '%s'\n" -msgstr "fsmonitor-daemon està veient «%s»\n" +msgstr "fsmonitor-daemon està vigilant «%s»\n" #: builtin/fsmonitor--daemon.c #, c-format @@ -9453,6 +9547,10 @@ msgstr "fsmonitor--daemon is already running «%s»" msgid "running fsmonitor-daemon in '%s'\n" msgstr "s'està executant fsmonitor-daemon en «%s»\n" +#: builtin/fsmonitor--daemon.c setup.c +msgid "setsid failed" +msgstr "«setsid» ha fallat" + #: builtin/fsmonitor--daemon.c #, c-format msgid "starting fsmonitor-daemon in '%s'\n" @@ -10271,7 +10369,7 @@ msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man.<tool>.cmd' instead." msgstr "" -"«%s»: camí a un visualitzador de manuals no compatible.\n" +"«%s»: camí a un visualitzador de manuals no admès.\n" "Considereu usar «man.<eina>.cmd» en lloc d'això." #: builtin/help.c @@ -10328,6 +10426,14 @@ msgid "'git help config' for more information" msgstr "«git help config» per a més informació" #: builtin/history.c +msgid "" +"git history fixup <commit> [--dry-run] [--update-refs=(branches|head)] [--" +"reedit-message] [--empty=(drop|keep|abort)]" +msgstr "" +"git history fixup <comissió> [--dry-run] [--update-refs=(branches|head)] [--" +"reedit-message] [--empty=(drop|keep|abort)]" + +#: builtin/history.c msgid "git history reword <commit> [--dry-run] [--update-refs=(branches|head)]" msgstr "" "git history reword <comissió> [--dry-run] [--update-refs=(branches|head)]" @@ -10353,7 +10459,7 @@ msgstr "" #: builtin/history.c #, c-format msgid "Aborting commit as launching the editor failed.\n" -msgstr "S'avorta la comissió perquè no s'ha pogut iniciar l'editor.\n" +msgstr "S'interromp la comissió perquè no s'ha pogut iniciar l'editor.\n" #: builtin/history.c #, c-format @@ -10371,7 +10477,7 @@ msgstr "s'ha produït un error en preparar les revisions" #: builtin/history.c replay.c msgid "replaying merge commits is not supported yet!" -msgstr "encara no s'admet la repetició de les comissions de fusió!" +msgstr "encara no s'admet la reproducció de les comissions de fusió!" #: builtin/history.c msgid "cannot look up HEAD" @@ -10404,31 +10510,102 @@ msgid "failed to commit ref transaction: %s" msgstr "no s'ha pogut cometre la transacció de referència: %s" #: builtin/history.c +#, c-format +msgid "unable to parse parent of %s" +msgstr "no s'ha pogut analitzar el pare de %s" + +#: builtin/history.c +#, c-format +msgid "" +"unrecognized '--empty=' action '%s'; valid values are \"drop\", \"keep\", " +"and \"abort\"." +msgstr "" +"acció \"--empty=\" «%s» no reconeguda; els valors vàlids són \"drop\", " +"\"keep\" i \"abort\"." + +#: builtin/history.c msgid "control which refs should be updated" msgstr "controla quines referències s'haurien d'actualitzar" #: builtin/history.c msgid "perform a dry-run without updating any refs" -msgstr "fes una prova dry-run sense actualitzar cap referència" +msgstr "fes una prova no destructiva sense actualitzar cap referència" + +#: builtin/history.c +msgid "open an editor to modify the commit message" +msgstr "obre un editor per a modificar el missatge de comissió" + +#: builtin/history.c builtin/rebase.c builtin/revert.c +msgid "how to handle commits that become empty" +msgstr "com gestionar les comissions que queden buides" #: builtin/history.c msgid "command expects a single revision" msgstr "l'ordre espera una única revisió" #: builtin/history.c +msgid "cannot run fixup in a bare repository" +msgstr "no es pot executar la correcció en un repositori nu" + +#: builtin/history.c #, c-format msgid "commit cannot be found: %s" msgstr "no s'ha pogut trobar la comissió %s" #: builtin/history.c -msgid "failed writing reworded commit" -msgstr "no s'ha pogut escriure la comissió reformulada" +msgid "cannot get tree for HEAD" +msgstr "no s'ha pogut obtenir l'arbre de HEAD" + +#: builtin/history.c builtin/show-index.c +msgid "unable to read index" +msgstr "no es pot llegir el fitxer d'índex" + +#: builtin/history.c +msgid "nothing to fixup: no staged changes" +msgstr "no hi ha res a corregir: no hi ha canvis a l'«stage»" + +#: builtin/history.c +msgid "unable to write index as a tree" +msgstr "no s'ha pogut escriure l'índex com un arbre" + +#: builtin/history.c +#, c-format +msgid "cannot get tree for commit %s" +msgstr "no s'ha pogut obtenir l'arbre de la comissió %s" + +#: builtin/history.c +msgid "merge failed while applying fixup" +msgstr "la fusió ha fallat mentre s'aplicava la correcció" + +#: builtin/history.c +msgid "fixup would produce conflicts; aborting" +msgstr "la correcció produiria conflictes; s'interromp" + +#: builtin/history.c +#, c-format +msgid "cannot drop root commit %s: it has no parent to replay onto" +msgstr "" +"no s'ha pogut descartar la comissió arrel %s: no té pare sobre el qual es " +"pugui reproduir" + +#: builtin/history.c +#, c-format +msgid "fixup makes commit %s empty" +msgstr "la correcció fa que la comissió %s quedi buida" + +#: builtin/history.c +msgid "failed writing fixed-up commit" +msgstr "no s'ha pogut escriure la comissió reparada" #: builtin/history.c msgid "failed replaying descendants" msgstr "no s'han pogut reproduir els descendents" #: builtin/history.c +msgid "failed writing reworded commit" +msgstr "no s'ha pogut escriure la comissió reformulada" + +#: builtin/history.c msgid "unable to populate index with tree" msgstr "no s'ha pogut emplenar l'índex amb l'arbre" @@ -10475,10 +10652,12 @@ msgstr "no es pot dividir la comissió de fusió" #: builtin/hook.c msgid "" "git hook run [--allow-unknown-hook-name] [--ignore-missing] [--to-" -"stdin=<path>] <hook-name> [-- <hook-args>]" +"stdin=<path>] [(-j|--jobs) <n>]\n" +"<hook-name> [-- <hook-args>]" msgstr "" "git hook run [--allow-unknown-hook-name] [--ignore-missing] [--to-" -"stdin=<camí>] <nom-lligam> [-- <arguments-lligam>]" +"stdin=<camí>] [(-j|--jobs) <n>]\n" +"<nom-lligam> [-- <arguments-lligam>]" #: builtin/hook.c msgid "" @@ -10488,7 +10667,7 @@ msgstr "" #: builtin/hook.c msgid "use NUL as line terminator" -msgstr "cal usar NUL com a terminador de línia" +msgstr "les línies es terminen amb NUL" #: builtin/hook.c msgid "show the config scope that defined each hook" @@ -10529,6 +10708,18 @@ msgstr "ignora silenciosament la sol·licitud <hook-name> perduda" msgid "file to read into hooks' stdin" msgstr "fitxer per a llegir a l'entrada estàndard dels lligams" +#: builtin/hook.c +msgid "run up to <n> hooks simultaneously (-1 for CPU count)" +msgstr "" +"executa fins a <n> lligams simultàniament (-1 per al nombre de processadors)" + +#: builtin/hook.c +#, c-format +msgid "invalid value for -j: %d (use -1 for CPU count or a positive integer)" +msgstr "" +"valor invàlid per a -j: %d (useu -1 per al nombre de processadors o un enter " +"positiu)" + #: builtin/index-pack.c #, c-format msgid "object type mismatch at %s" @@ -10579,7 +10770,7 @@ msgstr "hi ha una discordança de signatura de paquet" #: builtin/index-pack.c #, c-format msgid "pack version %<PRIu32> unsupported" -msgstr "la versió de paquet %<PRIu32> no és compatible" +msgstr "no s'admet la versió de paquet %<PRIu32>" #: builtin/index-pack.c #, c-format @@ -10591,6 +10782,10 @@ msgstr "el paquet té un objecte incorrecte a la posició %<PRIuMAX>: %s" msgid "inflate returned %d" msgstr "la inflació ha retornat %d" +#: builtin/index-pack.c builtin/unpack-objects.c +msgid "object size too large for this platform" +msgstr "la grandària de l'objecte és excessiva per a aquesta plataforma" + #: builtin/index-pack.c msgid "offset value overflow for delta base object" msgstr "" @@ -11090,7 +11285,7 @@ msgstr "" "consell: Podeu reemplaçar 'git whatchanged <opts>' amb:\n" "consell:\tgit log <opts> --raw --no-merges\n" "consell: O creant un àlies:\n" -"hint:\tgit config set --global alias.whatchanged 'log --raw --no-merges'\n" +"consell:\tgit config set --global alias.whatchanged 'log --raw --no-merges'\n" "\n" #: builtin/log.c @@ -11195,10 +11390,10 @@ msgid "" "please use git branch --set-upstream-to to track a remote branch.\n" "Or you could specify base commit by --base=<base-commit-id> manually" msgstr "" -"no s'ha pogut obtenir la font, si voleu registrar la comissió base\n" +"no s'ha pogut obtenir la branca amunt. Si voleu registrar la comissió base\n" "automàticament, useu git branch --set-upstream-to per a seguir una\n" -"branca remota. També podeu especificar la comissió base amb --base=<base-" -"commit-id> manualment" +"branca remota. També podeu especificar la comissió base amb --base=<id-" +"comissio-base> manualment" #: builtin/log.c msgid "failed to find exact merge base" @@ -11324,7 +11519,7 @@ msgstr "emet un resum de tots zeros en la capçalera From" #: builtin/log.c msgid "don't include a patch matching a commit upstream" -msgstr "no incloguis pedaços que coincideixin amb comissions a la font" +msgstr "no incloguis pedaços que coincideixin amb una comissió amunt" #: builtin/log.c msgid "show patch format instead of default (patch + stat)" @@ -11402,7 +11597,7 @@ msgstr "comissió base" #: builtin/log.c msgid "add prerequisite tree info to the patch series" -msgstr "afegeix la informació d'arbre requerida a la sèrie de pedaços" +msgstr "afegeix la informació obligatòria d'arbre a la sèrie de pedaços" #: builtin/log.c msgid "add a signature from a file" @@ -12121,7 +12316,7 @@ msgstr "Cap missatge de fusió -- no s'està actualitzant HEAD\n" #: builtin/merge.c #, c-format msgid "'%s' does not point to a commit" -msgstr "«%s» no assenyala una comissió" +msgstr "«%s» no apunta a una comissió" #: builtin/merge.c #, c-format @@ -12159,8 +12354,8 @@ msgid "" "\n" msgstr "" "Introduïu un missatge de comissió per a explicar per què aquesta fusió és\n" -"necessària, especialment si es fusiona una font actualitzada amb una branca " -"de tòpic.\n" +"necessària, especialment si es fusiona una branca amunt actualitzada amb una " +"branca de tòpic.\n" "\n" #: builtin/merge.c @@ -12203,7 +12398,7 @@ msgstr "No hi ha cap remot per a la branca actual." #: builtin/merge.c msgid "No default upstream defined for the current branch." -msgstr "No hi ha cap font per defecte definida per a la branca actual." +msgstr "No hi ha cap branca amunt per defecte definida per a la branca actual." #: builtin/merge.c #, c-format @@ -12215,7 +12410,7 @@ msgstr "No hi ha cap branca amb seguiment remot per a %s de %s" msgid "Bad value '%s' in environment '%s'" msgstr "Valor incorrecte «%s» en l'entorn «%s»" -#: builtin/merge.c editor.c read-cache.c wrapper.c +#: builtin/merge.c editor.c read-cache.c t/helper/test-synthesize.c wrapper.c #, c-format msgid "could not close '%s'" msgstr "no s'ha pogut tancar «%s»" @@ -12273,7 +12468,7 @@ msgstr "" #: builtin/merge.c msgid "Squash commit into empty head not supported yet" -msgstr "Una comissió «squash» a una HEAD buida encara no es permet" +msgstr "Encara no s'admet una comissió «squash» a una HEAD buida" #: builtin/merge.c msgid "Non-fast-forward commit does not make sense into an empty head" @@ -12397,19 +12592,23 @@ msgstr "permet la creació de més d'un arbre" msgid "" "git multi-pack-index [<options>] write [--preferred-pack=<pack>]\n" " [--[no-]bitmap] [--[no-]incremental] [--[no-]stdin-packs]\n" -" [--refs-snapshot=<path>]" +" [--refs-snapshot=<path>] [--[no-]write-chain-file]\n" +" [--base=<checksum>]" msgstr "" "git multi-pack-index [<opcions>] write [--preferred-pack=<paquet>]\n" " [--[no-]bitmap] [--[no-]incremental] [--[no-]stdin-packs]\n" -" [--refs-snapshot=<camí>]" +" [--refs-snapshot=<camí>] [--[no-]write-chain-file]\n" +" [--base=<suma-verificació>]" #: builtin/multi-pack-index.c msgid "" "git multi-pack-index [<options>] compact [--[no-]incremental]\n" -" [--[no-]bitmap] <from> <to>" +" [--[no-]bitmap] [--base=<checksum>] [--[no-]write-chain-file]\n" +" <from> <to>" msgstr "" -"git multi-pack-index [<opcions>] compact [--[no-]incremental]\n" -" [--[no-]bitmap] <des-de> <cap-a>" +"git multi-pack-index [<options>] compact [--[no-]incremental]\n" +" [--[no-]bitmap] [--base=<suma-verificació>] [--[no-]write-chain-file]\n" +" <de> <a>" #: builtin/multi-pack-index.c msgid "git multi-pack-index [<options>] verify" @@ -12447,10 +12646,22 @@ msgid "write multi-pack bitmap" msgstr "escriu un map de bits multipaquet" #: builtin/multi-pack-index.c +msgid "checksum" +msgstr "suma-verificació" + +#: builtin/multi-pack-index.c +msgid "base MIDX for incremental writes" +msgstr "MIDX de base per a les operacions incrementals d'escriptura" + +#: builtin/multi-pack-index.c msgid "write a new incremental MIDX" msgstr "escriu un nou MIDX incremental" #: builtin/multi-pack-index.c +msgid "write the multi-pack-index chain file" +msgstr "escriu el fitxer de cadena del multi-pack-index" + +#: builtin/multi-pack-index.c msgid "write multi-pack index containing only given indexes" msgstr "escriu un índex multipaquet que contingui només els índexs donats" @@ -12461,6 +12672,15 @@ msgstr "" #: builtin/multi-pack-index.c #, c-format +msgid "cannot use %s without %s" +msgstr "no es pot usar %s sense %s" + +#: builtin/multi-pack-index.c +msgid "cannot use --base without --no-write-chain-file" +msgstr "no es pot usar --base sense --no-write-chain-file" + +#: builtin/multi-pack-index.c +#, c-format msgid "could not find MIDX: %s" msgstr "no s'ha pogut trobar el MIDX: %s" @@ -12640,6 +12860,61 @@ msgstr "permet imprimir els noms «undefined» (per defecte)" msgid "dereference tags in the input (internal use)" msgstr "desreferencia les etiquetes en l'entrada (ús intern)" +# són els noms anglesos de les opcions de l'ordre, o s'han de traduir? +#: builtin/name-rev.c +#, c-format +msgid "'%s' needs to be either text, revs, or rev" +msgstr "«%s» ha de ser text, revs o rev" + +#: builtin/name-rev.c +msgid "" +"(EXPERIMENTAL!) git format-rev --stdin-mode=<mode> --format=<pretty> [--" +"[no-]notes=<ref>] [-z] [--[no-]null-output] [--[no-]null-input]" +msgstr "" +"(EXPERIMENTAL!) git format-rev --stdin-mode=<mode> --format=<format-net> [--" +"[no-]notes=<referència>] [-z] [--[no-]null-output] [--[no-]null-input]" + +#: builtin/name-rev.c +msgid "pretty format to use" +msgstr "format net a usar" + +#: builtin/name-rev.c +msgid "stdin-mode" +msgstr "mode stdin" + +#: builtin/name-rev.c +msgid "how revs are processed" +msgstr "com es processen les revisions" + +#: builtin/name-rev.c builtin/range-diff.c +msgid "notes" +msgstr "notes" + +#: builtin/name-rev.c +msgid "display notes for pretty format" +msgstr "mostra les notes per al format net" + +#: builtin/name-rev.c +msgid "z" +msgstr "z" + +#: builtin/name-rev.c +msgid "Use NUL for input and output termination" +msgstr "l'entrada i la sortida es terminen amb NUL" + +#: builtin/name-rev.c +msgid "Use NUL for input termination" +msgstr "l'entrada es termina amb NUL" + +#: builtin/name-rev.c +msgid "Use NUL for output termination" +msgstr "la sortida es termina amb NUL" + +#: builtin/name-rev.c +#, c-format +msgid "'%s' is required" +msgstr "es requereix «%s»" + #: builtin/notes.c msgid "git notes [--ref <notes-ref>] [list [<object>]]" msgstr "git notes [--ref <referència-notes>] [llista [<objecte>]]" @@ -12651,8 +12926,8 @@ msgid "" "| -C) <object>] [<object>] [-e]" msgstr "" "git notes [--ref <referència-notes>] add [-f] [--allow-empty] [--" -"[no-]separator|--separator=<salt-paràgraf>] [--[no-]stripspace] [-m <msg> | " -"-F <fitxer> | (-c | -C) <objecte>] [<objecte>]" +"[no-]separator|--separator=<salt-paràgraf>] [--[no-]stripspace] [-m <msg> | -" +"F <fitxer> | (-c | -C) <objecte>] [<objecte>]" #: builtin/notes.c msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" @@ -12666,8 +12941,8 @@ msgid "" "| -C) <object>] [<object>] [-e]" msgstr "" "git notes [--ref <referència-notes>] append [--allow-empty] [--" -"[no-]separator|--separator=<salt-paràgraf>] [--[no-]stripspace] [-m <msg> | " -"-F <fitxer> | (-c | -C) <objecte>] [<objecte>] [-e]" +"[no-]separator|--separator=<salt-paràgraf>] [--[no-]stripspace] [-m <msg> | -" +"F <fitxer> | (-c | -C) <objecte>] [<objecte>] [-e]" #: builtin/notes.c msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" @@ -12968,7 +13243,7 @@ msgstr "finalitza la fusió de notes cometent les notes sense fusionar" #: builtin/notes.c msgid "Aborting notes merge resolution" -msgstr "S'està avortant la resolució de fusió de notes" +msgstr "S'interromp la resolució de fusió de notes" #: builtin/notes.c msgid "abort notes merge" @@ -13082,6 +13357,12 @@ msgstr "actualment, --write-bitmap-index requereix --name-hash-version=1" #: builtin/pack-objects.c #, c-format +msgid "write_reuse_object: unable to parse object header of %s" +msgstr "" +"write_reuse_object: no s'ha pogut analitzar la capçalera de l'objecte de %s" + +#: builtin/pack-objects.c +#, c-format msgid "" "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in " "pack %s" @@ -13259,7 +13540,7 @@ msgstr "no s'ha pogut trobar el paquet «%s»" #, c-format msgid "packfile %s is a promisor but --exclude-promisor-objects was given" msgstr "" -"el fitxer de paquets %s és un «promissor» però s'ha indicat --exclude-" +"el fitxer de paquet %s és un paquet garant però s'ha indicat --exclude-" "promisor-objects" #: builtin/pack-objects.c @@ -13311,10 +13592,6 @@ msgid "unable to force loose object" msgstr "no s'ha pogut forçar l'objecte solt" #: builtin/pack-objects.c -msgid "failed to pack objects via path-walk" -msgstr "no s'ha pogut empaquetar els objectes via path-walk" - -#: builtin/pack-objects.c #, c-format msgid "not a rev '%s'" msgstr "«%s» no és una revisió" @@ -13325,13 +13602,17 @@ msgid "bad revision '%s'" msgstr "revisió incorrecta «%s»" #: builtin/pack-objects.c +msgid "failed to pack objects via path-walk" +msgstr "no s'ha pogut empaquetar els objectes via path-walk" + +#: builtin/pack-objects.c msgid "unable to add recent objects" msgstr "no s'han pogut afegir els objectes recents" #: builtin/pack-objects.c #, c-format msgid "unsupported index version %s" -msgstr "versió d'índex no compatible %s" +msgstr "versió d'índex no admesa %s" #: builtin/pack-objects.c #, c-format @@ -13510,7 +13791,8 @@ msgstr "gestió dels objectes absents" #: builtin/pack-objects.c msgid "do not pack objects in promisor packfiles" -msgstr "no empaquetis els objectes als fitxers de paquet «promisor»" +msgstr "" +"no empaquetis els objectes que es trobin en els fitxers de paquet garants" #: builtin/pack-objects.c msgid "implies --missing=allow-any" @@ -13623,7 +13905,8 @@ msgstr "fes caducar els objectes més antics que <data>" #: builtin/prune.c msgid "limit traversal to objects outside promisor packfiles" msgstr "" -"limita el recorregut als objectes fora dels fitxers de paquet «promisor»" +"limita el recorregut als objectes no inclosos en els fitxers de paquet " +"garants" #: builtin/prune.c msgid "cannot prune in a precious-objects repo" @@ -13891,7 +14174,7 @@ msgid "" "in 'git help config'.\n" msgstr "" "\n" -"Per a evitar configurar automàticament les branques font quan el seu nom\n" +"Per a evitar configurar automàticament una branca amunt quan el seu nom\n" "no coincideix amb el de la branca local, vegeu l'opció «simple» de\n" "«branch.autoSetupMerge» a «git help config».\n" @@ -13909,7 +14192,7 @@ msgid "" " git push %s HEAD\n" "%s%s" msgstr "" -"La branca font de la vostra branca actual no coincideix\n" +"La branca amunt de la vostra branca actual no coincideix\n" "amb el nom de la vostra branca actual. Per a pujar-la a la\n" "branca font en el remot, useu\n" "\n" @@ -13942,8 +14225,9 @@ msgid "" "upstream, see 'push.autoSetupRemote' in 'git help config'.\n" msgstr "" "\n" -"Per fer que això succeeixi automàticament per a les fonts sense seguiment,\n" -"vegeu «push.autoSetupRemote» a «git help config».\n" +"Perquè això passe automàticament en les branques que no tenen una\n" +"branca amunt de seguiment, vegeu «push.autoSetupRemote» a «git help " +"config».\n" #: builtin/push.c #, c-format @@ -13954,7 +14238,7 @@ msgid "" " git push --set-upstream %s %s\n" "%s" msgstr "" -"La branca actual %s no té cap branca font.\n" +"La branca actual %s no té cap branca amunt.\n" "Per a pujar la branca actual i establir el remot com a font, useu\n" "\n" " git push --set-upstream %s %s\n" @@ -13963,7 +14247,7 @@ msgstr "" #: builtin/push.c #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." -msgstr "La branca actual %s té múltiples branques font; s'està refusant pujar." +msgstr "La branca actual %s té múltiples branques amunt; es refusa pujar." #: builtin/push.c msgid "" @@ -13979,9 +14263,9 @@ msgid "" "your current branch '%s', without telling me what to push\n" "to update which remote branch." msgstr "" -"Esteu pujant al remot «%s», que no és la font de la vostra\n" -"branca actual «%s», sense dir-me què pujar per a actualitzar\n" -"quina branca remota." +"Esteu pujant al remot «%s», que no és la branca amunt de la vostra\n" +"branca actual «%s», sense especificar què s'ha de pujar ni quina\n" +"branca remota s'ha d'actualitzar." #: builtin/push.c msgid "" @@ -14073,6 +14357,11 @@ msgstr "" msgid "invalid value for '%s'" msgstr "valor no vàlid per a «%s»" +#: builtin/push.c +#, c-format +msgid "could not push to %s" +msgstr "no s'ha pogut pujar a %s" + #: builtin/push.c builtin/submodule--helper.c msgid "repository" msgstr "repositori" @@ -14123,7 +14412,7 @@ msgstr "programa que rep els paquets" #: builtin/push.c msgid "set upstream for git pull/status" -msgstr "estableix la font per a git pull/status" +msgstr "estableix la branca amunt per a git pull/status" #: builtin/push.c msgid "prune locally removed refs" @@ -14165,16 +14454,36 @@ msgid "" "and then push using the remote name\n" "\n" " git push <name>\n" +"\n" +"To push to multiple remotes at once, configure a remote group using\n" +"\n" +" git config remotes.<groupname> \"<remote1> <remote2>\"\n" +"\n" +"and then push using the group name\n" +"\n" +" git push <groupname>\n" msgstr "" -"No hi ha cap destinació de pujada configurat.\n" +"No s'ha configurat cap destinació de pujada.\n" "Especifiqueu l'URL des de la línia d'ordres o bé configureu un repositori " -"remot fent servir\n" +"remot usant\n" "\n" " git remote add <nom> <url>\n" "\n" -"i després pugeu fent servir el nom remot\n" +"i després pugeu usant el nom del remot\n" "\n" " git push <nom>\n" +"\n" +"Per a pujar a múltiples remots alhora, configureu un grup de remots usant\n" +"\n" +" git config remotes.<nom-de-grup> \"<remot1> <remot2>\"\n" +"\n" +"i després pugeu usant el nom del grup\n" +"\n" +" git push <nom-de-grup>\n" + +#: builtin/push.c +msgid "push options must not have new line characters" +msgstr "les opcions de pujada no han de tenir caràcters de línia nova" #: builtin/push.c msgid "--all can't be combined with refspecs" @@ -14185,8 +14494,8 @@ msgid "--mirror can't be combined with refspecs" msgstr "--mirror no es pot combinar amb especificacions de referència" #: builtin/push.c -msgid "push options must not have new line characters" -msgstr "les opcions de pujada no han de tenir caràcters de línia nova" +msgid "--atomic can only be used when pushing to one remote" +msgstr "--atomic només es pot usar quan es puja a un sol remot" #: builtin/range-diff.c msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>" @@ -14210,10 +14519,6 @@ msgid "use simple diff colors" msgstr "utilitza colors simples de diff" #: builtin/range-diff.c -msgid "notes" -msgstr "notes" - -#: builtin/range-diff.c msgid "passed to 'git log'" msgstr "passa-ho a «git log»" @@ -14322,7 +14627,7 @@ msgstr "no actualitzis l'índex ni l'arbre de treball" #: builtin/read-tree.c msgid "skip applying sparse checkout filter" -msgstr "omet l'aplicació del filtre d'agafament parcial" +msgstr "omet l'aplicació del filtre d'obtenció dispersa" #: builtin/read-tree.c msgid "debug unpack-trees" @@ -14410,7 +14715,7 @@ msgid "" "As a result, git cannot rebase them." msgstr "" "\n" -"git ha trobat un error en preparar els pedaços per a tornar a reproduir\n" +"git ha trobat un error en preparar els pedaços per a reproduir\n" "aquestes revisions:\n" "\n" " %s\n" @@ -14495,11 +14800,11 @@ msgstr "ordre exec buida" #: builtin/rebase.c msgid "rebase onto given branch instead of upstream" -msgstr "fes un «rebase» en la branca donada en comptes de la font" +msgstr "fes un «rebase» en la branca donada en comptes de la branca amunt" #: builtin/rebase.c msgid "use the merge-base of upstream and branch as the current base" -msgstr "utilitza la base de fusió de la font i la branca com a base actual" +msgstr "usa la base de fusió de la branca amunt i la branca com a base actual" #: builtin/rebase.c msgid "allow pre-rebase hook to run" @@ -14515,7 +14820,7 @@ msgstr "mostra un «diffstat» del que ha canviat a la font" #: builtin/rebase.c msgid "do not show diffstat of what changed upstream" -msgstr "no mostris «diffstat» del que ha canviat a la font" +msgstr "no mostris «diffstat» del que ha canviat amunt" #: builtin/rebase.c msgid "add a Signed-off-by trailer to each commit" @@ -14585,10 +14890,6 @@ msgstr "permet a l'usuari editar la llista de comissions a fer «rebase»" msgid "(REMOVED) was: try to recreate merges instead of ignoring them" msgstr "(SUPRIMIT) era: intenta recrear fusions en lloc d'ignorar-les" -#: builtin/rebase.c builtin/revert.c -msgid "how to handle commits that become empty" -msgstr "com gestionar les comissions que queden buides" - #: builtin/rebase.c msgid "keep commits which start empty" msgstr "manté les comissions que comencen en blanc" @@ -14617,7 +14918,7 @@ msgstr "intenta fer «rebase» de les fusions en comptes d'ometre-les" #: builtin/rebase.c msgid "use 'merge-base --fork-point' to refine upstream" -msgstr "usa «merge-base --fork-point» per a refinar la font" +msgstr "useu «merge-base --fork-point» per a refinar la branca amunt" #: builtin/rebase.c msgid "use the given merge strategy" @@ -14641,7 +14942,9 @@ msgstr "torna a planificar automàticament qualsevol «exec» que falli" #: builtin/rebase.c msgid "apply all changes, even those already present upstream" -msgstr "aplica tots els canvis, fins i tot els que ja estan a la font" +msgstr "" +"aplica tots els canvis, fins i tot els que ja estan presents a la branca " +"amunt" #: builtin/rebase.c msgid "It looks like 'git am' is in progress. Cannot rebase." @@ -14748,7 +15051,7 @@ msgstr "--reschedule-failed-exec requereix --exec o --interactive" #: builtin/rebase.c #, c-format msgid "invalid upstream '%s'" -msgstr "font no vàlida: «%s»" +msgstr "la referència amunt «%s» no és vàlida" #: builtin/rebase.c msgid "Could not create new root commit" @@ -15128,7 +15431,7 @@ msgstr "la referència no existeix" #: builtin/refs.c builtin/show-ref.c msgid "failed to look up reference" -msgstr "s'ha produït en cercar la referència" +msgstr "s'ha produït un error en cercar la referència" #: builtin/remote.c msgid "" @@ -15719,11 +16022,11 @@ msgstr "sigues detallat; s'ha de col·locar abans d'una subordre" msgid "" "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" "[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n" -"[--write-midx] [--name-hash-version=<n>] [--path-walk]" +"[--write-midx[=<mode>]] [--name-hash-version=<n>] [--path-walk]" msgstr "" "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" "[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<nom-paquet>]\n" -"[--write-midx] [--name-hash-version=<n>] [--path-walk]" +"[--write-midx[=<mode>]] [--name-hash-version=<n>] [--path-walk]" #: builtin/repack.c msgid "" @@ -15732,8 +16035,13 @@ msgid "" msgstr "" "Els reempaquetaments incrementals són incompatibles amb els índexs de mapes " "de bits. Useu\n" -"--no-write-bitmap-index o inhabiliteu el paràmetre de configuració " -"pack.writeBitmaps." +"--no-write-bitmap-index o inhabiliteu el paràmetre de configuració pack." +"writeBitmaps." + +#: builtin/repack.c +#, c-format +msgid "unknown value for %s: %s" +msgstr "valor desconegut per a %s: %s" #: builtin/repack.c msgid "pack everything in a single pack" @@ -15862,6 +16170,11 @@ msgstr "no es poden suprimir paquets en un repositori d'objectes preciosos" #: builtin/repack.c #, c-format +msgid "invalid value for %s: %d" +msgstr "valor no vàlid per a %s: %d" + +#: builtin/repack.c +#, c-format msgid "option '%s' can only be used along with '%s'" msgstr "l'opció «%s» només es pot utilitzar juntament amb «%s»" @@ -16065,7 +16378,7 @@ msgstr "reemplaça la referència si existeix" #: builtin/replace.c msgid "do not pretty-print contents for --edit" -msgstr "no imprimeixis bellament els continguts per a --edit" +msgstr "no apliquis cap formatació al contingut per a --edit" #: builtin/replace.c msgid "use this format" @@ -16129,11 +16442,11 @@ msgstr "" #: builtin/replay.c msgid "replay onto given commit" -msgstr "torna a reproduir a la comissió donada" +msgstr "torna a reproduir sobre la comissió donada" #: builtin/replay.c msgid "make replay advance given branch" -msgstr "fes avançar la repetició de la branca donada" +msgstr "fes que la reproducció avanci la branca especificada" #: builtin/replay.c msgid "revert commits onto given branch" @@ -16197,7 +16510,7 @@ msgstr "--keys no es pot usar amb <key> o --all" #: builtin/repo.c msgid "unsupported output format" -msgstr "format de sortida no compatible" +msgstr "format de sortida no admès" #: builtin/repo.c msgid "--all and <key> cannot be used together" @@ -16550,7 +16863,7 @@ msgstr "no s'ha especificat cap format d'objecte" #: builtin/rev-parse.c #, c-format msgid "unsupported object format: %s" -msgstr "format d'objecte no compatible: %s" +msgstr "format d'objecte no admès: %s" #: builtin/rev-parse.c #, c-format @@ -17003,17 +17316,13 @@ msgstr "s'assumeix SHA-1; useu --object-format per a sobreescriure-ho" #: builtin/show-index.c msgid "unable to read header" -msgstr "no s'ha pogut llegir la capçalera %s" +msgstr "no s'ha pogut llegir la capçalera" #: builtin/show-index.c msgid "unknown index version" msgstr "versió d'índex desconeguda" #: builtin/show-index.c -msgid "unable to read index" -msgstr "no es pot llegir el fitxer d'índex" - -#: builtin/show-index.c msgid "corrupt index file" msgstr "fitxer d'índex malmès" @@ -17276,8 +17585,7 @@ msgstr "ha d'estar en un sparse-checkout per a netejar directoris" #: builtin/sparse-checkout.c msgid "must be in a cone-mode sparse-checkout to clean directories" -msgstr "" -"ha d'estar en un sparse-checkout de mode cònic per a netejar directoris" +msgstr "ha d'estar en un sparse-checkout de mode con per a netejar directoris" #: builtin/sparse-checkout.c msgid "for safety, refusing to clean without one of --force or --dry-run" @@ -17347,8 +17655,12 @@ msgid "git stash pop [--index] [-q | --quiet] [<stash>]" msgstr "git stash pop [--index] [-q | --quiet] [<stash>]" #: builtin/stash.c -msgid "git stash apply [--index] [-q | --quiet] [<stash>]" -msgstr "git stash apply [--index] [-q | --quiet] [<stash>]" +msgid "" +"git stash apply [--index] [-q | --quiet] [--label-ours=<label>] [--label-" +"theirs=<label>] [--label-base=<label>] [<stash>]" +msgstr "" +"git stash apply [--index] [-q | --quiet] [--label-ours=<etiqueta>] [--label-" +"theirs=<etiqueta>] [--label-base=<etiqueta>] [<stash>]" #: builtin/stash.c msgid "git stash branch <branchname> [<stash>]" @@ -17466,6 +17778,22 @@ msgid "attempt to recreate the index" msgstr "intenta tornar a crear l'índex" #: builtin/stash.c +msgid "label" +msgstr "etiqueta" + +#: builtin/stash.c +msgid "label for the upstream side in conflict markers" +msgstr "etiqueta per a la part amunt en els marcadors de conflicte" + +#: builtin/stash.c +msgid "label for the stashed side in conflict markers" +msgstr "etiqueta per al costat «stashed» en els marcadors de conflicte" + +#: builtin/stash.c +msgid "label for the base in diff3 conflict markers" +msgstr "etiqueta per a la base en els marcadors de conflicte diff3" + +#: builtin/stash.c #, c-format msgid "Dropped %s (%s)" msgstr "Descartada %s (%s)" @@ -17705,7 +18033,7 @@ msgid "" "authoritative upstream." msgstr "" "no s'ha pogut trobar la configuració «%s». S'assumeix que aquest repositori " -"és el seu repositori font autoritzat." +"és el seu repositori amunt de referència." #: builtin/submodule--helper.c #, c-format @@ -17766,9 +18094,8 @@ msgid "" "submodule.%s.gitdir .git/modules/%s'" msgstr "" "no s'ha pogut establir una configuració per defecte vàlida per a 'submodule." -"%s.gitdir'. Si us plau, assegureu-vos que està establert, per exemple, " -"executant alguna ordre de l'estil de: 'git config submodule.%s.gitdir .git/" -"modules/%s'" +"%s.gitdir'. Si us plau, assegureu-vos que està d, per exemple, executant " +"alguna ordre de l'estil de: 'git config submodule.%s.gitdir .git/modules/%s'" #: builtin/submodule--helper.c #, c-format @@ -18124,7 +18451,7 @@ msgstr "S'ha produït un error en clonar «%s». S'ha programat un reintent" #: builtin/submodule--helper.c #, c-format msgid "Failed to clone '%s' a second time, aborting" -msgstr "S'ha produït un error per segon cop en clonar «%s», s'està avortant" +msgstr "S'ha produït un error per segon cop en clonar «%s», s'abandona" #: builtin/submodule--helper.c #, c-format @@ -18949,23 +19276,23 @@ msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" msgstr "" -"core.splitIndex està establert a fals; elimineu-lo o canviar-lo, si realment " -"voleu habilitar l'índex dividit" +"core.splitIndex s'ha definit com a fals; elimineu-lo o canviar-lo, si " +"realment voleu habilitar l'índex dividit" #: builtin/update-index.c msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" msgstr "" -"core.splitIndex està establert a cert; elimineu-lo o canvieu-lo, si realment " -"voleu inhabilitar l'índex dividit" +"core.splitIndex s'ha definit com a cert; elimineu-lo o canvieu-lo, si " +"realment voleu inhabilitar l'índex dividit" #: builtin/update-index.c msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" msgstr "" -"core.untrackedCache està establert a cert; elimineu-lo o canvieu-lo, si " +"core.untrackedCache s'ha definit com a cert; elimineu-lo o canvieu-lo, si " "realment voleu inhabilitar el cau no seguit" #: builtin/update-index.c @@ -18977,7 +19304,7 @@ msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" msgstr "" -"core.untrackedCache està establert a fals; elimineu-lo o canviar-lo, si " +"core.untrackedCache s'ha definit com a fals; elimineu-lo o canviar-lo, si " "realment voleu habilitar el cau no seguit" #: builtin/update-index.c @@ -18999,8 +19326,8 @@ msgstr "fsmonitor habilitat" msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "" -"core.fsmonitor està establert a cert; elimineu-lo si realment voleu " -"inhabilitar fsmonitor" +"core.fsmonitor està habilitat; elimineu-lo si realment voleu inhabilitar " +"fsmonitor" #: builtin/update-index.c msgid "fsmonitor disabled" @@ -19067,6 +19394,18 @@ msgstr "" msgid "interrupt transfer after <n> seconds of inactivity" msgstr "interromp la transferència després de <n> segons d'inactivitat" +#: builtin/url-parse.c +msgid "git url-parse [-c <component>] [--] <url>..." +msgstr "git url-parse [-c <component>] [--] <url>..." + +#: builtin/url-parse.c +msgid "component" +msgstr "component" + +#: builtin/url-parse.c +msgid "which URL component to extract" +msgstr "quin component d'URL cal extreure" + #: builtin/verify-commit.c msgid "git verify-commit [-v | --verbose] [--raw] <commit>..." msgstr "git verify-commit [-v | --verbose] [--raw] <comissió>..." @@ -19557,7 +19896,7 @@ msgstr "bundle-uri: argument inesperat: «%s»" #: bundle-uri.c msgid "bundle-uri: expected flush after arguments" -msgstr "bundle-uri: s'esperava una neteja després dels arguments" +msgstr "bundle-uri: s'esperava un buidatge després dels arguments" #: bundle-uri.c msgid "bundle-uri: got an empty line" @@ -19651,7 +19990,7 @@ msgstr "les opcions de la llista de revisions exclouen la referència «%s»" #: bundle.c #, c-format msgid "unsupported bundle version %d" -msgstr "versió del farcell no compatible %d" +msgstr "versió del farcell no admesa %d" #: bundle.c #, c-format @@ -19674,7 +20013,7 @@ msgstr "l'index-pack s'ha mort" #: cache-tree.c #, c-format msgid "directory '%s' is present in index, but not sparse" -msgstr "El directori %s és en l'índex però no és dispers" +msgstr "el directori %s és en l'índex però no és dispers" #: cache-tree.c unpack-trees.c msgid "corrupted cache-tree has entries not present in index" @@ -19694,7 +20033,7 @@ msgstr "subarbre incorrecte «%.*s»" #, c-format msgid "cache-tree for path %.*s does not match. Expected %s got %s" msgstr "" -"el cache-tree per al camí %.*s no coincideix. S'esperava %s i s'ha obtingut " +"el cache-tree per al camí %.*s no coincideix. S'esperava %s però s'ha rebut " "%s" #: chunk-format.c @@ -19811,7 +20150,7 @@ msgstr "Copia fitxers des de l'índex a l'arbre de treball" #: command-list.h msgid "Find commits yet to be applied to upstream" -msgstr "Troba les comissions que encara s'han d'aplicar a la font" +msgstr "Troba les comissions pendents d'integrar a la branca amunt" #: command-list.h msgid "Apply the changes introduced by some existing commits" @@ -19954,6 +20293,10 @@ msgid "Prepare patches for e-mail submission" msgstr "Prepara pedaços per a enviar-los per correu electrònic" #: command-list.h +msgid "EXPERIMENTAL: Pretty format revisions on demand" +msgstr "EXPERIMENTAL: dóna format net de les revisions sota demanda" + +#: command-list.h msgid "Verifies the connectivity and validity of the objects in the database" msgstr "Verifica la connectivitat i validesa dels objectes a la base de dades" @@ -19987,7 +20330,7 @@ msgid "EXPERIMENTAL: Rewrite history" msgstr "EXPERIMENTAL: rescriu la història" #: command-list.h -msgid "Run git hooks" +msgid "Run Git hooks" msgstr "Executa els lligams del git" #: command-list.h @@ -20193,8 +20536,8 @@ msgstr "Crea, llista i esborra referències per a substituir objectes" #: command-list.h msgid "EXPERIMENTAL: Replay commits on a new base, works with bare repos too" msgstr "" -"EXPERIMENTAL: torna a reproduir comissions sobre una nova base, també " -"funciona amb repositoris nus" +"EXPERIMENTAL: reprodueix comissions sobre una nova base, també funciona amb " +"repositoris nus" #: command-list.h msgid "Retrieve information about the repository" @@ -20254,7 +20597,7 @@ msgid "Restricted login shell for Git-only SSH access" msgstr "Intèrpret d'ordres d'entrada restringit només per a accés SSH al Git" #: command-list.h -msgid "Summarize 'git log' output" +msgid "Summarize `git log` output" msgstr "Resumeix la sortida «git log»" #: command-list.h @@ -20344,6 +20687,10 @@ msgid "Send objects packed back to git-fetch-pack" msgstr "Envia els objectes empaquetats de tornada al git-fetch-pack" #: command-list.h +msgid "Parse and extract git URL components" +msgstr "Analitza i extrau els components d'una URL amb format Git" + +#: command-list.h msgid "Show a Git logical variable" msgstr "Mostra una variable lògica del Git" @@ -20581,18 +20928,19 @@ msgstr "" #: commit-graph.c msgid "commit-graph required OID fanout chunk missing or corrupted" msgstr "" -"manca o està malmès el fragment del «fanout» OID requerit al graf de " +"manca o està malmès el fragment del «fanout» OID requerit pel graf de " "comissions" #: commit-graph.c msgid "commit-graph required OID lookup chunk missing or corrupted" msgstr "" -"manca o està malmès el fragment de cerca d'OID requerit al graf de comissions" +"manca o està malmès el fragment de cerca d'OID requerit pel graf de " +"comissions" #: commit-graph.c msgid "commit-graph required commit data chunk missing or corrupted" msgstr "" -"manca o està corromput el fragment de dades de publicació requerit al graf " +"manca o està corromput el fragment de dades de publicació requerit pel graf " "de comissions" #: commit-graph.c @@ -20782,11 +21130,11 @@ msgstr "" #: 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 "" -"s'ha intentat escriure un graf de comissió, però no s'admet " -"'commitGraph.changedPathsVersion' (%d)" +"s'ha intentat escriure un graf de comissió, però no s'admet 'commitGraph." +"changedPathsVersion' (%d)" #: commit-graph.c msgid "too many commits to write graph" @@ -20840,7 +21188,7 @@ msgstr "" #: commit-graph.c #, c-format msgid "commit-graph parent for %s is %s != %s" -msgstr "el pare pel graf de comissions %s és %s != %s" +msgstr "el pare per al graf de comissions %s és %s != %s" #: commit-graph.c #, c-format @@ -20867,7 +21215,7 @@ msgid "" "commit-graph has both zero and non-zero generations (e.g., commits '%s' and " "'%s')" msgstr "" -"El graf de comissió té tant generacions zero com no nul·les (p. ex., " +"el graf de comissió té tant generacions zero com no nul·les (p. ex., " "comissions «%s» i «%s»)" #: commit-graph.c @@ -20995,7 +21343,7 @@ msgstr "cas no gestionat a «has_worktree_moved»: %d" msgid "health thread wait failed [GLE %ld]" msgstr "ha fallat l'espera del fil de salut [GLE %ld]" -#: compat/fsmonitor/fsm-ipc-darwin.c +#: compat/fsmonitor/fsm-ipc-unix.c #, c-format msgid "Invalid path: %s" msgstr "Camí no vàlid: «%s»" @@ -21008,6 +21356,52 @@ msgstr "No s'ha pogut crear el FSEventStream." msgid "Failed to start the FSEventStream" msgstr "No s'ha pogut iniciar el FSEventStream" +#: compat/fsmonitor/fsm-listen-linux.c +msgid "inotify watch limit reached; increase fs.inotify.max_user_watches" +msgstr "" +"s'ha assolit el límit de vigilància d'inotify; augmenteu fs.inotify." +"max_user_watches" + +#: compat/fsmonitor/fsm-listen-linux.c +#, c-format +msgid "inotify_add_watch('%s') failed" +msgstr "ha fallat inotify_add_watch(«%s»)" + +#: compat/fsmonitor/fsm-listen-linux.c +msgid "inotify_rm_watch() failed" +msgstr "ha fallat inotify_rm_watch()" + +#: compat/fsmonitor/fsm-listen-linux.c compat/fsmonitor/fsm-path-utils-darwin.c +#, c-format +msgid "opendir('%s') failed" +msgstr "ha fallat opendir(«%s»)" + +#: compat/fsmonitor/fsm-listen-linux.c compat/fsmonitor/fsm-path-utils-darwin.c +#, c-format +msgid "lstat('%s') failed" +msgstr "ha fallat lstat(«%s»)" + +#: compat/fsmonitor/fsm-listen-linux.c compat/fsmonitor/fsm-path-utils-darwin.c +#, c-format +msgid "closedir('%s') failed" +msgstr "ha fallat closedir(«%s»)" + +#: compat/fsmonitor/fsm-listen-linux.c +msgid "inotify_init1() failed" +msgstr "ha fallat inotify_init1()" + +#: compat/fsmonitor/fsm-listen-linux.c +msgid "closing inotify file descriptor failed" +msgstr "ha fallat el tancament del descriptor de fitxer inotify" + +#: compat/fsmonitor/fsm-listen-linux.c +msgid "reading inotify message stream failed" +msgstr "ha fallat la lectura d'un flux de missatges inotify" + +#: compat/fsmonitor/fsm-listen-linux.c +msgid "polling inotify message stream failed" +msgstr "ha fallat el sondeig del flux de missatges d'inotify" + #: compat/fsmonitor/fsm-listen-win32.c #, c-format msgid "[GLE %ld] could not convert path to UTF-8: '%.*ls'" @@ -21040,24 +21434,9 @@ msgstr "no s'han pogut llegir els canvis de directori [GLE %ld]" #: compat/fsmonitor/fsm-path-utils-darwin.c #, c-format -msgid "opendir('%s') failed" -msgstr "ha fallat opendir(«%s»)" - -#: compat/fsmonitor/fsm-path-utils-darwin.c -#, c-format -msgid "lstat('%s') failed" -msgstr "ha fallat lstat(«%s»)" - -#: compat/fsmonitor/fsm-path-utils-darwin.c -#, c-format msgid "strbuf_readlink('%s') failed" msgstr "ha fallat strbuf_readlink(«%s»)" -#: compat/fsmonitor/fsm-path-utils-darwin.c -#, c-format -msgid "closedir('%s') failed" -msgstr "ha fallat closedir(«%s»)" - #: compat/fsmonitor/fsm-path-utils-win32.c #, c-format msgid "[GLE %ld] unable to open for read '%ls'" @@ -21402,7 +21781,7 @@ msgstr "no s'ha pogut carregar l'objecte blob de configuració «%s»" #: config.c #, c-format msgid "reference '%s' does not point to a blob" -msgstr "la referència «%s» no assenyala a un blob" +msgstr "la referència «%s» no apunta a un blob" #: config.c #, c-format @@ -21639,12 +22018,7 @@ msgstr "resposta de ls-refs no vàlida: %s" #: connect.c msgid "expected flush after ref listing" -msgstr "s'esperava una neteja després del llistat de referències" - -#: connect.c -#, c-format -msgid "protocol '%s' is not supported" -msgstr "el protocol «%s» no és compatible" +msgstr "s'esperava un buidatge després del llistat de referències" #: connect.c msgid "unable to set SO_KEEPALIVE on socket" @@ -21710,6 +22084,11 @@ msgid "cannot start proxy %s" msgstr "no s'ha pogut iniciar servidor intermediari «%s»" #: connect.c +#, c-format +msgid "protocol '%s' is not supported" +msgstr "el protocol «%s» no és compatible" + +#: connect.c msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "" "no s'ha especificat un camí; vegeu «git help pull» per la sintaxi vàlida per " @@ -22057,7 +22436,7 @@ msgstr "s'ha produït un error en escriure arxiu" #: diff-lib.c msgid "max-depth is not supported for worktree diffs" -msgstr "No s'admet max-depth per a diferències d'arbres de treball" +msgstr "no s'admet max-depth per a diferències d'arbres de treball" #: diff-lib.c msgid "max-depth is not supported for index diffs" @@ -22173,7 +22552,7 @@ msgstr "--follow requereix exactament una especificació de camí" #: diff.c #, c-format msgid "pathspec magic not supported by --follow: %s" -msgstr "la màgia d'especificació de camí no està suportat per --follow: %s" +msgstr "la màgia d'especificació de camí no està admesa per --follow: %s" #: diff.c parse-options.c #, c-format @@ -22276,6 +22655,11 @@ msgstr "" #: diff.c #, c-format +msgid "%s expects a non-negative integer" +msgstr "%s espera un enter no negatiu" + +#: diff.c +#, c-format msgid "bad --word-diff argument: %s" msgstr "argument --word-diff incorrecte: %s" @@ -23277,7 +23661,7 @@ msgstr "" #: git.c help.c #, c-format msgid "unsupported command listing type '%s'" -msgstr "tipus de llistat de l'ordre no compatible «%s»" +msgstr "tipus de llistat de l'ordre no admès «%s»" #: git.c #, c-format @@ -23689,6 +24073,60 @@ msgstr "" #: hook.c #, c-format +msgid "hook.jobs must be an integer, ignoring: '%s'" +msgstr "hook.jobs ha de ser un enter, s'ignora: «%s»" + +#: hook.c +#, c-format +msgid "hook.jobs must be a positive integer or -1, ignoring: '%s'" +msgstr "hook.jobs ha de ser un enter positiu o -1, s'ignora: «%s»" + +#: hook.c +#, c-format +msgid "" +"hook friendly-name '%s' collides with a known event name; please choose a " +"different friendly-name" +msgstr "" +"el nom descriptiu del lligam «%s» col·lideix amb un nom d'esdeveniment " +"conegut; cal triar un nom descriptiu diferent" + +#: hook.c +#, c-format +msgid "" +"hook friendly-name '%s' is the same as its event; this may cause ambiguity " +"with hook.%s.enabled" +msgstr "" +"el nom descriptiu del lligam «%s» és el mateix que el seu esdeveniment; això " +"pot causar una ambigüitat amb hook.%s.enabled" + +#: hook.c +#, c-format +msgid "hook.%s.parallel must be a boolean, ignoring: '%s'" +msgstr "hook.%s.parallel ha de ser un booleà, s'ignora: «%s»" + +#: hook.c +#, c-format +msgid "hook.%s.jobs must be an integer, ignoring: '%s'" +msgstr "hook.%s.jobs ha de ser un enter, s'ignora: «%s»" + +#: hook.c +#, c-format +msgid "hook.%s.jobs must be a positive integer or -1, ignoring: '%s'" +msgstr "hook.%s.jobs ha de ser un enter positiu o -1; ignoring: «%s»" + +#: hook.c +#, c-format +msgid "" +"hook.%s.jobs is set but '%s' looks like a hook friendly-name, not an event " +"name; hook.<event>.jobs uses the event name (e.g. hook.post-receive.jobs), " +"so this setting will be ignored" +msgstr "" +"hook.%s.jobs està habilitat però «%s» sembla un nom descriptiu de lligam, no " +"un nom d'esdeveniment; hook.<event>.jobs usa el nom d'esdeveniment (p.e. " +"hook.post-receive.jobs), de manera que aquesta configuració s'ignorarà" + +#: hook.c +#, c-format msgid "disabled hook '%s' has no command configured" msgstr "el lligam inhabilitat «%s» no té cap ordre configurada" @@ -23699,7 +24137,23 @@ msgid "" "aborting." msgstr "" "s'ha de configurar «hook.%s.command» o s'ha de suprimir «hook.%s.event»; " -"s'està avortant." +"s'abandona." + +#: hook.c +#, c-format +msgid "" +"hook '%s' is not marked as parallel=true, running in parallel anyway due to -" +"j%u" +msgstr "" +"el lligam «%s» no s'ha marcat com a parallel=true; s'executarà en paral·lel " +"de totes maneres a causa de -j%u" + +# gerundi → futur? +# default → valor predeterminat? +#: hook.c +#, c-format +msgid "%s must be a positive integer or -1, ignoring: %d" +msgstr "%s ha de ser un enter positiu o -1, s'ignora «%d»" #: http-fetch.c msgid "not a git repository" @@ -23708,7 +24162,7 @@ msgstr "no és un repositori de git" #: http-fetch.c #, c-format msgid "argument to --packfile must be a valid hash (got '%s')" -msgstr "l'argument a --packfile ha de ser un resum vàlid (s'ha obtingut «%s»)" +msgstr "l'argument a --packfile ha de ser un resum vàlid (s'ha rebut «%s»)" #: http.c #, c-format @@ -23731,7 +24185,7 @@ msgstr "s'ha produït un error en analitzar %s" #: http.c #, c-format msgid "Unsupported SSL backend '%s'. Supported SSL backends:" -msgstr "El rerefons SSL «%s» no està admès. Els rerefons SSL admesos:" +msgstr "El rerefons SSL «%s» no s'admet. Els rerefons SSL admesos:" #: http.c #, c-format @@ -23898,7 +24352,7 @@ msgstr "s'esperava «tree:<profunditat>»" #: list-objects-filter-options.c msgid "sparse:path filters support has been dropped" -msgstr "sparse: s'ha eliminat la implementació de filtres de camí sparse" +msgstr "sparse: s'ha eliminat la compatibilitat amb filtres de camí sparse" #: list-objects-filter-options.c #, c-format @@ -23917,7 +24371,7 @@ msgstr "cal escapar el caràcter en el sub-filter-spec «%c»" #: list-objects-filter-options.c msgid "an 'auto' filter cannot be combined" -msgstr " no es pot combinar un filtre «auto»" +msgstr "no es pot combinar un filtre «auto»" #: list-objects-filter-options.c msgid "expected something after combine:" @@ -23945,7 +24399,7 @@ msgstr "arguments" msgid "object filtering" msgstr "filtratge d'objecte" -#: list-objects-filter.c +#: list-objects-filter.c path-walk.c #, c-format msgid "unable to access sparse blob in '%s'" msgstr "no s'ha pogut accedir a un blob dispers en «%s»" @@ -23953,7 +24407,7 @@ msgstr "no s'ha pogut accedir a un blob dispers en «%s»" #: list-objects-filter.c #, c-format msgid "unable to parse sparse filter data in %s" -msgstr "no s'han pogut analitzar les dades disperses filtrades %s" +msgstr "no s'han pogut analitzar les dades del filtre dispers %s" #: list-objects.c #, c-format @@ -24042,7 +24496,7 @@ msgstr "línia inesperada: «%s»" #: ls-refs.c msgid "expected flush after ls-refs arguments" -msgstr "s'esperava una neteja després dels arguments ls-refs" +msgstr "s'esperava un buidatge després dels arguments ls-refs" #: mailinfo.c msgid "quoted CRLF detected" @@ -24421,6 +24875,11 @@ msgstr "" #: midx-write.c #, c-format +msgid "could not find base MIDX '%s'" +msgstr "no s'ha pogut trobar el MIDX de base «%s»" + +#: midx-write.c +#, c-format msgid "could not load reverse index for MIDX %s" msgstr "no s'ha pogut carregar l'índex invers per al MIDX %s" @@ -24446,7 +24905,7 @@ msgstr "no es pot seleccionar un paquet preferit %s sense objectes" #: midx-write.c #, c-format msgid "did not see pack-file %s to drop" -msgstr "no s'ha vist caure el fitxer empaquetat %s" +msgstr "no s'ha trobat el fitxer de paquets «%s» per a descartar" #: midx-write.c #, c-format @@ -24473,7 +24932,7 @@ msgstr "no s'han pogut escriure els mapes de bits dels multipaquets" msgid "too many multi-pack-indexes" msgstr "massa índexs multipaquet" -#: midx-write.c +#: midx-write.c repack-midx.c msgid "unable to open multi-pack-index chain file" msgstr "no s'ha pogut obrir el fitxer de cadenes multi-path-index" @@ -24522,7 +24981,7 @@ msgstr "" #: midx.c msgid "multi-pack-index OID lookup chunk is the wrong size" -msgstr "El fragment de cerca OID índex multipaquet és de mida incorrecta" +msgstr "el fragment de cerca OID índex multipaquet és de mida incorrecta" #: midx.c msgid "multi-pack-index object offset chunk is the wrong size" @@ -24556,26 +25015,26 @@ msgstr "" #: midx.c msgid "multi-pack-index required pack-name chunk missing or corrupted" msgstr "" -"manca o està malmès el fragment del nom de paquet requerit de l'índex " +"manca o està malmès el fragment del nom de paquet requerit per l'índex " "multipaquet" #: midx.c msgid "multi-pack-index required OID fanout chunk missing or corrupted" msgstr "" -"manca o està malmès el fragment del «fanout» OID requerit a l'índex " +"manca o està malmès el fragment del «fanout» OID requerit per l'índex " "multipaquet" #: midx.c msgid "multi-pack-index required OID lookup chunk missing or corrupted" msgstr "" -"manca o està malmès el fragment de cerca d'OID necessari a l'índex " +"manca o està malmès el fragment de cerca d'OID necessari per l'índex " "multipaquet" #: midx.c msgid "multi-pack-index required object offsets chunk missing or corrupted" msgstr "" -"manca o està malmès el fragment de l'índex multipaquet dels objectes " -"requerits" +"manca o està malmès el fragment dels desplaçaments d'objecte requerit per " +"l'índex multipaquet" #: midx.c msgid "multi-pack-index pack-name chunk is too short" @@ -24642,6 +25101,11 @@ msgid "multi-pack-index large offset out of bounds" msgstr "desplaçament gran de l'índex multipaquet està fora dels límits" #: midx.c +#, c-format +msgid "failed to clear multi-pack-index chain at %s" +msgstr "no s'ha pogut netejar l'índex multipaquet en %s" + +#: midx.c msgid "multi-pack-index file exists, but failed to parse" msgstr "" "el fitxer de l'índex multipaquet existeix, però no s'ha pogut analitzar" @@ -24770,7 +25234,7 @@ msgstr "no es pot mapar %s %s en l'objecte de comissió" msgid "Failed to convert object from %s to %s" msgstr "No s'ha pogut convertir l'objecte de %s a %s" -#: object-file.c +#: object-file.c odb/source-loose.c #, c-format msgid "object file %s is empty" msgstr "el tipus d'objecte %s és buit" @@ -24787,35 +25251,6 @@ msgstr "brossa al final de l'objecte solt «%s»" #: object-file.c #, c-format -msgid "unable to open loose object %s" -msgstr "no s'ha pogut obrir l'objecte solt %s" - -#: object-file.c -#, c-format -msgid "unable to parse %s header" -msgstr "no s'ha pogut analitzar la capçalera %s" - -#: object-file.c -msgid "invalid object type" -msgstr "tipus d'objecte és incorrecte" - -#: object-file.c -#, c-format -msgid "unable to unpack %s header" -msgstr "no s'ha pogut desempaquetar la capçalera %s" - -#: object-file.c -#, c-format -msgid "header for %s too long, exceeds %d bytes" -msgstr "la capçalera per a %s és massa llarga, supera els %d octets" - -#: object-file.c -#, c-format -msgid "loose object %s (stored in %s) is corrupt" -msgstr "l'objecte solt %s (emmagatzemat a %s) és corrupte" - -#: object-file.c -#, c-format msgid "unable to open %s" msgstr "no s'ha pogut obrir %s" @@ -24836,7 +25271,7 @@ msgstr "no s'ha pogut establir el permís a «%s»" #: object-file.c msgid "core.fsyncMethod = batch is unsupported on this platform" -msgstr "core.fsyncMethod = batch no és compatible amb aquesta plataforma" +msgstr "core.fsyncMethod = batch no és admès em aquesta plataforma" #: object-file.c msgid "error when closing loose object file" @@ -24874,8 +25309,8 @@ msgstr "confós per la font de dades inestable de l'objecte per a %s" #: object-file.c #, c-format -msgid "write stream object %ld != %<PRIuMAX>" -msgstr "escriu l'objecte de flux %ld != %<PRIuMAX>" +msgid "write stream object %<PRIuMAX> != %<PRIuMAX>" +msgstr "l'objecte de flux d'escriptura %<PRIuMAX> != %<PRIuMAX>" #: object-file.c #, c-format @@ -24933,7 +25368,7 @@ msgstr "no es pot afegir un submòdul d'un algorisme de hash diferent" #: object-file.c #, c-format msgid "%s: unsupported file type" -msgstr "%s: tipus de fitxer no suportat" +msgstr "%s: tipus de fitxer no admès" #: object-file.c #, c-format @@ -25134,7 +25569,7 @@ msgstr "" #: object-name.c #, c-format msgid "<object>:<path> required, only <object> '%s' given" -msgstr "<objecte>:<camí> requerit, només s'ha donat <objecte> «%s»" +msgstr "es requereix <objecte>:<camí>, només s'ha donat <objecte> «%s»" #: object-name.c #, c-format @@ -25238,6 +25673,11 @@ msgstr "manca el mapatge de %s a %s" #: odb.c #, c-format +msgid "%s is not a valid object" +msgstr "%s no és un objecte vàlid" + +#: odb.c +#, c-format msgid "%s is not a valid '%s' object" msgstr "%s no és un objecte de «%s» vàlid" @@ -25253,6 +25693,35 @@ msgstr "no es pot llegir el fitxer «alternates»" msgid "unable to move new alternates file into place" msgstr "no s'ha pogut moure el nou fitxer «alternates» al lloc" +#: odb/source-loose.c +#, c-format +msgid "unable to open loose object %s" +msgstr "no s'ha pogut obrir l'objecte solt %s" + +#: odb/source-loose.c +#, c-format +msgid "unable to parse %s header" +msgstr "no s'ha pogut analitzar la capçalera %s" + +#: odb/source-loose.c +msgid "invalid object type" +msgstr "tipus d'objecte és incorrecte" + +#: odb/source-loose.c +#, c-format +msgid "unable to unpack %s header" +msgstr "no s'ha pogut desempaquetar la capçalera %s" + +#: odb/source-loose.c +#, c-format +msgid "header for %s too long, exceeds %d bytes" +msgstr "la capçalera per a %s és massa llarga, supera els %d octets" + +#: odb/source-loose.c +#, c-format +msgid "loose object %s (stored in %s) is corrupt" +msgstr "l'objecte solt %s (emmagatzemat a %s) és corrupte" + #: pack-bitmap-write.c #, c-format msgid "duplicate entry when writing bitmap index: %s" @@ -25350,7 +25819,7 @@ msgstr "la suma de verificació no coincideix amb el MIDX i el mapa de bits" #: pack-bitmap.c msgid "multi-pack bitmap is missing required reverse index" -msgstr "hi manca l'índex invers necessari al mapa de bits multipaquet" +msgstr "al mapa de bits multipaquet li manca l'índex invers obligatori" #: pack-bitmap.c #, c-format @@ -25553,7 +26022,7 @@ msgstr "s'ha produït un error en fer %s llegible" #: pack-write.c #, c-format msgid "could not write '%s' promisor file" -msgstr "no s'ha pogut escriure «%s» al fitxer «promisor»" +msgstr "no s'ha pogut escriure el fitxer garant «%s»" #: packfile.c msgid "offset before end of packfile (broken .idx?)" @@ -25772,7 +26241,7 @@ msgstr "-NUM" #: parse-options.c #, c-format msgid "opposite of --no-%s" -msgstr "oposat a --no-%s" +msgstr "el contrari de --no-%s" #: parse-options.h msgid "expiry-date" @@ -25834,6 +26303,30 @@ msgid "failed to find tag %s" msgstr "no s'ha pogut trobar l'etiqueta %s" #: path-walk.c +#, c-format +msgid "tree:%lu filter not supported by the path-walk API" +msgstr "l'API path-walk no admet el filtre tree:%lu" + +#: path-walk.c +msgid "sparse filter cannot be combined with existing sparse patterns" +msgstr "" +"el filtre dispers no es pot combinar amb els patrons dispersos existents" + +#: path-walk.c +#, c-format +msgid "unable to parse sparse filter data in '%s'" +msgstr "no s'han pogut analitzar les dades del filtre dispers en «%s»" + +#: path-walk.c +msgid "sparse filter is not cone-mode compatible" +msgstr "el filtre dispers no és compatible amb el mode con" + +#: path-walk.c +#, c-format +msgid "object filter '%s' not supported by the path-walk API" +msgstr "l'API path-walk no admet el filtre d'objectes «%s»" + +#: path-walk.c msgid "failed to setup revision walk" msgstr "no s'ha pogut configurar un recorregut de revisió" @@ -26020,21 +26513,21 @@ msgstr "promisor-remote: no es pot bifurcar el subprocés d'obtenció" #: promisor-remote.c msgid "promisor-remote: could not write to fetch subprocess" -msgstr "promisor-remote: no s'ha pogut escriure per al subprocés d'obtenció" +msgstr "promisor-remote: no s'ha pogut escriure en el subprocés d'obtenció" #: promisor-remote.c msgid "promisor-remote: could not close stdin to fetch subprocess" -msgstr "promisor-remote: no s'ha pogut tancar stdin al subprocés d'obtenció" +msgstr "promisor-remote: no s'ha pogut tancar l'stdin del subprocés d'obtenció" #: promisor-remote.c #, c-format msgid "promisor remote name cannot begin with '/': %s" -msgstr "el nom remot «promisor» no pot començar amb «/»: %s" +msgstr "el nom del remot garant no pot començar amb «/»: %s" #: promisor-remote.c #, c-format msgid "could not fetch %s from promisor remote" -msgstr "no s'ha pogut obtenir «%s» del «promisor» remot" +msgstr "no s'ha pogut obtenir «%s» del remot garant" #: promisor-remote.c #, c-format @@ -26043,13 +26536,12 @@ msgstr "no s'admet el camp «%s» en la configuració «%s»" #: promisor-remote.c #, c-format -msgid "no or empty URL advertised for remote '%s'" -msgstr "no hi ha URL configurat per al remot «%s» o és buit" - -#: promisor-remote.c -#, c-format -msgid "known remote named '%s' but with URL '%s' instead of '%s'" -msgstr "remot conegut nomenat «%s» però amb URL «%s» en comptes de «%s»" +msgid "" +"known remote named '%s' but with URL '%s' instead of '%s', ignoring this " +"remote" +msgstr "" +"remot conegut amb nom «%s» però amb URL «%s» en comptes de «%s»; s'ignora " +"aquest remot" #: promisor-remote.c #, c-format @@ -26058,8 +26550,12 @@ msgstr "element invàlid «%s» en la informació del remot" #: promisor-remote.c #, c-format -msgid "server advertised a promisor remote without a name or URL: %s" -msgstr "el servidor ha anunciat un remot «promisor» sense nom o URL: %s" +msgid "" +"server advertised a promisor remote without a name or URL: '%s', ignoring " +"this remote" +msgstr "" +"el servidor ha anunciat un remot garant sense nom o URL: «%s»; s'ignora " +"aquest remot" #: promisor-remote.c #, c-format @@ -26088,16 +26584,16 @@ msgstr "valor desconegut «%s» per a l'opció «%s» de configuració" #: promisor-remote.c #, c-format msgid "accepted promisor remote '%s' not found" -msgstr "no s'ha trobat el remot promisor acceptat «%s»" +msgstr "no s'ha trobat el remot garant acceptat «%s»" #: promisor-remote.c #, c-format msgid "promisor remote '%s' advertised invalid filter '%s': %s" -msgstr "el remot de «promissor» «%s» ha anunciat un filtre invàlid «%s»:%s" +msgstr "el remot garant «%s» ha anunciat un filtre invàlid «%s»:%s" #: protocol-caps.c msgid "object-info: expected flush after arguments" -msgstr "object-info: s'esperava una neteja després dels arguments" +msgstr "object-info: s'esperava un buidatge després dels arguments" #: prune-packed.c msgid "Removing duplicate objects" @@ -26120,8 +26616,8 @@ msgstr "%s ha de ser no negatiu, s'usarà el valor predeterminat" # default → valor predeterminat? #: pseudo-merge.c #, c-format -msgid "%s must be between 0 and 1, using default" -msgstr "%s ha d'estar entre 0 i 1, s'usarà el valor predeterminat" +msgid "%s must be between 0 (exclusive) and 1, using default" +msgstr "%s ha d'estar entre 0 (exclusiu) i 1, s'usarà el valor predeterminat" # gerundi → futur? # default → valor predeterminat? @@ -26133,7 +26629,7 @@ msgstr "%s ha de ser positiu, s'usarà el valor predeterminat" #: pseudo-merge.c #, c-format msgid "pseudo-merge group '%s' missing required pattern" -msgstr "manca un patró requerit al grup de pseudo-fusió «%s»" +msgstr "manca un patró obligatori al grup de pseudo-fusió «%s»" #: pseudo-merge.c #, c-format @@ -26424,7 +26920,7 @@ msgstr "no s'han pogut corregir els bits de permisos en «%s»" #: read-cache.c #, c-format msgid "%s: cannot drop to stage #0" -msgstr "%s: no es pot baixar fins al «stage» #0" +msgstr "%s: no es pot baixar a l'«stage» #0" #: read-cache.c #, c-format @@ -27013,6 +27509,18 @@ msgstr "" #: refs.c #, c-format +msgid "trying to write ref '%s' with nonexistent object %s" +msgstr "" +"s'està intentant escriure la referència «%s» amb l'objecte que no existeix %s" + +#: refs.c +#, c-format +msgid "trying to write non-commit object %s to branch '%s'" +msgstr "" +"s'està intentant escriure un objecte no de comissió %s en la branca «%s»" + +#: refs.c +#, c-format msgid "update_ref failed for ref '%s': %s" msgstr "ha fallat update_ref per a la ref «%s»: %s" @@ -27127,18 +27635,6 @@ msgstr "el nom de referència és perillós: %s" #: refs/reftable-backend.c #, c-format -msgid "trying to write ref '%s' with nonexistent object %s" -msgstr "" -"s'està intentant escriure la referència «%s» amb l'objecte que no existeix %s" - -#: refs/reftable-backend.c -#, c-format -msgid "trying to write non-commit object %s to branch '%s'" -msgstr "" -"s'està intentant escriure un objecte no de comissió %s en la branca «%s»" - -#: refs/reftable-backend.c -#, c-format msgid "" "multiple updates for 'HEAD' (including one via its referent '%s') are not " "allowed" @@ -27226,7 +27722,7 @@ msgstr "" #, c-format msgid "reftable stack for worktree '%s' is broken" msgstr "" -"la pila de taula de referències per a l'arbre de treball '%s\" està trencada" +"la pila de taula de referències per a l'arbre de treball «%s» està trencada" #: refs/reftable-backend.c #, c-format @@ -27267,13 +27763,13 @@ msgstr "%sinfo/refs no vàlides: és un repositori git?" #: remote-curl.c msgid "invalid server response; expected service, got flush packet" msgstr "" -"resposta del servidor no és vàlida; el servei esperat, ha rebut in paquet de " -"neteja" +"resposta del servidor no és vàlida; el servei esperat, ha rebut un paquet de " +"buidatge" #: remote-curl.c #, c-format msgid "invalid server response; got '%s'" -msgstr "resposta del servidor no vàlida; s'ha obtingut «%s»" +msgstr "resposta del servidor no vàlida; s'ha rebut «%s»" #: remote-curl.c #, c-format @@ -27377,12 +27873,12 @@ msgstr "no s'ha pogut obtenir per sha1 a través de l'http intel·ligent" #: remote-curl.c #, c-format msgid "protocol error: expected sha/ref, got '%s'" -msgstr "error de protocol: s'esperava sha/ref, s'ha obtingut «%s»" +msgstr "error de protocol: s'esperava sha/ref, s'ha rebut «%s»" #: remote-curl.c #, c-format msgid "http transport does not support %s" -msgstr "El transport http no admet %s" +msgstr "el transport http no admet %s" #: remote-curl.c msgid "protocol error: expected '<url> <path>', missing space" @@ -27431,7 +27927,7 @@ msgstr "" "s'està llegint el remot des de «%s/%s», el qual està nominat per a la seva " "supressió.\n" "\n" -"Si encara feu servir el directori «remotes/», es recomana la migració a\n" +"Si encara utilitzeu el directori «remotes/», es recomana la migració a\n" "remots basats en configuració\n" "\n" "\tgit remote rename %s %s\n" @@ -27597,7 +28093,7 @@ msgstr "l'especificació de la referència dst %s rep més d'una referència src #: remote.c msgid "HEAD does not point to a branch" -msgstr "HEAD no assenyala cap branca" +msgstr "HEAD no apunta a cap branca" #: remote.c #, c-format @@ -27607,12 +28103,12 @@ msgstr "no existeix la branca: «%s»" #: remote.c #, c-format msgid "no upstream configured for branch '%s'" -msgstr "cap font configurada per a la branca «%s»" +msgstr "cap branca amunt configurada per a la branca «%s»" #: remote.c #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" -msgstr "la branca font «%s» no s'emmagatzema com a branca amb seguiment remot" +msgstr "la branca amunt «%s» no s'emmagatzema com a branca amb seguiment remot" #: remote.c #, c-format @@ -27718,17 +28214,17 @@ msgstr[1] "" #: remote.c msgid "" " (use \"git pull\" if you want to integrate the remote branch with yours)\n" -msgstr "" -" (utilitzeu «git pull» si voleu integrar la branca remota amb la vostra)\n" +msgstr " (useu «git pull» si voleu integrar la branca remota amb la vostra)\n" #: remote.c #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" -msgstr "La vostra branca està basada en «%s», però la font no hi és.\n" +msgstr "" +"La vostra branca està basada en «%s», però la branca amunt ha desaparegut.\n" #: remote.c msgid " (use \"git branch --unset-upstream\" to fixup)\n" -msgstr " (useu «git branch --unset-upstream» per a arreglar-ho)\n" +msgstr " (useu «git branch --unset-upstream» per a corregir)\n" #: remote.c #, c-format @@ -27771,15 +28267,55 @@ msgstr "" msgid "could not remove stale bitmap: %s" msgstr "no s'ha pogut eliminar el mapa de bits estancat: %s" +# The source sentence is strange. +#: repack-midx.c +msgid "no packs to write MIDX during compaction" +msgstr "no hi ha paquets per a escriure MIDX durant la compactació" + +#: repack-midx.c +#, c-format +msgid "expected exactly one line during MIDX write, got: %<PRIuMAX>" +msgstr "" +"s'esperava exactament una línia durant l'escriptura MIDX, s'ha rebut: " +"%<PRIuMAX>" + +#: repack-midx.c +#, c-format +msgid "unexpected MIDX output: '%s'" +msgstr "sortida MIDX inesperada: «%s»" + +#: repack-midx.c +#, c-format +msgid "could not load pack %<PRIu32> from MIDX" +msgstr "no s'ha pogut carregar el paquet %<PRIu32> del MIDX" + +#: repack-midx.c +msgid "too many objects in MIDX compaction step" +msgstr "massa objectes en el pas de compactació MIDX" + +#: repack-midx.c +#, c-format +msgid "could not find preferred pack for MIDX %s" +msgstr "no s'ha pogut trobar el paquet preferit per al MIDX %s" + +#: repack-midx.c +msgid "unable to generate compaction plan" +msgstr "no es pot generar el pla de compactació" + +#: repack-midx.c +#, c-format +msgid "unable to execute compaction step %<PRIuMAX>" +msgstr "no s'ha pogut executar el pas de compactació %<PRIuMAX>" + #: repack-promisor.c msgid "could not start pack-objects to repack promisor objects" msgstr "" "no s'ha pogut iniciar pack-objects per a tornar a empaquetar els objectes " -"«promisor»" +"garants" #: repack-promisor.c msgid "failed to feed promisor objects to pack-objects" -msgstr "no s'ha pogut alimentar pack-objects amb objectes «promisor»" +msgstr "no s'ha pogut subministrar objectes garants a pack-objects" #: repack-promisor.c repack.c msgid "repack: Expecting full hex object ID lines only from pack-objects." @@ -27791,13 +28327,13 @@ msgstr "" msgid "could not finish pack-objects to repack promisor objects" msgstr "" "no s'ha pogut finalitzar pack-objects per a tornar a empaquetar els objectes " -"«promisor»" +"garants" #: repack-promisor.c msgid "could not start pack-objects to repack promisor packs" msgstr "" "no s'ha pogut iniciar pack-objects per a tornar a empaquetar els paquets " -"«promisor»" +"garants" #: repack.c #, c-format @@ -27856,12 +28392,18 @@ msgstr "" #: replay.c msgid "need some commits to replay" -msgstr "calen algunes comissions per tornar a reproduir" +msgstr "cal especificar comissions per a reproduir" #: replay.c msgid "all positive revisions given must be references" msgstr "totes les revisions positives que s'han donat han de ser referències" +# replay → repetició o reproducció, repassar-los tots +#: replay.c +#, c-format +msgid "commit %s became empty after replay" +msgstr "la comissió %s ha esdevingut buida després de tornar-la a aplicar" + #: replay.c msgid "'--ref' cannot be used with multiple revision ranges" msgstr "«--ref» no es pot usar amb rangs múltiples de revisió" @@ -27969,7 +28511,7 @@ msgstr "s'ha produït un error en cercar l'arbre de %s" #: revision.c #, c-format msgid "unsupported section for hidden refs: %s" -msgstr "secció d'índex no compatible per a les referències ocultes: %s" +msgstr "secció no admesa per a les referències ocultes: %s" #: revision.c msgid "--exclude-hidden= passed more than once" @@ -28022,8 +28564,8 @@ msgid "object filtering requires --objects" msgstr "el filtratge d'objectes requereix --objects" #: revision.c -msgid "-L does not yet support diff formats besides -p and -s" -msgstr "-L no és encara compatible amb formats que no siguin «-p» o «-s»" +msgid "-L does not yet support the requested diff format" +msgstr "-L no és encara compatible amb el format de diferència sol·licitat" #: run-command.c #, c-format @@ -28708,7 +29250,7 @@ msgstr "no es pot escriure «%s»" #: sequencer.c msgid "need a HEAD to fixup" -msgstr "cal un HEAD per a reparar-ho" +msgstr "cal un HEAD per a corregir" #: sequencer.c msgid "could not read HEAD" @@ -28729,7 +29271,7 @@ msgstr "el vostre fitxer d'índex està sense fusionar." #: sequencer.c msgid "cannot fixup root commit" -msgstr "no es pot arreglar la comissió arrel" +msgstr "no es pot corregir la comissió arrel" #: sequencer.c #, c-format @@ -28766,7 +29308,7 @@ msgstr "no s'ha pogut aplicar %s... %s" #: sequencer.c #, c-format msgid "dropping %s %s -- patch contents already upstream\n" -msgstr "descartant %s %s -- el contingut del pedaç ja està a la font\n" +msgstr "es descarta %s %s -- el contingut del pedaç ja està amunt\n" #: sequencer.c #, c-format @@ -28803,7 +29345,7 @@ msgid "" "replay the merge, use 'merge -C' on the commit." msgstr "" "«pick» no accepta una comissió de fusió. Si volíeu\n" -"reproduir la fusió, utilitzeu «merge -C» en la comissió." +"reproduir la fusió, useu «merge -C» en la comissió." #. TRANSLATORS: 'reword' and 'merge -c' should not be #. translated. @@ -28816,7 +29358,7 @@ msgid "" msgstr "" "«reword» no accepta una comissió de fusió. Si volíeu\n" "reproduir la fusió i fer «reword» del missatge de comissió,\n" -"utilitzeu «merge -c» en la comissió" +"useu «merge -c» en la comissió" #. TRANSLATORS: 'edit', 'merge -C' and 'break' should #. not be translated. @@ -29181,22 +29723,28 @@ msgstr "no es pot emmagatzemar %s" #: sequencer.c #, c-format msgid "" -"%s\n" -"Your changes are safe in the stash.\n" -"You can run \"git stash pop\" or \"git stash drop\" at any time.\n" +"Your local changes are stashed, however applying them\n" +"resulted in conflicts. You can either resolve the conflicts\n" +"and then discard the stash with \"git stash drop\", or, if you\n" +"do not want to resolve them now, run \"git reset --hard\" and\n" +"apply the local changes later by running \"git stash pop\".\n" msgstr "" -"%s\n" -"Els vostres canvis estan segurs en el «stash».\n" -"Podeu executar «git stash pop» o «git stash drop» en qualsevol moment.\n" - -#: sequencer.c -msgid "Applying autostash resulted in conflicts." -msgstr "L'aplicació del «stash» automàticament ha donat conflictes." +"Els vostres canvis locals estan «stashed»; tot i això, aplicar-los\n" +"ha produït conflictes. Podeu resoldre els conflictes i descartar\n" +"després l'«stash» amb «git stash drop», o bé, si no els voleu\n" +"resoldre ara, executeu «git reset --hard» i apliqueu els\n" +"canvis locals més tard tot executant «git stash pop».\n" #: sequencer.c -msgid "Autostash exists; creating a new stash entry." +#, c-format +msgid "" +"Autostash exists; creating a new stash entry.\n" +"Your changes are safe in the stash.\n" +"You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" -"El «stash» automàtic ja existeix; s'està creant una entrada «stash» nova." +"Hi ha un «autostash»; s'està creant una nova entrada\n" +"de «stash». Els vostres canvis estan segurs en el «stash».\n" +"Podeu executar «git stash pop» o «git stash drop» en qualsevol moment.\n" #: sequencer.c msgid "autostash reference is a symref" @@ -29530,8 +30078,8 @@ msgid "" msgstr "" "no és un repositori de git (ni existeix cap pare fins al punt de muntatge " "%s)\n" -"S'atura a la frontera de sistema de fitxers (GIT_DISCOVERY_ACROSS_FILESYSTEM " -"no està establert)." +"S'atura al límit de sistema de fitxers (GIT_DISCOVERY_ACROSS_FILESYSTEM no " +"està establert)." #: setup.c #, c-format @@ -29559,10 +30107,6 @@ msgid "fork failed" msgstr "el «fork» ha fallat" #: setup.c -msgid "setsid failed" -msgstr "«setsid» ha fallat" - -#: setup.c #, c-format msgid "cannot stat template '%s'" msgstr "no es pot fer stat en la plantilla «%s»" @@ -29658,6 +30202,11 @@ msgstr "S'ha inicialitzat un repositori compartit buit del Git en %s%s\n" msgid "Initialized empty Git repository in %s%s\n" msgstr "S'ha inicialitzat un repositori buit del Git en %s%s\n" +#: sideband.c +#, c-format +msgid "unrecognized value for '%s': '%s'" +msgstr "valor no reconegut per a «%s»: «%s»" + #: sparse-index.c #, c-format msgid "index entry is a directory, but not sparse (%08x)" @@ -29991,8 +30540,8 @@ msgstr "ls-tree ha retornat un codi de retorn %d no esperat" msgid "" "the 'submodule.%s.gitdir' config does not exist for module '%s'. Please " "ensure it is set, for example by running something like: 'git config " -"submodule.%s.gitdir .git/modules/%s'. For details see the " -"extensions.submodulePathConfig documentation." +"submodule.%s.gitdir .git/modules/%s'. For details see the extensions." +"submodulePathConfig documentation." msgstr "" "la configuració «submodule.%s.gitdir» no existeix per al mòdul «%s». Si us " "plau, assegureu-vos que està establerta, per exemple, executant una ordre de " @@ -30074,6 +30623,10 @@ msgstr "commuta el recorregut agressiu de vores" msgid "read a pattern list over stdin" msgstr "llegeix una llista patrons de l'entrada estàndard" +#: t/helper/test-path-walk.c +msgid "toggle pruning of trees by sparse patterns" +msgstr "commuta la poda d'arbres segons patrons dispersos" + #: t/helper/test-reach.c #, c-format msgid "commit %s is not marked reachable" @@ -30169,6 +30722,15 @@ msgstr "testimoni" msgid "command token to send to the server" msgstr "testimoni d'ordre a enviar al servidor" +#: t/helper/test-synthesize.c +msgid "write a pack with a single reachable large blob" +msgstr "escriu un paquet amb un sol blob gran accessible" + +#: t/helper/test-synthesize.c +#, c-format +msgid "'%s' is not a valid blob size" +msgstr "«%s» no és una grandària vàlida de blob" + #: t/unit-tests/unit-test.c msgid "unit-test [<options>]" msgstr "unit-test [<opcions>]" @@ -30310,6 +30872,11 @@ msgid "--negotiate-only requires protocol v2" msgstr "--negotiate-only requereix el protocol v2" #: transport-helper.c +#, c-format +msgid "ignoring %s because the protocol does not support it." +msgstr "s'està ignorant %s perquè el protocol no l'admet" + +#: transport-helper.c msgid "'option' without a matching 'ok/error' directive" msgstr "«option» sense una directiva «ok/error» coincident" @@ -30383,7 +30950,7 @@ msgstr "" #: transport-helper.c #, c-format msgid "unsupported object format '%s'" -msgstr "format d'objecte no suportat «%s»" +msgstr "format d'objecte no admès «%s»" #: transport-helper.c #, c-format @@ -30432,7 +30999,7 @@ msgstr "no es pot iniciar el fil per a copiar dades" #: transport.c #, c-format msgid "Would set upstream of '%s' to '%s' of '%s'\n" -msgstr "Canviaria la font de «%s» a «%s» de «%s»\n" +msgstr "Establiria la referència amunt de «%s» a «%s» de «%s»\n" #: transport.c #, c-format @@ -30511,7 +31078,7 @@ msgstr "" #: transport.c msgid "Aborting." -msgstr "S'està avortant." +msgstr "S'abandona." #: transport.c msgid "failed to push all needed submodules" @@ -30519,7 +31086,7 @@ msgstr "no s'han pogut pujar tots els submòduls necessaris" #: transport.c msgid "bundle-uri operation not supported by protocol" -msgstr "L'operació bundle-uri no és compatible amb el protocol" +msgstr "l'operació bundle-uri no és compatible amb el protocol" #: transport.c msgid "could not retrieve server-advertised bundle-uri list" @@ -30787,7 +31354,7 @@ msgstr "" #: unpack-trees.c #, c-format msgid "Aborting\n" -msgstr "S'està avortant\n" +msgstr "S'abandona\n" #: unpack-trees.c #, c-format @@ -30959,7 +31526,7 @@ msgstr "fitxer .git incorrecte" #: worktree.c msgid ".git file absolute/relative path mismatch" -msgstr "el camins absoluts/relatius del fitxer .git no coincideixen " +msgstr "el camins absoluts/relatius del fitxer .git no coincideixen" #: worktree.c msgid "not a valid path" @@ -30985,7 +31552,7 @@ msgstr "gitdir illegible" #: worktree.c msgid "gitdir absolute/relative path mismatch" -msgstr "el camins absoluts/relatius del directori git no coincideixen " +msgstr "el camins absoluts/relatius del directori git no coincideixen" #: worktree.c msgid "gitdir incorrect" @@ -31300,7 +31867,7 @@ msgstr " (useu «git am --abort» per a restaurar la branca original)" #: wt-status.c msgid "git-rebase-todo is missing." -msgstr "Manca git-rebase-todo." +msgstr "manca git-rebase-todo." #: wt-status.c msgid "No commands done." @@ -31744,7 +32311,7 @@ msgstr "fatal: l'ordre «%s» ha mort amb el codi de sortida %d" #: git-send-email.perl msgid "the editor exited uncleanly, aborting everything" -msgstr "l'editor no ha sortit correctament, avortant-ho tot" +msgstr "l'editor no ha sortit correctament, s'interromp tot" #: git-send-email.perl #, perl-format @@ -31998,7 +32565,7 @@ msgstr "" #: git-send-email.perl msgid "Send this email reply required" -msgstr "Requereix resposta en enviar el correu" +msgstr "Envia aquest correu amb sol·licitud de resposta" #: git-send-email.perl msgid "The destination IMAP folder is not properly defined." @@ -87,8 +87,8 @@ msgid "" msgstr "" "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2026-04-17 23:29+0800\n" -"PO-Revision-Date: 2026-04-18 12:15+0800\n" +"POT-Creation-Date: 2026-06-13 12:23+0200\n" +"PO-Revision-Date: 2026-06-14 08:17+0200\n" "Last-Translator: Cédric Malard <c.malard-git@valdun.net>\n" "Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n" "Language: fr\n" @@ -152,7 +152,7 @@ msgstr[1] "%d chemins inversés\n" #, c-format msgid "No untracked files.\n" -msgstr "Aucun Fichier non suivi.\n" +msgstr "Aucun fichier non suivi.\n" msgid "Add untracked" msgstr "Ajouter un fichier non-suivi" @@ -615,7 +615,6 @@ msgstr "'git apply --cached' a échoué" #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. -#. msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" @@ -623,7 +622,7 @@ msgstr "" "l'élimine !) [y|n] ? " msgid "The selected hunks do not apply to the index!" -msgstr "Les sections sélectionnées ne s'applique pas à l'index !" +msgstr "Les sections sélectionnées ne s'appliquent pas à l'index !" msgid "Apply them to the worktree anyway? " msgstr "Les appliquer quand même à l'arbre de travail ? " @@ -1745,31 +1744,31 @@ msgstr "" #, c-format msgid "" -"The merge base %s is %s.\n" +"The merge base %s is '%s'.\n" "This means the first '%s' commit is between %s and [%s].\n" msgstr "" -"La base de fusion %s est %s.\n" +"La base de fusion %s est '%s'.\n" "Ceci signifie que le premier commit '%s' est entre %s et [%s].\n" #, c-format msgid "" -"Some %s revs are not ancestors of the %s rev.\n" +"Some '%s' revs are not ancestors of the '%s' rev.\n" "git bisect cannot work properly in this case.\n" -"Maybe you mistook %s and %s revs?\n" +"Maybe you mistook '%s' and '%s' revs?\n" msgstr "" -"Certaines révision %s ne sont pas ancêtres de la révision %s.\n" +"Certaines révisions '%s' ne sont pas ancêtres de la révision '%s'.\n" "git bisect ne peut pas fonctionner correctement dans ce cas.\n" -"Peut-être les révisions %s et %s ne sont-elles pas les bonnes ?\n" +"Peut-être les révisions '%s' et '%s' ne sont-elles pas les bonnes ?\n" #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" -"So we cannot be sure the first %s commit is between %s and %s.\n" +"So we cannot be sure the first '%s' commit is between %s and %s.\n" "We continue anyway." msgstr "" "la base de fusion entre %s et [%s] doit être évitée.\n" -"On ne peut donc pas être certain que le premier commit %s se trouve entre %s " -"et %s.\n" +"On ne peut donc pas être certain que le premier commit '%s' se trouve entre " +"%s et %s.\n" "On continue tout de même." #, c-format @@ -1777,8 +1776,8 @@ msgid "Bisecting: a merge base must be tested\n" msgstr "Bissection : une base de fusion doit être testée\n" #, c-format -msgid "a %s revision is needed" -msgstr "une révision %s est nécessaire" +msgid "a '%s' revision is needed" +msgstr "une révision '%s' est nécessaire" #, c-format msgid "could not create file '%s'" @@ -1796,8 +1795,8 @@ msgid "reading bisect refs failed" msgstr "impossible de lire les références de bissection" #, c-format -msgid "%s was both %s and %s\n" -msgstr "%s était à la fois %s et %s\n" +msgid "%s was both '%s' and '%s'\n" +msgstr "%s était à la fois '%s' et '%s'\n" #, c-format msgid "" @@ -1805,7 +1804,7 @@ msgid "" "Maybe you started with bad path arguments?\n" msgstr "" "Aucun commit testable n'a été trouvé\n" -"Peut-être avez-vous démarré avec un mauvais arguement de chemin ?\n" +"Peut-être avez-vous démarré avec un mauvais argument de chemin ?\n" #, c-format msgid "(roughly %d step)" @@ -1815,7 +1814,6 @@ msgstr[1] "(à peu près %d étapes)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. -#. #, 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" @@ -1900,20 +1898,17 @@ msgstr "pas de suivi : information ambiguë pour la référence '%s'" #. TRANSLATORS: This is a line listing a remote with duplicate #. refspecs in the advice message below. For RTL languages you'll #. probably want to swap the "%s" and leading " " space around. -#. #. #-#-#-#-# object-name.c.po #-#-#-#-# #. TRANSLATORS: This is line item of ambiguous object output #. from describe_ambiguous_object() above. For RTL languages #. you'll probably want to swap the "%s" and leading " " space #. around. -#. #, c-format msgid " %s\n" msgstr " %s\n" #. TRANSLATORS: The second argument is a \n-delimited list of #. duplicate refspecs, composed above. -#. #, c-format msgid "" "There are multiple remotes whose fetch refspecs map to the remote\n" @@ -2318,7 +2313,6 @@ msgstr "Le corps de la validation est :" #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] #. in your translation. The program will only accept English #. input at this point. -#. #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "Appliquer ? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all : " @@ -2554,8 +2548,22 @@ msgstr "git archive : erreur de protocole" msgid "git archive: expected a flush" msgstr "git archive : vidage attendu" -msgid "git backfill [--min-batch-size=<n>] [--[no-]sparse]" -msgstr "git backfill [--min-batch-size=<n>] [--[no-]sparse]" +msgid "" +"git backfill [--min-batch-size=<n>] [--[no-]sparse] [--[no-]include-edges] " +"[<revision-range>]" +msgstr "" +"git backfill [--min-batch-size=<n>] [--[no-]sparse] [--[no-]include-edges] " +"[<plage-de-révision>]" + +#, c-format +msgid "'%s' cannot be used with 'git backfill'" +msgstr "'%s' ne peut pas être utilisé avec 'git backfill'" + +msgid "cannot backfill with these filter options" +msgstr "impossible de remplir avec ces options de filtre" + +msgid "cannot backfill with blob size limits" +msgstr "impossible de remplir avec des limites de taille de blob" msgid "problem loading sparse-checkout" msgstr "problème lors du chargement de l'extraction clairsemée" @@ -2566,6 +2574,9 @@ 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 "Include blobs from boundary commits in the backfill" +msgstr "Inclure les blobs des commits de délimitation dans le remplissage" + #, c-format msgid "unrecognized argument: %s" msgstr "argument non reconnu : %s" @@ -2681,32 +2692,33 @@ msgstr "bissection avec seulement un commit %s" #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. -#. msgid "Are you sure [Y/n]? " msgstr "Confirmez-vous [Y/n] ? " -msgid "status: waiting for both good and bad commits\n" -msgstr "status : en attente d'un commit bon et d'un commit mauvais\n" +#, c-format +msgid "status: waiting for both '%s' and '%s' commits\n" +msgstr "status : en attente à la fois des commits '%s' et '%s'\n" #, c-format -msgid "status: waiting for bad commit, %d good commit known\n" -msgid_plural "status: waiting for bad commit, %d good commits known\n" -msgstr[0] "status : en attente d'un mauvais commit, %d commit bon connu\n" -msgstr[1] "status : en attente d'un mauvais commit, %d commits bons connus\n" +msgid "status: waiting for '%s' commit, %d '%s' commit known\n" +msgid_plural "status: waiting for '%s' commit, %d '%s' commits known\n" +msgstr[0] "status : en attente du commit '%1$s', %2$d commit '%3$s' connu\n" +msgstr[1] "status : en attente du commit '%1$s', %2$d commits '%3$s' connus\n" -msgid "status: waiting for good commit(s), bad commit known\n" -msgstr "status : en attente de bon(s) commit(s), un mauvais commit connu\n" +#, c-format +msgid "status: waiting for '%s' commit(s), '%s' commit known\n" +msgstr "status : en attente du/des commit(s) '%s', commit '%s' connu\n" msgid "no terms defined" msgstr "aucun terme défini" #, c-format msgid "" -"Your current terms are %s for the old state\n" -"and %s for the new state.\n" +"Your current terms are '%s' for the old state\n" +"and '%s' for the new state.\n" msgstr "" -"Vos termes actuels sont %s pour l'état ancien\n" -"et %s pour le nouvel état.\n" +"Vos termes actuels sont '%s' pour l'état ancien\n" +"et '%s' pour le nouvel état.\n" #, c-format msgid "" @@ -2745,7 +2757,7 @@ msgstr "mauvaise HEAD - référence symbolique douteuse" #, c-format msgid "invalid ref: '%s'" -msgstr "réference invalide : '%s'" +msgstr "référence invalide : '%s'" msgid "You need to start by \"git bisect start\"\n" msgstr "Vous devez démarrer avec \"git bisect start\"\n" @@ -2753,7 +2765,6 @@ msgstr "Vous devez démarrer avec \"git bisect start\"\n" #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. -#. msgid "Do you want me to do it for you [Y/n]? " msgstr "Souhaitez-vous que je le fasse pour vous [Y/n] ? " @@ -2791,12 +2802,12 @@ msgid "bisect run failed: no command provided." msgstr "la bissection a échoué : aucune commande fournie." #, c-format -msgid "unable to verify %s on good revision" -msgstr "impossible de vérifier %s sur une bonne révision" +msgid "unable to verify %s on '%s' revision" +msgstr "impossible de vérifier %s sur la révision '%s'" #, c-format -msgid "bogus exit code %d for good revision" -msgstr "code de sortie %d erroné pour une bonne révision" +msgid "bogus exit code %d for '%s' revision" +msgstr "code de sortie %d erroné pour la révision '%s'" #, c-format msgid "bisect run failed: exit code %d from %s is < 0 or >= 128" @@ -2812,8 +2823,9 @@ msgstr "la bissection ne peut plus continuer" msgid "bisect run success" msgstr "succès de la bissection" -msgid "bisect found first bad commit" -msgstr "la bissection a trouvé le premier mauvais commit" +#, c-format +msgid "bisect found first '%s' commit\n" +msgstr "la bissection a trouvé le premier commit '%s'\n" #, c-format msgid "bisect run failed: 'git bisect %s' exited with error code %d" @@ -2991,7 +3003,6 @@ msgstr "" #. among various forms of relative timestamps, but #. your language may need more or fewer display #. columns. -#. msgid "4 years, 11 months ago" msgstr "il y a 10 ans et 11 mois" @@ -3509,6 +3520,10 @@ msgstr "Dépaquetage d'objets" msgid "cannot read object %s '%s'" msgstr "impossible de lire l'objet %s '%s'" +#, c-format +msgid "mailmap: invalid boolean '%s'" +msgstr "mailmap : booléen invalide '%s'" + msgid "flush is only for --buffer mode" msgstr "flush n'est que pour le mode --buffer" @@ -3869,15 +3884,6 @@ msgid "you need to resolve your current index first" msgstr "vous devez d'abord résoudre votre index courant" #, c-format -msgid "" -"cannot continue with staged changes in the following files:\n" -"%s" -msgstr "" -"impossible de continuer avec des modifications indexées dans les fichiers " -"suivants :\n" -"%s" - -#, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Impossible de faire un reflog pour '%s' : %s\n" @@ -3971,6 +3977,10 @@ msgid "You are on a branch yet to be born" msgstr "Vous êtes sur une branche qui doit encore naître" #, c-format +msgid "The following paths have local changes:\n" +msgstr "Les chemins suivants ont des modifications locales :\n" + +#, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" "Please use -- (and optionally --no-guess) to disambiguate" @@ -4558,7 +4568,7 @@ msgid "separate git dir from working tree" msgstr "séparer le répertoire git de la copie de travail" msgid "specify the reference format to use" -msgstr "spécifier le format de réference à utiliser" +msgstr "spécifier le format de référence à utiliser" msgid "key=value" msgstr "clé=valeur" @@ -5280,7 +5290,6 @@ msgstr "réutiliser le message du commit spécifié" #. TRANSLATORS: Leave "[(amend|reword):]" as-is, #. and only translate <commit>. -#. msgid "[(amend|reword):]commit" msgstr "[(amend|reword):]commit" @@ -5534,6 +5543,18 @@ msgid "wrong number of arguments, should be from %d to %d" msgstr "mauvais nombre d'arguments, devrait être entre %d et %d" #, c-format +msgid "missing value to set to the variable '%s'" +msgstr "valeur manquante pour régler la variable '%s'" + +#, c-format +msgid "did you mean \"git config set %s %s\"?" +msgstr "vouliez-vous dire \"git config set %s %s\" ?" + +#, c-format +msgid "missing value to set to a variable with an invalid name '%s'" +msgstr "valeur manquante pour régler la variable avec un nom invalide '%s'" + +#, c-format msgid "invalid key pattern: %s" msgstr "motif de clé invalide : %s" @@ -6376,18 +6397,18 @@ msgstr "impossible de stocker le fichier d'index" #, c-format msgid "failed seeking to start of '%s'" -msgstr "échec de la recherche du debut de '%s'" +msgstr "échec de la recherche du début de '%s'" #, c-format msgid "core Git rejected index %s" -msgstr "le cœur de Git a rejecté l'index %s" +msgstr "le cœur de Git a rejeté l'index %s" msgid "cannot truncate pack to skip duplicate" -msgstr "impossible de tronquer le paquet pour sauté la duplication" +msgstr "impossible de tronquer le paquet pour sauter la duplication" #, c-format msgid "EOF in data (%<PRIuMAX> bytes remaining)" -msgstr "OEF dans les données (%<PRIuMAX> octets restant)" +msgstr "EOF dans les données (%<PRIuMAX> octets restants)" #, c-format msgid "unexpected deflate failure: %d" @@ -6970,14 +6991,18 @@ msgid "option \"%s\" is ignored for %s" msgstr "l'option \"%s\" est ignorée pour %s" #, c-format -msgid "%s is not a valid object" -msgstr "%s n'est pas un objet valide" - -#, c-format msgid "the object %s does not exist" msgstr "l'objet %s n'existe pas" #, c-format +msgid "ignoring %s=%s because it does not match any refs" +msgstr "%s=%s ignoré car il ne correspond à aucune réf" + +#, c-format +msgid "ignoring %s because the protocol does not support it" +msgstr "%s ignoré car le protocole ne le prend pas en charge" + +#, c-format msgid "" "Run 'git remote set-head %s %s' to follow the change, or set\n" "'remote.%s.followRemoteHEAD' configuration option to a different value\n" @@ -7182,6 +7207,9 @@ msgstr "révision" msgid "report that we have only objects reachable from this object" msgstr "rapporte que nous n'avons que des objets joignables depuis cet objet" +msgid "ensure this ref is always sent as a negotiation have" +msgstr "assure que cette réf est toujours envoyée comme 'have' de négociation" + msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" msgstr "" "ne pas récupérer le fichier paquet ; à la place, afficher les ancêtres des " @@ -7201,9 +7229,6 @@ msgstr "écrire le graphe de commits après le rapatriement" msgid "accept refspecs from stdin" msgstr "lire les spécificateurs de référence depuis l'entrée standard" -msgid "--negotiate-only needs one or more --negotiation-tip=*" -msgstr "--negotiate-only nécessite au moins un --negotiation-tip=*" - msgid "negative depth in --deepen is not supported" msgstr "une profondeur négative dans --deepen n'est pas supportée" @@ -7235,6 +7260,10 @@ msgstr "le distant doit être fourni lors de l'utilisation de --negotiate-only" msgid "protocol does not support --negotiate-only, exiting" msgstr "Le protocole ne prend pas en charge --negotiate-only, abandon" +#, c-format +msgid "%s needs one or more %s" +msgstr "%s nécessite un ou plusieurs %s" + msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -7432,7 +7461,7 @@ msgstr "%s : entrée %s de journal de références invalide" #, c-format msgid "Checking reflog %s->%s" -msgstr "Vérification du journal de réferences %s-> %s" +msgstr "Vérification du journal de références %s-> %s" #, c-format msgid "%s: invalid sha1 pointer %s" @@ -7495,7 +7524,7 @@ msgid "invalid rev-index for pack '%s'" msgstr "rev-index invalide pour le paquet '%s'" msgid "Checking ref database" -msgstr "Vérification de la base de données des réferences" +msgstr "Vérification de la base de données des références" msgid "" "git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n" @@ -7566,6 +7595,10 @@ msgid "value of '%s' not bool or int: %d" msgstr "la valeur de '%s' n'est ni bool ni int : %d" #, c-format +msgid "daemon did not stop within %d seconds" +msgstr "le démon ne s'est pas arrêté en %d secondes" + +#, c-format msgid "fsmonitor-daemon is watching '%s'\n" msgstr "fsmonitor-daemon surveille '%s'\n" @@ -7609,6 +7642,9 @@ msgstr "fsmonitor--daemon exécute déjà '%s'" msgid "running fsmonitor-daemon in '%s'\n" msgstr "lancement du fil fsmonitor-daemon dans '%s'\n" +msgid "setsid failed" +msgstr "échec du setsid" + #, c-format msgid "starting fsmonitor-daemon in '%s'\n" msgstr "démarrer fsmonitor-daemon dans '%s'\n" @@ -7960,7 +7996,6 @@ msgstr "nombre de fils spécifié invalide (%d) pour %s" #. TRANSLATORS: %s is the configuration #. variable for tweaking threads, currently #. grep.threads -#. #, c-format msgid "no threads support, ignoring %s" msgstr "pas de support des fils, ignore %s" @@ -8035,7 +8070,7 @@ msgid "show column number of first match" msgstr "afficher le numéro de colonne de la première correspondance" msgid "don't show filenames" -msgstr "ne pas pas afficher les noms de fichier" +msgstr "ne pas afficher les noms de fichier" msgid "show filenames" msgstr "afficher les noms de fichier" @@ -8299,6 +8334,13 @@ msgstr "usage : %s%s" msgid "'git help config' for more information" msgstr "'git help config' pour plus d'information" +msgid "" +"git history fixup <commit> [--dry-run] [--update-refs=(branches|head)] [--" +"reedit-message] [--empty=(drop|keep|abort)]" +msgstr "" +"git history fixup <commit> [--dry-run] [--update-refs=(branches|head)] [--" +"reedit-message] [--empty=(drop|keep|abort)]" + msgid "git history reword <commit> [--dry-run] [--update-refs=(branches|head)]" msgstr "" "git history reword <commit> [--dry-run] [--update-refs=(branches|head)]" @@ -8362,19 +8404,75 @@ msgstr "échec de la mise à jour de la réf '%s' : %s" msgid "failed to commit ref transaction: %s" msgstr "impossible de valider la transaction de réf : %s" +#, c-format +msgid "unable to parse parent of %s" +msgstr "impossible d'analyser le parent de %s" + +#, c-format +msgid "" +"unrecognized '--empty=' action '%s'; valid values are \"drop\", \"keep\", " +"and \"abort\"." +msgstr "" +"action '--empty=' non reconnue '%s' ; les valeurs valides sont \"drop\", " +"\"keep\" et \"abort\"." + msgid "control which refs should be updated" msgstr "contrôler quelle réf devrait être mise à jour" msgid "perform a dry-run without updating any refs" msgstr "réaliser un essai à blanc sans mettre à jour les réfs" +msgid "open an editor to modify the commit message" +msgstr "ouvrir un éditeur pour modifier le message de validation" + +msgid "how to handle commits that become empty" +msgstr "comment gérer les commits qui deviennent vides" + msgid "command expects a single revision" msgstr "une seule révision attendue par la commande" +msgid "cannot run fixup in a bare repository" +msgstr "impossible d'exécuter la rectification dans un dépôt nu" + #, c-format msgid "commit cannot be found: %s" msgstr "commit non trouvé : %s" +msgid "cannot get tree for HEAD" +msgstr "impossible d'obtenir l'arbre pour HEAD" + +msgid "unable to read index" +msgstr "lecture d'index impossible" + +msgid "nothing to fixup: no staged changes" +msgstr "rien à rectifier : aucune modification indexée" + +msgid "unable to write index as a tree" +msgstr "impossible d'écrire l'index en tant qu'arbre" + +#, c-format +msgid "cannot get tree for commit %s" +msgstr "impossible d'obtenir l'arbre pour le commit %s" + +msgid "merge failed while applying fixup" +msgstr "la fusion a échoué pendant l'application de la rectification" + +msgid "fixup would produce conflicts; aborting" +msgstr "la rectification produirait des conflits ; abandon" + +#, c-format +msgid "cannot drop root commit %s: it has no parent to replay onto" +msgstr "" +"impossible d'abandonner le commit racine %s : il n'a pas de parent sur " +"lequel rejouer" + +#, c-format +msgid "fixup makes commit %s empty" +msgstr "la rectification rend le commit %s vide" + +msgid "failed writing fixed-up commit" +msgstr "échec de l'écriture du commit rectifié" + msgid "failed writing reworded commit" msgstr "échec de l'écriture du commit reformulé" @@ -8416,10 +8514,12 @@ msgstr "impossible de scinder un commit de fusion" msgid "" "git hook run [--allow-unknown-hook-name] [--ignore-missing] [--to-" -"stdin=<path>] <hook-name> [-- <hook-args>]" +"stdin=<path>] [(-j|--jobs) <n>]\n" +"<hook-name> [-- <hook-args>]" msgstr "" "git hook run [--allow-unknown-hook-name] [--ignore-missing] [--to-" -"stdin=<chemin>] <nom-de-crochet> [-- <arguments-de-crochet>]" +"stdin=<chemin>] [(-j|--jobs) <n>]\n" +"<nom-de-crochet> [-- <arguments-de-crochet>]" msgid "" "git hook list [--allow-unknown-hook-name] [-z] [--show-scope] <hook-name>" @@ -8461,6 +8561,15 @@ msgstr "ignorer silencieusement le <nom-de-crochet> requis manquant" msgid "file to read into hooks' stdin" msgstr "fichier à la lire dans l'entrée standard du crochet" +msgid "run up to <n> hooks simultaneously (-1 for CPU count)" +msgstr "exécuter jusqu'à <n> crochets en simultané (-1 pour le nombre de CPU)" + +#, c-format +msgid "invalid value for -j: %d (use -1 for CPU count or a positive integer)" +msgstr "" +"valeur invalide pour -j : %d (utilisez -1 pour le nombre de CPU ou un entier " +"positif)" + #, c-format msgid "object type mismatch at %s" msgstr "type d'objet non correspondant à %s" @@ -8510,6 +8619,9 @@ msgstr "le paquet a un mauvais objet à l'offset %<PRIuMAX> : %s" msgid "inflate returned %d" msgstr "la décompression (inflate) a retourné %d" +msgid "object size too large for this platform" +msgstr "taille d'objet trop grande pour cette plate-forme" + msgid "offset value overflow for delta base object" msgstr "dépassement de la valeur d'offset pour l'objet delta de base" @@ -9938,18 +10050,22 @@ msgstr "autoriser la création de plus d'un arbre" msgid "" "git multi-pack-index [<options>] write [--preferred-pack=<pack>]\n" " [--[no-]bitmap] [--[no-]incremental] [--[no-]stdin-packs]\n" -" [--refs-snapshot=<path>]" +" [--refs-snapshot=<path>] [--[no-]write-chain-file]\n" +" [--base=<checksum>]" msgstr "" "git multi-pack-index [<options>] write [--preferred-pack=<paquet>]\n" " [--[no-]bitmap] [--[no-]incremental] [--[no-]stdin-packs]\n" -" [--refs-snapshot=<chemin>]" +" [--refs-snapshot=<chemin>] [--[no-]write-chain-file]\n" +" [--base=<somme-de-contrôle>]" msgid "" "git multi-pack-index [<options>] compact [--[no-]incremental]\n" -" [--[no-]bitmap] <from> <to>" +" [--[no-]bitmap] [--base=<checksum>] [--[no-]write-chain-file]\n" +" <from> <to>" msgstr "" "git multi-pack-index [<options>] compact [--[no-]incremental]\n" -" [--[no-]bitmap] <depuis> <vers>" +" [--[no-]bitmap] [--base=<somme-de-contrôle>] [--[no-]write-chain-file]\n" +" <de> <à>" msgid "git multi-pack-index [<options>] verify" msgstr "git multi-pack-index [<options>] verify" @@ -9977,9 +10093,18 @@ msgstr "paquet à réutiliser lors du calcul de bitmap de multi-paquet" msgid "write multi-pack bitmap" msgstr "écriture du bitmap de multi-paquet" +msgid "checksum" +msgstr "somme de contrôle" + +msgid "base MIDX for incremental writes" +msgstr "MIDX de base pour les écritures incrémentales" + msgid "write a new incremental MIDX" msgstr "écrire un nouveau MIDX incrémental" +msgid "write the multi-pack-index chain file" +msgstr "écrire le fichier de chaîne d'index multi-paquet" + msgid "write multi-pack index containing only given indexes" msgstr "écrire l'index multi-paquet ne contenant que les index fournis" @@ -9987,6 +10112,13 @@ msgid "refs snapshot for selecting bitmap commits" msgstr "instantané des réfs pour sélectionner les commits de bitmap" #, c-format +msgid "cannot use %s without %s" +msgstr "impossible d'utiliser %s sans %s" + +msgid "cannot use --base without --no-write-chain-file" +msgstr "impossible d'utiliser --base sans --no-write-chain-file" + +#, c-format msgid "could not find MIDX: %s" msgstr "impossible de trouver le MIDX : %s" @@ -10128,6 +10260,48 @@ msgstr "autoriser l'affichage des noms `non définis` (par défaut)" msgid "dereference tags in the input (internal use)" msgstr "déréférencer les étiquettes en entrée (usage interne)" +#, c-format +msgid "'%s' needs to be either text, revs, or rev" +msgstr "'%s' doit être soit 'text', 'revs' ou 'rev'" + +msgid "" +"(EXPERIMENTAL!) git format-rev --stdin-mode=<mode> --format=<pretty> [--" +"[no-]notes=<ref>] [-z] [--[no-]null-output] [--[no-]null-input]" +msgstr "" +"(EXPÉRIMENTAL !) git format-rev --stdin-mode=<mode> --format=<joli> [--" +"[no-]notes=<réf>] [-z] [--[no-]null-output] [--[no-]null-input]" + +msgid "pretty format to use" +msgstr "format joli à utiliser" + +msgid "stdin-mode" +msgstr "mode-stdin" + +msgid "how revs are processed" +msgstr "comment les révisions sont traitées" + +msgid "notes" +msgstr "notes" + +msgid "display notes for pretty format" +msgstr "afficher les notes pour le format joli" + +msgid "z" +msgstr "z" + +msgid "Use NUL for input and output termination" +msgstr "Utiliser NUL pour la terminaison d'entrée et de sortie" + +msgid "Use NUL for input termination" +msgstr "Utiliser NUL pour la terminaison d'entrée" + +msgid "Use NUL for output termination" +msgstr "Utiliser NUL pour la terminaison de sortie" + +#, c-format +msgid "'%s' is required" +msgstr "'%s' est requis" + msgid "git notes [--ref <notes-ref>] [list [<object>]]" msgstr "git notes [--ref <références-notes>] [list [<object>]]" @@ -10252,7 +10426,6 @@ msgstr "impossible de copier les notes de '%s' vers '%s'" #. TRANSLATORS: the first %s will be replaced by a git #. notes command: 'add', 'merge', 'remove', etc. -#. #, c-format msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "refus de faire %s sur des notes dans %s (hors de refs/notes/)" @@ -10480,6 +10653,10 @@ 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: unable to parse object header of %s" +msgstr "write_reuse_object : impossible d'analyser l'entête d'objet de %s" + +#, c-format msgid "" "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in " "pack %s" @@ -10992,7 +11169,7 @@ msgstr "impossible d'accéder le commit %s" #, c-format msgid "invalid refspec '%s'" -msgstr "spécificateur de réference invalide : '%s'" +msgstr "spécificateur de référence invalide : '%s'" msgid "ignoring --verify-signatures for rebase" msgstr "--verify-signatures est ignoré pour un rebasage" @@ -11315,6 +11492,10 @@ msgstr "" msgid "invalid value for '%s'" msgstr "valeur invalide pour '%s'" +#, c-format +msgid "could not push to %s" +msgstr "impossible de pousser vers %s" + msgid "repository" msgstr "dépôt" @@ -11388,16 +11569,38 @@ msgid "" "and then push using the remote name\n" "\n" " git push <name>\n" +"\n" +"To push to multiple remotes at once, configure a remote group using\n" +"\n" +" git config remotes.<groupname> \"<remote1> <remote2>\"\n" +"\n" +"and then push using the group name\n" +"\n" +" git push <groupname>\n" msgstr "" -"Pas de destination pour pousser.\n" +"Pas de destination de poussée configurée.\n" "Spécifiez une URL depuis la ligne de commande ou configurez un dépôt distant " "en utilisant\n" "\n" " git remote add <nom> <url>\n" "\n" -"et poussez alors en utilisant le dépôt distant\n" +"et poussez alors en utilisant le nom du dépôt distant\n" "\n" " git push <nom>\n" +"\n" +"Pour pousser vers plusieurs dépôts distants à la fois, configurez un groupe " +"de distants en utilisant\n" +"\n" +" git config remotes.<nom-groupe> \"<distant1> <distant2>\"\n" +"\n" +"et poussez alors en utilisant le nom du groupe\n" +"\n" +" git push <nom-groupe>\n" + +msgid "push options must not have new line characters" +msgstr "" +"les options de poussée ne peuvent pas contenir de caractères de nouvelle " +"ligne" msgid "--all can't be combined with refspecs" msgstr "--all ne peut pas être combiné avec des spécifications de référence" @@ -11405,10 +11608,9 @@ msgstr "--all ne peut pas être combiné avec des spécifications de référence msgid "--mirror can't be combined with refspecs" msgstr "--mirror ne peut pas être combiné avec des spécifications de référence" -msgid "push options must not have new line characters" +msgid "--atomic can only be used when pushing to one remote" msgstr "" -"les options de poussée ne peuvent pas contenir de caractères de nouvelle " -"ligne" +"--atomic ne peut être utilisé qu'en poussant vers un seul dépôt distant" msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>" msgstr "" @@ -11428,9 +11630,6 @@ msgstr "valeur invalide de max-memory : %s" msgid "use simple diff colors" msgstr "utiliser des couleurs de diff simples" -msgid "notes" -msgstr "notes" - msgid "passed to 'git log'" msgstr "passé à 'git log'" @@ -11731,9 +11930,6 @@ msgstr "laisser l'utilisateur éditer la liste des commits à rebaser" msgid "(REMOVED) was: try to recreate merges instead of ignoring them" msgstr "(EFFACÉ) était : essayer de recréer les fusions au lieu de les ignorer" -msgid "how to handle commits that become empty" -msgstr "comment gérer les commits qui deviennent vides" - msgid "keep commits which start empty" msgstr "conserver les commits qui commencent vides" @@ -12140,7 +12336,7 @@ msgid "git refs optimize " msgstr "git refs optimize " msgid "specify the reference format to convert to" -msgstr "spécifier le format de réference vers lequel convertir" +msgstr "spécifier le format de référence vers lequel convertir" msgid "perform a non-destructive dry-run" msgstr "faire l'action en mode simulé non destructif" @@ -12345,8 +12541,8 @@ msgid "" "If that is the case, you can address this by first renaming the\n" "remote to a different name.\n" msgstr "" -"Le distant que vous essayer de renommer a des réference en conflit\n" -"dans le nouveau refspec cible. C'est probablement du à un essai de\n" +"Le distant que vous essayez de renommer a des références en conflit\n" +"dans le nouveau refspec cible. C'est probablement dû à un essai de\n" "emboîter un distant dans lui-même, p. ex., en renommant 'parent' en\n" "'parent/enfant' ou à l'inverse, en dé-emboîtant un distant.\n" "\n" @@ -12355,7 +12551,7 @@ msgstr "" #, c-format msgid "No such remote: '%s'" -msgstr "Pas de serveur remote : '%s'" +msgstr "Pas de serveur distant : '%s'" #, c-format msgid "Could not rename config section '%s' to '%s'" @@ -12490,7 +12686,6 @@ msgstr " URL de rapatriement : %s" #. TRANSLATORS: the colon ':' should align #. with the one in " Fetch URL: %s" #. translation. -#. #, c-format msgid " Push URL: %s" msgstr " URL push : %s" @@ -12609,7 +12804,7 @@ msgstr "élagué les distants après la récupération" #, c-format msgid "No such remote '%s'" -msgstr "Pas de serveur remote '%s'" +msgstr "Pas de serveur distant '%s'" msgid "add branch" msgstr "ajouter une branche" @@ -12652,11 +12847,11 @@ msgstr "être verbeux : doit être placé avant une sous-commande" msgid "" "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" "[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n" -"[--write-midx] [--name-hash-version=<n>] [--path-walk]" +"[--write-midx[=<mode>]] [--name-hash-version=<n>] [--path-walk]" msgstr "" "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" "[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<nom-de-paquet>]\n" -"[--write-midx] [--name-hash-version=<n>] [--path-walk]" +"[--write-midx[=<mode>]] [--name-hash-version=<n>] [--path-walk]" msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" @@ -12666,6 +12861,10 @@ msgstr "" "Utilisez\n" "--no-write-bitmap-index ou désactivez le paramètre pack.writeBitmaps." +#, c-format +msgid "unknown value for %s: %s" +msgstr "valeur inconnue pour %s : %s" + msgid "pack everything in a single pack" msgstr "empaqueter tout dans un seul paquet" @@ -12759,6 +12958,10 @@ msgid "cannot delete packs in a precious-objects repo" msgstr "impossible de supprimer les paquets dans un dépôt d'objets précieux" #, c-format +msgid "invalid value for %s: %d" +msgstr "valeur invalide pour %s : %d" + +#, c-format msgid "option '%s' can only be used along with '%s'" msgstr "l'option '%s' ne peut être utilisé qu'avec '%s'" @@ -12951,7 +13154,7 @@ msgid "--convert-graft-file takes no argument" msgstr "--convert-graft-file ne supporte aucun argument" msgid "only one pattern can be given with -l" -msgstr "-l n'accepte qu'un motifs" +msgstr "-l n'accepte qu'un motif" #, c-format msgid "invalid %s value: '%s'" @@ -13568,8 +13771,8 @@ msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<référence>]" #, c-format msgid "ignoring %s; cannot handle more than %d ref" msgid_plural "ignoring %s; cannot handle more than %d refs" -msgstr[0] "%s ignoré; impossible de gérer plus de %d référence" -msgstr[1] "%s ignoré; impossible de gérer plus de %d références" +msgstr[0] "%s ignoré ; impossible de gérer plus de %d référence" +msgstr[1] "%s ignoré ; impossible de gérer plus de %d références" #, c-format msgid "no matching refs with %s" @@ -13670,9 +13873,6 @@ msgstr "impossible d'analyser l'entête" msgid "unknown index version" msgstr "version d'index inconnue" -msgid "unable to read index" -msgstr "lecture d'index impossible" - msgid "corrupt index file" msgstr "fichier d'index corrompu" @@ -13952,8 +14152,12 @@ msgstr "git stash drop [-q | --quiet] [<remise>]" msgid "git stash pop [--index] [-q | --quiet] [<stash>]" msgstr "git stash pop [--index] [-q | --quiet] [<remise>]" -msgid "git stash apply [--index] [-q | --quiet] [<stash>]" -msgstr "git stash apply [--index] [-q | --quiet] [<remise>]" +msgid "" +"git stash apply [--index] [-q | --quiet] [--label-ours=<label>] [--label-" +"theirs=<label>] [--label-base=<label>] [<stash>]" +msgstr "" +"git stash apply [--index] [-q | --quiet] [--label-ours=<étiquette>] [--label-" +"theirs=<étiquette>] [--label-base=<étiquette>] [<remise>]" msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <nom-de-branche> [<remise>]" @@ -14049,6 +14253,18 @@ msgstr "impossible de restaurer les fichiers non-suivis depuis le remisage" msgid "attempt to recreate the index" msgstr "tentative de recréer l'index" +msgid "label" +msgstr "étiquette" + +msgid "label for the upstream side in conflict markers" +msgstr "étiquette pour le côté amont dans les marqueurs de conflit" + +msgid "label for the stashed side in conflict markers" +msgstr "étiquette pour le côté remisé dans les marqueurs de conflit" + +msgid "label for the base in diff3 conflict markers" +msgstr "étiquette pour la base dans les marqueurs de conflit diff3" + #, c-format msgid "Dropped %s (%s)" msgstr "%s supprimé (%s)" @@ -15338,6 +15554,15 @@ msgstr "" msgid "interrupt transfer after <n> seconds of inactivity" msgstr "interrompre le transfert après <n> secondes d'inactivité" +msgid "git url-parse [-c <component>] [--] <url>..." +msgstr "git url-parse [-c <composant>] [--] <url>..." + +msgid "component" +msgstr "composant" + +msgid "which URL component to extract" +msgstr "quel composant d'URL extraire" + msgid "git verify-commit [-v | --verbose] [--raw] <commit>..." msgstr "git verify-commit [-v | --verbose] [--raw] <commit>..." @@ -15624,7 +15849,7 @@ msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" msgstr "" -"impossible de déplacer un arbre de travail verrouillé;\n" +"impossible de déplacer un arbre de travail verrouillé ;\n" "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant" #, c-format @@ -16051,6 +16276,9 @@ msgstr "Lance une commande Git sur une liste de dépôts" msgid "Prepare patches for e-mail submission" msgstr "Préparer les rustines pour soumission par courriel" +msgid "EXPERIMENTAL: Pretty format revisions on demand" +msgstr "EXPÉRIMENTAL : Afficher les révisions formatées à la demande" + msgid "Verifies the connectivity and validity of the objects in the database" msgstr "" "Vérifier la connectivité et la validité des objets dans la base de données" @@ -16077,8 +16305,8 @@ msgstr "Afficher l'information d'aide à propos de Git" msgid "EXPERIMENTAL: Rewrite history" msgstr "EXPERIMENTAL : Réécrit l'historique" -msgid "Run git hooks" -msgstr "Lance les crochets git" +msgid "Run Git hooks" +msgstr "Exécuter les crochets Git" msgid "Server side implementation of Git over HTTP" msgstr "Implantation côté serveur de Git sur HTTP" @@ -16280,8 +16508,8 @@ msgstr "Le code d'initialisation commun aux scripts shell Git" msgid "Restricted login shell for Git-only SSH access" msgstr "Shell de login restreint pour un accès SSH vers Git seulement" -msgid "Summarize 'git log' output" -msgstr "Résumer la sortie de 'git log'" +msgid "Summarize `git log` output" +msgstr "Résumer la sortie de `git log`" msgid "Show various types of objects" msgstr "Afficher différents types d'objets" @@ -16349,6 +16577,9 @@ msgstr "Renvoyer une archive dans git-archive" msgid "Send objects packed back to git-fetch-pack" msgstr "Renvoyer des objets empaquetés dans git-fetch-pack" +msgid "Parse and extract git URL components" +msgstr "Analyser et extraire les composants d'URL Git" + msgid "Show a Git logical variable" msgstr "Afficher un variable logique de Git" @@ -16877,6 +17108,42 @@ msgstr "impossible de créer FSEVEntStream." msgid "Failed to start the FSEventStream" msgstr "Échec de démarrage de FSEVEntStream" +msgid "inotify watch limit reached; increase fs.inotify.max_user_watches" +msgstr "" +"limite de surveillance inotify atteinte ; augmentez " +"fs.inotify.max_user_watches" + +#, c-format +msgid "inotify_add_watch('%s') failed" +msgstr "échec de inotify_add_watch('%s')" + +msgid "inotify_rm_watch() failed" +msgstr "échec de inotify_rm_watch()" + +#, c-format +msgid "opendir('%s') failed" +msgstr "échec de opendir(%s)" + +#, c-format +msgid "lstat('%s') failed" +msgstr "échec de lstat('%s')" + +#, c-format +msgid "closedir('%s') failed" +msgstr "échec de closedir('%s')" + +msgid "inotify_init1() failed" +msgstr "échec de inotify_init1()" + +msgid "closing inotify file descriptor failed" +msgstr "échec de la fermeture du descripteur de fichier inotify" + +msgid "reading inotify message stream failed" +msgstr "échec de la lecture du flux de messages inotify" + +msgid "polling inotify message stream failed" +msgstr "échec de l'interrogation du flux de messages inotify" + #, c-format msgid "[GLE %ld] could not convert path to UTF-8: '%.*ls'" msgstr "[GLE %ld] impossible de convertir le chemin en UTF-8 : '%.*ls'" @@ -16902,22 +17169,10 @@ msgid "could not read directory changes [GLE %ld]" msgstr "impossible de lire les modifications du répertoire [GLE %ld]" #, c-format -msgid "opendir('%s') failed" -msgstr "échec de opendir(%s)" - -#, c-format -msgid "lstat('%s') failed" -msgstr "échec de lstat('%s')" - -#, c-format msgid "strbuf_readlink('%s') failed" msgstr "échec de strbuf_readlink('%s')" #, c-format -msgid "closedir('%s') failed" -msgstr "échec de closedir('%s')" - -#, c-format msgid "[GLE %ld] unable to open for read '%ls'" msgstr "[GLE %ld] impossible d'ouvrir pour lire '%ls'" @@ -17398,10 +17653,6 @@ msgstr "réponse à ls-ref invalide : %s" msgid "expected flush after ref listing" msgstr "vidage attendu après le listage de références" -#, c-format -msgid "protocol '%s' is not supported" -msgstr "le protocole '%s' n'est pas supporté" - msgid "unable to set SO_KEEPALIVE on socket" msgstr "impossible de positionner SO_KEEPALIVE sur la socket" @@ -17454,6 +17705,10 @@ msgstr "port étrange '%s' bloqué" msgid "cannot start proxy %s" msgstr "impossible de démarrer un proxy %s" +#, c-format +msgid "protocol '%s' is not supported" +msgstr "le protocole '%s' n'est pas supporté" + msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "" "aucun chemin spécifié ; référez-vous à 'git help pull' pour une syntaxe " @@ -17921,6 +18176,10 @@ msgid "failed to parse --submodule option parameter: '%s'" msgstr "échec de l'analyse du paramètre de l'option --submodule : '%s'" #, c-format +msgid "%s expects a non-negative integer" +msgstr "%s attend un entier non négatif" + +#, c-format msgid "bad --word-diff argument: %s" msgstr "mauvais argument pour --word-diff : %s" @@ -18451,8 +18710,8 @@ msgid "" msgstr "" "Vous tentez de récupérer %s, qui est dans le graphe de commit mais pas dans " "la base de données des objets.\n" -"C'est probablement du à une corruption de dépôt.\n" -"Si vous essayez de réparer cette corruption de dépôt en re-récupérer l'objet " +"C'est probablement dû à une corruption de dépôt.\n" +"Si vous essayez de réparer cette corruption de dépôt en re-récupérant l'objet " "manquant, utilisez 'git fetch --refetch' sur les objets manquants." msgid "git fetch-pack: expected shallow list" @@ -18602,14 +18861,12 @@ msgstr "erreur lors du traitement des acquittements : %d" #. TRANSLATORS: The parameter will be 'ready', a protocol #. keyword. -#. #, c-format msgid "expected packfile to be sent after '%s'" msgstr "fichier paquet attendu à envoyer après '%s'" #. TRANSLATORS: The parameter will be 'ready', a protocol #. keyword. -#. #, c-format msgid "expected no other sections to be sent after no '%s'" msgstr "aucune autre section attendue à envoyer après absence de '%s'" @@ -19055,8 +19312,54 @@ msgid "" "You can disable this warning with `git config set advice.ignoredHook false`." msgstr "" "Le crochet '%s' a été ignoré parce qu'il n'est pas marqué comme exécutable.\n" -"Vous pouvez désactiver cet avertissement avec `git config set advice." -"ignoredHook false`." +"Vous pouvez désactiver cet avertissement avec `git config set " +"advice.ignoredHook false`." + +#, c-format +msgid "hook.jobs must be an integer, ignoring: '%s'" +msgstr "hook.jobs doit être un entier, ignoré : '%s'" + +#, c-format +msgid "hook.jobs must be a positive integer or -1, ignoring: '%s'" +msgstr "hook.jobs doit être un entier positif ou -1, ignoré : '%s'" + +#, c-format +msgid "" +"hook friendly-name '%s' collides with a known event name; please choose a " +"different friendly-name" +msgstr "" +"le nom convivial de crochet '%s' entre en collision avec un nom d'événement " +"connu ; veuillez choisir un nom convivial différent" + +#, c-format +msgid "" +"hook friendly-name '%s' is the same as its event; this may cause ambiguity " +"with hook.%s.enabled" +msgstr "" +"le nom convivial de crochet '%s' est le même que son événement ; ceci peut " +"créer une ambiguïté avec hook.%s.enabled" + +#, c-format +msgid "hook.%s.parallel must be a boolean, ignoring: '%s'" +msgstr "hook.%s.parallel doit être un booléen, ignoré : '%s'" + +#, c-format +msgid "hook.%s.jobs must be an integer, ignoring: '%s'" +msgstr "hook.%s.jobs doit être un entier, ignoré : '%s'" + +#, c-format +msgid "hook.%s.jobs must be a positive integer or -1, ignoring: '%s'" +msgstr "hook.%s.jobs doit être un entier positif ou -1, ignoré : '%s'" + +#, c-format +msgid "" +"hook.%s.jobs is set but '%s' looks like a hook friendly-name, not an event " +"name; hook.<event>.jobs uses the event name (e.g. hook.post-receive.jobs), " +"so this setting will be ignored" +msgstr "" +"hook.%s.jobs est défini mais '%s' ressemble à un nom convivial de crochet, " +"pas un nom d'événement ; hook.<event>.jobs utilise le nom d'événement (ex. " +"hook.post-receive.jobs), donc ce paramètre sera ignoré" #, c-format msgid "disabled hook '%s' has no command configured" @@ -19070,6 +19373,18 @@ msgstr "" "'hook.%s.command' doit être configuré ou 'hook.%s.event' doit être " "supprimé ; abandon." +#, c-format +msgid "" +"hook '%s' is not marked as parallel=true, running in parallel anyway due to " +"-j%u" +msgstr "" +"le crochet '%s' n'est pas marqué parallel=true, exécution en parallèle " +"malgré tout à cause de -j%u" + +#, c-format +msgid "%s must be a positive integer or -1, ignoring: %d" +msgstr "%s doit être un entier positif ou -1, ignoré : %d" + msgid "not a git repository" msgstr "pas un dépôt git" @@ -19575,7 +19890,6 @@ msgstr "" #. name, and the second argument is the abbreviated id of the #. commit that needs to be merged. For example: #. - go to submodule (mysubmodule), and either merge commit abc1234" -#. #, c-format msgid "" " - go to submodule (%s), and either merge commit %s\n" @@ -19613,7 +19927,6 @@ msgstr "" #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge #. base, and 2-3) the trees for the two trees we're merging. -#. #, c-format msgid "collecting merge info failed for trees %s, %s, %s" msgstr "échec de collecte l'information de fusion pour les arbres %s, %s, %s" @@ -19674,6 +19987,10 @@ msgstr "" "index multi-paquet existant ignoré ; non-concordance de la somme de contrôle" #, c-format +msgid "could not find base MIDX '%s'" +msgstr "impossible de trouver le MIDX de base '%s'" + +#, c-format msgid "could not load reverse index for MIDX %s" msgstr "impossible de charger l'index inversé pour le MIDX %s" @@ -19849,6 +20166,10 @@ msgstr "" msgid "multi-pack-index large offset out of bounds" msgstr "le grand décalage de l'index-multi-paquet est hors limite" +#, c-format +msgid "failed to clear multi-pack-index chain at %s" +msgstr "échec du nettoyage de la chaîne d'index multi-paquet à %s" + msgid "multi-pack-index file exists, but failed to parse" msgstr "le fichier d'index multi-paquet existe mais n'a pu être analysé" @@ -19926,7 +20247,6 @@ msgstr "Refus de réécrire des notes dans %s (hors de refs/notes/)" #. TRANSLATORS: The first %s is the name of #. the environment variable, the second %s is #. its value. -#. #, c-format msgid "Bad %s value: '%s'" msgstr "Mauvaise valeur de %s : '%s'" @@ -19963,29 +20283,6 @@ msgid "garbage at end of loose object '%s'" msgstr "données incorrectes à la fin de l'objet libre '%s'" #, c-format -msgid "unable to open loose object %s" -msgstr "impossible d'ouvrir l'objet libre %s" - -#, c-format -msgid "unable to parse %s header" -msgstr "impossible d'analyser l'entête %s" - -msgid "invalid object type" -msgstr "type d'objet invalide" - -#, c-format -msgid "unable to unpack %s header" -msgstr "impossible de dépaqueter l'entête %s" - -#, c-format -msgid "header for %s too long, exceeds %d bytes" -msgstr "entête de %s trop long, attendu %d octets" - -#, c-format -msgid "loose object %s (stored in %s) is corrupt" -msgstr "l'objet libre %s (stocké dans %s) est corrompu" - -#, c-format msgid "unable to open %s" msgstr "impossible d'ouvrir %s" @@ -20031,8 +20328,8 @@ msgid "confused by unstable object source data for %s" msgstr "données de source d'objet instable pour %s" #, c-format -msgid "write stream object %ld != %<PRIuMAX>" -msgstr "écrire l'objet de flux %ld != %<PRIuMAX>" +msgid "write stream object %<PRIuMAX> != %<PRIuMAX>" +msgstr "écrire l'objet de flux %<PRIuMAX> != %<PRIuMAX>" #, c-format msgid "unable to stream deflate new object (%d)" @@ -20108,7 +20405,6 @@ msgstr "impossible de dépaqueter le contenu de %s" #. TRANSLATORS: This is a line of ambiguous object #. output shown when we cannot look up or parse the #. object in question. E.g. "deadbeef [bad object]". -#. #, c-format msgid "%s [bad object]" msgstr "%s [mauvais objet]" @@ -20117,7 +20413,6 @@ msgstr "%s [mauvais objet]" #. object output. E.g.: #. * #. "deadbeef commit 2021-01-01 - Some Commit Message" -#. #, c-format msgid "%s commit %s - %s" msgstr "%s commit %s - %s" @@ -20132,7 +20427,6 @@ msgstr "%s commit %s - %s" #. * #. The third argument is the "tag" string #. from object.c. -#. #, c-format msgid "%s tag %s - %s" msgstr "%s étiquette %s - %s" @@ -20142,21 +20436,18 @@ msgstr "%s étiquette %s - %s" #. the tag itself. E.g.: #. * #. "deadbeef [bad tag, could not parse it]" -#. #, c-format msgid "%s [bad tag, could not parse it]" msgstr "%s [mauvaise étiquette, impossible à analyser]" #. TRANSLATORS: This is a line of ambiguous <type> #. object output. E.g. "deadbeef tree". -#. #, c-format msgid "%s tree" msgstr "arbre %s" #. TRANSLATORS: This is a line of ambiguous <type> #. object output. E.g. "deadbeef blob". -#. #, c-format msgid "%s blob" msgstr "blob %s" @@ -20168,7 +20459,6 @@ msgstr "l'id court d'objet %s est ambigu" #. TRANSLATORS: The argument is the list of ambiguous #. objects composed in show_ambiguous_object(). See #. its "TRANSLATORS" comments for details. -#. #, c-format msgid "" "The candidates are:\n" @@ -20337,6 +20627,10 @@ msgid "missing mapping of %s to %s" msgstr "correspondance manquante entre %s et %s" #, c-format +msgid "%s is not a valid object" +msgstr "%s n'est pas un objet valide" + +#, c-format msgid "%s is not a valid '%s' object" msgstr "%s n'est pas un objet '%s' valide" @@ -20350,6 +20644,29 @@ msgid "unable to move new alternates file into place" msgstr "impossible de déplacer le nouveau fichier d'alternative" #, c-format +msgid "unable to open loose object %s" +msgstr "impossible d'ouvrir l'objet libre %s" + +#, c-format +msgid "unable to parse %s header" +msgstr "impossible d'analyser l'entête %s" + +msgid "invalid object type" +msgstr "type d'objet invalide" + +#, c-format +msgid "unable to unpack %s header" +msgstr "impossible de dépaqueter l'entête %s" + +#, c-format +msgid "header for %s too long, exceeds %d bytes" +msgstr "entête de %s trop long, attendu %d octets" + +#, c-format +msgid "loose object %s (stored in %s) is corrupt" +msgstr "l'objet libre %s (stocké dans %s) est corrompu" + +#, c-format msgid "duplicate entry when writing bitmap index: %s" msgstr "entrée dupliquée dans l'index en bitmap : '%s'" @@ -20681,7 +20998,6 @@ msgstr "option non-ascii inconnue dans la chaîne : '%s'" #. 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>]" @@ -20697,7 +21013,6 @@ msgstr "[=<%s>]" #. 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>]" @@ -20711,7 +21026,6 @@ msgstr "[<%s>]" #. "|%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>" @@ -20725,7 +21039,6 @@ msgstr "usage : %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. -#. #, c-format msgid " or: %s" msgstr " ou : %s" @@ -20748,7 +21061,6 @@ msgstr " ou : %s" #. function. The "%s" is a line in the (hopefully already #. translated) N_() usage string, which contained embedded #. newlines before we split it up. -#. #, c-format msgid "%*s%s" msgstr "%*s%s" @@ -20810,6 +21122,26 @@ msgstr "échec de la recherche de l'objet %s" msgid "failed to find tag %s" msgstr "impossible de trouver l'étiquette %s" +#, c-format +msgid "tree:%lu filter not supported by the path-walk API" +msgstr "le filtre tree:%lu n'est pas pris en charge par l'API path-walk" + +msgid "sparse filter cannot be combined with existing sparse patterns" +msgstr "" +"le filtre clairsemé ne peut pas être combiné à des motifs clairsemés " +"existants" + +#, c-format +msgid "unable to parse sparse filter data in '%s'" +msgstr "impossible d'analyser les données de filtre clairsemé dans '%s'" + +msgid "sparse filter is not cone-mode compatible" +msgstr "le filtre clairsemé n'est pas compatible avec le mode cône" + +#, c-format +msgid "object filter '%s' not supported by the path-walk API" +msgstr "le filtre d'objets '%s' n'est pas pris en charge par l'API path-walk" + msgid "failed to setup revision walk" msgstr "impossible définir un parcours de révisions" @@ -20979,20 +21311,24 @@ msgid "unsupported field '%s' in '%s' config" msgstr "champ non géré '%s' dans le config '%s'" #, c-format -msgid "no or empty URL advertised for remote '%s'" -msgstr "URL manquante ou vide annoncée pour le distant '%s'" - -#, 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'" +msgid "" +"known remote named '%s' but with URL '%s' instead of '%s', ignoring this " +"remote" +msgstr "" +"distant connu nommé '%s' mais avec l'URL '%s' au lieu de '%s', ce distant " +"est ignoré" #, c-format msgid "invalid element '%s' from remote info" msgstr "élément invalide '%s' pour l'info de distant" #, c-format -msgid "server advertised a promisor remote without a name or URL: %s" -msgstr "les serveur a annoncé un distant prometteur sans nom ou URL : %s" +msgid "" +"server advertised a promisor remote without a name or URL: '%s', ignoring " +"this remote" +msgstr "" +"le serveur a annoncé un distant prometteur sans nom ni URL : '%s', ce " +"distant est ignoré" #, c-format msgid "" @@ -21037,8 +21373,9 @@ msgid "%s must be non-negative, using default" msgstr "%s doit être non négatif, utilisation de la valeur par défaut" #, c-format -msgid "%s must be between 0 and 1, using default" -msgstr "%s doit valoir entre 0 et 1, utilisation de la valeur par défaut" +msgid "%s must be between 0 (exclusive) and 1, using default" +msgstr "" +"%s doit être entre 0 (exclusif) et 1, utilisation de la valeur par défaut" #, c-format msgid "%s must be positive, using default" @@ -21678,7 +22015,7 @@ msgstr "Vérification de la cohérence des références" #, c-format msgid "%s does not point to a valid object!" -msgstr "%s ne pointe pas sur un objet valide!" +msgstr "%s ne pointe pas sur un objet valide !" #, c-format msgid "%s%s will become dangling after %s is deleted\n" @@ -21772,6 +22109,14 @@ msgid "refusing to force and skip creation of reflog" msgstr "refus de forcer et sauter la création du reflog" #, c-format +msgid "trying to write ref '%s' with nonexistent object %s" +msgstr "essai d'écriture de la réf '%s' avec l'objet inexistant %s" + +#, c-format +msgid "trying to write non-commit object %s to branch '%s'" +msgstr "essai d'écriture de l'objet non commit %s dans la branche '%s'" + +#, c-format msgid "update_ref failed for ref '%s': %s" msgstr "échec de update_ref pour la réf '%s' : %s" @@ -21857,15 +22202,7 @@ msgstr "impossible d'ouvrir '%s'" #, c-format msgid "refname is dangerous: %s" -msgstr "le nom de réference est dangereux : %s" - -#, c-format -msgid "trying to write ref '%s' with nonexistent object %s" -msgstr "essai d'écriture de la réf '%s' avec l'objet inexistant %s" - -#, c-format -msgid "trying to write non-commit object %s to branch '%s'" -msgstr "essai d'écriture de l'objet non commit %s dans la branche '%s'" +msgstr "le nom de référence est dangereux : %s" #, c-format msgid "" @@ -22150,7 +22487,6 @@ msgstr "" #. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. -#. #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -22384,6 +22720,35 @@ msgstr "impossible de fermer le fichier temporaire d'instantané des réfs" msgid "could not remove stale bitmap: %s" msgstr "impossible de revenir la bitmap obsolète : %s" +msgid "no packs to write MIDX during compaction" +msgstr "aucun paquet pour écrire le MIDX pendant la compaction" + +#, c-format +msgid "expected exactly one line during MIDX write, got: %<PRIuMAX>" +msgstr "une seule ligne attendue pendant l'écriture MIDX, obtenu : %<PRIuMAX>" + +#, c-format +msgid "unexpected MIDX output: '%s'" +msgstr "sortie MIDX inattendue : '%s'" + +#, c-format +msgid "could not load pack %<PRIu32> from MIDX" +msgstr "impossible de charger le paquet %<PRIu32> du MIDX" + +msgid "too many objects in MIDX compaction step" +msgstr "trop d'objets dans l'étape de compaction MIDX" + +#, c-format +msgid "could not find preferred pack for MIDX %s" +msgstr "impossible de trouver le paquet préféré pour le MIDX %s" + +msgid "unable to generate compaction plan" +msgstr "impossible de générer le plan de compaction" + +#, c-format +msgid "unable to execute compaction step %<PRIuMAX>" +msgstr "impossible d'exécuter l'étape de compaction %<PRIuMAX>" + msgid "could not start pack-objects to repack promisor objects" msgstr "" "échec du démarrage de pack-objects pour ré-empaqueter les objets de " @@ -22457,6 +22822,10 @@ msgstr "commits requis pour pouvoir rejouer" msgid "all positive revisions given must be references" msgstr "toutes les révisions positives fournies doivent être des références" +#, c-format +msgid "commit %s became empty after replay" +msgstr "le commit %s est devenu vide après rejeu" + msgid "'--ref' cannot be used with multiple revision ranges" msgstr "--ref ne peut pas être utilisé avec des plages de révisions multiples" @@ -22583,8 +22952,8 @@ msgstr "votre branche actuelle '%s' ne contient encore aucun commit" msgid "object filtering requires --objects" msgstr "le filtrage d'objet exige --objects" -msgid "-L does not yet support diff formats besides -p and -s" -msgstr "-L ne supporte pas encore les formats de diff autres que -p et -s" +msgid "-L does not yet support the requested diff format" +msgstr "-L ne prend pas encore en charge le format de diff demandé" #, c-format msgid "cannot create async thread: %s" @@ -22910,7 +23279,7 @@ msgstr "" "\"git add/rm <spéc-de-réf>\", puis lancez\n" "\"git cherry-pick --continue\".\n" "Vous pouvez aussi sauter ce commit avec \"git cherry-pick --skip\".\n" -"Pour arrêter et revenir à l'état antérieur à \"git cherry-pick\",,\n" +"Pour arrêter et revenir à l'état antérieur à \"git cherry-pick\",\n" "lancez \"git cherry-pick --abort\"." msgid "" @@ -22925,7 +23294,7 @@ msgstr "" "\"git add/rm <spéc-de-réf>\", puis lancez\n" "\"git revert --continue\".\n" "Vous pouvez aussi sauter ce commit avec \"git revert --skip\".\n" -"Pour arrêter et revenir à l'état antérieur à \"git revert\",,\n" +"Pour arrêter et revenir à l'état antérieur à \"git revert\",\n" "lancez \"git revert --abort\"." #, c-format @@ -22949,7 +23318,6 @@ msgstr "validez vos modifications ou les remiser pour continuer." #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase". -#. #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Impossible d'écrire le nouveau fichier index" @@ -23217,7 +23585,6 @@ msgstr "'%s' n'accepte pas de commit de fusion" #. TRANSLATORS: 'pick' and 'merge -C' should not be #. translated. -#. msgid "" "'pick' does not take a merge commit. If you wanted to\n" "replay the merge, use 'merge -C' on the commit." @@ -23227,7 +23594,6 @@ msgstr "" #. TRANSLATORS: 'reword' and 'merge -c' should not be #. translated. -#. msgid "" "'reword' does not take a merge commit. If you wanted to\n" "replay the merge and reword the commit message, use\n" @@ -23239,7 +23605,6 @@ msgstr "" #. TRANSLATORS: 'edit', 'merge -C' and 'break' should #. not be translated. -#. msgid "" "'edit' does not take a merge commit. If you wanted to\n" "replay the merge, use 'merge -C' on the commit, and then\n" @@ -23485,7 +23850,7 @@ msgstr "fusion : Impossible d'écrire le nouveau fichier index" #, c-format msgid "" "another 'rebase' process appears to be running; '%s.lock' already exists" -msgstr "un processu 'rebase' semble déjà lancé; '%s.lock' existe déjà" +msgstr "un processus 'rebase' semble déjà lancé ; '%s.lock' existe déjà" #, c-format msgid "" @@ -23531,21 +23896,28 @@ msgstr "impossible de stocker %s" #, c-format msgid "" -"%s\n" +"Your local changes are stashed, however applying them\n" +"resulted in conflicts. You can either resolve the conflicts\n" +"and then discard the stash with \"git stash drop\", or, if you\n" +"do not want to resolve them now, run \"git reset --hard\" and\n" +"apply the local changes later by running \"git stash pop\".\n" +msgstr "" +"Vos modifications locales sont remisées, mais leur application\n" +"a produit des conflits. Vous pouvez soit résoudre les conflits\n" +"et ensuite supprimer la remise avec \"git stash drop\", ou, si vous\n" +"ne voulez pas les résoudre maintenant, lancez \"git reset --hard\" et\n" +"appliquez les modifications locales plus tard avec \"git stash pop\".\n" + +#, c-format +msgid "" +"Autostash exists; creating a new stash entry.\n" "Your changes are safe in the stash.\n" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" -"%s\n" -"Vos modifications sont à l'abri dans la remise.\n" +"Un auto-remisage existe ; création d'une nouvelle entrée de remisage.\n" +"Vos modifications sont à l'abri dans la remise.\n" "Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n" -msgid "Applying autostash resulted in conflicts." -msgstr "L'application du remisage automatique a créé des conflits." - -msgid "Autostash exists; creating a new stash entry." -msgstr "" -"Un remisage automatique existe ; création d'une nouvelle entrée de remisage." - msgid "autostash reference is a symref" msgstr "la référence d'auto-remisage est une symref" @@ -23845,9 +24217,6 @@ msgstr "" msgid "fork failed" msgstr "échec de la bifurcation" -msgid "setsid failed" -msgstr "échec du setsid" - #, c-format msgid "cannot stat template '%s'" msgstr "impossible de faire un stat du modèle '%s'" @@ -23926,6 +24295,10 @@ msgid "Initialized empty Git repository in %s%s\n" msgstr "Dépôt Git vide initialisé dans %s%s\n" #, c-format +msgid "unrecognized value for '%s': '%s'" +msgstr "valeur non reconnue pour '%s' : '%s'" + +#, c-format msgid "index entry is a directory, but not sparse (%08x)" msgstr "l'entrée d'index est un répertoire, mais pas clairsemé (%08x)" @@ -24005,7 +24378,6 @@ msgstr[1] "octets" #. TRANSLATORS: The first argument is the number string. The second #. argument is the unit string (i.e. "12.34 MiB/s"). -#. #, c-format msgid "%s %s" msgstr "%s %s" @@ -24217,7 +24589,7 @@ msgstr "" #, c-format msgid "refusing to create/use '%s' in another submodule's git dir." msgstr "" -"refus de créer/utiliser '%s' dans un répertoire git d'un autre sous-module" +"refus de créer/utiliser '%s' dans un répertoire git d'un autre sous-module." #, c-format msgid "failed to lstat '%s'" @@ -24265,6 +24637,9 @@ msgstr "activer le parcours agressif des arêtes" msgid "read a pattern list over stdin" msgstr "lire les motifs depuis stdin" +msgid "toggle pruning of trees by sparse patterns" +msgstr "activer l'élagage des arbres par les motifs clairsemés" + #, c-format msgid "commit %s is not marked reachable" msgstr "le commit %s n'est pas marqué joignable" @@ -24341,6 +24716,13 @@ msgstr "jeton" msgid "command token to send to the server" msgstr "jeton de commande à envoyer au serveur" +msgid "write a pack with a single reachable large blob" +msgstr "écrire un paquet avec un seul gros blob joignable" + +#, c-format +msgid "'%s' is not a valid blob size" +msgstr "'%s' n'est pas une taille de blob valide" + msgid "unit-test [<options>]" msgstr "unit-test [<options>]" @@ -24411,7 +24793,7 @@ msgid "" "version of Git" msgstr "" "capacité obligatoire inconnue %s ; cet assistant distant requiert " -"probablement une une nouvelle version de Git" +"probablement une nouvelle version de Git" msgid "this remote helper should implement refspec capability" msgstr "cet assistant distant devrait supporter la capacité refspec" @@ -24453,6 +24835,10 @@ msgstr "impossible de se connecter au sous-service %s" msgid "--negotiate-only requires protocol v2" msgstr "--negotiate-only requiert le protocole v2" +#, c-format +msgid "ignoring %s because the protocol does not support it." +msgstr "ignoré %s car le protocole ne le prend pas en charge." + msgid "'option' without a matching 'ok/error' directive" msgstr "'option' sans directive 'ok/error' correspondante" @@ -25768,13 +26154,13 @@ msgstr "" "Transfer-Encoding.\n" msgid "Declare which 8bit encoding to use [default: UTF-8]? " -msgstr "Déclarer l'encodage 8bit à utilisé [par défaut : UTF8] ?" +msgstr "Déclarer l'encodage 8bit à utilisé [par défaut : UTF8] ? " #, perl-format msgid "'%s' does not appear to be a valid charset name. Use it anyway [y/N]? " msgstr "" -"'%s' ne semble être un jeu de caractères valide. L'utiliser quand même [y/" -"N] ?" +"'%s' ne semble pas être un jeu de caractères valide. L'utiliser quand même " +"[y/N] ? " #, perl-format msgid "" @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2026-04-08 23:26+0000\n" -"PO-Revision-Date: 2026-04-09 15:12+0100\n" +"POT-Creation-Date: 2026-06-15 18:56+0000\n" +"PO-Revision-Date: 2026-06-27 14:34+0100\n" "Last-Translator: Aindriú Mac Giolla Eoin <aindriu80@yahoo.com>\n" "Language-Team: none\n" "Language: ga\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n==2 ? 1 : 2;\n" -"X-Generator: Poedit 3.8\n" +"X-Generator: Poedit 3.9\n" #, c-format msgid "Huh (%s)?" @@ -401,8 +401,8 @@ msgstr "" #, c-format msgid "Apply mode change to index and worktree%s [y,n,q,a,d%s,?]? " msgstr "" -"Cuir athrú mód i bhfeidhm ar an innéacs agus ar an gcrann oibre%s " -"[y,n,q,a,d%s,?]? " +"Cuir athrú mód i bhfeidhm ar an innéacs agus ar an gcrann oibre%s [y,n,q,a," +"d%s,?]? " #, c-format msgid "Apply deletion to index and worktree%s [y,n,q,a,d%s,?]? " @@ -412,14 +412,14 @@ msgstr "" #, c-format msgid "Apply addition to index and worktree%s [y,n,q,a,d%s,?]? " msgstr "" -"Cuir an breiseán i bhfeidhm ar innéacs agus ar chrann oibre%s " -"[y,n,q,a,d%s,?]? " +"Cuir an breiseán i bhfeidhm ar innéacs agus ar chrann oibre%s [y,n,q,a," +"d%s,?]? " #, c-format msgid "Apply this hunk to index and worktree%s [y,n,q,a,d%s,?]? " msgstr "" -"Cuir an píosa seo i bhfeidhm ar innéacs agus ar chrann oibre%s " -"[y,n,q,a,d%s,?]? " +"Cuir an píosa seo i bhfeidhm ar innéacs agus ar chrann oibre%s [y,n,q,a," +"d%s,?]? " msgid "" "y - apply this hunk to index and worktree\n" @@ -1690,40 +1690,40 @@ msgstr "" #, c-format msgid "" -"The merge base %s is %s.\n" +"The merge base %s is '%s'.\n" "This means the first '%s' commit is between %s and [%s].\n" msgstr "" -"Is é an bonn cumaisc %s ná %s.\n" -"Ciallaíonn sé seo go bhfuil an chéad thiomantas '%s' idir %s agus [%s].\n" +"Is é '%s' an bonn cumasc %s.\n" +"Ciallaíonn sé seo go bhfuil an chéad tiomantas '%s' idir %s agus [%s].\n" #, c-format msgid "" -"Some %s revs are not ancestors of the %s rev.\n" +"Some '%s' revs are not ancestors of the '%s' rev.\n" "git bisect cannot work properly in this case.\n" -"Maybe you mistook %s and %s revs?\n" +"Maybe you mistook '%s' and '%s' revs?\n" msgstr "" -"Ní sinsear an %s rev iad roinnt revs %s\n" +"Ní sinsear den rev '%s' cuid de na '%s' revs.\n" "Ní féidir le git bisect oibriú i gceart sa chás seo.\n" -"B'fhéidir gur mheas tú %s agus %s revs?\n" +"B'fhéidir gur mheasc tú '%s' agus revs '%s'?\n" #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" -"So we cannot be sure the first %s commit is between %s and %s.\n" +"So we cannot be sure the first '%s' commit is between %s and %s.\n" "We continue anyway." msgstr "" -"caithfear an bonn cumaisc idir %s agus [%s] a scipeáil.\n" -"Mar sin ní féidir linn a bheith cinnte go bhfuil an chéad thiomantas %s idir " -"%s agus %s.\n" -"Leanaimid orainn ar aon nós." +"ní mór an bonn cumasc idir %s agus [%s] a scipeáil.\n" +"Mar sin ní féidir linn a bheith cinnte go bhfuil an chéad tiomantas '%s' " +"idir %s agus %s.\n" +"Leanfaimid ar aghaidh ar aon nós." #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Déroinnt: ní mór bonn cumaisc a thástáil\n" #, c-format -msgid "a %s revision is needed" -msgstr "tá athbhreithniú %s ag teastáil" +msgid "a '%s' revision is needed" +msgstr "Tá athbhreithniú '%s' ag teastáil" #, c-format msgid "could not create file '%s'" @@ -1741,8 +1741,8 @@ msgid "reading bisect refs failed" msgstr "theip ar athbhreithnithe bisect a léamh" #, c-format -msgid "%s was both %s and %s\n" -msgstr "Bhí %s %s agus %s araon\n" +msgid "%s was both '%s' and '%s'\n" +msgstr "Bhí %s ina '%s' agus ina '%s' araon\n" #, c-format msgid "" @@ -2503,8 +2503,22 @@ msgstr "git archive: earráid prótacal" msgid "git archive: expected a flush" msgstr "git archive: bhíothas ag súil le sruthlú" -msgid "git backfill [--min-batch-size=<n>] [--[no-]sparse]" -msgstr "git backfill [--min-batch-size=<n>] [-- [no-] neart]" +msgid "" +"git backfill [--min-batch-size=<n>] [--[no-]sparse] [--[no-]include-edges] " +"[<revision-range>]" +msgstr "" +"git backfill [--min-batch-size=<n>] [--[no-]sparse] [--[no-]include-edges] " +"[<revision-range>]" + +#, c-format +msgid "'%s' cannot be used with 'git backfill'" +msgstr "Ní féidir '%s' a úsáid le 'git backfill'" + +msgid "cannot backfill with these filter options" +msgstr "ní féidir aislíonadh leis na roghanna scagaire seo" + +msgid "cannot backfill with blob size limits" +msgstr "ní féidir aislíonadh le teorainneacha méide blob" msgid "problem loading sparse-checkout" msgstr "fadhb ag luchtú seiceáil neamhchoiti" @@ -2515,6 +2529,9 @@ msgstr "Líon íosta rudaí le iarraidh ag an am" msgid "Restrict the missing objects to the current sparse-checkout" msgstr "Cuir srian ar na rudaí atá in easnamh don tseiceáil neamhchoitianta" +msgid "Include blobs from boundary commits in the backfill" +msgstr "Cuir blobanna ó thiomantas teorann san áireamh sa líonadh siar" + #, c-format msgid "unrecognized argument: %s" msgstr "argóint gan aithint: %s" @@ -2560,7 +2577,7 @@ msgstr "ní féidir comhad '%s' a oscailt le haghaidh léamh" #, c-format msgid "'%s' is not a valid term" -msgstr "Ní téarma bailí é '%s'" +msgstr "ní téarma bailí é '%s'" #, c-format msgid "can't use the builtin command '%s' as a term" @@ -2634,31 +2651,33 @@ msgstr "ag déileáil ach amháin le tiomantas %s" msgid "Are you sure [Y/n]? " msgstr "An bhfuil tú cinnte [Y/n]? " -msgid "status: waiting for both good and bad commits\n" -msgstr "stádas: ag fanacht le tiomáintí mhaith agus tiomáintí dona\n" +#, c-format +msgid "status: waiting for both '%s' and '%s' commits\n" +msgstr "stádas: ag fanacht le gealltanais '%s' agus '%s' araon\n" #, c-format -msgid "status: waiting for bad commit, %d good commit known\n" -msgid_plural "status: waiting for bad commit, %d good commits known\n" -msgstr[0] "stádas: ag fanacht le droch-thiomnadh, %d dea-thiomnadh ar eolas\n" -msgstr[1] "" -"stádas: ag fanacht le droch-thiomantas, %d dea-thiomantas ar eolas\n" -msgstr[2] "" -"stádas: ag fanacht le droch-thiomantas, %d dea-thiomantas ar eolas\n" +msgid "status: waiting for '%s' commit, %d '%s' commit known\n" +msgid_plural "status: waiting for '%s' commit, %d '%s' commits known\n" +msgstr[0] "stádas: ag fanacht le '%s' tiomantas, %d '%s' tiomantas ar eolas\n" +msgstr[1] "stádas: ag fanacht le '%s' tiomantas, %d '%s' tiomantais ar eolas\n" +msgstr[2] "stádas: ag fanacht le '%s' tiomantas, %d '%s' tiomantais ar eolas\n" -msgid "status: waiting for good commit(s), bad commit known\n" -msgstr "stádas: ag fanacht le tiomáintí maith, droch-tiomantas ar eolas\n" +#, c-format +msgid "status: waiting for '%s' commit(s), '%s' commit known\n" +msgstr "" +"stádas: ag fanacht le tiomantas (tiomantais) '%s', tá an tiomantas '%s' ar " +"eolas\n" msgid "no terms defined" msgstr "aon téarmaí sainmhínithe" #, c-format msgid "" -"Your current terms are %s for the old state\n" -"and %s for the new state.\n" +"Your current terms are '%s' for the old state\n" +"and '%s' for the new state.\n" msgstr "" -"Is iad na téarmaí reatha %s don seanstát\n" -"agus %s don stát nua.\n" +"Is iad na téarmaí reatha atá agat ná '%s' don seanstát\n" +"agus '%s' don stát nua.\n" #, c-format msgid "" @@ -2743,12 +2762,12 @@ msgid "bisect run failed: no command provided." msgstr "theip ar rith bioctha: níl aon ordú curtha ar fáil." #, c-format -msgid "unable to verify %s on good revision" -msgstr "ní féidir %s a fhíorú ar athbhreithniú maith" +msgid "unable to verify %s on '%s' revision" +msgstr "ní féidir %s a fhíorú ar athbhreithniú '%s'" #, c-format -msgid "bogus exit code %d for good revision" -msgstr "cód imeachta bréagach %d le haghaidh athbhreithniú maith" +msgid "bogus exit code %d for '%s' revision" +msgstr "cód scoir bréige %d le haghaidh athbhreithniú '%s'" #, c-format msgid "bisect run failed: exit code %d from %s is < 0 or >= 128" @@ -2764,8 +2783,9 @@ msgstr "ní féidir le rith bisect leanúint ar aghaidh níos mó" msgid "bisect run success" msgstr "rath reatha dhéagsúil" -msgid "bisect found first bad commit" -msgstr "fuarthas bisect an chéad droch-thiomantas" +#, c-format +msgid "bisect found first '%s' commit\n" +msgstr "aimsíodh an chéad tiomnú '%s', leathroinn\n" #, c-format msgid "bisect run failed: 'git bisect %s' exited with error code %d" @@ -3215,11 +3235,11 @@ msgid "HEAD not found below refs/heads!" msgstr "Ní fhaightear CEAD thíos na refs/heads!" msgid "" -"branch with --recurse-submodules can only be used if " -"submodule.propagateBranches is enabled" +"branch with --recurse-submodules can only be used if submodule." +"propagateBranches is enabled" msgstr "" -"ní féidir brainse le --recurse-submodules a úsáid ach amháin má tá " -"submodule.propagateBranches cumasaithe" +"ní féidir brainse le --recurse-submodules a úsáid ach amháin má tá submodule." +"propagateBranches cumasaithe" msgid "--recurse-submodules can only be used to create branches" msgstr "Ní féidir --recurse-submodules a úsáid ach chun brainsí a chruthú" @@ -3444,6 +3464,10 @@ msgstr "Rudaí a dhícheangal" msgid "cannot read object %s '%s'" msgstr "ní féidir réad %s '%s' a léamh" +#, c-format +msgid "mailmap: invalid boolean '%s'" +msgstr "mailmap: booléanach neamhbhailí '%s'" + msgid "flush is only for --buffer mode" msgstr "níl sruth ach le haghaidh mód --buffer" @@ -3804,14 +3828,6 @@ msgid "you need to resolve your current index first" msgstr "ní mór duit d'innéacs reatha a réiteach ar dtús" #, c-format -msgid "" -"cannot continue with staged changes in the following files:\n" -"%s" -msgstr "" -"ní féidir leanúint ar aghaidh le hathruithe céime sna comhaid seo a leanas:\n" -"%s" - -#, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Ní féidir athbhreithniú a dhéanamh le haghaidh '%s': %s\n" @@ -3911,6 +3927,10 @@ msgid "You are on a branch yet to be born" msgstr "Tá tú ar bhrainse nach rugadh fós" #, c-format +msgid "The following paths have local changes:\n" +msgstr "Tá athruithe áitiúla ar na cosáin seo a leanas:\n" + +#, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" "Please use -- (and optionally --no-guess) to disambiguate" @@ -5468,6 +5488,18 @@ msgid "wrong number of arguments, should be from %d to %d" msgstr "ba chóir go mbeadh líon mícheart na n-argóintí ó %d go %d" #, c-format +msgid "missing value to set to the variable '%s'" +msgstr "luach atá ar iarraidh le socrú don athróg '%s'" + +#, c-format +msgid "did you mean \"git config set %s %s\"?" +msgstr "an bhfuil i gceist agat \"git config set %s %s\"?" + +#, c-format +msgid "missing value to set to a variable with an invalid name '%s'" +msgstr "luach ar iarraidh le socrú chuig athróg le hainm neamhbhailí '%s'" + +#, c-format msgid "invalid key pattern: %s" msgstr "patrún eochair neamhbhailí: %s" @@ -6898,14 +6930,19 @@ msgid "option \"%s\" is ignored for %s" msgstr "déantar neamhaird ar rogha “%s” do %s" #, c-format -msgid "%s is not a valid object" -msgstr "Ní réad bailí é %s" - -#, c-format msgid "the object %s does not exist" msgstr "níl an réad %s ann" #, c-format +msgid "ignoring %s=%s because it does not match any refs" +msgstr "" +"ag déanamh neamhaird de %s=%s mar nach bhfuil sé ag teacht le haon tagairtí" + +#, c-format +msgid "ignoring %s because the protocol does not support it" +msgstr "ag déanamh neamhaird de %s mar nach dtacaíonn an prótacal leis" + +#, c-format msgid "" "Run 'git remote set-head %s %s' to follow the change, or set\n" "'remote.%s.followRemoteHEAD' configuration option to a different value\n" @@ -7108,6 +7145,9 @@ msgstr "athbhreithiú" msgid "report that we have only objects reachable from this object" msgstr "tuairisciú nach bhfuil ach rudaí inrochtana againn ón réad seo" +msgid "ensure this ref is always sent as a negotiation have" +msgstr "cinntigh go seoltar an tagairt seo i gcónaí mar idirbheartaíocht" + msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" msgstr "" "ná faigh comhad pacáiste; ina ionad sin, priontáil sinsear leideanna " @@ -7125,10 +7165,6 @@ msgstr "scríobh an graf coimisiúnaithe tar éis a fháil" msgid "accept refspecs from stdin" msgstr "glacadh le refspecs ó stdin" -msgid "--negotiate-only needs one or more --negotiation-tip=*" -msgstr "" -"--negotiate-only teastaíonn ceann amháin nó níos mó --negotiation-tip=*" - msgid "negative depth in --deepen is not supported" msgstr "ní thacaítear le doimhneacht dhiúltach i --deepen" @@ -7158,9 +7194,13 @@ msgstr "ní mór iargúlta a sholáthar agus tú ag úsáid --negotiate-only" msgid "protocol does not support --negotiate-only, exiting" msgstr "ní thacaíonn an prótacal le --negotiate-only, ag scoir" +#, c-format +msgid "%s needs one or more %s" +msgstr "Teastaíonn %s ceann amháin nó níos mó de %s" + msgid "" -"--filter can only be used with the remote configured in " -"extensions.partialclone" +"--filter can only be used with the remote configured in extensions." +"partialclone" msgstr "" "--filter Ní féidir ach an scagaire a úsáid ach leis an iargúlta cumraithe in " "extensions.partialclone" @@ -7490,6 +7530,10 @@ msgid "value of '%s' not bool or int: %d" msgstr "luach '%s' gan bool nó int: %d" #, c-format +msgid "daemon did not stop within %d seconds" +msgstr "Níor stop an daemon laistigh de %d soicind" + +#, c-format msgid "fsmonitor-daemon is watching '%s'\n" msgstr "tá fsmonitor-daemon ag féachaint ar '%s'\n" @@ -7533,6 +7577,9 @@ msgstr "tá fsmonitor--daemon ag rith '%s' cheana féin" msgid "running fsmonitor-daemon in '%s'\n" msgstr "ag rith fsmonitor-daemon i '%s'\n" +msgid "setsid failed" +msgstr "theip ar setsid" + #, c-format msgid "starting fsmonitor-daemon in '%s'\n" msgstr "ag tosú fsmonitor-daemon i '%s'\n" @@ -7695,8 +7742,8 @@ msgstr "Theip ar 'git multi-pack-index repack'" msgid "" "skipping incremental-repack task because core.multiPackIndex is disabled" msgstr "" -"ag scipeáil an tasc athphacála incriminteach mar go bhfuil " -"core.multiPackIndex díchumasaithe" +"ag scipeáil an tasc athphacála incriminteach mar go bhfuil core." +"multiPackIndex díchumasaithe" msgid "failed to perform geometric repack" msgstr "theip ar athphacáil gheoiméadrach a dhéanamh" @@ -7715,7 +7762,7 @@ msgstr "straitéis chothabhála anaithnid: '%s'" #, c-format msgid "'%s' is not a valid task" -msgstr "Ní tasc bailí é '%s'" +msgstr "ní tasc bailí é '%s'" #, c-format msgid "task '%s' cannot be selected multiple times" @@ -8213,6 +8260,13 @@ msgstr "úsáid: %s%s" msgid "'git help config' for more information" msgstr "'git help config' le haghaidh tuilleadh faisnéise" +msgid "" +"git history fixup <commit> [--dry-run] [--update-refs=(branches|head)] [--" +"reedit-message] [--empty=(drop|keep|abort)]" +msgstr "" +"git history fixup <commit> [--dry-run] [--update-refs=(branches|head)] [--" +"reedit-message] [--empty=(drop|keep|abort)]" + msgid "git history reword <commit> [--dry-run] [--update-refs=(branches|head)]" msgstr "" "git history reword <commit> [--dry-run] [--update-refs=(brainsí|ceann)]" @@ -8277,25 +8331,81 @@ msgstr "theip ar an tagairt '%s' a nuashonrú: %s" msgid "failed to commit ref transaction: %s" msgstr "theip ar an idirbheart tagartha a dhéanamh: %s" +#, c-format +msgid "unable to parse parent of %s" +msgstr "ní féidir tuismitheoir %s a pharsáil" + +#, c-format +msgid "" +"unrecognized '--empty=' action '%s'; valid values are \"drop\", \"keep\", " +"and \"abort\"." +msgstr "" +"gníomh neamhaitheanta '--empty=' '%s'; is iad na luachanna bailí ná " +"\"drop\", \"keep\", agus \"abort\"." + msgid "control which refs should be updated" msgstr "rialú cé na tagairtí ba chóir a nuashonrú" msgid "perform a dry-run without updating any refs" msgstr "déan tástáil gan aon tagairtí a nuashonrú" +msgid "open an editor to modify the commit message" +msgstr "oscail eagarthóir chun an teachtaireacht tiomnaithe a mhodhnú" + +msgid "how to handle commits that become empty" +msgstr "conas gealltanais a éiríonn folamh a láimhseáil" + msgid "command expects a single revision" msgstr "tá athbhreithniú amháin ag teastáil ón ordú" +msgid "cannot run fixup in a bare repository" +msgstr "ní féidir fixup a rith i stórlann lom" + #, c-format msgid "commit cannot be found: %s" msgstr "ní féidir an tiomantas a aimsiú: %s" -msgid "failed writing reworded commit" -msgstr "theip ar scríobh an tiomnaithe athfhoclaithe" +msgid "cannot get tree for HEAD" +msgstr "ní féidir crann a fháil do HEAD" + +msgid "unable to read index" +msgstr "gan an t-innéacs a léamh" + +msgid "nothing to fixup: no staged changes" +msgstr "aon rud le socrú: gan aon athruithe céimnithe" + +msgid "unable to write index as a tree" +msgstr "ní féidir innéacs a scríobh mar chrann" + +#, c-format +msgid "cannot get tree for commit %s" +msgstr "ní féidir crann a fháil le haghaidh tiomnú %s" + +msgid "merge failed while applying fixup" +msgstr "theip ar chumasc agus an socrú á chur i bhfeidhm" + +msgid "fixup would produce conflicts; aborting" +msgstr "chuirfeadh an socrú coinbhleachtaí ar fáil; chuirfeadh deireadh leis" + +#, c-format +msgid "cannot drop root commit %s: it has no parent to replay onto" +msgstr "" +"ní féidir an tiomnú fréimhe %s a scaoileadh: níl aon tuismitheoir aige le " +"hathsheinm air" + +#, c-format +msgid "fixup makes commit %s empty" +msgstr "Déanann fixup an tiomnú %s folamh" + +msgid "failed writing fixed-up commit" +msgstr "theip ar scríobh an tiomnaithe socraithe" msgid "failed replaying descendants" msgstr "theip ar athimirt sliocht" +msgid "failed writing reworded commit" +msgstr "theip ar scríobh an tiomnaithe athfhoclaithe" + msgid "unable to populate index with tree" msgstr "ní féidir an t-innéacs a líonadh le crann" @@ -8331,10 +8441,12 @@ msgstr "ní féidir an tiomantas cumasc a roinnt" msgid "" "git hook run [--allow-unknown-hook-name] [--ignore-missing] [--to-" -"stdin=<path>] <hook-name> [-- <hook-args>]" +"stdin=<path>] [(-j|--jobs) <n>]\n" +"<hook-name> [-- <hook-args>]" msgstr "" -"git hook run [--allow-unknown-crúca-ainm] [--ignore-missing] [--to-" -"stdin=<cosán>] <ainm-crúca> [-- <argóintí-crúca>]" +"git hook run [--allow-unknown-hook-name] [--ignore-missing] [--to-" +"stdin=<path>] [(-j|--jobs) <n>]\n" +"<hook-name> [-- <hook-args>]" msgid "" "git hook list [--allow-unknown-hook-name] [-z] [--show-scope] <hook-name>" @@ -8375,6 +8487,16 @@ msgstr "neamhaird go ciúin a iarrtar ar <hook-name>" msgid "file to read into hooks' stdin" msgstr "comhad le léamh isteach i stdin na hracaí" +msgid "run up to <n> hooks simultaneously (-1 for CPU count)" +msgstr "" +"rith suas le <n> crúcaí ag an am céanna (-1 le haghaidh comhaireamh LAP)" + +#, c-format +msgid "invalid value for -j: %d (use -1 for CPU count or a positive integer)" +msgstr "" +"luach neamhbhailí le haghaidh -j: %d (bain úsáid as -1 le haghaidh " +"comhaireamh LAP nó slánuimhir dhearfach)" + #, c-format msgid "object type mismatch at %s" msgstr "mímheaitseáil cineál réad ag %s" @@ -8425,6 +8547,9 @@ msgstr "tá réad lochtach sa phacáiste ag an bhfritháireamh %<PRIuMAX>: %s" msgid "inflate returned %d" msgstr "infleáil ar ais %d" +msgid "object size too large for this platform" +msgstr "méid an réada ró-mhór don ardán seo" + msgid "offset value overflow for delta base object" msgstr "ró-shreabhadh luacha a fhritháireamh do réad" @@ -8877,7 +9002,7 @@ msgstr "theip ar chomhad litir chlúdaigh a chruthú" #, c-format msgid "'%s' is not a valid format string" -msgstr "Ní teaghrán formáide bailí é '%s'" +msgstr "ní teaghrán formáide bailí é '%s'" #, c-format msgid "insane in-reply-to: %s" @@ -9833,18 +9958,22 @@ msgstr "cead níos mó ná crann amháin a chruthú" msgid "" "git multi-pack-index [<options>] write [--preferred-pack=<pack>]\n" " [--[no-]bitmap] [--[no-]incremental] [--[no-]stdin-packs]\n" -" [--refs-snapshot=<path>]" +" [--refs-snapshot=<path>] [--[no-]write-chain-file]\n" +" [--base=<checksum>]" msgstr "" -"git multi-pack-index [<roghanna>] scríobh [--preferred-pack=<pacáiste>]\n" -" [--[gan-]bitmap] [--[gan-]incriminteach] [--[gan-]stdin-packs]\n" -" [--refs-snapshot=<cosán>]" +"git multi-pack-index [<options>] write [--preferred-pack=<pack>]\n" +" [--[no-]bitmap] [--[no-]incremental] [--[no-]stdin-packs]\n" +" [--refs-snapshot=<path>] [--[no-]write-chain-file]\n" +" [--base=<checksum>]" msgid "" "git multi-pack-index [<options>] compact [--[no-]incremental]\n" -" [--[no-]bitmap] <from> <to>" +" [--[no-]bitmap] [--base=<checksum>] [--[no-]write-chain-file]\n" +" <from> <to>" msgstr "" -"git multi-pack-index [<roghanna>] dlúth [--[gan-]incriminteach]\n" -" [--[gan-]bitmap] <ó> <go>" +"git multi-pack-index [<options>] compact [--[no-]incremental]\n" +" [--[no-]bitmap] [--base=<checksum>] [--[no-]write-chain-file]\n" +" <from> <to>" msgid "git multi-pack-index [<options>] verify" msgstr "git multi-pack-index [<options>] verify" @@ -9871,9 +10000,18 @@ msgstr "pacáiste le húsáid agus bitmap il-phacáiste á ríomh" msgid "write multi-pack bitmap" msgstr "scríobh bitmap il-phacáiste" +msgid "checksum" +msgstr "suim sheiceála" + +msgid "base MIDX for incremental writes" +msgstr "MIDX bonn le haghaidh scríbhinní incriminteacha" + msgid "write a new incremental MIDX" msgstr "scríobh MIDX incrementach nua" +msgid "write the multi-pack-index chain file" +msgstr "scríobh an comhad slabhra multi-pack-index" + msgid "write multi-pack index containing only given indexes" msgstr "scríobh innéacs il-phacáiste nach bhfuil ach innéacsanna ar leith" @@ -9881,6 +10019,13 @@ msgid "refs snapshot for selecting bitmap commits" msgstr "léargas refs chun gealltanais bitmap a roghnú" #, c-format +msgid "cannot use %s without %s" +msgstr "ní féidir %s a úsáid gan %s" + +msgid "cannot use --base without --no-write-chain-file" +msgstr "ní féidir --base a úsáid gan --no-write-chain-file" + +#, c-format msgid "could not find MIDX: %s" msgstr "níorbh fhéidir MIDX a aimsiú: %s" @@ -10020,6 +10165,48 @@ msgstr "" msgid "dereference tags in the input (internal use)" msgstr "clibeanna dereference san ionchur (úsáid inmheánach)" +#, c-format +msgid "'%s' needs to be either text, revs, or rev" +msgstr "Caithfidh '%s' a bheith ina text, revs, or rev" + +msgid "" +"(EXPERIMENTAL!) git format-rev --stdin-mode=<mode> --format=<pretty> [--" +"[no-]notes=<ref>] [-z] [--[no-]null-output] [--[no-]null-input]" +msgstr "" +"(TURGNAMHACH!) git format-rev --stdin-mode=<mode> --format=<pretty> [--" +"[no-]notes=<ref>] [-z] [--[no-]null-output] [--[no-]null-input]" + +msgid "pretty format to use" +msgstr "formáid deas le húsáid" + +msgid "stdin-mode" +msgstr "stdin-mode" + +msgid "how revs are processed" +msgstr "conas a phróiseáiltear revs" + +msgid "notes" +msgstr "nótaí" + +msgid "display notes for pretty format" +msgstr "nótaí taispeána le haghaidh formáid deas" + +msgid "z" +msgstr "z" + +msgid "Use NUL for input and output termination" +msgstr "Úsáid NUL le haghaidh foirceannadh ionchuir agus aschuir" + +msgid "Use NUL for input termination" +msgstr "Úsáid NUL le haghaidh foirceannadh ionchuir" + +msgid "Use NUL for output termination" +msgstr "Úsáid NUL le haghaidh foirceannadh aschuir" + +#, c-format +msgid "'%s' is required" +msgstr "Tá '%s' riachtanach" + msgid "git notes [--ref <notes-ref>] [list [<object>]]" msgstr "git notes [--ref <notes-ref>] [list [<object>]]" @@ -10368,6 +10555,10 @@ msgid "currently, --write-bitmap-index requires --name-hash-version=1" msgstr "faoi láthair, teastaíonn --write-bitmap-index --name-hash-version=1" #, c-format +msgid "write_reuse_object: unable to parse object header of %s" +msgstr "write_reuse_object: ní féidir ceanntásc réada %s a pharsáil" + +#, c-format msgid "" "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in " "pack %s" @@ -10398,8 +10589,8 @@ msgstr "" msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" -"scríobh bitmap a dhíchumasú, roinntear pacáistí mar gheall ar " -"pack.packSizeLimit" +"scríobh bitmap a dhíchumasú, roinntear pacáistí mar gheall ar pack." +"packSizeLimit" msgid "Writing objects" msgstr "Rudaí a scríobh" @@ -10552,9 +10743,6 @@ msgstr "ní fhéadfaí réad scaoilte ag %s a scrúdú" msgid "unable to force loose object" msgstr "ní féidir fórsa réad scaoilte" -msgid "failed to pack objects via path-walk" -msgstr "theip ar rudaí a phacáil tríd an gcosán-siúlóid" - #, c-format msgid "not a rev '%s'" msgstr "ní rev '%s'" @@ -10563,6 +10751,9 @@ msgstr "ní rev '%s'" msgid "bad revision '%s'" msgstr "droch-athbhreithniú '%s'" +msgid "failed to pack objects via path-walk" +msgstr "theip ar rudaí a phacáil tríd an gcosán-siúlóid" + msgid "unable to add recent objects" msgstr "ní féidir rudaí le déanaí a chur leis" @@ -11180,6 +11371,10 @@ msgstr "" msgid "invalid value for '%s'" msgstr "luach neamhbhailí do '%s'" +#, c-format +msgid "could not push to %s" +msgstr "níorbh fhéidir brú chuig %s" + msgid "repository" msgstr "stóras" @@ -11252,16 +11447,36 @@ msgid "" "and then push using the remote name\n" "\n" " git push <name>\n" +"\n" +"To push to multiple remotes at once, configure a remote group using\n" +"\n" +" git config remotes.<groupname> \"<remote1> <remote2>\"\n" +"\n" +"and then push using the group name\n" +"\n" +" git push <groupname>\n" msgstr "" -"Gan aon cheann scríbe brúite cumraithe.\n" +"Gan aon cheann scríbe brú cumraithe.\n" "Sonraigh an URL ón líne ordaithe nó cumraigh stór iargúlta ag baint úsáide " "as\n" "\n" -" git remote add <name> <url>\n" +" git remote add <ainm> <url>\n" "\n" -"agus ansin brúigh ag úsáid an ainm iargúlta\n" +"agus ansin brúigh ag baint úsáide as ainm an chianda\n" "\n" " git push <ainm>\n" +"\n" +"Chun brú a chur chuig il-chianrialtáin ag an am céanna, cumraigh grúpa " +"iargúlta ag baint úsáide as\n" +"\n" +" git config remotes.<ainmghrúpa> \"<cianda1> <cianda2>\"\n" +"\n" +"agus ansin brúigh ag baint úsáide as ainm an ghrúpa\n" +"\n" +" git push <ainmghrúpa>\n" + +msgid "push options must not have new line characters" +msgstr "ní chóir go mbeadh carachtair líne nua ag roghanna brú" msgid "--all can't be combined with refspecs" msgstr "--all ní féidir é a chomhcheangal le refspecs" @@ -11269,8 +11484,10 @@ msgstr "--all ní féidir é a chomhcheangal le refspecs" msgid "--mirror can't be combined with refspecs" msgstr "--mirror ní féidir é a chomhcheangal le refspecs" -msgid "push options must not have new line characters" -msgstr "ní chóir go mbeadh carachtair líne nua ag roghanna brú" +msgid "--atomic can only be used when pushing to one remote" +msgstr "" +"--atomic ní féidir ach adamhach a úsáid ach amháin nuair a bhíonn sé á fháil " +"ó chianrialtán amháin" msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>" msgstr "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>" @@ -11288,9 +11505,6 @@ msgstr "uasluach cuimhne neamhbhailí: %s" msgid "use simple diff colors" msgstr "bain úsáid as dathanna diff simplí" -msgid "notes" -msgstr "nótaí" - msgid "passed to 'git log'" msgstr "cuireadh chuig 'git log'" @@ -11590,9 +11804,6 @@ msgstr "" "(Bainte) a bhí: déan iarracht cumaisc a athchruthú in ionad neamhaird a " "dhéanamh orthu" -msgid "how to handle commits that become empty" -msgstr "conas gealltanais a éiríonn folamh a láimhseáil" - msgid "keep commits which start empty" msgstr "coinnigh gealltanais a thosaíonn folamh" @@ -12202,8 +12413,8 @@ msgid "" msgstr "" "Tá tagairtí contrártha sa\n" "tagarmharc sprice nua ag an gcianrialtán atá tú ag iarraidh a athainmniú. Is " -"dóichí gur mar gheall ar iarracht a dhéanamh cianrialtán a neadú ann féin, " -"e.g. trí 'tuismitheoir' a athainmniú go 'tuismitheoir/leanbh'\n" +"dóichí gur mar gheall ar iarracht a dhéanamh cianrialtán a neadú ann féin, e." +"g. trí 'tuismitheoir' a athainmniú go 'tuismitheoir/leanbh'\n" "nó trí chianrialtán a dhí-neadú, e.g. an bealach eile.\n" "\n" "Más amhlaidh atá, is féidir leat é seo a réiteach tríd an\n" @@ -12511,11 +12722,11 @@ msgstr "a bheith inearálta; caithfear é a chur os comhair fo-ordú" msgid "" "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" "[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n" -"[--write-midx] [--name-hash-version=<n>] [--path-walk]" +"[--write-midx[=<mode>]] [--name-hash-version=<n>] [--path-walk]" msgstr "" "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" "[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n" -"[--write-midx] [--name-hash-version=<n>] [--path-walk]" +"[--write-midx[=<mode>]] [--name-hash-version=<n>] [--path-walk]" msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" @@ -12524,6 +12735,10 @@ msgstr "" "Níl ath-phacáistí incréideacha comhoiriúnach le hinnéacsanna bitmap. Úsáid\n" "--no-write-bitmap-index nó díchumraíocht an pack.writeBitmaps a dhíchumasú." +#, c-format +msgid "unknown value for %s: %s" +msgstr "luach anaithnid do %s: %s" + msgid "pack everything in a single pack" msgstr "pacáil gach rud i bpacáiste amháin" @@ -12618,6 +12833,10 @@ msgid "cannot delete packs in a precious-objects repo" msgstr "ní féidir pacáistí a scriosadh i repo rudaí luachmhara" #, c-format +msgid "invalid value for %s: %d" +msgstr "luach neamhbhailí do %s: %d" + +#, c-format msgid "option '%s' can only be used along with '%s'" msgstr "ní féidir rogha '%s' a úsáid ach amháin in éineacht le '%s'" @@ -13512,7 +13731,7 @@ msgstr[2] "ní féidir níos mó ná %d luasghéarú a láimhseáil." #, c-format msgid "'%s' is not a valid ref." -msgstr "Ní tagairt bailí é '%s'." +msgstr "ní tagairt bailí é '%s'." #, c-format msgid "cannot find commit %s (%s)" @@ -13535,9 +13754,6 @@ msgstr "ní féidir ceanntásc a léamh" msgid "unknown index version" msgstr "leagan innéacs anaithnid" -msgid "unable to read index" -msgstr "gan an t-innéacs a léamh" - msgid "corrupt index file" msgstr "comhad innéacs truaillithe" @@ -13809,8 +14025,12 @@ msgstr "git stash drop [-q | --quiet] [<stash>]" msgid "git stash pop [--index] [-q | --quiet] [<stash>]" msgstr "git stash pop [--index] [-q | --quiet] [<stash>]" -msgid "git stash apply [--index] [-q | --quiet] [<stash>]" -msgstr "git stash apply [--index] [-q | --quiet] [<stash>]" +msgid "" +"git stash apply [--index] [-q | --quiet] [--label-ours=<label>] [--label-" +"theirs=<label>] [--label-base=<label>] [<stash>]" +msgstr "" +"git stash apply [--index] [-q | --quiet] [--label-ours=<label>] [--label-" +"theirs=<label>] [--label-base=<label>] [<stash>]" msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <branchname> [<stash>]" @@ -13864,7 +14084,7 @@ msgstr "Sonraítear an iomarca athbhreithnithe: %s" #, c-format msgid "%s is not a valid reference" -msgstr "Ní tagairt bailí é %s" +msgstr "ní tagairt bailí é %s" msgid "git stash clear with arguments is unimplemented" msgstr "git stash clear with arguments is unimplemented" @@ -13905,6 +14125,18 @@ msgstr "ní raibh in ann comhaid neamhrianaithe a chur ar ais ó stash" msgid "attempt to recreate the index" msgstr "iarracht an t-innéacs a athchruthú" +msgid "label" +msgstr "lipéad" + +msgid "label for the upstream side in conflict markers" +msgstr "lipéad don taobh suas an sruth i marcóirí coinbhleachta" + +msgid "label for the stashed side in conflict markers" +msgstr "lipéad don taobh atá stóráilte i marcóirí coinbhleachta" + +msgid "label for the base in diff3 conflict markers" +msgstr "lipéad don bhonn i marcóirí coinbhleachta diff3" + #, c-format msgid "Dropped %s (%s)" msgstr "Scaoil %s (%s)" @@ -13915,7 +14147,7 @@ msgstr "%s: Ní fhéadfaí iontráil stash a scaoileadh" #, c-format msgid "'%s' is not a stash reference" -msgstr "Ní tagairt stash é '%s'" +msgstr "ní tagairt stash é '%s'" msgid "The stash entry is kept in case you need it again." msgstr "Coinnítear an iontráil stash ar eagla go dteastaíonn sé uait arís." @@ -14139,9 +14371,9 @@ msgid "" "ensure it is set, for example by running something like: 'git config " "submodule.%s.gitdir .git/modules/%s'" msgstr "" -"theip ar chumraíocht réamhshocraithe bhailí a shocrú do 'submodule." -"%s.gitdir'. Cinntigh go bhfuil sé socraithe, mar shampla trí rud éigin " -"cosúil le: 'git config submodule.%s.gitdir .git/modules/%s' a rith" +"theip ar chumraíocht réamhshocraithe bhailí a shocrú do 'submodule.%s." +"gitdir'. Cinntigh go bhfuil sé socraithe, mar shampla trí rud éigin cosúil " +"le: 'git config submodule.%s.gitdir .git/modules/%s' a rith" #, c-format msgid "Failed to register url for submodule path '%s'" @@ -15167,6 +15399,15 @@ msgstr "" msgid "interrupt transfer after <n> seconds of inactivity" msgstr "cur isteach ar aistriú tar éis so <n>icind neamhghníomhach" +msgid "git url-parse [-c <component>] [--] <url>..." +msgstr "git url-parse [-c <component>] [--] <url>..." + +msgid "component" +msgstr "comhpháirt" + +msgid "which URL component to extract" +msgstr "cén comhpháirt URL atá le baint amach" + msgid "git verify-commit [-v | --verbose] [--raw] <commit>..." msgstr "git verify-commit [-v | --verbose] [--raw] <commit>..." @@ -15870,6 +16111,9 @@ msgstr "Rith ordú Git ar liosta stórais" msgid "Prepare patches for e-mail submission" msgstr "Ullmhaigh paistí le haghaidh aighneachta" +msgid "EXPERIMENTAL: Pretty format revisions on demand" +msgstr "TURGNAMHACH: Athbhreithnithe formáide deasa ar éileamh" + msgid "Verifies the connectivity and validity of the objects in the database" msgstr "Fíoraíonn sé nascacht agus bailíocht na rudaí sa bhunachar sonraí" @@ -15895,8 +16139,8 @@ msgstr "Taispeáin faisnéis chabhrach faoi Git" msgid "EXPERIMENTAL: Rewrite history" msgstr "TURGNAMHACH: Athscríobh an stair" -msgid "Run git hooks" -msgstr "Rith crúcaí git" +msgid "Run Git hooks" +msgstr "Rith crúcaí Git" msgid "Server side implementation of Git over HTTP" msgstr "Cur i bhfeidhm taobh freastalaí Git thar HTTP" @@ -16091,8 +16335,8 @@ msgstr "Cód socraithe script bhlaosc Git coitianta" msgid "Restricted login shell for Git-only SSH access" msgstr "Blaosc logála isteach srianta le haghaidh rochtain SSH GIT amháin" -msgid "Summarize 'git log' output" -msgstr "Achoimre ar aschur 'git log'" +msgid "Summarize `git log` output" +msgstr "Achoimrigh aschur `git log`" msgid "Show various types of objects" msgstr "Taispeáin cineálacha éagsúla rudaí" @@ -16157,6 +16401,9 @@ msgstr "Seol cartlann ar ais chuig git-archive" msgid "Send objects packed back to git-fetch-pack" msgstr "Seol rudaí pacáilte ar ais chuig git-fetch-pack" +msgid "Parse and extract git URL components" +msgstr "Comhpháirteanna URL git a pharsáil agus a bhaint amach" + msgid "Show a Git logical variable" msgstr "Taispeáin athróg loighciúil Git" @@ -16477,11 +16724,11 @@ msgstr "" #, c-format msgid "" -"attempting to write a commit-graph, but 'commitGraph.changedPathsVersion' " -"(%d) is not supported" +"attempting to write a commit-graph, but 'commitGraph." +"changedPathsVersion' (%d) is not supported" msgstr "" -"ag iarraidh commit-graph a scríobh, ach tá 'commitGraph.changedPathsVersion' " -"(%d) ní thacaítear leis" +"ag iarraidh commit-graph a scríobh, ach tá 'commitGraph." +"changedPathsVersion' (%d) ní thacaítear leis" msgid "too many commits to write graph" msgstr "an iomarca gealltanais graf a scríobh" @@ -16657,6 +16904,40 @@ msgstr "Ní féidir FSeventStream a chruthú." msgid "Failed to start the FSEventStream" msgstr "Theip ar an FSevenStream a thosú" +msgid "inotify watch limit reached; increase fs.inotify.max_user_watches" +msgstr "teorainn faire inotify sroichte; méadaigh fs.inotify.max_user_watches" + +#, c-format +msgid "inotify_add_watch('%s') failed" +msgstr "theip ar inotify_add_watch('%s')" + +msgid "inotify_rm_watch() failed" +msgstr "theip ar inotify_rm_watch()" + +#, c-format +msgid "opendir('%s') failed" +msgstr "theip ar opendir ('%s')" + +#, c-format +msgid "lstat('%s') failed" +msgstr "theip ar lstat ('%s')" + +#, c-format +msgid "closedir('%s') failed" +msgstr "theip ar closedir ('%s')" + +msgid "inotify_init1() failed" +msgstr "theip ar inotify_init1()" + +msgid "closing inotify file descriptor failed" +msgstr "theip ar dhúnadh tuairisceora comhaid inotify" + +msgid "reading inotify message stream failed" +msgstr "theip ar shruth teachtaireachta inotify a léamh" + +msgid "polling inotify message stream failed" +msgstr "theip ar shruth teachtaireachta inotify vótaíochta" + #, c-format msgid "[GLE %ld] could not convert path to UTF-8: '%.*ls'" msgstr "[GLE %ld] níorbh fhéidir an cosán a thiontú go UTF-8: '%.*ls'" @@ -16682,22 +16963,10 @@ msgid "could not read directory changes [GLE %ld]" msgstr "ní fhéadfaí athruithe eolaire a léamh [GLE %ld]" #, c-format -msgid "opendir('%s') failed" -msgstr "theip ar opendir ('%s')" - -#, c-format -msgid "lstat('%s') failed" -msgstr "theip ar lstat ('%s')" - -#, c-format msgid "strbuf_readlink('%s') failed" msgstr "theip ar strbuf_readlink ('%s')" #, c-format -msgid "closedir('%s') failed" -msgstr "theip ar closedir ('%s')" - -#, c-format msgid "[GLE %ld] unable to open for read '%ls'" msgstr "[GLE %ld] nach féidir é a oscailt le haghaidh léamh '%ls'" @@ -17157,10 +17426,6 @@ msgstr "freagra neamhbhailí ls-refs: %s" msgid "expected flush after ref listing" msgstr "súil le sruth tar éis liostú tagartha" -#, c-format -msgid "protocol '%s' is not supported" -msgstr "ní thacaítear le prótacal '%s'" - msgid "unable to set SO_KEEPALIVE on socket" msgstr "ní féidir SO_KEEPALIVE a shocrú ar an soicéad" @@ -17213,6 +17478,10 @@ msgstr "cosc ar chalafort aisteach '%s'" msgid "cannot start proxy %s" msgstr "ní féidir le seachfhreastalaí %s" +#, c-format +msgid "protocol '%s' is not supported" +msgstr "ní thacaítear le prótacal '%s'" + msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "" "níl aon chosán sonraithe; féach 'git help pull' le haghaidh comhréireachta " @@ -17528,8 +17797,8 @@ msgid "" "Not a git repository. Use --no-index to compare two paths outside a working " "tree" msgstr "" -"Ní stór git. Úsáid --no-index chun dhá chosán a chur i gcomparáid lasmuigh " -"de chrann oibre" +"Ní stórlann git é. Bain úsáid as --no-index chun dhá chonair lasmuigh de " +"chrann oibre a chur i gcomparáid" msgid "" "Limiting comparison with pathspecs is only supported if both paths are " @@ -17675,6 +17944,10 @@ msgid "failed to parse --submodule option parameter: '%s'" msgstr "theip ar pharaiméadar rogha --submodule a pháirseáil: '%s'" #, c-format +msgid "%s expects a non-negative integer" +msgstr "Tá %s ag súil le slánuimhir neamh-dhiúltach" + +#, c-format msgid "bad --word-diff argument: %s" msgstr "argóint olc --word-diff: %s" @@ -18633,8 +18906,8 @@ msgid "" "given pattern contains NULL byte (via -f <file>). This is only supported " "with -P under PCRE v2" msgstr "" -"tá byte NULL (trí -f<file>) i bpatrún tugtha. Ní thacaítear leis seo ach le " -"-P faoi PCRE v2" +"tá byte NULL (trí -f<file>) i bpatrún tugtha. Ní thacaítear leis seo ach le -" +"P faoi PCRE v2" #, c-format msgid "'%s': unable to read %s" @@ -18800,8 +19073,63 @@ msgid "" msgstr "" "Rinneadh neamhaird ar an gcroca '%s' toisc nach bhfuil sé socraithe mar " "infheidhmithe.\n" -"Is féidir leat an rabhadh seo a dhíchumasú le `git config set " -"advice.ignoredHook false `." +"Is féidir leat an rabhadh seo a dhíchumasú le `git config set advice." +"ignoredHook false `." + +#, c-format +msgid "hook.jobs must be an integer, ignoring: '%s'" +msgstr "" +"Ní mór do hook.jobs a bheith ina shlánuimhir, ag déanamh neamhaird ar: '%s'" + +#, c-format +msgid "hook.jobs must be a positive integer or -1, ignoring: '%s'" +msgstr "" +"Ní mór do hook.jobs a bheith ina slánuimhir dhearfach nó -1, ag déanamh " +"neamhaird ar: '%s'" + +#, c-format +msgid "" +"hook friendly-name '%s' collides with a known event name; please choose a " +"different friendly-name" +msgstr "" +"imbhuaileann ainm cairdiúil an chrúca '%s' le hainm imeachta aitheanta; " +"roghnaigh ainm cairdiúil difriúil le do thoil" + +#, c-format +msgid "" +"hook friendly-name '%s' is the same as its event; this may cause ambiguity " +"with hook.%s.enabled" +msgstr "" +"Is ionann ainm cairdiúil an chrúca '%s' agus a imeacht; d'fhéadfadh sé seo " +"débhríocht a chruthú le hook.%s.enabled" + +#, c-format +msgid "hook.%s.parallel must be a boolean, ignoring: '%s'" +msgstr "" +"Caithfidh hook.%s.parallel a bheith ina luach booléanach, ag déanamh " +"neamhaird ar: '%s'" + +#, c-format +msgid "hook.%s.jobs must be an integer, ignoring: '%s'" +msgstr "" +"Ní mór do hook.%s.jobs a bheith ina shlánuimhir, ag déanamh neamhaird ar: " +"'%s'" + +#, c-format +msgid "hook.%s.jobs must be a positive integer or -1, ignoring: '%s'" +msgstr "" +"Ní mór do hook.%s.jobs a bheith ina shlánuimhir dhearfach nó -1, ag déanamh " +"neamhaird ar: '%s'" + +#, c-format +msgid "" +"hook.%s.jobs is set but '%s' looks like a hook friendly-name, not an event " +"name; hook.<event>.jobs uses the event name (e.g. hook.post-receive.jobs), " +"so this setting will be ignored" +msgstr "" +"Tá hook.%s.jobs socraithe ach is cosúil gur ainm cairdiúil don hook é '%s', " +"ní ainm imeachta; úsáideann hook.<event>.jobs ainm an imeachta (e.g. hook." +"post-receive.jobs), mar sin déanfar neamhaird den socrú seo" #, c-format msgid "disabled hook '%s' has no command configured" @@ -18815,6 +19143,20 @@ msgstr "" "Caithfear 'hook.%s.command' a chumrú nó 'hook.%s.event' a bhaint; ag cur as " "don chóras." +#, c-format +msgid "" +"hook '%s' is not marked as parallel=true, running in parallel anyway due to -" +"j%u" +msgstr "" +"níl hook '%s' marcáilte mar parallel=true, ag rith go comhthreomhar ar aon " +"nós mar gheall ar -j%u" + +#, c-format +msgid "%s must be a positive integer or -1, ignoring: %d" +msgstr "" +"Ní mór %s a bheith ina shlánuimhir dhearfach nó -1, ag déanamh neamhaird ar: " +"%d" + msgid "not a git repository" msgstr "ní stór git é" @@ -18966,7 +19308,7 @@ msgstr "" "(e.g., 'git config imap.folder Dréachtaí')" msgid "'auto' filter not supported by this command" -msgstr "Ní thacaíonn an t-ordú seo le scagaire 'uathoibríoch'" +msgstr "ní thacaíonn an t-ordú seo le scagaire 'uathoibríoch'" msgid "expected 'tree:<depth>'" msgstr "<depth>'crann ag súil leis: '" @@ -19408,6 +19750,10 @@ msgstr "" "neamhaird a dhéanamh ar innéacs il-phacáiste atá ann cheana; mímheaitseáil" #, c-format +msgid "could not find base MIDX '%s'" +msgstr "níorbh fhéidir an MIDX bonn '%s' a aimsiú" + +#, c-format msgid "could not load reverse index for MIDX %s" msgstr "ní fhéadfaí innéacs droim a luchtú do MIDX %s" @@ -19573,6 +19919,10 @@ msgstr "" msgid "multi-pack-index large offset out of bounds" msgstr "innéacs il-phacáiste fhritháireamh mór as teorainneacha" +#, c-format +msgid "failed to clear multi-pack-index chain at %s" +msgstr "theip ar an slabhra multi-pack-index a ghlanadh ag %s" + msgid "multi-pack-index file exists, but failed to parse" msgstr "tá comhad in-innéacs il-phacáiste ann, ach theip air a pháirseáil" @@ -19689,29 +20039,6 @@ msgid "garbage at end of loose object '%s'" msgstr "truflais ag deireadh réad scaoilte '%s'" #, c-format -msgid "unable to open loose object %s" -msgstr "ní féidir réad scaoilte %s a oscailt" - -#, c-format -msgid "unable to parse %s header" -msgstr "ní féidir ceanntásc %s a pharsáil" - -msgid "invalid object type" -msgstr "cineál réad neamhbhailí" - -#, c-format -msgid "unable to unpack %s header" -msgstr "ní féidir ceannteideal %s a dhíphacáil" - -#, c-format -msgid "header for %s too long, exceeds %d bytes" -msgstr "ceannteideal do %s rófhada, níos mó ná %d bearta" - -#, c-format -msgid "loose object %s (stored in %s) is corrupt" -msgstr "tá réad scaoilte %s (stóráilte i %s) truaillithe" - -#, c-format msgid "unable to open %s" msgstr "ní féidir %s a oscailt" @@ -19756,8 +20083,8 @@ msgid "confused by unstable object source data for %s" msgstr "mearbhall de bharr sonraí foinse réada éagobhsaí do %s" #, c-format -msgid "write stream object %ld != %<PRIuMAX>" -msgstr "scríobh réad srutha %ld! =%<PRIuMAX>" +msgid "write stream object %<PRIuMAX> != %<PRIuMAX>" +msgstr "scríobh réad srutha %<PRIuMAX> != %<PRIuMAX>" #, c-format msgid "unable to stream deflate new object (%d)" @@ -20058,6 +20385,10 @@ msgid "missing mapping of %s to %s" msgstr "mapáil atá in easnamh de %s go %s" #, c-format +msgid "%s is not a valid object" +msgstr "Ní réad bailí é %s" + +#, c-format msgid "%s is not a valid '%s' object" msgstr "Ní réad bailí '%s' é %s '" @@ -20071,6 +20402,29 @@ msgid "unable to move new alternates file into place" msgstr "ní féidir comhad malartach nua a bhogadh ina áit" #, c-format +msgid "unable to open loose object %s" +msgstr "ní féidir réad scaoilte %s a oscailt" + +#, c-format +msgid "unable to parse %s header" +msgstr "ní féidir ceanntásc %s a pharsáil" + +msgid "invalid object type" +msgstr "cineál réad neamhbhailí" + +#, c-format +msgid "unable to unpack %s header" +msgstr "ní féidir ceannteideal %s a dhíphacáil" + +#, c-format +msgid "header for %s too long, exceeds %d bytes" +msgstr "ceannteideal do %s rófhada, níos mó ná %d bearta" + +#, c-format +msgid "loose object %s (stored in %s) is corrupt" +msgstr "tá réad scaoilte %s (stóráilte i %s) truaillithe" + +#, c-format msgid "duplicate entry when writing bitmap index: %s" msgstr "iontráil dúblach agus innéacs bitmap á scríobh: %s" @@ -20535,6 +20889,26 @@ msgstr "theip ar réad %s a aimsiú" msgid "failed to find tag %s" msgstr "theip ar chlib %s a aimsiú" +#, c-format +msgid "tree:%lu filter not supported by the path-walk API" +msgstr "ní thacaíonn API an chosáin leis an scagaire tree:%lu" + +msgid "sparse filter cannot be combined with existing sparse patterns" +msgstr "" +"ní féidir an scagaire tanaí a chomhcheangal le patrúin tanaí atá ann cheana " +"féin" + +#, c-format +msgid "unable to parse sparse filter data in '%s'" +msgstr "ní féidir sonraí scagaire tanaí a pharsáil i '%s'" + +msgid "sparse filter is not cone-mode compatible" +msgstr "níl an scagaire tanaí comhoiriúnach le mód cóin" + +#, c-format +msgid "object filter '%s' not supported by the path-walk API" +msgstr "ní thacaíonn API an chosáin leis an scagaire réada '%s'" + msgid "failed to setup revision walk" msgstr "theip orthu siúlóid athbhreithnithe" @@ -20664,7 +21038,7 @@ msgstr "ní féidir formáid --pretty a pharsáil" #, c-format msgid "%s is not supported by this command" -msgstr "Ní thacaíonn an t-ordú seo le %s" +msgstr "ní thacaíonn an t-ordú seo le %s" msgid "lazy fetching disabled; some objects may not be available" msgstr "" @@ -20692,20 +21066,24 @@ msgid "unsupported field '%s' in '%s' config" msgstr "réimse neamhthacaithe '%s' i gcumraíocht '%s'" #, c-format -msgid "no or empty URL advertised for remote '%s'" -msgstr "níl aon URL nó folamh fógraithe le haghaidh iargúlta '%s'" - -#, c-format -msgid "known remote named '%s' but with URL '%s' instead of '%s'" -msgstr "iargúlta ar a dtugtar '%s' ach le URL '%s' in ionad '%s'" +msgid "" +"known remote named '%s' but with URL '%s' instead of '%s', ignoring this " +"remote" +msgstr "" +"cianrialtán aitheanta darb ainm '%s' ach le URL '%s' in ionad '%s', ag " +"déanamh neamhaird den chianrialtán seo" #, c-format msgid "invalid element '%s' from remote info" msgstr "eilimint neamhbhailí '%s' ó eolas iargúlta" #, c-format -msgid "server advertised a promisor remote without a name or URL: %s" -msgstr "d’fhógair an freastalaí cianda promisor gan ainm ná URL: %s" +msgid "" +"server advertised a promisor remote without a name or URL: '%s', ignoring " +"this remote" +msgstr "" +"d’fhógair an freastalaí cianrialtán promisor gan ainm ná URL: '%s', ag " +"déanamh neamhaird den chianrialtán seo" #, c-format msgid "" @@ -20750,8 +21128,9 @@ msgid "%s must be non-negative, using default" msgstr "Ní mór %s a bheith neamh-dhiúltach, ag baint úsáide as" #, c-format -msgid "%s must be between 0 and 1, using default" -msgstr "Caithfidh %s a bheith idir 0 agus 1, ag baint úsáide as réamhshocrú" +msgid "%s must be between 0 (exclusive) and 1, using default" +msgstr "" +"Ní mór %s a bheith idir 0 (eisiach) agus 1, ag úsáid an réamhshocraithe" #, c-format msgid "%s must be positive, using default" @@ -21492,6 +21871,14 @@ msgid "refusing to force and skip creation of reflog" msgstr "diúltú cruthú reflog a chur i bhfeidhm agus a scipeáil" #, c-format +msgid "trying to write ref '%s' with nonexistent object %s" +msgstr "ag iarraidh tagairt '%s' a scríobh le réad nach bhfuil %s ann" + +#, c-format +msgid "trying to write non-commit object %s to branch '%s'" +msgstr "ag iarraidh réad neamh-thiomanta %s a scríobh chuig brainse '%s'" + +#, c-format msgid "update_ref failed for ref '%s': %s" msgstr "theip ar update_ref le haghaidh tagairt '%s': %s" @@ -21582,14 +21969,6 @@ msgid "refname is dangerous: %s" msgstr "tá refname contúirteach: %s" #, c-format -msgid "trying to write ref '%s' with nonexistent object %s" -msgstr "ag iarraidh tagairt '%s' a scríobh le réad nach bhfuil %s ann" - -#, c-format -msgid "trying to write non-commit object %s to branch '%s'" -msgstr "ag iarraidh réad neamh-thiomanta %s a scríobh chuig brainse '%s'" - -#, c-format msgid "" "multiple updates for 'HEAD' (including one via its referent '%s') are not " "allowed" @@ -22105,6 +22484,36 @@ msgstr "ní raibh in ann tempfile snapshot refs a dhúnadh" msgid "could not remove stale bitmap: %s" msgstr "ní fhéadfaí bitmap seasta a bhaint: %s" +msgid "no packs to write MIDX during compaction" +msgstr "gan aon phacáistí le MIDX a scríobh le linn dlúthaithe" + +#, c-format +msgid "expected exactly one line during MIDX write, got: %<PRIuMAX>" +msgstr "" +"ag súil le líne amháin go díreach le linn scríobh MIDX, fuarthas: %<PRIuMAX>" + +#, c-format +msgid "unexpected MIDX output: '%s'" +msgstr "aschur MIDX gan choinne: '%s'" + +#, c-format +msgid "could not load pack %<PRIu32> from MIDX" +msgstr "níorbh fhéidir pacáiste %<PRIu32> a luchtú ó MIDX" + +msgid "too many objects in MIDX compaction step" +msgstr "an iomarca réad i gcéim chomhdhlúthaithe MIDX" + +#, c-format +msgid "could not find preferred pack for MIDX %s" +msgstr "níorbh fhéidir an pacáiste is fearr leat a aimsiú do MIDX %s" + +msgid "unable to generate compaction plan" +msgstr "ní féidir plean dlúthaithe a ghiniúint" + +#, c-format +msgid "unable to execute compaction step %<PRIuMAX>" +msgstr "ní féidir céim chomhdhlúthaithe %<PRIuMAX> a fhorghníomhú" + msgid "could not start pack-objects to repack promisor objects" msgstr "ní fhéadfaí rudaí pacáiste a thosú chun rudaí gealltanna a athphacáil" @@ -22174,6 +22583,10 @@ msgstr "teastaíonn roinnt gealltanais chun athsheinm" msgid "all positive revisions given must be references" msgstr "caithfidh gach athbhreithniú dearfach a thugtar a bheith ina" +#, c-format +msgid "commit %s became empty after replay" +msgstr "d’éirigh an tiomantas %s folamh tar éis athsheinm" + msgid "'--ref' cannot be used with multiple revision ranges" msgstr "Ní féidir '--ref' a úsáid le raonta athbhreithnithe iolracha" @@ -22298,8 +22711,8 @@ msgstr "níl aon gealltanais fós ag do bhrainse reatha '%s'" msgid "object filtering requires --objects" msgstr "teastaíonn scagadh réad --objects" -msgid "-L does not yet support diff formats besides -p and -s" -msgstr "Ní thacaíonn -L le formáidí diff fós seachas -p agus -s" +msgid "-L does not yet support the requested diff format" +msgstr "ní thacaíonn -L leis an bhformáid diff iarrtha go fóill" #, c-format msgid "cannot create async thread: %s" @@ -23246,21 +23659,33 @@ msgstr "ní féidir %s a stóráil" #, c-format msgid "" -"%s\n" +"Your local changes are stashed, however applying them\n" +"resulted in conflicts. You can either resolve the conflicts\n" +"and then discard the stash with \"git stash drop\", or, if you\n" +"do not want to resolve them now, run \"git reset --hard\" and\n" +"apply the local changes later by running \"git stash pop\".\n" +msgstr "" +"Tá do chuid athruithe áitiúla stóráilte, ach nuair a cuireadh i bhfeidhm " +"iad,\n" +"bhí coinbhleachtaí ann. Is féidir leat na coinbhleachtaí a réiteach agus an " +"stash\n" +"a chaitheamh amach le \"git stash drop\", nó, mura mian leat iad a réiteach " +"anois,\n" +"rith \"git reset --hard\" agus cuir na hathruithe áitiúla i bhfeidhm níos " +"déanaí trí\n" +"\"git stash pop\" a rith.\n" + +#, c-format +msgid "" +"Autostash exists; creating a new stash entry.\n" "Your changes are safe in the stash.\n" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" -"%s\n" -"Tá do chuid athruithe sábháilte sa stóras.\n" +"Tá Autostash ann; tá iontráil stash nua á cruthú.\n" +"Tá do chuid athruithe sábháilte sa stash.\n" "Is féidir leat \"git stash pop\" nó \"git stash drop\" a rith ag am ar " "bith.\n" -msgid "Applying autostash resulted in conflicts." -msgstr "Bhí coinbhleachtaí mar thoradh ar autostash i bhfeidhm." - -msgid "Autostash exists; creating a new stash entry." -msgstr "Tá Autostash ann; ag cruthú iontráil nua stash." - msgid "autostash reference is a symref" msgstr "is é tagairt autostash ina symref" @@ -23560,9 +23985,6 @@ msgstr "" msgid "fork failed" msgstr "theip ar fhorc" -msgid "setsid failed" -msgstr "theip ar setsid" - #, c-format msgid "cannot stat template '%s'" msgstr "ní féidir teacht ar theimpléad '%s'" @@ -23640,6 +24062,10 @@ msgid "Initialized empty Git repository in %s%s\n" msgstr "Stórlann Git folamh tosaithe i %s%s\n" #, c-format +msgid "unrecognized value for '%s': '%s'" +msgstr "luach anaithnid do '%s': '%s'" + +#, c-format msgid "index entry is a directory, but not sparse (%08x)" msgstr "is eolaire é iontráil innéacs, ach ní neamhchoitianta (%08x)" @@ -23912,8 +24338,8 @@ msgstr "d’fhill an crann ls cód fillte gan choinne %d" msgid "" "the 'submodule.%s.gitdir' config does not exist for module '%s'. Please " "ensure it is set, for example by running something like: 'git config " -"submodule.%s.gitdir .git/modules/%s'. For details see the " -"extensions.submodulePathConfig documentation." +"submodule.%s.gitdir .git/modules/%s'. For details see the extensions." +"submodulePathConfig documentation." msgstr "" "níl an chumraíocht 'submodule.%s.gitdir' ann don mhodúl '%s'. Cinntigh go " "bhfuil sé socraithe, mar shampla trí rud éigin cosúil le: 'git config " @@ -23978,6 +24404,9 @@ msgstr "siúlóid imeall ionsaitheach a scoránaigh" msgid "read a pattern list over stdin" msgstr "léigh liosta patrún thar stdin" +msgid "toggle pruning of trees by sparse patterns" +msgstr "bearradh crainn a scoránaigh le patrúin scaipthe" + #, c-format msgid "commit %s is not marked reachable" msgstr "nach bhfuil comhordú %s marcáilte inrochtana" @@ -24051,6 +24480,13 @@ msgstr "comhartha" msgid "command token to send to the server" msgstr "comhartha ordaithe le seoladh chuig an bhfreastalaí" +msgid "write a pack with a single reachable large blob" +msgstr "scríobh pacáiste le blob mór inrochtana amháin" + +#, c-format +msgid "'%s' is not a valid blob size" +msgstr "Ní méid blob bailí é '%s'" + msgid "unit-test [<options>]" msgstr "unit-test [<options>]" @@ -24159,6 +24595,10 @@ msgstr "ní féidir nasc a dhéanamh le fo-sheirbhís %s" msgid "--negotiate-only requires protocol v2" msgstr "--negotiate-only ag teastáil prótacal v2" +#, c-format +msgid "ignoring %s because the protocol does not support it." +msgstr "ag déanamh neamhaird de %s mar nach dtacaíonn an prótacal leis." + msgid "'option' without a matching 'ok/error' directive" msgstr "'roghan' gan treoir 'ok/earráid' a mheaitseáil" @@ -25691,3 +26131,9 @@ msgstr "Ag scipeáil %s leis an iarmhír chúltaca '%s'.\n" #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "An bhfuil tú ag iarraidh %s a sheoladh i ndáiríre? [y|N]: " + +#, c-format + + + +#, c-format @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2026-01-22 23:57+0000\n" -"PO-Revision-Date: 2025-01-27 09:10+0700\n" +"POT-Creation-Date: 2026-06-27 04:45+0700\n" +"PO-Revision-Date: 2025-06-27 10:38+0700\n" "Last-Translator: Bagas Sanjaya <bagasdotme@gmail.com>\n" "Language-Team: Indonesian\n" "Language: id\n" @@ -19,11 +19,6 @@ msgstr "" #: add-interactive.c #, c-format -msgid "%s cannot be negative" -msgstr "%s tidak boleh negatif" - -#: add-interactive.c -#, c-format msgid "Huh (%s)?" msgstr "Huh (%s)?" @@ -224,23 +219,23 @@ msgstr "Sampai jumpa.\n" #: add-patch.c #, c-format -msgid "Stage mode change [y,n,q,a,d%s,?]? " -msgstr "Gelar perubahan mode [y,n,q,a,d%s,?]? " +msgid "Stage mode change%s [y,n,q,a,d%s,?]? " +msgstr "Gelar perubahan mode%s [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format -msgid "Stage deletion [y,n,q,a,d%s,?]? " -msgstr "Gelar penghapusan [y,n,q,a,d%s,?]? " +msgid "Stage deletion%s [y,n,q,a,d%s,?]? " +msgstr "Gelar penghapusan%s [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format -msgid "Stage addition [y,n,q,a,d%s,?]? " -msgstr "Gelar penambahan [y,n,q,a,d%s,?]? " +msgid "Stage addition%s [y,n,q,a,d%s,?]? " +msgstr "Gelar penambahan%s [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format -msgid "Stage this hunk [y,n,q,a,d%s,?]? " -msgstr "Gelar bingkah ini [y,n,q,a,d%s,?]? " +msgid "Stage this hunk%s [y,n,q,a,d%s,?]? " +msgstr "Gelar bingkah ini%s [y,n,q,a,d%s,?]? " #: add-patch.c msgid "" @@ -266,23 +261,23 @@ msgstr "" #: add-patch.c #, c-format -msgid "Stash mode change [y,n,q,a,d%s,?]? " -msgstr "Stase perubahan mode [y,n,q,a,d%s,?]? " +msgid "Stash mode change%s [y,n,q,a,d%s,?]? " +msgstr "Stase perubahan mode%s [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format -msgid "Stash deletion [y,n,q,a,d%s,?]? " -msgstr "Stase penghapusan [y,n,q,a,d%s,?]? " +msgid "Stash deletion%s [y,n,q,a,d%s,?]? " +msgstr "Stase penghapusan%s [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format -msgid "Stash addition [y,n,q,a,d%s,?]? " -msgstr "Stase penambahan [y,n,q,a,d%s,?]? " +msgid "Stash addition%s [y,n,q,a,d%s,?]? " +msgstr "Stase penambahan%s [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format -msgid "Stash this hunk [y,n,q,a,d%s,?]? " -msgstr "Stase bingkah ini [y,n,q,a,d%s,?]? " +msgid "Stash this hunk%s [y,n,q,a,d%s,?]? " +msgstr "Stase bingkah ini%s [y,n,q,a,d%s,?]? " #: add-patch.c msgid "" @@ -308,23 +303,23 @@ msgstr "" #: add-patch.c #, c-format -msgid "Unstage mode change [y,n,q,a,d%s,?]? " -msgstr "Batal gelar perubahan mode [y,n,q,a,d%s,?]? " +msgid "Unstage mode change%s [y,n,q,a,d%s,?]? " +msgstr "Batal gelar perubahan mode%s [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format -msgid "Unstage deletion [y,n,q,a,d%s,?]? " -msgstr "Batal gelar penghapusan [y,n,q,a,d%s,?]? " +msgid "Unstage deletion%s [y,n,q,a,d%s,?]? " +msgstr "Batal gelar penghapusan%s [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format -msgid "Unstage addition [y,n,q,a,d%s,?]? " -msgstr "Batal gelar penambahan [y,n,q,a,d%s,?]? " +msgid "Unstage addition%s [y,n,q,a,d%s,?]? " +msgstr "Batal gelar penambahan%s [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format -msgid "Unstage this hunk [y,n,q,a,d%s,?]? " -msgstr "Batal gelar bingkah ini [y,n,q,a,d%s,?]? " +msgid "Unstage this hunk%s [y,n,q,a,d%s,?]? " +msgstr "Batal gelar bingkah ini%s [y,n,q,a,d%s,?]? " #: add-patch.c msgid "" @@ -350,23 +345,23 @@ msgstr "" #: add-patch.c #, c-format -msgid "Apply mode change to index [y,n,q,a,d%s,?]? " -msgstr "Terapkan perubahan mode ke indeks [y,n,q,a,d%s,?]? " +msgid "Apply mode change to index%s [y,n,q,a,d%s,?]? " +msgstr "Terapkan perubahan mode ke indeks%s [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format -msgid "Apply deletion to index [y,n,q,a,d%s,?]? " -msgstr "Terapkan penghapusan ke indeks [y,n,q,a,d%s,?]? " +msgid "Apply deletion to index%s [y,n,q,a,d%s,?]? " +msgstr "Terapkan penghapusan ke indeks%s [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format -msgid "Apply addition to index [y,n,q,a,d%s,?]? " -msgstr "Terapkan penambahan ke indeks [y,n,q,a,d%s,?]? " +msgid "Apply addition to index%s [y,n,q,a,d%s,?]? " +msgstr "Terapkan penambahan ke indeks%s [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format -msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " -msgstr "Terapkan bingkah ini ke indeks [y,n,q,a,d%s,?]? " +msgid "Apply this hunk to index%s [y,n,q,a,d%s,?]? " +msgstr "Terapkan bingkah ini ke indeks%s [y,n,q,a,d%s,?]? " #: add-patch.c msgid "" @@ -392,23 +387,23 @@ msgstr "" #: add-patch.c #, c-format -msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " -msgstr "Buang perubahan mode dari pohon kerja [y,n,q,a,d%s,?]? " +msgid "Discard mode change from worktree%s [y,n,q,a,d%s,?]? " +msgstr "Buang perubahan mode dari pohon kerja%s [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format -msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " -msgstr "Buang penghapusan dari pohon kerja [y,n,q,a,d%s,?]? " +msgid "Discard deletion from worktree%s [y,n,q,a,d%s,?]? " +msgstr "Buang penghapusan dari pohon kerja%s [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format -msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " -msgstr "Buang penambahan dari pohon kerja [y,n,q,a,d%s,?]? " +msgid "Discard addition from worktree%s [y,n,q,a,d%s,?]? " +msgstr "Buang penambahan dari pohon kerja%s [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format -msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " -msgstr "Buang bingkah ini dari pohon kerja [y,n,q,a,d%s,?]? " +msgid "Discard this hunk from worktree%s [y,n,q,a,d%s,?]? " +msgstr "Buang bingkah ini dari pohon kerja%s [y,n,q,a,d%s,?]? " #: add-patch.c msgid "" @@ -434,23 +429,23 @@ msgstr "" #: add-patch.c #, c-format -msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " -msgstr "Buang perubahan mode dari indeks dan pohon kerja [y,n,q,a,d%s,?]? " +msgid "Discard mode change from index and worktree%s [y,n,q,a,d%s,?]? " +msgstr "Buang perubahan mode dari indeks dan pohon kerja%s [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format -msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " -msgstr "Buang penghapusan dari indeks dan pohon kerja [y,n,q,a,d%s,?]? " +msgid "Discard deletion from index and worktree%s [y,n,q,a,d%s,?]? " +msgstr "Buang penghapusan dari indeks dan pohon kerja%s [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format -msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " -msgstr "Buang penambahan dari indeks dan pohon kerja [y,n,q,a,d%s,?]? " +msgid "Discard addition from index and worktree%s [y,n,q,a,d%s,?]? " +msgstr "Buang penambahan dari indeks dan pohon kerja%s [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format -msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " -msgstr "Buang bingkah ini dari indeks dan pohon kerja [y,n,q,a,d%s,?]? " +msgid "Discard this hunk from index and worktree%s [y,n,q,a,d%s,?]? " +msgstr "Buang bingkah ini dari indeks dan pohon kerja%s [y,n,q,a,d%s,?]? " #: add-patch.c msgid "" @@ -468,23 +463,24 @@ msgstr "" #: add-patch.c #, c-format -msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " -msgstr "Terapkan perubahan mode pada indeks dan pohon kerja [y,n,q,a,d%s,?]? " +msgid "Apply mode change to index and worktree%s [y,n,q,a,d%s,?]? " +msgstr "" +"Terapkan perubahan mode pada indeks dan pohon kerja%s [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format -msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " -msgstr "Terapkan penghapusan pada indeks dan pohon kerja [y,n,q,a,d%s,?]? " +msgid "Apply deletion to index and worktree%s [y,n,q,a,d%s,?]? " +msgstr "Terapkan penghapusan pada indeks dan pohon kerja%s [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format -msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " -msgstr "Terapkan penambahan pada indeks dan pohon kerja [y,n,q,a,d%s,?]? " +msgid "Apply addition to index and worktree%s [y,n,q,a,d%s,?]? " +msgstr "Terapkan penambahan pada indeks dan pohon kerja%s [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format -msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " -msgstr "Terapkan bingkah ini pada indeks dan pohon kerja [y,n,q,a,d%s,?]? " +msgid "Apply this hunk to index and worktree%s [y,n,q,a,d%s,?]? " +msgstr "Terapkan bingkah ini pada indeks dan pohon kerja%s [y,n,q,a,d%s,?]? " #: add-patch.c msgid "" @@ -502,23 +498,23 @@ msgstr "" #: add-patch.c #, c-format -msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " -msgstr "Terapkan perubahan mode pada pohon kerja [y,n,q,a,d%s,?]?" +msgid "Apply mode change to worktree%s [y,n,q,a,d%s,?]? " +msgstr "Terapkan perubahan mode pada pohon kerja%s [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format -msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " -msgstr "Terapkan penghapusan pada pohon kerja [y,n,q,a,d%s,?]?" +msgid "Apply deletion to worktree%s [y,n,q,a,d%s,?]? " +msgstr "Terapkan penghapusan pada pohon kerja%s [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format -msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " -msgstr "Terapkan penambahan pada pohon kerja [y,n,q,a,d%s,?]?" +msgid "Apply addition to worktree%s [y,n,q,a,d%s,?]? " +msgstr "Terapkan penambahan pada pohon kerja%s [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format -msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " -msgstr "Terapkan bingkah ini pada pohon kerja [y,n,q,a,d%s,?]?" +msgid "Apply this hunk to worktree%s [y,n,q,a,d%s,?]? " +msgstr "Terapkan bingkah ini pada pohon kerja%s [y,n,q,a,d%s,?]? " #: add-patch.c msgid "" @@ -536,6 +532,11 @@ msgstr "" #: add-patch.c #, c-format +msgid "%s cannot be negative" +msgstr "%s tidak boleh negatif" + +#: add-patch.c +#, c-format msgid "could not parse hunk header '%.*s'" msgstr "tidak dapat menguraikan kepala bingkah '%.*s'" @@ -647,6 +648,7 @@ msgid "Nothing was applied.\n" msgstr "Tidak ada yang diterapkan.\n" #: add-patch.c +#, c-format msgid "" "j - go to the next undecided hunk, roll over at the bottom\n" "J - go to the next hunk, roll over at the bottom\n" @@ -658,7 +660,10 @@ msgid "" "e - manually edit the current hunk\n" "p - print the current hunk\n" "P - print the current hunk using the pager\n" +"> - go to the next file, roll over at the bottom\n" +"< - go to the previous file, roll over at the top\n" "? - print help\n" +"HUNKS SUMMARY - Hunks: %d, USE: %d, SKIP: %d\n" msgstr "" "j - pergi ke bingkah yang belum diputuskan selanjutnya, gulung ke bawah\n" "J - pergi ke bingkah berikutnya, gulung ke bawah\n" @@ -670,7 +675,22 @@ msgstr "" "e - sunting bingkah saat ini secara manual\n" "p - lihat bingkah saat ini\n" "P - lihat bingkah saat ini menggunakan pager\n" +"> - pergi ke berkas berikutnya, gulung ke bawah\n" +"< - pergi ke berkas sebelumnya, gulung ke atas\n" "? - lihat bantuan\n" +"RANGKUMAN BINGKAH - Bingkah: %d, GUNAKAN: %d, LEWATI: %d\n" + +#: add-patch.c +msgid "'git apply' failed" +msgstr "'git apply' gagal" + +#: add-patch.c +msgid " (was: y)" +msgstr " (sebelumnya: y)" + +#: add-patch.c +msgid " (was: n)" +msgstr " (sebelumnya: n)" #: add-patch.c #, c-format @@ -678,6 +698,14 @@ msgid "Only one letter is expected, got '%s'" msgstr "Hanya satu huruf yang diharapkan, dapat '%s'" #: add-patch.c +msgid "No next file" +msgstr "Tidak ada berkas berikutnya" + +#: add-patch.c +msgid "No previous file" +msgstr "Tidak ada berkas sebelumnya" + +#: add-patch.c msgid "No other hunk" msgstr "Tidak ada bingkah lainnya" @@ -745,10 +773,6 @@ msgid "Unknown command '%s' (use '?' for help)" msgstr "Perintah tidak dikenal '%s' (gunakan '?' untuk bantuan)" #: add-patch.c -msgid "'git apply' failed" -msgstr "'git apply' gagal" - -#: add-patch.c msgid "No changes." msgstr "Tidak ada perubahan." @@ -756,6 +780,30 @@ msgstr "Tidak ada perubahan." msgid "Only binary files changed." msgstr "Hanya berkas biner yang berubah." +#: add-patch.c +#, c-format +msgid "Stage mode change [y,n,q,a,d%s,?]? " +msgstr "Gelar perubahan mode [y,n,q,a,d%s,?]? " + +#: add-patch.c +#, c-format +msgid "Stage deletion [y,n,q,a,d%s,?]? " +msgstr "Gelar penghapusan [y,n,q,a,d%s,?]? " + +#: add-patch.c +#, c-format +msgid "Stage addition [y,n,q,a,d%s,?]? " +msgstr "Gelar penambahan [y,n,q,a,d%s,?]? " + +#: add-patch.c +#, c-format +msgid "Stage this hunk [y,n,q,a,d%s,?]? " +msgstr "Gelar bingkah ini [y,n,q,a,d%s,?]? " + +#: add-patch.c +msgid "Revision does not refer to a commit" +msgstr "Revisi tidak merujuk pada sebuah komit" + #: advice.c #, c-format msgid "" @@ -935,9 +983,9 @@ msgstr "baris perintah diakhiri dengan \\" msgid "unclosed quote" msgstr "tanda kutip tak ditutup" -#: alias.c builtin/cat-file.c builtin/notes.c builtin/prune-packed.c -#: builtin/receive-pack.c builtin/refs.c builtin/repo.c builtin/tag.c -#: t/helper/test-pkt-line.c +#: alias.c builtin/cat-file.c builtin/name-rev.c builtin/notes.c +#: builtin/prune-packed.c builtin/receive-pack.c builtin/refs.c builtin/repo.c +#: builtin/tag.c t/helper/test-pkt-line.c msgid "too many arguments" msgstr "terlalu banyak argumen" @@ -989,8 +1037,13 @@ msgstr "regexec kembalikan %d untuk input: %s" #: apply.c #, c-format -msgid "unable to find filename in patch at line %d" -msgstr "tidak dapat menemukan nama berkas dalam tambalan pada baris %d" +msgid "unable to find filename in patch at %s:%d" +msgstr "tidak dapat menemukan nama berkas di dalam tambalan pada %s:%d" + +#: apply.c +#, c-format +msgid "git apply: bad git-diff - expected /dev/null, got %s at %s:%d" +msgstr "git apply: git-diff jelek - berharap /dev/null, dapat %s pada %s:%d" #: apply.c #, c-format @@ -999,6 +1052,18 @@ msgstr "git apply: git-diff jelek - berharap /dev/null, dapat %s pada baris %d" #: apply.c #, c-format +msgid "git apply: bad git-diff - inconsistent new filename at %s:%d" +msgstr "" +"git apply: git-diff jelek - nama berkas baru tidak konsisten pada %s:%d" + +#: apply.c +#, c-format +msgid "git apply: bad git-diff - inconsistent old filename at %s:%d" +msgstr "" +"git apply: git-diff jelek - nama berkas lama tidak konsisten pada %s:%d" + +#: apply.c +#, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" "git apply: git-diff jelek - nama berkas baru tidak konsisten pada baris %d" @@ -1011,11 +1076,21 @@ msgstr "" #: apply.c #, c-format +msgid "git apply: bad git-diff - expected /dev/null at %s:%d" +msgstr "git apply: git-diff jelek - berharap /dev/null pada %s:%d" + +#: apply.c +#, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: git-diff jelek - berharap /dev/null pada baris %d" #: apply.c #, c-format +msgid "invalid mode at %s:%d: %s" +msgstr "mode tidak valid pada %s:%d: %s" + +#: apply.c +#, c-format msgid "invalid mode on line %d: %s" msgstr "mode tidak valid pada baris %d: %s" @@ -1028,6 +1103,21 @@ msgstr "kepala baris %d dan %d tidak konsisten" #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " +"component at %s:%d" +msgid_plural "" +"git diff header lacks filename information when removing %d leading pathname " +"components at %s:%d" +msgstr[0] "" +"kepala git diff kekurangan informasi nama berkas ketika menghapus %d " +"komponen nama jalur depan pada %s:%d" +msgstr[1] "" +"kepala git diff kekurangan informasi nama berkas ketika menghapus %d " +"komponen nama jalur depan pada %s:%d" + +#: apply.c +#, c-format +msgid "" +"git diff header lacks filename information when removing %d leading pathname " "component (line %d)" msgid_plural "" "git diff header lacks filename information when removing %d leading pathname " @@ -1041,6 +1131,11 @@ msgstr[1] "" #: apply.c #, c-format +msgid "git diff header lacks filename information at %s:%d" +msgstr "kepala git diff kekurangan informasi nama berkas pada %s:%d" + +#: apply.c +#, c-format msgid "git diff header lacks filename information (line %d)" msgstr "kepala git diff kekurangan informasi nama berkas (baris %d)" @@ -1051,8 +1146,8 @@ msgstr "recount: baris tidak diharapkan: %.*s" #: apply.c #, c-format -msgid "patch fragment without header at line %d: %.*s" -msgstr "pecahan tambalan tanpa kepala pada baris %d: %.*s" +msgid "patch fragment without header at %s:%d: %.*s" +msgstr "pecahan tambalan tanpa kepala pada %s:%d: %.*s" #: apply.c msgid "new file depends on old contents" @@ -1064,8 +1159,8 @@ msgstr "berkas terhapus masih ada konten" #: apply.c #, c-format -msgid "corrupt patch at line %d" -msgstr "tambalan rusak pada baris %d" +msgid "corrupt patch at %s:%d" +msgstr "tambalan rusak pada %s:%d" #: apply.c #, c-format @@ -1084,18 +1179,18 @@ msgstr "** peringatan: berkas %s menjadi kosong tetapi tidak dihapus" #: apply.c #, c-format -msgid "corrupt binary patch at line %d: %.*s" -msgstr "tambalan biner rusak pada baris %d: %.*s" +msgid "corrupt binary patch at %s:%d: %.*s" +msgstr "tambalan biner rusak pada %s:%d: %.*s" #: apply.c #, c-format -msgid "unrecognized binary patch at line %d" -msgstr "tambalan biner tidak dikenal pada baris %d" +msgid "unrecognized binary patch at %s:%d" +msgstr "tambalan biner tidak dikenal pada %s:%d" #: apply.c #, c-format -msgid "patch with only garbage at line %d" -msgstr "tambal dengan hanya sampah pada baris %d" +msgid "patch with only garbage at %s:%d" +msgstr "tambal dengan hanya sampah pada %s:%d" #: apply.c #, c-format @@ -1416,7 +1511,17 @@ msgstr "" #: apply.c t/helper/test-cache-tree.c msgid "unable to read index file" -msgstr "tidak dapa membaca berkas indeks" +msgstr "tidak dapat membaca berkas indeks" + +#: apply.c +#, c-format +msgid "option -p expects a non-negative integer, got '%s'" +msgstr "opsi -p mengharapkan bilangan bulat non-negatif, dapat: '%s'" + +#: apply.c +#, c-format +msgid "unable to normalize directory: '%s'" +msgstr "gagal menormalisasi direktori: '%s'" #: apply.c #, c-format @@ -1909,32 +2014,32 @@ msgstr "" #: bisect.c #, c-format msgid "" -"The merge base %s is %s.\n" +"The merge base %s is '%s'.\n" "This means the first '%s' commit is between %s and [%s].\n" msgstr "" -"Dasar penggabungan %s adalah %s.\n" +"Dasar penggabungan %s adalah '%s'.\n" "Ini berarti komit '%s' pertama adalah di antara %s dan [%s].\n" #: bisect.c #, c-format msgid "" -"Some %s revs are not ancestors of the %s rev.\n" +"Some '%s' revs are not ancestors of the '%s' rev.\n" "git bisect cannot work properly in this case.\n" -"Maybe you mistook %s and %s revs?\n" +"Maybe you mistook '%s' and '%s' revs?\n" msgstr "" -"Beberapa revisi %s bukan nenek moyang dari revisi %s.\n" +"Beberapa revisi '%s' bukan nenek moyang dari revisi '%s'.\n" "git bisect tidak dapat bekerja dengan benar pada kasus ini.\n" -"Mungkin Anda salah mengira revisi %s dan %s?\n" +"Mungkin Anda salah mengira revisi '%s' dan '%s'?\n" #: bisect.c #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" -"So we cannot be sure the first %s commit is between %s and %s.\n" +"So we cannot be sure the first '%s' commit is between %s and %s.\n" "We continue anyway." msgstr "" "dasar penggabungan antara %s dan [%s] harus dilewatkan.\n" -"Jadi kami tidak dapat yakin komit %s pertama di antara %s dan %s.\n" +"Jadi kami tidak dapat yakin komit '%s' pertama di antara %s dan %s.\n" "Kami tetap lanjutkan." #: bisect.c @@ -1944,8 +2049,8 @@ msgstr "Membagi dua: dasar penggabungan harus diuji\n" #: bisect.c #, c-format -msgid "a %s revision is needed" -msgstr "sebuah revisi %s diperlukan" +msgid "a '%s' revision is needed" +msgstr "sebuah revisi '%s' diperlukan" #: bisect.c #, c-format @@ -1968,8 +2073,8 @@ msgstr "gagal membaca berkas referensi bagi dua" #: bisect.c #, c-format -msgid "%s was both %s and %s\n" -msgstr "%s sama-sama %s dan %s\n" +msgid "%s was both '%s' and '%s'\n" +msgstr "%s sama-sama '%s' dan '%s'\n" #: bisect.c #, c-format @@ -2279,6 +2384,11 @@ msgstr "pengambilan interaktif" msgid "select hunks interactively" msgstr "pilih bingkah secara interaktif" +#: builtin/add.c builtin/checkout.c builtin/reset.c builtin/stash.c +msgid "auto advance to the next file when selecting hunks interactively" +msgstr "" +"otomatis lanjut ke berkas berikutnya ketika memilih bingkah secara interaktif" + #: builtin/add.c msgid "edit current diff and apply" msgstr "sunting diff saat ini dan terapkan" @@ -2409,7 +2519,7 @@ msgid "index file corrupt" msgstr "berkas indeks rusak" #: builtin/add.c builtin/am.c builtin/checkout.c builtin/clone.c -#: builtin/commit.c builtin/stash.c merge.c rerere.c +#: builtin/commit.c builtin/history.c builtin/stash.c merge.c rerere.c msgid "unable to write new index file" msgstr "gagal menulis berkas indeks baru" @@ -2425,7 +2535,7 @@ msgstr "tindakan jelek '%s' untuk '%s'" msgid "invalid value for '%s': '%s'" msgstr "nilai tidak valid untuk '%s': '%s'" -#: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c +#: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c trailer.c #, c-format msgid "could not read '%s'" msgstr "tidak dapat membaca '%s'" @@ -2584,7 +2694,7 @@ msgstr "git write-tree gagal menulis sebuah pohon" msgid "applying to an empty history" msgstr "menerapkan ke sebuah riwayat kosong" -#: builtin/am.c builtin/commit.c builtin/merge.c builtin/replay.c sequencer.c +#: builtin/am.c builtin/commit.c builtin/merge.c replay.c sequencer.c msgid "failed to write commit object" msgstr "gagal menulis objek komit" @@ -2771,8 +2881,8 @@ msgstr "n" #: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c #: builtin/clone.c builtin/diagnose.c builtin/for-each-ref.c builtin/init-db.c -#: builtin/ls-files.c builtin/ls-tree.c builtin/refs.c builtin/replace.c -#: builtin/repo.c builtin/submodule--helper.c builtin/tag.c +#: builtin/ls-files.c builtin/ls-tree.c builtin/name-rev.c builtin/refs.c +#: builtin/replace.c builtin/repo.c builtin/submodule--helper.c builtin/tag.c #: builtin/verify-tag.c msgid "format" msgstr "format" @@ -2903,8 +3013,25 @@ msgid "git archive: expected a flush" msgstr "git archive: sebuah bilasan diharapkan" #: builtin/backfill.c -msgid "git backfill [--min-batch-size=<n>] [--[no-]sparse]" -msgstr "git backfill [--min-batch-size=<n>] [--[no-]sparse]" +msgid "" +"git backfill [--min-batch-size=<n>] [--[no-]sparse] [--[no-]include-edges] " +"[<revision-range>]" +msgstr "" +"git backfill [--min-batch-size=<n>] [--[no-]sparse] [--[no-]include-edges] " +"[<rentang revisi>]" + +#: builtin/backfill.c +#, c-format +msgid "'%s' cannot be used with 'git backfill'" +msgstr "'%s' tidak dapat digunakan dengan 'git backfill'" + +#: builtin/backfill.c +msgid "cannot backfill with these filter options" +msgstr "tidak dapat melengkapi dengan opsi penyaring berikut" + +#: builtin/backfill.c +msgid "cannot backfill with blob size limits" +msgstr "tidak dapat melengkapi dengan batasan ukuran blob" #: builtin/backfill.c msgid "problem loading sparse-checkout" @@ -2918,6 +3045,16 @@ msgstr "Jumlah objek minum yang diminta pada suatu waktu" msgid "Restrict the missing objects to the current sparse-checkout" msgstr "Batasi objek yang hilang ke sparse-checkout saat ini" +#: builtin/backfill.c +msgid "Include blobs from boundary commits in the backfill" +msgstr "Sertakan blob dari komit perbatasan di dalam pelengkapan" + +#: builtin/backfill.c builtin/diff-pairs.c builtin/log.c builtin/replay.c +#: builtin/shortlog.c bundle.c +#, c-format +msgid "unrecognized argument: %s" +msgstr "argumen tidak dikenal: %s" + #: builtin/bisect.c msgid "" "git bisect start [--term-(bad|new)=<term-new> --term-(good|old)=<term-old>]\n" @@ -3058,19 +3195,21 @@ msgid "Are you sure [Y/n]? " msgstr "Anda yakin [Y/n]?" #: builtin/bisect.c -msgid "status: waiting for both good and bad commits\n" -msgstr "status: menunggu komit bagus dan jelek\n" +#, c-format +msgid "status: waiting for both '%s' and '%s' commits\n" +msgstr "status: menunggu komit '%s dan '%s'\n" #: builtin/bisect.c #, c-format -msgid "status: waiting for bad commit, %d good commit known\n" -msgid_plural "status: waiting for bad commit, %d good commits known\n" -msgstr[0] "status: menunggu komit jelek, %d komit bagus diketahui\n" -msgstr[1] "status: menunggu komit jelek, %d komit bagus diketahui\n" +msgid "status: waiting for '%s' commit, %d '%s' commit known\n" +msgid_plural "status: waiting for '%s' commit, %d '%s' commits known\n" +msgstr[0] "status: menunggu komit '%s', %d komit '%s' diketahui\n" +msgstr[1] "status: menunggu komit '%s', %d komit '%s' diketahui\n" #: builtin/bisect.c -msgid "status: waiting for good commit(s), bad commit known\n" -msgstr "status: menunggu komit bagus, komit jelek diketahui\n" +#, c-format +msgid "status: waiting for '%s' commit(s), '%s' commit known\n" +msgstr "status: menunggu komit(-komit) '%s', komit '%s' diketahui\n" #: builtin/bisect.c msgid "no terms defined" @@ -3079,11 +3218,11 @@ msgstr "tidak ada istilah yang didefinisikan" #: builtin/bisect.c #, c-format msgid "" -"Your current terms are %s for the old state\n" -"and %s for the new state.\n" +"Your current terms are '%s' for the old state\n" +"and '%s' for the new state.\n" msgstr "" -"Istilah Anda saat ini adalah %s untuk keadaan lama\n" -"dan %s untuk keadaan baru.\n" +"Istilah Anda saat ini adalah '%s' untuk keadaan lama\n" +"dan '%s' untuk keadaan baru.\n" #: builtin/bisect.c #, c-format @@ -3187,13 +3326,13 @@ msgstr "bisect run gagal: tidak ada perintah yang diberikan" #: builtin/bisect.c #, c-format -msgid "unable to verify %s on good revision" -msgstr "tidak dapat memverifikasi %s pada revisi bagus" +msgid "unable to verify %s on '%s' revision" +msgstr "tidak dapat memverifikasi %s pada revisi '%s'" #: builtin/bisect.c #, c-format -msgid "bogus exit code %d for good revision" -msgstr "kode keluar gadungan %d untuk revisi bagu" +msgid "bogus exit code %d for '%s' revision" +msgstr "kode keluar gadungan %d untuk revisi '%s'" #: builtin/bisect.c #, c-format @@ -3214,8 +3353,9 @@ msgid "bisect run success" msgstr "bisect run sukses" #: builtin/bisect.c -msgid "bisect found first bad commit" -msgstr "pembagian dua menemukan komit jelek pertama" +#, c-format +msgid "bisect found first '%s' commit\n" +msgstr "pembagian dua menemukan komit '%s' pertama\n" #: builtin/bisect.c #, c-format @@ -3943,7 +4083,8 @@ msgstr "" "Anda dapat menghapus baris-baris yang Anda tidak ingin dibagi.\n" #: builtin/bugreport.c builtin/commit.c builtin/fast-export.c -#: builtin/pack-objects.c builtin/rebase.c builtin/replay.c parse-options.h +#: builtin/pack-objects.c builtin/rebase.c builtin/repack.c builtin/replay.c +#: parse-options.h msgid "mode" msgstr "mode" @@ -4068,6 +4209,11 @@ msgid "cannot read object %s '%s'" msgstr "tidak dapat membaca objek %s '%s'" #: builtin/cat-file.c +#, c-format +msgid "mailmap: invalid boolean '%s'" +msgstr "mailmap: boolean tidak valid '%s'" + +#: builtin/cat-file.c msgid "flush is only for --buffer mode" msgstr "bilas hanya untuk mode --buffer" @@ -4428,22 +4574,6 @@ msgid "copy out the files from named stage" msgstr "salin berkas dari tahap bernama" #: builtin/checkout.c -msgid "git checkout [<options>] <branch>" -msgstr "git checkout [<opsi>] <cabang>" - -#: builtin/checkout.c -msgid "git checkout [<options>] [<branch>] -- <file>..." -msgstr "git checkout [<opsi>] [<cabang>] -- <berkas>..." - -#: builtin/checkout.c -msgid "git switch [<options>] [<branch>]" -msgstr "git switch [<opsi>] [<cabang>]" - -#: builtin/checkout.c -msgid "git restore [<options>] [--source=<branch>] <file>..." -msgstr "git restore [<opsi>] [--source=<cabang>] <berkas>..." - -#: builtin/checkout.c #, c-format msgid "path '%s' does not have our version" msgstr "jalur '%s' tidak punya versi kami" @@ -4543,16 +4673,6 @@ msgstr "Anda perlu selesaikan dulu indeks Anda saat ini" #: builtin/checkout.c #, c-format -msgid "" -"cannot continue with staged changes in the following files:\n" -"%s" -msgstr "" -"tidak dapat melanjutkan dengan perubahan yang tergelar dalam berkas " -"berikut:\n" -"%s" - -#: builtin/checkout.c -#, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Tidak dapat melakukan reflog untuk '%s': %s\n" @@ -4654,6 +4774,11 @@ msgstr "Anda berada pada cabang yang belum lahir" #: builtin/checkout.c #, c-format +msgid "The following paths have local changes:\n" +msgstr "Berkas berikut punya modifikasi lokal:\n" + +#: builtin/checkout.c +#, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" "Please use -- (and optionally --no-guess) to disambiguate" @@ -4662,20 +4787,22 @@ msgstr "" "Mohon gunakan -- (dan secara opsional --no-guess) untuk disambiguasi" #: builtin/checkout.c +#, c-format msgid "" "If you meant to check out a remote tracking branch on, e.g. 'origin',\n" "you can do so by fully qualifying the name with the --track option:\n" "\n" -" git checkout --track origin/<name>\n" +" git %s --track origin/<name>\n" "\n" "If you'd like to always have checkouts of an ambiguous <name> prefer\n" "one remote, e.g. the 'origin' remote, consider setting\n" "checkout.defaultRemote=origin in your config." msgstr "" -"Jika maksud Anda check out cabang pelacak remote, seperti 'origin',\n" -"Anda bisa lakukan dengan kualifikasi penuh nama dengan opsi --track:\n" +"Jika maksud Anda untuk meng-check out cabang pelacak remote, seperti\n" +"'origin', Anda bisa lakukan dengan kualifikasi penuh nama dengan opsi\n" +"--track:\n" "\n" -" git checkout --track origin/<nama>\n" +" git %s --track origin/<nama>\n" "\n" "Jika Anda ingin checkout <nama> ambigu selalu memilih satu remote,\n" "seperti remote 'origin', pertimbangkan untuk menyetel\n" @@ -4865,6 +4992,22 @@ msgid "do not limit pathspecs to sparse entries only" msgstr "jangan batasi jalur spek hanya ke entri tipis" #: builtin/checkout.c +msgid "git checkout [<options>] <branch>" +msgstr "git checkout [<opsi>] <cabang>" + +#: builtin/checkout.c +msgid "git checkout [<options>] [<branch>] -- <file>..." +msgstr "git checkout [<opsi>] [<cabang>] -- <berkas>..." + +#: builtin/checkout.c +msgid "git switch [<options>] [<branch>]" +msgstr "git switch [<opsi>] [<cabang>]" + +#: builtin/checkout.c +msgid "git restore [<options>] [--source=<branch>] <file>..." +msgstr "git restore [<opsi>] [--source=<cabang>] <berkas>..." + +#: builtin/checkout.c #, c-format msgid "options '-%c', '-%c', and '%s' cannot be used together" msgstr "opsi '-%c', '-%c', dan '%s' tidak dapat digunakan bersamaan" @@ -5958,7 +6101,8 @@ msgstr "tidak dapat membaca SQUASH_MSG" msgid "could not read MERGE_MSG" msgstr "tidak dapat membaca MERGE_MSG" -#: builtin/commit.c bundle.c rerere.c sequencer.c +#: builtin/commit.c builtin/history.c builtin/submodule--helper.c bundle.c +#: rerere.c sequencer.c #, c-format msgid "could not open '%s'" msgstr "tidak dapat membuka '%s'" @@ -6268,11 +6412,11 @@ msgstr "gunakan pesan terformat autosquash untuk lumat komit tersebut" msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "komit sekarang dikarang olehku (gunakan dengan -C/-c/--amend)" -#: builtin/commit.c builtin/interpret-trailers.c builtin/tag.c +#: builtin/commit.c builtin/interpret-trailers.c builtin/rebase.c builtin/tag.c msgid "trailer" msgstr "trailer" -#: builtin/commit.c builtin/tag.c +#: builtin/commit.c builtin/rebase.c builtin/tag.c msgid "add custom trailer(s)" msgstr "tambahkan trailer kustom" @@ -6359,7 +6503,7 @@ msgstr "tidak dapat membaca MERGE_MODE" msgid "could not read commit message: %s" msgstr "tidak dapat membaca pesan komit: %s" -#: builtin/commit.c +#: builtin/commit.c builtin/history.c #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Batalkan komit karena pesan komit kosong.\n" @@ -6563,6 +6707,21 @@ msgstr "jumlah argumen salah, seharusnya dari %d ke %d" #: builtin/config.c #, c-format +msgid "missing value to set to the variable '%s'" +msgstr "nilai untuk disetel ke variabel '%s' hilang" + +#: builtin/config.c +#, c-format +msgid "did you mean \"git config set %s %s\"?" +msgstr "mungkin maksud Anda \"git config set %s %s\"?" + +#: builtin/config.c +#, c-format +msgid "missing value to set to a variable with an invalid name '%s'" +msgstr "nilai untuk disetel ke variabel dengan nama tidak valid '%s' hilang" + +#: builtin/config.c +#, c-format msgid "invalid key pattern: %s" msgstr "pola kunci tidak valid: %s" @@ -7112,12 +7271,6 @@ msgstr "tidak dapat menguraikan id objek: %s" msgid "git diff-pairs -z [<diff-options>]" msgstr "git diff-pairs -z [<opsi diff>]" -#: builtin/diff-pairs.c builtin/log.c builtin/replay.c builtin/shortlog.c -#: bundle.c -#, c-format -msgid "unrecognized argument: %s" -msgstr "argumen tidak dikenal: %s" - #: builtin/diff-pairs.c msgid "working without -z is not supported" msgstr "bekerja tanpa -z tidak didukung" @@ -7398,14 +7551,6 @@ msgstr "" "menanganinya" #: builtin/fast-export.c -msgid "" -"'strip-if-invalid' is not a valid mode for git fast-export with --signed-" -"commits=<mode>" -msgstr "" -"'strip-if-invalid' bukan mode valid untuk git fast-export dengan --signed-" -"commits=<mode>" - -#: builtin/fast-export.c #, c-format msgid "" "omitting tag %s,\n" @@ -7437,14 +7582,6 @@ msgstr "" "menanganinya" #: builtin/fast-export.c -msgid "" -"'strip-if-invalid' is not a valid mode for git fast-export with --signed-" -"tags=<mode>" -msgstr "" -"'strip-if-invalid' bukan mode valid untuk git fast-export dengan --signed-" -"tags=<mode>" - -#: builtin/fast-export.c #, c-format msgid "" "tag %s tags unexported object; use --tag-of-filtered-object=<mode> to handle " @@ -7698,7 +7835,7 @@ msgid "not updating %s (new tip %s does not contain %s)" msgstr "tidak memperbarui %s (ujung baru %s tidak mempunyai %s)" #: builtin/fast-import.c builtin/sparse-checkout.c commit-graph.c midx-write.c -#: sequencer.c +#: repack-midx.c sequencer.c #, c-format msgid "unable to create leading directories of %s" msgstr "tidak dapat membuat direktori utama dari %s" @@ -7969,6 +8106,45 @@ msgstr "" " yang diduga dibuat oleh %s" #: builtin/fast-import.c +#, c-format +msgid "" +"replacing invalid signature for commit '%.100s...'\n" +" allegedly by %s" +msgstr "" +"menggantikan tandatangan tidak valid untuk komit '%.100s...'\n" +" yang diduga dibuat oleh %s" + +#: builtin/fast-import.c +#, c-format +msgid "" +"replacing invalid signature for commit '%.*s'\n" +" allegedly by %s" +msgstr "" +"menggantikan tandatangan tidak valid untuk komit '%.*s'\n" +" yang diduga dibuat oleh %s" + +#: builtin/fast-import.c +#, c-format +msgid "" +"replacing invalid signature for commit\n" +" allegedly by %s" +msgstr "" +"menggantikan tandatangan tidak valid untuk komit\n" +" yang diduga dibuat oleh %s" + +#: builtin/fast-import.c +msgid "aborting due to invalid signature" +msgstr "membatalkan karena tandatangan tidak valid" + +#: builtin/fast-import.c +msgid "signing commits in interoperability mode is unsupported" +msgstr "menandatangani komit dalam mode interoperabilitas tidak didukung" + +#: builtin/fast-import.c +msgid "failed to sign commit object" +msgstr "gagal menandatangani objek komit" + +#: builtin/fast-import.c msgid "expected committer but didn't get one" msgstr "pengkomit diharapkan tapi tidak mendapatkannya" @@ -7987,6 +8163,10 @@ msgid "importing a commit signature verbatim" msgstr "mengimpor tandatangan komit secara verbatim" #: builtin/fast-import.c +msgid "failed to sign tag object" +msgstr "gagal menandatangani objek tag" + +#: builtin/fast-import.c #, c-format msgid "importing a tag signature verbatim for tag '%s'" msgstr "mengimpor tag secara verbatim untuk tag '%s'" @@ -8002,14 +8182,6 @@ msgstr "" "menemukan tag bertandatangan; gunakan --signed-tags=<mode> untuk menanganinya" #: builtin/fast-import.c -msgid "" -"'strip-if-invalid' is not a valid mode for git fast-import with --signed-" -"tags=<mode>" -msgstr "" -"'strip-if-invalid' bukan mode valid untuk git fast-import dengan --signed-" -"tags=<mode>" - -#: builtin/fast-import.c #, c-format msgid "expected 'from' command, got '%s'" msgstr "perintah 'from' diharapkan, dapat '%s'" @@ -8339,15 +8511,20 @@ msgstr "opsi \"%s\" nilai \"%s\" tidak valid untuk %s" msgid "option \"%s\" is ignored for %s" msgstr "opsi \"%s\" diabaikan untuk %s" -#: builtin/fetch.c odb.c +#: builtin/fetch.c fetch-pack.c #, c-format -msgid "%s is not a valid object" -msgstr "%s bukan sebuah objek valid" +msgid "the object %s does not exist" +msgstr "objek '%s' tidak ada" #: builtin/fetch.c #, c-format -msgid "the object %s does not exist" -msgstr "objek '%s' tidak ada" +msgid "ignoring %s=%s because it does not match any refs" +msgstr "mengabaikan %s=%s karena tidak cocok dengan referensi apapun" + +#: builtin/fetch.c +#, c-format +msgid "ignoring %s because the protocol does not support it" +msgstr "mengabaikan %s karena protokol tidak mendukungnya" #: builtin/fetch.c #, c-format @@ -8591,6 +8768,10 @@ msgid "report that we have only objects reachable from this object" msgstr "" "laporkan bahwa kami hanya punya object yang bisa dicapai dari objek ini" +#: builtin/fetch.c builtin/pull.c +msgid "ensure this ref is always sent as a negotiation have" +msgstr "pastikan referensi ini selalu dikirim sebagai kepunyaan negosiasi" + #: builtin/fetch.c msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" msgstr "" @@ -8613,10 +8794,6 @@ msgid "accept refspecs from stdin" msgstr "terima spek referensi dari masukan standar" #: builtin/fetch.c -msgid "--negotiate-only needs one or more --negotiation-tip=*" -msgstr "--negotiate-only perlu satu atau lebih --negotiation-tip=*" - -#: builtin/fetch.c msgid "negative depth in --deepen is not supported" msgstr "kedalaman negatif pada --deepen tidak didukung" @@ -8637,7 +8814,7 @@ msgstr "fetch --all tidak mengambil argumen repositori" msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all tidak masuk akal dengan spek referensi" -#: builtin/fetch.c +#: builtin/fetch.c builtin/push.c #, c-format msgid "no such remote or remote group: %s" msgstr "tidak ada remote atau grup remote seperti: %s" @@ -8655,6 +8832,11 @@ msgid "protocol does not support --negotiate-only, exiting" msgstr "protokol tidak mendukung --negotiate-only, keluar." #: builtin/fetch.c +#, c-format +msgid "%s needs one or more %s" +msgstr "%s butuh satu atau lebih %s" + +#: builtin/fetch.c msgid "" "--filter can only be used with the remote configured in " "extensions.partialclone" @@ -9077,6 +9259,11 @@ msgstr "nilai '%s' bukan bool atau int: %d" #: builtin/fsmonitor--daemon.c #, c-format +msgid "daemon did not stop within %d seconds" +msgstr "daemon tidak berhenti dalam %d detik" + +#: builtin/fsmonitor--daemon.c +#, c-format msgid "fsmonitor-daemon is watching '%s'\n" msgstr "fsmonitor-daemon mengawasi '%s'\n" @@ -9131,6 +9318,10 @@ msgstr "fsmonitor--daemon sudah berjalan '%s'" msgid "running fsmonitor-daemon in '%s'\n" msgstr "menjalankan fsmonitor-daemon di '%s'\n" +#: builtin/fsmonitor--daemon.c setup.c +msgid "setsid failed" +msgstr "setsid gagal" + #: builtin/fsmonitor--daemon.c #, c-format msgid "starting fsmonitor-daemon in '%s'\n" @@ -9991,13 +10182,277 @@ msgstr "penggunaan: %s%s" msgid "'git help config' for more information" msgstr "'git help config' untuk informasi lebih lanjut" +#: builtin/history.c +msgid "" +"git history fixup <commit> [--dry-run] [--update-refs=(branches|head)] [--" +"reedit-message] [--empty=(drop|keep|abort)]" +msgstr "" +"git history fixup <komit> [--dry-run] [--update-refs=(branches|head)] [--" +"reedit-message] [--empty=(drop|keep|abort)]" + +#: builtin/history.c +msgid "git history reword <commit> [--dry-run] [--update-refs=(branches|head)]" +msgstr "git history reword <komit> [--dry-run] [--update-refs=(branches|head)]" + +#: builtin/history.c +msgid "" +"git history split <commit> [--dry-run] [--update-refs=(branches|head)] [--] " +"[<pathspec>...]" +msgstr "" +"git history split <komit> [--dry-run] [--update-refs=(branches|head)] [--] " +"[<spek jalur>...]" + +#: builtin/history.c +#, c-format +msgid "" +"Please enter the commit message for the %s changes. Lines starting\n" +"with '%s' will be ignored, and an empty message aborts the commit.\n" +msgstr "" +"Mohon masukkan pesan komit untuk perubahan %s. Baris yang diawali\n" +"dengan '%s' akan diabaikan, dan pesan kosong batalkan komit.\n" + +#: builtin/history.c +#, c-format +msgid "Aborting commit as launching the editor failed.\n" +msgstr "Membatalkan komit karena gagal meluncurkan penyunting.\n" + +#: builtin/history.c +#, c-format +msgid "unable to parse parent commit %s" +msgstr "tidak dapat menguraikan komit induk %s" + +#: builtin/history.c +#, c-format +msgid "%s expects one of 'branches' or 'head'" +msgstr "%s mengharapkan salah satu dari 'branches' atau 'head'" + +#: builtin/history.c replay.c +msgid "error preparing revisions" +msgstr "kesalahan menyiapkan revisi" + +#: builtin/history.c replay.c +msgid "replaying merge commits is not supported yet!" +msgstr "memainkan ulang komit penggabungan belum didukung!" + +#: builtin/history.c +msgid "cannot look up HEAD" +msgstr "tidak dapat mencari HEAD" + +#: builtin/history.c +msgid "cannot determine descendance" +msgstr "tidak dapat menentukan keturunan" + +#: builtin/history.c +msgid "" +"rewritten commit must be an ancestor of HEAD when using --update-refs=head" +msgstr "" +"komit yang ditulis ulang harus jadi nenek moyang HEAD ketika menggunakan --" +"update-refs=head" + +#: builtin/history.c builtin/replay.c +#, c-format +msgid "failed to begin ref transaction: %s" +msgstr "gagal memulai transaksi referensi: %s" + +#: builtin/history.c builtin/replay.c +#, c-format +msgid "failed to update ref '%s': %s" +msgstr "gagal memperbarui referensi '%s': %s" + +#: builtin/history.c builtin/replay.c +#, c-format +msgid "failed to commit ref transaction: %s" +msgstr "gagal mengkomit transaksi referensi: %s" + +#: builtin/history.c +#, c-format +msgid "unable to parse parent of %s" +msgstr "tidak dapat menguraikan induk dari %s" + +#: builtin/history.c +#, c-format +msgid "" +"unrecognized '--empty=' action '%s'; valid values are \"drop\", \"keep\", " +"and \"abort\"." +msgstr "" +"aksi '--empty=' '%s' tak dikenal; nilai yang valid adalah \"drop\", " +"\"keep\", dan \"abort\"." + +#: builtin/history.c +msgid "control which refs should be updated" +msgstr "atur referensi mana yang harus diperbarui" + +#: builtin/history.c +msgid "perform a dry-run without updating any refs" +msgstr "lakukan uji coba tanpa memperbarui referensi apapun" + +#: builtin/history.c +msgid "open an editor to modify the commit message" +msgstr "buka penyunting untuk mengubah pesan komit" + +#: builtin/history.c builtin/rebase.c builtin/revert.c +msgid "how to handle commits that become empty" +msgstr "bagaimana cara menangani komit yang menjadi kosong" + +#: builtin/history.c +msgid "command expects a single revision" +msgstr "perintah mengharapkan satu revisi" + +#: builtin/history.c +msgid "cannot run fixup in a bare repository" +msgstr "tidak dapat menjalankan perbaikan di dalam repositori bare" + +#: builtin/history.c +#, c-format +msgid "commit cannot be found: %s" +msgstr "komit tidak ditemukan: %s" + +#: builtin/history.c +msgid "cannot get tree for HEAD" +msgstr "tidak dapat mendapatkan pohon untuk HEAD" + +#: builtin/history.c builtin/show-index.c +msgid "unable to read index" +msgstr "tidak dapa membaca indeks" + +#: builtin/history.c +msgid "nothing to fixup: no staged changes" +msgstr "tidak ada yang diperbaiki: tidak ada perubahan tergelar" + +#: builtin/history.c +msgid "unable to write index as a tree" +msgstr "tidak dapat menulis indeks sebagai sebuah pohon" + +#: builtin/history.c +#, c-format +msgid "cannot get tree for commit %s" +msgstr "tidak dapat mendapatkan pohon untuk komit %s" + +#: builtin/history.c +msgid "merge failed while applying fixup" +msgstr "penggabungan gagal ketika menerapkan perbaikan" + +#: builtin/history.c +msgid "fixup would produce conflicts; aborting" +msgstr "perbaikan akan menghasilkan konflik; batalkan" + +#: builtin/history.c +#, c-format +msgid "cannot drop root commit %s: it has no parent to replay onto" +msgstr "" +"tidak dapat menjatuhkan komit akar %s: ia tidak punya induk untuk dimainkan " +"ulang" + +#: builtin/history.c +#, c-format +msgid "fixup makes commit %s empty" +msgstr "perbaikan membuat komit %s kosong" + +#: builtin/history.c +msgid "failed writing fixed-up commit" +msgstr "gagal menulis komit yang diperbaiki" + +#: builtin/history.c +msgid "failed replaying descendants" +msgstr "gagal memainkan ulang keturunan" + +#: builtin/history.c +msgid "failed writing reworded commit" +msgstr "gagal menulis komit yang diubah kata-katanya" + +#: builtin/history.c +msgid "unable to populate index with tree" +msgstr "tidak dapat mengisi indeks dengan pohon" + +#: builtin/history.c +msgid "unable to acquire index lock" +msgstr "tidak dapat memperoleh kunci indeks" + +#: builtin/history.c +msgid "failed reading temporary index" +msgstr "gagal membaca indeks sementara" + +#: builtin/history.c +msgid "failed split tree" +msgstr "gagal membagi pohon" + +#: builtin/history.c +msgid "split commit is empty" +msgstr "komit yang terbagi kosong" + +#: builtin/history.c +msgid "split commit tree matches original commit" +msgstr "pohon komit terbagi cocok dengan komit asli" + +#: builtin/history.c +msgid "failed writing first commit" +msgstr "gagal menulis komit pertama" + +#: builtin/history.c +msgid "failed writing second commit" +msgstr "gagal menulis komit kedua" + +#: builtin/history.c +msgid "control ref update behavior" +msgstr "atur perilaku pembaruan referensi" + +#: builtin/history.c +msgid "command expects a committish" +msgstr "perintah mengharapkan sebuah mirip komit" + +#: builtin/history.c +msgid "cannot split up merge commit" +msgstr "tidak dapat membagi komit penggabungan" + +#: builtin/hook.c +msgid "" +"git hook run [--allow-unknown-hook-name] [--ignore-missing] [--to-" +"stdin=<path>] [(-j|--jobs) <n>]\n" +"<hook-name> [-- <hook-args>]" +msgstr "" +"git hook run [--allow-unknown-hook-name] [--ignore-missing] [--to-" +"stdin=<jalur>] [(-j|--jobs) <n>]\n" +"<nama kait> [-- <argumen kait>]" + +#: builtin/hook.c +msgid "" +"git hook list [--allow-unknown-hook-name] [-z] [--show-scope] <hook-name>" +msgstr "" +"git hook list [--allow-unknown-hook-name] [-z] [--show-scope] <nama kait>" + +#: builtin/hook.c +msgid "use NUL as line terminator" +msgstr "gunakan NUL sebagai pengakhir baris" + #: builtin/hook.c +msgid "show the config scope that defined each hook" +msgstr "perlihatkan cakupan konfigurasi yang mendefinisikan setiap kait" + +#: builtin/hook.c +msgid "allow running a hook with a non-native hook name" +msgstr "izinkan menjalankan kait dengan nama kait non-asli" + +#: builtin/hook.c +msgid "you must specify a hook event name to list" +msgstr "Anda harus merincikan nama kejadian kait untuk didaftarkan" + +#: builtin/hook.c +#, c-format msgid "" -"git hook run [--ignore-missing] [--to-stdin=<path>] <hook-name> [-- <hook-" -"args>]" +"unknown hook event '%s';\n" +"use --allow-unknown-hook-name to allow non-native hook names" msgstr "" -"git hook run [--ignore-missing] [--to-stdin=<jalur>] <nama kait> [-- " -"<argumen kait>]" +"kejadian kait tidak dikenal '%s';\n" +"gunakan --allow-unknown-hook-name untuk memperbolehkan nama kait non-asli" + +#: builtin/hook.c +#, c-format +msgid "no hooks found for event '%s'" +msgstr "tidak ada kait yang ditemukan untuk kejadian '%s'" + +#: builtin/hook.c +msgid "hook from hookdir" +msgstr "kait dari direktori kait" #: builtin/hook.c msgid "silently ignore missing requested <hook-name>" @@ -10007,6 +10462,17 @@ msgstr "diam-diam abaikan <nama kait> yang diminta yang hilang" msgid "file to read into hooks' stdin" msgstr "gagal membaca masukan standar kait" +#: builtin/hook.c +msgid "run up to <n> hooks simultaneously (-1 for CPU count)" +msgstr "jalankan hingga <n> kait sekaligus (-1 untuk jumlah CPU)" + +#: builtin/hook.c +#, c-format +msgid "invalid value for -j: %d (use -1 for CPU count or a positive integer)" +msgstr "" +"nilai tidak valid untuk -j: %d (gunakan -1 untuk jumlah CPU atau bilangan " +"bulat positif)" + #: builtin/index-pack.c #, c-format msgid "object type mismatch at %s" @@ -10069,6 +10535,10 @@ msgstr "paket ada objek jelek pada offset %<PRIuMAX>: %s" msgid "inflate returned %d" msgstr "inflate mengembalikan %d" +#: builtin/index-pack.c builtin/unpack-objects.c +msgid "object size too large for this platform" +msgstr "ukuran objek terlalu besar untuk platform ini" + #: builtin/index-pack.c msgid "offset value overflow for delta base object" msgstr "nilai offset meluap untuk objek basis delta" @@ -10385,25 +10855,6 @@ msgstr "" "[(=|:)<nilai>])...]\n" " [--parse] [<berkas>...]" -#: builtin/interpret-trailers.c wrapper.c -#, c-format -msgid "could not stat %s" -msgstr "tidak dapat membaca %s" - -#: builtin/interpret-trailers.c -#, c-format -msgid "file %s is not a regular file" -msgstr "berkas %s bukan sebuah berkas reguler" - -#: builtin/interpret-trailers.c -#, c-format -msgid "file %s is not writable by user" -msgstr "berkas %s tidak dapat ditulis oleh pengguna" - -#: builtin/interpret-trailers.c -msgid "could not open temporary file" -msgstr "tidak dapat membuka berkas sementara" - #: builtin/interpret-trailers.c #, c-format msgid "could not read input file '%s'" @@ -10415,6 +10866,11 @@ msgstr "tidak dapat membaca dari masukan standar" #: builtin/interpret-trailers.c #, c-format +msgid "could not write to temporary file '%s'" +msgstr "tidak dapat menulis ke berkas sementara '%s'" + +#: builtin/interpret-trailers.c trailer.c +#, c-format msgid "could not rename temporary file to %s" msgstr "tidak dapat menamai ulang berkas sementara ke %s" @@ -10447,8 +10903,8 @@ msgid "output only the trailers" msgstr "keluarkan hanya trailer" #: builtin/interpret-trailers.c -msgid "do not apply trailer.* configuration variables" -msgstr "jangan terapkan variabel konfigurasi trailer.*" +msgid "do not apply trailer.<key-alias> configuration variables" +msgstr "jangan terapkan variabel konfigurasi trailer.<alias kunci>" #: builtin/interpret-trailers.c msgid "reformat multiline trailer values as single-line values" @@ -10475,25 +10931,27 @@ msgid "no input file given for in-place editing" msgstr "tidak ada berkas masukan yang diberikan untuk penyuntingan di tempat" #: builtin/last-modified.c -msgid "last-modified can only operate on one tree at a time" -msgstr "last-modified hanya dapat beroperasi pada satu pohon pada satu waktu" +msgid "last-modified can only operate on one commit at a time" +msgstr "last-modified hanya dapat beroperasi pada satu komit dalam satu waktu" #: builtin/last-modified.c #, c-format -msgid "unknown last-modified argument: %s" -msgstr "argumen last-modified tidak dikenal: %s" +msgid "revision argument '%s' is a %s, not a commit-ish" +msgstr "argumen revisi '%s' adalah sebuah %s, bukan sebuah mirip-komit" #: builtin/last-modified.c -msgid "unable to setup last-modified" -msgstr "tidak dapat mensetup last-modified" +#, c-format +msgid "unknown last-modified argument: %s" +msgstr "argumen last-modified tidak dikenal: %s" #: builtin/last-modified.c msgid "" -"git last-modified [--recursive] [--show-trees] [<revision-range>] [[--] " -"<path>...]" +"git last-modified [--recursive] [--show-trees] [--max-depth=<depth>] [-z]\n" +" [<revision-range>] [[--] <pathspec>...]" msgstr "" -"git last-modified [--recursive] [--show-trees] [<rentang revisi>] [[--] " -"<jalur>...]" +"git last-modified [--recursive] [--show-trees] [--max-depth=<kedalaman>] [-" +"z]\n" +" [<rentang revisi>] [[--] <spek jalur>...]" #: builtin/last-modified.c builtin/ls-tree.c msgid "recurse into subtrees" @@ -10503,6 +10961,14 @@ msgstr "rekursi ke dalam subpohon" msgid "show tree entries when recursing into subtrees" msgstr "perlihatkan entri pohon ketika mengulangi ke dalam subpohon" +#: builtin/last-modified.c diff.c +msgid "maximum tree depth to recurse" +msgstr "kedalaman pohon maksimal untuk diselami" + +#: builtin/last-modified.c +msgid "lines are separated with NUL character" +msgstr "baris dipisahkan dengan karakter NUL" + #: builtin/log.c msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<opsi>] [<rentang revisi>] [[--] <jalur>...]" @@ -10593,6 +11059,20 @@ msgstr "%s: sampul tidak valid dari mode deskripsi" msgid "format.headers without value" msgstr "format.headers tanpa nilai" +#: builtin/log.c config.c +#, c-format +msgid "bad boolean config value '%s' for '%s'" +msgstr "nilai konfigurasi boolean '%s' jelek untuk '%s'" + +#: builtin/log.c +#, c-format +msgid "" +"'%s' used to accept any value and treat that as 'true'.\n" +"Now it only accepts boolean values, like what '%s' does.\n" +msgstr "" +"'%s' pernah menerima nilai apapun dan memperlakukannya sebagai 'true'.\n" +"Sekarang hanya menerima nilai boolean, seperti yang '%s' lakukan.\n" + #: builtin/log.c #, c-format msgid "cannot open patch file %s" @@ -10621,6 +11101,11 @@ msgstr "gagal membuat berkas sampul surat" #: builtin/log.c #, c-format +msgid "'%s' is not a valid format string" +msgstr "'%s' bukan untai format yang valid" + +#: builtin/log.c +#, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to gila: %s" @@ -10700,6 +11185,14 @@ msgid "generate a cover letter" msgstr "buat sampul surat" #: builtin/log.c +msgid "format-spec" +msgstr "spek format" + +#: builtin/log.c +msgid "format spec used for the commit list in the cover letter" +msgstr "format spek yang digunakan untuk daftar komit di dalam sampul surat" + +#: builtin/log.c msgid "use simple number sequence for output file names" msgstr "gunakan urutan bilangan sederhana untuk keluarkan nama berkas" @@ -11653,7 +12146,7 @@ msgstr "Tidak ada cabang pelacak remote untuk %s dari %s" msgid "Bad value '%s' in environment '%s'" msgstr "Nilai jelek '%s' dalam lingkungan '%s'" -#: builtin/merge.c editor.c read-cache.c wrapper.c +#: builtin/merge.c editor.c read-cache.c t/helper/test-synthesize.c wrapper.c #, c-format msgid "could not close '%s'" msgstr "tidak dapat menutup '%s'" @@ -11833,11 +12326,25 @@ msgstr "perbolehkan pembuatan lebih dari satu pohon" #: builtin/multi-pack-index.c msgid "" -"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-" -"snapshot=<path>]" +"git multi-pack-index [<options>] write [--preferred-pack=<pack>]\n" +" [--[no-]bitmap] [--[no-]incremental] [--[no-]stdin-packs]\n" +" [--refs-snapshot=<path>] [--[no-]write-chain-file]\n" +" [--base=<checksum>]" msgstr "" -"git multi-pack-index [<opsi>] write [--preferred-pack=<pak>] [--refs-" -"snapshot=<jalur>]" +"git multi-pack-index [<opsi>] write [--preferred-pack=<pak>]\n" +" [--[no-]bitmap] [--[no-]incremental] [--[no-]stdin-packs]\n" +" [--refs-snapshot=<jalur>] [--[no-]write-chain-file]\n" +" [--base=<checksum>]" + +#: builtin/multi-pack-index.c +msgid "" +"git multi-pack-index [<options>] compact [--[no-]incremental]\n" +" [--[no-]bitmap] [--base=<checksum>] [--[no-]write-chain-file]\n" +" <from> <to>" +msgstr "" +"git multi-pack-index [<opsi>] compact [--[no-]incremental]\n" +" [--[no-]bitmap] [--base=<checksum>] [--[no-]write-chain-file]\n" +" <dari> <ke>" #: builtin/multi-pack-index.c msgid "git multi-pack-index [<options>] verify" @@ -11872,10 +12379,22 @@ msgid "write multi-pack bitmap" msgstr "tulis bitmap multipak" #: builtin/multi-pack-index.c +msgid "checksum" +msgstr "checksum" + +#: builtin/multi-pack-index.c +msgid "base MIDX for incremental writes" +msgstr "MIDX dasar untuk penulisan inkremental" + +#: builtin/multi-pack-index.c msgid "write a new incremental MIDX" msgstr "tulis MIDX tambahan baru" #: builtin/multi-pack-index.c +msgid "write the multi-pack-index chain file" +msgstr "menulis berkas rantai indeks multipak" + +#: builtin/multi-pack-index.c msgid "write multi-pack index containing only given indexes" msgstr "tulis indeks multipak yang hanya berisi indeks yang diberikan" @@ -11884,6 +12403,29 @@ msgid "refs snapshot for selecting bitmap commits" msgstr "potret referensi untuk memilih komit bitmap" #: builtin/multi-pack-index.c +#, c-format +msgid "cannot use %s without %s" +msgstr "tidak dapat menggunakan %s tanpa %s" + +#: builtin/multi-pack-index.c +msgid "cannot use --base without --no-write-chain-file" +msgstr "tidak dapat menggunakan --base tanpa --no-write-chain-file" + +#: builtin/multi-pack-index.c +#, c-format +msgid "could not find MIDX: %s" +msgstr "tidak dapat menemukan MIDX: %s" + +#: builtin/multi-pack-index.c +msgid "MIDX compaction endpoints must be unique" +msgstr "Titik ujung pemampatan MIDX harus unik" + +#: builtin/multi-pack-index.c +#, c-format +msgid "MIDX %s must be an ancestor of %s" +msgstr "MIDX %s harus jadi nenek moyang untuk %s" + +#: builtin/multi-pack-index.c msgid "" "during repack, collect pack-files of smaller size into a batch that is " "larger than this size" @@ -12048,6 +12590,60 @@ msgstr "perbolehkan mencetak nama `undefined` (asali)" msgid "dereference tags in the input (internal use)" msgstr "dereferensi tag di dalam masukan (penggunaan internal)" +#: builtin/name-rev.c +#, c-format +msgid "'%s' needs to be either text, revs, or rev" +msgstr "'%s' perlu baik teks, revisi-revisi, atau revisi" + +#: builtin/name-rev.c +msgid "" +"(EXPERIMENTAL!) git format-rev --stdin-mode=<mode> --format=<pretty> [--" +"[no-]notes=<ref>] [-z] [--[no-]null-output] [--[no-]null-input]" +msgstr "" +"(EKSPERIMENTAL!) git format-rev --stdin-mode=<mode> --format=<cantik> [--" +"[no-]notes=<referensi>] [-z] [--[no-]null-output] [--[no-]null-input]" + +#: builtin/name-rev.c +msgid "pretty format to use" +msgstr "format cantik untuk digunakan" + +#: builtin/name-rev.c +msgid "stdin-mode" +msgstr "mode masukan standar" + +#: builtin/name-rev.c +msgid "how revs are processed" +msgstr "bagaimana revisi diproses" + +#: builtin/name-rev.c builtin/range-diff.c +msgid "notes" +msgstr "catatan" + +#: builtin/name-rev.c +msgid "display notes for pretty format" +msgstr "tampilkan catatan untuk format cantik" + +#: builtin/name-rev.c +msgid "z" +msgstr "z" + +#: builtin/name-rev.c +msgid "Use NUL for input and output termination" +msgstr "Gunakan NUL untuk penghentian masukan dan keluaran" + +#: builtin/name-rev.c +msgid "Use NUL for input termination" +msgstr "Gunakan NUL untuk penghentian masukan" + +#: builtin/name-rev.c +msgid "Use NUL for output termination" +msgstr "Gunakan NUL untuk penghentian keluaran" + +#: builtin/name-rev.c +#, c-format +msgid "'%s' is required" +msgstr "'%s' diperlukan" + #: builtin/notes.c msgid "git notes [--ref <notes-ref>] [list [<object>]]" msgstr "git notes [--ref <referensi catan>] [list [<objek>]]" @@ -12487,6 +13083,11 @@ msgstr "saat ini, --write-bitmap-index memerlukan --name-hash-version=1" #: builtin/pack-objects.c #, c-format +msgid "write_reuse_object: unable to parse object header of %s" +msgstr "write_reuse_object: tidak dapat menguraikan kepala objek %s" + +#: builtin/pack-objects.c +#, c-format msgid "" "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in " "pack %s" @@ -12651,13 +13252,13 @@ msgstr "tidak dapat mendapatkan tipe objek %s di dalam pak %s" #: builtin/pack-objects.c #, c-format -msgid "packfile %s is a promisor but --exclude-promisor-objects was given" -msgstr "berkas pak %s adalah pejanji tapi --exclude-promisor-objects diberikan" +msgid "could not find pack '%s'" +msgstr "tidak dapat menemukan pak '%s'" #: builtin/pack-objects.c #, c-format -msgid "could not find pack '%s'" -msgstr "tidak dapat menemukan pak '%s'" +msgid "packfile %s is a promisor but --exclude-promisor-objects was given" +msgstr "berkas pak %s adalah pejanji tapi --exclude-promisor-objects diberikan" #: builtin/pack-objects.c #, c-format @@ -12694,10 +13295,6 @@ msgstr "" "ID objek diharapkan, dapat sampah:\n" " %s" -#: builtin/pack-objects.c reachable.c -msgid "could not load cruft pack .mtimes" -msgstr "tidak dapat memuat .mtimes paket sisa" - #: builtin/pack-objects.c msgid "cannot open pack index" msgstr "tidak dapat membuka indeks pak" @@ -12712,10 +13309,6 @@ msgid "unable to force loose object" msgstr "tidak dapat memaksakan objek longgar" #: builtin/pack-objects.c -msgid "failed to pack objects via path-walk" -msgstr "gagal mempak objek lewat jalan jalur" - -#: builtin/pack-objects.c #, c-format msgid "not a rev '%s'" msgstr "bukan sebuah revisi '%s'" @@ -12726,6 +13319,10 @@ msgid "bad revision '%s'" msgstr "revisi jelek '%s'" #: builtin/pack-objects.c +msgid "failed to pack objects via path-walk" +msgstr "gagal mempak objek lewat jalan jalur" + +#: builtin/pack-objects.c msgid "unable to add recent objects" msgstr "tidak dapat menambahkan objek terkini" @@ -13465,6 +14062,11 @@ msgstr "" msgid "invalid value for '%s'" msgstr "nilai tidak valid untuk '%s'" +#: builtin/push.c +#, c-format +msgid "could not push to %s" +msgstr "tidak dapat mendorong ke %s" + #: builtin/push.c builtin/submodule--helper.c msgid "repository" msgstr "repositori" @@ -13559,16 +14161,34 @@ msgid "" "and then push using the remote name\n" "\n" " git push <name>\n" +"\n" +"To push to multiple remotes at once, configure a remote group using\n" +"\n" +" git config remotes.<groupname> \"<remote1> <remote2>\"\n" +"\n" +"and then push using the group name\n" +"\n" +" git push <groupname>\n" msgstr "" "Tidak ada tujuan dorong terkonfigurasi.\n" -"Baik sebutkan URL dari baris perintah atau konfigurasikan repositori remote " +"Baik rincikan URL dari baris perintah atau konfigurasikan repositori remote " "dengan menggunakan\n" "\n" " git remote add <nama> <url>\n" "\n" -"dan dorong dengan menggunakan nama remote\n" +"lalu dorong dengan menggunakan nama remote\n" "\n" " git push <nama>\n" +"\n" +"Untuk mendorong ke banyak remote sekaligus, konfigurasikan grup remote " +"dengan menggunakan\n" +" git config remotes.<nama grup> \"<remote 1> <remote 2>\"\n" +"lalu dorong menggunakan nama grup\n" +" git push <nama grup>\n" + +#: builtin/push.c +msgid "push options must not have new line characters" +msgstr "opsi dorong harus tidak ada karakter baris baru" #: builtin/push.c msgid "--all can't be combined with refspecs" @@ -13579,8 +14199,8 @@ msgid "--mirror can't be combined with refspecs" msgstr "--mirror tidak dapat digabungkan dengan spek referensi" #: builtin/push.c -msgid "push options must not have new line characters" -msgstr "opsi dorong harus tidak ada karakter baris baru" +msgid "--atomic can only be used when pushing to one remote" +msgstr "--atomic hanya dapat digunakan ketika mendorong ke satu remote" #: builtin/range-diff.c msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>" @@ -13605,10 +14225,6 @@ msgid "use simple diff colors" msgstr "gunakan warna diff sederhana" #: builtin/range-diff.c -msgid "notes" -msgstr "catatan" - -#: builtin/range-diff.c msgid "passed to 'git log'" msgstr "lewatkan ke 'git log'" @@ -13980,10 +14596,6 @@ msgstr "biarkan pengguna menyunting daftar komit untuk didasarkan ulang" msgid "(REMOVED) was: try to recreate merges instead of ignoring them" msgstr "(USANG) yaitu: coba buat ulang penggabungan daripada abaikannya" -#: builtin/rebase.c builtin/revert.c -msgid "how to handle commits that become empty" -msgstr "bagaimana cara menangani komit yang menjadi kosong" - #: builtin/rebase.c msgid "keep commits which start empty" msgstr "simpan komit yang dimulai kosong" @@ -15100,11 +15712,11 @@ msgstr "jadi lebih bertele-tele; harus ditempatkan sebelum subperintah" msgid "" "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" "[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n" -"[--write-midx] [--name-hash-version=<n>] [--path-walk]" +"[--write-midx[=<mode>]] [--name-hash-version=<n>] [--path-walk]" msgstr "" "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" "[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<nama pak>]\n" -"[--write-midx] [--name-hash-version=<n>] [--path-walk]" +"[--write-midx[=<mode>]] [--name-hash-version=<n>] [--path-walk]" #: builtin/repack.c msgid "" @@ -15115,6 +15727,11 @@ msgstr "" " --no-write-bitmap-index atau nonaktifkan konfigurasi pack.writeBitmaps." #: builtin/repack.c +#, c-format +msgid "unknown value for %s: %s" +msgstr "nilai tidak dikenal untuk %s: %s" + +#: builtin/repack.c msgid "pack everything in a single pack" msgstr "pak semuanya dalam satu pak" @@ -15237,6 +15854,11 @@ msgstr "tidak dapat menghapus pak dalam repositori objek berharga" #: builtin/repack.c #, c-format +msgid "invalid value for %s: %d" +msgstr "nilai tidak valid untuk %s: %d" + +#: builtin/repack.c +#, c-format msgid "option '%s' can only be used along with '%s'" msgstr "opsi '%s' tidak dapat digunakan bersamaan dengan '%s'" @@ -15484,62 +16106,48 @@ msgstr "hanya satu pola yang dapat diberikan dengan -l" #: builtin/replay.c #, c-format -msgid "'%s' is not a valid commit-ish for %s" -msgstr "'%s' bukan mirip komit yang valid untuk %s" - -#: builtin/replay.c -msgid "need some commits to replay" -msgstr "butuh beberapa komit untuk dimainkan ulang" - -#: builtin/replay.c -msgid "all positive revisions given must be references" -msgstr "semua revisi positif yang diberikan haruslah referensi" - -#: builtin/replay.c -msgid "argument to --advance must be a reference" -msgstr "argumen pada --advance harus sebuah referensi" +msgid "invalid %s value: '%s'" +msgstr "nilai %s tidak valid: '%s'" #: builtin/replay.c msgid "" -"cannot advance target with multiple sources because ordering would be ill-" -"defined" +"(EXPERIMENTAL!) git replay ([--contained] --onto=<newbase> | --" +"advance=<branch> | --revert=<branch>)\n" +"[--ref=<ref>] [--ref-action=<mode>] <revision-range>" msgstr "" -"tidak dapat memajukan target dengan banyak sumber karena pengurutannya akan " -"menjadi tidak jelas" +"(EKSPERIMENTAL!) git replay ([--contained] --onto=<dasar baru> | --" +"advance=<cabang> | --revert=<cabang>)\n" +"[--ref=<referensi>] [--ref-action=<mode>] <rentang revisi>" #: builtin/replay.c -#, c-format -msgid "invalid %s value: '%s'" -msgstr "nilai %s tidak valid: '%s'" +msgid "update all branches that point at commits in <revision-range>" +msgstr "" +"perbarui semua cabang yang menunjuk pada komit di dalam <rentang revisi>" #: builtin/replay.c -msgid "" -"(EXPERIMENTAL!) git replay ([--contained] --onto <newbase> | --advance " -"<branch>) [--ref-action[=<mode>]] <revision-range>" -msgstr "" -"(EKSPERIMENTAL!) git replay ([--contained] --onto <dasar baru> | --advance " -"<cabang>) [--ref-action[=<mode>]] <rentang revisi>" +msgid "replay onto given commit" +msgstr "mainkan ulang pada komit yang diberikan" #: builtin/replay.c msgid "make replay advance given branch" msgstr "buat pemainan ulang memajukan caban yang diberikan" #: builtin/replay.c -msgid "replay onto given commit" -msgstr "mainkan ulang pada komit yang diberikan" +msgid "revert commits onto given branch" +msgstr "balikkan komit pada cabang yang diberikan" #: builtin/replay.c -msgid "update all branches that point at commits in <revision-range>" -msgstr "" -"perbarui semua cabang yang menunjuk pada komit di dalam <rentang revisi>" +msgid "reference to update with result" +msgstr "referensi untuk diperbarui dengan hasil" #: builtin/replay.c msgid "control ref update behavior (update|print)" msgstr "atur perilaku pembaruan referensi (update|print)" #: builtin/replay.c -msgid "option --onto or --advance is mandatory" -msgstr "opsi --onto atau --advance diwajibkan" +msgid "exactly one of --onto, --advance, or --revert is required" +msgstr "" +"tepatnya salah satu dari --onto, --advance, atau --revert yang diperlukan" #: builtin/replay.c #, c-format @@ -15550,39 +16158,16 @@ msgstr "" "beberapa opsi jalan revisi akan ditimpa oleh karena bit '%s' di 'struct " "rev_info' akan dipaksakan" -#: builtin/replay.c -#, c-format -msgid "failed to begin ref transaction: %s" -msgstr "gagal memulai transaksi referensi: %s" - -#: builtin/replay.c -msgid "error preparing revisions" -msgstr "kesalahan menyiapkan revisi" - -#: builtin/replay.c -msgid "replaying down from root commit is not supported yet!" -msgstr "memainkan ulang dari komit akar belum didukung!" - -#: builtin/replay.c -msgid "replaying merge commits is not supported yet!" -msgstr "memainkan ulang komit penggabungan belum didukung!" - -#: builtin/replay.c -#, c-format -msgid "failed to update ref '%s': %s" -msgstr "gagal memperbarui referensi '%s': %s" - -#: builtin/replay.c -#, c-format -msgid "failed to commit ref transaction: %s" -msgstr "gagal mengkomit transaksi referensi: %s" - #: builtin/repo.c #, c-format msgid "key '%s' not found" msgstr "kunci '%s' tidak ditemukan" #: builtin/repo.c +msgid "--keys can only be used with --format=lines or --format=nul" +msgstr "--keys hanya dapat digunakan dengan --format=lines atau --format=nul" + +#: builtin/repo.c #, c-format msgid "invalid format '%s'" msgstr "format '%s' tidak valid" @@ -15600,6 +16185,14 @@ msgid "print all keys/values" msgstr "cetak semua kunci/nilai" #: builtin/repo.c +msgid "show keys" +msgstr "perlihatkan kunci" + +#: builtin/repo.c +msgid "--keys cannot be used with a <key> or --all" +msgstr "--keys tidak dapat digunakan dengan sebuah <kunci> atau --all" + +#: builtin/repo.c msgid "unsupported output format" msgstr "format keluaran tidak didukung" @@ -15656,6 +16249,22 @@ msgid "Disk size" msgstr "Ukuran disk" #: builtin/repo.c +msgid "Largest objects" +msgstr "Objek terbesar" + +#: builtin/repo.c +msgid "Maximum size" +msgstr "Ukuran maksimum" + +#: builtin/repo.c +msgid "Maximum parents" +msgstr "Induk maksimum" + +#: builtin/repo.c +msgid "Maximum entries" +msgstr "Entri maksimum" + +#: builtin/repo.c msgid "Repository structure" msgstr "Struktur repositori" @@ -16380,6 +16989,51 @@ msgstr "algoritma hash" msgid "Unknown hash algorithm" msgstr "algoritma hash tidak dikenal" +#: builtin/show-index.c +msgid "assuming SHA-1; use --object-format to override" +msgstr "mengasumsikan SHA-1; gunakan --object-format untuk menimpa" + +#: builtin/show-index.c +msgid "unable to read header" +msgstr "tidak dapat membaca kepala" + +#: builtin/show-index.c +msgid "unknown index version" +msgstr "versi indeks tidak dikenal" + +#: builtin/show-index.c +msgid "corrupt index file" +msgstr "berkas indeks rusak" + +#: builtin/show-index.c +#, c-format +msgid "unable to read entry %u/%u" +msgstr "tidak dapat membaca entri %u/%u" + +#: builtin/show-index.c +#, c-format +msgid "unable to read sha1 %u/%u" +msgstr "tidak dapat membaca sha1 %u/%u" + +#: builtin/show-index.c +#, c-format +msgid "unable to read crc %u/%u" +msgstr "tidak dapat membaca crc %u/%u" + +#: builtin/show-index.c +#, c-format +msgid "unable to read 32b offset %u/%u" +msgstr "tidak dapat membaca offset 32b %u/%u" + +#: builtin/show-index.c +msgid "inconsistent 64b offset index" +msgstr "indeks offset 64b tidak konsisten" + +#: builtin/show-index.c +#, c-format +msgid "unable to read 64b offset %u" +msgstr "tidak dapat membaca offset 64b %u" + #: builtin/show-ref.c msgid "" "git show-ref [--head] [-d | --dereference]\n" @@ -16681,8 +17335,12 @@ msgid "git stash pop [--index] [-q | --quiet] [<stash>]" msgstr "git stash pop [--index] [-q | --quiet] [<stase>]" #: builtin/stash.c -msgid "git stash apply [--index] [-q | --quiet] [<stash>]" -msgstr "git stash apply [--index] [-q | --quiet] [<stase>]" +msgid "" +"git stash apply [--index] [-q | --quiet] [--label-ours=<label>] [--label-" +"theirs=<label>] [--label-base=<label>] [<stash>]" +msgstr "" +"git stash apply [--index] [-q | --quiet] [--label-ours=<label>] [--label-" +"theirs=<label>] [--label-base=<label>] [<stase>]" #: builtin/stash.c msgid "git stash branch <branchname> [<stash>]" @@ -16694,19 +17352,19 @@ msgstr "git stash store [(-m | --message) <pesan>] [-q|--quiet] <komit>" #: builtin/stash.c msgid "" -"git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q " +"git stash [push] [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q " "| --quiet]\n" " [-u | --include-untracked] [-a | --all] [(-m | --message) " "<message>]\n" " [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" -" [--] [<pathspec>...]]" +" [--] [<pathspec>...]" msgstr "" -"git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q " +"git stash [push] [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q " "| --quiet]\n" " [-u | --include-untracked] [-a | --all] [(-m | --message) " "<pesan>]\n" " [--pathspec-from-file=<berkas> [--pathspec-file-nul]]\n" -" [--] [<spek jalur>...]]" +" [--] [<spek jalur>...]" #: builtin/stash.c msgid "" @@ -16800,6 +17458,22 @@ msgid "attempt to recreate the index" msgstr "coba membuat ulang indeks" #: builtin/stash.c +msgid "label" +msgstr "label" + +#: builtin/stash.c +msgid "label for the upstream side in conflict markers" +msgstr "label untuk sisi hulu pada penanda konflik" + +#: builtin/stash.c +msgid "label for the stashed side in conflict markers" +msgstr "label untuk sisi terstase pada penanda konflik" + +#: builtin/stash.c +msgid "label for the base in diff3 conflict markers" +msgstr "label untuk dasar pada penanda konflik diff3" + +#: builtin/stash.c #, c-format msgid "Dropped %s (%s)" msgstr "%s (%s) dijatuhkan" @@ -17047,6 +17721,10 @@ msgid "could not get a repository handle for submodule '%s'" msgstr "tidak dapat mendapat pegangan repositori untuk submodul '%s'" #: builtin/submodule--helper.c +msgid "git submodule--helper get-default-remote <path>" +msgstr "git submodule--helper get-default-remote <jalur>" + +#: builtin/submodule--helper.c #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "Tidak ada url yang ditemukan untuk jalur submodul '%s' di .gitmodules" @@ -17090,6 +17768,17 @@ msgstr "git submodule foreach [--quiet] [--recursive] [--] [<perintah>]" #: builtin/submodule--helper.c #, c-format +msgid "" +"failed to set a valid default config for 'submodule.%s.gitdir'. Please " +"ensure it is set, for example by running something like: 'git config " +"submodule.%s.gitdir .git/modules/%s'" +msgstr "" +"gagal menyetel konfigurasi asali untuk 'submodule.%s.gitdir'. Mohon pastikan " +"ini disetel, misalkan dengan menjalankan seperti: 'git config submodule." +"%s.gitdir .git/modules/%s'" + +#: builtin/submodule--helper.c +#, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Gagal mendaftarkan url untuk jalur submodul '%s'" @@ -17197,6 +17886,30 @@ msgid "could not fetch a revision for HEAD" msgstr "tidak dapat mengambil revisi untuk HEAD" #: builtin/submodule--helper.c +msgid "git submodule--helper gitdir <name>" +msgstr "git submodule--helper gitdir <nama>" + +#: builtin/submodule--helper.c +msgid "" +"could not set core.repositoryformatversion to 1.\n" +"Please set it for migration to work, for example:\n" +"git config core.repositoryformatversion 1" +msgstr "" +"tidak dapat menyetel core.repositoryformatversion ke 1.\n" +"Mohon setel agar migrasi dapat bekerja, seperti:\n" +"git config core.repositoryformatversion 1" + +#: builtin/submodule--helper.c +msgid "" +"could not enable submodulePathConfig extension. It is required\n" +"for migration to work. Please enable it in the root repo:\n" +"git config extensions.submodulePathConfig true" +msgstr "" +"tidak dapat mengaktifkan ekstensi submodulePathConfig. Ini diperlukan\n" +"agar migrasi dapat bekerja. Mohon aktifkan di dalam repositori akar:\n" +"git config extensions.submodulePathConfig true" + +#: builtin/submodule--helper.c #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "Mensinkronisasi url submodul untuk '%s'\n" @@ -17308,12 +18021,6 @@ msgstr "Nilai '%s' untuk submodule.alternateErrorStrategy tidak dikenal" msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Nilai '%s' untuk submodule.alternateLocation tidak dikenal" -#: builtin/submodule--helper.c submodule.c -#, c-format -msgid "refusing to create/use '%s' in another submodule's git dir" -msgstr "" -"menolak membuat/menggunakan '%s' di dalam direktori git submodul yang lain" - #: builtin/submodule--helper.c #, c-format msgid "directory not empty: '%s'" @@ -17324,6 +18031,15 @@ msgstr "direktori tidak kosong: '%s'" msgid "clone of '%s' into submodule path '%s' failed" msgstr "gagal mengkloning '%s' ke dalam jalur submodul '%s'" +#: builtin/submodule--helper.c submodule.c +#, c-format +msgid "" +"refusing to create/use '%s' in another submodule's git dir. Enabling " +"extensions.submodulePathConfig should fix this." +msgstr "" +"menolak membuat/menggunakan '%s' di dalam direktori git submodul lain. " +"Mengaktifkan extensions.submodulePathConfig harusnya memperbaiki ini." + #: builtin/submodule--helper.c #, c-format msgid "could not get submodule directory for '%s'" @@ -18330,6 +19046,18 @@ msgstr "jangan coba <direktori>.git/ jika <direktori> bukan direktori Git" msgid "interrupt transfer after <n> seconds of inactivity" msgstr "interupsi transfer setelah <n> detik niraktivitas" +#: builtin/url-parse.c +msgid "git url-parse [-c <component>] [--] <url>..." +msgstr "git url-parse [-c <component>] [--] <url>..." + +#: builtin/url-parse.c +msgid "component" +msgstr "komponen" + +#: builtin/url-parse.c +msgid "which URL component to extract" +msgstr "komponen URL untuk diekstrak" + #: builtin/verify-commit.c msgid "git verify-commit [-v | --verbose] [--raw] <commit>..." msgstr "git verify-commit [-v | --verbose] [--raw] <komit>..." @@ -18440,8 +19168,8 @@ msgid "report pruned working trees" msgstr "laporkan pohon kerja terpangkas" #: builtin/worktree.c -msgid "expire working trees older than <time>" -msgstr "kadaluarsakan pohon kerja yang lebih tua dari <waktu>" +msgid "prune missing working trees older than <time>" +msgstr "pangkas pohon kerja yang hilang yang lebih tua dari <waktu>" #: builtin/worktree.c #, c-format @@ -18524,15 +19252,8 @@ msgid "Preparing worktree (detached HEAD %s)" msgstr "Menyiapkan pohon kerja (HEAD terpisah %s)" #: builtin/worktree.c -#, c-format -msgid "" -"HEAD points to an invalid (or orphaned) reference.\n" -"HEAD path: '%s'\n" -"HEAD contents: '%s'" -msgstr "" -"HEAD menunjuk pada referensi tidak valid (atau yatim).\n" -"Jalur HEAD: '%s'\n" -"Isi HEAD: '%s'" +msgid "HEAD points to an invalid (or orphaned) reference.\n" +msgstr "HEAD menunjuk pada referensi yang tidak valid (atau yatim).\n" #: builtin/worktree.c msgid "" @@ -18607,9 +19328,8 @@ msgid "show extended annotations and reasons, if available" msgstr "perlihatkan anotasi dan alasan yang diperpanjang, jika ada" #: builtin/worktree.c -msgid "add 'prunable' annotation to worktrees older than <time>" -msgstr "" -"tambahkan anotasi 'dapat dipangkas' ke pohon kerja lebih tua dari <time>" +msgid "add 'prunable' annotation to missing worktrees older than <time>" +msgstr "tambahkan anotasi 'prunable' ke pohon kerja yang lebih tua dari <time>" #: builtin/worktree.c msgid "terminate records with a NUL character" @@ -19211,6 +19931,10 @@ msgid "Prepare patches for e-mail submission" msgstr "Siapkan tambalan untuk pengiriman surel" #: command-list.h +msgid "EXPERIMENTAL: Pretty format revisions on demand" +msgstr "EKSPERIMENTAL: Format cantik revisi sesuai permintaan" + +#: command-list.h msgid "Verifies the connectivity and validity of the objects in the database" msgstr "Verifikasi hubungan dan validitas objek di dalam basis data" @@ -19239,8 +19963,12 @@ msgid "Display help information about Git" msgstr "Perlihatkan bantuan mengenai Git" #: command-list.h -msgid "Run git hooks" -msgstr "Jalankan kait git" +msgid "EXPERIMENTAL: Rewrite history" +msgstr "EKSPERIMENTAL: Tulis ulang riwayat" + +#: command-list.h +msgid "Run Git hooks" +msgstr "Jalankan kait Git" #: command-list.h msgid "Server side implementation of Git over HTTP" @@ -19378,8 +20106,8 @@ msgid "Pack heads and tags for efficient repository access" msgstr "Pak kepala dan tag untuk akses repositori yang efisien" #: command-list.h -msgid "Compute unique ID for a patch" -msgstr "Hitung ID unik untuk sebuah tambalan" +msgid "Compute unique IDs for patches" +msgstr "Hitung ID unik untuk tambalan" #: command-list.h msgid "Prune all unreachable objects from the object database" @@ -19500,7 +20228,7 @@ msgid "Restricted login shell for Git-only SSH access" msgstr "Cangkang masuk terbatas untuk akses SSH hanya Git" #: command-list.h -msgid "Summarize 'git log' output" +msgid "Summarize `git log` output" msgstr "Rangkum keluaran 'git log'" #: command-list.h @@ -19588,6 +20316,10 @@ msgid "Send objects packed back to git-fetch-pack" msgstr "Kirim objek terpak kembali ke git-fetch-pack" #: command-list.h +msgid "Parse and extract git URL components" +msgstr "Uraikan dan ekstrak komponen URL git" + +#: command-list.h msgid "Show a Git logical variable" msgstr "Perlihatkan variabel logikal Git" @@ -20083,6 +20815,11 @@ msgstr "Memverifikasi komit di dalam grafik komit" msgid "could not parse commit %s" msgstr "tidak dapat menguraikan komit %s" +#: commit.c object.c +#, c-format +msgid "object %s is a %s, not a %s" +msgstr "objek %s adalah %s, bukan %s" + #: commit.c #, c-format msgid "%s %s is not a commit!" @@ -20192,7 +20929,7 @@ msgstr "kasus tak tertangani di 'has_worktree_moved': %d" msgid "health thread wait failed [GLE %ld]" msgstr "antri utas kesehatan gagal [GLE %ld]" -#: compat/fsmonitor/fsm-ipc-darwin.c +#: compat/fsmonitor/fsm-ipc-unix.c #, c-format msgid "Invalid path: %s" msgstr "Jalur tidak valid: %s" @@ -20205,6 +20942,50 @@ msgstr "tidak dapat membuat FSEventStream." msgid "Failed to start the FSEventStream" msgstr "Gagal memulai FSEventStream" +#: compat/fsmonitor/fsm-listen-linux.c +msgid "inotify watch limit reached; increase fs.inotify.max_user_watches" +msgstr "batas lihat inotify tercapai; naikkan fs.inotify.max_user_watches" + +#: compat/fsmonitor/fsm-listen-linux.c +#, c-format +msgid "inotify_add_watch('%s') failed" +msgstr "inotify_add_watch('%s') gagal" + +#: compat/fsmonitor/fsm-listen-linux.c +msgid "inotify_rm_watch() failed" +msgstr "inotify_rm_watch() gagal" + +#: compat/fsmonitor/fsm-listen-linux.c compat/fsmonitor/fsm-path-utils-darwin.c +#, c-format +msgid "opendir('%s') failed" +msgstr "opendir('%s') gagal" + +#: compat/fsmonitor/fsm-listen-linux.c compat/fsmonitor/fsm-path-utils-darwin.c +#, c-format +msgid "lstat('%s') failed" +msgstr "lstat('%s') gagal" + +#: compat/fsmonitor/fsm-listen-linux.c compat/fsmonitor/fsm-path-utils-darwin.c +#, c-format +msgid "closedir('%s') failed" +msgstr "closedir('%s') gagal" + +#: compat/fsmonitor/fsm-listen-linux.c +msgid "inotify_init1() failed" +msgstr "inotify_init1() gagal" + +#: compat/fsmonitor/fsm-listen-linux.c +msgid "closing inotify file descriptor failed" +msgstr "gagal menutup deskriptor berkas inotify" + +#: compat/fsmonitor/fsm-listen-linux.c +msgid "reading inotify message stream failed" +msgstr "gagal membaca arus pesan inotify" + +#: compat/fsmonitor/fsm-listen-linux.c +msgid "polling inotify message stream failed" +msgstr "gagal menjajak pendapat arus pesan inotify" + #: compat/fsmonitor/fsm-listen-win32.c #, c-format msgid "[GLE %ld] could not convert path to UTF-8: '%.*ls'" @@ -20237,24 +21018,9 @@ msgstr "tidak dapat membaca perubahan direktori [GLE %ld]" #: compat/fsmonitor/fsm-path-utils-darwin.c #, c-format -msgid "opendir('%s') failed" -msgstr "opendir('%s') gagal" - -#: compat/fsmonitor/fsm-path-utils-darwin.c -#, c-format -msgid "lstat('%s') failed" -msgstr "lstat('%s') gagal" - -#: compat/fsmonitor/fsm-path-utils-darwin.c -#, c-format msgid "strbuf_readlink('%s') failed" msgstr "strbuf_readlink('%s') gagal" -#: compat/fsmonitor/fsm-path-utils-darwin.c -#, c-format -msgid "closedir('%s') failed" -msgstr "closedir('%s') gagal" - #: compat/fsmonitor/fsm-path-utils-win32.c #, c-format msgid "[GLE %ld] unable to open for read '%ls'" @@ -20582,11 +21348,6 @@ msgstr "nilai konfigurasi numerik '%s' jelek untuk '%s' dalam %s: %s" #: config.c #, c-format -msgid "bad boolean config value '%s' for '%s'" -msgstr "nilai konfigurasi boolean '%s' jelek untuk '%s'" - -#: config.c -#, c-format msgid "failed to expand user dir in: '%s'" msgstr "gagal menjabarkan direktori pengguna di: '%s'" @@ -20843,11 +21604,6 @@ msgid "expected flush after ref listing" msgstr "bilasan diharapkan setelah penyebutan referensi" #: connect.c -#, c-format -msgid "protocol '%s' is not supported" -msgstr "protokol '%s' tidak didukung" - -#: connect.c msgid "unable to set SO_KEEPALIVE on socket" msgstr "tidak dapat menyetel SO_KEEPALIVE pada soket" @@ -20911,6 +21667,11 @@ msgid "cannot start proxy %s" msgstr "tidak dapat memulai proksi %s" #: connect.c +#, c-format +msgid "protocol '%s' is not supported" +msgstr "protokol '%s' tidak didukung" + +#: connect.c msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "" "tidak ada jalur yang disebutkan; lihat 'git help pull' untuk sintaks url " @@ -21414,6 +22175,10 @@ msgid "unknown value after ws-error-highlight=%.*s" msgstr "nilai tidak dikenal setelah ws-error-highlight=%.*s" #: diff.c +msgid "--find-object requires a git repository" +msgstr "--find-object memerlukan repositori git" + +#: diff.c #, c-format msgid "unable to resolve '%s'" msgstr "tidak dapat menguraikan '%s'" @@ -21463,6 +22228,11 @@ msgstr "gagal menguraikan parameter opsi --submodule: '%s'" #: diff.c #, c-format +msgid "%s expects a non-negative integer" +msgstr "%s memerlukan bilangan bulat non-negatif" + +#: diff.c +#, c-format msgid "bad --word-diff argument: %s" msgstr "argumen --word-diff jelek: %s" @@ -21906,10 +22676,6 @@ msgid "<depth>" msgstr "<kedalaman>" #: diff.c -msgid "maximum tree depth to recurse" -msgstr "kedalaman pohon maksimal untuk diselami" - -#: diff.c msgid "<file>" msgstr "<berkas>" @@ -22342,6 +23108,11 @@ msgid "git fetch-pack: expected response end packet" msgstr "git fetch-pack: paket jawaban akhir diharapkan" #: fetch-pack.c +#, c-format +msgid "couldn't resolve 'auto' filter '%s': %s" +msgstr "tidak dapat menguraikan penyaring 'auto' '%s': %s" + +#: fetch-pack.c msgid "no matching remote head" msgstr "tidak ada kepala remote yang cocok" @@ -22846,6 +23617,89 @@ msgstr "" "dieksekusi. Anda dapat menonaktifkan peringatan ini dengan\n" "`git config set advice.ignoredHook false`." +#: hook.c +#, c-format +msgid "hook.jobs must be an integer, ignoring: '%s'" +msgstr "hook.jobs harus bilangan bulat, abaikan: '%s'" + +#: hook.c +#, c-format +msgid "hook.jobs must be a positive integer or -1, ignoring: '%s'" +msgstr "hook.jobs harus bilangan bulat positif atau -1, abaikan: '%s'" + +#: hook.c +#, c-format +msgid "" +"hook friendly-name '%s' collides with a known event name; please choose a " +"different friendly-name" +msgstr "" +"nama ramah kait '%s' bertabrakan dengan nama kejadian yang dikenal; mohon " +"pilih nama ramah lainnya" + +#: hook.c +#, c-format +msgid "" +"hook friendly-name '%s' is the same as its event; this may cause ambiguity " +"with hook.%s.enabled" +msgstr "" +"nama ramah kait '%s' sama dengan kejadiannya; ini dapat menyebabkan " +"kerancuan dengan hook.%s.enabled" + +#: hook.c +#, c-format +msgid "hook.%s.parallel must be a boolean, ignoring: '%s'" +msgstr "hook.%s.parallel harus boolean, abaikan: '%s'" + +#: hook.c +#, c-format +msgid "hook.%s.jobs must be an integer, ignoring: '%s'" +msgstr "hook.%s.jobs harus bilangan bulat, abaikan: '%s'" + +#: hook.c +#, c-format +msgid "hook.%s.jobs must be a positive integer or -1, ignoring: '%s'" +msgstr "hook.%s.jobs harus bilangan bulat positif atau -1, abaikan: '%s'" + +#: hook.c +#, c-format +msgid "" +"hook.%s.jobs is set but '%s' looks like a hook friendly-name, not an event " +"name; hook.<event>.jobs uses the event name (e.g. hook.post-receive.jobs), " +"so this setting will be ignored" +msgstr "" +"hook.%s.jobs disetel tapi '%s' sepertinya nama ramah kait, bukan nama " +"kejadian; hook.<kejadian>.jobs menggunakan nama kejadian (seperti hook.post-" +"receive.jobs), jadinya setelan ini akan diabaikan" + +#: hook.c +#, c-format +msgid "disabled hook '%s' has no command configured" +msgstr "" +"kait yang dinonaktifkan '%s' tidak punya perintah yang dikonfigurasikan" + +#: hook.c +#, c-format +msgid "" +"'hook.%s.command' must be configured or 'hook.%s.event' must be removed; " +"aborting." +msgstr "" +"'hook.%s.command' harus dikonfigurasikan atau 'hook.%s.event' harus dihapus; " +"membatalkan." + +#: hook.c +#, c-format +msgid "" +"hook '%s' is not marked as parallel=true, running in parallel anyway due to " +"-j%u" +msgstr "" +"kait '%s' tidak ditandai sebagai parallel=true, tetap menjalankan secara " +"paralel oleh karena -j%u" + +#: hook.c +#, c-format +msgid "%s must be a positive integer or -1, ignoring: %d" +msgstr "%s harus bilangan bulat positif atau -1, abaikan: %d" + #: http-fetch.c msgid "not a git repository" msgstr "bukan sebuah repositori git" @@ -22909,6 +23763,26 @@ msgstr "" " diminta: %s\n" " pengalihan: %s" +#: http.c +#, c-format +msgid "" +"response requested a delay greater than http.maxRetryTime (%ld > %ld seconds)" +msgstr "" +"jawaban meminta jeda lebih lama daripada http.maxRetryTime (%ld > %ld detik)" + +#: http.c +#, c-format +msgid "" +"configured http.retryAfter exceeds http.maxRetryTime (%ld > %ld seconds)" +msgstr "" +"http.retryAfter yang terkonfigurasi melebihi http.maxRetryTime (%ld > %ld " +"detik)" + +#: http.c +#, c-format +msgid "rate limited, waiting %ld seconds before retry" +msgstr "laju terbatasi, menunggu %ld detik sebelum mencoba lagi" + #: http.h #, c-format msgid "" @@ -23009,6 +23883,10 @@ msgstr "" "(contohnya 'git config imap.folder Drafts')" #: list-objects-filter-options.c +msgid "'auto' filter not supported by this command" +msgstr "penyaring 'auto' tidak didukung oleh perintah ini" + +#: list-objects-filter-options.c msgid "expected 'tree:<depth>'" msgstr "'tree:<kedalaman> diharapkan'" @@ -23032,6 +23910,10 @@ msgid "must escape char in sub-filter-spec: '%c'" msgstr "harus melarikan karakter pada spek subpenyaring: '%c'" #: list-objects-filter-options.c +msgid "an 'auto' filter cannot be combined" +msgstr "sebuah penyaring 'auto' tidak dapat dikombinasikan" + +#: list-objects-filter-options.c msgid "expected something after combine:" msgstr "sesuatu setelah pencampuran diharapkan:" @@ -23040,6 +23922,10 @@ msgid "multiple filter-specs cannot be combined" msgstr "spek penyaring lebih dari satu tidak dapat dicampurkan" #: list-objects-filter-options.c +msgid "an 'auto' filter is incompatible with any other filter" +msgstr "sebuah penyaring 'auto' tidak kompatibel dengan penyaring yang lainnya" + +#: list-objects-filter-options.c msgid "unable to upgrade repository format to support partial clone" msgstr "" "tidak dapat meningkatkan format repositori untuk mendukung klon parsial" @@ -23052,7 +23938,7 @@ msgstr "argumen" msgid "object filtering" msgstr "penyaringan objek" -#: list-objects-filter.c +#: list-objects-filter.c path-walk.c #, c-format msgid "unable to access sparse blob in '%s'" msgstr "tidak dapat mengakses blob tipis di '%s'" @@ -23079,21 +23965,49 @@ msgstr "tidak dapat memuat pohon akar untuk komit %s" #: lockfile.c #, c-format +msgid "could not write lock pid file '%s'" +msgstr "tidak dapat menulis berkas kunci pid '%s'" + +#: lockfile.c +#, c-format +msgid "malformed lock pid file '%s'" +msgstr "berkas kunci pid '%s' rusak" + +#: lockfile.c +#, c-format msgid "" -"Unable to create '%s.lock': %s.\n" +"Unable to create '%s': %s.\n" "\n" -"Another git process seems to be running in this repository, e.g.\n" -"an editor opened by 'git commit'. Please make sure all processes\n" -"are terminated then try again. If it still fails, a git process\n" -"may have crashed in this repository earlier:\n" -"remove the file manually to continue." msgstr "" -"Tidak dapat membuat '%s.lock': %s.\n" +"Tidak dapat membuat '%s': %s.\n" "\n" -"Sepertinya proses git lainnya berjalan pada repositori ini, seperti\n" -"penyunting yang dibuka oleh 'git commit'. Mohon pastikan semua proses\n" -"berhenti dan coba lagi. Jika masih gagal, mungkin sebuah proses git hancur\n" -"pada repositori ini sebelumnya: hapus berkas secara manual untuk melanjutkan." + +#: lockfile.c +#, c-format +msgid "" +"Lock may be held by process %<PRIuMAX>; if no git process is running, the " +"lock file may be stale (PIDs can be reused)" +msgstr "" +"Kunci mungkin dipegang oleh proses %<PRIuMAX>; jika tidak ada proses git " +"yang berjalan, berkas kunci mungkin sudah kadaluarsa (PID bisa digunakan " +"ulang)" + +#: lockfile.c +#, c-format +msgid "" +"Lock was held by process %<PRIuMAX>, which is no longer running; the lock " +"file appears to be stale" +msgstr "" +"Kunci dipegang oleh proses %<PRIuMAX>, yang tidak lagi berjalan; berkas " +"kunci sepertinya kadaluarsa" + +#: lockfile.c +msgid "" +"Another git process seems to be running in this repository, or the lock file " +"may be stale" +msgstr "" +"Proses git lainnya sepertinya sedang berjalan di dalam repositori ini, atau " +"berkas kunci bisa jadi kadaluarsa" #: lockfile.c #, c-format @@ -23458,8 +24372,17 @@ msgid "malformed line: %s" msgstr "baris jelek '%s'." #: midx-write.c -msgid "could not load pack" -msgstr "tidak dapat memuat pak" +#, c-format +msgid "could not load pack %d" +msgstr "tidak dapat memuat pak %d" + +#: midx-write.c +msgid "too many packs, unable to compact" +msgstr "terlalu banyak pak, tidak dapat memampatkan" + +#: midx-write.c pack-revindex.c +msgid "could not determine preferred pack" +msgstr "tidak dapat menentukan pak terpilih" #: midx-write.c #, c-format @@ -23472,11 +24395,25 @@ msgid "failed to clear multi-pack-index at %s" msgstr "gagal membersihkan indeks multipak pada %s" #: midx-write.c +#, c-format +msgid "unknown MIDX version: %d" +msgstr "versi MIDX tidak dikenal: %d" + +#: midx-write.c +msgid "cannot perform MIDX compaction with v1 format" +msgstr "tidak dapat melakukan pemampatan MIDX dengan format v1" + +#: midx-write.c msgid "ignoring existing multi-pack-index; checksum mismatch" msgstr "abaikan indeks multipak yang sudah ada; checksum tidak cocok" #: midx-write.c #, c-format +msgid "could not find base MIDX '%s'" +msgstr "tidak dapat menemukan MIDX dasar '%s'" + +#: midx-write.c +#, c-format msgid "could not load reverse index for MIDX %s" msgstr "tidak dapat memuat indeks balik untuk MIDX %s" @@ -23529,7 +24466,7 @@ msgstr "tidak dapat menulis bitmap multipak" msgid "too many multi-pack-indexes" msgstr "terlalu banyak indeks multipak" -#: midx-write.c +#: midx-write.c repack-midx.c msgid "unable to open multi-pack-index chain file" msgstr "tidak dapat membuka berkas rantai indeks multipak" @@ -23683,6 +24620,11 @@ msgid "multi-pack-index large offset out of bounds" msgstr "offset indeks multipak besar di luar jangkauan" #: midx.c +#, c-format +msgid "failed to clear multi-pack-index chain at %s" +msgstr "gagal membersihkan rantai indeks multipak pada %s" + +#: midx.c msgid "multi-pack-index file exists, but failed to parse" msgstr "berkas indeks multipak ada, tetapi gagal diurai" @@ -23809,7 +24751,7 @@ msgstr "tidak dapat memetakan %s %s pada objek komit" msgid "Failed to convert object from %s to %s" msgstr "Gagal mengkonversi objek dari %s ke %s" -#: object-file.c +#: object-file.c odb/source-loose.c #, c-format msgid "object file %s is empty" msgstr "berkas objek %s kosong" @@ -23826,35 +24768,6 @@ msgstr "sampah pada ujung berkas objek '%s'" #: object-file.c #, c-format -msgid "unable to open loose object %s" -msgstr "tidak dapat membuka objek longgar %s" - -#: object-file.c -#, c-format -msgid "unable to parse %s header" -msgstr "tidak dapat menguraikan kepala %s" - -#: object-file.c -msgid "invalid object type" -msgstr "tipe objek tidak valid" - -#: object-file.c -#, c-format -msgid "unable to unpack %s header" -msgstr "tidak dapat membongkar kepala %s" - -#: object-file.c -#, c-format -msgid "header for %s too long, exceeds %d bytes" -msgstr "kepala untuk %s terlalu panjang, melebihi %d bita" - -#: object-file.c -#, c-format -msgid "loose object %s (stored in %s) is corrupt" -msgstr "objek longgar %s (disimpan di %s) rusak" - -#: object-file.c -#, c-format msgid "unable to open %s" msgstr "tidak dapat membuka %s" @@ -23913,8 +24826,8 @@ msgstr "kebingungan oleh data sumber objek tidak stabil untuk %s" #: object-file.c #, c-format -msgid "write stream object %ld != %<PRIuMAX>" -msgstr "tulis objek arus %ld != %<PRIuMAX>" +msgid "write stream object %<PRIuMAX> != %<PRIuMAX>" +msgstr "tulis objek arus %<PRIuMAX> != %<PRIuMAX>" #: object-file.c #, c-format @@ -24184,11 +25097,6 @@ msgstr "tipe objek tidak valid \"%s\"" #: object.c #, c-format -msgid "object %s is a %s, not a %s" -msgstr "objek %s adalah %s, bukan %s" - -#: object.c -#, c-format msgid "object %s has unknown type id %d" msgstr "objek %s punya id tipe tidak dikenal %d" @@ -24199,6 +25107,11 @@ msgstr "tidak dapat menguraikan objek: %s" #: object.c #, c-format +msgid "unable to open object stream for %s" +msgstr "tidak dapat membuka arus objek untuk %s" + +#: object.c +#, c-format msgid "hash mismatch %s" msgstr "hash tidak cocok %s" @@ -24218,18 +25131,6 @@ msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s: mengabaikan penyimpanan objek alternatif, bersarang terlalu dalam" #: odb.c -msgid "unable to fdopen alternates lockfile" -msgstr "tidak dapat men-fdopen berkas kunci alternatif" - -#: odb.c -msgid "unable to read alternates file" -msgstr "tidak dapat membaca berkas alternatif" - -#: odb.c -msgid "unable to move new alternates file into place" -msgstr "tidak dapat memindahkan berkas alternatif baru ke tempatnya" - -#: odb.c #, c-format msgid "path '%s' does not exist" msgstr "jalur '%s' tidak ada" @@ -24282,9 +25183,55 @@ msgstr "pemetaan %s ke %s hilang" #: odb.c #, c-format +msgid "%s is not a valid object" +msgstr "%s bukan sebuah objek valid" + +#: odb.c +#, c-format msgid "%s is not a valid '%s' object" msgstr "%s bukan sebuah objek '%s' valid" +#: odb/source-files.c +msgid "unable to fdopen alternates lockfile" +msgstr "tidak dapat men-fdopen berkas kunci alternatif" + +#: odb/source-files.c +msgid "unable to read alternates file" +msgstr "tidak dapat membaca berkas alternatif" + +#: odb/source-files.c +msgid "unable to move new alternates file into place" +msgstr "tidak dapat memindahkan berkas alternatif baru ke tempatnya" + +#: odb/source-loose.c +#, c-format +msgid "unable to open loose object %s" +msgstr "tidak dapat membuka objek longgar %s" + +#: odb/source-loose.c +#, c-format +msgid "unable to parse %s header" +msgstr "tidak dapat menguraikan kepala %s" + +#: odb/source-loose.c +msgid "invalid object type" +msgstr "tipe objek tidak valid" + +#: odb/source-loose.c +#, c-format +msgid "unable to unpack %s header" +msgstr "tidak dapat membongkar kepala %s" + +#: odb/source-loose.c +#, c-format +msgid "header for %s too long, exceeds %d bytes" +msgstr "kepala untuk %s terlalu panjang, melebihi %d bita" + +#: odb/source-loose.c +#, c-format +msgid "loose object %s (stored in %s) is corrupt" +msgstr "objek longgar %s (disimpan di %s) rusak" + #: pack-bitmap-write.c #, c-format msgid "duplicate entry when writing bitmap index: %s" @@ -24550,10 +25497,6 @@ msgstr "posisi indeks balik tidak valid pada %<PRIu64>: %<PRIu32> != %<PRIu32>" msgid "multi-pack-index reverse-index chunk is the wrong size" msgstr "bingkah indeks balik multipak salah ukuran" -#: pack-revindex.c -msgid "could not determine preferred pack" -msgstr "tidak dapat menentukan pak terpilih" - #: pack-write.c msgid "cannot both write and verify reverse index" msgstr "tidak dapat kedua-duanya menulis dan memverifikasi indeks balik" @@ -24584,6 +25527,11 @@ msgstr "berkas pak %s tidak dapat dipetakan%s" #: packfile.c #, c-format +msgid "could not load .mtimes for cruft pack '%s'" +msgstr "tidak dapat memuat .mtimes untuk pak sisa '%s'" + +#: packfile.c +#, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "offset sebelum awal indeks pak untuk %s (indeks rusak?)" @@ -24846,6 +25794,30 @@ msgid "failed to find tag %s" msgstr "gagal menemukan tag %s" #: path-walk.c +#, c-format +msgid "tree:%lu filter not supported by the path-walk API" +msgstr "penyaring tree:%lu tidak didukung oleh API path-walk" + +#: path-walk.c +msgid "sparse filter cannot be combined with existing sparse patterns" +msgstr "" +"penyaring tipis tidak dapat dikombinasikan dengan pola tipis yang sudah ada" + +#: path-walk.c +#, c-format +msgid "unable to parse sparse filter data in '%s'" +msgstr "tidak dapat menguraikan data penyaring tipis di '%s'" + +#: path-walk.c +msgid "sparse filter is not cone-mode compatible" +msgstr "penyaring tipis tidak kompatibel dengan mode kerucut" + +#: path-walk.c +#, c-format +msgid "object filter '%s' not supported by the path-walk API" +msgstr "penyaring objek '%s' tidak didukung oleh API path-walk" + +#: path-walk.c msgid "failed to setup revision walk" msgstr "gagal men-setup jalan revisi" @@ -25008,6 +25980,11 @@ msgstr "tidak dapat membuat lstat terutas: %s" msgid "unable to parse --pretty format" msgstr "tidak dapat menguraikan format --pretty" +#: pretty.c +#, c-format +msgid "%s is not supported by this command" +msgstr "%s tidak didukung oleh perintah ini" + #: promisor-remote.c msgid "lazy fetching disabled; some objects may not be available" msgstr "pengambilan malas dimatikan; beberapa objek mungkin tidak tersedia" @@ -25042,23 +26019,45 @@ msgstr "bidang '%s' tidak didukung pada konfiugrasi '%s'" #: promisor-remote.c #, c-format -msgid "no or empty URL advertised for remote '%s'" -msgstr "tidak ada URL atau URL kosong yang diiklankan untuk remote '%s'" +msgid "" +"known remote named '%s' but with URL '%s' instead of '%s', ignoring this " +"remote" +msgstr "" +"remote yang dikenal bernama '%s' tapi dengan URL '%s' daripada '%s', abaikan " +"remote ini" #: 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'" +msgid "invalid element '%s' from remote info" +msgstr "elemen '%s' invalid dari info remote" #: promisor-remote.c #, c-format -msgid "invalid element '%s' from remote info" -msgstr "elemen '%s' invalid dari info remote" +msgid "" +"server advertised a promisor remote without a name or URL: '%s', ignoring " +"this remote" +msgstr "" +"peladen mengiklankan remote pejanji tanpa nama atau URL: '%s', abaikan " +"remote ini" + +#: promisor-remote.c +#, c-format +msgid "" +"Storing new %s from server for remote '%s'.\n" +" '%s' -> '%s'\n" +msgstr "" +"Menyimpan %s baru dari peladen untuk remote '%s'.\n" +" '%s' -> '%s'\n" + +#: promisor-remote.c +#, c-format +msgid "invalid filter '%s' for remote '%s' will not be stored: %s" +msgstr "penyaring tidak valid '%s' untuk remote '%s' tidak akan disimpan: %s" #: promisor-remote.c #, c-format -msgid "server advertised a promisor remote without a name or URL: %s" -msgstr "peladen mengiklankan remote pejanji tanpa nama atau URL: %s" +msgid "invalid token '%s' for remote '%s' will not be stored" +msgstr "token tidak valid '%s' untuk remote '%s' tidak akan disimpan" #: promisor-remote.c #, c-format @@ -25070,6 +26069,11 @@ msgstr "nilai '%s' tidak dikenal untuk opsi konfigurasi '%s'" msgid "accepted promisor remote '%s' not found" msgstr "remote penjanji yang diterima '%s' tidak ditemukan" +#: promisor-remote.c +#, c-format +msgid "promisor remote '%s' advertised invalid filter '%s': %s" +msgstr "remote penjanji '%s' mengiklankan penyaring tidak valid '%s': %s" + #: protocol-caps.c msgid "object-info: expected flush after arguments" msgstr "object-info: bilasan diharapkan setelah argumen" @@ -25090,8 +26094,8 @@ msgstr "%s harus non-negatif, menggunakan yang asali" #: pseudo-merge.c #, c-format -msgid "%s must be between 0 and 1, using default" -msgstr "%s harus di antara 0 atau 1, menggunakan yang asali" +msgid "%s must be between 0 (exclusive) and 1, using default" +msgstr "%s harus di antara 0 (eksklusif) dan 1, menggunakan yang asali" #: pseudo-merge.c #, c-format @@ -25393,6 +26397,15 @@ msgstr "%s: tidak dapat menurunkan ke tahap #0" #: read-cache.c #, c-format +msgid "" +"Skipping submodule due to ignore=all: %s\n" +"Use --force if you really want to add the submodule." +msgstr "" +"Melewatkan submodul karena ignore=all: %s\n" +"Gunakan --force jika Anda ingin benar-benar menambahkan submodul." + +#: read-cache.c +#, c-format msgid "unexpected diff status %c" msgstr "status diff tak diharapkan %c" @@ -25835,6 +26848,11 @@ msgid "no reflog for '%s'" msgstr "tidak ada log referensi untuk '%s'" #: refs.c +#, c-format +msgid "in '%s' phase, update aborted by the reference-transaction hook" +msgstr "pada fase '%s', pembaruan dibatalkan oleh kait referense-transaction" + +#: refs.c msgid "Checking references consistency" msgstr "Memeriksa konsistensi referensi" @@ -25952,6 +26970,16 @@ msgstr "menolak memaksa dan melewatkan pembuatan reflog" #: refs.c #, c-format +msgid "trying to write ref '%s' with nonexistent object %s" +msgstr "mencoba menulis referensi '%s' dengan objek %s yang tak ada" + +#: refs.c +#, c-format +msgid "trying to write non-commit object %s to branch '%s'" +msgstr "mencoba menulis objek non-komit %s pada cabang '%s'" + +#: refs.c +#, c-format msgid "update_ref failed for ref '%s': %s" msgstr "update_ref gagal untuk referensi '%s': %s" @@ -25965,10 +26993,6 @@ msgid "ref updates forbidden inside quarantine environment" msgstr "pembaruan referensi tidak diperbolehkan di dalam lingkungan karantina" #: refs.c -msgid "ref updates aborted by hook" -msgstr "pembaruan referensi dihentikan oleh kait" - -#: refs.c #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "'%s' ada; tidak dapat membuat '%s'" @@ -26062,16 +27086,6 @@ msgstr "nama referensi berbahaya: %s" #: refs/reftable-backend.c #, c-format -msgid "trying to write ref '%s' with nonexistent object %s" -msgstr "mencoba menulis referensi '%s' dengan objek %s yang tak ada" - -#: refs/reftable-backend.c -#, c-format -msgid "trying to write non-commit object %s to branch '%s'" -msgstr "mencoba menulis objek non-komit %s pada cabang '%s'" - -#: refs/reftable-backend.c -#, c-format msgid "" "multiple updates for 'HEAD' (including one via its referent '%s') are not " "allowed" @@ -26211,6 +27225,16 @@ msgstr "tidak dapat mengakses '%s' dengan konfigurasi http.pinnedPubkey: %s" #: remote-curl.c #, c-format +msgid "rate limited by '%s', please try again in %ld seconds" +msgstr "laju dibatasi oleh '%s', coba lagi dalam %ld detik" + +#: remote-curl.c +#, c-format +msgid "rate limited by '%s', please try again later" +msgstr "laju dibatasi oleh '%s', coba lagi nanti" + +#: remote-curl.c +#, c-format msgid "unable to access '%s': %s" msgstr "tidak dapat mengakses '%s': %s" @@ -26547,12 +27571,12 @@ msgstr "* Abaikan referensi lucu '%s' secara lokal" #: remote.c #, c-format -msgid "Your branch is based on '%s', but the upstream is gone.\n" -msgstr "Cabang Anda didasarkan pada '%s', tapi hulu sudah tiada.\n" - -#: remote.c -msgid " (use \"git branch --unset-upstream\" to fixup)\n" -msgstr " (gunakan \"git branch --unset-upstream\" untuk perbaiki)\n" +msgid "" +"ignoring value '%s' for status.compareBranches, only @{upstream} and @{push} " +"are supported" +msgstr "" +"mengabaikan nilai '%s' untuk status.compareBranches, hanya @{upstream} dan " +"@{push} yang didukung" #: remote.c #, c-format @@ -26618,6 +27642,15 @@ msgstr "" #: remote.c #, c-format +msgid "Your branch is based on '%s', but the upstream is gone.\n" +msgstr "Cabang Anda didasarkan pada '%s', tapi hulu sudah tiada.\n" + +#: remote.c +msgid " (use \"git branch --unset-upstream\" to fixup)\n" +msgstr " (gunakan \"git branch --unset-upstream\" untuk perbaiki)\n" + +#: remote.c +#, c-format msgid "cannot parse expected object name '%s'" msgstr "tidak dapat mengurai nama object yang diharapkan '%s'" @@ -26655,6 +27688,43 @@ msgstr "tidak dapat menutup berkas sementara jepretan referensi" msgid "could not remove stale bitmap: %s" msgstr "tidak dapt memindahkan bitmap basi: %s" +#: repack-midx.c +msgid "no packs to write MIDX during compaction" +msgstr "tidak ada pak untuk ditulis saat pemampatan" + +#: repack-midx.c +#, c-format +msgid "expected exactly one line during MIDX write, got: %<PRIuMAX>" +msgstr "tepatnya satu baris diharapkan ketika menulis MIDX, dapat: %<PRIuMAX>" + +#: repack-midx.c +#, c-format +msgid "unexpected MIDX output: '%s'" +msgstr "keluaran MIDX tidak diharapkan: '%s'" + +#: repack-midx.c +#, c-format +msgid "could not load pack %<PRIu32> from MIDX" +msgstr "tidak dapat memuat pak %<PRIu32> dari MIDX" + +#: repack-midx.c +msgid "too many objects in MIDX compaction step" +msgstr "terlalu banyak objek pada tahap pemampatan MIDX" + +#: repack-midx.c +#, c-format +msgid "could not find preferred pack for MIDX %s" +msgstr "tidak dapat menemukan pak pilihan untuk MIDX %s" + +#: repack-midx.c +msgid "unable to generate compaction plan" +msgstr "tidak dapat membuat rencana pemampatan" + +#: repack-midx.c +#, c-format +msgid "unable to execute compaction step %<PRIuMAX>" +msgstr "tidak dapat menjalankan tahap pemampatan %<PRIuMAX>" + #: repack-promisor.c msgid "could not start pack-objects to repack promisor objects" msgstr "tidak dapat memulai pack-objects untuk mengepak ulang objek pejanji" @@ -26711,6 +27781,51 @@ msgstr "referensi pengganti duplikat: %s" msgid "replace depth too high for object %s" msgstr "kedalaman penggantian terlalu tinggi untuk objek %s" +#: replay.c +#, c-format +msgid "'%s' is not a valid commit-ish for %s" +msgstr "'%s' bukan mirip komit yang valid untuk %s" + +#: replay.c +#, c-format +msgid "argument to %s must be a reference" +msgstr "argumen ke %s harus sebuah referensi" + +#: replay.c +#, c-format +msgid "" +"'%s' cannot be used with multiple revision ranges because the ordering would " +"be ill-defined" +msgstr "" +"'%s' tidak dapat digunakan dengan berbagai rentang revisi karena urutan akan " +"jadi tidak tentu" + +#: replay.c +msgid "need some commits to replay" +msgstr "butuh beberapa komit untuk dimainkan ulang" + +#: replay.c +msgid "all positive revisions given must be references" +msgstr "semua revisi positif yang diberikan haruslah referensi" + +#: replay.c +#, c-format +msgid "commit %s became empty after replay" +msgstr "komit %s menjadi kosong setelah tayangan ulang" + +#: replay.c +msgid "'--ref' cannot be used with multiple revision ranges" +msgstr "'--ref' tidak dapat digunakan dengan berbagai rentang revisi" + +#: replay.c sequencer.c +#, c-format +msgid "'%s' is not a valid refname" +msgstr "'%s' bukan nama referensi valid" + +#: repository.c +msgid "compatibility hash algorithm support requires Rust" +msgstr "dukungan kompatibilitas algoritma hash memerlukan Rust" + #: rerere.c msgid "corrupt MERGE_RR" msgstr "MERGE_RR rusak" @@ -26858,8 +27973,8 @@ msgid "object filtering requires --objects" msgstr "penyaringan objek memerlukan --objects" #: revision.c -msgid "-L does not yet support diff formats besides -p and -s" -msgstr "-L belum mendukung format diff selain -p dan -s" +msgid "-L does not yet support the requested diff format" +msgstr "-L belum mendukung format diff yang diminta" #: run-command.c #, c-format @@ -27612,11 +28727,6 @@ msgstr "'%s' bukan label valid" #: sequencer.c #, c-format -msgid "'%s' is not a valid refname" -msgstr "'%s' bukan nama referensi valid" - -#: sequencer.c -#, c-format msgid "update-ref requires a fully qualified refname e.g. refs/heads/%s" msgstr "" "update-ref memerlukan nama referensi terkualifikasi penuh, misalnya refs/" @@ -27726,6 +28836,18 @@ msgid "cannot revert during a cherry-pick." msgstr "tidak dapat membalikkan selama petik ceri." #: sequencer.c +msgid "trailers file contains empty line" +msgstr "berkas trailer berisi baris kosong" + +#: sequencer.c +msgid "trailers file is empty" +msgstr "berkas trailer kosong" + +#: sequencer.c +msgid "cannot read trailers files" +msgstr "tidak dapat membaca berkas trailer" + +#: sequencer.c msgid "unusable squash-onto" msgstr "squash-onto tidak dapat digunakan" @@ -28001,23 +29123,31 @@ msgstr "tidak dapat menyimpan %s" #: sequencer.c #, c-format msgid "" -"%s\n" +"Your local changes are stashed, however applying them\n" +"resulted in conflicts. You can either resolve the conflicts\n" +"and then discard the stash with \"git stash drop\", or, if you\n" +"do not want to resolve them now, run \"git reset --hard\" and\n" +"apply the local changes later by running \"git stash pop\".\n" +msgstr "" +"Perubahan lokal Anda distase, akan tetapi menerapkannya\n" +"berakhir konflik. Anda dapat menyelesaikan konflik lalu membuang\n" +"stase dengan \"git stash drop\", atau jika Anda tidak ingin\n" +"menyelesaikannya sekarang, jalankan \"git reset --hard\" dan\n" +"terapkan perubahan lokal Anda nanti dengan menjalankan\n" +"\"git stash pop\".\n" + +#: sequencer.c +#, c-format +msgid "" +"Autostash exists; creating a new stash entry.\n" "Your changes are safe in the stash.\n" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" -"%s\n" +"Autostase ada; membuat entri stase baru.\n" "Perubahan Anda aman di dalam stase.\n" "Anda dapat menjalankan \"git stash pop\" atau \"git stash drop\" kapanpun.\n" #: sequencer.c -msgid "Applying autostash resulted in conflicts." -msgstr "Menerapkan stase otomatis menghasilkan konflik." - -#: sequencer.c -msgid "Autostash exists; creating a new stash entry." -msgstr "Stase otomatis sudah ada; membuat entri stase baru." - -#: sequencer.c msgid "autostash reference is a symref" msgstr "referensi autostase itu referensi simbolik" @@ -28316,6 +29446,16 @@ msgstr "" "\tgit config --global --add safe.directory %s" #: setup.c +#, c-format +msgid "error reading '%s'" +msgstr "kesalahan membaca '%s'" + +#: setup.c +#, c-format +msgid "not a regular file: '%s'" +msgstr "bukan berkas reguler: '%s'" + +#: setup.c msgid "Unable to read current working directory" msgstr "tidak dapat membaca direktori kerja saat ini" @@ -28347,6 +29487,11 @@ msgstr "" #: setup.c #, c-format +msgid "unknown ref storage format: '%s'" +msgstr "format penyimpanan referensi tidak dikenal: '%s'" + +#: setup.c +#, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" "The owner of files must always have read and write permissions." @@ -28359,10 +29504,6 @@ msgid "fork failed" msgstr "penggarpuan gagal" #: setup.c -msgid "setsid failed" -msgstr "setsid gagal" - -#: setup.c #, c-format msgid "cannot stat template '%s'" msgstr "tidak dapat men-stat templat '%s'" @@ -28458,6 +29599,11 @@ msgstr "Repositori berbagi Git kosong diinisialisasi di %s%s\n" msgid "Initialized empty Git repository in %s%s\n" msgstr "Repositori Git kosong dinisialisasi di %s%s\n" +#: sideband.c +#, c-format +msgid "unrecognized value for '%s': '%s'" +msgstr "nilai tidak dikenal untuk '%s': '%s'" + #: sparse-index.c #, c-format msgid "index entry is a directory, but not sparse (%08x)" @@ -28764,11 +29910,6 @@ msgstr "tidak dapat mencari nama untuk submodul '%s'" #: submodule.c #, c-format -msgid "refusing to move '%s' into an existing git dir" -msgstr "menolak memindahkan '%s' ke dalam direktori git yang ada" - -#: submodule.c -#, c-format msgid "" "Migrating git directory of '%s%s' from\n" "'%s' to\n" @@ -28787,6 +29928,33 @@ msgstr "tidak dapat memulai ls-files dalam .." msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree kembalikan kode kembali %d yang tak diharapkan" +#: submodule.c +#, c-format +msgid "" +"the 'submodule.%s.gitdir' config does not exist for module '%s'. Please " +"ensure it is set, for example by running something like: 'git config " +"submodule.%s.gitdir .git/modules/%s'. For details see the " +"extensions.submodulePathConfig documentation." +msgstr "" +"konfigurasi 'submodule.%s.gitdir' tidak ada untuk modul '%s'. Mohon pastikan " +"ini disetel, seperti dengan menjalankan: 'git config submodule." +"%s.gitdir .git/modules/%s'. Untuk lebih lengkapnya lihat dokumentasi " +"extensions.submodulePathConfig." + +#: submodule.c +msgid "" +"enabling extensions.submodulePathConfig might fix the following error, if " +"it's not already enabled." +msgstr "" +"mengaktifkan extensions.submodulePathConfig mungkin dapat memperbaiki " +"kesalahan ini, jika belum diaktifkan." + +#: submodule.c +#, c-format +msgid "refusing to create/use '%s' in another submodule's git dir." +msgstr "" +"menolak membuat/menggunakan '%s' di dalam direktori git submodul yang lain." + #: symlinks.c #, c-format msgid "failed to lstat '%s'" @@ -28822,32 +29990,36 @@ msgstr "test-tool path-walk <opsi> -- <opsi revisi>" #: t/helper/test-path-walk.c msgid "toggle inclusion of blob objects" -msgstr "sertakan objek blob" +msgstr "alihkan penyertaan objek blob" #: t/helper/test-path-walk.c msgid "toggle inclusion of commit objects" -msgstr "sertakan objek komit" +msgstr "alihkan penyertaan objek komit" #: t/helper/test-path-walk.c msgid "toggle inclusion of tag objects" -msgstr "sertakan objek tag" +msgstr "alihkan penyertaan objek tag" #: t/helper/test-path-walk.c msgid "toggle inclusion of tree objects" -msgstr "sertakan objek pohon" +msgstr "alihkan penyertaan objek pohon" #: t/helper/test-path-walk.c msgid "toggle pruning of uninteresting paths" -msgstr "pangkas jalur yang tidak menarik" +msgstr "alihkan pemangkasan jalur yang tidak menarik" #: t/helper/test-path-walk.c msgid "toggle aggressive edge walk" -msgstr "nyalakan jalan tepian agresif" +msgstr "alihkan jalan tepian agresif" #: t/helper/test-path-walk.c msgid "read a pattern list over stdin" msgstr "baca daftar pola dari masukan standar" +#: t/helper/test-path-walk.c +msgid "toggle pruning of trees by sparse patterns" +msgstr "pangkas pohon oleh pola tipis" + #: t/helper/test-reach.c #, c-format msgid "commit %s is not marked reachable" @@ -28858,6 +30030,11 @@ msgid "too many commits marked reachable" msgstr "terlalu banyak komit yang ditandai sebagai dapat dicapai" #: t/helper/test-read-midx.c +#, c-format +msgid "could not find MIDX with checksum %s" +msgstr "tidak dapat menemukan MIDX dengan checksum %s" + +#: t/helper/test-read-midx.c msgid "could not determine MIDX preferred pack" msgstr "tidak dapat menentukan pak MIDX terpilih" @@ -28939,6 +30116,15 @@ msgstr "token" msgid "command token to send to the server" msgstr "token perintah untuk dikirim ke peladen" +#: t/helper/test-synthesize.c +msgid "write a pack with a single reachable large blob" +msgstr "menulis sebuah pak dengan satu blob besar yang dapat dicapai" + +#: t/helper/test-synthesize.c +#, c-format +msgid "'%s' is not a valid blob size" +msgstr "'%s' bukan ukuran blob yang valid" + #: t/unit-tests/unit-test.c msgid "unit-test [<options>]" msgstr "unit-test [<opsi>]" @@ -28978,6 +30164,34 @@ msgstr "nilai tidak dikenal '%s' untuk kunci '%s'" msgid "empty trailer token in trailer '%.*s'" msgstr "token trailer kosong dalam trailer '%.*s'" +#: trailer.c +msgid "empty --trailer argument" +msgstr "argumen --trailer kosong" + +#: trailer.c +#, c-format +msgid "invalid trailer '%s': missing key before separator" +msgstr "trailer '%s' tidak valid: kunci tidak ada sebelum pemisah" + +#: trailer.c wrapper.c +#, c-format +msgid "could not stat %s" +msgstr "tidak dapat membaca %s" + +#: trailer.c +#, c-format +msgid "file %s is not a regular file" +msgstr "berkas %s bukan sebuah berkas reguler" + +#: trailer.c +#, c-format +msgid "file %s is not writable by user" +msgstr "berkas %s tidak dapat ditulis oleh pengguna" + +#: trailer.c +msgid "could not write to temporary file" +msgstr "tidak dapat menulis ke berkas sementara" + #: transport-helper.c msgid "full write to remote helper failed" msgstr "gagal menulis penuh ke pembantu remote" @@ -29050,6 +30264,11 @@ msgid "--negotiate-only requires protocol v2" msgstr "--negotiate-only butuh protokol v2" #: transport-helper.c +#, c-format +msgid "ignoring %s because the protocol does not support it." +msgstr "mengabaikan %s karena protokol tidak mendukungnya." + +#: transport-helper.c msgid "'option' without a matching 'ok/error' directive" msgstr "'option' tanpa pengarah 'ok/error' yang bersesuaian" @@ -30617,8 +31836,14 @@ msgstr "" "Berkas berikut 8bit, tetapi tidak menyebutkan Content-Transfer-Encoding.\n" #: git-send-email.perl -msgid "Which 8bit encoding should I declare [UTF-8]? " -msgstr "Pengkodean 8bit apa yang harus saya sebut [UTF-8]? " +msgid "Declare which 8bit encoding to use [default: UTF-8]? " +msgstr "Sebutkan pengkodean 8bit apa yang digunakan [asali: UTF-8]? " + +#: git-send-email.perl +#, perl-format +msgid "'%s' does not appear to be a valid charset name. Use it anyway [y/N]? " +msgstr "" +"'%s' sepertinya bukan nama set karakter yang valid. Tetap gunakan [y/N]? " #: git-send-email.perl #, perl-format @@ -30667,6 +31892,11 @@ msgid "CA path \"%s\" does not exist" msgstr "Jalur CA \"%s\" tidak ada" #: git-send-email.perl +#, perl-format +msgid "Only client key \"%s\" specified" +msgstr "Hanya kunci klien \"%s\" yang dirincikan" + +#: git-send-email.perl msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -5400,7 +5400,7 @@ msgstr "uso: %s" #: parse-options.c:915 #, c-format msgid " or: %s" -msgstr " oppure: %s" +msgstr " o: %s" #: parse-options.c:918 #, c-format @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: git 2.54.0\n" +"Project-Id-Version: git 2.55.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2026-04-16 12:26+0100\n" -"PO-Revision-Date: 2026-04-16 13:29+0100\n" +"POT-Creation-Date: 2026-06-15 18:56+0000\n" +"PO-Revision-Date: 2026-06-25 16:15+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Svenska <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -561,7 +561,7 @@ msgstr "" "K - gå till föregående stycken, börja om vid början\n" "g - välj ett stycke att gå till\n" "/ - sök efter stycke som motsvarar angivet reguljärt uttryck\n" -"s - dela aktuellt stycke i mindre styckens\n" +"s - dela aktuellt stycke i mindre stycken\n" "e - redigera aktuellt stycke manuellt\n" "p - visa aktuellt stycke\n" "P - visa aktuellt stycke i bläddrare\n" @@ -1087,7 +1087,7 @@ msgstr "Utför trevägssammanslagning...\n" #, c-format msgid "cannot read the current contents of '%s'" -msgstr "kunde inte läsa aktuellt innehåll i ”%s”" +msgstr "kan inte läsa aktuellt innehåll i ”%s”" #, c-format msgid "Failed to perform three-way merge...\n" @@ -1425,7 +1425,7 @@ msgstr "git archive --remote <arkiv> [--exec <kmd>] --list" #, c-format msgid "cannot read '%s'" -msgstr "kunde inte läsa ”%s”" +msgstr "kan inte läsa ”%s”" #, c-format msgid "pathspec '%s' matches files outside the current directory" @@ -1625,30 +1625,30 @@ msgstr "" #, c-format msgid "" -"The merge base %s is %s.\n" +"The merge base %s is '%s'.\n" "This means the first '%s' commit is between %s and [%s].\n" msgstr "" -"Sammanslagningsbasen %s är %s.\n" +"Sammanslagningsbasen %s är ”%s”.\n" "Det betyder att den första ”%s” incheckningen är mellan %s och [%s].\n" #, c-format msgid "" -"Some %s revs are not ancestors of the %s rev.\n" +"Some '%s' revs are not ancestors of the '%s' rev.\n" "git bisect cannot work properly in this case.\n" -"Maybe you mistook %s and %s revs?\n" +"Maybe you mistook '%s' and '%s' revs?\n" msgstr "" -"Några %s-revisioner är inte förfäder till %s-revisionen.\n" +"Några ”%s”-revisioner är inte förfäder till ”%s”-revisionen.\n" "git bisect kan inte fungera korrekt i detta fall.\n" -"Kanske du skrev fel %s- och %s-revisioner?\n" +"Kanske du skrev fel ”%s”- och ”%s”-revisioner?\n" #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" -"So we cannot be sure the first %s commit is between %s and %s.\n" +"So we cannot be sure the first '%s' commit is between %s and %s.\n" "We continue anyway." msgstr "" "sammanslagningsbasen mellan %s och [%s] måste hoppas över.\n" -"Vi kan inte vara säkra på att den första %s incheckningen är mellan %s och " +"Vi kan inte vara säkra på att den första ”%s”-incheckningen är mellan %s och " "%s.\n" "Vi fortsätter ändå." @@ -1657,8 +1657,8 @@ msgid "Bisecting: a merge base must be tested\n" msgstr "Bisect: en sammanslagningsbas måste testas\n" #, c-format -msgid "a %s revision is needed" -msgstr "en %s-revision behövs" +msgid "a '%s' revision is needed" +msgstr "en ”%s”-revision behövs" #, c-format msgid "could not create file '%s'" @@ -1676,8 +1676,8 @@ msgid "reading bisect refs failed" msgstr "misslyckades läsa bisect-referenser" #, c-format -msgid "%s was both %s and %s\n" -msgstr "%s var både %s och %s\n" +msgid "%s was both '%s' and '%s'\n" +msgstr "%s var både ”%s” och ”%s”\n" #, c-format msgid "" @@ -2413,8 +2413,22 @@ 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=<n>] [--[no-]sparse]" -msgstr "git backfill [--min-batch-size=<n>] [--[no-]sparse]" +msgid "" +"git backfill [--min-batch-size=<n>] [--[no-]sparse] [--[no-]include-edges] " +"[<revision-range>]" +msgstr "" +"git backfill [--min-batch-size=<n>] [--[no-]sparse] [--[no-]include-edges] " +"[<revisions-intervall>]" + +#, c-format +msgid "'%s' cannot be used with 'git backfill'" +msgstr "”%s” kan inte användas med ”git backfill”" + +msgid "cannot backfill with these filter options" +msgstr "kan inte återfylla med dessa filterflaggor" + +msgid "cannot backfill with blob size limits" +msgstr "kan inte återfylla med blob-storleksbegränsning" msgid "problem loading sparse-checkout" msgstr "problem med att läsa filen sparse-checkout" @@ -2425,6 +2439,9 @@ 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 "Include blobs from boundary commits in the backfill" +msgstr "Inkludera blobar från gränsincheckningar i återfyllningen" + #, c-format msgid "unrecognized argument: %s" msgstr "okänt argument: %s" @@ -2544,28 +2561,30 @@ msgstr "utför bisect med endast en %s incheckning" msgid "Are you sure [Y/n]? " msgstr "Är du säker [Y=ja/N=nej]? " -msgid "status: waiting for both good and bad commits\n" -msgstr "status: väntar på både bra och trasiga incheckningar\n" +#, c-format +msgid "status: waiting for both '%s' and '%s' commits\n" +msgstr "status: väntar på både ”%s”- och ”%s”-incheckningar\n" #, c-format -msgid "status: waiting for bad commit, %d good commit known\n" -msgid_plural "status: waiting for bad commit, %d good commits known\n" -msgstr[0] "status: väntar på trasig incheckning, %d bra incheckning känd\n" -msgstr[1] "status: väntar på trasig incheckning, %d bra incheckningar kända\n" +msgid "status: waiting for '%s' commit, %d '%s' commit known\n" +msgid_plural "status: waiting for '%s' commit, %d '%s' commits known\n" +msgstr[0] "status: väntar på ”%s”-incheckning, %d ”%s”-incheckning känd\n" +msgstr[1] "status: väntar på ”%s”-incheckning, %d ”%s”-incheckningar kända\n" -msgid "status: waiting for good commit(s), bad commit known\n" -msgstr "status: väntar på bra incheckning(ar), trasig incheckning känd\n" +#, c-format +msgid "status: waiting for '%s' commit(s), '%s' commit known\n" +msgstr "status: väntar på ”%s”-incheckning(ar), ”%s” incheckning känd\n" msgid "no terms defined" msgstr "inga termer angivna" #, c-format msgid "" -"Your current terms are %s for the old state\n" -"and %s for the new state.\n" +"Your current terms are '%s' for the old state\n" +"and '%s' for the new state.\n" msgstr "" -"Aktuella termer är %s för det gamla tillståndet\n" -"och %s för det nya tillståndet.\n" +"Aktuella termer är ”%s” för det gamla tillståndet\n" +"och ”%s” för det nya tillståndet.\n" #, c-format msgid "" @@ -2648,12 +2667,12 @@ msgid "bisect run failed: no command provided." msgstr "bisect-körning misslyckades: inget kommando gavs." #, c-format -msgid "unable to verify %s on good revision" -msgstr "kan inte bekräfta %s på bra revision" +msgid "unable to verify %s on '%s' revision" +msgstr "kan inte bekräfta %s på ”%s”-revision" #, c-format -msgid "bogus exit code %d for good revision" -msgstr "falsk slutkod %d för bra revision" +msgid "bogus exit code %d for '%s' revision" +msgstr "falsk slutkod %d för ”%s”-revision" #, c-format msgid "bisect run failed: exit code %d from %s is < 0 or >= 128" @@ -2669,8 +2688,9 @@ msgstr "”bisect”-körningen kan inte fortsätta längre" msgid "bisect run success" msgstr "”bisect”-körningen lyckades" -msgid "bisect found first bad commit" -msgstr "bisect hittade första trasiga incheckning" +#, c-format +msgid "bisect found first '%s' commit\n" +msgstr "bisect hittade första ”%s”-incheckning\n" #, c-format msgid "bisect run failed: 'git bisect %s' exited with error code %d" @@ -3135,10 +3155,10 @@ msgid "cannot edit description of more than one branch" msgstr "kan inte redigera beskrivning för mer än en gren" msgid "cannot copy the current branch while not on any" -msgstr "kunde inte kopiera aktuell gren när du inte befinner dig på någon" +msgstr "kan inte kopiera aktuell gren när du inte befinner dig på någon" msgid "cannot rename the current branch while not on any" -msgstr "kunde inte byta namn på aktuell gren när du inte befinner dig på någon" +msgstr "kan inte byta namn på aktuell gren när du inte befinner dig på någon" msgid "too many branches for a copy operation" msgstr "för många grenar för kopiering" @@ -3340,6 +3360,10 @@ msgstr "Packar upp objektbunt" msgid "cannot read object %s '%s'" msgstr "kan inte läsa objektet %s: ”%s”" +#, c-format +msgid "mailmap: invalid boolean '%s'" +msgstr "mailmap: ogiltigt booleskt värde ”%s”" + msgid "flush is only for --buffer mode" msgstr "flush är endast till för ”--buffer”-läge" @@ -3457,7 +3481,7 @@ msgid "blob|tree" msgstr "blob|träd" msgid "use a <path> for (--textconv | --filters); Not with 'batch'" -msgstr "använd en <sökväg> för (--textconv | --filters): Inte med ”batch”" +msgstr "använd en <sökväg> för (--textconv | --filters); Inte med ”batch”" msgid "objects filter only supported in batch mode" msgstr "objektfilter stöds endast i buntläge" @@ -3691,14 +3715,6 @@ msgid "you need to resolve your current index first" msgstr "du måste lösa ditt befintliga index först" #, c-format -msgid "" -"cannot continue with staged changes in the following files:\n" -"%s" -msgstr "" -"kan inte fortsätta med köade ändringar i följande filer:\n" -"%s" - -#, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Kan inte skapa referenslogg för ”%s”: %s\n" @@ -3790,6 +3806,10 @@ msgid "You are on a branch yet to be born" msgstr "Du är på en gren som ännu inte är född" #, c-format +msgid "The following paths have local changes:\n" +msgstr "Följande sökvägar har lokala ändringar:\n" + +#, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" "Please use -- (and optionally --no-guess) to disambiguate" @@ -4280,7 +4300,7 @@ 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" +msgstr "kan inte ta bort temporär ”alternates”-fil" msgid "don't clone shallow repository" msgstr "klona inte grunt arkiv" @@ -5316,6 +5336,18 @@ msgid "wrong number of arguments, should be from %d to %d" msgstr "fel antal argument, skulle vara från %d till %d" #, c-format +msgid "missing value to set to the variable '%s'" +msgstr "saknar värde att sätta för variabeln ”%s”" + +#, c-format +msgid "did you mean \"git config set %s %s\"?" +msgstr "menade du ”git config set %s %s”?" + +#, c-format +msgid "missing value to set to a variable with an invalid name '%s'" +msgstr "saknar värde att sätta för variabeln med ett ogiltigt namn ”%s”" + +#, c-format msgid "invalid key pattern: %s" msgstr "felaktigt nyckelmönster: %s" @@ -6731,14 +6763,18 @@ msgid "option \"%s\" is ignored for %s" msgstr "flaggan ”%s” ignoreras för %s" #, c-format -msgid "%s is not a valid object" -msgstr "%s är inte ett giltigt objekt" - -#, c-format msgid "the object %s does not exist" msgstr "objektet %s finns inte" #, c-format +msgid "ignoring %s=%s because it does not match any refs" +msgstr "ignorerar %s=%s eftersom det inte motsvarar några referenser" + +#, c-format +msgid "ignoring %s because the protocol does not support it" +msgstr "ignorerar %s eftersom protokollet inte stöder det" + +#, c-format msgid "" "Run 'git remote set-head %s %s' to follow the change, or set\n" "'remote.%s.followRemoteHEAD' configuration option to a different value\n" @@ -6936,6 +6972,9 @@ msgstr "revision" msgid "report that we have only objects reachable from this object" msgstr "rapportera att vi bara har objekt nåbara från detta objektet" +msgid "ensure this ref is always sent as a negotiation have" +msgstr "se till att referensen alltid sänds som ett förhandlingsinnehav" + msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" msgstr "hämta inte paketfil; skriv istället förfäder till förhandlingstips" @@ -6951,9 +6990,6 @@ msgstr "skriv incheckningsgrafen efter hämtning" msgid "accept refspecs from stdin" msgstr "ta emot referensspecifikationer från standard in" -msgid "--negotiate-only needs one or more --negotiation-tip=*" -msgstr "--negotiate-only behöver en eller flera --negotiation-tip=*" - msgid "negative depth in --deepen is not supported" msgstr "negativa djup stöds inte i --deepen" @@ -6983,6 +7019,10 @@ msgstr "måste ange fjärr när --negotiate-only anges" msgid "protocol does not support --negotiate-only, exiting" msgstr "protokollet stöder inte --negotiate-only, avslutar" +#, c-format +msgid "%s needs one or more %s" +msgstr "%s behöver en eller flera %s" + msgid "" "--filter can only be used with the remote configured in " "extensions.partialclone" @@ -7318,6 +7358,10 @@ msgid "value of '%s' not bool or int: %d" msgstr "värdet för ”%s” är inte bool eller int: %d" #, c-format +msgid "daemon did not stop within %d seconds" +msgstr "bakgrundsprocessen stoppade inte inom %d sekunder" + +#, c-format msgid "fsmonitor-daemon is watching '%s'\n" msgstr "fsmonitor-daemon bevakar ”%s”\n" @@ -7361,6 +7405,9 @@ msgstr "fsmonitor--daemon körs redan på ”%s”" msgid "running fsmonitor-daemon in '%s'\n" msgstr "kör fsmonitor-daemon i ”%s”\n" +msgid "setsid failed" +msgstr "”setsid” misslyckades" + #, c-format msgid "starting fsmonitor-daemon in '%s'\n" msgstr "startar fsmonitor-daemon i ”%s”\n" @@ -8027,6 +8074,13 @@ msgstr "användning: %s%s" msgid "'git help config' for more information" msgstr "”git help config” för mer information" +msgid "" +"git history fixup <commit> [--dry-run] [--update-refs=(branches|head)] [--" +"reedit-message] [--empty=(drop|keep|abort)]" +msgstr "" +"git history fixup <incheckning> [--dry-run] [--update-refs=(branches|head)] " +"[--reedit-message] [--empty=(drop|keep|abort)]" + msgid "git history reword <commit> [--dry-run] [--update-refs=(branches|head)]" msgstr "" "git history reword <incheckning> [--dry-run] [--update-refs=(branches|head)]" @@ -8058,7 +8112,7 @@ msgstr "kan inte tolka föräldraincheckningen %s" #, c-format msgid "%s expects one of 'branches' or 'head'" -msgstr "%s förväntar antingeen ”branches” eller ”head”" +msgstr "%s förväntar antingen ”branches” eller ”head”" msgid "error preparing revisions" msgstr "fel när revisioner skulle förberedas" @@ -8090,30 +8144,85 @@ msgstr "misslyckades uppdatera referensen ”%s”: %s" msgid "failed to commit ref transaction: %s" msgstr "misslyckades checka in referenstransaktionen: %s" +#, c-format +msgid "unable to parse parent of %s" +msgstr "kan inte tolka förälder till %s" + +#, c-format +msgid "" +"unrecognized '--empty=' action '%s'; valid values are \"drop\", \"keep\", " +"and \"abort\"." +msgstr "" +"okänd ”--empty”-handling ”%s”; giltiga värden är ”drop”, ”keep” och ”abort”." + msgid "control which refs should be updated" msgstr "styr vilka referenser som ska uppdateras" msgid "perform a dry-run without updating any refs" msgstr "utför en testkörning utan att uppdatera några referenser" +msgid "open an editor to modify the commit message" +msgstr "öppna textredigeringsprogram för att ändra incheckningsmeddelandet" + +msgid "how to handle commits that become empty" +msgstr "hur incheckningar som blir tomma ska hanteras" + msgid "command expects a single revision" msgstr "kommandot förväntar en ensam revision" +msgid "cannot run fixup in a bare repository" +msgstr "kan inte rätta i ett naket arkiv" + #, c-format msgid "commit cannot be found: %s" msgstr "incheckningen hittades inte: %s" -msgid "failed writing reworded commit" -msgstr "misslyckades skriva omformulerad incheckning" +msgid "cannot get tree for HEAD" +msgstr "kan inte läsa trädet för HEAD" + +msgid "unable to read index" +msgstr "kan inte läsa indexet" + +msgid "nothing to fixup: no staged changes" +msgstr "inget att rätta: inga köade ändringar" + +msgid "unable to write index as a tree" +msgstr "kan inte skriva indexet som ett träd" + +#, c-format +msgid "cannot get tree for commit %s" +msgstr "kan inte läsa trädet för incheckningen %s" + +msgid "merge failed while applying fixup" +msgstr "sammanslagning misslyckades när rättelsen skulle appliceras" + +msgid "fixup would produce conflicts; aborting" +msgstr "rättning skulle introducera konflikter; avbryter" + +#, c-format +msgid "cannot drop root commit %s: it has no parent to replay onto" +msgstr "" +"kan inte kasta rot-incheckningen %s: den har ingen förälder att återuppspela " +"på" + +#, c-format +msgid "fixup makes commit %s empty" +msgstr "rättningen gör incheckningen %s tom" + +msgid "failed writing fixed-up commit" +msgstr "misslyckades skriva den rättade incheckningen" msgid "failed replaying descendants" msgstr "misslyckades spela upp ättlingar på nytt" +msgid "failed writing reworded commit" +msgstr "misslyckades skriva omformulerad incheckning" + msgid "unable to populate index with tree" -msgstr "kndde inte fylla i indexet med trädet" +msgstr "kan inte fylla i indexet med trädet" msgid "unable to acquire index lock" -msgstr "kunde inte erhålla indexlås" +msgstr "kan inte erhålla indexlås" msgid "failed reading temporary index" msgstr "misslyckades läsa temporärt index" @@ -8129,7 +8238,7 @@ msgstr "" "trädet för delad incheckning är identisk med den ursprungliga incheckningen" msgid "failed writing first commit" -msgstr "mislyckades skriva första incheckningen" +msgstr "misslyckades skriva första incheckningen" msgid "failed writing second commit" msgstr "misslyckades skriva andra incheckningen" @@ -8141,14 +8250,16 @@ msgid "command expects a committish" msgstr "kommandot förväntar en incheckning-igt" msgid "cannot split up merge commit" -msgstr "kan inte dela sammanslagnignsincheckning" +msgstr "kan inte dela sammanslagningsincheckning" msgid "" "git hook run [--allow-unknown-hook-name] [--ignore-missing] [--to-" -"stdin=<path>] <hook-name> [-- <hook-args>]" +"stdin=<path>] [(-j|--jobs) <n>]\n" +"<hook-name> [-- <hook-args>]" msgstr "" "git hook run [--allow-unknown-hook-name] [--ignore-missing] [--to-" -"stdin=<sökväg>] <krok-namn> [-- <krok-argument>]" +"stdin=<sökväg>] [(-j|--jobs) <n>]\n" +"<krok-namn> [-- <krok-argument>]" msgid "" "git hook list [--allow-unknown-hook-name] [-z] [--show-scope] <hook-name>" @@ -8177,7 +8288,7 @@ msgstr "" #, c-format msgid "no hooks found for event '%s'" -msgstr "inga krokar hittades för händelsen ”%s”." +msgstr "inga krokar hittades för händelsen ”%s”" msgid "hook from hookdir" msgstr "krok från krokkatalog" @@ -8188,6 +8299,15 @@ msgstr "ignorera tyst om önskat <krok-namn> saknas" msgid "file to read into hooks' stdin" msgstr "misslyckades läsa till krokens standard in" +msgid "run up to <n> hooks simultaneously (-1 for CPU count)" +msgstr "kör upp till <n> krokar samtidigt (-1 för antal processorer)" + +#, c-format +msgid "invalid value for -j: %d (use -1 for CPU count or a positive integer)" +msgstr "" +"ogiltigt värde för -j: %d (använd -1 för antalet processorer eller ett " +"positivt heltal)" + #, c-format msgid "object type mismatch at %s" msgstr "objekttyp stämmer inte överens vid %s" @@ -8237,6 +8357,9 @@ msgstr "paketet har felaktigt objekt vid index %<PRIuMAX>: %s" msgid "inflate returned %d" msgstr "inflate returnerade %d" +msgid "object size too large for this platform" +msgstr "objektstorleken för stor för plattformen" + msgid "offset value overflow for delta base object" msgstr "indexvärdespill för deltabasobjekt" @@ -8561,7 +8684,7 @@ msgid "" " [<revision-range>] [[--] <pathspec>...]" msgstr "" "git last-modified [--recursive] [--show-trees] [--max-depth=<djup>] [-z]\n" -" [<revisionsintervall>] [[--] <sökväg>...]" +" [<revisions-intervall>] [[--] <sökväg>...]" msgid "recurse into subtrees" msgstr "rekursera ner i underträd" @@ -8576,7 +8699,7 @@ msgid "lines are separated with NUL character" msgstr "rader avdelas med NUL-tecken" msgid "git log [<options>] [<revision-range>] [[--] <path>...]" -msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]" +msgstr "git log [<flaggor>] [<revisions-intervall>] [[--] <sökväg>...]" msgid "git show [<options>] <object>..." msgstr "git show [<flaggor>] <objekt>..." @@ -9617,18 +9740,22 @@ msgstr "tillåt skapa mer än ett träd" msgid "" "git multi-pack-index [<options>] write [--preferred-pack=<pack>]\n" " [--[no-]bitmap] [--[no-]incremental] [--[no-]stdin-packs]\n" -" [--refs-snapshot=<path>]" +" [--refs-snapshot=<path>] [--[no-]write-chain-file]\n" +" [--base=<checksum>]" msgstr "" "git multi-pack-index [<flaggor>] write [--preferred-pack=<paket>]\n" " [--[no-]bitmap] [--[no-]incremental] [--[no-]stdin-packs]\n" -" [--refs-snapshot=<sökväg>]" +" [--refs-snapshot=<sökväg>] [--[no-]write-chain-file]\n" +" [--base=<kontrollsumma>]" msgid "" "git multi-pack-index [<options>] compact [--[no-]incremental]\n" -" [--[no-]bitmap] <from> <to>" +" [--[no-]bitmap] [--base=<checksum>] [--[no-]write-chain-file]\n" +" <from> <to>" msgstr "" "git multi-pack-index [<flaggor>] compact [--[no-]incremental]\n" -" [--[no-]bitmap] <från> <till>" +" [--[no-]bitmap] [--base=<kontrollsumma>] [--[no-]write-chain-file]\n" +" <från> <till>" msgid "git multi-pack-index [<options>] verify" msgstr "git multi-pack-index [<flaggor>] verify" @@ -9654,9 +9781,18 @@ msgstr "paket att återanvända vid beräkning av multipaketsbitkarta" msgid "write multi-pack bitmap" msgstr "skriv flerpaketsbitkarta" +msgid "checksum" +msgstr "kontrollsumma" + +msgid "base MIDX for incremental writes" +msgstr "bas-MIDX för inkrementella skrivningar" + msgid "write a new incremental MIDX" msgstr "skriv en ny inkrementell MIDX" +msgid "write the multi-pack-index chain file" +msgstr "skriv kedjefil för multi-pack-index" + msgid "write multi-pack index containing only given indexes" msgstr "skriv flerpaketsindex som endast innehåller angivna index" @@ -9664,6 +9800,13 @@ msgid "refs snapshot for selecting bitmap commits" msgstr "refs-ögonblicksbild för att välja bitkarte-incheckningar" #, c-format +msgid "cannot use %s without %s" +msgstr "kan inte använda %s utan %s" + +msgid "cannot use --base without --no-write-chain-file" +msgstr "kan inte använda --base utan --no-write-chain-file" + +#, c-format msgid "could not find MIDX: %s" msgstr "kunde inte hitta MIDX: %s" @@ -9802,6 +9945,48 @@ msgstr "tillåt att skriva ”odefinierade” namn (standard)" msgid "dereference tags in the input (internal use)" msgstr "avreferera taggar i indata (används internt)" +#, c-format +msgid "'%s' needs to be either text, revs, or rev" +msgstr "”%s” måste antingen vara text, revs, eller rev" + +msgid "" +"(EXPERIMENTAL!) git format-rev --stdin-mode=<mode> --format=<pretty> [--" +"[no-]notes=<ref>] [-z] [--[no-]null-output] [--[no-]null-input]" +msgstr "" +"(EXPERIMENTELLT!) git format-rev --stdin-mode=<läge> --format=<snyggt> [--" +"[no-]notes=<ref>] [-z] [--[no-]null-output] [--[no-]null-input]" + +msgid "pretty format to use" +msgstr "välj snyggt format att använda" + +msgid "stdin-mode" +msgstr "standard in-läge" + +msgid "how revs are processed" +msgstr "hur revisioner hanteras" + +msgid "notes" +msgstr "anteckningar" + +msgid "display notes for pretty format" +msgstr "visa anteckningar för snyggt format" + +msgid "z" +msgstr "z" + +msgid "Use NUL for input and output termination" +msgstr "Avdela indata och utdata med NUL" + +msgid "Use NUL for input termination" +msgstr "Avdela indata med NUL" + +msgid "Use NUL for output termination" +msgstr "Avdela utdata med NUL" + +#, c-format +msgid "'%s' is required" +msgstr "”%s” krävs" + msgid "git notes [--ref <notes-ref>] [list [<object>]]" msgstr "git notes [--ref <anteckningsref>] [list [<objekt>]]" @@ -10152,6 +10337,10 @@ 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: unable to parse object header of %s" +msgstr "write_reuse_object: kan inte tolka objekthuvud för %s" + +#, c-format msgid "" "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in " "pack %s" @@ -10247,7 +10436,7 @@ msgid "unable to get type of object %s" msgstr "kan inte hämta typ för objektet %s" msgid "Compressing objects by path" -msgstr "komprimerar objekt efter sökväg" +msgstr "Komprimerar objekt efter sökväg" #, c-format msgid "Path-based delta compression using up to %d thread" @@ -10325,13 +10514,10 @@ msgstr "kan inte öppna paketfilen" #, c-format msgid "loose object at %s could not be examined" -msgstr "lösa objekt på %s kunde inte undersökas" +msgstr "det lösa objektet på %s kunde inte undersökas" msgid "unable to force loose object" -msgstr "kan inte tvinga lösa objekt" - -msgid "failed to pack objects via path-walk" -msgstr "misslyckades packa objekt genom att gå genom sökväg" +msgstr "kan inte tvinga löst objekt" #, c-format msgid "not a rev '%s'" @@ -10341,6 +10527,9 @@ msgstr "inte en referens ”%s”" msgid "bad revision '%s'" msgstr "felaktig revision ”%s”" +msgid "failed to pack objects via path-walk" +msgstr "misslyckades packa objekt genom att gå genom sökväg" + msgid "unable to add recent objects" msgstr "kan inte lägga till nya objekt" @@ -10941,6 +11130,10 @@ msgstr "" msgid "invalid value for '%s'" msgstr "ogiltigt värde för ”%s”" +#, c-format +msgid "could not push to %s" +msgstr "kunde inte sända till %s" + msgid "repository" msgstr "arkiv" @@ -11013,6 +11206,14 @@ msgid "" "and then push using the remote name\n" "\n" " git push <name>\n" +"\n" +"To push to multiple remotes at once, configure a remote group using\n" +"\n" +" git config remotes.<groupname> \"<remote1> <remote2>\"\n" +"\n" +"and then push using the group name\n" +"\n" +" git push <groupname>\n" msgstr "" "Ingen destination har angivits.\n" "Ange antingen URL:en på kommandoraden eller ställ in ett uppströmsarkiv med\n" @@ -11022,6 +11223,18 @@ msgstr "" "och sänd sedan med hjälp av fjärrnamnet\n" "\n" " git push <namn>\n" +"\n" +"För att sända till flera fjärrar samtidigt, konfigurera en uppströmsgrupp " +"med\n" +"\n" +" git config remotes.<gruppnamn> \"<fjärr1> <fjärr2>\"\n" +"\n" +"och sänd sedan genom att använda gruppnamnet\n" +"\n" +" git push <gruppnamn>\n" + +msgid "push options must not have new line characters" +msgstr "push-flaggor kan inte innehålla radbrytning" msgid "--all can't be combined with refspecs" msgstr "--all kan inte kombineras med referensspecifikationer" @@ -11029,8 +11242,8 @@ msgstr "--all kan inte kombineras med referensspecifikationer" msgid "--mirror can't be combined with refspecs" msgstr "--mirror kan inte kombineras med referensspecifikationer" -msgid "push options must not have new line characters" -msgstr "push-flaggor kan inte innehålla radbrytning" +msgid "--atomic can only be used when pushing to one remote" +msgstr "--atomic kan bara användas vid sändning till en fjärr" msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>" msgstr "" @@ -11049,9 +11262,6 @@ msgstr "felaktigt värde för max-memory: %s" msgid "use simple diff colors" msgstr "använd enkla diff-färger" -msgid "notes" -msgstr "anteckningar" - msgid "passed to 'git log'" msgstr "sänds till ”git log”" @@ -11349,9 +11559,6 @@ msgstr "" "(BORTTAGEN) var: försök återskapa sammanslagningar istället för att ignorera " "dem" -msgid "how to handle commits that become empty" -msgstr "hur incheckningar som blir tomma ska hanteras" - msgid "keep commits which start empty" msgstr "behåller incheckningar som är tomma från början" @@ -12249,11 +12456,11 @@ msgstr "var pratsam; måste skrivas före ett underkommando" msgid "" "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" "[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n" -"[--write-midx] [--name-hash-version=<n>] [--path-walk]" +"[--write-midx[=<mode>]] [--name-hash-version=<n>] [--path-walk]" msgstr "" "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" "[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<paket-namn>]\n" -"[--write-midx] [--name-hash-version=<n>] [--path-walk]" +"[--write-midx[=<läge>]] [--name-hash-version=<n>] [--path-walk]" msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" @@ -12263,6 +12470,10 @@ msgstr "" "Använd --no-write-bitmap-index eller inaktivera inställningen\n" "pack.writeBitmaps." +#, c-format +msgid "unknown value for %s: %s" +msgstr "okänt värde för %s: %s" + msgid "pack everything in a single pack" msgstr "packa allt i ett enda paket" @@ -12354,6 +12565,10 @@ msgid "cannot delete packs in a precious-objects repo" msgstr "kan inte ta bort paket i ett ”precious-objects”-arkiv" #, c-format +msgid "invalid value for %s: %d" +msgstr "felaktigt värde för %s: %d" + +#, c-format msgid "option '%s' can only be used along with '%s'" msgstr "flaggan ”%s” kan inte användas med ”%s”" @@ -12575,7 +12790,7 @@ msgid "revert commits onto given branch" msgstr "återställer incheckningar ovanpå given grenen" msgid "reference to update with result" -msgstr "referensen add uppdatera med resultatet" +msgstr "referensen att uppdatera med resultatet" msgid "control ref update behavior (update|print)" msgstr "styr beteende för referensuppdatering (update|print)" @@ -13089,7 +13304,7 @@ msgid "print status from remote helper" msgstr "visa status från fjärrhjälpare" msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" -msgstr "git shortlog [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]" +msgstr "git shortlog [<flaggor>] [<revisions-intervall>] [[--] <sökväg>...]" msgid "git log --pretty=short | git shortlog [<options>]" msgstr "git log --pretty=short | git shortlog [<flaggor>]" @@ -13215,7 +13430,7 @@ msgstr "--reflog behöver ett namn på en gren" #, c-format msgid "only %d entry can be shown at one time." msgid_plural "only %d entries can be shown at one time." -msgstr[0] "maximalt %d poster kan visas samtidigt." +msgstr[0] "maximalt %d post kan visas samtidigt." msgstr[1] "maximalt %d poster kan visas samtidigt." #, c-format @@ -13251,9 +13466,6 @@ msgstr "kan inte läsa huvud" msgid "unknown index version" msgstr "okänd indexversion" -msgid "unable to read index" -msgstr "kan inte läsa indexet" - msgid "corrupt index file" msgstr "trasig indexfil" @@ -13517,8 +13729,12 @@ msgstr "git stash drop [-q | --quiet] [<stash>]" msgid "git stash pop [--index] [-q | --quiet] [<stash>]" msgstr "git stash pop [--index] [-q | --quiet] [<stash>]" -msgid "git stash apply [--index] [-q | --quiet] [<stash>]" -msgstr "git stash apply [--index] [-q | --quiet] [<stash>]" +msgid "" +"git stash apply [--index] [-q | --quiet] [--label-ours=<label>] [--label-" +"theirs=<label>] [--label-base=<label>] [<stash>]" +msgstr "" +"git stash apply [--index] [-q | --quiet] [--label-ours=<etikett>] [--label-" +"theirs=<etikett>] [--label-base=<etikett>] [<stash>]" msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <grennamn> [<stash>]" @@ -13535,9 +13751,9 @@ msgid "" " [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" " [--] [<pathspec>...]" msgstr "" -"git stash [push] [-p | --patch] [S | --staged] [-k | --[no-]keep-index] [-q " +"git stash [push] [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q " "| --quiet]\n" -" [-u | --include-untracked] [-a | --all] [(-m | --message " +" [-u | --include-untracked] [-a | --all] [(-m | --message) " "<meddelande>]\n" " [--pathspec-from-file=<fil> [--pathspec-file-nul]]\n" " [--] [<sökvägsangivelse>...]" @@ -13614,6 +13830,18 @@ msgstr "kunde inte återställa ospårade filer från stash-post" msgid "attempt to recreate the index" msgstr "försök återskapa indexet" +msgid "label" +msgstr "etikett" + +msgid "label for the upstream side in conflict markers" +msgstr "etikett för uppströmssidan i konfliktmarkörer" + +msgid "label for the stashed side in conflict markers" +msgstr "etikett för den ”stashade” sidan i konfliktmarkörer" + +msgid "label for the base in diff3 conflict markers" +msgstr "etikett för basen i diff3-konfliktmarkörer" + #, c-format msgid "Dropped %s (%s)" msgstr "Kastade %s (%s)" @@ -14861,6 +15089,15 @@ msgstr "testa inte <katalog>/.git/ om <katalog> inte är en Git-katalog" msgid "interrupt transfer after <n> seconds of inactivity" msgstr "avbryt överföringen efter <n> sekunders inaktivitet" +msgid "git url-parse [-c <component>] [--] <url>..." +msgstr "git url-parse [-c <komponent>] [--] <url>..." + +msgid "component" +msgstr "komponent" + +msgid "which URL component to extract" +msgstr "vilken URL-komponent som ska hämtas ut" + msgid "git verify-commit [-v | --verbose] [--raw] <commit>..." msgstr "git verify-commit [-v | --verbose] [--raw] <incheckning>..." @@ -15549,6 +15786,9 @@ msgstr "Kör ett Git-kommando på en lista över arkiv" msgid "Prepare patches for e-mail submission" msgstr "Förbered patchar för insändning via e-post" +msgid "EXPERIMENTAL: Pretty format revisions on demand" +msgstr "EXPERIMENTELLT: Formatera revisioner snyggt på begäran" + msgid "Verifies the connectivity and validity of the objects in the database" msgstr "Bekräftar konnektivitet och validitet för objektet i databasen" @@ -15573,8 +15813,8 @@ msgstr "Visa hjälpinformation om Git" msgid "EXPERIMENTAL: Rewrite history" msgstr "EXPERIMENTELLT: Skriv om historiken" -msgid "Run git hooks" -msgstr "Kör git-krokar" +msgid "Run Git hooks" +msgstr "Kör Git-krokar" msgid "Server side implementation of Git over HTTP" msgstr "Serversideimplementation av Git över HTTP" @@ -15768,7 +16008,7 @@ msgstr "Gemensam skriptstartkod för Git" msgid "Restricted login shell for Git-only SSH access" msgstr "Begränsat inloggningsskal för SSH-åtkomst till bara Git" -msgid "Summarize 'git log' output" +msgid "Summarize `git log` output" msgstr "Summera ”git log”-utdata" msgid "Show various types of objects" @@ -15834,6 +16074,9 @@ msgstr "Sänd arkivet tillbaka till git-archive" msgid "Send objects packed back to git-fetch-pack" msgstr "Sänd packade objekt tillbaka till git-fetch-pack" +msgid "Parse and extract git URL components" +msgstr "Tolka och extrahera git-URL-komponenter" + msgid "Show a Git logical variable" msgstr "Visa en logisk Git-variabel" @@ -16336,6 +16579,42 @@ msgstr "Kunde inte skapa FSEventStream." msgid "Failed to start the FSEventStream" msgstr "Misslyckades starta FSEventStream:en" +msgid "inotify watch limit reached; increase fs.inotify.max_user_watches" +msgstr "" +"gränsen för inotify-övervakning nåddes; öka fs.inotify.max_user_watches" + +#, c-format +msgid "inotify_add_watch('%s') failed" +msgstr "inotify_add_watch(”%s”) misslyckades" + +msgid "inotify_rm_watch() failed" +msgstr "inotify_rm_watch() misslyckades" + +#, c-format +msgid "opendir('%s') failed" +msgstr "opendir(”%s”) misslyckades" + +#, c-format +msgid "lstat('%s') failed" +msgstr "lstat(”%s”) misslyckades" + +#, c-format +msgid "closedir('%s') failed" +msgstr "closedir(”%s”) misslyckades" + +msgid "inotify_init1() failed" +msgstr "inotify_init1() misslyckades" + +msgid "closing inotify file descriptor failed" +msgstr "misslyckades stänga inotify-filhandtag" + +msgid "reading inotify message stream failed" +msgstr "misslyckades läsa inotify-meddelandeström" + +# TODO: Hitta bättre översättning för "poll" +msgid "polling inotify message stream failed" +msgstr "misslyckades övervaka inotify-meddelandeström" + #, c-format msgid "[GLE %ld] could not convert path to UTF-8: '%.*ls'" msgstr "[GLE %ld] kunde inte konvertera sökväg till UTF-8: ”%.*ls”" @@ -16361,22 +16640,10 @@ msgid "could not read directory changes [GLE %ld]" msgstr "kunde inte läsa katalogändringar [GLE %ld]" #, c-format -msgid "opendir('%s') failed" -msgstr "opendir(”%s”) misslyckades" - -#, c-format -msgid "lstat('%s') failed" -msgstr "lstat(”%s”) misslyckades" - -#, c-format msgid "strbuf_readlink('%s') failed" msgstr "strbuf_readlink(”%s”) misslyckades" #, c-format -msgid "closedir('%s') failed" -msgstr "closedir(”%s”) misslyckades" - -#, c-format msgid "[GLE %ld] unable to open for read '%ls'" msgstr "[GLE %ld] kan inte öppna ”%ls” för läsning" @@ -16840,10 +17107,6 @@ msgstr "ogiltigt svar på ls-refs: %s" msgid "expected flush after ref listing" msgstr "förväntade ”flush” efter ref-listan" -#, c-format -msgid "protocol '%s' is not supported" -msgstr "protokollet ”%s” stöds inte" - msgid "unable to set SO_KEEPALIVE on socket" msgstr "kan inte sätta SO_KEEPALIVE på uttaget" @@ -16862,7 +17125,7 @@ msgid "" "Connecting to %s (port %s) ... " msgstr "" "klart.\n" -"Ansluter till %s (port %s)..." +"Ansluter till %s (port %s)... " #, c-format msgid "" @@ -16896,6 +17159,10 @@ msgstr "konstig port ”%s” blockerad" msgid "cannot start proxy %s" msgstr "kan inte starta mellanserver (proxy) %s" +#, c-format +msgid "protocol '%s' is not supported" +msgstr "protokollet ”%s” stöds inte" + msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "ingen sökväg angavs; se ”git help pull” för giltig URL-syntax" @@ -17345,6 +17612,10 @@ msgid "failed to parse --submodule option parameter: '%s'" msgstr "misslyckades tolka argument till flaggan --submodule: ”%s”" #, c-format +msgid "%s expects a non-negative integer" +msgstr "%s förväntar ett icke-negativt heltal" + +#, c-format msgid "bad --word-diff argument: %s" msgstr "felaktigt argument --word-diff: %s" @@ -18444,6 +18715,52 @@ msgstr "" "Du kan inaktivera varningen med ”git config set advice.ignoredHook false”." #, c-format +msgid "hook.jobs must be an integer, ignoring: '%s'" +msgstr "hook.jobs måste vara ett heltal, ignorerar: ”%s”" + +#, c-format +msgid "hook.jobs must be a positive integer or -1, ignoring: '%s'" +msgstr "hook.jobs måste vara ett positivt heltal eller -1, ignorerar: ”%s”" + +#, c-format +msgid "" +"hook friendly-name '%s' collides with a known event name; please choose a " +"different friendly-name" +msgstr "" +"krokens läsbara namn ”%s” krockar med ett känt händelsenamn; använd ett " +"annat läsbart namn" + +#, c-format +msgid "" +"hook friendly-name '%s' is the same as its event; this may cause ambiguity " +"with hook.%s.enabled" +msgstr "" +"krokens läsbara namn ”%s” är detsamma som dess händelse; det kan orsaka " +"tvetydigheter med hook.%s.enabled" + +#, c-format +msgid "hook.%s.parallel must be a boolean, ignoring: '%s'" +msgstr "hook.%s.parallel måste vara booleskt värde, ignorerar: ”%s”" + +#, c-format +msgid "hook.%s.jobs must be an integer, ignoring: '%s'" +msgstr "hook.%s.jobs måste vara ett heltal, ignorerar: ”%s”" + +#, c-format +msgid "hook.%s.jobs must be a positive integer or -1, ignoring: '%s'" +msgstr "hook.%s.jobs måste vara ett positivt heltal eller -1, ignorerar: ”%s”" + +#, c-format +msgid "" +"hook.%s.jobs is set but '%s' looks like a hook friendly-name, not an event " +"name; hook.<event>.jobs uses the event name (e.g. hook.post-receive.jobs), " +"so this setting will be ignored" +msgstr "" +"hook.%s.jobs har ställts in, men ”%s” ser ut som en kroks läsbara namn, inte " +"ett namn på en händelse; hook.<händelse>.jobs använder händelsens namn " +"(t.ex. hook.post-receive.jobs), så den här inställningen kommer att ignoreras" + +#, c-format msgid "disabled hook '%s' has no command configured" msgstr "den inaktiverade kroken ”%s” har inget kommando konfigurerat" @@ -18455,6 +18772,18 @@ msgstr "" "”hook.%s.command” måste ställas in, eller så måste ”hook.%s.event” tas bort; " "avbryter." +#, c-format +msgid "" +"hook '%s' is not marked as parallel=true, running in parallel anyway due to " +"-j%u" +msgstr "" +"kroken ”%s” har inte markerats som parallel=true, kör ändå parallellt på " +"grund av -j%u" + +#, c-format +msgid "%s must be a positive integer or -1, ignoring: %d" +msgstr "%s måste vara ett positivt heltal eller -1, ignorerar: %d" + msgid "not a git repository" msgstr "inte ett git-arkiv" @@ -19040,6 +19369,10 @@ msgid "ignoring existing multi-pack-index; checksum mismatch" msgstr "ignorerar befintlig multi-pack-index; felaktig kontrollsumma" #, c-format +msgid "could not find base MIDX '%s'" +msgstr "kunde inte hitta bas-MIDX: ”%s”" + +#, c-format msgid "could not load reverse index for MIDX %s" msgstr "kunde inte läsa in baklängesindexet för MIDX %s" @@ -19070,7 +19403,7 @@ msgid "no pack files to index." msgstr "inga paketfiler att indexera." msgid "refusing to write multi-pack .bitmap without any objects" -msgstr "kunde inte skriva fler-paketsbitkarta utan några objekt" +msgstr "vägrar skriva fler-paketsbitkarta utan några objekt" msgid "unable to create temporary MIDX layer" msgstr "kan inte skapa temporärt MIDX-lager" @@ -19201,6 +19534,10 @@ 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 multi-pack-index utanför gränsen" +#, c-format +msgid "failed to clear multi-pack-index chain at %s" +msgstr "misslyckades städa multi-pack-index-kedja på %s" + msgid "multi-pack-index file exists, but failed to parse" msgstr "multi-pack-indexfilen finns, men kunde inte tolkas" @@ -19316,29 +19653,6 @@ msgid "garbage at end of loose object '%s'" msgstr "skräp i slutet av löst objekt ”%s”" #, c-format -msgid "unable to open loose object %s" -msgstr "kan inte öppna lösa objekt %s" - -#, c-format -msgid "unable to parse %s header" -msgstr "kan inte tolka %s-huvud" - -msgid "invalid object type" -msgstr "felaktig objekttyp" - -#, c-format -msgid "unable to unpack %s header" -msgstr "kan inte packa upp %s-huvudet" - -#, c-format -msgid "header for %s too long, exceeds %d bytes" -msgstr "huvudet för %s är för långt, mer än %d byte" - -#, c-format -msgid "loose object %s (stored in %s) is corrupt" -msgstr "löst objekt %s (lagrat i %s) är trasigt" - -#, c-format msgid "unable to open %s" msgstr "kan inte öppna %s" @@ -19384,8 +19698,8 @@ msgid "confused by unstable object source data for %s" msgstr "förvirrad av instabil objektkälldata för %s" #, c-format -msgid "write stream object %ld != %<PRIuMAX>" -msgstr "skriv strömobjektet %ld != %<PRIuMAX>" +msgid "write stream object %<PRIuMAX> != %<PRIuMAX>" +msgstr "skriv strömobjektet %<PRIuMAX> != %<PRIuMAX>" #, c-format msgid "unable to stream deflate new object (%d)" @@ -19463,7 +19777,7 @@ msgstr "kan inte tolka innehåll i %s" #. #, c-format msgid "%s [bad object]" -msgstr "%s [felaktig objekt]" +msgstr "%s [felaktigt objekt]" #. TRANSLATORS: This is a line of ambiguous commit #. object output. E.g.: @@ -19682,6 +19996,10 @@ msgid "missing mapping of %s to %s" msgstr "saknar koppling av %s till %s" #, c-format +msgid "%s is not a valid object" +msgstr "%s är inte ett giltigt objekt" + +#, c-format msgid "%s is not a valid '%s' object" msgstr "%s är inte ett giltigt ”%s”-objekt" @@ -19695,6 +20013,29 @@ msgid "unable to move new alternates file into place" msgstr "kan inte flytta ny ”alternates”-fil på plats" #, c-format +msgid "unable to open loose object %s" +msgstr "kan inte öppna det lösa objektet %s" + +#, c-format +msgid "unable to parse %s header" +msgstr "kan inte tolka %s-huvud" + +msgid "invalid object type" +msgstr "felaktig objekttyp" + +#, c-format +msgid "unable to unpack %s header" +msgstr "kan inte packa upp %s-huvudet" + +#, c-format +msgid "header for %s too long, exceeds %d bytes" +msgstr "huvudet för %s är för långt, mer än %d byte" + +#, c-format +msgid "loose object %s (stored in %s) is corrupt" +msgstr "det lösa objektet %s (lagrat i %s) är trasigt" + +#, c-format msgid "duplicate entry when writing bitmap index: %s" msgstr "duplicerad post när bitkarteindex skulle skrivas: %s" @@ -19760,7 +20101,7 @@ msgid "cannot fstat bitmap file" msgstr "kan inte utföra ”fstat” på bitkartefil" msgid "checksum doesn't match in MIDX and bitmap" -msgstr "checksumman stämmer inte i MIDX och bitkarta" +msgstr "kontrollsumman stämmer inte i MIDX och bitkarta" msgid "multi-pack bitmap is missing required reverse index" msgstr "flerpaketsbitkarta saknar nödvändigt omvänt index" @@ -20146,6 +20487,24 @@ msgstr "misslyckades hitta objektet %s" msgid "failed to find tag %s" msgstr "misslyckades hitta taggen %s" +#, c-format +msgid "tree:%lu filter not supported by the path-walk API" +msgstr "”tree:%lu”-filtret hanteras inte av det ”path-walk”-API:et" + +msgid "sparse filter cannot be combined with existing sparse patterns" +msgstr "glest filter kan inte kombineras med befintliga glesa mönster" + +#, c-format +msgid "unable to parse sparse filter data in '%s'" +msgstr "kan inte tolka data för glest filter i ”%s”" + +msgid "sparse filter is not cone-mode compatible" +msgstr "glest filter är inte kompatibelt med kon-läge" + +#, c-format +msgid "object filter '%s' not supported by the path-walk API" +msgstr "objektfiltret ”%s” stöds inte av ”path-walk”-API:et" + msgid "failed to setup revision walk" msgstr "misslyckades starta revisionstraversering" @@ -20219,7 +20578,7 @@ msgstr "sökvägsangivelsen ”%s” är på andra sidan av en symbolisk länk" #, c-format msgid "line is badly quoted: %s" -msgstr "raden er felaktigt citerad: %s" +msgstr "raden är felaktigt citerad: %s" msgid "unable to write flush packet" msgstr "kan inte skriva flush-paket" @@ -20305,20 +20664,24 @@ msgid "unsupported field '%s' in '%s' config" msgstr "fältet ”%s” i inställningen ”%s” stöds ej" #, c-format -msgid "no or empty URL advertised for remote '%s'" -msgstr "ingen eller tom URL tillkännagavs för fjärren ”%s”" - -#, c-format -msgid "known remote named '%s' but with URL '%s' instead of '%s'" -msgstr "känd fjärr som heter ”%s” men med URL:en ”%s” istället för ”%s”" +msgid "" +"known remote named '%s' but with URL '%s' instead of '%s', ignoring this " +"remote" +msgstr "" +"känd fjärr som heter ”%s” men med URL:en ”%s” istället för ”%s”, ignorerar " +"denna fjärr" #, c-format msgid "invalid element '%s' from remote info" msgstr "ogiltigt element ”%s” från fjärrinformation" #, c-format -msgid "server advertised a promisor remote without a name or URL: %s" -msgstr "servern deklarerade en kontraktsfjärr utan namn eller URL: %s" +msgid "" +"server advertised a promisor remote without a name or URL: '%s', ignoring " +"this remote" +msgstr "" +"servern deklarerade en kontraktsfjärr utan namn eller URL: %s, ignorerar " +"denna fjärr" #, c-format msgid "" @@ -20364,8 +20727,8 @@ msgid "%s must be non-negative, using default" msgstr "%s måste vara icke-negativt, använder förval" #, c-format -msgid "%s must be between 0 and 1, using default" -msgstr "%s måste vara mellan 0 och 1, använder förval" +msgid "%s must be between 0 (exclusive) and 1, using default" +msgstr "%s måste vara mellan 0 (exklusivt) och 1, använder förval" #, c-format msgid "%s must be positive, using default" @@ -21093,6 +21456,14 @@ msgid "refusing to force and skip creation of reflog" msgstr "vägrar att tvinga och hoppa över skapande av referenslogg" #, c-format +msgid "trying to write ref '%s' with nonexistent object %s" +msgstr "försöker skriva referensen ”%s” med icke-existerande objektet %s" + +#, c-format +msgid "trying to write non-commit object %s to branch '%s'" +msgstr "försöker skriva objektet %s som inte är incheckning till grenen ”%s”" + +#, c-format msgid "update_ref failed for ref '%s': %s" msgstr "update_ref misslyckades för referensen ”%s”: %s" @@ -21179,14 +21550,6 @@ msgid "refname is dangerous: %s" msgstr "refnamnet är farligt: %s" #, c-format -msgid "trying to write ref '%s' with nonexistent object %s" -msgstr "försöker skriva referensen ”%s” med icke-existerande objektet %s" - -#, c-format -msgid "trying to write non-commit object %s to branch '%s'" -msgstr "försöker skriva objektet %s som inte är incheckning till grenen ”%s”" - -#, c-format msgid "" "multiple updates for 'HEAD' (including one via its referent '%s') are not " "allowed" @@ -21678,6 +22041,35 @@ msgstr "kunde inte stänga temporär fil för refs-ögonblicksbild" msgid "could not remove stale bitmap: %s" msgstr "kunde inte ta bort gammal bitkarta: %s" +msgid "no packs to write MIDX during compaction" +msgstr "inga paket att skriva till MIDX under kompaktering" + +#, c-format +msgid "expected exactly one line during MIDX write, got: %<PRIuMAX>" +msgstr "förväntade exakt en rad under MIDX-skrivning, fick: %<PRIuMAX>" + +#, c-format +msgid "unexpected MIDX output: '%s'" +msgstr "oväntade MIDX-utdata: ”%s”" + +#, c-format +msgid "could not load pack %<PRIu32> from MIDX" +msgstr "kunde inte läsa det paketet %<PRIu32> från MIDX" + +msgid "too many objects in MIDX compaction step" +msgstr "för många objekt i MIDX-kompakteringssteg" + +#, c-format +msgid "could not find preferred pack for MIDX %s" +msgstr "kunde inte hitta föredraget paket för MIDX %s" + +msgid "unable to generate compaction plan" +msgstr "kan inte skapa kompakteringsplan" + +#, c-format +msgid "unable to execute compaction step %<PRIuMAX>" +msgstr "kan inte utföra kompakteringssteg %<PRIuMAX>" + msgid "could not start pack-objects to repack promisor objects" msgstr "kunde inte starta pack-objects för att packa om kontraktsobjekt" @@ -21744,6 +22136,10 @@ msgstr "behöver några incheckningar för omspelning" msgid "all positive revisions given must be references" msgstr "alla positiva revisioner som anges måste vara referenser" +#, c-format +msgid "commit %s became empty after replay" +msgstr "incheckningen %s blev tom efter återuppspelning" + msgid "'--ref' cannot be used with multiple revision ranges" msgstr "”--ref” kan inte användas med flera revisionsintervall" @@ -21868,8 +22264,8 @@ msgstr "din nuvarande gren ”%s” innehåller ännu inte några incheckningar" msgid "object filtering requires --objects" msgstr "objektfiltrering kräver --objects" -msgid "-L does not yet support diff formats besides -p and -s" -msgstr "-L stöder ännu inte andra diff-format än -p och -s" +msgid "-L does not yet support the requested diff format" +msgstr "-L stöder ännu inte det önskade diff-formatet" #, c-format msgid "cannot create async thread: %s" @@ -22809,20 +23205,29 @@ msgstr "kan inte spara %s" #, c-format msgid "" -"%s\n" +"Your local changes are stashed, however applying them\n" +"resulted in conflicts. You can either resolve the conflicts\n" +"and then discard the stash with \"git stash drop\", or, if you\n" +"do not want to resolve them now, run \"git reset --hard\" and\n" +"apply the local changes later by running \"git stash pop\".\n" +msgstr "" +"Dina lokala ändringar har skrivits till en ”stash”, men\n" +"tillämpning av dem gav konflikter. Du kan antingen lösa\n" +"konflikterna och så kasta ”stash:en” med ”git stash drop”,\n" +"eller, om du inte vill lösa dem nu, köra ”git reset --hard”\n" +"och tillämpa de lokala ändringarna senare genom att köra\n" +"”git stash pop”.\n" + +#, c-format +msgid "" +"Autostash exists; creating a new stash entry.\n" "Your changes are safe in the stash.\n" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" -"%s\n" +"Autostash finns; skapar ny stash-post.\n" "Dina ändringar är säkra i stashen.\n" "Du kan när som helst använda ”git stash pop” eller ”git stash drop”.\n" -msgid "Applying autostash resulted in conflicts." -msgstr "Tillämpning av autostash gav konflikter." - -msgid "Autostash exists; creating a new stash entry." -msgstr "Autostash finns; skapar ny stash-post." - msgid "autostash reference is a symref" msgstr "autostash-referensen är en symbolisk referens" @@ -23115,9 +23520,6 @@ msgstr "" msgid "fork failed" msgstr "”fork” misslyckades" -msgid "setsid failed" -msgstr "”setsid” misslyckades" - #, c-format msgid "cannot stat template '%s'" msgstr "kan inte ta status på mallen ”%s”" @@ -23194,6 +23596,10 @@ msgid "Initialized empty Git repository in %s%s\n" msgstr "Initierade tomt Git-arkiv i %s%s\n" #, c-format +msgid "unrecognized value for '%s': '%s'" +msgstr "okänt värde för ”%s”: ”%s”" + +#, c-format msgid "index entry is a directory, but not sparse (%08x)" msgstr "indexposten är en katalog, men inte gles (%08x)" @@ -23527,6 +23933,9 @@ msgstr "växla aggressiv kantvandring" msgid "read a pattern list over stdin" msgstr "läs en mönsterlista från standard in" +msgid "toggle pruning of trees by sparse patterns" +msgstr "växla bortrensning av träd med glesa mönster" + #, c-format msgid "commit %s is not marked reachable" msgstr "incheckning %s är inte märkt nåbar" @@ -23600,6 +24009,13 @@ msgstr "symbol" msgid "command token to send to the server" msgstr "igenkänningstecken för kommando att sända till servern" +msgid "write a pack with a single reachable large blob" +msgstr "skriv ett paket med en ensam nåbar stor blob" + +#, c-format +msgid "'%s' is not a valid blob size" +msgstr "”%s” är inte en giltig blob-storlek" + msgid "unit-test [<options>]" msgstr "unit-test [<flaggor>]" @@ -23631,7 +24047,7 @@ msgid "empty trailer token in trailer '%.*s'" msgstr "tom släpradssymbol i släpraden ”%.*s”" msgid "empty --trailer argument" -msgstr "tomt --trailer-argument" +msgstr "tomt ”--trailer”-argument" #, c-format msgid "invalid trailer '%s': missing key before separator" @@ -23709,6 +24125,10 @@ msgstr "kan inte ansluta till undertjänsten %s" msgid "--negotiate-only requires protocol v2" msgstr "--negotiate-only kräver protokoll v2" +#, c-format +msgid "ignoring %s because the protocol does not support it." +msgstr "ignorerar %s eftersom protokollet inte stöder det." + msgid "'option' without a matching 'ok/error' directive" msgstr "”option” utan motsvarande ”ok/error”-direktiv" @@ -24305,7 +24725,7 @@ msgstr "misslyckades ändra inställningen extensions.worktreeConfig" msgid "unable to upgrade repository format to support relative worktrees" msgstr "" -"kunde inte uppgradera arkivformat till att stöda relativa arbetskataloger" +"kan inte uppgradera arkivformat till att stöda relativa arbetskataloger" msgid "unable to set extensions.relativeWorktrees setting" msgstr "misslyckades ändra inställningen extensions.relativeWorktrees" @@ -25030,7 +25450,7 @@ msgstr "CA-sökvägen ”%s” finns inte" #, perl-format msgid "Only client key \"%s\" specified" -msgstr "Ingen klientnyckel ”%s” har angivits" +msgstr "Endast klientnyckel ”%s” har angivits" msgid "" " The Cc list above has been expanded by additional\n" @@ -97,8 +97,8 @@ msgid "" msgstr "" "Project-Id-Version: Git Turkish Localization Project\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2026-04-16 01:14+0300\n" -"PO-Revision-Date: 2026-04-04 22:30+0300\n" +"POT-Creation-Date: 2026-06-15 18:56+0000\n" +"PO-Revision-Date: 2026-06-16 20:30+0300\n" "Last-Translator: Emir SARI <emir_sari@icloud.com>\n" "Language-Team: Turkish <kde-i18n-doc@kde.org>\n" "Language: tr\n" @@ -1712,30 +1712,30 @@ msgstr "" #, c-format msgid "" -"The merge base %s is %s.\n" +"The merge base %s is '%s'.\n" "This means the first '%s' commit is between %s and [%s].\n" msgstr "" -"Birleştirme temeli %s, %s.\n" -"Bu demek oluyor ki ilk '%s' işlemesi %s ve [%s] arasında.\n" +"Birleştirme temeli %s, \"%s\".\n" +"Bu demek oluyor ki ilk \"%s\" işlemesi %s ve [%s] arasında.\n" #, c-format msgid "" -"Some %s revs are not ancestors of the %s rev.\n" +"Some '%s' revs are not ancestors of the '%s' rev.\n" "git bisect cannot work properly in this case.\n" -"Maybe you mistook %s and %s revs?\n" +"Maybe you mistook '%s' and '%s' revs?\n" msgstr "" -"Bazı %s revizyonları %s revizyonunun atası değil.\n" +"Bazı \"%s\" revizyonları \"%s\" revizyonunun atası değil.\n" "git bisect bu durumda düzgünce çalışamaz.\n" -"%s ve %s revizyonlarını birbirine mi karıştırdınız?\n" +"\"%s\" ve \"%s\" revizyonlarını birbirine mi karıştırdınız?\n" #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" -"So we cannot be sure the first %s commit is between %s and %s.\n" +"So we cannot be sure the first '%s' commit is between %s and %s.\n" "We continue anyway." msgstr "" "%s ve [%s] arasındaki birleştirme temeli atlanmalı.\n" -"%s işlemesinin %s ve [%s] arasında olduğundan emin olamıyoruz.\n" +"İlk \"%s\" işlemesinin %s ve %s arasında olduğundan emin olamıyoruz.\n" "Yine de sürdüreceğiz." #, c-format @@ -1743,27 +1743,27 @@ msgid "Bisecting: a merge base must be tested\n" msgstr "İkili arama: Birleştirme temelleri sınanmalı\n" #, c-format -msgid "a %s revision is needed" -msgstr "bir %s revizyonu gerekiyor" +msgid "a '%s' revision is needed" +msgstr "bir \"%s\" revizyonu gerekiyor" #, c-format msgid "could not create file '%s'" -msgstr "'%s' dosyası oluşturulamadı" +msgstr "\"%s\" dosyası oluşturulamadı" #, c-format msgid "unable to start 'show' for object '%s'" -msgstr "'%s' nesnesi için 'show' başlatılamıyor" +msgstr "\"%s\" nesnesi için \"show\" başlatılamıyor" #, c-format msgid "could not read file '%s'" -msgstr "'%s' dosyası okunamadı" +msgstr "\"%s\" dosyası okunamadı" msgid "reading bisect refs failed" msgstr "ikili arama başvurularını okuma başarısız oldu" #, c-format -msgid "%s was both %s and %s\n" -msgstr "%s hem %s hem %s idi\n" +msgid "%s was both '%s' and '%s'\n" +msgstr "%s, hem \"%s\" hem \"%s\" idi\n" #, c-format msgid "" @@ -1817,7 +1817,7 @@ msgid "" "cannot inherit upstream tracking configuration of multiple refs when " "rebasing is requested" msgstr "" -"yeniden temellendirme istendiğinde birden çok başvurunun üst kaynak izleme " +"yeniden temellendirme istendiğinde birden çok başvurunun üstkaynak izleme " "yapılandırması miras alınamıyor" #, c-format @@ -2509,8 +2509,22 @@ msgstr "git archive: Protokol hatası" msgid "git archive: expected a flush" msgstr "git archive: Floş bekleniyordu" -msgid "git backfill [--min-batch-size=<n>] [--[no-]sparse]" -msgstr "git backfill [--min-batch-size=<n>] [--[no-]sparse]" +msgid "" +"git backfill [--min-batch-size=<n>] [--[no-]sparse] [--[no-]include-edges] " +"[<revision-range>]" +msgstr "" +"git backfill [--min-batch-size=<n>] [--[no-]sparse] [--[no-]include-edges] " +"[<revizyon-erimi>]" + +#, c-format +msgid "'%s' cannot be used with 'git backfill'" +msgstr "\"%s\", \"git backfill\" ile birlikte kullanılamaz" + +msgid "cannot backfill with these filter options" +msgstr "bu süzgeç seçenekleriyle geriye doldurma yapılamıyor" + +msgid "cannot backfill with blob size limits" +msgstr "ikili nesne boyut limitleriyle geriye doldurma yapılamıyor" msgid "problem loading sparse-checkout" msgstr "aralıklı çıkış yüklenirken sorun" @@ -2521,6 +2535,9 @@ 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 "Include blobs from boundary commits in the backfill" +msgstr "Geri doldurma içinde sınırlardaki işlemelerden ikili nesneleri içer" + #, c-format msgid "unrecognized argument: %s" msgstr "tanımlanamayan argüman: %s" @@ -2638,28 +2655,30 @@ msgstr "yalnızca bir %s işlemesi ile ikili arama yapılıyor" msgid "Are you sure [Y/n]? " msgstr "Emin misiniz [Y/n]? " -msgid "status: waiting for both good and bad commits\n" -msgstr "durum: hem iyi hem kötü işlemeler bekleniyor\n" +#, c-format +msgid "status: waiting for both '%s' and '%s' commits\n" +msgstr "durum: hem \"%s\" hem \"%s\" işlemeler bekleniyor\n" #, c-format -msgid "status: waiting for bad commit, %d good commit known\n" -msgid_plural "status: waiting for bad commit, %d good commits known\n" -msgstr[0] "durum: kötü işleme bekleniyor, bilinen %d iyi işleme\n" -msgstr[1] "durum: kötü işleme bekleniyor, bilinen %d iyi işleme\n" +msgid "status: waiting for '%s' commit, %d '%s' commit known\n" +msgid_plural "status: waiting for '%s' commit, %d '%s' commits known\n" +msgstr[0] "durum: \"%s\" işleme bekleniyor, bilinen %d \"%s\" işleme\n" +msgstr[1] "durum: \"%s\" işleme bekleniyor, bilinen %d \"%s\" işleme\n" -msgid "status: waiting for good commit(s), bad commit known\n" -msgstr "durum: iyi işleme(ler) bekleniyor, kötü işleme biliniyor\n" +#, c-format +msgid "status: waiting for '%s' commit(s), '%s' commit known\n" +msgstr "durum: \"%s\" işleme(ler) bekleniyor, \"%s\" işleme biliniyor\n" msgid "no terms defined" msgstr "hiçbir terim tanımlanmadı" #, c-format msgid "" -"Your current terms are %s for the old state\n" -"and %s for the new state.\n" +"Your current terms are '%s' for the old state\n" +"and '%s' for the new state.\n" msgstr "" -"Mevcut terimleriniz eski durum için %s ve\n" -"yeni durum için %s.\n" +"Geçerli koşullarınız eski durum için \"%s\" ve\n" +"yeni durum için \"%s\".\n" #, c-format msgid "" @@ -2742,12 +2761,12 @@ msgid "bisect run failed: no command provided." msgstr "ikili arama başarısız: Komut verilmedi." #, c-format -msgid "unable to verify %s on good revision" -msgstr "%s, iyi revizyonda doğrulanamıyor" +msgid "unable to verify %s on '%s' revision" +msgstr "%s, \"%s\" revizyonda doğrulanamıyor" #, c-format -msgid "bogus exit code %d for good revision" -msgstr "iyi revizyon için anlamsız %d çıkış kodu" +msgid "bogus exit code %d for '%s' revision" +msgstr "anlamsız %d çıkış kodu, \"%s\" revizyon için" #, c-format msgid "bisect run failed: exit code %d from %s is < 0 or >= 128" @@ -2763,8 +2782,9 @@ msgstr "ikili arama artık çalışmayı sürdüremiyor" msgid "bisect run success" msgstr "ikili arama başarılı" -msgid "bisect found first bad commit" -msgstr "ikili arama ilk hatalı işlemeyi buldu" +#, c-format +msgid "bisect found first '%s' commit\n" +msgstr "ikili arama ilk \"%s\" işlemeyi buldu\n" #, c-format msgid "bisect run failed: 'git bisect %s' exited with error code %d" @@ -3436,6 +3456,10 @@ msgstr "Nesneler demetten çıkarılıyor" msgid "cannot read object %s '%s'" msgstr "%s '%s' nesnesi okunamıyor" +#, c-format +msgid "mailmap: invalid boolean '%s'" +msgstr "mailmap: geçersiz Boole \"%s\"" + msgid "flush is only for --buffer mode" msgstr "floş, yalnızca --buffer kipi içindir" @@ -3788,14 +3812,6 @@ msgid "you need to resolve your current index first" msgstr "önce geçerli indeksinizi çözmelisiniz" #, c-format -msgid "" -"cannot continue with staged changes in the following files:\n" -"%s" -msgstr "" -"aşağıdaki dosyalardaki hazırlanan değişikliklerle sürdürülemiyor:\n" -"%s" - -#, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "'%s' için başvuru günlüğü yapılamıyor: %s\n" @@ -3887,6 +3903,10 @@ msgid "You are on a branch yet to be born" msgstr "Henüz doğmamış bir dal üzerindesiniz" #, c-format +msgid "The following paths have local changes:\n" +msgstr "Aşağıdaki yolların yerel değişiklikleri var:\n" + +#, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" "Please use -- (and optionally --no-guess) to disambiguate" @@ -5430,6 +5450,18 @@ msgid "wrong number of arguments, should be from %d to %d" msgstr "yanlış argüman sayısı, %d ile %d arasında olmalı" #, c-format +msgid "missing value to set to the variable '%s'" +msgstr "\"%s\" değişkeni için eksik değer" + +#, c-format +msgid "did you mean \"git config set %s %s\"?" +msgstr "\"git config set %s %s\" mi demek istediniz?" + +#, c-format +msgid "missing value to set to a variable with an invalid name '%s'" +msgstr "\"%s\" geçersiz adlı bir değişken için eksik değer" + +#, c-format msgid "invalid key pattern: %s" msgstr "geçersiz anahtar dizgisi: %s" @@ -6846,14 +6878,18 @@ msgid "option \"%s\" is ignored for %s" msgstr "\"%s\" seçeneği %s için yok sayılıyor" #, c-format -msgid "%s is not a valid object" -msgstr "%s geçerli bir nesne değil" - -#, c-format msgid "the object %s does not exist" msgstr "%s diye bir nesne yok" #, c-format +msgid "ignoring %s=%s because it does not match any refs" +msgstr "%s=%s yok sayılıyor; çünkü herhangi bir başvuruyla eşleşmiyor" + +#, c-format +msgid "ignoring %s because the protocol does not support it" +msgstr "%s yok sayılıyor; çünkü protokol tarafından desteklenmiyor" + +#, c-format msgid "" "Run 'git remote set-head %s %s' to follow the change, or set\n" "'remote.%s.followRemoteHEAD' configuration option to a different value\n" @@ -7054,6 +7090,9 @@ msgstr "revizyon" msgid "report that we have only objects reachable from this object" msgstr "yalnızca bu nesneden ulaşılabilir nesnelerimiz olduğunu bildir" +msgid "ensure this ref is always sent as a negotiation have" +msgstr "bu başvurunun her zaman pazarlık için gönderildiğinden emin ol" + msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" msgstr "" "bir paket dosyasını getirme; bunun yerine pazarlık ipuçlarının atalarını " @@ -7071,9 +7110,6 @@ msgstr "getirdikten sonra işleme grafiğini yaz" msgid "accept refspecs from stdin" msgstr "başvuru belirteçlerini stdin'den oku" -msgid "--negotiate-only needs one or more --negotiation-tip=*" -msgstr "--negotiate-only'e bir veya daha çok --negotiation-tip=* gerekiyor" - msgid "negative depth in --deepen is not supported" msgstr "--deepen içinde negatif derinlik desteklenmiyor" @@ -7104,6 +7140,10 @@ msgstr "--negotiate-only kullanırken uzak konum sağlanmalıdır" msgid "protocol does not support --negotiate-only, exiting" msgstr "protokol, --negotiate-only desteklemediğinden çıkılıyor" +#, c-format +msgid "%s needs one or more %s" +msgstr "%s için bir veya daha fazla %s ögesine gereksinim var" + msgid "" "--filter can only be used with the remote configured in " "extensions.partialclone" @@ -7434,6 +7474,10 @@ msgid "value of '%s' not bool or int: %d" msgstr "'%s' değeri Boole veya tamsayı değil: %d" #, c-format +msgid "daemon did not stop within %d seconds" +msgstr "ardalan süreci, %d saniye içinde durmadı" + +#, c-format msgid "fsmonitor-daemon is watching '%s'\n" msgstr "fsmonitor-daemon, '%s' ögesini izliyor\n" @@ -7477,6 +7521,9 @@ msgstr "fsmonitor--daemon, halihazırda '%s' çalıştırıyor" msgid "running fsmonitor-daemon in '%s'\n" msgstr "fsmonitor-daemon '%s' içinde çalışıyor\n" +msgid "setsid failed" +msgstr "setsid başarısız" + #, c-format msgid "starting fsmonitor-daemon in '%s'\n" msgstr "'%s' içinde fsmonitor-daemon başlatılıyor\n" @@ -8150,6 +8197,13 @@ msgstr "kullanım: %s%s" msgid "'git help config' for more information" msgstr "ek bilgi için: 'git help config'" +msgid "" +"git history fixup <commit> [--dry-run] [--update-refs=(branches|head)] [--" +"reedit-message] [--empty=(drop|keep|abort)]" +msgstr "" +"git history fixup <işleme> [--dry-run] [--update-refs=(branches|head)] [--" +"reedit-message] [--empty=(drop|keep|abort)]" + msgid "git history reword <commit> [--dry-run] [--update-refs=(branches|head)]" msgstr "" "git history reword <işleme> [--dry-run] [--update-refs=(branches|head)]" @@ -8210,25 +8264,79 @@ msgstr "\"%s\" başvurusu güncellenemedi: %s" msgid "failed to commit ref transaction: %s" msgstr "başvuru işlemi işlenemedi: %s" +#, c-format +msgid "unable to parse parent of %s" +msgstr "%s ögesinin üst ögesi ayrıştırılamıyor" + +#, c-format +msgid "" +"unrecognized '--empty=' action '%s'; valid values are \"drop\", \"keep\", " +"and \"abort\"." +msgstr "" +"tanımlanamayan \"--empty=\" eylemi \"%s\"; geçerli değerler: \"drop\", " +"\"keep\", \"abort\"" + msgid "control which refs should be updated" msgstr "hangi başvuruların güncellenmesi gerektiğini denetle" msgid "perform a dry-run without updating any refs" msgstr "herhangi bir başvuruyu güncellemeden önce prova yap" +msgid "open an editor to modify the commit message" +msgstr "işleme iletisini düzenlemek için düzenleyici aç" + +msgid "how to handle commits that become empty" +msgstr "boşalan işlemelerin nasıl ele alınacağı" + msgid "command expects a single revision" msgstr "komut tek bir revizyon bekler" +msgid "cannot run fixup in a bare repository" +msgstr "çıplak bir depoda düzeltme çalıştırılamıyor" + #, c-format msgid "commit cannot be found: %s" msgstr "işleme bulunamadı: %s" -msgid "failed writing reworded commit" -msgstr "iletisi değiştirilen işleme yazılamadı" +msgid "cannot get tree for HEAD" +msgstr "HEAD için olan ağaç alınamıyor" + +msgid "unable to read index" +msgstr "indeks okunamıyor" + +msgid "nothing to fixup: no staged changes" +msgstr "düzeltilecek bir şey yok: hazırlanmış değişiklik yok" + +msgid "unable to write index as a tree" +msgstr "indeks bir ağaç olarak yazılamıyor" + +#, c-format +msgid "cannot get tree for commit %s" +msgstr "%s işlemesi için olan ağaç alınamıyor" + +msgid "merge failed while applying fixup" +msgstr "birleştirme, düzeltme uygulanırken başarısız oldu" + +msgid "fixup would produce conflicts; aborting" +msgstr "düzeltme, çakışmalar üretecekti, iptal edildi" + +#, c-format +msgid "cannot drop root commit %s: it has no parent to replay onto" +msgstr "kök işleme %s bırakılamıyor: üzerine yeniden oynanacak üst ögesi yok" + +#, c-format +msgid "fixup makes commit %s empty" +msgstr "düzeltme, %s işlemesini boş yapıyor" + +msgid "failed writing fixed-up commit" +msgstr "düzeltme işlemesi yazılamadı" msgid "failed replaying descendants" msgstr "altsoy yeniden oynatılamadı" +msgid "failed writing reworded commit" +msgstr "iletisi değiştirilen işleme yazılamadı" + msgid "unable to populate index with tree" msgstr "indeks, ağaç ile doldurulamıyor" @@ -8264,10 +8372,11 @@ msgstr "birleştirme işlemesi bölünemez" msgid "" "git hook run [--allow-unknown-hook-name] [--ignore-missing] [--to-" -"stdin=<path>] <hook-name> [-- <hook-args>]" +"stdin=<path>] [(-j|--jobs) <n>]\n" +"<hook-name> [-- <hook-args>]" msgstr "" "git hook run [--allow-unknown-hook-name] [--ignore-missing]\n" -"[--to-stdin=<yol>] <kanca-adı> [-- <kanca-argümanları>]" +" [--to-stdin=<yol>] [(-j|--jobs) <n>] <kanca-adı> [-- <kanca-argümanları>]" msgid "" "git hook list [--allow-unknown-hook-name] [-z] [--show-scope] <hook-name>" @@ -8308,6 +8417,13 @@ msgstr "istenen eksik <kanca-adı> sessizce yok sayılıyor" msgid "file to read into hooks' stdin" msgstr "kancaların stdin'ine okunacak dosya" +msgid "run up to <n> hooks simultaneously (-1 for CPU count)" +msgstr "en çok <n> kancaya kadar çalıştır (CPU sayısı için -1)" + +#, c-format +msgid "invalid value for -j: %d (use -1 for CPU count or a positive integer)" +msgstr "-j için geçersiz değer: %d (CPU sayısı için -1 veya pozitif tamsayı)" + #, c-format msgid "object type mismatch at %s" msgstr "%s konumunda nesne türü uyuşmazlığı" @@ -8357,6 +8473,9 @@ msgstr "paketin %<PRIuMAX> ofsetinde hatalı nesne var: %s" msgid "inflate returned %d" msgstr "şişirme programı %d döndürdü" +msgid "object size too large for this platform" +msgstr "nesne boyutu bu platform için pek büyük" + msgid "offset value overflow for delta base object" msgstr "delta tabanı nesnesi için ofset değeri taşımı" @@ -9741,18 +9860,22 @@ msgstr "birden çok ağacın oluşturulmasına izin ver" msgid "" "git multi-pack-index [<options>] write [--preferred-pack=<pack>]\n" " [--[no-]bitmap] [--[no-]incremental] [--[no-]stdin-packs]\n" -" [--refs-snapshot=<path>]" +" [--refs-snapshot=<path>] [--[no-]write-chain-file]\n" +" [--base=<checksum>]" msgstr "" "git multi-pack-index [<seçenekler>] write [--preferred-pack=<paket>]\n" " [--[no-]bitmap] [--[no-]incremental] [--[no-]stdin-packs]\n" -" [--refs-snapshot=<yol>]" +" [--refs-snapshot=<yol>] [--[no-]write-chain-file]\n" +" [--base=<sağlama-toplamı>]" msgid "" "git multi-pack-index [<options>] compact [--[no-]incremental]\n" -" [--[no-]bitmap] <from> <to>" +" [--[no-]bitmap] [--base=<checksum>] [--[no-]write-chain-file]\n" +" <from> <to>" msgstr "" "git multi-pack-index [<seçenekler>] compact [--[no-]incremental]\n" -" [--[no-]bitmap] <nereden> <nereye>" +" [--[no-]bitmap] [--base=<sağlama-toplamı>] [--[no-]write-chain-file]\n" +" <nereden> <nereye>" msgid "git multi-pack-index [<options>] verify" msgstr "git multi-pack-index [<seçenekler>] verify" @@ -9778,9 +9901,18 @@ msgstr "bir çoklu paket biteşlemi hesaplanırken yeniden kullanılacak paket" msgid "write multi-pack bitmap" msgstr "çoklu paket biteşlemi yaz" +msgid "checksum" +msgstr "sağlama toplamı" + +msgid "base MIDX for incremental writes" +msgstr "artımlı yazımlar için taban MIDX" + msgid "write a new incremental MIDX" msgstr "yeni bir artımlı MIDX yaz" +msgid "write the multi-pack-index chain file" +msgstr "multi-pack-index zincir dosyasını yaz" + msgid "write multi-pack index containing only given indexes" msgstr "yalnızca verilen indeksleri içeren çoklu paket indekslerini yaz" @@ -9788,6 +9920,13 @@ msgid "refs snapshot for selecting bitmap commits" msgstr "biteşlem işlemeleri seçmek için başvuruların anlık görüntüsünü al" #, c-format +msgid "cannot use %s without %s" +msgstr "%s, %s olmadan kullanılamıyor" + +msgid "cannot use --base without --no-write-chain-file" +msgstr "--no-write-chain-file olmadan --base kullanılamaz" + +#, c-format msgid "could not find MIDX: %s" msgstr "MIDX bulunamadı: %s" @@ -9927,6 +10066,48 @@ msgstr "'tanımlanmayan' adların yazdırılmasına izin ver (öntanımlı)" msgid "dereference tags in the input (internal use)" msgstr "girdide etiketlerin başvurularını kaldır (iç kullanım)" +#, c-format +msgid "'%s' needs to be either text, revs, or rev" +msgstr "\"%s\"; ya metin ya revizyonlar ya da revizyon olmalıdır" + +msgid "" +"(EXPERIMENTAL!) git format-rev --stdin-mode=<mode> --format=<pretty> [--" +"[no-]notes=<ref>] [-z] [--[no-]null-output] [--[no-]null-input]" +msgstr "" +"(DENEYSEL!) git format-rev --stdin-mode=<kip> --format=<okunabilir>\n" +"[--[no-]notes=<başvuru>] [-z] [--[no-]null-output] [--[no-]null-input]" + +msgid "pretty format to use" +msgstr "kullanılacak okunabilir biçim" + +msgid "stdin-mode" +msgstr "stdin-mode" + +msgid "how revs are processed" +msgstr "revizyonların nasıl işlendiği" + +msgid "notes" +msgstr "notlar" + +msgid "display notes for pretty format" +msgstr "okunabilir biçim için görüntülenecek notlar" + +msgid "z" +msgstr "z" + +msgid "Use NUL for input and output termination" +msgstr "girdi ve çıktı sonlandırma için NUL kullan" + +msgid "Use NUL for input termination" +msgstr "girdi sonlandırma için NUL kullan" + +msgid "Use NUL for output termination" +msgstr "çıktı sonlandırma için NUL kullan" + +#, c-format +msgid "'%s' is required" +msgstr "\"%s\" gerekiyor" + msgid "git notes [--ref <notes-ref>] [list [<object>]]" msgstr "git notes [--ref <not-bşvr>] [list [<nesne>]]" @@ -10273,6 +10454,10 @@ 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: unable to parse object header of %s" +msgstr "write_reuse_object: %s nesne üstbilgisi ayrıştırılamıyor" + +#, c-format msgid "" "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in " "pack %s" @@ -10453,9 +10638,6 @@ msgstr "%s konumundaki gevşek nesne incelenemedi" msgid "unable to force loose object" msgstr "gevşek nesne zorlanamıyor" -msgid "failed to pack objects via path-walk" -msgstr "path-walk ile nesneler paketlenemedi" - #, c-format msgid "not a rev '%s'" msgstr "bir revizyon değil: '%s'" @@ -10464,6 +10646,9 @@ msgstr "bir revizyon değil: '%s'" msgid "bad revision '%s'" msgstr "hatalı revizyon: '%s'" +msgid "failed to pack objects via path-walk" +msgstr "path-walk ile nesneler paketlenemedi" + msgid "unable to add recent objects" msgstr "en son nesneler eklenemiyor" @@ -11066,6 +11251,10 @@ msgstr "" msgid "invalid value for '%s'" msgstr "'%s' için geçersiz değer" +#, c-format +msgid "could not push to %s" +msgstr "%s konumuna itilemedi" + msgid "repository" msgstr "depo" @@ -11137,8 +11326,16 @@ msgid "" "and then push using the remote name\n" "\n" " git push <name>\n" +"\n" +"To push to multiple remotes at once, configure a remote group using\n" +"\n" +" git config remotes.<groupname> \"<remote1> <remote2>\"\n" +"\n" +"and then push using the group name\n" +"\n" +" git push <groupname>\n" msgstr "" -"Yapılandırılan itme hedefi yok.\n" +"Yapılandırılmış itme hedefi yok.\n" "Ya URL'yi komut satırından belirtin ya da şunu kullanarak bir uzak konum " "deposu yapılandırın:\n" "\n" @@ -11147,6 +11344,16 @@ msgstr "" "ardından uzak konum adını kullanarak itin:\n" "\n" "\tgit push <ad>\n" +"\n" +"Aynı anda birden çok uzak konum itmek için şunu kullanarak bir uzak konum " +"grubu yapılandırın:\n" +"\tgit config remotes.<grup-adı> \"<uzak-konum-1> <uzak-konum-2>\"\n" +"\n" +"ve sonrasında grup adını kullanarak itin:\n" +"\tgit push <grup-adı>\n" + +msgid "push options must not have new line characters" +msgstr "itme seçeneklerinde yeni satır karakterleri olmamalı" msgid "--all can't be combined with refspecs" msgstr "--all başvuru belirteçleriyle birleştirilemez" @@ -11154,8 +11361,8 @@ msgstr "--all başvuru belirteçleriyle birleştirilemez" msgid "--mirror can't be combined with refspecs" msgstr "--mirror başvuru belirteçleriyle birleştirilemez" -msgid "push options must not have new line characters" -msgstr "itme seçeneklerinde yeni satır karakterleri olmamalı" +msgid "--atomic can only be used when pushing to one remote" +msgstr "--atomic yalnızca bir uzak konuma iterken kullanılabilir" msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>" msgstr "" @@ -11174,9 +11381,6 @@ msgstr "geçersiz en büyük bellek değeri: %s" msgid "use simple diff colors" msgstr "yalın diff renklerini kullan" -msgid "notes" -msgstr "notlar" - msgid "passed to 'git log'" msgstr "'git log'a aktarıldı" @@ -11478,9 +11682,6 @@ msgstr "" "şu (KALDIRILDI): Birleştirmeleri yok saymak yerine onları yeniden " "oluşturmaya çalış" -msgid "how to handle commits that become empty" -msgstr "boşalan işlemelerin nasıl ele alınacağı" - msgid "keep commits which start empty" msgstr "boş başlayan işlemeleri tut" @@ -12389,11 +12590,11 @@ msgstr "ayrıntılı anlat; bir altkomuttan önce yerleştirilmelidir" msgid "" "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" "[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n" -"[--write-midx] [--name-hash-version=<n>] [--path-walk]" +"[--write-midx[=<mode>]] [--name-hash-version=<n>] [--path-walk]" msgstr "" "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" -"[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<paket-adı>]\n" -"[--write-midx] [--name-hash-version=<n>] [--path-walk]" +" [--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<paket-adı>]\n" +" [--write-midx[=<kip>]] [--name-hash-version=<n>] [--path-walk]" msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" @@ -12403,6 +12604,10 @@ msgstr "" "--no-write-bitmap-index kullanın veya pack.writeBitmaps\n" "yapılandırmasını devre dışı bırakın." +#, c-format +msgid "unknown value for %s: %s" +msgstr "%s için bilinmeyen değer: %s" + msgid "pack everything in a single pack" msgstr "her şeyi tek bir pakete sığdır" @@ -12493,8 +12698,12 @@ msgid "cannot delete packs in a precious-objects repo" msgstr "bir precious-objects deposundaki paketler silinemiyor" #, c-format +msgid "invalid value for %s: %d" +msgstr "%s için geçersiz değer: %d" + +#, c-format msgid "option '%s' can only be used along with '%s'" -msgstr "'%s' seçeneği, yalnızca '%s' ile birlikte kullanılabilir" +msgstr "\"%s\" seçeneği, yalnızca \"%s\" ile birlikte kullanılabilir" msgid "Nothing new to pack." msgstr "Paketlenecek yeni bir şey yok." @@ -13392,9 +13601,6 @@ msgstr "üstbilgi okunamıyor" msgid "unknown index version" msgstr "bilinmeyen indeks sürümü" -msgid "unable to read index" -msgstr "indeks okunamıyor" - msgid "corrupt index file" msgstr "bozulmuş indeks dosyası" @@ -13658,8 +13864,12 @@ msgstr "git stash drop [-q | --quiet] [<zula>]" msgid "git stash pop [--index] [-q | --quiet] [<stash>]" msgstr "git stash pop [--index] [-q | --quiet] [<zula>]" -msgid "git stash apply [--index] [-q | --quiet] [<stash>]" -msgstr "git stash apply [--index] [-q | --quiet] [<zula>]" +msgid "" +"git stash apply [--index] [-q | --quiet] [--label-ours=<label>] [--label-" +"theirs=<label>] [--label-base=<label>] [<stash>]" +msgstr "" +"git stash apply [--index] [-q | --quiet] [--label-ours=<etiket>]\n" +"[--label-theirs=<etiket>] [--label-base=<etiket>] [<zula>]" msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <dal-adı> [<zula>]" @@ -13752,6 +13962,18 @@ msgstr "izlenmeyen dosyalar zuladan geri getirilemedi" msgid "attempt to recreate the index" msgstr "indeks yeniden oluşturulmaya çalışılıyor" +msgid "label" +msgstr "etiket" + +msgid "label for the upstream side in conflict markers" +msgstr "çakışma imleyicilerindeki üstkaynak tarafı etiketi" + +msgid "label for the stashed side in conflict markers" +msgstr "çakışma imleyicilerindeki zulanan taraf etiketi" + +msgid "label for the base in diff3 conflict markers" +msgstr "diff3 çakışma imleyicilerindeki temel etiketi" + #, c-format msgid "Dropped %s (%s)" msgstr "%s bırakıldı (%s)" @@ -15000,6 +15222,15 @@ msgstr "eğer <dizin> bir Git dizini değilse <dizin>/.git/ deneme" msgid "interrupt transfer after <n> seconds of inactivity" msgstr "aktarımı <n> saniye hareketsizlikten sonra kes" +msgid "git url-parse [-c <component>] [--] <url>..." +msgstr "git url-parse [-c <bileşen>] [--] <url>..." + +msgid "component" +msgstr "bileşen" + +msgid "which URL component to extract" +msgstr "hangi URL bileşeninin çıkarılacağı" + msgid "git verify-commit [-v | --verbose] [--raw] <commit>..." msgstr "git verify-commit [-v | --verbose] [--raw] <işleme>..." @@ -15683,6 +15914,9 @@ msgstr "Listedeki depolar üzerinde bir Git komutu çalıştır" msgid "Prepare patches for e-mail submission" msgstr "E-posta teslimi için yamaları hazırla" +msgid "EXPERIMENTAL: Pretty format revisions on demand" +msgstr "DENEYSEL: İsteğe bağlı okunabilir biçim revizyonları" + msgid "Verifies the connectivity and validity of the objects in the database" msgstr "Veri nesnesinin bağlanırlığını ve geçerliliğini sına" @@ -15707,7 +15941,7 @@ msgstr "Git yardım bilgisini görüntüle" msgid "EXPERIMENTAL: Rewrite history" msgstr "DENEYSEL: Geçmişi yeniden yaz" -msgid "Run git hooks" +msgid "Run Git hooks" msgstr "Git kancalarını çalıştır" msgid "Server side implementation of Git over HTTP" @@ -15899,8 +16133,8 @@ msgstr "Ortak Git kabuk betiği kurulum kodu" msgid "Restricted login shell for Git-only SSH access" msgstr "Yalnızca Git SSH erişimi için kısıtlandırılmış oturum açma kabuğu" -msgid "Summarize 'git log' output" -msgstr "'git log' çıktısını özetle" +msgid "Summarize `git log` output" +msgstr "\"git log\" çıktısını özetle" msgid "Show various types of objects" msgstr "Çeşitli türlerden nesneleri göster" @@ -15965,6 +16199,9 @@ msgstr "Arşivi git-archive'e geri gönder" msgid "Send objects packed back to git-fetch-pack" msgstr "Nesneleri git-fetch-pack'e paketlenmiş olarak geri gönder" +msgid "Parse and extract git URL components" +msgstr "Git URL bileşenlerini çıkar ve ayrıştır" + msgid "Show a Git logical variable" msgstr "Bir mantıksal Git değişkeni göster" @@ -16461,53 +16698,76 @@ msgstr "FSEventStream oluşturulamadı." msgid "Failed to start the FSEventStream" msgstr "FSEventStream başlatılamadı" +msgid "inotify watch limit reached; increase fs.inotify.max_user_watches" +msgstr "" +"inotify izleme sınırına erişildi; fs.inotify.max_user_watches'ı artırın" + +#, c-format +msgid "inotify_add_watch('%s') failed" +msgstr "inotify_add_watch('%s') başarısız oldu" + +msgid "inotify_rm_watch() failed" +msgstr "inotify_rm_watch() başarısız oldu" + +#, c-format +msgid "opendir('%s') failed" +msgstr "opendir('%s') başarısız oldu" + +#, c-format +msgid "lstat('%s') failed" +msgstr "lstat('%s') başarısız oldu" + +#, c-format +msgid "closedir('%s') failed" +msgstr "closedir('%s') başarısız oldu" + +msgid "inotify_init1() failed" +msgstr "inotify_init1() başarısız oldu" + +msgid "closing inotify file descriptor failed" +msgstr "inotify dosya açıklayıcısı kapatılamadı" + +msgid "reading inotify message stream failed" +msgstr "inotify ileti akışını izleme başarısız oldu" + +msgid "polling inotify message stream failed" +msgstr "inotify ileti akışını toplama başarısız oldu" + #, c-format msgid "[GLE %ld] could not convert path to UTF-8: '%.*ls'" -msgstr "[GLE %ld] yol UTF-8'e dönüştürülemedi: '%.*ls" +msgstr "[GLE %ld] yol UTF-8'e dönüştürülemedi: \"%.*ls\"" #, c-format msgid "[GLE %ld] could not watch '%s'" -msgstr "[GLE %ld] '%s' izlenemedi" +msgstr "[GLE %ld] \"%s\" izlenemedi" #, c-format msgid "[GLE %ld] could not get longname of '%s'" -msgstr "[GLE %ld] şunun uzun adı alınamadı: '%s'" +msgstr "[GLE %ld] şunun uzun adı alınamadı: \"%s\"" #, c-format msgid "ReadDirectoryChangedW failed on '%s' [GLE %ld]" -msgstr "ReadDirectoryChangedW, '%s' üzerinde başarısız oldu [GLE %ld]" +msgstr "ReadDirectoryChangedW, \"%s\" üzerinde başarısız oldu [GLE %ld]" #, c-format msgid "GetOverlappedResult failed on '%s' [GLE %ld]" -msgstr "GetOverlappedResult, '%s' üzerinde başarısız oldu [GLE %ld]" +msgstr "GetOverlappedResult, \"%s\" üzerinde başarısız oldu [GLE %ld]" #, c-format msgid "could not read directory changes [GLE %ld]" msgstr "dizin değişiklikleri okunamadı [GLE %ld]" #, c-format -msgid "opendir('%s') failed" -msgstr "opendir('%s') başarısız oldu" - -#, c-format -msgid "lstat('%s') failed" -msgstr "lstat('%s') başarısız oldu" - -#, c-format msgid "strbuf_readlink('%s') failed" msgstr "strbuf_readlink('%s') başarısız oldu" #, c-format -msgid "closedir('%s') failed" -msgstr "closedir('%s') başarısız oldu" - -#, c-format msgid "[GLE %ld] unable to open for read '%ls'" -msgstr "[GLE %ld] '%ls', okuma için açılamıyor" +msgstr "[GLE %ld] \"%ls\", okuma için açılamıyor" #, c-format msgid "[GLE %ld] unable to get protocol information for '%ls'" -msgstr "[GLE %ld] '%ls' için protokol bilgisi alınamıyor" +msgstr "[GLE %ld] \"%ls\" için protokol bilgisi alınamıyor" #, c-format msgid "failed to copy SID (%ld)" @@ -16515,7 +16775,7 @@ msgstr "SID kopyalanamadı (%ld)" #, c-format msgid "failed to get owner for '%s' (%ld)" -msgstr "'%s' için sahip alınamadı (%ld)" +msgstr "\"%s\" için sahip alınamadı (%ld)" msgid "memory exhausted" msgstr "bellek tükendi" @@ -16970,10 +17230,6 @@ msgstr "geçersiz ls-refs yanıtı: %s" msgid "expected flush after ref listing" msgstr "başvuru listelemesinden sonra floş bekleniyordu" -#, c-format -msgid "protocol '%s' is not supported" -msgstr "'%s' protokolü desteklenmiyor" - msgid "unable to set SO_KEEPALIVE on socket" msgstr "yuva üzerinde SO_KEEPALIVE ayarlanamıyor" @@ -17026,6 +17282,10 @@ msgstr "garip kapı '%s' engellendi" msgid "cannot start proxy %s" msgstr "vekil %s başlatılamıyor" +#, c-format +msgid "protocol '%s' is not supported" +msgstr "'%s' protokolü desteklenmiyor" + msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "yol belirtilmedi; geçerli url sözdizimi için 'git help pull' yazın" @@ -17479,6 +17739,10 @@ msgid "failed to parse --submodule option parameter: '%s'" msgstr "--submodule seçenek parametresi ayrıştırılamadı: '%s'" #, c-format +msgid "%s expects a non-negative integer" +msgstr "%s, negatif olmayan bir tamsayı bekliyor" + +#, c-format msgid "bad --word-diff argument: %s" msgstr "hatalı --word-diff argümanı: %s" @@ -18581,6 +18845,52 @@ msgstr "" "Bu uyarıyı, \"git config set advice.ignoredHook false\" ile kapatabilirsiniz." #, c-format +msgid "hook.jobs must be an integer, ignoring: '%s'" +msgstr "hook.jobs, bir tamsayı olmalı, yok sayılıyor: \"%s\"" + +#, c-format +msgid "hook.jobs must be a positive integer or -1, ignoring: '%s'" +msgstr "hook.jobs, pozitif bir tamsayı veya -1 olmayı, yok sayılıyor: \"%s\"" + +#, c-format +msgid "" +"hook friendly-name '%s' collides with a known event name; please choose a " +"different friendly-name" +msgstr "" +"kanca dostu ad \"%s\", bilinen bir olay adıyla çakışıyor; lütfen başka bir " +"kanca dostu ad girin" + +#, c-format +msgid "" +"hook friendly-name '%s' is the same as its event; this may cause ambiguity " +"with hook.%s.enabled" +msgstr "" +"kanca dostu ad \"%s\", kendi olayıyla aynı; bu, hook.%s.enabled ile " +"belirsizliğe neden olabilir" + +#, c-format +msgid "hook.%s.parallel must be a boolean, ignoring: '%s'" +msgstr "hook.%s.parallel bir Boole olmalı, yok sayılıyor: \"%s\"" + +#, c-format +msgid "hook.%s.jobs must be an integer, ignoring: '%s'" +msgstr "hook.%s.jobs bir tamsayı olmalı, yok sayılıyor: \"%s\"" + +#, c-format +msgid "hook.%s.jobs must be a positive integer or -1, ignoring: '%s'" +msgstr "hook.%s.jobs pozitif bir tamsayı veya -1 olmalı, yok sayılıyor: \"%s\"" + +#, c-format +msgid "" +"hook.%s.jobs is set but '%s' looks like a hook friendly-name, not an event " +"name; hook.<event>.jobs uses the event name (e.g. hook.post-receive.jobs), " +"so this setting will be ignored" +msgstr "" +"hook.%s.jobs ayarlı, ancak \"%s\", kanca dostu bir ad gibi görünüyor, olay " +"adı değil; hook.<olay>.jobs olay adını kullanır (örneğin, hook.post-" +"receive.jobs), bu yüzden bu ayar yok sayılacak" + +#, c-format msgid "disabled hook '%s' has no command configured" msgstr "devre dışı \"%s\" kancasında yapılandırılmış bir komut yok" @@ -18592,6 +18902,18 @@ msgstr "" "\"hook.%s.command\" yapılandırılmış veya \"hook.%s.event\" kaldırılmış " "olmalı; iptal ediliyor." +#, c-format +msgid "" +"hook '%s' is not marked as parallel=true, running in parallel anyway due to " +"-j%u" +msgstr "" +"kanca \"%s\", parallel=true olarak imlenmemiş; ancak -j%u nedeniyle yine de " +"paralel olarak çalıştırılacak" + +#, c-format +msgid "%s must be a positive integer or -1, ignoring: %d" +msgstr "%s, pozitif bir tamsayı veya -1 olmalıdır, yok sayılıyor: %d" + msgid "not a git repository" msgstr "bir git deposu değil" @@ -19184,6 +19506,10 @@ msgid "ignoring existing multi-pack-index; checksum mismatch" msgstr "var olan multi-pack-index yok sayılıyor; sağlama toplamı uyumsuzluğu" #, c-format +msgid "could not find base MIDX '%s'" +msgstr "temel MIDX bulunamadı: \"%s\"" + +#, c-format msgid "could not load reverse index for MIDX %s" msgstr "MIDX %s için ters indeks yüklenemedi" @@ -19342,6 +19668,10 @@ msgstr "multi-pack-index bir 64 bit ofset depoluyor; ancak off_t pek küçük" msgid "multi-pack-index large offset out of bounds" msgstr "multi-pack-index geniş ofseti sınırlar dışında" +#, c-format +msgid "failed to clear multi-pack-index chain at %s" +msgstr "%s konumundaki multi-pack-index zinciri temizlenemedi" + msgid "multi-pack-index file exists, but failed to parse" msgstr "multi-pack-index dosyası var; ancak ayrıştırılamadı" @@ -19457,29 +19787,6 @@ msgid "garbage at end of loose object '%s'" msgstr "gevşek nesne '%s' sonunda anlamsız veri" #, c-format -msgid "unable to open loose object %s" -msgstr "gevşek nesne %s açılamıyor" - -#, c-format -msgid "unable to parse %s header" -msgstr "%s üstbilgisi ayrıştırılamıyor" - -msgid "invalid object type" -msgstr "geçersiz nesne türü" - -#, c-format -msgid "unable to unpack %s header" -msgstr "%s üstbilgisi açılamıyor" - -#, c-format -msgid "header for %s too long, exceeds %d bytes" -msgstr "%s üstbilgisi pek uzun, %d bayt'ı aşıyor" - -#, c-format -msgid "loose object %s (stored in %s) is corrupt" -msgstr "%s gevşek nesnesi (%s içinde depolanıyor) hasarlı" - -#, c-format msgid "unable to open %s" msgstr "%s açılamıyor" @@ -19524,8 +19831,8 @@ msgid "confused by unstable object source data for %s" msgstr "%s için olan nesne kaynak verisinden dolayı kafa karışıklığı" #, c-format -msgid "write stream object %ld != %<PRIuMAX>" -msgstr "akış nesnesini yaz %ld != %<PRIuMAX>" +msgid "write stream object %<PRIuMAX> != %<PRIuMAX>" +msgstr "akış nesnesini yaz %<PRIuMAX> != %<PRIuMAX>" #, c-format msgid "unable to stream deflate new object (%d)" @@ -19824,6 +20131,10 @@ msgid "missing mapping of %s to %s" msgstr "%s ögesinin %s ögesine eksik eşlemlemesi" #, c-format +msgid "%s is not a valid object" +msgstr "%s geçerli bir nesne değil" + +#, c-format msgid "%s is not a valid '%s' object" msgstr "%s geçerli bir '%s' nesnesi değil" @@ -19837,6 +20148,29 @@ msgid "unable to move new alternates file into place" msgstr "yeni alternatifler dosyası yerine taşınamıyor" #, c-format +msgid "unable to open loose object %s" +msgstr "gevşek nesne %s açılamıyor" + +#, c-format +msgid "unable to parse %s header" +msgstr "%s üstbilgisi ayrıştırılamıyor" + +msgid "invalid object type" +msgstr "geçersiz nesne türü" + +#, c-format +msgid "unable to unpack %s header" +msgstr "%s üstbilgisi açılamıyor" + +#, c-format +msgid "header for %s too long, exceeds %d bytes" +msgstr "%s üstbilgisi pek uzun, %d bayt'ı aşıyor" + +#, c-format +msgid "loose object %s (stored in %s) is corrupt" +msgstr "%s gevşek nesnesi (%s içinde depolanıyor) hasarlı" + +#, c-format msgid "duplicate entry when writing bitmap index: %s" msgstr "biteşlem indeksi yazılırken yinelenen girdi: %s" @@ -20289,6 +20623,24 @@ msgstr "%s nesnesi bulunamadı" msgid "failed to find tag %s" msgstr "%s etiketi bulunamadı" +#, c-format +msgid "tree:%lu filter not supported by the path-walk API" +msgstr "tree:%lu süzgeci, path-walk API'si tarafından desteklenmiyor" + +msgid "sparse filter cannot be combined with existing sparse patterns" +msgstr "aralıklı süzgeç, var olan aralıklı dizgilerle birlikte kullanılamıyor" + +#, c-format +msgid "unable to parse sparse filter data in '%s'" +msgstr "\"%s\" içindeki aralıklı süzgeç verisi ayrıştırılamıyor" + +msgid "sparse filter is not cone-mode compatible" +msgstr "aralıklı süzgeç, koni kipi ile uyumlu değil" + +#, c-format +msgid "object filter '%s' not supported by the path-walk API" +msgstr "nesne süzgeci \"%s\", path-walk API'si tarafından desteklenmiyor" + msgid "failed to setup revision walk" msgstr "revizyon yürüyüşü ayarlanamadı" @@ -20433,7 +20785,7 @@ msgstr "promisor-remote: alt sürecine getirmek için stdin kapatılamıyor" #, c-format msgid "promisor remote name cannot begin with '/': %s" -msgstr "vaatçi uzak konum adı '/' ile başlayamaz: %s" +msgstr "vaatçi uzak konum adı \"/\" ile başlayamaz: %s" #, c-format msgid "could not fetch %s from promisor remote" @@ -20441,23 +20793,27 @@ msgstr "vaatçi uzak konumundan %s getirilemedi" #, c-format msgid "unsupported field '%s' in '%s' config" -msgstr "şu yapılandırmada desteklenmeyen '%s' alanı: '%s'" +msgstr "şu yapılandırmada desteklenmeyen \"%s\" alanı: \"%s\"" #, c-format -msgid "no or empty URL advertised for remote '%s'" -msgstr "'%s' uzak konumu için olmayan veya boş URL sağlandı" - -#, 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ı" +msgid "" +"known remote named '%s' but with URL '%s' instead of '%s', ignoring this " +"remote" +msgstr "" +"bilinen uzak konum adı \"%s\"; ancak URL'si \"%s\", \"%s\" olmalıydı; bu " +"uzak konum yok sayılıyor" #, c-format msgid "invalid element '%s' from remote info" -msgstr "uzak konum bilgisinden geçersiz '%s' ögesi" +msgstr "uzak konum bilgisinden geçersiz \"%s\" ögesi" #, c-format -msgid "server advertised a promisor remote without a name or URL: %s" -msgstr "sunucu bir ad veya URL olmadan bir vaatçiyi öne sürdü: %s" +msgid "" +"server advertised a promisor remote without a name or URL: '%s', ignoring " +"this remote" +msgstr "" +"sunucu bir ad veya URL olmadan bir vaatçi uzak konumu öne sürdü: \"%s\", bu " +"uzak konum yok sayılıyor" #, c-format msgid "" @@ -20504,8 +20860,8 @@ msgid "%s must be non-negative, using default" msgstr "%s negatif dışı bir değer olmalı, öntanımlı değer kullanılıyor" #, c-format -msgid "%s must be between 0 and 1, using default" -msgstr "%s, 0 ve 1 arasında olmalıdır, öntanımlı kullanılıyor" +msgid "%s must be between 0 (exclusive) and 1, using default" +msgstr "%s, 0 (0 dışında) ve 1 arasında olmalıdır, öntanımlı kullanılıyor" #, c-format msgid "%s must be positive, using default" @@ -21232,6 +21588,14 @@ msgid "refusing to force and skip creation of reflog" msgstr "başvuru günlüğünün oluşturulma/atlanma zorlanması reddediliyor" #, c-format +msgid "trying to write ref '%s' with nonexistent object %s" +msgstr "'%s' başvurusu, var olmayan %s nesnesiyle yazılmaya çalışılıyor" + +#, c-format +msgid "trying to write non-commit object %s to branch '%s'" +msgstr "işleme olmayan %s nesnesi '%s' dalına yazılmaya çalışılıyor" + +#, c-format msgid "update_ref failed for ref '%s': %s" msgstr "'%s' başvurusu için update_ref başarısız oldu: %s" @@ -21320,14 +21684,6 @@ msgid "refname is dangerous: %s" msgstr "başvuru adı tehlikeli: %s" #, c-format -msgid "trying to write ref '%s' with nonexistent object %s" -msgstr "'%s' başvurusu, var olmayan %s nesnesiyle yazılmaya çalışılıyor" - -#, c-format -msgid "trying to write non-commit object %s to branch '%s'" -msgstr "işleme olmayan %s nesnesi '%s' dalına yazılmaya çalışılıyor" - -#, c-format msgid "" "multiple updates for 'HEAD' (including one via its referent '%s') are not " "allowed" @@ -21825,6 +22181,36 @@ msgstr "başvurular anlık görüntü geçici dosyası kapatılamadı" msgid "could not remove stale bitmap: %s" msgstr "eskimiş biteşlem kaldırılamadı: %s" +msgid "no packs to write MIDX during compaction" +msgstr "sıkıştırma sırasında MIDX yazımı için paket yok" + +#, c-format +msgid "expected exactly one line during MIDX write, got: %<PRIuMAX>" +msgstr "" +"MIDX yazımı sırasında tek bir satır bekleniyordu, şu alındı: %<PRIuMAX>" + +#, c-format +msgid "unexpected MIDX output: '%s'" +msgstr "beklenmedik MIDX çıktısı: \"%s\"" + +#, c-format +msgid "could not load pack %<PRIu32> from MIDX" +msgstr "MIDX'ten %<PRIu32> paketi yüklenemedi" + +msgid "too many objects in MIDX compaction step" +msgstr "MIDX sıkıştırma adımı sırasında pek çok nesne" + +#, c-format +msgid "could not find preferred pack for MIDX %s" +msgstr "MIDX %s için yeğlenen paket bulunamadı" + +msgid "unable to generate compaction plan" +msgstr "sıkıştırma planı oluşturulamıyor" + +#, c-format +msgid "unable to execute compaction step %<PRIuMAX>" +msgstr "sıkıştırma adımı %<PRIuMAX> yürütülemiyor" + msgid "could not start pack-objects to repack promisor objects" msgstr "vaatçi nesneleri yeniden paketleme için pack-objects başlatılamadı" @@ -21891,6 +22277,10 @@ msgstr "yeniden oynatmak için birkaç işleme gerekli" msgid "all positive revisions given must be references" msgstr "verilen tüm pozitif revizyonlar, başvuru olmalı" +#, c-format +msgid "commit %s became empty after replay" +msgstr "%s işlemesi, yeniden oynatma sonrasında boş oldu" + msgid "'--ref' cannot be used with multiple revision ranges" msgstr "\"--ref\", birden çok revizyon erimiyle kullanılamaz" @@ -22016,8 +22406,8 @@ msgstr "geçerli dalınız '%s' içinde henüz bir işleme yok" msgid "object filtering requires --objects" msgstr "nesne süzme --objects gerektiriyor" -msgid "-L does not yet support diff formats besides -p and -s" -msgstr "-L, -p ve -s dışında başka diff biçimlerini henüz desteklemiyor" +msgid "-L does not yet support the requested diff format" +msgstr "-L, istenen diff biçimini henüz desteklemiyor" #, c-format msgid "cannot create async thread: %s" @@ -22952,20 +23342,29 @@ msgstr "%s depolanamıyor" #, c-format msgid "" -"%s\n" +"Your local changes are stashed, however applying them\n" +"resulted in conflicts. You can either resolve the conflicts\n" +"and then discard the stash with \"git stash drop\", or, if you\n" +"do not want to resolve them now, run \"git reset --hard\" and\n" +"apply the local changes later by running \"git stash pop\".\n" +msgstr "" +"Yerel değişiklikleriniz zulalandı; ancak onları uygulamak\n" +"çakışmalara neden oldu. İster çakışmaları çözüp zulayı\n" +"\"git stash drop\" ile bırakabilir veya onları şimdi\n" +"çözmek istemiyorsanız \"git reset --hard\" yapıp daha\n" +"sonra \"git stash pop\" ile yerel değişiklikleri\n" +"uygulayabilirsiniz.\n" + +#, c-format +msgid "" +"Autostash exists; creating a new stash entry.\n" "Your changes are safe in the stash.\n" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" -"%s\n" +"Otomatik zula var; yeni bir zula girdisi oluşturuluyor.\n" "Değişiklikleriniz zulada güvende.\n" "İstediğiniz zaman \"git stash pop\" veya \"git stash drop\" yapabilirsiniz.\n" -msgid "Applying autostash resulted in conflicts." -msgstr "Kendiliğinden zulalama çakışmalara neden oldu." - -msgid "Autostash exists; creating a new stash entry." -msgstr "Kendiliğinden zulalama mevcut; yeni bir zula girdisi oluşturuluyor." - msgid "autostash reference is a symref" msgstr "kendiliğinden zulalama başvurusu bir sembol başvurusu" @@ -23257,9 +23656,6 @@ msgstr "" msgid "fork failed" msgstr "çatallama başarısız" -msgid "setsid failed" -msgstr "setsid başarısız" - #, c-format msgid "cannot stat template '%s'" msgstr "'%s' şablonunun bilgileri alınamıyor" @@ -23337,6 +23733,10 @@ msgid "Initialized empty Git repository in %s%s\n" msgstr "%s%s içinde boş Git deposu ilklendirildi\n" #, c-format +msgid "unrecognized value for '%s': '%s'" +msgstr "\"%s\" için geçersiz değer: \"%s\"" + +#, c-format msgid "index entry is a directory, but not sparse (%08x)" msgstr "indeks girdisi bir dizin; ancak aralıklı değil (%08x)" @@ -23670,6 +24070,9 @@ msgstr "agresif kenar yürüyüşünü aç/kapat" msgid "read a pattern list over stdin" msgstr "stdin'den bir dizgi listesi oku" +msgid "toggle pruning of trees by sparse patterns" +msgstr "aralıklı dizgilerle ağaçların budanmasını aç/kapat" + #, c-format msgid "commit %s is not marked reachable" msgstr "%s işlemesi ulaşılabilir olarak imlenmedi" @@ -23743,6 +24146,13 @@ msgstr "jeton" msgid "command token to send to the server" msgstr "sunucuya gönderilecek komut jetonu" +msgid "write a pack with a single reachable large blob" +msgstr "tek bir erişilebilir büyük ikili nesneli bir paket yaz" + +#, c-format +msgid "'%s' is not a valid blob size" +msgstr "\"%s\", geçerli bir ikili nesne boyutu değil" + msgid "unit-test [<options>]" msgstr "unit-test [<seçenekler>]" @@ -23851,6 +24261,10 @@ msgstr "%s altservisine bağlanılamıyor" msgid "--negotiate-only requires protocol v2" msgstr "--negotiate-only protokolün ikinci sürümünü gerektiriyor" +#, c-format +msgid "ignoring %s because the protocol does not support it." +msgstr "%s yok sayılıyor; çünkü protokol tarafından desteklenmiyor." + msgid "'option' without a matching 'ok/error' directive" msgstr "eşleşen bir 'tamam/hata' direktifi olmadan 'option'" @@ -6,11 +6,11 @@ # msgid "" msgstr "" -"Project-Id-Version: Git v2.46\n" +"Project-Id-Version: Git v2.55\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2025-11-13 15:18-0800\n" -"PO-Revision-Date: 2025-11-14 21:08-0800\n" -"Last-Translator: Arkadii Yakovets <ark@cho.red>\n" +"POT-Creation-Date: 2026-06-27 11:33-0700\n" +"PO-Revision-Date: 2026-06-27 10:23-0700\n" +"Last-Translator: Kateryna Golovanova <kate@kgthreads.com>\n" "Language-Team: Ukrainian <https://github.com/arkid15r/git-uk-l10n/>\n" "Language: uk\n" "MIME-Version: 1.0\n" @@ -18,11 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n" -"X-Generator: Poedit 3.8\n" - -#, c-format -msgid "%s cannot be negative" -msgstr "%s не може бути відʼємним" +"X-Generator: Poedit 3.9\n" #, c-format msgid "Huh (%s)?" @@ -181,20 +177,20 @@ msgid "Bye.\n" msgstr "До побачення.\n" #, c-format -msgid "Stage mode change [y,n,q,a,d%s,?]? " -msgstr "Індексувати зміну режиму [y,n,q,a,d%s,?]? " +msgid "Stage mode change%s [y,n,q,a,d%s,?]? " +msgstr "Індексувати зміну режиму%s [y,n,q,a,d%s,?]? " #, c-format -msgid "Stage deletion [y,n,q,a,d%s,?]? " -msgstr "Індексувати видалення [y,n,q,a,d%s,?]? " +msgid "Stage deletion%s [y,n,q,a,d%s,?]? " +msgstr "Індексувати видалення%s [y,n,q,a,d%s,?]? " #, c-format -msgid "Stage addition [y,n,q,a,d%s,?]? " -msgstr "Індексувати додавання [y,n,q,a,d%s,?]? " +msgid "Stage addition%s [y,n,q,a,d%s,?]? " +msgstr "Індексувати додавання%s [y,n,q,a,d%s,?]? " #, c-format -msgid "Stage this hunk [y,n,q,a,d%s,?]? " -msgstr "Індексувати цей шматок [y,n,q,a,d%s,?]? " +msgid "Stage this hunk%s [y,n,q,a,d%s,?]? " +msgstr "Індексувати цей шматок%s [y,n,q,a,d%s,?]? " msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " @@ -217,20 +213,20 @@ msgstr "" "d - не індексувати цей шматок і всі наступні шматки у файлі\n" #, c-format -msgid "Stash mode change [y,n,q,a,d%s,?]? " -msgstr "Сховати зміну режиму [y,n,q,a,d%s,?]? " +msgid "Stash mode change%s [y,n,q,a,d%s,?]? " +msgstr "Сховати зміну режиму%s [y,n,q,a,d%s,?]? " #, c-format -msgid "Stash deletion [y,n,q,a,d%s,?]? " -msgstr "Сховати видалення [y,n,q,a,d%s,?]? " +msgid "Stash deletion%s [y,n,q,a,d%s,?]? " +msgstr "Сховати видалення%s [y,n,q,a,d%s,?]? " #, c-format -msgid "Stash addition [y,n,q,a,d%s,?]? " -msgstr "Сховати додавання [y,n,q,a,d%s,?]? " +msgid "Stash addition%s [y,n,q,a,d%s,?]? " +msgstr "Сховати додавання%s [y,n,q,a,d%s,?]? " #, c-format -msgid "Stash this hunk [y,n,q,a,d%s,?]? " -msgstr "Сховати цей шматок [y,n,q,a,d%s,?]? " +msgid "Stash this hunk%s [y,n,q,a,d%s,?]? " +msgstr "Сховати цей шматок%s [y,n,q,a,d%s,?]? " msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " @@ -253,20 +249,20 @@ msgstr "" "d - не ховати цей шматок і всі наступні шматки у файлі\n" #, c-format -msgid "Unstage mode change [y,n,q,a,d%s,?]? " -msgstr "Прибрати з індексу зміну режиму [y,n,q,a,d%s,?]? " +msgid "Unstage mode change%s [y,n,q,a,d%s,?]? " +msgstr "Прибрати з індексу зміну режиму%s [y,n,q,a,d%s,?]? " #, c-format -msgid "Unstage deletion [y,n,q,a,d%s,?]? " -msgstr "Прибрати з індексу видалення [y,n,q,a,d%s,?]? " +msgid "Unstage deletion%s [y,n,q,a,d%s,?]? " +msgstr "Прибрати з індексу видалення%s [y,n,q,a,d%s,?]? " #, c-format -msgid "Unstage addition [y,n,q,a,d%s,?]? " -msgstr "Прибрати з індексу додавання [y,n,q,a,d%s,?]? " +msgid "Unstage addition%s [y,n,q,a,d%s,?]? " +msgstr "Прибрати з індексу додавання%s [y,n,q,a,d%s,?]? " #, c-format -msgid "Unstage this hunk [y,n,q,a,d%s,?]? " -msgstr "Прибрати з індексу цей шматок [y,n,q,a,d%s,?]? " +msgid "Unstage this hunk%s [y,n,q,a,d%s,?]? " +msgstr "Прибрати з індексу цей шматок%s [y,n,q,a,d%s,?]? " msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " @@ -289,20 +285,20 @@ msgstr "" "d - не прибирати з індексу цей шматок і всі наступні шматки у файлі\n" #, c-format -msgid "Apply mode change to index [y,n,q,a,d%s,?]? " -msgstr "Застосувати зміну режиму до індексу [y,n,q,a,d%s,?]? " +msgid "Apply mode change to index%s [y,n,q,a,d%s,?]? " +msgstr "Застосувати зміну режиму до індексу%s [y,n,q,a,d%s,?]? " #, c-format -msgid "Apply deletion to index [y,n,q,a,d%s,?]? " -msgstr "Застосувати видалення до індексу [y,n,q,a,d%s,?]? " +msgid "Apply deletion to index%s [y,n,q,a,d%s,?]? " +msgstr "Застосувати видалення до індексу%s [y,n,q,a,d%s,?]? " #, c-format -msgid "Apply addition to index [y,n,q,a,d%s,?]? " -msgstr "Застосувати додавання до індексу [y,n,q,a,d%s,?]? " +msgid "Apply addition to index%s [y,n,q,a,d%s,?]? " +msgstr "Застосувати додавання до індексу%s [y,n,q,a,d%s,?]? " #, c-format -msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " -msgstr "Застосувати цей шматок до індексу [y,n,q,a,d%s,?]? " +msgid "Apply this hunk to index%s [y,n,q,a,d%s,?]? " +msgstr "Застосувати цей шматок до індексу%s [y,n,q,a,d%s,?]? " msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " @@ -325,20 +321,20 @@ msgstr "" "d - не застосовувати цей шматок і всі наступні шматки у файлі\n" #, c-format -msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " -msgstr "Відкинути зміну режиму з робочого дерева [y,n,q,a,d%s,?]? " +msgid "Discard mode change from worktree%s [y,n,q,a,d%s,?]? " +msgstr "Скасувати зміну режиму з робочого дерева%s [y,n,q,a,d%s,?]? " #, c-format -msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " -msgstr "Відкинути видалення з робочого дерева [y,n,q,a,d%s,?] " +msgid "Discard deletion from worktree%s [y,n,q,a,d%s,?]? " +msgstr "Скинути видалення з робочого дерева%s [y,n,q,a,d%s,?]? " #, c-format -msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " -msgstr "Відкинути додавання з робочого дерева [y,n,q,a,d%s,?]? " +msgid "Discard addition from worktree%s [y,n,q,a,d%s,?]? " +msgstr "Скинути додавання з робочого дерева%s [y,n,q,a,d%s,?]? " #, c-format -msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " -msgstr "Відкинути цей шматок з робочого дерева [y,n,q,a,d%s,?]? " +msgid "Discard this hunk from worktree%s [y,n,q,a,d%s,?]? " +msgstr "Скинути цей шматок з робочого дерева%s [y,n,q,a,d%s,?]? " msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " @@ -361,20 +357,21 @@ msgstr "" "d - не відкидати цей шматок і всі наступні шматки у файлі\n" #, c-format -msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " -msgstr "Відкинути зміну режиму з індексу та робочого дерева [y,n,q,a,d%s,?]? " +msgid "Discard mode change from index and worktree%s [y,n,q,a,d%s,?]? " +msgstr "" +"Скасувати зміну режиму з індексу та робочого дерева%s [y,n,q,a,d%s,?]? " #, c-format -msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " -msgstr "Відкинути видалення з індексу та робочого дерева [y,n,q,a,d%s,?]? " +msgid "Discard deletion from index and worktree%s [y,n,q,a,d%s,?]? " +msgstr "Скинути видалення з індексу та робочого дерева%s [y,n,q,a,d%s,?]? " #, c-format -msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " -msgstr "Відкинути додавання з індексу та робочого дерева [y,n,q,a,d%s,?]? " +msgid "Discard addition from index and worktree%s [y,n,q,a,d%s,?]? " +msgstr "Скинути додавання з індексу та робочого дерева%s [y,n,q,a,d%s,?]? " #, c-format -msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " -msgstr "Відкинути цей шматок з індексу та робочого дерева [y,n,q,a,d%s,?]? " +msgid "Discard this hunk from index and worktree%s [y,n,q,a,d%s,?]? " +msgstr "Скинути цей шматок з індексу та робочого дерева%s [y,n,q,a,d%s,?]? " msgid "" "y - discard this hunk from index and worktree\n" @@ -390,21 +387,24 @@ msgstr "" "d - не відкидати цей шматок і всі наступні шматки у файлі\n" #, c-format -msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " +msgid "Apply mode change to index and worktree%s [y,n,q,a,d%s,?]? " msgstr "" -"Застосувати зміну режиму до індексу та робочого дерева [y,n,q,a,d%s,?] " +"Застосувати зміну режиму до індексу та робочого дерева%s [y,n,q,a,d%s,?]? " #, c-format -msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " -msgstr "Застосувати видалення до індексу та робочого дерева [y,n,q,a,d%s,?] " +msgid "Apply deletion to index and worktree%s [y,n,q,a,d%s,?]? " +msgstr "" +"Застосувати видалення до індексу та робочого дерева%s [y,n,q,a,d%s,?]? " #, c-format -msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " -msgstr "Застосувати додавання до індексу та робочого дерева [y,n,q,a,d%s,?] " +msgid "Apply addition to index and worktree%s [y,n,q,a,d%s,?]? " +msgstr "" +"Застосувати додавання до індексу та робочого дерева %s [y,n,q,a,d%s,?]? " #, c-format -msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " -msgstr "Застосувати цей шматок до індексу та робочого дерева [y,n,q,a,d%s,?] " +msgid "Apply this hunk to index and worktree%s [y,n,q,a,d%s,?]? " +msgstr "" +"Застосувати цей шматок до індексу та робочого дерева%s [y,n,q,a,d%s,?]? " msgid "" "y - apply this hunk to index and worktree\n" @@ -420,20 +420,20 @@ msgstr "" "d - не застосовувати цей шматок і всі наступні шматки у файлі\n" #, c-format -msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " -msgstr "Застосувати зміну режиму до робочого дерева [y,n,q,a,d%s,?]? " +msgid "Apply mode change to worktree%s [y,n,q,a,d%s,?]? " +msgstr "Застосувати зміну режиму до робочого дерева%s [y,n,q,a,d%s,?]? " #, c-format -msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " -msgstr "Застосувати видалення до робочого дерева [y,n,q,a,d%s,?]? " +msgid "Apply deletion to worktree%s [y,n,q,a,d%s,?]? " +msgstr "Застосувати видалення до робочого дерева%s [y,n,q,a,d%s,?]? " #, c-format -msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " -msgstr "Застосувати додавання до робочого дерева [y,n,q,a,d%s,?]? " +msgid "Apply addition to worktree%s [y,n,q,a,d%s,?]? " +msgstr "Застосувати додавання до робочого дерева%s [y,n,q,a,d%s,?]? " #, c-format -msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " -msgstr "Застосувати цей шматок до робочого дерева [y,n,q,a,d%s,?]? " +msgid "Apply this hunk to worktree%s [y,n,q,a,d%s,?]? " +msgstr "Застосувати цей шматок до робочого дерева%s [y,n,q,a,d%s,?]? " msgid "" "y - apply this hunk to worktree\n" @@ -449,6 +449,10 @@ msgstr "" "d - не застосовувати цей шматок і всі наступні шматки у файлі\n" #, c-format +msgid "%s cannot be negative" +msgstr "%s не може бути відʼємним" + +#, c-format msgid "could not parse hunk header '%.*s'" msgstr "не вдалося розібрати заголовок шматка \"%.*s\"" @@ -544,6 +548,7 @@ msgstr "Все одно застосувати їх до робочого дер msgid "Nothing was applied.\n" msgstr "Нічого не застосовано.\n" +#, c-format msgid "" "j - go to the next undecided hunk, roll over at the bottom\n" "J - go to the next hunk, roll over at the bottom\n" @@ -555,24 +560,46 @@ msgid "" "e - manually edit the current hunk\n" "p - print the current hunk\n" "P - print the current hunk using the pager\n" +"> - go to the next file, roll over at the bottom\n" +"< - go to the previous file, roll over at the top\n" "? - print help\n" +"HUNKS SUMMARY - Hunks: %d, USE: %d, SKIP: %d\n" msgstr "" -"j - перейти до наступного невизначеного шматка, перевернути внизу\n" -"J - перейти до наступного шматка, перевернути внизу\n" -"k - перейти до попереднього невизначеного шматка, перевернути вгорі\n" -"K - перейти до попереднього фрагмента, прокрутити вгорі\n" -"g - вибрати шматок, до якого ви хочете перейти\n" -"/ - шукати шматок, що відповідає заданому регвиру\n" -"s - розбити поточний шматок на менші шматки\n" -"e - редагувати поточний шматок вручну\n" -"p - показати поточний шматок, \"P\" для гортання сторінок\n" -"P - показати поточний шматок з гортанням сторінок\n" -"? - показати довідку\n" +"j — перейти до наступного невизначеного шматка, прокрутити у кінці\n" +"J — перейти до наступного шматка, прокрутити у кінці\n" +"k — перейти до попереднього невизначеного шматка, прокрутити на початку\n" +"K — перейти до попереднього шматка, прокрутити на початку\n" +"g — вибрати шматок, до якого потрібно перейти\n" +"/ — шукати шматок, що відповідає заданому регулярному виразу\n" +"s — розділити поточний шматок на менші шматки\n" +"e — вручну редагувати поточний шматок\n" +"p — вивести поточний шматок\n" +"P — вивести поточний шматок за допомогою пейджера\n" +"> — перейти до наступного файлу, прокрутити у кінці\n" +"< — перейти до попереднього файлу, прокрутити на початку\n" +"? — вивести довідку\n" +"ПІДСУМОК ШМАТКІВ — Шматки: %d, ВИКОРИСТАНО: %d, ПРОПУЩЕНО: %d\n" +"\n" + +msgid "'git apply' failed" +msgstr "\"git apply\" завершився невдало" + +msgid " (was: y)" +msgstr " (було: y)" + +msgid " (was: n)" +msgstr " (було: n)" #, c-format msgid "Only one letter is expected, got '%s'" msgstr "Очікувався лише один символ, отримано \"%s\"" +msgid "No next file" +msgstr "Наступного файлу немає" + +msgid "No previous file" +msgstr "Попереднього файлу немає" + msgid "No other hunk" msgstr "Немає інших шматків" @@ -626,9 +653,6 @@ msgstr "Вибачайте, не можу редагувати цей шмато msgid "Unknown command '%s' (use '?' for help)" msgstr "Невідома команда: \"%s\" (використовуйте \"?\" для допомоги)" -msgid "'git apply' failed" -msgstr "\"git apply\" завершився невдало" - msgid "No changes." msgstr "Нічого не змінено." @@ -636,6 +660,25 @@ msgid "Only binary files changed." msgstr "Змінено лише бінарні файли." #, c-format +msgid "Stage mode change [y,n,q,a,d%s,?]? " +msgstr "Індексувати зміну режиму [y,n,q,a,d%s,?]? " + +#, c-format +msgid "Stage deletion [y,n,q,a,d%s,?]? " +msgstr "Індексувати видалення [y,n,q,a,d%s,?]? " + +#, c-format +msgid "Stage addition [y,n,q,a,d%s,?]? " +msgstr "Індексувати додавання [y,n,q,a,d%s,?]? " + +#, c-format +msgid "Stage this hunk [y,n,q,a,d%s,?]? " +msgstr "Індексувати цей шматок [y,n,q,a,d%s,?]? " + +msgid "Revision does not refer to a commit" +msgstr "Ревізія не пов’язана з комітом" + +#, c-format msgid "" "\n" "Disable this message with \"git config set advice.%s false\"" @@ -829,8 +872,13 @@ msgid "regexec returned %d for input: %s" msgstr "regexec повернув %d для вводу: %s" #, c-format -msgid "unable to find filename in patch at line %d" -msgstr "не вдалося знайти назву файла в рядку %d латки" +msgid "unable to find filename in patch at %s:%d" +msgstr "не вдалося знайти назву файлу в латці за адресою %s:%d" + +#, c-format +msgid "git apply: bad git-diff - expected /dev/null, got %s at %s:%d" +msgstr "" +"git apply: неправильний git-diff - очікувалося /dev/null, отримано %s у %s:%d" #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" @@ -838,6 +886,15 @@ msgstr "" "git apply: невірний git-diff - очікувалось /dev/null, отримано %s у рядку %d" #, c-format +msgid "git apply: bad git-diff - inconsistent new filename at %s:%d" +msgstr "git apply: помилка git-diff — невідповідна нова назва файлу в %s:%d" + +#, c-format +msgid "git apply: bad git-diff - inconsistent old filename at %s:%d" +msgstr "" +"git apply: неправильний git-diff - невідповідна стара назва файлу в %s:%d" + +#, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" "git apply: невірний git-diff - невідповідна назва нового файлу в рядку %d" @@ -848,10 +905,18 @@ msgstr "" "git apply: невірний git-diff - невідповідна назва старого файлу в рядку %d" #, c-format +msgid "git apply: bad git-diff - expected /dev/null at %s:%d" +msgstr "git apply: неправильний git-diff - очікувалося /dev/null у %s:%d" + +#, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: невірний git-diff - очікувалось /dev/null у рядку %d" #, c-format +msgid "invalid mode at %s:%d: %s" +msgstr "неприпустимий режим у %s:%d: %s" + +#, c-format msgid "invalid mode on line %d: %s" msgstr "неприпустимий режим у рядку %d: %s" @@ -862,6 +927,23 @@ msgstr "невідповідні рядки заголовка %d та %d" #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " +"component at %s:%d" +msgid_plural "" +"git diff header lacks filename information when removing %d leading pathname " +"components at %s:%d" +msgstr[0] "" +"у заголовку git diff відсутня інформація про назву файлу після видаленні %d " +"початкового компонента шляху в позиції %s:%d" +msgstr[1] "" +"у заголовку git diff відсутня інформація про назву файлу після видаленні %d " +"початкових компонентів шляху в позиції %s:%d" +msgstr[2] "" +"у заголовку git diff відсутня інформація про назву файлу після видаленні %d " +"початкових компонентів шляху в позиції %s:%d" + +#, c-format +msgid "" +"git diff header lacks filename information when removing %d leading pathname " "component (line %d)" msgid_plural "" "git diff header lacks filename information when removing %d leading pathname " @@ -877,6 +959,10 @@ msgstr[2] "" "провідних компонентів назви шляху (рядок %d)" #, c-format +msgid "git diff header lacks filename information at %s:%d" +msgstr "у заголовку git diff відсутня інформація про назву файлу в %s:%d" + +#, c-format msgid "git diff header lacks filename information (line %d)" msgstr "у заголовку git diff відсутня інформація про назву файла (рядок %d)" @@ -885,8 +971,8 @@ msgid "recount: unexpected line: %.*s" msgstr "recount: неочікуваний рядок: %.*s" #, c-format -msgid "patch fragment without header at line %d: %.*s" -msgstr "фрагмент латки без заголовка у рядку %d: %.*s" +msgid "patch fragment without header at %s:%d: %.*s" +msgstr "фрагмент латки без заголовка за адресою %s:%d: %.*s" msgid "new file depends on old contents" msgstr "новий файл залежить від старого вмісту" @@ -895,8 +981,8 @@ msgid "deleted file still has contents" msgstr "видалений файл все ще має вміст" #, c-format -msgid "corrupt patch at line %d" -msgstr "пошкоджена латка у рядку %d" +msgid "corrupt patch at %s:%d" +msgstr "пошкоджена латка у %s:%d" #, c-format msgid "new file %s depends on old contents" @@ -911,16 +997,16 @@ msgid "** warning: file %s becomes empty but is not deleted" msgstr "** попередження: файл %s стане порожнім, але не буде видалений" #, c-format -msgid "corrupt binary patch at line %d: %.*s" -msgstr "пошкоджена бінарна латка у рядку %d: %.*s" +msgid "corrupt binary patch at %s:%d: %.*s" +msgstr "пошкоджена бінарна латка у %s:%d: %.*s" #, c-format -msgid "unrecognized binary patch at line %d" -msgstr "нерозпізнана бінарна латка у рядку %d" +msgid "unrecognized binary patch at %s:%d" +msgstr "нерозпізнана бінарна латка у %s:%d" #, c-format -msgid "patch with only garbage at line %d" -msgstr "латка, що містить лише непотріб у рядку %d" +msgid "patch with only garbage at %s:%d" +msgstr "латка лише має непотріб у %s:%d" #, c-format msgid "unable to read symlink %s" @@ -1185,6 +1271,14 @@ msgid "unable to read index file" msgstr "не вдалося прочитати індексний файл" #, c-format +msgid "option -p expects a non-negative integer, got '%s'" +msgstr "опція -p очікує невідʼємне ціле число, отримано \"%s\"" + +#, c-format +msgid "unable to normalize directory: '%s'" +msgstr "не вдалося нормалізувати директорію: \"%s\"" + +#, c-format msgid "can't open patch '%s': %s" msgstr "неможливо відкрити латку \"%s\": %s" @@ -1566,40 +1660,40 @@ msgstr "" #, c-format msgid "" -"The merge base %s is %s.\n" +"The merge base %s is '%s'.\n" "This means the first '%s' commit is between %s and [%s].\n" msgstr "" -"Базою злиття %s є %s.\n" -"Це означає, що перший \"%s\" коміт знаходиться між %s і [%s].\n" +"Базою злиття %s є \"%s\".\n" +"Це означає, що перший коміт \"%s\" знаходиться між %s та [%s].\n" #, c-format msgid "" -"Some %s revs are not ancestors of the %s rev.\n" +"Some '%s' revs are not ancestors of the '%s' rev.\n" "git bisect cannot work properly in this case.\n" -"Maybe you mistook %s and %s revs?\n" +"Maybe you mistook '%s' and '%s' revs?\n" msgstr "" -"Деякі %s revs не є предками %s rev.\n" -"git bisect не може працювати належним чином в таких випадках.\n" -"Можливо, ви переплутали %s і %s revs?\n" +"Деякі ревізії \"%s\" не є предками ревізії \"%s\".\n" +"У цьому випадку git bisect не може працювати належним чином.\n" +"Можливо, ви переплутали ревізії \"%s\" і \"%s\"?\n" #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" -"So we cannot be sure the first %s commit is between %s and %s.\n" +"So we cannot be sure the first '%s' commit is between %s and %s.\n" "We continue anyway." msgstr "" -"базу злиття між %s і [%s] потрібно пропустити.\n" -"Тому ми не можемо бути впевнені, що перший коміт %s знаходиться між %s і " -"%s.\n" -"Ми все одно продовжимо." +"базу злиття між %s та [%s] необхідно пропустити.\n" +"Тому ми не можемо бути впевнені, що перший коміт \"%s\" знаходиться між %s " +"та %s.\n" +"Все одно продовжуємо." #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Бісекція: база злиття повинна бути протестована\n" #, c-format -msgid "a %s revision is needed" -msgstr "необхідна ревізія %s" +msgid "a '%s' revision is needed" +msgstr "необхідна ревізія \"%s\"" #, c-format msgid "could not create file '%s'" @@ -1617,8 +1711,8 @@ msgid "reading bisect refs failed" msgstr "не вдалося прочитати бісекційні посилання" #, c-format -msgid "%s was both %s and %s\n" -msgstr "%s був одночасно і %s, і %s\n" +msgid "%s was both '%s' and '%s'\n" +msgstr "%s було одночасно і \"%s\", і \"%s\"\n" #, c-format msgid "" @@ -1762,8 +1856,8 @@ msgstr "" msgid "'%s' is not a valid branch name" msgstr "\"%s\" не є допустимою назвою гілки" -msgid "See `man git check-ref-format`" -msgstr "Дивіться \"man git check-ref-format\"" +msgid "See 'git help check-ref-format'" +msgstr "Дивіться \"git help check-ref-format\"" #, c-format msgid "a branch named '%s' already exists" @@ -1879,6 +1973,11 @@ msgstr "інтерактивний вибір" msgid "select hunks interactively" msgstr "обирати шматки інтерактивно" +msgid "auto advance to the next file when selecting hunks interactively" +msgstr "" +"автоматичне переміщення до наступного файлу під час інтерактивного вибору " +"фрагментів" + msgid "edit current diff and apply" msgstr "відредагувати поточну різницю і застосувати" @@ -2365,8 +2464,22 @@ msgstr "git archive: помилка протоколу" msgid "git archive: expected a flush" msgstr "git archive: очікувалось flush" -msgid "git backfill [--min-batch-size=<n>] [--[no-]sparse]" -msgstr "git backfill [--min-batch-size=<н>] [--[no-]sparse]" +msgid "" +"git backfill [--min-batch-size=<n>] [--[no-]sparse] [--[no-]include-edges] " +"[<revision-range>]" +msgstr "" +"git backfill [--min-batch-size=<н>] [--[no-]sparse] [--[no-]include-edges] " +"[<діапазон-ревізій>]" + +#, c-format +msgid "'%s' cannot be used with 'git backfill'" +msgstr "\"%s\" неможливо використовувати з командою \"git backfill\"" + +msgid "cannot backfill with these filter options" +msgstr "неможливо заповнити з цими параметрами фільтрації" + +msgid "cannot backfill with blob size limits" +msgstr "неможливо заповнити з урахуванням обмежень на розмір blob-обʼєктів" msgid "problem loading sparse-checkout" msgstr "проблема із завантаженням розрідженого переходу" @@ -2377,6 +2490,13 @@ msgstr "Мінімальна кількість обʼєктів для запи msgid "Restrict the missing objects to the current sparse-checkout" msgstr "Обмежити відсутні обʼєкти поточним розрідженим переходом" +msgid "Include blobs from boundary commits in the backfill" +msgstr "Включити blobs з межевих комітів у процес заповнення" + +#, c-format +msgid "unrecognized argument: %s" +msgstr "нерозпізнаний аргумент: %s" + msgid "" "git bisect start [--term-(bad|new)=<term-new> --term-(good|old)=<term-old>]\n" " [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " @@ -2494,29 +2614,32 @@ msgstr "бісекція лише з %s комітом" msgid "Are you sure [Y/n]? " msgstr "Ви впевнені [Y/n]? " -msgid "status: waiting for both good and bad commits\n" -msgstr "статус: чекаємо на добрий і поганий коміти\n" +#, c-format +msgid "status: waiting for both '%s' and '%s' commits\n" +msgstr "статус: очікується виконання комітів \"%s\" і \"%s\"\n" #, c-format -msgid "status: waiting for bad commit, %d good commit known\n" -msgid_plural "status: waiting for bad commit, %d good commits known\n" -msgstr[0] "статус: чекаємо на поганий коміт, відомий %d добрий коміт\n" -msgstr[1] "статус: чекаємо на поганий коміт, відомі %d добрих коміти\n" -msgstr[2] "статус: чекаємо на поганий коміт, відомі %d добрих комітів\n" +msgid "status: waiting for '%s' commit, %d '%s' commit known\n" +msgid_plural "status: waiting for '%s' commit, %d '%s' commits known\n" +msgstr[0] "статус: очікування коміту \"%s\", відомо про %d коміт \"%s\"\n" +msgstr[1] "статус: очікування коміту \"%s\", відомо про %d коміти \"%s\"\n" +msgstr[2] "статус: очікування коміту \"%s\", відомо про %d комітів \"%s\"\n" -msgid "status: waiting for good commit(s), bad commit known\n" -msgstr "статус: чекаємо на добрий коміт(и), поганий коміт відомий\n" +#, c-format +msgid "status: waiting for '%s' commit(s), '%s' commit known\n" +msgstr "" +"статус: очікується виконання \"%s\" коміт(ів), відомо про \"%s\" коміт\n" msgid "no terms defined" msgstr "терміни не визначені" #, c-format msgid "" -"Your current terms are %s for the old state\n" -"and %s for the new state.\n" +"Your current terms are '%s' for the old state\n" +"and '%s' for the new state.\n" msgstr "" -"Ваші поточні терміни: %s для старого стану\n" -"і %s для нового стану.\n" +"Ваші поточні терміни — \"%s\" для попереднього стану\n" +"та \"%s\" для нового стану.\n" #, c-format msgid "" @@ -2602,12 +2725,12 @@ msgid "bisect run failed: no command provided." msgstr "бісекція завершилася невдало: не надано команду." #, c-format -msgid "unable to verify %s on good revision" -msgstr "не вдалося розпізнати %s як припустиму ревізію" +msgid "unable to verify %s on '%s' revision" +msgstr "не вдалося перевірити %s у ревізії \"%s\"" #, c-format -msgid "bogus exit code %d for good revision" -msgstr "хибний код виходу %d для доброї ревізії" +msgid "bogus exit code %d for '%s' revision" +msgstr "хибний код завершення %d для версії \"%s\"" #, c-format msgid "bisect run failed: exit code %d from %s is < 0 or >= 128" @@ -2623,8 +2746,9 @@ msgstr "неможливо продовжити бісекцію" msgid "bisect run success" msgstr "бісекцію завершено успішно" -msgid "bisect found first bad commit" -msgstr "бісекція знайшла перший поганий коміт" +#, c-format +msgid "bisect found first '%s' commit\n" +msgstr "бісекція знайшла перший \"%s\" коміт\n" #, c-format msgid "bisect run failed: 'git bisect %s' exited with error code %d" @@ -2674,6 +2798,17 @@ msgid "must end with a color" msgstr "повинно закінчуватися кольором" #, c-format +msgid "unknown value for config '%s': %s" +msgstr "невідоме значення для конфігурації \"%s\": %s" + +msgid "" +"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " +"\"histogram\"" +msgstr "" +"опція diff-algorithm приймає значення \"myers\", \"minimal\", \"patience\" " +"та \"histogram\"" + +#, c-format msgid "cannot find revision %s to ignore" msgstr "неможливо знайти ревізію %s для ігнорування" @@ -2728,6 +2863,12 @@ msgstr "показувати email автора замість імені (за msgid "ignore whitespace differences" msgstr "ігнорувати різницю між пробільними символами" +msgid "<algorithm>" +msgstr "<алгоритм>" + +msgid "choose a diff algorithm" +msgstr "вибрати алгоритм різниці" + msgid "rev" msgstr "ревізія" @@ -2743,8 +2884,8 @@ msgstr "розфарбувати надлишкові метадані з поп msgid "color lines by age" msgstr "розфарбувати рядки за віком" -msgid "spend extra cycles to find better match" -msgstr "витрачати додаткові цикли для пошуку кращого варіанта" +msgid "spend extra cycles to find a better match" +msgstr "витратити додаткові цикли на пошук кращого збігу" msgid "use revisions from <file> instead of calling git-rev-list" msgstr "використовувати ревізії з <файлу> замість виклику git-rev-list" @@ -3293,6 +3434,10 @@ msgstr "Розділення об’єктів" msgid "cannot read object %s '%s'" msgstr "неможливо прочитати об’єкт %s \"%s\"" +#, c-format +msgid "mailmap: invalid boolean '%s'" +msgstr "mailmap: неприпустиме булеве значення \"%s\"" + msgid "flush is only for --buffer mode" msgstr "flush тільки для режиму --buffer" @@ -3568,18 +3713,6 @@ msgstr "записати вміст до тимчасових файлів" msgid "copy out the files from named stage" msgstr "скопіювати файли з іменованої стадії" -msgid "git checkout [<options>] <branch>" -msgstr "git checkout [<опції>] <гілка>" - -msgid "git checkout [<options>] [<branch>] -- <file>..." -msgstr "git checkout [<опції>] [<гілка>] -- <файл>..." - -msgid "git switch [<options>] [<branch>]" -msgstr "git switch [<опції>] [<гілка>]" - -msgid "git restore [<options>] [--source=<branch>] <file>..." -msgstr "git restore [<опції>] [--source=<гілка>] <файл>..." - #, c-format msgid "path '%s' does not have our version" msgstr "шлях \"%s\" не містить нашої версії" @@ -3662,14 +3795,6 @@ msgid "you need to resolve your current index first" msgstr "спочатку потрібно розібратись з вашим поточним індексом" #, c-format -msgid "" -"cannot continue with staged changes in the following files:\n" -"%s" -msgstr "" -"неможливо продовжити з індексованими змінами в наступних файлах:\n" -"%s" - -#, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Неможливо виконати reflog для \"%s\": %s\n" @@ -3770,6 +3895,10 @@ msgid "You are on a branch yet to be born" msgstr "Ви на гілці, яка ще не iснує" #, c-format +msgid "The following paths have local changes:\n" +msgstr "У наступних шляхах є локальні зміни:\n" + +#, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" "Please use -- (and optionally --no-guess) to disambiguate" @@ -3777,27 +3906,28 @@ msgstr "" "\"%s\" може бути як локальним файлом, так і відстежуваною гілкою.\n" "Будь ласка, використовуйте -- (і, за бажанням, --no-guess), для визначення" +#, c-format msgid "" "If you meant to check out a remote tracking branch on, e.g. 'origin',\n" "you can do so by fully qualifying the name with the --track option:\n" "\n" -" git checkout --track origin/<name>\n" +" git %s --track origin/<name>\n" "\n" "If you'd like to always have checkouts of an ambiguous <name> prefer\n" "one remote, e.g. the 'origin' remote, consider setting\n" "checkout.defaultRemote=origin in your config." msgstr "" -"Якщо ви хотіли переключитись на віддалено відстежувану гілку, наприклад, " -"'origin',\n" -"ви можете зробити це, повністю вказавши назву з опцією --track:\n" +"Якщо ви хотіли перейти на віддалену гілку відстеження, наприклад, з " +"\"origin\",\n" +"ви можете це зробити, вказавши повну назву за допомогою опції --track:\n" "\n" -" git checkout --track origin/<назва>.\n" +" git %s --track origin/<назва>\n" "\n" -"Якщо при переключенні з неоднозначною <назвою> ви бажаєте завжди віддавати " +"Якщо ви хочете, щоб при переході на неоднозначний <назва> завжди віддавалась " "перевагу\n" -"певному віддаленому сховищу, наприклад, 'origin', розгляньте можливість " -"додання\n" -"checkout.defaultRemote=origin до вашого конфігураційного файлу." +"одній віддаленій гілці, наприклад \"origin\", розгляньте можливість " +"встановити\n" +"параметр checkout.defaultRemote=origin у вашому файлі конфігурації." #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" @@ -3944,6 +4074,18 @@ msgstr "використовувати їхню версію для не зли msgid "do not limit pathspecs to sparse entries only" msgstr "не обмежувати визначники шляхів лише розрідженими записами" +msgid "git checkout [<options>] <branch>" +msgstr "git checkout [<опції>] <гілка>" + +msgid "git checkout [<options>] [<branch>] -- <file>..." +msgstr "git checkout [<опції>] [<гілка>] -- <файл>..." + +msgid "git switch [<options>] [<branch>]" +msgstr "git switch [<опції>] [<гілка>]" + +msgid "git restore [<options>] [--source=<branch>] <file>..." +msgstr "git restore [<опції>] [--source=<гілка>] <файл>..." + #, c-format msgid "options '-%c', '-%c', and '%s' cannot be used together" msgstr "опції \"-%c\", \"-%c\" та \"%s\" не можна використовувати разом" @@ -3956,8 +4098,8 @@ msgid "missing branch name; try -%c" msgstr "відсутня назва гілки; спробуйте -%c" #, c-format -msgid "could not resolve %s" -msgstr "не вдалося розвʼязати %s" +msgid "could not resolve '%s'" +msgstr "не вдалося розпізнати \"%s\"" msgid "invalid path specification" msgstr "неприпустиме зазначення шляху" @@ -5306,6 +5448,20 @@ msgid "wrong number of arguments, should be from %d to %d" msgstr "невірна кількість аргументів, має бути від %d до %d" #, c-format +msgid "missing value to set to the variable '%s'" +msgstr "відсутнє значення, яке потрібно присвоїти змінній \"%s\"" + +#, c-format +msgid "did you mean \"git config set %s %s\"?" +msgstr "ви мали на увазі \"git config set %s %s\"?" + +#, c-format +msgid "missing value to set to a variable with an invalid name '%s'" +msgstr "" +"відсутнє значення, яке потрібно присвоїти змінній з неприпустимою назвою " +"\"%s\"" + +#, c-format msgid "invalid key pattern: %s" msgstr "неприпустимий шаблон ключа: %s" @@ -5446,10 +5602,17 @@ msgstr "--append не можна використовувати з --value=<ша #, c-format msgid "" "cannot overwrite multiple values with a single value\n" -" Use a regexp, --add or --replace-all to change %s." +" Use --value=<pattern>, --append or --all to change %s." msgstr "" -"неможливо перезаписати кілька значень одним значенням\n" -" Використовуйте regexp, --add або --replace-all для зміни %s." +"не можна перезаписати кілька значень одним значенням\n" +" Для зміни %s використовуйте параметри --value=<шаблон>, --append або " +"--all." + +msgid "unset all multi-valued config options" +msgstr "скинути всі багатозначні параметри конфігурації" + +msgid "unset multi-valued config options with matching values" +msgstr "скинути багатозначні параметри конфігурації з відповідними значеннями" #, c-format msgid "no such section: %s" @@ -5536,6 +5699,14 @@ msgstr "--default застосовується лише до --get" msgid "--comment is only applicable to add/set/replace operations" msgstr "--comment застосовується лише до add/set/replace операцій" +#, c-format +msgid "" +"cannot overwrite multiple values with a single value\n" +" Use a regexp, --add or --replace-all to change %s." +msgstr "" +"неможливо перезаписати кілька значень одним значенням\n" +" Використовуйте regexp, --add або --replace-all для зміни %s." + msgid "print sizes in human readable format" msgstr "показувати розмір у зручному для читання форматі" @@ -5733,10 +5904,6 @@ msgstr "не вдалося розібрати ідентифікатор об msgid "git diff-pairs -z [<diff-options>]" msgstr "git diff-pairs -z [<опціі-різниці>]" -#, c-format -msgid "unrecognized argument: %s" -msgstr "нерозпізнаний аргумент: %s" - msgid "working without -z is not supported" msgstr "робота без -z не підтримується" @@ -5944,12 +6111,6 @@ msgstr "" "використовуйте --reencode=[yes|no]" #, c-format -msgid "encountered signed commit %s; use --signed-commits=<mode> to handle it" -msgstr "" -"виявлено підписаний коміт %s; використовуйте --signed-commits=<режим> для " -"його обробки" - -#, c-format msgid "exporting %<PRIuMAX> signature(s) for commit %s" msgstr "експорт %<PRIuMAX> підписів для коміту %s" @@ -5958,6 +6119,12 @@ msgid "stripping signature(s) from commit %s" msgstr "видалення підпису(-ів) з коміту %s" #, c-format +msgid "encountered signed commit %s; use --signed-commits=<mode> to handle it" +msgstr "" +"виявлено підписаний коміт %s; використовуйте --signed-commits=<режим> для " +"його обробки" + +#, c-format msgid "" "omitting tag %s,\n" "since tags of trees (or tags of tags of trees, etc.) are not supported." @@ -5970,12 +6137,6 @@ msgid "could not read tag %s" msgstr "не вдалося прочитати тег %s" #, c-format -msgid "encountered signed tag %s; use --signed-tags=<mode> to handle it" -msgstr "" -"виявлено підписаний тег %s; для його обробки використовуйте --signed-" -"tags=<режим>" - -#, c-format msgid "exporting signed tag %s" msgstr "експортування підписаного тегу %s" @@ -5984,6 +6145,12 @@ msgid "stripping signature from tag %s" msgstr "видалення підпису з тегу %s" #, c-format +msgid "encountered signed tag %s; use --signed-tags=<mode> to handle it" +msgstr "" +"виявлено підписаний тег %s; для його обробки використовуйте --signed-" +"tags=<режим>" + +#, c-format msgid "" "tag %s tags unexported object; use --tag-of-filtered-object=<mode> to handle " "it" @@ -6373,6 +6540,66 @@ msgstr "знайдено кілька підписів %s, ігноруванн msgid "parse_one_signature() returned unknown hash algo" msgstr "parse_one_signature() повернув невідомий алгоритм хешування" +msgid "unknown" +msgstr "невідомо" + +#, c-format +msgid "" +"stripping invalid signature for commit '%.100s...'\n" +" allegedly by %s" +msgstr "" +"видалення неприпустимого підпису для коміту \"%.100s...\"\n" +" нібито від %s" + +#, c-format +msgid "" +"stripping invalid signature for commit '%.*s'\n" +" allegedly by %s" +msgstr "" +"видалення неприпустимого підпису для коміту \"%.*s\"\n" +" нібито від %s" + +#, c-format +msgid "" +"stripping invalid signature for commit\n" +" allegedly by %s" +msgstr "" +"видалення неприпустимого підпису для коміту\n" +" нібито від %s" + +#, c-format +msgid "" +"replacing invalid signature for commit '%.100s...'\n" +" allegedly by %s" +msgstr "" +"заміна неприпустимого підпису для коміту \"%.100s...\"\n" +" імовірно, від %s" + +#, c-format +msgid "" +"replacing invalid signature for commit '%.*s'\n" +" allegedly by %s" +msgstr "" +"заміна неприпустимого підпису для коміту \"%.*s\"\n" +" імовірно, від %s" + +#, c-format +msgid "" +"replacing invalid signature for commit\n" +" allegedly by %s" +msgstr "" +"заміна неприпустимого підпису для коміту\n" +" нібито %s" + +msgid "aborting due to invalid signature" +msgstr "припинення через неприпустимий підпис" + +msgid "signing commits in interoperability mode is unsupported" +msgstr "підписання комітів у режимі взаємодії не підтримується" + +msgid "failed to sign commit object" +msgstr "не вдалося підписати об’єкт коміту" + msgid "expected committer but didn't get one" msgstr "очікувався комміттер, але його не отримали" @@ -6387,9 +6614,8 @@ msgstr "видалення підпису коміту" msgid "importing a commit signature verbatim" msgstr "імпортування підпису комміту дослівно" -msgid "encountered signed tag; use --signed-tags=<mode> to handle it" -msgstr "" -"зустрів підписаний тег; використовуйте --signed-tags=<режим> для його обробки" +msgid "failed to sign tag object" +msgstr "не вдалося підписати об’єкт тегу" #, c-format msgid "importing a tag signature verbatim for tag '%s'" @@ -6399,6 +6625,10 @@ msgstr "імпортування дослівного підпису для те msgid "stripping a tag signature for tag '%s'" msgstr "видалення підпису для тегу \"%s\"" +msgid "encountered signed tag; use --signed-tags=<mode> to handle it" +msgstr "" +"зустрів підписаний тег; використовуйте --signed-tags=<режим> для його обробки" + #, c-format msgid "expected 'from' command, got '%s'" msgstr "очікувалась команда \"from\", отримано \"%s\"" @@ -6557,8 +6787,8 @@ msgstr "git fetch [<опції>] [<сховище> [<визначник поси msgid "git fetch [<options>] <group>" msgstr "git fetch [<опції>] [<група>]" -msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" -msgstr "git fetch --multiple [<опції>] [(<сховище> | <група>)...]" +msgid "git fetch --multiple [<options>] [(<repository>|<group>)...]" +msgstr "git fetch --multiple [<опції>] [(<сховище>|<група>)...]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<опції>]" @@ -6663,14 +6893,18 @@ msgid "option \"%s\" is ignored for %s" msgstr "опція \"%s\" ігнорується для %s" #, c-format -msgid "%s is not a valid object" -msgstr "%s не є припустимим об’єктом" - -#, c-format msgid "the object %s does not exist" msgstr "об’єкт %s не існує" #, c-format +msgid "ignoring %s=%s because it does not match any refs" +msgstr "ігнорування %s=%s, оскільки воно не відповідає жодному посиланню" + +#, c-format +msgid "ignoring %s because the protocol does not support it" +msgstr "ігнорування %s, оскільки протокол його не підтримує" + +#, c-format msgid "" "Run 'git remote set-head %s %s' to follow the change, or set\n" "'remote.%s.followRemoteHEAD' configuration option to a different value\n" @@ -6875,6 +7109,10 @@ msgstr "ревізія" msgid "report that we have only objects reachable from this object" msgstr "звітувати, що у нас є тільки обʼєкти, доступні з цього обʼєкта" +msgid "ensure this ref is always sent as a negotiation have" +msgstr "" +"забезпечити, щоб це посилання завжди надсилалося як параметр переговорів" + msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" msgstr "" "не отримувати файл пакунка; замість цього роздрукувати предків верхівок для " @@ -6892,9 +7130,6 @@ msgstr "записати коміт-граф після отримання" msgid "accept refspecs from stdin" msgstr "приймати визначники посилань з stdin" -msgid "--negotiate-only needs one or more --negotiation-tip=*" -msgstr "--negotiate-only потребує одного або кількох --negotiation-tip=*" - msgid "negative depth in --deepen is not supported" msgstr "відʼємна глибина в --deepen не підтримується" @@ -6925,6 +7160,10 @@ msgstr "" msgid "protocol does not support --negotiate-only, exiting" msgstr "протокол не підтримує --negotiate-only, вихід" +#, c-format +msgid "%s needs one or more %s" +msgstr "%s потребує одного або декількох %s" + msgid "" "--filter can only be used with the remote configured in " "extensions.partialclone" @@ -7032,8 +7271,7 @@ msgid "config key storing a list of repository paths" msgstr "ключ конфігурації, в якому зберігається список шляхів до сховищ" msgid "keep going even if command fails in a repository" -msgstr "" -"продовжувати роботу, навіть якщо команда завершилася невдало в репозиторії" +msgstr "продовжувати роботу, навіть якщо команда завершилася невдало в сховищі" msgid "missing --config=<config>" msgstr "відсутній --config=<конфіг>" @@ -7042,9 +7280,6 @@ msgstr "відсутній --config=<конфіг>" msgid "got bad config --config=%s" msgstr "невірно задано параметр --config=%s" -msgid "unknown" -msgstr "невідомо" - #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> #, c-format msgid "error in %s %s: %s" @@ -7139,6 +7374,10 @@ msgstr "%s: невірний вказівник sha1 %s" msgid "%s: not a commit" msgstr "%s не є комітом" +#, c-format +msgid "invalid parameter: expected sha1, got '%s'" +msgstr "неприпустимий параметр: очікувалось sha1, надано \"%s\"" + msgid "notice: No default references" msgstr "повідомлення: Немає посилань за замовчуванням" @@ -7165,26 +7404,6 @@ msgid "Checking object directories" msgstr "Перевірка директорій обʼєкта" #, c-format -msgid "Checking %s link" -msgstr "Перевірка %s посилання" - -#, c-format -msgid "invalid %s" -msgstr "неприпустимий %s" - -#, c-format -msgid "%s points to something strange (%s)" -msgstr "%s вказує на щось дивне (%s)" - -#, c-format -msgid "%s: detached HEAD points at nothing" -msgstr "%s: відокремлений HEAD вказує на ніщо" - -#, c-format -msgid "notice: %s points to an unborn branch (%s)" -msgstr "повідомлення: %s вказує на ненароджену гілку (%s)" - -#, c-format msgid "Checking cache tree of %s" msgstr "Перевірка дерева кеша для \"%s\"" @@ -7263,14 +7482,6 @@ msgstr "перевірити базу даних посилань" msgid "Checking objects" msgstr "Перевірка обʼєктів" -#, c-format -msgid "%s: object missing" -msgstr "%s: об’єкт відсутній" - -#, c-format -msgid "invalid parameter: expected sha1, got '%s'" -msgstr "неприпустимий параметр: очікувалось sha1, надано \"%s\"" - msgid "git fsmonitor--daemon start [<options>]" msgstr "git fsmonitor--daemon start [<опції>]" @@ -7286,6 +7497,10 @@ msgid "value of '%s' not bool or int: %d" msgstr "значення \"%s\" не є bool або int: %d" #, c-format +msgid "daemon did not stop within %d seconds" +msgstr "демон не завершив роботу протягом %d секунд" + +#, c-format msgid "fsmonitor-daemon is watching '%s'\n" msgstr "fsmonitor-daemon стежить за \"%s\"\n" @@ -7329,6 +7544,9 @@ msgstr "fsmonitor--daemon вже запущений \"%s\"" msgid "running fsmonitor-daemon in '%s'\n" msgstr "запуск fsmonitor-daemon в \"%s\"\n" +msgid "setsid failed" +msgstr "setsid завершився невдало" + #, c-format msgid "starting fsmonitor-daemon in '%s'\n" msgstr "старт fsmonitor-daemon в \"%s\"\n" @@ -7657,6 +7875,9 @@ msgstr "не вдалося встановити розклад обслугов msgid "failed to add repo to global config" msgstr "не вдалося додати сховище до глобальної конфігурації" +msgid "check a specific task" +msgstr "перевірити певне завдання" + msgid "git maintenance <subcommand> [<options>]" msgstr "git maintenance <підкоманда> [<опції>]" @@ -8007,17 +8228,239 @@ msgid "'git help config' for more information" msgstr "\"git help config\" для додаткової інформації" msgid "" -"git hook run [--ignore-missing] [--to-stdin=<path>] <hook-name> [-- <hook-" -"args>]" +"git history fixup <commit> [--dry-run] [--update-refs=(branches|head)] [--" +"reedit-message] [--empty=(drop|keep|abort)]" +msgstr "" +"git history fixup <коміт> [--dry-run] [--update-refs=(branches|head)] [--" +"reedit-message] [--empty=(drop|keep|abort)]" + +msgid "git history reword <commit> [--dry-run] [--update-refs=(branches|head)]" +msgstr "git history reword <коміт> [--dry-run] [--update-refs=(branches|head)]" + +msgid "" +"git history split <commit> [--dry-run] [--update-refs=(branches|head)] [--] " +"[<pathspec>...]" +msgstr "" +"git history split <коміт> [--dry-run] [--update-refs=( branches|head) ] [--] " +"[<шлях>...]" + +#, c-format +msgid "" +"Please enter the commit message for the %s changes. Lines starting\n" +"with '%s' will be ignored, and an empty message aborts the commit.\n" msgstr "" -"git hook run [--ignore-missing] [--to-stdin=<шлях>] <назва-гачка> [-- " -"<аргументи-гачка>]" +"Введіть текст допис до коміту для змін %s. Рядки, що починаються\n" +"з \"%s\", будуть проігноровані, а порожній допис призведе до скасування " +"коміту.\n" + +#, c-format +msgid "Aborting commit as launching the editor failed.\n" +msgstr "Переривання коміту через невдалий запуск редактора.\n" + +#, c-format +msgid "unable to parse parent commit %s" +msgstr "не вдалося проаналізувати батьківський коміт %s" + +#, c-format +msgid "%s expects one of 'branches' or 'head'" +msgstr "%s очікує значення \"branches\" або \"head\"" + +msgid "error preparing revisions" +msgstr "помилка при підготовці ревізій" + +msgid "replaying merge commits is not supported yet!" +msgstr "відтворення комітів злиття поки що не підтримується!" + +msgid "cannot look up HEAD" +msgstr "неможливо знайти HEAD" + +msgid "cannot determine descendance" +msgstr "неможливо визначити походження" + +msgid "" +"rewritten commit must be an ancestor of HEAD when using --update-refs=head" +msgstr "" +"при використанні опції --update-refs=head переписаний комміт повинен бути " +"предком HEAD" + +#, c-format +msgid "failed to begin ref transaction: %s" +msgstr "не вдалося розпочати транзакцію посилання: %s" + +#, c-format +msgid "failed to update ref '%s': %s" +msgstr "не вдалося оновити посилання \"%s\": %s" + +#, c-format +msgid "failed to commit ref transaction: %s" +msgstr "не вдалося зробити коміт транзакціі посилання: %s" + +#, c-format +msgid "unable to parse parent of %s" +msgstr "не вдалося проаналізувати батька %s" + +#, c-format +msgid "" +"unrecognized '--empty=' action '%s'; valid values are \"drop\", \"keep\", " +"and \"abort\"." +msgstr "" +"нерозпізнана \"--empty=\" операція \"%s\"; допустимі значення: \"drop\", " +"\"keep\" та \"abort\"." + +msgid "control which refs should be updated" +msgstr "управління оновленням посилань" + +msgid "perform a dry-run without updating any refs" +msgstr "виконати пробний запуск без оновлення будь-яких посилань" + +msgid "open an editor to modify the commit message" +msgstr "відкрити редактор, щоб змінити допис до коміту" + +msgid "how to handle commits that become empty" +msgstr "як обробляти порожні коміти" + +msgid "command expects a single revision" +msgstr "команда очікує єдину ревізію" + +msgid "cannot run fixup in a bare repository" +msgstr "неможливо виконати виправлення в порожньому сховищі" + +#, c-format +msgid "commit cannot be found: %s" +msgstr "неможливо знайти коміт: %s" + +msgid "cannot get tree for HEAD" +msgstr "неможливо отримати дерево для HEAD" + +msgid "unable to read index" +msgstr "не вдалося прочитати індексний файл" + +msgid "nothing to fixup: no staged changes" +msgstr "немає чого виправляти: немає індексованих змін" + +msgid "unable to write index as a tree" +msgstr "не вдалося записати індекс як дерево" + +#, c-format +msgid "cannot get tree for commit %s" +msgstr "неможливо отримати дерево для коміту %s" + +msgid "merge failed while applying fixup" +msgstr "не вдалося зробити злиття під час застосування виправлення" + +msgid "fixup would produce conflicts; aborting" +msgstr "виправлення призведе до конфліктів; припинення" + +#, c-format +msgid "cannot drop root commit %s: it has no parent to replay onto" +msgstr "" +"неможливо скасувати кореневий коміт %s: у нього немає батьківського коміту, " +"на який можна його відтворити" + +#, c-format +msgid "fixup makes commit %s empty" +msgstr "виправлення робить коміт %s порожнім" + +msgid "failed writing fixed-up commit" +msgstr "не вдалося записати виправлений коміт" + +msgid "failed replaying descendants" +msgstr "відтворення нащадків не вдалося" + +msgid "failed writing reworded commit" +msgstr "не вдалося записати переформульований коміт" + +msgid "unable to populate index with tree" +msgstr "не вдалося заповнити індекс деревом" + +msgid "unable to acquire index lock" +msgstr "не вдалося отримати блокування індексу" + +msgid "failed reading temporary index" +msgstr "не вдалося прочитати тимчасовий індекс" + +msgid "failed split tree" +msgstr "не вдалося розділити дерево" + +msgid "split commit is empty" +msgstr "розщеплений коміт є порожнім" + +msgid "split commit tree matches original commit" +msgstr "розділене дерево комітів відповідає оригінальному коміту" + +msgid "failed writing first commit" +msgstr "не вдалося записати перший коміт" + +msgid "failed writing second commit" +msgstr "не вдалося записати другий коміт" + +msgid "control ref update behavior" +msgstr "управління поведінкою оновлення посилань" + +msgid "command expects a committish" +msgstr "команда очікує на комітоподібне" + +msgid "cannot split up merge commit" +msgstr "неможливо розділити коміт злиття" + +msgid "" +"git hook run [--allow-unknown-hook-name] [--ignore-missing] [--to-" +"stdin=<path>] [(-j|--jobs) <n>]\n" +"<hook-name> [-- <hook-args>]" +msgstr "" +"git hook run [--allow-unknown-hook-name] [--ignore-missing] [--to-" +"stdin=<шлях>] [(-j|--jobs) <н>]\n" +"<назва-гачка> [-- <аргументи-гачка>]" + +msgid "" +"git hook list [--allow-unknown-hook-name] [-z] [--show-scope] <hook-name>" +msgstr "" +"git hook list [--allow-unknown-hook-name] [-z] [--show-scope] <назва-гачка>" + +msgid "use NUL as line terminator" +msgstr "використовувати NUL як закінчення рядка" + +msgid "show the config scope that defined each hook" +msgstr "показати область конфігурації, в якій визначено кожен гачок" + +msgid "allow running a hook with a non-native hook name" +msgstr "дозволити запуск гачка з нестандартною назвою" + +msgid "you must specify a hook event name to list" +msgstr "ви маєте вказати назву події гачка, яку потрібно відобразити" + +#, c-format +msgid "" +"unknown hook event '%s';\n" +"use --allow-unknown-hook-name to allow non-native hook names" +msgstr "" +"невідома подія гачка \"%s\";\n" +"використовуйте опцію --allow-unknown-hook-name, щоб дозволити використання " +"нестандартних імен гачків" + +#, c-format +msgid "no hooks found for event '%s'" +msgstr "не знайдено гачків для події \"%s\"" + +msgid "hook from hookdir" +msgstr "гачок із каталогу hookdir" msgid "silently ignore missing requested <hook-name>" msgstr "мовчки ігнорувати відсутній <назва-гачка>" msgid "file to read into hooks' stdin" -msgstr "файл, з якого читати stdin хука" +msgstr "файл, з якого читати stdin гачка" + +msgid "run up to <n> hooks simultaneously (-1 for CPU count)" +msgstr "" +"запустити одночасно до <n> гачків (значення -1 відповідає кількості " +"процесорів)" + +#, c-format +msgid "invalid value for -j: %d (use -1 for CPU count or a positive integer)" +msgstr "" +"неприпустиме значення для параметра -j: %d (для вказівки кількості " +"процесорів використовуйте -1 або додатне ціле число)" #, c-format msgid "object type mismatch at %s" @@ -8069,6 +8512,9 @@ msgstr "пакунок має невірний обʼєкт зі зміщенн msgid "inflate returned %d" msgstr "розпаковувач повернув %d" +msgid "object size too large for this platform" +msgstr "розмір об’єкта завеликий для цієї платформи" + msgid "offset value overflow for delta base object" msgstr "переповнення значення зсуву для обʼєкту дельти з базою" @@ -8112,6 +8558,10 @@ msgid "fsck error in packed object" msgstr "помилка fsck у запакованому обʼєкті" #, c-format +msgid "invalid %s" +msgstr "неприпустимий %s" + +#, c-format msgid "Not all child objects of %s are reachable" msgstr "Не всі дочірні об’єкти %s доступні" @@ -8255,6 +8705,9 @@ msgstr "--stdin потребує наявності git сховища" msgid "--verify with no packfile name given" msgstr "--verify без зазначення имені файла пакунка" +msgid "cannot perform queued object checks outside of a repository" +msgstr "неможливо виконувати чергову перевірку об’єкта поза межами сховища" + msgid "fsck error in pack objects" msgstr "помилка fsck в об’єктах пакунка" @@ -8320,21 +8773,6 @@ msgstr "" " [--parse] [<файл>...]" #, c-format -msgid "could not stat %s" -msgstr "не вдалося виконати stat для %s" - -#, c-format -msgid "file %s is not a regular file" -msgstr "файл %s не є звичайним файлом" - -#, c-format -msgid "file %s is not writable by user" -msgstr "файл %s не доступний для запису користувачем" - -msgid "could not open temporary file" -msgstr "не вдалося відкрити тимчасовий файл" - -#, c-format msgid "could not read input file '%s'" msgstr "не вдалося прочитати вхідний файл \"%s\"" @@ -8342,6 +8780,10 @@ msgid "could not read from stdin" msgstr "не вдалося прочитати з stdin" #, c-format +msgid "could not write to temporary file '%s'" +msgstr "не вдалося записати дані у тимчасовий файл \"%s\"" + +#, c-format msgid "could not rename temporary file to %s" msgstr "не вдалося перейменувати тимчасовий файл на %s" @@ -8366,8 +8808,8 @@ msgstr "що робити, якщо причіп відсутній" msgid "output only the trailers" msgstr "виводити лише причепи" -msgid "do not apply trailer.* configuration variables" -msgstr "не застосовувати конфігураційні змінні trailer.*" +msgid "do not apply trailer.<key-alias> configuration variables" +msgstr "не застосовувати trailer.<аліас-ключа> конфігураційні значення" msgid "reformat multiline trailer values as single-line values" msgstr "переформатувати багаторядкові значення причепів в однорядкові" @@ -8387,22 +8829,23 @@ msgstr "--trailer з --only-input не має сенсу" msgid "no input file given for in-place editing" msgstr "не надано вхідного файлу для редагування на місці" -msgid "last-modified can only operate on one tree at a time" +msgid "last-modified can only operate on one commit at a time" msgstr "last-modified може працювати тільки з одним деревом за раз" #, c-format +msgid "revision argument '%s' is a %s, not a commit-ish" +msgstr "аргумент ревізії \"%s\" є %s, а не комітоподібним" + +#, c-format msgid "unknown last-modified argument: %s" msgstr "невідомий аргумент last-modified: %s" -msgid "unable to setup last-modified" -msgstr "не вдалося налаштувати last-modified" - msgid "" -"git last-modified [--recursive] [--show-trees] [<revision-range>] [[--] " -"<path>...]" +"git last-modified [--recursive] [--show-trees] [--max-depth=<depth>] [-z]\n" +" [<revision-range>] [[--] <pathspec>...]" msgstr "" -"git last-modified [--recursive] [--show-trees] [<діапазон-ревізій>] [[--] " -"<шлях>...]" +"git last-modified [--recursive] [--show-trees] [--max-depth=<глибина>] [-z]\n" +" [<діапазон-ревізій>] [[--] <визначник шляху>...]" msgid "recurse into subtrees" msgstr "рекурсивно в піддеревах" @@ -8410,6 +8853,12 @@ msgstr "рекурсивно в піддеревах" msgid "show tree entries when recursing into subtrees" msgstr "показати записи дерева при рекурсії в піддерева" +msgid "maximum tree depth to recurse" +msgstr "максимальна глибина дерева для рекурсії" + +msgid "lines are separated with NUL character" +msgstr "рядки розділені символом NUL" + msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<опції>] [<діапазон-ревізій>] [[--] <шлях>...]" @@ -8484,6 +8933,18 @@ msgid "format.headers without value" msgstr "format.headers без значення" #, c-format +msgid "bad boolean config value '%s' for '%s'" +msgstr "невірне булеве значення конфігурації \"%s\" для \"%s\"" + +#, c-format +msgid "" +"'%s' used to accept any value and treat that as 'true'.\n" +"Now it only accepts boolean values, like what '%s' does.\n" +msgstr "" +"Раніше \"%s\" приймало будь-яке значення і трактувало його як \"true\".\n" +"Тепер воно приймає лише булеві значення, так само, як і \"%s\".\n" + +#, c-format msgid "cannot open patch file %s" msgstr "не вдається відкрити файл латки %s" @@ -8504,6 +8965,10 @@ msgid "failed to create cover-letter file" msgstr "не вдалося створити файл супровідного листа" #, c-format +msgid "'%s' is not a valid format string" +msgstr "\"%s\" не є дійсним форматом рядка" + +#, c-format msgid "insane in-reply-to: %s" msgstr "неприпустимий in-reply-to: %s" @@ -8567,6 +9032,14 @@ msgstr "вивести латки на стандартний вивід" msgid "generate a cover letter" msgstr "скласти супровідний лист" +msgid "format-spec" +msgstr "специфікація формату" + +msgid "format spec used for the commit list in the cover letter" +msgstr "" +"специфікація формату, що використовується для списку комітів у супровідному " +"листі" + msgid "use simple number sequence for output file names" msgstr "використати просту послідовність чисел для назв вихідних файлів" @@ -8688,7 +9161,7 @@ msgid "don't print the patch filenames" msgstr "не виводити назви файлів латок" msgid "show progress while generating patches" -msgstr "показувати прогрес під час генерації патчів" +msgstr "показувати прогрес під час генерації латок" msgid "show changes against <rev> in cover letter or single patch" msgstr "" @@ -9014,13 +9487,6 @@ msgstr "" "git merge-file [<опції>] [-L <назва1> [-L <оріг> [-L <назва2>]]] <файл1> " "<оріг-файл> <файл2>" -msgid "" -"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " -"\"histogram\"" -msgstr "" -"опція diff-algorithm приймає значення \"myers\", \"minimal\", \"patience\" " -"та \"histogram\"" - msgid "send results to standard output" msgstr "надсилати результати до стандартного виводу" @@ -9033,12 +9499,6 @@ msgstr "використовувати злиття на основі diff3" msgid "use a zealous diff3 based merge" msgstr "використовувати ретельне злиття на основі diff3" -msgid "<algorithm>" -msgstr "<алгоритм>" - -msgid "choose a diff algorithm" -msgstr "вибрати алгоритм різниці" - msgid "for conflicts, use this marker size" msgstr "у разі конфліктів використовувати цей розмір маркера" @@ -9461,11 +9921,24 @@ msgid "allow creation of more than one tree" msgstr "дозволяти створення більш ніж одного дерева" msgid "" -"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-" -"snapshot=<path>]" +"git multi-pack-index [<options>] write [--preferred-pack=<pack>]\n" +" [--[no-]bitmap] [--[no-]incremental] [--[no-]stdin-packs]\n" +" [--refs-snapshot=<path>] [--[no-]write-chain-file]\n" +" [--base=<checksum>]" msgstr "" -"git multi-pack-index [<опції>] write [--preferred-pack=<пакунок>] [--refs-" -"snapshot=<шлях>]" +"git multi-pack-index [<опції>] write [--preferred-pack=<пакунок>]\n" +" [--[no-]bitmap] [--[no-]incremental] [--[no-]stdin-packs]\n" +" [--refs-snapshot=<шлях>] [--[no-]write-chain-file]\n" +" [--base=<контрольна сума>]" + +msgid "" +"git multi-pack-index [<options>] compact [--[no-]incremental]\n" +" [--[no-]bitmap] [--base=<checksum>] [--[no-]write-chain-file]\n" +" <from> <to>" +msgstr "" +"git multi-pack-index [<опції>] compact [--[no-]incremental]\n" +" [--[no-]bitmap] [--base=<контрольна-сума>] [--[no-]write-chain-file]\n" +" <від> <до>" msgid "git multi-pack-index [<options>] verify" msgstr "git multi-pack-index [<опції>] verify" @@ -9492,15 +9965,42 @@ msgstr "" msgid "write multi-pack bitmap" msgstr "записати multi-pack bitmap" +msgid "checksum" +msgstr "контрольна сума" + +msgid "base MIDX for incremental writes" +msgstr "базовий MIDX для інкрементного запису" + msgid "write a new incremental MIDX" msgstr "записати новий інкрементний MIDX" +msgid "write the multi-pack-index chain file" +msgstr "записати файл ланцюжка multi-pack-index" + msgid "write multi-pack index containing only given indexes" msgstr "записати multi-pack індекс, що містить лише задані індекси" msgid "refs snapshot for selecting bitmap commits" msgstr "знімок посилань для вибору bitmap комітів" +#, c-format +msgid "cannot use %s without %s" +msgstr "неможливо використовувати %s без %s" + +msgid "cannot use --base without --no-write-chain-file" +msgstr "неможливо використовувати опцію --base без опції --no-write-chain-file" + +#, c-format +msgid "could not find MIDX: %s" +msgstr "не вдалося знайти MIDX: %s" + +msgid "MIDX compaction endpoints must be unique" +msgstr "Кінцеві точки ущільнення MIDX повинні бути унікальними" + +#, c-format +msgid "MIDX %s must be an ancestor of %s" +msgstr "MIDX %s має бути предком %s" + msgid "" "during repack, collect pack-files of smaller size into a batch that is " "larger than this size" @@ -9631,6 +10131,49 @@ msgstr "дозволити виводити \"невизначені\" назв msgid "dereference tags in the input (internal use)" msgstr "розіменувати теги на вході (внутрішнє використання)" +#, c-format +msgid "'%s' needs to be either text, revs, or rev" +msgstr "\"%s\" має бути або текстом, або revs, або rev" + +msgid "" +"(EXPERIMENTAL!) git format-rev --stdin-mode=<mode> --format=<pretty> [--" +"[no-]notes=<ref>] [-z] [--[no-]null-output] [--[no-]null-input]" +msgstr "" +"(ЕКСПЕРИМЕНТАЛЬНО!) git format-rev --stdin-mode=<режим> --" +"format=<прикрашати> [--[no-]notes=<посилання>] [-z] [--[no-]null-output] [--" +"[no-]null-input]" + +msgid "pretty format to use" +msgstr "використовувати прикрашений формат" + +msgid "stdin-mode" +msgstr "режим stdin" + +msgid "how revs are processed" +msgstr "як обробляються ревізіі" + +msgid "notes" +msgstr "нотатки" + +msgid "display notes for pretty format" +msgstr "відобразити примітки у прикрашеному форматі" + +msgid "z" +msgstr "z" + +msgid "Use NUL for input and output termination" +msgstr "Для припинення вводу та виводу використовуйте символ NUL" + +msgid "Use NUL for input termination" +msgstr "Для припинення введення використовуйте символ NUL" + +msgid "Use NUL for output termination" +msgstr "Для припинення виводу використовуйте символ NUL" + +#, c-format +msgid "'%s' is required" +msgstr "\"%s\" є обов’язковим полем" + msgid "git notes [--ref <notes-ref>] [list [<object>]]" msgstr "git notes [--ref <посилання-нотатки>] [list [<об’єкт>]]" @@ -9981,6 +10524,10 @@ msgid "currently, --write-bitmap-index requires --name-hash-version=1" msgstr "наразі --write-bitmap-index потребує --name-hash-version=1" #, c-format +msgid "write_reuse_object: unable to parse object header of %s" +msgstr "write_reuse_object: не вдалося розібрати заголовок об’єкта %s" + +#, c-format msgid "" "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in " "pack %s" @@ -10120,6 +10667,12 @@ msgid "could not find pack '%s'" msgstr "не вдалося знайти пакунок \"%s\"" #, c-format +msgid "packfile %s is a promisor but --exclude-promisor-objects was given" +msgstr "" +"файл пакунка %s є promisor, але було додано параметр --exclude-promisor-" +"objects" + +#, c-format msgid "packfile %s cannot be accessed" msgstr "неможливо отримати доступ до файлу пакунку %s" @@ -10148,9 +10701,6 @@ msgstr "" "очікувався ідентифікатор обʼєкта, отримано непотріб:\n" " %s" -msgid "could not load cruft pack .mtimes" -msgstr "не вдалося завантажити марний пакунок .mtimes" - msgid "cannot open pack index" msgstr "не вдалося відкрити індекс пакунка" @@ -10161,9 +10711,6 @@ msgstr "не вдалося розглянути вільний обʼєкт у msgid "unable to force loose object" msgstr "не вдалося примусово вивільнити обʼєкт" -msgid "failed to pack objects via path-walk" -msgstr "не вдалося запакувати обʼєкти за допомогою path-walk" - #, c-format msgid "not a rev '%s'" msgstr "не є ревізією \"%s\"" @@ -10172,6 +10719,9 @@ msgstr "не є ревізією \"%s\"" msgid "bad revision '%s'" msgstr "невірна ревізія \"%s\"" +msgid "failed to pack objects via path-walk" +msgstr "не вдалося запакувати обʼєкти за допомогою path-walk" + msgid "unable to add recent objects" msgstr "не вдалося додати нещодавні обʼєкти" @@ -10375,11 +10925,11 @@ msgstr "git pack-refs " msgid "git patch-id [--stable | --unstable | --verbatim]" msgstr "git patch-id [--stable | --unstable | --verbatim]" -msgid "use the unstable patch-id algorithm" -msgstr "використовувати нестабільний алгоритм ідентифікатора латки" +msgid "use the unstable patch ID algorithm" +msgstr "використовувати алгоритм ідентифікації нестабільних латок" -msgid "use the stable patch-id algorithm" -msgstr "використовувати стабільний алгоритм ідентифікатора латки" +msgid "use the stable patch ID algorithm" +msgstr "використовувати алгоритм ідентифікації стабільних латок" msgid "don't strip whitespace from the patch" msgstr "не прибирати пробіли з латки" @@ -10402,39 +10952,6 @@ msgstr "неможливо виконати видалення в precious-objec msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<опції>] [<сховище> [<визначник посилання>...]]" -msgid "control for recursive fetching of submodules" -msgstr "управління рекурсивним отриманням підмодулів" - -msgid "Options related to merging" -msgstr "Опції, повʼязані зі злиттям" - -msgid "incorporate changes by rebasing rather than merging" -msgstr "вносити зміни через перебазування, а не злиття" - -msgid "allow fast-forward" -msgstr "дозволити перемотування вперед" - -msgid "control use of pre-merge-commit and commit-msg hooks" -msgstr "контролювати використання гачків pre-merge-commit та commit-msg" - -msgid "automatically stash/stash pop before and after" -msgstr "автоматично додавати до та забирати зі схову перед і після" - -msgid "Options related to fetching" -msgstr "Опції, пов’язані з отриманням" - -msgid "force overwrite of local branch" -msgstr "примусовий перезапис локальної гілки" - -msgid "number of submodules pulled in parallel" -msgstr "кількість підмодулів, що затягуються паралельно" - -msgid "use IPv4 addresses only" -msgstr "використовувати тільки IPv4 адреси" - -msgid "use IPv6 addresses only" -msgstr "використовувати тільки IPv6 адреси" - msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -10540,6 +11057,39 @@ msgstr "" "замовчуванням для кожного\n" "виклику.\n" +msgid "control for recursive fetching of submodules" +msgstr "управління рекурсивним отриманням підмодулів" + +msgid "Options related to merging" +msgstr "Опції, повʼязані зі злиттям" + +msgid "incorporate changes by rebasing rather than merging" +msgstr "вносити зміни через перебазування, а не злиття" + +msgid "allow fast-forward" +msgstr "дозволити перемотування вперед" + +msgid "control use of pre-merge-commit and commit-msg hooks" +msgstr "контролювати використання гачків pre-merge-commit та commit-msg" + +msgid "automatically stash/stash pop before and after" +msgstr "автоматично додавати до та забирати зі схову перед і після" + +msgid "Options related to fetching" +msgstr "Опції, пов’язані з отриманням" + +msgid "force overwrite of local branch" +msgstr "примусовий перезапис локальної гілки" + +msgid "number of submodules pulled in parallel" +msgstr "кількість підмодулів, що затягуються паралельно" + +msgid "use IPv4 addresses only" +msgstr "використовувати тільки IPv4 адреси" + +msgid "use IPv6 addresses only" +msgstr "використовувати тільки IPv6 адреси" + msgid "Updating an unborn branch with changes added to the index." msgstr "Оновлення ненародженої гілки зі змінами, доданими до індексу." @@ -10792,6 +11342,10 @@ msgstr "" msgid "invalid value for '%s'" msgstr "неприпустиме значення для \"%s\"" +#, c-format +msgid "could not push to %s" +msgstr "не вдалося надіслати в %s" + msgid "repository" msgstr "сховище" @@ -10864,16 +11418,37 @@ msgid "" "and then push using the remote name\n" "\n" " git push <name>\n" +"\n" +"To push to multiple remotes at once, configure a remote group using\n" +"\n" +" git config remotes.<groupname> \"<remote1> <remote2>\"\n" +"\n" +"and then push using the group name\n" +"\n" +" git push <groupname>\n" msgstr "" -"Немає налаштованого місця призначення надсилання.\n" -"Або зазначте URL-адресу з командного рядка, або налаштуйте віддалене сховище " -"за допомогою\n" +"Не налаштовано шлях призначення надсилання.\n" +"Вкажіть URL-адресу з командного рядка або налаштуйте віддалене сховище за " +"допомогою команди\n" +"\n" +" git remote add <назва> <url>\n" +"\n" +"а потім надішліть дані, вказавши назву віддаленого сховища\n" +"\n" +" git push <назва>\n" +"\n" +"Щоб надіслати дані одразу до кількох віддалених сховищ, налаштуйте групу " +"віддалених сховищ за допомогою команди\n" "\n" -" git remote add <назва> <адреса>\n" +" git config remotes.<назва-групи> «<віддалене-призначення1> <віддалене-" +"призначення2>»\n" "\n" -"а потім виконайте надсилання, використовуючи назву віддаленого сховища\n" +"а потім надішліть дані, використовуючи назву групи\n" "\n" -" git push <імʼя>\n" +" git push <назва-групи>\n" + +msgid "push options must not have new line characters" +msgstr "опції push не можуть містити символи нового рядка" msgid "--all can't be combined with refspecs" msgstr "--all не можна комбінувати з визначниками посилань" @@ -10881,8 +11456,10 @@ msgstr "--all не можна комбінувати з визначниками msgid "--mirror can't be combined with refspecs" msgstr "--mirror не можна комбінувати з визначниками посилань" -msgid "push options must not have new line characters" -msgstr "опції push не можуть містити символи нового рядка" +msgid "--atomic can only be used when pushing to one remote" +msgstr "" +"--atomic можна використовувати лише під час надсилання змін до одного " +"віддаленого сховища" msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>" msgstr "" @@ -10902,9 +11479,6 @@ msgstr "неприпустиме значення максимального о msgid "use simple diff colors" msgstr "використовувати прості кольори diff" -msgid "notes" -msgstr "нотатки" - msgid "passed to 'git log'" msgstr "передано до \"git log\"" @@ -11207,9 +11781,6 @@ msgid "(REMOVED) was: try to recreate merges instead of ignoring them" msgstr "" "(ВИДАЛЕНО) було: спробувати відтворити злиття замість того, щоб ігнорувати їх" -msgid "how to handle commits that become empty" -msgstr "як обробляти порожні коміти" - msgid "keep commits which start empty" msgstr "зберігати коміти, які починаються порожніми" @@ -12135,11 +12706,11 @@ msgstr "розгорнутий вивід; має стояти перед під msgid "" "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" "[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n" -"[--write-midx] [--name-hash-version=<n>] [--path-walk]" +"[--write-midx[=<mode>]] [--name-hash-version=<n>] [--path-walk]" msgstr "" "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" "[--window=<н>] [--depth=<н>] [--threads=<н>] [--keep-pack=<назва-пакунка>]\n" -"[--write-midx] [--name-hash-version=<н>] [--path-walk]" +"[--write-midx[=<режим>]] [--name-hash-version=<н>] [--path-walk]" msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" @@ -12149,6 +12720,10 @@ msgstr "" "параметром\n" "--no-write-bitmap-index або вимкніть конфігурацію pack.writeBitmaps." +#, c-format +msgid "unknown value for %s: %s" +msgstr "невідоме значення для %s: %s" + msgid "pack everything in a single pack" msgstr "запакувати все в один пакунок" @@ -12240,6 +12815,10 @@ msgid "cannot delete packs in a precious-objects repo" msgstr "неможливо видалити пакунки в precious-objects сховищі" #, c-format +msgid "invalid value for %s: %d" +msgstr "неприпустиме значення для %s: %d" + +#, c-format msgid "option '%s' can only be used along with '%s'" msgstr "опція \"%s\" може бути використана тільки разом з \"%s\"" @@ -12434,54 +13013,40 @@ msgstr "--convert-graft-file не потребує аргументів" msgid "only one pattern can be given with -l" msgstr "тільки один шаблон може бути заданий з -l" -msgid "need some commits to replay" -msgstr "потрібні деякі коміти для відтворення" - -msgid "all positive revisions given must be references" -msgstr "всі надані позитивні ревізії мають бути посиланнями" - -msgid "argument to --advance must be a reference" -msgstr "аргумент до --advance має бути посиланням" - -msgid "" -"cannot advance target with multiple sources because ordering would be ill-" -"defined" -msgstr "" -"неможливо просунути посилання з декількома джерелами, тому що впорядкування " -"буде нечітко визначеним" - -msgid "" -"cannot implicitly determine whether this is an --advance or --onto operation" -msgstr "неможливо неявно визначити, чи це операція --advance або --onto" +#, c-format +msgid "invalid %s value: '%s'" +msgstr "неприпустиме значення %s: \"%s\"" msgid "" -"cannot advance target with multiple source branches because ordering would " -"be ill-defined" +"(EXPERIMENTAL!) git replay ([--contained] --onto=<newbase> | --" +"advance=<branch> | --revert=<branch>)\n" +"[--ref=<ref>] [--ref-action=<mode>] <revision-range>" msgstr "" -"неможливо просунути посилання з декількома джерельними гілками, тому що " -"впорядкування буде нечітко визначеним" +"(ЕКСПЕРИМЕНТАЛЬНО!) git replay ([--contained] --onto=<нова-база> | --" +"advance=<гілка> | --revert=<гілка>)\n" +"[--ref=<посилання>] [--ref-action=<режим>] <діапазон-ревізій>" -msgid "cannot implicitly determine correct base for --onto" -msgstr "неможливо неявно визначити вірну базу для --onto" +msgid "update all branches that point at commits in <revision-range>" +msgstr "оновити всі гілки, які вказують на коміти в <діапазоні-ревізій>" -msgid "" -"(EXPERIMENTAL!) git replay ([--contained] --onto <newbase> | --advance " -"<branch>) <revision-range>..." -msgstr "" -"(ЕКСПЕРИМЕНТАЛЬНО!) git replay ([--contained] --onto <нова-база> | --advance " -"<гілка>) <діапазон-ревізій>..." +msgid "replay onto given commit" +msgstr "відтворити на заданий коміт" msgid "make replay advance given branch" msgstr "зробити відтворення з просуванням даної гілки" -msgid "replay onto given commit" -msgstr "відтворити на заданий коміт" +msgid "revert commits onto given branch" +msgstr "вивернути коміти у вказаній гілці" -msgid "advance all branches contained in revision-range" -msgstr "просунути всі гілки, що містяться в діапазоні ревізій" +msgid "reference to update with result" +msgstr "посилання для оновлення з результатом" -msgid "option --onto or --advance is mandatory" -msgstr "опція --onto або --advance є обовʼязковою" +msgid "control ref update behavior (update|print)" +msgstr "управління поведінкою оновлення посилань (update|print)" + +msgid "exactly one of --onto, --advance, or --revert is required" +msgstr "" +"потрібно вказати лише один з параметрів: --onto, --advance або --revert" #, c-format msgid "" @@ -12491,19 +13056,14 @@ msgstr "" "деякі опції проходження по ревізіям будуть перевизначені, оскільки біт " "\"%s\" у \"struct rev_info\" буде примусово використано" -msgid "error preparing revisions" -msgstr "помилка при підготовці ревізій" - -msgid "replaying down to root commit is not supported yet!" -msgstr "відтворення до кореневого коміту поки що не підтримується!" - -msgid "replaying merge commits is not supported yet!" -msgstr "відтворення комітів злиття поки що не підтримується!" - #, c-format msgid "key '%s' not found" msgstr "ключ \"%s\" не знайдено" +msgid "--keys can only be used with --format=lines or --format=nul" +msgstr "" +"--keys можна використовувати лише разом з --format=lines або --format=nul" + #, c-format msgid "invalid format '%s'" msgstr "неприпустимий формат \"%s\"" @@ -12514,9 +13074,21 @@ msgstr "формат виводу" msgid "synonym for --format=nul" msgstr "те ж саме, що й --format=nul" +msgid "print all keys/values" +msgstr "вивести всі ключі/значення" + +msgid "show keys" +msgstr "показати ключі" + +msgid "--keys cannot be used with a <key> or --all" +msgstr "--keys неможливо використовувати разом із <ключ> або --all" + msgid "unsupported output format" msgstr "непідтримуваний формат виводу" +msgid "--all and <key> cannot be used together" +msgstr "--all та <ключ> неможливо використовувати одночасно" + msgid "References" msgstr "Посилання" @@ -12547,6 +13119,24 @@ msgstr "Дерева" msgid "Blobs" msgstr "Blobs" +msgid "Inflated size" +msgstr "Завищений розмір" + +msgid "Disk size" +msgstr "Розмір диска" + +msgid "Largest objects" +msgstr "Найбільші об’єкти" + +msgid "Maximum size" +msgstr "Максимальний розмір" + +msgid "Maximum parents" +msgstr "Максимальна кількість батьків" + +msgid "Maximum entries" +msgstr "Максимальна кількість записів" + msgid "Repository structure" msgstr "Структура сховища" @@ -13134,6 +13724,43 @@ msgstr "хеш-алгоритм" msgid "Unknown hash algorithm" msgstr "Невідомий хеш-алгоритм" +msgid "assuming SHA-1; use --object-format to override" +msgstr "" +"за замовчуванням використовується SHA-1; для зміни цього параметра " +"використовуйте опцію --object-format" + +msgid "unable to read header" +msgstr "не вдалося прочитати заголовок" + +msgid "unknown index version" +msgstr "невідома версія індексу" + +msgid "corrupt index file" +msgstr "пошкоджений індексний файл" + +#, c-format +msgid "unable to read entry %u/%u" +msgstr "не вдалося прочитати запис %u/%u" + +#, c-format +msgid "unable to read sha1 %u/%u" +msgstr "не вдалося прочитати sha1 %u/%u" + +#, c-format +msgid "unable to read crc %u/%u" +msgstr "не вдалося прочитати crc %u/%u" + +#, c-format +msgid "unable to read 32b offset %u/%u" +msgstr "не вдалося прочитати 32-бітне зміщення %u/%u" + +msgid "inconsistent 64b offset index" +msgstr "непослідовний 64-бітний індекс зміщення" + +#, c-format +msgid "unable to read 64b offset %u" +msgstr "не вдалося прочитати 64-бітне зміщення %u" + msgid "" "git show-ref [--head] [-d | --dereference]\n" " [-s | --hash[=<n>]] [--abbrev[=<n>]] [--branches] [--tags]\n" @@ -13380,8 +14007,12 @@ msgstr "git stash drop [-q | --quiet] [<схов>]" msgid "git stash pop [--index] [-q | --quiet] [<stash>]" msgstr "git stash pop [--index] [-q | --quiet] [<схов>]" -msgid "git stash apply [--index] [-q | --quiet] [<stash>]" -msgstr "git stash apply [--index] [-q | --quiet] [<схов>]" +msgid "" +"git stash apply [--index] [-q | --quiet] [--label-ours=<label>] [--label-" +"theirs=<label>] [--label-base=<label>] [<stash>]" +msgstr "" +"git stash apply [--index] [-q | --quiet] [--label-ours=<мітка>] [--label-" +"theirs=<мітка>] [--label-base=<мітка>] [<схов>]" msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <назва-гілки> [<схов>]" @@ -13390,19 +14021,19 @@ msgid "git stash store [(-m | --message) <message>] [-q | --quiet] <commit>" msgstr "git stash store [(-m | --message) <допис>] [-q | --quiet] <коміт>" msgid "" -"git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q " +"git stash [push] [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q " "| --quiet]\n" " [-u | --include-untracked] [-a | --all] [(-m | --message) " "<message>]\n" " [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" -" [--] [<pathspec>...]]" +" [--] [<pathspec>...]" msgstr "" -"git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q " +"git stash [push] [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q " "| --quiet]\n" " [-u | --include-untracked] [-a | --all] [(-m | --message) " "<допис>]\n" " [--pathspec-from-file=<файл> [--pathspec-file-nul]]\n" -" [--] [<визначник-шляху>...]]" +" [--] [<визначник шляху>...]" msgid "" "git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | " @@ -13476,6 +14107,18 @@ msgstr "не вдалося відновити невідстежувані фа msgid "attempt to recreate the index" msgstr "спроба відтворити індекс" +msgid "label" +msgstr "мітка" + +msgid "label for the upstream side in conflict markers" +msgstr "мітка для першоджерельної частини в маркерах конфлікту" + +msgid "label for the stashed side in conflict markers" +msgstr "мітка для збереженої частини в маркерах конфлікту" + +msgid "label for the base in diff3 conflict markers" +msgstr "мітка для бази в маркерах конфліктів diff3" + #, c-format msgid "Dropped %s (%s)" msgstr "Скинуто %s (%s)" @@ -13666,6 +14309,9 @@ msgstr "" msgid "could not get a repository handle for submodule '%s'" msgstr "не вдалося отримати обʼєкт сховища для підмодуля \"%s\"" +msgid "git submodule--helper get-default-remote <path>" +msgstr "git submodule--helper get-default-remote <шлях>" + #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "Не знайдено URL для шляху підмодуля \"%s\" у .gitmodules" @@ -13702,6 +14348,16 @@ msgid "git submodule foreach [--quiet] [--recursive] [--] <command>" msgstr "git submodule foreach [--quiet] [--recursive] [--] <команда>" #, c-format +msgid "" +"failed to set a valid default config for 'submodule.%s.gitdir'. Please " +"ensure it is set, for example by running something like: 'git config " +"submodule.%s.gitdir .git/modules/%s'" +msgstr "" +"не вдалося встановити дійсну конфігурацію за замовчуванням для \"submodule." +"%s.gitdir\". Переконайтеся, що вона встановлена, наприклад, виконавши таку " +"команду: \"git config submodule.%s.gitdir .git/modules/%s\"" + +#, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Не вдалося зареєструвати url для підмодуля за шляхом \"%s\"" @@ -13790,6 +14446,28 @@ msgstr "git summary submodule [<опції>] [<коміт>] [--] [<шлях>]" msgid "could not fetch a revision for HEAD" msgstr "не вдалося отримати ревізію для HEAD" +msgid "git submodule--helper gitdir <name>" +msgstr "git submodule--helper gitdir <назва>" + +msgid "" +"could not set core.repositoryformatversion to 1.\n" +"Please set it for migration to work, for example:\n" +"git config core.repositoryformatversion 1" +msgstr "" +"не вдалося встановити значення core.repositoryformatversion на 1.\n" +"Будь ласка, встановіть це значення, щоб міграція почала працювати, " +"наприклад:\n" +"git config core.repositoryformatversion 1" + +msgid "" +"could not enable submodulePathConfig extension. It is required\n" +"for migration to work. Please enable it in the root repo:\n" +"git config extensions.submodulePathConfig true" +msgstr "" +"не вдалося увімкнути розширення submodulePathConfig. Воно необхідне\n" +"для роботи міграції. Будь ласка, увімкніть його в кореневому сховищі:\n" +"git config extensions.submodulePathConfig true" + #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "Синхронізація url підмодуля для \"%s\"\n" @@ -13887,11 +14565,6 @@ msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Значення \"%s\" для submodule.alternateLocation не розпізнано" #, c-format -msgid "refusing to create/use '%s' in another submodule's git dir" -msgstr "" -"відмовлено в створенні/використанні \"%s\" у git директорії іншого підмодуля" - -#, c-format msgid "directory not empty: '%s'" msgstr "директорія не порожня: \"%s\"" @@ -13900,6 +14573,15 @@ msgid "clone of '%s' into submodule path '%s' failed" msgstr "не вдалося клонувати \"%s\" у шлях підмодуля \"%s\"" #, c-format +msgid "" +"refusing to create/use '%s' in another submodule's git dir. Enabling " +"extensions.submodulePathConfig should fix this." +msgstr "" +"відмовлено в створенні/використанні \"%s\" у git директорії іншого " +"підмодуля. Увімкнення параметра extensions.submodulePathConfig має це " +"виправити." + +#, c-format msgid "could not get submodule directory for '%s'" msgstr "не вдалося отримати директорію підмодуля для \"%s\"" @@ -14211,7 +14893,7 @@ msgid "allow adding an otherwise ignored submodule path" msgstr "дозволити додавання шляху до підмодуля, який інакше ігнорується" msgid "borrow the objects from reference repositories" -msgstr "запозичити обʼєкти з репозиторіїв посилань" +msgstr "запозичити обʼєкти зі сховищ посилань" msgid "" "sets the submodule's name to the given string instead of defaulting to its " @@ -14229,7 +14911,7 @@ msgstr "" #, c-format msgid "repo URL: '%s' must be absolute or begin with ./|../" -msgstr "URL сховища: \"%s\" має бути абсолютним або починатися з ./|../." +msgstr "URL-адреса сховища: \"%s\" має бути абсолютною або починатися з ./|../" #, c-format msgid "submodule name '%s' already used for path '%s'" @@ -14711,6 +15393,15 @@ msgstr "" msgid "interrupt transfer after <n> seconds of inactivity" msgstr "перервати передачу після <н> секунд неактивності" +msgid "git url-parse [-c <component>] [--] <url>..." +msgstr "git url-parse [-c <компонент>] [--] <url>..." + +msgid "component" +msgstr "компонент" + +msgid "which URL component to extract" +msgstr "який компонент URL-адреси слід витягти" + msgid "git verify-commit [-v | --verbose] [--raw] <commit>..." msgstr "git verify-commit [-v | —verbose] [--raw] <коміт>..." @@ -14802,8 +15493,8 @@ msgstr "Видалення %s/%s: %s" msgid "report pruned working trees" msgstr "звітувати про видалення робочих дерев" -msgid "expire working trees older than <time>" -msgstr "видалити робочі дерева, старіші за <час>" +msgid "prune missing working trees older than <time>" +msgstr "видалити відсутні робочі дерева, вік яких перевищує <час>" #, c-format msgid "'%s' already exists" @@ -14872,15 +15563,8 @@ msgstr "Підготовка робочого дерева (перехід до msgid "Preparing worktree (detached HEAD %s)" msgstr "Підготовка робочого дерева (відокремлений HEAD %s)" -#, c-format -msgid "" -"HEAD points to an invalid (or orphaned) reference.\n" -"HEAD path: '%s'\n" -"HEAD contents: '%s'" -msgstr "" -"HEAD вказує на неприпустиме (або осиротіле) посилання.\n" -"HEAD шлях: \"%s\"\n" -"HEAD вміст: \"%s\"" +msgid "HEAD points to an invalid (or orphaned) reference.\n" +msgstr "HEAD вказує на неприпустиме (або осиротіле) посилання.\n" msgid "" "No local or remote refs exist despite at least one remote\n" @@ -14940,8 +15624,9 @@ msgstr "--[no-]track можна використовувати лише при msgid "show extended annotations and reasons, if available" msgstr "показувати розширені анотації та причини, якщо вони доступні" -msgid "add 'prunable' annotation to worktrees older than <time>" -msgstr "додати анотацію \"prunable\" до робочих дерев, старіших за <час>" +msgid "add 'prunable' annotation to missing worktrees older than <time>" +msgstr "" +"додати анотацію \"prunable\" до відсутніх робочих дерев старіших за <час>" msgid "terminate records with a NUL character" msgstr "завершувати записи символом NUL" @@ -15071,6 +15756,10 @@ msgstr "не вдалося розібрати ключ списку пакун msgid "bundle list at '%s' has no mode" msgstr "список пакунків на \"%s\" не має режиму" +#, c-format +msgid "bundle list at '%s': bundle '%s' has no uri" +msgstr "cписок пакунків у \"%s\": пакунок \"%s\" не має URI" + msgid "failed to create temporary file" msgstr "не вдалося створити тимчасовий файл" @@ -15093,6 +15782,10 @@ msgid "exceeded bundle URI recursion limit (%d)" msgstr "перевищено ліміт рекурсії URI пакунка (%d)" #, c-format +msgid "bundle '%s' has no uri" +msgstr "пакунок \"%s\" немає URI" + +#, c-format msgid "failed to download bundle from URI '%s'" msgstr "не вдалося завантажити пакунок з URI \"%s\"" @@ -15407,6 +16100,9 @@ msgstr "Запустити команду Git на списку сховищ" msgid "Prepare patches for e-mail submission" msgstr "Підготувати латки для надсилання електронною поштою" +msgid "EXPERIMENTAL: Pretty format revisions on demand" +msgstr "ЕКСПЕРИМЕНТАЛЬНО: Прикрашати ревізїї за запитом" + msgid "Verifies the connectivity and validity of the objects in the database" msgstr "Перевіряє звʼязність та валідність обʼєктів у базі даних" @@ -15429,8 +16125,11 @@ msgstr "Обчислити ідентифікатор обʼєкта та за msgid "Display help information about Git" msgstr "Відобразити довідкову інформацію про Git" -msgid "Run git hooks" -msgstr "Запустити git гачки" +msgid "EXPERIMENTAL: Rewrite history" +msgstr "ЕКСПЕРИМЕНТАЛЬНО: Переписати історію" + +msgid "Run Git hooks" +msgstr "Запустити гачки Git" msgid "Server side implementation of Git over HTTP" msgstr "Серверна реалізація Git через HTTP" @@ -15532,8 +16231,8 @@ msgstr "Знайти зайві файли пакунків" msgid "Pack heads and tags for efficient repository access" msgstr "Запакувати верхівки та теги для ефективного доступу до сховища" -msgid "Compute unique ID for a patch" -msgstr "Обчислити унікальний ідентифікатор для патчу" +msgid "Compute unique IDs for patches" +msgstr "Обчислити унікальні ідентифікатори для латок" msgid "Prune all unreachable objects from the object database" msgstr "Видалити всі недосяжні обʼєкти з бази даних обʼєктів" @@ -15591,8 +16290,8 @@ msgstr "Створює підсумок змін для розгляду" msgid "Reuse recorded resolution of conflicted merges" msgstr "Використати повторно записане розв’язання конфліктних злиттів" -msgid "Reset current HEAD to the specified state" -msgstr "Скинути поточний HEAD до вказаного стану" +msgid "Set `HEAD` or the index to a known state" +msgstr "Встановити \"HEAD\" або індекс у відомий стан" msgid "Restore working tree files" msgstr "Відновити файли робочого дерева" @@ -15624,8 +16323,8 @@ msgstr "Загальний код налаштування скриптів об msgid "Restricted login shell for Git-only SSH access" msgstr "Обмежений логін оболонки для доступу по SSH лише для Git" -msgid "Summarize 'git log' output" -msgstr "Підсумувати вивід \"git log\"" +msgid "Summarize `git log` output" +msgstr "Підсумувати результати команди \"git log\"" msgid "Show various types of objects" msgstr "Показати різні типи об’єктів" @@ -15690,6 +16389,9 @@ msgstr "Надіслати архів назад до git-archive" msgid "Send objects packed back to git-fetch-pack" msgstr "Надіслати запаковані обʼєкти назад до git-fetch-pack" +msgid "Parse and extract git URL components" +msgstr "Розібрати та витягти компоненти URL-адреси Git" + msgid "Show a Git logical variable" msgstr "Показати логічну змінну Git" @@ -16037,7 +16739,7 @@ msgstr "не вдалося розібрати коміт %s з бази дан #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" -msgstr "OID кореневого дерева для коміту %s у коміт-графі є %s != %s" +msgstr "OID кореневого дерева для коміту %s у графі комітів дорівнює %s != %s" #, c-format msgid "commit-graph parent list for commit %s is too long" @@ -16075,6 +16777,10 @@ msgid "could not parse commit %s" msgstr "не вдалося розібрати коміт %s" #, c-format +msgid "object %s is a %s, not a %s" +msgstr "обʼєкт %s є %s, а не %s" + +#, c-format msgid "%s %s is not a commit!" msgstr "%s %s не є комітом!" @@ -16175,6 +16881,42 @@ msgstr "Не вдалося створити FSEventStream." msgid "Failed to start the FSEventStream" msgstr "Не вдалося запустити потік FSEventStream" +msgid "inotify watch limit reached; increase fs.inotify.max_user_watches" +msgstr "" +"досягнуто обмеження на кількість спостережень inotify; збільште значення " +"параметра fs.inotify.max_user_watches" + +#, c-format +msgid "inotify_add_watch('%s') failed" +msgstr "inotify_add_watch(\"%s\") завершився невдало" + +msgid "inotify_rm_watch() failed" +msgstr "inotify_rm_watch() завершився невдало" + +#, c-format +msgid "opendir('%s') failed" +msgstr "opendir(\"%s\") завершився невдало" + +#, c-format +msgid "lstat('%s') failed" +msgstr "lstat(\"%s\") завершився невдало" + +#, c-format +msgid "closedir('%s') failed" +msgstr "closedir(\"%s\") завершився невдало" + +msgid "inotify_init1() failed" +msgstr "не вдалося виконати inotify_init1()" + +msgid "closing inotify file descriptor failed" +msgstr "не вдалося закрити файловий дескриптор inotify" + +msgid "reading inotify message stream failed" +msgstr "не вдалося прочитати потік повідомлень inotify" + +msgid "polling inotify message stream failed" +msgstr "не вдалося отримати потік повідомлень inotify" + #, c-format msgid "[GLE %ld] could not convert path to UTF-8: '%.*ls'" msgstr "[GLE %ld] не вдалося конвертувати шлях у UTF-8: \"%.*ls\"" @@ -16200,22 +16942,10 @@ msgid "could not read directory changes [GLE %ld]" msgstr "не вдалося прочитати зміни директорії [GLE %ld]" #, c-format -msgid "opendir('%s') failed" -msgstr "opendir(\"%s\") завершився невдало" - -#, c-format -msgid "lstat('%s') failed" -msgstr "lstat(\"%s\") завершився невдало" - -#, c-format msgid "strbuf_readlink('%s') failed" msgstr "strbuf_readlink(\"%s\") завершився невдало" #, c-format -msgid "closedir('%s') failed" -msgstr "closedir(\"%s\") завершився невдало" - -#, c-format msgid "[GLE %ld] unable to open for read '%ls'" msgstr "[GLE %ld] не вдалося відкрити для читання \"%ls\"" @@ -16478,10 +17208,6 @@ msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "невірне числове значення конфігурації \"%s\" для \"%s\" у \"%s\": %s" #, c-format -msgid "bad boolean config value '%s' for '%s'" -msgstr "невірне булеве значення конфігурації \"%s\" для \"%s\"" - -#, c-format msgid "failed to expand user dir in: '%s'" msgstr "не вдалося визначити директорію користувача в: \"%s\"" @@ -16539,7 +17265,7 @@ msgstr "Підтримка \"%s=auto\" була видалена в Git 3.0" #, c-format msgid "Support for '%s=auto' is deprecated and will be removed in Git 3.0" -msgstr "Підтримка \"%s=auto\" є застарілою і буде видалена в Git 3.0." +msgstr "Підтримка \"%s=auto\" є застарілою і буде видалена в Git 3.0" msgid "unknown error occurred while reading the configuration files" msgstr "невідома помилка виникла під час читання конфігураційних файлів" @@ -16689,10 +17415,6 @@ msgstr "неприпустима ls-refs відповідь: %s" msgid "expected flush after ref listing" msgstr "очікувалось flush після виводу посилань" -#, c-format -msgid "protocol '%s' is not supported" -msgstr "протокол \"%s\" не підтримується" - msgid "unable to set SO_KEEPALIVE on socket" msgstr "не вдалося встановити SO_KEEPALIVE сокету" @@ -16745,11 +17467,15 @@ msgstr "дивний порт \"%s\" заблоковано" msgid "cannot start proxy %s" msgstr "неможливо запустити проксі %s" +#, c-format +msgid "protocol '%s' is not supported" +msgstr "протокол \"%s\" не підтримується" + msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "не вказано шлях; дивіться \"git help pull\" для чинного url синтаксису" msgid "newline is forbidden in git:// hosts and repo paths" -msgstr "новий рядок у хостах git:// та шляхах репозиторіїв заборонено" +msgstr "новий рядок у хостах git:// та шляхах сховищ заборонено" msgid "ssh variant 'simple' does not support -4" msgstr "ssh опція \"simple\" не підтримує -4" @@ -17106,10 +17832,6 @@ msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Невідоме значення конфігураційної змінної \"diff.submodule\": \"%s\"" #, c-format -msgid "unknown value for config '%s': %s" -msgstr "невідоме значення для конфігурації \"%s\": %s" - -#, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" @@ -17169,6 +17891,9 @@ msgstr "невідома зміна класу \"%c\" у --diff-filter=%s" msgid "unknown value after ws-error-highlight=%.*s" msgstr "невідоме значення після ws-error-highlight=%.*s" +msgid "--find-object requires a git repository" +msgstr "--find-object вимагає наявності сховища Git" + #, c-format msgid "unable to resolve '%s'" msgstr "не вдалося розпізнати \"%s\"" @@ -17208,6 +17933,10 @@ msgid "failed to parse --submodule option parameter: '%s'" msgstr "не вдалося розібрати параметр опції --submodule: \"%s\"" #, c-format +msgid "%s expects a non-negative integer" +msgstr "%s очікує невідʼємне ціле число" + +#, c-format msgid "bad --word-diff argument: %s" msgstr "невірний --word-diff аргумент: %s" @@ -17547,9 +18276,6 @@ msgstr "вибрати файли за типом різниці" msgid "<depth>" msgstr "<глибина>" -msgid "maximum tree depth to recurse" -msgstr "максимальна глибина дерева для рекурсії" - msgid "<file>" msgstr "<файл>" @@ -17716,10 +18442,10 @@ msgid "" msgstr "" "Ви намагаєтеся отримати %s, який знаходиться у файлі коміт-графа, але не в " "базі даних обʼєктів.\n" -"Ймовірно, це повʼязано з пошкодженням репозиторію.\n" -"Якщо ви намагаєтеся виправити це пошкодження репозиторію повторним " -"отриманням відсутнього обʼєкта, скористайтеся командою \"git fetch --" -"refetch\" з відсутнім обʼєктом." +"Ймовірно, це повʼязано з пошкодженням сховища.\n" +"Якщо ви намагаєтеся виправити це пошкодження сховища повторним отриманням " +"відсутнього обʼєкта, скористайтеся командою \"git fetch --refetch\" з " +"відсутнім обʼєктом." msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: очікувався неглибокий список" @@ -17898,6 +18624,10 @@ msgstr "помилка під час обробки запитуваних по msgid "git fetch-pack: expected response end packet" msgstr "git fetch-pack: очікувався response end пакет" +#, c-format +msgid "couldn't resolve 'auto' filter '%s': %s" +msgstr "не вдалося розвʼязати фільтр \"auto\" \"%s\": %s" + msgid "no matching remote head" msgstr "немає відповідного віддаленого head" @@ -18320,6 +19050,77 @@ msgstr "" "Ви можете вимкнути це попередження за допомогою \"git config set " "advice.ignoredHook false\"." +#, c-format +msgid "hook.jobs must be an integer, ignoring: '%s'" +msgstr "hook.jobs має бути цілим числом, ігнорується: \"%s\"" + +#, c-format +msgid "hook.jobs must be a positive integer or -1, ignoring: '%s'" +msgstr "hook.jobs має бути додатним цілим числом або -1; ігнорується: \"%s\"" + +#, c-format +msgid "" +"hook friendly-name '%s' collides with a known event name; please choose a " +"different friendly-name" +msgstr "" +"гачок з дружньою назвою \"%s\" конфліктує з назвою відомої події; будь " +"ласка, виберіть іншу дружню назву" + +#, c-format +msgid "" +"hook friendly-name '%s' is the same as its event; this may cause ambiguity " +"with hook.%s.enabled" +msgstr "" +"гачок з дружньою назвою \"%s\" є таким самим, як і відповідна подія; це може " +"спричинити неоднозначність із параметром hook.%s.enabled" + +#, c-format +msgid "hook.%s.parallel must be a boolean, ignoring: '%s'" +msgstr "hook.%s.parallel має бути булевим значенням, ігнорується: \"%s\"" + +#, c-format +msgid "hook.%s.jobs must be an integer, ignoring: '%s'" +msgstr "hook.%s.jobs має бути цілим числом, ігнорується: \"%s\"" + +#, c-format +msgid "hook.%s.jobs must be a positive integer or -1, ignoring: '%s'" +msgstr "" +"hook.%s.jobs має бути додатним цілим числом або -1; ігнорується: \"%s\"" + +#, c-format +msgid "" +"hook.%s.jobs is set but '%s' looks like a hook friendly-name, not an event " +"name; hook.<event>.jobs uses the event name (e.g. hook.post-receive.jobs), " +"so this setting will be ignored" +msgstr "" +"параметр hook.%s.jobs задано, але \"%s\" виглядає як дружня назва гачка, а " +"не назва події; у форматі hook.<подія>.jobs використовується назва події " +"(наприклад, hook.post-receive.jobs), тому це значення буде проігноровано" + +#, c-format +msgid "disabled hook '%s' has no command configured" +msgstr "вимкнений гачок \"%s\" не має налаштованої команди" + +#, c-format +msgid "" +"'hook.%s.command' must be configured or 'hook.%s.event' must be removed; " +"aborting." +msgstr "" +"Необхідно налаштувати параметр \"hook.%s.command\" або видалити параметр " +"\"hook.%s.event\"; переривання." + +#, c-format +msgid "" +"hook '%s' is not marked as parallel=true, running in parallel anyway due to " +"-j%u" +msgstr "" +"гачок \"%s\" не позначений як parallel=true, але все одно виконується " +"паралельно завдяки параметру -j%u" + +#, c-format +msgid "%s must be a positive integer or -1, ignoring: %d" +msgstr "%s має бути додатним цілим числом або -1, ігнорується: %d" + msgid "not a git repository" msgstr "не є git сховищем" @@ -18374,6 +19175,25 @@ msgstr "" #, c-format msgid "" +"response requested a delay greater than http.maxRetryTime (%ld > %ld seconds)" +msgstr "" +"у відповіді було запрошено затримку, що перевищує http.maxRetryTime (%ld > " +"%ld секунд)" + +#, c-format +msgid "" +"configured http.retryAfter exceeds http.maxRetryTime (%ld > %ld seconds)" +msgstr "" +"налаштований параметр http.retryAfter перевищує значення http.maxRetryTime " +"(%ld > %ld секунд)" + +#, c-format +msgid "rate limited, waiting %ld seconds before retry" +msgstr "" +"обмеження частоти запитів, очікування %ld секунд перед повторною спробою" + +#, c-format +msgid "" "number too large to represent as curl_off_t on this platform: %<PRIuMAX>" msgstr "" "число занадто велике, щоб представити його як curl_off_t на цій платформі: " @@ -18457,6 +19277,9 @@ msgstr "" "<директорія>\".\n" "(наприклад, \"git config imap.folder Drafts\")" +msgid "'auto' filter not supported by this command" +msgstr "ця команда не підтримує фільтр \"auto\"" + msgid "expected 'tree:<depth>'" msgstr "очікувалось \"tree:<глибина>\"" @@ -18475,12 +19298,18 @@ msgstr "неприпустимий визначник фільтра \"%s\"" msgid "must escape char in sub-filter-spec: '%c'" msgstr "необхідно екранувати символ у sub-filter-spec: \"%c\"" +msgid "an 'auto' filter cannot be combined" +msgstr "фільтр \"авто\" не можна поєднувати" + msgid "expected something after combine:" msgstr "щоcь очікувалось після комбінування:" msgid "multiple filter-specs cannot be combined" msgstr "не можна комбінувати кілька визначників фільтра" +msgid "an 'auto' filter is incompatible with any other filter" +msgstr "фільтр \"авто\" несумісний з будь-яким іншим фільтром" + msgid "unable to upgrade repository format to support partial clone" msgstr "не вдалося оновити формат сховища для підтримки часткового клонування" @@ -18511,24 +19340,44 @@ msgid "unable to load root tree for commit %s" msgstr "не вдалося завантажити кореневе дерево для коміту %s" #, c-format +msgid "could not write lock pid file '%s'" +msgstr "не вдалося записати lock PID файл \"%s\"" + +#, c-format +msgid "malformed lock pid file '%s'" +msgstr "невірно сформований lock PID файл \"%s\"" + +#, c-format msgid "" -"Unable to create '%s.lock': %s.\n" +"Unable to create '%s': %s.\n" "\n" -"Another git process seems to be running in this repository, e.g.\n" -"an editor opened by 'git commit'. Please make sure all processes\n" -"are terminated then try again. If it still fails, a git process\n" -"may have crashed in this repository earlier:\n" -"remove the file manually to continue." msgstr "" -"Не вдалося створити \"%s.lock\": %s.\n" +"Не вдалося створити \"%s\": %s.\n" "\n" -"Схоже, у цьому сховищі запущено інший git процес, наприклад\n" -"редактор, відкритий командою \"git commit\". Будь ласка, переконайтеся, що " -"всі процеси\n" -"завершено, а потім спробуйте ще раз. Якщо все одно не вдасться, можливо, " -"раніше \n" -"у цьому сховищі аварійно завершився git процес:\n" -"видаліть файл вручну, щоб продовжити." + +#, c-format +msgid "" +"Lock may be held by process %<PRIuMAX>; if no git process is running, the " +"lock file may be stale (PIDs can be reused)" +msgstr "" +"Блокування може утримуватися процесом %<PRIuMAX>; якщо жоден процес git не " +"працює, файл блокування може бути застарілим (PID можуть використовуватися " +"повторно)" + +#, c-format +msgid "" +"Lock was held by process %<PRIuMAX>, which is no longer running; the lock " +"file appears to be stale" +msgstr "" +"Блокування було встановлено процесом %<PRIuMAX>, який більше не працює; файл " +"блокування виглядає застарілим" + +msgid "" +"Another git process seems to be running in this repository, or the lock file " +"may be stale" +msgstr "" +"Схоже, у цьому сховищі працює ще один процес Git, або файл блокування може " +"бути застарілим" #, c-format msgid "Unable to create '%s.lock': %s" @@ -18834,8 +19683,15 @@ msgstr "не вдалося розібрати рядок: %s" msgid "malformed line: %s" msgstr "невірно сформований рядок: %s" -msgid "could not load pack" -msgstr "не вдалося завантажити пакунок" +#, c-format +msgid "could not load pack %d" +msgstr "не вдалося завантажити пакунок %d" + +msgid "too many packs, unable to compact" +msgstr "занадто багато пакунків, неможливо стиснути" + +msgid "could not determine preferred pack" +msgstr "не вдалося визначити бажаний пакунок" #, c-format msgid "unable to link '%s' to '%s'" @@ -18845,11 +19701,22 @@ msgstr "не вдалося звʼязати \"%s\" з \"%s\"" msgid "failed to clear multi-pack-index at %s" msgstr "не вдалося очистити multi-pack-index при %s" +#, c-format +msgid "unknown MIDX version: %d" +msgstr "невідома версія MIDX: %d" + +msgid "cannot perform MIDX compaction with v1 format" +msgstr "неможливо виконати ущільнення MIDX у форматі v1" + msgid "ignoring existing multi-pack-index; checksum mismatch" msgstr "" "ігнорування існуючого multi-pack-index; невідповідність контрольних сум" #, c-format +msgid "could not find base MIDX '%s'" +msgstr "не вдалося знайти базовий MIDX \"%s\"" + +#, c-format msgid "could not load reverse index for MIDX %s" msgstr "не вдалося завантажити зворотний індекс для MIDX %s" @@ -19013,6 +19880,10 @@ msgstr "" msgid "multi-pack-index large offset out of bounds" msgstr "large offset multi-pack-index виходить за межі" +#, c-format +msgid "failed to clear multi-pack-index chain at %s" +msgstr "не вдалося очистити ланцюжок multi-pack-index в %s" + msgid "multi-pack-index file exists, but failed to parse" msgstr "multi-pack-index файл існує, але його не вдалося розібрати" @@ -19128,29 +19999,6 @@ msgid "garbage at end of loose object '%s'" msgstr "непотріб в кінці вільного обʼєкта \"%s\"" #, c-format -msgid "unable to open loose object %s" -msgstr "не вдалося відкрити вільний обʼєкт %s" - -#, c-format -msgid "unable to parse %s header" -msgstr "не вдалося розібрати заголовок %s" - -msgid "invalid object type" -msgstr "неприпустимий тип обʼєкта" - -#, c-format -msgid "unable to unpack %s header" -msgstr "не вдалося розпакувати %s заголовок" - -#, c-format -msgid "header for %s too long, exceeds %d bytes" -msgstr "заголовок для %s занадто довгий, перевищує %d байт" - -#, c-format -msgid "loose object %s (stored in %s) is corrupt" -msgstr "вільний обʼєкт %s (що зберігається у %s) пошкоджено" - -#, c-format msgid "unable to open %s" msgstr "не вдалося відкрити %s" @@ -19195,8 +20043,8 @@ msgid "confused by unstable object source data for %s" msgstr "збентежений нестабільними початковими даними обʼєкта для %s" #, c-format -msgid "write stream object %ld != %<PRIuMAX>" -msgstr "запис обʼєкта потока %ld != %<PRIuMAX>" +msgid "write stream object %<PRIuMAX> != %<PRIuMAX>" +msgstr "об’єкт потоку запису %<PRIuMAX> != %<PRIuMAX>" #, c-format msgid "unable to stream deflate new object (%d)" @@ -19237,6 +20085,9 @@ msgstr "помилка считування замалого вмісту при msgid "%s: failed to insert into database" msgstr "%s: не вдалося внести до бази даних" +msgid "cannot add a submodule of a different hash algorithm" +msgstr "неможливо додати підмодуль з іншим алгоритмом хешування" + #, c-format msgid "%s: unsupported file type" msgstr "%s: непідтримуваний тип файлу" @@ -19426,10 +20277,6 @@ msgid "invalid object type \"%s\"" msgstr "неприпустимий тип обʼєкту \"%s\"" #, c-format -msgid "object %s is a %s, not a %s" -msgstr "обʼєкт %s є %s, а не %s" - -#, c-format msgid "object %s has unknown type id %d" msgstr "обʼєкт %s має невідомий тип ідентифікатора %d" @@ -19438,6 +20285,10 @@ msgid "unable to parse object: %s" msgstr "не вдалося розібрати обʼєкт: %s" #, c-format +msgid "unable to open object stream for %s" +msgstr "не вдалося відкрити потік об’єкта для %s" + +#, c-format msgid "hash mismatch %s" msgstr "невідповідність хешу %s" @@ -19455,15 +20306,6 @@ msgstr "" "%s: ігнорування місць збереження запозичених об’єктів, надто глибока " "вкладеність" -msgid "unable to fdopen alternates lockfile" -msgstr "не вдалося виконати fdopen для файла блокування запозичених обʼєктів" - -msgid "unable to read alternates file" -msgstr "не вдалося прочитати файл запозичених обʼєктів" - -msgid "unable to move new alternates file into place" -msgstr "не вдалося перемістити файл нових запозичених обʼєктів на місце" - #, c-format msgid "path '%s' does not exist" msgstr "шлях \"%s\" не існує" @@ -19505,9 +20347,45 @@ msgid "missing mapping of %s to %s" msgstr "відсутнє зіставлення %s до %s" #, c-format +msgid "%s is not a valid object" +msgstr "%s не є припустимим об’єктом" + +#, c-format msgid "%s is not a valid '%s' object" msgstr "%s не є допустимим \"%s\" обʼєктом" +msgid "unable to fdopen alternates lockfile" +msgstr "не вдалося виконати fdopen для файла блокування запозичених обʼєктів" + +msgid "unable to read alternates file" +msgstr "не вдалося прочитати файл запозичених обʼєктів" + +msgid "unable to move new alternates file into place" +msgstr "не вдалося перемістити файл нових запозичених обʼєктів на місце" + +#, c-format +msgid "unable to open loose object %s" +msgstr "не вдалося відкрити вільний обʼєкт %s" + +#, c-format +msgid "unable to parse %s header" +msgstr "не вдалося розібрати заголовок %s" + +msgid "invalid object type" +msgstr "неприпустимий тип обʼєкта" + +#, c-format +msgid "unable to unpack %s header" +msgstr "не вдалося розпакувати %s заголовок" + +#, c-format +msgid "header for %s too long, exceeds %d bytes" +msgstr "заголовок для %s занадто довгий, перевищує %d байт" + +#, c-format +msgid "loose object %s (stored in %s) is corrupt" +msgstr "вільний обʼєкт %s (що зберігається у %s) пошкоджено" + #, c-format msgid "duplicate entry when writing bitmap index: %s" msgstr "дубльований елемент під час запису bitmap індексу: \"%s\"" @@ -19725,9 +20603,6 @@ msgstr "" msgid "multi-pack-index reverse-index chunk is the wrong size" msgstr "multi-pack-index reverse-index шматок має невірний розмір" -msgid "could not determine preferred pack" -msgstr "не вдалося визначити бажаний пакунок" - msgid "cannot both write and verify reverse index" msgstr "неможливо одночасно записувати та звіряти зворотний індекс" @@ -19751,6 +20626,10 @@ msgid "packfile %s cannot be mapped%s" msgstr "файл пакунка %s не може бути mapped%s" #, c-format +msgid "could not load .mtimes for cruft pack '%s'" +msgstr "не вдалося завантажити .mtimes для марного пакунку \"%s\"" + +#, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "зміщення перед початком індекса пакунка для %s (пошкоджений індекс?)" @@ -19969,6 +20848,25 @@ msgstr "не вдалося знайти обʼєкт %s" msgid "failed to find tag %s" msgstr "не вдалося знайти тег %s" +#, c-format +msgid "tree:%lu filter not supported by the path-walk API" +msgstr "tree:%lu фільтр не підтримується API обходу шляху" + +msgid "sparse filter cannot be combined with existing sparse patterns" +msgstr "" +"розріджений фільтр не можна поєднувати з існуючими розрідженими шаблонами" + +#, c-format +msgid "unable to parse sparse filter data in '%s'" +msgstr "не вдалося розібрати дані розрідженого фільтра у файлі \"%s\"" + +msgid "sparse filter is not cone-mode compatible" +msgstr "розріджений фільтр не є сумісним із конусним режимом" + +#, c-format +msgid "object filter '%s' not supported by the path-walk API" +msgstr "обʼєктний фільтр \"%s\" не підтримується path-walk API" + msgid "failed to setup revision walk" msgstr "не вдалося налаштувати проходження по ревізіям" @@ -20101,6 +20999,10 @@ msgstr "не вдалося створити потоковий lstat: %s" msgid "unable to parse --pretty format" msgstr "не вдалося розібрати --pretty формат" +#, c-format +msgid "%s is not supported by this command" +msgstr "ця команда не підтримує %s" + msgid "lazy fetching disabled; some objects may not be available" msgstr "лінива вибірка вимкнена; деякі обʼєкти можуть бути недоступні" @@ -20126,22 +21028,44 @@ msgid "unsupported field '%s' in '%s' config" msgstr "непідтримуване поле \"%s\" у конфігурації \"%s\"" #, c-format -msgid "no or empty URL advertised for remote '%s'" -msgstr "відсутній або пустий обіцяний URL для віддаленого \"%s\"" - -#, c-format -msgid "known remote named '%s' but with URL '%s' instead of '%s'" +msgid "" +"known remote named '%s' but with URL '%s' instead of '%s', ignoring this " +"remote" msgstr "" -"відоме віддалене призначення з імʼям \"%s\", але з URL-адресою \"%s\" " -"замість \"%s\"" +"відоме віддалене призначення із назвою \"%s\", але з URL-адресою \"%s\" " +"замість \"%s\"; це віддалене призначення буде проігноровано" #, c-format msgid "invalid element '%s' from remote info" msgstr "невірний елемент \"%s\" з віддаленої інформації" #, c-format -msgid "server advertised a promisor remote without a name or URL: %s" -msgstr "сервер оголосив віддалений promisor без назви або URL-адреси: %s" +msgid "" +"server advertised a promisor remote without a name or URL: '%s', ignoring " +"this remote" +msgstr "" +"сервер повідомив про віддалений promisor без назви або URL-адреси: \"%s\"; " +"це віддалене призначеня буде проігноровано" + +#, c-format +msgid "" +"Storing new %s from server for remote '%s'.\n" +" '%s' -> '%s'\n" +msgstr "" +"Зберігання нового %s із сервера для віддаленого \"%s\".\n" +" \"%s\" -> \"%s\"\n" + +#, c-format +msgid "invalid filter '%s' for remote '%s' will not be stored: %s" +msgstr "" +"неприпустимий фільтр \"%s\" для віддаленого призначення \"%s\" не буде " +"збережено: %s" + +#, c-format +msgid "invalid token '%s' for remote '%s' will not be stored" +msgstr "" +"неприпустимий токен \"%s\" для віддаленого призначення \"%s\" не буде " +"збережено" #, c-format msgid "unknown '%s' value for '%s' config option" @@ -20151,6 +21075,10 @@ msgstr "невідоме значення \"%s\" для параметра ко msgid "accepted promisor remote '%s' not found" msgstr "прийнятий віддалений promisor \"%s\" не знайдено" +#, c-format +msgid "promisor remote '%s' advertised invalid filter '%s': %s" +msgstr "віддалений promisor \"%s\" оголосив неприпустимий фільтр \"%s\": %s" + msgid "object-info: expected flush after arguments" msgstr "object-info: очікувався flush після аргументів" @@ -20167,9 +21095,10 @@ msgstr "" "%s має бути невідʼємним значенням, використано значення за замовчуванням" #, c-format -msgid "%s must be between 0 and 1, using default" +msgid "%s must be between 0 (exclusive) and 1, using default" msgstr "" -"%s має бути в діапазоні від 0 до 1, використано значення за замовчуванням" +"Значення %s має бути в діапазоні від 0 (не включно) до 1; використовується " +"значення за замовчуванням" #, c-format msgid "%s must be positive, using default" @@ -20406,6 +21335,14 @@ msgid "%s: cannot drop to stage #0" msgstr "%s: неможливо скинути індекс до стану #0" #, c-format +msgid "" +"Skipping submodule due to ignore=all: %s\n" +"Use --force if you really want to add the submodule." +msgstr "" +"Пропуск підмодуля через параметр ignore=all: %s\n" +"Якщо ви дійсно хочете додати цей підмодуль, скористайтеся опцією --force." + +#, c-format msgid "unexpected diff status %c" msgstr "неочікуваний статус diff %c" @@ -20703,6 +21640,10 @@ msgstr "ця команда відхиляє частку %%(%.*s)" msgid "--format=%.*s cannot be used with --python, --shell, --tcl" msgstr "--format=%.*s не може бути використаний з --python, --shell, --tcl" +#, c-format +msgid "parse_object_buffer failed on %s for %s" +msgstr "parse_object_buffer завершився невдало на %s для %s" + msgid "failed to run 'describe'" msgstr "не вдалося запустити команду \"describe\"" @@ -20734,10 +21675,6 @@ msgid "missing object %s for %s" msgstr "відсутній обʼєкт %s для %s" #, c-format -msgid "parse_object_buffer failed on %s for %s" -msgstr "parse_object_buffer завершився невдало на %s для %s" - -#, c-format msgid "malformed object at '%s'" msgstr "невірно сформований обʼєкт за адресою \"%s\"" @@ -20778,6 +21715,10 @@ msgstr "не є журналом посилань: %s" msgid "no reflog for '%s'" msgstr "немає журналу посилань для \"%s\"" +#, c-format +msgid "in '%s' phase, update aborted by the reference-transaction hook" +msgstr "на стадії \"%s\", оновлення було перервано гачком транзакції-посилання" + msgid "Checking references consistency" msgstr "Перевірка співпадіння посилань" @@ -20880,6 +21821,14 @@ msgid "refusing to force and skip creation of reflog" msgstr "відмовлено в примусовому пропуску створення рефлогу" #, c-format +msgid "trying to write ref '%s' with nonexistent object %s" +msgstr "спроба записати посилання \"%s\" з неіснуючим обʼєктом %s" + +#, c-format +msgid "trying to write non-commit object %s to branch '%s'" +msgstr "спроба записати не коміт обʼєкт %s у гілку \"%s\"" + +#, c-format msgid "update_ref failed for ref '%s': %s" msgstr "update_ref завершився невдало для посилання \"%s\": %s" @@ -20890,9 +21839,6 @@ msgstr "багатократні оновлення для посилання \" msgid "ref updates forbidden inside quarantine environment" msgstr "оновлення посилань заборонено у карантинному середовищі" -msgid "ref updates aborted by hook" -msgstr "оновлення посилань перервано гачком" - #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "\"%s\" існує; неможливо створити \"%s\"" @@ -20971,14 +21917,6 @@ msgid "refname is dangerous: %s" msgstr "refname є небезпечним: %s" #, c-format -msgid "trying to write ref '%s' with nonexistent object %s" -msgstr "спроба записати посилання \"%s\" з неіснуючим обʼєктом %s" - -#, c-format -msgid "trying to write non-commit object %s to branch '%s'" -msgstr "спроба записати не коміт обʼєкт %s у гілку \"%s\"" - -#, c-format msgid "" "multiple updates for 'HEAD' (including one via its referent '%s') are not " "allowed" @@ -21044,6 +21982,18 @@ msgstr "" "назва посилання %s є символьним посиланням, копіювання якого не підтримується" #, c-format +msgid "reftable stack for worktree '%s' is broken" +msgstr "пошкоджено стек таблиці посилань для робочого дерева \"%s\"" + +#, c-format +msgid "could not create iterator for worktree '%s'" +msgstr "не вдалося створити ітератор для робочого дерева \"%s\"" + +#, c-format +msgid "could not read record for worktree '%s'" +msgstr "не вдалося прочитати запис для робочого дерева \"%s\"" + +#, c-format msgid "pattern '%s' has no '*'" msgstr "шаблон \"%s\" не має \"*\"" @@ -21085,6 +22035,14 @@ msgstr "" "не вдалося отримати доступ до \"%s\" з конфігурацією http.pinnedPubkey: %s" #, c-format +msgid "rate limited by '%s', please try again in %ld seconds" +msgstr "швидкість обмежена значенням \"%s\", спробуйте ще раз через %ld секунд" + +#, c-format +msgid "rate limited by '%s', please try again later" +msgstr "швидкість обмежена значенням \"%s\", спробуйте ще раз пізніше" + +#, c-format msgid "unable to access '%s': %s" msgstr "не вдалося отримати доступ до \"%s\": %s" @@ -21372,12 +22330,12 @@ msgid "* Ignoring funny ref '%s' locally" msgstr "* Ігнорування кумедних посилань \"%s\" локально" #, c-format -msgid "Your branch is based on '%s', but the upstream is gone.\n" -msgstr "Ваша гілка базується на \"%s\", але першоджерельне сховище зникло.\n" - -msgid " (use \"git branch --unset-upstream\" to fixup)\n" +msgid "" +"ignoring value '%s' for status.compareBranches, only @{upstream} and @{push} " +"are supported" msgstr "" -" (використовуйте команду \"git branch --unset-upstream\", щоб виправити)\n" +"значення \"%s\" для параметра status.compareBranches було проігноровано; " +"підтримуються лише @{upstream} та @{push}" #, c-format msgid "Your branch is up to date with '%s'.\n" @@ -21440,6 +22398,14 @@ msgstr "" "своєю)\n" #, c-format +msgid "Your branch is based on '%s', but the upstream is gone.\n" +msgstr "Ваша гілка базується на \"%s\", але першоджерельне сховище зникло.\n" + +msgid " (use \"git branch --unset-upstream\" to fixup)\n" +msgstr "" +" (використовуйте команду \"git branch --unset-upstream\", щоб виправити)\n" + +#, c-format msgid "cannot parse expected object name '%s'" msgstr "неможливо розібрати очікувану назву обʼєкту \"%s\"" @@ -21470,6 +22436,36 @@ msgstr "не вдалося закрити тимчасовий файл зні msgid "could not remove stale bitmap: %s" msgstr "не вдалося видалити застарілий bitmap: %s" +msgid "no packs to write MIDX during compaction" +msgstr "немає пакунків для запису MIDX під час ущільнення" + +#, c-format +msgid "expected exactly one line during MIDX write, got: %<PRIuMAX>" +msgstr "" +"під час запису MIDX було очікувано рівно один рядок, отримано: %<PRIuMAX>" + +#, c-format +msgid "unexpected MIDX output: '%s'" +msgstr "неочікуваний результат MIDX: '%s'" + +#, c-format +msgid "could not load pack %<PRIu32> from MIDX" +msgstr "не вдалося завантажити пакунок %<PRIu32> з MIDX" + +msgid "too many objects in MIDX compaction step" +msgstr "занадто багато об’єктів на етапі ущільнення MIDX" + +#, c-format +msgid "could not find preferred pack for MIDX %s" +msgstr "не вдалося знайти бажаний пакунок для MIDX %s" + +msgid "unable to generate compaction plan" +msgstr "не вдалося сформувати план ущільнення" + +#, c-format +msgid "unable to execute compaction step %<PRIuMAX>" +msgstr "не вдалося виконати етап ущільнення %<PRIuMAX>" + msgid "could not start pack-objects to repack promisor objects" msgstr "не вдалося розпочати pack-objects для перепакування promisor обʼєктів" @@ -21484,6 +22480,9 @@ msgstr "" msgid "could not finish pack-objects to repack promisor objects" msgstr "не вдалося завершити pack-objects для перепакування promisor обʼєктів" +msgid "could not start pack-objects to repack promisor packs" +msgstr "не вдалося запустити pack-objects для перепакування пакунків promisor" + #, c-format msgid "pack prefix %s does not begin with objdir %s" msgstr "префікс пакунку %s не починається з objdir %s" @@ -21512,6 +22511,42 @@ msgstr "дубльована заміна посилання: %s" msgid "replace depth too high for object %s" msgstr "глибина заміни занадто висока для обʼєкта %s" +#, c-format +msgid "'%s' is not a valid commit-ish for %s" +msgstr "\"%s\" не є допустимим комітоподібним для %s" + +#, c-format +msgid "argument to %s must be a reference" +msgstr "аргумент для %s повинен бути посиланням" + +#, c-format +msgid "" +"'%s' cannot be used with multiple revision ranges because the ordering would " +"be ill-defined" +msgstr "" +"\"%s\" неможливо використовувати з кількома діапазонами версій, оскільки " +"порядок їхнього сортування буде невизначеним" + +msgid "need some commits to replay" +msgstr "потрібні деякі коміти для відтворення" + +msgid "all positive revisions given must be references" +msgstr "всі надані позитивні ревізії мають бути посиланнями" + +#, c-format +msgid "commit %s became empty after replay" +msgstr "коміт %s став порожнім після відтворення" + +msgid "'--ref' cannot be used with multiple revision ranges" +msgstr "\"--ref\" неможливо використовувати з кількома діапазонами ревізій" + +#, c-format +msgid "'%s' is not a valid refname" +msgstr "\"%s\" не є припустимою назвою посилання" + +msgid "compatibility hash algorithm support requires Rust" +msgstr "підтримка алгоритму хешування сумісності вимагає використання Rust" + msgid "corrupt MERGE_RR" msgstr "пошкоджений MERGE_RR" @@ -21628,8 +22663,8 @@ msgstr "ваша поточна гілка \"%s\" ще не має жодних msgid "object filtering requires --objects" msgstr "для фільтрації обʼєктів потрібен параметр --objects" -msgid "-L does not yet support diff formats besides -p and -s" -msgstr "-L поки що не підтримує diff формати, окрім -p та -s" +msgid "-L does not yet support the requested diff format" +msgstr "-L поки що не підтримує запрошений формат порівняння" #, c-format msgid "cannot create async thread: %s" @@ -21809,7 +22844,7 @@ msgid "" "to unregister this repository from Scalar, run\n" "\tgit config --global --unset --fixed-value scalar.repo \"%s\"" msgstr "" -"щоб скасувати реєстрацію цього репозиторію в Scalar, виконайте\n" +"щоб скасувати реєстрацію цього сховища в Scalar, виконайте\n" "\tgit config --global --unset --fixed-value scalar.repo \"%s\"" msgid "" @@ -22256,10 +23291,6 @@ msgid "'%s' is not a valid label" msgstr "\"%s\" не є припустимою міткою" #, c-format -msgid "'%s' is not a valid refname" -msgstr "\"%s\" не є припустимою назвою посилання" - -#, c-format msgid "update-ref requires a fully qualified refname e.g. refs/heads/%s" msgstr "update-ref потребує повної назви посилання, наприклад, refs/heads/%s" @@ -22348,6 +23379,15 @@ msgstr "неможливо зробити висмикування під час msgid "cannot revert during a cherry-pick." msgstr "неможливо зробити вивертання під час висмикування." +msgid "trailers file contains empty line" +msgstr "файл причеп містить порожній рядок" + +msgid "trailers file is empty" +msgstr "файл причеп порожній" + +msgid "cannot read trailers files" +msgstr "неможливо прочитати файли причепів" + msgid "unusable squash-onto" msgstr "непридатний squash-onto" @@ -22492,10 +23532,6 @@ msgstr "" msgid "illegal label name: '%.*s'" msgstr "неприпустима назва мітки: \"%.*s\"" -#, c-format -msgid "could not resolve '%s'" -msgstr "не вдалося розпізнати \"%s\"" - msgid "writing fake root commit" msgstr "написання підробленого кореневого коміту" @@ -22576,20 +23612,28 @@ msgstr "неможливо зберегти %s" #, c-format msgid "" -"%s\n" +"Your local changes are stashed, however applying them\n" +"resulted in conflicts. You can either resolve the conflicts\n" +"and then discard the stash with \"git stash drop\", or, if you\n" +"do not want to resolve them now, run \"git reset --hard\" and\n" +"apply the local changes later by running \"git stash pop\".\n" +msgstr "" +"Ваші локальні зміни збережено у схову, однак їх застосування\n" +"призвело до конфліктів. Ви можете або вирішити конфлікти,\n" +"а потім видалити схов за допомогою команди \"git stash drop\", або, якщо\n" +"ви не хочете вирішувати їх зараз, виконати команду \"git reset --hard\" і\n" +"застосувати локальні зміни пізніше за допомогою команди \"git stash pop\".\n" + +#, c-format +msgid "" +"Autostash exists; creating a new stash entry.\n" "Your changes are safe in the stash.\n" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" -"%s\n" -"Ваші зміни в безпеці у схову.\n" -"Ви можете запустити \"git stash pop\" або \"git stash drop\" у будь-який " -"час.\n" - -msgid "Applying autostash resulted in conflicts." -msgstr "Застосування автосхову призвело до конфліктів." - -msgid "Autostash exists; creating a new stash entry." -msgstr "Автосхов існує; створення нового запису схову." +"Існує автосхов; створення нового запису у сховищі.\n" +"Ваші зміни надійно збережені у сховищі.\n" +"Ви можете у будь-який момент виконати команди \"git stash pop\" або \"git " +"stash drop\".\n" msgid "autostash reference is a symref" msgstr "посилання автосхову є символьним посиланням" @@ -22842,6 +23886,14 @@ msgstr "" "\n" "\tgit config --global --add safe.directory %s" +#, c-format +msgid "error reading '%s'" +msgstr "помилка при читанні \"%s\"" + +#, c-format +msgid "not a regular file: '%s'" +msgstr "це не звичайний файл: \"%s\"" + msgid "Unable to read current working directory" msgstr "Не вдалося прочитати поточну робочу директорію" @@ -22870,6 +23922,10 @@ msgstr "" "встановлено в \"%s\")" #, c-format +msgid "unknown ref storage format: '%s'" +msgstr "невідомий формат зберігання посилань \"%s\"" + +#, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" "The owner of files must always have read and write permissions." @@ -22880,9 +23936,6 @@ msgstr "" msgid "fork failed" msgstr "fork завершився невдало" -msgid "setsid failed" -msgstr "setsid завершився невдало" - #, c-format msgid "cannot stat template '%s'" msgstr "неможливо виконати stat шаблона \"%s\"" @@ -22932,7 +23985,7 @@ msgid "unable to move %s to %s" msgstr "не вдалося перемістити %s на %s" msgid "attempt to reinitialize repository with different hash" -msgstr "спроба переініціалізувати репозиторій з іншим хеш-алгоритмом" +msgstr "спроба переініціалізувати сховище з іншим хеш-алгоритмом" msgid "" "attempt to reinitialize repository with different reference storage format" @@ -22959,6 +24012,10 @@ msgid "Initialized empty Git repository in %s%s\n" msgstr "Ініціалізовано порожнє Git сховище в %s%s\n" #, c-format +msgid "unrecognized value for '%s': '%s'" +msgstr "нерозпізнане значення для \"%s\": \"%s\"" + +#, c-format msgid "index entry is a directory, but not sparse (%08x)" msgstr "запис індексу є директорією, але не розрідженою (%08x)" @@ -22980,51 +24037,70 @@ msgstr "невірний формат %s: елемент \"%s\" не закін msgid "bad %s format: %%%.*s" msgstr "невірний формат %s: %%%.*s" -#. TRANSLATORS: IEC 80000-13:2008 gibibyte #, c-format -msgid "%u.%2.2u GiB" -msgstr "%u.%2.2u ГіБ" +msgid "%u.%2.2u" +msgstr "%u.%2.2u" -#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#, c-format -msgid "%u.%2.2u GiB/s" -msgstr "%u.%2.2u ГіБ/с" +#. TRANSLATORS: SI decimal prefix symbol for 10^9 +msgid "G" +msgstr "Г" -#. TRANSLATORS: IEC 80000-13:2008 mebibyte -#, c-format -msgid "%u.%2.2u MiB" -msgstr "%u.%2.2u МіБ" +#. TRANSLATORS: SI decimal prefix symbol for 10^6 +msgid "M" +msgstr "M" -#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#, c-format -msgid "%u.%2.2u MiB/s" -msgstr "%u.%2.2u МіБ/с" +#. TRANSLATORS: SI decimal prefix symbol for 10^3 +msgid "k" +msgstr "к" -#. TRANSLATORS: IEC 80000-13:2008 kibibyte -#, c-format -msgid "%u.%2.2u KiB" -msgstr "%u.%2.2u КіБ" +#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second and gibibyte +msgid "GiB/s" +msgstr "ГіБ/с" -#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#, c-format -msgid "%u.%2.2u KiB/s" -msgstr "%u.%2.2u КіБ/с" +msgid "GiB" +msgstr "ГіБ" -#. TRANSLATORS: IEC 80000-13:2008 byte -#, c-format -msgid "%u byte" -msgid_plural "%u bytes" -msgstr[0] "%u байт" -msgstr[1] "%u байти" -msgstr[2] "%u байтів" +#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second and mebibyte +msgid "MiB/s" +msgstr "МіБ/с" + +msgid "MiB" +msgstr "МіБ" + +#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second and kibibyte +msgid "KiB/s" +msgstr "КіБ/с" + +msgid "KiB" +msgstr "КіБ" + +#. TRANSLATORS: IEC 80000-13:2008 byte/second and byte +msgid "B/s" +msgstr "Б/c" + +msgid "B" +msgstr "Б" #. TRANSLATORS: IEC 80000-13:2008 byte/second +msgid "byte/s" +msgid_plural "bytes/s" +msgstr[0] "байт/с" +msgstr[1] "байти/c" +msgstr[2] "байтів/c" + +#. TRANSLATORS: IEC 80000-13:2008 byte +msgid "byte" +msgid_plural "bytes" +msgstr[0] "байт" +msgstr[1] "байти" +msgstr[2] "байтів" + +#. TRANSLATORS: The first argument is the number string. The second +#. argument is the unit string (i.e. "12.34 MiB/s"). +#. #, c-format -msgid "%u byte/s" -msgid_plural "%u bytes/s" -msgstr[0] "%u байт/s" -msgstr[1] "%u байти/s" -msgstr[2] "%u байтів/s" +msgid "%s %s" +msgstr "%s %s" #, c-format msgid "ignoring suspicious submodule name: %s" @@ -23192,10 +24268,6 @@ msgid "could not lookup name for submodule '%s'" msgstr "не вдалося знайти назву для підмодуля \"%s\"" #, c-format -msgid "refusing to move '%s' into an existing git dir" -msgstr "відмовлено в переміщенні \"%s\" до існуючої git директорії" - -#, c-format msgid "" "Migrating git directory of '%s%s' from\n" "'%s' to\n" @@ -23213,6 +24285,30 @@ msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree повернув неочікуваний код повернення %d" #, c-format +msgid "" +"the 'submodule.%s.gitdir' config does not exist for module '%s'. Please " +"ensure it is set, for example by running something like: 'git config " +"submodule.%s.gitdir .git/modules/%s'. For details see the " +"extensions.submodulePathConfig documentation." +msgstr "" +"параметр конфігурації \"submodule.%s.gitdir\" для модуля \"%s\" відсутній. " +"Переконайтеся, що він заданий, наприклад, виконавши таку команду: \"git " +"config submodule.%s.gitdir .git/modules/%s\". Детальнішу інформацію дивiться " +"в документації до extensions.submodulePathConfig." + +msgid "" +"enabling extensions.submodulePathConfig might fix the following error, if " +"it's not already enabled." +msgstr "" +"увімкнення параметра extensions.submodulePathConfig може вирішити проблему з " +"наступною помилкою, якщо він ще не увімкнений." + +#, c-format +msgid "refusing to create/use '%s' in another submodule's git dir." +msgstr "" +"відмовлено в створенні/використанні \"%s\" у git діректорії іншого підмодуля." + +#, c-format msgid "failed to lstat '%s'" msgstr "не вдалося виконати lstat для \"%s\"" @@ -23238,7 +24334,7 @@ msgid "the number of objects to write" msgstr "кількість об’єктів для запису" msgid "test-tool path-walk <options> -- <revision-options>" -msgstr "test-tool path-walk <опції> -- <опції-ревізії>." +msgstr "test-tool path-walk <опції> -- <опції-ревізії>" msgid "toggle inclusion of blob objects" msgstr "перемикач включення обʼєктів blob" @@ -23261,6 +24357,9 @@ msgstr "перемикач агресивного ходіння по краю" msgid "read a pattern list over stdin" msgstr "читати список шаблонів через stdin" +msgid "toggle pruning of trees by sparse patterns" +msgstr "перемкнути обрізання дерев за розрідженими шаблонами" + #, c-format msgid "commit %s is not marked reachable" msgstr "коміт %s не позначений як досяжний" @@ -23268,6 +24367,10 @@ msgstr "коміт %s не позначений як досяжний" msgid "too many commits marked reachable" msgstr "забагато комітів позначено як досяжні" +#, c-format +msgid "could not find MIDX with checksum %s" +msgstr "не вдалося знайти MIDX із контрольною сумою %s" + msgid "could not determine MIDX preferred pack" msgstr "не вдалося визначити бажаний пакунок MIDX" @@ -23324,9 +24427,6 @@ msgstr "кількість байтів" msgid "number of requests per thread" msgstr "кількість запитів на потік" -msgid "byte" -msgstr "байт" - msgid "ballast character" msgstr "баластний символ" @@ -23336,6 +24436,13 @@ msgstr "токен" msgid "command token to send to the server" msgstr "токен команди для відправки на сервер" +msgid "write a pack with a single reachable large blob" +msgstr "створити пакунок з одним доступним великим blob" + +#, c-format +msgid "'%s' is not a valid blob size" +msgstr "\"%s\" не є допустимим розміром blob-обʼєкта" + msgid "unit-test [<options>]" msgstr "unit-test [<опції>]" @@ -23366,6 +24473,28 @@ msgstr "невідоме значення \"%s\" для ключа \"%s\"" msgid "empty trailer token in trailer '%.*s'" msgstr "порожній токен трейлера в трейлері \"%.*s\"" +msgid "empty --trailer argument" +msgstr "порожній аргумент --trailer" + +#, c-format +msgid "invalid trailer '%s': missing key before separator" +msgstr "неприпустимий трейлер \"%s\": відсутній ключ перед розділюмачем" + +#, c-format +msgid "could not stat %s" +msgstr "не вдалося виконати stat для %s" + +#, c-format +msgid "file %s is not a regular file" +msgstr "файл %s не є звичайним файлом" + +#, c-format +msgid "file %s is not writable by user" +msgstr "файл %s не доступний для запису користувачем" + +msgid "could not write to temporary file" +msgstr "не вдалося записати дані у тимчасовий файл" + msgid "full write to remote helper failed" msgstr "не вдалося виконати повний запис до віддаленого помічника" @@ -23422,6 +24551,10 @@ msgstr "неможливо підключитися до підсервісу %s msgid "--negotiate-only requires protocol v2" msgstr "--negotiate-only потребує протоколу v2" +#, c-format +msgid "ignoring %s because the protocol does not support it." +msgstr "ігнорування %s, оскільки протокол його не підтримує." + msgid "'option' without a matching 'ok/error' directive" msgstr "\"option\" без відповідної директиви \"ok/error\"" @@ -24727,8 +25860,15 @@ msgid "" msgstr "" "Наступні файли є 8-бітними, але не містять Content-Transfer-Encoding.\n" -msgid "Which 8bit encoding should I declare [UTF-8]? " -msgstr "Яке 8-бітне кодування слід оголосити [UTF-8]? " +msgid "Declare which 8bit encoding to use [default: UTF-8]? " +msgstr "" +"Вкажіть, яке 8-бітне кодування використовувати [за замовчуванням: UTF-8]? " + +#, perl-format +msgid "'%s' does not appear to be a valid charset name. Use it anyway [y/N]? " +msgstr "" +"\"%s\", схоже, не є припустимим набором символів. Все одно використовувати " +"[y/N]? " #, perl-format msgid "" @@ -24768,6 +25908,10 @@ msgstr "Що робити з цією адресою? ([q]uit|[d]rop|[e]dit): " msgid "CA path \"%s\" does not exist" msgstr "Шлях до ЦВС \"%s\" не існує" +#, perl-format +msgid "Only client key \"%s\" specified" +msgstr "Вказано лише ключ клієнта \"%s\"" + msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -24903,7 +26047,7 @@ msgid "" "%s\n" "warning: no patches were sent\n" msgstr "" -"збій: %s: відхилено %s хуком\n" +"збій: %s: відхилено %s гачком\n" "%s\n" "попередження: не було надіслано жодних латок\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 3eaa07c99c..9baf2bf7a6 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -28,6 +28,7 @@ # amend | 修订 # ancestor | 祖先，祖先提交 # annotated tag | 附注标签 +# backfill | 回填 # bare repository | 纯仓库 # bisect | 二分查找 # bitmap | 位图 @@ -49,6 +50,7 @@ # commit object | 提交对象 # commit-graph | 提交图 # commit-ish (also committish) | 提交号 +# compact | 压实 # cone | 锥形模式（稀疏检出）；锥（稀疏检出） # conflict | 冲突 # core Git | 核心 Git 工具 @@ -174,7 +176,7 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2026-04-10 10:05+0800\n" +"POT-Creation-Date: 2026-06-19 14:43+0800\n" "PO-Revision-Date: 2025-11-16 01:03+0800\n" "Last-Translator: Teng Long <dyroneteng@gmail.com>\n" "Language-Team: GitHub <https://github.com/dyrone/git/>\n" @@ -185,55 +187,6 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Gtranslator 42.0\n" -#: builtin/fast-import.c -msgid "aborting due to invalid signature" -msgstr "由于签名无效而中止" - -#: builtin/fast-import.c -msgid "failed to sign tag object" -msgstr "无法为标签对象签名" - -#: builtin/history.c -msgid "control which refs should be updated" -msgstr "控制应更新哪些引用" - -#: builtin/history.c -msgid "control ref update behavior" -msgstr "控制引用更新行为" - -#: builtin/replay.c -msgid "" -"(EXPERIMENTAL!) git replay ([--contained] --onto=<newbase> | --" -"advance=<branch> | --revert=<branch>)\n" -"[--ref=<ref>] [--ref-action=<mode>] <revision-range>" -msgstr "" -"（实验性！）git replay ([--contained] --onto=<新基线> | --advance=<分支> | --" -"revert=<分支>)\n" -"[--ref=<引用>] [--ref-action=<模式>] <版本范围>" - -#: builtin/replay.c -msgid "reference to update with result" -msgstr "要更新结果的引用" - -#: builtin/stash.c -msgid "" -"git stash [push] [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q " -"| --quiet]\n" -" [-u | --include-untracked] [-a | --all] [(-m | --message) " -"<message>]\n" -" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" -" [--] [<pathspec>...]" -msgstr "" -"git stash [push] [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q " -"| --quiet]\n" -" [-u | --include-untracked] [-a | --all] [(-m | --message) <消息>]\n" -" [--pathspec-from-file=<文件> [--pathspec-file-nul]]\n" -" [--] [<路径规格>...]" - -#: replay.c -msgid "'--ref' cannot be used with multiple revision ranges" -msgstr "'--ref' 不能与多个版本范围一起使用" - #: add-interactive.c #, c-format msgid "Huh (%s)?" @@ -815,7 +768,7 @@ msgid "" "aborted and the hunk is left unchanged.\n" msgstr "" "如果无法干净地应用，您将有机会重新编辑。如果该块的全部内容删除，则\n" -"此次编辑被终止，该块不会被修改。\n" +"此次编辑被中止，该块不会被修改。\n" #: add-patch.c msgid "could not parse hunk header" @@ -1087,7 +1040,7 @@ msgstr "" #: advice.c msgid "Not possible to fast-forward, aborting." -msgstr "无法快进，终止。" +msgstr "无法快进，中止。" #: advice.c #, c-format @@ -1176,9 +1129,9 @@ msgstr "命令行以 \\ 结尾" msgid "unclosed quote" msgstr "未关闭的引号" -#: alias.c builtin/cat-file.c builtin/notes.c builtin/prune-packed.c -#: builtin/receive-pack.c builtin/refs.c builtin/repo.c builtin/tag.c -#: t/helper/test-pkt-line.c +#: alias.c builtin/cat-file.c builtin/name-rev.c builtin/notes.c +#: builtin/prune-packed.c builtin/receive-pack.c builtin/refs.c builtin/repo.c +#: builtin/tag.c t/helper/test-pkt-line.c msgid "too many arguments" msgstr "太多参数" @@ -2190,32 +2143,32 @@ msgstr "" #: bisect.c #, c-format msgid "" -"The merge base %s is %s.\n" +"The merge base %s is '%s'.\n" "This means the first '%s' commit is between %s and [%s].\n" msgstr "" -"合并基线 %s 是 %s。\n" +"合并基线 %s 是 '%s'。\n" "这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n" #: bisect.c #, c-format msgid "" -"Some %s revs are not ancestors of the %s rev.\n" +"Some '%s' revs are not ancestors of the '%s' rev.\n" "git bisect cannot work properly in this case.\n" -"Maybe you mistook %s and %s revs?\n" +"Maybe you mistook '%s' and '%s' revs?\n" msgstr "" -"一些 %s 版本不是 %s 版本的祖先。\n" -"这种情况下 git 二分查找无法正常工作。\n" -"您可能弄错了 %s 和 %s 版本？\n" +"一些 '%s' 版本不是 '%s' 版本的祖先。\n" +"这种情况下 git bisect 无法正常工作。\n" +"也许您弄错了 '%s' 和 '%s' 版本？\n" #: bisect.c #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" -"So we cannot be sure the first %s commit is between %s and %s.\n" +"So we cannot be sure the first '%s' commit is between %s and %s.\n" "We continue anyway." msgstr "" "介于 %s 和 [%s] 的合并基线必须被跳过。\n" -"所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n" +"所以我们无法确认第一个 '%s' 提交是否介于 %s 和 %s 之间。\n" "我们仍然继续。" #: bisect.c @@ -2225,8 +2178,8 @@ msgstr "二分查找中：合并基线必须经过测试\n" #: bisect.c #, c-format -msgid "a %s revision is needed" -msgstr "需要一个 %s 版本" +msgid "a '%s' revision is needed" +msgstr "需要一个 '%s' 版本" #: bisect.c #, c-format @@ -2249,8 +2202,8 @@ msgstr "读取二分查找引用失败" #: bisect.c #, c-format -msgid "%s was both %s and %s\n" -msgstr "%s 同时为 %s 和 %s\n" +msgid "%s was both '%s' and '%s'\n" +msgstr "%s 同时为 '%s' 和 '%s'\n" #: bisect.c #, c-format @@ -3022,8 +2975,8 @@ msgstr "n" #: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c #: builtin/clone.c builtin/diagnose.c builtin/for-each-ref.c builtin/init-db.c -#: builtin/ls-files.c builtin/ls-tree.c builtin/refs.c builtin/replace.c -#: builtin/repo.c builtin/submodule--helper.c builtin/tag.c +#: builtin/ls-files.c builtin/ls-tree.c builtin/name-rev.c builtin/refs.c +#: builtin/replace.c builtin/repo.c builtin/submodule--helper.c builtin/tag.c #: builtin/verify-tag.c msgid "format" msgstr "格式" @@ -3050,11 +3003,11 @@ msgstr "跳过当前补丁" #: builtin/am.c msgid "restore the original branch and abort the patching operation" -msgstr "恢复原始分支并终止打补丁操作" +msgstr "恢复原始分支并中止打补丁操作" #: builtin/am.c msgid "abort the patching operation but keep HEAD where it is" -msgstr "终止补丁操作但保持 HEAD 不变" +msgstr "中止补丁操作但保持 HEAD 不变" #: builtin/am.c msgid "show the patch being applied" @@ -3153,8 +3106,25 @@ msgid "git archive: expected a flush" msgstr "git archive：应有一个 flush 包" #: builtin/backfill.c -msgid "git backfill [--min-batch-size=<n>] [--[no-]sparse]" -msgstr "git backfill [--min-batch-size=<n>] [--[no-]sparse]" +msgid "" +"git backfill [--min-batch-size=<n>] [--[no-]sparse] [--[no-]include-edges] " +"[<revision-range>]" +msgstr "" +"git backfill [--min-batch-size=<n>] [--[no-]sparse] [--[no-]include-edges] [<" +"版本范围>]" + +#: builtin/backfill.c +#, c-format +msgid "'%s' cannot be used with 'git backfill'" +msgstr "'%s' 不能和 'git backfill' 同时使用" + +#: builtin/backfill.c +msgid "cannot backfill with these filter options" +msgstr "无法使用这些过滤选项进行回填" + +#: builtin/backfill.c +msgid "cannot backfill with blob size limits" +msgstr "无法在有数据对象大小限制的情况下进行回填" #: builtin/backfill.c msgid "problem loading sparse-checkout" @@ -3168,6 +3138,10 @@ msgstr "单次请求的最少对象数量" msgid "Restrict the missing objects to the current sparse-checkout" msgstr "将缺少的对象限制在当前的稀疏检出中" +#: builtin/backfill.c +msgid "Include blobs from boundary commits in the backfill" +msgstr "在回填中包含边界提交中的数据对象" + #: builtin/backfill.c builtin/diff-pairs.c builtin/log.c builtin/replay.c #: builtin/shortlog.c bundle.c #, c-format @@ -3312,19 +3286,21 @@ msgid "Are you sure [Y/n]? " msgstr "您确认吗 [Y/n]？ " #: builtin/bisect.c -msgid "status: waiting for both good and bad commits\n" -msgstr "状态：正在等待好的和坏的提交\n" +#, c-format +msgid "status: waiting for both '%s' and '%s' commits\n" +msgstr "状态：正在等待 '%s' 和 '%s' 提交\n" #: builtin/bisect.c #, c-format -msgid "status: waiting for bad commit, %d good commit known\n" -msgid_plural "status: waiting for bad commit, %d good commits known\n" -msgstr[0] "状态：正在等待坏的提交，已知 %d 个好的提交\n" -msgstr[1] "状态：正在等待坏的提交，已知 %d 个好的提交\n" +msgid "status: waiting for '%s' commit, %d '%s' commit known\n" +msgid_plural "status: waiting for '%s' commit, %d '%s' commits known\n" +msgstr[0] "状态：正在等待 '%s' 提交，已知 %d 个 '%s' 提交\n" +msgstr[1] "状态：正在等待 '%s' 提交，已知 %d 个 '%s' 提交\n" #: builtin/bisect.c -msgid "status: waiting for good commit(s), bad commit known\n" -msgstr "状态：正在等待好的提交，已知坏的提交\n" +#, c-format +msgid "status: waiting for '%s' commit(s), '%s' commit known\n" +msgstr "状态：正在等待 '%s' 提交，已知 '%s' 提交\n" #: builtin/bisect.c msgid "no terms defined" @@ -3333,9 +3309,9 @@ msgstr "未定义术语" #: builtin/bisect.c #, c-format msgid "" -"Your current terms are %s for the old state\n" -"and %s for the new state.\n" -msgstr "您当前针对旧状态的术语是 %s，对新状态的术语是 %s。\n" +"Your current terms are '%s' for the old state\n" +"and '%s' for the new state.\n" +msgstr "您当前的术语：旧状态为 '%s'，新状态为 '%s'。\n" #: builtin/bisect.c #, c-format @@ -3439,13 +3415,13 @@ msgstr "二分查找运行失败：没有提供命令。" #: builtin/bisect.c #, c-format -msgid "unable to verify %s on good revision" -msgstr "无法在好版本中验证 %s" +msgid "unable to verify %s on '%s' revision" +msgstr "无法在 '%2$s' 版本上验证 %1$s" #: builtin/bisect.c #, c-format -msgid "bogus exit code %d for good revision" -msgstr "好版本返回错误的退出码 %d" +msgid "bogus exit code %d for '%s' revision" +msgstr "'%2$s' 版本返回错误的退出码 %1$d" #: builtin/bisect.c #, c-format @@ -3466,8 +3442,9 @@ msgid "bisect run success" msgstr "二分查找运行成功" #: builtin/bisect.c -msgid "bisect found first bad commit" -msgstr "二分查找找到了第一个坏的提交" +#, c-format +msgid "bisect found first '%s' commit\n" +msgstr "二分查找找到了第一个 '%s' 提交\n" #: builtin/bisect.c #, c-format @@ -4187,7 +4164,8 @@ msgstr "" "您可以删除任何您不想共享的内容。\n" #: builtin/bugreport.c builtin/commit.c builtin/fast-export.c -#: builtin/pack-objects.c builtin/rebase.c builtin/replay.c parse-options.h +#: builtin/pack-objects.c builtin/rebase.c builtin/repack.c builtin/replay.c +#: parse-options.h msgid "mode" msgstr "模式" @@ -4312,6 +4290,11 @@ msgid "cannot read object %s '%s'" msgstr "无法读取对象 %s '%s'" #: builtin/cat-file.c +#, c-format +msgid "mailmap: invalid boolean '%s'" +msgstr "mailmap：无效的布尔值 '%s'" + +#: builtin/cat-file.c msgid "flush is only for --buffer mode" msgstr "flush 只在 --buffer 模式中使用" @@ -4759,15 +4742,6 @@ msgstr "您需要先解决当前索引的冲突" #: builtin/checkout.c #, c-format -msgid "" -"cannot continue with staged changes in the following files:\n" -"%s" -msgstr "" -"无法继续，下列文件有暂存的修改：\n" -"%s" - -#: builtin/checkout.c -#, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "无法对 '%s' 执行 reflog 操作：%s\n" @@ -4872,6 +4846,11 @@ msgstr "您位于一个尚未初始化的分支" #: builtin/checkout.c #, c-format +msgid "The following paths have local changes:\n" +msgstr "以下路径有本地修改：\n" + +#: builtin/checkout.c +#, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" "Please use -- (and optionally --no-guess) to disambiguate" @@ -6197,7 +6176,7 @@ msgid "" "with '%s' will be ignored, and an empty message aborts the commit.\n" msgstr "" "请为您的变更输入提交说明。以 '%s' 开始的行将被忽略，而一个空的提交\n" -"说明将会终止提交。\n" +"说明将会中止提交。\n" #: builtin/commit.c #, c-format @@ -6216,7 +6195,7 @@ msgid "" "An empty message aborts the commit.\n" msgstr "" "请为您的变更输入提交说明。以 '%s' 开始的行将被保留，如果您愿意\n" -"也可以删除它们。一个空的提交说明将会终止提交。\n" +"也可以删除它们。一个空的提交说明将会中止提交。\n" #: builtin/commit.c msgid "" @@ -6570,17 +6549,17 @@ msgstr "无法读取提交说明：%s" #: builtin/commit.c builtin/history.c #, c-format msgid "Aborting commit due to empty commit message.\n" -msgstr "由于提交说明为空，终止提交。\n" +msgstr "由于提交说明为空，中止提交。\n" #: builtin/commit.c #, c-format msgid "Aborting commit; you did not edit the message.\n" -msgstr "终止提交；您未更改来自模板的提交说明。\n" +msgstr "中止提交；您未更改来自模板的提交说明。\n" #: builtin/commit.c #, c-format msgid "Aborting commit due to empty commit message body.\n" -msgstr "因提交说明的正文为空而终止提交。\n" +msgstr "因提交说明的正文为空而中止提交。\n" #: builtin/commit.c msgid "" @@ -6765,6 +6744,21 @@ msgstr "错误的参数个数，应为 %d 到 %d 个" #: builtin/config.c #, c-format +msgid "missing value to set to the variable '%s'" +msgstr "缺少要设置给变量 '%s' 的值" + +#: builtin/config.c +#, c-format +msgid "did you mean \"git config set %s %s\"?" +msgstr "您的意思是 \"git config set %s %s\" 吗？" + +#: builtin/config.c +#, c-format +msgid "missing value to set to a variable with an invalid name '%s'" +msgstr "变量名 '%s' 无效，且缺少要设置的值" + +#: builtin/config.c +#, c-format msgid "invalid key pattern: %s" msgstr "无效键名模式：%s" @@ -7860,7 +7854,7 @@ msgid "not updating %s (new tip %s does not contain %s)" msgstr "未更新 %s（新的分支顶端 %s 不包含 %s）" #: builtin/fast-import.c builtin/sparse-checkout.c commit-graph.c midx-write.c -#: sequencer.c +#: repack-midx.c sequencer.c #, c-format msgid "unable to create leading directories of %s" msgstr "无法为 %s 创建上级目录" @@ -8156,6 +8150,10 @@ msgstr "" " 据称由 %s 签署" #: builtin/fast-import.c +msgid "aborting due to invalid signature" +msgstr "由于签名无效而中止" + +#: builtin/fast-import.c msgid "signing commits in interoperability mode is unsupported" msgstr "互操作模式下不支持为提交签名" @@ -8180,6 +8178,10 @@ msgid "importing a commit signature verbatim" msgstr "逐字导入提交签名" #: builtin/fast-import.c +msgid "failed to sign tag object" +msgstr "无法为标签对象签名" + +#: builtin/fast-import.c #, c-format msgid "importing a tag signature verbatim for tag '%s'" msgstr "逐字导入标签 '%s' 的签名" @@ -8519,15 +8521,20 @@ msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" msgid "option \"%s\" is ignored for %s" msgstr "选项 \"%s\" 对 %s 将被忽略" -#: builtin/fetch.c odb.c +#: builtin/fetch.c fetch-pack.c #, c-format -msgid "%s is not a valid object" -msgstr "%s 不是一个有效的对象" +msgid "the object %s does not exist" +msgstr "对象 %s 不存在" #: builtin/fetch.c #, c-format -msgid "the object %s does not exist" -msgstr "对象 '%s' 不存在" +msgid "ignoring %s=%s because it does not match any refs" +msgstr "因不匹配任何引用而忽略 %s=%s" + +#: builtin/fetch.c +#, c-format +msgid "ignoring %s because the protocol does not support it" +msgstr "因协议不支持而忽略 %s" #: builtin/fetch.c #, c-format @@ -8758,6 +8765,10 @@ msgstr "版本" msgid "report that we have only objects reachable from this object" msgstr "报告我们只拥有从该对象开始可达的对象" +#: builtin/fetch.c builtin/pull.c +msgid "ensure this ref is always sent as a negotiation have" +msgstr "确保此引用始终作为协商的 have 发送" + #: builtin/fetch.c msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" msgstr "不获取包文件；而是打印协商的祖先提交" @@ -8779,10 +8790,6 @@ msgid "accept refspecs from stdin" msgstr "从标准输入获取引用规格" #: builtin/fetch.c -msgid "--negotiate-only needs one or more --negotiation-tip=*" -msgstr "--negotiate-only 需要一个或多个 --negotiation-tip=*" - -#: builtin/fetch.c msgid "negative depth in --deepen is not supported" msgstr "--deepen 不支持负数深度" @@ -8803,7 +8810,7 @@ msgstr "fetch --all 不能带一个仓库参数" msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all 带引用规格没有任何意义" -#: builtin/fetch.c +#: builtin/fetch.c builtin/push.c #, c-format msgid "no such remote or remote group: %s" msgstr "没有这样的远程或远程组：%s" @@ -8821,6 +8828,11 @@ msgid "protocol does not support --negotiate-only, exiting" msgstr "协议不支持 --negotiate-only，退出" #: builtin/fetch.c +#, c-format +msgid "%s needs one or more %s" +msgstr "%s 需要一个或多个 %s" + +#: builtin/fetch.c msgid "" "--filter can only be used with the remote configured in " "extensions.partialclone" @@ -9240,6 +9252,11 @@ msgstr "'%s' 的值不是 bool 或 int：%d" #: builtin/fsmonitor--daemon.c #, c-format +msgid "daemon did not stop within %d seconds" +msgstr "守护进程未在 %d 秒内停止" + +#: builtin/fsmonitor--daemon.c +#, c-format msgid "fsmonitor-daemon is watching '%s'\n" msgstr "fsmonitor-daemon 正在监视 '%s'\n" @@ -9294,6 +9311,10 @@ msgstr "fsmonitor--daemon 已经在运行 '%s'" msgid "running fsmonitor-daemon in '%s'\n" msgstr "在 '%s' 中运行 fsmonitor-daemon\n" +#: builtin/fsmonitor--daemon.c setup.c +msgid "setsid failed" +msgstr "setsid 失败" + #: builtin/fsmonitor--daemon.c #, c-format msgid "starting fsmonitor-daemon in '%s'\n" @@ -10140,6 +10161,14 @@ msgid "'git help config' for more information" msgstr "'git help config' 获取更多信息" #: builtin/history.c +msgid "" +"git history fixup <commit> [--dry-run] [--update-refs=(branches|head)] [--" +"reedit-message] [--empty=(drop|keep|abort)]" +msgstr "" +"git history fixup <提交> [--dry-run] [--update-refs=(branches|head)] [--" +"reedit-message] [--empty=(drop|keep|abort)]" + +#: builtin/history.c msgid "git history reword <commit> [--dry-run] [--update-refs=(branches|head)]" msgstr "git history reword <提交> [--dry-run] [--update-refs=(branches|head)]" @@ -10211,27 +10240,99 @@ msgid "failed to commit ref transaction: %s" msgstr "无法提交引用事务：%s" #: builtin/history.c +#, c-format +msgid "unable to parse parent of %s" +msgstr "无法解析 %s 的父提交" + +#: builtin/history.c +#, c-format +msgid "" +"unrecognized '--empty=' action '%s'; valid values are \"drop\", \"keep\", " +"and \"abort\"." +msgstr "" +"无法识别的 '--empty=' 动作 '%s'；有效值为 \"drop\"、\"keep\" 和 \"abort\"。" + +#: builtin/history.c +msgid "control which refs should be updated" +msgstr "控制应更新哪些引用" + +#: builtin/history.c msgid "perform a dry-run without updating any refs" msgstr "试运行（不更新任何引用）" #: builtin/history.c +msgid "open an editor to modify the commit message" +msgstr "打开编辑器以修改提交说明" + +#: builtin/history.c builtin/rebase.c builtin/revert.c +msgid "how to handle commits that become empty" +msgstr "如何处理成为空提交的提交" + +#: builtin/history.c msgid "command expects a single revision" msgstr "该命令需要一个版本" #: builtin/history.c +msgid "cannot run fixup in a bare repository" +msgstr "无法在纯仓库中运行 fixup" + +#: builtin/history.c #, c-format msgid "commit cannot be found: %s" msgstr "找不到提交：%s" #: builtin/history.c -msgid "failed writing reworded commit" -msgstr "写入重写后的提交失败" +msgid "cannot get tree for HEAD" +msgstr "无法获取 HEAD 的树对象" + +#: builtin/history.c builtin/show-index.c +msgid "unable to read index" +msgstr "无法读取索引" + +#: builtin/history.c +msgid "nothing to fixup: no staged changes" +msgstr "没有可修正的内容：没有暂存的变更" + +#: builtin/history.c +msgid "unable to write index as a tree" +msgstr "无法将索引写入为树" + +#: builtin/history.c +#, c-format +msgid "cannot get tree for commit %s" +msgstr "无法获取提交 %s 的树对象" + +#: builtin/history.c +msgid "merge failed while applying fixup" +msgstr "应用修正时合并失败" + +#: builtin/history.c +msgid "fixup would produce conflicts; aborting" +msgstr "修正会产生冲突；正在中止" + +#: builtin/history.c +#, c-format +msgid "cannot drop root commit %s: it has no parent to replay onto" +msgstr "无法丢弃根提交 %s：它没有可以重放到的父提交" + +#: builtin/history.c +#, c-format +msgid "fixup makes commit %s empty" +msgstr "修正使提交 %s 变为空" + +#: builtin/history.c +msgid "failed writing fixed-up commit" +msgstr "无法写入修正后的提交" #: builtin/history.c msgid "failed replaying descendants" msgstr "重放后代提交失败" #: builtin/history.c +msgid "failed writing reworded commit" +msgstr "写入重写后的提交失败" + +#: builtin/history.c msgid "unable to populate index with tree" msgstr "无法用树填充索引" @@ -10264,6 +10365,10 @@ msgid "failed writing second commit" msgstr "写入第二个提交失败" #: builtin/history.c +msgid "control ref update behavior" +msgstr "控制引用更新行为" + +#: builtin/history.c msgid "command expects a committish" msgstr "该命令需要一个提交号" @@ -10274,10 +10379,12 @@ msgstr "无法拆分合并提交" #: builtin/hook.c msgid "" "git hook run [--allow-unknown-hook-name] [--ignore-missing] [--to-" -"stdin=<path>] <hook-name> [-- <hook-args>]" +"stdin=<path>] [(-j|--jobs) <n>]\n" +"<hook-name> [-- <hook-args>]" msgstr "" "git hook run [--allow-unknown-hook-name] [--ignore-missing] [--to-stdin=<路径" -">] <钩子名称> [-- <钩子参数>]" +">] [(-j|--jobs) <n>]\n" +"<钩子名称> [-- <钩子参数>]" #: builtin/hook.c msgid "" @@ -10327,6 +10434,15 @@ msgstr "静默地忽略缺失的 <钩子名称>" msgid "file to read into hooks' stdin" msgstr "读取至钩子标准输入的文件" +#: builtin/hook.c +msgid "run up to <n> hooks simultaneously (-1 for CPU count)" +msgstr "同时运行最多 <n> 个钩子（-1 表示 CPU 数）" + +#: builtin/hook.c +#, c-format +msgid "invalid value for -j: %d (use -1 for CPU count or a positive integer)" +msgstr "-j 的值无效：%d（使用 -1 表示 CPU 数，或使用正整数）" + #: builtin/index-pack.c #, c-format msgid "object type mismatch at %s" @@ -10389,6 +10505,10 @@ msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>：%s" msgid "inflate returned %d" msgstr "解压缩返回 %d" +#: builtin/index-pack.c builtin/unpack-objects.c +msgid "object size too large for this platform" +msgstr "对象大小对于此平台而言太大" + #: builtin/index-pack.c msgid "offset value overflow for delta base object" msgstr "delta 基准对象的偏移值溢出" @@ -11926,14 +12046,14 @@ msgstr "" #: builtin/merge.c msgid "An empty message aborts the commit.\n" -msgstr "空的提交说明会终止提交。\n" +msgstr "空的提交说明会中止提交。\n" #: builtin/merge.c #, c-format msgid "" "Lines starting with '%s' will be ignored, and an empty message aborts\n" "the commit.\n" -msgstr "以 '%s' 开始的行将被忽略，而空的提交说明将终止提交。\n" +msgstr "以 '%s' 开始的行将被忽略，而空的提交说明将中止提交。\n" #: builtin/merge.c msgid "Empty commit message." @@ -11971,7 +12091,7 @@ msgstr "对于 %s 没有来自 %s 的远程跟踪分支" msgid "Bad value '%s' in environment '%s'" msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'" -#: builtin/merge.c editor.c read-cache.c wrapper.c +#: builtin/merge.c editor.c read-cache.c t/helper/test-synthesize.c wrapper.c #, c-format msgid "could not close '%s'" msgstr "无法关闭 '%s'" @@ -11987,7 +12107,7 @@ msgstr "--abort 不带参数" #: builtin/merge.c msgid "There is no merge to abort (MERGE_HEAD missing)." -msgstr "没有要终止的合并（MERGE_HEAD 丢失）。" +msgstr "没有要中止的合并（MERGE_HEAD 丢失）。" #: builtin/merge.c msgid "--quit expects no arguments" @@ -12149,19 +12269,23 @@ msgstr "允许创建一个以上的树" msgid "" "git multi-pack-index [<options>] write [--preferred-pack=<pack>]\n" " [--[no-]bitmap] [--[no-]incremental] [--[no-]stdin-packs]\n" -" [--refs-snapshot=<path>]" +" [--refs-snapshot=<path>] [--[no-]write-chain-file]\n" +" [--base=<checksum>]" msgstr "" "git multi-pack-index [<选项>] write [--preferred-pack=<包>]\n" " [--[no-]bitmap] [--[no-]incremental] [--[no-]stdin-packs]\n" -" [--refs-snapshot=<路径>]" +" [--refs-snapshot=<路径>] [--[no-]write-chain-file]\n" +" [--base=<校验和>]" #: builtin/multi-pack-index.c msgid "" "git multi-pack-index [<options>] compact [--[no-]incremental]\n" -" [--[no-]bitmap] <from> <to>" +" [--[no-]bitmap] [--base=<checksum>] [--[no-]write-chain-file]\n" +" <from> <to>" msgstr "" "git multi-pack-index [<选项>] compact [--[no-]incremental]\n" -" [--[no-]bitmap] <源> <目标>" +" [--[no-]bitmap] [--base=<校验和>] [--[no-]write-chain-file]\n" +" <起始> <截止>" #: builtin/multi-pack-index.c msgid "git multi-pack-index [<options>] verify" @@ -12196,10 +12320,22 @@ msgid "write multi-pack bitmap" msgstr "写入多包位图" #: builtin/multi-pack-index.c +msgid "checksum" +msgstr "校验和" + +#: builtin/multi-pack-index.c +msgid "base MIDX for incremental writes" +msgstr "增量写入的基线 MIDX" + +#: builtin/multi-pack-index.c msgid "write a new incremental MIDX" msgstr "写入一个新的增量 MIDX" #: builtin/multi-pack-index.c +msgid "write the multi-pack-index chain file" +msgstr "写入多包索引链文件" + +#: builtin/multi-pack-index.c msgid "write multi-pack index containing only given indexes" msgstr "写入只包括给定索引的多包索引" @@ -12209,6 +12345,15 @@ msgstr "用于选择位图提交的引用快照" #: builtin/multi-pack-index.c #, c-format +msgid "cannot use %s without %s" +msgstr "使用 %s 时不能没有 %s" + +#: builtin/multi-pack-index.c +msgid "cannot use --base without --no-write-chain-file" +msgstr "使用 --base 时不能没有 --no-write-chain-file" + +#: builtin/multi-pack-index.c +#, c-format msgid "could not find MIDX: %s" msgstr "找不到 MIDX：%s" @@ -12384,6 +12529,60 @@ msgstr "允许打印 `undefined` 的名称（默认）" msgid "dereference tags in the input (internal use)" msgstr "反向解析输入中的标签（内部使用）" +#: builtin/name-rev.c +#, c-format +msgid "'%s' needs to be either text, revs, or rev" +msgstr "'%s' 必须是 text、revs 或 rev" + +#: builtin/name-rev.c +msgid "" +"(EXPERIMENTAL!) git format-rev --stdin-mode=<mode> --format=<pretty> [--" +"[no-]notes=<ref>] [-z] [--[no-]null-output] [--[no-]null-input]" +msgstr "" +"（实验性！）git format-rev --stdin-mode=<模式> --format=<美化> [--" +"[no-]notes=<引用>] [-z] [--[no-]null-output] [--[no-]null-input]" + +#: builtin/name-rev.c +msgid "pretty format to use" +msgstr "要使用的美化格式" + +#: builtin/name-rev.c +msgid "stdin-mode" +msgstr "标准输入模式" + +#: builtin/name-rev.c +msgid "how revs are processed" +msgstr "如何处理版本" + +#: builtin/name-rev.c builtin/range-diff.c +msgid "notes" +msgstr "注解" + +#: builtin/name-rev.c +msgid "display notes for pretty format" +msgstr "为美化格式显示注解" + +#: builtin/name-rev.c +msgid "z" +msgstr "z" + +#: builtin/name-rev.c +msgid "Use NUL for input and output termination" +msgstr "使用 NUL 作为输入和输出的终止符" + +#: builtin/name-rev.c +msgid "Use NUL for input termination" +msgstr "使用 NUL 作为输入的终止符" + +#: builtin/name-rev.c +msgid "Use NUL for output termination" +msgstr "使用 NUL 作为输出的终止符" + +#: builtin/name-rev.c +#, c-format +msgid "'%s' is required" +msgstr "需要 '%s'" + #: builtin/notes.c msgid "git notes [--ref <notes-ref>] [list [<object>]]" msgstr "git notes [--ref <注解引用>] [list [<对象>]]" @@ -12737,7 +12936,7 @@ msgid "" "abort'.\n" msgstr "" "自动注解合并失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提" -"交结果，或者使用命令 'git notes merge --abort' 终止合并。\n" +"交结果，或者使用命令 'git notes merge --abort' 中止合并。\n" #: builtin/notes.c builtin/tag.c #, c-format @@ -12811,6 +13010,11 @@ msgstr "当前，--write-bitmap-index 要求 --name-hash-version=1" #: builtin/pack-objects.c #, c-format +msgid "write_reuse_object: unable to parse object header of %s" +msgstr "write_reuse_object：无法解析 %s 的对象头" + +#: builtin/pack-objects.c +#, c-format msgid "" "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in " "pack %s" @@ -13029,10 +13233,6 @@ msgid "unable to force loose object" msgstr "无法强制松散对象" #: builtin/pack-objects.c -msgid "failed to pack objects via path-walk" -msgstr "通过 path-walk 打包对象失败" - -#: builtin/pack-objects.c #, c-format msgid "not a rev '%s'" msgstr "不是一个版本 '%s'" @@ -13043,6 +13243,10 @@ msgid "bad revision '%s'" msgstr "错误的版本 '%s'" #: builtin/pack-objects.c +msgid "failed to pack objects via path-walk" +msgstr "通过 path-walk 打包对象失败" + +#: builtin/pack-objects.c msgid "unable to add recent objects" msgstr "无法添加最近的对象" @@ -13745,6 +13949,11 @@ msgstr "" msgid "invalid value for '%s'" msgstr "'%s' 的值无效" +#: builtin/push.c +#, c-format +msgid "could not push to %s" +msgstr "无法推送到 %s" + #: builtin/push.c builtin/submodule--helper.c msgid "repository" msgstr "仓库" @@ -13837,15 +14046,35 @@ msgid "" "and then push using the remote name\n" "\n" " git push <name>\n" +"\n" +"To push to multiple remotes at once, configure a remote group using\n" +"\n" +" git config remotes.<groupname> \"<remote1> <remote2>\"\n" +"\n" +"and then push using the group name\n" +"\n" +" git push <groupname>\n" msgstr "" -"没有配置推送目标。\n" -"或通过命令行指定 URL，或用下面命令配置一个远程仓库\n" +"未配置推送目标。\n" +"请通过命令行指定 URL，或使用以下命令配置一个远程仓库\n" "\n" " git remote add <名称> <地址>\n" "\n" "然后使用该远程仓库名执行推送\n" "\n" " git push <名称>\n" +"\n" +"若要同时推送到多个远程仓库，请使用以下命令配置远程组\n" +"\n" +" git config remotes.<组名> \"<远程1> <远程2>\"\n" +"\n" +"然后使用组名进行推送\n" +"\n" +" git push <组名>\n" + +#: builtin/push.c +msgid "push options must not have new line characters" +msgstr "推送选项不能有换行符" #: builtin/push.c msgid "--all can't be combined with refspecs" @@ -13856,8 +14085,8 @@ msgid "--mirror can't be combined with refspecs" msgstr "--mirror 不能和引用规格同时使用" #: builtin/push.c -msgid "push options must not have new line characters" -msgstr "推送选项不能有换行符" +msgid "--atomic can only be used when pushing to one remote" +msgstr "--atomic 只能在推送到一个远程仓库时使用" #: builtin/range-diff.c msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>" @@ -13881,10 +14110,6 @@ msgid "use simple diff colors" msgstr "使用简单差异颜色" #: builtin/range-diff.c -msgid "notes" -msgstr "注解" - -#: builtin/range-diff.c msgid "passed to 'git log'" msgstr "传递给 'git log'" @@ -14220,11 +14445,11 @@ msgstr "跳过当前补丁并继续" #: builtin/rebase.c msgid "abort and check out the original branch" -msgstr "终止并检出原有分支" +msgstr "中止并检出原有分支" #: builtin/rebase.c msgid "abort but keep HEAD where it is" -msgstr "终止但保持 HEAD 不变" +msgstr "中止但保持 HEAD 不变" #: builtin/rebase.c msgid "edit the todo list during an interactive rebase" @@ -14250,10 +14475,6 @@ msgstr "让用户编辑要变基的提交列表" msgid "(REMOVED) was: try to recreate merges instead of ignoring them" msgstr "（已删除）曾是：尝试重建合并提交而非忽略它们" -#: builtin/rebase.c builtin/revert.c -msgid "how to handle commits that become empty" -msgstr "如何处理成为空提交的提交" - #: builtin/rebase.c msgid "keep commits which start empty" msgstr "保留初始为空的提交" @@ -15341,11 +15562,11 @@ msgstr "冗长输出；必须置于子命令之前" msgid "" "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" "[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n" -"[--write-midx] [--name-hash-version=<n>] [--path-walk]" +"[--write-midx[=<mode>]] [--name-hash-version=<n>] [--path-walk]" msgstr "" "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" "[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<包名>]\n" -"[--write-midx] [--name-hash-version=<n>] [--path-walk]" +"[--write-midx[=<模式>]] [--name-hash-version=<n>] [--path-walk]" #: builtin/repack.c msgid "" @@ -15356,6 +15577,11 @@ msgstr "" "或禁用 pack.writeBitmaps 配置。" #: builtin/repack.c +#, c-format +msgid "unknown value for %s: %s" +msgstr "%s 的值未识别：%s" + +#: builtin/repack.c msgid "pack everything in a single pack" msgstr "所有内容打包到一个包文件中" @@ -15474,6 +15700,11 @@ msgstr "不能删除珍品仓库中的打包文件" #: builtin/repack.c #, c-format +msgid "invalid value for %s: %d" +msgstr "%s 的值无效：%d" + +#: builtin/repack.c +#, c-format msgid "option '%s' can only be used along with '%s'" msgstr "选项 '%s' 只能和 '%s' 搭配使用" @@ -15723,6 +15954,16 @@ msgid "invalid %s value: '%s'" msgstr "无效的 %s 值：'%s'" #: builtin/replay.c +msgid "" +"(EXPERIMENTAL!) git replay ([--contained] --onto=<newbase> | --" +"advance=<branch> | --revert=<branch>)\n" +"[--ref=<ref>] [--ref-action=<mode>] <revision-range>" +msgstr "" +"（实验性！）git replay ([--contained] --onto=<新基线> | --advance=<分支> | --" +"revert=<分支>)\n" +"[--ref=<引用>] [--ref-action=<模式>] <版本范围>" + +#: builtin/replay.c msgid "update all branches that point at commits in <revision-range>" msgstr "更新指向 <版本范围> 中提交的所有分支" @@ -15739,6 +15980,10 @@ msgid "revert commits onto given branch" msgstr "在给定分支上还原提交" #: builtin/replay.c +msgid "reference to update with result" +msgstr "要更新结果的引用" + +#: builtin/replay.c msgid "control ref update behavior (update|print)" msgstr "控制引用更新行为（update|print）" @@ -16588,10 +16833,6 @@ msgid "unknown index version" msgstr "未知的索引版本" #: builtin/show-index.c -msgid "unable to read index" -msgstr "无法读取索引" - -#: builtin/show-index.c msgid "corrupt index file" msgstr "索引文件损坏" @@ -16906,8 +17147,12 @@ msgid "git stash pop [--index] [-q | --quiet] [<stash>]" msgstr "git stash pop [--index] [-q | --quiet] [<储藏>]" #: builtin/stash.c -msgid "git stash apply [--index] [-q | --quiet] [<stash>]" -msgstr "git stash apply [--index] [-q | --quiet] [<储藏>]" +msgid "" +"git stash apply [--index] [-q | --quiet] [--label-ours=<label>] [--label-" +"theirs=<label>] [--label-base=<label>] [<stash>]" +msgstr "" +"git stash apply [--index] [-q | --quiet] [--label-ours=<标签>] [--label-" +"theirs=<标签>] [--label-base=<标签>] [<储藏>]" #: builtin/stash.c msgid "git stash branch <branchname> [<stash>]" @@ -16919,6 +17164,21 @@ msgstr "git stash store [(-m | --message) <消息>] [-q | --quiet] <提交>" #: builtin/stash.c msgid "" +"git stash [push] [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q " +"| --quiet]\n" +" [-u | --include-untracked] [-a | --all] [(-m | --message) " +"<message>]\n" +" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" +" [--] [<pathspec>...]" +msgstr "" +"git stash [push] [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q " +"| --quiet]\n" +" [-u | --include-untracked] [-a | --all] [(-m | --message) <消息>]\n" +" [--pathspec-from-file=<文件> [--pathspec-file-nul]]\n" +" [--] [<路径规格>...]" + +#: builtin/stash.c +msgid "" "git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | " "--quiet]\n" " [-u | --include-untracked] [-a | --all] [<message>]" @@ -17008,6 +17268,22 @@ msgid "attempt to recreate the index" msgstr "尝试重建索引" #: builtin/stash.c +msgid "label" +msgstr "标签" + +#: builtin/stash.c +msgid "label for the upstream side in conflict markers" +msgstr "冲突标记中上游侧的标签" + +#: builtin/stash.c +msgid "label for the stashed side in conflict markers" +msgstr "冲突标记中储藏侧的标签" + +#: builtin/stash.c +msgid "label for the base in diff3 conflict markers" +msgstr "diff3 冲突标记中基准侧的标签" + +#: builtin/stash.c #, c-format msgid "Dropped %s (%s)" msgstr "丢弃了 %s（%s）" @@ -18546,7 +18822,19 @@ msgstr "如果 <目录> 不是一个 Git 目录，不要尝试 <目录>/.git/" #: builtin/upload-pack.c msgid "interrupt transfer after <n> seconds of inactivity" -msgstr "不活动 <n> 秒钟后终止传输" +msgstr "不活动 <n> 秒钟后中止传输" + +#: builtin/url-parse.c +msgid "git url-parse [-c <component>] [--] <url>..." +msgstr "git url-parse [-c <组件>] [--] <url>..." + +#: builtin/url-parse.c +msgid "component" +msgstr "组件" + +#: builtin/url-parse.c +msgid "which URL component to extract" +msgstr "提取哪个 URL 组件" #: builtin/verify-commit.c msgid "git verify-commit [-v | --verbose] [--raw] <commit>..." @@ -19408,6 +19696,10 @@ msgid "Prepare patches for e-mail submission" msgstr "准备电子邮件提交的补丁" #: command-list.h +msgid "EXPERIMENTAL: Pretty format revisions on demand" +msgstr "实验性：按需以美化的格式输出版本信息" + +#: command-list.h msgid "Verifies the connectivity and validity of the objects in the database" msgstr "验证仓库中对象的连通性和有效性" @@ -19440,8 +19732,8 @@ msgid "EXPERIMENTAL: Rewrite history" msgstr "实验性：重写历史" #: command-list.h -msgid "Run git hooks" -msgstr "运行 git 钩子" +msgid "Run Git hooks" +msgstr "运行 Git 钩子" #: command-list.h msgid "Server side implementation of Git over HTTP" @@ -19697,8 +19989,8 @@ msgid "Restricted login shell for Git-only SSH access" msgstr "只允许 Git SSH 访问的受限登录 shell" #: command-list.h -msgid "Summarize 'git log' output" -msgstr "汇总 'git log' 输出" +msgid "Summarize `git log` output" +msgstr "汇总 `git log` 的输出" #: command-list.h msgid "Show various types of objects" @@ -19786,6 +20078,10 @@ msgid "Send objects packed back to git-fetch-pack" msgstr "将对象压缩包发送回 git-fetch-pack" #: command-list.h +msgid "Parse and extract git URL components" +msgstr "解析并提取 git URL 的组件" + +#: command-list.h msgid "Show a Git logical variable" msgstr "显示一个 Git 逻辑变量" @@ -20383,7 +20679,7 @@ msgstr "'has_worktree_moved' 中未处理的情况：%d" msgid "health thread wait failed [GLE %ld]" msgstr "健康监测线程等待失败 [GLE %ld]" -#: compat/fsmonitor/fsm-ipc-darwin.c +#: compat/fsmonitor/fsm-ipc-unix.c #, c-format msgid "Invalid path: %s" msgstr "无效路径：%s" @@ -20396,6 +20692,50 @@ msgstr "无法创建 FSEventStream。" msgid "Failed to start the FSEventStream" msgstr "无法启动 FSEventStream" +#: compat/fsmonitor/fsm-listen-linux.c +msgid "inotify watch limit reached; increase fs.inotify.max_user_watches" +msgstr "达到 inotify 监视限制；请增加 fs.inotify.max_user_watches" + +#: compat/fsmonitor/fsm-listen-linux.c +#, c-format +msgid "inotify_add_watch('%s') failed" +msgstr "inotify_add_watch('%s') 失败" + +#: compat/fsmonitor/fsm-listen-linux.c +msgid "inotify_rm_watch() failed" +msgstr "inotify_rm_watch() 失败" + +#: compat/fsmonitor/fsm-listen-linux.c compat/fsmonitor/fsm-path-utils-darwin.c +#, c-format +msgid "opendir('%s') failed" +msgstr "opendir('%s') 失败" + +#: compat/fsmonitor/fsm-listen-linux.c compat/fsmonitor/fsm-path-utils-darwin.c +#, c-format +msgid "lstat('%s') failed" +msgstr "lstat('%s') 失败" + +#: compat/fsmonitor/fsm-listen-linux.c compat/fsmonitor/fsm-path-utils-darwin.c +#, c-format +msgid "closedir('%s') failed" +msgstr "closedir('%s') 失败" + +#: compat/fsmonitor/fsm-listen-linux.c +msgid "inotify_init1() failed" +msgstr "inotify_init1() 失败" + +#: compat/fsmonitor/fsm-listen-linux.c +msgid "closing inotify file descriptor failed" +msgstr "关闭 inotify 文件描述符失败" + +#: compat/fsmonitor/fsm-listen-linux.c +msgid "reading inotify message stream failed" +msgstr "读取 inotify 消息流失败" + +#: compat/fsmonitor/fsm-listen-linux.c +msgid "polling inotify message stream failed" +msgstr "轮询 inotify 消息流失败" + #: compat/fsmonitor/fsm-listen-win32.c #, c-format msgid "[GLE %ld] could not convert path to UTF-8: '%.*ls'" @@ -20428,24 +20768,9 @@ msgstr "无法获取目录变更 [GLE %ld]" #: compat/fsmonitor/fsm-path-utils-darwin.c #, c-format -msgid "opendir('%s') failed" -msgstr "opendir('%s') 失败" - -#: compat/fsmonitor/fsm-path-utils-darwin.c -#, c-format -msgid "lstat('%s') failed" -msgstr "lstat('%s') 失败" - -#: compat/fsmonitor/fsm-path-utils-darwin.c -#, c-format msgid "strbuf_readlink('%s') failed" msgstr "strbuf_readlink('%s') 失败" -#: compat/fsmonitor/fsm-path-utils-darwin.c -#, c-format -msgid "closedir('%s') failed" -msgstr "closedir('%s') 失败" - #: compat/fsmonitor/fsm-path-utils-win32.c #, c-format msgid "[GLE %ld] unable to open for read '%ls'" @@ -21020,11 +21345,6 @@ msgid "expected flush after ref listing" msgstr "在引用列表之后应该有一个 flush 包" #: connect.c -#, c-format -msgid "protocol '%s' is not supported" -msgstr "不支持 '%s' 协议" - -#: connect.c msgid "unable to set SO_KEEPALIVE on socket" msgstr "无法为 socket 设置 SO_KEEPALIVE" @@ -21088,6 +21408,11 @@ msgid "cannot start proxy %s" msgstr "无法启动代理 %s" #: connect.c +#, c-format +msgid "protocol '%s' is not supported" +msgstr "不支持 '%s' 协议" + +#: connect.c msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "未指定路径，执行 'git help pull' 查看有效的 URL 语法" @@ -21626,6 +21951,11 @@ msgstr "无法解析 --submodule 选项的参数：'%s'" #: diff.c #, c-format +msgid "%s expects a non-negative integer" +msgstr "%s 预期一个非负整数" + +#: diff.c +#, c-format msgid "bad --word-diff argument: %s" msgstr "无效的 --word-diff 参数：%s" @@ -22981,6 +23311,56 @@ msgstr "" #: hook.c #, c-format +msgid "hook.jobs must be an integer, ignoring: '%s'" +msgstr "hook.jobs 必须是整数，已忽略：'%s'" + +#: hook.c +#, c-format +msgid "hook.jobs must be a positive integer or -1, ignoring: '%s'" +msgstr "hook.jobs 必须是正整数或 -1，已忽略：'%s'" + +#: hook.c +#, c-format +msgid "" +"hook friendly-name '%s' collides with a known event name; please choose a " +"different friendly-name" +msgstr "钩子的友好名称 '%s' 与已知事件名称冲突；请选择另外的友好名称" + +#: hook.c +#, c-format +msgid "" +"hook friendly-name '%s' is the same as its event; this may cause ambiguity " +"with hook.%s.enabled" +msgstr "钩子的友好名称 '%s' 与其事件相同；这可能会导致 hook.%s.enabled 有歧义" + +#: hook.c +#, c-format +msgid "hook.%s.parallel must be a boolean, ignoring: '%s'" +msgstr "hook.%s.parallel 必须是布尔值，已忽略：'%s'" + +#: hook.c +#, c-format +msgid "hook.%s.jobs must be an integer, ignoring: '%s'" +msgstr "hook.%s.jobs 必须是整数，已忽略：'%s'" + +#: hook.c +#, c-format +msgid "hook.%s.jobs must be a positive integer or -1, ignoring: '%s'" +msgstr "hook.%s.jobs 必须是正整数或 -1，已忽略：'%s'" + +#: hook.c +#, c-format +msgid "" +"hook.%s.jobs is set but '%s' looks like a hook friendly-name, not an event " +"name; hook.<event>.jobs uses the event name (e.g. hook.post-receive.jobs), " +"so this setting will be ignored" +msgstr "" +"设置了 hook.%s.jobs，但 '%s' 看起来像是一个钩子的友好名称，而不是事件名称；" +"hook.<event>.jobs 使用事件名称（例如 hook.post-receive.jobs），因此此设置将被" +"忽略" + +#: hook.c +#, c-format msgid "disabled hook '%s' has no command configured" msgstr "已禁用的钩子 '%s' 未配置命令" @@ -22991,6 +23371,18 @@ msgid "" "aborting." msgstr "必须配置 'hook.%s.command'，或移除 'hook.%s.event'；正在中止。" +#: hook.c +#, c-format +msgid "" +"hook '%s' is not marked as parallel=true, running in parallel anyway due to " +"-j%u" +msgstr "钩子 '%s' 未标记为 parallel=true，但由于 -j%u 仍并行运行" + +#: hook.c +#, c-format +msgid "%s must be a positive integer or -1, ignoring: %d" +msgstr "%s 必须为正整数或 -1，已忽略：%d" + #: http-fetch.c msgid "not a git repository" msgstr "不是 Git 仓库" @@ -23221,7 +23613,7 @@ msgstr "参数" msgid "object filtering" msgstr "对象过滤" -#: list-objects-filter.c +#: list-objects-filter.c path-walk.c #, c-format msgid "unable to access sparse blob in '%s'" msgstr "无法访问 '%s' 中的稀疏数据对象" @@ -23670,6 +24062,11 @@ msgstr "忽略已存在的多包索引，校验码不匹配" #: midx-write.c #, c-format +msgid "could not find base MIDX '%s'" +msgstr "找不到基线 MIDX '%s'" + +#: midx-write.c +#, c-format msgid "could not load reverse index for MIDX %s" msgstr "无法加载多包索引 %s 的反向索引" @@ -23722,7 +24119,7 @@ msgstr "无法写入多包位图" msgid "too many multi-pack-indexes" msgstr "过多的多包索引" -#: midx-write.c +#: midx-write.c repack-midx.c msgid "unable to open multi-pack-index chain file" msgstr "无法打开多包索引链文件" @@ -23828,12 +24225,12 @@ msgstr "多包索引链文件太小" #: midx.c #, c-format msgid "pack count in base MIDX too high: %<PRIuMAX>" -msgstr "基线的 MIDX 中包的数量过高：%<PRIuMAX>" +msgstr "基线 MIDX 中包的数量过高：%<PRIuMAX>" #: midx.c #, c-format msgid "object count in base MIDX too high: %<PRIuMAX>" -msgstr "基线的 MIDX 中对象的数量过高：%<PRIuMAX>" +msgstr "基线 MIDX 中对象的数量过高：%<PRIuMAX>" #: midx.c #, c-format @@ -23871,6 +24268,11 @@ msgid "multi-pack-index large offset out of bounds" msgstr "多包索引大偏移区越界" #: midx.c +#, c-format +msgid "failed to clear multi-pack-index chain at %s" +msgstr "无法清理位于 %s 的多包索引链" + +#: midx.c msgid "multi-pack-index file exists, but failed to parse" msgstr "多包索引文件存在，但无法解析" @@ -23942,7 +24344,7 @@ msgid "" msgstr "" "您的前一次注解合并尚未结束（存在 %s）。\n" "在开始一个新的注解合并之前，请使用 'git notes merge --commit' 或者 'git " -"notes merge --abort' 来提交/终止前一次合并。" +"notes merge --abort' 来提交/中止前一次合并。" #: notes-merge.c #, c-format @@ -23996,7 +24398,7 @@ msgstr "无法将 %s %s 映射到提交对象中" msgid "Failed to convert object from %s to %s" msgstr "无法将对象从 %s 转换为 %s" -#: object-file.c +#: object-file.c odb/source-loose.c #, c-format msgid "object file %s is empty" msgstr "对象文件 %s 为空" @@ -24013,35 +24415,6 @@ msgstr "松散对象 '%s' 后面有垃圾数据" #: object-file.c #, c-format -msgid "unable to open loose object %s" -msgstr "无法打开松散对象 %s" - -#: object-file.c -#, c-format -msgid "unable to parse %s header" -msgstr "无法解析 %s 头部" - -#: object-file.c -msgid "invalid object type" -msgstr "无效的对象类型" - -#: object-file.c -#, c-format -msgid "unable to unpack %s header" -msgstr "无法解开 %s 头部" - -#: object-file.c -#, c-format -msgid "header for %s too long, exceeds %d bytes" -msgstr "%s 的头部太长，超出了 %d 字节" - -#: object-file.c -#, c-format -msgid "loose object %s (stored in %s) is corrupt" -msgstr "松散对象 %s（保存在 %s）已损坏" - -#: object-file.c -#, c-format msgid "unable to open %s" msgstr "无法打开 %s" @@ -24098,8 +24471,8 @@ msgstr "由于 %s 的对象源数据不稳定而无法处理" #: object-file.c #, c-format -msgid "write stream object %ld != %<PRIuMAX>" -msgstr "写入流对象 %ld != %<PRIuMAX>" +msgid "write stream object %<PRIuMAX> != %<PRIuMAX>" +msgstr "写入流对象 %<PRIuMAX> != %<PRIuMAX>" #: object-file.c #, c-format @@ -24453,6 +24826,11 @@ msgstr "缺少 %s 到 %s 的映射" #: odb.c #, c-format +msgid "%s is not a valid object" +msgstr "%s 不是一个有效的对象" + +#: odb.c +#, c-format msgid "%s is not a valid '%s' object" msgstr "%s 不是有效的 '%s' 对象" @@ -24468,6 +24846,35 @@ msgstr "无法读取 alternates 文件" msgid "unable to move new alternates file into place" msgstr "无法将新的 alternates 文件移动到位" +#: odb/source-loose.c +#, c-format +msgid "unable to open loose object %s" +msgstr "无法打开松散对象 %s" + +#: odb/source-loose.c +#, c-format +msgid "unable to parse %s header" +msgstr "无法解析 %s 头部" + +#: odb/source-loose.c +msgid "invalid object type" +msgstr "无效的对象类型" + +#: odb/source-loose.c +#, c-format +msgid "unable to unpack %s header" +msgstr "无法解开 %s 头部" + +#: odb/source-loose.c +#, c-format +msgid "header for %s too long, exceeds %d bytes" +msgstr "%s 的头部太长，超出了 %d 字节" + +#: odb/source-loose.c +#, c-format +msgid "loose object %s (stored in %s) is corrupt" +msgstr "松散对象 %s（保存在 %s）已损坏" + #: pack-bitmap-write.c #, c-format msgid "duplicate entry when writing bitmap index: %s" @@ -25022,6 +25429,29 @@ msgid "failed to find tag %s" msgstr "无法找到标签 %s" #: path-walk.c +#, c-format +msgid "tree:%lu filter not supported by the path-walk API" +msgstr "path-walk API 不支持 tree:%lu 过滤器" + +#: path-walk.c +msgid "sparse filter cannot be combined with existing sparse patterns" +msgstr "稀疏过滤器不能与现有的稀疏模式同时使用" + +#: path-walk.c +#, c-format +msgid "unable to parse sparse filter data in '%s'" +msgstr "无法解析 '%s' 中的稀疏过滤器数据" + +#: path-walk.c +msgid "sparse filter is not cone-mode compatible" +msgstr "稀疏过滤器不兼容锥形模式" + +#: path-walk.c +#, c-format +msgid "object filter '%s' not supported by the path-walk API" +msgstr "path-walk API 不支持对象过滤器 '%s'" + +#: path-walk.c msgid "failed to setup revision walk" msgstr "无法设置版本遍历" @@ -25218,13 +25648,10 @@ msgstr "配置 '%2$s' 中存在不支持的字段 '%1$s'" #: promisor-remote.c #, c-format -msgid "no or empty URL advertised for remote '%s'" -msgstr "远程 '%s' 的 URL 没有公布或为空" - -#: promisor-remote.c -#, c-format -msgid "known remote named '%s' but with URL '%s' instead of '%s'" -msgstr "已知远程名称为 '%s'，但 URL 是 '%s' 而非 '%s'" +msgid "" +"known remote named '%s' but with URL '%s' instead of '%s', ignoring this " +"remote" +msgstr "已知远程名称为 '%s'，但 URL 是 '%s' 而非 '%s'，忽略此远程" #: promisor-remote.c #, c-format @@ -25233,8 +25660,10 @@ msgstr "远程信息中的无效元素 '%s'" #: promisor-remote.c #, c-format -msgid "server advertised a promisor remote without a name or URL: %s" -msgstr "服务器通告了一个没有名称或 URL 的承诺者远程：%s" +msgid "" +"server advertised a promisor remote without a name or URL: '%s', ignoring " +"this remote" +msgstr "服务器通告了一个没有名称或 URL 的承诺者远程：'%s'，忽略此远程" #: promisor-remote.c #, c-format @@ -25290,8 +25719,8 @@ msgstr "%s 必须为非负值，使用默认值" #: pseudo-merge.c #, c-format -msgid "%s must be between 0 and 1, using default" -msgstr "%s 必须介于 0 到 1 之间，使用默认值" +msgid "%s must be between 0 (exclusive) and 1, using default" +msgstr "%s 必须介于 0（不含）和 1 之间，使用默认值" #: pseudo-merge.c #, c-format @@ -25600,7 +26029,7 @@ msgid "" "Or you can abort the rebase with 'git rebase --abort'.\n" msgstr "" "您可以用 'git rebase --edit-todo' 修正，然后执行 'git rebase --continue'。\n" -"或者您可以用 'git rebase --abort' 终止变基。\n" +"或者您可以用 'git rebase --abort' 中止变基。\n" #: rebase-interactive.c #, c-format @@ -25704,7 +26133,7 @@ msgid "" "\n" msgstr "" "\n" -"然而，如果您删除全部内容，变基操作将会终止。\n" +"然而，如果您删除全部内容，变基操作将会中止。\n" "\n" #: rebase-interactive.c @@ -26138,6 +26567,16 @@ msgstr "拒绝强制跳过创建引用日志" #: refs.c #, c-format +msgid "trying to write ref '%s' with nonexistent object %s" +msgstr "试图用不存在的对象 %2$s 写入引用 '%1$s'" + +#: refs.c +#, c-format +msgid "trying to write non-commit object %s to branch '%s'" +msgstr "尝试将非提交对象 %s 写入分支 '%s'" + +#: refs.c +#, c-format msgid "update_ref failed for ref '%s': %s" msgstr "对引用 '%s' 执行 update_ref 失败：%s" @@ -26239,16 +26678,6 @@ msgstr "危险的引用名称：%s" #: refs/reftable-backend.c #, c-format -msgid "trying to write ref '%s' with nonexistent object %s" -msgstr "试图用不存在的对象 %2$s 写入引用 '%1$s'" - -#: refs/reftable-backend.c -#, c-format -msgid "trying to write non-commit object %s to branch '%s'" -msgstr "尝试将非提交对象 %s 写入分支 '%s'" - -#: refs/reftable-backend.c -#, c-format msgid "" "multiple updates for 'HEAD' (including one via its referent '%s') are not " "allowed" @@ -26831,6 +27260,43 @@ msgstr "无法关闭引用快照临时文件" msgid "could not remove stale bitmap: %s" msgstr "无法删除过期的位图：%s" +#: repack-midx.c +msgid "no packs to write MIDX during compaction" +msgstr "压实时没有要写入 MIDX 的包" + +#: repack-midx.c +#, c-format +msgid "expected exactly one line during MIDX write, got: %<PRIuMAX>" +msgstr "写入 MIDX 时预期刚好一行，却得到：%<PRIuMAX>" + +#: repack-midx.c +#, c-format +msgid "unexpected MIDX output: '%s'" +msgstr "意外的 MIDX 输出：'%s'" + +#: repack-midx.c +#, c-format +msgid "could not load pack %<PRIu32> from MIDX" +msgstr "无法从 MIDX 加载包 %<PRIu32>" + +#: repack-midx.c +msgid "too many objects in MIDX compaction step" +msgstr "MIDX 压实步骤中对象过多" + +#: repack-midx.c +#, c-format +msgid "could not find preferred pack for MIDX %s" +msgstr "无法找到 MIDX %s 的首选包" + +#: repack-midx.c +msgid "unable to generate compaction plan" +msgstr "无法生成压实计划" + +#: repack-midx.c +#, c-format +msgid "unable to execute compaction step %<PRIuMAX>" +msgstr "无法执行压实步骤 %<PRIuMAX>" + #: repack-promisor.c msgid "could not start pack-objects to repack promisor objects" msgstr "无法开始 pack-objects 来重新打包承诺者对象" @@ -26911,6 +27377,15 @@ msgstr "需要一些提交来重放" msgid "all positive revisions given must be references" msgstr "提供的所有正向版本必须为引用" +#: replay.c +#, c-format +msgid "commit %s became empty after replay" +msgstr "提交 %s 在重放后变空" + +#: replay.c +msgid "'--ref' cannot be used with multiple revision ranges" +msgstr "'--ref' 不能与多个版本范围一起使用" + #: replay.c sequencer.c #, c-format msgid "'%s' is not a valid refname" @@ -27065,8 +27540,8 @@ msgid "object filtering requires --objects" msgstr "对象过滤需要 --objects" #: revision.c -msgid "-L does not yet support diff formats besides -p and -s" -msgstr "-L 尚不支持 -p 和 -s 之外的差异格式" +msgid "-L does not yet support the requested diff format" +msgstr "-L 尚不支持所请求的差异格式" #: run-command.c #, c-format @@ -27438,7 +27913,7 @@ msgid "" msgstr "" "手工解决所有冲突，执行 \"git add/rm <冲突的文件>\" 标记\n" "冲突已解决，然后执行 \"git rebase --continue\"。您也可以执行\n" -"\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n" +"\"git rebase --skip\" 命令跳过这个提交。如果想要中止执行并回到\n" "\"git rebase\" 执行之前的状态，执行 \"git rebase --abort\"。" #: sequencer.c @@ -27460,7 +27935,7 @@ msgid "" msgstr "" "解决所有冲突之后，用 \"git add/rm <路径规格>\" 标记它们，\n" "然后执行 \"git cherry-pick --continue\"。您也可以执行\n" -"\"git cherry-pick --skip\" 命令跳过这个提交。如果想要终止执行并回到\n" +"\"git cherry-pick --skip\" 命令跳过这个提交。如果想要中止执行并回到\n" "执行 \"git cherry-pick\" 之前的状态，执行 \"git cherry-pick --abort\"。" #: sequencer.c @@ -27474,7 +27949,7 @@ msgid "" msgstr "" "解决所有冲突之后，用 \"git add/rm <路径规格>\" 标记它们，\n" "然后执行 \"git revert --continue\"。您也可以执行\n" -"\"git revert --skip\" 命令跳过这个提交。如果想要终止执行并回到\n" +"\"git revert --skip\" 命令跳过这个提交。如果想要中止执行并回到\n" "执行 \"git revert\" 之前的状态，执行 \"git revert --abort\"。" #: sequencer.c @@ -27968,7 +28443,7 @@ msgstr "无法解析 HEAD" #: sequencer.c msgid "cannot abort from a branch yet to be born" -msgstr "无法从尚未建立的分支终止" +msgstr "无法从尚未建立的分支中止" #: sequencer.c #, c-format @@ -28196,23 +28671,29 @@ msgstr "无法存储 %s" #: sequencer.c #, c-format msgid "" -"%s\n" +"Your local changes are stashed, however applying them\n" +"resulted in conflicts. You can either resolve the conflicts\n" +"and then discard the stash with \"git stash drop\", or, if you\n" +"do not want to resolve them now, run \"git reset --hard\" and\n" +"apply the local changes later by running \"git stash pop\".\n" +msgstr "" +"您的本地修改已储藏，但在应用时出现了冲突。您可以解决这些冲突，\n" +"然后通过 \"git stash drop\" 丢弃该储藏；或者，如果您现在不想解决它们，\n" +"运行 \"git reset --hard\"，以后再运行 \"git stash pop\" 来重新应用\n" +"这些本地修改。\n" + +#: sequencer.c +#, c-format +msgid "" +"Autostash exists; creating a new stash entry.\n" "Your changes are safe in the stash.\n" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" -"%s\n" +"自动储藏已存在，创建一个新的储藏条目。\n" "您的修改在储藏区中很安全。\n" "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n" #: sequencer.c -msgid "Applying autostash resulted in conflicts." -msgstr "应用自动储藏导致冲突。" - -#: sequencer.c -msgid "Autostash exists; creating a new stash entry." -msgstr "自动储藏已经存在；正在创建一个新的储藏条目。" - -#: sequencer.c msgid "autostash reference is a symref" msgstr "自动储藏的引用是一个符号引用" @@ -28563,10 +29044,6 @@ msgid "fork failed" msgstr "fork 失败" #: setup.c -msgid "setsid failed" -msgstr "setsid 失败" - -#: setup.c #, c-format msgid "cannot stat template '%s'" msgstr "无法对模板 '%s' 调用 stat" @@ -28660,6 +29137,11 @@ msgstr "在 %s%s 初始化空的共享 Git 仓库\n" msgid "Initialized empty Git repository in %s%s\n" msgstr "在 %s%s 初始化空的 Git 仓库\n" +#: sideband.c +#, c-format +msgid "unrecognized value for '%s': '%s'" +msgstr "'%s' 的值无法识别：'%s'" + #: sparse-index.c #, c-format msgid "index entry is a directory, but not sparse (%08x)" @@ -29059,6 +29541,10 @@ msgstr "切换激进边遍历模式" msgid "read a pattern list over stdin" msgstr "从标准输入读取模式列表" +#: t/helper/test-path-walk.c +msgid "toggle pruning of trees by sparse patterns" +msgstr "切换按稀疏模式裁剪树" + #: t/helper/test-reach.c #, c-format msgid "commit %s is not marked reachable" @@ -29153,6 +29639,15 @@ msgstr "令牌" msgid "command token to send to the server" msgstr "发送到服务器的命令令牌" +#: t/helper/test-synthesize.c +msgid "write a pack with a single reachable large blob" +msgstr "写入一个包含单个可达的大数据对象的包" + +#: t/helper/test-synthesize.c +#, c-format +msgid "'%s' is not a valid blob size" +msgstr "'%s' 不是一个有效的数据对象大小" + #: t/unit-tests/unit-test.c msgid "unit-test [<options>]" msgstr "unit-test [<选项>]" @@ -29290,6 +29785,11 @@ msgid "--negotiate-only requires protocol v2" msgstr "--negotiate-only 需要协议 v2" #: transport-helper.c +#, c-format +msgid "ignoring %s because the protocol does not support it." +msgstr "因协议不支持而忽略 %s" + +#: transport-helper.c msgid "'option' without a matching 'ok/error' directive" msgstr "'option' 缺乏一个匹配的 'ok/error' 指令" @@ -29488,7 +29988,7 @@ msgstr "" #: transport.c msgid "Aborting." -msgstr "正在终止。" +msgstr "正在中止。" #: transport.c msgid "failed to push all needed submodules" @@ -29750,7 +30250,7 @@ msgstr "" #: unpack-trees.c #, c-format msgid "Aborting\n" -msgstr "正在终止\n" +msgstr "正在中止\n" #: unpack-trees.c #, c-format @@ -30222,7 +30722,7 @@ msgstr " （解决冲突并运行 \"git commit\"）" # 译者：注意保持前导空格 #: wt-status.c msgid " (use \"git merge --abort\" to abort the merge)" -msgstr " （使用 \"git merge --abort\" 终止合并）" +msgstr " （使用 \"git merge --abort\" 中止合并）" #: wt-status.c msgid "All conflicts fixed but you are still merging." @@ -30702,7 +31202,7 @@ msgstr "致命错误：命令 '%s' 已终止，退出代码为 %d" #: git-send-email.perl msgid "the editor exited uncleanly, aborting everything" -msgstr "编辑器非正常退出，终止所有操作" +msgstr "编辑器非正常退出，中止所有操作" #: git-send-email.perl #, perl-format diff --git a/po/zh_TW.po b/po/zh_TW.po index fe31e18096..87a8faca93 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -20,19 +20,20 @@ # - Zhuang Ya <zhuangya AT me.com> # # Yi-Jyun Pan <pan93412@gmail.com>, 2021, 2022, 2023, 2024, 2025, 2026. -# Kaiyang Wu <self@origincode.me>, 2022. +# Kaiyang Wu <self@origincode.me>, 2022, 2026. # Lumynous <lumynou5.tw@gmail.com>, 2023, 2024, 2025, 2026. -# Kisaragi Hiu <mail@kisaragi-hiu.com>, 2024. -# Ngoo Ka-iu <willy04wu69@gmail.com>, 2024. -# Nightfeather Chen <slat@nightfeather.me>, 2024. -# hms5232 <hms5232@hhming.moe>, 2024, 2025. +# Kisaragi Hiu <mail@kisaragi-hiu.com>, 2024, 2026. +# Ngoo Ka-iu <willy04wu69@gmail.com>, 2024, 2026. +# Nightfeather Chen <slat@nightfeather.me>, 2024, 2026. +# hms5232 <hms5232@hhming.moe>, 2024, 2025, 2026. +# WellsTsai <admin@wellstsai.com>, 2026. msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2026-04-19 19:19+0800\n" -"PO-Revision-Date: 2026-04-19 13:40+0000\n" -"Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n" +"POT-Creation-Date: 2026-06-26 12:08+0800\n" +"PO-Revision-Date: 2026-06-28 14:21+0800\n" +"Last-Translator: Lumynous <lumynou5.tw@gmail.com>\n" "Language-Team: Chinese (Traditional Han script) <https://weblate.slat.org/" "projects/git-po/git-cli/zh_Hant/>\n" "Language: zh_TW\n" @@ -40,7 +41,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 5.16.2\n" +"X-Generator: Poedit 3.9\n" "X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://" "zhconvert.org\n" @@ -49,9 +50,7 @@ msgstr "" msgid "Huh (%s)?" msgstr "嗯（%s）？" -#: add-interactive.c add-interactive.c builtin/merge.c -#: builtin/rebase.c builtin/rebase.c reset.c sequencer.c -#: sequencer.c sequencer.c +#: add-interactive.c builtin/merge.c builtin/rebase.c reset.c sequencer.c msgid "could not read index" msgstr "無法讀取索引" @@ -71,14 +70,12 @@ msgstr "未變更" msgid "Update" msgstr "更新" -#: add-interactive.c add-interactive.c add-interactive.c +#: add-interactive.c #, c-format msgid "could not stage '%s'" msgstr "無法暫存「%s」" -#: add-interactive.c add-interactive.c builtin/stash.c -#: builtin/stash.c builtin/stash.c builtin/stash.c -#: builtin/stash.c reset.c sequencer.c +#: add-interactive.c builtin/stash.c reset.c sequencer.c msgid "could not write index" msgstr "無法寫入索引" @@ -93,8 +90,7 @@ msgstr[0] "已更新 %d 個路徑\n" msgid "note: %s is untracked now.\n" msgstr "註：現已不再追蹤 %s。\n" -#: add-interactive.c apply.c builtin/checkout.c -#: builtin/reset.c +#: add-interactive.c apply.c builtin/checkout.c builtin/reset.c #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "對「%s」路徑執行 make_cache_entry 失敗" @@ -175,7 +171,7 @@ msgstr "檢視 HEAD 及索引之間的差異" msgid "add contents of untracked files to the staged set of changes" msgstr "將未追蹤檔案的內容加入至變更暫存集" -#: add-interactive.c add-interactive.c +#: add-interactive.c msgid "Prompt help:" msgstr "提示說明：" @@ -191,7 +187,7 @@ msgstr "選取範圍中項目" msgid "select multiple ranges" msgstr "選取多個範圍" -#: add-interactive.c add-interactive.c +#: add-interactive.c msgid "select item based on unique prefix" msgstr "根據獨特前綴選取項目" @@ -231,11 +227,9 @@ msgstr "已暫存" msgid "unstaged" msgstr "未暫存" -#: add-interactive.c apply.c apply.c builtin/am.c -#: builtin/am.c builtin/bugreport.c builtin/clone.c -#: builtin/diagnose.c builtin/fetch.c builtin/hook.c -#: builtin/merge.c builtin/pull.c builtin/submodule--helper.c -#: builtin/submodule--helper.c +#: add-interactive.c apply.c builtin/am.c builtin/bugreport.c builtin/clone.c +#: builtin/diagnose.c builtin/fetch.c builtin/hook.c builtin/merge.c +#: builtin/pull.c builtin/submodule--helper.c msgid "path" msgstr "路徑" @@ -268,13 +262,13 @@ msgstr "暫存加入動作%s [y,n,q,a,d%s,?]? " msgid "Stage this hunk%s [y,n,q,a,d%s,?]? " msgstr "暫存此區塊%s [y,n,q,a,d%s,?]? " -#: add-patch.c add-patch.c +#: add-patch.c msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "staging." msgstr "如果修補檔能完全套用，編輯區塊將立即標記為暫存。" -#: add-patch.c add-patch.c +#: add-patch.c msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -388,7 +382,7 @@ msgstr "將加入動作套用至索引%s [y,n,q,a,d%s,?]? " msgid "Apply this hunk to index%s [y,n,q,a,d%s,?]? " msgstr "將此區塊套用到索引%s [y,n,q,a,d%s,?]? " -#: add-patch.c add-patch.c add-patch.c +#: add-patch.c msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "applying." @@ -408,33 +402,33 @@ msgstr "" "a - 套用此區塊和本檔案中後面的全部區塊\n" "d - 不要套用此區塊和本檔案中後面的全部區塊\n" -#: add-patch.c add-patch.c +#: add-patch.c #, c-format msgid "Discard mode change from worktree%s [y,n,q,a,d%s,?]? " msgstr "從工作區捨棄模式變更%s [y,n,q,a,d%s,?]？ " -#: add-patch.c add-patch.c +#: add-patch.c #, c-format msgid "Discard deletion from worktree%s [y,n,q,a,d%s,?]? " msgstr "從工作區捨棄刪除動作%s [y,n,q,a,d%s,?]? " -#: add-patch.c add-patch.c +#: add-patch.c #, c-format msgid "Discard addition from worktree%s [y,n,q,a,d%s,?]? " msgstr "從工作區捨棄加入動作%s [y,n,q,a,d%s,?]? " -#: add-patch.c add-patch.c +#: add-patch.c #, c-format msgid "Discard this hunk from worktree%s [y,n,q,a,d%s,?]? " msgstr "從工作區捨棄此區塊%s [y,n,q,a,d%s,?]? " -#: add-patch.c add-patch.c add-patch.c +#: add-patch.c msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "discarding." msgstr "如果修補檔能完全套用，編輯區塊將立即標記為捨棄。" -#: add-patch.c add-patch.c +#: add-patch.c msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -550,7 +544,7 @@ msgstr "" "a - 套用此區塊和本檔案中後面的全部區塊\n" "d - 不要套用此區塊和本檔案中後面的全部區塊\n" -#: add-patch.c add-patch.c add-patch.c add-patch.c +#: add-patch.c #, c-format msgid "%s cannot be negative" msgstr "%s 不能是負數" @@ -723,11 +717,11 @@ msgstr "沒有下一個檔案" msgid "No previous file" msgstr "沒有上一個檔案" -#: add-patch.c add-patch.c +#: add-patch.c msgid "No other hunk" msgstr "沒有其他區塊" -#: add-patch.c add-patch.c +#: add-patch.c msgid "No other undecided hunk" msgstr "沒有其他未決區塊" @@ -994,12 +988,9 @@ msgstr "命令列以 \\ 結尾" msgid "unclosed quote" msgstr "未閉合的引號" -#: alias.c builtin/cat-file.c builtin/notes.c builtin/notes.c -#: builtin/notes.c builtin/notes.c builtin/notes.c -#: builtin/notes.c builtin/notes.c builtin/notes.c -#: builtin/notes.c builtin/prune-packed.c builtin/receive-pack.c -#: builtin/refs.c builtin/repo.c builtin/tag.c -#: t/helper/test-pkt-line.c +#: alias.c builtin/cat-file.c builtin/name-rev.c builtin/notes.c +#: builtin/prune-packed.c builtin/receive-pack.c builtin/refs.c builtin/repo.c +#: builtin/tag.c t/helper/test-pkt-line.c msgid "too many arguments" msgstr "引數過多" @@ -1013,37 +1004,20 @@ msgstr "無法識別空白字元選項「%s」" msgid "unrecognized whitespace ignore option '%s'" msgstr "無法辨識空白字元忽略選項「%s」" -#: apply.c archive.c builtin/add.c builtin/add.c -#: builtin/add.c builtin/add.c builtin/branch.c -#: builtin/checkout-index.c builtin/checkout.c builtin/checkout.c -#: builtin/checkout.c builtin/checkout.c builtin/checkout.c -#: builtin/clean.c builtin/clone.c builtin/clone.c -#: builtin/commit.c builtin/commit.c builtin/commit.c -#: builtin/commit.c builtin/commit.c builtin/describe.c -#: builtin/diff-tree.c builtin/difftool.c builtin/fast-export.c -#: builtin/fetch.c builtin/fetch.c builtin/fetch.c -#: builtin/fetch.c builtin/help.c builtin/index-pack.c -#: builtin/init-db.c builtin/log.c builtin/log.c -#: builtin/ls-files.c builtin/merge-base.c builtin/merge-base.c -#: builtin/merge-tree.c builtin/merge.c builtin/merge.c -#: builtin/rebase.c builtin/rebase.c builtin/rebase.c -#: builtin/repack.c builtin/reset.c builtin/reset.c -#: builtin/rev-parse.c builtin/rev-parse.c builtin/rev-parse.c -#: builtin/show-branch.c builtin/show-branch.c builtin/stash.c -#: builtin/stash.c builtin/submodule--helper.c -#: builtin/submodule--helper.c builtin/tag.c builtin/tag.c -#: builtin/worktree.c builtin/worktree.c builtin/worktree.c -#: builtin/worktree.c builtin/worktree.c builtin/worktree.c -#: parse-options.c parse-options.c range-diff.c revision.c -#: revision.c revision.c revision.c revision.c -#: revision.c revision.c revision.c revision.c -#: revision.c revision.c revision.c revision.c -#: revision.c +#: apply.c archive.c builtin/add.c builtin/branch.c builtin/checkout-index.c +#: builtin/checkout.c builtin/clean.c builtin/clone.c builtin/commit.c +#: builtin/describe.c builtin/diff-tree.c builtin/difftool.c +#: builtin/fast-export.c builtin/fetch.c builtin/help.c builtin/index-pack.c +#: builtin/init-db.c builtin/log.c builtin/ls-files.c builtin/merge-base.c +#: builtin/merge-tree.c builtin/merge.c builtin/rebase.c builtin/repack.c +#: builtin/reset.c builtin/rev-parse.c builtin/show-branch.c builtin/stash.c +#: builtin/submodule--helper.c builtin/tag.c builtin/worktree.c parse-options.c +#: range-diff.c revision.c #, c-format msgid "options '%s' and '%s' cannot be used together" msgstr "無法同時使用「%s」和「%s」選項" -#: apply.c apply.c apply.c +#: apply.c #, c-format msgid "'%s' outside a repository" msgstr "「%s」在版本庫之外" @@ -1297,8 +1271,7 @@ msgstr "修補失敗：%s:%ld" msgid "cannot checkout %s" msgstr "無法簽出 %s" -#: apply.c apply.c apply.c midx.c pack-mtimes.c -#: pack-revindex.c setup.c +#: apply.c midx.c pack-mtimes.c pack-revindex.c setup.c #, c-format msgid "failed to read %s" msgstr "無法讀取 %s" @@ -1308,17 +1281,17 @@ msgstr "無法讀取 %s" msgid "reading from '%s' beyond a symbolic link" msgstr "讀取符號連結背後的「%s」" -#: apply.c apply.c +#: apply.c #, c-format msgid "path %s has been renamed/deleted" msgstr "路徑 %s 已被重新命名或刪除" -#: apply.c apply.c +#: apply.c #, c-format msgid "%s: does not exist in index" msgstr "%s：不在索引中" -#: apply.c apply.c apply.c +#: apply.c #, c-format msgid "%s: does not match index" msgstr "%s：與索引不符" @@ -1332,7 +1305,7 @@ msgstr "版本庫缺少用來進行三方合併，所需要的資料物件。" msgid "Performing three-way merge...\n" msgstr "正在進行三方合併……\n" -#: apply.c apply.c +#: apply.c #, c-format msgid "cannot read the current contents of '%s'" msgstr "無法讀取「%s」目前的內容" @@ -1371,9 +1344,7 @@ msgstr "%s：錯誤類型" msgid "%s has type %o, expected %o" msgstr "%s 的類型是 %o，預期是 %o" -#: apply.c apply.c builtin/fast-import.c -#: builtin/fast-import.c read-cache.c read-cache.c -#: read-cache.c +#: apply.c builtin/fast-import.c read-cache.c #, c-format msgid "invalid path '%s'" msgstr "路徑「%s」無效" @@ -1398,7 +1369,7 @@ msgstr "%2$s 的新模式（%1$o）和舊模式（%3$o）不符" msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "%2$s 的新模式（%1$o）和 %4$s 的舊模式（%3$o）不符" -#: apply.c apply.c +#: apply.c #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "受影響的檔案「%s」在符號連結後" @@ -1458,12 +1429,12 @@ msgstr "無法對剛建立的檔案「%s」執行 stat" msgid "unable to create backing store for newly created file %s" msgstr "無法對剛建立的檔案 %s 建立後端儲存" -#: apply.c apply.c +#: apply.c #, c-format msgid "unable to add cache entry for %s" msgstr "無法為 %s 加入快取項目" -#: apply.c builtin/bisect.c builtin/gc.c builtin/gc.c +#: apply.c builtin/bisect.c builtin/gc.c #, c-format msgid "failed to write to '%s'" msgstr "無法寫入「%s」" @@ -1493,7 +1464,7 @@ msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "套用修補檔 %%s，其中 %d 個被拒絕……" -#: apply.c apply.c apply.c +#: apply.c #, c-format msgid "cannot open %s" msgstr "無法開啟 %s" @@ -1547,7 +1518,7 @@ msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "抑制下仍有 %d 個空白字元誤用" -#: apply.c apply.c +#: apply.c #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -1647,9 +1618,8 @@ msgstr "路徑以 NUL 字元分隔" msgid "ensure at least <n> lines of context match" msgstr "確保至少符合 <n> 列上下文" -#: apply.c builtin/am.c builtin/am.c -#: builtin/interpret-trailers.c builtin/interpret-trailers.c -#: builtin/pack-objects.c builtin/rebase.c +#: apply.c builtin/am.c builtin/interpret-trailers.c builtin/pack-objects.c +#: builtin/rebase.c msgid "action" msgstr "動作" @@ -1657,7 +1627,7 @@ msgstr "動作" msgid "detect new or modified lines that have whitespace errors" msgstr "檢查新增和修改的列中間，是否有空白字元誤用" -#: apply.c apply.c +#: apply.c msgid "ignore changes in whitespace when finding context" msgstr "尋找上下文時忽略空白字元變更" @@ -1712,7 +1682,6 @@ msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "不支援的檔案模式：0%o (SHA1：%s)" #: archive-tar.c archive-zip.c builtin/pack-objects.c -#: builtin/pack-objects.c #, c-format msgid "deflate error (%d)" msgstr "壓縮錯誤 (%d)" @@ -1760,9 +1729,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <repo> [--exec <cmd>] --list" -#: archive.c archive.c builtin/fast-import.c -#: builtin/fast-import.c builtin/gc.c builtin/notes.c -#: builtin/tag.c +#: archive.c builtin/fast-import.c builtin/gc.c builtin/notes.c builtin/tag.c #, c-format msgid "cannot read '%s'" msgstr "無法讀取「%s」" @@ -1772,7 +1739,7 @@ msgstr "無法讀取「%s」" msgid "pathspec '%s' matches files outside the current directory" msgstr "符合路徑規格「%s」的檔案在目前目錄之外" -#: archive.c builtin/add.c builtin/add.c builtin/rm.c +#: archive.c builtin/add.c builtin/rm.c #, c-format msgid "pathspec '%s' did not match any files" msgstr "路徑規格「%s」未符合任何檔案" @@ -1838,17 +1805,13 @@ msgstr "前綴" msgid "prepend prefix to each pathname in the archive" msgstr "為封存中的每個路徑名稱加上前綴" -#: archive.c archive.c builtin/blame.c builtin/blame.c -#: builtin/blame.c builtin/commit-tree.c builtin/config.c -#: builtin/fast-export.c builtin/fast-export.c -#: builtin/fast-export.c builtin/gc.c builtin/gc.c -#: builtin/grep.c builtin/hash-object.c builtin/ls-files.c -#: builtin/ls-files.c builtin/notes.c builtin/notes.c -#: builtin/read-tree.c parse-options.h +#: archive.c builtin/blame.c builtin/commit-tree.c builtin/config.c +#: builtin/fast-export.c builtin/gc.c builtin/grep.c builtin/hash-object.c +#: builtin/ls-files.c builtin/notes.c builtin/read-tree.c parse-options.h msgid "file" msgstr "file" -#: archive.c archive.c +#: archive.c msgid "add untracked file to archive" msgstr "將未追蹤檔案加進封存" @@ -1868,8 +1831,8 @@ msgstr "讀取工作目錄中的 .gitattributes" msgid "report archived files on stderr" msgstr "在 stderr 上回報封存的檔案" -#: archive.c builtin/clone.c builtin/fetch.c -#: builtin/pack-objects.c builtin/pack-objects.c builtin/pull.c +#: archive.c builtin/clone.c builtin/fetch.c builtin/pack-objects.c +#: builtin/pull.c msgid "time" msgstr "time" @@ -1885,8 +1848,7 @@ msgstr "設定壓縮級別" msgid "list supported archive formats" msgstr "列出支援的封存格式" -#: archive.c builtin/archive.c builtin/clone.c builtin/clone.c -#: builtin/submodule--helper.c builtin/submodule--helper.c +#: archive.c builtin/archive.c builtin/clone.c builtin/submodule--helper.c msgid "repo" msgstr "repo" @@ -1894,8 +1856,7 @@ msgstr "repo" msgid "retrieve the archive from remote repository <repo>" msgstr "從遠端版本庫 <repo> 擷取封存檔案" -#: archive.c builtin/archive.c builtin/difftool.c -#: builtin/notes.c +#: archive.c builtin/archive.c builtin/difftool.c builtin/notes.c msgid "command" msgstr "command" @@ -1907,18 +1868,10 @@ msgstr "遠端 git-upload-archive 命令的路徑" msgid "Unexpected option --remote" msgstr "非預期選項 --remote" -#: archive.c builtin/add.c builtin/add.c builtin/add.c -#: builtin/add.c builtin/add.c builtin/checkout.c -#: builtin/checkout.c builtin/checkout.c builtin/checkout.c -#: builtin/clone.c builtin/clone.c builtin/commit.c -#: builtin/commit.c builtin/commit.c builtin/fast-export.c -#: builtin/index-pack.c builtin/log.c builtin/reset.c -#: builtin/reset.c builtin/reset.c builtin/reset.c -#: builtin/reset.c builtin/rm.c builtin/stash.c -#: builtin/stash.c builtin/stash.c builtin/stash.c -#: builtin/stash.c builtin/stash.c builtin/stash.c -#: builtin/worktree.c builtin/worktree.c fetch-pack.c -#: http-fetch.c http-fetch.c revision.c +#: archive.c builtin/add.c builtin/checkout.c builtin/clone.c builtin/commit.c +#: builtin/fast-export.c builtin/index-pack.c builtin/log.c builtin/reset.c +#: builtin/rm.c builtin/stash.c builtin/worktree.c fetch-pack.c http-fetch.c +#: revision.c #, c-format msgid "the option '%s' requires '%s'" msgstr "「%s」選項需要「%s」" @@ -1997,10 +1950,8 @@ msgstr "無效的 --attr-source 或 GIT_ATTR_SOURCE" msgid "unable to stat '%s'" msgstr "無法 stat「%s」" -#: bisect.c builtin/cat-file.c builtin/cat-file.c -#: builtin/index-pack.c builtin/notes.c builtin/pack-objects.c -#: builtin/pack-objects.c builtin/pack-objects.c combine-diff.c -#: object-file.c object-file.c rerere.c +#: bisect.c builtin/cat-file.c builtin/index-pack.c builtin/notes.c +#: builtin/pack-objects.c combine-diff.c object-file.c rerere.c #, c-format msgid "unable to read %s" msgstr "無法讀取 %s" @@ -2041,33 +1992,33 @@ msgstr "" #: bisect.c #, c-format msgid "" -"The merge base %s is %s.\n" +"The merge base %s is '%s'.\n" "This means the first '%s' commit is between %s and [%s].\n" msgstr "" -"合併基礎 %s 是 %s。\n" -"這意味著第一個「%s」提交位於 %s 和 [%s] 之間。\n" +"合併基底 %s 是「%s」。\n" +"這代表第一個「%s」提交位於 %s 和 [%s] 之間。\n" #: bisect.c #, c-format msgid "" -"Some %s revs are not ancestors of the %s rev.\n" +"Some '%s' revs are not ancestors of the '%s' rev.\n" "git bisect cannot work properly in this case.\n" -"Maybe you mistook %s and %s revs?\n" +"Maybe you mistook '%s' and '%s' revs?\n" msgstr "" -"部分 %s 修訂版不是 %s 修訂版的祖先。\n" +"部分「%s」修訂版不是「%s」修訂版的祖先。\n" "這種情況下 git bisect 無法正常運作。\n" -"您可能弄錯了 %s 和 %s 修訂版？\n" +"您可能弄錯了「%s」和「%s」修訂版？\n" #: bisect.c #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" -"So we cannot be sure the first %s commit is between %s and %s.\n" +"So we cannot be sure the first '%s' commit is between %s and %s.\n" "We continue anyway." msgstr "" -"介於 %s 和 [%s] 的合併基礎一定被略過了。\n" -"所以我們無法確認第一個 %s 提交是否介於 %s 和 %s 之間。\n" -"我們仍舊繼續。" +"介於 %s 和 [%s] 之間的合併基底一定被略過了。\n" +"所以第一個「%s」提交無法確認是否介於 %s 和 %s 之間。\n" +"將依然繼續。" #: bisect.c #, c-format @@ -2076,8 +2027,8 @@ msgstr "二分搜尋中：合併基礎必須經過測試\n" #: bisect.c #, c-format -msgid "a %s revision is needed" -msgstr "需要一個 %s 修訂版" +msgid "a '%s' revision is needed" +msgstr "需要一個「%s」修訂版" #: bisect.c #, c-format @@ -2100,8 +2051,8 @@ msgstr "無法讀取二分搜尋的引用" #: bisect.c #, c-format -msgid "%s was both %s and %s\n" -msgstr "%s 同時為 %s 和 %s\n" +msgid "%s was both '%s' and '%s'\n" +msgstr "%s 同時為「%s」和「%s」\n" #: bisect.c #, c-format @@ -2135,21 +2086,16 @@ msgstr "--contents 和 --reverse 不能混用。" msgid "--reverse and --first-parent together require specified latest commit" msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交" -#: blame.c builtin/bisect.c builtin/bisect.c -#: builtin/commit.c builtin/fast-export.c builtin/log.c -#: builtin/log.c builtin/log.c builtin/log.c builtin/log.c -#: builtin/merge.c builtin/pack-objects.c builtin/pack-objects.c -#: builtin/pack-objects.c builtin/pack-objects.c -#: builtin/shortlog.c midx-write.c pack-bitmap.c -#: pack-bitmap.c remote.c sequencer.c sequencer.c -#: submodule.c +#: blame.c builtin/bisect.c builtin/commit.c builtin/fast-export.c +#: builtin/log.c builtin/merge.c builtin/pack-objects.c builtin/shortlog.c +#: midx-write.c pack-bitmap.c remote.c sequencer.c submodule.c msgid "revision walk setup failed" msgstr "修訂版遍歷設定失敗" #: blame.c msgid "" "--reverse --first-parent together require range along first-parent chain" -msgstr "--reverse 和 --first-parent 共用，需要第一上級鏈的提交範圍" +msgstr "--reverse 和 --first-parent 一起使用時需要沿第一親代鏈選擇範圍" #: blame.c #, c-format @@ -2217,12 +2163,10 @@ msgid "not tracking: ambiguous information for ref '%s'" msgstr "未追蹤：「%s」引用有歧義" # 譯者：為保證在輸出中對齊，注意調整句中空格！ -#. #-#-#-#-# branch.c.po #-#-#-#-# #. TRANSLATORS: This is a line listing a remote with duplicate #. refspecs in the advice message below. For RTL languages you'll #. probably want to swap the "%s" and leading " " space around. #. -#. #-#-#-#-# object-name.c.po #-#-#-#-# #. TRANSLATORS: This is line item of ambiguous object output #. from describe_ambiguous_object() above. For RTL languages #. you'll probably want to swap the "%s" and leading " " space @@ -2304,8 +2248,7 @@ msgstr "" "並建立兩個分支間的追蹤關係，您可能需要使用 `git push -u`\n" "推送分支並設定和上游的關聯。" -#: branch.c builtin/replace.c builtin/replace.c -#: builtin/replace.c builtin/replace.c +#: branch.c builtin/replace.c #, c-format msgid "not a valid object name: '%s'" msgstr "物件名稱無效：「%s」" @@ -2334,7 +2277,7 @@ msgstr "" "您可以使用「git checkout --no-recurse-submodules %s && git submodule update " "--init」命令嘗試更新子模組" -#: branch.c branch.c +#: branch.c #, c-format msgid "submodule '%s': cannot create branch '%s'" msgstr "「%s」子模組：無法建立「%s」分支" @@ -2384,15 +2327,14 @@ msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "下列路徑根據其中一個 .gitignore 檔案而被忽略：\n" #: builtin/add.c builtin/clean.c builtin/fetch.c builtin/mv.c -#: builtin/prune-packed.c builtin/pull.c builtin/push.c -#: builtin/remote.c builtin/rm.c builtin/send-pack.c -#: builtin/sparse-checkout.c +#: builtin/prune-packed.c builtin/pull.c builtin/push.c builtin/remote.c +#: builtin/rm.c builtin/send-pack.c builtin/sparse-checkout.c msgid "dry run" msgstr "測試執行" #: builtin/add.c builtin/check-ignore.c builtin/commit.c -#: builtin/count-objects.c builtin/fsck.c builtin/log.c -#: builtin/mv.c builtin/read-tree.c builtin/refs.c +#: builtin/count-objects.c builtin/fsck.c builtin/log.c builtin/mv.c +#: builtin/read-tree.c builtin/refs.c msgid "be verbose" msgstr "詳細輸出" @@ -2404,8 +2346,7 @@ msgstr "互動式挑選" msgid "select hunks interactively" msgstr "互動式選取區塊" -#: builtin/add.c builtin/checkout.c builtin/reset.c -#: builtin/stash.c builtin/stash.c +#: builtin/add.c builtin/checkout.c builtin/reset.c builtin/stash.c msgid "auto advance to the next file when selecting hunks interactively" msgstr "在互動式選取區塊時自動前往下一個檔案" @@ -2505,10 +2446,8 @@ msgstr "如果您確定想要加入它們，請使用 -f。" msgid "adding files failed" msgstr "加入檔案失敗" -#: builtin/add.c builtin/add.c builtin/checkout.c -#: builtin/checkout.c builtin/commit.c builtin/commit.c -#: builtin/reset.c builtin/reset.c builtin/stash.c -#: builtin/stash.c builtin/stash.c builtin/stash.c +#: builtin/add.c builtin/checkout.c builtin/commit.c builtin/reset.c +#: builtin/stash.c #, c-format msgid "'%s' cannot be negative" msgstr "「%s」不能是負數" @@ -2518,8 +2457,8 @@ msgstr "「%s」不能是負數" msgid "--chmod param '%s' must be either -x or +x" msgstr "--chmod 的參數「%s」必須是 -x 或 +x" -#: builtin/add.c builtin/checkout.c builtin/commit.c -#: builtin/reset.c builtin/rm.c builtin/stash.c +#: builtin/add.c builtin/checkout.c builtin/commit.c builtin/reset.c +#: builtin/rm.c builtin/stash.c #, c-format msgid "'%s' and pathspec arguments cannot be used together" msgstr "「%s」和路徑規格引數不得同時使用" @@ -2533,19 +2472,15 @@ msgstr "沒有指定，亦未加入檔案。\n" msgid "Maybe you wanted to say 'git add .'?" msgstr "也許您想要執行的是「git add .」？" -#: builtin/add.c builtin/check-ignore.c builtin/checkout.c -#: builtin/checkout.c builtin/clean.c builtin/commit.c -#: builtin/diff-tree.c builtin/grep.c builtin/mv.c -#: builtin/reset.c builtin/rm.c builtin/submodule--helper.c -#: builtin/submodule--helper.c read-cache.c read-cache.c -#: rerere.c rerere.c rerere.c submodule.c +#: builtin/add.c builtin/check-ignore.c builtin/checkout.c builtin/clean.c +#: builtin/commit.c builtin/diff-tree.c builtin/grep.c builtin/mv.c +#: builtin/reset.c builtin/rm.c builtin/submodule--helper.c read-cache.c +#: rerere.c submodule.c msgid "index file corrupt" msgstr "索引檔案損壞" -#: builtin/add.c builtin/am.c builtin/am.c builtin/checkout.c -#: builtin/checkout.c builtin/clone.c builtin/commit.c -#: builtin/commit.c builtin/commit.c builtin/history.c -#: builtin/stash.c merge.c rerere.c +#: builtin/add.c builtin/am.c builtin/checkout.c builtin/clone.c +#: builtin/commit.c builtin/history.c builtin/stash.c merge.c rerere.c msgid "unable to write new index file" msgstr "無法寫入新的索引檔案" @@ -2554,18 +2489,14 @@ msgstr "無法寫入新的索引檔案" msgid "bad action '%s' for '%s'" msgstr "「%s」動作對「%s」無效" -#: builtin/am.c builtin/am.c builtin/am.c builtin/blame.c -#: builtin/blame.c builtin/fetch.c builtin/pack-objects.c -#: builtin/pack-objects.c builtin/pull.c builtin/pull.c -#: builtin/pull.c builtin/revert.c diff-merges.c diff.c -#: environment.c gpg-interface.c gpg-interface.c ls-refs.c -#: parallel-checkout.c sequencer.c setup.c setup.c setup.c +#: builtin/am.c builtin/blame.c builtin/fetch.c builtin/pack-objects.c +#: builtin/pull.c builtin/revert.c diff-merges.c diff.c environment.c +#: gpg-interface.c ls-refs.c parallel-checkout.c sequencer.c setup.c #, c-format msgid "invalid value for '%s': '%s'" msgstr "「%s」的值無效：「%s」" -#: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c -#: sequencer.c sequencer.c sequencer.c trailer.c +#: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c trailer.c #, c-format msgid "could not read '%s'" msgstr "無法讀取「%s」" @@ -2574,7 +2505,6 @@ msgstr "無法讀取「%s」" msgid "could not parse author script" msgstr "無法解析作者文稿" -#: builtin/am.c builtin/am.c builtin/am.c builtin/am.c #: builtin/am.c builtin/replace.c commit.c sequencer.c #, c-format msgid "could not parse %s" @@ -2599,14 +2529,12 @@ msgstr "從「%s」複製註解到「%s」失敗" msgid "fseek failed" msgstr "fseek 失敗" -#: builtin/am.c builtin/am.c builtin/rebase.c sequencer.c -#: wrapper.c wrapper.c +#: builtin/am.c builtin/rebase.c sequencer.c wrapper.c #, c-format msgid "could not open '%s' for reading" msgstr "無法開啟「%s」進行讀取" -#: builtin/am.c builtin/rebase.c editor.c sequencer.c -#: wrapper.c wrapper.c +#: builtin/am.c builtin/rebase.c editor.c sequencer.c wrapper.c #, c-format msgid "could not open '%s' for writing" msgstr "無法開啟「%s」進行寫入" @@ -2624,7 +2552,7 @@ msgstr "一次只能套用一個 StGIT 修補檔序列" msgid "invalid timestamp" msgstr "無效的時間戳" -#: builtin/am.c builtin/am.c +#: builtin/am.c msgid "invalid Date line" msgstr "無效的 Date 列" @@ -2680,8 +2608,7 @@ msgstr "在提交 %s 中缺少作者列" msgid "invalid ident line: %.*s" msgstr "ident 列無效：%.*s" -#: builtin/am.c builtin/checkout.c builtin/clone.c -#: commit-graph.c +#: builtin/am.c builtin/checkout.c builtin/clone.c commit-graph.c #, c-format msgid "unable to parse commit %s" msgstr "無法解析 %s 提交" @@ -2718,12 +2645,11 @@ msgstr "git write-tree 無法寫入樹狀物件" msgid "applying to an empty history" msgstr "正在套用至空白歷史記錄上" -#: builtin/am.c builtin/commit.c builtin/merge.c -#: builtin/merge.c replay.c sequencer.c +#: builtin/am.c builtin/commit.c builtin/merge.c replay.c sequencer.c msgid "failed to write commit object" msgstr "無法寫入提交物件" -#: builtin/am.c builtin/am.c +#: builtin/am.c #, c-format msgid "cannot resume: %s does not exist." msgstr "無法繼續：%s 不存在。" @@ -2765,7 +2691,7 @@ msgstr "建立空白提交：%.*s" msgid "Patch is empty." msgstr "修補檔空白。" -#: builtin/am.c builtin/am.c +#: builtin/am.c #, c-format msgid "Applying: %.*s" msgstr "套用：%.*s" @@ -2808,13 +2734,12 @@ msgstr "" "您應該對已經解決衝突的每一個檔案執行 `git add`，標記為已經完成。\n" "你可以對「由他們刪除」的檔案，執行 `git rm` 指令。" -#: builtin/am.c builtin/am.c builtin/am.c builtin/reset.c -#: builtin/reset.c +#: builtin/am.c builtin/reset.c #, c-format msgid "Could not parse object '%s'." msgstr "無法解析物件「%s」。" -#: builtin/am.c builtin/am.c +#: builtin/am.c msgid "failed to clean index" msgstr "無法清除索引" @@ -2855,8 +2780,8 @@ msgstr "歷史遺留選項——無作用" msgid "allow fall back on 3way merging if needed" msgstr "必要時允許回復至三方合併" -#: builtin/am.c builtin/init-db.c builtin/prune-packed.c -#: builtin/repack.c builtin/stash.c +#: builtin/am.c builtin/init-db.c builtin/prune-packed.c builtin/repack.c +#: builtin/stash.c msgid "be quiet" msgstr "靜默模式" @@ -2892,30 +2817,21 @@ msgstr "截掉裁切線前的所有內容" msgid "pass it through git-mailinfo" msgstr "透過 git-mailinfo 傳入" -#: builtin/am.c builtin/am.c builtin/am.c builtin/am.c -#: builtin/am.c builtin/am.c builtin/am.c builtin/am.c #: builtin/am.c msgid "pass it through git-apply" msgstr "透過 git-apply 傳入" -#: builtin/am.c builtin/commit.c builtin/fmt-merge-msg.c -#: builtin/fmt-merge-msg.c builtin/grep.c builtin/merge.c -#: builtin/pull.c builtin/pull.c builtin/pull.c -#: builtin/rebase.c builtin/repack.c builtin/repack.c -#: builtin/repack.c builtin/show-branch.c builtin/show-ref.c -#: builtin/tag.c parse-options.h parse-options.h -#: parse-options.h +#: builtin/am.c builtin/commit.c builtin/fmt-merge-msg.c builtin/grep.c +#: builtin/merge.c builtin/pull.c builtin/rebase.c builtin/repack.c +#: builtin/show-branch.c builtin/show-ref.c builtin/tag.c parse-options.h msgid "n" msgstr "n" -#: builtin/am.c builtin/branch.c builtin/bugreport.c -#: builtin/cat-file.c builtin/cat-file.c builtin/cat-file.c -#: builtin/clone.c builtin/diagnose.c builtin/for-each-ref.c -#: builtin/init-db.c builtin/ls-files.c builtin/ls-tree.c -#: builtin/refs.c builtin/replace.c builtin/repo.c -#: builtin/repo.c builtin/submodule--helper.c -#: builtin/submodule--helper.c builtin/submodule--helper.c -#: builtin/tag.c builtin/verify-tag.c +#: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c +#: builtin/clone.c builtin/diagnose.c builtin/for-each-ref.c builtin/init-db.c +#: builtin/ls-files.c builtin/ls-tree.c builtin/name-rev.c builtin/refs.c +#: builtin/replace.c builtin/repo.c builtin/submodule--helper.c builtin/tag.c +#: builtin/verify-tag.c msgid "format" msgstr "format" @@ -2967,9 +2883,8 @@ msgstr "將作者日期當作提交日期" msgid "use current timestamp for author date" msgstr "把目前時間戳當作是作者日期" -#: builtin/am.c builtin/commit-tree.c builtin/commit.c -#: builtin/merge.c builtin/pull.c builtin/rebase.c -#: builtin/revert.c builtin/tag.c +#: builtin/am.c builtin/commit-tree.c builtin/commit.c builtin/merge.c +#: builtin/pull.c builtin/rebase.c builtin/revert.c builtin/tag.c msgid "key-id" msgstr "key-id" @@ -3045,8 +2960,25 @@ msgid "git archive: expected a flush" msgstr "git archive：預期收到 flush 封包" #: builtin/backfill.c -msgid "git backfill [--min-batch-size=<n>] [--[no-]sparse]" -msgstr "git backfill [--min-batch-size=<n>] [--[no-]sparse]" +msgid "" +"git backfill [--min-batch-size=<n>] [--[no-]sparse] [--[no-]include-edges] " +"[<revision-range>]" +msgstr "" +"git backfill [--min-batch-size=<n>] [--[no-]sparse] [--[no-]include-edges] " +"[<revision-range>]" + +#: builtin/backfill.c +#, c-format +msgid "'%s' cannot be used with 'git backfill'" +msgstr "「%s」不能與「git backfill」同時使用" + +#: builtin/backfill.c +msgid "cannot backfill with these filter options" +msgstr "無法以這些過濾器選項回填" + +#: builtin/backfill.c +msgid "cannot backfill with blob size limits" +msgstr "無法帶資料物件大小限制回填" #: builtin/backfill.c msgid "problem loading sparse-checkout" @@ -3060,8 +2992,12 @@ msgstr "一次請求的最小物件數量" msgid "Restrict the missing objects to the current sparse-checkout" msgstr "將缺少的物件限制於目前的稀疏簽出" -#: builtin/backfill.c builtin/diff-pairs.c builtin/log.c -#: builtin/log.c builtin/replay.c builtin/shortlog.c bundle.c +#: builtin/backfill.c +msgid "Include blobs from boundary commits in the backfill" +msgstr "在回填時包含邊界提交的資料物件" + +#: builtin/backfill.c builtin/diff-pairs.c builtin/log.c builtin/replay.c +#: builtin/shortlog.c bundle.c #, c-format msgid "unrecognized argument: %s" msgstr "不認識的引數：%s" @@ -3118,21 +3054,21 @@ msgstr "無法開啟檔案「%s」來讀取" #: builtin/bisect.c #, c-format msgid "'%s' is not a valid term" -msgstr "「%s」不是有效的術語" +msgstr "「%s」不是有效的措詞" #: builtin/bisect.c #, c-format msgid "can't use the builtin command '%s' as a term" -msgstr "不能將內建命令「%s」當作術語使用" +msgstr "不能將內建命令「%s」當作措詞使用" #: builtin/bisect.c #, c-format msgid "can't change the meaning of the term '%s'" -msgstr "不能變更術語「%s」的含義" +msgstr "不能變更措詞「%s」的含義" #: builtin/bisect.c msgid "please use two different terms" -msgstr "請使用兩個不同的術語" +msgstr "請使用兩個不同的措詞" #: builtin/bisect.c #, c-format @@ -3168,7 +3104,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 @@ -3205,31 +3141,33 @@ msgid "Are you sure [Y/n]? " msgstr "是否確定 [Y/n]? " #: builtin/bisect.c -msgid "status: waiting for both good and bad commits\n" -msgstr "狀態：正在等待好和壞的提交\n" +#, c-format +msgid "status: waiting for both '%s' and '%s' commits\n" +msgstr "狀態：正在等待「%s」和「%s」提交\n" #: builtin/bisect.c #, c-format -msgid "status: waiting for bad commit, %d good commit known\n" -msgid_plural "status: waiting for bad commit, %d good commits known\n" -msgstr[0] "狀態：正在等待壞的提交，已知有 %d 個好的提交\n" +msgid "status: waiting for '%s' commit, %d '%s' commit known\n" +msgid_plural "status: waiting for '%s' commit, %d '%s' commits known\n" +msgstr[0] "狀態：正在等待「%s」提交，已知有 %d 個「%s」提交\n" #: builtin/bisect.c -msgid "status: waiting for good commit(s), bad commit known\n" -msgstr "狀態：正在等待好的提交，已知有壞的提交\n" +#, c-format +msgid "status: waiting for '%s' commit(s), '%s' commit known\n" +msgstr "狀態：正在等待「%s」提交，已知有「%s」提交\n" #: builtin/bisect.c msgid "no terms defined" -msgstr "未定義術語" +msgstr "未定義措詞" #: builtin/bisect.c #, c-format msgid "" -"Your current terms are %s for the old state\n" -"and %s for the new state.\n" +"Your current terms are '%s' for the old state\n" +"and '%s' for the new state.\n" msgstr "" -"您目前針對舊狀態的術語是 %s；\n" -"對新狀態的術語是 %s。\n" +"您目前對舊狀態的措詞是「%s」；\n" +"對新狀態的措詞是「%s」。\n" #: builtin/bisect.c #, c-format @@ -3245,9 +3183,9 @@ msgstr "" msgid "could not open '%s' for appending" msgstr "無法開啟「%s」進行附加" -#: builtin/bisect.c builtin/bisect.c +#: builtin/bisect.c msgid "'' is not a valid term" -msgstr "「 」不是有效術語" +msgstr "「」不是有效的措詞" #: builtin/bisect.c #, c-format @@ -3299,7 +3237,7 @@ msgstr "要呼叫 `--bisect-state`，請傳入一個以上的引數" msgid "'git bisect %s' can take only one argument." msgstr "「git bisect %s」只取一個引數。" -#: builtin/bisect.c builtin/bisect.c +#: builtin/bisect.c #, c-format msgid "Bad rev input: %s" msgstr "rev 輸入格式錯誤：%s" @@ -3334,13 +3272,13 @@ msgstr "二分搜尋執行失敗：沒有提供命令。" #: builtin/bisect.c #, c-format -msgid "unable to verify %s on good revision" -msgstr "無法在好的修訂版上驗證 %s" +msgid "unable to verify %s on '%s' revision" +msgstr "無法在「%2$s」修訂版上驗證 %1$s" #: builtin/bisect.c #, c-format -msgid "bogus exit code %d for good revision" -msgstr "好的修訂版回傳偽造的錯誤碼 %d" +msgid "bogus exit code %d for '%s' revision" +msgstr "處理「%2$s」修訂版時遇到了虛假的結束代碼 %1$d" #: builtin/bisect.c #, c-format @@ -3361,8 +3299,9 @@ msgid "bisect run success" msgstr "二分搜尋執行成功" #: builtin/bisect.c -msgid "bisect found first bad commit" -msgstr "二分搜尋發現到第一個有問題的提交" +#, c-format +msgid "bisect found first '%s' commit\n" +msgstr "二分搜尋找到了第一個「%s」提交\n" #: builtin/bisect.c #, c-format @@ -3410,7 +3349,7 @@ msgstr "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgid "git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>" -#: builtin/blame.c builtin/blame.c +#: builtin/blame.c msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<rev-opts> 的文件在 git-rev-list(1)" @@ -3423,7 +3362,7 @@ msgstr "預期是個顏色：%s" msgid "must end with a color" msgstr "結尾必須是一個顏色" -#: builtin/blame.c diff.c diff.c merge-ort.c transport.c +#: builtin/blame.c diff.c merge-ort.c transport.c #, c-format msgid "unknown value for config '%s': %s" msgstr "設定 '%s' 的取值未知：%s" @@ -3456,9 +3395,8 @@ msgstr "不把根提交當作邊界（預設值：off）" msgid "show work cost statistics" msgstr "顯示工作量統計" -#: builtin/blame.c builtin/checkout.c builtin/clone.c -#: builtin/commit-graph.c builtin/commit-graph.c builtin/fetch.c -#: builtin/merge.c builtin/multi-pack-index.c builtin/pull.c +#: builtin/blame.c builtin/checkout.c builtin/clone.c builtin/commit-graph.c +#: builtin/fetch.c builtin/merge.c builtin/multi-pack-index.c builtin/pull.c #: builtin/push.c builtin/remote.c builtin/send-pack.c msgid "force progress reporting" msgstr "強制顯示進度報告" @@ -3547,7 +3485,7 @@ msgstr "使用來自 <file> 的修訂集而不是呼叫 git-rev-list" msgid "use <file>'s contents as the final image" msgstr "將 <file> 的內容當成是最終印象" -#: builtin/blame.c builtin/blame.c +#: builtin/blame.c msgid "score" msgstr "score" @@ -3739,12 +3677,12 @@ msgstr "%s 工作區的 HEAD 指標未被更新" msgid "invalid branch name: '%s'" msgstr "分支名稱無效：「%s」" -#: builtin/branch.c builtin/branch.c builtin/branch.c +#: builtin/branch.c #, c-format msgid "no commit on branch '%s' yet" msgstr "分支「%s」尚無提交" -#: builtin/branch.c builtin/branch.c +#: builtin/branch.c #, c-format msgid "no branch named '%s'" msgstr "沒有名為「%s」的分支" @@ -3803,8 +3741,7 @@ msgstr "顯示雜湊值和主旨，若傳入兩次則顯示上游分支" msgid "suppress informational messages" msgstr "不顯示資訊訊息" -#: builtin/branch.c builtin/checkout.c -#: builtin/submodule--helper.c +#: builtin/branch.c builtin/checkout.c builtin/submodule--helper.c msgid "set branch tracking configuration" msgstr "設定分支追蹤組態" @@ -3832,11 +3769,11 @@ msgstr "使用彩色輸出" msgid "act on remote-tracking branches" msgstr "作用於遠端追蹤分支" -#: builtin/branch.c builtin/branch.c +#: builtin/branch.c msgid "print only branches that contain the commit" msgstr "只輸出包含此提交的分支" -#: builtin/branch.c builtin/branch.c +#: builtin/branch.c msgid "print only branches that don't contain the commit" msgstr "只輸出不包含此提交的分支" @@ -3908,9 +3845,7 @@ msgstr "只輸出尚未合併的分支" msgid "list branches in columns" msgstr "以行的形式列出分支" -#: builtin/branch.c builtin/for-each-ref.c builtin/notes.c -#: builtin/notes.c builtin/notes.c builtin/notes.c -#: builtin/tag.c +#: builtin/branch.c builtin/for-each-ref.c builtin/notes.c builtin/tag.c msgid "object" msgstr "object" @@ -3926,8 +3861,8 @@ msgstr "排序和過濾不區分大小寫" msgid "recurse through submodules" msgstr "在子模組中遞迴" -#: builtin/branch.c builtin/for-each-ref.c builtin/ls-files.c -#: builtin/ls-tree.c builtin/tag.c builtin/verify-tag.c +#: builtin/branch.c builtin/for-each-ref.c builtin/ls-files.c builtin/ls-tree.c +#: builtin/tag.c builtin/verify-tag.c msgid "format to use for the output" msgstr "輸出格式" @@ -3950,7 +3885,7 @@ msgstr "" msgid "--recurse-submodules can only be used to create branches" msgstr "--recurse-submodules 只能用來建立分支" -#: builtin/branch.c builtin/branch.c +#: builtin/branch.c msgid "branch name required" msgstr "必須提供分支名稱" @@ -3988,7 +3923,7 @@ msgid "" "could not set upstream of HEAD to %s when it does not point to any branch" msgstr "HEAD 不指向任何分支時無法將其上游設為 %s" -#: builtin/branch.c builtin/branch.c +#: builtin/branch.c #, c-format msgid "no such branch '%s'" msgstr "無「%s」分支" @@ -4086,10 +4021,8 @@ msgstr "" "請檢閱臭蟲報告下方的剩餘部分。\n" "您可刪除任何您不想分享的地方。\n" -#: builtin/bugreport.c builtin/commit.c builtin/commit.c -#: builtin/commit.c builtin/fast-export.c builtin/fast-export.c -#: builtin/fast-export.c builtin/fast-export.c -#: builtin/pack-objects.c builtin/rebase.c builtin/replay.c +#: builtin/bugreport.c builtin/commit.c builtin/fast-export.c +#: builtin/pack-objects.c builtin/rebase.c builtin/repack.c builtin/replay.c #: parse-options.h msgid "mode" msgstr "mode" @@ -4168,7 +4101,7 @@ msgstr "需要提供 <file> 引數" msgid "do not show progress meter" msgstr "不顯示進度列" -#: builtin/bundle.c builtin/bundle.c builtin/pack-objects.c +#: builtin/bundle.c builtin/pack-objects.c msgid "show progress meter" msgstr "顯示進度列" @@ -4215,6 +4148,11 @@ msgid "cannot read object %s '%s'" msgstr "無法讀取物件 %s「%s」" #: builtin/cat-file.c +#, c-format +msgid "mailmap: invalid boolean '%s'" +msgstr "mailmap：無效的布林值「%s」" + +#: builtin/cat-file.c msgid "flush is only for --buffer mode" msgstr "排清功能只能用於 --buffer 模式" @@ -4382,8 +4320,7 @@ msgstr "「%s=<%s>」需要「%s」或「%s」" msgid "path|tree-ish" msgstr "path|tree-ish" -#: builtin/cat-file.c builtin/cat-file.c builtin/cat-file.c -#: builtin/cat-file.c builtin/cat-file.c +#: builtin/cat-file.c #, c-format msgid "'%s' requires a batch mode" msgstr "「%s」需要批次處理模式" @@ -4397,7 +4334,7 @@ msgstr "「-%c」與批次處理模式不相容" msgid "batch modes take no arguments" msgstr "批次處理模式不取引數" -#: builtin/cat-file.c builtin/cat-file.c +#: builtin/cat-file.c #, c-format msgid "<rev> required with '%s'" msgstr "「%s」需要 <rev>" @@ -4450,8 +4387,7 @@ msgstr "<tree-ish>" msgid "which tree-ish to check attributes at" msgstr "要檢查屬性的樹狀物件指示元" -#: builtin/check-ignore.c builtin/checkout.c builtin/gc.c -#: builtin/worktree.c +#: builtin/check-ignore.c builtin/checkout.c builtin/gc.c builtin/worktree.c msgid "suppress progress reporting" msgstr "不顯示進度報告" @@ -4515,10 +4451,8 @@ msgstr "未指定聯絡地址" msgid "git checkout--worker [<options>]" msgstr "git checkout--worker [<options>]" -#: builtin/checkout--worker.c builtin/checkout-index.c -#: builtin/column.c builtin/column.c builtin/submodule--helper.c +#: builtin/checkout--worker.c builtin/checkout-index.c builtin/column.c #: builtin/submodule--helper.c builtin/worktree.c -#: builtin/worktree.c msgid "string" msgstr "string" @@ -4570,12 +4504,12 @@ msgstr "將內容寫入暫存檔" msgid "copy out the files from named stage" msgstr "從指定暫存區中拷出檔案" -#: builtin/checkout.c builtin/checkout.c +#: builtin/checkout.c #, c-format msgid "path '%s' does not have our version" msgstr "「%s」路徑沒有我們的版本" -#: builtin/checkout.c builtin/checkout.c +#: builtin/checkout.c #, c-format msgid "path '%s' does not have their version" msgstr "「%s」路徑沒有他們的版本" @@ -4618,7 +4552,6 @@ msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "已從索引區更新 %d 個路徑" -#: builtin/checkout.c builtin/checkout.c builtin/checkout.c #: builtin/checkout.c #, c-format msgid "'%s' cannot be used with updating paths" @@ -4639,7 +4572,7 @@ msgstr "「%s」或「%s」皆未指定" msgid "'%s' must be used when '%s' is not specified" msgstr "未指定「%2$s」時，必須使用「%1$s」" -#: builtin/checkout.c builtin/checkout.c +#: builtin/checkout.c #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "「%s」或「%s」不能與 %s 同時使用" @@ -4649,16 +4582,13 @@ msgstr "「%s」或「%s」不能與 %s 同時使用" msgid "'%s', '%s', or '%s' cannot be used when checking out of a tree" msgstr "「%s」、「%s」或「%s」不能在簽出樹狀物件時使用" -#: builtin/checkout.c builtin/checkout.c +#: builtin/checkout.c #, c-format msgid "path '%s' is unmerged" msgstr "路徑「%s」未合併" -#: builtin/checkout.c builtin/checkout.c builtin/checkout.c -#: builtin/grep.c builtin/grep.c builtin/grep.c -#: builtin/merge-tree.c builtin/merge-tree.c builtin/merge-tree.c -#: builtin/reset.c merge-ort.c reset.c sequencer.c -#: sequencer.c tree-walk.c +#: builtin/checkout.c builtin/grep.c builtin/merge-tree.c builtin/reset.c +#: merge-ort.c reset.c sequencer.c tree-walk.c #, c-format msgid "unable to read tree (%s)" msgstr "無法讀取樹狀物件（%s）" @@ -4669,15 +4599,6 @@ msgstr "您需要先解決目前索引區的衝突" #: builtin/checkout.c #, c-format -msgid "" -"cannot continue with staged changes in the following files:\n" -"%s" -msgstr "" -"無法繼續，下列檔案有暫存的變更：\n" -"%s" - -#: builtin/checkout.c -#, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "無法對「%s」執行 reflog 動作：%s\n" @@ -4685,7 +4606,7 @@ msgstr "無法對「%s」執行 reflog 動作：%s\n" msgid "HEAD is now at" msgstr "HEAD 目前位於" -#: builtin/checkout.c builtin/clone.c builtin/clone.c +#: builtin/checkout.c builtin/clone.c msgid "unable to update HEAD" msgstr "無法更新 HEAD" @@ -4704,7 +4625,7 @@ msgstr "已經位於「%s」\n" msgid "Switched to and reset branch '%s'\n" msgstr "已切換並重設分支「%s」\n" -#: builtin/checkout.c builtin/checkout.c +#: builtin/checkout.c #, c-format msgid "Switched to a new branch '%s'\n" msgstr "已切換至新分支「%s」\n" @@ -4767,12 +4688,17 @@ msgstr "在修訂版遍歷時遇到內部錯誤" msgid "Previous HEAD position was" msgstr "之前的 HEAD 指標位置在" -#: builtin/checkout.c builtin/checkout.c +#: builtin/checkout.c msgid "You are on a branch yet to be born" msgstr "您正位於一個尚未初始化的分支" #: builtin/checkout.c #, c-format +msgid "The following paths have local changes:\n" +msgstr "如下路徑有本機變更：\n" + +#: builtin/checkout.c +#, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" "Please use -- (and optionally --no-guess) to disambiguate" @@ -4815,12 +4741,12 @@ msgstr "預期只有一個引用" msgid "only one reference expected, %d given." msgstr "預期只有一個引用，卻提供了 %d 個。" -#: builtin/checkout.c builtin/worktree.c builtin/worktree.c +#: builtin/checkout.c builtin/worktree.c #, c-format msgid "invalid reference: %s" msgstr "無效引用：%s" -#: builtin/checkout.c builtin/checkout.c +#: builtin/checkout.c #, c-format msgid "reference is not a tree: %s" msgstr "引用不是樹狀物件：%s" @@ -4835,7 +4761,7 @@ msgstr "預期收到分支，卻收到標籤「%s」" msgid "a branch is expected, got remote branch '%s'" msgstr "預期收到分支，卻收到遠端分支「%s」" -#: builtin/checkout.c builtin/checkout.c +#: builtin/checkout.c #, c-format msgid "a branch is expected, got '%s'" msgstr "預期收到分支，卻收到「%s」" @@ -4898,7 +4824,7 @@ msgstr "在進行二分搜尋時切換分支" msgid "paths cannot be used with switching branches" msgstr "切換分支時不能指定路徑" -#: builtin/checkout.c builtin/checkout.c builtin/checkout.c +#: builtin/checkout.c #, c-format msgid "'%s' cannot be used with switching branches" msgstr "切換分支時不能指定「%s」" @@ -4908,8 +4834,7 @@ msgstr "切換分支時不能指定「%s」" msgid "'%s' needs the paths to check out" msgstr "「%s」需要指定要簽出的路徑" -#: builtin/checkout.c builtin/checkout.c builtin/checkout.c -#: builtin/checkout.c builtin/checkout.c +#: builtin/checkout.c #, c-format msgid "'%s' cannot be used with '%s'" msgstr "「%s」不能與「%s」同時使用" @@ -4937,8 +4862,7 @@ msgstr "未知的衝突輸出風格「%s」" msgid "perform a 3-way merge with the new branch" msgstr "和新分支進行三方合併" -#: builtin/checkout.c builtin/log.c builtin/range-diff.c -#: parse-options.h +#: builtin/checkout.c builtin/log.c builtin/range-diff.c parse-options.h msgid "style" msgstr "style" @@ -5042,12 +4966,8 @@ msgstr "" msgid "you must specify path(s) to restore" msgstr "您必須指定要還原的路徑" -#: builtin/checkout.c builtin/checkout.c builtin/checkout.c -#: builtin/checkout.c builtin/clone.c builtin/remote.c -#: builtin/remote.c builtin/replay.c builtin/replay.c -#: builtin/replay.c builtin/submodule--helper.c +#: builtin/checkout.c builtin/clone.c builtin/remote.c builtin/replay.c #: builtin/submodule--helper.c builtin/worktree.c -#: builtin/worktree.c msgid "branch" msgstr "branch" @@ -5255,11 +5175,9 @@ msgstr "互動式清除" msgid "remove whole directories" msgstr "移除整個目錄" -#: builtin/clean.c builtin/config.c builtin/config.c -#: builtin/config.c builtin/describe.c builtin/describe.c -#: builtin/grep.c builtin/log.c builtin/log.c -#: builtin/ls-files.c builtin/name-rev.c builtin/name-rev.c -#: builtin/show-ref.c pack-refs.c pack-refs.c ref-filter.h +#: builtin/clean.c builtin/config.c builtin/describe.c builtin/grep.c +#: builtin/log.c builtin/ls-files.c builtin/name-rev.c builtin/show-ref.c +#: pack-refs.c ref-filter.h msgid "pattern" msgstr "pattern" @@ -5284,8 +5202,7 @@ msgstr "clean.requireForce 是 true 且未給定 -f 選項：拒絕清理" 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 +#: builtin/clone.c builtin/diff.c builtin/rm.c grep.c setup.c #, c-format msgid "failed to stat '%s'" msgstr "對「%s」呼叫 stat 失敗" @@ -5396,7 +5313,7 @@ msgstr "不要拓製淺層版本庫" msgid "don't create a checkout" msgstr "不要建立簽出" -#: builtin/clone.c builtin/clone.c builtin/init-db.c +#: builtin/clone.c builtin/init-db.c msgid "create a bare repository" msgstr "建立裸版本庫" @@ -5436,21 +5353,17 @@ msgstr "模板目錄" msgid "directory from which templates will be used" msgstr "將被使用的模板目錄" -#: builtin/clone.c builtin/clone.c builtin/submodule--helper.c -#: builtin/submodule--helper.c builtin/submodule--helper.c +#: builtin/clone.c builtin/submodule--helper.c msgid "reference repository" msgstr "引用版本庫" #: builtin/clone.c builtin/submodule--helper.c -#: builtin/submodule--helper.c msgid "use --reference only while cloning" msgstr "僅在拓製時使用 --reference" -#: builtin/clone.c builtin/column.c builtin/fmt-merge-msg.c -#: builtin/init-db.c builtin/merge-file.c builtin/merge.c -#: builtin/pack-objects.c builtin/repack.c +#: builtin/clone.c builtin/column.c builtin/fmt-merge-msg.c builtin/init-db.c +#: builtin/merge-file.c builtin/merge.c builtin/pack-objects.c builtin/repack.c #: builtin/submodule--helper.c t/helper/test-simple-ipc.c -#: t/helper/test-simple-ipc.c msgid "name" msgstr "name" @@ -5491,7 +5404,6 @@ msgid "deepen history of shallow clone, excluding ref" msgstr "取得更多淺層拓製的過往歷史記錄，除了特定修訂版" #: builtin/clone.c builtin/submodule--helper.c -#: builtin/submodule--helper.c msgid "clone only one branch, HEAD or --branch" msgstr "只拓製一個分支、HEAD 或 --branch" @@ -5512,7 +5424,6 @@ msgid "separate git dir from working tree" msgstr "git 目錄和工作區分離" #: builtin/clone.c builtin/init-db.c builtin/submodule--helper.c -#: builtin/submodule--helper.c builtin/submodule--helper.c msgid "specify the reference format to use" msgstr "指定要使用的引用格式" @@ -5524,13 +5435,13 @@ msgstr "key=value" msgid "set config inside the new repository" msgstr "在新版本庫中設定設定訊息" -#: builtin/clone.c builtin/fetch.c builtin/ls-remote.c -#: builtin/pull.c builtin/push.c builtin/send-pack.c +#: builtin/clone.c builtin/fetch.c builtin/ls-remote.c builtin/pull.c +#: builtin/push.c builtin/send-pack.c msgid "server-specific" msgstr "server-specific" -#: builtin/clone.c builtin/fetch.c builtin/ls-remote.c -#: builtin/pull.c builtin/push.c builtin/send-pack.c +#: builtin/clone.c builtin/fetch.c builtin/ls-remote.c builtin/pull.c +#: builtin/push.c builtin/send-pack.c msgid "option to transmit" msgstr "傳輸選項" @@ -5566,9 +5477,8 @@ msgstr "太多參數。" msgid "You must specify a repository to clone." msgstr "您必須指定要拓製的版本庫。" -#: builtin/clone.c builtin/init-db.c builtin/refs.c -#: builtin/submodule--helper.c builtin/submodule--helper.c -#: builtin/submodule--helper.c setup.c setup.c +#: builtin/clone.c builtin/init-db.c builtin/refs.c builtin/submodule--helper.c +#: setup.c #, c-format msgid "unknown ref storage format '%s'" msgstr "未知的引用儲存格式「%s」" @@ -5598,8 +5508,7 @@ msgstr "版本庫路徑 '%s' 已經存在，並且不是一個空目錄。" msgid "working tree '%s' already exists." msgstr "工作區 '%s' 已經存在。" -#: builtin/clone.c builtin/clone.c builtin/difftool.c -#: builtin/log.c builtin/worktree.c builtin/worktree.c +#: builtin/clone.c builtin/difftool.c builtin/log.c builtin/worktree.c #, c-format msgid "could not create leading directories of '%s'" msgstr "無法為「%s」建立前導目錄" @@ -5625,7 +5534,7 @@ msgid "" "able" msgstr "clone --recursive 與 --reference 和 --reference-if-able 不相容" -#: builtin/clone.c builtin/remote.c builtin/remote.c +#: builtin/clone.c builtin/remote.c #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' 不是一個有效的遠端名稱" @@ -5646,7 +5555,7 @@ msgstr "本機拓製會忽略 --shallow-exclude。請改用 file:// 協定。" msgid "--filter is ignored in local clones; use file:// instead." msgstr "本機拓製會忽略 --filter。請改用 file:// 協定。" -#: builtin/clone.c fetch-pack.c fetch-pack.c +#: builtin/clone.c fetch-pack.c msgid "source repository is shallow, reject to clone." msgstr "來源版本庫是淺版本庫 (shallow)。拒絕拓製。" @@ -5662,7 +5571,7 @@ msgstr "--local 被忽略" msgid "cannot clone from filtered bundle" msgstr "無法從過濾後的套件包拓製" -#: builtin/clone.c builtin/clone.c +#: builtin/clone.c msgid "failed to initialize the repo, skipping bundle URI" msgstr "無法初始化版本庫，略過套件包 URI" @@ -5675,7 +5584,7 @@ msgstr "無法從套件包 URL「%s」抓取物件" msgid "failed to fetch advertised bundles" msgstr "無法抓取公佈的套件包" -#: builtin/clone.c builtin/clone.c +#: builtin/clone.c msgid "remote transport reported error" msgstr "遠端傳輸回報錯誤" @@ -5701,7 +5610,7 @@ msgstr "git column [<選項>]" msgid "lookup config vars" msgstr "尋找設定變數" -#: builtin/column.c builtin/column.c +#: builtin/column.c msgid "layout to use" msgstr "要使用的配置" @@ -5752,8 +5661,8 @@ msgstr "" "[no-]progress]\n" " <split-options>" -#: builtin/commit-graph.c builtin/fetch.c builtin/gc.c -#: builtin/log.c builtin/repack.c builtin/repack.c +#: builtin/commit-graph.c builtin/fetch.c builtin/gc.c builtin/log.c +#: builtin/repack.c msgid "dir" msgstr "目錄" @@ -5790,7 +5699,7 @@ msgstr "非期望的非十六進位物件 ID：%s" msgid "invalid object: %s" msgstr "物件無效：%s" -#: builtin/commit-graph.c parse-options-cb.c parse-options-cb.c +#: builtin/commit-graph.c parse-options-cb.c #, c-format msgid "option `%s' expects a numerical value" msgstr "選項 `%s' 期望一個數字值" @@ -5858,9 +5767,9 @@ msgstr "" #: builtin/commit-tree.c #, c-format msgid "duplicate parent %s ignored" -msgstr "忽略重複的父提交 %s" +msgstr "忽略重複的親代提交 %s" -#: builtin/commit-tree.c builtin/commit-tree.c builtin/log.c +#: builtin/commit-tree.c builtin/log.c #, c-format msgid "not a valid object name %s" msgstr "不是一個有效的物件名 %s" @@ -5877,15 +5786,14 @@ msgstr "git commit-tree：無法關閉 '%s'" #: builtin/commit-tree.c msgid "parent" -msgstr "父提交" +msgstr "親代" #: builtin/commit-tree.c msgid "id of a parent commit object" -msgstr "父提交物件 ID" +msgstr "親代提交物件 ID" -#: builtin/commit-tree.c builtin/commit.c builtin/merge.c -#: builtin/notes.c builtin/notes.c builtin/stash.c -#: builtin/tag.c +#: builtin/commit-tree.c builtin/commit.c builtin/merge.c builtin/notes.c +#: builtin/stash.c builtin/tag.c msgid "message" msgstr "訊息" @@ -5897,8 +5805,8 @@ msgstr "提交說明" msgid "read commit log message from file" msgstr "從檔案中讀取提交說明" -#: builtin/commit-tree.c builtin/commit.c builtin/merge.c -#: builtin/pull.c builtin/revert.c +#: builtin/commit-tree.c builtin/commit.c builtin/merge.c builtin/pull.c +#: builtin/revert.c msgid "GPG sign commit" msgstr "GPG 提交簽名" @@ -6061,7 +5969,7 @@ msgid "" "in the current commit message" msgstr "無法選擇一個未被目前提交說明使用的備註字元" -#: builtin/commit.c builtin/commit.c builtin/commit.c +#: builtin/commit.c #, c-format msgid "could not lookup commit '%s'" msgstr "無法查詢提交「%s」" @@ -6085,7 +5993,7 @@ msgstr "無法讀取日誌檔案「%s」" msgid "options '%s' and '%s:%s' cannot be used together" msgstr "「%s」和「%s:%s」選項不得同時使用" -#: builtin/commit.c builtin/commit.c +#: builtin/commit.c msgid "could not read SQUASH_MSG" msgstr "無法讀取 SQUASH_MSG" @@ -6093,8 +6001,8 @@ msgstr "無法讀取 SQUASH_MSG" msgid "could not read MERGE_MSG" msgstr "無法讀取 MERGE_MSG" -#: builtin/commit.c builtin/history.c builtin/submodule--helper.c -#: bundle.c rerere.c rerere.c sequencer.c sequencer.c +#: builtin/commit.c builtin/history.c builtin/submodule--helper.c bundle.c +#: rerere.c sequencer.c #, c-format msgid "could not open '%s'" msgstr "無法開啟「%s」" @@ -6214,7 +6122,7 @@ msgstr "--author '%s' 不是 '姓名 <信箱>' 格式，且未能在現有作者 msgid "Invalid ignored mode '%s'" msgstr "無效的忽略模式 '%s'" -#: builtin/commit.c builtin/commit.c +#: builtin/commit.c #, c-format msgid "Invalid untracked files mode '%s'" msgstr "無效的未追蹤檔案參數 '%s'" @@ -6267,11 +6175,11 @@ msgstr "未知選項：--fixup=%s:%s" msgid "paths '%s ...' with -a does not make sense" msgstr "路徑 '%s ...' 和 -a 選項同時使用沒有意義" -#: builtin/commit.c builtin/commit.c +#: builtin/commit.c msgid "show status concisely" msgstr "以簡潔的格式顯示狀態" -#: builtin/commit.c builtin/commit.c +#: builtin/commit.c msgid "show branch information" msgstr "顯示分支訊息" @@ -6279,7 +6187,7 @@ msgstr "顯示分支訊息" msgid "show stash information" msgstr "顯示貯存區訊息" -#: builtin/commit.c builtin/commit.c +#: builtin/commit.c msgid "compute full ahead/behind values" msgstr "計算完整的領先/落後值" @@ -6287,20 +6195,19 @@ msgstr "計算完整的領先/落後值" msgid "version" msgstr "版本" -#: builtin/commit.c builtin/commit.c builtin/fetch.c -#: builtin/push.c builtin/worktree.c +#: builtin/commit.c builtin/fetch.c builtin/push.c builtin/worktree.c msgid "machine-readable output" msgstr "機器可讀的輸出" -#: builtin/commit.c builtin/commit.c +#: builtin/commit.c msgid "show status in long format (default)" msgstr "以長格式顯示狀態（預設值）" -#: builtin/commit.c builtin/commit.c +#: builtin/commit.c msgid "terminate entries with NUL" msgstr "條目以 NUL 字元結尾" -#: builtin/commit.c builtin/commit.c +#: builtin/commit.c msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "顯示未追蹤的檔案，「模式」的可選參數：all、normal、no。（預設值：all）" @@ -6371,8 +6278,7 @@ msgstr "日期" msgid "override date for commit" msgstr "提交時覆蓋日期" -#: builtin/commit.c builtin/commit.c builtin/commit.c -#: parse-options.h ref-filter.h +#: builtin/commit.c parse-options.h ref-filter.h msgid "commit" msgstr "提交" @@ -6404,8 +6310,7 @@ msgstr "使用 autosquash 格式的提交說明用以壓縮至指定的提交" msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "現在將該提交的作者改為我（和 -C/-c/--amend 參數共用）" -#: builtin/commit.c builtin/interpret-trailers.c builtin/rebase.c -#: builtin/tag.c +#: builtin/commit.c builtin/interpret-trailers.c builtin/rebase.c builtin/tag.c msgid "trailer" msgstr "結尾資訊" @@ -6413,8 +6318,8 @@ msgstr "結尾資訊" msgid "add custom trailer(s)" msgstr "加入自訂結尾資訊" -#: builtin/commit.c builtin/log.c builtin/merge.c -#: builtin/pull.c builtin/revert.c +#: builtin/commit.c builtin/log.c builtin/merge.c builtin/pull.c +#: builtin/revert.c msgid "add a Signed-off-by trailer" msgstr "在結尾加入 Signed-off-by" @@ -6478,7 +6383,7 @@ msgstr "允許一個空提交" msgid "ok to record a change with an empty message" msgstr "允許空的提交說明" -#: builtin/commit.c sequencer.c sequencer.c +#: builtin/commit.c sequencer.c msgid "could not parse HEAD commit" msgstr "無法解析 HEAD 提交" @@ -6520,7 +6425,7 @@ msgstr "" "版本庫已更新，但無法寫入新的索引檔案。請檢查磁碟是否\n" "已滿或磁碟配額已耗盡，然後執行「git restore --staged :/」復原。" -#: builtin/config.c builtin/config.c +#: builtin/config.c msgid "git config list [<file-option>] [<display-option>] [--includes]" msgstr "git config list [<檔案選項>] [<顯示選項>] [--includes]" @@ -6542,7 +6447,7 @@ msgstr "" "git config set [<file-option>] [--type=<type>] [--all] [--value=<pattern>] " "[--fixed-value] <name> <value>" -#: builtin/config.c builtin/config.c +#: builtin/config.c msgid "" "git config unset [<file-option>] [--all] [--value=<pattern>] [--fixed-value] " "<name>" @@ -6550,15 +6455,15 @@ msgstr "" "git config unset [<file-option>] [--all] [--value=<pattern>] [--fixed-value] " "<name>" -#: builtin/config.c builtin/config.c +#: builtin/config.c msgid "git config rename-section [<file-option>] <old-name> <new-name>" msgstr "git config rename-section [<檔案選項>] <舊名稱> <新名稱>" -#: builtin/config.c builtin/config.c +#: builtin/config.c msgid "git config remove-section [<file-option>] <name>" msgstr "git config remove-section [<檔案選項>] <名稱>" -#: builtin/config.c builtin/config.c +#: builtin/config.c msgid "git config edit [<file-option>]" msgstr "git config edit [<檔案選項>]" @@ -6604,7 +6509,7 @@ msgstr "使用版本庫級設定檔案" msgid "use per-worktree config file" msgstr "使用工作區級別的設定檔案" -#: builtin/config.c builtin/gc.c builtin/gc.c +#: builtin/config.c builtin/gc.c msgid "use given config file" msgstr "使用指定的設定檔案" @@ -6699,6 +6604,21 @@ msgstr "錯誤的參數個數，應該為從 %d 個到 %d 個" #: builtin/config.c #, c-format +msgid "missing value to set to the variable '%s'" +msgstr "缺少值來設定變數「%s」" + +#: builtin/config.c +#, c-format +msgid "did you mean \"git config set %s %s\"?" +msgstr "您是想用「git config set %s %s」嗎？" + +#: builtin/config.c +#, c-format +msgid "missing value to set to a variable with an invalid name '%s'" +msgstr "缺少值來設定具無效名稱「%s」的變數" + +#: builtin/config.c +#, c-format msgid "invalid key pattern: %s" msgstr "無效鍵名模式：%s" @@ -6721,7 +6641,7 @@ msgstr "無法解析顏色 '%s'" msgid "unable to parse default color value" msgstr "無法解析預設顏色值" -#: builtin/config.c builtin/config.c +#: builtin/config.c msgid "not in a git directory" msgstr "不在 git 版本庫中" @@ -6764,7 +6684,7 @@ msgstr "--blob 只能在一個版本庫內使用" msgid "--worktree can only be used inside a git repository" msgstr "--worktree 只能在 git 版本庫中使用" -#: builtin/config.c builtin/gc.c builtin/gc.c +#: builtin/config.c builtin/gc.c msgid "$HOME not set" msgstr "$HOME 未設定" @@ -6777,21 +6697,20 @@ msgstr "" "不能和多個工作區一起使用 --worktree，除非啟用 worktreeConfig 設定擴充部分。\n" "詳情請閱讀「git help worktree」的「CONFIGURATION FILE」小節" -#: builtin/config.c builtin/config.c builtin/config.c #: builtin/config.c msgid "Other" msgstr "其他" -#: builtin/config.c builtin/config.c builtin/config.c +#: builtin/config.c msgid "respect include directives on lookup" msgstr "查詢時引用 include 指令遞迴尋找" -#: builtin/config.c builtin/config.c +#: builtin/config.c #, c-format msgid "unable to read config file '%s'" msgstr "無法讀取設定檔案 '%s'" -#: builtin/config.c builtin/config.c +#: builtin/config.c msgid "error processing config file(s)" msgstr "處理設定檔案發生錯誤" @@ -6807,11 +6726,10 @@ msgstr "回傳有多項值之組態選項的所有值" msgid "interpret the name as a regular expression" msgstr "將名稱當作常規表示式解讀" -#: builtin/config.c builtin/config.c +#: builtin/config.c msgid "show config with values matching the pattern" msgstr "顯示值符合模式的組態" -#: builtin/config.c builtin/config.c builtin/config.c #: builtin/config.c msgid "use string equality when comparing values to value pattern" msgstr "使用字串相等比較值和模式" @@ -6824,7 +6742,6 @@ msgstr "URL" msgid "show config matching the given URL" msgstr "顯示符合提供 URL 的組態" -#: builtin/config.c builtin/config.c builtin/config.c #: builtin/config.c msgid "value" msgstr "取值" @@ -6833,7 +6750,7 @@ msgstr "取值" msgid "use default value when missing entry" msgstr "未指定參數時所使用的預設值" -#: builtin/config.c builtin/config.c builtin/config.c +#: builtin/config.c msgid "--fixed-value only applies with 'value-pattern'" msgstr "--fixed-value 僅套用至 'value-pattern'" @@ -6845,7 +6762,7 @@ msgstr "--default= 無法和 --all 或 --url= 一起使用" msgid "--url= cannot be used with --all, --regexp or --value" msgstr "--url= 無法和 --all、--regexp、--value 一起使用" -#: builtin/config.c builtin/config.c +#: builtin/config.c msgid "Filter" msgstr "過濾器" @@ -6853,7 +6770,7 @@ msgstr "過濾器" msgid "replace multi-valued config option with new value" msgstr "以新值取代有多項值的組態選項" -#: builtin/config.c builtin/config.c +#: builtin/config.c msgid "human-readable comment string (# will be prepended as needed)" msgstr "人類可讀的備註字串（將按需插入 # 至前方）" @@ -6886,7 +6803,6 @@ msgstr "取消設定所有多值組態選項" msgid "unset multi-valued config options with matching values" msgstr "取消設定其值相符的多值組態選項" -#: builtin/config.c builtin/config.c builtin/config.c #: builtin/config.c #, c-format msgid "no such section: %s" @@ -7026,11 +6942,10 @@ msgid "print debugging messages to stderr" msgstr "除錯訊息輸出到標準錯誤" #: builtin/credential-cache--daemon.c -#: builtin/credential-cache--daemon.c msgid "credential-cache--daemon unavailable; no unix socket support" msgstr "credential-cache--daemon 無法使用；缺少 unix socket 支援" -#: builtin/credential-cache.c builtin/credential-cache.c +#: builtin/credential-cache.c msgid "credential-cache unavailable; no unix socket support" msgstr "credential-cache 無法使用；缺少 unix socket 支援" @@ -7167,7 +7082,7 @@ msgstr "始終使用長提交號格式" #: builtin/describe.c msgid "only follow first parent" -msgstr "只跟隨第一個父提交" +msgstr "只跟隨第一個親代提交" #: builtin/describe.c msgid "only output exact matches" @@ -7189,7 +7104,7 @@ msgstr "不考慮符合 <模式> 的標籤" msgid "show abbreviated commit object as fallback" msgstr "顯示簡寫的提交號作為後備" -#: builtin/describe.c builtin/describe.c +#: builtin/describe.c msgid "mark" msgstr "標記" @@ -7205,7 +7120,7 @@ msgstr "對於損壞的工作區，追加 <標記>（預設值：」-broken\"） msgid "No names found, cannot describe anything." msgstr "沒有發現名稱，無法描述任何東西。" -#: builtin/describe.c builtin/describe.c +#: builtin/describe.c #, c-format msgid "option '%s' and commit-ishes cannot be used together" msgstr "「%s」選項和提交指示元不得同時使用" @@ -7293,7 +7208,7 @@ msgstr "'%s'：不是一個正規檔案或符號連結" #: builtin/diff.c msgid "no merge given, only parents." -msgstr "沒有提供合併提交，只有提供父提交。" +msgstr "沒有提供合併提交，只有提供親代提交。" #: builtin/diff.c #, c-format @@ -7305,8 +7220,7 @@ msgstr "無效選項：%s" msgid "%s...%s: no merge base" msgstr "%s...%s: 無合併基底" -#: builtin/diff.c setup.c setup.c setup.c setup.c -#: setup.c +#: builtin/diff.c setup.c msgid "cannot come back to cwd" msgstr "無法返回目前工作目錄" @@ -7370,7 +7284,7 @@ msgstr "兩個檔案都被修改：'%s' 和 '%s'。" msgid "working tree file has been left." msgstr "工作區檔案被留了下來。" -#: builtin/difftool.c sequencer.c sequencer.c sequencer.c +#: builtin/difftool.c sequencer.c #, c-format msgid "could not copy '%s' to '%s'" msgstr "無法將「%s」複製至「%s」" @@ -7462,7 +7376,7 @@ msgstr "標籤之物件濾除者的模式未知：%s" msgid "unknown reencoding mode: %s" msgstr "重新編碼的模式未知：%s" -#: builtin/fast-export.c builtin/fast-export.c +#: builtin/fast-export.c #, c-format msgid "could not read blob %s" msgstr "無法讀取資料物件 %s" @@ -7482,7 +7396,7 @@ msgstr "無法寫入資料物件「%s」" msgid "unexpected comparison status '%c' for %s, %s" msgstr "%2$s、%3$s 有非預期的比較狀態「%1$c」" -#: builtin/fast-export.c builtin/fast-export.c +#: builtin/fast-export.c msgid "none" msgstr "無" @@ -7584,14 +7498,12 @@ msgstr "無法為寫入開啟標記檔案 %s。" msgid "unable to write marks file %s." msgstr "無法寫入標記檔案 %s。" -#: builtin/fast-export.c builtin/fast-export.c -#: builtin/fast-import.c builtin/fast-import.c +#: builtin/fast-export.c builtin/fast-import.c #, c-format msgid "corrupt mark line: %s" msgstr "損壞的標記列：%s" -#: builtin/fast-export.c builtin/fast-import.c -#: builtin/fast-import.c fetch-pack.c fetch-pack.c +#: builtin/fast-export.c builtin/fast-import.c fetch-pack.c #, c-format msgid "object not found: %s" msgstr "物件未找到：%s" @@ -7680,7 +7592,7 @@ msgstr "在匿名輸出中將 <from> 轉換為 <to>" #: builtin/fast-export.c msgid "reference parents which are not in fast-export stream by object id" -msgstr "依物件 ID 引用不在 fast-export 串流中的父物件" +msgstr "依物件 ID 引用不在 fast-export 串流中的親代物件" #: builtin/fast-export.c msgid "show original object ids of blobs/commits" @@ -7764,7 +7676,7 @@ msgstr "非預期的壓縮失敗：%d" msgid "not a tree: %s" msgstr "非樹狀物件：%s" -#: builtin/fast-import.c builtin/fast-import.c +#: builtin/fast-import.c #, c-format msgid "can't load tree %s" msgstr "無法載入樹狀物件 %s" @@ -7778,7 +7690,7 @@ msgstr "%s 中有損壞的模式" msgid "root cannot be a non-directory" msgstr "根不能不是目錄" -#: builtin/fast-import.c builtin/fast-import.c +#: builtin/fast-import.c msgid "empty path component found in input" msgstr "輸入中有空的路徑部分" @@ -7801,8 +7713,8 @@ msgstr "分支 %s 缺少提交。" msgid "not updating %s (new tip %s does not contain %s)" msgstr "沒有更新 %s（提示：%s 不包含 %s）" -#: builtin/fast-import.c builtin/sparse-checkout.c commit-graph.c -#: midx-write.c sequencer.c +#: builtin/fast-import.c builtin/sparse-checkout.c commit-graph.c midx-write.c +#: repack-midx.c sequencer.c #, c-format msgid "unable to create leading directories of %s" msgstr "不能為 %s 建立先導目錄" @@ -7861,7 +7773,7 @@ msgstr "身分字串中缺少 >：%s" msgid "missing space after > in ident string: %s" msgstr "身分字串的 > 後面缺少空格：%s" -#: builtin/fast-import.c builtin/fast-import.c +#: builtin/fast-import.c #, c-format msgid "invalid raw date \"%s\" in ident: %s" msgstr "身分中有無效的原始日期「%s」：%s" @@ -7921,18 +7833,17 @@ msgstr "%s 後有垃圾：%s" msgid "missing space after %s: %s" msgstr "%s 後缺少空格：%s" -#: builtin/fast-import.c builtin/fast-import.c +#: builtin/fast-import.c #, c-format msgid "corrupt mode: %s" msgstr "損壞的模式：%s" -#: builtin/fast-import.c builtin/fast-import.c -#: builtin/fast-import.c builtin/fast-import.c +#: builtin/fast-import.c #, c-format msgid "invalid dataref: %s" msgstr "無效的資料引用：%s" -#: builtin/fast-import.c builtin/fast-import.c +#: builtin/fast-import.c #, c-format msgid "missing space after SHA1: %s" msgstr "SHA1 值後缺少空格：%s" @@ -7975,25 +7886,22 @@ msgstr "分支中沒有路徑 %s" msgid "can't add a note on empty branch." msgstr "不能在空分支上附加註記。" -#: builtin/fast-import.c builtin/fast-import.c #: builtin/fast-import.c #, c-format msgid "mark :%<PRIuMAX> not a commit" msgstr "標記 :%<PRIuMAX> 不是提交" -#: builtin/fast-import.c builtin/fast-import.c #: builtin/fast-import.c #, c-format msgid "not a valid commit: %s" msgstr "不是有效的提交：%s" -#: builtin/fast-import.c builtin/fast-import.c -#: builtin/fast-import.c builtin/fast-import.c +#: builtin/fast-import.c #, c-format msgid "invalid ref name or SHA1 expression: %s" msgstr "無效的引用名稱或 SHA1 表示式：%s" -#: builtin/fast-import.c builtin/fast-import.c +#: builtin/fast-import.c #, c-format msgid "not a blob (actually a %s): %s" msgstr "不是資料物件（而是 %s）：%s" @@ -8045,8 +7953,7 @@ msgstr "找到多個 %s 簽章，忽略多餘的簽章" msgid "parse_one_signature() returned unknown hash algo" msgstr "parse_one_signature() 回傳了未知的雜湊演算法" -#: builtin/fast-import.c builtin/fsck.c builtin/fsck.c -#: builtin/fsck.c +#: builtin/fast-import.c builtin/fsck.c msgid "unknown" msgstr "未知" @@ -8104,7 +8011,7 @@ msgstr "" "正在取代提交的無效簽章\n" " 據稱由 %s 所簽" -#: builtin/fast-import.c builtin/fast-import.c +#: builtin/fast-import.c msgid "aborting due to invalid signature" msgstr "因為簽章無效而中止" @@ -8183,7 +8090,6 @@ msgstr "物件 %s 是 %s，但預期是資料物件。" msgid "not a mark: %s" msgstr "不是標記：%s" -#: builtin/fast-import.c builtin/fast-import.c #: builtin/fast-import.c #, c-format msgid "unknown mark: %s" @@ -8378,7 +8284,7 @@ msgstr "找不到物件 %s" msgid "[up to date]" msgstr "[最新]" -#: builtin/fetch.c builtin/fetch.c builtin/fetch.c +#: builtin/fetch.c msgid "[rejected]" msgstr "[已拒絕]" @@ -8390,7 +8296,6 @@ msgstr "無法抓取至已簽出分支" msgid "[tag update]" msgstr "[標籤更新]" -#: builtin/fetch.c builtin/fetch.c builtin/fetch.c #: builtin/fetch.c msgid "unable to update local ref" msgstr "不能更新本機引用" @@ -8419,8 +8324,7 @@ msgstr "強制更新" msgid "non-fast-forward" msgstr "非快轉" -#: builtin/fetch.c builtin/fetch.c builtin/grep.c -#: sequencer.c +#: builtin/fetch.c builtin/grep.c sequencer.c #, c-format msgid "cannot open '%s'" msgstr "不能開啟 '%s'" @@ -8479,15 +8383,20 @@ msgstr "選項「%s」的值「%s」對 %s 無效" msgid "option \"%s\" is ignored for %s" msgstr "選項「%s」被 %s 忽略" -#: builtin/fetch.c odb.c +#: builtin/fetch.c fetch-pack.c #, c-format -msgid "%s is not a valid object" -msgstr "%s 不是一個有效的物件" +msgid "the object %s does not exist" +msgstr "%s 物件不存在" #: builtin/fetch.c #, c-format -msgid "the object %s does not exist" -msgstr "%s 物件不存在" +msgid "ignoring %s=%s because it does not match any refs" +msgstr "忽略了 %s=%s，因為其與任何引用皆不符" + +#: builtin/fetch.c +#, c-format +msgid "ignoring %s because the protocol does not support it" +msgstr "忽略了 %s，因為通訊協定不支援之" #: builtin/fetch.c #, c-format @@ -8576,12 +8485,12 @@ msgstr "" "找不到來源分支。\n" "您得使用 --set-upstream 選項明確指定一個分支" -#: builtin/fetch.c builtin/fetch.c +#: builtin/fetch.c #, c-format msgid "Fetching %s\n" msgstr "正在取得 %s\n" -#: builtin/fetch.c builtin/fetch.c +#: builtin/fetch.c #, c-format msgid "could not fetch %s" msgstr "無法取得 %s" @@ -8656,7 +8565,7 @@ msgid "prune local tags no longer on remote and clobber changed tags" msgstr "清除遠端不存在的本機標籤，並且取代變更標籤" # 譯者：可選值，不能翻譯 -#: builtin/fetch.c builtin/fetch.c builtin/pull.c +#: builtin/fetch.c builtin/pull.c msgid "on-demand" msgstr "on-demand" @@ -8676,8 +8585,7 @@ msgstr "保持下載包" msgid "allow updating of HEAD ref" msgstr "允許更新 HEAD 引用" -#: builtin/fetch.c builtin/fetch.c builtin/pull.c -#: builtin/pull.c +#: builtin/fetch.c builtin/pull.c msgid "deepen history of shallow clone" msgstr "取得淺拓製的更多過去歷史記錄" @@ -8715,8 +8623,7 @@ msgstr "引用映射" msgid "specify fetch refmap" msgstr "指定取得動作的引用映射" -#: builtin/fetch.c builtin/pull.c builtin/rebase.c -#: builtin/replay.c +#: builtin/fetch.c builtin/pull.c builtin/rebase.c builtin/replay.c msgid "revision" msgstr "revision" @@ -8724,11 +8631,15 @@ msgstr "revision" msgid "report that we have only objects reachable from this object" msgstr "報告我們只擁有從該物件開始可以取得的物件" +#: builtin/fetch.c builtin/pull.c +msgid "ensure this ref is always sent as a negotiation have" +msgstr "確保始終在磋商中發送此引用" + #: builtin/fetch.c msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" msgstr "不取得 packfile，而是輸出協商的祖先提交" -#: builtin/fetch.c builtin/fetch.c +#: builtin/fetch.c msgid "run 'maintenance --auto' after fetching" msgstr "取得 (fetch) 後執行 'maintenance --auto'" @@ -8745,10 +8656,6 @@ msgid "accept refspecs from stdin" msgstr "從標準輸入中接受引用規格" #: builtin/fetch.c -msgid "--negotiate-only needs one or more --negotiation-tip=*" -msgstr "--negotiate-only 需要一或多個 --negotiation-tip=*" - -#: builtin/fetch.c msgid "negative depth in --deepen is not supported" msgstr "--deepen 不支援負數深度" @@ -8769,7 +8676,7 @@ msgstr "fetch --all 不能帶一個版本庫參數" msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all 帶引用規格沒有任何意義" -#: builtin/fetch.c +#: builtin/fetch.c builtin/push.c #, c-format msgid "no such remote or remote group: %s" msgstr "無此遠端或遠端群組：%s" @@ -8787,6 +8694,11 @@ msgid "protocol does not support --negotiate-only, exiting" msgstr "通訊協定不支援 --negotiate-only。結束" #: builtin/fetch.c +#, c-format +msgid "%s needs one or more %s" +msgstr "%s 需要一個或數個 %s" + +#: builtin/fetch.c msgid "" "--filter can only be used with the remote configured in " "extensions.partialclone" @@ -8931,7 +8843,7 @@ msgid "got bad config --config=%s" msgstr "收到無效的組態 --config=%s" #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> -#: builtin/fsck.c builtin/fsck.c +#: builtin/fsck.c #, c-format msgid "error in %s %s: %s" msgstr "%s %s 錯誤：%s" @@ -8942,7 +8854,7 @@ msgstr "%s %s 錯誤：%s" msgid "warning in %s %s: %s" msgstr "%s %s 警告：%s" -#: builtin/fsck.c builtin/fsck.c +#: builtin/fsck.c #, c-format msgid "broken link from %7s %s" msgstr "來自 %7s %s 的損壞的連結" @@ -8983,8 +8895,7 @@ msgstr "懸空 %s %s" msgid "could not create lost-found" msgstr "無法建立 lost-found" -#: builtin/fsck.c builtin/gc.c builtin/rebase.c -#: rebase-interactive.c rerere.c rerere.c sequencer.c +#: builtin/fsck.c builtin/gc.c builtin/rebase.c rebase-interactive.c rerere.c #: sequencer.c #, c-format msgid "could not write '%s'" @@ -9115,7 +9026,7 @@ msgstr "無法讀取「%s」封裝的修訂版索引 (rev-index)" msgid "invalid rev-index for pack '%s'" msgstr "「%s」封裝的修訂版索引 (rev-index) 無效" -#: builtin/fsck.c builtin/fsck.c +#: builtin/fsck.c msgid "Checking ref database" msgstr "正在檢查引用資料庫" @@ -9195,7 +9106,7 @@ msgstr "git fsmonitor--daemon start [<options>]" msgid "git fsmonitor--daemon run [<options>]" msgstr "git fsmonitor--daemon run [<options>]" -#: builtin/fsmonitor--daemon.c builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c #, c-format msgid "value of '%s' out of range: %d" msgstr "「%s」的數值超出範圍：%d" @@ -9207,6 +9118,11 @@ msgstr "「%s」的數值不是布林值或整數：%d" #: builtin/fsmonitor--daemon.c #, c-format +msgid "daemon did not stop within %d seconds" +msgstr "常駐行程未在 %d 秒內停止" + +#: builtin/fsmonitor--daemon.c +#, c-format msgid "fsmonitor-daemon is watching '%s'\n" msgstr "fsmonitor-daemon 正在監控「%s」\n" @@ -9251,7 +9167,7 @@ msgstr "無法初始化健康檢查執行緒" msgid "could not cd home '%s'" msgstr "無法 cd home '%s'" -#: builtin/fsmonitor--daemon.c builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c #, c-format msgid "fsmonitor--daemon is already running '%s'" msgstr "fsmonitor--daemon 已在執行「%s」" @@ -9261,6 +9177,10 @@ msgstr "fsmonitor--daemon 已在執行「%s」" msgid "running fsmonitor-daemon in '%s'\n" msgstr "正在「%s」執行 fsmonitor-daemon\n" +#: builtin/fsmonitor--daemon.c setup.c +msgid "setsid failed" +msgstr "setsid 失敗" + #: builtin/fsmonitor--daemon.c #, c-format msgid "starting fsmonitor-daemon in '%s'\n" @@ -9490,7 +9410,7 @@ msgstr "'%s' 非有效作業" msgid "task '%s' cannot be selected multiple times" msgstr "不能多次選取 '%s' 作業" -#: builtin/gc.c builtin/gc.c +#: builtin/gc.c msgid "run tasks based on the state of the repository" msgstr "基於版本庫狀態執行作業" @@ -9510,7 +9430,7 @@ msgstr "依據頻率執行工作" msgid "do not report progress or other information over stderr" msgstr "不要在 stderr 輸出進度或其他資訊" -#: builtin/gc.c builtin/gc.c +#: builtin/gc.c msgid "task" msgstr "作業" @@ -9542,11 +9462,11 @@ msgstr "版本庫「%s」未註冊" msgid "failed to expand path '%s'" msgstr "無法展開「%s」路徑" -#: builtin/gc.c builtin/gc.c +#: builtin/gc.c msgid "failed to start launchctl" msgstr "無法啟動 launchctl" -#: builtin/gc.c builtin/gc.c builtin/gc.c +#: builtin/gc.c #, c-format msgid "failed to create directories for '%s'" msgstr "無法建立「%s」的目錄" @@ -9584,13 +9504,12 @@ msgstr "無法執行「crontab」；您的系統可能不支援「cron」" msgid "'crontab' died" msgstr "「crontab」結束運作" -#: builtin/gc.c builtin/gc.c builtin/gc.c builtin/worktree.c -#: builtin/worktree.c +#: builtin/gc.c builtin/worktree.c #, c-format msgid "failed to delete '%s'" msgstr "刪除 '%s' 失敗" -#: builtin/gc.c builtin/gc.c rerere.c +#: builtin/gc.c rerere.c #, c-format msgid "failed to flush '%s'" msgstr "排清 '%s' 失敗" @@ -9681,13 +9600,11 @@ msgstr "grep：無法建立執行緒：%s" msgid "invalid number of threads specified (%d) for %s" msgstr "為 %2$s 設定的執行緒數 (%1$d) 無效" -#. #-#-#-#-# grep.c.po #-#-#-#-# #. TRANSLATORS: %s is the configuration #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c builtin/index-pack.c builtin/index-pack.c -#: builtin/pack-objects.c +#: builtin/grep.c builtin/index-pack.c builtin/pack-objects.c #, c-format msgid "no threads support, ignoring %s" msgstr "沒有執行緒支援，忽略 %s" @@ -10045,7 +9962,7 @@ msgstr "無法解析 emacsclient 版本。" msgid "emacsclient version '%d' too old (< 22)." msgstr "emacsclient 版本 '%d' 太老（< 22）。" -#: builtin/help.c builtin/help.c builtin/help.c builtin/help.c +#: builtin/help.c #, c-format msgid "failed to exec '%s'" msgstr "執行 '%s' 失敗" @@ -10081,7 +9998,7 @@ msgstr "沒有 man 檢視器處理此請求" msgid "no info viewer handled the request" msgstr "沒有 info 檢視器處理此請求" -#: builtin/help.c builtin/help.c git.c +#: builtin/help.c git.c #, c-format msgid "'%s' is aliased to '%s'" msgstr "'%s' 是 '%s' 的別名" @@ -10101,7 +10018,7 @@ msgid "" "the '--no-[external-commands|aliases]' options can only be used with '--all'" msgstr "「--no-[external-commands|aliases]」選項只能與「--all」一起使用" -#: builtin/help.c builtin/help.c +#: builtin/help.c #, c-format msgid "usage: %s%s" msgstr "用法：%s%s" @@ -10111,6 +10028,14 @@ msgid "'git help config' for more information" msgstr "'git help config' 取得更多訊息" #: builtin/history.c +msgid "" +"git history fixup <commit> [--dry-run] [--update-refs=(branches|head)] [--" +"reedit-message] [--empty=(drop|keep|abort)]" +msgstr "" +"git history fixup <commit> [--dry-run] [--update-refs=(branches|head)] [--" +"reedit-message] [--empty=(drop|keep|abort)]" + +#: builtin/history.c msgid "git history reword <commit> [--dry-run] [--update-refs=(branches|head)]" msgstr "" "git history reword <commit> [--dry-run] [--update-refs=(branches|head)]" @@ -10137,10 +10062,10 @@ msgstr "" msgid "Aborting commit as launching the editor failed.\n" msgstr "中止提交，因為無法開啟編輯器。\n" -#: builtin/history.c builtin/history.c +#: builtin/history.c #, c-format msgid "unable to parse parent commit %s" -msgstr "無法解析上級提交 %s" +msgstr "無法解析親代提交 %s" #: builtin/history.c #, c-format @@ -10173,7 +10098,7 @@ msgstr "使用 --update-refs=head 時，重寫後的提交必須是 HEAD 的祖 msgid "failed to begin ref transaction: %s" msgstr "無法開始引用事務：%s" -#: builtin/history.c builtin/history.c builtin/replay.c +#: builtin/history.c builtin/replay.c #, c-format msgid "failed to update ref '%s': %s" msgstr "無法更新「%s」引用：%s" @@ -10184,31 +10109,99 @@ msgid "failed to commit ref transaction: %s" msgstr "無法提交引用事務：%s" #: builtin/history.c +#, c-format +msgid "unable to parse parent of %s" +msgstr "無法解析 %s 的親代" + +#: builtin/history.c +#, c-format +msgid "" +"unrecognized '--empty=' action '%s'; valid values are \"drop\", \"keep\", " +"and \"abort\"." +msgstr "" +"無法辨識「--empty=」動作「%s」；有效值為「drop」、「keep」、和「abort」。" + +#: builtin/history.c msgid "control which refs should be updated" msgstr "控制要更新的引用" -#: builtin/history.c builtin/history.c +#: builtin/history.c msgid "perform a dry-run without updating any refs" msgstr "進行測試執行，不更新任何引用" #: builtin/history.c +msgid "open an editor to modify the commit message" +msgstr "開啟編輯器以修改提交訊息" + +#: builtin/history.c builtin/rebase.c builtin/revert.c +msgid "how to handle commits that become empty" +msgstr "處理空白提交的方式" + +#: builtin/history.c msgid "command expects a single revision" msgstr "命令預期只有一個修訂版" -#: builtin/history.c builtin/history.c +#: builtin/history.c +msgid "cannot run fixup in a bare repository" +msgstr "無法在裸版本庫中進行 fixup" + +#: builtin/history.c #, c-format msgid "commit cannot be found: %s" msgstr "找不到提交：%s" #: builtin/history.c -msgid "failed writing reworded commit" -msgstr "無法寫入改寫說明後的提交" +msgid "cannot get tree for HEAD" +msgstr "無法取得 HEAD 的樹狀物件" + +#: builtin/history.c builtin/show-index.c +msgid "unable to read index" +msgstr "無法讀取索引" -#: builtin/history.c builtin/history.c +#: builtin/history.c +msgid "nothing to fixup: no staged changes" +msgstr "不需要 fixup：沒有已暫存的變更" + +#: builtin/history.c +msgid "unable to write index as a tree" +msgstr "無法將索引區寫入為樹狀物件" + +#: builtin/history.c +#, c-format +msgid "cannot get tree for commit %s" +msgstr "無法取得提交 %s 的樹狀物件" + +#: builtin/history.c +msgid "merge failed while applying fixup" +msgstr "套用 fixup 時合併失敗" + +#: builtin/history.c +msgid "fixup would produce conflicts; aborting" +msgstr "fixup 將產生衝突；中止" + +#: builtin/history.c +#, c-format +msgid "cannot drop root commit %s: it has no parent to replay onto" +msgstr "無法捨棄根提交 %s：其沒有親代可重放" + +#: builtin/history.c +#, c-format +msgid "fixup makes commit %s empty" +msgstr "fixup 致使提交 %s 為空" + +#: builtin/history.c +msgid "failed writing fixed-up commit" +msgstr "寫入經過 fixup 的提交失敗" + +#: builtin/history.c msgid "failed replaying descendants" msgstr "重放後代失敗" #: builtin/history.c +msgid "failed writing reworded commit" +msgstr "無法寫入改寫說明後的提交" + +#: builtin/history.c msgid "unable to populate index with tree" msgstr "無法以樹狀物件填入索引" @@ -10255,10 +10248,12 @@ msgstr "無法拆分合併提交" #: builtin/hook.c msgid "" "git hook run [--allow-unknown-hook-name] [--ignore-missing] [--to-" -"stdin=<path>] <hook-name> [-- <hook-args>]" +"stdin=<path>] [(-j|--jobs) <n>]\n" +"<hook-name> [-- <hook-args>]" msgstr "" "git hook run [--allow-unknown-hook-name] [--ignore-missing] [--to-" -"stdin=<path>] <hook-name> [-- <hook-args>]" +"stdin=<path>] [(-j|--jobs) <n>]\n" +"<hook-name> [-- <hook-args>]" #: builtin/hook.c msgid "" @@ -10274,7 +10269,7 @@ msgstr "使用 NUL 作為列終止符" msgid "show the config scope that defined each hook" msgstr "顯示定義每個掛鉤的組態範圍" -#: builtin/hook.c builtin/hook.c +#: builtin/hook.c msgid "allow running a hook with a non-native hook name" msgstr "允許執行非原生名稱的掛鉤" @@ -10282,7 +10277,7 @@ msgstr "允許執行非原生名稱的掛鉤" msgid "you must specify a hook event name to list" msgstr "您必須指定要列出的掛鉤事件名稱" -#: builtin/hook.c builtin/hook.c +#: builtin/hook.c #, c-format msgid "" "unknown hook event '%s';\n" @@ -10308,6 +10303,15 @@ msgstr "靜默忽略不存在而請求的 <hook-name>" msgid "file to read into hooks' stdin" msgstr "要讀進掛鉤 stdin 的檔案" +#: builtin/hook.c +msgid "run up to <n> hooks simultaneously (-1 for CPU count)" +msgstr "至多同時執行 <n> 個掛鉤（-1 表示 CPU 數量）" + +#: builtin/hook.c +#, c-format +msgid "invalid value for -j: %d (use -1 for CPU count or a positive integer)" +msgstr "無效的 -j 值：%d（使用 -1 表示 CPU 數量，或者一個正整數）" + #: builtin/index-pack.c #, c-format msgid "object type mismatch at %s" @@ -10369,6 +10373,10 @@ msgstr "包中有錯誤的物件位於位移量 %<PRIuMAX>：%s" msgid "inflate returned %d" msgstr "解壓縮返回 %d" +#: builtin/index-pack.c builtin/unpack-objects.c +msgid "object size too large for this platform" +msgstr "物件對此平台而言過大" + #: builtin/index-pack.c msgid "offset value overflow for delta base object" msgstr "位移值覆蓋了 delta 基準物件" @@ -10396,8 +10404,7 @@ msgstr[0] "包檔案過早結束，缺少 %<PRIuMAX> 位元組" msgid "serious inflate inconsistency" msgstr "解壓縮嚴重的不一致" -#: builtin/index-pack.c builtin/index-pack.c builtin/index-pack.c -#: builtin/index-pack.c builtin/index-pack.c +#: builtin/index-pack.c #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "發現 %s 出現 SHA1 衝突！" @@ -10417,7 +10424,7 @@ msgstr "不能讀取現存物件 %s" msgid "invalid blob object %s" msgstr "無效的資料物件 %s" -#: builtin/index-pack.c builtin/index-pack.c +#: builtin/index-pack.c msgid "fsck error in packed object" msgstr "對打包物件 fsck 檢查發生錯誤" @@ -10431,7 +10438,7 @@ msgstr "無效的 %s" msgid "Not all child objects of %s are reachable" msgstr "%s 的所有子物件並非都可以取得" -#: builtin/index-pack.c builtin/index-pack.c +#: builtin/index-pack.c msgid "failed to apply delta" msgstr "套用 delta 失敗" @@ -10464,7 +10471,6 @@ msgid "Resolving deltas" msgstr "處理 delta 中" #: builtin/index-pack.c builtin/pack-objects.c -#: builtin/pack-objects.c #, c-format msgid "unable to create thread: %s" msgstr "不能建立執行緒：%s" @@ -10576,12 +10582,12 @@ msgstr "無法返回目前工作目錄" msgid "bad --pack_header: %s" msgstr "無效的 --pack_header：%s" -#: builtin/index-pack.c builtin/index-pack.c +#: builtin/index-pack.c #, c-format msgid "bad %s" msgstr "錯誤選項 %s" -#: builtin/index-pack.c builtin/init-db.c setup.c setup.c +#: builtin/index-pack.c builtin/init-db.c setup.c #, c-format msgid "unknown hash algorithm '%s'" msgstr "未知的「%s」雜湊算法" @@ -10640,12 +10646,12 @@ msgstr "雜湊" msgid "specify the hash algorithm to use" msgstr "指定要使用的雜湊算法" -#: builtin/init-db.c builtin/init-db.c +#: builtin/init-db.c #, c-format msgid "cannot mkdir %s" msgstr "不能建立目錄 %s" -#: builtin/init-db.c builtin/init-db.c +#: builtin/init-db.c #, c-format msgid "cannot chdir to %s" msgstr "不能切換目錄到 %s" @@ -10857,7 +10863,7 @@ msgstr "" msgid "git show %s: bad file" msgstr "git show %s: 損壞的檔案" -#: builtin/log.c builtin/log.c +#: builtin/log.c #, c-format msgid "could not read object %s" msgstr "無法讀取物件 %s" @@ -10934,13 +10940,12 @@ msgstr "git format-patch [<選項>] [<從> | <版本範圍>]" msgid "two output directories?" msgstr "兩個輸出目錄？" -#: builtin/log.c builtin/log.c builtin/log.c builtin/log.c +#: builtin/log.c #, c-format msgid "unknown commit %s" msgstr "未知提交 %s" -#: builtin/log.c builtin/replace.c builtin/replace.c -#: builtin/replace.c +#: builtin/log.c builtin/replace.c #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "無法將 '%s' 解析為一個有效引用" @@ -11096,7 +11101,7 @@ msgstr "header" msgid "add email header" msgstr "新增信件頭" -#: builtin/log.c builtin/log.c +#: builtin/log.c msgid "email" msgstr "信箱" @@ -11124,7 +11129,7 @@ msgstr "信件標記" msgid "make first mail a reply to <message-id>" msgstr "使第一封信件作為對 <信件標記> 的回覆" -#: builtin/log.c builtin/log.c +#: builtin/log.c msgid "boundary" msgstr "邊界" @@ -11205,8 +11210,7 @@ msgstr "--check 無意義" msgid "--remerge-diff does not make sense" msgstr "--remerge-diff 無意義" -#: builtin/log.c builtin/submodule--helper.c -#: builtin/submodule--helper.c rerere.c submodule.c +#: builtin/log.c builtin/submodule--helper.c rerere.c submodule.c #, c-format msgid "could not create directory '%s'" msgstr "無法建立「%s」目錄" @@ -11398,11 +11402,11 @@ msgstr "" msgid "do not print remote URL" msgstr "不列印遠端 URL" -#: builtin/ls-remote.c builtin/ls-remote.c builtin/rebase.c +#: builtin/ls-remote.c builtin/rebase.c msgid "exec" msgstr "exec" -#: builtin/ls-remote.c builtin/ls-remote.c +#: builtin/ls-remote.c msgid "path of git-upload-pack on the remote host" msgstr "遠端主機上的 git-upload-pack 路徑" @@ -11454,7 +11458,7 @@ msgstr "條目以 NUL 字元終止" msgid "include object size" msgstr "包括物件大小" -#: builtin/ls-tree.c builtin/ls-tree.c +#: builtin/ls-tree.c msgid "list only filenames" msgstr "只列出檔案名" @@ -11632,7 +11636,7 @@ msgstr[0] "無法處理 %d 條以上的基礎。忽略 %s。" msgid "not handling anything other than two heads merge." msgstr "不能處理兩個頭合併之外的任何動作。" -#: builtin/merge-recursive.c builtin/merge-recursive.c +#: builtin/merge-recursive.c #, c-format msgid "could not resolve ref '%s'" msgstr "無法解析引用「%s」" @@ -11642,12 +11646,12 @@ msgstr "無法解析引用「%s」" msgid "Merging %s with %s\n" msgstr "合併 %s 和 %s\n" -#: builtin/merge-tree.c builtin/merge-tree.c builtin/merge-tree.c +#: builtin/merge-tree.c #, c-format msgid "could not parse as tree '%s'" msgstr "無法解析為樹狀物件「%s」" -#: builtin/merge-tree.c builtin/merge-tree.c builtin/merge.c +#: builtin/merge-tree.c builtin/merge.c msgid "not something we can merge" msgstr "不能合併" @@ -11707,7 +11711,7 @@ msgstr "option=value" msgid "option for selected merge strategy" msgstr "所選的合併策略的選項" -#: builtin/merge-tree.c builtin/merge-tree.c builtin/merge-tree.c +#: builtin/merge-tree.c msgid "--trivial-merge is incompatible with all other options" msgstr "--trivial-merge 和其他所有選項都不相容" @@ -11716,7 +11720,7 @@ msgstr "--trivial-merge 和其他所有選項都不相容" msgid "unknown strategy option: -X%s" msgstr "未知的策略選項：-X%s" -#: builtin/merge-tree.c builtin/merge-tree.c builtin/notes.c +#: builtin/merge-tree.c builtin/notes.c #, c-format msgid "malformed input line: '%s'." msgstr "格式錯誤的輸入行：'%s'。" @@ -11793,8 +11797,8 @@ msgstr "如果不能快轉就放棄合併" msgid "verify that the named commit has a valid GPG signature" msgstr "驗證指定的提交是否包含一個有效的 GPG 簽名" -#: builtin/merge.c builtin/notes.c builtin/pull.c -#: builtin/rebase.c builtin/revert.c +#: builtin/merge.c builtin/notes.c builtin/pull.c builtin/rebase.c +#: builtin/revert.c msgid "strategy" msgstr "策略" @@ -11835,7 +11839,7 @@ msgstr "無法執行貯存。" msgid "stash failed" msgstr "貯存失敗" -#: builtin/merge.c builtin/merge.c +#: builtin/merge.c msgid "read-tree failed" msgstr "讀取樹失敗" @@ -11868,7 +11872,7 @@ msgstr "'%s' 沒有指向一個提交" msgid "Bad branch.%s.mergeoptions string: %s" msgstr "壞的 branch.%s.mergeoptions 字串：%s" -#: builtin/merge.c builtin/merge.c merge-ort-wrappers.c +#: builtin/merge.c merge-ort-wrappers.c msgid "Unable to write index." msgstr "不能寫入索引。" @@ -11948,7 +11952,7 @@ msgstr "對於 %s 沒有來自 %s 的遠端追蹤分支" msgid "Bad value '%s' in environment '%s'" msgstr "環境 '%2$s' 中存在壞的取值 '%1$s'" -#: builtin/merge.c editor.c read-cache.c wrapper.c +#: builtin/merge.c editor.c read-cache.c t/helper/test-synthesize.c wrapper.c #, c-format msgid "could not close '%s'" msgstr "無法關閉「%s」" @@ -12043,7 +12047,7 @@ msgstr "嘗試非常小的索引內合併...\n" msgid "Nope.\n" msgstr "無。\n" -#: builtin/merge.c builtin/merge.c +#: builtin/merge.c #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "將樹回滾至原始狀態...\n" @@ -12126,19 +12130,23 @@ msgstr "允許建立一個以上的樹" msgid "" "git multi-pack-index [<options>] write [--preferred-pack=<pack>]\n" " [--[no-]bitmap] [--[no-]incremental] [--[no-]stdin-packs]\n" -" [--refs-snapshot=<path>]" +" [--refs-snapshot=<path>] [--[no-]write-chain-file]\n" +" [--base=<checksum>]" msgstr "" "git multi-pack-index [<options>] write [--preferred-pack=<pack>]\n" " [--[no-]bitmap] [--[no-]incremental] [--[no-]stdin-packs]\n" -" [--refs-snapshot=<path>]" +" [--refs-snapshot=<path>] [--[no-]write-chain-file]\n" +" [--base=<checksum>]" #: builtin/multi-pack-index.c msgid "" "git multi-pack-index [<options>] compact [--[no-]incremental]\n" -" [--[no-]bitmap] <from> <to>" +" [--[no-]bitmap] [--base=<checksum>] [--[no-]write-chain-file]\n" +" <from> <to>" msgstr "" "git multi-pack-index [<options>] compact [--[no-]incremental]\n" -" [--[no-]bitmap] <from> <to>" +" [--[no-]bitmap] [--base=<checksum>] [--[no-]write-chain-file]\n" +" <from> <to>" #: builtin/multi-pack-index.c msgid "git multi-pack-index [<options>] verify" @@ -12168,15 +12176,27 @@ msgstr "偏好包" msgid "pack for reuse when computing a multi-pack bitmap" msgstr "計算多包位圖時要重複使用的包" -#: builtin/multi-pack-index.c builtin/multi-pack-index.c +#: builtin/multi-pack-index.c msgid "write multi-pack bitmap" msgstr "寫入多包位圖" -#: builtin/multi-pack-index.c builtin/multi-pack-index.c +#: builtin/multi-pack-index.c +msgid "checksum" +msgstr "總和檢查碼" + +#: builtin/multi-pack-index.c +msgid "base MIDX for incremental writes" +msgstr "增量寫入的基礎 MIDX" + +#: builtin/multi-pack-index.c msgid "write a new incremental MIDX" msgstr "寫入新的增量 MIDX" #: builtin/multi-pack-index.c +msgid "write the multi-pack-index chain file" +msgstr "寫入多包索引鏈檔" + +#: builtin/multi-pack-index.c msgid "write multi-pack index containing only given indexes" msgstr "寫入只包含指定索引的多包索引" @@ -12184,14 +12204,23 @@ msgstr "寫入只包含指定索引的多包索引" msgid "refs snapshot for selecting bitmap commits" msgstr "用來選取位圖提交的引用快照" -#: builtin/multi-pack-index.c builtin/multi-pack-index.c +#: builtin/multi-pack-index.c +#, c-format +msgid "cannot use %s without %s" +msgstr "不能不與 %2$s 一起使用 %1$s" + +#: builtin/multi-pack-index.c +msgid "cannot use --base without --no-write-chain-file" +msgstr "不能不與 --no-write-chain-file 一起使用 --base" + +#: builtin/multi-pack-index.c #, c-format msgid "could not find MIDX: %s" msgstr "找不到 MIDX：%s" #: builtin/multi-pack-index.c msgid "MIDX compaction endpoints must be unique" -msgstr "MIDX 壓縮端點必須唯一" +msgstr "MIDX 緻密化端點必須唯一" #: builtin/multi-pack-index.c #, c-format @@ -12244,11 +12273,11 @@ msgstr "目的地「%s」不是目錄" msgid "Checking rename of '%s' to '%s'\n" msgstr "檢查 '%s' 到 '%s' 的重新命名\n" -#: builtin/mv.c builtin/mv.c +#: builtin/mv.c msgid "bad source" msgstr "來源損壞" -#: builtin/mv.c builtin/mv.c +#: builtin/mv.c msgid "destination exists" msgstr "目的地已存在" @@ -12272,7 +12301,7 @@ msgstr "不在版本控制之下" msgid "conflicted" msgstr "衝突" -#: builtin/mv.c builtin/mv.c +#: builtin/mv.c #, c-format msgid "overwriting '%s'" msgstr "覆蓋 '%s'" @@ -12361,6 +12390,60 @@ msgstr "允許列印 `未定義` 的名稱（預設值）" msgid "dereference tags in the input (internal use)" msgstr "反向解析輸入中的標籤（內部使用）" +#: builtin/name-rev.c +#, c-format +msgid "'%s' needs to be either text, revs, or rev" +msgstr "「%s」應為 text、revs、或 rev" + +#: builtin/name-rev.c +msgid "" +"(EXPERIMENTAL!) git format-rev --stdin-mode=<mode> --format=<pretty> [--" +"[no-]notes=<ref>] [-z] [--[no-]null-output] [--[no-]null-input]" +msgstr "" +"（實驗性！）git format-rev --stdin-mode=<mode> --format=<pretty> [--" +"[no-]notes=<ref>] [-z] [--[no-]null-output] [--[no-]null-input]" + +#: builtin/name-rev.c +msgid "pretty format to use" +msgstr "要使用的美化輸出格式" + +#: builtin/name-rev.c +msgid "stdin-mode" +msgstr "stdin-mode" + +#: builtin/name-rev.c +msgid "how revs are processed" +msgstr "修訂版如何處理" + +#: builtin/name-rev.c builtin/range-diff.c +msgid "notes" +msgstr "註解" + +#: builtin/name-rev.c +msgid "display notes for pretty format" +msgstr "以美化格式顯示註解" + +#: builtin/name-rev.c +msgid "z" +msgstr "z" + +#: builtin/name-rev.c +msgid "Use NUL for input and output termination" +msgstr "使用 NUL 作為輸入和輸出終止符" + +#: builtin/name-rev.c +msgid "Use NUL for input termination" +msgstr "使用 NUL 作為輸入終止符" + +#: builtin/name-rev.c +msgid "Use NUL for output termination" +msgstr "使用 NUL 作為輸出終止符" + +#: builtin/name-rev.c +#, c-format +msgid "'%s' is required" +msgstr "需要「%s」" + #: builtin/notes.c msgid "git notes [--ref <notes-ref>] [list [<object>]]" msgstr "git notes [--ref <註解引用>] [list [<物件>]]" @@ -12493,9 +12576,7 @@ msgstr "註解內容被留在 %s 中" msgid "could not open or read '%s'" msgstr "無法開啟或讀取「%s」" -#: builtin/notes.c builtin/notes.c builtin/notes.c -#: builtin/notes.c builtin/notes.c builtin/notes.c -#: builtin/notes.c builtin/notes.c builtin/notes.c +#: builtin/notes.c #, c-format msgid "failed to resolve '%s' as a valid ref." msgstr "無法解析 '%s' 為一個有效引用。" @@ -12523,48 +12604,48 @@ msgstr "將註解從「%s」複製至「%s」失敗" msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "拒絕向 %2$s（在 refs/notes/ 之外）%1$s註解" -#: builtin/notes.c builtin/notes.c +#: builtin/notes.c #, c-format msgid "no note found for object %s." msgstr "未發現物件 %s 的註解。" -#: builtin/notes.c builtin/notes.c +#: builtin/notes.c msgid "note contents as a string" msgstr "註解內容作為一個字串" -#: builtin/notes.c builtin/notes.c +#: builtin/notes.c msgid "note contents in a file" msgstr "註解內容到一個檔案中" -#: builtin/notes.c builtin/notes.c +#: builtin/notes.c msgid "reuse and edit specified note object" msgstr "重用和編輯指定的註解物件" -#: builtin/notes.c builtin/notes.c +#: builtin/notes.c msgid "edit note message in editor" msgstr "在編輯器中編輯備註訊息" -#: builtin/notes.c builtin/notes.c +#: builtin/notes.c msgid "reuse specified note object" msgstr "重用指定的註解物件" -#: builtin/notes.c builtin/notes.c +#: builtin/notes.c msgid "allow storing empty note" msgstr "允許儲存空白備註" -#: builtin/notes.c builtin/notes.c +#: builtin/notes.c msgid "replace existing notes" msgstr "取代已存在的註解" -#: builtin/notes.c builtin/notes.c +#: builtin/notes.c msgid "<paragraph-break>" msgstr "<paragraph-break>" -#: builtin/notes.c builtin/notes.c +#: builtin/notes.c msgid "insert <paragraph-break> between paragraphs" msgstr "在段落間插入 <paragraph-break>" -#: builtin/notes.c builtin/notes.c +#: builtin/notes.c msgid "remove unnecessary whitespace" msgstr "移除不必要的空白字元" @@ -12575,12 +12656,12 @@ msgid "" "existing notes" msgstr "不能新增註解。發現物件 %s 已存在註解。使用 '-f' 覆蓋現存註解" -#: builtin/notes.c builtin/notes.c +#: builtin/notes.c #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "覆蓋物件 %s 現存註解\n" -#: builtin/notes.c builtin/notes.c builtin/notes.c +#: builtin/notes.c #, c-format msgid "Removing note for object %s\n" msgstr "刪除物件 %s 的註解\n" @@ -12790,6 +12871,11 @@ msgstr "目前 --write-bitmap-index 需要指定 --name-hash-version=1" #: builtin/pack-objects.c #, c-format +msgid "write_reuse_object: unable to parse object header of %s" +msgstr "write_reuse_object：無法解析 %s 的物件標頭" + +#: builtin/pack-objects.c +#, c-format msgid "" "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in " "pack %s" @@ -12866,7 +12952,7 @@ msgstr "%s 的 delta 基準位移越界" msgid "Counting objects" msgstr "正在計算物件數量" -#: builtin/pack-objects.c pack-bitmap.c pack-bitmap.c +#: builtin/pack-objects.c pack-bitmap.c #, c-format msgid "unable to get size of %s" msgstr "不能得到 %s 的大小" @@ -12876,13 +12962,12 @@ msgstr "不能得到 %s 的大小" msgid "unable to parse object header of %s" msgstr "無法解析物件 %s 標頭訊息" -#: builtin/pack-objects.c builtin/pack-objects.c #: builtin/pack-objects.c #, c-format msgid "object %s cannot be read" msgstr "物件 %s 無法讀取" -#: builtin/pack-objects.c builtin/pack-objects.c +#: builtin/pack-objects.c #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "物件 %s 不一致的物件長度（%<PRIuMAX> vs %<PRIuMAX>）" @@ -12906,7 +12991,7 @@ msgstr "無法為標籤 %s 壓縮物件" msgid "unable to get type of object %s" msgstr "無法獲得物件 %s 類型" -#: builtin/pack-objects.c builtin/pack-objects.c +#: builtin/pack-objects.c msgid "Compressing objects by path" msgstr "正在根據路徑壓縮物件" @@ -12949,7 +13034,7 @@ msgstr "物件已經在其他 uploadpack.blobpackfileuri 設定過 (收到 '%s') msgid "could not get type of object %s in pack %s" msgstr "無法取得 %2$s 包中 %1$s 物件的類型" -#: builtin/pack-objects.c builtin/pack-objects.c +#: builtin/pack-objects.c #, c-format msgid "could not find pack '%s'" msgstr "找不到「%s」包" @@ -12964,7 +13049,7 @@ msgstr "封包檔案 %s 是承諾者，但是指定了 --exclude-promisor-object msgid "packfile %s cannot be accessed" msgstr "無法存取封包檔案 %s" -#: builtin/pack-objects.c builtin/pack-objects.c +#: builtin/pack-objects.c msgid "Enumerating cruft objects" msgstr "正在枚舉無用物件" @@ -12994,7 +13079,7 @@ msgstr "" "預期物件 ID，卻得到垃圾資料：\n" " %s" -#: builtin/pack-objects.c builtin/pack-objects.c +#: builtin/pack-objects.c msgid "cannot open pack index" msgstr "無法開啟包檔案索引" @@ -13008,10 +13093,6 @@ msgid "unable to force loose object" msgstr "無法強制鬆散物件" #: builtin/pack-objects.c -msgid "failed to pack objects via path-walk" -msgstr "無法使用 path-walk 封裝物件" - -#: builtin/pack-objects.c #, c-format msgid "not a rev '%s'" msgstr "不是一個版本 '%s'" @@ -13022,6 +13103,10 @@ msgid "bad revision '%s'" msgstr "壞的版本 '%s'" #: builtin/pack-objects.c +msgid "failed to pack objects via path-walk" +msgstr "無法使用 path-walk 封裝物件" + +#: builtin/pack-objects.c msgid "unable to add recent objects" msgstr "無法新增最近的物件" @@ -13347,24 +13432,23 @@ msgstr "" msgid "You are not currently on a branch." msgstr "您目前不在一個分支上。" -#: builtin/pull.c builtin/pull.c +#: builtin/pull.c msgid "Please specify which branch you want to rebase against." msgstr "請指定您要重定基底到哪一個分支。" -#: builtin/pull.c builtin/pull.c +#: builtin/pull.c msgid "Please specify which branch you want to merge with." msgstr "請指定您要合併哪一個分支。" -#: builtin/pull.c builtin/pull.c +#: builtin/pull.c msgid "See git-pull(1) for details." msgstr "詳見 git-pull(1)。" -#: builtin/pull.c builtin/pull.c builtin/pull.c -#: builtin/rebase.c +#: builtin/pull.c builtin/rebase.c msgid "<remote>" msgstr "<遠端>" -#: builtin/pull.c builtin/pull.c builtin/pull.c scalar.c +#: builtin/pull.c scalar.c msgid "<branch>" msgstr "<分支>" @@ -13727,6 +13811,11 @@ msgstr "在有 push.recurseSubmodules=only; 的情況嘗試遞迴子模組；改 msgid "invalid value for '%s'" msgstr "「%s」的值無效" +#: builtin/push.c +#, c-format +msgid "could not push to %s" +msgstr "無法推送到 %s" + #: builtin/push.c builtin/submodule--helper.c msgid "repository" msgstr "版本庫" @@ -13771,8 +13860,7 @@ msgstr "控制子模組的遞迴推送" msgid "use thin pack" msgstr "使用精簡打包" -#: builtin/push.c builtin/push.c builtin/send-pack.c -#: builtin/send-pack.c +#: builtin/push.c builtin/send-pack.c msgid "receive pack program" msgstr "接收包程式" @@ -13820,15 +13908,35 @@ msgid "" "and then push using the remote name\n" "\n" " git push <name>\n" +"\n" +"To push to multiple remotes at once, configure a remote group using\n" +"\n" +" git config remotes.<groupname> \"<remote1> <remote2>\"\n" +"\n" +"and then push using the group name\n" +"\n" +" git push <groupname>\n" msgstr "" "沒有設定推送目的地。\n" -"請透過命令列指定 URL，或者用下面指令設定遠端版本庫\n" +"請透過命令列指定 URL，或者用以下命令設定遠端版本庫\n" "\n" -" git remote add <名稱> <位址>\n" +" git remote add <名稱> <URL>\n" "\n" -"然後使用該遠端版本庫名執行推送\n" +"然後以該遠端名稱進行推送\n" "\n" " git push <名稱>\n" +"\n" +"要一次推送到多個遠端，用以下命令設定遠端群組\n" +"\n" +" git config remotes.<群組名稱> \"<遠端1> <遠端2>\"\n" +"\n" +"然後以該群組名稱進行推送\n" +"\n" +" git push <群組名稱>\n" + +#: builtin/push.c +msgid "push options must not have new line characters" +msgstr "推送選項不能有換行符號" #: builtin/push.c msgid "--all can't be combined with refspecs" @@ -13839,8 +13947,8 @@ msgid "--mirror can't be combined with refspecs" msgstr "--mirror 不能和引用規格同時使用" #: builtin/push.c -msgid "push options must not have new line characters" -msgstr "推送選項不能有換行符號" +msgid "--atomic can only be used when pushing to one remote" +msgstr "--atomic 只能在推送到一個遠端時使用" #: builtin/range-diff.c msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>" @@ -13864,10 +13972,6 @@ msgid "use simple diff colors" msgstr "使用簡單差異顏色" #: builtin/range-diff.c -msgid "notes" -msgstr "註解" - -#: builtin/range-diff.c builtin/range-diff.c builtin/range-diff.c msgid "passed to 'git log'" msgstr "傳遞給 'git log'" @@ -13887,12 +13991,12 @@ msgstr "只發出跟第一個範圍相關的輸出" msgid "only emit output related to the second range" msgstr "只發出跟第二個範圍相關的輸出" -#: builtin/range-diff.c builtin/range-diff.c builtin/range-diff.c +#: builtin/range-diff.c #, c-format msgid "not a revision: '%s'" msgstr "非修訂版：「%s」" -#: builtin/range-diff.c builtin/range-diff.c +#: builtin/range-diff.c #, c-format msgid "not a commit range: '%s'" msgstr "不是提交範圍：「%s」" @@ -14046,8 +14150,7 @@ msgstr "無效的原始 head：'%s'" msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "忽略無效的 allow_rerere_autoupdate：'%s'" -#: builtin/rebase.c builtin/rebase.c builtin/rebase.c -#: builtin/rm.c sequencer.c sequencer.c +#: builtin/rebase.c builtin/rm.c sequencer.c #, c-format msgid "could not remove '%s'" msgstr "無法刪除「%s」" @@ -14080,7 +14183,6 @@ msgstr "未知的 rebase-merges 模式：%s" msgid "could not switch to %s" msgstr "無法切換到 %s" -#: builtin/rebase.c builtin/rebase.c builtin/rebase.c #: builtin/rebase.c msgid "apply options and merge options cannot be used together" msgstr "套用選項與合併選項不得同時使用" @@ -14183,7 +14285,7 @@ msgstr "忽略製作日期而使用日前日期" msgid "synonym of --reset-author-date" msgstr "和 --reset-author-date 同義" -#: builtin/rebase.c builtin/rebase.c +#: builtin/rebase.c msgid "passed to 'git apply'" msgstr "傳遞給 'git apply'" @@ -14191,7 +14293,7 @@ msgstr "傳遞給 'git apply'" msgid "ignore changes in whitespace" msgstr "忽略空白字元中的變更" -#: builtin/rebase.c builtin/rebase.c +#: builtin/rebase.c msgid "cherry-pick all commits, even if unchanged" msgstr "揀選所有提交，即使未修改" @@ -14236,10 +14338,6 @@ msgstr "讓使用者編輯要重定基底的提交列表" msgid "(REMOVED) was: try to recreate merges instead of ignoring them" msgstr "（已移除）曾為：嘗試重新建立，而非忽略合併" -#: builtin/rebase.c builtin/revert.c -msgid "how to handle commits that become empty" -msgstr "處理空白提交的方式" - #: builtin/rebase.c msgid "keep commits which start empty" msgstr "保留開頭是空白的提交" @@ -14570,7 +14668,7 @@ msgstr "" " [--dry-run | -n] [--verbose] [--all [--single-worktree] | " "<refs>...]" -#: builtin/reflog.c builtin/reflog.c +#: builtin/reflog.c #, c-format msgid "invalid timestamp '%s' given to '--%s'" msgstr "傳入「--%s」的時間戳「%s」無效" @@ -14580,24 +14678,24 @@ msgstr "傳入「--%s」的時間戳「%s」無效" msgid "%s does not accept arguments: '%s'" msgstr "%s 不接受參數：'%s'" -#: builtin/reflog.c builtin/reflog.c +#: builtin/reflog.c msgid "do not actually prune any entries" msgstr "不實際剪除任何項目" -#: builtin/reflog.c builtin/reflog.c +#: builtin/reflog.c msgid "" "rewrite the old SHA1 with the new SHA1 of the entry that now precedes it" msgstr "將舊的 SHA1 重寫為現在比它早的新 SHA1" -#: builtin/reflog.c builtin/reflog.c +#: builtin/reflog.c msgid "update the reference to the value of the top reflog entry" msgstr "更新引用至首個引用日誌項目的值" -#: builtin/reflog.c builtin/reflog.c +#: builtin/reflog.c msgid "print extra information on screen" msgstr "在螢幕上輸出額外資訊" -#: builtin/reflog.c builtin/reflog.c +#: builtin/reflog.c msgid "timestamp" msgstr "時間戳" @@ -14628,7 +14726,7 @@ msgstr "限制只處理目前工作區的引用日誌" msgid "Marking reachable objects..." msgstr "正在標記可以取得物件..." -#: builtin/reflog.c builtin/reflog.c +#: builtin/reflog.c #, c-format msgid "reflog could not be found: '%s'" msgstr "找不到引用日誌：「%s」" @@ -14763,15 +14861,15 @@ msgstr "" "git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <名稱> <位址>" -#: builtin/remote.c builtin/remote.c +#: builtin/remote.c msgid "git remote rename [--[no-]progress] <old> <new>" msgstr "git remote rename [--[no-]progress] <old> <new>" -#: builtin/remote.c builtin/remote.c +#: builtin/remote.c msgid "git remote remove <name>" msgstr "git remote remove <名稱>" -#: builtin/remote.c builtin/remote.c +#: builtin/remote.c msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <名稱> (-a | --auto | -d | --delete | <分支>)" @@ -14792,19 +14890,19 @@ msgstr "git remote [-v | --verbose] update [-p | --prune] [(<組> | <遠端>)... msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <名稱> <分支>..." -#: builtin/remote.c builtin/remote.c +#: builtin/remote.c msgid "git remote get-url [--push] [--all] <name>" msgstr "git remote get-url [--push] [--all] <名稱>" -#: builtin/remote.c builtin/remote.c +#: builtin/remote.c msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <名稱> <新的位址> [<舊的位址>]" -#: builtin/remote.c builtin/remote.c +#: builtin/remote.c msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <名稱> <新的位址>" -#: builtin/remote.c builtin/remote.c +#: builtin/remote.c msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <名稱> <位址>" @@ -14897,7 +14995,7 @@ msgstr "指定一個 master 分支並使用 --mirror 選項沒有意義" msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "指定要追蹤的分支只在與取得鏡像同時使用才有意義" -#: builtin/remote.c builtin/remote.c +#: builtin/remote.c #, c-format msgid "remote %s already exists." msgstr "遠端 %s 已經存在。" @@ -14907,8 +15005,7 @@ msgstr "遠端 %s 已經存在。" msgid "Could not setup master '%s'" msgstr "無法配置 master「%s」" -#: builtin/remote.c builtin/remote.c trailer.c trailer.c -#: trailer.c +#: builtin/remote.c trailer.c #, c-format msgid "more than one %s" msgstr "多於一個 %s" @@ -14923,7 +15020,7 @@ msgstr "branch.%s.rebase=%s 未處理。假設成 'true'" msgid "Could not get fetch map for refspec %s" msgstr "無法取得引用規格 %s 的 fetch 映射" -#: builtin/remote.c builtin/remote.c +#: builtin/remote.c msgid "(matching)" msgstr "（符合）" @@ -14936,8 +15033,7 @@ msgstr "（刪除）" msgid "could not set '%s'" msgstr "無法設定「%s」" -#: builtin/remote.c builtin/remote.c builtin/remote.c -#: config.c +#: builtin/remote.c config.c #, c-format msgid "could not unset '%s'" msgstr "無法取消設定「%s」" @@ -14969,7 +15065,7 @@ msgstr "" "\n" "若是這種情況，你可以先將遠端改為不同的名稱來解決這個問題。\n" -#: builtin/remote.c builtin/remote.c builtin/remote.c +#: builtin/remote.c #, c-format msgid "No such remote: '%s'" msgstr "沒有此遠端版本庫：'%s'" @@ -15132,7 +15228,7 @@ msgstr " 取得位址：%s" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c builtin/remote.c +#: builtin/remote.c #, c-format msgid " Push URL: %s" msgstr " 推送位址：%s" @@ -15141,7 +15237,7 @@ msgstr " 推送位址：%s" msgid "(no URL)" msgstr "(無 URL)" -#: builtin/remote.c builtin/remote.c builtin/remote.c +#: builtin/remote.c #, c-format msgid " HEAD branch: %s" msgstr " HEAD 分支：%s" @@ -15168,7 +15264,7 @@ msgid_plural " Remote branches:%s" msgstr[0] " 遠端分支：%s" # 譯者：中文字串拼接，可刪除前導空格 -#: builtin/remote.c builtin/remote.c +#: builtin/remote.c msgid " (status not queried)" msgstr " （狀態未查詢）" @@ -15269,7 +15365,7 @@ msgstr " * [已剪除] %s" msgid "prune remotes after fetching" msgstr "抓取後剪除遠端" -#: builtin/remote.c builtin/remote.c builtin/remote.c +#: builtin/remote.c #, c-format msgid "No such remote '%s'" msgstr "沒有此遠端 '%s'" @@ -15328,11 +15424,11 @@ msgstr "詳細輸出；必須置於子指令之前" msgid "" "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" "[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n" -"[--write-midx] [--name-hash-version=<n>] [--path-walk]" +"[--write-midx[=<mode>]] [--name-hash-version=<n>] [--path-walk]" msgstr "" "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" "[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n" -"[--write-midx] [--name-hash-version=<n>] [--path-walk]" +"[--write-midx[=<mode>]] [--name-hash-version=<n>] [--path-walk]" #: builtin/repack.c msgid "" @@ -15343,6 +15439,11 @@ msgstr "" "或停用 pack.writeBitmaps 設定。" #: builtin/repack.c +#, c-format +msgid "unknown value for %s: %s" +msgstr "未知的 %s 值：%s" + +#: builtin/repack.c msgid "pack everything in a single pack" msgstr "所有內容打包到一個包檔案中" @@ -15354,7 +15455,7 @@ msgstr "和 -a 相同，並將無法取得的物件設為鬆散物件" msgid "same as -a, pack unreachable cruft objects separately" msgstr "和 -a 相同，會獨立封裝無法存取的無用物件" -#: builtin/repack.c builtin/repack.c +#: builtin/repack.c msgid "approxidate" msgstr "近似日期" @@ -15461,6 +15562,11 @@ msgstr "不能刪除珍品版本庫中的封包" #: builtin/repack.c #, c-format +msgid "invalid value for %s: %d" +msgstr "無效的 %s 值：%d" + +#: builtin/repack.c +#, c-format msgid "option '%s' can only be used along with '%s'" msgstr "「%s」選項只能與「%s」一起使用" @@ -15478,7 +15584,7 @@ msgstr "git replace [-f] --edit <物件>" #: builtin/replace.c msgid "git replace [-f] --graft <commit> [<parent>...]" -msgstr "git replace [-f] --graft <提交> [<父提交>...]" +msgstr "git replace [-f] --graft <提交> [<親代提交>...]" #: builtin/replace.c msgid "git replace -d <object>..." @@ -15650,7 +15756,7 @@ msgstr "編輯現存的物件" #: builtin/replace.c msgid "change a commit's parents" -msgstr "修改一個提交的父提交" +msgstr "修改一個提交的親代提交" #: builtin/replace.c msgid "convert existing graft file" @@ -15747,7 +15853,6 @@ msgstr "控制引用的更新行為（update|print）" msgid "exactly one of --onto, --advance, or --revert is required" msgstr "--onto、--advance 或 --revert 必須三選一" -#: builtin/replay.c builtin/replay.c builtin/replay.c #: builtin/replay.c #, c-format msgid "" @@ -15769,11 +15874,11 @@ msgstr "--keys 只能與 --format=lines 或 --format=nul 一起使用" msgid "invalid format '%s'" msgstr "「%s」格式無效" -#: builtin/repo.c builtin/repo.c +#: builtin/repo.c msgid "output format" msgstr "輸出格式" -#: builtin/repo.c builtin/repo.c +#: builtin/repo.c msgid "synonym for --format=nul" msgstr "和 --format=nul 同義" @@ -15801,7 +15906,7 @@ msgstr "--all 和 <key> 不能同時使用" msgid "References" msgstr "引用" -#: builtin/repo.c builtin/repo.c +#: builtin/repo.c msgid "Count" msgstr "總數" @@ -15809,7 +15914,6 @@ msgstr "總數" msgid "Branches" msgstr "分支" -#: builtin/repo.c builtin/repo.c builtin/repo.c builtin/repo.c #: builtin/repo.c msgid "Tags" msgstr "標籤" @@ -15826,15 +15930,15 @@ msgstr "其他" msgid "Reachable objects" msgstr "可到達物件" -#: builtin/repo.c builtin/repo.c builtin/repo.c builtin/repo.c +#: builtin/repo.c msgid "Commits" msgstr "提交" -#: builtin/repo.c builtin/repo.c builtin/repo.c builtin/repo.c +#: builtin/repo.c msgid "Trees" msgstr "樹狀物件" -#: builtin/repo.c builtin/repo.c builtin/repo.c builtin/repo.c +#: builtin/repo.c msgid "Blobs" msgstr "資料物件" @@ -15850,13 +15954,13 @@ msgstr "磁碟大小" msgid "Largest objects" msgstr "最大的物件" -#: builtin/repo.c builtin/repo.c builtin/repo.c builtin/repo.c +#: builtin/repo.c msgid "Maximum size" msgstr "最大大小" #: builtin/repo.c msgid "Maximum parents" -msgstr "最大父提交數" +msgstr "最大親代提交數" #: builtin/repo.c msgid "Maximum entries" @@ -15956,8 +16060,7 @@ msgstr "HEAD 現在位於 %s" msgid "Cannot do a %s reset in the middle of a merge." msgstr "在合併過程中不能做%s重設動作。" -#: builtin/reset.c builtin/stash.c builtin/stash.c -#: builtin/stash.c +#: builtin/reset.c builtin/stash.c msgid "be quiet, only report errors" msgstr "安靜模式，只報告錯誤" @@ -15973,7 +16076,7 @@ msgstr "重設 HEAD 和索引" msgid "reset only HEAD" msgstr "只重設 HEAD" -#: builtin/reset.c builtin/reset.c +#: builtin/reset.c msgid "reset HEAD, index and working tree" msgstr "重設 HEAD、索引和工作區" @@ -16223,11 +16326,11 @@ msgstr "編輯提交說明" #: builtin/revert.c msgid "parent-number" -msgstr "父編號" +msgstr "親代編號" #: builtin/revert.c msgid "select mainline parent" -msgstr "選擇主幹父提交編號" +msgstr "選擇主幹親代提交編號" #: builtin/revert.c msgid "merge strategy" @@ -16297,7 +16400,7 @@ msgid "the following file has changes staged in the index:" msgid_plural "the following files have changes staged in the index:" msgstr[0] "下列檔案有暫存在索引的變更：" -#: builtin/rm.c builtin/rm.c +#: builtin/rm.c msgid "" "\n" "(use --cached to keep the file, or -f to force removal)" @@ -16394,7 +16497,7 @@ msgstr "git log --pretty=short | git shortlog [<選項>]" msgid "using multiple --group options with stdin is not supported" msgstr "不支援在標準輸入使用多個 --group 選項" -#: builtin/shortlog.c builtin/shortlog.c +#: builtin/shortlog.c #, c-format msgid "using %s with stdin is not supported" msgstr "不支援對 %s 使用 stdin" @@ -16588,10 +16691,6 @@ msgstr "無法讀取標頭" msgid "unknown index version" msgstr "未知的索引版本" -#: builtin/show-index.c builtin/show-index.c -msgid "unable to read index" -msgstr "無法讀取索引" - #: builtin/show-index.c msgid "corrupt index file" msgstr "索引檔案損壞" @@ -16669,7 +16768,7 @@ msgstr "檢查引用是否存在但不解析" msgid "stricter reference checking, requires exact ref path" msgstr "更嚴格的引用檢測，需要精確的引用路徑" -#: builtin/show-ref.c builtin/show-ref.c +#: builtin/show-ref.c msgid "show the HEAD reference, even if it would be filtered out" msgstr "顯示 HEAD 引用，即使被過濾掉" @@ -16734,12 +16833,10 @@ msgstr "無法初始化工作區組態" msgid "failed to modify sparse-index config" msgstr "無法修改稀疏索引設定" -#: builtin/sparse-checkout.c builtin/sparse-checkout.c #: builtin/sparse-checkout.c msgid "initialize the sparse-checkout in cone mode" msgstr "以 cone 模式初始化稀疏簽出" -#: builtin/sparse-checkout.c builtin/sparse-checkout.c #: builtin/sparse-checkout.c msgid "toggle the use of a sparse index" msgstr "切換是否使用稀疏索引" @@ -16754,12 +16851,11 @@ msgstr "無法開啟「%s」" msgid "could not normalize path %s" msgstr "無法標準化路徑 %s" -#: builtin/sparse-checkout.c builtin/sparse-checkout.c +#: builtin/sparse-checkout.c #, c-format msgid "unable to unquote C-style string '%s'" msgstr "無法去掉 '%s' C 樣式字串的引號" -#: builtin/sparse-checkout.c builtin/sparse-checkout.c #: builtin/sparse-checkout.c msgid "unable to load existing sparse-checkout patterns" msgstr "無法載入現存的稀疏簽出樣式" @@ -16810,12 +16906,12 @@ msgstr "" msgid "git sparse-checkout add [--skip-checks] (--stdin | <patterns>)" msgstr "git sparse-checkout add [--skip-checks] (--stdin | <patterns>)" -#: builtin/sparse-checkout.c builtin/sparse-checkout.c +#: builtin/sparse-checkout.c msgid "" "skip some sanity checks on the given paths that might give false positives" msgstr "在可能給出誤判結果的指定目錄，略過某些完整性檢查" -#: builtin/sparse-checkout.c builtin/sparse-checkout.c +#: builtin/sparse-checkout.c msgid "read patterns from standard in" msgstr "從標準輸入讀取樣式" @@ -16912,8 +17008,12 @@ msgid "git stash pop [--index] [-q | --quiet] [<stash>]" msgstr "git stash pop [--index] [-q | --quiet] [<stash>]" #: builtin/stash.c -msgid "git stash apply [--index] [-q | --quiet] [<stash>]" -msgstr "git stash apply [--index] [-q | --quiet] [<stash>]" +msgid "" +"git stash apply [--index] [-q | --quiet] [--label-ours=<label>] [--label-" +"theirs=<label>] [--label-base=<label>] [<stash>]" +msgstr "" +"git stash apply [--index] [-q | --quiet] [--label-ours=<label>] [--label-" +"theirs=<label>] [--label-base=<label>] [<stash>]" #: builtin/stash.c msgid "git stash branch <branchname> [<stash>]" @@ -17025,11 +17125,27 @@ msgstr "索引未從貯存中復原。" msgid "could not restore untracked files from stash" msgstr "無法從貯存條目中復原未追蹤檔案" -#: builtin/stash.c builtin/stash.c +#: builtin/stash.c msgid "attempt to recreate the index" msgstr "嘗試重建索引" #: builtin/stash.c +msgid "label" +msgstr "label" + +#: builtin/stash.c +msgid "label for the upstream side in conflict markers" +msgstr "衝突標記中表示上游的標籤" + +#: builtin/stash.c +msgid "label for the stashed side in conflict markers" +msgstr "衝突標記中表示貯存的標籤" + +#: builtin/stash.c +msgid "label for the base in diff3 conflict markers" +msgstr "diff3 衝突標記中表示基底的標籤" + +#: builtin/stash.c #, c-format msgid "Dropped %s (%s)" msgstr "捨棄了 %s（%s）" @@ -17068,12 +17184,12 @@ msgstr "在貯存區包含未追蹤檔案" msgid "only show untracked files in the stash" msgstr "只在貯存區顯示未追蹤檔案" -#: builtin/stash.c builtin/stash.c +#: builtin/stash.c #, c-format msgid "Cannot update %s with %s" msgstr "無法用 %2$s 更新 %1$s" -#: builtin/stash.c builtin/stash.c builtin/stash.c +#: builtin/stash.c msgid "stash message" msgstr "貯存說明" @@ -17101,7 +17217,7 @@ msgstr "無法儲存目前索引狀態" msgid "Cannot save the untracked files" msgstr "無法儲存未追蹤檔案" -#: builtin/stash.c builtin/stash.c +#: builtin/stash.c msgid "Cannot save the current worktree state" msgstr "無法儲存目前工作區狀態" @@ -17146,31 +17262,30 @@ msgstr "儲存工作目錄和索引狀態 %s" msgid "Cannot remove worktree changes" msgstr "無法刪除工作區變更" -#: builtin/stash.c builtin/stash.c +#: builtin/stash.c msgid "keep index" msgstr "保持索引" -#: builtin/stash.c builtin/stash.c +#: builtin/stash.c msgid "stash staged changes only" msgstr "只貯存暫存變更" -#: builtin/stash.c builtin/stash.c +#: builtin/stash.c msgid "stash in patch mode" msgstr "以修補檔模式貯存" -#: builtin/stash.c builtin/stash.c +#: builtin/stash.c msgid "quiet mode" msgstr "靜默模式" -#: builtin/stash.c builtin/stash.c +#: builtin/stash.c msgid "include untracked files in stash" msgstr "貯存中包含未追蹤檔案" -#: builtin/stash.c builtin/stash.c +#: builtin/stash.c msgid "include ignore files" msgstr "包含忽略的檔案" -#: builtin/stash.c builtin/stash.c builtin/stash.c #: builtin/stash.c #, c-format msgid "cannot parse commit %s" @@ -17213,9 +17328,9 @@ msgstr "找到 %s 貯存提交，裡面缺少預期的前綴" #: builtin/stash.c #, c-format msgid "cannot parse parents of commit: %s" -msgstr "無法解析提交的父物件：%s" +msgstr "無法解析提交的親代物件：%s" -#: builtin/stash.c builtin/stash.c builtin/stash.c +#: builtin/stash.c #, c-format msgid "%s does not look like a stash commit" msgstr "%s 似乎不是貯存提交" @@ -17266,7 +17381,7 @@ msgid "" "authoritative upstream." msgstr "找不到「%s」組態設定。假定這個版本庫是其自身的官方上游。" -#: builtin/submodule--helper.c builtin/submodule--helper.c +#: builtin/submodule--helper.c #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "無法取得子模組「%s」的版本庫控制代碼" @@ -17275,7 +17390,6 @@ msgstr "無法取得子模組「%s」的版本庫控制代碼" msgid "git submodule--helper get-default-remote <path>" msgstr "git submodule--helper get-default-remote <path>" -#: builtin/submodule--helper.c builtin/submodule--helper.c #: builtin/submodule--helper.c #, c-format msgid "No url found for submodule path '%s' in .gitmodules" @@ -17309,7 +17423,6 @@ msgstr "" msgid "suppress output of entering each submodule command" msgstr "隱藏每個子模組進入命令的輸出" -#: builtin/submodule--helper.c builtin/submodule--helper.c #: builtin/submodule--helper.c msgid "recurse into nested submodules" msgstr "遞迴進入嵌套子模組中" @@ -17357,7 +17470,6 @@ msgstr "隱藏初始化子模組的輸出" msgid "git submodule init [<options>] [<path>]" msgstr "git submodule init [<options>] [<path>]" -#: builtin/submodule--helper.c builtin/submodule--helper.c #: builtin/submodule--helper.c #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" @@ -17368,12 +17480,12 @@ msgstr "在 .gitmodules 中沒有發現路徑 '%s' 的子模組映射" msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "無法解析子模組「%s」的 HEAD 引用" -#: builtin/submodule--helper.c builtin/submodule--helper.c +#: builtin/submodule--helper.c #, c-format msgid "failed to recurse into submodule '%s'" msgstr "遞迴子模組 '%s' 失敗" -#: builtin/submodule--helper.c builtin/submodule--helper.c +#: builtin/submodule--helper.c msgid "suppress submodule status output" msgstr "隱藏子模組的狀態輸出" @@ -17553,7 +17665,7 @@ msgstr "" msgid "could not get a repository handle for gitdir '%s'" msgstr "無法取得 gitdir「%s」的版本庫控制代碼" -#: builtin/submodule--helper.c builtin/submodule--helper.c +#: builtin/submodule--helper.c #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "子模組 '%s' 不能新增版本庫備選：%s" @@ -17568,7 +17680,6 @@ msgstr "不能識別 submodule.alternateErrorStrategy 的取值 '%s'" msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "不能識別 submodule.alternateLocation 的取值 '%s'" -#: builtin/submodule--helper.c builtin/submodule--helper.c #: builtin/submodule--helper.c #, c-format msgid "directory not empty: '%s'" @@ -17609,11 +17720,10 @@ msgstr "新子模組的名稱" msgid "url where to clone the submodule from" msgstr "拓製子模組的 url 位址" -#: builtin/submodule--helper.c builtin/submodule--helper.c +#: builtin/submodule--helper.c msgid "depth for shallow clones" msgstr "淺拓製的深度" -#: builtin/submodule--helper.c builtin/submodule--helper.c #: builtin/submodule--helper.c msgid "force cloning progress" msgstr "強制顯示拓製進度" @@ -17860,7 +17970,7 @@ msgstr "git submodule set-branch [-q|--quiet] (-b|--branch) <branch> <path>" msgid "--branch or --default required" msgstr "需要 --branch 或 --default" -#: builtin/submodule--helper.c builtin/submodule--helper.c +#: builtin/submodule--helper.c msgid "print only error messages" msgstr "只輸出錯誤訊息" @@ -17925,7 +18035,7 @@ msgstr "正在重新啟用「%s」子模組的本機 Git 目錄\n" msgid "unable to checkout submodule '%s'" msgstr "無法簽出「%s」子模組" -#: builtin/submodule--helper.c builtin/submodule--helper.c +#: builtin/submodule--helper.c msgid "please make sure that the .gitmodules file is in the working tree" msgstr "請確認 .gitmodules 檔案在工作區裡" @@ -17934,7 +18044,6 @@ msgstr "請確認 .gitmodules 檔案在工作區裡" msgid "Failed to add submodule '%s'" msgstr "無法加入子模組「%s」" -#: builtin/submodule--helper.c builtin/submodule--helper.c #: builtin/submodule--helper.c #, c-format msgid "Failed to register submodule '%s'" @@ -18128,7 +18237,7 @@ msgstr "壞的物件類型。" msgid "no tag message?" msgstr "無標籤說明？" -#: builtin/tag.c builtin/tag.c +#: builtin/tag.c #, c-format msgid "The tag message has been left in %s\n" msgstr "標籤說明被保留在 %s\n" @@ -18189,11 +18298,11 @@ msgstr "標籤列表選項" msgid "show tag list in columns" msgstr "以列的方式顯示標籤列表" -#: builtin/tag.c builtin/tag.c +#: builtin/tag.c msgid "print only tags that contain the commit" msgstr "只列印包含該提交的標籤" -#: builtin/tag.c builtin/tag.c +#: builtin/tag.c msgid "print only tags that don't contain the commit" msgstr "只列印不包含該提交的標籤" @@ -18269,7 +18378,7 @@ msgstr "建立目錄 %s 失敗" msgid "failed to delete file %s" msgstr "刪除檔案 %s 失敗" -#: builtin/update-index.c builtin/update-index.c +#: builtin/update-index.c #, c-format msgid "failed to delete directory %s" msgstr "刪除目錄 %s 失敗" @@ -18575,6 +18684,18 @@ msgstr "如果 <目錄> 不是一個 Git 目錄，不要嘗試 <目錄>/.git/" msgid "interrupt transfer after <n> seconds of inactivity" msgstr "不活動 <n> 秒鐘後終止傳輸" +#: builtin/url-parse.c +msgid "git url-parse [-c <component>] [--] <url>..." +msgstr "git url-parse [-c <component>] [--] <url>..." + +#: builtin/url-parse.c +msgid "component" +msgstr "component" + +#: builtin/url-parse.c +msgid "which URL component to extract" +msgstr "要提出的 URL 部件" + #: builtin/verify-commit.c msgid "git verify-commit [-v | --verbose] [--raw] <commit>..." msgstr "git verify-commit [-v | --verbose] [--raw] <commit>..." @@ -18728,7 +18849,7 @@ msgstr "將「%s」複製至「%s」失敗；稀疏簽出可能無法正常運 msgid "failed to copy worktree config from '%s' to '%s'" msgstr "將工作區組態從「%s」複製至「%s」失敗" -#: builtin/worktree.c builtin/worktree.c +#: builtin/worktree.c #, c-format msgid "failed to unset '%s' in '%s'" msgstr "無法取消「%2$s」中「%1$s」的設定" @@ -18747,7 +18868,7 @@ msgstr "正在初始化" msgid "could not find created worktree '%s'" msgstr "找不到建立的工作區「%s」" -#: builtin/worktree.c builtin/worktree.c +#: builtin/worktree.c #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "準備工作區（新分支 '%s'）" @@ -18803,7 +18924,7 @@ msgstr "生成新的工作區" msgid "keep the new working tree locked" msgstr "鎖定新工作區" -#: builtin/worktree.c builtin/worktree.c +#: builtin/worktree.c msgid "reason for locking" msgstr "鎖定原因" @@ -18815,7 +18936,7 @@ msgstr "設定追蹤模式（參見 git-branch(1)）" msgid "try to match the new branch name with a remote-tracking branch" msgstr "嘗試為新分支名符合一個遠端追蹤分支" -#: builtin/worktree.c builtin/worktree.c builtin/worktree.c +#: builtin/worktree.c msgid "use relative paths for worktrees" msgstr "對工作區使用相對路徑" @@ -18849,13 +18970,12 @@ msgstr "對舊於 <time> 的遺失工作區加上「prunable」標示" msgid "terminate records with a NUL character" msgstr "以一個 NUL 字元終止記錄" -#: builtin/worktree.c builtin/worktree.c builtin/worktree.c #: builtin/worktree.c #, c-format msgid "'%s' is not a working tree" msgstr "'%s' 不是一個工作區" -#: builtin/worktree.c builtin/worktree.c +#: builtin/worktree.c msgid "The main working tree cannot be locked or unlocked" msgstr "主工作區無法被加鎖或解鎖" @@ -18882,7 +19002,7 @@ msgstr "不能移動或刪除包含子模組的工作區" msgid "force move even if worktree is dirty or locked" msgstr "強制移動，即使工作區是髒的或已鎖定" -#: builtin/worktree.c builtin/worktree.c +#: builtin/worktree.c #, c-format msgid "'%s' is a main working tree" msgstr "'%s' 是一個主工作區" @@ -19434,6 +19554,10 @@ msgid "Prepare patches for e-mail submission" msgstr "準備電子信件提交的修補檔" #: command-list.h +msgid "EXPERIMENTAL: Pretty format revisions on demand" +msgstr "實驗性：按需美化修訂集" + +#: command-list.h msgid "Verifies the connectivity and validity of the objects in the database" msgstr "驗證版本庫中物件的連通性和有效性" @@ -19466,8 +19590,8 @@ msgid "EXPERIMENTAL: Rewrite history" msgstr "實驗性：重寫歷史記錄" #: command-list.h -msgid "Run git hooks" -msgstr "執行 git 掛鉤" +msgid "Run Git hooks" +msgstr "執行 Git 掛鉤" #: command-list.h msgid "Server side implementation of Git over HTTP" @@ -19723,8 +19847,8 @@ msgid "Restricted login shell for Git-only SSH access" msgstr "只允許 Git SSH 存取的受限登入shell" #: command-list.h -msgid "Summarize 'git log' output" -msgstr "'git log' 輸出摘要" +msgid "Summarize `git log` output" +msgstr "總結「git log」輸出" #: command-list.h msgid "Show various types of objects" @@ -19812,6 +19936,10 @@ msgid "Send objects packed back to git-fetch-pack" msgstr "將物件壓縮包傳送回 git-fetch-pack" #: command-list.h +msgid "Parse and extract git URL components" +msgstr "解析並提出 git URL 部件" + +#: command-list.h msgid "Show a Git logical variable" msgstr "顯示 Git 邏輯變數" @@ -20087,7 +20215,7 @@ msgstr "無效的提交圖鏈：「%s」列不是雜湊值" msgid "unable to find all commit-graph files" msgstr "無法找到所有提交圖檔案" -#: commit-graph.c commit-graph.c +#: commit-graph.c msgid "invalid commit position. commit-graph is likely corrupt" msgstr "無效的提交位置。提交圖可能已損壞" @@ -20233,7 +20361,7 @@ msgstr "提交圖檔案的總和檢查碼錯誤，可能已經損壞" msgid "commit-graph has incorrect OID order: %s then %s" msgstr "提交圖的物件 ID 順序不正確：%s 然後 %s" -#: commit-graph.c commit-graph.c +#: commit-graph.c #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "提交圖有不正確的扇出值：fanout[%d] = %u != %u" @@ -20256,17 +20384,17 @@ msgstr "提交圖中的提交 %s 的根樹狀物件 ID 是 %s != %s" #: commit-graph.c #, c-format msgid "commit-graph parent list for commit %s is too long" -msgstr "提交 %s 的提交圖上級清單過長" +msgstr "提交 %s 的提交圖親代清單過長" #: commit-graph.c #, c-format msgid "commit-graph parent for %s is %s != %s" -msgstr "%s 的提交圖上級是 %s != %s" +msgstr "%s 的提交圖親代是 %s != %s" #: commit-graph.c #, c-format msgid "commit-graph parent list for commit %s terminates early" -msgstr "提交 %s 的提交圖上級清單過早終止" +msgstr "提交 %s 的提交圖親代清單過早終止" #: commit-graph.c #, c-format @@ -20289,8 +20417,7 @@ msgstr "提交圖中包含 0 和非 0 兩個世代數（例如提交「%s」和 msgid "Verifying commits in commit graph" msgstr "正在驗證提交圖中的提交" -#: commit-reach.c commit-reach.c commit-reach.c sequencer.c -#: sequencer.c +#: commit-reach.c sequencer.c #, c-format msgid "could not parse commit %s" msgstr "無法解析提交 %s" @@ -20368,7 +20495,7 @@ msgstr "沒有可用的編譯器資訊\n" msgid "no libc information available\n" msgstr "沒有可用的 libc 資訊\n" -#: compat/disk.h compat/disk.h +#: compat/disk.h #, c-format msgid "could not determine free disk size for '%s'" msgstr "無法判斷「%s」的剩餘磁碟大小" @@ -20388,8 +20515,7 @@ msgstr "[GLE %ld] 健康監聽執行緒無法開啟「%ls」" msgid "[GLE %ld] health thread getting BHFI for '%ls'" msgstr "[GLE %ld] 健康監聽執行緒取得「%ls」的 BHFI" -#: compat/fsmonitor/fsm-health-win32.c -#: compat/fsmonitor/fsm-listen-win32.c +#: compat/fsmonitor/fsm-health-win32.c compat/fsmonitor/fsm-listen-win32.c #, c-format msgid "could not convert to wide characters: '%s'" msgstr "無法轉換至較寬字元：「%s」" @@ -20409,7 +20535,7 @@ msgstr "「has_worktree_moved」中有未處置的情況：%d" msgid "health thread wait failed [GLE %ld]" msgstr "健康監聽執行緒等待失敗 [GLE %ld]" -#: compat/fsmonitor/fsm-ipc-darwin.c +#: compat/fsmonitor/fsm-ipc-unix.c #, c-format msgid "Invalid path: %s" msgstr "無效路徑：%s" @@ -20422,6 +20548,50 @@ msgstr "無法建立 FSEventStream。" msgid "Failed to start the FSEventStream" msgstr "無法啟動 FSEventStream" +#: compat/fsmonitor/fsm-listen-linux.c +msgid "inotify watch limit reached; increase fs.inotify.max_user_watches" +msgstr "達到 inotify 監看上限；請提高 fs.inotify.max_user_watches" + +#: compat/fsmonitor/fsm-listen-linux.c +#, c-format +msgid "inotify_add_watch('%s') failed" +msgstr "inotify_add_watch('%s') 失敗" + +#: compat/fsmonitor/fsm-listen-linux.c +msgid "inotify_rm_watch() failed" +msgstr "inotify_rm_watch() 失敗" + +#: compat/fsmonitor/fsm-listen-linux.c compat/fsmonitor/fsm-path-utils-darwin.c +#, c-format +msgid "opendir('%s') failed" +msgstr "opendir('%s') 失敗" + +#: compat/fsmonitor/fsm-listen-linux.c compat/fsmonitor/fsm-path-utils-darwin.c +#, c-format +msgid "lstat('%s') failed" +msgstr "lstat('%s') 失敗" + +#: compat/fsmonitor/fsm-listen-linux.c compat/fsmonitor/fsm-path-utils-darwin.c +#, c-format +msgid "closedir('%s') failed" +msgstr "closedir('%s') 失敗" + +#: compat/fsmonitor/fsm-listen-linux.c +msgid "inotify_init1() failed" +msgstr "inotify_init1() 失敗" + +#: compat/fsmonitor/fsm-listen-linux.c +msgid "closing inotify file descriptor failed" +msgstr "關閉 inotify 檔案描述子失敗" + +#: compat/fsmonitor/fsm-listen-linux.c +msgid "reading inotify message stream failed" +msgstr "讀取 inotify 訊息流失敗" + +#: compat/fsmonitor/fsm-listen-linux.c +msgid "polling inotify message stream failed" +msgstr "輪詢 inotify 訊息流失敗" + #: compat/fsmonitor/fsm-listen-win32.c #, c-format msgid "[GLE %ld] could not convert path to UTF-8: '%.*ls'" @@ -20454,24 +20624,9 @@ msgstr "無法讀取目錄變化 [GLE %ld]" #: compat/fsmonitor/fsm-path-utils-darwin.c #, c-format -msgid "opendir('%s') failed" -msgstr "opendir('%s') 失敗" - -#: compat/fsmonitor/fsm-path-utils-darwin.c -#, c-format -msgid "lstat('%s') failed" -msgstr "lstat('%s') 失敗" - -#: compat/fsmonitor/fsm-path-utils-darwin.c -#, c-format msgid "strbuf_readlink('%s') failed" msgstr "strbuf_readlink('%s') 失敗" -#: compat/fsmonitor/fsm-path-utils-darwin.c -#, c-format -msgid "closedir('%s') failed" -msgstr "closedir('%s') 失敗" - #: compat/fsmonitor/fsm-path-utils-win32.c #, c-format msgid "[GLE %ld] unable to open for read '%ls'" @@ -20492,7 +20647,7 @@ msgstr "複製 SID 失敗（%ld）" msgid "failed to get owner for '%s' (%ld)" msgstr "無法取得「%s」的所有者 (%ld)" -#: compat/obstack.c compat/obstack.c +#: compat/obstack.c msgid "memory exhausted" msgstr "記憶體耗盡" @@ -20689,12 +20844,12 @@ msgstr "無效鍵名（有換行符號）：%s" msgid "empty config key" msgstr "空白設定鍵" -#: config.c config.c +#: config.c #, c-format msgid "bogus config parameter: %s" msgstr "偽設定參數：%s" -#: config.c config.c config.c config.c +#: config.c #, c-format msgid "bogus format in %s" msgstr "%s 中格式錯誤" @@ -20907,7 +21062,7 @@ msgstr "寫入新的設定檔案 %s 失敗" msgid "no multi-line comment allowed: '%s'" msgstr "不允許多列備註：「%s」" -#: config.c config.c +#: config.c #, c-format msgid "could not lock config file %s" msgstr "無法鎖定組態檔案 %s" @@ -20922,7 +21077,7 @@ msgstr "開啟 %s" msgid "invalid config file %s" msgstr "無效的設定檔案 %s" -#: config.c config.c +#: config.c #, c-format msgid "fstat on %s failed" msgstr "對 %s 呼叫 fstat 失敗" @@ -20932,12 +21087,12 @@ msgstr "對 %s 呼叫 fstat 失敗" msgid "unable to mmap '%s'%s" msgstr "無法 mmap '%s'%s" -#: config.c config.c +#: config.c #, c-format msgid "chmod on %s failed" msgstr "對 %s 呼叫 chmod 失敗" -#: config.c config.c +#: config.c #, c-format msgid "could not write config file %s" msgstr "無法寫入組態檔案 %s" @@ -21032,7 +21187,7 @@ msgstr "在 bundle-uri 回應的第 %d 列發現錯誤：%s" msgid "expected flush after bundle-uri listing" msgstr "在 bundle-uri 清單後應該有一個 flush 包" -#: connect.c connect.c +#: connect.c msgid "expected response end packet after ref listing" msgstr "在引用列表後預期要有回應結束封包" @@ -21046,15 +21201,10 @@ msgid "expected flush after ref listing" msgstr "在引用列表之後應該有一個 flush 包" #: connect.c -#, c-format -msgid "protocol '%s' is not supported" -msgstr "不支援 '%s' 協定" - -#: connect.c msgid "unable to set SO_KEEPALIVE on socket" msgstr "無法為 socket 設定 SO_KEEPALIVE" -#: connect.c connect.c +#: connect.c #, c-format msgid "Looking up %s ... " msgstr "尋找 %s ... " @@ -21065,7 +21215,7 @@ msgid "unable to look up %s (port %s) (%s)" msgstr "無法尋找 %s（埠 %s）（%s）" #. TRANSLATORS: this is the end of "Looking up %s ... " -#: connect.c connect.c +#: connect.c #, c-format msgid "" "done.\n" @@ -21074,7 +21224,7 @@ msgstr "" "完成。\n" "連線到 %s（埠 %s）... " -#: connect.c connect.c +#: connect.c #, c-format msgid "" "unable to connect to %s:\n" @@ -21084,7 +21234,7 @@ msgstr "" "%s" #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " -#: connect.c connect.c +#: connect.c msgid "done." msgstr "完成。" @@ -21098,7 +21248,7 @@ msgstr "無法尋找 %s（%s）" msgid "unknown port %s" msgstr "未知埠 %s" -#: connect.c connect.c +#: connect.c #, c-format msgid "strange hostname '%s' blocked" msgstr "已阻止奇怪的主機名稱 '%s'" @@ -21114,6 +21264,11 @@ msgid "cannot start proxy %s" msgstr "不能啟動代理 %s" #: connect.c +#, c-format +msgid "protocol '%s' is not supported" +msgstr "不支援 '%s' 協定" + +#: connect.c msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "未指定路徑，執行 'git help pull' 檢視有效的 url 語法" @@ -21209,7 +21364,7 @@ msgstr "" "檔案 '%s' 缺少一個位元組順序標記（BOM）。請使用 UTF-%sBE or UTF-%sLE（取決於" "字節序）作為工作區編碼。" -#: convert.c convert.c +#: convert.c #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "無法對 '%s' 進行從 %s 到 %s 的編碼" @@ -21234,12 +21389,12 @@ msgstr "不能將輸入傳遞給外部過濾器 '%s'" msgid "external filter '%s' failed %d" msgstr "外部過濾器 '%s' 失敗碼 %d" -#: convert.c convert.c +#: convert.c #, c-format msgid "read from external filter '%s' failed" msgstr "從外部過濾器 '%s' 讀取失敗" -#: convert.c convert.c +#: convert.c #, c-format msgid "external filter '%s' failed" msgstr "外部過濾器 '%s' 失敗" @@ -21263,7 +21418,7 @@ msgstr "外部過濾器 '%s' 不再可用，但並非所有路徑都已過濾" msgid "true/false are no valid working-tree-encodings" msgstr "true/false 不是有效的工作區編碼" -#: convert.c convert.c +#: convert.c #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s：clean 過濾器 '%s' 失敗" @@ -21369,7 +21524,7 @@ msgid "%s, %<PRIuMAX> month ago" msgid_plural "%s, %<PRIuMAX> months ago" msgstr[0] "%s %<PRIuMAX> 個月前" -#: date.c date.c +#: date.c #, c-format msgid "%<PRIuMAX> year ago" msgid_plural "%<PRIuMAX> years ago" @@ -21564,8 +21719,7 @@ msgstr "「%s」和「%s」選項不得同時使用，請使用「%s」搭配「 msgid "invalid --stat value: %s" msgstr "無效的 --stat 值：%s" -#: diff.c diff.c diff.c diff.c diff.c -#: parse-options.c parse-options.c +#: diff.c parse-options.c #, c-format msgid "%s expects a numerical value" msgstr "%s 期望一個數字值" @@ -21598,7 +21752,7 @@ msgstr "--find-object 需要一個 git 版本庫" msgid "unable to resolve '%s'" msgstr "不能解析 '%s'" -#: diff.c diff.c +#: diff.c #, c-format msgid "%s expects <n>/<m> form" msgstr "%s 期望 <n>/<m> 格式" @@ -21618,7 +21772,7 @@ msgstr "壞的 --color-moved 參數：%s" msgid "invalid mode '%s' in --color-moved-ws" msgstr "--color-moved-ws 中的無效模式 '%s'" -#: diff.c diff.c +#: diff.c #, c-format msgid "invalid argument to %s" msgstr "%s 的參數無效" @@ -21643,6 +21797,11 @@ msgstr "無法解析 --submodule 選項的參數：'%s'" #: diff.c #, c-format +msgid "%s expects a non-negative integer" +msgstr "%s 預期非負整數" + +#: diff.c +#, c-format msgid "bad --word-diff argument: %s" msgstr "壞的 --word-diff 參數：%s" @@ -21650,15 +21809,15 @@ msgstr "壞的 --word-diff 參數：%s" msgid "Diff output format options" msgstr "差異輸出格式化選項" -#: diff.c diff.c +#: diff.c msgid "generate patch" msgstr "生成修補檔" -#: diff.c diff.c diff.c +#: diff.c msgid "<n>" msgstr "<n>" -#: diff.c diff.c parse-options.h +#: diff.c parse-options.h msgid "generate diffs with <n> lines context" msgstr "生成含 <n> 行上下文的差異" @@ -21682,7 +21841,7 @@ msgstr "機器友好的 --stat" msgid "output only the last line of --stat" msgstr "只輸出 --stat 的最後一行" -#: diff.c diff.c +#: diff.c msgid "<param1>,<param2>..." msgstr "<param1>,<param2>..." @@ -21723,7 +21882,7 @@ msgstr "<寬度>[,<檔案名寬度>[,<次數>]]" msgid "generate diffstat" msgstr "生成差異統計（diffstat）" -#: diff.c diff.c diff.c +#: diff.c msgid "<width>" msgstr "<寬度>" @@ -21781,7 +21940,7 @@ msgstr "" "在 --raw 或者 --numstat 中，不對路徑字元轉檔並使用 NUL 字元做為輸出欄位的分隔" "符" -#: diff.c diff.c diff.c diff.c +#: diff.c msgid "<prefix>" msgstr "<前綴>" @@ -21809,7 +21968,7 @@ msgstr "使用預設的前置名稱 a/ 和 b/" msgid "show context between diff hunks up to the specified number of lines" msgstr "顯示指定行數的差異區塊間的上下文" -#: diff.c diff.c diff.c +#: diff.c msgid "<char>" msgstr "<字元>" @@ -21899,7 +22058,7 @@ msgstr "忽略行尾的Enter符（CR）" msgid "ignore changes whose lines are all blank" msgstr "忽略整行都是空白的變更" -#: diff.c diff.c diff.c diff.c +#: diff.c msgid "<regex>" msgstr "<正則>" @@ -21927,7 +22086,7 @@ msgstr "<文字>" msgid "generate diff using the \"anchored diff\" algorithm" msgstr "使用 \"anchored diff\" 演算法生成差異" -#: diff.c diff.c diff.c +#: diff.c msgid "<mode>" msgstr "<模式>" @@ -22035,7 +22194,7 @@ msgstr "將 -S 的 <string> 當做延伸 POSIX 常規表示式" msgid "control the order in which files appear in the output" msgstr "控制輸出中的檔案顯示順序" -#: diff.c diff.c +#: diff.c msgid "<path>" msgstr "<路徑>" @@ -22110,12 +22269,12 @@ msgstr "diff 中沒有「%s」路徑" msgid "pathspec '%s' did not match any file(s) known to git" msgstr "路徑規格 '%s' 未符合任何 git 已知檔案" -#: dir.c dir.c dir.c dir.c +#: dir.c #, c-format msgid "unrecognized pattern: '%s'" msgstr "不認識樣式：「%s」" -#: dir.c dir.c +#: dir.c #, c-format msgid "unrecognized negative pattern: '%s'" msgstr "不認識反向模式：「%s」" @@ -22142,7 +22301,7 @@ msgstr "無法獲得核心名稱和訊息" msgid "untracked cache is disabled on this system or location" msgstr "快取未追蹤檔案在本系統或位置中被停用" -#: dir.c dir.c +#: dir.c msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -22155,7 +22314,7 @@ msgstr "" msgid "index file corrupt in repo %s" msgstr "版本庫 %s 中的索引檔案損壞" -#: dir.c dir.c +#: dir.c #, c-format msgid "could not create directories for %s" msgstr "無法建立 %s 的目錄" @@ -22170,8 +22329,7 @@ msgstr "無法從「%s」遷移 git 目錄到「%s」" msgid "hint: Waiting for your editor to close the file...%c" msgstr "提示：等待您的編輯器關閉檔案...%c" -#: editor.c sequencer.c sequencer.c sequencer.c -#: sequencer.c sequencer.c wrapper.c +#: editor.c sequencer.c wrapper.c #, c-format msgid "could not write to '%s'" msgstr "無法寫入「%s」" @@ -22210,7 +22368,7 @@ msgstr "忽略未知的 core.fsync 元件「%s」" msgid "abbrev length out of range: %d" msgstr "縮寫長度超出範圍：%d" -#: environment.c environment.c +#: environment.c #, c-format msgid "bad zlib compression level %d" msgstr "錯誤的 zlib 壓縮級別 %d" @@ -22300,27 +22458,27 @@ msgstr "無法寫到遠端" msgid "Server supports filter" msgstr "伺服器支援 filter" -#: fetch-pack.c fetch-pack.c +#: fetch-pack.c #, c-format msgid "invalid shallow line: %s" msgstr "無效的 shallow 訊息：%s" -#: fetch-pack.c fetch-pack.c +#: fetch-pack.c #, c-format msgid "invalid unshallow line: %s" msgstr "無效的 unshallow 訊息：%s" -#: fetch-pack.c fetch-pack.c +#: fetch-pack.c #, c-format msgid "error in object: %s" msgstr "物件中發生錯誤：%s" -#: fetch-pack.c fetch-pack.c +#: fetch-pack.c #, c-format msgid "no shallow found: %s" msgstr "未發現 shallow：%s" -#: fetch-pack.c fetch-pack.c +#: fetch-pack.c #, c-format msgid "expected shallow/unshallow, got %s" msgstr "應為 shallow/unshallow，卻得到 %s" @@ -22389,10 +22547,7 @@ msgstr "sideband 多路輸出發生錯誤" msgid "Server version is %.*s" msgstr "伺服器版本 %.*s" -#: fetch-pack.c fetch-pack.c fetch-pack.c fetch-pack.c -#: fetch-pack.c fetch-pack.c fetch-pack.c fetch-pack.c -#: fetch-pack.c fetch-pack.c fetch-pack.c fetch-pack.c -#: fetch-pack.c fetch-pack.c fetch-pack.c fetch-pack.c +#: fetch-pack.c #, c-format msgid "Server supports %s" msgstr "伺服器支援 %s" @@ -22421,7 +22576,7 @@ msgstr "伺服器不支援此版本庫的物件格式" msgid "no common commits" msgstr "沒有共同的提交" -#: fetch-pack.c fetch-pack.c +#: fetch-pack.c msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack：取得失敗。" @@ -22439,7 +22594,7 @@ msgstr "伺服器不支援「%s」算法" msgid "Server does not support shallow requests" msgstr "伺服器不支援 shallow 請求" -#: fetch-pack.c fetch-pack.c +#: fetch-pack.c msgid "unable to write request to remote" msgstr "無法將請求寫到遠端" @@ -22609,7 +22764,7 @@ msgstr "" msgid "unsupported command listing type '%s'" msgstr "不支援的命令列表類型 '%s'" -#: git.c git.c git.c +#: git.c #, c-format msgid "no directory given for '%s' option\n" msgstr "未傳入目錄至「%s」選項\n" @@ -22704,12 +22859,11 @@ msgstr "展開別名指令 '%s' 失敗，'%s' 不是一個 git 指令\n" msgid "failed to run command '%s': %s\n" msgstr "執行指令 '%s' 失敗：%s\n" -#: gpg-interface.c gpg-interface.c gpg-interface.c #: gpg-interface.c msgid "could not create temporary file" msgstr "無法建立暫存檔" -#: gpg-interface.c gpg-interface.c +#: gpg-interface.c #, c-format msgid "failed writing detached signature to '%s'" msgstr "無法將分離式簽名寫入 '%s'" @@ -22743,7 +22897,7 @@ msgstr "簽名「%s」損壞或者不相容" msgid "failed to get the ssh fingerprint for key '%s'" msgstr "無法取得「%s」金鑰的 SSH 指紋" -#: gpg-interface.c gpg-interface.c +#: gpg-interface.c #, c-format msgid "failed to get the ssh fingerprint for key %s" msgstr "無法取得 %s 金鑰的 SSH 指紋" @@ -22931,7 +23085,7 @@ msgstr "" "「%s」似乎是 git 命令，但卻無法執行。\n" "可能是 git-%s 受損？" -#: help.c help.c +#: help.c #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git：'%s' 不是一個 git 指令。參見 'git --help'。" @@ -23002,6 +23156,55 @@ msgstr "" #: hook.c #, c-format +msgid "hook.jobs must be an integer, ignoring: '%s'" +msgstr "hook.jobs 必須是整數，忽略之：「%s」" + +#: hook.c +#, c-format +msgid "hook.jobs must be a positive integer or -1, ignoring: '%s'" +msgstr "hook.jobs 必須是正整數或 -1，忽略之：「%s」" + +#: hook.c +#, c-format +msgid "" +"hook friendly-name '%s' collides with a known event name; please choose a " +"different friendly-name" +msgstr "掛鉤的可讀名稱「%s」與既有事件名稱重複；請選擇不同的可讀名稱" + +#: hook.c +#, c-format +msgid "" +"hook friendly-name '%s' is the same as its event; this may cause ambiguity " +"with hook.%s.enabled" +msgstr "掛鉤的可讀名稱「%s」與其事件相同；這可能導致 hook.%s.enabled 有歧義" + +#: hook.c +#, c-format +msgid "hook.%s.parallel must be a boolean, ignoring: '%s'" +msgstr "hook.%s.parallel 必須是布林值，忽略之：「%s」" + +#: hook.c +#, c-format +msgid "hook.%s.jobs must be an integer, ignoring: '%s'" +msgstr "hook.%s.jobs 必須是整數，忽略之：「%s」" + +#: hook.c +#, c-format +msgid "hook.%s.jobs must be a positive integer or -1, ignoring: '%s'" +msgstr "hook.%s.jobs 必須是正整數或 -1，忽略之：「%s」" + +#: hook.c +#, c-format +msgid "" +"hook.%s.jobs is set but '%s' looks like a hook friendly-name, not an event " +"name; hook.<event>.jobs uses the event name (e.g. hook.post-receive.jobs), " +"so this setting will be ignored" +msgstr "" +"設定了 hook.%s.jobs，但「%s」似乎是掛鉤的可讀名稱，而非事件名稱；hook.<事件" +">.jobs 使用事件名稱（如 hook.post-receive.jobs），所以將忽略此設定" + +#: hook.c +#, c-format msgid "disabled hook '%s' has no command configured" msgstr "停用的掛鉤「%s」沒有設定命令" @@ -23012,7 +23215,19 @@ msgid "" "aborting." msgstr "必須設定「hook.%s.command」或移除「hook.%s.event」，中止。" -#: http-fetch.c http-fetch.c +#: hook.c +#, c-format +msgid "" +"hook '%s' is not marked as parallel=true, running in parallel anyway due to " +"-j%u" +msgstr "掛鉤「%s」並未標記為 parallel=true，因 -j%u 將依然平行執行" + +#: hook.c +#, c-format +msgid "%s must be a positive integer or -1, ignoring: %d" +msgstr "%s 必須是正整數或 -1，忽略之：%d" + +#: http-fetch.c msgid "not a git repository" msgstr "不是一個 git 版本庫" @@ -23034,7 +23249,7 @@ msgstr "不支援委託控制，因為 cURL < 7.22.0" msgid "Unknown value for http.proactiveauth" msgstr "http.proactiveauth 的值未知" -#: http.c http.c parse.c +#: http.c parse.c #, c-format msgid "failed to parse %s" msgstr "解析 %s 失敗" @@ -23226,7 +23441,7 @@ msgstr "期望在組合後有一些東西：" msgid "multiple filter-specs cannot be combined" msgstr "不能混用多種過濾規格" -#: list-objects-filter-options.c list-objects-filter-options.c +#: list-objects-filter-options.c msgid "an 'auto' filter is incompatible with any other filter" msgstr "「auto」過濾器與其他過濾器均不相容" @@ -23242,7 +23457,7 @@ msgstr "參數" msgid "object filtering" msgstr "物件過濾" -#: list-objects-filter.c +#: list-objects-filter.c path-walk.c #, c-format msgid "unable to access sparse blob in '%s'" msgstr "不能存取 '%s' 中的稀疏資料物件" @@ -23324,7 +23539,7 @@ msgstr "無法建立暫存物件目錄" msgid "could not write loose object index %s" msgstr "無法寫入鬆散物件索引 %s" -#: loose.c loose.c +#: loose.c #, c-format msgid "failed to write loose object index %s" msgstr "寫入鬆散物件索引 %s 失敗" @@ -23342,12 +23557,12 @@ msgstr "在 ls-refs 引數之後應該有一個 flush 包" msgid "quoted CRLF detected" msgstr "偵測到由可列印字元 (quoted) 所組成的 CRLF" -#: mem-pool.c strbuf.c strbuf.c wrapper.c +#: mem-pool.c strbuf.c wrapper.c #, c-format msgid "unable to format message: %s" msgstr "無法格式化訊息：%s" -#: merge-ll.c merge-ll.c +#: merge-ll.c #, c-format msgid "invalid marker-size '%s', expecting an integer" msgstr "無效的 marker-size「%s」，應為整數" @@ -23372,7 +23587,6 @@ msgstr "無法合併 %s 子模組（沒有合併基底）" msgid "Failed to merge submodule %s (commits not present)" msgstr "無法合併子模組 %s（提交不存在）" -#: merge-ort.c merge-ort.c merge-ort.c merge-ort.c #: merge-ort.c #, c-format msgid "error: failed to merge submodule %s (repository corrupt)" @@ -23383,7 +23597,7 @@ msgstr "錯誤：無法合併子模組 %s （版本庫損壞）" msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "無法合併子模組 %s （提交未跟隨合併基礎）" -#: merge-ort.c merge-ort.c +#: merge-ort.c #, c-format msgid "Note: Fast-forwarding submodule %s to %s" msgstr "注意：正在將 %s 子模組快轉到 %s" @@ -23510,7 +23724,7 @@ msgstr "" "衝突（重新命名陷入相撞）：%s -> %s 這個重新命名有內容衝突並與其他路徑相撞，可" "能會因此出現巢狀衝突標記。" -#: merge-ort.c merge-ort.c +#: merge-ort.c #, c-format msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s." msgstr "" @@ -23688,7 +23902,7 @@ msgstr "未知的 MIDX 版本：%d" #: midx-write.c msgid "cannot perform MIDX compaction with v1 format" -msgstr "無法在 v1 格式下執行 MIDX 壓縮" +msgstr "無法在 v1 格式下執行 MIDX 緻密化" #: midx-write.c msgid "ignoring existing multi-pack-index; checksum mismatch" @@ -23696,6 +23910,11 @@ msgstr "忽略現有的多包索引：總和檢查碼不符" #: midx-write.c #, c-format +msgid "could not find base MIDX '%s'" +msgstr "無法找到基礎 MIDX「%s」" + +#: midx-write.c +#, c-format msgid "could not load reverse index for MIDX %s" msgstr "無法載入 MIDX %s 的反向索引" @@ -23748,7 +23967,7 @@ msgstr "無法寫入多包位圖" msgid "too many multi-pack-indexes" msgstr "太多多包索引" -#: midx-write.c +#: midx-write.c repack-midx.c msgid "unable to open multi-pack-index chain file" msgstr "無法開啟多封裝索引鏈檔案" @@ -23897,6 +24116,11 @@ msgid "multi-pack-index large offset out of bounds" msgstr "多包索引的最大偏移超出邊界" #: midx.c +#, c-format +msgid "failed to clear multi-pack-index chain at %s" +msgstr "無法清理位於 %s 的多包索引鏈" + +#: midx.c msgid "multi-pack-index file exists, but failed to parse" msgstr "有 multi-pack-index 檔案，但無法解析" @@ -24007,14 +24231,12 @@ msgstr "無法解碼樹狀物件項目" msgid "failed to map tree entry for %s" msgstr "無法為 %s 映射樹狀物件項目" -#: object-file-convert.c object-file-convert.c -#: object-file-convert.c object-file-convert.c #: object-file-convert.c #, c-format msgid "bad %s in commit" msgstr "提交中有無效的 %s" -#: object-file-convert.c object-file-convert.c +#: object-file-convert.c #, c-format msgid "unable to map %s %s in commit object" msgstr "無法在提交物件中映射 %s %s" @@ -24024,52 +24246,23 @@ msgstr "無法在提交物件中映射 %s %s" msgid "Failed to convert object from %s to %s" msgstr "無法將物件從 %s 轉換為 %s" -#: object-file.c object-file.c +#: object-file.c odb/source-loose.c #, c-format msgid "object file %s is empty" msgstr "物件檔案 %s 為空" -#: object-file.c object-file.c +#: object-file.c #, c-format msgid "corrupt loose object '%s'" msgstr "損壞的鬆散物件 '%s'" -#: object-file.c object-file.c +#: object-file.c #, c-format msgid "garbage at end of loose object '%s'" msgstr "鬆散物件 '%s' 後面有垃圾資料" #: object-file.c #, c-format -msgid "unable to open loose object %s" -msgstr "無法打開鬆散物件 %s" - -#: object-file.c -#, c-format -msgid "unable to parse %s header" -msgstr "無法解析 %s 頭部" - -#: object-file.c -msgid "invalid object type" -msgstr "無效的物件類型" - -#: object-file.c -#, c-format -msgid "unable to unpack %s header" -msgstr "無法解開 %s 頭部" - -#: object-file.c -#, c-format -msgid "header for %s too long, exceeds %d bytes" -msgstr "%s 的標頭過長，超出 %d 位元組" - -#: object-file.c -#, c-format -msgid "loose object %s (stored in %s) is corrupt" -msgstr "鬆散物件 %s（儲存在 %s）已損壞" - -#: object-file.c object-file.c object-file.c -#, c-format msgid "unable to open %s" msgstr "不能開啟 %s" @@ -24126,8 +24319,8 @@ msgstr "被 %s 的不穩定物件來源資料混淆" #: object-file.c #, c-format -msgid "write stream object %ld != %<PRIuMAX>" -msgstr "寫入串流物件 %ld != %<PRIuMAX>" +msgid "write stream object %<PRIuMAX> != %<PRIuMAX>" +msgstr "寫入串流物件 %<PRIuMAX> != %<PRIuMAX>" #: object-file.c #, c-format @@ -24173,7 +24366,7 @@ msgstr "索引 %s 時讀取錯誤" msgid "short read while indexing %s" msgstr "索引 %s 時讀入不完整" -#: object-file.c object-file.c +#: object-file.c #, c-format msgid "%s: failed to insert into database" msgstr "%s：插入資料庫失敗" @@ -24410,7 +24603,7 @@ msgstr "不能解析物件：%s" msgid "unable to open object stream for %s" msgstr "無法開啟 %s 的物件串流" -#: object.c object.c +#: object.c #, c-format msgid "hash mismatch %s" msgstr "雜湊值與 %s 不符合" @@ -24475,13 +24668,18 @@ msgstr "找不到 %2$s 的替代 %1$s" msgid "packed object %s (stored in %s) is corrupt" msgstr "打包物件 %s（儲存在 %s）已損壞" -#: odb.c odb.c +#: odb.c #, c-format msgid "missing mapping of %s to %s" msgstr "缺少 %s 到 %s 的映射" #: odb.c #, c-format +msgid "%s is not a valid object" +msgstr "%s 不是一個有效的物件" + +#: odb.c +#, c-format msgid "%s is not a valid '%s' object" msgstr "%s 不是一個有效的 '%s' 物件" @@ -24497,6 +24695,35 @@ msgstr "無法讀取替代檔案" msgid "unable to move new alternates file into place" msgstr "無法將新的替代檔案移動到位" +#: odb/source-loose.c +#, c-format +msgid "unable to open loose object %s" +msgstr "無法打開鬆散物件 %s" + +#: odb/source-loose.c +#, c-format +msgid "unable to parse %s header" +msgstr "無法解析 %s 頭部" + +#: odb/source-loose.c +msgid "invalid object type" +msgstr "無效的物件類型" + +#: odb/source-loose.c +#, c-format +msgid "unable to unpack %s header" +msgstr "無法解開 %s 頭部" + +#: odb/source-loose.c +#, c-format +msgid "header for %s too long, exceeds %d bytes" +msgstr "%s 的標頭過長，超出 %d 位元組" + +#: odb/source-loose.c +#, c-format +msgid "loose object %s (stored in %s) is corrupt" +msgstr "鬆散物件 %s（儲存在 %s）已損壞" + #: pack-bitmap-write.c #, c-format msgid "duplicate entry when writing bitmap index: %s" @@ -24572,7 +24799,7 @@ msgstr "位圖包索引損壞" msgid "invalid XOR offset in bitmap pack index" msgstr "位圖包索引的 XOR 偏移無效" -#: pack-bitmap.c pack-bitmap.c +#: pack-bitmap.c msgid "cannot fstat bitmap file" msgstr "無法 fstat 位圖檔案" @@ -24602,7 +24829,7 @@ msgstr "位圖查詢表損壞：XOR 鏈超出項目數" msgid "corrupt bitmap lookup table: commit index %u out of range" msgstr "位圖查詢表損壞：提交索引 %u 超出範圍" -#: pack-bitmap.c pack-bitmap.c +#: pack-bitmap.c #, c-format msgid "corrupt ewah bitmap: truncated header for bitmap of commit \"%s\"" msgstr "ewah 位圖損壞：提交「%s」之位圖的標頭遭截斷" @@ -24631,12 +24858,11 @@ msgstr "「%s」物件的類型不唯一" msgid "object '%s': real type '%s', expected: '%s'" msgstr "「%s」物件：實際類型是「%s」，但預期是「%s」" -#: pack-bitmap.c pack-bitmap.c +#: pack-bitmap.c #, c-format msgid "object not in bitmap: '%s'" msgstr "物件不在位圖中：「%s」" -#: pack-bitmap.c pack-bitmap.c pack-bitmap.c pack-bitmap.c #: pack-bitmap.c msgid "failed to load bitmap indexes" msgstr "無法載入位圖索引" @@ -24654,7 +24880,7 @@ msgstr "提交「%s」無索引過的位圖" msgid "mismatch in bitmap results" msgstr "位圖結果中有不符項目" -#: pack-bitmap.c pack-bitmap.c +#: pack-bitmap.c #, c-format msgid "pseudo-merge index out of range (%<PRIu32> >= %<PRIuMAX>)" msgstr "偽合併索引超出範圍（%<PRIu32> >= %<PRIuMAX>）" @@ -24766,7 +24992,7 @@ msgstr "無法同時寫入和驗證倒排索引" msgid "could not stat: %s" msgstr "無法 stat：%s" -#: pack-write.c pack-write.c +#: pack-write.c #, c-format msgid "failed to make %s readable" msgstr "無法讓 %s 能夠寫入" @@ -24810,7 +25036,7 @@ msgstr "格式錯誤的到期時間：'%s'" msgid "option `%s' expects \"always\", \"auto\", or \"never\"" msgstr "選項 `%s' 期望 \"always\"、\"auto\" 或 \"never\"" -#: parse-options-cb.c parse-options-cb.c +#: parse-options-cb.c #, c-format msgid "malformed object name '%s'" msgstr "格式錯誤的物件名 '%s'" @@ -24825,7 +25051,7 @@ msgstr "選項「%s」期望「%s」或「%s」" msgid "%s requires a value" msgstr "%s 需要一個值" -#: parse-options.c parse-options.c +#: parse-options.c #, c-format msgid "%s takes no value" msgstr "%s 不取值" @@ -24840,7 +25066,7 @@ msgstr "%s 不可用" msgid "value for %s exceeds %<PRIdMAX>" msgstr "%s 的值超過 %<PRIdMAX>" -#: parse-options.c parse-options.c parse-options.c +#: parse-options.c #, c-format msgid "value %s for %s not in range [%<PRIdMAX>,%<PRIdMAX>]" msgstr "%2$s 的數值 %1$s 不在 [%3$<PRIdMAX>,%4$<PRIdMAX>] 範圍內" @@ -24860,12 +25086,12 @@ msgstr "%s 期望一個非負整數和一個可選的 k/m/g 後綴" msgid "ambiguous option: %s (could be --%s%s or --%s%s)" msgstr "有歧義的選項：%s（可以是 --%s%s 或 --%s%s）" -#: parse-options.c parse-options.c +#: parse-options.c #, c-format msgid "did you mean `--%s` (with two dashes)?" msgstr "你的意思是 `--%s`（有兩個短線）嗎？" -#: parse-options.c parse-options.c +#: parse-options.c #, c-format msgid "alias of --%s" msgstr "--%s 的別名" @@ -24998,7 +25224,7 @@ msgstr "--no-%s 的相反行為" msgid "expiry-date" msgstr "到期時間" -#: parse-options.h parse-options.h +#: parse-options.h msgid "no-op (backward compatibility)" msgstr "空動作（向後相容）" @@ -25052,6 +25278,29 @@ msgid "failed to find tag %s" msgstr "找不到標籤 %s" #: path-walk.c +#, c-format +msgid "tree:%lu filter not supported by the path-walk API" +msgstr "path-walk API 不支援 tree:%lu 過濾器" + +#: path-walk.c +msgid "sparse filter cannot be combined with existing sparse patterns" +msgstr "稀疏過濾器不能與既有稀疏模式一起使用" + +#: path-walk.c +#, c-format +msgid "unable to parse sparse filter data in '%s'" +msgstr "無法解析「%s」中的稀疏過濾器資料" + +#: path-walk.c +msgid "sparse filter is not cone-mode compatible" +msgstr "稀疏過濾器不與圓錐模式相容" + +#: path-walk.c +#, c-format +msgid "object filter '%s' not supported by the path-walk API" +msgstr "path-walk API 不支援物件過濾器「%s」" + +#: path-walk.c msgid "failed to setup revision walk" msgstr "無法設置修訂版走訪" @@ -25161,11 +25410,11 @@ msgstr "flush 包寫錯誤" msgid "protocol error: impossibly long line" msgstr "協定錯誤：不可能的長行" -#: pkt-line.c pkt-line.c +#: pkt-line.c msgid "packet write with format failed" msgstr "格式化包寫入錯誤" -#: pkt-line.c pkt-line.c +#: pkt-line.c msgid "packet write failed - data exceeds max packet size" msgstr "寫封包失敗：資料超過了包的最大長度" @@ -25174,20 +25423,20 @@ msgstr "寫封包失敗：資料超過了包的最大長度" msgid "packet write failed: %s" msgstr "封包寫入失敗：%s" -#: pkt-line.c pkt-line.c +#: pkt-line.c msgid "read error" msgstr "讀取錯誤" -#: pkt-line.c pkt-line.c +#: pkt-line.c msgid "the remote end hung up unexpectedly" msgstr "遠端意外掛斷了" -#: pkt-line.c pkt-line.c +#: pkt-line.c #, c-format msgid "protocol error: bad line length character: %.4s" msgstr "協定錯誤：錯誤的行長度字串：%.4s" -#: pkt-line.c pkt-line.c pkt-line.c pkt-line.c +#: pkt-line.c #, c-format msgid "protocol error: bad line length %d" msgstr "協定錯誤：錯誤的行長度 %d" @@ -25210,7 +25459,7 @@ msgstr "無法建立執行緒 lstat：%s" msgid "unable to parse --pretty format" msgstr "不能解析 --pretty 格式" -#: pretty.c pretty.c +#: pretty.c #, c-format msgid "%s is not supported by this command" msgstr "此命令不支援 %s" @@ -25223,7 +25472,7 @@ msgstr "延後抓取已被停用；某些物件可能無法使用" msgid "promisor-remote: unable to fork off fetch subprocess" msgstr "promisor-remote: 無法 fork fetch 子處理程序" -#: promisor-remote.c promisor-remote.c +#: promisor-remote.c msgid "promisor-remote: could not write to fetch subprocess" msgstr "promisor-remote: 無法寫入 fetch 子處理程序" @@ -25248,13 +25497,10 @@ msgstr "不支援「%2$s」組態中的「%1$s」欄位" #: promisor-remote.c #, c-format -msgid "no or empty URL advertised for remote '%s'" -msgstr "遠端「%s」未公佈 URL 或 URL 空白" - -#: promisor-remote.c -#, c-format -msgid "known remote named '%s' but with URL '%s' instead of '%s'" -msgstr "已知有遠端名為「%s」，但其 URL 為「%s」而非「%s」" +msgid "" +"known remote named '%s' but with URL '%s' instead of '%s', ignoring this " +"remote" +msgstr "已知名為「%s」的遠端，但其 URL 為「%s」而非「%s」，將忽略此遠端" #: promisor-remote.c #, c-format @@ -25263,8 +25509,10 @@ msgstr "遠端資訊的元素「%s」無效" #: promisor-remote.c #, c-format -msgid "server advertised a promisor remote without a name or URL: %s" -msgstr "伺服器公告了一個沒有名稱或 URL 的承諾者遠端：%s" +msgid "" +"server advertised a promisor remote without a name or URL: '%s', ignoring " +"this remote" +msgstr "伺服器公告了一個沒有名稱或 URL 的承諾者遠端：「%s」，將忽略此遠端" #: promisor-remote.c #, c-format @@ -25313,15 +25561,15 @@ msgstr "正在刪除重複物件" msgid "failed to load pseudo-merge regex for %s: '%s'" msgstr "未能載入 %s 的偽合併常規表示式：%s" -#: pseudo-merge.c pseudo-merge.c +#: pseudo-merge.c #, c-format msgid "%s must be non-negative, using default" msgstr "%s 須為非負數，將採用預設值" #: pseudo-merge.c #, c-format -msgid "%s must be between 0 and 1, using default" -msgstr "%s 須介於 0 到 1 之間，將採用預設值" +msgid "%s must be between 0 (exclusive) and 1, using default" +msgstr "%s 必須介於 0（不含）至 1 之間，將採用預設值" #: pseudo-merge.c #, c-format @@ -25413,7 +25661,7 @@ msgstr "" "range-diff：無法計算範圍差異，因為它超過了成本矩陣的最大記憶體限制：%s（需要 " "%<PRIuMAX> 位元組），限制為 %s（%<PRIuMAX> 位元組）" -#: range-diff.c range-diff.c +#: range-diff.c #, c-format msgid "could not parse log for '%s'" msgstr "無法解析「%s」的日誌" @@ -25850,7 +26098,7 @@ msgstr "期望一個正數 %s=%s" msgid "cannot fully parse %s=%s" msgstr "無法完全解析 %s=%s" -#: ref-filter.c ref-filter.c +#: ref-filter.c #, c-format msgid "value expected %s=" msgstr "數值預期 %s=" @@ -25911,7 +26159,7 @@ msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "不是一個 git 版本庫，但是欄位 '%.*s' 需要存取物件資料" -#: ref-filter.c ref-filter.c ref-filter.c ref-filter.c +#: ref-filter.c #, c-format msgid "format: %%(%s) atom used without a %%(%s) atom" msgstr "format：使用 %%(%s) 元素卻缺少 %%(%s) 元素" @@ -25989,7 +26237,7 @@ msgstr "（開頭指標分離自 %s）" msgid "(no branch)" msgstr "（無分支）" -#: ref-filter.c ref-filter.c +#: ref-filter.c #, c-format msgid "missing object %s for %s" msgstr "缺少 %2$s 的物件 %1$s" @@ -26169,6 +26417,16 @@ msgstr "拒絕強制並略過建立引用日誌" #: refs.c #, c-format +msgid "trying to write ref '%s' with nonexistent object %s" +msgstr "嘗試以不存在的物件 %s 寫入引用「%s」" + +#: refs.c +#, c-format +msgid "trying to write non-commit object %s to branch '%s'" +msgstr "嘗試將非提交物件 %s 寫入分支「%s」" + +#: refs.c +#, c-format msgid "update_ref failed for ref '%s': %s" msgstr "對引用 '%s' 執行 update_ref 失敗：%s" @@ -26181,17 +26439,17 @@ msgstr "不允許對引用 '%s' 多次更新" msgid "ref updates forbidden inside quarantine environment" msgstr "在隔離環境中禁止更新引用" -#: refs.c refs.c +#: refs.c #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "'%s' 已存在，無法建立 '%s'" -#: refs.c refs.c +#: refs.c #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "無法同時處理 '%s' 和 '%s'" -#: refs.c refs.c +#: refs.c #, c-format msgid "could not delete reference %s: %s" msgstr "無法刪除引用 %s：%s" @@ -26270,16 +26528,6 @@ msgstr "此引用名稱是危險的：%s" #: refs/reftable-backend.c #, c-format -msgid "trying to write ref '%s' with nonexistent object %s" -msgstr "嘗試以不存在的物件 %s 寫入引用「%s」" - -#: refs/reftable-backend.c -#, c-format -msgid "trying to write non-commit object %s to branch '%s'" -msgstr "嘗試將非提交物件 %s 寫入分支「%s」" - -#: refs/reftable-backend.c -#, c-format msgid "" "multiple updates for 'HEAD' (including one via its referent '%s') are not " "allowed" @@ -26488,12 +26736,12 @@ msgstr "取得失敗。" msgid "cannot fetch by sha1 over smart http" msgstr "無法透過智慧 HTTP 取得 sha1" -#: remote-curl.c remote-curl.c +#: remote-curl.c #, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "協定錯誤：期望 sha/ref，卻得到 '%s'" -#: remote-curl.c remote-curl.c +#: remote-curl.c #, c-format msgid "http transport does not support %s" msgstr "http 傳輸協定不支援 %s" @@ -26573,7 +26821,7 @@ msgstr "已經忽略不認識的「%s」數值" msgid "unrecognized value transfer.credentialsInUrl: '%s'" msgstr "數值 transfer.credentialsInUrl 不認識：「%s」" -#: remote.c remote.c +#: remote.c #, c-format msgid "URL '%s' uses plaintext credentials" msgstr "URL「%s」使用明文憑證" @@ -26699,7 +26947,7 @@ msgstr "目的地引用規格 %s 符合超過一個" msgid "dst ref %s receives from more than one src" msgstr "目的地引用 %s 接收超過一個來源" -#: remote.c remote.c +#: remote.c msgid "HEAD does not point to a branch" msgstr "HEAD 沒有指向一個分支" @@ -26842,7 +27090,7 @@ msgstr "無法開啟 %s 的索引" msgid "pack %s too large to consider in geometric progression" msgstr "%s 包太大，以致不能在等比數列中考慮" -#: repack-geometry.c repack-geometry.c repack-geometry.c +#: repack-geometry.c #, c-format msgid "pack %s too large to roll up" msgstr "%s 包太大，以致不能縮合" @@ -26861,6 +27109,43 @@ msgstr "無法關閉 refs 的快照暫存檔" msgid "could not remove stale bitmap: %s" msgstr "無法移除過時位圖：%s" +#: repack-midx.c +msgid "no packs to write MIDX during compaction" +msgstr "緻密化期間沒有包要寫入 MIDX" + +#: repack-midx.c +#, c-format +msgid "expected exactly one line during MIDX write, got: %<PRIuMAX>" +msgstr "MIDX 寫入期間預期正好一列，收到 %<PRIuMAX>" + +#: repack-midx.c +#, c-format +msgid "unexpected MIDX output: '%s'" +msgstr "非預期的 MIDX 輸出：「%s」" + +#: repack-midx.c +#, c-format +msgid "could not load pack %<PRIu32> from MIDX" +msgstr "無法從 MIDX 載入包 %<PRIu32>" + +#: repack-midx.c +msgid "too many objects in MIDX compaction step" +msgstr "MIDX 緻密化步驟中有過多物件" + +#: repack-midx.c +#, c-format +msgid "could not find preferred pack for MIDX %s" +msgstr "無法找到 MIDX %s 偏好的包" + +#: repack-midx.c +msgid "unable to generate compaction plan" +msgstr "無法產生緻密化計劃" + +#: repack-midx.c +#, c-format +msgid "unable to execute compaction step %<PRIuMAX>" +msgstr "無法執行緻密化步驟 %<PRIuMAX>" + #: repack-promisor.c msgid "could not start pack-objects to repack promisor objects" msgstr "無法開始 pack-objects 來重新打包 promisor 物件" @@ -26942,6 +27227,11 @@ msgid "all positive revisions given must be references" msgstr "提供的所有正向修訂集必須為引用" #: replay.c +#, c-format +msgid "commit %s became empty after replay" +msgstr "提交 %s 重放之後變成空了" + +#: replay.c msgid "'--ref' cannot be used with multiple revision ranges" msgstr "「--ref」不能與多個修訂版本範圍一起使用" @@ -26954,11 +27244,11 @@ msgstr "「%s」不是有效的引用名稱" msgid "compatibility hash algorithm support requires Rust" msgstr "相容性雜湊演算法支援需要 Rust" -#: rerere.c rerere.c rerere.c +#: rerere.c msgid "corrupt MERGE_RR" msgstr "損壞的 MERGE_RR" -#: rerere.c rerere.c +#: rerere.c msgid "unable to write rerere record" msgstr "無法寫入 rerere 記錄" @@ -26967,7 +27257,7 @@ msgstr "無法寫入 rerere 記錄" msgid "there were errors while writing '%s' (%s)" msgstr "寫入 '%s' (%s) 時發生錯誤" -#: rerere.c rerere.c +#: rerere.c #, c-format msgid "could not parse conflict hunks in '%s'" msgstr "無法解析「%s」中的衝突區塊" @@ -27012,7 +27302,7 @@ msgstr "為 '%s' 記錄 preimage" msgid "failed to update conflicted state in '%s'" msgstr "更新 '%s' 中的衝突狀態失敗" -#: rerere.c rerere.c +#: rerere.c #, c-format msgid "no remembered resolution for '%s'" msgstr "沒有為 '%s' 記憶的解決方案" @@ -27039,7 +27329,7 @@ msgstr "如果可能，重用衝突解決更新索引" msgid "could not determine HEAD revision" msgstr "無法確定 HEAD 修訂版" -#: reset.c reset.c sequencer.c +#: reset.c sequencer.c #, c-format msgid "failed to find tree of %s" msgstr "無法找到 %s 指向的樹" @@ -27099,8 +27389,8 @@ msgid "object filtering requires --objects" msgstr "物件過濾需要 --objects" #: revision.c -msgid "-L does not yet support diff formats besides -p and -s" -msgstr "-L 尚不支援 -p 和 -s 之外的差異格式" +msgid "-L does not yet support the requested diff format" +msgstr "-L 尚不支援所請求的差異格式" #: run-command.c #, c-format @@ -27112,7 +27402,7 @@ msgstr "不能建立 async 執行緒：%s" msgid "'%s' does not exist" msgstr "'%s' 不存在" -#: scalar.c scalar.c scalar.c scalar.c scalar.c +#: scalar.c #, c-format msgid "could not switch to '%s'" msgstr "無法切換至「%s」" @@ -27121,11 +27411,11 @@ msgstr "無法切換至「%s」" msgid "need a working directory" msgstr "需要工作目錄" -#: scalar.c scalar.c +#: scalar.c msgid "Scalar enlistments require a worktree" msgstr "純量編列名單需要工作目錄" -#: scalar.c scalar.c +#: scalar.c #, c-format msgid "could not configure %s=%s" msgstr "無法設定 %s=%s" @@ -27203,7 +27493,7 @@ msgstr "在「src」目錄建立版本庫" msgid "specify if tags should be fetched during clone" msgstr "指定是否要在拓製階段抓取標籤" -#: scalar.c scalar.c +#: scalar.c msgid "specify if background maintenance should be enabled" msgstr "指定是否要啟用背景維護模式" @@ -27516,7 +27806,7 @@ msgstr "" "若要取消並返回 \"git revert\" 前的狀態，\n" "請執行 \"git revert --abort\"。" -#: sequencer.c sequencer.c +#: sequencer.c #, c-format msgid "could not lock '%s'" msgstr "無法鎖定「%s」" @@ -27526,7 +27816,7 @@ msgstr "無法鎖定「%s」" msgid "could not write eol to '%s'" msgstr "無法將換行符號寫入「%s」" -#: sequencer.c sequencer.c sequencer.c sequencer.c +#: sequencer.c #, c-format msgid "failed to finalize '%s'" msgstr "無法完成 '%s'" @@ -27696,7 +27986,7 @@ msgstr "分離 HEAD 指標" msgid " (root-commit)" msgstr " (根提交)" -#: sequencer.c sequencer.c +#: sequencer.c msgid "could not parse HEAD" msgstr "無法解析 HEAD" @@ -27705,16 +27995,16 @@ msgstr "無法解析 HEAD" msgid "HEAD %s is not a commit!" msgstr "HEAD %s 不是一個提交！" -#: sequencer.c sequencer.c +#: sequencer.c msgid "unable to parse commit author" msgstr "不能解析提交作者" -#: sequencer.c sequencer.c +#: sequencer.c #, c-format msgid "unable to read commit message from '%s'" msgstr "不能從 '%s' 讀取提交說明" -#: sequencer.c sequencer.c +#: sequencer.c #, c-format msgid "invalid author identity '%s'" msgstr "無效的作者身分 '%s'" @@ -27723,7 +28013,7 @@ msgstr "無效的作者身分 '%s'" msgid "corrupt author: missing date information" msgstr "作者資訊損壞：缺少日期資訊" -#: sequencer.c sequencer.c +#: sequencer.c #, c-format msgid "could not update %s" msgstr "無法更新 %s" @@ -27731,7 +28021,7 @@ msgstr "無法更新 %s" #: sequencer.c #, c-format msgid "could not parse parent commit %s" -msgstr "無法解析父提交 %s" +msgstr "無法解析親代提交 %s" #: sequencer.c #, c-format @@ -27761,7 +28051,7 @@ msgstr "略過第 %d 個提交說明：" msgid "This is a combination of %d commits." msgstr "這是整合 %d 個提交的集合提交。" -#: sequencer.c sequencer.c +#: sequencer.c #, c-format msgid "cannot write '%s'" msgstr "不能寫 '%s'" @@ -27770,7 +28060,7 @@ msgstr "不能寫 '%s'" msgid "need a HEAD to fixup" msgstr "需要一個 HEAD 來修復" -#: sequencer.c sequencer.c +#: sequencer.c msgid "could not read HEAD" msgstr "無法讀取 HEAD" @@ -27796,10 +28086,10 @@ msgstr "不能修復根提交" msgid "commit %s is a merge but no -m option was given." msgstr "提交 %s 是一個合併提交但未提供 -m 選項。" -#: sequencer.c sequencer.c +#: sequencer.c #, c-format msgid "commit %s does not have parent %d" -msgstr "提交 %s 沒有第 %d 個父提交" +msgstr "提交 %s 沒有第 %d 個親代提交" #: sequencer.c #, c-format @@ -27811,7 +28101,7 @@ msgstr "不能得到 %s 的提交說明" #: sequencer.c #, c-format msgid "%s: cannot parse parent commit %s" -msgstr "%s：不能解析父提交 %s" +msgstr "%s：不能解析親代提交 %s" #: sequencer.c #, c-format @@ -27848,7 +28138,7 @@ msgstr "「%s」不是有效的標籤" msgid "update-ref requires a fully qualified refname e.g. refs/heads/%s" msgstr "update-ref 需要完全限定的引用名稱，比如：refs/heads/%s" -#: sequencer.c sequencer.c sequencer.c +#: sequencer.c #, c-format msgid "'%s' does not accept merge commits" msgstr "「%s」不接受合併提交" @@ -27971,7 +28261,7 @@ msgstr "不可用的 squash-onto" msgid "malformed options sheet: '%s'" msgstr "格式錯誤的選項清單：'%s'" -#: sequencer.c sequencer.c +#: sequencer.c msgid "empty commit set passed" msgstr "提供了空的提交集" @@ -27998,15 +28288,15 @@ msgstr "嘗試 \"git cherry-pick (--continue | %s--abort | --quit)\"" msgid "could not create sequencer directory '%s'" msgstr "無法建立序列目錄「%s」" -#: sequencer.c sequencer.c +#: sequencer.c msgid "no cherry-pick or revert in progress" msgstr "揀選或還原動作並未進行" -#: sequencer.c sequencer.c +#: sequencer.c msgid "cannot resolve HEAD" msgstr "不能解析 HEAD" -#: sequencer.c sequencer.c +#: sequencer.c msgid "cannot abort from a branch yet to be born" msgstr "不能從尚未建立的分支終止" @@ -28053,7 +28343,7 @@ msgstr "" "您已經提交了嗎？\n" "試試 \"git %s --continue\"" -#: sequencer.c sequencer.c +#: sequencer.c msgid "cannot read HEAD" msgstr "不能讀取 HEAD" @@ -28237,21 +28527,27 @@ msgstr "不能儲存 %s" #: sequencer.c #, c-format msgid "" -"%s\n" -"Your changes are safe in the stash.\n" -"You can run \"git stash pop\" or \"git stash drop\" at any time.\n" +"Your local changes are stashed, however applying them\n" +"resulted in conflicts. You can either resolve the conflicts\n" +"and then discard the stash with \"git stash drop\", or, if you\n" +"do not want to resolve them now, run \"git reset --hard\" and\n" +"apply the local changes later by running \"git stash pop\".\n" msgstr "" -"%s\n" -"您的修改安全地儲存在貯存區中。\n" -"您可以在任何時候執行 \"git stash pop\" 或 \"git stash drop\"。\n" - -#: sequencer.c -msgid "Applying autostash resulted in conflicts." -msgstr "因套用自動貯存而導致衝突。" +"你的本機變更已貯存，但套用之導致了衝突。你可以解決衝突並以\n" +"「git stash drop」捨棄該貯存，或者如果你不想要現在解決，執行\n" +"「git reset --hard」並在之後再以「git stash pop」套用本機變\n" +"更。\n" #: sequencer.c -msgid "Autostash exists; creating a new stash entry." -msgstr "已有自動貯存；建立新貯存項目。" +#, c-format +msgid "" +"Autostash exists; creating a new stash entry.\n" +"Your changes are safe in the stash.\n" +"You can run \"git stash pop\" or \"git stash drop\" at any time.\n" +msgstr "" +"存在自動貯存；將建立新貯存項目。\n" +"您的變更在貯存中很安全。\n" +"您可以在任何時候執行「git stash pop」或「git stash drop」。\n" #: sequencer.c msgid "autostash reference is a symref" @@ -28351,7 +28647,7 @@ msgstr "" "\n" "您的工作區中有未提交的變更。請先提交然後再次執行 'git rebase --continue'。" -#: sequencer.c sequencer.c +#: sequencer.c #, c-format msgid "could not write file: '%s'" msgstr "無法寫入檔案：「%s」" @@ -28378,12 +28674,12 @@ msgstr "%s：錯誤的版本" msgid "can't revert as initial commit" msgstr "不能作為初始提交還原提交" -#: sequencer.c sequencer.c +#: sequencer.c #, c-format msgid "skipped previously applied commit %s" msgstr "已略過先前套用的 %s 提交" -#: sequencer.c sequencer.c +#: sequencer.c msgid "use --reapply-cherry-picks to include skipped commits" msgstr "使用 --reapply-cherry-picks 以包含略過提交" @@ -28395,7 +28691,7 @@ msgstr "make_script：有未能處理的選項" msgid "make_script: error preparing revisions" msgstr "make_script：準備版本時錯誤" -#: sequencer.c sequencer.c +#: sequencer.c msgid "nothing to do" msgstr "無事可做" @@ -28407,7 +28703,7 @@ msgstr "無法略過不必要的揀選" msgid "the script was already rearranged." msgstr "腳本已經重新編排。" -#: sequencer.c sequencer.c +#: sequencer.c #, c-format msgid "update-refs file at '%s' is invalid" msgstr "位於「%s」的 update-refs 檔案無效" @@ -28517,7 +28813,7 @@ msgstr "'$%s' 太大" msgid "not a git repository: '%s'" msgstr "不是一個 git 版本庫：'%s'" -#: setup.c setup.c setup.c +#: setup.c #, c-format msgid "cannot chdir to '%s'" msgstr "不能切換目錄到 '%s'" @@ -28532,7 +28828,7 @@ msgstr "取得 '%*s%s%s' 狀態（stat）失敗" msgid "safe.directory '%s' not absolute" msgstr "safe.directory「%s」不是絕對路徑" -#: setup.c setup.c +#: setup.c #, c-format msgid "" "detected dubious ownership in repository at '%s'\n" @@ -28559,7 +28855,7 @@ msgstr "不是一般檔案：「%s」" msgid "Unable to read current working directory" msgstr "不能讀取目前工作目錄" -#: setup.c setup.c +#: setup.c #, c-format msgid "cannot change to '%s'" msgstr "不能切換到 '%s'" @@ -28567,7 +28863,7 @@ msgstr "不能切換到 '%s'" #: setup.c #, c-format msgid "not a git repository (or any of the parent directories): %s" -msgstr "不是一個 git 版本庫（或者任何父目錄）：%s" +msgstr "不是一個 git 版本庫（或者任何親代目錄）：%s" #: setup.c #, c-format @@ -28575,7 +28871,7 @@ msgid "" "not a git repository (or any parent up to mount point %s)\n" "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." msgstr "" -"不是一個 git 版本庫（或者直至掛載點 %s 的任何父目錄）\n" +"不是一個 git 版本庫（或者直至掛載點 %s 的任何親代目錄）\n" "停止在檔案系統邊界（未設定 GIT_DISCOVERY_ACROSS_FILESYSTEM）。" #: setup.c @@ -28583,7 +28879,7 @@ msgstr "" msgid "cannot use bare repository '%s' (safe.bareRepository is '%s')" msgstr "無法使用「%s」純版本庫（safe.bareRepository 是「%s」）" -#: setup.c setup.c +#: setup.c #, c-format msgid "unknown ref storage format: '%s'" msgstr "未知的引用儲存格式：「%s」" @@ -28602,10 +28898,6 @@ msgid "fork failed" msgstr "fork 失敗" #: setup.c -msgid "setsid failed" -msgstr "setsid 失敗" - -#: setup.c #, c-format msgid "cannot stat template '%s'" msgstr "不能對範本 '%s' 呼叫 stat" @@ -28674,7 +28966,7 @@ msgid "" "attempt to reinitialize repository with different reference storage format" msgstr "嘗試以不同的引用儲存格式重新初始化版本庫" -#: setup.c setup.c +#: setup.c #, c-format msgid "%s already exists" msgstr "%s 已經存在" @@ -28699,6 +28991,11 @@ msgstr "已初始化空的共享 Git 版本庫於 %s%s\n" msgid "Initialized empty Git repository in %s%s\n" msgstr "已初始化空的 Git 版本庫於 %s%s\n" +#: sideband.c +#, c-format +msgid "unrecognized value for '%s': '%s'" +msgstr "無法辨識「%s」的值：「%s」" + #: sparse-index.c #, c-format msgid "index entry is a directory, but not sparse (%08x)" @@ -28726,7 +29023,6 @@ msgstr "無效的 %s 格式：「%s」元素的結尾不是「)」" msgid "bad %s format: %%%.*s" msgstr "無效的 %s 格式：%%%.*s" -#: strbuf.c strbuf.c strbuf.c strbuf.c strbuf.c #: strbuf.c #, c-format msgid "%u.%2.2u" @@ -28822,11 +29118,11 @@ msgstr "忽略可能被解析為命令列選項的 '%s'：%s" msgid "Could not update .gitmodules entry %s" msgstr "無法更新 .gitmodules 條目 %s" -#: submodule.c submodule.c +#: submodule.c msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "無法修改未合併的 .gitmodules，先解決合併衝突" -#: submodule.c submodule.c +#: submodule.c #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "無法在 .gitmodules 中找到 path=%s 的小節" @@ -28948,7 +29244,7 @@ msgstr "無法在子模組「%s」中執行「git status」" msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "無法在子模組「%s」中取消 core.worktree 的設定" -#: submodule.c submodule.c +#: submodule.c #, c-format msgid "could not recurse into submodule '%s'" msgstr "無法遞迴子模組路徑 '%s'" @@ -28988,7 +29284,7 @@ msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "不支援對有多個工作區的子模組 '%s' 執行 relocate_gitdir" -#: submodule.c submodule.c +#: submodule.c #, c-format msgid "could not lookup name for submodule '%s'" msgstr "無法查詢子模組「%s」的名稱" @@ -29098,6 +29394,10 @@ msgstr "切換是否更激進地走訪邊" msgid "read a pattern list over stdin" msgstr "從 stdin 讀取模式清單" +#: t/helper/test-path-walk.c +msgid "toggle pruning of trees by sparse patterns" +msgstr "切換是否依稀疏模式剪除樹狀物件" + #: t/helper/test-reach.c #, c-format msgid "commit %s is not marked reachable" @@ -29192,6 +29492,15 @@ msgstr "代符" msgid "command token to send to the server" msgstr "要傳送至伺服器的命令代符" +#: t/helper/test-synthesize.c +msgid "write a pack with a single reachable large blob" +msgstr "寫入具單個可及的大資料物件的包" + +#: t/helper/test-synthesize.c +#, c-format +msgid "'%s' is not a valid blob size" +msgstr "「%s」不是有效的資料物件大小" + #: t/unit-tests/unit-test.c msgid "unit-test [<options>]" msgstr "unit-test [<options>]" @@ -29221,7 +29530,6 @@ msgstr "排除測試套件 <suite>" msgid "running trailer command '%s' failed" msgstr "執行 trailer 指令 '%s' 失敗" -#: trailer.c trailer.c trailer.c trailer.c trailer.c #: trailer.c #, c-format msgid "unknown value '%s' for key '%s'" @@ -29232,7 +29540,7 @@ msgstr "鍵 '%2$s' 的未知取值 '%1$s'" msgid "empty trailer token in trailer '%.*s'" msgstr "簽名 '%.*s' 的鍵為空" -#: trailer.c trailer.c +#: trailer.c msgid "empty --trailer argument" msgstr "--trailer 引數為空" @@ -29241,7 +29549,7 @@ msgstr "--trailer 引數為空" msgid "invalid trailer '%s': missing key before separator" msgstr "無效的結尾資訊「%s」：分隔符號前缺少鍵" -#: trailer.c wrapper.c wrapper.c +#: trailer.c wrapper.c #, c-format msgid "could not stat %s" msgstr "無法 stat %s" @@ -29260,7 +29568,7 @@ msgstr "檔案 %s 使用者不可寫" msgid "could not write to temporary file" msgstr "無法寫入暫存檔案" -#: transport-helper.c transport-helper.c +#: transport-helper.c msgid "full write to remote helper failed" msgstr "完整寫入遠端協助工具失敗" @@ -29269,7 +29577,7 @@ msgstr "完整寫入遠端協助工具失敗" msgid "unable to find remote helper for '%s'" msgstr "無法為 '%s' 找到遠端協助工具" -#: transport-helper.c transport-helper.c +#: transport-helper.c msgid "can't dup helper output fd" msgstr "無法再製協助工具輸出檔案句柄" @@ -29284,7 +29592,7 @@ msgstr "未知的強制能力 %s，該遠端協助工具可能需要新版本的 msgid "this remote helper should implement refspec capability" msgstr "遠端協助工具需要實現 refspec 引用規格能力" -#: transport-helper.c transport-helper.c +#: transport-helper.c #, c-format msgid "%s unexpectedly said: '%s'" msgstr "%s 意外地說：'%s'" @@ -29302,7 +29610,7 @@ msgstr "無法執行 fast-import" msgid "error while running fast-import" msgstr "執行 fast-import 發生錯誤" -#: transport-helper.c transport-helper.c +#: transport-helper.c #, c-format msgid "could not read ref %s" msgstr "無法讀取引用 %s" @@ -29330,6 +29638,11 @@ msgid "--negotiate-only requires protocol v2" msgstr "--negotiate-only 需要 v2 版協定" #: transport-helper.c +#, c-format +msgid "ignoring %s because the protocol does not support it." +msgstr "忽略 %s，因為通訊協定不支援之。" + +#: transport-helper.c msgid "'option' without a matching 'ok/error' directive" msgstr "'option' 缺少對應的 'ok/error' 指令" @@ -29429,7 +29742,7 @@ msgstr "%s 執行緒失敗" msgid "%s thread failed to join: %s" msgstr "%s 執行緒等待失敗：%s" -#: transport-helper.c transport-helper.c +#: transport-helper.c #, c-format msgid "can't start thread for copying data: %s" msgstr "無法啟動執行緒來複製資料: %s" @@ -29444,7 +29757,7 @@ msgstr "%s 進程等待失敗" msgid "%s process failed" msgstr "%s 進程失敗" -#: transport-helper.c transport-helper.c +#: transport-helper.c msgid "can't start thread for copying data" msgstr "無法啟動執行緒來複製資料" @@ -29829,7 +30142,7 @@ msgstr "在 fetch 引數應為一個 flush 包" msgid "invalid URL scheme name or missing '://' suffix" msgstr "無效的 URL 方案名稱或遺失 '://' 後綴" -#: urlmatch.c urlmatch.c urlmatch.c +#: urlmatch.c #, c-format msgid "invalid %XX escape sequence" msgstr "無效的 %XX 轉義序列" @@ -29846,7 +30159,7 @@ msgstr "一個 'file:' URL 不應該包含埠號" msgid "invalid characters in host name" msgstr "主機名稱中包含無效的字元" -#: urlmatch.c urlmatch.c +#: urlmatch.c msgid "invalid port number" msgstr "無效的埠號" @@ -29859,7 +30172,7 @@ msgstr "無效的 '..' 路徑區塊" msgid "error: unable to format message: %s\n" msgstr "錯誤：無法格式化訊息：%s\n" -#: usage.c usage.c +#: usage.c msgid "usage: " msgstr "用法: " @@ -29993,7 +30306,7 @@ msgstr "非有效目錄" msgid "gitdir file does not exist" msgstr "找不到 gitdir 檔案" -#: worktree.c worktree.c +#: worktree.c #, c-format msgid "unable to read gitdir file (%s)" msgstr "無法讀取 gitdir 檔案 (%s)" @@ -30043,12 +30356,12 @@ msgstr "無法 setenv「%s」" msgid "unable to create '%s'" msgstr "不能建立 '%s'" -#: wrapper.c wrapper.c +#: wrapper.c #, c-format msgid "could not open '%s' for reading and writing" msgstr "無法開啟「%s」進行讀寫" -#: wrapper.c wrapper.c +#: wrapper.c #, c-format msgid "unable to access '%s'" msgstr "不能存取 '%s'" @@ -30076,18 +30389,18 @@ msgid "Unmerged paths:" msgstr "未合併的路徑：" # 譯者：請維持前導空格 -#: wt-status.c wt-status.c +#: wt-status.c msgid " (use \"git restore --staged <file>...\" to unstage)" msgstr " （使用 \"git restore --staged <檔案>...\" 以取消暫存）" # 譯者：請維持前導空格 -#: wt-status.c wt-status.c +#: wt-status.c #, c-format msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)" msgstr " （使用 \"git restore --source=%s --staged <檔案>...\" 以取消暫存）" # 譯者：請維持前導空格 -#: wt-status.c wt-status.c +#: wt-status.c msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " （使用 \"git rm --cached <檔案>...\" 以取消暫存）" @@ -30097,7 +30410,7 @@ msgid " (use \"git add <file>...\" to mark resolution)" msgstr " （使用 \"git add <檔案>...\" 標記解決方案）" # 譯者：請維持前導空格 -#: wt-status.c wt-status.c +#: wt-status.c msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr " （酌情使用 \"git add/rm <檔案>...\" 標記解決方案）" @@ -30106,11 +30419,11 @@ msgstr " （酌情使用 \"git add/rm <檔案>...\" 標記解決方案）" msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " （使用 \"git rm <檔案>...\" 標記解決方案）" -#: wt-status.c wt-status.c +#: wt-status.c msgid "Changes to be committed:" msgstr "要提交的變更：" -#: wt-status.c wt-status.c +#: wt-status.c msgid "Changes not staged for commit:" msgstr "尚未暫存以備提交的變更：" @@ -30590,7 +30903,7 @@ msgstr "提交為空，但是存在尚未追蹤的檔案\n" msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "沒有東西提交（建立/複製檔案並使用「git add」追蹤之）\n" -#: wt-status.c wt-status.c +#: wt-status.c #, c-format msgid "nothing to commit\n" msgstr "無檔案要提交\n" @@ -30620,11 +30933,11 @@ msgid "different" msgstr "不同" # 譯者：請維持句尾空格 -#: wt-status.c wt-status.c +#: wt-status.c msgid "behind " msgstr "落後 " -#: wt-status.c wt-status.c +#: wt-status.c msgid "ahead " msgstr "領先 " @@ -30686,7 +30999,7 @@ msgstr "嘗試和 $pretty_name 的簡單合併" msgid "Simple merge did not work, trying automatic merge." msgstr "簡單合併未生效，嘗試自動合併。" -#: git-sh-setup.sh git-sh-setup.sh +#: git-sh-setup.sh #, sh-format msgid "usage: $dashless $USAGE" msgstr "用法：$dashless $USAGE" @@ -30696,7 +31009,7 @@ msgstr "用法：$dashless $USAGE" msgid "Cannot chdir to $cdup, the toplevel of the working tree" msgstr "不能切換目錄到 $cdup，工作區的頂級目錄" -#: git-sh-setup.sh git-sh-setup.sh +#: git-sh-setup.sh #, sh-format msgid "fatal: $program_name cannot be used without a working tree." msgstr "致命錯誤：$program_name 不能在沒有工作區的情況下使用。" @@ -30731,7 +31044,7 @@ msgstr "不能確定 git 目錄的絕對路徑" msgid "local zone differs from GMT by a non-minute interval\n" msgstr "本機時間和 GMT 有不到一分鐘間隔\n" -#: git-send-email.perl git-send-email.perl +#: git-send-email.perl msgid "local time offset greater than or equal to 24 hours\n" msgstr "本機時間位移量大於等於 24 小時\n" @@ -30773,7 +31086,7 @@ msgstr "" "git-send-email 已經以 sendemail.* 選項設定 - 注意裡面的 'e'。\n" "請將 sendemail.forbidSendmailVariables 設為 false 停用此檢查。\n" -#: git-send-email.perl git-send-email.perl +#: git-send-email.perl msgid "Cannot run git format-patch from outside a repository\n" msgstr "不能在版本庫之外執行 git format-patch\n" @@ -30926,7 +31239,7 @@ msgstr "致命錯誤：別名 '%s' 展開後還是自己\n" msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "（如果有）Message-ID 是否要被用作第一封信件的 In-Reply-To ？ " -#: git-send-email.perl git-send-email.perl +#: git-send-email.perl #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "錯誤：不能從 %s 中擷取一個有效的信件位址\n" @@ -30994,7 +31307,7 @@ msgstr "要求的 SMTP 伺服器未被正確定義。" msgid "Server does not support STARTTLS! %s" msgstr "伺服器不支援 STARTTLS！%s" -#: git-send-email.perl git-send-email.perl +#: git-send-email.perl #, perl-format msgid "STARTTLS failed! %s" msgstr "STARTTLS 失敗！%s" @@ -31048,7 +31361,7 @@ msgstr "結果：OK" msgid "can't open file %s" msgstr "無法開啟檔案 %s" -#: git-send-email.perl git-send-email.perl +#: git-send-email.perl #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) 新增 cc：%s 自行 '%s'\n" @@ -31112,7 +31425,7 @@ msgstr "" "%s\n" "警告：修補檔未能傳送\n" -#: git-send-email.perl git-send-email.perl git-send-email.perl +#: git-send-email.perl #, perl-format msgid "unable to open %s: %s\n" msgstr "無法開啟 %s: %s\n" |