From 6032aee65ec5c68c2f43761d1df4d227f7b5966e Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Wed, 7 Feb 2024 19:42:17 +0000 Subject: l10n: bump Actions versions in l10n.yml This avoids the "Node.js 16 Actions are deprecated" warnings. Original-commits-by: dependabot[bot] Signed-off-by: Johannes Schindelin --- .github/workflows/l10n.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/l10n.yml b/.github/workflows/l10n.yml index 6c3849658a..3d89758981 100644 --- a/.github/workflows/l10n.yml +++ b/.github/workflows/l10n.yml @@ -63,7 +63,7 @@ jobs: origin \ ${{ github.ref }} \ $args - - uses: actions/setup-go@v2 + - uses: actions/setup-go@v5 with: go-version: '>=1.16' - name: Install git-po-helper @@ -91,7 +91,7 @@ jobs: cat git-po-helper.out exit $exit_code - name: Create comment in pull request for report - uses: mshick/add-pr-comment@v1 + uses: mshick/add-pr-comment@v2 if: >- always() && github.event_name == 'pull_request_target' && -- cgit 1.2.3-korg From ed8e89ec8cbba4d96848ae724d47b298b64dc9db Mon Sep 17 00:00:00 2001 From: Arkadii Yakovets Date: Mon, 12 Feb 2024 18:38:26 -0800 Subject: l10n: uk: v2.44 localization update Co-authored-by: Kate Golovanova Signed-off-by: Arkadii Yakovets Signed-off-by: Kate Golovanova --- po/uk.po | 409 ++++++++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 262 insertions(+), 147 deletions(-) diff --git a/po/uk.po b/po/uk.po index 086890552a..f09e8d6dd3 100644 --- a/po/uk.po +++ b/po/uk.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Git v2.43\n" "Report-Msgid-Bugs-To: Git Mailing List \n" "POT-Creation-Date: 2023-11-09 14:26-0800\n" -"PO-Revision-Date: 2023-11-09 14:34-0800\n" +"PO-Revision-Date: 2024-02-11 09:26-0800\n" "Last-Translator: Arkadii Yakovets \n" "Language-Team: Ukrainian \n" "Language: uk\n" @@ -18,7 +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.4.1\n" +"X-Generator: Poedit 3.4.2\n" #, c-format msgid "Huh (%s)?" @@ -1443,6 +1443,10 @@ msgstr "опція \"%s\" потребує \"%s\"" msgid "Unexpected option --output" msgstr "Неочікувана опція --output" +#, c-format +msgid "extra command line parameter '%s'" +msgstr "зайвий параметр командного рядка: \"%s\"" + #, c-format msgid "Unknown archive format '%s'" msgstr "Невідомий формат архіву \"%s\"" @@ -1488,6 +1492,10 @@ msgstr "ігнорування надто великих gitattributes blob \"%s msgid "bad --attr-source or GIT_ATTR_SOURCE" msgstr "невірний --attr-source або GIT_ATTR_SOURCE" +#, c-format +msgid "unable to stat '%s'" +msgstr "не вдалося виконати stat для \"%s\"" + #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Невірно процитований вміст у файлі \"%s\": %s" @@ -1666,10 +1674,12 @@ msgstr "" 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 @@ -2325,7 +2335,7 @@ msgid "" "git bisect start [--term-(new|bad)= --term-(old|good)=] [--no-" "checkout] [--first-parent] [ [...]] [--] [...]" msgstr "" -"git bisect start [--term-{new,bad}=<термін> --term-{old,good}=<термін>] " +"git bisect start [--term-(new,bad)=<термін> --term-(old,good)=<термін>] " "[--no-checkout] [--first-parent] [<поганий> [<добрий>...]] [--] " "[<визначник шляху>...]" @@ -2785,11 +2795,12 @@ msgid "couldn't look up commit object for '%s'" msgstr "не вдалося знайти об’єкт коміту для \"%s\"" #, c-format -msgid "" -"the branch '%s' is not fully merged.\n" -"If you are sure you want to delete it, run 'git branch -D %s'" +msgid "the branch '%s' is not fully merged" +msgstr "гілка \"%s\" злита не повністю" + +#, c-format +msgid "If you are sure you want to delete it, run 'git branch -D %s'" msgstr "" -"гілка \"%s\" злита не повністю.\n" "Якщо ви впевнені, що хочете її видалити, виконайте \"git branch -D %s\"" msgid "update of config-file failed" @@ -2856,11 +2867,11 @@ msgstr "неприпустима назва гілки: \"%s\"" #, c-format msgid "no commit on branch '%s' yet" -msgstr "поки що немає комітів в гілці \"%s\"" +msgstr "поки що немає комітів у гілці \"%s\"" #, c-format msgid "no branch named '%s'" -msgstr "немає гілки з ім’ям \"%s\"" +msgstr "немає гілки з назвою \"%s\"" msgid "branch rename failed" msgstr "не вдалося перейменувати гілку" @@ -3078,7 +3089,7 @@ msgid "" "'--set-upstream-to' instead" msgstr "" "опція \"--set-upstream\" більше не підтримується. Будь ласка, використовуйте " -"\"--track\" або \"--set-upstream-to\"" +"\"--track\" або \"--set-upstream-to\" замість неї" msgid "git version:\n" msgstr "версія git:\n" @@ -3848,8 +3859,8 @@ msgstr "переключити примусово (викинути локаль msgid "new-branch" msgstr "нова-гілка" -msgid "new unparented branch" -msgstr "нова гілка без джерела" +msgid "new unborn branch" +msgstr "нова ненароджена гілка" msgid "update ignored files (default)" msgstr "оновити ігноровані файли (за замовчуванням)" @@ -4100,9 +4111,6 @@ msgstr "" "clean.requireForce встановлено у true за замовчуванням і не задано ні -i, ні " "-n, ні -f; відмовлено в прибиранні" -msgid "-x and -X cannot be used together" -msgstr "-x та -X не можна використовувати разом" - msgid "git clone [] [--] []" msgstr "git clone [<опції>] [--] <сховище> [<директорія>]" @@ -4193,6 +4201,9 @@ msgstr "git директорія" msgid "separate git dir from working tree" msgstr "відокремити git-директорію від робочого дерева" +msgid "specify the reference format to use" +msgstr "вкажіть формат посилання, який потрібно використовувати" + msgid "key=value" msgstr "ключ=значення" @@ -4311,11 +4322,9 @@ msgstr "Забагато аргументів." msgid "You must specify a repository to clone." msgstr "Треба вказати сховище для клонування." -msgid "" -"--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-" -"exclude" -msgstr "" -"--bundle-uri несумісний з --depth, --shallow-since та --shallow-exclude" +#, c-format +msgid "unknown ref storage format '%s'" +msgstr "невідомий формат зберігання посилань \"%s\"" #, c-format msgid "repository '%s' does not exist" @@ -4450,7 +4459,7 @@ msgid "" "--stdin-commits]\n" " [--changed-paths] [--[no-]max-new-filters ] [--" "[no-]progress]\n" -" " +" " msgstr "" "git commit-graph write [--object-dir <директорія>] [--append] [--object-dir " "<директорія>] [--append] [--object-dir <директорія>] [--append\n" @@ -4458,7 +4467,7 @@ msgstr "" "| --stdin-commits]\n" " [--changed-paths] [--[no-]max-new-filters <число>] [--" "[no-]progress]\n" -" <опції розділення>" +" <опції-розділення>" msgid "dir" msgstr "директорія" @@ -6757,7 +6766,7 @@ msgid "scheduler to trigger git maintenance run" msgstr "планувальник для запуску обслуговування git" msgid "failed to set up maintenance schedule" -msgstr "не вдалося встановити графік обслуговування" +msgstr "не вдалося встановити розклад обслуговування" msgid "failed to add repo to global config" msgstr "не вдалося додати сховище до глобальної конфігурації" @@ -6776,6 +6785,7 @@ msgstr "grep: не вдалося створити потік: %s" msgid "invalid number of threads specified (%d) for %s" msgstr "невірно вказана кількість потоків (%d) для %s" +#. #-#-#-#-# grep.c.po #-#-#-#-# #. TRANSLATORS: %s is the configuration #. variable for tweaking threads, currently #. grep.threads @@ -7348,11 +7358,13 @@ msgstr "помилка fsck в об’єктах пакунка" msgid "" "git init [-q | --quiet] [--bare] [--template=]\n" " [--separate-git-dir ] [--object-format=]\n" +" [--ref-format=]\n" " [-b | --initial-branch=]\n" " [--shared[=]] []" msgstr "" "git init [-q | --quiet] [--bare] [--template=<шаблон-директорія>]\n" " [--separate-git-dir ] [--object-format=<формат>]\n" +" [--ref-format=<формат>]\n" " [-b <назва-гілки> | --initial-branch=<назва-гілки>]\n" " [--shared[=<дозволи>]] [<директорія>]" @@ -7400,8 +7412,8 @@ msgid "" " [--parse] [...]" msgstr "" "git interpret-trailers [--in-place] [--trim-empty]\n" -" [(--trailer (<ключ>|<аліасКлюча>)" -"[(=|:)<значення>])...]\n" +" [(--trailer <ключ>|" +"<аліасКлюча>[(=|:)<значення>])...]\n" " [--parse] [<файл>...]" msgid "edit files in place" @@ -7411,7 +7423,7 @@ msgid "trim empty trailers" msgstr "обрізати порожні причепи" msgid "placement" -msgstr "розташування" +msgstr "розміщення" msgid "where to place the new trailer" msgstr "де розмістити новий причіп" @@ -8065,11 +8077,18 @@ 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 "надсилати результати до стандартного виводу" msgid "use object IDs instead of filenames" -msgstr "використовувати ID обʼєктів замість назв файлів" +msgstr "використовувати ідентифікатори обʼєктів замість назв файлів" msgid "use a diff3 based merge" msgstr "використовувати злиття на основі diff3" @@ -8086,6 +8105,12 @@ msgstr "у разі конфліктів використовувати їхню msgid "for conflicts, use a union version" msgstr "у разі конфліктів використовувати об’єднану версію" +msgid "" +msgstr "<алгоритм>" + +msgid "choose a diff algorithm" +msgstr "вибрати алгоритм різниці" + msgid "for conflicts, use this marker size" msgstr "у разі конфліктів використовувати цей розмір маркера" @@ -8097,7 +8122,7 @@ msgstr "встановити мітки для файл1/оріг-файл/фа #, c-format msgid "object '%s' does not exist" -msgstr "обʼєкт \"%s\" не існує" +msgstr "об’єкт \"%s\" не існує" msgid "Could not write object file" msgstr "Не вдалося записати файл обʼєкта" @@ -8177,9 +8202,6 @@ msgstr "--trivial-merge несумісна з усіма іншими опція msgid "unknown strategy option: -X%s" msgstr "невідомий варіант стратегії: -X%s" -msgid "--merge-base is incompatible with --stdin" -msgstr "--merge-base несумісна з --stdin" - #, c-format msgid "malformed input line: '%s'." msgstr "невірно сформований рядок вводу: \"%s\"." @@ -9112,6 +9134,10 @@ msgstr "Компресія обʼєктів" msgid "inconsistency with delta count" msgstr "неспівпадіння з підрахунком дельти" +#, c-format +msgid "invalid pack.allowPackReuse value: '%s'" +msgstr "неприпустиме значення pack.allowPackReuse: \"%s\"" + #, c-format msgid "" "value of uploadpack.blobpackfileuri must be of the form ' (delta %), reused % (delta %), pack-" -"reused %" +"reused % (from %)" msgstr "" "Всього % (дельта %), повторно використано % (дельта " -"%), повторно використано пакунків %" +"%), повторно використано пакунків % (з %)" msgid "" "'git pack-redundant' is nominated for removal.\n" @@ -10360,13 +10386,6 @@ msgstr "" msgid "switch `C' expects a numerical value" msgstr "перемикач \"C\" очікує числове значення" -msgid "" -"apply options are incompatible with rebase.autoSquash. Consider adding --no-" -"autosquash" -msgstr "" -"apply опції несумісні з rebase.autoSquash. Розгляньте можливість додавання " -"--no-autosquash" - msgid "" "apply options are incompatible with rebase.rebaseMerges. Consider adding --" "no-rebase-merges" @@ -11156,7 +11175,7 @@ msgid "write a multi-pack index of the resulting packs" msgstr "записати multi-pack-index результуючих пакунків" msgid "pack prefix to store a pack containing pruned objects" -msgstr "префікс пакунка для зберігання пакунка з обрізаними обʼєктами" +msgstr "префікс для зберігання пакунка з обрізаними обʼєктами" msgid "pack prefix to store a pack containing filtered out objects" msgstr "префікс для зберігання пакунка з відфільтрованими обʼєктами" @@ -11166,7 +11185,7 @@ msgstr "неможливо видалити пакунки в precious-objects #, c-format msgid "option '%s' can only be used along with '%s'" -msgstr "опцію \"%s\" можна використовувати тільки разом з \"%s\"" +msgstr "опція \"%s\" може бути використана тільки разом з \"%s\"" msgid "Nothing new to pack." msgstr "Немає нічого нового для пакування." @@ -11371,6 +11390,75 @@ msgstr "--convert-graft-file не потребує аргументів" msgid "only one pattern can be given with -l" msgstr "тільки один шаблон може бути заданий з -l" +msgid "need some commits to replay" +msgstr "потрібні деякі комміти для відтворення" + +msgid "--onto and --advance are incompatible" +msgstr "--onto та --advance несумісні" + +msgid "all positive revisions given must be references" +msgstr "всі надані позитивні ревізії мають бути посиланнями" + +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" + +msgid "" +"cannot advance target with multiple source branches because ordering would " +"be ill-defined" +msgstr "" +"неможливо просунути посилання з декількома джерельними гілками, тому що " +"впорядкування буде нечітко визначеним" + +msgid "cannot implicitly determine correct base for --onto" +msgstr "неможливо неявно визначити вірну базу для --onto" + +msgid "" +"(EXPERIMENTAL!) git replay ([--contained] --onto | --advance " +") ..." +msgstr "" +"(ЕКСПЕРИМЕНТАЛЬНО!) git replay ([--contained] --onto <нова-база> | --advance " +"<гілка>) <діапазон-ревізій>..." + +msgid "make replay advance given branch" +msgstr "зробити відтворення з просуванням даної гілки" + +msgid "replay onto given commit" +msgstr "відтворити на заданий коміт" + +msgid "advance all branches contained in revision-range" +msgstr "просунути всі гілки, що містяться в діапазоні ревізій" + +msgid "option --onto or --advance is mandatory" +msgstr "опція --onto або --advance є обовʼязковою" + +#, c-format +msgid "" +"some rev walking options will be overridden as '%s' bit in 'struct rev_info' " +"will be forced" +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 "відтворення коммітів злиття поки що не підтримується!" + msgid "" "git rerere [clear | forget ... | diff | status | remaining | gc]" msgstr "" @@ -11583,15 +11671,6 @@ msgstr "--prefix потребує аргументу" msgid "unknown mode for --abbrev-ref: %s" msgstr "невідомий режим для --abbrev-ref: %s" -msgid "--exclude-hidden cannot be used together with --branches" -msgstr "--exclude-hidden не можна використовувати разом з --branches" - -msgid "--exclude-hidden cannot be used together with --tags" -msgstr "--exclude-hidden неможливо використовувати разом з --tags" - -msgid "--exclude-hidden cannot be used together with --remotes" -msgstr "--exclude-hidden неможливо використовувати разом з --remotes" - msgid "this operation must be run in a work tree" msgstr "цю операцію треба виконувати в робочому дереві" @@ -12005,10 +12084,6 @@ msgstr "не виводити результати у stdout (корисно з msgid "show refs from stdin that aren't in local repository" msgstr "показати посилання з stdin, яких немає в локальному сховищі" -#, c-format -msgid "only one of '%s', '%s' or '%s' can be given" -msgstr "можна вказати тільки один з \"%s\", \"%s\" або \"%s\"" - msgid "" "git sparse-checkout (init | list | set | add | reapply | disable | check-" "rules) []" @@ -12820,7 +12895,7 @@ msgstr "" "branch] [--] [<шлях>...]" msgid "Failed to resolve HEAD as a valid ref." -msgstr "Не вдалося розпізнати HEAD як дійсне посилання." +msgstr "Не вдалося розвʼязати HEAD в дійсне посилання." msgid "git submodule absorbgitdirs [] [...]" msgstr "git submodule absorbgitdirs [<опції>] [<шлях>...]" @@ -13325,7 +13400,7 @@ msgstr "%d\n" #, c-format msgid "index-version: was %d, set to %d" -msgstr "index-version: було %d, стало %d" +msgstr "версія індексу: була %d, стала %d" msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " @@ -13482,13 +13557,13 @@ msgstr "Немає можливої джерельної гілки, що озн #, c-format msgid "" -"If you meant to create a worktree containing a new orphan branch\n" +"If you meant to create a worktree containing a new unborn branch\n" "(branch with no commits) for this repository, you can do so\n" "using the --orphan flag:\n" "\n" " git worktree add --orphan -b %s %s\n" msgstr "" -"Якщо ви хочете створити робоче дерево, що містить нову сирітську гілку\n" +"Якщо ви хочете створити робоче дерево, що містить нову ненароджену гілку\n" "(гілку без комітів) для цього сховища, ви можете зробити це\n" "за допомогою прапорця --orphan:\n" "\n" @@ -13496,13 +13571,13 @@ msgstr "" #, c-format msgid "" -"If you meant to create a worktree containing a new orphan branch\n" +"If you meant to create a worktree containing a new unborn branch\n" "(branch with no commits) for this repository, you can do so\n" "using the --orphan flag:\n" "\n" " git worktree add --orphan %s\n" msgstr "" -"Якщо ви хочете створити робоче дерево, що містить нову сирітську гілку\n" +"Якщо ви хочете створити робоче дерево, що містить нову ненароджену гілку\n" "(гілку без комітів) для цього сховища, ви можете зробити це\n" "за допомогою прапорця --orphan:\n" "\n" @@ -13565,6 +13640,10 @@ msgstr "не вдалося створити директорію \"%s\"" msgid "initializing" msgstr "ініціалізація" +#, c-format +msgid "could not find created worktree '%s'" +msgstr "не вдалося знайти створене робоче дерево \"%s\"" + #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Підготовка робочого дерева (нова гілка \"%s\")" @@ -13601,12 +13680,8 @@ msgid "" msgstr "" "Не існує локальних або віддалених посилань, незважаючи на наявність " "принаймні одного віддаленого\n" -"призначення, зупинка; скористайтесь \"add -f\" для перевизначення або " -"спочатку виконайте отримання віддаленого посилання" - -#, c-format -msgid "'%s' and '%s' cannot be used together" -msgstr "\"%s\" і \"%s\" не можна використовувати разом" +"призначення, зупинка; скористайтесь \"add -f\", щоб перевизначити, або " +"спочатку виконайте отримання з віддаленного сховища" msgid "checkout even if already checked out in other worktree" msgstr "" @@ -13618,8 +13693,8 @@ msgstr "створити нову гілку" msgid "create or reset a branch" msgstr "створити або скинути гілку" -msgid "create unborn/orphaned branch" -msgstr "створити ненароджену/сирітську гілку" +msgid "create unborn branch" +msgstr "створити ненароджену гілку" msgid "populate the new working tree" msgstr "заповнити нове робоче дерево" @@ -13642,11 +13717,8 @@ msgid "options '%s', '%s', and '%s' cannot be used together" msgstr "опції \"%s\", \"%s\" та \"%s\" не можна використовувати разом" #, c-format -msgid "options '%s', and '%s' cannot be used together" -msgstr "опції \"%s\" і \"%s\" не можна використовувати разом" - -msgid "" -msgstr "<комітоподібне>" +msgid "option '%s' and commit-ish cannot be used together" +msgstr "опцію \"%s\" не можна використовувати разом з комітоподібними" msgid "added with --lock" msgstr "додано з --lock" @@ -13926,7 +13998,7 @@ msgstr "ідентифікатор завершення фрагмента зʼ #, c-format msgid "chunk id % not %d-byte aligned" -msgstr "шматок в id % не %d-byte впорядкований" +msgstr "шматок id % не є %d-byte впорядкованим" #, c-format msgid "improper chunk offset(s) % and %" @@ -13981,7 +14053,7 @@ msgid "Move objects and refs by archive" msgstr "Перенести архів обʼєктів та посилань" msgid "Provide contents or details of repository objects" -msgstr "Показати вміст або інформацію про обʼєкти сховища" +msgstr "Надавати вміст або деталі обʼєктів сховища" msgid "Display gitattributes information" msgstr "Відобразити інформацію про gitattributes" @@ -14269,6 +14341,11 @@ msgstr "Запакувати розпаковані обʼєкти у схови msgid "Create, list, delete refs to replace objects" msgstr "Створити, показати, видалити посилання для об’єктів заміни" +msgid "EXPERIMENTAL: Replay commits on a new base, works with bare repos too" +msgstr "" +"ЕКСПЕРИМЕНТАЛЬНО: Відтворення коммітів на новій базі також працює з " +"порожніми сховищами" + msgid "Generates a summary of pending changes" msgstr "Створює підсумок змін для розгляду" @@ -14391,7 +14468,7 @@ msgid "Display version information about Git" msgstr "Показати інформацію про версію Git" msgid "Show logs with differences each commit introduces" -msgstr "Показати журнал з різницею, яку вносить кожен з комітів" +msgstr "Показати журнал з різницями, які вносить кожен коміт" msgid "Manage multiple working trees" msgstr "Керувати кількома робочими деревами" @@ -14507,6 +14584,32 @@ msgstr "Інструмент для керування великими схов msgid "commit-graph file is too small" msgstr "файл коміт-графа занадто малий" +msgid "commit-graph oid fanout chunk is wrong size" +msgstr "шматок oid fanout коміт-графа має невірний розмір" + +msgid "commit-graph fanout values out of order" +msgstr "значення fanout коміт-графа впорядковані невірно" + +msgid "commit-graph OID lookup chunk is the wrong size" +msgstr "шматок OID lookup коміт-графа має невірний розмір" + +msgid "commit-graph commit data chunk is wrong size" +msgstr "шматок commit data коміт-графа має невірний розмір" + +msgid "commit-graph generations chunk is wrong size" +msgstr "шматок generations коміт-графа має невірний розмір" + +msgid "commit-graph changed-path index chunk is too small" +msgstr "шматок changed-path index коміт-графа має невірний розмір" + +#, c-format +msgid "" +"ignoring too-small changed-path chunk (% < %) in commit-" +"graph file" +msgstr "" +"ігнорування занадто малого шматка changed-path (% < %) " +"файла коміт-графа" + #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "підпис коміт-графа %X не збігається з підписом %X" @@ -14523,11 +14626,20 @@ msgstr "хеш версія коміт-графа %X не збігається msgid "commit-graph file is too small to hold %u chunks" msgstr "файл коміт-графа занадто малий, щоб вмістити %u шматків" +msgid "commit-graph required OID fanout chunk missing or corrupted" +msgstr "необхідний шматок OID fanout коміт-графа відсутній або пошкоджений" + +msgid "commit-graph required OID lookup chunk missing or corrupted" +msgstr "необхідний шматок OID lookup коміт-графа відсутній або пошкоджений" + +msgid "commit-graph required commit data chunk missing or corrupted" +msgstr "необхідний шматок commit data коміт-графа відсутній або пошкоджений" + msgid "commit-graph has no base graphs chunk" msgstr "коміт-граф не має шматка базових графів" msgid "commit-graph base graphs chunk is too small" -msgstr "занадто малий шматок базових графів коміт-графа" +msgstr "шматок base graphs коміт-графа занадто малий" msgid "commit-graph chain does not match" msgstr "ланцюжок коміт-графа не співпадає" @@ -14536,6 +14648,9 @@ msgstr "ланцюжок коміт-графа не співпадає" msgid "commit count in base graph too high: %" msgstr "кількість комітів у базовому графі занадто велика: %" +msgid "commit-graph chain file too small" +msgstr "файл ланцюжка коміт-графа занадто малий" + #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "неприпустимий ланцюжок коміт-графа: рядок \"%s\" не є хешем" @@ -14551,10 +14666,13 @@ msgid "could not find commit %s" msgstr "не вдалося знайти коміт %s" msgid "commit-graph requires overflow generation data but has none" -msgstr "коміт-граф потребує даних генерації переповнення, але їх немаєданих" +msgstr "коміт-граф потребує даних генерації переповнення, але не має їх" msgid "commit-graph overflow generation data is too small" -msgstr "занадто мало даних про переповнення коміт-граф генерації" +msgstr "занадто мало даних генерації переповнення коміт-графа" + +msgid "commit-graph extra-edges pointer out of bounds" +msgstr "extra-edges pointer коміт-графа виходить за межі" msgid "Loading known commits in commit graph" msgstr "Завантаження відомих комітів у коміт-графі" @@ -14692,7 +14810,8 @@ msgid "" "commit-graph has both zero and non-zero generations (e.g., commits '%s' and " "'%s')" msgstr "" -"коміт-граф має як нульові, так і ненульові генерації (коміти \"%s\" і \"%s\")" +"коміт-граф має як нульові, так і ненульові генерації (наприклад, коміти " +"\"%s\" і \"%s\")" msgid "Verifying commits in commit graph" msgstr "Перевірка комітів у коміт-графі" @@ -15702,6 +15821,10 @@ msgstr "" 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" @@ -15782,13 +15905,6 @@ msgstr "невірний --color-moved аргумент: %s" msgid "invalid mode '%s' in --color-moved-ws" msgstr "неприпустимий режим \"%s\" у --color-moved-ws" -msgid "" -"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " -"\"histogram\"" -msgstr "" -"опція diff-algorithm приймає значення \"myers\", \"minimal\", \"patience\" " -"та \"histogram\"" - #, c-format msgid "invalid argument to %s" msgstr "неприпустимий аргумент до %s" @@ -16019,12 +16135,6 @@ msgstr "згенерувати різницю за алгоритмом \"patien msgid "generate diff using the \"histogram diff\" algorithm" msgstr "згенерувати різницю за алгоритмом \"histogram diff\"" -msgid "" -msgstr "<алгоритм>" - -msgid "choose a diff algorithm" -msgstr "вибрати алгоритм різниці" - msgid "" msgstr "<текст>" @@ -17224,7 +17334,7 @@ msgstr "" #. conflict in a submodule. The first argument is the submodule #. 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" +#. - go to submodule (mysubmodule), and either merge commit abc1234" #. #, c-format msgid "" @@ -17513,12 +17623,18 @@ msgstr "не вдалося прочитати кеш" msgid "multi-pack-index OID fanout is of the wrong size" msgstr "multi-pack-index OID розсіювання має невірний розмір" +#, c-format +msgid "" +"oid fanout out of order: fanout[%d] = % > % = fanout[%d]" +msgstr "" +"невірна послідовність oid fanout: fanout[%d] = % > % = " +"fanout[%d]" + msgid "multi-pack-index OID lookup chunk is the wrong size" -msgstr "multi-pack-index шматок пошуку OID має невірний розмір" +msgstr "multi-pack-index OID lookup шматок має невірний розмір" msgid "multi-pack-index object offset chunk is the wrong size" -msgstr "" -"multi-pack-index необхідній шматок зміщення обʼєкта має невірний розмір" +msgstr "multi-pack-index object offset шматок має невірний розмір" #, c-format msgid "multi-pack-index file %s is too small" @@ -17537,24 +17653,22 @@ msgid "multi-pack-index hash version %u does not match version %u" msgstr "версія хешу multi-pack-index %u не збігається з версією %u" msgid "multi-pack-index required pack-name chunk missing or corrupted" -msgstr "" -"multi-pack-index необхідний шматок імені пакунка відсутній або пошкоджений" +msgstr "необхідний шматок pack-name multi-pack-index відсутній або пошкоджений" msgid "multi-pack-index required OID fanout chunk missing or corrupted" msgstr "" -"multi-pack-index необхідний шматок розсіювання OID відсутній або пошкоджений" +"необхідний шматок OID fanout multi-pack-index відсутній або пошкоджений" msgid "multi-pack-index required OID lookup chunk missing or corrupted" msgstr "" -"multi-pack-index необхідний шматок пошуку OID відсутній або пошкоджений" +"необхідний шматок OID lookup multi-pack-index відсутній або пошкоджений" msgid "multi-pack-index required object offsets chunk missing or corrupted" msgstr "" -"multi-pack-index необхідний шматок зміщення обʼєктів відсутній або " -"пошкоджений" +"необхідний шматок object offsets multi-pack-index відсутній або пошкоджений" msgid "multi-pack-index pack-name chunk is too short" -msgstr "multi-pack-index pack-name шматок занадто малий" +msgstr "шматок pack-name multi-pack-index занадто малий" #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" @@ -17566,12 +17680,19 @@ msgstr "" msgid "bad pack-int-id: %u (%u total packs)" msgstr "невірний pack-int-id: %u (%u всього пакунків)" +msgid "MIDX does not contain the BTMP chunk" +msgstr "MIDX не містить шматок BTMP" + +#, c-format +msgid "could not load bitmapped pack %" +msgstr "не вдалося завантажити бітмаповий пакунок %" + msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "" "multi-pack-index зберігає 64-бітне зміщення, але значення off_t занадто мале" msgid "multi-pack-index large offset out of bounds" -msgstr "multi-pack-index large зсув виходить за межі" +msgstr "large offset multi-pack-index виходить за межі" #, c-format msgid "failed to add packfile '%s'" @@ -17651,13 +17772,6 @@ msgstr "невірна контрольна сума" msgid "Looking for referenced packfiles" msgstr "Пошук файлів пакунків, на які є посилання" -#, c-format -msgid "" -"oid fanout out of order: fanout[%d] = % > % = fanout[%d]" -msgstr "" -"невірна послідовність oid розсіювання: fanout[%d] = % > % = " -"fanout[%d]" - msgid "the midx contains no oid" msgstr "midx не містить oid" @@ -17961,7 +18075,7 @@ msgstr "%s [невірний обʼект]" #. TRANSLATORS: This is a line of ambiguous commit #. object output. E.g.: #. * -#. "deadbeef commit 2021-01-01 - Some Commit Message" +#. "deadbeef commit 2021-01-01 - Some Commit Message" #. #, c-format msgid "%s commit %s - %s" @@ -17970,7 +18084,7 @@ msgstr "%s коміт %s - %s" #. TRANSLATORS: This is a line of ambiguous #. tag object output. E.g.: #. * -#. "deadbeef tag 2022-01-01 - Some Tag Message" +#. "deadbeef tag 2022-01-01 - Some Tag Message" #. * #. The second argument is the YYYY-MM-DD found #. in the tag. @@ -17986,7 +18100,7 @@ msgstr "%s тег %s - %s" #. tag object output where we couldn't parse #. the tag itself. E.g.: #. * -#. "deadbeef [bad tag, could not parse it]" +#. "deadbeef [bad tag, could not parse it]" #. #, c-format msgid "%s [bad tag, could not parse it]" @@ -18182,6 +18296,9 @@ msgstr "у мультіпакунковому bitmap відсутній необ msgid "could not open pack %s" msgstr "не вдалося відкрити пакунок %s" +msgid "could not determine MIDX preferred pack" +msgstr "не вдалося визначити бажаний пакунок MIDX" + #, c-format msgid "preferred pack (%s) is invalid" msgstr "бажаний пакунок (%s) є неприпустимим" @@ -18202,6 +18319,12 @@ msgstr "" msgid "corrupt ewah bitmap: truncated header for bitmap of commit \"%s\"" msgstr "пошкоджений ewah bitmap: урізаний заголовок для bitmap коміту \"%s\"" +#, c-format +msgid "unable to load pack: '%s', disabling pack-reuse" +msgstr "" +"не вдалося завантажити пакунок: \"%s\", вимкнення повторного використання " +"пакунків" + #, c-format msgid "object '%s' not found in type bitmaps" msgstr "обʼєкт \"%s\" не знайдено в типах bitmap" @@ -18296,6 +18419,9 @@ 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 "неможливо одночасно записувати та звіряти зворотний індекс" @@ -18358,10 +18484,6 @@ msgstr "%s недоступний" msgid "%s expects a non-negative integer value with an optional k/m/g suffix" msgstr "%s очікує невід'ємне ціле значення з опціональним суфіксом k/m/g" -#, c-format -msgid "%s is incompatible with %s" -msgstr "%s несумісний з %s" - #, c-format msgid "ambiguous option: %s (could be --%s%s or --%s%s)" msgstr "неоднозначна опція: %s (може бути --%s%s або --%s%s)" @@ -18469,7 +18591,7 @@ msgstr "" #, c-format msgid "bad boolean environment value '%s' for '%s'" -msgstr "невірне булеве значення конфігурації \"%s\" для \"%s\"" +msgstr "невірне булеве значення оточення \"%s\" для \"%s\"" #, c-format msgid "failed to parse %s" @@ -18683,10 +18805,6 @@ msgstr "не вдалося проіндексувати файл \"%s\"" msgid "unable to add '%s' to index" msgstr "не вдалося додати \"%s\" до індексу" -#, c-format -msgid "unable to stat '%s'" -msgstr "не вдалося виконати stat для \"%s\"" - #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "\"%s\" відображається як файл і як каталог" @@ -19260,10 +19378,6 @@ msgstr "\"%s\" існує; неможливо створити \"%s\"" msgid "cannot process '%s' and '%s' at the same time" msgstr "неможливо обробити \"%s\" і \"%s\" одночасно" -#, c-format -msgid "could not remove reference %s" -msgstr "не вдалося видалити посилання %s" - #, c-format msgid "could not delete reference %s: %s" msgstr "не вдалося видалити посилання %s: %s" @@ -20651,6 +20765,9 @@ msgstr "Застосування автосхову призвело до кон msgid "Autostash exists; creating a new stash entry." msgstr "Автосхов існує; створення нового запису схову." +msgid "autostash reference is a symref" +msgstr "посилання автосхову є символьним посиланням" + msgid "could not detach HEAD" msgstr "не вдалося відʼєднати HEAD" @@ -20971,6 +21088,10 @@ msgstr "не копіюються шаблони з \"%s\": %s" msgid "invalid initial branch name: '%s'" msgstr "неприпустиме початкове ім’я гілки: \"%s\"" +#, c-format +msgid "re-init: ignored --initial-branch=%s" +msgstr "re-init: ігноровано --initial-branch=%s" + #, c-format msgid "unable to handle file type %d" msgstr "не вдалося обробити тип файлу %d" @@ -20982,14 +21103,14 @@ msgstr "не вдалося перемістити %s на %s" msgid "attempt to reinitialize repository with different hash" msgstr "спроба переініціалізувати репозиторій з іншим хеш-алгоритмом" +msgid "" +"attempt to reinitialize repository with different reference storage format" +msgstr "спроба переініціалізувати сховище з іншим форматом зберігання" + #, c-format msgid "%s already exists" msgstr "%s вже існує" -#, c-format -msgid "re-init: ignored --initial-branch=%s" -msgstr "re-init: ігноровано --initial-branch=%s" - #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "Переініціалізовано існуюче спільне Git сховище в %s%s\n" @@ -21261,12 +21382,6 @@ msgid "number of entries in the cache tree to invalidate (default 0)" msgstr "" "кількість записів у дереві кешу, які потрібно анулювати (за замовчуванням 0)" -msgid "unhandled options" -msgstr "необроблені опції" - -msgid "error preparing revisions" -msgstr "помилка при підготовці ревізій" - #, c-format msgid "commit %s is not marked reachable" msgstr "коміт %s не позначений як досяжний" @@ -21423,9 +21538,6 @@ msgstr "встановлення шляху до віддаленого серв msgid "invalid remote service path" msgstr "неприпустимий шлях до віддаленої служби" -msgid "operation not supported by protocol" -msgstr "операція не підтримується протоколом" - #, c-format msgid "can't connect to subservice %s" msgstr "неможливо підключитися до підсервісу %s" @@ -21557,10 +21669,6 @@ msgstr "не вдалося розібрати конфігурацію transpor msgid "support for protocol v2 not implemented yet" msgstr "підтримка протоколу v2 ще не запроваджена" -#, c-format -msgid "unknown value for config '%s': %s" -msgstr "невідоме значення для конфігурації \"%s\": %s" - #, c-format msgid "transport '%s' not allowed" msgstr "засіб передачі \"%s\" не дозволений" @@ -21613,6 +21721,9 @@ msgstr "bundle-uri операція не підтримується проток msgid "could not retrieve server-advertised bundle-uri list" msgstr "не вдалося отримати список адрес пакетів, оголошений сервером" +msgid "operation not supported by protocol" +msgstr "операція не підтримується протоколом" + msgid "too-short tree object" msgstr "занадто короткий обʼєкт дерева" @@ -22014,7 +22125,7 @@ msgid "unable to get random bytes" msgstr "не вдалося отримати випадкові байти" msgid "Unmerged paths:" -msgstr "не злиті шляхи:" +msgstr "Не злиті шляхи:" msgid " (use \"git restore --staged ...\" to unstage)" msgstr "" @@ -22466,6 +22577,10 @@ msgstr "крім того, ваш індекс містить незакоміч msgid "cannot %s: Your index contains uncommitted changes." msgstr "неможливо виконати %s: Ваш індекс містить незакомічені зміни." +#, c-format +msgid "unknown style '%s' given for '%s'" +msgstr "невідомий стиль \"%s\" наданий для \"%s\"" + msgid "" "Error: Your local changes to the following files would be overwritten by " "merge" -- cgit 1.2.3-korg From 6ad5961c9112c9e9480f1e6e1caddfd3c6a64074 Mon Sep 17 00:00:00 2001 From: Arkadii Yakovets Date: Wed, 14 Feb 2024 20:35:59 -0800 Subject: l10n: uk: v2.44 update (round 2) Signed-off-by: Arkadii Yakovets --- po/uk.po | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/po/uk.po b/po/uk.po index f09e8d6dd3..dbd0d42ce3 100644 --- a/po/uk.po +++ b/po/uk.po @@ -1496,6 +1496,10 @@ msgstr "невірний --attr-source або GIT_ATTR_SOURCE" msgid "unable to stat '%s'" msgstr "не вдалося виконати stat для \"%s\"" +#, c-format +msgid "unable to read %s" +msgstr "не вдалося прочитати %s" + #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Невірно процитований вміст у файлі \"%s\": %s" @@ -6798,6 +6802,10 @@ msgstr "немає підтримки потоків, ігнорування %s" msgid "unable to read tree (%s)" msgstr "не вдалося прочитати дерево (%s)" +#, c-format +msgid "unable to read tree %s" +msgstr "не вдалося прочитати дерево %s" + #, c-format msgid "unable to grep from object of type %s" msgstr "не вдалося виконати grep для об’єкта типу %s" @@ -7210,10 +7218,6 @@ msgstr "серйозне неспівпадіння під час розпаку msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "ВИЯВЛЕНО SHA1 КОЛІЗІЮ З %s!" -#, c-format -msgid "unable to read %s" -msgstr "не вдалося прочитати %s" - #, c-format msgid "cannot read existing object info %s" msgstr "неможливо прочитати інформацію про існуючий об’єкт %s" @@ -15959,7 +15963,7 @@ msgid "synonym for --dirstat=cumulative" msgstr "синонім для --dirstat=cumulative" msgid "synonym for --dirstat=files,param1,param2..." -msgstr "синонім для --dirstat=files,параметр1,параметр2..." +msgstr "синонім для --dirstat=files,param1,param2..." msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" -- cgit 1.2.3-korg From a2e183e065c48ea79c4392d3d6cf4aa6467e3b0f Mon Sep 17 00:00:00 2001 From: Arkadii Yakovets Date: Thu, 15 Feb 2024 18:05:05 -0800 Subject: l10n: uk: v2.44 update (round 3) Signed-off-by: Arkadii Yakovets --- po/uk.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/uk.po b/po/uk.po index dbd0d42ce3..0507e387ba 100644 --- a/po/uk.po +++ b/po/uk.po @@ -15952,8 +15952,8 @@ msgstr "машинний вивід --stat" msgid "output only the last line of --stat" msgstr "вивести лише останній рядок --stat" -msgid "..." -msgstr "<параметр1,параметр2>..." +msgid ",..." +msgstr "<параметр1>,<параметр2>..." msgid "" "output the distribution of relative amount of changes for each sub-directory" @@ -15962,8 +15962,8 @@ msgstr "вивести розподіл відносної кількості з msgid "synonym for --dirstat=cumulative" msgstr "синонім для --dirstat=cumulative" -msgid "synonym for --dirstat=files,param1,param2..." -msgstr "синонім для --dirstat=files,param1,param2..." +msgid "synonym for --dirstat=files,,..." +msgstr "синонім для --dirstat=files,<параметр1>,<параметр2>..." msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" -- cgit 1.2.3-korg From 4d733f09f03c8e28a26470ebe046a2f3efa891d9 Mon Sep 17 00:00:00 2001 From: Jiang Xin Date: Fri, 16 Feb 2024 11:01:04 +0800 Subject: l10n: ci: remove unused param for add-pr-comment@v2 When we upgraded GitHub Actions "mshick/add-pr-comment" to v2, the following warning message was reported every time we ran the CI. Unexpected input(s) 'repo-token-user-login', valid inputs ... Removed the obsolete parameter "repo-token-user-login" to suppress warning messages. Signed-off-by: Jiang Xin --- .github/workflows/l10n.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/l10n.yml b/.github/workflows/l10n.yml index 3d89758981..6d3ae9daf1 100644 --- a/.github/workflows/l10n.yml +++ b/.github/workflows/l10n.yml @@ -98,7 +98,6 @@ jobs: env.COMMENT_BODY != '' with: repo-token: ${{ secrets.GITHUB_TOKEN }} - repo-token-user-login: 'github-actions[bot]' message: > ${{ steps.check-commits.outcome == 'failure' && 'Errors and warnings' || 'Warnings' }} found by [git-po-helper](https://github.com/git-l10n/git-po-helper#readme) in workflow -- cgit 1.2.3-korg From 1bb7fcbffc213db044476998f3a14b2597f3c540 Mon Sep 17 00:00:00 2001 From: Jiang Xin Date: Fri, 16 Feb 2024 11:20:39 +0800 Subject: l10n: ci: disable cache for setup-go to suppress warnings After we upgraded actions/setup-go to v5, the following warning message was reported every time we ran the CI. Restore cache failed: Dependencies file is not found ... Disable cache to suppress warning messages as described in the solution below. https://github.com/actions/setup-go/issues/427 Signed-off-by: Jiang Xin --- .github/workflows/l10n.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/l10n.yml b/.github/workflows/l10n.yml index 6d3ae9daf1..e2c3dbdcb5 100644 --- a/.github/workflows/l10n.yml +++ b/.github/workflows/l10n.yml @@ -66,6 +66,7 @@ jobs: - uses: actions/setup-go@v5 with: go-version: '>=1.16' + cache: false - name: Install git-po-helper run: go install github.com/git-l10n/git-po-helper@main - name: Install other dependencies -- cgit 1.2.3-korg From c293cf8c4769c0dd0a910b7f3444359d937fc465 Mon Sep 17 00:00:00 2001 From: Bagas Sanjaya Date: Sat, 10 Feb 2024 20:02:17 +0700 Subject: l10n: po-id for 2.44 (round 1) Update following components: * builtin/replay.c * command-list.h * commit-graph.c * pack-bitmap.c * sequencer.c Signed-off-by: Bagas Sanjaya --- po/id.po | 485 +++++++++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 319 insertions(+), 166 deletions(-) diff --git a/po/id.po b/po/id.po index 9698367606..3e8b212b61 100644 --- a/po/id.po +++ b/po/id.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2023-11-12 20:04+0700\n" -"PO-Revision-Date: 2023-11-12 20:30+0700\n" +"POT-Creation-Date: 2024-02-16 09:36+0700\n" +"PO-Revision-Date: 2024-02-16 10:45+0700\n" "Last-Translator: Bagas Sanjaya \n" "Language-Team: Indonesian\n" "Language: id\n" @@ -909,7 +909,7 @@ msgid "unclosed quote" msgstr "tanda kutip tak ditutup" #: alias.c builtin/cat-file.c builtin/notes.c builtin/prune-packed.c -#: builtin/receive-pack.c builtin/tag.c +#: builtin/receive-pack.c builtin/tag.c t/helper/test-pkt-line.c msgid "too many arguments" msgstr "terlalu banyak argumen" @@ -924,12 +924,13 @@ msgid "unrecognized whitespace ignore option '%s'" msgstr "opsi abai spasi putih tidak dikenal '%s'" #: apply.c archive.c builtin/add.c builtin/branch.c builtin/checkout-index.c -#: builtin/checkout.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.c -#: builtin/pack-objects.c builtin/push.c builtin/rebase.c builtin/repack.c -#: builtin/reset.c builtin/rev-list.c builtin/show-branch.c builtin/stash.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/pack-objects.c builtin/rebase.c +#: builtin/repack.c builtin/replay.c builtin/reset.c builtin/rev-list.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 @@ -1752,6 +1753,11 @@ msgstr "opsi `%s' butuh '%s'" msgid "Unexpected option --output" msgstr "Opsi --output tak diharapkan" +#: archive.c +#, c-format +msgid "extra command line parameter '%s'" +msgstr "parameter konfigurasi tambahan: '%s'" + #: archive.c #, c-format msgid "Unknown archive format '%s'" @@ -1808,6 +1814,17 @@ msgstr "mengabaikan blob gitattributes '%s' yang terlalu besar" msgid "bad --attr-source or GIT_ATTR_SOURCE" msgstr "--attr-source atau GIT_ATTR_SOURCE jelek" +#: attr.c read-cache.c +#, c-format +msgid "unable to stat '%s'" +msgstr "tidak dapat men-stat '%s'" + +#: bisect.c builtin/cat-file.c builtin/index-pack.c builtin/notes.c +#: builtin/pack-objects.c combine-diff.c rerere.c +#, c-format +msgid "unable to read %s" +msgstr "tidak dapat membaca %s" + #: bisect.c #, c-format msgid "Badly quoted content in file '%s': %s" @@ -2359,8 +2376,8 @@ msgid "bad action '%s' for '%s'" msgstr "tindakan jelek '%s' untuk '%s'" #: builtin/am.c builtin/blame.c builtin/fetch.c builtin/pack-objects.c -#: builtin/pull.c diff-merges.c gpg-interface.c ls-refs.c parallel-checkout.c -#: sequencer.c setup.c +#: builtin/pull.c config.c diff-merges.c gpg-interface.c ls-refs.c +#: parallel-checkout.c sequencer.c setup.c #, c-format msgid "invalid value for '%s': '%s'" msgstr "nilai tidak valid untuk '%s': '%s'" @@ -2523,8 +2540,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 sequencer.c -#: t/helper/test-fast-rebase.c +#: builtin/am.c builtin/commit.c builtin/merge.c builtin/replay.c sequencer.c msgid "failed to write commit object" msgstr "gagal menulis objek komit" @@ -2710,8 +2726,9 @@ msgid "n" msgstr "n" #: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c -#: builtin/diagnose.c builtin/for-each-ref.c builtin/ls-files.c -#: builtin/ls-tree.c builtin/replace.c builtin/tag.c builtin/verify-tag.c +#: builtin/clone.c builtin/diagnose.c builtin/for-each-ref.c builtin/init-db.c +#: builtin/ls-files.c builtin/ls-tree.c builtin/replace.c builtin/tag.c +#: builtin/verify-tag.c msgid "format" msgstr "format" @@ -3406,12 +3423,13 @@ msgstr "tidak dapat mencari objek komit untuk '%s'" #: builtin/branch.c #, c-format -msgid "" -"the branch '%s' is not fully merged.\n" -"If you are sure you want to delete it, run 'git branch -D %s'" -msgstr "" -"cabang '%s' belum sepenuhnya tergabung.\n" -"kalau Anda yakin ingin menghapusnya, jalankan 'git branch -D %s'" +msgid "the branch '%s' is not fully merged" +msgstr "cabang '%s' belum sepenuhnya digabungkan" + +#: builtin/branch.c +#, c-format +msgid "If you are sure you want to delete it, run 'git branch -D %s'" +msgstr "Jika anda yakin untuk menghapusnya, lakukan 'git branch -D %s'" #: builtin/branch.c msgid "update of config-file failed" @@ -4443,7 +4461,7 @@ msgstr "Tidak dapat melakukan reflog untuk '%s': %s\n" msgid "HEAD is now at" msgstr "HEAD sekarang berada di" -#: builtin/checkout.c builtin/clone.c t/helper/test-fast-rebase.c +#: builtin/checkout.c builtin/clone.c msgid "unable to update HEAD" msgstr "tidak dapat memperbarui HEAD" @@ -4714,8 +4732,8 @@ msgid "new-branch" msgstr "cabang baru" #: builtin/checkout.c -msgid "new unparented branch" -msgstr "cabang baru tanpa induk" +msgid "new unborn branch" +msgstr "cabang yatim baru" #: builtin/checkout.c builtin/merge.c msgid "update ignored files (default)" @@ -4783,7 +4801,7 @@ msgstr "" msgid "you must specify path(s) to restore" msgstr "Anda harus sebutkan jalur untuk dipulihkan" -#: builtin/checkout.c builtin/clone.c builtin/remote.c +#: builtin/checkout.c builtin/clone.c builtin/remote.c builtin/replay.c #: builtin/submodule--helper.c builtin/worktree.c msgid "branch" msgstr "cabang" @@ -5027,10 +5045,6 @@ msgstr "" "clean.requireForce asal ke true dan baik -i, -n, atau -f tidak diberikan; " "menolak membersihkan" -#: builtin/clean.c -msgid "-x and -X cannot be used together" -msgstr "-x dan -X tidak dapat digunakan bersamaan" - #: builtin/clone.c msgid "git clone [] [--] []" msgstr "git clone [] [--] []" @@ -5122,6 +5136,7 @@ msgid "create a shallow clone since a specific time" msgstr "buat klon dangkal sejak waktu yang disebutkan" #: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/rebase.c +#: builtin/replay.c msgid "revision" msgstr "revisi" @@ -5149,6 +5164,10 @@ msgstr "direktori git" msgid "separate git dir from working tree" msgstr "pisahkan direktori git dari pohon kerja" +#: builtin/clone.c builtin/init-db.c +msgid "specify the reference format to use" +msgstr "sebutkan format referensi untuk digunakan" + #: builtin/clone.c msgid "key=value" msgstr "kunci=nilai" @@ -5299,13 +5318,10 @@ msgstr "Terlalu banyak argumen." msgid "You must specify a repository to clone." msgstr "Anda harus sebutkan repositori untuk diklon." -#: builtin/clone.c -msgid "" -"--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-" -"exclude" -msgstr "" -"--bundle-uri tidak kompatibel dengan --depth, --shallow-since, dan --shallow-" -"exclude" +#: builtin/clone.c builtin/init-db.c setup.c +#, c-format +msgid "unknown ref storage format '%s'" +msgstr "format penyimpanan referensi tidak dikenal '%s'" #: builtin/clone.c #, c-format @@ -5471,13 +5487,13 @@ msgid "" "--stdin-commits]\n" " [--changed-paths] [--[no-]max-new-filters ] [--" "[no-]progress]\n" -" " +" " msgstr "" "git commit-graph write [--object-dir ] [--append]\n" " [--split[=]] [--reachable | --stdin-packs | " "--stdin-commits]\n" -" [--changed-paths] [--[no-]max-new-filters ] [--[-" -"no-]progress]\n" +" [--changed-paths] [--[no-]max-new-filters ] [--" +"[no-]progress]\n" " " #: builtin/commit-graph.c builtin/fetch.c builtin/log.c builtin/repack.c @@ -8400,6 +8416,11 @@ msgstr "tidak ada dukungan utas, abaikan %s" msgid "unable to read tree (%s)" msgstr "tidak dapat membaca pohon (%s)" +#: builtin/grep.c +#, c-format +msgid "unable to read tree %s" +msgstr "tidak dapat membaca pohon %s" + #: builtin/grep.c #, c-format msgid "unable to grep from object of type %s" @@ -8929,11 +8950,6 @@ msgstr "inkonsistensi inflate serius" msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "TUMBUKAN SHA1 DITEMUKAN DENGAN %s !" -#: builtin/index-pack.c builtin/pack-objects.c -#, c-format -msgid "unable to read %s" -msgstr "tidak dapat membaca %s" - #: builtin/index-pack.c #, c-format msgid "cannot read existing object info %s" @@ -9111,11 +9127,13 @@ msgstr "kesalahan fsck dalam objek paket" msgid "" "git init [-q | --quiet] [--bare] [--template=]\n" " [--separate-git-dir ] [--object-format=]\n" +" [--ref-format=]\n" " [-b | --initial-branch=]\n" " [--shared[=]] []" msgstr "" "git init [-q | --quiet] [--bare] [--template=]\n" " [--separate-git-dir ] [--object-format=]\n" +"\t [--ref-format=]\n" " [-b | --initial-branch=]\n" " [--shared[=]] []" @@ -9280,7 +9298,7 @@ msgstr "" "lacak evolusi rentang baris , atau fungsi : dalam " "" -#: builtin/log.c builtin/shortlog.c bundle.c +#: builtin/log.c builtin/replay.c builtin/shortlog.c bundle.c #, c-format msgid "unrecognized argument: %s" msgstr "argumen tidak dikenal: %s" @@ -10036,6 +10054,14 @@ msgstr "" "git merge-file [] [-L [-L [-L ]]] " " " +#: builtin/merge-file.c diff.c +msgid "" +"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " +"\"histogram\"" +msgstr "" +"opsi diff-algorithm terima \"myers\", \"minimal\", \"patience\" dan " +"\"histogram\"" + #: builtin/merge-file.c msgid "send results to standard output" msgstr "kirim hasil ke keluaran standar" @@ -10064,6 +10090,14 @@ msgstr "untuk konflik, gunakan versi mereka" msgid "for conflicts, use a union version" msgstr "untuk konflik, gunakan versi bersatu" +#: builtin/merge-file.c diff.c +msgid "" +msgstr "" + +#: builtin/merge-file.c diff.c +msgid "choose a diff algorithm" +msgstr "pilih algoritma diff" + #: builtin/merge-file.c msgid "for conflicts, use this marker size" msgstr "untuk konflik, gunakan ukuran penanda ini" @@ -10181,10 +10215,6 @@ msgstr "--trivial-merge tidak kompatibel dengan semua opsi lainnya" msgid "unknown strategy option: -X%s" msgstr "opsi strategi tidak dikenal: -X%s" -#: builtin/merge-tree.c -msgid "--merge-base is incompatible with --stdin" -msgstr "--merge-base tidak kompatibel dengan --stdin" - #: builtin/merge-tree.c builtin/notes.c #, c-format msgid "malformed input line: '%s'." @@ -10342,7 +10372,7 @@ msgstr "'%s' tidak menunjuk pada sebuah komit" msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Untai branch.%s.mergeoptions jelek: %s" -#: builtin/merge.c builtin/stash.c merge-recursive.c +#: builtin/merge.c merge-recursive.c msgid "Unable to write index." msgstr "Tidak dapat menulis indeks." @@ -10350,7 +10380,7 @@ msgstr "Tidak dapat menulis indeks." msgid "Not handling anything other than two heads merge." msgstr "Tak tangani apapun selain penggabungan dua kepala." -#: builtin/merge.c t/helper/test-fast-rebase.c +#: builtin/merge.c #, c-format msgid "unable to write %s" msgstr "tidak dapat menulis %s" @@ -11363,6 +11393,11 @@ msgstr "Memampatkan objek" msgid "inconsistency with delta count" msgstr "ketidakkonsistenan dengan hitungan delta" +#: builtin/pack-objects.c +#, c-format +msgid "invalid pack.allowPackReuse value: '%s'" +msgstr "nilai pack.allowPackReuse tidak valid: '%s'" + #: builtin/pack-objects.c #, c-format msgid "" @@ -11694,10 +11729,10 @@ msgstr "Menghitung objek" #, c-format msgid "" "Total % (delta %), reused % (delta %), pack-" -"reused %" +"reused % (from %)" msgstr "" "Total % (delta %), digunakan ulang % (delta " -"%), pak yang digunakan ulang %" +"%), pak yang digunakan ulang % (dari %)" #: builtin/pack-redundant.c msgid "" @@ -12816,7 +12851,7 @@ msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "Aksi --edit-todo hanya dapat digunakan selama pendasaran ulang interaktif." -#: builtin/rebase.c t/helper/test-fast-rebase.c +#: builtin/rebase.c msgid "Cannot read HEAD" msgstr "Tidak dapat membaca HEAD" @@ -12862,14 +12897,6 @@ msgstr "" msgid "switch `C' expects a numerical value" msgstr "tombol `C' harap nilai numerik" -#: builtin/rebase.c -msgid "" -"apply options are incompatible with rebase.autoSquash. Consider adding --no-" -"autosquash" -msgstr "" -"opsi penerapan tidak kompatibel dengan rebase.autoSquash. " -"Pertimbangkanmenambahkan --no-autosquash" - #: builtin/rebase.c msgid "" "apply options are incompatible with rebase.rebaseMerges. Consider adding --" @@ -13368,10 +13395,10 @@ msgid_plural "" "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n" "to delete them, use:" msgstr[0] "" -"Catatan: Sebuah cabang diluar hierarki refs/remotes tidak dihapus;\n" +"Catatan: Sebuah cabang diluar hierarki refs/remotes/ tidak dihapus;\n" "untuk menghapusnya, gunakan:" msgstr[1] "" -"Catatan: Beberapa cabang diluar hierarki refs/remotes tidak dihapus;\n" +"Catatan: Beberapa cabang diluar hierarki refs/remotes/ tidak dihapus;\n" "untuk menghapusnya, gunakan:" #: builtin/remote.c @@ -14108,6 +14135,94 @@ msgstr "--convert-graft-file tidak mengambil argumen" msgid "only one pattern can be given with -l" msgstr "hanya satu pola yang dapat diberikan dengan -l" +#: builtin/replay.c +msgid "need some commits to replay" +msgstr "butuh beberapa komit untuk dimainkan ulang" + +#: builtin/replay.c +msgid "--onto and --advance are incompatible" +msgstr "--onto dan --advance tidak kompatibel" + +#: builtin/replay.c +msgid "all positive revisions given must be references" +msgstr "semua revisi positif yang diberikan haruslah referensi" + +#: builtin/replay.c +msgid "argument to --advance must be a reference" +msgstr "argumen pada --advance harus sebuah referensi" + +#: builtin/replay.c +msgid "" +"cannot advance target with multiple sources because ordering would be ill-" +"defined" +msgstr "" +"tidak dapat memajukan target dengan banyak sumber karena pengurutannya akan " +"menjadi tidak jelas" + +#: builtin/replay.c +msgid "" +"cannot implicitly determine whether this is an --advance or --onto operation" +msgstr "" +"tidak dapat menentukan secara tidak langsung apakah ini operasi --advance " +"atau --onto" + +#: builtin/replay.c +msgid "" +"cannot advance target with multiple source branches because ordering would " +"be ill-defined" +msgstr "" +"tidak dapat memajukan target dengan banyak cabang sumber karena " +"pengurutannya akan menjadi tidak jelas" + +#: builtin/replay.c +msgid "cannot implicitly determine correct base for --onto" +msgstr "tidak dapat menentukan secara tidak langsung dasar untuk --onto" + +#: builtin/replay.c +msgid "" +"(EXPERIMENTAL!) git replay ([--contained] --onto | --advance " +") ..." +msgstr "" +"(EKSPERIMENTAL!) git replay ([--contained] --onto | --advance " +") ..." + +#: 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" + +#: builtin/replay.c +msgid "advance all branches contained in revision-range" +msgstr "majukan semua cabang yang berada pada rentang komit" + +#: builtin/replay.c +msgid "option --onto or --advance is mandatory" +msgstr "opsi --onto atau --advance diwajibkan" + +#: builtin/replay.c +#, c-format +msgid "" +"some rev walking options will be overridden as '%s' bit in 'struct rev_info' " +"will be forced" +msgstr "" +"beberapa opsi jalan revisi akan ditimpa oleh karena bit '%s' di 'struct " +"rev_info' akan dipaksakan" + +#: builtin/replay.c +msgid "error preparing revisions" +msgstr "kesalahan menyiapkan revisi" + +#: builtin/replay.c +msgid "replaying down to root commit is not supported yet!" +msgstr "memainkan ulang ke komit akar belum didukung!" + +#: builtin/replay.c +msgid "replaying merge commits is not supported yet!" +msgstr "memainkan ulang komit penggabungan belum didukung!" + #: builtin/rerere.c msgid "" "git rerere [clear | forget ... | diff | status | remaining | gc]" @@ -14370,18 +14485,6 @@ msgstr "--prefix butuh sebuah argumen" msgid "unknown mode for --abbrev-ref: %s" msgstr "mode untuk --abbrev-ref tidak dikenal: %s" -#: builtin/rev-parse.c revision.c -msgid "--exclude-hidden cannot be used together with --branches" -msgstr "--exclude-hidden tidak dapat digunakan bersamaan dengan --branches" - -#: builtin/rev-parse.c revision.c -msgid "--exclude-hidden cannot be used together with --tags" -msgstr "--exclude-hidden tidak dapat digunakan bersamaan dengan --tags" - -#: builtin/rev-parse.c revision.c -msgid "--exclude-hidden cannot be used together with --remotes" -msgstr "--exclude-hidden tidak dapat digunakan dengan --remotes" - #: builtin/rev-parse.c setup.c msgid "this operation must be run in a work tree" msgstr "operasi ini harus dijalankan di dalam pohon kerja" @@ -14894,11 +14997,6 @@ msgstr "" "perlihatkan referensi dari masukan standar yang tidak ada dalam repositori " "lokal" -#: builtin/show-ref.c -#, c-format -msgid "only one of '%s', '%s' or '%s' can be given" -msgstr "hanya salah satu dari '%s', '%s', dan '%s' dapat diberikan" - #: builtin/sparse-checkout.c msgid "" "git sparse-checkout (init | list | set | add | reapply | disable | check-" @@ -16720,7 +16818,7 @@ msgstr "Tidak ada cabang sumber yang mungkin, menyimpulkan '--orphan'" #: builtin/worktree.c #, c-format msgid "" -"If you meant to create a worktree containing a new orphan branch\n" +"If you meant to create a worktree containing a new unborn branch\n" "(branch with no commits) for this repository, you can do so\n" "using the --orphan flag:\n" "\n" @@ -16734,7 +16832,7 @@ msgstr "" #: builtin/worktree.c #, c-format msgid "" -"If you meant to create a worktree containing a new orphan branch\n" +"If you meant to create a worktree containing a new unborn branch\n" "(branch with no commits) for this repository, you can do so\n" "using the --orphan flag:\n" "\n" @@ -16812,6 +16910,11 @@ msgstr "tidak dapat membuat direktori '%s'" msgid "initializing" msgstr "menginisialisasi" +#: builtin/worktree.c +#, c-format +msgid "could not find created worktree '%s'" +msgstr "tidak dapat menemukan pohon kerja yang dibuat '%s'" + #: builtin/worktree.c #, c-format msgid "Preparing worktree (new branch '%s')" @@ -16858,11 +16961,6 @@ msgstr "" "ada, berhenti; gunakan 'add -f' untuk menimpa atau mengambil remote\n" "terlebih dahulu" -#: builtin/worktree.c -#, c-format -msgid "'%s' and '%s' cannot be used together" -msgstr "'%s' dan '%s' tidak dapat digunakan bersamaan" - #: builtin/worktree.c msgid "checkout even if already checked out in other worktree" msgstr "" @@ -16877,7 +16975,7 @@ msgid "create or reset a branch" msgstr "buat atau setel ulang sebuah cabang" #: builtin/worktree.c -msgid "create unborn/orphaned branch" +msgid "create unborn branch" msgstr "buat cabang belum lahir/yatim" #: builtin/worktree.c @@ -16907,12 +17005,8 @@ msgstr "Opsi '%s', '%s', dan '%s' tidak dapat digunakan bersamaan" #: builtin/worktree.c #, c-format -msgid "options '%s', and '%s' cannot be used together" -msgstr "Opsi '%s', dan '%s' tidak dapat digunakan bersamaan" - -#: builtin/worktree.c -msgid "" -msgstr "" +msgid "option '%s' and commit-ish cannot be used together" +msgstr "opsi '%s' dan mirip-komit tidak dapat digunakan bersamaan" #: builtin/worktree.c msgid "added with --lock" @@ -17714,6 +17808,12 @@ msgstr "Pak objek tak terpak di dalam repositori" msgid "Create, list, delete refs to replace objects" msgstr "Buat, daftar, hapus referensi untuk mengganti objek" +#: command-list.h +msgid "EXPERIMENTAL: Replay commits on a new base, works with bare repos too" +msgstr "" +"EKSPERIMENTAL: Mainkan ulang komit pada dasar baru, dan juga bekerja pada " +"repositori bare" + #: command-list.h msgid "Generates a summary of pending changes" msgstr "Buat ringkasan perubahan tertunda" @@ -18031,6 +18131,39 @@ msgstr "Alat untuk mengelola repositori Git besar" msgid "commit-graph file is too small" msgstr "berkas grafik komit terlalu kecil" +#: commit-graph.c +msgid "commit-graph oid fanout chunk is wrong size" +msgstr "bingkah oid grafik komit kipas keluar salah ukuran" + +#: commit-graph.c +msgid "commit-graph fanout values out of order" +msgstr "nilai kipas keluar grafik komit tidak berurutan" + +#: commit-graph.c +msgid "commit-graph OID lookup chunk is the wrong size" +msgstr "bingkah OID pencarian grafik komit salah ukuran" + +#: commit-graph.c +msgid "commit-graph commit data chunk is wrong size" +msgstr "bingkah data grafik komit salah ukuran" + +#: commit-graph.c +msgid "commit-graph generations chunk is wrong size" +msgstr "bingkah generasi grafik komit salah ukuran" + +#: commit-graph.c +msgid "commit-graph changed-path index chunk is too small" +msgstr "bingkah indeks grafik komit jalur berubah terlalu kecil" + +#: commit-graph.c +#, c-format +msgid "" +"ignoring too-small changed-path chunk (% < %) in commit-" +"graph file" +msgstr "" +"mengabaikan bingkah jalur berubah yang terlalu kecil (% < " +"%) di dalam berkas grafik komit" + #: commit-graph.c #, c-format msgid "commit-graph signature %X does not match signature %X" @@ -18051,6 +18184,19 @@ msgstr "versi hash grafik komit %X tidak cocok dengan versi %X" msgid "commit-graph file is too small to hold %u chunks" msgstr "berkas grafik komit terlalu kecil untuk menyimpan %u bingkah" +#: commit-graph.c +msgid "commit-graph required OID fanout chunk missing or corrupted" +msgstr "" +"bingkah grafik komit OID kipas keluar yang diperlukan hilang atau rusak" + +#: commit-graph.c +msgid "commit-graph required OID lookup chunk missing or corrupted" +msgstr "bingkah grafik komit OID pencarian yang diperlukan hilang atau rusak" + +#: commit-graph.c +msgid "commit-graph required commit data chunk missing or corrupted" +msgstr "bingkah grafik komit data komit yang diperlukan hilang atau rusak" + #: commit-graph.c msgid "commit-graph has no base graphs chunk" msgstr "grafik komit tidak punya bingkah grafik dasar" @@ -18068,6 +18214,10 @@ msgstr "rantai grafik komit tidak cocok" msgid "commit count in base graph too high: %" msgstr "jumlah komit pada grafik dasar terlalu tinggi: %" +#: commit-graph.c +msgid "commit-graph chain file too small" +msgstr "berkas rantai grafik komit terlalu kecil" + #: commit-graph.c #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" @@ -18094,6 +18244,10 @@ msgstr "grafik komit memerlukan pembuatan data meluap tapi tidak punya" msgid "commit-graph overflow generation data is too small" msgstr "data generasi luapan grafik komit terlalu kecil" +#: commit-graph.c +msgid "commit-graph extra-edges pointer out of bounds" +msgstr "penunjuk tepi tambahan grafik komit di luar batas" + #: commit-graph.c msgid "Loading known commits in commit graph" msgstr "Memuat komit yang dikenal di grafik komit" @@ -19505,6 +19659,11 @@ msgstr "" msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Nilai tidak dikenal untuk variabel konfigurasi 'diff.submodule': '%s'" +#: diff.c transport.c +#, c-format +msgid "unknown value for config '%s': %s" +msgstr "nilai tidak dikenal untuk konfigurasi '%s': %s" + #: diff.c #, c-format msgid "" @@ -19601,14 +19760,6 @@ msgstr "argumen --color-moved jelek: %s" msgid "invalid mode '%s' in --color-moved-ws" msgstr "mode tidak valid '%s' dalam --color-moved-ws" -#: diff.c -msgid "" -"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " -"\"histogram\"" -msgstr "" -"opsi diff-algorithm terima \"myers\", \"minimal\", \"patience\" dan " -"\"histogram\"" - #: diff.c #, c-format msgid "invalid argument to %s" @@ -19666,8 +19817,8 @@ msgid "output only the last line of --stat" msgstr "keluarkan hanya baris terakhir --stat" #: diff.c -msgid "..." -msgstr "..." +msgid ",..." +msgstr ",..." #: diff.c msgid "" @@ -19680,8 +19831,8 @@ msgid "synonym for --dirstat=cumulative" msgstr "sinonim untuk --dirstat=cumulative" #: diff.c -msgid "synonym for --dirstat=files,param1,param2..." -msgstr "sinonim untuk --dirstat=files,param1,param2..." +msgid "synonym for --dirstat=files,,..." +msgstr "sinonim untuk --dirstat=files,,..." #: diff.c msgid "warn if changes introduce conflict markers or whitespace errors" @@ -19913,14 +20064,6 @@ msgstr "buat diff menggunakan algoritma \"diff sabar\"" msgid "generate diff using the \"histogram diff\" algorithm" msgstr "buat diff menggunakan algoritma \"diff histogram\"" -#: diff.c -msgid "" -msgstr "" - -#: diff.c -msgid "choose a diff algorithm" -msgstr "pilih algoritma diff" - #: diff.c msgid "" msgstr "" @@ -21729,6 +21872,14 @@ msgstr "gagal membaca tembolok" msgid "multi-pack-index OID fanout is of the wrong size" msgstr "OID kipas-keluar indeks multipak salah ukuran" +#: midx.c +#, c-format +msgid "" +"oid fanout out of order: fanout[%d] = % > % = fanout[%d]" +msgstr "" +"kipas-keluar oid tidak berurutan: fanout[%d] =% > % = " +"fanout[%d]" + #: midx.c msgid "multi-pack-index OID lookup chunk is the wrong size" msgstr "bingkah pencarian OID kipas-keluar indeks multipak salah ukuran" @@ -21790,6 +21941,15 @@ msgstr "nama pak indeks multipak tidak berurutan: '%s' sebelum '%s'" msgid "bad pack-int-id: %u (%u total packs)" msgstr "pack-int-id jelek: %u (total pak %u)" +#: midx.c +msgid "MIDX does not contain the BTMP chunk" +msgstr "MIDX tidak berisi bingkah BTMP" + +#: midx.c +#, c-format +msgid "could not load bitmapped pack %" +msgstr "tidak dapat membuka pak terbitmap %" + #: midx.c msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "indeks multipak simpan offset 64-bit, tapi off_t terlalu kecil" @@ -21897,14 +22057,6 @@ msgstr "checksum salah" msgid "Looking for referenced packfiles" msgstr "Mencari berkas pak yang direferensikan" -#: midx.c -#, c-format -msgid "" -"oid fanout out of order: fanout[%d] = % > % = fanout[%d]" -msgstr "" -"kipas-keluar oid tidak berurutan: fanout[%d] =% > % = " -"fanout[%d]" - #: midx.c msgid "the midx contains no oid" msgstr "midx tidak berisi oid" @@ -22542,6 +22694,10 @@ msgstr "bitmap multipak kehilangan indeks balik yang diperlukan" msgid "could not open pack %s" msgstr "tidak dapat membuka '%s'" +#: pack-bitmap.c t/helper/test-read-midx.c +msgid "could not determine MIDX preferred pack" +msgstr "tidak dapat menentukan pak MIDX terpilih" + #: pack-bitmap.c #, c-format msgid "preferred pack (%s) is invalid" @@ -22565,6 +22721,11 @@ msgstr "tabel pencarian bitmap rusak: indeks komit %u di luar jangkauan" msgid "corrupt ewah bitmap: truncated header for bitmap of commit \"%s\"" msgstr "bitmap ewah rusak: kepala terpotong untuk bitmap komit \"%s\"" +#: pack-bitmap.c +#, c-format +msgid "unable to load pack: '%s', disabling pack-reuse" +msgstr "tidak dapat memuat pak: '%s', mematikan penggunaan ulang pak" + #: pack-bitmap.c #, c-format msgid "object '%s' not found in type bitmaps" @@ -22680,6 +22841,10 @@ msgstr "posisi indeks balik tidak valid pada %: % != %" 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" @@ -22760,11 +22925,6 @@ msgstr "" "%s mengharapkan nilai bilangan bulat non negatif dengan akhiran opsional k/m/" "g" -#: parse-options.c -#, c-format -msgid "%s is incompatible with %s" -msgstr "%s tidak kompatibel dengan %s" - #: parse-options.c #, c-format msgid "ambiguous option: %s (could be --%s%s or --%s%s)" @@ -23164,11 +23324,6 @@ msgstr "tidak dapat menulis berkas indeks '%s'" msgid "unable to add '%s' to index" msgstr "tidak dapat menambahkan '%s' ke indeks" -#: read-cache.c -#, c-format -msgid "unable to stat '%s'" -msgstr "tidak dapat men-stat '%s'" - #: read-cache.c #, c-format msgid "'%s' appears as both a file and as a directory" @@ -23855,17 +24010,12 @@ msgstr "'%s' ada; tidak dapat membuat '%s'" msgid "cannot process '%s' and '%s' at the same time" msgstr "tidak dapat memproses '%s' dan '%s' pada waktu yang bersamaan" -#: refs/files-backend.c -#, c-format -msgid "could not remove reference %s" -msgstr "tidak dapat menghapus referensi %s" - -#: refs/files-backend.c refs/packed-backend.c +#: refs.c #, c-format msgid "could not delete reference %s: %s" msgstr "tidak dapat menghapus referensi %s: %s" -#: refs/files-backend.c refs/packed-backend.c +#: refs.c #, c-format msgid "could not delete references: %s" msgstr "tidak dapat menghapus referensi: %s" @@ -24100,9 +24250,9 @@ msgid "" msgstr "" "Tujuan yang Anda berikan bukan nama referensi penuh (seperti \n" "dimulai dengan \"refs/\"). Kami mencoba menebak maksud Anda dengan:\n" -"- Cari referensi yang cocok dengan '%s' pada sisi remote.\n" -"- Perika apakah yang sedang didorong ('%s') adalah \n" -" referensi pada \"refs/{heads,tags}\". Bila demikian kami \n" +"- mencari referensi yang cocok dengan '%s' pada sisi remote.\n" +"- memeriksa apakah yang sedang didorong ('%s') adalah \n" +" referensi pada \"refs/{heads,tags}/\". Bila demikian kami \n" " menambahkan awalan refs/{heads,tags}/ yang bersesuaian pada sisi \n" " remote.\n" "\n" @@ -25042,7 +25192,7 @@ msgstr "identitas pengarang tidak valid '%s'" msgid "corrupt author: missing date information" msgstr "pengarang rusak: informasi tanggal hilang" -#: sequencer.c t/helper/test-fast-rebase.c +#: sequencer.c #, c-format msgid "could not update %s" msgstr "tidak dapat memperbarui %s" @@ -25536,6 +25686,10 @@ msgstr "Menerapkan stase otomatis menghasilkan konflik." 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" + #: sequencer.c msgid "could not detach HEAD" msgstr "tidak dapat melepas HEAD" @@ -25916,6 +26070,11 @@ msgstr "tidak menyalin templat dari '%s': %s" msgid "invalid initial branch name: '%s'" msgstr "nama cabang asal salah: '%s'" +#: setup.c +#, c-format +msgid "re-init: ignored --initial-branch=%s" +msgstr "re-init: --initial-branch=%s diabaikan" + #: setup.c #, c-format msgid "unable to handle file type %d" @@ -25931,14 +26090,16 @@ msgid "attempt to reinitialize repository with different hash" msgstr "mencoba menginisialisasi ulang repositori dengan hash yang berbeda" #: setup.c -#, c-format -msgid "%s already exists" -msgstr "%s sudah ada" +msgid "" +"attempt to reinitialize repository with different reference storage format" +msgstr "" +"mencoba menginisialisasi ulang repositori dengan format penyimpanan " +"referensi yang berbeda" #: setup.c #, c-format -msgid "re-init: ignored --initial-branch=%s" -msgstr "re-init: --initial-branch=%s diabaikan" +msgid "%s already exists" +msgstr "%s sudah ada" #: setup.c #, c-format @@ -26264,14 +26425,6 @@ msgstr "bersihkan pohon tembolok sebelum setiap iterasi" msgid "number of entries in the cache tree to invalidate (default 0)" msgstr "jumlah entri di dalam pohon tembolok untuk dinirvalidasi (asali 0)" -#: t/helper/test-fast-rebase.c -msgid "unhandled options" -msgstr "opsi tak tertangani" - -#: t/helper/test-fast-rebase.c -msgid "error preparing revisions" -msgstr "kesalahan menyiapkan revisi" - #: t/helper/test-reach.c #, c-format msgid "commit %s is not marked reachable" @@ -26469,10 +26622,6 @@ msgstr "menyetel jalur layanan remote tidak didukung oleh protokol" msgid "invalid remote service path" msgstr "jalur layanan remote tidak valid" -#: transport-helper.c transport.c -msgid "operation not supported by protocol" -msgstr "operasi tidak didukung oleh protokol" - #: transport-helper.c #, c-format msgid "can't connect to subservice %s" @@ -26636,11 +26785,6 @@ msgstr "tidak dapat menguraikan konfigurasi transport.color.*" msgid "support for protocol v2 not implemented yet" msgstr "dukungan untuk protokol v2 belum diterapkan" -#: transport.c -#, c-format -msgid "unknown value for config '%s': %s" -msgstr "nilai tidak dikenal untuk konfigurasi '%s': %s" - #: transport.c #, c-format msgid "transport '%s' not allowed" @@ -26701,6 +26845,10 @@ msgstr "operasi bundle-uri tidak didukung oleh protokol" msgid "could not retrieve server-advertised bundle-uri list" msgstr "tidak dapat menerima daftar bundle-uri teriklankan server" +#: transport.c +msgid "operation not supported by protocol" +msgstr "operasi tidak didukung oleh protokol" + #: tree-walk.c msgid "too-short tree object" msgstr "objek pohon terlalu pendek" @@ -27722,6 +27870,11 @@ msgstr "juga indeks Anda berisi perubahan yang belum dikomit." msgid "cannot %s: Your index contains uncommitted changes." msgstr "tidak dapat %s: indeks Anda berisi perubahan yang belum dikomit." +#: xdiff-interface.c +#, c-format +msgid "unknown style '%s' given for '%s'" +msgstr "nilai gaya tidak dikenal '%s' diberikan untuk '%s'" + #: git-merge-octopus.sh git-merge-resolve.sh msgid "" "Error: Your local changes to the following files would be overwritten by " -- cgit 1.2.3-korg From 6f5e31bec7346b2d38ea3830b030412c12bcc136 Mon Sep 17 00:00:00 2001 From: Jordi Mas Date: Sun, 11 Feb 2024 11:36:02 +0100 Subject: l10n: Update Catalan translation Signed-off-by: Jordi Mas --- po/ca.po | 466 ++++++++++++++++++++++++++++++++++++++------------------------- 1 file changed, 283 insertions(+), 183 deletions(-) diff --git a/po/ca.po b/po/ca.po index d1a4e56c3a..bcb4da80fb 100644 --- a/po/ca.po +++ b/po/ca.po @@ -1,7 +1,7 @@ # Catalan translations for Git. # This file is distributed under the same license as the Git package. # Alex Henrie , 2014-2016. -# Jordi Mas i Hernàndez , 2016-2023 +# Jordi Mas i Hernàndez , 2016-2024 # # Terminologia # @@ -56,6 +56,7 @@ # Anglès | Català # -----------------+--------------------------------- # blame | «blame» +# fanout | «fanout» # HEAD | HEAD (f, la branca actual) - (no s'apostrofa) # cherry pick | «cherry pick» # promisor | «promisor» @@ -70,14 +71,14 @@ # # Criteris # - Mantingueu en anglès les referències a seccions de la documentació, ja que no està traduïda. -# - Usem la convenció valenciana per a «per / per a», que inclou l'ús de «per a» davant d'infintiu +# - Usem la convenció valenciana per a «per / per a», que inclou l'ús de «per a» davant d'infinitiu # msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2023-11-13 18:55+0100\n" -"PO-Revision-Date: 2023-11-13 19:00-0600\n" +"POT-Creation-Date: 2024-02-16 07:14+0100\n" +"PO-Revision-Date: 2024-02-16 07:16+0100\n" "Last-Translator: Jordi Mas i Hernàndez \n" "Language-Team: Catalan\n" "Language: ca\n" @@ -592,6 +593,7 @@ msgstr "«git apply --cached» ha fallat" #. 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 "" @@ -1502,6 +1504,10 @@ msgstr "l'opció «%s» requereix «%s»" msgid "Unexpected option --output" msgstr "Opció inesperada --output" +#, c-format +msgid "extra command line parameter '%s'" +msgstr "paràmetre extra de la línia d'ordres «%s»" + #, c-format msgid "Unknown archive format '%s'" msgstr "Format d'arxiu desconegut «%s»" @@ -1547,6 +1553,14 @@ msgstr "s'ignorarà el blob «%s» gitattributes per a ser massa gran" msgid "bad --attr-source or GIT_ATTR_SOURCE" msgstr "--attr-source incorrecte o GIT_ATTR_SOURCE" +#, c-format +msgid "unable to stat '%s'" +msgstr "no s'ha pogut fer «stat» a «%s»" + +#, c-format +msgid "unable to read %s" +msgstr "no s'ha pogut llegir %s" + #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Comentari amb cometes errònies en el fitxer «%s»: %s" @@ -1643,6 +1657,7 @@ msgstr[1] "(aproximadament %d passos)" #. 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" @@ -1728,17 +1743,20 @@ msgstr "no s'està seguint: informació ambigua per a la referència «%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" @@ -2143,6 +2161,7 @@ msgstr "El cos de la comissió és:" #. 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 "" @@ -2480,6 +2499,7 @@ msgstr "bisecant amb només una comissió %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 "N'esteu segur [Y/n]? " @@ -2557,6 +2577,7 @@ msgstr "Cal començar per «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 "Voleu que ho faci per vostè [Y/n]? " @@ -2777,6 +2798,7 @@ msgstr "" #. among various forms of relative timestamps, but #. your language may need more or fewer display #. columns. +#. msgid "4 years, 11 months ago" msgstr "fa 4 anys i 11 mesos" @@ -2838,12 +2860,12 @@ msgid "couldn't look up commit object for '%s'" msgstr "no s'ha pogut cercar l'objecte de comissió per a «%s»" #, c-format -msgid "" -"the branch '%s' is not fully merged.\n" -"If you are sure you want to delete it, run 'git branch -D %s'" -msgstr "" -"la branca «%s» no està completament fusionada.\n" -"Si esteu segur que voleu suprimir-la, executeu «git branch -D %s»" +msgid "the branch '%s' is not fully merged" +msgstr "la branca «%s» no està completament fusionada" + +#, c-format +msgid "If you are sure you want to delete it, run 'git branch -D %s'" +msgstr "Si esteu segur que voleu suprimir-la, executeu «git branch -D %s»" msgid "update of config-file failed" msgstr "ha fallat l'actualització del fitxer de configuració" @@ -3884,8 +3906,8 @@ msgstr "agafa a la força (descarta qualsevol modificació local)" msgid "new-branch" msgstr "branca-nova" -msgid "new unparented branch" -msgstr "branca òrfena nova" +msgid "new unborn branch" +msgstr "branca no nascuda nova" msgid "update ignored files (default)" msgstr "actualitza els fitxers ignorats (per defecte)" @@ -4137,9 +4159,6 @@ msgstr "" "clean.requireForce és per defecte cert i ni -i, -n ni -f s'han indicat; " "refusant netejar" -msgid "-x and -X cannot be used together" -msgstr "-x i -X no es poden usar junts" - msgid "git clone [] [--] []" msgstr "git clone [] [--] []" @@ -4228,6 +4247,9 @@ msgstr "directori de git" msgid "separate git dir from working tree" msgstr "separa el directori de git de l'arbre de treball" +msgid "specify the reference format to use" +msgstr "especifiqueu el format de referència a usar" + msgid "key=value" msgstr "clau=valor" @@ -4347,11 +4369,9 @@ msgstr "Hi ha massa arguments." msgid "You must specify a repository to clone." msgstr "Heu d'especificar un repositori per a clonar." -msgid "" -"--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-" -"exclude" -msgstr "" -"--bundle-uri és incompatible amb --depth, --shallow-since i --shallow-exclude" +#, c-format +msgid "unknown ref storage format '%s'" +msgstr "el format d'emmagatzematge de referència «%s» és desconegut" #, c-format msgid "repository '%s' does not exist" @@ -4481,14 +4501,14 @@ msgid "" "--stdin-commits]\n" " [--changed-paths] [--[no-]max-new-filters ] [--" "[no-]progress]\n" -" " +" " msgstr "" "git commit-graph write [--object-dir ] [--append]\n" " [--split[=]] [--reachable | --stdin-packs | " "--stdin-commits]\n" " [--changed-paths] [--[no-]max-new-filters ] [--" "[no-]progress]\n" -" " +" " msgid "dir" msgstr "directori" @@ -5007,6 +5027,7 @@ msgstr "reusa el missatge de la comissió especificada" #. TRANSLATORS: Leave "[(amend|reword):]" as-is, #. and only translate . +#. msgid "[(amend|reword):]commit" msgstr "[(amend|reword):]commit" @@ -5544,7 +5565,7 @@ msgstr "No s'ha trobat cap nom, no es pot descriure res." #, c-format msgid "option '%s' and commit-ishes cannot be used together" -msgstr "les opcions «%s» i de comissió no es poden usar juntes" +msgstr "opció «%s» i les de comissió no es poden usar juntes" msgid "" "git diagnose [(-o | --output-directory) ] [(-s | --suffix) ]\n" @@ -6820,6 +6841,7 @@ msgstr "s'ha especificat un nombre de fils no vàlid (%d) per a %s" #. TRANSLATORS: %s is the configuration #. variable for tweaking threads, currently #. grep.threads +#. #, c-format msgid "no threads support, ignoring %s" msgstr "no s'admeten fils, s'ignorarà %s" @@ -6828,6 +6850,10 @@ msgstr "no s'admeten fils, s'ignorarà %s" msgid "unable to read tree (%s)" msgstr "no s'ha pogut llegir l'arbre (%s)" +#, c-format +msgid "unable to read tree %s" +msgstr "no s'ha pogut llegir l'arbre %s" + #, c-format msgid "unable to grep from object of type %s" msgstr "no es pot fer grep des d'un objecte de tipus %s" @@ -7246,10 +7272,6 @@ msgstr "hi ha una inconsistència seriosa d'inflació" msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "S'HA TROBAT UNA COL·LISIÓ SHA1 AMB %s !" -#, c-format -msgid "unable to read %s" -msgstr "no s'ha pogut llegir %s" - #, c-format msgid "cannot read existing object info %s" msgstr "no es pot llegir la informació d'objecte existent %s" @@ -7390,11 +7412,13 @@ msgstr "error fsck als objectes del paquet" msgid "" "git init [-q | --quiet] [--bare] [--template=]\n" " [--separate-git-dir ] [--object-format=]\n" +" [--ref-format=]\n" " [-b | --initial-branch=]\n" " [--shared[=]] []" msgstr "" "git init [-q | --quiet] [--bare] [--template=]\n" " [--separate-git-dir ] [--object-format=]\n" +" [--ref-format=]\n" " [-b | --initial-branch=]\n" " [--shared[=]] []" @@ -8110,6 +8134,12 @@ msgstr "" "git merge-file [] [-L [-L [-L ]]] " " " +msgid "" +"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " +"\"histogram\"" +msgstr "" +"l'opció diff-algorithm accepta «myers», «minimal», «patience» i «histogram»" + msgid "send results to standard output" msgstr "envia els resultats a la sortida estàndard" @@ -8131,6 +8161,12 @@ msgstr "en conflictes, usa la seva versió" msgid "for conflicts, use a union version" msgstr "en conflictes, usa una versió d'unió" +msgid "" +msgstr "" + +msgid "choose a diff algorithm" +msgstr "trieu un algorisme per al diff" + msgid "for conflicts, use this marker size" msgstr "en conflictes, usa aquesta mida de marcador" @@ -8221,9 +8257,6 @@ msgstr "--trivial-merge és incompatible amb totes les altres opcions" msgid "unknown strategy option: -X%s" msgstr "opció d'estratègia desconeguda: -X%s" -msgid "--merge-base is incompatible with --stdin" -msgstr "--merge-base és incompatible amb --stdin" - #, c-format msgid "malformed input line: '%s'." msgstr "línia d'entrada mal formada: «%s»." @@ -8856,6 +8889,7 @@ msgstr "s'ha produït un error en copiar les notes de «%s» a «%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 "s'està refusant %s les notes en %s (fora de refs/notes/)" @@ -9165,6 +9199,10 @@ msgstr "S'estan comprimint els objectes" msgid "inconsistency with delta count" msgstr "inconsistència amb el comptador de diferències" +#, c-format +msgid "invalid pack.allowPackReuse value: '%s'" +msgstr "valor pack.allowPackReuse value no vàlid: «%s»" + #, c-format msgid "" "value of uploadpack.blobpackfileuri must be of the form ' (delta %), reused % (delta %), pack-" -"reused %" +"reused % (from %)" msgstr "" "Total % (% diferències), reusats % (% " -"diferències), paquets reusats %" +"diferències), paquets reusats % (de %)" msgid "" "'git pack-redundant' is nominated for removal.\n" @@ -10397,13 +10435,6 @@ msgstr "" msgid "switch `C' expects a numerical value" msgstr "«switch» «c» espera un valor numèric" -msgid "" -"apply options are incompatible with rebase.autoSquash. Consider adding --no-" -"autosquash" -msgstr "" -"les opcions «apply» són incompatibles amb rebase.autoSquash. Considereu " -"afegir-hi --no-autosquash" - msgid "" "apply options are incompatible with rebase.rebaseMerges. Consider adding --" "no-rebase-merges" @@ -10922,6 +10953,7 @@ msgstr "(sense URL)" #. TRANSLATORS: the colon ':' should align #. with the one in " Fetch URL: %s" #. translation. +#. #, c-format msgid " Push URL: %s" msgstr " URL de pujada: %s" @@ -11414,6 +11446,77 @@ msgstr "--convert-graft-file arguments" msgid "only one pattern can be given with -l" msgstr "només es pot especificar un patró amb -l" +msgid "need some commits to replay" +msgstr "calen algunes comissions per tornar a reproduir" + +msgid "--onto and --advance are incompatible" +msgstr "--onto i --advance són incompatibles" + +msgid "all positive revisions given must be references" +msgstr "totes les revisions positives que s'han donat han de ser referències" + +msgid "argument to --advance must be a reference" +msgstr "l'argument per a --advance ha de ser una referència" + +msgid "" +"cannot advance target with multiple sources because ordering would be ill-" +"defined" +msgstr "" +"no es pot avançar l'objectiu amb múltiples fonts perquè l'ordenació no " +"estaria definida correctament" + +msgid "" +"cannot implicitly determine whether this is an --advance or --onto operation" +msgstr "" +"no es pot determinar implícitament si aquesta és una operació --advance o --" +"onto" + +msgid "" +"cannot advance target with multiple source branches because ordering would " +"be ill-defined" +msgstr "" +"no es pot avançar l'objectiu amb múltiples branques d'origen perquè " +"l'ordenació no estaria definida correctament" + +msgid "cannot implicitly determine correct base for --onto" +msgstr "no es pot determinar implícitament la base correcta per a --onto" + +msgid "" +"(EXPERIMENTAL!) git replay ([--contained] --onto | --advance " +") ..." +msgstr "" +"(EXPERIMENTAL!) git replay ([--contained] --onto | --advance " +") ..." + +msgid "make replay advance given branch" +msgstr "fes avançar la repetició de la branca donada" + +msgid "replay onto given commit" +msgstr "torna a reproduir a la comissió donada" + +msgid "advance all branches contained in revision-range" +msgstr "avança totes les branques contingudes a l'interval de revisions" + +msgid "option --onto or --advance is mandatory" +msgstr "l'opció --onto o --advance és obligatòria" + +#, c-format +msgid "" +"some rev walking options will be overridden as '%s' bit in 'struct rev_info' " +"will be forced" +msgstr "" +"algunes opcions de referència se sobreescriuran de forma forçada com a «%s» " +"bits a «struct rev_info»" + +msgid "error preparing revisions" +msgstr "s'ha produït un error en preparar les revisions" + +msgid "replaying down to root commit is not supported yet!" +msgstr "encara no s'admet la reproducció cap avall en una comissió arrel" + +msgid "replaying merge commits is not supported yet!" +msgstr "encara no s'admet la repetició de les comissió de fusió" + msgid "" "git rerere [clear | forget ... | diff | status | remaining | gc]" msgstr "" @@ -11622,15 +11725,6 @@ msgstr "--prefix requereix un argument" msgid "unknown mode for --abbrev-ref: %s" msgstr "mode desconegut per a --abbrev-ref: %s" -msgid "--exclude-hidden cannot be used together with --branches" -msgstr "--exclude-hidden no es pot utilitzar juntament amb --branches" - -msgid "--exclude-hidden cannot be used together with --tags" -msgstr "--exclude-hidden no es pot utilitzar juntament amb --tags" - -msgid "--exclude-hidden cannot be used together with --remotes" -msgstr "--exclude-hidden no es pot utilitzar juntament amb --remotes" - msgid "this operation must be run in a work tree" msgstr "aquesta operació s'ha d'executar en un arbre de treball" @@ -12040,10 +12134,6 @@ msgstr "no imprimeixis els resultats a stdout (útil amb --verify)" msgid "show refs from stdin that aren't in local repository" msgstr "mostra les referències de stdin que no siguin en el repositori local" -#, c-format -msgid "only one of '%s', '%s' or '%s' can be given" -msgstr "només es poden donar les opcions «%s», «%s», o «%s»" - msgid "" "git sparse-checkout (init | list | set | add | reapply | disable | check-" "rules) []" @@ -13519,28 +13609,28 @@ msgstr "No hi ha cap branca d'origen possible, inferint «--orphan»" #, c-format msgid "" -"If you meant to create a worktree containing a new orphan branch\n" +"If you meant to create a worktree containing a new unborn branch\n" "(branch with no commits) for this repository, you can do so\n" "using the --orphan flag:\n" "\n" " git worktree add --orphan -b %s %s\n" msgstr "" -"Si voleu crear un arbre de treball que contingui una branca orfe nova\n" -"(branca sense comissions) per a aquest repositori, podeu fer-ho\n" +"Si voleu crear un arbre de treball que contingui una branca no nascuda\n" +"nova (branca sense comissions) per a aquest repositori, podeu fer-ho\n" "utilitzant l'argument --orphan:\n" "\n" " git worktree add --orphan -b %s %s\n" #, c-format msgid "" -"If you meant to create a worktree containing a new orphan branch\n" +"If you meant to create a worktree containing a new unborn branch\n" "(branch with no commits) for this repository, you can do so\n" "using the --orphan flag:\n" "\n" " git worktree add --orphan %s\n" msgstr "" -"Si voleu crear un arbre de treball que contingui una branca orfe nova\n" -"(branca sense comissions) per a aquest repositori, podeu fer-ho\n" +"Si voleu crear un arbre de treball que contingui una branca no nascuda\n" +"nova (branca sense comissions) per a aquest repositori, podeu fer-ho\n" "utilitzant l'argument --orphan:\n" "\n" " git worktree add --orphan %s\n" @@ -13602,6 +13692,10 @@ msgstr "no s'ha pogut crear directori de «%s»" msgid "initializing" msgstr "s'està inicialitzant" +#, c-format +msgid "could not find created worktree '%s'" +msgstr "no s'ha pogut trobar l'arbre de treball creat «%s»" + #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "S'està preparant l'arbre de treball (branca nova «%s»)" @@ -13641,10 +13735,6 @@ msgstr "" "No hi ha referències locals o remotes malgrat hi existeix almenys un\n" "remot, aturada; useu «add -f» per a anul·lar o obtenir primer un remot" -#, c-format -msgid "'%s' and '%s' cannot be used together" -msgstr "les opcions «%s» i «%s» no es poden usar juntes" - msgid "checkout even if already checked out in other worktree" msgstr "agafa encara que sigui agafada en altre arbre de treball" @@ -13654,8 +13744,8 @@ msgstr "crea una branca nova" msgid "create or reset a branch" msgstr "crea o restableix una branca" -msgid "create unborn/orphaned branch" -msgstr "crea una branca no nascuda/òrfena" +msgid "create unborn branch" +msgstr "crea una branca no nascuda" msgid "populate the new working tree" msgstr "emplena l'arbre de treball nou" @@ -13679,11 +13769,8 @@ msgid "options '%s', '%s', and '%s' cannot be used together" msgstr "les opcions «%s», «%s», i «%s» no es poden usar juntes" #, c-format -msgid "options '%s', and '%s' cannot be used together" -msgstr "les opcions «%s» i «%s» no es poden usar juntes" - -msgid "" -msgstr "" +msgid "option '%s' and commit-ish cannot be used together" +msgstr "opció «%s» i les de comissió no es poden usar juntes" msgid "added with --lock" msgstr "afegit amb --lock" @@ -14313,6 +14400,11 @@ msgstr "Empaqueta els objectes desempaquetats en un repositori" msgid "Create, list, delete refs to replace objects" msgstr "Crea, llista i esborra referències per a substituir objectes" +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" + msgid "Generates a summary of pending changes" msgstr "Genera un resum dels canvis pendents" @@ -14554,6 +14646,35 @@ msgstr "Una eina per a gestionar dipòsits Git grans" msgid "commit-graph file is too small" msgstr "el fitxer del graf de comissions és massa petit" +msgid "commit-graph oid fanout chunk is wrong size" +msgstr "" +"el fragment de «fanout» de l'oid del graf de comissions és de mida incorrecta" + +msgid "commit-graph fanout values out of order" +msgstr "valors de graf de comissions de «fanout» estan fora d'ordre" + +msgid "commit-graph OID lookup chunk is the wrong size" +msgstr "el fragment de cerca OID és de mida incorrecta" + +msgid "commit-graph commit data chunk is wrong size" +msgstr "el fragment de dades del graf de comissions és de mida incorrecta" + +msgid "commit-graph generations chunk is wrong size" +msgstr "" +"el fragment de les generacions del graf de comissions és de mida incorrecta" + +msgid "commit-graph changed-path index chunk is too small" +msgstr "" +"el fragment d'índex del canvi del camí del graf de comissions és massa petit" + +#, c-format +msgid "" +"ignoring too-small changed-path chunk (% < %) in commit-" +"graph file" +msgstr "" +"s'ignorarà un fragment massa petit de camí canviat (% < %) " +"al fitxer del graf de comissions" + #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "" @@ -14573,6 +14694,20 @@ msgid "commit-graph file is too small to hold %u chunks" msgstr "" "el fitxer del graf de comissions és massa petit per a guardar %u fragments" +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 " +"comissions" + +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" + +msgid "commit-graph required commit data chunk missing or corrupted" +msgstr "" +"manca o està corromput el fragment de dades de publicació requerit al graf " +"de comissions" + msgid "commit-graph has no base graphs chunk" msgstr "el fragment del graf de comissions no té grafs de base" @@ -14586,6 +14721,9 @@ msgstr "la cadena del graf de comissions no coincideix" msgid "commit count in base graph too high: %" msgstr "el nombre de comissions en el graf base és massa alt: %" +msgid "commit-graph chain file too small" +msgstr "el fitxer de cadena del graf de comissions és massa petit" + #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "" @@ -14613,6 +14751,9 @@ msgstr "" "les dades de generació de desbordament del graf de comissions són massa " "petites" +msgid "commit-graph extra-edges pointer out of bounds" +msgstr "punter de vores extra del graf de comissió està fora dels límits" + msgid "Loading known commits in commit graph" msgstr "S'estan carregant comissions conegudes al graf de comissions" @@ -15785,6 +15926,10 @@ msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" "Valor desconegut de la variable de configuració de «diff.submodule»: «%s»" +#, c-format +msgid "unknown value for config '%s': %s" +msgstr "valor desconegut per al config «%s»': %s" + #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -15862,12 +16007,6 @@ msgstr "argument --color-moved incorrecte: %s" msgid "invalid mode '%s' in --color-moved-ws" msgstr "mode «%s» no vàlid en --color-moved-ws" -msgid "" -"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " -"\"histogram\"" -msgstr "" -"l'opció diff-algorithm accepta «myers», «minimal», «patience» i «histogram»" - #, c-format msgid "invalid argument to %s" msgstr "argument no vàlid a %s" @@ -15912,8 +16051,8 @@ msgstr "llegible per una màquina --stat" msgid "output only the last line of --stat" msgstr "mostra només l'última línia de --stat" -msgid "..." -msgstr "..." +msgid ",..." +msgstr ",..." msgid "" "output the distribution of relative amount of changes for each sub-directory" @@ -15924,8 +16063,8 @@ msgstr "" msgid "synonym for --dirstat=cumulative" msgstr "sinònim de --dirstat=cumulative" -msgid "synonym for --dirstat=files,param1,param2..." -msgstr "sinònim de --dirstat=files,param1,param2..." +msgid "synonym for --dirstat=files,,..." +msgstr "sinònim de --dirstat=files,,..." msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" @@ -16108,12 +16247,6 @@ msgstr "genera diff usant l'algorisme «patience diff»" msgid "generate diff using the \"histogram diff\" algorithm" msgstr "genera diff usant l'algorisme «histogram diff»" -msgid "" -msgstr "" - -msgid "choose a diff algorithm" -msgstr "trieu un algorisme per al diff" - msgid "" msgstr "" @@ -16499,12 +16632,14 @@ msgstr "s'ha produït un error en processar els acks: %d" #. TRANSLATORS: The parameter will be 'ready', a protocol #. keyword. +#. #, c-format msgid "expected packfile to be sent after '%s'" msgstr "s'esperava que el fitxer de paquet s'enviés després de «%s»" #. TRANSLATORS: The parameter will be 'ready', a protocol #. keyword. +#. #, c-format msgid "expected no other sections to be sent after no '%s'" msgstr "no s'esperava que cap altra secció s'enviés després de «%s»" @@ -17322,6 +17457,7 @@ 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" @@ -17356,6 +17492,7 @@ 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 "" @@ -17616,6 +17753,12 @@ msgstr "s'ha produït un error en llegir la memòria cau" msgid "multi-pack-index OID fanout is of the wrong size" msgstr "l'OID «fanout» de l'índex multipaquet és d'una mida incorrecta" +#, c-format +msgid "" +"oid fanout out of order: fanout[%d] = % > % = fanout[%d]" +msgstr "" +"oid «fanout» desordenat: fanout[%d] = % > % = fanout[%d]" + msgid "multi-pack-index OID lookup chunk is the wrong size" msgstr "El fragment de cerca OID índex multipaquet és de mida incorrecta" @@ -17676,6 +17819,13 @@ msgstr "" msgid "bad pack-int-id: %u (%u total packs)" msgstr "pack-int-id: %u incorrecte (%u paquets en total)" +msgid "MIDX does not contain the BTMP chunk" +msgstr "MIDX no conté el fragment BTMP" + +#, c-format +msgid "could not load bitmapped pack %" +msgstr "no s'ha pogut carregar el paquet amb bits %" + msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "" "l'índex multipaquet emmagatzema un desplaçament de 64 bits, però off_t és " @@ -17764,11 +17914,6 @@ msgstr "suma de verificació incorrecta" msgid "Looking for referenced packfiles" msgstr "S'estan cercant fitxers empaquetats referenciats" -#, c-format -msgid "" -"oid fanout out of order: fanout[%d] = % > % = fanout[%d]" -msgstr "oid fanout desordenat: fanout[%d] = % > % = fanout[%d]" - msgid "the midx contains no oid" msgstr "el midx no conté cap oid" @@ -17851,6 +17996,7 @@ msgstr "S'està refusant reescriure les notes en %s (fora 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 "Valor erroni de %s: «%s»" @@ -18069,6 +18215,7 @@ msgstr "no s'han pogut desempaquetar els continguts 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 [objecte incorrecte]" @@ -18077,6 +18224,7 @@ msgstr "%s [objecte incorrecte]" #. object output. E.g.: #. * #. "deadbeef commit 2021-01-01 - Some Commit Message" +#. #, c-format msgid "%s commit %s - %s" msgstr "%s comissió %s - %s" @@ -18091,6 +18239,7 @@ msgstr "%s comissió %s - %s" #. * #. The third argument is the "tag" string #. from object.c. +#. #, c-format msgid "%s tag %s - %s" msgstr "%s etiqueta %s - %s" @@ -18100,18 +18249,21 @@ msgstr "%s etiqueta %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 [etiqueta malmesa, no s'ha pogut analitzar]" #. TRANSLATORS: This is a line of ambiguous #. object output. E.g. "deadbeef tree". +#. #, c-format msgid "%s tree" msgstr "arbre %s" #. TRANSLATORS: This is a line of ambiguous #. object output. E.g. "deadbeef blob". +#. #, c-format msgid "%s blob" msgstr "blob %s" @@ -18123,6 +18275,7 @@ msgstr "l'id d'objecte curt %s és 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" @@ -18292,6 +18445,9 @@ msgstr "falta l'índex invers necessari al mapa de bits multipaquet" msgid "could not open pack %s" msgstr "no s'ha pogut obrir el paquet %s" +msgid "could not determine MIDX preferred pack" +msgstr "no s'ha pogut determinar el paquet preferit MIDX" + #, c-format msgid "preferred pack (%s) is invalid" msgstr "el paquet preferit (%s) no és vàlid" @@ -18317,6 +18473,12 @@ msgstr "" "mapa de bits ewah malmès: capçalera truncada per al mapa de bits de la " "comissió «%s»" +#, c-format +msgid "unable to load pack: '%s', disabling pack-reuse" +msgstr "" +"no s'ha pogut carregar el paquet: «%s», s'està inhabilitant lareutilització " +"de paquets" + #, c-format msgid "object '%s' not found in type bitmaps" msgstr "no s'ha trobat l'objecte «%s» als tipus de mapes de bits" @@ -18410,6 +18572,9 @@ msgid "multi-pack-index reverse-index chunk is the wrong size" msgstr "" "el fragment de l'index invers de l'índex multipaquet és de mida incorrecta" +msgid "could not determine preferred pack" +msgstr "no s'ha pogut determinar el paquet preferit" + msgid "cannot both write and verify reverse index" msgstr "no es pot escriure i verificar l'índex invers" @@ -18474,10 +18639,6 @@ msgstr "%s no és disponible" msgid "%s expects a non-negative integer value with an optional k/m/g suffix" msgstr "%s espera un valor enter no negatiu amb un sufix opcional k/m/g" -#, c-format -msgid "%s is incompatible with %s" -msgstr "%s és incompatible amb %s" - #, c-format msgid "ambiguous option: %s (could be --%s%s or --%s%s)" msgstr "opció ambigua: %s (pot ser --%s%s o --%s%s)" @@ -18514,6 +18675,7 @@ msgstr "ús: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. +#. #, c-format msgid " or: %s" msgstr " o: %s" @@ -18536,6 +18698,7 @@ msgstr " o: %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" @@ -18798,10 +18961,6 @@ msgstr "no es pot llegir indexar el fitxer «%s»" msgid "unable to add '%s' to index" msgstr "no s'ha pogut afegir «%s» a l'índex" -#, c-format -msgid "unable to stat '%s'" -msgstr "no s'ha pogut fer «stat» a «%s»" - #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "«%s» apareix com a fitxer i com a directori" @@ -19383,10 +19542,6 @@ msgstr "«%s» existeix; no es pot crear «%s»" msgid "cannot process '%s' and '%s' at the same time" msgstr "no es poden processar «%s» i «%s» a la vegada" -#, c-format -msgid "could not remove reference %s" -msgstr "no s'ha pogut eliminar la referència %s" - #, c-format msgid "could not delete reference %s: %s" msgstr "no s'ha pogut suprimir la referència %s: %s" @@ -19570,6 +19725,7 @@ msgstr "" #. TRANSLATORS: "matches '%s'%" is the part of "git push #. :" push, and "being pushed ('%s')" is #. the . +#. #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -19610,7 +19766,7 @@ msgid "" "'%s:refs/tags/%s'?" msgstr "" "La part de l'especificació de la referència és un objecte d'etiqueta.\n" -"Voleu crear una etiqueta pujant-la a «%srefs/tags/%s»?" +"Voleu crear una etiqueta pujant-la a «%s:refs/tags/%s»?" #, c-format msgid "" @@ -19619,7 +19775,7 @@ msgid "" "'%s:refs/tags/%s'?" msgstr "" "La part de l'especificació de la referència és un objecte d'arbre.\n" -"Voleu crear una etiqueta pujant-la a «%srefs/tags/%s»?" +"Voleu crear una etiqueta pujant-la a «%s:refs/tags/%s»?" #, c-format msgid "" @@ -20203,6 +20359,7 @@ msgstr "cometeu els vostres canvis o feu un «stash» per a procedir." #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase". +#. #, c-format msgid "%s: Unable to write new index file" msgstr "%s: No s'ha pogut escriure un fitxer d'índex nou" @@ -20762,6 +20919,9 @@ msgid "Autostash exists; creating a new stash entry." msgstr "" "El «stash» automàtic ja existeix; s'està creant una entrada «stash» nova." +msgid "autostash reference is a symref" +msgstr "la referència d'autostash és un symref" + msgid "could not detach HEAD" msgstr "no s'ha pogut separar HEAD" @@ -21005,7 +21165,8 @@ 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 "" -"no és un repositori de git (ni cap pare fins al punt de muntatge %s)\n" +"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)." @@ -21077,6 +21238,10 @@ msgstr "no s'estan copiant plantilles de «%s»: %s" msgid "invalid initial branch name: '%s'" msgstr "nom de branca inicial no vàlid: «%s»" +#, c-format +msgid "re-init: ignored --initial-branch=%s" +msgstr "reinicialització: s'ha ignorat --initial-branch=%s" + #, c-format msgid "unable to handle file type %d" msgstr "no s'ha pogut gestionar el tipus de fitxer %d" @@ -21088,14 +21253,16 @@ msgstr "no s'ha pogut moure %s a %s" msgid "attempt to reinitialize repository with different hash" msgstr "s'ha intentat reinicialitzar el repositori amb un resum diferent" +msgid "" +"attempt to reinitialize repository with different reference storage format" +msgstr "" +"s'ha intentat reactivar el repositori amb un format d'emmagatzematge de " +"referència diferent" + #, c-format msgid "%s already exists" msgstr "%s ja existeix" -#, c-format -msgid "re-init: ignored --initial-branch=%s" -msgstr "reinicialització: s'ha ignorat --initial-branch=%s" - #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "S'ha reinicialitzat el repositori compartit existent del Git en %s%s\n" @@ -21365,12 +21532,6 @@ msgid "number of entries in the cache tree to invalidate (default 0)" msgstr "" "nombre d'entrades a l'arbre de la memòria cau a invalidar (per defecte 0)" -msgid "unhandled options" -msgstr "opcions no gestionades" - -msgid "error preparing revisions" -msgstr "s'ha produït un error en preparar les revisions" - #, c-format msgid "commit %s is not marked reachable" msgstr "la comissió %s no està marcada com abastable" @@ -21523,9 +21684,6 @@ msgstr "el protocol no permet establir el camí del servei remot" msgid "invalid remote service path" msgstr "el camí del servei remot no és vàlid" -msgid "operation not supported by protocol" -msgstr "opció no admesa pel protocol" - #, c-format msgid "can't connect to subservice %s" msgstr "no es pot connectar al subservei %s" @@ -21657,10 +21815,6 @@ msgid "support for protocol v2 not implemented yet" msgstr "" "encara no s'ha implementat la compatibilitat amb la versió v2 del protocol" -#, c-format -msgid "unknown value for config '%s': %s" -msgstr "valor desconegut per al config «%s»': %s" - #, c-format msgid "transport '%s' not allowed" msgstr "no es permet el transport «%s»" @@ -21714,6 +21868,9 @@ msgid "could not retrieve server-advertised bundle-uri list" msgstr "" "no s'ha pogut recuperar la llista de paquets d'URI anunciats pel servidor" +msgid "operation not supported by protocol" +msgstr "opció no admesa pel protocol" + msgid "too-short tree object" msgstr "objecte d'arbre massa curt" @@ -22555,6 +22712,10 @@ msgstr "addicionalment, el vostre índex conté canvis sense cometre." msgid "cannot %s: Your index contains uncommitted changes." msgstr "no es pot %s: El vostre índex conté canvis sense cometre." +#, c-format +msgid "unknown style '%s' given for '%s'" +msgstr "estil desconegut «%s» donat per a «%s»" + msgid "" "Error: Your local changes to the following files would be overwritten by " "merge" @@ -22950,64 +23111,3 @@ msgstr "S'està ometent %s amb el sufix de còpia de seguretat «%s».\n" #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Esteu segur que voleu enviar %s? [y|N]: " - -#, c-format -#~ msgid "options '%s=%s' and '%s=%s' cannot be used together" -#~ msgstr "les opcions «%s=%s» i «%s=%s» no es poden usar juntes" - -#, c-format -#~ msgid "%s : incompatible with something else" -#~ msgstr "%s: és incompatible amb alguna altra cosa" - -#~ msgid "Could not write patch" -#~ msgstr "No s'ha pogut escriure el pedaç" - -#, c-format -#~ msgid "Could not stat '%s'" -#~ msgstr "No s'ha pogut fer stat a «%s»" - -#, c-format -#~ msgid "Cannot delete branch '%s' checked out at '%s'" -#~ msgstr "No es pot suprimir la branca «%s» agafada a «%s»" - -#~ msgid "unable to write new_index file" -#~ msgstr "no s'ha pogut escriure el fitxer new_index" - -#~ msgid "do not apply config rules" -#~ msgstr "no apliquis les regles de configuració" - -#~ msgid "join whitespace-continued values" -#~ msgstr "uneix els valors continus amb espais en blanc" - -#~ msgid "set parsing options" -#~ msgstr "estableix les opcions d'anàlisi" - -#~ msgid "cannot move directory over file" -#~ msgstr "no es pot moure un directori sobre un fitxer" - -#~ msgid "cannot use --filter without --stdout" -#~ msgstr "no es pot utilitzar --filter sense --stdout" - -#~ msgid "cannot use --max-pack-size with --cruft" -#~ msgstr "no es pot usar --max-pack-size amb --cruft" - -#~ msgid "--strategy requires --merge or --interactive" -#~ msgstr "--strategy requereix --merge o --interactive" - -#, c-format -#~ msgid "" -#~ "commit-graph has generation number zero for commit %s, but non-zero " -#~ "elsewhere" -#~ msgstr "" -#~ "el graf de comissions té nombre de generació zero per a la comissió %s, " -#~ "però té no zero en altres llocs" - -#~ msgid "--merge-base only works with commits" -#~ msgstr "--merge-base només funciona amb comissions" - -#~ msgid "scalar clone [] [--] []" -#~ msgstr "scalar clone [] [--] []" - -#, c-format -#~ msgid "could not rename '%s' to '%s'" -#~ msgstr "no s'ha pogut canviar el nom «%s» a «%s»" -- cgit 1.2.3-korg From 20657a8b43844cbb9f2d17f44a1d3938ef8dbf63 Mon Sep 17 00:00:00 2001 From: Peter Krefting Date: Fri, 16 Feb 2024 07:59:21 +0100 Subject: l10n: sv.po: Update Swedish translation Signed-off-by: Peter Krefting --- po/sv.po | 358 ++++++++++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 238 insertions(+), 120 deletions(-) diff --git a/po/sv.po b/po/sv.po index cd2a86a4a5..786c2f749e 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,14 +1,14 @@ # Swedish translations for Git. -# Copyright (C) 2010-2023 Peter Krefting +# Copyright (C) 2010-2024 Peter Krefting # This file is distributed under the same license as the Git package. -# Peter Krefting , 2010-2023. +# Peter Krefting , 2010-2024. # msgid "" msgstr "" -"Project-Id-Version: git 2.43.0\n" +"Project-Id-Version: git 2.44.0\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2023-11-09 14:12+0100\n" -"PO-Revision-Date: 2023-11-09 14:28+0100\n" +"POT-Creation-Date: 2024-02-16 07:58+0100\n" +"PO-Revision-Date: 2024-02-16 07:59+0100\n" "Last-Translator: Peter Krefting \n" "Language-Team: Svenska \n" "Language: sv\n" @@ -1417,6 +1417,10 @@ msgstr "flaggan ”%s” kräver ”%s”" msgid "Unexpected option --output" msgstr "Oväntad flagga --output" +#, c-format +msgid "extra command line parameter '%s'" +msgstr "falsk konfigureringsparameter: ”%s”" + #, c-format msgid "Unknown archive format '%s'" msgstr "Okänt arkivformat ”%s”" @@ -1462,6 +1466,14 @@ msgstr "ignorerar allt för stor gitattributes-objekt ”%s”" msgid "bad --attr-source or GIT_ATTR_SOURCE" msgstr "felaktig --attr-source eller GIT_ATTR_SOURCE" +#, c-format +msgid "unable to stat '%s'" +msgstr "kan inte ta status på ”%s”" + +#, c-format +msgid "unable to read %s" +msgstr "kunde inte läsa %s" + #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Felaktigt citerat innehåll i filen ”%s”: %s" @@ -2582,7 +2594,7 @@ msgid "do not show object names of boundary commits (Default: off)" msgstr "visa inte objektnamn för gränsincheckningar (Standard: av)" msgid "do not treat root commits as boundaries (Default: off)" -msgstr "vehandla inte rotincheckningar som gränser (Standard: av)" +msgstr "behandla inte rotincheckningar som gränser (Standard: av)" msgid "show work cost statistics" msgstr "visa statistik över arbetskostnad" @@ -2734,12 +2746,12 @@ msgid "couldn't look up commit object for '%s'" msgstr "kunde inte slå upp incheckningsobjekt för ”%s”" #, c-format -msgid "" -"the branch '%s' is not fully merged.\n" -"If you are sure you want to delete it, run 'git branch -D %s'" -msgstr "" -"grenen ”%s” har inte slagits samman i sin helhet.\n" -"Om du är säker på att du vill ta bort den, kör ”git branch -D %s”" +msgid "the branch '%s' is not fully merged" +msgstr "grenen ”%s” har inte slagits samman i sin helhet" + +#, c-format +msgid "If you are sure you want to delete it, run 'git branch -D %s'" +msgstr "Om du är säker på att du vill ta bort den, kör ”git branch -D %s”" msgid "update of config-file failed" msgstr "misslyckades uppdatera konfigurationsfil" @@ -3772,8 +3784,8 @@ msgstr "tvinga utcheckning (kasta bort lokala ändringar)" msgid "new-branch" msgstr "ny-gren" -msgid "new unparented branch" -msgstr "ny gren utan förälder" +msgid "new unborn branch" +msgstr "ny ofödd gren" msgid "update ignored files (default)" msgstr "uppdatera ignorerade filer (standard)" @@ -4023,9 +4035,6 @@ msgstr "" "clean.requireForce har standardvärdet true och varken -i, -n eller -f " "angavs; vägrar städa" -msgid "-x and -X cannot be used together" -msgstr "-x och -X kan inte användas samtidigt" - msgid "git clone [] [--] []" msgstr "git clone [] [--] []" @@ -4113,6 +4122,9 @@ msgstr "gitkat" msgid "separate git dir from working tree" msgstr "separera gitkatalogen från arbetskatalogen" +msgid "specify the reference format to use" +msgstr "använd referensformatet som ska användas" + msgid "key=value" msgstr "nyckel=värde" @@ -4228,12 +4240,9 @@ msgstr "För många argument." msgid "You must specify a repository to clone." msgstr "Du måste ange ett arkiv att klona." -msgid "" -"--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-" -"exclude" -msgstr "" -"--bundle-uri är inkompatibelt med --depth, --shallow-since och --shallow-" -"exclude" +#, c-format +msgid "unknown ref storage format '%s'" +msgstr "okänt format för lagring av referenser ”%s”" #, c-format msgid "repository '%s' does not exist" @@ -4361,7 +4370,7 @@ msgid "" "--stdin-commits]\n" " [--changed-paths] [--[no-]max-new-filters ] [--" "[no-]progress]\n" -" " +" " msgstr "" "git commit-graph write [--object-dir ] [--append]\n" " [--split[=]] [--reachable | --stdin-packs | " @@ -6674,6 +6683,10 @@ msgstr "trådstöd saknas, ignorerar %s" msgid "unable to read tree (%s)" msgstr "kunde inte läsa träd (%s)" +#, c-format +msgid "unable to read tree %s" +msgstr "kunde inte läsa trädet %s" + #, c-format msgid "unable to grep from object of type %s" msgstr "kunde inte ”grep” från objekt av typen %s" @@ -7080,10 +7093,6 @@ msgstr "allvarlig inflate-inkonsekvens" msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !" -#, c-format -msgid "unable to read %s" -msgstr "kunde inte läsa %s" - #, c-format msgid "cannot read existing object info %s" msgstr "kan inte läsa information om befintligt objekt %s" @@ -7224,11 +7233,13 @@ msgstr "fsck-fel i packat objekt" msgid "" "git init [-q | --quiet] [--bare] [--template=]\n" " [--separate-git-dir ] [--object-format=]\n" +" [--ref-format=]\n" " [-b | --initial-branch=]\n" " [--shared[=]] []" msgstr "" "git init [-q | --quiet] [--bare] [--template=]\n" " [--separate-git-dir ] [--object-format=]\n" +" [--ref-format=]\n" " [-b | --initial-branch=]\n" " [--shared[=]] []" @@ -7927,6 +7938,12 @@ msgstr "" "git merge-file [] [-L [-L [-L ]]] " " " +msgid "" +"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " +"\"histogram\"" +msgstr "" +"flaggan diff-algorithm godtar ”myers”, ”minimal”, ”patience” och ”histogram”" + msgid "send results to standard output" msgstr "sänd resultat till standard ut" @@ -7948,6 +7965,12 @@ msgstr "för konflikter, använd deras version" msgid "for conflicts, use a union version" msgstr "för konflikter, använd en förenad version" +msgid "" +msgstr "" + +msgid "choose a diff algorithm" +msgstr "välj en diff-algoritm" + msgid "for conflicts, use this marker size" msgstr "för konflikter, använd denna markörstorlek" @@ -8038,9 +8061,6 @@ msgstr "--trivial-merge är inkompatibelt med andra flaggor" msgid "unknown strategy option: -X%s" msgstr "okänd strategiflagga: -X%s" -msgid "--merge-base is incompatible with --stdin" -msgstr "--merge-base är inkompatibel med --stdin" - #, c-format msgid "malformed input line: '%s'." msgstr "felaktig indatarad: ”%s”." @@ -8966,6 +8986,10 @@ msgstr "Komprimerar objekt" msgid "inconsistency with delta count" msgstr "deltaräknaren är inkonsekvent" +#, c-format +msgid "invalid pack.allowPackReuse value: '%s'" +msgstr "felaktigt värde för pack.allowPackReuse: ”%s”" + #, c-format msgid "" "value of uploadpack.blobpackfileuri must be of the form ' (delta %), reused % (delta %), pack-" -"reused %" +"reused % (from %)" msgstr "" "Totalt % (delta %), återanvände % (delta %), " -"paket-återanvända %" +"paket-återanvända % (från %)" msgid "" "'git pack-redundant' is nominated for removal.\n" @@ -10175,13 +10199,6 @@ msgstr "" msgid "switch `C' expects a numerical value" msgstr "flaggan ”C” förväntar ett numeriskt värde" -msgid "" -"apply options are incompatible with rebase.autoSquash. Consider adding --no-" -"autosquash" -msgstr "" -"argument för ”apply” är inkompatibla med rebase.autoSquash. Överväg att " -"lägga till --no-autosquash" - msgid "" "apply options are incompatible with rebase.rebaseMerges. Consider adding --" "no-rebase-merges" @@ -11167,6 +11184,76 @@ msgstr "--convert-graft-file tar inga argument" msgid "only one pattern can be given with -l" msgstr "endast ett mönster kan anges med -l" +msgid "need some commits to replay" +msgstr "behöver några incheckningar för omspelning" + +msgid "--onto and --advance are incompatible" +msgstr "--onto och --advance kan inte kombineras" + +msgid "all positive revisions given must be references" +msgstr "alla positiva revisioner som anges måste vara referenser" + +msgid "argument to --advance must be a reference" +msgstr "argumentet till --advance måste vara en referens" + +msgid "" +"cannot advance target with multiple sources because ordering would be ill-" +"defined" +msgstr "" +"kan inte flytta målet framåt när det finns flera källor eftersom ordningen " +"inte kan fastställas" + +msgid "" +"cannot implicitly determine whether this is an --advance or --onto operation" +msgstr "" +"kan inte avgöra om den underförstådda processen är --advance eller --onto" + +msgid "" +"cannot advance target with multiple source branches because ordering would " +"be ill-defined" +msgstr "" +"kan inte flytta målet framåt när det finns flera källgrenar eftersom " +"ordningen inte kan fastställas" + +msgid "cannot implicitly determine correct base for --onto" +msgstr "kan inte avgöra den underförstådda basen för --onto" + +msgid "" +"(EXPERIMENTAL!) git replay ([--contained] --onto | --advance " +") ..." +msgstr "" +"(EXPERIMENTELLT!) git replay ([--contained] --onto | --advance " +") ..." + +msgid "make replay advance given branch" +msgstr "låt omspelningen flytta den givna grenen framåt" + +msgid "replay onto given commit" +msgstr "spela om ovanpå en given incheckning" + +msgid "advance all branches contained in revision-range" +msgstr "flytta alla grenar som finns i revisionsintervallet framåt" + +msgid "option --onto or --advance is mandatory" +msgstr "flaggan --onto eller --advance måste anges" + +#, c-format +msgid "" +"some rev walking options will be overridden as '%s' bit in 'struct rev_info' " +"will be forced" +msgstr "" +"några flaggor för revisionstraversering kommer överstyras eftersom ”%s”-" +"biten i ”struct rev_info” kommer att tvingas" + +msgid "error preparing revisions" +msgstr "fel när revisioner skulle förberedas" + +msgid "replaying down to root commit is not supported yet!" +msgstr "kan ännu inte spela om hela vägen ned till rotincheckningen!" + +msgid "replaying merge commits is not supported yet!" +msgstr "kan ännu inte spela om sammanslagningsincheckningar!" + msgid "" "git rerere [clear | forget ... | diff | status | remaining | gc]" msgstr "" @@ -11373,15 +11460,6 @@ msgstr "--prefix kräver ett argument" msgid "unknown mode for --abbrev-ref: %s" msgstr "okänt läge för --abbrev-ref: %s" -msgid "--exclude-hidden cannot be used together with --branches" -msgstr "--exclude-hidden kan endast användas tillsammans med --branches" - -msgid "--exclude-hidden cannot be used together with --tags" -msgstr "--exclude-hidden kan kan inte användas tillsammans med --tags" - -msgid "--exclude-hidden cannot be used together with --remotes" -msgstr "--exclude-hidden kan kan inte användas tillsammans med --remotes" - msgid "this operation must be run in a work tree" msgstr "funktionen måste köras i en arbetskatalog" @@ -11784,10 +11862,6 @@ msgstr "visa inte resultat på standard ut (användbart med --verify)" msgid "show refs from stdin that aren't in local repository" msgstr "visa referenser från standard in som inte finns i lokalt arkiv" -#, c-format -msgid "only one of '%s', '%s' or '%s' can be given" -msgstr "endast en av ”%s”, ”%s” och ”%s” kan anges" - msgid "" "git sparse-checkout (init | list | set | add | reapply | disable | check-" "rules) []" @@ -13232,13 +13306,13 @@ msgstr "Ingen möjlig källgren, använder ”--orphan”" #, c-format msgid "" -"If you meant to create a worktree containing a new orphan branch\n" +"If you meant to create a worktree containing a new unborn branch\n" "(branch with no commits) for this repository, you can do so\n" "using the --orphan flag:\n" "\n" " git worktree add --orphan -b %s %s\n" msgstr "" -"Om meningen var att skapa en arbetskatalog från en ny föräldrals\n" +"Om meningen var att skapa en arbetskatalog från en ny ofödd\n" "gren (gren utan incheckningar) för det här arkivet kan du göra\n" "det med flaggan --orphan:\n" "\n" @@ -13246,13 +13320,13 @@ msgstr "" #, c-format msgid "" -"If you meant to create a worktree containing a new orphan branch\n" +"If you meant to create a worktree containing a new unborn branch\n" "(branch with no commits) for this repository, you can do so\n" "using the --orphan flag:\n" "\n" " git worktree add --orphan %s\n" msgstr "" -"Om meningen var att skapa en arbetskatalog från en ny föräldrals\n" +"Om meningen var att skapa en arbetskatalog från en ny ofödd\n" "gren (gren utan incheckningar) för det här arkivet kan du göra\n" "det med flaggan --orphan:\n" "\n" @@ -13314,6 +13388,10 @@ msgstr "kunde inte skapa katalogen ”%s”" msgid "initializing" msgstr "initierar" +#, c-format +msgid "could not find created worktree '%s'" +msgstr "kunde inte hitta den skapade arbetskatalogen ”%s”" + #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Förbereder arbetskatalog (ny gren ”%s”)" @@ -13352,10 +13430,6 @@ msgstr "" "finns, avslutar; använd ”add -f” för att överstyra eller hämta från en fjärr " "först" -#, c-format -msgid "'%s' and '%s' cannot be used together" -msgstr "”%s” och ”%s” kan inte användas samtidigt" - msgid "checkout even if already checked out in other worktree" msgstr "" "checka ut även om den redan är utcheckad i en annan arbetskatalog" @@ -13366,8 +13440,8 @@ msgstr "skapa en ny gren" msgid "create or reset a branch" msgstr "skapa eller återställ en gren" -msgid "create unborn/orphaned branch" -msgstr "skapa en ofödd/övergiven gren" +msgid "create unborn branch" +msgstr "skapa en ofödd gren" msgid "populate the new working tree" msgstr "befolka den nya arbetskatalogen" @@ -13389,11 +13463,8 @@ msgid "options '%s', '%s', and '%s' cannot be used together" msgstr "flaggorna ”%s”, ”%s” och ”%s” kan inte användas samtidigt" #, c-format -msgid "options '%s', and '%s' cannot be used together" -msgstr "flaggorna ”%s” och ”%s” kan inte användas samtidigt" - -msgid "" -msgstr "" +msgid "option '%s' and commit-ish cannot be used together" +msgstr "flaggorna ”%s” och incheckning-igt kan inte användas samtidigt" msgid "added with --lock" msgstr "lagt till med --lock" @@ -14006,6 +14077,11 @@ msgstr "Packa opackade objekt i ett arkiv" msgid "Create, list, delete refs to replace objects" msgstr "Skapa, visa, ta bort referenser för att ersätta objekt" +msgid "EXPERIMENTAL: Replay commits on a new base, works with bare repos too" +msgstr "" +"EXPERIMENTELLT: Spela om incheckningar ovanpå en ny bas, fungerar även med " +"nakna arkiv" + msgid "Generates a summary of pending changes" msgstr "Skapar en sammanfattning av väntande ändringar" @@ -14243,6 +14319,32 @@ msgstr "Verktyg för att hantera stora Git-arkiv" msgid "commit-graph file is too small" msgstr "incheckningsgraffilen %s är för liten" +msgid "commit-graph oid fanout chunk is wrong size" +msgstr "incheckningsgrafens oid-utbredningsstycke har fel storlek" + +msgid "commit-graph fanout values out of order" +msgstr "incheckningsgrafens utbredningsvärden är i fel ordning" + +msgid "commit-graph OID lookup chunk is the wrong size" +msgstr "incheckningsgrafens OID-uppslagningsstycket har fel storlek" + +msgid "commit-graph commit data chunk is wrong size" +msgstr "incheckningsgrafens incheckningsdatastycke har fel storlek" + +msgid "commit-graph generations chunk is wrong size" +msgstr "incheckningsgrafens generationsstycke har fel storlek" + +msgid "commit-graph changed-path index chunk is too small" +msgstr "incheckningsgrafens ändrade-sökvägar-indexstycke är förö litet" + +#, c-format +msgid "" +"ignoring too-small changed-path chunk (% < %) in commit-" +"graph file" +msgstr "" +"ignorerar för litet ändrade-sökvägar-stycke (% < %) i " +"incheckningsgraffilen" + #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "incheckningsgrafens signatur %X stämmer inte med signaturen %X" @@ -14259,6 +14361,18 @@ msgstr "incheckningsgrafens hashversion %X stämmer inte med versionen %X" msgid "commit-graph file is too small to hold %u chunks" msgstr "incheckningsgraffilen är för liten för att innehålla %u stycken" +msgid "commit-graph required OID fanout chunk missing or corrupted" +msgstr "" +"incheckningsgrafens nödvändiga OID-utbredningsstycke saknas eller är trasigt" + +msgid "commit-graph required OID lookup chunk missing or corrupted" +msgstr "" +"incheckningsgrafens nödvändiga OID-uppslagningsstycke saknas eller är trasigt" + +msgid "commit-graph required commit data chunk missing or corrupted" +msgstr "" +"incheckningsgrafens nödvändiga incheckningsdatastycke saknas eller är trasigt" + msgid "commit-graph has no base graphs chunk" msgstr "incheckningsgrafen har inga bas-graf-stycken" @@ -14272,6 +14386,9 @@ msgstr "incheckningsgrafens kedja stämmer inte" msgid "commit count in base graph too high: %" msgstr "antalet incheckningar i basgrafen för högt: %" +msgid "commit-graph chain file too small" +msgstr "incheckningsgrafens kedjefil är för liten" + #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "ogiltig incheckingsgrafkedja: rad ”%s” är inte ett hash-värde" @@ -14292,6 +14409,9 @@ msgstr "incheckningsgraf kräver spillgenerationsdata, men har ingen" msgid "commit-graph overflow generation data is too small" msgstr "incheckningsgrafens spillgenerationsdata är för liten" +msgid "commit-graph extra-edges pointer out of bounds" +msgstr "incheckningsgrafens extra-kant-pekare är utanför intervallet" + msgid "Loading known commits in commit graph" msgstr "Läser in kända incheckningar i incheckningsgraf" @@ -15430,6 +15550,10 @@ msgstr "" msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Okänt värde för konfigurationsvariabeln ”diff.submodule”: ”%s”" +#, c-format +msgid "unknown value for config '%s': %s" +msgstr "okänt värde för inställningen ”%s”: %s" + #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -15509,12 +15633,6 @@ msgstr "felaktigt argument till --color-moved: %s" msgid "invalid mode '%s' in --color-moved-ws" msgstr "ogiltigt läge %s” i --color-moved-ws" -msgid "" -"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " -"\"histogram\"" -msgstr "" -"flaggan diff-algorithm godtar ”myers”, ”minimal”, ”patience” och ”histogram”" - #, c-format msgid "invalid argument to %s" msgstr "ogiltigt argument för %s" @@ -15558,8 +15676,8 @@ msgstr "maskinläsbar --stat" msgid "output only the last line of --stat" msgstr "skriv bara ut den sista raden för --stat" -msgid "..." -msgstr "..." +msgid ",..." +msgstr ",..." msgid "" "output the distribution of relative amount of changes for each sub-directory" @@ -15569,8 +15687,8 @@ msgstr "" msgid "synonym for --dirstat=cumulative" msgstr "synonym för --dirstat=cumulative" -msgid "synonym for --dirstat=files,param1,param2..." -msgstr "synonym för --dirstat=filer,param1,param2..." +msgid "synonym for --dirstat=files,,..." +msgstr "synonym för --dirstat=filer,,..." msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "varna om ändringar introducerar konfliktmarkörer eller blankstegsfel" @@ -15744,12 +15862,6 @@ msgstr "skapa diffar med algoritmen ”patience diff”" msgid "generate diff using the \"histogram diff\" algorithm" msgstr "skapa diffar med algoritmen ”histogram diff”" -msgid "" -msgstr "" - -msgid "choose a diff algorithm" -msgstr "välj en diff-algoritm" - msgid "" msgstr "" @@ -17220,6 +17332,12 @@ msgstr "misslyckades läsa cachen" msgid "multi-pack-index OID fanout is of the wrong size" msgstr "OID-utbredning för multi-pack-index har fel storlek" +#, c-format +msgid "" +"oid fanout out of order: fanout[%d] = % > % = fanout[%d]" +msgstr "" +"oid-utbredning i fel ordning: fanout[%d] = % > % = fanout[%d]" + msgid "multi-pack-index OID lookup chunk is the wrong size" msgstr "OID-uppslagningsstycket för multi-pack-index har fel storlek" @@ -17270,6 +17388,13 @@ msgstr "paketnamn för multi-pack-index i fel ordning: ”%s” före ”%s”" msgid "bad pack-int-id: %u (%u total packs)" msgstr "bad pack-int-id: %u (%u paket totalt)" +msgid "MIDX does not contain the BTMP chunk" +msgstr "MIDX innehåller inte BTMP-stycket" + +#, c-format +msgid "could not load bitmapped pack %" +msgstr "kunde inte läsa det bitmappade paketet %" + msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "multi-pack-index innehåller 64-bitars offset, men off_t är för liten" @@ -17353,12 +17478,6 @@ msgstr "felaktig kontrollsumma" msgid "Looking for referenced packfiles" msgstr "Ser efter refererade packfiler" -#, c-format -msgid "" -"oid fanout out of order: fanout[%d] = % > % = fanout[%d]" -msgstr "" -"oid-utbredning i fel ordning: fanout[%d] = % > % = fanout[%d]" - msgid "the midx contains no oid" msgstr "midx saknar oid" @@ -17875,6 +17994,9 @@ msgstr "flerpaketsbitkarta saknar nödvändigt omvänt index" msgid "could not open pack %s" msgstr "kunde inte öppna paketfilen %s" +msgid "could not determine MIDX preferred pack" +msgstr "kunde inte bestämma det föredragna MIDX-paketet" + #, c-format msgid "preferred pack (%s) is invalid" msgstr "föredragen paketfil (%s) är ogiltig" @@ -17894,6 +18016,10 @@ msgstr "" msgid "corrupt ewah bitmap: truncated header for bitmap of commit \"%s\"" msgstr "trasig ewah-bitkarta: avhugget huvud för bitkarta för incheckning ”%s”" +#, c-format +msgid "unable to load pack: '%s', disabling pack-reuse" +msgstr "kunde inte läsa paketet: ”%s”, inaktiverar återanvändning av paket" + #, c-format msgid "object '%s' not found in type bitmaps" msgstr "objektet ”%s” hittades inte i typbitkartor" @@ -17985,6 +18111,9 @@ msgstr "ogiltig rev-indexposition vid %: % != %" msgid "multi-pack-index reverse-index chunk is the wrong size" msgstr "baklängesindex-stycke för multi-pack-index har fel storlek" +msgid "could not determine preferred pack" +msgstr "kunde inte bestämma föredraget paket" + msgid "cannot both write and verify reverse index" msgstr "kan inte både skriva och bekräfta reverse-index" @@ -18047,10 +18176,6 @@ msgstr "%s är inte tillgängligt" msgid "%s expects a non-negative integer value with an optional k/m/g suffix" msgstr "%s förväntar ett icke-negativt heltalsvärde, med valfritt k/m/g-suffix" -#, c-format -msgid "%s is incompatible with %s" -msgstr "%s är inkompatibel med %s" - #, c-format msgid "ambiguous option: %s (could be --%s%s or --%s%s)" msgstr "tvetydig flagga: %s (kan vara --%s%s eller --%s%s)" @@ -18364,10 +18489,6 @@ msgstr "kan inte indexera filen ”%s”" msgid "unable to add '%s' to index" msgstr "kan inte lägga till ”%s” till indexet" -#, c-format -msgid "unable to stat '%s'" -msgstr "kan inte ta status på ”%s”" - #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "”%s” finns både som en fil och en katalog" @@ -18940,10 +19061,6 @@ msgstr "”%s” finns; kan inte skapa ”%s”" msgid "cannot process '%s' and '%s' at the same time" msgstr "kan inte hantera ”%s” och ”%s” samtidigt" -#, c-format -msgid "could not remove reference %s" -msgstr "kunde inte ta bort referensen %s" - #, c-format msgid "could not delete reference %s: %s" msgstr "kunde inte ta bort referensen %s: %s" @@ -19138,7 +19255,7 @@ msgstr "" "- Se efter en referens som motsvarar ”%s” på fjärrsidan.\n" "- Se om som sänds (”%s”)\n" " är en referens i ”refs/{heads,tags}/”. Om så lägger vi till\n" -" motsvarande refs/{heads,tags}/-prefix på fjärrsidan.\n" +" motsvarande ”refs/{heads,tags}/”-prefix på fjärrsidan.\n" "\n" "Inget av dem fungerade, så vi gav upp. Ange fullständig referens." @@ -20299,6 +20416,9 @@ 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" + msgid "could not detach HEAD" msgstr "kunde inte koppla från HEAD" @@ -20610,6 +20730,10 @@ msgstr "kopierade inte mallar från ”%s”: %s" msgid "invalid initial branch name: '%s'" msgstr "ogiltigt namn på första gren: ”%s”" +#, c-format +msgid "re-init: ignored --initial-branch=%s" +msgstr "re-init: ignorerade --initial-branch=%s" + #, c-format msgid "unable to handle file type %d" msgstr "kan inte hantera filtyp %d" @@ -20621,14 +20745,14 @@ msgstr "kan inte flytta %s till %s" msgid "attempt to reinitialize repository with different hash" msgstr "försöker initiera arkivet på nytt med annan hash" +msgid "" +"attempt to reinitialize repository with different reference storage format" +msgstr "försöker initiera arkivet på nytt med annat referenslagringsformat" + #, c-format msgid "%s already exists" msgstr "%s finns redan" -#, c-format -msgid "re-init: ignored --initial-branch=%s" -msgstr "re-init: ignorerade --initial-branch=%s" - #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "Ominitierade befintligt delat Git-arkiv i %s%s\n" @@ -20893,12 +21017,6 @@ msgstr "töm cacheträdet före varje iteration" msgid "number of entries in the cache tree to invalidate (default 0)" msgstr "antal poster i cacheträdet att ogiltigförklara (förval är 0)" -msgid "unhandled options" -msgstr "flaggor som inte hanterats" - -msgid "error preparing revisions" -msgstr "fel när revisioner skulle förberedas" - #, c-format msgid "commit %s is not marked reachable" msgstr "incheckning %s är inte märkt nåbar" @@ -21054,9 +21172,6 @@ msgstr "protkollet stöder inte att sätta sökväg till fjärrtjänst" msgid "invalid remote service path" msgstr "felaktig sökväg till fjärrtjänst" -msgid "operation not supported by protocol" -msgstr "funktionen stöds inte av protokollet" - #, c-format msgid "can't connect to subservice %s" msgstr "kan inte ansluta till undertjänsten %s" @@ -21186,10 +21301,6 @@ msgstr "kunde inte tolka inställningen för transport.color.*" msgid "support for protocol v2 not implemented yet" msgstr "stöd för protokoll v2 ännu ej implementerat" -#, c-format -msgid "unknown value for config '%s': %s" -msgstr "okänt värde för inställningen ”%s”: %s" - #, c-format msgid "transport '%s' not allowed" msgstr "transporten ”%s” tillåts inte" @@ -21243,6 +21354,9 @@ msgstr "bundle-uri-funktionen stöds inte av protokollet" msgid "could not retrieve server-advertised bundle-uri list" msgstr "kunde inte hämta bundle-uri-listan som servern annonserade" +msgid "operation not supported by protocol" +msgstr "funktionen stöds inte av protokollet" + msgid "too-short tree object" msgstr "trädobjekt för kort" @@ -22066,6 +22180,10 @@ msgstr "dessutom innehåller dit index ändringar som inte har checkats in." msgid "cannot %s: Your index contains uncommitted changes." msgstr "kan inte %s: Ditt index innehåller ändringar som inte checkats in." +#, c-format +msgid "unknown style '%s' given for '%s'" +msgstr "okänd stil ”%s” angavs för ”%s”" + msgid "" "Error: Your local changes to the following files would be overwritten by " "merge" -- cgit 1.2.3-korg From 330e4198b8b11b856806a8cdc3d54789eb92df80 Mon Sep 17 00:00:00 2001 From: Alexander Shopov Date: Sun, 11 Feb 2024 14:41:40 +0100 Subject: l10n: bg.po: Updated Bulgarian translation (5610t) Signed-off-by: Alexander Shopov --- po/bg.po | 391 +++++++++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 266 insertions(+), 125 deletions(-) diff --git a/po/bg.po b/po/bg.po index a3fc5b74d8..6b95addef4 100644 --- a/po/bg.po +++ b/po/bg.po @@ -1,7 +1,7 @@ # Bulgarian translation of git po-file. -# Copyright (C) 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 Alexander Shopov . +# Copyright (C) 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024 Alexander Shopov . # This file is distributed under the same license as the git package. -# Alexander Shopov , 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023. +# Alexander Shopov , 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024. # ======================== # DICTIONARY TO MERGE IN GIT GUI # ------------------------ @@ -141,6 +141,8 @@ # midx, multi-pack index - файл с индекса за множество пакети # overlay mode - припокриващ режим (при изтеглянe) # incremental file нарастващ файл +# commit-graph граф с подавания +# commit-graph chain верига на гра̀фа с подавания # split (commit-graphr) раздробен (граф с подавания) # clobber (a tag) презаписвам (етикет) # blame извеждане на авторство @@ -207,6 +209,15 @@ # master/main branch основен клон # unborn/orphan branch неродѐн клон (а не несъздаден) - клон без никакви подавания, включително и началното # parse анализ, анализирам +# reinitialize repository зануляване на хранилището и инициализиране +# replay изпълняване/прилагане наново +# BTMP chunk откъс за побитова маска +# OID fanout chunk откъс за разпределянето +# OID lookup chunk откъс за търсенето +# autostash автоматично скатано +# symref файл с указател (regular file that stores a string that begins with ref: refs/) +# +# # # ------------------------ # „$var“ - може да не сработва за shell има gettext и eval_gettext - проверка - намират се лесно по „$ @@ -233,10 +244,10 @@ # for i in `sort -u FILES`; do cnt=`grep $i FILES | wc -l`; echo $cnt $i ;done | sort -n msgid "" msgstr "" -"Project-Id-Version: git 2.43\n" +"Project-Id-Version: git 2.44\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2023-11-17 15:49+0100\n" -"PO-Revision-Date: 2023-11-18 13:23+0100\n" +"POT-Creation-Date: 2024-02-16 09:33+0100\n" +"PO-Revision-Date: 2024-02-16 09:38+0100\n" "Last-Translator: Alexander Shopov \n" "Language-Team: Bulgarian \n" "Language: bg\n" @@ -1690,6 +1701,10 @@ msgstr "опцията „%s“ изисква „%s“" msgid "Unexpected option --output" msgstr "Неочаквана опция „--output“" +#, c-format +msgid "extra command line parameter '%s'" +msgstr "излишна опция или стойност на командния ред: „%s“" + #, c-format msgid "Unknown archive format '%s'" msgstr "Непознат формат на архив: „%s“" @@ -1737,6 +1752,14 @@ msgstr "" "неправилна стойност за опцията „--attr-source“ или променливата " "„GIT_ATTR_SOURCE“" +#, c-format +msgid "unable to stat '%s'" +msgstr "„stat“ не може да се изпълни върху „%s“" + +#, c-format +msgid "unable to read %s" +msgstr "обектът „%s“ не може да бъде прочетен" + #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Неправилно цитирано съдържание във файла „%s“: %s" @@ -3074,12 +3097,13 @@ msgid "couldn't look up commit object for '%s'" msgstr "обектът-подаване за „%s“ не може да се открие" #, c-format -msgid "" -"the branch '%s' is not fully merged.\n" -"If you are sure you want to delete it, run 'git branch -D %s'" +msgid "the branch '%s' is not fully merged" +msgstr "клонът „%s“ не е слят напълно" + +#, c-format +msgid "If you are sure you want to delete it, run 'git branch -D %s'" msgstr "" -"клонът „%s“ не е слят напълно. Ако сте сигурни, че искате\n" -"да го изтриете, изпълнете:\n" +"Ако сте сигурни, че искате да го изтриете, изпълнете:\n" "\n" " git branch -D %s" @@ -3126,7 +3150,7 @@ msgstr "подаването, сочено от указателя „HEAD“, #, c-format msgid "HEAD (%s) points outside of refs/heads/" -msgstr "„HEAD“ (%s) сочи извън директорията „refs/heads“" +msgstr "„HEAD“ (%s) сочи извън директорията „refs/heads/“" #, c-format msgid "branch %s is being rebased at %s" @@ -4138,8 +4162,8 @@ msgstr "принудително изтегляне (вашите промѐн msgid "new-branch" msgstr "НОВ_КЛОН" -msgid "new unparented branch" -msgstr "нов клон без родител" +msgid "new unborn branch" +msgstr "нов неродѐн клон" msgid "update ignored files (default)" msgstr "обновяване на игнорираните файлове (стандартно)" @@ -4392,9 +4416,6 @@ msgstr "" "което изисква някоя от опциите „-i“, „-n“ или „-f“. Няма да се извърши " "изчистване" -msgid "-x and -X cannot be used together" -msgstr "опциите „-x“ и „-X“ са несъвместими" - msgid "git clone [] [--] []" msgstr "git clone [ОПЦИЯ…] [--] ХРАНИЛИЩЕ [ДИРЕКТОРИЯ]" @@ -4486,6 +4507,9 @@ msgstr "СЛУЖЕБНА_ДИРЕКТОРИЯ" msgid "separate git dir from working tree" msgstr "отделна СЛУЖЕБНА_ДИРЕКТОРИЯ за git извън работното дърво" +msgid "specify the reference format to use" +msgstr "указване на форма̀та за указател" + msgid "key=value" msgstr "КЛЮЧ=СТОЙНОСТ" @@ -4613,12 +4637,9 @@ msgstr "Прекалено много аргументи." msgid "You must specify a repository to clone." msgstr "Трябва да укажете кое хранилище искате да клонирате." -msgid "" -"--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-" -"exclude" -msgstr "" -"опцията „--bundle-uri“ е несъвместима с „--depth“, „--shallow-since“ и „--" -"shallow-exclude“" +#, c-format +msgid "unknown ref storage format '%s'" +msgstr "непознат формат на съхранение: „%s“" #, c-format msgid "repository '%s' does not exist" @@ -4756,7 +4777,7 @@ msgid "" "--stdin-commits]\n" " [--changed-paths] [--[no-]max-new-filters ] [--" "[no-]progress]\n" -" " +" " msgstr "" "git commit-graph write [--object-dir ДИРЕКТОРИЯ] [--append]\n" " [--split[=СТРАТЕГИЯ]] [--reachable|--stdin-packs|--" @@ -7144,6 +7165,10 @@ msgstr "липсва поддръжка за нишки. „%s“ ще се п msgid "unable to read tree (%s)" msgstr "дървото не може да бъде прочетено (%s)" +#, c-format +msgid "unable to read tree %s" +msgstr "дървото не може да бъде прочетено: %s" + #, c-format msgid "unable to grep from object of type %s" msgstr "не може да се изпълни „grep“ от обект от вида %s" @@ -7565,10 +7590,6 @@ msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "" "СЪВПАДЕНИЕ НА СТОЙНОСТИТЕ ЗА СУМИТЕ ЗА SHA1: „%s“ НА ДВА РАЗЛИЧНИ ОБЕКТА!" -#, c-format -msgid "unable to read %s" -msgstr "обектът „%s“ не може да бъде прочетен" - #, c-format msgid "cannot read existing object info %s" msgstr "съществуващият обект в „%s“ не може да бъде прочетен" @@ -7711,6 +7732,7 @@ msgstr "грешка при проверка с „fsck“ на пакетнит msgid "" "git init [-q | --quiet] [--bare] [--template=]\n" " [--separate-git-dir ] [--object-format=]\n" +" [--ref-format=]\n" " [-b | --initial-branch=]\n" " [--shared[=]] []" msgstr "" @@ -8449,6 +8471,14 @@ msgstr "" "git merge-file [ОПЦИЯ…] [-L ИМЕ_1 [-L ОРИГИНАЛ [-L ИМЕ_2]]] ФАЙЛ_1 ОРИГ_ФАЙЛ " "ФАЙЛ_2" +msgid "" +"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " +"\"histogram\"" +msgstr "" +"опцията приема следните варианти за алгоритъм за разлики: „myers“ (по " +"Майерс), „minimal“ (минимизиране на разликите), „patience“ (пасианс) и " +"„histogram“ (хистограмен)" + msgid "send results to standard output" msgstr "извеждане на резултатите на стандартния изход" @@ -8470,6 +8500,12 @@ msgstr "при конфликти да се ползва чуждата верс msgid "for conflicts, use a union version" msgstr "при конфликти да се ползва обединена версия" +msgid "" +msgstr "АЛГОРИТЪМ" + +msgid "choose a diff algorithm" +msgstr "избор на АЛГОРИТЪМа за разлики" + msgid "for conflicts, use this marker size" msgstr "при конфликти да се ползва маркер с такъв БРОЙ знаци" @@ -8561,9 +8597,6 @@ msgstr "„--trivial-merge“ е несъвместима с другите оп msgid "unknown strategy option: -X%s" msgstr "непозната опция за стратегия: -X%s" -msgid "--merge-base is incompatible with --stdin" -msgstr "опциите „--merge-base“ и „--stdin“ са несъвместими" - #, c-format msgid "malformed input line: '%s'." msgstr "входен ред с неправилен формат: „%s“." @@ -8606,7 +8639,7 @@ msgstr "(псевдоним на „--stat“)" msgid "add (at most ) entries from shortlog to merge commit message" msgstr "" "добавяне (на максимум такъв БРОЙ) записи от съкратения журнал в съобщението " -"за подаване" +"за подаване със сливане" msgid "create a single commit instead of doing a merge" msgstr "създаване на едно подаване вместо извършване на сливане" @@ -9522,6 +9555,11 @@ msgstr "Компресиране на обектите" msgid "inconsistency with delta count" msgstr "неправилен брой разлики" +#, c-format +msgid "invalid pack.allowPackReuse value: '%s'" +msgstr "" +"неправилна стойност за преизползването на пакети „pack.allowPackReuse“: „%s“" + #, c-format msgid "" "value of uploadpack.blobpackfileuri must be of the form ' (delta %), reused % (delta %), pack-" -"reused %" +"reused % (from %)" msgstr "" "Общо: % (разлики: %), преизползвани: % (разлики: " -"%), преизползвани при пакетиране: %" +"%), преизползвани при пакетиране: % (от %)" msgid "" "'git pack-redundant' is nominated for removal.\n" @@ -10791,13 +10829,6 @@ msgstr "" msgid "switch `C' expects a numerical value" msgstr "опцията „C“ очаква число за аргумент" -msgid "" -"apply options are incompatible with rebase.autoSquash. Consider adding --no-" -"autosquash" -msgstr "" -"опциите за прилагане са несъвместими с „rebase.autoSquash“. Пробвайте да " -"добавите опцията „--no-autosquash“" - msgid "" "apply options are incompatible with rebase.rebaseMerges. Consider adding --" "no-rebase-merges" @@ -11823,6 +11854,76 @@ msgstr "опцията „--convert-graft-file“ не приема аргуме msgid "only one pattern can be given with -l" msgstr "опцията „-l“ приема точно един шаблон" +msgid "need some commits to replay" +msgstr "необходимо е да има подавания за прилагане отново" + +msgid "--onto and --advance are incompatible" +msgstr "опциите „--onto“ и „--advance“ са несъвместими" + +msgid "all positive revisions given must be references" +msgstr "всички зададени положителни версии трябва да са указатели" + +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“" + +msgid "" +"cannot advance target with multiple source branches because ordering would " +"be ill-defined" +msgstr "" +"цели с множество клони-източници не може да се придвижат напред, защото " +"подредбата не е добре дефинирана" + +msgid "cannot implicitly determine correct base for --onto" +msgstr "правилната база за „--onto“ не може да се определи" + +msgid "" +"(EXPERIMENTAL!) git replay ([--contained] --onto | --advance " +") ..." +msgstr "" +"(ЕКСПЕРИМЕНТАЛНО!) git replay ([--contained] --onto НОВА_БАЗА | --advance " +"КЛОН) ДИАПАЗОН_ПОДАВАНИЯ…" + +msgid "make replay advance given branch" +msgstr "прилагането наново придвижва дадения КЛОН напред" + +msgid "replay onto given commit" +msgstr "прилагането наново върху даденото ПОДАВАНЕ" + +msgid "advance all branches contained in revision-range" +msgstr "придвижване на всички КЛОНи в ДИАПАЗОНа_ПОДАВАНИЯ" + +msgid "option --onto or --advance is mandatory" +msgstr "изисква се някоя от опциите „--onto“ или „--advance“" + +#, c-format +msgid "" +"some rev walking options will be overridden as '%s' bit in 'struct rev_info' " +"will be forced" +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 "не се поддържа прилагане наново и на подавания със сливане!" + msgid "" "git rerere [clear | forget ... | diff | status | remaining | gc]" msgstr "git rerere [clear|forget ПЪТ…|diff|status|remaining|gc]" @@ -12030,15 +12131,6 @@ msgstr "опцията „--prefix“ изисква аргумент" msgid "unknown mode for --abbrev-ref: %s" msgstr "непознат режим за „--abbrev-ref“: „%s“" -msgid "--exclude-hidden cannot be used together with --branches" -msgstr "опциите „--exclude-hidden“ и „--branches“ са несъвместими" - -msgid "--exclude-hidden cannot be used together with --tags" -msgstr "опциите „--exclude-hidden“ и „--tags“ са несъвместими" - -msgid "--exclude-hidden cannot be used together with --remotes" -msgstr "опциите „--exclude-hidden“ и „--remotes“ са несъвместими" - msgid "this operation must be run in a work tree" msgstr "тази команда трябва да се изпълни в работно дърво" @@ -12242,7 +12334,7 @@ msgid "git shortlog [] [] [[--] ...]" msgstr "git shortlog [ОПЦИЯ…] [ДИАПАЗОН_НА_ВЕРСИИТЕ] [[--] [ПЪТ…]]" msgid "git log --pretty=short | git shortlog []" -msgstr "git log --pretty=short|git shortlog [ОПЦИЯ…]" +msgstr "git log --pretty=short | git shortlog [ОПЦИЯ…]" msgid "using multiple --group options with stdin is not supported" msgstr "повече от една опции „--group“ са несъвместими със стандартния вход" @@ -12455,10 +12547,6 @@ msgstr "" "извеждане на указателите приети от стандартния вход, които липсват в " "локалното хранилище" -#, c-format -msgid "only one of '%s', '%s' or '%s' can be given" -msgstr "опциите „%s“, „%s“ и „%s“ са несъвместими" - msgid "" "git sparse-checkout (init | list | set | add | reapply | disable | check-" "rules) []" @@ -13951,7 +14039,7 @@ msgstr "Липсва клон-източник, затова се приема #, c-format msgid "" -"If you meant to create a worktree containing a new orphan branch\n" +"If you meant to create a worktree containing a new unborn branch\n" "(branch with no commits) for this repository, you can do so\n" "using the --orphan flag:\n" "\n" @@ -13965,7 +14053,7 @@ msgstr "" #, c-format msgid "" -"If you meant to create a worktree containing a new orphan branch\n" +"If you meant to create a worktree containing a new unborn branch\n" "(branch with no commits) for this repository, you can do so\n" "using the --orphan flag:\n" "\n" @@ -14034,6 +14122,10 @@ msgstr "директорията „%s“ не може да бъде създа msgid "initializing" msgstr "инициализация" +#, c-format +msgid "could not find created worktree '%s'" +msgstr "създаденото в „%s“ работно дърво липсва" + #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Приготвяне на работното дърво (нов клон „%s“)" @@ -14076,10 +14168,6 @@ msgstr "" "доставете\n" "обектите от отдалеченото хранилище" -#, c-format -msgid "'%s' and '%s' cannot be used together" -msgstr "опциите „%s“ и „%s“ са несъвместими" - msgid "checkout even if already checked out in other worktree" msgstr "Изтегляне КЛОНа, дори и да е изтеглен в друго работно дърво" @@ -14089,7 +14177,7 @@ msgstr "създаване на нов клон" msgid "create or reset a branch" msgstr "създаване или зануляване на клони" -msgid "create unborn/orphaned branch" +msgid "create unborn branch" msgstr "създаване на неродѐн клон" msgid "populate the new working tree" @@ -14112,11 +14200,8 @@ msgid "options '%s', '%s', and '%s' cannot be used together" msgstr "опциите „%s“, „%s“ и „%s“ са несъвместими" #, c-format -msgid "options '%s', and '%s' cannot be used together" -msgstr "опциите „%s“ и „%s“ са несъвместими" - -msgid "" -msgstr "ПОДАВАНЕ" +msgid "option '%s' and commit-ish cannot be used together" +msgstr "опциите „%s“ и указателите към подавания са несъвместими" msgid "added with --lock" msgstr "добавена с „--lock“" @@ -14753,6 +14838,11 @@ msgstr "Пакетиране на непакетираните обекти в msgid "Create, list, delete refs to replace objects" msgstr "Създаване, извеждане, изтриване на указатели за замяна на обекти" +msgid "EXPERIMENTAL: Replay commits on a new base, works with bare repos too" +msgstr "" +"ЕКСПЕРИМЕНТАЛНО: прилагане на подавания върху нова база, работи и с голи " +"хранилища" + msgid "Generates a summary of pending changes" msgstr "Обобщение на предстоящите промѐни" @@ -14991,6 +15081,36 @@ msgstr "Инструмент за управление на големи хра msgid "commit-graph file is too small" msgstr "файлът за гра̀фа с подаванията е твърде малък" +msgid "commit-graph oid fanout chunk is wrong size" +msgstr "откъсът за разпределянето в гра̀фа с подаванията е прекалено малък" + +msgid "commit-graph fanout values out of order" +msgstr "" +"стойностите за откъс за разпределяне в гра̀фа с подаванията не са подредени" + +msgid "commit-graph OID lookup chunk is the wrong size" +msgstr "откъсът за търсенето в гра̀фа с подаванията е прекалено малък" + +msgid "commit-graph commit data chunk is wrong size" +msgstr "" +"откъсът за данните за подаванията в гра̀фа с подаванията е с неправилен размер" + +msgid "commit-graph generations chunk is wrong size" +msgstr "откъсът за поколенията в гра̀фа с подаванията е с неправилен размер" + +msgid "commit-graph changed-path index chunk is too small" +msgstr "" +"откъсът за индекса с промѐни в пътищата в гра̀фа с подаванията е прекалено " +"малък" + +#, c-format +msgid "" +"ignoring too-small changed-path chunk (% < %) in commit-" +"graph file" +msgstr "" +"прескачане на прекалено малък откъс за индекса с промѐни (% < " +"%) в пътищата в гра̀фа с подаванията" + #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "отпечатъкът на гра̀фа с подаванията %X не съвпада с %X" @@ -15007,6 +15127,19 @@ msgstr "версията на контролната сума на гра̀фа msgid "commit-graph file is too small to hold %u chunks" msgstr "файлът с гра̀фа на подаванията е твърде малък, за да съдържа %u откъси" +msgid "commit-graph required OID fanout chunk missing or corrupted" +msgstr "" +"откъсът за разпределянето необходимо на гра̀фа с подаванията липсва или е " +"повреден" + +msgid "commit-graph required OID lookup chunk missing or corrupted" +msgstr "" +"откъсът за търсенето необходимо на гра̀фа с подаванията липсва или е повреден" + +msgid "commit-graph required commit data chunk missing or corrupted" +msgstr "" +"откъсът за данните необходими на гра̀фа с подаванията липсва или е повреден" + msgid "commit-graph has no base graphs chunk" msgstr "базовият откъс липсва в гра̀фа с подаванията" @@ -15020,6 +15153,9 @@ msgstr "веригата на гра̀фа с подаванията не съв msgid "commit count in base graph too high: %" msgstr "броят подавания в основния граф е прекалено голям: %" +msgid "commit-graph chain file too small" +msgstr "веригата на гра̀фа с подаванията е твърде малка" + #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "" @@ -15038,12 +15174,16 @@ msgstr "подаването „%s“ не може да бъде открито msgid "commit-graph requires overflow generation data but has none" msgstr "" -"графът с подаванията изисква генериране на данни за отместването, но такива " -"липсват" +"графът с подаванията изисква данни за прелелите поколения, но такива липсват" msgid "commit-graph overflow generation data is too small" msgstr "прекалено малко данни за прелелите поколения в гра̀фа с подаванията" +msgid "commit-graph extra-edges pointer out of bounds" +msgstr "" +"указателят за допълнителните ребра в гра̀фа с подаванията е извън позволения " +"диапазон" + msgid "Loading known commits in commit graph" msgstr "Зареждане на познатите подавания в гра̀фа с подаванията" @@ -16244,6 +16384,10 @@ msgstr "" msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Непозната стойност „%s“ за настройката „diff.submodule“" +#, c-format +msgid "unknown value for config '%s': %s" +msgstr "непозната стойност за настройката „%s“: „%s“" + #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -16323,14 +16467,6 @@ msgstr "неправилен аргумент за „--color-moved“: „%s“ msgid "invalid mode '%s' in --color-moved-ws" msgstr "неправилен режим „%s“ за „ --color-moved-ws“" -msgid "" -"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " -"\"histogram\"" -msgstr "" -"опцията приема следните варианти за алгоритъм за разлики: „myers“ (по " -"Майерс), „minimal“ (минимизиране на разликите), „patience“ (пасианс) и " -"„histogram“ (хистограмен)" - #, c-format msgid "invalid argument to %s" msgstr "неправилен аргумент към „%s“" @@ -16374,8 +16510,8 @@ msgstr "„--stat“ във формат за четене от програма msgid "output only the last line of --stat" msgstr "извеждане само на последния ред на „--stat“" -msgid "..." -msgstr "ПАРАМЕТЪР_1, ПАРАМЕТЪР_2, …" +msgid ",..." +msgstr "ПАРАМЕТЪР_1,ПАРАМЕТЪР_2,…" msgid "" "output the distribution of relative amount of changes for each sub-directory" @@ -16384,8 +16520,8 @@ msgstr "извеждане на разпределението на промѐ msgid "synonym for --dirstat=cumulative" msgstr "псевдоним на „--dirstat=cumulative“" -msgid "synonym for --dirstat=files,param1,param2..." -msgstr "псевдоним на „--dirstat=ФАЙЛ…,ПАРАМЕТЪР_1,ПАРАМЕТЪР_2,…“" +msgid "synonym for --dirstat=files,,..." +msgstr "псевдоним на „--dirstat=files,ПАРАМЕТЪР_1,ПАРАМЕТЪР_2,…“" msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" @@ -16569,12 +16705,6 @@ msgstr "разлика чрез алгоритъм за подредба кат msgid "generate diff using the \"histogram diff\" algorithm" msgstr "разлика по хистограмния алгоритъм" -msgid "" -msgstr "АЛГОРИТЪМ" - -msgid "choose a diff algorithm" -msgstr "избор на АЛГОРИТЪМа за разлики" - msgid "" msgstr "ТЕКСТ" @@ -18093,6 +18223,13 @@ msgid "multi-pack-index OID fanout is of the wrong size" msgstr "" "неправилен размер на откъса за разпределянето в индекса за множество пакети" +#, c-format +msgid "" +"oid fanout out of order: fanout[%d] = % > % = fanout[%d]" +msgstr "" +"неправилна подредба на откъси (OID fanout): fanout[%d] = % > " +"% = fanout[%d]" + msgid "multi-pack-index OID lookup chunk is the wrong size" msgstr "неправилен размер на откъса за търсенето в индекса за множество пакети" @@ -18149,6 +18286,14 @@ msgid "bad pack-int-id: %u (%u total packs)" msgstr "" "неправилен идентификатор на пакет (pack-int-id): %u (от общо %u пакети)" +msgid "MIDX does not contain the BTMP chunk" +msgstr "" +"липсва откъс за побитова маска във файла за индекса за множество пакети" + +#, c-format +msgid "could not load bitmapped pack %" +msgstr "пакетът за битови маски % не може да се отвори" + msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "" "индексът за множество пакети съдържа 64-битови отмествания, но размерът на " @@ -18241,13 +18386,6 @@ msgstr "неправилна сума за проверка" msgid "Looking for referenced packfiles" msgstr "Търсене на указаните пакетни файлове" -#, c-format -msgid "" -"oid fanout out of order: fanout[%d] = % > % = fanout[%d]" -msgstr "" -"неправилна подредба на откъси (OID fanout): fanout[%d] = % > " -"% = fanout[%d]" - msgid "the midx contains no oid" msgstr "във файла с индекса за множество пакети няма идентификатори на обекти" @@ -18792,6 +18930,11 @@ msgstr "задължителният обратен индекс липсва в msgid "could not open pack %s" msgstr "пакетът „%s“ не може да се отвори" +msgid "could not determine MIDX preferred pack" +msgstr "" +"предпочитаният пакет за файла с индекса за множество пакети не може да се " +"определи" + #, c-format msgid "preferred pack (%s) is invalid" msgstr "предпочитаният пакет „%s“ е неправилен" @@ -18818,6 +18961,11 @@ msgstr "" "повредена битова маска във формат EWAH: отрязана заглавна част за битовата " "маска на подаване „%s“" +#, c-format +msgid "unable to load pack: '%s', disabling pack-reuse" +msgstr "" +"пакетът не може да се зареди: „%s“, преизползването на пакети се изключва" + #, c-format msgid "object '%s' not found in type bitmaps" msgstr "обектът „%s“ липсва в битовата маска на видовете" @@ -18917,6 +19065,9 @@ msgid "multi-pack-index reverse-index chunk is the wrong size" msgstr "" "неправилен размер на откъс за обратен индекс в индекса за множество пакети" +msgid "could not determine preferred pack" +msgstr "предпочитаният пакет не може да се определи" + msgid "cannot both write and verify reverse index" msgstr "обратният индекс не може едновременно да се записва и да се проверява" @@ -18987,10 +19138,6 @@ msgid "%s expects a non-negative integer value with an optional k/m/g suffix" msgstr "" "„%s“ очаква неотрицателно цяло число, евентуално със суфикс „k“/„m“/„g“" -#, c-format -msgid "%s is incompatible with %s" -msgstr "опциите „%s“ и „%s“ са несъвместими" - #, c-format msgid "ambiguous option: %s (could be --%s%s or --%s%s)" msgstr "нееднозначна опция: „%s“ (може да е „--%s%s“ или „--%s%s“)" @@ -19315,10 +19462,6 @@ msgstr "файлът „%s“ не може да бъде индексиран" msgid "unable to add '%s' to index" msgstr "„%s“ не може да се добави в индекса" -#, c-format -msgid "unable to stat '%s'" -msgstr "„stat“ не може да се изпълни върху „%s“" - #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "„%s“ съществува и като файл, и като директория" @@ -19864,7 +20007,7 @@ msgstr "неправилно име на клон: „%s = %s“" #, c-format msgid "ignoring dangling symref %s" -msgstr "игнориране на указател на обект извън клон „%s“" +msgstr "игнориране на файл с указател на обект извън клон „%s“" #, c-format msgid "log for ref %s has gap after %s" @@ -19904,10 +20047,6 @@ msgstr "„%s“ съществува, не може да се създаде msgid "cannot process '%s' and '%s' at the same time" msgstr "невъзможно е едновременно да се обработват „%s“ и „%s“" -#, c-format -msgid "could not remove reference %s" -msgstr "Указателят „%s“ не може да бъде изтрит" - #, c-format msgid "could not delete reference %s: %s" msgstr "Указателят „%s“ не може да бъде изтрит: %s" @@ -21333,6 +21472,9 @@ msgstr "Конфликти при прилагането на автоматич msgid "Autostash exists; creating a new stash entry." msgstr "Вече има запис за автоматично скатано, затова се създава нов запис." +msgid "autostash reference is a symref" +msgstr "указателят за автоматично скатано e файл с указател" + msgid "could not detach HEAD" msgstr "указателят „HEAD“ не може да се отдели" @@ -21656,6 +21798,10 @@ msgstr "шаблоните няма да бъдат копирани от „%s msgid "invalid initial branch name: '%s'" msgstr "неправилно име на първоначалния клон: „%s“" +#, c-format +msgid "re-init: ignored --initial-branch=%s" +msgstr "re-init: „--initial-branch=%s“ се пропуска" + #, c-format msgid "unable to handle file type %d" msgstr "файлове от вид %d не се поддържат" @@ -21666,17 +21812,18 @@ msgstr "„%s“ не може да се премести в „%s“" msgid "attempt to reinitialize repository with different hash" msgstr "" -"опит за повторно задаване на първото подаване в хранилището с различна " -"контролна сума" +"опит за зануляване на хранилището и инициализиране с различна контролна сума" + +msgid "" +"attempt to reinitialize repository with different reference storage format" +msgstr "" +"опит за зануляване на хранилището и инициализиране с различен формат на " +"съхраняване" #, c-format msgid "%s already exists" msgstr "Директорията „%s“ вече съществува" -#, c-format -msgid "re-init: ignored --initial-branch=%s" -msgstr "re-init: „--initial-branch=%s“ се пропуска" - #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "" @@ -21948,12 +22095,6 @@ msgstr "" "какъв брой записи в кеша на обектите-дървета да се отбележат като невалидни " "(стандартно е 0)" -msgid "unhandled options" -msgstr "неподдържани опции" - -msgid "error preparing revisions" -msgstr "грешка при подготовката на версии" - #, c-format msgid "commit %s is not marked reachable" msgstr "подаването „%s“ не е отбелязано като достижимо" @@ -22110,9 +22251,6 @@ msgstr "протоколът не поддържа задаването на п msgid "invalid remote service path" msgstr "неправилен път на отдалечената услуга" -msgid "operation not supported by protocol" -msgstr "опцията не се поддържа от протокола" - #, c-format msgid "can't connect to subservice %s" msgstr "неуспешно свързване към подуслугата „%s“" @@ -22247,10 +22385,6 @@ msgstr "стойността на настройката „transport.color.*“ msgid "support for protocol v2 not implemented yet" msgstr "протокол версия 2 все още не се поддържа" -#, c-format -msgid "unknown value for config '%s': %s" -msgstr "непозната стойност за настройката „%s“: „%s“" - #, c-format msgid "transport '%s' not allowed" msgstr "преносът по „%s“ не е позволен" @@ -22304,6 +22438,9 @@ msgstr "" "спъсъкът с адреси на пратки обявени за налични от сървъра не може да се " "получи " +msgid "operation not supported by protocol" +msgstr "опцията не се поддържа от протокола" + msgid "too-short tree object" msgstr "прекалено кратък обект-дърво" @@ -23147,6 +23284,10 @@ msgstr "освен това в индекса има неподадени про msgid "cannot %s: Your index contains uncommitted changes." msgstr "не може да извършите „%s“, защото в индекса има неподадени промѐни." +#, c-format +msgid "unknown style '%s' given for '%s'" +msgstr "непознат стил „%s“ за „%s“" + msgid "" "Error: Your local changes to the following files would be overwritten by " "merge" -- cgit 1.2.3-korg From 267556208175dc8d6e051504541796eb20385e06 Mon Sep 17 00:00:00 2001 From: Jean-Noël Avila Date: Sun, 11 Feb 2024 09:51:46 +0100 Subject: l10n: fr.po: v2.44.0 round 3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jean-Noël Avila --- po/fr.po | 427 +++++++++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 305 insertions(+), 122 deletions(-) diff --git a/po/fr.po b/po/fr.po index ee2e610ef1..736a90f6bb 100644 --- a/po/fr.po +++ b/po/fr.po @@ -80,8 +80,8 @@ msgid "" msgstr "" "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2023-11-08 04:57+0000\n" -"PO-Revision-Date: 2023-11-11 10:00+0100\n" +"POT-Creation-Date: 2024-02-16 19:18+0100\n" +"PO-Revision-Date: 2024-02-16 19:19+0100\n" "Last-Translator: Cédric Malard \n" "Language-Team: Jean-Noël Avila \n" "Language: fr\n" @@ -1525,6 +1525,10 @@ msgstr "l'option '%s' requiert '%s'" msgid "Unexpected option --output" msgstr "Option --output inattendue" +#, c-format +msgid "extra command line parameter '%s'" +msgstr "paramètre de commande supplémentaire '%s'" + #, c-format msgid "Unknown archive format '%s'" msgstr "Format d'archive inconnu '%s'" @@ -1570,6 +1574,14 @@ msgstr "blob gitattributes trop gros ignoré '%s'" msgid "bad --attr-source or GIT_ATTR_SOURCE" msgstr "mauvais --attr-source ou GIT_ATTR_SOURCE" +#, c-format +msgid "unable to stat '%s'" +msgstr "fstat de '%s' impossible" + +#, c-format +msgid "unable to read %s" +msgstr "impossible de lire %s" + #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Contenu mal cité dans le fichier '%s' : %s" @@ -2874,12 +2886,12 @@ msgid "couldn't look up commit object for '%s'" msgstr "impossible de rechercher l'objet commit pour '%s'" #, c-format -msgid "" -"the branch '%s' is not fully merged.\n" -"If you are sure you want to delete it, run 'git branch -D %s'" -msgstr "" -"la branche '%s' n'est pas totalement fusionnée.\n" -"Si vous souhaitez réellement la supprimer, lancez 'git branch -D %s'" +msgid "the branch '%s' is not fully merged" +msgstr "la branche '%s' n'est pas complètement fusionnée" + +#, c-format +msgid "If you are sure you want to delete it, run 'git branch -D %s'" +msgstr "Si vous souhaitez réellement la supprimer, lancez 'git branch -D %s'" msgid "update of config-file failed" msgstr "échec de la mise à jour du fichier de configuration" @@ -3937,8 +3949,8 @@ msgstr "forcer l'extraction (laisser tomber les modifications locales)" msgid "new-branch" msgstr "nouvelle branche" -msgid "new unparented branch" -msgstr "nouvelle branche sans parent" +msgid "new unborn branch" +msgstr "nouvelle branche non née" msgid "update ignored files (default)" msgstr "mettre à jour les fichiers ignorés (par défaut)" @@ -4192,9 +4204,6 @@ msgstr "" "clean.requireForce à true par défaut et ni -i, -n ou -f fourni ; refus de " "nettoyer" -msgid "-x and -X cannot be used together" -msgstr "-x et -X ne peuvent pas être utilisés ensemble" - msgid "git clone [] [--] []" msgstr "git clone [] [--] []" @@ -4285,6 +4294,9 @@ msgstr "gitdir" 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" + msgid "key=value" msgstr "clé=valeur" @@ -4407,12 +4419,9 @@ msgstr "Trop d'arguments." msgid "You must specify a repository to clone." msgstr "Vous devez spécifier un dépôt à cloner." -msgid "" -"--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-" -"exclude" -msgstr "" -"--bundle-uri est incompatible avec --depth, --shallow-since, et --shallow-" -"exclude" +#, c-format +msgid "unknown ref storage format '%s'" +msgstr "Format de stockage de réf inconnu '%s'" #, c-format msgid "repository '%s' does not exist" @@ -4546,14 +4555,14 @@ msgid "" "--stdin-commits]\n" " [--changed-paths] [--[no-]max-new-filters ] [--" "[no-]progress]\n" -" " +" " msgstr "" "git commit-graph write [--object-dir ] [--append]\n" " [--split[=]] [--reachable | --stdin-packs " "| --stdin-commits]\n" " [--changed-paths] [--[no-]max-new-filters ] [--" "[no-]progress]\n" -" " +" " msgid "dir" msgstr "répertoire" @@ -6906,6 +6915,10 @@ msgstr "pas de support des fils, ignore %s" msgid "unable to read tree (%s)" msgstr "impossible de lire l'arbre (%s)" +#, c-format +msgid "unable to read tree %s" +msgstr "impossible de lire l'arbre %s" + #, c-format msgid "unable to grep from object of type %s" msgstr "impossible de faire un grep sur un objet de type %s" @@ -7324,10 +7337,6 @@ msgstr "grave incohérence dans la décompression (inflate)" msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "COLLISION SHA1 TROUVÉE AVEC %s !" -#, c-format -msgid "unable to read %s" -msgstr "impossible de lire %s" - #, c-format msgid "cannot read existing object info %s" msgstr "impossible de lire l'information existante de l'objet %s" @@ -7469,12 +7478,14 @@ msgstr "erreur de fsck dans les objets paquets" msgid "" "git init [-q | --quiet] [--bare] [--template=]\n" " [--separate-git-dir ] [--object-format=]\n" +" [--ref-format=]\n" " [-b | --initial-branch=]\n" " [--shared[=]] []" msgstr "" -"git init [-q | --quiet] [--bare] [--template=]\n" -" [--separate-git-dir ] [--object-format=]\\n\"\n" -" [-b | --initial-branch=]\\n\"\n" +"git init [-q | --quiet] [--bare] [--template=]\n" +" [--separate-git-dir ] [--object-format=]\n" +" [--ref-format=]\n" +" [-b | --initial-branch=]\n" " [--shared[=]] []" msgid "permissions" @@ -8204,6 +8215,13 @@ msgstr "" "git merge-file [] [-L [-L [-L ]]] " " " +msgid "" +"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " +"\"histogram\"" +msgstr "" +"l'option diff-algorithm accept \"myers\", \"minimal\", \"patience\" et " +"\"histogram\"" + msgid "send results to standard output" msgstr "envoyer les résultats sur la sortie standard" @@ -8225,6 +8243,12 @@ msgstr "pour les conflits, utiliser leur version (their)" msgid "for conflicts, use a union version" msgstr "pour les conflits, utiliser l'ensemble des versions" +msgid "" +msgstr "" + +msgid "choose a diff algorithm" +msgstr "choisir un algorithme de différence" + msgid "for conflicts, use this marker size" msgstr "pour les conflits, utiliser cette taille de marqueur" @@ -8315,9 +8339,6 @@ msgstr "--trivial-merge est incompatible avec d'autres options" msgid "unknown strategy option: -X%s" msgstr "option de stratégie inconnue : -X%s" -msgid "--merge-base is incompatible with --stdin" -msgstr "--merge-base est incompatible avec --stdin" - #, c-format msgid "malformed input line: '%s'." msgstr "ligne en entrée malformée : '%s'." @@ -9264,6 +9285,10 @@ msgstr "Compression des objets" msgid "inconsistency with delta count" msgstr "inconsistance dans le compte de delta" +#, c-format +msgid "invalid pack.allowPackReuse value: '%s'" +msgstr "valeur invalide de pack.allowPackReuse : '%s'" + #, c-format msgid "" "value of uploadpack.blobpackfileuri must be of the form ' (delta %), reused % (delta %), pack-" -"reused %" +"reused % (from %)" msgstr "" "Total % (delta %), réutilisés % (delta %), " -"réutilisés du pack %" +"réutilisés du paquet % (depuis %)" msgid "" "'git pack-redundant' is nominated for removal.\n" @@ -10519,13 +10544,6 @@ msgstr "" msgid "switch `C' expects a numerical value" msgstr "l'option `C' attend un valeur numérique" -msgid "" -"apply options are incompatible with rebase.autoSquash. Consider adding --no-" -"autosquash" -msgstr "" -"les options d'application sont incompatibles avec rebase.autoSquash. " -"Considérez l'ajout de --no-autosquash" - msgid "" "apply options are incompatible with rebase.rebaseMerges. Consider adding --" "no-rebase-merges" @@ -11535,6 +11553,77 @@ msgstr "--convert-graft-file ne supporte aucun argument" msgid "only one pattern can be given with -l" msgstr "-l n'accepte qu'un motifs" +msgid "need some commits to replay" +msgstr "commits requis pour pouvoir rejouer" + +msgid "--onto and --advance are incompatible" +msgstr "--onto et --advance sont incompatibles" + +msgid "all positive revisions given must be references" +msgstr "toutes les révisions positives fournies doivent être des références" + +msgid "argument to --advance must be a reference" +msgstr "l'argument de --advance doit être une référence" + +msgid "" +"cannot advance target with multiple sources because ordering would be ill-" +"defined" +msgstr "" +"impossible d'avancer la cible avec des sources multiples parce l'ordre ne " +"serait pas total" + +msgid "" +"cannot implicitly determine whether this is an --advance or --onto operation" +msgstr "" +"impossible de déterminer implicitement s'il y a une opération --advance ou --" +"onto" + +msgid "" +"cannot advance target with multiple source branches because ordering would " +"be ill-defined" +msgstr "" +"impossible d'avancer la cible sur des branches sources multiples parce que " +"l'ordre ne serait pas total" + +msgid "cannot implicitly determine correct base for --onto" +msgstr "impossible de déterminer implicitement une base correcte pour --onto" + +msgid "" +"(EXPERIMENTAL!) git replay ([--contained] --onto | --advance " +") ..." +msgstr "" +"(EXPERIMENTAL!) git replay ([--contained] --onto | --advance " +") ..." + +msgid "make replay advance given branch" +msgstr "faire rejouer en avançant la branche indiquée" + +msgid "replay onto given commit" +msgstr "rejouer par-dessus le commit indiqué" + +msgid "advance all branches contained in revision-range" +msgstr "avancer toutes les branches contenues dans la plage-de-révisions" + +msgid "option --onto or --advance is mandatory" +msgstr "une option --onto ou --advance est obligatoire" + +#, c-format +msgid "" +"some rev walking options will be overridden as '%s' bit in 'struct rev_info' " +"will be forced" +msgstr "" +"certaines options de parcours de révs seront surchargées car le bit '%s' " +"dans 'struct rev_info' sera forcé" + +msgid "error preparing revisions" +msgstr "erreur lors de la préparation des révisions" + +msgid "replaying down to root commit is not supported yet!" +msgstr "rejouer jusqu'au commit racine n'est pas encore géré !" + +msgid "replaying merge commits is not supported yet!" +msgstr "rejouer des commits de fusion n'est pas encore géré !" + msgid "" "git rerere [clear | forget ... | diff | status | remaining | gc]" msgstr "" @@ -11746,15 +11835,6 @@ msgstr "--prefix exige un argument" msgid "unknown mode for --abbrev-ref: %s" msgstr "mode inconnu pour --abbrev-ref : %s" -msgid "--exclude-hidden cannot be used together with --branches" -msgstr "--exclude-hidden ne peut être utilisé avec --branches" - -msgid "--exclude-hidden cannot be used together with --tags" -msgstr "--exclude-hidden ne peut pas être utilisé avec --tags" - -msgid "--exclude-hidden cannot be used together with --remotes" -msgstr "--exclude-hidden ne peut pas être utilisé avec --remotes" - msgid "this operation must be run in a work tree" msgstr "cette opération doit être effectuée dans un arbre de travail" @@ -12171,10 +12251,6 @@ msgstr "" "afficher les références de l'entrée standard qui ne sont pas dans le dépôt " "local" -#, c-format -msgid "only one of '%s', '%s' or '%s' can be given" -msgstr "les options '%s', '%s' et '%s' sont mutuellement exclusives" - msgid "" "git sparse-checkout (init | list | set | add | reapply | disable | check-" "rules) []" @@ -13673,28 +13749,28 @@ msgstr "Aucune branche source possible, activation de '--orphan'" #, c-format msgid "" -"If you meant to create a worktree containing a new orphan branch\n" +"If you meant to create a worktree containing a new unborn branch\n" "(branch with no commits) for this repository, you can do so\n" "using the --orphan flag:\n" "\n" " git worktree add --orphan -b %s %s\n" msgstr "" "Si vous vouliez créer un arbre-de-travail contenant une nouvelle branche\n" -"orpheline (une branche sans commit) pour ce dépôt, vous pouvez le faire\n" +"non-née (une branche sans commit) pour ce dépôt, vous pouvez le faire\n" "en utilisant le drapeau --orphan :\n" "\n" " git worktree add --orphan -b %s %s\n" #, c-format msgid "" -"If you meant to create a worktree containing a new orphan branch\n" +"If you meant to create a worktree containing a new unborn branch\n" "(branch with no commits) for this repository, you can do so\n" "using the --orphan flag:\n" "\n" " git worktree add --orphan %s\n" msgstr "" "Si vous vouliez créer un arbre-de-travail contenant une nouvelle branche\n" -"orpheline (une branche sans commit) pour ce dépôt, vous pouvez le faire\n" +"non-née (une branche sans commit) pour ce dépôt, vous pouvez le faire\n" "en utilisant le drapeau --orphan :\n" "\n" " git worktree add --orphan %s\n" @@ -13756,6 +13832,10 @@ msgstr "impossible de créer le répertoire de '%s'" msgid "initializing" msgstr "initialisation" +#, c-format +msgid "could not find created worktree '%s'" +msgstr "impossible de trouver l'arbre-de-travail créé '%s'" + #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Préparation de l'arbre de travail (nouvelle branche '%s')" @@ -13797,10 +13877,6 @@ msgstr "" "on arrête ; utilisez 'add -f' pour passe outre ou récupérer le distant en " "premier" -#, c-format -msgid "'%s' and '%s' cannot be used together" -msgstr "'%s' et '%s' ne peuvent pas être utilisées ensemble" - msgid "checkout even if already checked out in other worktree" msgstr "" "extraire la même si elle est déjà extraite dans une autre copie de " @@ -13812,8 +13888,8 @@ msgstr "créer une nouvelle branche" msgid "create or reset a branch" msgstr "créer ou réinitialiser une branche" -msgid "create unborn/orphaned branch" -msgstr "créer une branche non née/orpheline" +msgid "create unborn branch" +msgstr "créer une branche non née" msgid "populate the new working tree" msgstr "remplissage de la nouvelle copie de travail" @@ -13835,11 +13911,9 @@ msgid "options '%s', '%s', and '%s' cannot be used together" msgstr "les options '%s', '%s' et '%s' ne peuvent pas être utilisées ensemble" #, c-format -msgid "options '%s', and '%s' cannot be used together" -msgstr "les options '%s' et '%s' ne peuvent pas être utilisées ensemble" - -msgid "" -msgstr "" +msgid "option '%s' and commit-ish cannot be used together" +msgstr "" +"l'option '%s' et des commit-esques ne peuvent pas être utilisés ensemble" msgid "added with --lock" msgstr "ajouté avec --lock" @@ -14480,6 +14554,11 @@ msgstr "Empaqueter les objets non-empaquetés d'un dépôt" msgid "Create, list, delete refs to replace objects" msgstr "Créer, lister, supprimer des référence pour remplacer des objets" +msgid "EXPERIMENTAL: Replay commits on a new base, works with bare repos too" +msgstr "" +"EXPÉRIMENTAL ; rejoue des commits sur une nouvelle base, fonctionne aussi " +"avec les dépôts nus" + msgid "Generates a summary of pending changes" msgstr "Générer une résumé des modifications en attentes" @@ -14722,6 +14801,35 @@ msgstr "Un outil pour gérer les grands dépôts Git" msgid "commit-graph file is too small" msgstr "le graphe de commit est trop petit" +msgid "commit-graph oid fanout chunk is wrong size" +msgstr "" +"le tronçon de distribution d'oid du graphe de commit n'a pas la bonne taille" + +msgid "commit-graph fanout values out of order" +msgstr "les valeurs de distribution du graphe de commit sont désordonnées" + +msgid "commit-graph OID lookup chunk is the wrong size" +msgstr "" +"le tronçon de recherche de l'OID du graphe de commits n'a pas la bonne taille" + +msgid "commit-graph commit data chunk is wrong size" +msgstr "le tronçon de données du graphe de commit n'a pas la bonne taille" + +msgid "commit-graph generations chunk is wrong size" +msgstr "le tronçon des générations du graphe de commit n'a pas la bonne taille" + +msgid "commit-graph changed-path index chunk is too small" +msgstr "" +"le tronçon d'index des chemins modifiés du graphe de commit est trop petit" + +#, c-format +msgid "" +"ignoring too-small changed-path chunk (% < %) in commit-" +"graph file" +msgstr "" +"tronçon de chemin modifié dans le fichier de graphe de commits trop petit " +"((% < %)) ignoré" + #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "" @@ -14741,6 +14849,21 @@ msgstr "" msgid "commit-graph file is too small to hold %u chunks" msgstr "le graphe de commit est trop petit pour contenir %u tronçons" +msgid "commit-graph required OID fanout chunk missing or corrupted" +msgstr "" +"le tronçon de distribution des OID requis du graphe de commits est manquant " +"ou corrompu" + +msgid "commit-graph required OID lookup chunk missing or corrupted" +msgstr "" +"le tronçon de recherche OID requis par le graphe de commits est manquant ou " +"corrompu" + +msgid "commit-graph required commit data chunk missing or corrupted" +msgstr "" +"le tronçon d'étalement OID requis par le graphe de commits est manquant ou " +"corrompu" + msgid "commit-graph has no base graphs chunk" msgstr "le graphe de commit n'a pas de tronçon de graphes de base" @@ -14754,6 +14877,9 @@ msgstr "la chaîne de graphe de commit ne correspond pas" msgid "commit count in base graph too high: %" msgstr "nombre de commits dans le graphe de base trop haut : %" +msgid "commit-graph chain file too small" +msgstr "la chaine du graphe de commit est trop petite" + #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "" @@ -14781,6 +14907,9 @@ msgstr "" "les données de génération de débordement du graphe de commits sont trop " "petites" +msgid "commit-graph extra-edges pointer out of bounds" +msgstr "pointeur hors-gamme d'arêtes supplémentaires du graphe de commits" + msgid "Loading known commits in commit graph" msgstr "Lecture des commits connus dans un graphe de commit" @@ -15960,6 +16089,10 @@ msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" "Valeur inconnue pour la variable de configuration 'diff.submodule' : '%s'" +#, c-format +msgid "unknown value for config '%s': %s" +msgstr "valeur inconnue pour la config '%s' : %s" + #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -16042,13 +16175,6 @@ msgstr "mauvais argument --color-moved : %s" msgid "invalid mode '%s' in --color-moved-ws" msgstr "mode invalide '%s' dans --color-moved-ws" -msgid "" -"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " -"\"histogram\"" -msgstr "" -"l'option diff-algorithm accept \"myers\", \"minimal\", \"patience\" et " -"\"histogram\"" - #, c-format msgid "invalid argument to %s" msgstr "argument invalide pour %s" @@ -16092,8 +16218,8 @@ msgstr "--stat pour traitement automatique" msgid "output only the last line of --stat" msgstr "afficher seulement la dernière ligne de --stat" -msgid "..." -msgstr "..." +msgid ",..." +msgstr ",..." msgid "" "output the distribution of relative amount of changes for each sub-directory" @@ -16104,8 +16230,8 @@ msgstr "" msgid "synonym for --dirstat=cumulative" msgstr "synonyme pour --dirstat=cumulative" -msgid "synonym for --dirstat=files,param1,param2..." -msgstr "synonyme pour --dirstat=files,param1,param2..." +msgid "synonym for --dirstat=files,,..." +msgstr "synonyme pour --dirstat=files,,..." msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" @@ -16293,12 +16419,6 @@ msgid "generate diff using the \"histogram diff\" algorithm" msgstr "" "générer un diff en utilisant l'algorithme de différence \"histogramme\"" -msgid "" -msgstr "" - -msgid "choose a diff algorithm" -msgstr "choisir un algorithme de différence" - msgid "" msgstr "" @@ -17808,6 +17928,13 @@ msgstr "impossible de lire le cache" msgid "multi-pack-index OID fanout is of the wrong size" msgstr "l'étalement de l'OID d'index multi-paquet n'a pas la bonne taille" +#, c-format +msgid "" +"oid fanout out of order: fanout[%d] = % > % = fanout[%d]" +msgstr "" +"étalement oid en désordre : étalement[%d] = % > % = " +"étalement[%d]" + msgid "multi-pack-index OID lookup chunk is the wrong size" msgstr "" "le tronçon de recherche de l'OID d'index multi-paquet n'a pas la bonne taille" @@ -17868,6 +17995,13 @@ msgstr "" msgid "bad pack-int-id: %u (%u total packs)" msgstr "mauvais pack-int-id : %u (%u paquets au total)" +msgid "MIDX does not contain the BTMP chunk" +msgstr "le MIDX ne contient pas de tronçon BTMP" + +#, c-format +msgid "could not load bitmapped pack %" +msgstr "impossible d'ouvrir le paquet bitmappé %" + msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "" "l'index multi-paquet stocke un décalage en 64-bit, mais off_t est trop petit" @@ -17953,13 +18087,6 @@ msgstr "somme de contrôle incorrecte" msgid "Looking for referenced packfiles" msgstr "Recherche de fichiers paquets référencés" -#, c-format -msgid "" -"oid fanout out of order: fanout[%d] = % > % = fanout[%d]" -msgstr "" -"étalement oid en désordre : étalement[%d] = % > % = " -"étalement[%d]" - msgid "the midx contains no oid" msgstr "le midx ne contient aucun oid" @@ -18486,6 +18613,9 @@ msgstr "l'index inverse requis manque dans l'index multi-paquet" msgid "could not open pack %s" msgstr "impossible d'ouvrir le paquet '%s'" +msgid "could not determine MIDX preferred pack" +msgstr "impossible de déterminer le paquet préféré de MIDX" + #, c-format msgid "preferred pack (%s) is invalid" msgstr "le paquet préféré (%s) est invalide" @@ -18507,6 +18637,10 @@ msgstr "table de recherche en bitmap corrompue : index de commit %u hors plage" msgid "corrupt ewah bitmap: truncated header for bitmap of commit \"%s\"" msgstr "bitmap ewah corrompue : entête tronqué pour la bitmap du commit '%s'" +#, c-format +msgid "unable to load pack: '%s', disabling pack-reuse" +msgstr "impossible de charger le paquet : '%s', pack-reuse désactivé" + #, c-format msgid "object '%s' not found in type bitmaps" msgstr "objet '%s' non trouvé dans les bitmaps de type" @@ -18599,6 +18733,9 @@ msgid "multi-pack-index reverse-index chunk is the wrong size" msgstr "" "le tronçon d'index inversé de l'index multi-paquet n'a pas la bonne taille" +msgid "could not determine preferred pack" +msgstr "impossible de déterminer le paquet préféré" + msgid "cannot both write and verify reverse index" msgstr "impossible de lire et vérifier à la fois l'index inverse" @@ -18662,10 +18799,6 @@ msgstr "%s n'est pas disponible" msgid "%s expects a non-negative integer value with an optional k/m/g suffix" msgstr "%s attend une valeur entière non négative avec une suffixe k/m/g" -#, c-format -msgid "%s is incompatible with %s" -msgstr "%s est incompatible avec %s" - #, c-format msgid "ambiguous option: %s (could be --%s%s or --%s%s)" msgstr "option ambigüe : %s (devrait être --%s%s ou --%s%s)" @@ -18994,10 +19127,6 @@ msgstr "indexation du fichier '%s' impossible" msgid "unable to add '%s' to index" msgstr "impossible d'ajouter '%s' à l'index" -#, c-format -msgid "unable to stat '%s'" -msgstr "fstat de '%s' impossible" - #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "'%s' existe à la fois comme un fichier et un répertoire" @@ -19574,10 +19703,6 @@ msgstr "'%s' existe ; impossible de créer '%s'" msgid "cannot process '%s' and '%s' at the same time" msgstr "impossible de traiter '%s' et '%s' en même temps" -#, c-format -msgid "could not remove reference %s" -msgstr "impossible de supprimer la référence %s" - #, c-format msgid "could not delete reference %s: %s" msgstr "impossible de supprimer la référence %s : %s" @@ -19773,7 +19898,7 @@ msgid "" "Neither worked, so we gave up. You must fully qualify the ref." msgstr "" "La destination que vous avez fournie n'est pas un nom de référence complète\n" -"(c'est-à-dire commençant par \"ref/\"). Essai d'approximation par :\n" +"(c'est-à-dire commençant par \"refs/\"). Essai d'approximation par :\n" "\n" "- Recherche d'une référence qui correspond à '%s' sur le serveur distant.\n" "- Vérification si la en cours de poussée ('%s')\n" @@ -20961,6 +21086,9 @@ 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" + msgid "could not detach HEAD" msgstr "impossible de détacher HEAD" @@ -21279,6 +21407,10 @@ msgstr "pas de copie des modèles depuis '%s' : %s" msgid "invalid initial branch name: '%s'" msgstr "nom de branche initiale invalide : '%s'" +#, c-format +msgid "re-init: ignored --initial-branch=%s" +msgstr "re-initialisation : --initial-branch=%s ignoré" + #, c-format msgid "unable to handle file type %d" msgstr "impossible de traiter le fichier de type %d" @@ -21290,14 +21422,16 @@ msgstr "impossible de déplacer %s vers %s" msgid "attempt to reinitialize repository with different hash" msgstr "essai de réinitialisation du dépôt avec une empreinte différente" +msgid "" +"attempt to reinitialize repository with different reference storage format" +msgstr "" +"essai de réinitialisation du dépôt avec un format de stockage de références " +"différent" + #, c-format msgid "%s already exists" msgstr "%s existe déjà" -#, c-format -msgid "re-init: ignored --initial-branch=%s" -msgstr "re-initialisation : --initial-branch=%s ignoré" - #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "Dépôt Git existant partagé réinitialisé dans %s%s\n" @@ -21567,12 +21701,6 @@ msgstr "effacer l'arbre de cache avant chaque itération" msgid "number of entries in the cache tree to invalidate (default 0)" msgstr "nombre d'entrées dans l'arbre de cache à invalider (par défaut, 0)" -msgid "unhandled options" -msgstr "options non gérées" - -msgid "error preparing revisions" -msgstr "erreur lors de la préparation des révisions" - #, c-format msgid "commit %s is not marked reachable" msgstr "le commit %s n'est pas marqué joignable" @@ -21732,9 +21860,6 @@ msgstr "" msgid "invalid remote service path" msgstr "chemin de service distant invalide" -msgid "operation not supported by protocol" -msgstr "option non supportée par le protocole" - #, c-format msgid "can't connect to subservice %s" msgstr "impossible de se connecter au sous-service %s" @@ -21866,10 +21991,6 @@ msgstr "impossible d'analyser la configuration transport.color.*" msgid "support for protocol v2 not implemented yet" msgstr "le support du protocole v2 n'est pas encore implanté" -#, c-format -msgid "unknown value for config '%s': %s" -msgstr "valeur inconnue pour la config '%s' : %s" - #, c-format msgid "transport '%s' not allowed" msgstr "transport '%s' non permis" @@ -21924,6 +22045,9 @@ msgid "could not retrieve server-advertised bundle-uri list" msgstr "" "impossible de récupérer la liste de bundle-uris annoncée par le serveur" +msgid "operation not supported by protocol" +msgstr "option non supportée par le protocole" + msgid "too-short tree object" msgstr "objet arbre trop court" @@ -22773,6 +22897,10 @@ msgstr "de plus, votre index contient des modifications non validées." msgid "cannot %s: Your index contains uncommitted changes." msgstr "%s impossible : votre index contient des modifications non validées." +#, c-format +msgid "unknown style '%s' given for '%s'" +msgstr "style inconnu '%s' pour '%s'" + msgid "" "Error: Your local changes to the following files would be overwritten by " "merge" @@ -23174,6 +23302,61 @@ msgstr "%s sauté avec un suffix de sauvegarde '%s'.\n" msgid "Do you really want to send %s? [y|N]: " msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : " +#~ msgid "-x and -X cannot be used together" +#~ msgstr "-x et -X ne peuvent pas être utilisés ensemble" + +#~ msgid "" +#~ "--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-" +#~ "exclude" +#~ msgstr "" +#~ "--bundle-uri est incompatible avec --depth, --shallow-since, et --shallow-" +#~ "exclude" + +#~ msgid "--merge-base is incompatible with --stdin" +#~ msgstr "--merge-base est incompatible avec --stdin" + +#~ msgid "" +#~ "apply options are incompatible with rebase.autoSquash. Consider adding --" +#~ "no-autosquash" +#~ msgstr "" +#~ "les options d'application sont incompatibles avec rebase.autoSquash. " +#~ "Considérez l'ajout de --no-autosquash" + +#~ msgid "--exclude-hidden cannot be used together with --branches" +#~ msgstr "--exclude-hidden ne peut être utilisé avec --branches" + +#~ msgid "--exclude-hidden cannot be used together with --tags" +#~ msgstr "--exclude-hidden ne peut pas être utilisé avec --tags" + +#~ msgid "--exclude-hidden cannot be used together with --remotes" +#~ msgstr "--exclude-hidden ne peut pas être utilisé avec --remotes" + +#, c-format +#~ msgid "only one of '%s', '%s' or '%s' can be given" +#~ msgstr "les options '%s', '%s' et '%s' sont mutuellement exclusives" + +#, c-format +#~ msgid "'%s' and '%s' cannot be used together" +#~ msgstr "'%s' et '%s' ne peuvent pas être utilisées ensemble" + +#, c-format +#~ msgid "options '%s', and '%s' cannot be used together" +#~ msgstr "les options '%s' et '%s' ne peuvent pas être utilisées ensemble" + +#~ msgid "" +#~ msgstr "" + +#, c-format +#~ msgid "%s is incompatible with %s" +#~ msgstr "%s est incompatible avec %s" + +#, c-format +#~ msgid "could not remove reference %s" +#~ msgstr "impossible de supprimer la référence %s" + +#~ msgid "unhandled options" +#~ msgstr "options non gérées" + #, c-format #~ msgid "options '%s=%s' and '%s=%s' cannot be used together" #~ msgstr "" -- cgit 1.2.3-korg From b92740818355829686e8565ee374e5d3186ae86c Mon Sep 17 00:00:00 2001 From: Emir SARI Date: Sun, 11 Feb 2024 15:39:25 +0300 Subject: l10n: tr: Update Turkish translations for 2.44 Signed-off-by: Emir SARI --- po/tr.po | 380 +++++++++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 251 insertions(+), 129 deletions(-) diff --git a/po/tr.po b/po/tr.po index f01962d1db..19d6661bbe 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1,8 +1,8 @@ # Turkish translations for Git # Git Türkçe çevirileri -# Copyright (C) 2020-2023 Emir SARI +# Copyright (C) 2020-2024 Emir SARI # This file is distributed under the same license as the Git package. -# Emir SARI , 2020-2023 +# Emir SARI , 2020-2024 # # ######################################################### # # Git Türkçe kavramlar dizini / Git Turkish Glossary # @@ -27,6 +27,7 @@ # detached HEAD | ayrık HEAD # # dirty | kirli # # evil merge | uğursuz birleştirme # +# fanout | çıkış sayısı # # fast-forward | ileri sarım/sarmak # # fetch | getirme(k) # # fixup | düzeltmek # @@ -48,10 +49,10 @@ # pathspec | yol belirteci # # pattern | dizgi # # porcelain | okunabilir # -# prune | budamak # +# prune | buda(mak) # # pseudoref | yalancıktan başvuru # -# pull | çekme(k) # -# push | itme(k) # +# pull | çek(mek) # +# push | it(mek) # # rebase | yeniden temellendirme(k) # # record | kayıt yaz(mak) # # ref | başvuru # @@ -85,6 +86,7 @@ # trailer | artbilgi # # tree | ağaç # # treeish | ağacımsı # +# unborn | henüz doğmamış (dal) # # unstage | hazırlıktan çıkar(mak) # # upstream | üstkaynak # # worktree/working tree | çalışma ağacı # @@ -94,8 +96,8 @@ msgid "" msgstr "" "Project-Id-Version: Git Turkish Localization Project\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2023-11-09 11:15+0300\n" -"PO-Revision-Date: 2023-11 13:00+0300\n" +"POT-Creation-Date: 2024-02-16 22:04+0300\n" +"PO-Revision-Date: 2024-02-16 22:00+0300\n" "Last-Translator: Emir SARI \n" "Language-Team: Turkish (https://github.com/bitigchi/git-po/)\n" "Language: tr\n" @@ -1499,6 +1501,10 @@ msgstr "'%s' seçeneği '%s' gerektiriyor" msgid "Unexpected option --output" msgstr "Beklenmedik seçenek --output" +#, c-format +msgid "extra command line parameter '%s'" +msgstr "fazladan komut satırı parametresi '%s'" + #, c-format msgid "Unknown archive format '%s'" msgstr "Bilinmeyen arşiv biçimi '%s'" @@ -1544,6 +1550,14 @@ msgstr "pek büyük gitattributes ikili nesnesi '%s' yok sayılıyor" msgid "bad --attr-source or GIT_ATTR_SOURCE" msgstr "hatalı --attr-source veya GIT_ATTR_SOURCE" +#, c-format +msgid "unable to stat '%s'" +msgstr "'%s' dosyasının bilgileri alınamıyor" + +#, c-format +msgid "unable to read %s" +msgstr "%s okunamıyor" + #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "'%s' dosyasında hatalı tırnağa alınmış içerik: %s" @@ -2823,12 +2837,12 @@ msgid "couldn't look up commit object for '%s'" msgstr "'%s' için işleme nesnesi aranamadı" #, c-format -msgid "" -"the branch '%s' is not fully merged.\n" -"If you are sure you want to delete it, run 'git branch -D %s'" -msgstr "" -"'%s' dalı tümüyle birleştirilmemiş.\n" -"Eğer silmek istediğinizden eminseniz 'git branch -D %s' çalıştırın." +msgid "the branch '%s' is not fully merged" +msgstr "'%s' dalı tümüyle birleştirilmedi" + +#, c-format +msgid "If you are sure you want to delete it, run 'git branch -D %s'" +msgstr "Onu silmek istediğinizden eminseniz 'git branch -D %s' çalıştırın." msgid "update of config-file failed" msgstr "config-file güncellenemedi" @@ -3863,8 +3877,8 @@ msgstr "zorla çıkış yap (yerel değişiklikleri çöpe at)" msgid "new-branch" msgstr "yeni dal" -msgid "new unparented branch" -msgstr "yeni üst ögesi olmayan dal" +msgid "new unborn branch" +msgstr "yeni henüz doğmamış dal" msgid "update ignored files (default)" msgstr "yok sayılan dosyaları güncelle (öntanımlı)" @@ -4115,9 +4129,6 @@ msgstr "" "clean.requireForce öntanımlı olarak 'true' ve ne -i ne -n ne de -f verilmiş; " "temizleme reddediliyor" -msgid "-x and -X cannot be used together" -msgstr "-x ve -X birlikte kullanılamaz" - msgid "git clone [] [--] []" msgstr "git clone [] [--] []" @@ -4205,6 +4216,9 @@ msgstr "git dizini" msgid "separate git dir from working tree" msgstr "git dizinini çalışma ağacından ayır" +msgid "specify the reference format to use" +msgstr "kullanılacak başvuru biçimini belirt" + msgid "key=value" msgstr "anahtar=değer" @@ -4322,11 +4336,9 @@ msgstr "Çok fazla argüman." msgid "You must specify a repository to clone." msgstr "Klonlamak için bir depo belirtmelisiniz." -msgid "" -"--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-" -"exclude" -msgstr "" -"--bundle-uri; --depth, --shallow-since ve --shallow-exclude ile uyumsuz" +#, c-format +msgid "unknown ref storage format '%s'" +msgstr "bilinmeyen başvuru depolama biçimi '%s'" #, c-format msgid "repository '%s' does not exist" @@ -4454,11 +4466,11 @@ msgid "" "--stdin-commits]\n" " [--changed-paths] [--[no-]max-new-filters ] [--" "[no-]progress]\n" -" " +" " msgstr "" "git commit-graph write [--object-dir ] [--append]\n" -" [--split[=<]] [--reachable | --stdin-packs " -"| --stdin-commits]\n" +" [--split[=]] [--reachable | --stdin-packs | " +"--stdin-commits]\n" " [--changed-paths] [--[no-]max-new-filters ] [--" "[no-]progress]\n" " " @@ -6777,6 +6789,10 @@ msgstr "iş parçacığı desteği yok, %s yok sayılıyor" msgid "unable to read tree (%s)" msgstr "ağaç okunamıyor (%s)" +#, c-format +msgid "unable to read tree %s" +msgstr "%s ağacı okunamıyor" + #, c-format msgid "unable to grep from object of type %s" msgstr "%s türündeki bir nesneden grep yapılamıyor" @@ -7189,10 +7205,6 @@ msgstr "ciddi şişirme programı tutarsızlığı" msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "%s İLE SHA1 ÇARPIŞMASI BULUNDU!" -#, c-format -msgid "unable to read %s" -msgstr "%s okunamıyor" - #, c-format msgid "cannot read existing object info %s" msgstr "var olan nesne bilgisi %s okunamıyor" @@ -7333,13 +7345,15 @@ msgstr "paket nesnelerinde fsck hatası" msgid "" "git init [-q | --quiet] [--bare] [--template=]\n" " [--separate-git-dir ] [--object-format=]\n" +" [--ref-format=]\n" " [-b | --initial-branch=]\n" " [--shared[=]] []" msgstr "" "git init [-q | --quiet] [--bare] [--template=<şablon-dizini>]\n" " [--separate-git-dir ] [--object-format=]\n" +" [--ref-format=]\n" " [-b | --initial-branch=]\n" -" [--shared[=]] []" +" [--shared[=]] []" msgid "permissions" msgstr "izinler" @@ -8039,6 +8053,13 @@ msgstr "" "git merge-file [] [-L [-L [-L ]]] " " " +msgid "" +"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " +"\"histogram\"" +msgstr "" +"diff-algorithm seçeneği şunları kabul eder: \"myers\", \"minimal\", " +"\"patience\" ve \"histogram\"" + msgid "send results to standard output" msgstr "sonuçları standart çıktıya gönder" @@ -8060,6 +8081,12 @@ msgstr "çakışmalarda onların sürümünü kullan" msgid "for conflicts, use a union version" msgstr "çakışmalarda birlik olmuş bir sürüm kullan" +msgid "" +msgstr "" + +msgid "choose a diff algorithm" +msgstr "bir diff algoritması seç" + msgid "for conflicts, use this marker size" msgstr "çakışmalarda bu imleyici boyutunu kullan" @@ -8150,9 +8177,6 @@ msgstr "--trivial-merge, tüm diğer seçeneklerle uyumsuz" msgid "unknown strategy option: -X%s" msgstr "bilinmeyen strateji seçeneği: -X%s" -msgid "--merge-base is incompatible with --stdin" -msgstr "--merge-base, --stdin ile uyumsuz" - #, c-format msgid "malformed input line: '%s'." msgstr "hatalı oluşturulmuş girdi satırı: '%s'." @@ -9077,6 +9101,10 @@ msgstr "Nesneler sıkıştırılıyor" msgid "inconsistency with delta count" msgstr "delta sayımında tutarsızlık" +#, c-format +msgid "invalid pack.allowPackReuse value: '%s'" +msgstr "geçersiz pack.allowPackReuse değeri: '%s'" + #, c-format msgid "" "value of uploadpack.blobpackfileuri must be of the form ' (delta %), reused % (delta %), pack-" -"reused %" +"reused % (from %)" msgstr "" "Toplam % (delta %), yeniden kullanılan % (delta " -"%), yeniden kullanılan paket %" +"%), yeniden kullanılan paket % (% konumundan)" msgid "" "'git pack-redundant' is nominated for removal.\n" @@ -10298,13 +10326,6 @@ msgstr "" msgid "switch `C' expects a numerical value" msgstr "'C' anahtarı sayısal bir değer bekliyor" -msgid "" -"apply options are incompatible with rebase.autoSquash. Consider adding --no-" -"autosquash" -msgstr "" -"seçenekleri uygula, rebase.autoSquash ile uyumlu değil. --no-autosquash " -"eklemeyi düşünün" - msgid "" "apply options are incompatible with rebase.rebaseMerges. Consider adding --" "no-rebase-merges" @@ -10717,10 +10738,10 @@ msgid_plural "" "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n" "to delete them, use:" msgstr[0] "" -"Not: refs/remotes hiyerarşisi dışındaki bir dal kaldırılmadı;\n" +"Not: refs/remotes/ hiyerarşisi dışındaki bir dal kaldırılmadı;\n" "onu silmek için şunu kullanın:" msgstr[1] "" -"Not: refs/remotes hiyerarşisi dışındaki bazı dallar kaldırılmadı;\n" +"Not: refs/remotes/ hiyerarşisi dışındaki bazı dallar kaldırılmadı;\n" "onları silmek için şunu kullanın:" #, c-format @@ -11298,6 +11319,76 @@ msgstr "--convert-graft-file argüman almaz" msgid "only one pattern can be given with -l" msgstr "-l ile yalnızca bir dizgi verilebilir" +msgid "need some commits to replay" +msgstr "yeniden oynatmak için birkaç işleme gerekli" + +msgid "--onto and --advance are incompatible" +msgstr "--onto ve --advance birbiriyle uyumsuz" + +msgid "all positive revisions given must be references" +msgstr "verilen tüm pozitif revizyonlar, başvuru olmalı" + +msgid "argument to --advance must be a reference" +msgstr "--advance'a olan argüman bir başvuru olmalı" + +msgid "" +"cannot advance target with multiple sources because ordering would be ill-" +"defined" +msgstr "" +"birden çok kaynaklı hedef ilerletilemiyor; çünkü sıralama hatalı tanımlanmış " +"olurdu" + +msgid "" +"cannot implicitly determine whether this is an --advance or --onto operation" +msgstr "" +"bunun --advance veya --onto işlemi olup olmadığı örtük olarak algılanamıyor" + +msgid "" +"cannot advance target with multiple source branches because ordering would " +"be ill-defined" +msgstr "" +"birden çok kaynak dallı hedef ilerletilemiyor; çünkü sıralama hatalı " +"tanımlanmış olurdu" + +msgid "cannot implicitly determine correct base for --onto" +msgstr "--onto için olan doğru temel örtük olarak algılanamıyor" + +msgid "" +"(EXPERIMENTAL!) git replay ([--contained] --onto | --advance " +") ..." +msgstr "" +"(DENEYSEL!) git replay ([--contained] --onto | --advance ) " +"..." + +msgid "make replay advance given branch" +msgstr "verilen dalı önceden yeniden oynat" + +msgid "replay onto given commit" +msgstr "verilen işlemeye yeniden oynat" + +msgid "advance all branches contained in revision-range" +msgstr "revizyon eriminde içerilen tüm dalları ilerlet" + +msgid "option --onto or --advance is mandatory" +msgstr "--onto veya --advance seçeneğinin kullanımı zorunlu" + +#, c-format +msgid "" +"some rev walking options will be overridden as '%s' bit in 'struct rev_info' " +"will be forced" +msgstr "" +"'struct rev_info' içindeki '%s' biti zorlanacağından kimi revizyon yürütme " +"seçenekleri geçersiz kılınacak" + +msgid "error preparing revisions" +msgstr "revizyonlar hazırlanırken hata" + +msgid "replaying down to root commit is not supported yet!" +msgstr "kök işlemeye kadar yeniden oynatma henüz desteklenmiyor!" + +msgid "replaying merge commits is not supported yet!" +msgstr "birleştirme işlemelerini yeniden oynatma henüz desteklenmiyor!" + msgid "" "git rerere [clear | forget ... | diff | status | remaining | gc]" msgstr "" @@ -11506,15 +11597,6 @@ msgstr "--prefix bir argüman gerektiriyor" msgid "unknown mode for --abbrev-ref: %s" msgstr "--abbrev-ref için bilinmeyen kip: %s" -msgid "--exclude-hidden cannot be used together with --branches" -msgstr "--exclude-hidden, --branches ile birlikte kullanılamıyor" - -msgid "--exclude-hidden cannot be used together with --tags" -msgstr "--exclude-hidden, --tags ile birlikte kullanılamıyor" - -msgid "--exclude-hidden cannot be used together with --remotes" -msgstr "--exclude-hidden, --remotes ile birlikte kullanılamıyor" - msgid "this operation must be run in a work tree" msgstr "bu işlem bir çalışma ağacı içinde çalıştırılmalı" @@ -11920,9 +12002,6 @@ msgstr "sonuçları stdout'a yazdırma (--verify ile birlikte kullanışlı)" msgid "show refs from stdin that aren't in local repository" msgstr "stdin'den yerel bir depoda olmayan başvuruları göster" -msgid "only one of '%s', '%s' or '%s' can be given" -msgstr "yalnızca '%s', '%s' veya '%s' arasından biri verilebilir" - msgid "" "git sparse-checkout (init | list | set | add | reapply | disable | check-" "rules) []" @@ -13366,29 +13445,29 @@ msgstr "Olası kaynak dal yok, '--orphan' anlamı çıkarılıyor" #, c-format msgid "" -"If you meant to create a worktree containing a new orphan branch\n" +"If you meant to create a worktree containing a new unborn branch\n" "(branch with no commits) for this repository, you can do so\n" "using the --orphan flag:\n" "\n" " git worktree add --orphan -b %s %s\n" msgstr "" -"Bu depo için yeni bir yetim dal içeren (işlemesiz dal) bir\n" -"çalışma ağacı oluşturmak istediyseniz bunu --orphan bayrağı\n" -"ile yapabilirsiniz:\n" +"Bu depo için henüz doğmamış bir dal (işleme içermeyen dal) içeren\n" +"bir çalışma ağacı oluşturmak istediyseniz bunu --orphan bayrağını\n" +"kullanarak yapabilirsiniz:\n" "\n" " git worktree add --orphan -b %s %s\n" #, c-format msgid "" -"If you meant to create a worktree containing a new orphan branch\n" +"If you meant to create a worktree containing a new unborn branch\n" "(branch with no commits) for this repository, you can do so\n" "using the --orphan flag:\n" "\n" " git worktree add --orphan %s\n" msgstr "" -"Bu depo için yeni bir yetim dal içeren (işlemesiz dal) bir\n" -"çalışma ağacı oluşturmak istediyseniz bunu --orphan bayrağı\n" -"ile yapabilirsiniz:\n" +"Bu depo için henüz doğmamış bir dal (işleme içermeyen dal) içeren\n" +"bir çalışma ağacı oluşturmak istediyseniz bunu --orphan bayrağını\n" +"kullanarak yapabilirsiniz:\n" "\n" " git worktree add --orphan %s\n" @@ -13446,6 +13525,10 @@ msgstr "'%s' dizini oluşturulamadı" msgid "initializing" msgstr "ilklendiriliyor" +#, c-format +msgid "could not find created worktree '%s'" +msgstr "oluşturulan '%s' çalışma ağacı bulunamadı" + #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Çalışma ağacı hazırlanıyor (yeni dal '%s')" @@ -13483,10 +13566,6 @@ msgstr "" "Bir uzak konum olmasına rağmen hiçbir yerel/uzak başvuru yok, durduruluyor;\n" "geçersiz kılmak veya önce bir uzak konum getirmek için 'add -f' kullanın" -#, c-format -msgid "'%s' and '%s' cannot be used together" -msgstr "'%s' ve '%s' birlikte kullanılamaz" - msgid "checkout even if already checked out in other worktree" msgstr "diğer çalışma ağacında çıkış yapılmış olsa bile çıkışını yap" @@ -13496,8 +13575,8 @@ msgstr "yeni bir dal oluştur" msgid "create or reset a branch" msgstr "yeni bir dal oluştur veya sıfırla" -msgid "create unborn/orphaned branch" -msgstr "doğmamış/yetim bırakılmış dal oluştur" +msgid "create unborn branch" +msgstr "henüz doğmamış dal oluştur" msgid "populate the new working tree" msgstr "yeni çalışma ağacını doldur" @@ -13519,11 +13598,8 @@ msgid "options '%s', '%s', and '%s' cannot be used together" msgstr "'%s', '%s' ve '%s' seçenekleri birlikte kullanılamaz" #, c-format -msgid "options '%s', and '%s' cannot be used together" -msgstr "'%s' ve '%s' seçenekleri birlikte kullanılamaz" - -msgid "" -msgstr "" +msgid "option '%s' and commit-ish cannot be used together" +msgstr "'%s' seçeneği ve işlememsiler birlikte kullanılamaz" msgid "added with --lock" msgstr "--lock ile eklendi" @@ -14135,6 +14211,10 @@ msgstr "Bir depodaki paketlenmemiş nesneleri paketle" msgid "Create, list, delete refs to replace objects" msgstr "Nesne değiştirmek için başvurular oluştur, sil, listele" +msgid "EXPERIMENTAL: Replay commits on a new base, works with bare repos too" +msgstr "" +"DENEYSEL: İşlemeleri yeni temelde yeniden oynat, çıplak depolarla da çalışır" + msgid "Generates a summary of pending changes" msgstr "Bekleyen değişikliklerin bir özetini çıkart" @@ -14373,6 +14453,32 @@ msgstr "Büyük Git depolarını yönetmek için bir araç" msgid "commit-graph file is too small" msgstr "commit-graph dosyası pek küçük" +msgid "commit-graph oid fanout chunk is wrong size" +msgstr "commit-graph OID çıkış sayısı iri parçası boyutu yanlış" + +msgid "commit-graph fanout values out of order" +msgstr "commit-graph çıkış sayısı değerleri sırasız: fanout[%d] = %u != %u" + +msgid "commit-graph OID lookup chunk is the wrong size" +msgstr "commit-graph OID arama iri parçası boyutu yanlış" + +msgid "commit-graph commit data chunk is wrong size" +msgstr "commit-graph işleme verisi iri parçası boyutu yanlış" + +msgid "commit-graph generations chunk is wrong size" +msgstr "commit-graph kuşaklar iri parçası boyutu yanlış" + +msgid "commit-graph changed-path index chunk is too small" +msgstr "commit-graph changed-path indeksi iri parçası boyutu pek küçük" + +#, c-format +msgid "" +"ignoring too-small changed-path chunk (% < %) in commit-" +"graph file" +msgstr "" +"commit-graph dosyasındaki pek küçük changed-path iri parçası (% < " +"%) yok sayılıyor" + #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "commit-graph imzası %X, %X ile eşleşmiyor" @@ -14389,6 +14495,17 @@ msgstr "commit-graph sağlama sürümü %X, %X ile eşleşmiyor" msgid "commit-graph file is too small to hold %u chunks" msgstr "commit-graph dosyası %u iri parça tutmak için pek küçük" +msgid "commit-graph required OID fanout chunk missing or corrupted" +msgstr "" +"commit-graph'ten gerekli OID çıkış sayısı iri parçası eksik veya hasarlı" + +msgid "commit-graph required OID lookup chunk missing or corrupted" +msgstr "commit-graph'ten gerekli OID arama iri parçası eksik veya hasarlı" + +msgid "commit-graph required commit data chunk missing or corrupted" +msgstr "" +"commit-graph'ten gerekli OID çıkış sayısı iri parçası eksik veya hasarlı" + msgid "commit-graph has no base graphs chunk" msgstr "commit-graph temel grafiği iri parçasına iye değil" @@ -14402,6 +14519,9 @@ msgstr "commit-graph zinciri eşleşmiyor" msgid "commit count in base graph too high: %" msgstr "temel grafikteki işleme sayısı pek yüksek: %" +msgid "commit-graph chain file too small" +msgstr "commit-graph zincir dosyası pek küçük" + #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "geçersiz commit-graph zinciri: '%s'. satır bir sağlama değil" @@ -14422,6 +14542,9 @@ msgstr "commit-graph, taşım oluşturma verisi gerektiriyor; ancak hiç yok" msgid "commit-graph overflow generation data is too small" msgstr "commit-graph, taşım üretim verisi pek küçük" +msgid "commit-graph extra-edges pointer out of bounds" +msgstr "commit-graph extra-edges işaretçisi sınırlar dışında" + msgid "Loading known commits in commit graph" msgstr "İşleme grafiğindeki bilinen işlemeler yükleniyor" @@ -15562,6 +15685,10 @@ msgstr "" msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "'diff.submodule' yapılandırma değişkeni için bilinmeyen değer: '%s'" +#, c-format +msgid "unknown value for config '%s': %s" +msgstr "'%s' yapılandırması için bilinmeyen değer: %s" + #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -15642,13 +15769,6 @@ msgstr "hatalı --color-moved argümanı: %s" msgid "invalid mode '%s' in --color-moved-ws" msgstr "--color-moved-ws içinde geçersiz kip '%s'" -msgid "" -"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " -"\"histogram\"" -msgstr "" -"diff-algorithm seçeneği şunları kabul eder: \"myers\", \"minimal\", " -"\"patience\" ve \"histogram\"" - #, c-format msgid "invalid argument to %s" msgstr "%s için geçersiz argüman" @@ -15692,8 +15812,8 @@ msgstr "makinede okunabilen --stat" msgid "output only the last line of --stat" msgstr "--stat'ın yalnızca son satırını çıktı ver" -msgid "..." -msgstr "..." +msgid ",..." +msgstr ",..." msgid "" "output the distribution of relative amount of changes for each sub-directory" @@ -15703,8 +15823,8 @@ msgstr "" msgid "synonym for --dirstat=cumulative" msgstr "--dirstat=cumulative eşanlamlısı" -msgid "synonym for --dirstat=files,param1,param2..." -msgstr "--dirstat=files,param1,param2... eşanlamlısı" +msgid "synonym for --dirstat=files,,..." +msgstr "--dirstat=files,,... eşanlamlısı" msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" @@ -15879,12 +15999,6 @@ msgstr "diff'i \"patience diff\" algoritmasını kullanarak oluştur" msgid "generate diff using the \"histogram diff\" algorithm" msgstr "diff'i \"histogram diff\" algoritmasını kullanarak oluştur" -msgid "" -msgstr "" - -msgid "choose a diff algorithm" -msgstr "bir diff algoritması seç" - msgid "" msgstr "" @@ -17367,7 +17481,13 @@ msgid "failed to read the cache" msgstr "önbellek okunamadı" msgid "multi-pack-index OID fanout is of the wrong size" -msgstr "multi-pack-index OID ikiye bölümünün boyutu hatalı" +msgstr "multi-pack-index OID çıkış sayısı boyutu yanlış" + +#, c-format +msgid "" +"oid fanout out of order: fanout[%d] = % > % = fanout[%d]" +msgstr "" +"oid çıkış sayısı sırasız: fanout[%d] = % > % = fanout[%d]" msgid "multi-pack-index OID lookup chunk is the wrong size" msgstr "multi-pack-index OID arama iri parçası yanlış boyutlu" @@ -17415,6 +17535,13 @@ msgstr "multi-pack-index paket adlarının sırasız: '%s' şundan önce: '%s'" msgid "bad pack-int-id: %u (%u total packs)" msgstr "hatalı pack-int-id: %u (%u toplam paket)" +msgid "MIDX does not contain the BTMP chunk" +msgstr "MIDX, BTMP iri parçasını içermiyor" + +#, c-format +msgid "could not load bitmapped pack %" +msgstr "biteşlemli % paketi yüklenemedi" + msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "multi-pack-index bir 64 bit ofset depoluyor; ancak off_t pek küçük" @@ -17498,11 +17625,6 @@ msgstr "yanlış sağlama toplamı" msgid "Looking for referenced packfiles" msgstr "Başvurulmuş paket dosyaları aranıyor" -#, c-format -msgid "" -"oid fanout out of order: fanout[%d] = % > % = fanout[%d]" -msgstr "oid fanout sırasız: fanout[%d] = % > % = fanout[%d]" - msgid "the midx contains no oid" msgstr "midx bir oid içermiyor" @@ -18022,9 +18144,12 @@ msgstr "çoklu paket biteşlemi gereken ters indeksi içermiyor" msgid "could not open pack %s" msgstr "%s paketi açılamadı" +msgid "could not determine MIDX preferred pack" +msgstr "MIDX yeğlenen paketi algılanamadı" + #, c-format msgid "preferred pack (%s) is invalid" -msgstr "tercih edilen (%s) paket geçersiz" +msgstr "yeğlenen paket (%s) geçersiz" msgid "corrupt bitmap lookup table: triplet position out of index" msgstr "hasarlı biteşlem arama tablosu: üçlü konum indeks dışında" @@ -18041,6 +18166,10 @@ msgid "corrupt ewah bitmap: truncated header for bitmap of commit \"%s\"" msgstr "" "hasarlı ewah biteşlemi: \"%s\" işlemesinin biteşleminde kısaltılmış üstbilgi" +#, c-format +msgid "unable to load pack: '%s', disabling pack-reuse" +msgstr "paket yüklenemiyor: '%s', pack-reuse devre dışı bırakılıyor" + #, c-format msgid "object '%s' not found in type bitmaps" msgstr "'%s' nesnesi, tür biteşlemlerinde bulunamadı" @@ -18132,6 +18261,9 @@ msgstr "% konumunda geçersiz rev-index konumu: % != %" msgid "multi-pack-index reverse-index chunk is the wrong size" msgstr "multi-pack-index reverse-index iri parçası yanlış boyutlu" +msgid "could not determine preferred pack" +msgstr "yeğlenen paket algılanamadı" + msgid "cannot both write and verify reverse index" msgstr "ters indeks dosyası hem yazılıp hem doğrulanamıyor" @@ -18194,10 +18326,6 @@ msgstr "%s kullanılabilir değil" msgid "%s expects a non-negative integer value with an optional k/m/g suffix" msgstr "%s negatif olmayan bir tamsayı bekliyor, isteğe bağlı k/m/g eki ile" -#, c-format -msgid "%s is incompatible with %s" -msgstr "%s, %s ile uyumsuz" - #, c-format msgid "ambiguous option: %s (could be --%s%s or --%s%s)" msgstr "belirsiz seçenek: %s (--%s%s veya --%s%s olabilir)" @@ -18511,10 +18639,6 @@ msgstr "'%s' dosyası indekslenemiyor" msgid "unable to add '%s' to index" msgstr "'%s' indekse eklenemiyor" -#, c-format -msgid "unable to stat '%s'" -msgstr "'%s' dosyasının bilgileri alınamıyor" - #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "'%s' hem bir dosya hem de bir dizin olarak görünüyor" @@ -19086,10 +19210,6 @@ msgstr "'%s' mevcut; '%s' oluşturulamıyor" msgid "cannot process '%s' and '%s' at the same time" msgstr "'%s' ve '%s' aynı anda işlenemiyor" -#, c-format -msgid "could not remove reference %s" -msgstr "%s başvurusu kaldırılamadı" - #, c-format msgid "could not delete reference %s: %s" msgstr "%s başvurusu silinemedi: %s" @@ -20446,6 +20566,9 @@ 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" + msgid "could not detach HEAD" msgstr "HEAD ayrılamadı" @@ -20756,6 +20879,10 @@ msgstr "şablonlar '%s' konumundan kopyalanmıyor: %s" msgid "invalid initial branch name: '%s'" msgstr "geçersiz başlangıç dalı adı: '%s'" +#, c-format +msgid "re-init: ignored --initial-branch=%s" +msgstr "re-init: --initial-branch=%s yok sayıldı" + #, c-format msgid "unable to handle file type %d" msgstr "%d dosya türü ele alınamıyor" @@ -20767,14 +20894,15 @@ msgstr "%s şuraya taşınamıyor: %s" msgid "attempt to reinitialize repository with different hash" msgstr "depoyu başka bir sağlama ile yeniden ilklendirme deneniyor" +msgid "" +"attempt to reinitialize repository with different reference storage format" +msgstr "" +"depo başka bir başvuru depolama biçimiyle yeniden ilklendirilmeye çalışılıyor" + #, c-format msgid "%s already exists" msgstr "%s halihazırda var" -#, c-format -msgid "re-init: ignored --initial-branch=%s" -msgstr "re-init: --initial-branch=%s yok sayıldı" - #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "%s%s içindeki var olan paylaşılan Git deposu yeniden ilklendirildi\n" @@ -21039,12 +21167,6 @@ msgstr "her bir yinelemeden önce önbellek ağacını temizle" msgid "number of entries in the cache tree to invalidate (default 0)" msgstr "önbellek ağacındaki geçersizleştirilecek girdi sayısı (öntanımlı 0)" -msgid "unhandled options" -msgstr "beklenmeyen seçenekler" - -msgid "error preparing revisions" -msgstr "revizyonlar hazırlanırken hata" - #, c-format msgid "commit %s is not marked reachable" msgstr "%s işlemesi ulaşılabilir olarak imlenmedi" @@ -21198,9 +21320,6 @@ msgstr "uzak servis yolu ayarlama protokol tarafından desteklenmiyor" msgid "invalid remote service path" msgstr "geçersiz uzak konum servis yolu" -msgid "operation not supported by protocol" -msgstr "işlem protokol tarafından desteklenmiyor" - #, c-format msgid "can't connect to subservice %s" msgstr "%s altservisine bağlanılamıyor" @@ -21330,10 +21449,6 @@ msgstr "transport.color.* yapılandırması ayrıştırılamadı" msgid "support for protocol v2 not implemented yet" msgstr "protokol v2 desteği henüz yerine getirilmedi" -#, c-format -msgid "unknown value for config '%s': %s" -msgstr "'%s' yapılandırması için bilinmeyen değer: %s" - #, c-format msgid "transport '%s' not allowed" msgstr "'%s' taşıyıcısına izin verilmiyor" @@ -21387,6 +21502,9 @@ msgstr "bundle-uri işlemi protokol tarafından desteklenmiyor" msgid "could not retrieve server-advertised bundle-uri list" msgstr "sunucu tarafından tanıtılan bundle-uri listesi alınamadı" +msgid "operation not supported by protocol" +msgstr "işlem protokol tarafından desteklenmiyor" + msgid "too-short tree object" msgstr "ağaç nesnesi çok kısa" @@ -22210,6 +22328,10 @@ msgstr "Ek olarak, indeksiniz işlenmemiş değişiklikler içeriyor." msgid "cannot %s: Your index contains uncommitted changes." msgstr "%s yapılamıyor: İndeksiniz işlenmemiş değişiklikler içeriyor." +#, c-format +msgid "unknown style '%s' given for '%s'" +msgstr "'%s' bilinmeyen biçemi şunun için verildi: '%s'" + msgid "" "Error: Your local changes to the following files would be overwritten by " "merge" -- cgit 1.2.3-korg From 37c2ad65355b161cddd8c93d5a00a73b71e40977 Mon Sep 17 00:00:00 2001 From: Ralf Thielow Date: Sat, 17 Feb 2024 18:14:54 +0100 Subject: l10n: Update German translation Signed-off-by: Ralf Thielow --- po/de.po | 392 ++++++++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 252 insertions(+), 140 deletions(-) diff --git a/po/de.po b/po/de.po index 95a185afd2..37d6c80998 100644 --- a/po/de.po +++ b/po/de.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2023-11-09 11:29+0100\n" -"PO-Revision-Date: 2023-11-10 14:28+0100\n" +"POT-Creation-Date: 2024-02-17 18:07+0100\n" +"PO-Revision-Date: 2024-02-17 18:14+0100\n" "Last-Translator: Ralf Thielow \n" "Language-Team: German\n" "Language: de\n" @@ -1473,6 +1473,10 @@ msgstr "die Option '%s' erfordert '%s'" msgid "Unexpected option --output" msgstr "Unerwartete Option --output" +#, c-format +msgid "extra command line parameter '%s'" +msgstr "zusätzlicher Befehlszeilenparameter '%s'" + #, c-format msgid "Unknown archive format '%s'" msgstr "Unbekanntes Archivformat '%s'" @@ -1518,6 +1522,14 @@ msgstr "ignoriere übermäßig großen gitattribute-Blob '%s'" msgid "bad --attr-source or GIT_ATTR_SOURCE" msgstr "ungültiges --attr-source oder GIT_ATTR_SOURCE" +#, c-format +msgid "unable to stat '%s'" +msgstr "konnte '%s' nicht lesen" + +#, c-format +msgid "unable to read %s" +msgstr "kann %s nicht lesen" + #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Ungültiger Inhalt bzgl. Anführungszeichen in Datei '%s': %s" @@ -1698,12 +1710,10 @@ msgstr "" msgid "not tracking: ambiguous information for ref '%s'" msgstr "kein Tracking: mehrdeutige Informationen für Referenz '%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 @@ -2830,13 +2840,14 @@ msgid "couldn't look up commit object for '%s'" msgstr "konnte Commit-Objekt für '%s' nicht nachschlagen" #, c-format -msgid "" -"the branch '%s' is not fully merged.\n" -"If you are sure you want to delete it, run 'git branch -D %s'" +msgid "the branch '%s' is not fully merged" +msgstr "der Branch '%s' ist nicht vollständig zusammengeführt" + +#, c-format +msgid "If you are sure you want to delete it, run 'git branch -D %s'" msgstr "" -"Der Branch '%s' ist nicht vollständig zusammengeführt.\n" -"Wenn Sie sicher sind diesen Branch zu entfernen, führen Sie 'git branch -D " -"%s' aus." +"Wenn Sie sicher sind, dass Sie den Branch löschen wollen, führen Sie 'git " +"branch -D %s' aus." msgid "update of config-file failed" msgstr "Aktualisierung der Konfigurationsdatei fehlgeschlagen." @@ -3905,8 +3916,8 @@ msgstr "Auschecken erzwingen (verwirft lokale Änderungen)" msgid "new-branch" msgstr "neuer Branch" -msgid "new unparented branch" -msgstr "neuer Branch ohne Eltern-Commit" +msgid "new unborn branch" +msgstr "neuer ungeborener Branch" msgid "update ignored files (default)" msgstr "ignorierte Dateien aktualisieren (Standard)" @@ -4160,9 +4171,6 @@ msgstr "" "clean.requireForce standardmäßig auf \"true\" gesetzt und weder -i, -n noch -" "f gegeben; \"clean\" verweigert" -msgid "-x and -X cannot be used together" -msgstr "-x und -X können nicht gemeinsam verwendet werden" - msgid "git clone [] [--] []" msgstr "git clone [] [--] []" @@ -4256,6 +4264,9 @@ msgstr ".git-Verzeichnis" msgid "separate git dir from working tree" msgstr "Git-Verzeichnis vom Arbeitsverzeichnis separieren" +msgid "specify the reference format to use" +msgstr "das zu verwendende Referenzformat angeben" + msgid "key=value" msgstr "Schlüssel=Wert" @@ -4379,12 +4390,9 @@ msgstr "Zu viele Argumente." msgid "You must specify a repository to clone." msgstr "Sie müssen ein Repository zum Klonen angeben." -msgid "" -"--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-" -"exclude" -msgstr "" -"--bundle-uri ist inkompatibel mit --depth, --shallow-since und --shallow-" -"exclude" +#, c-format +msgid "unknown ref storage format '%s'" +msgstr "unbekanntes Speicherformat für Referenzen '%s'" #, c-format msgid "repository '%s' does not exist" @@ -4526,7 +4534,7 @@ msgid "" "--stdin-commits]\n" " [--changed-paths] [--[no-]max-new-filters ] [--" "[no-]progress]\n" -" " +" " msgstr "" "git commit-graph write [--object-dir ] [--append]\n" " [--split[=]] [--reachable | --stdin-packs " @@ -6892,7 +6900,6 @@ msgstr "grep: Fehler beim Erzeugen eines Thread: %s" msgid "invalid number of threads specified (%d) for %s" msgstr "ungültige Anzahl von Threads (%d) für %s angegeben" -#. #-#-#-#-# grep.c.po #-#-#-#-# #. TRANSLATORS: %s is the configuration #. variable for tweaking threads, currently #. grep.threads @@ -6905,6 +6912,10 @@ msgstr "keine Unterstützung von Threads, '%s' wird ignoriert" msgid "unable to read tree (%s)" msgstr "konnte \"Tree\"-Objekt (%s) nicht lesen" +#, c-format +msgid "unable to read tree %s" +msgstr "konnte \"Tree\"-Objekt (%s) nicht lesen" + #, c-format msgid "unable to grep from object of type %s" msgstr "kann \"grep\" nicht mit Objekten des Typs %s durchführen" @@ -7326,10 +7337,6 @@ msgstr "ernsthafte Inkonsistenz nach Dekomprimierung" msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SHA1 KOLLISION MIT %s GEFUNDEN !" -#, c-format -msgid "unable to read %s" -msgstr "kann %s nicht lesen" - #, c-format msgid "cannot read existing object info %s" msgstr "Kann existierende Informationen zu Objekt %s nicht lesen." @@ -7470,11 +7477,13 @@ msgstr "fsck Fehler beim Packen von Objekten" msgid "" "git init [-q | --quiet] [--bare] [--template=]\n" " [--separate-git-dir ] [--object-format=]\n" +" [--ref-format=]\n" " [-b | --initial-branch=]\n" " [--shared[=]] []" msgstr "" "git init [-q | --quiet] [--bare] [--template=]\n" " [--separate-git-dir ] [--object-format=]\n" +" [--ref-format=]\n" " [-b | --initial-branch=]\n" " [--shared[=]] []" @@ -8195,6 +8204,13 @@ msgstr "" "git merge-file [] [-L [-L [-L ]]] " " " +msgid "" +"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " +"\"histogram\"" +msgstr "" +"Option diff-algorithm akzeptiert: \"myers\", \"minimal\", \"patience\" and " +"\"histogram\"" + msgid "send results to standard output" msgstr "Ergebnisse zur Standard-Ausgabe senden" @@ -8216,6 +8232,12 @@ msgstr "bei Konflikten ihre Variante verwenden" msgid "for conflicts, use a union version" msgstr "bei Konflikten eine gemeinsame Variante verwenden" +msgid "" +msgstr "" + +msgid "choose a diff algorithm" +msgstr "einen Algorithmus für Änderungen wählen" + msgid "for conflicts, use this marker size" msgstr "bei Konflikten diese Kennzeichnungslänge verwenden" @@ -8307,9 +8329,6 @@ msgstr "--trivial-merge ist mit allen anderen Optionen inkompatibel" msgid "unknown strategy option: -X%s" msgstr "unbekannte Strategie-Option: -X%s" -msgid "--merge-base is incompatible with --stdin" -msgstr "--merge-base ist inkompatibel mit --stdin" - #, c-format msgid "malformed input line: '%s'." msgstr "Fehlerhafte Eingabezeile: '%s'." @@ -9264,6 +9283,10 @@ msgstr "Komprimiere Objekte" msgid "inconsistency with delta count" msgstr "Inkonsistenz mit der Anzahl von Deltas" +#, c-format +msgid "invalid pack.allowPackReuse value: '%s'" +msgstr "ungültiger Wert für pack.allowPackReuse: '%s'" + #, c-format msgid "" "value of uploadpack.blobpackfileuri must be of the form ' (delta %), reused % (delta %), pack-" -"reused %" +"reused % (from %)" msgstr "" "Gesamt % (Delta %), Wiederverwendet % (Delta " -"%), Pack wiederverwendet %" +"%), Paket wiederverwendet % (von %)" msgid "" "'git pack-redundant' is nominated for removal.\n" @@ -10547,13 +10570,6 @@ msgstr "" msgid "switch `C' expects a numerical value" msgstr "Schalter `C' erwartet einen numerischen Wert." -msgid "" -"apply options are incompatible with rebase.autoSquash. Consider adding --no-" -"autosquash" -msgstr "" -"apply-Optionen sind mit rebase.autoSquash nicht kompatibel. Erwägen Sie das " -"Hinzufügen von --no-autosquash" - msgid "" "apply options are incompatible with rebase.rebaseMerges. Consider adding --" "no-rebase-merges" @@ -11567,6 +11583,77 @@ msgstr "--convert-graft-file erwartet keine Argumente" msgid "only one pattern can be given with -l" msgstr "Mit -l kann nur ein Muster angegeben werden" +msgid "need some commits to replay" +msgstr "zum erneuten Abspielen werden Commits benötigt" + +msgid "--onto and --advance are incompatible" +msgstr "--onto und --advance sind inkompatibel" + +msgid "all positive revisions given must be references" +msgstr "alle angegebenen positiven Commits müssen Referenzen sein" + +msgid "argument to --advance must be a reference" +msgstr "Argument für --advance muss eine Referenz sein" + +msgid "" +"cannot advance target with multiple sources because ordering would be ill-" +"defined" +msgstr "" +"kann Ziel nicht mit mehreren Quellen erweitern, da die Reihenfolge unklar " +"wäre" + +msgid "" +"cannot implicitly determine whether this is an --advance or --onto operation" +msgstr "" +"kann nicht implizit bestimmen, ob es sich um eine --advance oder --onto " +"Operation handelt" + +msgid "" +"cannot advance target with multiple source branches because ordering would " +"be ill-defined" +msgstr "" +"kann Ziel nicht mit mehreren Quell-Branches erweitern, da die Reihenfolge " +"unklar wäre" + +msgid "cannot implicitly determine correct base for --onto" +msgstr "kann nicht implizit die richtige Basis für --onto bestimmen" + +msgid "" +"(EXPERIMENTAL!) git replay ([--contained] --onto | --advance " +") ..." +msgstr "" +"(EXPERIMENTELL!) git replay ([--contained] --onto | --advance " +") ..." + +msgid "make replay advance given branch" +msgstr "angegebenen Branch durch neues Abspielen erweitern" + +msgid "replay onto given commit" +msgstr "auf angegebenen Commit neu abspielen" + +msgid "advance all branches contained in revision-range" +msgstr "alle Branches erweitern, die in Commitbereich liegen" + +msgid "option --onto or --advance is mandatory" +msgstr "Option --onto oder --advance erforderlich" + +#, c-format +msgid "" +"some rev walking options will be overridden as '%s' bit in 'struct rev_info' " +"will be forced" +msgstr "" +"einige Optionen für das Abgehen von Commits werden außer Kraft gesetzt, da " +"das '%s' Bit in 'struct rev_info' erzwungen wird" + +msgid "error preparing revisions" +msgstr "Fehler beim Vorbereiten der Commits" + +msgid "replaying down to root commit is not supported yet!" +msgstr "erneutes Abspielen bis zum Root-Commit wird noch nicht unterstützt!" + +msgid "replaying merge commits is not supported yet!" +msgstr "erneutes Abspielen von Merge-Commits wird noch nicht unterstützt!" + msgid "" "git rerere [clear | forget ... | diff | status | remaining | gc]" msgstr "" @@ -11778,15 +11865,6 @@ msgstr "--prefix benötigt ein Argument" msgid "unknown mode for --abbrev-ref: %s" msgstr "unbekannter Modus für --abbrev-ref: %s" -msgid "--exclude-hidden cannot be used together with --branches" -msgstr "--exclude-hidden kann nicht zusammen mit --branches verwendet werden" - -msgid "--exclude-hidden cannot be used together with --tags" -msgstr "--exclude-hidden kann nicht zusammen mit --tags verwendet werden" - -msgid "--exclude-hidden cannot be used together with --remotes" -msgstr "--exclude-hidden kann nicht zusammen mit --remotes verwendet werden" - msgid "this operation must be run in a work tree" msgstr "Diese Operation muss in einem Arbeitsverzeichnis ausgeführt werden." @@ -12202,10 +12280,6 @@ msgstr "" "Referenzen von der Standard-Eingabe anzeigen, die sich nicht im lokalen " "Repository befinden" -#, c-format -msgid "only one of '%s', '%s' or '%s' can be given" -msgstr "es kann nur eines von '%s', '%s' oder '%s' angegeben werden" - msgid "" "git sparse-checkout (init | list | set | add | reapply | disable | check-" "rules) []" @@ -13717,33 +13791,29 @@ msgstr "Kein möglicher Quell-Branch, der auf '--orphan' schließen lässt" #, c-format msgid "" -"If you meant to create a worktree containing a new orphan branch\n" +"If you meant to create a worktree containing a new unborn branch\n" "(branch with no commits) for this repository, you can do so\n" "using the --orphan flag:\n" "\n" " git worktree add --orphan -b %s %s\n" msgstr "" -"Wenn Sie ein Arbeitsverzeichnis erstellen möchten, um einen neuen verwaisten " -"Branch\n" -"(Branch ohne Commits) für dieses Repository zu erstellen, können Sie dies " -"mit\n" -"der Option --orphan tun:\n" +"Wenn Sie ein Arbeitsverzeichnis erstellen möchten, welches einen neuen\n" +"ungeborenen Branch (Branch ohne Commits) für dieses Repository erzeugt,\n" +"können Sie dies mit der Option --orphan tun:\n" "\n" " git worktree add --orphan -b %s %s\n" #, c-format msgid "" -"If you meant to create a worktree containing a new orphan branch\n" +"If you meant to create a worktree containing a new unborn branch\n" "(branch with no commits) for this repository, you can do so\n" "using the --orphan flag:\n" "\n" " git worktree add --orphan %s\n" msgstr "" -"Wenn Sie ein Arbeitsverzeichnis erstellen möchten, um einen neuen verwaisten " -"Branch\n" -"(Branch ohne Commits) für dieses Repository zu erstellen, können Sie dies " -"mit\n" -"der Option --orphan tun:\n" +"Wenn Sie ein Arbeitsverzeichnis erstellen möchten, welches einen neuen\n" +"ungeborenen Branch (Branch ohne Commits) für dieses Repository erzeugt,\n" +"können Sie dies mit der Option --orphan tun:\n" "\n" " git worktree add --orphan %s\n" @@ -13805,6 +13875,10 @@ msgstr "Konnte Verzeichnis '%s' nicht erstellen." msgid "initializing" msgstr "initialisiere" +#, c-format +msgid "could not find created worktree '%s'" +msgstr "konnte erstelltes Arbeitsverzeichnis '%s' nicht finden" + #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Bereite Arbeitsverzeichnis vor (neuer Branch '%s')" @@ -13845,10 +13919,6 @@ msgstr "" "Referenz zu überschreiben\n" "oder rufen Sie diese zuerst ab" -#, c-format -msgid "'%s' and '%s' cannot be used together" -msgstr "'%s' und '%s' können nicht zusammen verwendet werden" - msgid "checkout even if already checked out in other worktree" msgstr "" " auschecken, auch wenn dieser bereits in einem anderen " @@ -13860,8 +13930,8 @@ msgstr "neuen Branch erstellen" msgid "create or reset a branch" msgstr "Branch erstellen oder umsetzen" -msgid "create unborn/orphaned branch" -msgstr "ungeborenen/verwaisten Branch erstellen" +msgid "create unborn branch" +msgstr "ungeborenen Branch erzeugen" msgid "populate the new working tree" msgstr "das neue Arbeitsverzeichnis auschecken" @@ -13886,11 +13956,8 @@ msgstr "" "die Optionen '%s', '%s' und '%s' können nicht gemeinsam verwendet werden" #, c-format -msgid "options '%s', and '%s' cannot be used together" -msgstr "die Optionen '%s' und '%s' können nicht gemeinsam verwendet werden" - -msgid "" -msgstr "" +msgid "option '%s' and commit-ish cannot be used together" +msgstr "Option '%s' und commit-ish können nicht gemeinsam verwendet werden" msgid "added with --lock" msgstr "mit --lock hinzugefügt" @@ -14541,6 +14608,11 @@ msgstr "ungepackte Objekte in einem Repository packen" msgid "Create, list, delete refs to replace objects" msgstr "Referenzen für ersetzende Objekte erstellen, auflisten, löschen" +msgid "EXPERIMENTAL: Replay commits on a new base, works with bare repos too" +msgstr "" +"EXPERIMENTELL: Commits auf neuer Basis abspielen, funktioniert auch mit Bare-" +"Repositories" + msgid "Generates a summary of pending changes" msgstr "eine Übersicht über ausstehende Änderungen generieren" @@ -14785,6 +14857,32 @@ msgstr "Ein Werkzeug zur Verwaltung großer Git-Repositories" msgid "commit-graph file is too small" msgstr "Commit-Graph-Datei ist zu klein" +msgid "commit-graph oid fanout chunk is wrong size" +msgstr "Commit-Graph OID fanout Chunk hat die falsche Größe" + +msgid "commit-graph fanout values out of order" +msgstr "Commit-Graph fanout-Werte sind nicht in Ordnung" + +msgid "commit-graph OID lookup chunk is the wrong size" +msgstr "Commit-Graph OID Lookup Chunk hat die falsche Größe" + +msgid "commit-graph commit data chunk is wrong size" +msgstr "Commit-Graph Commit Daten Chunk hat die falsche Größe" + +msgid "commit-graph generations chunk is wrong size" +msgstr "Commit-Graph Generations Chunk hat die falsche Größe" + +msgid "commit-graph changed-path index chunk is too small" +msgstr "Commit-Graph changed-path Index Chunk ist zu klein" + +#, c-format +msgid "" +"ignoring too-small changed-path chunk (% < %) in commit-" +"graph file" +msgstr "" +"ignoriere zu kleinen Chunk für geänderte Pfade (% < %) in " +"Commit-Graph-Datei" + #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "Commit-Graph-Signatur %X stimmt nicht mit Signatur %X überein" @@ -14801,6 +14899,16 @@ msgstr "Hash-Version des Commit-Graph %X stimmt nicht mit Version %X überein" msgid "commit-graph file is too small to hold %u chunks" msgstr "Commit-Graph-Datei ist zu klein, um %u Chunks zu enthalten" +msgid "commit-graph required OID fanout chunk missing or corrupted" +msgstr "Commit-Graph benötigter OID fanout Chunk fehlt oder ist beschädigt" + +msgid "commit-graph required OID lookup chunk missing or corrupted" +msgstr "Commit-Graph benötigter OID lookup Chunk fehlt oder ist beschädigt" + +msgid "commit-graph required commit data chunk missing or corrupted" +msgstr "" +"Commit-Graph erforderlicher Commit-Daten Chunk fehlt oder ist beschädigt" + msgid "commit-graph has no base graphs chunk" msgstr "Commit-Graph hat keinen Basis-Graph-Chunk" @@ -14814,6 +14922,9 @@ msgstr "Commit-Graph Verkettung stimmt nicht überein" msgid "commit count in base graph too high: %" msgstr "Anzahl der Commits im Basisgraph zu hoch: %" +msgid "commit-graph chain file too small" +msgstr "Commit-Graph Chain-Datei zu klein" + #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "Ungültige Commit-Graph Verkettung: Zeile '%s' ist kein Hash" @@ -14834,6 +14945,9 @@ msgstr "Commit-Graph erfordert Überlaufgenerierungsdaten, aber hat keine" msgid "commit-graph overflow generation data is too small" msgstr "Commit-Graph Überlaufgenerierungsdaten sind zu klein" +msgid "commit-graph extra-edges pointer out of bounds" +msgstr "commit-graph extra-edges Zeiger außerhalb der Grenzen" + msgid "Loading known commits in commit graph" msgstr "Lade bekannte Commits in Commit-Graph" @@ -16000,6 +16114,10 @@ msgstr "" msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Unbekannter Wert in Konfigurationsvariable 'diff.submodule': '%s'" +#, c-format +msgid "unknown value for config '%s': %s" +msgstr "Unbekannter Wert für Konfiguration '%s': %s" + #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -16082,13 +16200,6 @@ msgstr "ungültiges --color-moved Argument: %s" msgid "invalid mode '%s' in --color-moved-ws" msgstr "ungültiger Modus '%s' in --color-moved-ws" -msgid "" -"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " -"\"histogram\"" -msgstr "" -"Option diff-algorithm akzeptiert: \"myers\", \"minimal\", \"patience\" and " -"\"histogram\"" - #, c-format msgid "invalid argument to %s" msgstr "ungültiges Argument für %s" @@ -16132,8 +16243,8 @@ msgstr "maschinenlesbare Ausgabe von --stat" msgid "output only the last line of --stat" msgstr "nur die letzte Zeile von --stat ausgeben" -msgid "..." -msgstr "..." +msgid ",..." +msgstr ",..." msgid "" "output the distribution of relative amount of changes for each sub-directory" @@ -16144,8 +16255,8 @@ msgstr "" msgid "synonym for --dirstat=cumulative" msgstr "Synonym für --dirstat=cumulative" -msgid "synonym for --dirstat=files,param1,param2..." -msgstr "Synonym für --dirstat=files,Parameter1,Parameter2..." +msgid "synonym for --dirstat=files,,..." +msgstr "Synonym für --dirstat=files,,..." msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" @@ -16328,12 +16439,6 @@ msgstr "Änderungen durch Nutzung des Algorithmus \"Patience Diff\" erzeugen" msgid "generate diff using the \"histogram diff\" algorithm" msgstr "Änderungen durch Nutzung des Algorithmus \"Histogram Diff\" erzeugen" -msgid "" -msgstr "" - -msgid "choose a diff algorithm" -msgstr "einen Algorithmus für Änderungen wählen" - msgid "" msgstr "" @@ -17547,7 +17652,7 @@ msgstr "" #. conflict in a submodule. The first argument is the submodule #. 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" +#. - go to submodule (mysubmodule), and either merge commit abc1234" #. #, c-format msgid "" @@ -17848,6 +17953,13 @@ msgstr "Lesen des Zwischenspeichers fehlgeschlagen" msgid "multi-pack-index OID fanout is of the wrong size" msgstr "Multi-Pack-Index OID fanout hat die falsche Größe" +#, c-format +msgid "" +"oid fanout out of order: fanout[%d] = % > % = fanout[%d]" +msgstr "" +"Ungültige oid fanout Reihenfolge: fanout[%d] = % > % = " +"fanout[%d]" + msgid "multi-pack-index OID lookup chunk is the wrong size" msgstr "multi-pack-index OID-Lookup-Chunk hat die falsche Größe" @@ -17898,6 +18010,13 @@ msgstr "Falsche Reihenfolge bei Multi-Pack-Index Pack-Namen: '%s' vor '%s'" msgid "bad pack-int-id: %u (%u total packs)" msgstr "Ungültige pack-int-id: %u (%u Pakete insgesamt)" +msgid "MIDX does not contain the BTMP chunk" +msgstr "MIDX enthält keinen BTMP-Chunk" + +#, c-format +msgid "could not load bitmapped pack %" +msgstr "konnte Bitmap-Paket nicht laden %" + msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "" "Multi-Pack-Index speichert einen 64-Bit Offset, aber off_t ist zu klein" @@ -17983,13 +18102,6 @@ msgstr "Prüfsumme nicht korrekt" msgid "Looking for referenced packfiles" msgstr "Suche nach referenzierten Pack-Dateien" -#, c-format -msgid "" -"oid fanout out of order: fanout[%d] = % > % = fanout[%d]" -msgstr "" -"Ungültige oid fanout Reihenfolge: fanout[%d] = % > % = " -"fanout[%d]" - msgid "the midx contains no oid" msgstr "das midx enthält keine oid" @@ -18304,7 +18416,7 @@ msgstr "%s [ungültiges Objekt]" #. TRANSLATORS: This is a line of ambiguous commit #. object output. E.g.: #. * -#. "deadbeef commit 2021-01-01 - Some Commit Message" +#. "deadbeef commit 2021-01-01 - Some Commit Message" #. #, c-format msgid "%s commit %s - %s" @@ -18313,7 +18425,7 @@ msgstr "%s Commit %s - %s" #. TRANSLATORS: This is a line of ambiguous #. tag object output. E.g.: #. * -#. "deadbeef tag 2022-01-01 - Some Tag Message" +#. "deadbeef tag 2022-01-01 - Some Tag Message" #. * #. The second argument is the YYYY-MM-DD found #. in the tag. @@ -18329,7 +18441,7 @@ msgstr "%s Tag %s - %s" #. tag object output where we couldn't parse #. the tag itself. E.g.: #. * -#. "deadbeef [bad tag, could not parse it]" +#. "deadbeef [bad tag, could not parse it]" #. #, c-format msgid "%s [bad tag, could not parse it]" @@ -18525,6 +18637,9 @@ msgstr "Multi-Pack-Bitmap fehlt erforderlicher Reverse-Index" msgid "could not open pack %s" msgstr "konnte Paket '%s' nicht öffnen" +msgid "could not determine MIDX preferred pack" +msgstr "konnte das von MIDX bevorzugte Paket nicht ermitteln" + #, c-format msgid "preferred pack (%s) is invalid" msgstr "bevorzugtes Paket (%s) ist ungültig" @@ -18547,6 +18662,12 @@ msgid "corrupt ewah bitmap: truncated header for bitmap of commit \"%s\"" msgstr "" "fehlerhafte ewah-Bitmap: abgeschnittener Header für Bitmap des Commits \"%s\"" +#, c-format +msgid "unable to load pack: '%s', disabling pack-reuse" +msgstr "" +"Paket kann nicht geladen werden: '%s', Deaktivierung der Paket-" +"Wiederverwendung" + #, c-format msgid "object '%s' not found in type bitmaps" msgstr "Objekt '%s' nicht im Typ Bitmaps gefunden" @@ -18638,6 +18759,9 @@ msgstr "ungültige rev-index Position bei %: % != %" msgid "multi-pack-index reverse-index chunk is the wrong size" msgstr "multi-pack-index Reverse-Index Chunk hat die falsche Größe" +msgid "could not determine preferred pack" +msgstr "konnte das bevorzugte Paket nicht bestimmen" + msgid "cannot both write and verify reverse index" msgstr "" "Reverse-Index kann nicht gleichzeitig geschrieben und verifiziert werden" @@ -18703,10 +18827,6 @@ msgstr "" "%s erwartet einen nicht-negativen Integer-Wert mit einem optionalen k/m/g " "Suffix" -#, c-format -msgid "%s is incompatible with %s" -msgstr "%s ist inkompatibel mit %s." - #, c-format msgid "ambiguous option: %s (could be --%s%s or --%s%s)" msgstr "Mehrdeutige Option: %s (kann --%s%s oder --%s%s sein)" @@ -19030,10 +19150,6 @@ msgstr "Konnte Datei '%s' nicht indizieren." msgid "unable to add '%s' to index" msgstr "Konnte '%s' nicht dem Index hinzufügen." -#, c-format -msgid "unable to stat '%s'" -msgstr "konnte '%s' nicht lesen" - #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "'%s' scheint eine Datei und ein Verzeichnis zu sein" @@ -19612,10 +19728,6 @@ msgstr "'%s' existiert; kann '%s' nicht erstellen" msgid "cannot process '%s' and '%s' at the same time" msgstr "kann '%s' und '%s' nicht zur selben Zeit verarbeiten" -#, c-format -msgid "could not remove reference %s" -msgstr "konnte Referenz %s nicht löschen" - #, c-format msgid "could not delete reference %s: %s" msgstr "konnte Referenz %s nicht entfernen: %s" @@ -19810,16 +19922,13 @@ msgid "" "\n" "Neither worked, so we gave up. You must fully qualify the ref." msgstr "" -"Das angegebene Ziel ist kein vollständiger Referenzname (startet mit \"refs/" -"\").\n" -"Wir versuchten zu erraten, was Sie meinten, mit:\n" +"Das angegebene Ziel ist kein vollständiger Referenzname (startet mit\n" +"\"refs/\"). Wir versuchten zu erraten, was Sie meinten, mit:\n" "\n" "- Suche einer Referenz, die mit '%s' übereinstimmt, auf der Remote-Seite\n" -"- Prüfung, ob die versendete ('%s') eine Referenz in \"refs/{heads," -"tags}\"\n" -" ist, in dessen Falle wir einen entsprechenden refs/{heads,tags} Präfix " -"auf\n" -" der Remote-Seite hinzufügen würden.\n" +"- Prüfung, ob die versendete ('%s') eine Referenz in\n" +" \"refs/{heads,tags}/\" ist, in dessen Falle wir einen entsprechenden\n" +" refs/{heads,tags}/ Präfix auf der Remote-Seite hinzufügen würden.\n" "\n" "Keines hat funktioniert, sodass wir aufgegeben haben. Sie müssen die\n" "Referenz mit vollqualifizierten Namen angeben." @@ -21004,6 +21113,9 @@ msgstr "Beim Anwenden des automatischen Stash traten Konflikte auf." msgid "Autostash exists; creating a new stash entry." msgstr "Automatischer Stash existiert; ein neuer Stash-Eintrag wird erstellt." +msgid "autostash reference is a symref" +msgstr "Referenz für autostash ist eine symbolische Referenz" + msgid "could not detach HEAD" msgstr "konnte HEAD nicht loslösen" @@ -21323,6 +21435,10 @@ msgstr "kopiere keine Vorlagen von '%s': %s" msgid "invalid initial branch name: '%s'" msgstr "ungültiger initialer Branchname: '%s'" +#, c-format +msgid "re-init: ignored --initial-branch=%s" +msgstr "Neu-Initialisierung: --initial-branch=%s ignoriert" + #, c-format msgid "unable to handle file type %d" msgstr "kann nicht mit Dateityp %d umgehen" @@ -21334,14 +21450,16 @@ msgstr "konnte %s nicht nach %s verschieben" msgid "attempt to reinitialize repository with different hash" msgstr "Versuch, das Repository mit einem anderen Hash zu reinitialisieren" +msgid "" +"attempt to reinitialize repository with different reference storage format" +msgstr "" +"Versuch, das Repository mit einem anderen Referenzspeicherformat neu zu " +"initialisieren" + #, c-format msgid "%s already exists" msgstr "%s existiert bereits" -#, c-format -msgid "re-init: ignored --initial-branch=%s" -msgstr "Neu-Initialisierung: --initial-branch=%s ignoriert" - #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "Bestehendes verteiltes Git-Repository in %s%s neuinitialisiert\n" @@ -21611,12 +21729,6 @@ msgstr "" "Anzahl der Einträge im Cache-Verzeichnis, die ungültig gemacht werden sollen " "(Standardwert 0)" -msgid "unhandled options" -msgstr "unbehandelte Optionen" - -msgid "error preparing revisions" -msgstr "Fehler beim Vorbereiten der Commits" - #, c-format msgid "commit %s is not marked reachable" msgstr "Commit %s ist nicht als erreichbar gekennzeichnet." @@ -21772,9 +21884,6 @@ msgstr "" msgid "invalid remote service path" msgstr "ungültiger Remote-Service Pfad." -msgid "operation not supported by protocol" -msgstr "die Operation wird von dem Protokoll nicht unterstützt" - #, c-format msgid "can't connect to subservice %s" msgstr "kann keine Verbindung zu Subservice %s herstellen" @@ -21904,10 +22013,6 @@ msgstr "Konnte transport.color.* Konfiguration nicht parsen." msgid "support for protocol v2 not implemented yet" msgstr "Unterstützung für Protokoll v2 noch nicht implementiert." -#, c-format -msgid "unknown value for config '%s': %s" -msgstr "Unbekannter Wert für Konfiguration '%s': %s" - #, c-format msgid "transport '%s' not allowed" msgstr "Übertragungsart '%s' nicht erlaubt." @@ -21961,6 +22066,9 @@ msgstr "bundle-uri Operation wird vom Protokoll nicht unterstützt" msgid "could not retrieve server-advertised bundle-uri list" msgstr "konnte die vom Server angekündigte bundle-uri-Liste nicht abrufen" +msgid "operation not supported by protocol" +msgstr "die Operation wird von dem Protokoll nicht unterstützt" + msgid "too-short tree object" msgstr "zu kurzes Tree-Objekt" @@ -22849,6 +22957,10 @@ msgid "cannot %s: Your index contains uncommitted changes." msgstr "" "%s nicht möglich: Die Staging-Area enthält nicht committete Änderungen." +#, c-format +msgid "unknown style '%s' given for '%s'" +msgstr "unbekannter Stil '%s' für '%s' angegeben" + msgid "" "Error: Your local changes to the following files would be overwritten by " "merge" -- cgit 1.2.3-korg From 3c58354a5319393425847add40c2458d59c9d649 Mon Sep 17 00:00:00 2001 From: Teng Long Date: Mon, 12 Feb 2024 21:04:30 +0800 Subject: l10n: zh_CN: for git 2.44 rounds In addition to the localized translation in 2.44, for zh_CN, we have uniformly modified the translation of the word "commit-graph" to make it more consistent with language usage habits. Signed-off-by: Teng Long --- po/zh_CN.po | 538 ++++++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 340 insertions(+), 198 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 86402725b2..39efaf1012 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -46,6 +46,7 @@ # commit | 提交 # commit message | 提交说明 # commit object | 提交对象 +# commit-graph | 提交图 # commit-ish (also committish) | 提交号 # cone | 锥形（稀疏检出模型）；锥（稀疏检出） # conflict | 冲突 @@ -99,6 +100,7 @@ # plumbing | 管件（Git 底层核心命令的别称） # porcelain | 瓷件（Git 上层封装命令的别称） # precious-objects repo | 珍品仓库 +# preferred pack | 首选包（多包索引中引入的首选包概念） # promisor | 承诺者 # prune | 清除 # pull | 拉，拉取 @@ -151,8 +153,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2023-11-10 10:49+0800\n" -"PO-Revision-Date: 2023-11-10 17:13+0800\n" +"POT-Creation-Date: 2024-02-16 14:27+0800\n" +"PO-Revision-Date: 2024-02-18 11:47+0800\n" "Last-Translator: Teng Long \n" "Language-Team: GitHub \n" "Language: zh_CN\n" @@ -1031,7 +1033,7 @@ msgid "unclosed quote" msgstr "未关闭的引号" #: alias.c builtin/cat-file.c builtin/notes.c builtin/prune-packed.c -#: builtin/receive-pack.c builtin/tag.c +#: builtin/receive-pack.c builtin/tag.c t/helper/test-pkt-line.c msgid "too many arguments" msgstr "太多参数" @@ -1046,12 +1048,13 @@ msgid "unrecognized whitespace ignore option '%s'" msgstr "未能识别的空白字符忽略选项 '%s'" #: apply.c archive.c builtin/add.c builtin/branch.c builtin/checkout-index.c -#: builtin/checkout.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.c -#: builtin/pack-objects.c builtin/push.c builtin/rebase.c builtin/repack.c -#: builtin/reset.c builtin/rev-list.c builtin/show-branch.c builtin/stash.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/pack-objects.c builtin/rebase.c +#: builtin/repack.c builtin/replay.c builtin/reset.c builtin/rev-list.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 @@ -1859,6 +1862,11 @@ msgstr "选项 '%s' 需要 '%s'" msgid "Unexpected option --output" msgstr "未知参数 --output" +#: archive.c +#, c-format +msgid "extra command line parameter '%s'" +msgstr "额外的命令行参数：'%s'" + #: archive.c #, c-format msgid "Unknown archive format '%s'" @@ -1915,6 +1923,17 @@ msgstr "忽略过大的 gitattributes 数据对象 '%s'" msgid "bad --attr-source or GIT_ATTR_SOURCE" msgstr "错误的 --attr-source 或 GIT_ATTR_SOURCE" +#: attr.c read-cache.c +#, c-format +msgid "unable to stat '%s'" +msgstr "无法对 %s 执行 stat" + +#: bisect.c builtin/cat-file.c builtin/index-pack.c builtin/notes.c +#: builtin/pack-objects.c combine-diff.c rerere.c +#, c-format +msgid "unable to read %s" +msgstr "不能读 %s" + #: bisect.c #, c-format msgid "Badly quoted content in file '%s': %s" @@ -2448,8 +2467,8 @@ msgid "bad action '%s' for '%s'" msgstr "'%2$s' 的错误动作 '%1$s'" #: builtin/am.c builtin/blame.c builtin/fetch.c builtin/pack-objects.c -#: builtin/pull.c diff-merges.c gpg-interface.c ls-refs.c parallel-checkout.c -#: sequencer.c setup.c +#: builtin/pull.c config.c diff-merges.c gpg-interface.c ls-refs.c +#: parallel-checkout.c sequencer.c setup.c #, c-format msgid "invalid value for '%s': '%s'" msgstr "'%s' 的值无效：'%s'" @@ -2602,8 +2621,7 @@ msgstr "git write-tree 无法写入树对象" msgid "applying to an empty history" msgstr "正应用到一个空历史上" -#: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c -#: t/helper/test-fast-rebase.c +#: builtin/am.c builtin/commit.c builtin/merge.c builtin/replay.c sequencer.c msgid "failed to write commit object" msgstr "无法写提交对象" @@ -2783,8 +2801,9 @@ msgid "n" msgstr "n" #: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c -#: builtin/diagnose.c builtin/for-each-ref.c builtin/ls-files.c -#: builtin/ls-tree.c builtin/replace.c builtin/tag.c builtin/verify-tag.c +#: builtin/clone.c builtin/diagnose.c builtin/for-each-ref.c builtin/init-db.c +#: builtin/ls-files.c builtin/ls-tree.c builtin/replace.c builtin/tag.c +#: builtin/verify-tag.c msgid "format" msgstr "格式" @@ -2916,7 +2935,9 @@ msgstr "git archive：应有一个 flush 包" msgid "" "git bisect start [--term-(new|bad)= --term-(old|good)=] [--no-" "checkout] [--first-parent] [ [...]] [--] [...]" -msgstr "git bisect start [--term-{new|bad}=<术语> --term-{old|good}=<术语>] [--no-checkout] [--first-parent] [<坏> [<好>...]] [--] [<路径规格>...]" +msgstr "" +"git bisect start [--term-{new|bad}=<术语> --term-{old|good}=<术语>] [--no-" +"checkout] [--first-parent] [<坏> [<好>...]] [--] [<路径规格>...]" #: builtin/bisect.c msgid "git bisect (good|bad) [...]" @@ -3473,12 +3494,13 @@ msgstr "无法查询 '%s' 指向的提交对象" #: builtin/branch.c #, c-format -msgid "" -"the branch '%s' is not fully merged.\n" -"If you are sure you want to delete it, run 'git branch -D %s'" -msgstr "" -"分支 '%s' 没有完全合并。\n" -"如果您确认要删除它，执行 'git branch -D %s'" +msgid "the branch '%s' is not fully merged" +msgstr "分支 '%s' 没有完全合并" + +#: builtin/branch.c +#, c-format +msgid "If you are sure you want to delete it, run 'git branch -D %s'" +msgstr "如果您确认要删除它，执行 'git branch -D %s'" #: builtin/branch.c msgid "update of config-file failed" @@ -4488,7 +4510,7 @@ msgstr "不能对 '%s' 执行 reflog 操作：%s\n" msgid "HEAD is now at" msgstr "HEAD 目前位于" -#: builtin/checkout.c builtin/clone.c t/helper/test-fast-rebase.c +#: builtin/checkout.c builtin/clone.c msgid "unable to update HEAD" msgstr "不能更新 HEAD" @@ -4757,8 +4779,8 @@ msgid "new-branch" msgstr "新分支" #: builtin/checkout.c -msgid "new unparented branch" -msgstr "新的没有父提交的分支" +msgid "new unborn branch" +msgstr "新的未诞生的分支" #: builtin/checkout.c builtin/merge.c msgid "update ignored files (default)" @@ -4824,7 +4846,7 @@ msgstr "" msgid "you must specify path(s) to restore" msgstr "您必须指定要恢复的路径" -#: builtin/checkout.c builtin/clone.c builtin/remote.c +#: builtin/checkout.c builtin/clone.c builtin/remote.c builtin/replay.c #: builtin/submodule--helper.c builtin/worktree.c msgid "branch" msgstr "分支" @@ -5065,10 +5087,6 @@ msgid "" msgstr "" "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作" -#: builtin/clean.c -msgid "-x and -X cannot be used together" -msgstr "-x 和 -X 不能同时使用" - #: builtin/clone.c msgid "git clone [] [--] []" msgstr "git clone [<选项>] [--] <仓库> [<路径>]" @@ -5160,6 +5178,7 @@ msgid "create a shallow clone since a specific time" msgstr "从一个特定时间创建一个浅克隆" #: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/rebase.c +#: builtin/replay.c msgid "revision" msgstr "版本" @@ -5187,6 +5206,10 @@ msgstr "git目录" msgid "separate git dir from working tree" msgstr "git目录和工作区分离" +#: builtin/clone.c builtin/init-db.c +msgid "specify the reference format to use" +msgstr "指定要使用的引用格式" + #: builtin/clone.c msgid "key=value" msgstr "key=value" @@ -5336,11 +5359,10 @@ msgstr "太多参数。" msgid "You must specify a repository to clone." msgstr "您必须指定一个仓库来克隆。" -#: builtin/clone.c -msgid "" -"--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-" -"exclude" -msgstr "--bundle-uri 与 --depth、--shallow-since 和 --shallow-exclude 不兼容" +#: builtin/clone.c builtin/init-db.c setup.c +#, c-format +msgid "unknown ref storage format '%s'" +msgstr "未知的引用存储格式 '%s'" #: builtin/clone.c #, c-format @@ -5501,7 +5523,7 @@ msgid "" "--stdin-commits]\n" " [--changed-paths] [--[no-]max-new-filters ] [--" "[no-]progress]\n" -" " +" " msgstr "" "git commit-graph write [--object-dir <目录>] [--append]\n" " [--split[=<策略>]] [--reachable | --stdin-packs | --" @@ -5520,17 +5542,17 @@ msgstr "保存图形的对象目录" #: builtin/commit-graph.c msgid "if the commit-graph is split, only verify the tip file" -msgstr "如果提交图形被拆分，只验证头一个文件" +msgstr "如果提交图被拆分，只验证头一个文件" #: builtin/commit-graph.c #, c-format msgid "Could not open commit-graph '%s'" -msgstr "无法打开提交图形 '%s'" +msgstr "无法打开提交图 '%s'" #: builtin/commit-graph.c #, c-format msgid "could not open commit-graph chain '%s'" -msgstr "无法打开提交图形链 '%s'" +msgstr "无法打开提交图链 '%s'" #: builtin/commit-graph.c #, c-format @@ -5574,15 +5596,15 @@ msgstr "启用变更路径的计算" #: builtin/commit-graph.c msgid "allow writing an incremental commit-graph file" -msgstr "允许写一个增量提交图形文件" +msgstr "允许写一个增量提交图文件" #: builtin/commit-graph.c msgid "maximum number of commits in a non-base split commit-graph" -msgstr "在非基本拆分提交图形中的最大提交数" +msgstr "在非基本拆分提交图中的最大提交数" #: builtin/commit-graph.c msgid "maximum ratio between two levels of a split commit-graph" -msgstr "一个拆分提交图形的两个级别之间的最大比率" +msgstr "一个拆分提交图的两个级别之间的最大比率" #: builtin/commit-graph.c msgid "only expire files older than a given date-time" @@ -8378,6 +8400,11 @@ msgstr "没有线程支持，忽略 %s" msgid "unable to read tree (%s)" msgstr "无法读取树（%s）" +#: builtin/grep.c +#, c-format +msgid "unable to read tree %s" +msgstr "无法读取树 %s" + #: builtin/grep.c #, c-format msgid "unable to grep from object of type %s" @@ -8901,11 +8928,6 @@ msgstr "解压缩严重的不一致" msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "发现 %s 出现 SHA1 冲突！" -#: builtin/index-pack.c builtin/pack-objects.c -#, c-format -msgid "unable to read %s" -msgstr "不能读 %s" - #: builtin/index-pack.c #, c-format msgid "cannot read existing object info %s" @@ -9083,11 +9105,13 @@ msgstr "在打包对象中 fsck 检查出错" msgid "" "git init [-q | --quiet] [--bare] [--template=]\n" " [--separate-git-dir ] [--object-format=]\n" +" [--ref-format=]\n" " [-b | --initial-branch=]\n" " [--shared[=]] []" msgstr "" "git init [-q | --quiet] [--bare] [--template=<模板目录>]\n" " [--separate-git-dir ] [--object-format=<格式>]\n" +" [--ref-format=<格式>]\n" " [-b <分支名> | --initial-branch=<分支名>]\n" " [--shared[=<权限>]] [<目录>]" @@ -9246,7 +9270,7 @@ msgid "" "" msgstr "跟踪 <文件> 中 <开始>,<结束> 范围内的行或函数 :<函数名> 的演变" -#: builtin/log.c builtin/shortlog.c bundle.c +#: builtin/log.c builtin/replay.c builtin/shortlog.c bundle.c #, c-format msgid "unrecognized argument: %s" msgstr "未能识别的参数：%s" @@ -9990,6 +10014,12 @@ msgstr "" "git merge-file [<选项>] [-L <名字1> [-L <初始名字> [-L <名字2>]]] <文件1> <初" "始文件> <文件2>" +#: builtin/merge-file.c diff.c +msgid "" +"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " +"\"histogram\"" +msgstr "选项 diff-algorithm 接受参数 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\"" + #: builtin/merge-file.c msgid "send results to standard output" msgstr "将结果发送到标准输出" @@ -10018,6 +10048,14 @@ msgstr "如果冲突，使用他们的版本" msgid "for conflicts, use a union version" msgstr "如果冲突，使用联合版本" +#: builtin/merge-file.c diff.c +msgid "" +msgstr "<算法>" + +#: builtin/merge-file.c diff.c +msgid "choose a diff algorithm" +msgstr "选择一个差异算法" + #: builtin/merge-file.c msgid "for conflicts, use this marker size" msgstr "如果冲突，使用指定长度的标记" @@ -10135,10 +10173,6 @@ msgstr "--trivial-merge 与其他所有选项不兼容" msgid "unknown strategy option: -X%s" msgstr "未知的策略选项：-X%s" -#: builtin/merge-tree.c -msgid "--merge-base is incompatible with --stdin" -msgstr "--merge-base 与 --stdin 不兼容" - #: builtin/merge-tree.c builtin/notes.c #, c-format msgid "malformed input line: '%s'." @@ -10296,7 +10330,7 @@ msgstr "'%s' 没有指向一个提交" msgid "Bad branch.%s.mergeoptions string: %s" msgstr "坏的 branch.%s.mergeoptions 字符串：%s" -#: builtin/merge.c builtin/stash.c merge-recursive.c +#: builtin/merge.c merge-recursive.c msgid "Unable to write index." msgstr "不能写入索引。" @@ -10304,7 +10338,7 @@ msgstr "不能写入索引。" msgid "Not handling anything other than two heads merge." msgstr "未处理两个头合并之外的任何操作。" -#: builtin/merge.c t/helper/test-fast-rebase.c +#: builtin/merge.c #, c-format msgid "unable to write %s" msgstr "不能写 %s" @@ -11290,6 +11324,11 @@ msgstr "压缩对象中" msgid "inconsistency with delta count" msgstr "不一致的差异计数" +#: builtin/pack-objects.c +#, c-format +msgid "invalid pack.allowPackReuse value: '%s'" +msgstr "无效的 pack.allowPackReuse 值：'%s'" + #: builtin/pack-objects.c #, c-format msgid "" @@ -11614,10 +11653,10 @@ msgstr "枚举对象中" #, c-format msgid "" "Total % (delta %), reused % (delta %), pack-" -"reused %" +"reused % (from %)" msgstr "" "总共 %（差异 %），复用 %（差异 %），包复用 " -"%" +"%（来自 % 个包）" #: builtin/pack-redundant.c msgid "" @@ -12691,7 +12730,7 @@ msgstr "没有正在进行的变基？" msgid "The --edit-todo action can only be used during interactive rebase." msgstr "动作 --edit-todo 只能用在交互式变基过程中。" -#: builtin/rebase.c t/helper/test-fast-rebase.c +#: builtin/rebase.c msgid "Cannot read HEAD" msgstr "不能读取 HEAD" @@ -12735,12 +12774,6 @@ msgstr "" msgid "switch `C' expects a numerical value" msgstr "开关 `C' 期望一个数字值" -#: builtin/rebase.c -msgid "" -"apply options are incompatible with rebase.autoSquash. Consider adding --no-" -"autosquash" -msgstr "应用的选项与 rebase.autoSquash 不兼容。考虑加上 --no-autosquash" - #: builtin/rebase.c msgid "" "apply options are incompatible with rebase.rebaseMerges. Consider adding --" @@ -13224,8 +13257,8 @@ msgid "" msgid_plural "" "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n" "to delete them, use:" -msgstr[0] "注意：ref/remotes 层级之外的一个分支未被移除。要删除它，使用：" -msgstr[1] "注意：ref/remotes 层级之外的一些分支未被移除。要删除它们，使用：" +msgstr[0] "注意：refs/remotes/ 层级之外的一个分支未被移除。要删除它，使用：" +msgstr[1] "注意：refs/remotes/ 层级之外的一些分支未被移除。要删除它们，使用：" #: builtin/remote.c #, c-format @@ -13956,6 +13989,84 @@ msgstr "--convert-graft-file 不带参数" msgid "only one pattern can be given with -l" msgstr "只能为 -l 提供一个模式" +#: builtin/replay.c +msgid "need some commits to replay" +msgstr "需要一些提交来重放" + +#: builtin/replay.c +msgid "--onto and --advance are incompatible" +msgstr "--onto 和 --advance 不兼容" + +#: builtin/replay.c +msgid "all positive revisions given must be references" +msgstr "提供的所有正向版本必须为引用" + +#: builtin/replay.c +msgid "argument to --advance must be a reference" +msgstr "--advance 的参数必须是引用" + +#: builtin/replay.c +msgid "" +"cannot advance target with multiple sources because ordering would be ill-" +"defined" +msgstr "不能使用多个源推进目标，因为无法明确如何排序" + +#: builtin/replay.c +msgid "" +"cannot implicitly determine whether this is an --advance or --onto operation" +msgstr "不能隐式地确定这是 --advance 还是 --onto 的操作" + +#: builtin/replay.c +msgid "" +"cannot advance target with multiple source branches because ordering would " +"be ill-defined" +msgstr "不能使用多个源分支推进目标，因为无法明确如何排序" + +#: builtin/replay.c +msgid "cannot implicitly determine correct base for --onto" +msgstr "不能隐式地确定 --onto 正确的基线" + +#: builtin/replay.c +msgid "" +"(EXPERIMENTAL!) git replay ([--contained] --onto | --advance " +") ..." +msgstr "（试验中！）git replay ([--contained] --onto <新基线> | --advance <分支>) <版本范围>..." + +#: builtin/replay.c +msgid "make replay advance given branch" +msgstr "重放时演进给定的分支" + +#: builtin/replay.c +msgid "replay onto given commit" +msgstr "重放到给定提交" + +#: builtin/replay.c +msgid "advance all branches contained in revision-range" +msgstr "演进版本范围中包含的所有分支" + +#: builtin/replay.c +msgid "option --onto or --advance is mandatory" +msgstr "选项 --onto 或 --advance 必须指定其一" + +#: builtin/replay.c +#, c-format +msgid "" +"some rev walking options will be overridden as '%s' bit in 'struct rev_info' " +"will be forced" +msgstr "一些版本遍历选项将被覆盖，如 'struct rev_info' 中的 '%s' 位将被强制设定" + +#: builtin/replay.c +msgid "error preparing revisions" +msgstr "准备版本时错误" + +#: builtin/replay.c +msgid "replaying down to root commit is not supported yet!" +msgstr "目前还不支持重放到根提交！" + +#: builtin/replay.c +msgid "replaying merge commits is not supported yet!" +msgstr "目前还不支持重放到合并提交！" + #: builtin/rerere.c msgid "" "git rerere [clear | forget ... | diff | status | remaining | gc]" @@ -14215,18 +14326,6 @@ msgstr "--prefix 需要一个参数" msgid "unknown mode for --abbrev-ref: %s" msgstr "未知的 --abbrev-ref 模式：%s" -#: builtin/rev-parse.c revision.c -msgid "--exclude-hidden cannot be used together with --branches" -msgstr "--exclude-hidden 不能与 --branches 一起使用" - -#: builtin/rev-parse.c revision.c -msgid "--exclude-hidden cannot be used together with --tags" -msgstr "--exclude-hidden 不能与 --tags 一起使用" - -#: builtin/rev-parse.c revision.c -msgid "--exclude-hidden cannot be used together with --remotes" -msgstr "--exclude-hidden 不能与 --remotes 一起使用" - #: builtin/rev-parse.c setup.c msgid "this operation must be run in a work tree" msgstr "该操作必须在一个工作区中运行" @@ -14730,11 +14829,6 @@ msgstr "不打印结果到标准输出（例如与 --verify 参数共用）" msgid "show refs from stdin that aren't in local repository" msgstr "显示从标准输入中读入的不在本地仓库中的引用" -#: builtin/show-ref.c -#, c-format -msgid "only one of '%s', '%s' or '%s' can be given" -msgstr "选项 '%s'、'%s' 或 '%s' 只能使用其一" - #: builtin/sparse-checkout.c msgid "" "git sparse-checkout (init | list | set | add | reapply | disable | check-" @@ -16509,30 +16603,30 @@ msgstr "没有可用的源分支，将基于 '--orphan' 选项进行推断" #: builtin/worktree.c #, c-format msgid "" -"If you meant to create a worktree containing a new orphan branch\n" +"If you meant to create a worktree containing a new unborn branch\n" "(branch with no commits) for this repository, you can do so\n" "using the --orphan flag:\n" "\n" " git worktree add --orphan -b %s %s\n" msgstr "" -"如果你打算为此仓库创建一个包含新的孤立分支\n" -"（没有提交的分支）的工作区，你可以使用选项\n" -"--orphan 来执行此操作：\n" +"如果你打算为此仓库创建一个包含新的未诞生的\n" +"分支（没有提交的分支）的工作区，你可以使用\n" +"选项 --orphan 来执行此操作：\n" "\n" " git worktree add --orphan -b %s %s\n" #: builtin/worktree.c #, c-format msgid "" -"If you meant to create a worktree containing a new orphan branch\n" +"If you meant to create a worktree containing a new unborn branch\n" "(branch with no commits) for this repository, you can do so\n" "using the --orphan flag:\n" "\n" " git worktree add --orphan %s\n" msgstr "" -"如果你打算为此仓库创建一个包含新的孤立分支\n" -"（没有提交的分支）的工作区，你可以使用选项\n" -"--orphan 来执行此操作：\n" +"如果你打算为此仓库创建一个包含新的未诞生的\n" +"分支（没有提交的分支）的工作区，你可以使用\n" +"选项 --orphan 来执行此操作：\n" "\n" " git worktree add --orphan %s\n" @@ -16601,6 +16695,11 @@ msgstr "不能创建目录 '%s'" msgid "initializing" msgstr "初始化" +#: builtin/worktree.c +#, c-format +msgid "could not find created worktree '%s'" +msgstr "无法找到已创建的工作树 '%s'" + #: builtin/worktree.c #, c-format msgid "Preparing worktree (new branch '%s')" @@ -16645,11 +16744,6 @@ msgstr "" "尽管已配置远程仓库，但不存在任何本地的或远程的引用，操作终止。\n" "请先使用 'add -f' 来覆盖或拉取一个远程仓库" -#: builtin/worktree.c -#, c-format -msgid "'%s' and '%s' cannot be used together" -msgstr "'%s' 和 '%s' 不能同时使用" - #: builtin/worktree.c msgid "checkout even if already checked out in other worktree" msgstr "检出 <分支>，即使已经被检出到其它工作区" @@ -16663,8 +16757,8 @@ msgid "create or reset a branch" msgstr "创建或重置一个分支" #: builtin/worktree.c -msgid "create unborn/orphaned branch" -msgstr "创建一个尚未诞生的/孤立的分支" +msgid "create unborn branch" +msgstr "创建一个尚未诞生的分支" #: builtin/worktree.c msgid "populate the new working tree" @@ -16693,12 +16787,8 @@ msgstr "选项 '%s'、'%s' 和 '%s' 不能同时使用" #: builtin/worktree.c #, c-format -msgid "options '%s', and '%s' cannot be used together" -msgstr "选项 '%s' 与 '%s' 不能同时使用" - -#: builtin/worktree.c -msgid "" -msgstr "<提交号>" +msgid "option '%s' and commit-ish cannot be used together" +msgstr "选项 '%s' 和提交号不能同时使用" #: builtin/worktree.c msgid "added with --lock" @@ -17488,6 +17578,10 @@ msgstr "打包仓库中未打包对象" msgid "Create, list, delete refs to replace objects" msgstr "创建、列出、删除对象替换引用" +#: command-list.h +msgid "EXPERIMENTAL: Replay commits on a new base, works with bare repos too" +msgstr "试验中：基于一个新基线重放提交，同样适用于纯仓库" + #: command-list.h msgid "Generates a summary of pending changes" msgstr "生成待定更改的摘要" @@ -17803,57 +17897,104 @@ msgstr "一个管理大型 Git 仓库的工具" #: commit-graph.c msgid "commit-graph file is too small" -msgstr "提交图形文件太小" +msgstr "提交图文件太小" + +#: commit-graph.c +msgid "commit-graph oid fanout chunk is wrong size" +msgstr "提交图中对象 ID 的扇出块大小错误" + +#: commit-graph.c +msgid "commit-graph fanout values out of order" +msgstr "提交图的扇出值失序" + +#: commit-graph.c +msgid "commit-graph OID lookup chunk is the wrong size" +msgstr "提交图的对象 ID 查询块大小错误" + +#: commit-graph.c +msgid "commit-graph commit data chunk is wrong size" +msgstr "提交图的提交数据块大小错误" + +#: commit-graph.c +msgid "commit-graph generations chunk is wrong size" +msgstr "提交图的世代块大小错误" + +#: commit-graph.c +msgid "commit-graph changed-path index chunk is too small" +msgstr "提交图的变更路径的索引块太小" + +#: commit-graph.c +#, c-format +msgid "" +"ignoring too-small changed-path chunk (% < %) in commit-" +"graph file" +msgstr "忽略提交图文件中过小的更改路径块（% < %）" #: commit-graph.c #, c-format msgid "commit-graph signature %X does not match signature %X" -msgstr "提交图形签名 %X 和签名 %X 不匹配" +msgstr "提交图签名 %X 和签名 %X 不匹配" #: commit-graph.c #, c-format msgid "commit-graph version %X does not match version %X" -msgstr "提交图形版本 %X 和版本 %X 不匹配" +msgstr "提交图版本 %X 和版本 %X 不匹配" #: commit-graph.c #, c-format msgid "commit-graph hash version %X does not match version %X" -msgstr "提交图形哈希版本 %X 和版本 %X 不匹配" +msgstr "提交图哈希版本 %X 和版本 %X 不匹配" #: commit-graph.c #, c-format msgid "commit-graph file is too small to hold %u chunks" -msgstr "提交图形文件太小，容不下 %u 个块" +msgstr "提交图文件太小，容不下 %u 个块" + +#: commit-graph.c +msgid "commit-graph required OID fanout chunk missing or corrupted" +msgstr "提交图所需的对象 ID 扇出块缺失或损坏" + +#: commit-graph.c +msgid "commit-graph required OID lookup chunk missing or corrupted" +msgstr "提交图所需的对象 ID 查询块缺失或损坏" + +#: commit-graph.c +msgid "commit-graph required commit data chunk missing or corrupted" +msgstr "提交图所需的提交数据块缺失或损坏" #: commit-graph.c msgid "commit-graph has no base graphs chunk" -msgstr "提交图形没有基础图形块" +msgstr "提交图没有基础图形块" #: commit-graph.c msgid "commit-graph base graphs chunk is too small" -msgstr "提交图形的基础图形块过小" +msgstr "提交图的基础图形块过小" #: commit-graph.c msgid "commit-graph chain does not match" -msgstr "提交图形链不匹配" +msgstr "提交图链不匹配" #: commit-graph.c #, c-format msgid "commit count in base graph too high: %" msgstr "基础图形中的提交数量过高：%" +#: commit-graph.c +msgid "commit-graph chain file too small" +msgstr "提交图链文件太小" + #: commit-graph.c #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" -msgstr "无效的提交图形链：行 '%s' 不是一个哈希值" +msgstr "无效的提交图链：行 '%s' 不是一个哈希值" #: commit-graph.c msgid "unable to find all commit-graph files" -msgstr "无法找到所有提交图形文件" +msgstr "无法找到所有提交图文件" #: commit-graph.c msgid "invalid commit position. commit-graph is likely corrupt" -msgstr "无效的提交位置。提交图形可能已损坏" +msgstr "无效的提交位置。提交图可能已损坏" #: commit-graph.c #, c-format @@ -17868,6 +18009,10 @@ msgstr "提交图需要溢出世代数据，但是没有" msgid "commit-graph overflow generation data is too small" msgstr "提交图溢出世代数据过小" +#: commit-graph.c +msgid "commit-graph extra-edges pointer out of bounds" +msgstr "提交图额外边的指针越界" + #: commit-graph.c msgid "Loading known commits in commit graph" msgstr "正在加载提交图中的已知提交" @@ -17943,26 +18088,25 @@ msgstr[1] "正在用 %d 步写出提交图" #: commit-graph.c msgid "unable to open commit-graph chain file" -msgstr "无法打开提交图形链文件" +msgstr "无法打开提交图链文件" #: commit-graph.c msgid "failed to rename base commit-graph file" -msgstr "无法重命名基础提交图形文件" +msgstr "无法重命名基础提交图文件" #: commit-graph.c msgid "failed to rename temporary commit-graph file" -msgstr "无法重命名临时提交图形文件" +msgstr "无法重命名临时提交图文件" #: commit-graph.c #, c-format msgid "cannot merge graphs with %, % commits" -msgstr "" -"无法合并提交图形，总共已累加提交数：%，当前待累加提交数：%" +msgstr "无法合并提交图，总共已累加提交数：%，当前待累加提交数：%" #: commit-graph.c #, c-format msgid "cannot merge graph %s, too many commits: %" -msgstr "无法合并提交图形 %s, 提交过多：%" +msgstr "无法合并提交图 %s, 提交过多：%" #: commit-graph.c msgid "Scanning merged commits" @@ -17970,7 +18114,7 @@ msgstr "正在扫描合并提交" #: commit-graph.c msgid "Merging commit-graph" -msgstr "正在合并提交图形" +msgstr "正在合并提交图" #: commit-graph.c msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" @@ -17987,59 +18131,59 @@ msgstr "提交图文件的校验码错误，可能已经损坏" #: commit-graph.c #, c-format msgid "commit-graph has incorrect OID order: %s then %s" -msgstr "提交图形的对象 ID 顺序不正确：%s 然后 %s" +msgstr "提交图的对象 ID 顺序不正确：%s 然后 %s" #: commit-graph.c #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" -msgstr "提交图形有不正确的扇出值：fanout[%d] = %u != %u" +msgstr "提交图有不正确的扇出值：fanout[%d] = %u != %u" #: commit-graph.c #, c-format msgid "failed to parse commit %s from commit-graph" -msgstr "无法从提交图形中解析提交 %s" +msgstr "无法从提交图中解析提交 %s" #: commit-graph.c #, c-format msgid "failed to parse commit %s from object database for commit-graph" -msgstr "无法从提交图形的对象库中解析提交 %s" +msgstr "无法从提交图的对象库中解析提交 %s" #: commit-graph.c #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" -msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s" +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 msgid "commit-graph generation for commit %s is % < %" -msgstr "提交图形中的提交 %s 的世代号是 % < %" +msgstr "提交图中的提交 %s 的世代号是 % < %" #: commit-graph.c #, c-format msgid "commit date for commit %s in commit-graph is % != %" -msgstr "提交图形中提交 %s 的提交日期是 % != %" +msgstr "提交图中提交 %s 的提交日期是 % != %" #: commit-graph.c #, c-format msgid "" "commit-graph has both zero and non-zero generations (e.g., commits '%s' and " "'%s')" -msgstr "提交图形具有零和非零的世代（例如：提交 '%s' 和 '%s'）" +msgstr "提交图具有零和非零的世代（例如：提交 '%s' 和 '%s'）" #: commit-graph.c msgid "Verifying commits in commit graph" @@ -18073,7 +18217,7 @@ msgstr "" #: commit.c #, c-format msgid "commit %s exists in commit-graph but not in the object database" -msgstr "提交 %s 存在于提交图形中，但不存在于对象数据库中" +msgstr "提交 %s 存在于提交图中，但不存在于对象数据库中" #: commit.c #, c-format @@ -19255,6 +19399,11 @@ msgstr "color-moved-ws：allow-indentation-change 不能与其它空白字符模 msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "配置变量 'diff.submodule' 未知的取值：'%s'" +#: diff.c transport.c +#, c-format +msgid "unknown value for config '%s': %s" +msgstr "配置 '%s' 未知的取值：%s" + #: diff.c #, c-format msgid "" @@ -19348,13 +19497,6 @@ msgstr "坏的 --color-moved 参数：%s" msgid "invalid mode '%s' in --color-moved-ws" msgstr "--color-moved-ws 中的无效模式 '%s' " -#: diff.c -msgid "" -"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " -"\"histogram\"" -msgstr "" -"diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\"" - #: diff.c #, c-format msgid "invalid argument to %s" @@ -19412,8 +19554,8 @@ msgid "output only the last line of --stat" msgstr "只输出 --stat 的最后一行" #: diff.c -msgid "..." -msgstr "<参数1,参数2>..." +msgid ",..." +msgstr "<参数1>,<参数2>..." #: diff.c msgid "" @@ -19425,8 +19567,8 @@ msgid "synonym for --dirstat=cumulative" msgstr "和 --dirstat=cumulative 同义" #: diff.c -msgid "synonym for --dirstat=files,param1,param2..." -msgstr "是 --dirstat=files,param1,param2... 的同义词" +msgid "synonym for --dirstat=files,,..." +msgstr "是 --dirstat=files,<参数1>,<参数2>... 的同义词" #: diff.c msgid "warn if changes introduce conflict markers or whitespace errors" @@ -19648,14 +19790,6 @@ msgstr "使用 \"patience diff\" 算法生成差异" msgid "generate diff using the \"histogram diff\" algorithm" msgstr "使用 \"histogram diff\" 算法生成差异" -#: diff.c -msgid "" -msgstr "<算法>" - -#: diff.c -msgid "choose a diff algorithm" -msgstr "选择一个差异算法" - #: diff.c msgid "" msgstr "<文本>" @@ -21411,6 +21545,12 @@ msgstr "无法读取缓存" msgid "multi-pack-index OID fanout is of the wrong size" msgstr "多包索引的对象 ID 扇出表大小错误" +#: midx.c +#, c-format +msgid "" +"oid fanout out of order: fanout[%d] = % > % = fanout[%d]" +msgstr "对象 ID 扇出失序：fanout[%d] = % > % = fanout[%d]" + #: midx.c msgid "multi-pack-index OID lookup chunk is the wrong size" msgstr "多包索引的对象 ID 查询块大小错误" @@ -21469,6 +21609,15 @@ msgstr "多包索引包名无序：'%s' 在 '%s' 之前" msgid "bad pack-int-id: %u (%u total packs)" msgstr "错的 pack-int-id：%u（共有 %u 个包）" +#: midx.c +msgid "MIDX does not contain the BTMP chunk" +msgstr "多包索引中未包含 BTMP 块" + +#: midx.c +#, c-format +msgid "could not load bitmapped pack %" +msgstr "不能打开已被位图索引的包 %" + #: midx.c msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "多包索引存储一个64位偏移，但是 off_t 太小" @@ -21576,12 +21725,6 @@ msgstr "不正确的校验码" msgid "Looking for referenced packfiles" msgstr "正在查找引用的包文件" -#: midx.c -#, c-format -msgid "" -"oid fanout out of order: fanout[%d] = % > % = fanout[%d]" -msgstr "对象 ID 扇出无序：fanout[%d] = % > % = fanout[%d]" - #: midx.c msgid "the midx contains no oid" msgstr "midx 不包含 oid" @@ -22211,6 +22354,10 @@ msgstr "多包位图缺少必需的反向索引" msgid "could not open pack %s" msgstr "不能打开包 %s" +#: pack-bitmap.c t/helper/test-read-midx.c +msgid "could not determine MIDX preferred pack" +msgstr "不能确定多包索引的首选包" + #: pack-bitmap.c #, c-format msgid "preferred pack (%s) is invalid" @@ -22234,6 +22381,11 @@ msgstr "损坏的位图查询表：提交索引 %u 超出范围" msgid "corrupt ewah bitmap: truncated header for bitmap of commit \"%s\"" msgstr "损坏的 EWAH 位图：提交 \"%s\" 位图的文件头被截断" +#: pack-bitmap.c +#, c-format +msgid "unable to load pack: '%s', disabling pack-reuse" +msgstr "无法打开包：'%s'，禁用包重用" + #: pack-bitmap.c #, c-format msgid "object '%s' not found in type bitmaps" @@ -22349,6 +22501,10 @@ msgstr "位于 % 的无效的反向索引：% != %" msgid "multi-pack-index reverse-index chunk is the wrong size" msgstr "多包索引的反向索引块大小错误" +#: pack-revindex.c +msgid "could not determine preferred pack" +msgstr "无法确定首选包" + #: pack-write.c msgid "cannot both write and verify reverse index" msgstr "无法同时写入和校验反向索引" @@ -22427,11 +22583,6 @@ msgstr "%s 不可用" msgid "%s expects a non-negative integer value with an optional k/m/g suffix" msgstr "%s 期望一个非负整数和一个可选的 k/m/g 后缀" -#: parse-options.c -#, c-format -msgid "%s is incompatible with %s" -msgstr "%s 与 %s 不兼容" - #: parse-options.c #, c-format msgid "ambiguous option: %s (could be --%s%s or --%s%s)" @@ -22821,11 +22972,6 @@ msgstr "无法索引文件 '%s'" msgid "unable to add '%s' to index" msgstr "无法在索引中添加 '%s'" -#: read-cache.c -#, c-format -msgid "unable to stat '%s'" -msgstr "无法对 %s 执行 stat" - #: read-cache.c #, c-format msgid "'%s' appears as both a file and as a directory" @@ -23500,17 +23646,12 @@ msgstr "'%s' 已存在，无法创建 '%s'" msgid "cannot process '%s' and '%s' at the same time" msgstr "无法同时处理 '%s' 和 '%s'" -#: refs/files-backend.c -#, c-format -msgid "could not remove reference %s" -msgstr "无法删除引用 %s" - -#: refs/files-backend.c refs/packed-backend.c +#: refs.c #, c-format msgid "could not delete reference %s: %s" msgstr "无法删除引用 %s：%s" -#: refs/files-backend.c refs/packed-backend.c +#: refs.c #, c-format msgid "could not delete references: %s" msgstr "无法删除引用：%s" @@ -24665,7 +24806,7 @@ msgstr "无效的作者身份 '%s'" msgid "corrupt author: missing date information" msgstr "损坏的作者：缺失日期信息" -#: sequencer.c t/helper/test-fast-rebase.c +#: sequencer.c #, c-format msgid "could not update %s" msgstr "不能更新 %s" @@ -25155,6 +25296,10 @@ msgstr "应用自动贮藏导致冲突。" msgid "Autostash exists; creating a new stash entry." msgstr "自动贮藏已经存在；正在创建一个新的贮藏条目。" +#: sequencer.c +msgid "autostash reference is a symref" +msgstr "自动贮藏的引用是一个符号引用" + #: sequencer.c msgid "could not detach HEAD" msgstr "不能分离头指针" @@ -25529,6 +25674,11 @@ msgstr "没有从 '%s' 复制模版：%s" msgid "invalid initial branch name: '%s'" msgstr "无效的初始分支名：'%s'" +#: setup.c +#, c-format +msgid "re-init: ignored --initial-branch=%s" +msgstr "re-init：已忽略 --initial-branch=%s" + #: setup.c #, c-format msgid "unable to handle file type %d" @@ -25544,14 +25694,14 @@ msgid "attempt to reinitialize repository with different hash" msgstr "尝试用不同的哈希算法重新初始化仓库" #: setup.c -#, c-format -msgid "%s already exists" -msgstr "%s 已经存在" +msgid "" +"attempt to reinitialize repository with different reference storage format" +msgstr "尝试使用不同的引用存储格式重新初始化仓库" #: setup.c #, c-format -msgid "re-init: ignored --initial-branch=%s" -msgstr "re-init：已忽略 --initial-branch=%s" +msgid "%s already exists" +msgstr "%s 已经存在" #: setup.c #, c-format @@ -25869,14 +26019,6 @@ msgstr "在每次迭代前清除缓存树" msgid "number of entries in the cache tree to invalidate (default 0)" msgstr "缓存树中无效化的条目数量（默认 0）" -#: t/helper/test-fast-rebase.c -msgid "unhandled options" -msgstr "未处理的选项" - -#: t/helper/test-fast-rebase.c -msgid "error preparing revisions" -msgstr "准备版本时错误" - #: t/helper/test-reach.c #, c-format msgid "commit %s is not marked reachable" @@ -26070,10 +26212,6 @@ msgstr "协议不支持设置远程服务路径" msgid "invalid remote service path" msgstr "无效的远程服务路径" -#: transport-helper.c transport.c -msgid "operation not supported by protocol" -msgstr "协议不支持该操作" - #: transport-helper.c #, c-format msgid "can't connect to subservice %s" @@ -26237,11 +26375,6 @@ msgstr "不能解析 transport.color.* 配置" msgid "support for protocol v2 not implemented yet" msgstr "协议 v2 的支持尚未实现" -#: transport.c -#, c-format -msgid "unknown value for config '%s': %s" -msgstr "配置 '%s' 的取值未知：%s" - #: transport.c #, c-format msgid "transport '%s' not allowed" @@ -26301,6 +26434,10 @@ msgstr "协议不支持 bundle-uri 操作" msgid "could not retrieve server-advertised bundle-uri list" msgstr "无法获取服务器公布的 bundle-uri 列表" +#: transport.c +msgid "operation not supported by protocol" +msgstr "协议不支持该操作" + #: tree-walk.c msgid "too-short tree object" msgstr "太短的树对象" @@ -27329,6 +27466,11 @@ msgstr "另外，您的索引中包含未提交的变更。" msgid "cannot %s: Your index contains uncommitted changes." msgstr "不能%s：您的索引中包含未提交的变更。" +#: xdiff-interface.c +#, c-format +msgid "unknown style '%s' given for '%s'" +msgstr "'%2$s' 的未知风格取值 '%1$s'" + #: git-merge-octopus.sh git-merge-resolve.sh msgid "" "Error: Your local changes to the following files would be overwritten by " -- cgit 1.2.3-korg From 5fdd5b989cbe5096d44e89861a92b2dd47c279d9 Mon Sep 17 00:00:00 2001 From: Yi-Jyun Pan Date: Sun, 18 Feb 2024 20:53:27 +0800 Subject: l10n: zh_TW: Git 2.44 Co-Authored-By: lumynou5 Signed-off-by: Yi-Jyun Pan --- po/zh_TW.po | 531 +++++++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 363 insertions(+), 168 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index f777a0596f..312dd128a4 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -19,15 +19,15 @@ # - Yichao Yu # - Zhuang Ya # -# Yi-Jyun Pan , 2021, 2022, 2023. +# Yi-Jyun Pan , 2021, 2022, 2023, 2024. # Kaiyang Wu , 2022. -# lumynou5 , 2023. +# lumynou5 , 2023, 2024. msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2023-11-19 22:29+0800\n" -"PO-Revision-Date: 2023-11-19 23:34+0800\n" +"POT-Creation-Date: 2024-02-18 20:48+0800\n" +"PO-Revision-Date: 2024-02-18 20:50+0800\n" "Last-Translator: Yi-Jyun Pan \n" "Language-Team: Chinese (Traditional) \n" @@ -36,7 +36,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 3.4.1\n" +"X-Generator: Poedit 3.4.2\n" "X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://" "zhconvert.org\n" @@ -910,7 +910,7 @@ msgid "unclosed quote" msgstr "未閉合的引號" #: alias.c builtin/cat-file.c builtin/notes.c builtin/prune-packed.c -#: builtin/receive-pack.c builtin/tag.c +#: builtin/receive-pack.c builtin/tag.c t/helper/test-pkt-line.c msgid "too many arguments" msgstr "引數過多" @@ -925,12 +925,13 @@ msgid "unrecognized whitespace ignore option '%s'" msgstr "空白字元忽略選項 “%s” 無法識別" #: apply.c archive.c builtin/add.c builtin/branch.c builtin/checkout-index.c -#: builtin/checkout.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.c -#: builtin/pack-objects.c builtin/push.c builtin/rebase.c builtin/repack.c -#: builtin/reset.c builtin/rev-list.c builtin/show-branch.c builtin/stash.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/pack-objects.c builtin/rebase.c +#: builtin/repack.c builtin/replay.c builtin/reset.c builtin/rev-list.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 @@ -1240,12 +1241,12 @@ msgstr "%s：已存在於工作區中" #: apply.c #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" -msgstr "%2$s 的新模式 (%1$o) 和舊模式 (%3$o) 不符" +msgstr "%2$s 的新模式（%1$o）和舊模式（%3$o）不符" #: apply.c #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" -msgstr "%2$s 的新模式 (%1$o) 和 %4$s 的舊模式 (%3$o) 不符" +msgstr "%2$s 的新模式（%1$o）和 %4$s 的舊模式（%3$o）不符" #: apply.c #, c-format @@ -1732,6 +1733,11 @@ msgstr "“%s” 選項需要 “%s”" msgid "Unexpected option --output" msgstr "非預期選項 --output" +#: archive.c +#, c-format +msgid "extra command line parameter '%s'" +msgstr "多出命令列參數 “%s”" + #: archive.c #, c-format msgid "Unknown archive format '%s'" @@ -1788,6 +1794,17 @@ msgstr "忽略過大的 gitattributes 資料物件 “%s”" msgid "bad --attr-source or GIT_ATTR_SOURCE" msgstr "無效的 --attr-source 或 GIT_ATTR_SOURCE" +#: attr.c read-cache.c +#, c-format +msgid "unable to stat '%s'" +msgstr "無法對 %s 執行 stat" + +#: bisect.c builtin/cat-file.c builtin/index-pack.c builtin/notes.c +#: builtin/pack-objects.c combine-diff.c rerere.c +#, c-format +msgid "unable to read %s" +msgstr "不能讀 %s" + #: bisect.c #, c-format msgid "Badly quoted content in file '%s': %s" @@ -2323,8 +2340,8 @@ msgid "bad action '%s' for '%s'" msgstr "“%s” 動作對 “%s” 無效" #: builtin/am.c builtin/blame.c builtin/fetch.c builtin/pack-objects.c -#: builtin/pull.c diff-merges.c gpg-interface.c ls-refs.c parallel-checkout.c -#: sequencer.c setup.c +#: builtin/pull.c config.c diff-merges.c gpg-interface.c ls-refs.c +#: parallel-checkout.c sequencer.c setup.c #, c-format msgid "invalid value for '%s': '%s'" msgstr "“%s” 的值無效：“%s”" @@ -2477,8 +2494,7 @@ msgstr "git write-tree 無法寫入樹狀物件" msgid "applying to an empty history" msgstr "正在套用至空白歷史記錄上" -#: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c -#: t/helper/test-fast-rebase.c +#: builtin/am.c builtin/commit.c builtin/merge.c builtin/replay.c sequencer.c msgid "failed to write commit object" msgstr "無法寫入提交物件" @@ -2661,8 +2677,9 @@ msgid "n" msgstr "n" #: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c -#: builtin/diagnose.c builtin/for-each-ref.c builtin/ls-files.c -#: builtin/ls-tree.c builtin/replace.c builtin/tag.c builtin/verify-tag.c +#: builtin/clone.c builtin/diagnose.c builtin/for-each-ref.c builtin/init-db.c +#: builtin/ls-files.c builtin/ls-tree.c builtin/replace.c builtin/tag.c +#: builtin/verify-tag.c msgid "format" msgstr "format" @@ -3357,12 +3374,13 @@ msgstr "無法查詢 “%s” 指向的提交物件" #: builtin/branch.c #, c-format -msgid "" -"the branch '%s' is not fully merged.\n" -"If you are sure you want to delete it, run 'git branch -D %s'" -msgstr "" -"分支 “%s” 沒有完全合併。\n" -"如果確定要刪除它，請執行 “git branch -D %s”" +msgid "the branch '%s' is not fully merged" +msgstr "分支 “%s” 沒有完全合併" + +#: builtin/branch.c +#, c-format +msgid "If you are sure you want to delete it, run 'git branch -D %s'" +msgstr "如果確定要刪除它，請執行 “git branch -D %s”" #: builtin/branch.c msgid "update of config-file failed" @@ -4370,7 +4388,7 @@ msgstr "無法對 “%s” 執行 reflog 動作：%s\n" msgid "HEAD is now at" msgstr "HEAD 目前位於" -#: builtin/checkout.c builtin/clone.c t/helper/test-fast-rebase.c +#: builtin/checkout.c builtin/clone.c msgid "unable to update HEAD" msgstr "無法更新 HEAD" @@ -4631,8 +4649,8 @@ msgid "new-branch" msgstr "new-branch" #: builtin/checkout.c -msgid "new unparented branch" -msgstr "新的，沒有父提交的分支" +msgid "new unborn branch" +msgstr "新的未誕生分支" #: builtin/checkout.c builtin/merge.c msgid "update ignored files (default)" @@ -4699,7 +4717,7 @@ msgstr "" msgid "you must specify path(s) to restore" msgstr "您必須指定要還原的路徑" -#: builtin/checkout.c builtin/clone.c builtin/remote.c +#: builtin/checkout.c builtin/clone.c builtin/remote.c builtin/replay.c #: builtin/submodule--helper.c builtin/worktree.c msgid "branch" msgstr "branch" @@ -4940,10 +4958,6 @@ msgid "" msgstr "" "clean.requireForce 預設為 true 且未提供 -i、-n 或 -f 選項，拒絕執行清理動作" -#: builtin/clean.c -msgid "-x and -X cannot be used together" -msgstr "-x 和 -X 不能同時使用" - #: builtin/clone.c msgid "git clone [] [--] []" msgstr "git clone [] [--] []" @@ -5035,6 +5049,7 @@ msgid "create a shallow clone since a specific time" msgstr "建立從指定時間到現在的淺層複製" #: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/rebase.c +#: builtin/replay.c msgid "revision" msgstr "revision" @@ -5062,6 +5077,10 @@ msgstr "gitdir" msgid "separate git dir from working tree" msgstr "git 目錄和工作區分離" +#: builtin/clone.c builtin/init-db.c +msgid "specify the reference format to use" +msgstr "指定要使用的引用格式" + #: builtin/clone.c msgid "key=value" msgstr "key=value" @@ -5211,11 +5230,10 @@ msgstr "太多參數。" msgid "You must specify a repository to clone." msgstr "您必須指定要複製的版本庫。" -#: builtin/clone.c -msgid "" -"--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-" -"exclude" -msgstr "--bundle-uri 與 --depth、--shallow-since 和 --shallow-exclude 不相容" +#: builtin/clone.c builtin/init-db.c setup.c +#, c-format +msgid "unknown ref storage format '%s'" +msgstr "未知的引用儲存格式 “%s”" #: builtin/clone.c #, c-format @@ -5376,14 +5394,14 @@ msgid "" "--stdin-commits]\n" " [--changed-paths] [--[no-]max-new-filters ] [--" "[no-]progress]\n" -" " +" " msgstr "" "git commit-graph write [--object-dir ] [--append]\n" " [--split[=]] [--reachable | --stdin-packs | " "--stdin-commits]\n" " [--changed-paths] [--[no-]max-new-filters ] [--" "[no-]progress]\n" -" " +" " #: builtin/commit-graph.c builtin/fetch.c builtin/log.c builtin/repack.c msgid "dir" @@ -8262,6 +8280,11 @@ msgstr "沒有執行緒支援，忽略 %s" msgid "unable to read tree (%s)" msgstr "無法讀取樹（%s）" +#: builtin/grep.c +#, c-format +msgid "unable to read tree %s" +msgstr "無法讀取 %s 樹狀物件" + #: builtin/grep.c #, c-format msgid "unable to grep from object of type %s" @@ -8784,11 +8807,6 @@ msgstr "解壓縮嚴重的不一致" msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "發現 %s 出現 SHA1 衝突！" -#: builtin/index-pack.c builtin/pack-objects.c -#, c-format -msgid "unable to read %s" -msgstr "不能讀 %s" - #: builtin/index-pack.c #, c-format msgid "cannot read existing object info %s" @@ -8962,11 +8980,13 @@ msgstr "在打包物件中 fsck 檢查發生錯誤" msgid "" "git init [-q | --quiet] [--bare] [--template=]\n" " [--separate-git-dir ] [--object-format=]\n" +" [--ref-format=]\n" " [-b | --initial-branch=]\n" " [--shared[=]] []" msgstr "" "git init [-q | --quiet] [--bare] [--template=]\n" " [--separate-git-dir ] [--object-format=]\n" +" [--ref-format=]\n" " [-b | --initial-branch=]\n" " [--shared[=]] []" @@ -9125,7 +9145,7 @@ msgid "" "" msgstr "追蹤 <開始>,<結束> 範圍中橫列或 <檔案> 中> :<函數名稱> 的變化史" -#: builtin/log.c builtin/shortlog.c bundle.c +#: builtin/log.c builtin/replay.c builtin/shortlog.c bundle.c #, c-format msgid "unrecognized argument: %s" msgstr "無法識別的參數：%s" @@ -9868,6 +9888,13 @@ msgstr "" "git merge-file [<選項>] [-L <檔案1> [-L <初始> [-L <名字2>]]] <檔案1> <初始文" "件> <檔案2>" +#: builtin/merge-file.c diff.c +msgid "" +"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " +"\"histogram\"" +msgstr "" +"diff-algorithm 選項有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\"" + #: builtin/merge-file.c msgid "send results to standard output" msgstr "將結果傳送到標準輸出" @@ -9896,6 +9923,14 @@ msgstr "如果衝突，使用他們的版本" msgid "for conflicts, use a union version" msgstr "如果衝突，使用聯合版本" +#: builtin/merge-file.c diff.c +msgid "" +msgstr "<演算法>" + +#: builtin/merge-file.c diff.c +msgid "choose a diff algorithm" +msgstr "選擇一個差異演算法" + #: builtin/merge-file.c msgid "for conflicts, use this marker size" msgstr "如果衝突，使用指定長度的標記" @@ -10012,10 +10047,6 @@ msgstr "--trivial-merge 和其他所有選項都不相容" msgid "unknown strategy option: -X%s" msgstr "未知的策略選項：-X%s" -#: builtin/merge-tree.c -msgid "--merge-base is incompatible with --stdin" -msgstr "--merge-base 與 --stdin 不相容" - #: builtin/merge-tree.c builtin/notes.c #, c-format msgid "malformed input line: '%s'." @@ -10174,7 +10205,7 @@ msgstr "'%s' 沒有指向一個提交" msgid "Bad branch.%s.mergeoptions string: %s" msgstr "壞的 branch.%s.mergeoptions 字串：%s" -#: builtin/merge.c builtin/stash.c merge-recursive.c +#: builtin/merge.c merge-recursive.c msgid "Unable to write index." msgstr "不能寫入索引。" @@ -10182,7 +10213,7 @@ msgstr "不能寫入索引。" msgid "Not handling anything other than two heads merge." msgstr "未處理兩個頭合併之外的任何動作。" -#: builtin/merge.c t/helper/test-fast-rebase.c +#: builtin/merge.c #, c-format msgid "unable to write %s" msgstr "不能寫 %s" @@ -11168,6 +11199,11 @@ msgstr "壓縮物件中" msgid "inconsistency with delta count" msgstr "不一致的差異計數" +#: builtin/pack-objects.c +#, c-format +msgid "invalid pack.allowPackReuse value: '%s'" +msgstr "無效的 pack.allowPackReuse 值：“%s”" + #: builtin/pack-objects.c #, c-format msgid "" @@ -11492,10 +11528,10 @@ msgstr "枚舉物件" #, c-format msgid "" "Total % (delta %), reused % (delta %), pack-" -"reused %" +"reused % (from %)" msgstr "" "總共 % (差異 %)，復用 % (差異 %)，重用包 " -"%" +"% (總共 %)" #: builtin/pack-redundant.c msgid "" @@ -12574,7 +12610,7 @@ msgstr "沒有正在進行的重定基底？" msgid "The --edit-todo action can only be used during interactive rebase." msgstr "動作 --edit-todo 只能用在互動式重定基底過程中。" -#: builtin/rebase.c t/helper/test-fast-rebase.c +#: builtin/rebase.c msgid "Cannot read HEAD" msgstr "不能讀取 HEAD" @@ -12618,12 +12654,6 @@ msgstr "" msgid "switch `C' expects a numerical value" msgstr "開關 `C' 期望一個數字值" -#: builtin/rebase.c -msgid "" -"apply options are incompatible with rebase.autoSquash. Consider adding --no-" -"autosquash" -msgstr "apply 選項與 rebase.autoSquash 不相容。請考慮加上 --no-autosquash" - #: builtin/rebase.c msgid "" "apply options are incompatible with rebase.rebaseMerges. Consider adding --" @@ -13109,7 +13139,7 @@ msgid "" msgid_plural "" "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n" "to delete them, use:" -msgstr[0] "注意：ref/remotes 層級之外的一個分支未被移除。要刪除它，使用：" +msgstr[0] "注意：refs/remotes/ 層級之外的一個分支未被移除。要刪除它，使用：" #: builtin/remote.c #, c-format @@ -13838,6 +13868,86 @@ msgstr "--convert-graft-file 不帶參數" msgid "only one pattern can be given with -l" msgstr "只能為 -l 提供一個模式" +#: builtin/replay.c +msgid "need some commits to replay" +msgstr "需要一些提交才能重放" + +#: builtin/replay.c +msgid "--onto and --advance are incompatible" +msgstr "--onto 和 --advance 不相容" + +#: builtin/replay.c +msgid "all positive revisions given must be references" +msgstr "提供的所有正向修訂集必須為引用" + +#: builtin/replay.c +msgid "argument to --advance must be a reference" +msgstr "傳入 --advance 的引數必須為引用" + +#: builtin/replay.c +msgid "" +"cannot advance target with multiple sources because ordering would be ill-" +"defined" +msgstr "無法用多個來源演進目的地，以免無法確定排序" + +#: builtin/replay.c +msgid "" +"cannot implicitly determine whether this is an --advance or --onto operation" +msgstr "無法假設這是 --advance 還是 --onto 動作" + +#: builtin/replay.c +msgid "" +"cannot advance target with multiple source branches because ordering would " +"be ill-defined" +msgstr "無法由多個來源分支演進目的地，以免無法確定排序" + +#: builtin/replay.c +msgid "cannot implicitly determine correct base for --onto" +msgstr "無法假設 --onto 的正確基底" + +#: builtin/replay.c +msgid "" +"(EXPERIMENTAL!) git replay ([--contained] --onto | --advance " +") ..." +msgstr "" +"（實驗性功能！）git replay ([--contained] --onto | --advance " +") ..." + +#: builtin/replay.c +msgid "make replay advance given branch" +msgstr "在指定分支上進行重放演進" + +#: builtin/replay.c +msgid "replay onto given commit" +msgstr "重放到指定提交" + +#: builtin/replay.c +msgid "advance all branches contained in revision-range" +msgstr "演進所有包含在 revision-range 中的分支" + +#: builtin/replay.c +msgid "option --onto or --advance is mandatory" +msgstr "必須傳入 --onto 或 --advance 選項" + +#: builtin/replay.c +#, c-format +msgid "" +"some rev walking options will be overridden as '%s' bit in 'struct rev_info' " +"will be forced" +msgstr "將覆寫部分修訂版遍歷選項，強制使用 “struct rev_info” 的 “%s” 位元" + +#: builtin/replay.c +msgid "error preparing revisions" +msgstr "無法準備修訂集" + +#: builtin/replay.c +msgid "replaying down to root commit is not supported yet!" +msgstr "尚不支援重放到根提交！" + +#: builtin/replay.c +msgid "replaying merge commits is not supported yet!" +msgstr "尚不支援重放合併提交！" + #: builtin/rerere.c msgid "" "git rerere [clear | forget ... | diff | status | remaining | gc]" @@ -14100,18 +14210,6 @@ msgstr "--prefix 需要 1 個引數" msgid "unknown mode for --abbrev-ref: %s" msgstr "--abbrev-ref 的模式未知：%s" -#: builtin/rev-parse.c revision.c -msgid "--exclude-hidden cannot be used together with --branches" -msgstr "--exclude-hidden 無法與 --branches 同時使用" - -#: builtin/rev-parse.c revision.c -msgid "--exclude-hidden cannot be used together with --tags" -msgstr "--exclude-hidden 無法與 --tags 同時使用" - -#: builtin/rev-parse.c revision.c -msgid "--exclude-hidden cannot be used together with --remotes" -msgstr "--exclude-hidden 無法與 --remotes 同時使用" - #: builtin/rev-parse.c setup.c msgid "this operation must be run in a work tree" msgstr "該動作必須在一個工作區中執行" @@ -14610,11 +14708,6 @@ msgstr "不列印結果到標準輸出（例如與 --verify 參數共用）" msgid "show refs from stdin that aren't in local repository" msgstr "顯示從標準輸入中讀入的不在本機版本庫中的引用" -#: builtin/show-ref.c -#, c-format -msgid "only one of '%s', '%s' or '%s' can be given" -msgstr "只能傳入 “%s”、“%s” 或 “%s”" - #: builtin/sparse-checkout.c msgid "" "git sparse-checkout (init | list | set | add | reapply | disable | check-" @@ -16389,14 +16482,14 @@ msgstr "沒有可能的來源分支，推測為 “--orphan”" #: builtin/worktree.c #, c-format msgid "" -"If you meant to create a worktree containing a new orphan branch\n" +"If you meant to create a worktree containing a new unborn branch\n" "(branch with no commits) for this repository, you can do so\n" "using the --orphan flag:\n" "\n" " git worktree add --orphan -b %s %s\n" msgstr "" "如果您是想要在這個版本庫建立一個工作區，裡面包含一個\n" -"孤立分支（即沒有提交的分支），可以使用 --orphan 達到\n" +"未誕生分支（即沒有提交的分支），可以使用 --orphan 達到\n" "這個效果：\n" "\n" " git worktree add --orphan -b %s %s\n" @@ -16404,14 +16497,14 @@ msgstr "" #: builtin/worktree.c #, c-format msgid "" -"If you meant to create a worktree containing a new orphan branch\n" +"If you meant to create a worktree containing a new unborn branch\n" "(branch with no commits) for this repository, you can do so\n" "using the --orphan flag:\n" "\n" " git worktree add --orphan %s\n" msgstr "" "如果您是想要在這個版本庫建立一個工作區，裡面包含一個\n" -"孤立分支（即沒有提交的分支），可以使用 --orphan 達到\n" +"未誕生分支（即沒有提交的分支），可以使用 --orphan 達到\n" "這個效果：\n" "\n" " git worktree add --orphan %s\n" @@ -16481,6 +16574,11 @@ msgstr "不能建立目錄 '%s'" msgid "initializing" msgstr "正在初始化" +#: builtin/worktree.c +#, c-format +msgid "could not find created worktree '%s'" +msgstr "找不到建立的工作區「%s」" + #: builtin/worktree.c #, c-format msgid "Preparing worktree (new branch '%s')" @@ -16525,11 +16623,6 @@ msgstr "" "即使有提供一個遠端，卻不存在本機或遠端引用，\n" "故停止。使用 “add -f” 先覆蓋或抓取遠端" -#: builtin/worktree.c -#, c-format -msgid "'%s' and '%s' cannot be used together" -msgstr "無法同時使用 “%s” 和 “%s”" - #: builtin/worktree.c msgid "checkout even if already checked out in other worktree" msgstr "簽出 <分支>，即使已經被簽出到其它工作區" @@ -16543,8 +16636,8 @@ msgid "create or reset a branch" msgstr "建立或重設一個分支" #: builtin/worktree.c -msgid "create unborn/orphaned branch" -msgstr "建立尚無內容（孤立）的分支" +msgid "create unborn branch" +msgstr "建立未誕生分支" #: builtin/worktree.c msgid "populate the new working tree" @@ -16573,12 +16666,8 @@ msgstr "「%s」、「%s」和「%s」選項不得同時使用" #: builtin/worktree.c #, c-format -msgid "options '%s', and '%s' cannot be used together" -msgstr "無法同時使用 “%s” 和 “%s” 選項" - -#: builtin/worktree.c -msgid "" -msgstr "<提交指示元>" +msgid "option '%s' and commit-ish cannot be used together" +msgstr "“%s” 選項和提交號不得同時使用" #: builtin/worktree.c msgid "added with --lock" @@ -17366,6 +17455,10 @@ msgstr "打包版本庫中未打包物件" msgid "Create, list, delete refs to replace objects" msgstr "建立、列出、刪除物件取代引用" +#: command-list.h +msgid "EXPERIMENTAL: Replay commits on a new base, works with bare repos too" +msgstr "實驗性功能：在新的基底重放提交，亦支援裸版本庫" + #: command-list.h msgid "Generates a summary of pending changes" msgstr "生成待定更改的摘要" @@ -17683,6 +17776,37 @@ msgstr "用來管理大型 Git 版本庫的工具" msgid "commit-graph file is too small" msgstr "提交圖形檔案太小" +#: commit-graph.c +msgid "commit-graph oid fanout chunk is wrong size" +msgstr "提交圖形 OID 扇出區塊大小有誤" + +#: commit-graph.c +msgid "commit-graph fanout values out of order" +msgstr "提交圖形扇出的數值失序" + +#: commit-graph.c +msgid "commit-graph OID lookup chunk is the wrong size" +msgstr "提交圖形 OID 查詢區塊的大小有誤" + +#: commit-graph.c +msgid "commit-graph commit data chunk is wrong size" +msgstr "提交圖形的提交資料區塊大小有誤" + +#: commit-graph.c +msgid "commit-graph generations chunk is wrong size" +msgstr "提交圖形的世代區塊大小有誤" + +#: commit-graph.c +msgid "commit-graph changed-path index chunk is too small" +msgstr "提交圖形的更動路徑索引區塊過小" + +#: commit-graph.c +#, c-format +msgid "" +"ignoring too-small changed-path chunk (% < %) in commit-" +"graph file" +msgstr "忽略提交圖形檔案中過小的更動路徑區塊 (% < %)" + #: commit-graph.c #, c-format msgid "commit-graph signature %X does not match signature %X" @@ -17701,7 +17825,19 @@ msgstr "提交圖形雜湊版本 %X 和版本 %X 不符合" #: commit-graph.c #, c-format msgid "commit-graph file is too small to hold %u chunks" -msgstr "commit-graph 檔案不夠放置 %u 個區塊" +msgstr "提交圖形檔案不夠放置 %u 個區塊" + +#: commit-graph.c +msgid "commit-graph required OID fanout chunk missing or corrupted" +msgstr "提交圖形需要的 OID 扇出區塊遺失或損壞" + +#: commit-graph.c +msgid "commit-graph required OID lookup chunk missing or corrupted" +msgstr "提交圖形需要的 OID 查詢區塊遺失或損壞" + +#: commit-graph.c +msgid "commit-graph required commit data chunk missing or corrupted" +msgstr "提交圖形需要的提交資料區塊遺失或損壞" #: commit-graph.c msgid "commit-graph has no base graphs chunk" @@ -17720,10 +17856,14 @@ msgstr "提交圖形鏈不符合" msgid "commit count in base graph too high: %" msgstr "基礎圖 (base graph) 中的提交數過多：%" +#: commit-graph.c +msgid "commit-graph chain file too small" +msgstr "提交圖形鏈檔案過小" + #: commit-graph.c #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" -msgstr "無效的提交圖形鏈：行 '%s' 不是一個雜湊值" +msgstr "無效的提交圖形鏈：「%s」列不是雜湊值" #: commit-graph.c msgid "unable to find all commit-graph files" @@ -17746,6 +17886,10 @@ msgstr "提交圖需要比目前更多的世代資料，但沒有相關資料" msgid "commit-graph overflow generation data is too small" msgstr "提交圖形的溢出世代資料過小" +#: commit-graph.c +msgid "commit-graph extra-edges pointer out of bounds" +msgstr "提交圖形的延伸邊界指針超出範圍" + #: commit-graph.c msgid "Loading known commits in commit graph" msgstr "正在載入提交圖中的已知提交" @@ -19120,6 +19264,11 @@ msgstr "color-moved-ws：allow-indentation-change 不能與其它空白字元模 msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "設定變數 'diff.submodule' 未知的取值：'%s'" +#: diff.c transport.c +#, c-format +msgid "unknown value for config '%s': %s" +msgstr "設定 '%s' 的取值未知：%s" + #: diff.c #, c-format msgid "" @@ -19213,13 +19362,6 @@ msgstr "壞的 --color-moved 參數：%s" msgid "invalid mode '%s' in --color-moved-ws" msgstr "--color-moved-ws 中的無效模式 '%s'" -#: diff.c -msgid "" -"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " -"\"histogram\"" -msgstr "" -"diff-algorithm 選項有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\"" - #: diff.c #, c-format msgid "invalid argument to %s" @@ -19277,8 +19419,9 @@ msgid "output only the last line of --stat" msgstr "只輸出 --stat 的最後一行" #: diff.c -msgid "..." -msgstr "<參數1,參數2>..." +#| msgid "..." +msgid ",..." +msgstr ",..." #: diff.c msgid "" @@ -19290,8 +19433,8 @@ msgid "synonym for --dirstat=cumulative" msgstr "和 --dirstat=cumulative 同義" #: diff.c -msgid "synonym for --dirstat=files,param1,param2..." -msgstr "是 --dirstat=files,param1,param2... 的同義詞" +msgid "synonym for --dirstat=files,,..." +msgstr "是 --dirstat=files,,... 的同義詞" #: diff.c msgid "warn if changes introduce conflict markers or whitespace errors" @@ -19513,14 +19656,6 @@ msgstr "使用 \"patience diff\" 演算法生成差異" msgid "generate diff using the \"histogram diff\" algorithm" msgstr "使用 \"histogram diff\" 演算法生成差異" -#: diff.c -msgid "" -msgstr "<演算法>" - -#: diff.c -msgid "choose a diff algorithm" -msgstr "選擇一個差異演算法" - #: diff.c msgid "" msgstr "<文字>" @@ -20940,7 +21075,7 @@ msgstr "" #. conflict in a submodule. The first argument is the submodule #. 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" +#. - go to submodule (mysubmodule), and either merge commit abc1234" #. #: merge-ort.c #, c-format @@ -21274,6 +21409,12 @@ msgstr "讀取快取失敗" msgid "multi-pack-index OID fanout is of the wrong size" msgstr "多包索引的物件 ID fanout 大小錯誤" +#: midx.c +#, c-format +msgid "" +"oid fanout out of order: fanout[%d] = % > % = fanout[%d]" +msgstr "物件 ID 扇出無序：fanout[%d] = % > % = fanout[%d]" + #: midx.c msgid "multi-pack-index OID lookup chunk is the wrong size" msgstr "多包索引 OID 查詢區塊的大小有誤" @@ -21332,6 +21473,15 @@ msgstr "多包索引包名無序：'%s' 在 '%s' 之前" msgid "bad pack-int-id: %u (%u total packs)" msgstr "錯的 pack-int-id：%u（共有 %u 個包）" +#: midx.c +msgid "MIDX does not contain the BTMP chunk" +msgstr "MIDX 未包含 BTMP 區塊" + +#: midx.c +#, c-format +msgid "could not load bitmapped pack %" +msgstr "無法載入位圖化 (bitmapped) 的封裝 %" + #: midx.c msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "多包索引儲存一個64位位移，但是 off_t 太小" @@ -21439,12 +21589,6 @@ msgstr "總和檢查碼不正確" msgid "Looking for referenced packfiles" msgstr "正在尋找引用的 packfile" -#: midx.c -#, c-format -msgid "" -"oid fanout out of order: fanout[%d] = % > % = fanout[%d]" -msgstr "物件 ID 扇出無序：fanout[%d] = % > % = fanout[%d]" - #: midx.c msgid "the midx contains no oid" msgstr "midx 沒有 oid" @@ -21820,7 +21964,7 @@ msgstr "%s [無效物件]" #. TRANSLATORS: This is a line of ambiguous commit #. object output. E.g.: #. * -#. "deadbeef commit 2021-01-01 - Some Commit Message" +#. "deadbeef commit 2021-01-01 - Some Commit Message" #. #: object-name.c #, c-format @@ -21830,7 +21974,7 @@ msgstr "%s 提交 %s - %s" #. TRANSLATORS: This is a line of ambiguous #. tag object output. E.g.: #. * -#. "deadbeef tag 2022-01-01 - Some Tag Message" +#. "deadbeef tag 2022-01-01 - Some Tag Message" #. * #. The second argument is the YYYY-MM-DD found #. in the tag. @@ -21847,7 +21991,7 @@ msgstr "%s 標籤 %s - %s" #. tag object output where we couldn't parse #. the tag itself. E.g.: #. * -#. "deadbeef [bad tag, could not parse it]" +#. "deadbeef [bad tag, could not parse it]" #. #: object-name.c #, c-format @@ -22075,6 +22219,10 @@ msgstr "多包位圖缺少需要的反向索引" msgid "could not open pack %s" msgstr "無法開啟封包 %s" +#: pack-bitmap.c t/helper/test-read-midx.c +msgid "could not determine MIDX preferred pack" +msgstr "無法確定 MIDX 偏好的封裝" + #: pack-bitmap.c #, c-format msgid "preferred pack (%s) is invalid" @@ -22098,6 +22246,11 @@ msgstr "位圖查詢表損壞：提交索引 %u 超出範圍" msgid "corrupt ewah bitmap: truncated header for bitmap of commit \"%s\"" msgstr "ewah 位圖損壞：提交 “%s” 之位圖的標頭遭截斷" +#: pack-bitmap.c +#, c-format +msgid "unable to load pack: '%s', disabling pack-reuse" +msgstr "無法載入「%s」封裝，停用 pack-reuse" + #: pack-bitmap.c #, c-format msgid "object '%s' not found in type bitmaps" @@ -22213,6 +22366,10 @@ msgstr "% 位置的修訂版索引 (rev-index) 無效：% != %

" +#~ msgstr "<提交指示元>" + +#, c-format +#~ msgid "%s is incompatible with %s" +#~ msgstr "%s 與 %s 不相容" + +#, c-format +#~ msgid "could not remove reference %s" +#~ msgstr "無法刪除引用 %s" + +#~ msgid "unhandled options" +#~ msgstr "未處理選項" -- cgit 1.2.3-korg