diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-10-02 15:24:32 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-10-02 15:24:32 (GMT) |
| commit | c03bee6e9f5c05259f5f501e1f47cd8adb63af38 (patch) | |
| tree | d1c57a47a624987b51fc6bcbac3254f25151c4e9 | |
| parent | bcd6bc478adc4951d57ec597c44b12ee74bc88fb (diff) | |
| parent | dedb2883ce5670401ccd2a18e47d6dae2bc798ab (diff) | |
| download | git-c03bee6e9f5c05259f5f501e1f47cd8adb63af38.zip git-c03bee6e9f5c05259f5f501e1f47cd8adb63af38.tar.gz git-c03bee6e9f5c05259f5f501e1f47cd8adb63af38.tar.bz2 | |
Merge tag 'l10n-2.38.0-rnd3' of https://github.com/git-l10n/git-po
l10n-2.38.0-rnd3
* tag 'l10n-2.38.0-rnd3' of https://github.com/git-l10n/git-po: (25 commits)
l10n: zh_TW.po: Git 2.38.0, round 3
l10n: fr: v2.38.0 round 3
l10n: Update Catalan translation
l10n: de.po: update German translation
l10n: zh_CN: 2.38.0 round 3
l10n: tr: v2.38.0 3rd round
l10n: bg.po: Updated Bulgarian translation (5484t)
l10n: po-id for 2.38 (round 3)
l10n: es: update translation
l10n: sv.po: Update Swedish translation (5484t0f0u)
l10n: Update Catalan translation
l10n: fr: don't say that merge is "the default strategy"
l10n: zh_CN v2.38.0 rounds 1 & 2
l10n: po-id for 2.38 (round 2)
l10n: tr: v2.38.0 round 2
l10n: bg.po: Updated Bulgarian translation (5484t)
l10n: fr: v2.38.0 round 2
l10n: fr: v2.38 round 1
l10n: fr: The word 'branche' is only feminine
l10n: Update Catalan translation
...
| -rw-r--r-- | po/bg.po | 1251 | ||||
| -rw-r--r-- | po/ca.po | 2165 | ||||
| -rw-r--r-- | po/de.po | 1267 | ||||
| -rw-r--r-- | po/es.po | 2589 | ||||
| -rw-r--r-- | po/fr.po | 1283 | ||||
| -rw-r--r-- | po/id.po | 3518 | ||||
| -rw-r--r-- | po/sv.po | 1198 | ||||
| -rw-r--r-- | po/tr.po | 1447 | ||||
| -rw-r--r-- | po/zh_CN.po | 1479 | ||||
| -rw-r--r-- | po/zh_TW.po | 1498 |
10 files changed, 11390 insertions, 6305 deletions
@@ -1,8 +1,7 @@ # Bulgarian translation of git po-file. -# Copyright (C) 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Alexander Shopov <ash@kambanaria.org>. +# Copyright (C) 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Alexander Shopov <ash@kambanaria.org>. # This file is distributed under the same license as the git package. # Alexander Shopov <ash@kambanaria.org>, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022. -# # ======================== # DICTIONARY TO MERGE IN GIT GUI # ------------------------ @@ -64,6 +63,8 @@ # pathspec magic опция за магически пътища # bitmap index индекс на база битови маски # multi-pack bitmap многопакетната битова маска +# ewah bitmap битова маска във формат EWAH +# type bitmap битова маска на видовете # mark маркер # plumbing команди от системно ниво # porcelain команди от потребителско ниво @@ -165,6 +166,7 @@ # scheduler планиращ модул # snapshot снимка # enlistment зачислена директория +# remove enlistment отчислявам директория # zealous merge засилено сливане # unregister отчислявам # marked counting изброяване @@ -184,7 +186,13 @@ # traverse обхождам # timestamp времево клеймо # bare repository голо хранилище -# +# resolve-undo отмяна на разрешените подавания +# maintenance задачи по поддръжка +# GLE последна грешка в нишката - от GetLatError: https://learn.microsoft.com/en-us/windows/win32/api/errhandlingapi/nf-errhandlingapi-getlasterror +# lookup table таблица със съответствия +# out of range извън диапазона +# checksum сума за проверка +# superproject обхващащ проект # ------------------------ # „$var“ - може да не сработва за shell има gettext и eval_gettext - проверка - намират се лесно по „$ # ------------------------ @@ -199,13 +207,12 @@ # msgcat todo1.po todo2.po > todo.po # grep '^#: ' todo.po | sed 's/^#: //' | tr ' ' '\n' | sed 's/:[0-9]*$//' > FILES # 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.37\n" +"Project-Id-Version: git 2.38\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2022-06-22 15:43+0200\n" -"PO-Revision-Date: 2022-06-22 15:44+0200\n" +"POT-Creation-Date: 2022-09-28 10:59+0200\n" +"PO-Revision-Date: 2022-09-28 10:59+0200\n" "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" "Language: bg\n" @@ -363,7 +370,6 @@ msgstr "път" msgid "could not refresh index" msgstr "индексът не може да бъде обновен" -# #, c-format msgid "Bye.\n" msgstr "Изход.\n" @@ -625,6 +631,24 @@ msgstr "" "d — без прилагане на това и всички следващи парчета от файла от индекса и " "работното дърво\n" +#, c-format, perl-format +msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Прилагане на промяната в правата за достъп към работното дърво [y,n,q,a,d" +"%s,?]? " + +#, c-format, perl-format +msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " +msgstr "Прилагане на изтриването към работното дърво [y,n,q,a,d%s,?]? " + +#, c-format, perl-format +msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " +msgstr "Прилагане на добавянето към работното дърво [y,n,q,a,d%s,?]? " + +#, c-format, perl-format +msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " +msgstr "Прилагане на парчето към работното дърво [y,n,q,a,d%s,?]? " + msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -642,10 +666,6 @@ msgstr "" msgid "could not parse hunk header '%.*s'" msgstr "заглавната част на парчето „%.*s“ не може да се анализира" -#, c-format -msgid "could not parse colored hunk header '%.*s'" -msgstr "заглавната част на оцветеното парче „%.*s“ не може да се анализира" - msgid "could not parse diff" msgstr "разликата не може да се анализира" @@ -936,6 +956,29 @@ msgstr "" "detachedHead“\n" "да е „false“ (лъжа̀).\n" +#, c-format +msgid "" +"The following paths have been moved outside the\n" +"sparse-checkout definition but are not sparse due to local\n" +"modifications.\n" +msgstr "" +"Следните пътища са преместени извън дефинициите за частично\n" +"изтегляне, но вече не са частични заради локални промени.\n" + +msgid "" +"To correct the sparsity of these paths, do the following:\n" +"* Use \"git add --sparse <paths>\" to update the index\n" +"* Use \"git sparse-checkout reapply\" to apply the sparsity rules" +msgstr "" +"Ако искате да ги обновите, пробвайте едно от следните:\n" +" ⁃ обновете индекса с командата:\n" +"\n" +" git add --sparse ПЪТ…\n" +"\n" +" ⁃ приложете правилата за частичност с командата:\n" +"\n" +" git sparse-checkout reapply" + msgid "cmdline ends with \\" msgstr "командният ред завършва с „/“" @@ -1461,6 +1504,10 @@ msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "неподдържани права за достъп до файл: 0%o (SHA1: %s)" #, c-format +msgid "deflate error (%d)" +msgstr "грешка при декомпресиране с „deflate“ (%d)" + +#, c-format msgid "unable to start '%s' filter" msgstr "филтърът „%s“ не може да бъде стартиран" @@ -1480,10 +1527,6 @@ msgid "path too long (%d chars, SHA1: %s): %s" msgstr "твърде дълъг път (%d знака, SHA1: %s): %s" #, c-format -msgid "deflate error (%d)" -msgstr "грешка при декомпресиране с „deflate“ (%d)" - -#, c-format msgid "timestamp too large for this system: %<PRIuMAX>" msgstr "времевото клеймо е твърде голямо за тази система: %<PRIuMAX>" @@ -3315,8 +3358,13 @@ msgstr "библиотека на C: " msgid "not run from a git repository - no hooks to show\n" msgstr "командата е стартирана извън хранилище на Git, затова няма куки\n" -msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]" -msgstr "git bugreport [-o|--output-directory ФАЙЛ] [-s|--suffix ФОРМАТ]" +# FIXME +msgid "" +"git bugreport [-o|--output-directory <file>] [-s|--suffix <format>] [--" +"diagnose[=<mode>]" +msgstr "" +"git bugreport [-o|--output-directory ФАЙЛ] [-s|--suffix ФОРМАТ] [--" +"diagnose[=РЕЖИМ]]" msgid "" "Thank you for filling out a Git bug report!\n" @@ -3353,16 +3401,29 @@ msgstr "" "Разгледайте останалата част от доклада за грешка по-долу.\n" "Може да изтриете редовете, които не искате да споделите.\n" -msgid "specify a destination for the bugreport file" -msgstr "укажете файла, в който да се запази докладът за грешка" +msgid "mode" +msgstr "РЕЖИМ" -msgid "specify a strftime format suffix for the filename" -msgstr "укажете суфикса на файла във формат за „strftime“" +msgid "" +"create an additional zip archive of detailed diagnostics (default 'stats')" +msgstr "" +"създаване на допълнителен архив във формат zip с подробни диагностични " +"съобщения (стандартно е „stats“ — статистика)" + +msgid "specify a destination for the bugreport file(s)" +msgstr "укажете местоположение, в което да се запазят докладите за грешка" + +msgid "specify a strftime format suffix for the filename(s)" +msgstr "укажете суфикса на файловете във формат за „strftime“" #, c-format msgid "could not create leading directories for '%s'" msgstr "родителските директории на „%s“ не може да бъдат създадени" +#, c-format +msgid "unable to create diagnostics archive %s" +msgstr "не може да се създаде архив за диагностичните съобщения: %s" + msgid "System Info" msgstr "Информация за системата" @@ -3422,10 +3483,6 @@ msgid "Unbundling objects" msgstr "Разпакетиране на пратки от обекти" #, c-format -msgid "Unknown subcommand: %s" -msgstr "Непозната подкоманда: %s" - -#, c-format msgid "cannot read object %s '%s'" msgstr "обектът „%s“ (%s) не може да бъде прочетен" @@ -3504,6 +3561,11 @@ msgstr "извеждане на размера на обект" msgid "allow -s and -t to work with broken/corrupt objects" msgstr "позволяване на опциите „-s“ и „-t“ да работят с повредени обекти" +msgid "use mail map file" +msgstr "" +"използване на файл за съответствията на имената и адресите на е-поща („." +"mailmap“)" + msgid "Batch objects requested on stdin (or --batch-all-objects)" msgstr "" "Пакетно извеждане на заявените обекти на стандартния изход (или „--batch-all-" @@ -3515,6 +3577,9 @@ msgstr "извеждане на пълното съдържание на ОБЕ msgid "like --batch, but don't emit <contents>" msgstr "като „--batch“, но без извеждане на съдържанието" +msgid "stdin is NUL-terminated" +msgstr "стандартният вход да ползва нулевия знак „NUL“ за разделител" + msgid "read commands from stdin" msgstr "изчитане на командите от стандартния вход" @@ -4403,6 +4468,13 @@ msgstr "" "инициализиране на файла за частично изтегляне („.git/info/sparse-checkout“) " "да съдържа само файловете в основната директория" +msgid "uri" +msgstr "АДРЕС" + +msgid "a URI for downloading bundles before fetching from origin remote" +msgstr "" +"АДРЕС за доставяне на пратки на git преди доставяне от отдалеченото хранилище" + #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "" @@ -4468,10 +4540,10 @@ msgstr "обектът „%s“ не може да бъде обновен" msgid "failed to initialize sparse-checkout" msgstr "частичното изтегляне не може да се инициализира" -msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" +msgid "remote HEAD refers to nonexistent ref, unable to checkout" msgstr "" -"указателят „HEAD“ от отдалеченото хранилище сочи към нещо,\n" -"което не съществува. Не може да се изтегли определен клон.\n" +"указателят „HEAD“ от отдалеченото хранилище сочи към нещо, което не " +"съществува. Изтегляне не може да се извърши" msgid "unable to checkout working tree" msgstr "работното дърво не може да бъде подготвено" @@ -4495,6 +4567,13 @@ msgstr "Трябва да укажете кое хранилище искате msgid "options '%s' and '%s %s' cannot be used together" msgstr "опциите „%s“ и „%s %s“ са несъвместими" +msgid "" +"--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-" +"exclude" +msgstr "" +"опцията „--bundle-uri“ е несъвместима с „--depth“, „--shallow-since“ и „--" +"shallow-exclude“" + #, c-format msgid "repository '%s' does not exist" msgstr "не съществува хранилище „%s“" @@ -4574,6 +4653,14 @@ msgstr "опцията „--local“ се прескача" msgid "cannot clone from filtered bundle" msgstr "не може да се клонира от филтрирана пратка" +msgid "failed to initialize the repo, skipping bundle URI" +msgstr "" +"хранилището не може да се инициализира, адресът на пратката се прескача" + +#, c-format +msgid "failed to fetch objects from bundle URI '%s'" +msgstr "неуспешно доставяне на обекти от пратка на адрес „%s“" + msgid "remote transport reported error" msgstr "отдалеченият транспорт върна грешка" @@ -4694,10 +4781,6 @@ msgstr "" msgid "Collecting commits from input" msgstr "Получаване на подаванията от входа" -#, c-format -msgid "unrecognized subcommand: %s" -msgstr "непозната подкоманда: %s" - msgid "" "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " "<file>)...] <tree>" @@ -5066,9 +5149,6 @@ msgstr "подробна информация за състоянието (ст msgid "terminate entries with NUL" msgstr "разделяне на елементите с нулевия знак „NUL“" -msgid "mode" -msgstr "РЕЖИМ" - msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "извеждане на неследените файлове. Възможните РЕЖИМи са „all“ (подробна " @@ -5685,6 +5765,22 @@ msgstr "Не са открити имена — нищо не може да бъ msgid "option '%s' and commit-ishes cannot be used together" msgstr "опциите „%s“ и указателите към обекти са несъвместими" +msgid "" +"git diagnose [-o|--output-directory <path>] [-s|--suffix <format>] [--" +"mode=<mode>]" +msgstr "" +"git diagnose [-o|--output-directory ФАЙЛ] [-s|--suffix ФОРМАТ] [--" +"diagnose[=РЕЖИМ]]" + +msgid "specify a destination for the diagnostics archive" +msgstr "укажете местоположение на архива с диагностичната информация" + +msgid "specify a strftime format suffix for the filename" +msgstr "укажете суфикса на файла във формат за „strftime“" + +msgid "specify the content of the diagnostic archive" +msgstr "указване на съдържанието на диагностичния архив" + msgid "--merge-base only works with two commits" msgstr "опцията „--merge-base“ изисква точно две подавания" @@ -6066,12 +6162,9 @@ msgstr "[актуален]" msgid "[rejected]" msgstr "[отхвърлен]" -msgid "can't fetch in current branch" +msgid "can't fetch into checked-out branch" msgstr "в текущия клон не може да се доставя" -msgid "checked out in another worktree" -msgstr "изтеглен в друго работно дърво" - msgid "[tag update]" msgstr "[обновяване на етикетите]" @@ -6487,7 +6580,6 @@ msgstr "Проверка на директориите с обекти" msgid "Checking %s link" msgstr "Проверка на връзките на „%s“" -# #, c-format msgid "invalid %s" msgstr "неправилен указател „%s“" @@ -6514,6 +6606,10 @@ msgstr "„%s“: неправилен указател за SHA1 в дърво msgid "non-tree in cache-tree" msgstr "в дървото на кеша има нещо, което не е дърво" +#, c-format +msgid "%s: invalid sha1 pointer in resolve-undo" +msgstr "„%s“: неправилен указател за отмяна на разрешените подавания" + msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [ОПЦИЯ…] [ОБЕКТ…]" @@ -6578,7 +6674,7 @@ msgstr "git fsmonitor--daemon status" #, c-format msgid "value of '%s' out of range: %d" -msgstr "дължината на „%s“ e извън интервала: %d" +msgstr "дължината на „%s“ e извън диапазона: %d" #, c-format msgid "value of '%s' not bool or int: %d" @@ -6856,13 +6952,16 @@ msgstr "" "неуспешно изпълнение на „crontab -l“. Системата ви може да не поддържа " "„cron“" +msgid "failed to create crontab temporary file" +msgstr "не може да се създаде временен файл за crontab" + +msgid "failed to open temporary file" +msgstr "временният файл не може да се отвори" + msgid "failed to run 'crontab'; your system might not support 'cron'" msgstr "" "неуспешно изпълнение на „crontab“. Системата ви може да не поддържа „cron“" -msgid "failed to open stdin of 'crontab'" -msgstr "стандартният вход на „crontab“ не може да се отвори" - msgid "'crontab' died" msgstr "процесът на „crontab“ умря" @@ -6909,10 +7008,6 @@ msgstr "неуспешно добавяне на хранилище към фа msgid "git maintenance <subcommand> [<options>]" msgstr "git maintenance ПОДКОМАНДА [ОПЦИЯ…]" -#, c-format -msgid "invalid subcommand: %s" -msgstr "неправилна подкоманда: „%s“" - msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [ОПЦИЯ…] [-e] ШАБЛОН [ВЕРСИЯ…] [[--] ПЪТ…]" @@ -7094,6 +7189,9 @@ msgstr "" "позволяване на стартирането на grep(1) (текущият компилат пренебрегва тази " "опция)" +msgid "maximum number of results per file" +msgstr "максимален брой резултати във файл" + msgid "no pattern given" msgstr "не сте задали шаблон" @@ -7178,16 +7276,22 @@ msgid "show info page" msgstr "показване на информационна страница" msgid "print command description" -msgstr "извеждане на описанието на команда" +msgstr "показване на описанието на команда" msgid "print list of useful guides" msgstr "показване на списък с въведения" +msgid "print list of user-facing repository, command and file interfaces" +msgstr "показване на списък с командите за файлове и хранилища за потребители" + +msgid "print list of file formats, protocols and other developer interfaces" +msgstr "показване на списък с файлови формати, протоколи и др. за програмисти" + msgid "print all configuration variable names" msgstr "показване на имената на всички конфигуриращи променливи" -msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]" -msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [КОМАНДА…]" +msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>|<doc>]" +msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [КОМАНДА|ДОКУМЕНТ]" #, c-format msgid "unrecognized help format '%s'" @@ -7403,7 +7507,7 @@ msgstr[1] "действието завърши с %d локални обекта #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" -"Неочаквана последваща сума за грешки за „%s“ (причината може да е грешка в " +"Неочаквана последваща сума за проверка на „%s“ (причината може да е грешка в " "диска)" #, c-format @@ -7666,10 +7770,8 @@ msgstr "без извеждане на разликите" msgid "show source" msgstr "извеждане на изходния код" -msgid "use mail map file" -msgstr "" -"използване на файл за съответствията на имената и адресите на е-поща („." -"mailmap“)" +msgid "clear all previously-defined decoration filters" +msgstr "изчистване на зададените филтри за форма̀та на извежданата информация" msgid "only decorate refs that match <pattern>" msgstr "специален формат само на указателите напасващи на ШАБЛОНа" @@ -7936,6 +8038,11 @@ msgstr "" msgid "percentage by which creation is weighted" msgstr "процент за претегляне при оценка на създаването" +msgid "show in-body From: even if identical to the e-mail header" +msgstr "" +"показване на заглавната част „From:“ в тялото на писмото дори и да е същата " +"като тази на плика на писмото" + #, c-format msgid "invalid ident line: %s" msgstr "грешна идентичност: %s" @@ -7998,6 +8105,18 @@ msgstr "" "Следеният отдалечен клон не бе открит, затова изрично задайте " "ОТДАЛЕЧЕН_КЛОН.\n" +#, c-format +msgid "bad ls-files format: element '%s' does not start with '('" +msgstr "неправилен формат за „ls-tree“: елементът „%s“ не започва с „(“" + +#, c-format +msgid "bad ls-files format: element '%s' does not end in ')'" +msgstr "неправилен формат за „ls-tree“: елементът „%s“ не завършва с „)“" + +#, c-format +msgid "bad ls-files format: %%%.*s" +msgstr "неправилен формат за „ls-tree“: %%%.*s" + msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [ОПЦИЯ…] [ФАЙЛ…]" @@ -8086,6 +8205,13 @@ msgstr "" "указване на частично изтеглените директории при наличието на частичен индекс" msgid "" +"--format cannot be used with -s, -o, -k, -t, --resolve-undo, --deduplicate, " +"--eol" +msgstr "" +"опцията „--format“ е несъвместима с „-s“/„-o“/„-k“/„-t“/„--resolve-undo“/„--" +"deduplicate“/„--eol“" + +msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" " [-q | --quiet] [--exit-code] [--get-url]\n" " [--symref] [<repository> [<refs>...]]" @@ -8310,6 +8436,40 @@ msgstr "указателят „%s“ не може да бъде изтрит" msgid "Merging %s with %s\n" msgstr "Сливане на „%s“ с „%s“\n" +msgid "not something we can merge" +msgstr "не може да се слее" + +msgid "refusing to merge unrelated histories" +msgstr "независими истории не може да се слеят" + +msgid "failure to merge" +msgstr "неуспешно сливане" + +msgid "git merge-tree [--write-tree] [<options>] <branch1> <branch2>" +msgstr "git merge-tree [--write-tree] [ОПЦИЯ…] КЛОН_1 КЛОН_2" + +msgid "git merge-tree [--trivial-merge] <base-tree> <branch1> <branch2>" +msgstr "git merge-tree [--trivial-merge] БАЗОВО_ДЪРВО КЛОН_1 КЛОН_2" + +msgid "do a real merge instead of a trivial merge" +msgstr "същинско, а не тривиално сливане" + +msgid "do a trivial merge only" +msgstr "само тривиално сливане" + +msgid "also show informational/conflict messages" +msgstr "показване и информационните съобщения, и тези при конфликт" + +msgid "list filenames without modes/oids/stages" +msgstr "" +"извеждане на имената на файлове без режими/идентификатори на обекти/етапи" + +msgid "allow merging unrelated histories" +msgstr "позволяване на сливане на независими истории" + +msgid "--trivial-merge is incompatible with all other options" +msgstr "„--trivial-merge“ е несъвместима с другите опции" + msgid "git merge [<options>] [<commit>...]" msgstr "git merge [ОПЦИЯ…] [ПОДАВАНЕ…]" @@ -8391,9 +8551,6 @@ msgstr "преустановяване (--abort) без промяна на ин msgid "continue the current in-progress merge" msgstr "продължаване на текущото сливане" -msgid "allow merging unrelated histories" -msgstr "позволяване на сливане на независими истории" - msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "" "без изпълнение на куките преди подаване и сливане и при промяна на " @@ -8516,9 +8673,6 @@ msgstr "„%s“ не може да се затвори" msgid "not something we can merge in %s: %s" msgstr "не може да се слее в „%s“: %s" -msgid "not something we can merge" -msgstr "не може да се слее" - msgid "--abort expects no arguments" msgstr "опцията „--abort“ не приема аргументи" @@ -8573,14 +8727,19 @@ msgstr "„%s“ — не е нещо, което може да се слее" msgid "Can merge only exactly one commit into empty head" msgstr "Може да слеете точно едно подаване във връх без история" -msgid "refusing to merge unrelated histories" -msgstr "независими истории не може да се слеят" - #, c-format msgid "Updating %s..%s\n" msgstr "Обновяване „%s..%s“\n" #, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" +"Сливането ще презапише локалните промѐни на тези файлове:\n" +" %s" + +#, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Проба със сливане в рамките на индекса…\n" @@ -8616,6 +8775,10 @@ msgstr "" "Автоматичното сливане завърши успешно. Самото подаване не е извършено\n" #, c-format +msgid "When finished, apply stashed changes with `git stash pop`\n" +msgstr "При завършване скатаните промени да се приложат с „git stash pop“\n" + +#, c-format msgid "warning: tag input does not pass fsck: %s" msgstr "ПРЕДУПРЕЖДЕНИЕ: аргументът-етикет не минава проверка с „fsck“: %s" @@ -8738,6 +8901,9 @@ msgstr "Проверка на преименуването на обект от msgid "bad source" msgstr "неправилен обект" +msgid "destination exists" +msgstr "целта съществува" + msgid "can not move directory into itself" msgstr "директория не може да се премести в себе си" @@ -8753,9 +8919,6 @@ msgstr "не е под контрола на Git" msgid "conflicted" msgstr "конфликт" -msgid "destination exists" -msgstr "целта съществува" - #, c-format msgid "overwriting '%s'" msgstr "презаписване на „%s“" @@ -8769,6 +8932,9 @@ msgstr "множество източници за една цел" msgid "destination directory does not exist" msgstr "целевата директория не съществува" +msgid "destination exists in the index" +msgstr "целта съществува в индекса" + #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, обект: „%s“, цел: „%s“" @@ -9136,8 +9302,8 @@ msgid "use notes from <notes-ref>" msgstr "да се използва бележката сочена от този УКАЗАТЕЛ_ЗА_БЕЛЕЖКА" #, c-format -msgid "unknown subcommand: %s" -msgstr "непозната подкоманда: %s" +msgid "unknown subcommand: `%s'" +msgstr "непозната подкоманда: „%s“" msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" @@ -10066,11 +10232,16 @@ msgid "only emit output related to the second range" msgstr "извеждане само на информацията за втория диапазон" #, c-format +msgid "not a revision: '%s'" +msgstr "„%s“ не е версия" + +#, c-format msgid "not a commit range: '%s'" msgstr "не е диапазон с подавания: „%s“" -msgid "single arg format must be symmetric range" -msgstr "вариантът с единствен аргумент изисква симетричен диапазон" +#, c-format +msgid "not a symmetric range: '%s'" +msgstr "не е симетричен диапазон: „%s“" msgid "need two commit ranges" msgstr "необходими са два диапазона с подавания" @@ -10344,6 +10515,9 @@ msgid "move commits that begin with squash!/fixup! under -i" msgstr "" "преместване на подаванията, които започват със „squash!“/“fixup!“ при „-i“" +msgid "update branches that point to commits that are being rebased" +msgstr "обновяване на клоните, които сочат към пребазирани подавания" + msgid "add exec lines after each commit of the editable list" msgstr "" "добавяне на редове с команди за изпълнение след всяко подаване в " @@ -10895,6 +11069,9 @@ msgstr " нов (следващото доставяне ще го разпол msgid " tracked" msgstr " следен" +msgid " skipped" +msgstr " прескочен" + msgid " stale (use 'git remote prune' to remove)" msgstr " стар (изтрийте чрез „git remote prune“)" @@ -11587,6 +11764,10 @@ msgstr "Новият индекс не може да бъде записан." msgid "unable to get disk usage of %s" msgstr "използваното място за „%s“ не може да бъде получено" +#, c-format +msgid "invalid value for '%s': '%s', the only allowed format is '%s'" +msgstr "неправилна стойност за „%s“: „%s“, единственият позволен формат е „%s“" + msgid "rev-list does not support display of notes" msgstr "командата „rev-list“ не поддържа извеждането на бележки" @@ -11612,6 +11793,9 @@ msgstr "неочакван край на входа" msgid "no usage string given before the `--' separator" msgstr "липсва низ преди разделителя „--“" +msgid "missing opt-spec before option flags" +msgstr "липсват опции пред флаговете за опции" + msgid "Needed a single revision" msgstr "Изисква точно една версия" @@ -12392,6 +12576,10 @@ msgid "Expecting a full ref name, got %s" msgstr "Очаква се пълно име на указател, а не „%s“" #, c-format +msgid "could not get a repository handle for submodule '%s'" +msgstr "не може да се получи връзка към хранилище за подмодула „%s“" + +#, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " "authoritative upstream." @@ -12399,12 +12587,6 @@ msgstr "" "настройката „%s“ липсва. Приема се, че това хранилище е правилният източник " "за себе си." -msgid "alternative anchor for relative paths" -msgstr "директория за определянето на относителните пътища" - -msgid "git submodule--helper list [--prefix=<path>] [<path>...]" -msgstr "git submodule--helper list [--prefix=ПЪТ] [ПЪТ…]" - #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "Във файла „.gitmodules“ не е открит адрес за пътя към подмодул „%s“" @@ -12437,8 +12619,8 @@ msgstr "без извеждане на изход при въвеждането msgid "recurse into nested submodules" msgstr "рекурсивно обхождане на подмодулите" -msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" -msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] КОМАНДА" +msgid "git submodule foreach [--quiet] [--recursive] [--] <command>" +msgstr "git submodule foreach [--quiet] [--recursive] [--] КОМАНДА" #, c-format msgid "Failed to register url for submodule path '%s'" @@ -12460,8 +12642,8 @@ msgstr "" msgid "suppress output for initializing a submodule" msgstr "без извеждане на информация при инициализирането на подмодул" -msgid "git submodule--helper init [<options>] [<path>]" -msgstr "git submodule--helper init [ОПЦИЯ…] [ПЪТ]" +msgid "git submodule init [<options>] [<path>]" +msgstr "git submodule init [ОПЦИЯ…] [ПЪТ]" #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" @@ -12488,9 +12670,6 @@ msgstr "" msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [ПЪТ…]" -msgid "git submodule--helper name <path>" -msgstr "git submodule--helper name ПЪТ" - #, c-format msgid "* %s %s(blob)->%s(submodule)" msgstr "● %s %s(обект-BLOB)→%s(подмодул)" @@ -12527,8 +12706,8 @@ msgstr "прескачане на подмодули, чиято настрой msgid "limit the summary size" msgstr "ограничаване на размера на обобщението" -msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" -msgstr "git submodule--helper summary [ОПЦИЯ…] [ПОДАВАНЕ] [--] [ПЪТ]" +msgid "git submodule summary [<options>] [<commit>] [--] [<path>]" +msgstr "git submodule summary [ОПЦИЯ…] [ПОДАВАНЕ] [--] [ПЪТ]" msgid "could not fetch a revision for HEAD" msgstr "не може да се достави версия за „HEAD“" @@ -12542,18 +12721,14 @@ msgid "failed to register url for submodule path '%s'" msgstr "неуспешно регистриране на адрес за пътя към подмодул „%s“" #, c-format -msgid "failed to get the default remote for submodule '%s'" -msgstr "отдалеченият адрес на подмодула „%s“ не може да бъде получен" - -#, c-format msgid "failed to update remote for submodule '%s'" msgstr "отдалеченият адрес на подмодула „%s“ не може да бъде променен" msgid "suppress output of synchronizing submodule url" msgstr "без извеждане на информация при синхронизирането на подмодул" -msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" -msgstr "git submodule--helper sync [--quiet] [--recursive] [ПЪТ]" +msgid "git submodule sync [--quiet] [--recursive] [<path>]" +msgstr "git submodule sync [--quiet] [--recursive] [ПЪТ]" #, c-format msgid "" @@ -12616,6 +12791,10 @@ msgstr "" "при клониране ползвайте опцията „--reference-if-able“ вместо „--reference“." #, c-format +msgid "could not get a repository handle for gitdir '%s'" +msgstr "не може да се получи връзка към хранилище за директорията на git „%s“" + +#, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "към подмодула „%s“ не може да се добави алтернативен източник: %s" @@ -12646,6 +12825,9 @@ msgstr "директорията не е празна: „%s“" msgid "could not get submodule directory for '%s'" msgstr "директорията на подмодула „%s“ не може да бъде получена" +msgid "alternative anchor for relative paths" +msgstr "директория за определянето на относителните пътища" + msgid "where the new submodule will be cloned to" msgstr "къде да се клонира новият подмодул" @@ -12674,10 +12856,6 @@ msgstr "" "АДРЕС --path ПЪТ" #, c-format -msgid "Invalid update mode '%s' for submodule path '%s'" -msgstr "Неправилен режим на обновяване „%s“ за пътя към подмодул „%s“" - -#, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "" "Настроен е неправилен режим на обновяване „%s“ за пътя към подмодул „%s“" @@ -12753,6 +12931,10 @@ msgstr "" "„%s“. Директното доставяне на това подаване е неуспешно." #, c-format +msgid "could not initialize submodule at path '%s'" +msgstr "подмодулът в „%s“ не може да се инициализира" + +#, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " "the superproject is not on any branch" @@ -12761,10 +12943,6 @@ msgstr "" "но той не е на никой клон" #, c-format -msgid "could not get a repository handle for submodule '%s'" -msgstr "не може да се получи връзка към хранилище за подмодула „%s“" - -#, c-format msgid "Unable to find current revision in submodule path '%s'" msgstr "Текущата версия за подмодула в „%s“ липсва" @@ -12798,13 +12976,15 @@ msgstr "без доставяне на новите обекти от отдал msgid "path into the working tree" msgstr "път към работното дърво" -msgid "path into the working tree, across nested submodule boundaries" -msgstr "път към работното дърво, през границите на вложените подмодули" - -msgid "rebase, merge, checkout or none" +msgid "use the 'checkout' update strategy (default)" msgstr "" -"„rebase“ (пребазиране), „merge“ (сливане), „checkout“ (изтегляне) или " -"„none“ (нищо да не се прави)" +"използване на стратегията за обновяване „checkout“ (изтегляне — стандартно)" + +msgid "use the 'merge' update strategy" +msgstr "използване на стратегията за обновяване „merge“ (сливане)" + +msgid "use the 'rebase' update strategy" +msgstr "използване на стратегията за обновяване „rebase“ (пребазиране)" msgid "create a shallow clone truncated to the specified number of revisions" msgstr "извършване на плитко клониране, отрязано до указания брой версии" @@ -12818,6 +12998,9 @@ msgstr "дали първоначалното клониране да е пли msgid "don't print cloning progress" msgstr "без извеждане на напредъка на клонирането" +msgid "disallow cloning into non-empty directory, implies --init" +msgstr "предотвратяване на клониране в непразна история, включва „--init“" + msgid "" "git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] " "[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-" @@ -12829,14 +13012,11 @@ msgstr "" "shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] " "[--] [ПЪТ…]" -msgid "bad value for update parameter" -msgstr "неправилен параметър към опцията „--update“" - msgid "recurse into submodules" msgstr "рекурсивно обхождане подмодулите" -msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" -msgstr "git submodule--helper absorb-git-dirs [ОПЦИЯ…] [ПЪТ…]" +msgid "git submodule absorbgitdirs [<options>] [<path>...]" +msgstr "git submodule absorbgitdirs [ОПЦИЯ…] [ПЪТ…]" msgid "check if it is safe to write to the .gitmodules file" msgstr "проверка дали писането във файла „.gitmodules“ е безопасно" @@ -12856,8 +13036,8 @@ msgstr "файлът „.gitmodules“ трябва да е в работнот msgid "suppress output for setting url of a submodule" msgstr "без извеждане на информация при задаването на адреса на подмодул" -msgid "git submodule--helper set-url [--quiet] <path> <newurl>" -msgstr "git submodule--helper set-url [--quiet] [ПЪТ] [НОВ_ПЪТ]" +msgid "git submodule set-url [--quiet] <path> <newurl>" +msgstr "git submodule set-url [--quiet] [ПЪТ] [НОВ_ПЪТ]" msgid "set the default tracking branch to master" msgstr "задаване на стандартния следящ клон да е „master“" @@ -12865,12 +13045,11 @@ msgstr "задаване на стандартния следящ клон да msgid "set the default tracking branch" msgstr "задаване на стандартния следящ клон" -msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" -msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) ПЪТ" +msgid "git submodule set-branch [-q|--quiet] (-d|--default) <path>" +msgstr "git submodule set-branch [-q|--quiet] (-d|--default) ПЪТ" -msgid "" -"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" -msgstr "git submodule--helper set-branch [-q|--quiet] (-b|--branch) КЛОН ПЪТ" +msgid "git submodule set-branch [-q|--quiet] (-b|--branch) <branch> <path>" +msgstr "git submodule set-branch [-q|--quiet] (-b|--branch) КЛОН ПЪТ" msgid "--branch or --default required" msgstr "необходимо е една от опциите „--branch“ и „--default“" @@ -12968,8 +13147,8 @@ msgid "" msgstr "" "името на подмодула да е указаното, а не да е автоматично същото като пътя" -msgid "git submodule--helper add [<options>] [--] <repository> [<path>]" -msgstr "git submodule--helper add [ОПЦИЯ…] [--] ХРАНИЛИЩЕ [ПЪТ]" +msgid "git submodule add [<options>] [--] <repository> [<path>]" +msgstr "git submodule add [ОПЦИЯ…] [--] ХРАНИЛИЩЕ [ПЪТ]" msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" @@ -13178,6 +13357,16 @@ msgstr "Обновен етикет „%s“ (бе „%s“)\n" msgid "pack exceeds maximum allowed size" msgstr "пакетният файл надвишава максималния възможен размер" +msgid "failed to write object in stream" +msgstr "някой обект не може да се запише в потока" + +#, c-format +msgid "inflate returned (%d)" +msgstr "декомпресирането с „inflate“ завърши (%d)" + +msgid "invalid blob object from stream" +msgstr "неправилен обект-BLOB от потока" + msgid "Unpacking objects" msgstr "Разпакетиране на обектите" @@ -13726,6 +13915,27 @@ msgstr "запис на обект-дърво за поддиректорият msgid "only useful for debugging" msgstr "само за изчистване на грешки" +msgid "core.fsyncMethod = batch is unsupported on this platform" +msgstr "„core.fsyncMethod = batch“ не се поддържа на тази платформа" + +msgid "failed to create temporary file" +msgstr "не може да се създаде временен файл" + +msgid "insufficient capabilities" +msgstr "недостатъчно възможности" + +#, c-format +msgid "failed to download bundle from URI '%s'" +msgstr "неуспешно изтегляне на пратка от адрес: „%s“" + +#, c-format +msgid "file at URI '%s' is not a bundle" +msgstr "файлът на адрес „%s“ не е пратка" + +#, c-format +msgid "failed to unbundle bundle from URI '%s'" +msgstr "неуспешно разпакетиране на пратка от адрес „%s“" + #, c-format msgid "unrecognized bundle hash algorithm: %s" msgstr "непознат алгоритъм за контролни суми за пратки „%s“" @@ -13939,6 +14149,9 @@ msgstr "" "Задаване на име удобно за потребителите на обект въз основа на наличен " "указател" +msgid "Generate a zip archive of diagnostic information" +msgstr "Създаване на архив във формат zip с диагностична информация" + msgid "Show changes between commits, commit and working tree, etc" msgstr "Извеждане на разликите между подаванията, версиите, работното дърво" @@ -14070,8 +14283,8 @@ msgstr "Сливане на файловете, които се нуждаят msgid "The standard helper program to use with git-merge-index" msgstr "Стандартната помощна програма за „git-merge-index“" -msgid "Show three-way merge without touching index" -msgstr "Извеждане на тройно сливане без промяна на индекса" +msgid "Perform merge without touching index or working tree" +msgstr "Извършване на сливането без промени по индекса или работното време" msgid "Run merge conflict resolution tools to resolve merge conflicts" msgstr "Изпълнение на програмите за коригиране на конфликтите при сливане" @@ -14266,6 +14479,9 @@ msgstr "Проверка на пакетираните архивни файло msgid "Check the GPG signature of tags" msgstr "Проверка на подписите GPG върху етикетите" +msgid "Display version information about Git" +msgstr "Извеждане на версията на Git" + msgid "Show logs with difference each commit introduces" msgstr "Извеждане на журнал с разликите, въведени с всяко подаване" @@ -14299,6 +14515,24 @@ msgstr "Полезен минимален набор от команди за е msgid "Frequently asked questions about using Git" msgstr "Често задавани въпроси за употребата на Git" +msgid "The bundle file format" +msgstr "Формат на пратките" + +msgid "Chunk-based file formats" +msgstr "Формати на откъсите" + +msgid "Git commit graph format" +msgstr "Формат на гра̀фа с подаванията" + +msgid "Git index format" +msgstr "Формат на индекса" + +msgid "Git pack format" +msgstr "Формат на пакетите" + +msgid "Git cryptographic signature formats" +msgstr "Формати на криптографските подписи" + msgid "A Git Glossary" msgstr "Речник с термините на Git" @@ -14320,6 +14554,21 @@ msgstr "Дефиниране на свойствата на подмодулит msgid "Git namespaces" msgstr "Пространства от имена на Git" +msgid "Protocol v0 and v1 capabilities" +msgstr "Възможности на протоколи, версия 1 и 2" + +msgid "Things common to various protocols" +msgstr "Общи за различните протоколи възможности" + +msgid "Git HTTP-based protocols" +msgstr "Протоколи на Git на основа на HTTP" + +msgid "How packs are transferred over-the-wire" +msgstr "Как пакетите се пренасят по мрежата" + +msgid "Git Wire Protocol, Version 2" +msgstr "Мрежов протокол на Git, версия 2" + msgid "Helper programs to interact with remote repositories" msgstr "Помощни програми за работа с отдалечените хранилища" @@ -14344,6 +14593,9 @@ msgstr "Уеб интерфейс на Git" msgid "An overview of recommended workflows with Git" msgstr "Общ преглед на препоръчваните начини за работа с Git" +msgid "A tool for managing large Git repositories" +msgstr "Инструмент за управление на големи хранилища на Git " + msgid "commit-graph file is too small" msgstr "файлът за гра̀фа с подаванията е твърде малък" @@ -14602,6 +14854,14 @@ msgid "no libc information available\n" msgstr "липсва информация за библиотеката на C\n" #, c-format +msgid "could not determine free disk size for '%s'" +msgstr "не може да се определи свободното дисково пространство за „%s“" + +#, c-format +msgid "could not get info for '%s'" +msgstr "не може да се получи информацията за „%s“" + +#, c-format msgid "[GLE %ld] health thread could not open '%ls'" msgstr "" "нишката за следенето на състоянието не може да отвори „%2$ls“ [последна " @@ -14673,6 +14933,18 @@ msgstr "" "нишката: GLE=%ld]" #, c-format +msgid "[GLE %ld] unable to open for read '%ls'" +msgstr "" +"файлът „%2$ls“ не може да бъде отворен за четене [последна грешка в нишката: " +"GLE=%1$ld]" + +#, c-format +msgid "[GLE %ld] unable to get protocol information for '%ls'" +msgstr "" +"информацията за протокола на „%2$ls“ не може да се получи [последна грешка в " +"нишката: GLE=%1$ld]" + +#, c-format msgid "failed to copy SID (%ld)" msgstr "идентификаторът за сигурност (SID=%ld) не може да бъде копиран" @@ -14942,7 +15214,7 @@ msgstr "„%s“ не е правилна стойност за време за #, c-format msgid "abbrev length out of range: %d" -msgstr "дължината на съкращаване е извън интервала ([4; 40]): %d" +msgstr "дължината на съкращаване е извън диапазона ([4; 40]): %d" #, c-format msgid "bad zlib compression level %d" @@ -15225,182 +15497,6 @@ msgid "failed to close rev-list's stdin" msgstr "стандартният вход на списъка с версиите не може да бъде затворен" #, c-format -msgid "'%s' does not exist" -msgstr "„%s“ не съществува." - -msgid "need a working directory" -msgstr "необходима е работна директория" - -msgid "could not find enlistment root" -msgstr "началната зачислена директория не може да бъде открита" - -#, c-format -msgid "could not switch to '%s'" -msgstr "не може да се премине към „%s“" - -#, c-format -msgid "could not configure %s=%s" -msgstr "настройката „%s=%s“ не може да се зададе" - -msgid "could not configure log.excludeDecoration" -msgstr "„log.excludeDecoration“ не може да се настрои" - -msgid "Scalar enlistments require a worktree" -msgstr "Зачисляването на директории чрез „scalar“ изисква работно дърво" - -#, c-format -msgid "could not open directory '%s'" -msgstr "директорията „%s“ не може да бъде отворена" - -#, c-format -msgid "skipping '%s', which is neither file nor directory" -msgstr "„%s“ се прескача, защото не е нито файл, нито директория" - -#, c-format -msgid "could not determine free disk size for '%s'" -msgstr "не може да се определи свободното дисково пространство за „%s“" - -#, c-format -msgid "could not get info for '%s'" -msgstr "не може да се получи информацията за „%s“" - -#, c-format -msgid "remote HEAD is not a branch: '%.*s'" -msgstr "отдалеченият указател „HEAD“ не сочи към клон: „%.*s“" - -msgid "failed to get default branch name from remote; using local default" -msgstr "" -"името на стандартния клон на отдалеченото хранилище не може да се получи, " -"затова ще се ползва локално настроеното име на стандартния клон" - -msgid "failed to get default branch name" -msgstr "неуспешно получаване на името на стандартния клон" - -msgid "failed to unregister repository" -msgstr "хранилището не може да бъде отчислено" - -msgid "failed to delete enlistment directory" -msgstr "зачислената директория не може да бъде изтрита" - -msgid "branch to checkout after clone" -msgstr "към кой клон да се премине след клониране" - -msgid "when cloning, create full working directory" -msgstr "при клониране да се създава пълна работна директория" - -msgid "only download metadata for the branch that will be checked out" -msgstr "да се свалят метаданните само за изтегляния клон" - -msgid "scalar clone [<options>] [--] <repo> [<dir>]" -msgstr "scalar clone [ОПЦИЯ…] [--] ХРАНИЛИЩЕ [ДИРЕКТОРИЯ]" - -#, c-format -msgid "cannot deduce worktree name from '%s'" -msgstr "името на работното дърво не може да се извлече от „%s“" - -#, c-format -msgid "directory '%s' exists already" -msgstr "директорията „%s“ вече съществува" - -#, c-format -msgid "failed to get default branch for '%s'" -msgstr "основният клон на „%s“ не може да бъде получен" - -#, c-format -msgid "could not configure remote in '%s'" -msgstr "отдалеченото хранилище в „%s“ не може да се настрои" - -#, c-format -msgid "could not configure '%s'" -msgstr "„%s“ не може да се настрои" - -msgid "partial clone failed; attempting full clone" -msgstr "неуспешно създаване на непълно хранилище, ще се опита пълно хранилище" - -msgid "could not configure for full clone" -msgstr "не може да се настрои пълно клониране" - -msgid "scalar diagnose [<enlistment>]" -msgstr "scalar diagnose [ЗАЧИСЛЕНА_ДИРЕКТОРИЯ]" - -#, c-format -msgid "could not create directory for '%s'" -msgstr "директорията за „%s“ не може да се създадe" - -msgid "could not duplicate stdout" -msgstr "стандартният изход не може да се дублира" - -msgid "failed to write archive" -msgstr "неуспешен запис на архива" - -msgid "`scalar list` does not take arguments" -msgstr "„scalar list“ не приема аргументи" - -msgid "scalar register [<enlistment>]" -msgstr "scalar register [ЗАЧИСЛЕНА_ДИРЕКТОРИЯ]" - -msgid "reconfigure all registered enlistments" -msgstr "пренастройване на всички зачислени директории" - -msgid "scalar reconfigure [--all | <enlistment>]" -msgstr "scalar reconfigure [--all | ЗАЧИСЛЕНА_ДИРЕКТОРИЯ]" - -msgid "--all or <enlistment>, but not both" -msgstr "опцията „--all“ и указването на зачислена директория не са съвместими" - -#, c-format -msgid "git repository gone in '%s'" -msgstr "вече няма хранилище на git в „%s“" - -msgid "" -"scalar run <task> [<enlistment>]\n" -"Tasks:\n" -msgstr "" -"scalar run ЗАДАЧА [ЗАЧИСЛЕНА_ДИРЕКТОРИЯ]\n" -"Задачи:\n" - -#, c-format -msgid "no such task: '%s'" -msgstr "няма задача с име „%s“" - -msgid "scalar unregister [<enlistment>]" -msgstr "scalar unregister [ЗАЧИСЛЕНА_ДИРЕКТОРИЯ]" - -msgid "scalar delete <enlistment>" -msgstr "scalar delete ЗАЧИСЛЕНА_ДИРЕКТОРИЯ" - -msgid "refusing to delete current working directory" -msgstr "текущата работна директория няма да бъде изтрита" - -msgid "include Git version" -msgstr "включване и на версията на git" - -msgid "include Git's build options" -msgstr "включване и на опциите за компилиране на git" - -msgid "scalar verbose [-v | --verbose] [--build-options]" -msgstr "scalar verbose [-v | --verbose] [--build-options]" - -msgid "-C requires a <directory>" -msgstr "„-C“ изисква ДИРЕКТОРИЯ" - -#, c-format -msgid "could not change to '%s'" -msgstr "не може да се влезе в директорията „%s“" - -msgid "-c requires a <key>=<value> argument" -msgstr "опцията „-c“ изисква аргумент във вид КЛЮЧ=СТОЙНОСТ" - -msgid "" -"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n" -"\n" -"Commands:\n" -msgstr "" -"scalar [-C ДИРЕКТОРИЯ] [-c КЛЮЧ=СТОЙНОСТ] КОМАНДА [ОПЦИЯ…]<\n" -"\n" -"Команди:\n" - -#, c-format msgid "illegal crlf_action %d" msgstr "неправилно действие за край на ред (crlf_action): %d" @@ -15613,6 +15709,32 @@ msgstr "" msgid "Marked %d islands, done.\n" msgstr "Отбелязани са %d групи, работата приключи.\n" +#, c-format +msgid "invalid --%s value '%s'" +msgstr "неправилна стойност за „--%s“: „%s“" + +#, c-format +msgid "could not archive missing directory '%s'" +msgstr "директорията „%s“ липсва и не може да се архивира" + +#, c-format +msgid "could not open directory '%s'" +msgstr "директорията „%s“ не може да бъде отворена" + +#, c-format +msgid "skipping '%s', which is neither file nor directory" +msgstr "„%s“ се прескача, защото не е нито файл, нито директория" + +msgid "could not duplicate stdout" +msgstr "стандартният изход не може да се дублира" + +#, c-format +msgid "could not add directory '%s' to archiver" +msgstr "директорията „%s“ не може да бъде добавена към архива" + +msgid "failed to write archive" +msgstr "неуспешен запис на архива" + msgid "--merge-base does not work with ranges" msgstr "опцията „--merge-base“ не работи с диапазони" @@ -16242,6 +16364,9 @@ msgstr "git fetch-pack: очаква се „ACK“/„NAK“, а бе полу msgid "unable to write to remote" msgstr "невъзможно писане към отдалечено хранилище" +msgid "Server supports filter" +msgstr "Сървърът поддържа филтри" + #, c-format msgid "invalid shallow line: %s" msgstr "неправилен плитък ред: „%s“" @@ -16352,9 +16477,6 @@ msgstr "сървърът не поддържа алгоритъм „%s“" msgid "Server does not support shallow requests" msgstr "Сървърът не поддържа плитки заявки" -msgid "Server supports filter" -msgstr "Сървърът поддържа филтри" - msgid "unable to write request to remote" msgstr "невъзможно писане към отдалечено хранилище" @@ -16710,6 +16832,12 @@ msgstr "Команди от ниско ниво / Синхронизация н msgid "Low-level Commands / Internal Helpers" msgstr "Команди от ниско ниво / Допълнителни инструменти" +msgid "User-facing repository, command and file interfaces" +msgstr "Команди за хранилища, файлове и др. интерфейси за потребители:" + +msgid "Developer-facing file formats, protocols and other interfaces" +msgstr "Файлови формати, протоколи и др. интерфейси за програмисти:" + #, c-format msgid "available git commands in '%s'" msgstr "налични команди на git от „%s“" @@ -16723,6 +16851,12 @@ msgstr "Това са най-често използваните команди msgid "The Git concept guides are:" msgstr "Ръководствата за концепциите в Git са:" +msgid "User-facing repository, command and file interfaces:" +msgstr "Команди за хранилища, файлове и др. за потребители:" + +msgid "File formats, protocols and other developer interfaces:" +msgstr "Файлови формати, протоколи и др. за програмисти:" + msgid "External commands" msgstr "Външни команди" @@ -16811,10 +16945,6 @@ msgstr "" " git config advice.ignoredHook false" #, c-format -msgid "Couldn't start hook '%s'\n" -msgstr "Куката „%s“ не може да се стартира\n" - -#, c-format msgid "argument to --packfile must be a valid hash (got '%s')" msgstr "опцията „--packfile“ изисква валидна контролна сума (а не „%s“)" @@ -17006,18 +17136,14 @@ msgid "quoted CRLF detected" msgstr "цитирани знаци CRLF" #, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -" %s" -msgstr "" -"Сливането ще презапише локалните промѐни на тези файлове:\n" -" %s" - -#, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "Неуспешно сливане на подмодула „%s“ (не е изтеглен)" #, c-format +msgid "Failed to merge submodule %s (no merge base)" +msgstr "Неуспешно сливане на подмодула „%s“ (няма база за сливане)" + +#, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "Неуспешно сливане на подмодула „%s“ (няма подавания)" @@ -17037,26 +17163,8 @@ msgstr "Неуспешно сливане на подмодула „%s“" #, c-format msgid "" -"Failed to merge submodule %s, but a possible merge resolution exists:\n" -"%s\n" -msgstr "" -"Неуспешно сливане на подмодула „%s“, но е открито възможно решение:\n" -"%s\n" - -#, c-format -msgid "" -"If this is correct simply add it to the index for example\n" -"by using:\n" -"\n" -" git update-index --cacheinfo 160000 %s \"%s\"\n" -"\n" -"which will accept this suggestion.\n" -msgstr "" -"Ако това е така, добавете го към индекса с команда като следната:\n" -"\n" -" git update-index --cacheinfo 160000 %s \"%s\"\n" -"\n" -"Това приема предложеното.\n" +"Failed to merge submodule %s, but a possible merge resolution exists: %s" +msgstr "Неуспешно сливане на подмодула „%s“, но е открито възможно решение: %s" #, c-format msgid "" @@ -17219,13 +17327,45 @@ msgstr "" "КОНФЛИКТ (промяна/изтриване): „%s“ е изтрит в %s, а е променен в %s. Версия " "%s на „%s“ е оставена в дървото." +#. TRANSLATORS: This is a line of advice to resolve a merge +#. 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" +#. #, c-format msgid "" -"Note: %s not up to date and in way of checking out conflicted version; old " -"copy renamed to %s" +" - go to submodule (%s), and either merge commit %s\n" +" or update to an existing commit which has merged those changes\n" msgstr "" -"Бележка: „%s“ не е актуален и пречи за преминаването към версията с " -"конфликт. Старият вариант е преименуван на „%s“" +" ⁃ преминаване към подмодула (%s), след които или де се слее подаването\n" +" „%s“, или да се обновяви към съществуващо подаване, в които\n" +" тези промени са слети\n" + +#, c-format +msgid "" +"Recursive merging with submodules currently only supports trivial cases.\n" +"Please manually handle the merging of each conflicted submodule.\n" +"This can be accomplished with the following steps:\n" +"%s - come back to superproject and run:\n" +"\n" +" git add %s\n" +"\n" +" to record the above merge or update\n" +" - resolve any other conflicts in the superproject\n" +" - commit the resulting index in the superproject\n" +msgstr "" +"В момента рекурсивното сливане с модули поддържа само тривиалните случаи.\n" +"Ще трябва ръчно да разрешавате конфликтите във всеки модул, в който се " +"появят.\n" +"Това може да се постигне чрез следните стъпки:\n" +"%s — върнете се към обхващащия проект и изпълнете:\n" +"\n" +" git add %s\n" +"\n" +" за да отбележите сливането или обновяването\n" +" ⁃ решете конфликтите в обхващащия проект\n" +" ⁃ подайте индекса в обхващащия проект\n" #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge #. base, and 2-3) the trees for the two trees we're merging. @@ -17306,6 +17446,21 @@ msgstr "" "подмодула:\n" #, c-format +msgid "" +"If this is correct simply add it to the index for example\n" +"by using:\n" +"\n" +" git update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"which will accept this suggestion.\n" +msgstr "" +"Ако това е така, добавете го към индекса с команда като следната:\n" +"\n" +" git update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"Това приема предложеното.\n" + +#, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "Неуспешно сливане на подмодула „%s“ (открити са множество сливания)" @@ -17546,7 +17701,8 @@ msgstr "неправилен ред: „%s“." msgid "ignoring existing multi-pack-index; checksum mismatch" msgstr "" -"индексът за множество пакети се прескача, защото контролната сума не съвпада" +"индексът за множество пакети се прескача, защото сумата за проверка не " +"съвпада" msgid "could not load pack" msgstr "пакетът не може да се зареди" @@ -17596,7 +17752,7 @@ msgid "multi-pack-index file exists, but failed to parse" msgstr "файлът с индекса за множество пакети, но не може да бъде анализиран" msgid "incorrect checksum" -msgstr "неправилна контролна сума" +msgstr "неправилна сума за проверка" msgid "Looking for referenced packfiles" msgstr "Търсене на указаните пакетни файлове" @@ -17852,6 +18008,22 @@ msgid "confused by unstable object source data for %s" msgstr "грешка поради нестабилния източник данни за обектите „%s“" #, c-format +msgid "write stream object %ld != %<PRIuMAX>" +msgstr "при записа на обект в потока: %ld != %<PRIuMAX>" + +#, c-format +msgid "unable to stream deflate new object (%d)" +msgstr "новият обект не може да се компресира поточно с „deflate“ (%d)" + +#, c-format +msgid "deflateEnd on stream object failed (%d)" +msgstr "неуспешно изпълнение на „deflateEnd“ върху поточния обект: %d" + +#, c-format +msgid "unable to create directory %s" +msgstr "директорията „%s“ не може да бъде създадена" + +#, c-format msgid "cannot read object for %s" msgstr "обектът за „%s“ не може да се прочете" @@ -18079,6 +18251,66 @@ msgstr "обектът „%s“ не може да бъде анализиран msgid "hash mismatch %s" msgstr "разлика в контролната сума: „%s“" +msgid "trying to write commit not in index" +msgstr "опит за записване на обект за подаване извън индекса" + +msgid "failed to load bitmap index (corrupted?)" +msgstr "" +"индексът на база битови маски не може да се зареди (възможно е да е повреден)" + +msgid "corrupted bitmap index (too small)" +msgstr "повреден индекс на база битови маски (прекалено малък)" + +msgid "corrupted bitmap index file (wrong header)" +msgstr "повреден индекс на база битови маски (неправилна заглавна част)" + +#, c-format +msgid "unsupported version '%d' for bitmap index file" +msgstr "версия „%d“ на файла за индекса на база битови маски не се поддържа" + +msgid "corrupted bitmap index file (too short to fit hash cache)" +msgstr "" +"повреден индекс на база битови маски (прекалено малък, за да напасне на кеша " +"за контролните суми)" + +msgid "corrupted bitmap index file (too short to fit lookup table)" +msgstr "" +"повреден файл за индекс на база битови маски (прекалено е малък дори и за " +"таблицата със съответствия)" + +#, c-format +msgid "duplicate entry in bitmap index: '%s'" +msgstr "повтарящ се запис в индекс на база битови маски: „%s“" + +#, c-format +msgid "corrupt ewah bitmap: truncated header for entry %d" +msgstr "" +"повредена битова маска във формат EWAH: отрязана заглавна част за запис %d" + +#, c-format +msgid "corrupt ewah bitmap: commit index %u out of range" +msgstr "" +"повредена битова маска във формат EWAH: индексът на подаването %u е извън " +"диапазона" + +msgid "corrupted bitmap pack index" +msgstr "повреден пакетен индекс на база битови маски" + +msgid "invalid XOR offset in bitmap pack index" +msgstr "неправилно отместване по XOR в пакетен индекс на база битови маски" + +msgid "cannot fstat bitmap file" +msgstr "не може да се получи информация за файла с битови маски с „fstat“" + +#, c-format +msgid "ignoring extra bitmap file: '%s'" +msgstr "игнориране на излишния файл с битови маски: „%s“" + +msgid "checksum doesn't match in MIDX and bitmap" +msgstr "" +"сумата за проверка се различава във файла с индекса за множество пакети и " +"битовата маска" + msgid "multi-pack bitmap is missing required reverse index" msgstr "задължителният обратен индекс липсва в многопакетната битова маска" @@ -18090,11 +18322,66 @@ msgstr "пакетът „%s“ не може да се отвори" msgid "preferred pack (%s) is invalid" msgstr "предпочитаният пакет „%s“ е неправилен" +msgid "corrupt bitmap lookup table: triplet position out of index" +msgstr "" +"повредена таблица със съответствия: местоположението на тройката е извън " +"индекса" + +msgid "corrupt bitmap lookup table: xor chain exceeds entry count" +msgstr "" +"повредена таблица със съответствия: веригата за XOR е по-дълга от броя на " +"записите" + +#, c-format +msgid "corrupt bitmap lookup table: commit index %u out of range" +msgstr "" +"повредена таблица със съответствия: индексът на подаването %u е извън " +"диапазона" + +#, c-format +msgid "corrupt ewah bitmap: truncated header for bitmap of commit \"%s\"" +msgstr "" +"повредена битова маска във формат EWAH: отрязана заглавна част за битовата " +"маска на подаване „%s“" + +#, c-format +msgid "object '%s' not found in type bitmaps" +msgstr "обектът „%s“ липсва в битовата маска на видовете" + +#, c-format +msgid "object '%s' does not have a unique type" +msgstr "обектът „%s“ няма уникален вид" + +#, c-format +msgid "object '%s': real type '%s', expected: '%s'" +msgstr "обект „%s“: истинският му вид е „%s“, а се очакваше „%s“" + +#, c-format +msgid "object not in bitmap: '%s'" +msgstr "обектът „%s“ липсва в индекса на база битови маски" + +msgid "failed to load bitmap indexes" +msgstr "неуспешно зареждане на индекси на база битови маски" + +msgid "you must specify exactly one commit to test" +msgstr "трябва да укажете точно едно подаване за тестване" + #, c-format -msgid "could not find %s in pack %s at offset %<PRIuMAX>" +msgid "commit '%s' doesn't have an indexed bitmap" +msgstr "подаването „%s“ няма индекс на база битови маски" + +msgid "mismatch in bitmap results" +msgstr "различие в резултатите от битовите маски" + +#, c-format +msgid "could not find '%s' in pack '%s' at offset %<PRIuMAX>" msgstr "„%s“ липсва в пакет „%s“ при отместване %<PRIuMAX>" #, c-format +msgid "unable to get disk usage of '%s'" +msgstr "използваното място за съхранение на „%s“ не може да бъде получено" + +#, c-format msgid "mtimes file %s is too small" msgstr "файлът с времето на промяна (mtime) „%s“ е твърде малък" @@ -18230,6 +18517,9 @@ msgstr "„--%s“ (с 2 тирета) ли имахте предвид?" msgid "alias of --%s" msgstr "псевдоним на „--%s“" +msgid "need a subcommand" +msgstr "необходима е подкоманда" + #, c-format msgid "unknown option `%s'" msgstr "непозната опция: „%s“" @@ -18683,9 +18973,12 @@ msgid "" "l, label <label> = label current HEAD with a name\n" "t, reset <label> = reset HEAD to a label\n" "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" -". create a merge commit using the original merge commit's\n" -". message (or the oneline, if no original merge commit was\n" -". specified); use -c <commit> to reword the commit message\n" +" create a merge commit using the original merge commit's\n" +" message (or the oneline, if no original merge commit was\n" +" specified); use -c <commit> to reword the commit message\n" +"u, update-ref <ref> = track a placeholder for the <ref> to be updated\n" +" to this position in the new commits. The <ref> is\n" +" updated at the end of the rebase\n" "\n" "These lines can be re-ordered; they are executed from top to bottom.\n" msgstr "" @@ -18712,7 +19005,12 @@ msgstr "" " — създаване на подаване със сливане със съобщението от\n" " първоначалното подаване (или съобщението от ЕДИН_РЕД,\n" " ако не е зададено подаване със сливане. С опцията\n" -" „-c ПОДАВАНЕ“, може да смените съобщението.\n" +" „-c ПОДАВАНЕ“, може да смените съобщението\n" +"u, update-ref УКАЗАТЕЛ\n" +" — проследяване на заместител на УКАЗАТЕЛя, който трябва\n" +" да се обнови до това положение в новите подавания.\n" +" УКАЗАТЕЛят се обновява в края на пребазирането\n" +"\n" "\n" "Може да променяте последователността на редовете — те се изпълняват\n" "последователно отгоре-надолу.\n" @@ -19188,6 +19486,13 @@ msgstr "протоколна грешка: очаква се SHA1 или ука msgid "http transport does not support %s" msgstr "транспортът по http не поддържа „%s“" +msgid "protocol error: expected '<url> <path>', missing space" +msgstr "протоколна грешка: очаква се „АДРЕС ПЪТ“, липсва интервал" + +#, c-format +msgid "failed to download file at URL '%s'" +msgstr "файлът на адрес „%s“ не може да се свали" + msgid "git-http-push failed" msgstr "неуспешно изпълнение на „git-http-push“" @@ -19532,6 +19837,16 @@ msgstr "не може да се определи към какво да сочи msgid "failed to find tree of %s" msgstr "дървото, сочено от „%s“, не може да бъде открито" +#, c-format +msgid "resolve-undo records `%s` which is missing" +msgstr "" +"в информацията за отмяна на разрешените подавания присъства „%s“, който " +"липсва" + +#, c-format +msgid "could not get commit for ancestry-path argument %s" +msgstr "подаването „%s“ към опцията „--ancestry-path“ не може да бъде получено" + msgid "--unpacked=<packfile> no longer supported" msgstr "опцията „--unpacked=ПАКЕТЕН_ФАЙЛ“ вече не се поддържа" @@ -19554,6 +19869,174 @@ msgstr "" msgid "cannot create async thread: %s" msgstr "не може да се създаде асинхронна нишка: %s" +#, c-format +msgid "'%s' does not exist" +msgstr "„%s“ не съществува." + +#, c-format +msgid "could not switch to '%s'" +msgstr "не може да се премине към „%s“" + +msgid "need a working directory" +msgstr "необходима е работна директория" + +msgid "Scalar enlistments require a worktree" +msgstr "Зачисляването на директории чрез „scalar“ изисква работно дърво" + +#, c-format +msgid "could not configure %s=%s" +msgstr "настройката „%s=%s“ не може да се зададе" + +msgid "could not configure log.excludeDecoration" +msgstr "„log.excludeDecoration“ не може да се настрои" + +msgid "could not add enlistment" +msgstr "директория не може да се зачисли" + +msgid "could not set recommended config" +msgstr "препоръчаните настройки не може да се зададат" + +msgid "could not turn on maintenance" +msgstr "задачите по поддръжка не може да се включат" + +msgid "could not start the FSMonitor daemon" +msgstr "фоновият процес на FSMonitor не може да бъде спрян" + +msgid "could not turn off maintenance" +msgstr "задачите по поддръжка не може да се изключат" + +msgid "could not remove enlistment" +msgstr "директорията не може да се отчисли" + +#, c-format +msgid "remote HEAD is not a branch: '%.*s'" +msgstr "отдалеченият указател „HEAD“ не сочи към клон: „%.*s“" + +msgid "failed to get default branch name from remote; using local default" +msgstr "" +"името на стандартния клон на отдалеченото хранилище не може да се получи, " +"затова ще се ползва локално настроеното име на стандартния клон" + +msgid "failed to get default branch name" +msgstr "неуспешно получаване на името на стандартния клон" + +msgid "failed to unregister repository" +msgstr "хранилището не може да бъде отчислено" + +msgid "failed to stop the FSMonitor daemon" +msgstr "фоновият процес FSMonitor не може да бъде спрян" + +msgid "failed to delete enlistment directory" +msgstr "зачислената директория не може да бъде изтрита" + +msgid "branch to checkout after clone" +msgstr "към кой клон да се премине след клониране" + +msgid "when cloning, create full working directory" +msgstr "при клониране да се създава пълна работна директория" + +msgid "only download metadata for the branch that will be checked out" +msgstr "да се свалят метаданните само за изтегляния клон" + +msgid "scalar clone [<options>] [--] <repo> [<dir>]" +msgstr "scalar clone [ОПЦИЯ…] [--] ХРАНИЛИЩЕ [ДИРЕКТОРИЯ]" + +#, c-format +msgid "cannot deduce worktree name from '%s'" +msgstr "името на работното дърво не може да се извлече от „%s“" + +#, c-format +msgid "directory '%s' exists already" +msgstr "директорията „%s“ вече съществува" + +#, c-format +msgid "failed to get default branch for '%s'" +msgstr "основният клон на „%s“ не може да бъде получен" + +#, c-format +msgid "could not configure remote in '%s'" +msgstr "отдалеченото хранилище в „%s“ не може да се настрои" + +#, c-format +msgid "could not configure '%s'" +msgstr "„%s“ не може да се настрои" + +msgid "partial clone failed; attempting full clone" +msgstr "неуспешно създаване на непълно хранилище, ще се опита пълно хранилище" + +msgid "could not configure for full clone" +msgstr "не може да се настрои пълно клониране" + +msgid "scalar diagnose [<enlistment>]" +msgstr "scalar diagnose [ЗАЧИСЛЕНА_ДИРЕКТОРИЯ]" + +msgid "`scalar list` does not take arguments" +msgstr "„scalar list“ не приема аргументи" + +msgid "scalar register [<enlistment>]" +msgstr "scalar register [ЗАЧИСЛЕНА_ДИРЕКТОРИЯ]" + +msgid "reconfigure all registered enlistments" +msgstr "пренастройване на всички зачислени директории" + +msgid "scalar reconfigure [--all | <enlistment>]" +msgstr "scalar reconfigure [--all | ЗАЧИСЛЕНА_ДИРЕКТОРИЯ]" + +msgid "--all or <enlistment>, but not both" +msgstr "опцията „--all“ и указването на зачислена директория не са съвместими" + +#, c-format +msgid "git repository gone in '%s'" +msgstr "вече няма хранилище на git в „%s“" + +msgid "" +"scalar run <task> [<enlistment>]\n" +"Tasks:\n" +msgstr "" +"scalar run ЗАДАЧА [ЗАЧИСЛЕНА_ДИРЕКТОРИЯ]\n" +"Задачи:\n" + +#, c-format +msgid "no such task: '%s'" +msgstr "няма задача с име „%s“" + +msgid "scalar unregister [<enlistment>]" +msgstr "scalar unregister [ЗАЧИСЛЕНА_ДИРЕКТОРИЯ]" + +msgid "scalar delete <enlistment>" +msgstr "scalar delete ЗАЧИСЛЕНА_ДИРЕКТОРИЯ" + +msgid "refusing to delete current working directory" +msgstr "текущата работна директория няма да бъде изтрита" + +msgid "include Git version" +msgstr "включване и на версията на git" + +msgid "include Git's build options" +msgstr "включване и на опциите за компилиране на git" + +msgid "scalar verbose [-v | --verbose] [--build-options]" +msgstr "scalar verbose [-v | --verbose] [--build-options]" + +msgid "-C requires a <directory>" +msgstr "„-C“ изисква ДИРЕКТОРИЯ" + +#, c-format +msgid "could not change to '%s'" +msgstr "не може да се влезе в директорията „%s“" + +msgid "-c requires a <key>=<value> argument" +msgstr "опцията „-c“ изисква аргумент във вид КЛЮЧ=СТОЙНОСТ" + +msgid "" +"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n" +"\n" +"Commands:\n" +msgstr "" +"scalar [-C ДИРЕКТОРИЯ] [-c КЛЮЧ=СТОЙНОСТ] КОМАНДА [ОПЦИЯ…]<\n" +"\n" +"Команди:\n" + msgid "unexpected flush packet while reading remote unpack status" msgstr "" "неочакван изчистващ пакет „flush“ при изчитане на състоянието от " @@ -19703,10 +20186,6 @@ msgstr "локалните промѐни ще бъдат презаписан msgid "commit your changes or stash them to proceed." msgstr "подайте или скатайте промѐните, за да продължите" -#, c-format -msgid "%s: fast-forward" -msgstr "%s: превъртане" - #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase". #. @@ -20208,6 +20687,29 @@ msgstr "сливането на „%.*s“ не може даже да запо msgid "merge: Unable to write new index file" msgstr "сливане: новият индекс не може да бъде запазен" +#, c-format +msgid "" +"another 'rebase' process appears to be running; '%s.lock' already exists" +msgstr "" +"изглежда в момента тече друг процес за пребазиране; файлът „%s.lock“ вече " +"съществува" + +#, c-format +msgid "" +"Updated the following refs with %s:\n" +"%s" +msgstr "" +"Следните указатели са обновени с %s:\n" +"%s" + +#, c-format +msgid "" +"Failed to update the following refs with %s:\n" +"%s" +msgstr "" +"Неуспешно обновяване на следните указатели с %s:\n" +"%s" + msgid "Cannot autostash" msgstr "Не може да се скатае автоматично" @@ -20378,6 +20880,10 @@ msgid "the script was already rearranged." msgstr "скриптът вече е преподреден." #, c-format +msgid "update-refs file at '%s' is invalid" +msgstr "файлът за обновяване на указателите „%s“ е неправилен" + +#, c-format msgid "'%s' is outside repository at '%s'" msgstr "„%s“ е извън хранилището при „%s“" @@ -20504,17 +21010,22 @@ msgstr "" #, c-format msgid "" -"unsafe repository ('%s' is owned by someone else)\n" -"To add an exception for this directory, call:\n" +"detected dubious ownership in repository at '%s'\n" +"%sTo add an exception for this directory, call:\n" "\n" "\tgit config --global --add safe.directory %s" msgstr "" -"хранилището не е безопасно („%s“ се притежава от някой друг)\n" -"За да зададете изключение за тази директория, изпълнете:\n" +"засечено е проблемно притежание на хранилището „%s“\n" +"%sЗа да зададете изключение за тази директория, изпълнете:\n" "\n" " git config --global --add safe.directory %s" #, c-format +msgid "cannot use bare repository '%s' (safe.bareRepository is '%s')" +msgstr "" +"голото хранилище „%s“ не може да се ползва („safe.bareRepository“ е „%s“)" + +#, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" "The owner of files must always have read and write permissions." @@ -21388,6 +21899,18 @@ msgstr "неправилен номер на порт" msgid "invalid '..' path segment" msgstr "неправилна част от пътя „..“" +msgid "usage: " +msgstr "употреба: " + +msgid "fatal: " +msgstr "фатална грешка: " + +msgid "error: " +msgstr "грешка: " + +msgid "warning: " +msgstr "предупреждение: " + msgid "Fetching objects" msgstr "Доставяне на обектите" @@ -22220,24 +22743,6 @@ msgstr "Избраните парчета не може да се добавят msgid "ignoring unmerged: %s\n" msgstr "пренебрегване на неслятото: „%s“\n" -#, perl-format -msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " -msgstr "" -"Прилагане на промяната в правата за достъп към работното дърво [y,n,q,a,d" -"%s,?]? " - -#, perl-format -msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " -msgstr "Прилагане на изтриването към работното дърво [y,n,q,a,d%s,?]? " - -#, perl-format -msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " -msgstr "Прилагане на добавянето към работното дърво [y,n,q,a,d%s,?]? " - -#, perl-format -msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " -msgstr "Прилагане на парчето към работното дърво [y,n,q,a,d%s,?]? " - msgid "No other hunks to goto\n" msgstr "Няма други парчета\n" @@ -13,6 +13,7 @@ # bundle | farcell # chunk | fragment # cover letter | carta de presentació +# cruft | superflu # delta | diferència # deprecated | en desús # detached | separat @@ -21,12 +22,14 @@ # fetch | obtenir # flush | buidar / buidatge # graph | graf +# hash | resum # hint | consell # hook | lligam # hunk | tros # not supported | no està admès # pull | baixar # push | pujar +# quote | cometes (ortogràfiques) # repository | repositori # setting | paràmetre # shallow | superficial @@ -65,8 +68,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2022-06-24 13:30+0200\n" -"PO-Revision-Date: 2022-06-03 19:00-0600\n" +"POT-Creation-Date: 2022-09-28 18:55+0200\n" +"PO-Revision-Date: 2022-09-28 19:00-0600\n" "Last-Translator: Jordi Mas i Hernàndez <jmas@softcatala.org>\n" "Language-Team: Catalan\n" "Language: ca\n" @@ -472,6 +475,22 @@ msgstr "" "a - aplica aquest tros i tots els trossos posteriors en el fitxer\n" "d - no apliquis aquest tros ni cap dels trossos posteriors en el fitxer\n" +#, c-format, perl-format +msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " +msgstr "Aplica el canvi de mode a l'arbre de treball [y,n,q,a,d%s,?]? " + +#, c-format, perl-format +msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " +msgstr "Aplica la supressió a l'arbre de treball [y,n,q,a,d%s,?]? " + +#, c-format, perl-format +msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " +msgstr "Aplica l'addició a l'arbre de treball [y,n,q,a,d%s,?]? " + +#, c-format, perl-format +msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " +msgstr "Aplica aquest tros a l'arbre de treball [y,n,q,a,d%s,?]? " + msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -489,10 +508,6 @@ msgstr "" msgid "could not parse hunk header '%.*s'" msgstr "no s'ha pogut analitzar la capçalera del tros «%.*s»" -#, c-format -msgid "could not parse colored hunk header '%.*s'" -msgstr "no s'ha pogut analitzar la capçalera del tros acolorida «%.*s»" - msgid "could not parse diff" msgstr "no s'ha pogut analitzar el diff" @@ -780,11 +795,30 @@ msgstr "" "«false»\n" "\n" +#, c-format +msgid "" +"The following paths have been moved outside the\n" +"sparse-checkout definition but are not sparse due to local\n" +"modifications.\n" +msgstr "" +"Els camins següents s'han mogut fora de la\n" +"definició de sparse-checkout però no són dispersos\n" +"a causa de modificacions en local.\n" + +msgid "" +"To correct the sparsity of these paths, do the following:\n" +"* Use \"git add --sparse <paths>\" to update the index\n" +"* Use \"git sparse-checkout reapply\" to apply the sparsity rules" +msgstr "" +"Per a corregir la dispersió d'aquests camins, feu el següent:\n" +"* Useu «git add --sparse <paths>» per a actualitzar l'índex\n" +"* Useu «git sparse-checkout reapply» per a aplicar les regles de dispersió" + msgid "cmdline ends with \\" msgstr "la línia d'ordres acaba amb \\" msgid "unclosed quote" -msgstr "cita no tancada" +msgstr "commetes no tancades" #, c-format msgid "unrecognized whitespace option '%s'" @@ -1219,7 +1253,7 @@ msgid "instead of applying the patch, output a summary for the input" msgstr "en lloc d'aplicar el pedaç, emet un resum de l'entrada" msgid "instead of applying the patch, see if the patch is applicable" -msgstr "en lloc d'aplicar el pedaç, veges si el pedaç és aplicable" +msgstr "en lloc d'aplicar el pedaç, determina si el pedaç és aplicable" msgid "make sure the patch is applicable to the current index" msgstr "assegura que el pedaç sigui aplicable a l'índex actual" @@ -1295,6 +1329,10 @@ msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "mode de fitxer no compatible: 0%o (SHA1: %s)" #, c-format +msgid "deflate error (%d)" +msgstr "error de deflació (%d)" + +#, c-format msgid "unable to start '%s' filter" msgstr "no s'ha pogut iniciar el filtre «%s»" @@ -1314,10 +1352,6 @@ msgid "path too long (%d chars, SHA1: %s): %s" msgstr "el camí és massa llarg (%d caràcters, SHA1: %s): %s" #, c-format -msgid "deflate error (%d)" -msgstr "error de deflació (%d)" - -#, c-format msgid "timestamp too large for this system: %<PRIuMAX>" msgstr "marca de temps massa gran per a aquest sistema: %<PRIuMAX>" @@ -1364,17 +1398,17 @@ msgstr "Fitxer no trobat: %s" msgid "Not a regular file: %s" msgstr "No és un fitxer normal: %s" -#, fuzzy, c-format +#, c-format msgid "unclosed quote: '%s'" -msgstr "cita no tancada" +msgstr "cometes no tancades: «%s»" -#, fuzzy, c-format +#, c-format msgid "missing colon: '%s'" -msgstr "falta el valor per «%s»" +msgstr "falten els dos punts: «%s»" -#, fuzzy, c-format +#, c-format msgid "empty file name: '%s'" -msgstr "mbox buit: «%s»" +msgstr "nom de fitxer buit: «%s»" msgid "fmt" msgstr "format" @@ -1394,9 +1428,8 @@ msgstr "fitxer" msgid "add untracked file to archive" msgstr "inclou els fitxers no seguits a l'arxiu" -#, fuzzy msgid "path:content" -msgstr "contingut" +msgstr "camí: contingut" msgid "write the archive to this file" msgstr "escriu l'arxiu a aquest fitxer" @@ -2423,16 +2456,20 @@ msgid "Are you sure [Y/n]? " msgstr "N'esteu segur [Y/n]? " msgid "status: waiting for both good and bad commits\n" -msgstr "" +msgstr "estat: s'estan esperant les comissions bones i dolentes\n" #, c-format msgid "status: waiting for bad commit, %d good commit known\n" msgid_plural "status: waiting for bad commit, %d good commits known\n" msgstr[0] "" +"estat: s'està esperant una comissió incorrecta, es coneix %d comissió bona\n" msgstr[1] "" +"estat: s'està esperant una comissió incorrecta, es coneixen %d comissions " +"bones\n" msgid "status: waiting for good commit(s), bad commit known\n" msgstr "" +"estat: s'està esperant comissions bones, es coneix una comissió incorrecta\n" msgid "no terms defined" msgstr "cap terme definit" @@ -2472,7 +2509,7 @@ msgid "'%s' does not appear to be a valid revision" msgstr "«%s» no sembla ser una revisió vàlida" msgid "bad HEAD - I need a HEAD" -msgstr "HEAD incorrecte - cal un HEAD" +msgstr "HEAD incorrecte - cal una HEAD" #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." @@ -2650,7 +2687,7 @@ msgstr "" "no tractis les comissions arrel com de frontera (per defecte: desactivat)" msgid "show work cost statistics" -msgstr "mostra les estadístiques de preu de treball" +msgstr "mostra les estadístiques del cost de treball" msgid "force progress reporting" msgstr "força l'informe de progrés" @@ -2912,7 +2949,7 @@ msgid "Generic options" msgstr "Opcions genèriques" msgid "show hash and subject, give twice for upstream branch" -msgstr "mostra el hash i l'assumpte, doneu dues vegades per a la branca font" +msgstr "mostra el hash i l'assumpte, useu-lo dues vegades per a la branca font" msgid "suppress informational messages" msgstr "omet els missatges informatius" @@ -2999,7 +3036,7 @@ msgid "print only branches of the object" msgstr "imprimeix només les branques de l'objecte" msgid "sorting and filtering are case insensitive" -msgstr "l'ordenació i el filtratge distingeixen entre majúscules i minúscules" +msgstr "ordenació i filtratge distingeixen entre majúscules i minúscules" msgid "recurse through submodules" msgstr "inclou recursivament als submòduls" @@ -3027,7 +3064,7 @@ msgid "branch name required" msgstr "cal el nom de branca" msgid "Cannot give description to detached HEAD" -msgstr "No es pot donar descripció a un HEAD separat" +msgstr "No es pot donar descripció a una HEAD separada" msgid "cannot edit description of more than one branch" msgstr "no es pot editar la descripció de més d'una branca" @@ -3105,8 +3142,12 @@ msgid "not run from a git repository - no hooks to show\n" msgstr "" "no s'està executant en un repositori de git - no hi ha lligams a mostrar\n" -msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]" -msgstr "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]" +msgid "" +"git bugreport [-o|--output-directory <file>] [-s|--suffix <format>] [--" +"diagnose[=<mode>]" +msgstr "" +"git bugreport [-o|--output-directory <file>] [-s|--suffix <format>] [--" +"diagnose[=<mode>]" msgid "" "Thank you for filling out a Git bug report!\n" @@ -3141,16 +3182,28 @@ msgstr "" "Reviseu la resta de l'informe d'error de sota.\n" "Podeu eliminar qualsevol línia que vulgueu.\n" -msgid "specify a destination for the bugreport file" -msgstr "especifiqueu una destinació per al fitxer d'informe d'error" +msgid "mode" +msgstr "mode" -msgid "specify a strftime format suffix for the filename" +msgid "" +"create an additional zip archive of detailed diagnostics (default 'stats')" +msgstr "" +"crea un arxiu zip addicional amb diagnòstics detallats (per defecte «stats»)" + +msgid "specify a destination for the bugreport file(s)" +msgstr "especifiqueu una destinació per al fitxer de l'informe d'error" + +msgid "specify a strftime format suffix for the filename(s)" msgstr "especifiqueu un sufix en format strftime per al nom de fitxer" #, c-format msgid "could not create leading directories for '%s'" msgstr "no s'han pogut crear els directoris principals de «%s»" +#, c-format +msgid "unable to create diagnostics archive %s" +msgstr "no s'ha pogut crear l'arxiu de diagnòstic %s" + msgid "System Info" msgstr "Informació del sistema" @@ -3209,10 +3262,6 @@ msgid "Unbundling objects" msgstr "S'estan desagrupant objectes" #, c-format -msgid "Unknown subcommand: %s" -msgstr "Subordre desconeguda: %s" - -#, c-format msgid "cannot read object %s '%s'" msgstr "no es pot llegir l'objecte %s «%s»" @@ -3274,17 +3323,16 @@ msgstr "Comprova l'existència de l'objecte o emet el contingut de l'objecte" msgid "check if <object> exists" msgstr "comprova si <object> existeix" -#, fuzzy msgid "pretty-print <object> content" -msgstr "empremta de <object> contingut" +msgstr "impressió embellida del contingut de l'<objecte>" -#, fuzzy msgid "Emit [broken] object attributes" -msgstr "Emet els atributs de l'objecte objectbroken]" +msgstr "Emet els atributs [broken] de l'objecte" -#, fuzzy msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)" -msgstr "mostra el tipus d'objecte (un de 'blob', 'tree', 'commit', 'tag', ...)" +msgstr "" +"mostra el tipus d'objecte (un dels següents: «blob», «tree», «commit», " +"«tag», ...)" msgid "show object size" msgstr "mostra la mida de l'objecte" @@ -3292,62 +3340,57 @@ msgstr "mostra la mida de l'objecte" msgid "allow -s and -t to work with broken/corrupt objects" msgstr "permet que -s i -t funcionin amb objectes trencats/malmesos" -#, fuzzy +msgid "use mail map file" +msgstr "usa el fitxer de mapa de correu" + msgid "Batch objects requested on stdin (or --batch-all-objects)" -msgstr "Objectes lots sol·licitats a stdin (o --batch-all-objects)" +msgstr "Objectes de lots sol·licitats a stdin (o --batch-all-objects)" -#, fuzzy msgid "show full <object> or <rev> contents" -msgstr "mostra el contingut complet de <object> o <rev>" +msgstr "mostra el contingut complet de <objecte> o <rev>" -#, fuzzy msgid "like --batch, but don't emit <contents>" -msgstr "com --batch, però no emeti <contents>" +msgstr "com a --batch, però no emetis <contents>" + +msgid "stdin is NUL-terminated" +msgstr "l'entrada és acabada amb NUL" -#, fuzzy msgid "read commands from stdin" msgstr "llegeix les ordres de stdin" -#, fuzzy msgid "with --batch[-check]: ignores stdin, batches all known objects" -msgstr "amb --batch--check:: ignora stdin, bateja tots els objectes coneguts" +msgstr "" +"amb --batch[-check]: ignora stdin, posa en lots tots els objectes coneguts" -#, fuzzy msgid "Change or optimize batch output" msgstr "Canvia o optimitza la sortida per lots" msgid "buffer --batch output" msgstr "posa la sortida de --batch en memòria intermèdia" -#, fuzzy msgid "follow in-tree symlinks" msgstr "segueix els enllaços simbòlics en l'arbre" -#, fuzzy msgid "do not order objects before emitting them" -msgstr "no ordena objectes abans d'emetre'ls" +msgstr "no ordenis els objectes abans d'emetre'ls" -#, fuzzy msgid "" "Emit object (blob or tree) with conversion or filter (stand-alone, or with " "batch)" msgstr "" "Emet l'objecte (blob o arbre) amb conversió o filtre (stand-alone, o amb lot)" -#, fuzzy msgid "run textconv on object's content" msgstr "executar textconv al contingut de l'objecte" -#, fuzzy msgid "run filters on object's content" msgstr "executa els filtres al contingut de l'objecte" msgid "blob|tree" msgstr "blob|tree" -#, fuzzy msgid "use a <path> for (--textconv | --filters); Not with 'batch'" -msgstr "useu un <path> per a (--textconv | --filters); No amb 'batch'" +msgstr "useu un <path> per a (--textconv | --filters); no amb «batch»" #, c-format msgid "'%s=<%s>' needs '%s' or '%s'" @@ -3358,7 +3401,7 @@ msgstr "path|tree-ish" #, c-format msgid "'%s' requires a batch mode" -msgstr "%s requereix un mode batch" +msgstr "«%s» requereix un mode batch" #, c-format msgid "'-%c' is incompatible with batch mode" @@ -3378,11 +3421,9 @@ msgstr "<object> requerit amb «-%c»" msgid "too many arguments" msgstr "hi ha massa arguments" -#, fuzzy, c-format +#, c-format msgid "only two arguments allowed in <type> <object> mode, not %d" -msgstr "" -"només es permeten dos arguments en el mode <type> <object>, no en un " -"percentatge" +msgstr "només es permeten dos arguments en el mode <type> <object>, no %d" msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." msgstr "git check-attr [-a | --all | <atribut>...] [--] <nom-de-camí>..." @@ -3460,9 +3501,8 @@ msgstr "«stage» ha de ser entre 1 i 3 o all" msgid "check out all files in the index" msgstr "agafa tots els fitxers en l'índex" -#, fuzzy msgid "do not skip files with skip-worktree set" -msgstr "no ometis els fitxers amb el conjunt d'arbres de salt" +msgstr "no ometis els fitxers amb skip-worktree establert" msgid "force overwrite of existing files" msgstr "força la sobreescriptura de fitxers existents" @@ -4016,7 +4056,7 @@ msgstr "" "ask each - confirma cada supressió (com «rm -i»)\n" "quit - deixa de netejar\n" "help - aquesta pantalla\n" -"? - ajuda de selecció de l'avís" +"? - ajuda de selecció manual" msgid "Would remove the following item:" msgid_plural "Would remove the following items:" @@ -4176,9 +4216,8 @@ msgstr "usa només adreces IPv4" msgid "use IPv6 addresses only" msgstr "usa només adreces IPv6" -#, fuzzy msgid "apply partial clone filters to submodules" -msgstr "Aplica els filtres de clonatge parcial als submòduls" +msgstr "aplica els filtres de clonatge parcial als submòduls" msgid "any cloned submodules will use their remote-tracking branch" msgstr "qualsevol submòdul clonat utilitzarà la seva branca de seguiment remot" @@ -4188,6 +4227,12 @@ msgstr "" "inicialitza el fitxer «sparse-checkout» per a incloure només els fitxers a " "l'arrel" +msgid "uri" +msgstr "uri" + +msgid "a URI for downloading bundles before fetching from origin remote" +msgstr "un URI per a baixar paquets abans d'obtenir des del remot origen" + #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: No s'ha pogut afegir un alternatiu per a «%s»: %s\n" @@ -4247,10 +4292,10 @@ msgstr "no s'ha pogut actualitzar %s" msgid "failed to initialize sparse-checkout" msgstr "no s'ha pogut inicialitzar «sparse-checkout»" -msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" +msgid "remote HEAD refers to nonexistent ref, unable to checkout" msgstr "" -"la HEAD remot es refereix a una referència que no existeix; no s'ha pogut " -"agafar.\n" +"la HEAD remot es refereix a una referència que no existeix, no s'ha pogut " +"agafar" msgid "unable to checkout working tree" msgstr "no s'ha pogut agafar l'arbre de treball" @@ -4274,6 +4319,12 @@ msgstr "Heu d'especificar un repositori per a clonar." msgid "options '%s' and '%s %s' cannot be used together" msgstr "les opcions «%s» i «%s %s» no es poden usar juntes" +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 "repository '%s' does not exist" msgstr "el repositori «%s» no existeix" @@ -4347,6 +4398,13 @@ msgstr "--local s'ignora" msgid "cannot clone from filtered bundle" msgstr "no es pot clonar des del farell filtrat" +msgid "failed to initialize the repo, skipping bundle URI" +msgstr "no s'ha pogut inicialitzar el repositori, s'omet l'URI del paquet" + +#, c-format +msgid "failed to fetch objects from bundle URI '%s'" +msgstr "no s'han pogut obtenir els objectes de l'URI del paquet «%s»" + msgid "remote transport reported error" msgstr "el transport remot ha informat d'un error" @@ -4462,10 +4520,6 @@ msgstr "usa com a màxim un --reachable, --stdin-commits, o --stdin-packs" msgid "Collecting commits from input" msgstr "S'estan recollint les comissions de l'entrada" -#, c-format -msgid "unrecognized subcommand: %s" -msgstr "subordre no reconeguda: %s" - msgid "" "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " "<file>)...] <tree>" @@ -4821,9 +4875,6 @@ msgstr "mostra l'estat en format llarg (per defecte)" msgid "terminate entries with NUL" msgstr "acaba les entrades amb NUL" -msgid "mode" -msgstr "mode" - msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "mostra els fitxers no seguits, modes opcionals: all, normal, no. (Per " @@ -4869,7 +4920,7 @@ msgid "Commit message options" msgstr "Opcions de missatge de comissió" msgid "read message from file" -msgstr "llegiu el missatge des d'un fitxer" +msgstr "llegeix el missatge des d'un fitxer" msgid "author" msgstr "autor" @@ -5095,7 +5146,7 @@ msgid "type" msgstr "tipus" msgid "value is given this type" -msgstr "el valor té donat aquest tipus" +msgstr "el valor és d'aquest tipus que s'ha donat" msgid "value is \"true\" or \"false\"" msgstr "el valor és «true» o «false»" @@ -5356,7 +5407,7 @@ msgstr "" #, c-format msgid "traversed %lu commits\n" -msgstr "%lu comissions travessades\n" +msgstr "%lu comissions recorregudes\n" #, c-format msgid "" @@ -5427,6 +5478,22 @@ msgstr "No s'ha trobat cap nom, no es pot descriure res." msgid "option '%s' and commit-ishes cannot be used together" msgstr "les opcions «%s» i de comissió no es poden usar juntes" +msgid "" +"git diagnose [-o|--output-directory <path>] [-s|--suffix <format>] [--" +"mode=<mode>]" +msgstr "" +"git diagnose [-o|--output-directory <path>] [-s|--suffix <format>] [--" +"mode=<mode>]" + +msgid "specify a destination for the diagnostics archive" +msgstr "especifiqueu una destinació per a l'arxiu de diagnòstic" + +msgid "specify a strftime format suffix for the filename" +msgstr "especifiqueu un sufix en format strftime per al nom de fitxer" + +msgid "specify the content of the diagnostic archive" +msgstr "especifica el contingut de l'arxiu de diagnòstic" + msgid "--merge-base only works with two commits" msgstr "--merge-base només funciona amb dues comissions" @@ -5695,7 +5762,7 @@ msgid "set upstream for git pull/fetch" msgstr "estableix la font per a git pull/fetch" msgid "append to .git/FETCH_HEAD instead of overwriting" -msgstr "annexa a .git/FETCH_HEAD en lloc de sobreescriure" +msgstr "annexa a .git/FETCH_HEAD en lloc de sobreescriure'l" msgid "use atomic transaction to update references" msgstr "usa una transacció atòmica per a actualitzar les referències" @@ -5755,9 +5822,8 @@ msgstr "aprofundeix la història d'un clon superficial basat en una data" msgid "convert to a complete repository" msgstr "converteix en un repositori complet" -#, fuzzy msgid "re-fetch without negotiating common commits" -msgstr "tornar a capturar sense negociar comissions comunes" +msgstr "tornar a obtenir sense negociar comissions comunes" msgid "prepend this to submodule path output" msgstr "anteposa això a la sortida de camí del submòdul" @@ -5812,12 +5878,9 @@ msgstr "[al dia]" msgid "[rejected]" msgstr "[rebutjat]" -msgid "can't fetch in current branch" +msgid "can't fetch into checked-out branch" msgstr "no es pot obtenir en la branca actual" -msgid "checked out in another worktree" -msgstr "s'ha agafat en un altre arbre de treball" - msgid "[tag update]" msgstr "[actualització d'etiqueta]" @@ -5974,7 +6037,6 @@ msgstr "" msgid "you need to specify a tag name" msgstr "necessiteu especificar un nom d'etiqueta" -#, fuzzy msgid "--negotiate-only needs one or more --negotiation-tip=*" msgstr "--negotiate-only necessita un o més --negotiation-tip=*" @@ -6025,7 +6087,7 @@ msgid "populate log with at most <n> entries from shortlog" msgstr "emplena el registre amb <n> entrades del registre curt com a màxim" msgid "alias for --log (deprecated)" -msgstr "àlies per --log (en desús)" +msgstr "àlies per a --log (en desús)" msgid "text" msgstr "text" @@ -6054,7 +6116,8 @@ msgstr "" msgid "quote placeholders suitably for shells" msgstr "" -"posa els marcadors de posició de forma adequada per a intèrprets d'ordres" +"posa els marcadors de posició entre cometes adequades per a intèrprets " +"d'ordres" msgid "quote placeholders suitably for perl" msgstr "posa els marcadors de posició entre cometes adequades per al perl" @@ -6131,15 +6194,15 @@ msgstr "S'està comprovant la connectivitat" #, c-format msgid "missing %s %s" -msgstr "manca %s %s" +msgstr "%s %s manca" #, c-format msgid "unreachable %s %s" -msgstr "inabastable %s %s" +msgstr "%s %s inabastable" #, c-format msgid "dangling %s %s" -msgstr "sense assignació %s %s" +msgstr "%s %s sense assignació" msgid "could not create lost-found" msgstr "no s'ha pogut crear el trobat-perdut" @@ -6238,7 +6301,7 @@ msgstr "%s apunta a una cosa estranya (%s)" #, c-format msgid "%s: detached HEAD points at nothing" -msgstr "%s: el HEAD separat no apunta a res" +msgstr "%s: la HEAD separada no apunta a res" #, c-format msgid "notice: %s points to an unborn branch (%s)" @@ -6254,6 +6317,10 @@ msgstr "%s: apuntador sha1 no vàlid a l'arbre de la memòria cau" msgid "non-tree in cache-tree" msgstr "un no arbre en l'arbre de la memòria cau" +#, c-format +msgid "%s: invalid sha1 pointer in resolve-undo" +msgstr "%s: el punter sha1 no és vàlid a «resolve-undo»" + msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<opcions>] [<objecte>...]" @@ -6320,49 +6387,45 @@ msgstr "git fsmonitor--daemon status" msgid "value of '%s' out of range: %d" msgstr "el valor de «%s» està fora de rang: %d" -#, fuzzy, c-format +#, c-format msgid "value of '%s' not bool or int: %d" -msgstr "valor de \"%s\" no bool ni int: el percentatge" +msgstr "valor de «%s» no és booleà ni enter: %d" #, c-format msgid "fsmonitor-daemon is watching '%s'\n" -msgstr "fsmonitor-daemon està veient '%s'\n" +msgstr "fsmonitor-daemon està veient «%s»\n" #, c-format msgid "fsmonitor-daemon is not watching '%s'\n" msgstr "fsmonitor-daemon no està vigilant «%s»\n" -#, fuzzy, c-format +#, c-format msgid "could not create fsmonitor cookie '%s'" -msgstr "no s'ha pogut crear la galeta fsmonitor '%s'" +msgstr "no s'ha pogut crear la galeta fsmonitor «%s»" #, c-format msgid "fsmonitor: cookie_result '%d' != SEEN" -msgstr "fsmonitor: cookie_result '%d' != SEEN" +msgstr "fsmonitor: cookie_result «%d» != SEEN" -#, fuzzy, c-format +#, c-format msgid "could not start IPC thread pool on '%s'" msgstr "no s'ha pogut iniciar el grup de fils IPC a «%s»" -#, fuzzy msgid "could not start fsmonitor listener thread" -msgstr "no s'ha pogut iniciar el fil d'oient del fsmonitor" +msgstr "no s'ha pogut iniciar el fil receptor del fsmonitor" -#, fuzzy msgid "could not start fsmonitor health thread" -msgstr "no s'ha pogut iniciar el fil d'oient del fsmonitor" +msgstr "no s'ha pogut iniciar el fil de salut del fsmonitor" -#, fuzzy msgid "could not initialize listener thread" -msgstr "no s'ha pogut inicialitzar el fil d'oient" +msgstr "no s'ha pogut inicialitzar el fil receptor" -#, fuzzy msgid "could not initialize health thread" -msgstr "no s'ha pogut inicialitzar el fil d'oient" +msgstr "no s'ha pogut inicialitzar el fil de salut" -#, fuzzy, c-format +#, c-format msgid "could not cd home '%s'" -msgstr "no s'ha pogut tancar «%s»" +msgstr "no s'ha pogut fer cd home «%s»" #, c-format msgid "fsmonitor--daemon is already running '%s'" @@ -6372,15 +6435,13 @@ msgstr "fsmonitor--daemon is already running «%s»" msgid "running fsmonitor-daemon in '%s'\n" msgstr "s'està executant fsmonitor-daemon en «%s»\n" -#, fuzzy, c-format +#, c-format msgid "starting fsmonitor-daemon in '%s'\n" -msgstr "s'està iniciant fsmonitor-daemon a «%s»" +msgstr "s'està iniciant fsmonitor-daemon a «%s»\n" -#, fuzzy msgid "daemon failed to start" msgstr "el dimoni ha fallat en iniciar" -#, fuzzy msgid "daemon not online yet" msgstr "el dimoni encara no està en línia" @@ -6393,19 +6454,17 @@ msgstr "separat de la consola" msgid "use <n> ipc worker threads" msgstr "usa <n> fils de treball ipc" -#, fuzzy msgid "max seconds to wait for background daemon startup" -msgstr "màxim de segons a esperar a l'inici del dimoni de fons" +msgstr "màxim de segons a esperar a l'inici del dimoni en segon pla" -#, fuzzy, c-format +#, c-format msgid "invalid 'ipc-threads' value (%d)" -msgstr "valor «ipc-threads» no vàlid (%)" +msgstr "valor «ipc-threads» no vàlid (%d)" -#, fuzzy, c-format +#, c-format msgid "Unhandled subcommand '%s'" -msgstr "Subordre no gestionada '%s'" +msgstr "Subordre no gestionada «%s»" -#, fuzzy msgid "fsmonitor--daemon not supported on this platform" msgstr "fsmonitor--daemon no és compatible amb aquesta plataforma" @@ -6441,9 +6500,8 @@ msgstr "" msgid "prune unreferenced objects" msgstr "poda objectes sense referència" -#, fuzzy msgid "pack unreferenced objects separately" -msgstr "poda objectes sense referència" +msgstr "empaqueta els objectes no referenciats de forma separada" msgid "be more thorough (increased runtime)" msgstr "sigues més exhaustiu (el temps d'execució augmenta)" @@ -6458,9 +6516,9 @@ msgstr "" msgid "repack all other packs except the largest pack" msgstr "reempaqueta tots els altres paquets excepte el paquet més gran" -#, fuzzy, c-format +#, c-format msgid "failed to parse gc.logExpiry value %s" -msgstr "no s'ha pogut analitzar el valor %s de gc.logexpiry" +msgstr "no s'ha pogut analitzar el valor %s de gc.logExpiry" #, c-format msgid "failed to parse prune expiry value %s" @@ -6598,13 +6656,16 @@ msgstr "" "no s'ha pogut executar «crontab -l»; el vostre sistema podria no admetre " "«cron»" +msgid "failed to create crontab temporary file" +msgstr "no s'ha pogut crear un fitxer temporal crontab" + +msgid "failed to open temporary file" +msgstr "no s'ha pogut obrir el fitxer temporal" + msgid "failed to run 'crontab'; your system might not support 'cron'" msgstr "" "no s'ha pogut executar «crontab»; el vostre sistema podria no admetre «cron»" -msgid "failed to open stdin of 'crontab'" -msgstr "s'ha produït un error en obrir stdin de «crontab»" - msgid "'crontab' died" msgstr "«crontab» ha mort" @@ -6651,10 +6712,6 @@ msgstr "no s'ha pogut afegir un repositori a la configuració global" msgid "git maintenance <subcommand> [<options>]" msgstr "git maintenance <subcommand> [<options>]" -#, c-format -msgid "invalid subcommand: %s" -msgstr "subordre no vàlida: %s" - msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<opcions>] [-e] <patró> [<revisió>...] [[--] <camí>...]" @@ -6715,7 +6772,7 @@ msgid "process binary files as text" msgstr "processa els fitxers binaris com a text" msgid "don't match patterns in binary files" -msgstr "no coincideixis amb els patrons en els fitxers binaris" +msgstr "no cerquis els patrons en els fitxers binaris" msgid "process binary files with textconv filters" msgstr "processa els fitxers binaris amb filtres de textconv" @@ -6829,6 +6886,9 @@ msgstr "mostra els fitxers coincidents en el paginador" msgid "allow calling of grep(1) (ignored by this build)" msgstr "permet la invocació de grep(1) (ignorat per aquesta compilació)" +msgid "maximum number of results per file" +msgstr "nombre màxim de resultats per fitxer" + msgid "no pattern given" msgstr "no s'ha donat cap patró" @@ -6892,11 +6952,9 @@ msgstr "processa el fitxer com si fos d'aquest camí" msgid "print all available commands" msgstr "imprimeix totes les ordres disponibles" -#, fuzzy msgid "show external commands in --all" msgstr "mostra les ordres externes a --all" -#, fuzzy msgid "show aliases in --all" msgstr "mostra els àlies a --all" @@ -6918,11 +6976,21 @@ msgstr "imprimeix la descripció de l'ordre" msgid "print list of useful guides" msgstr "imprimeix la llista de guies útils" +msgid "print list of user-facing repository, command and file interfaces" +msgstr "" +"imprimeix la llista de repositoris, ordres i interfícies de fitxers que veu " +"l'usuari" + +msgid "print list of file formats, protocols and other developer interfaces" +msgstr "" +"mostra la llista de formats de fitxer, protocols i altres interfícies de " +"desenvolupador" + msgid "print all configuration variable names" msgstr "imprimeix tots els noms de les variables de configuració" -msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]" -msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]" +msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>|<doc>]" +msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>|<doc>]" #, c-format msgid "unrecognized help format '%s'" @@ -6976,16 +7044,15 @@ msgstr "«%s» és un àlies de «%s»" msgid "bad alias.%s string: %s" msgstr "cadena «alias.%s» incorrecte: %s" -#, fuzzy, c-format +#, c-format msgid "the '%s' option doesn't take any non-option arguments" msgstr "l'opció «%s» no pren cap argument que no sigui una opció" -#, fuzzy msgid "" "the '--no-[external-commands|aliases]' options can only be used with '--all'" msgstr "" -"les opcions «--no-exexternal-commands|aliases with» només es poden utilitzar " -"amb «--all»" +"les opcions «--no-[external-commands|aliases]» només es poden utilitzar amb " +"«--all»" #, c-format msgid "usage: %s%s" @@ -7144,8 +7211,8 @@ msgstr "Suma de verificació final no esperada per a %s (corrupció de disc?)" #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" -msgstr[0] "El paquet té %d diferència no resolta" -msgstr[1] "El paquet té %d diferències no resoltes" +msgstr[0] "el paquet té %d diferència no resolta" +msgstr[1] "el paquet té %d diferències no resoltes" #, c-format msgid "unable to deflate appended object (%d)" @@ -7174,9 +7241,9 @@ msgstr "no s'ha pogut canviar el nom del fitxer temporal «*.%s» a «%s»" msgid "error while closing pack file" msgstr "error en tancar el fitxer empaquetat" -#, fuzzy, c-format +#, c-format msgid "bad pack.indexVersion=%<PRIu32>" -msgstr "pack.indexversion=%<PRIu32> incorrecte" +msgstr "bad pack.indexVersion=%<PRIu32>" #, c-format msgid "Cannot open existing pack file '%s'" @@ -7207,7 +7274,7 @@ msgstr "%s incorrecte" #, c-format msgid "unknown hash algorithm '%s'" -msgstr "algorisme hash desconegut «%s»" +msgstr "algorisme de resum desconegut «%s»" msgid "--stdin requires a git repository" msgstr "--stdin requereix un repositori git" @@ -7263,7 +7330,7 @@ msgid "unable to move %s to %s" 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 hash diferent" +msgstr "s'ha intentat reinicialitzar el repositori amb un resum diferent" #, c-format msgid "%s already exists" @@ -7307,7 +7374,7 @@ msgid "override the name of the initial branch" msgstr "sobreescriu el nom de la branca inicial" msgid "hash" -msgstr "hash" +msgstr "resum" msgid "specify the hash algorithm to use" msgstr "especifiqueu l'algorisme de resum a usar" @@ -7397,8 +7464,8 @@ msgstr "omet la sortida de diferències" msgid "show source" msgstr "mostra la font" -msgid "use mail map file" -msgstr "usa el fitxer de mapa de correu" +msgid "clear all previously-defined decoration filters" +msgstr "neteja tots els filtres de decoració prèviament definits" msgid "only decorate refs that match <pattern>" msgstr "només decora les referències que coincideixin amb <patró>" @@ -7427,7 +7494,6 @@ msgstr "-L<range>:<file> no es pot usar amb una especificació de camí" msgid "Final output: %d %s\n" msgstr "Sortida final: %d %s\n" -#, fuzzy msgid "unable to create temporary object directory" msgstr "no s'ha pogut crear el directori temporal de l'objecte" @@ -7494,7 +7560,7 @@ msgid "" msgstr "" "no s'ha pogut obtenir la font, si voleu registrar la comissió base\n" "automàticament, useu git branch --set-upstream-to per a seguir una\n" -"una branca remota. També podeu especificar la comissió base amb --base=<base-" +"branca remota. També podeu especificar la comissió base amb --base=<base-" "commit-id> manualment" msgid "failed to find exact merge base" @@ -7574,7 +7640,7 @@ msgid "don't output binary diffs" msgstr "no emetis diferències binàries" msgid "output all-zero hash in From header" -msgstr "emet un hash de tots zeros en la capçalera From" +msgstr "emet un resum de tots zeros en la capçalera From" msgid "don't include a patch matching a commit upstream" msgstr "no incloguis pedaços que coincideixin amb comissions a la font" @@ -7658,6 +7724,11 @@ msgstr "" msgid "percentage by which creation is weighted" msgstr "percentatge pel qual la creació és ponderada" +msgid "show in-body From: even if identical to the e-mail header" +msgstr "" +"mostra en el cos el remitent: encara que sigui idèntic a la capçalera del " +"correu electrònic" + #, c-format msgid "invalid ident line: %s" msgstr "línia d'identitat no vàlida: %s" @@ -7718,6 +7789,18 @@ msgstr "" "No s'ha pogut trobar una branca remota seguida. Especifiqueu <font> " "manualment.\n" +#, c-format +msgid "bad ls-files format: element '%s' does not start with '('" +msgstr "format incorrecte del ls-files: l'element «%s» no comença amb «(»" + +#, c-format +msgid "bad ls-files format: element '%s' does not end in ')'" +msgstr "format incorrecte del ls-files: l'element «%s» no acaba amb «)»" + +#, c-format +msgid "bad ls-files format: %%%.*s" +msgstr "format incorrecte de ls-files: %%%.*s" + msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<opcions>] [<fitxer>...]" @@ -7805,6 +7888,13 @@ msgid "show sparse directories in the presence of a sparse index" msgstr "mostra els directoris dispersos en presència d'un índex dispers" msgid "" +"--format cannot be used with -s, -o, -k, -t, --resolve-undo, --deduplicate, " +"--eol" +msgstr "" +"--format no es pot usar amb -s, -o, -k, -t, --resolve-undo, --deduplicate, --" +"eol" + +msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" " [-q | --quiet] [--exit-code] [--get-url]\n" " [--symref] [<repository> [<refs>...]]" @@ -7826,7 +7916,7 @@ msgid "limit to tags" msgstr "limita a etiquetes" msgid "limit to heads" -msgstr "limita a caps" +msgstr "limita a «heads»" msgid "do not show peeled tags" msgstr "no mostris les etiquetes pelades" @@ -7843,21 +7933,21 @@ msgstr "mostra la referència subjacent a més de l'objecte que assenyali" msgid "git ls-tree [<options>] <tree-ish> [<path>...]" msgstr "git ls-tree [<opcions>] <arbre> [<camí>...]" -#, fuzzy, c-format +#, c-format msgid "could not get object info about '%s'" -msgstr "no s'ha pogut obtenir la informació de l'objecte sobre «%s»" +msgstr "no s'ha pogut obtenir la informació sobre l'objecte «%s»" -#, fuzzy, c-format +#, c-format msgid "bad ls-tree format: element '%s' does not start with '('" -msgstr "format ls-tree dolent: l'element '%s' no comença amb '('" +msgstr "format incorrecte del ls-tree: l'element '%s' no comença amb «(»" -#, fuzzy, c-format +#, c-format msgid "bad ls-tree format: element '%s' does not end in ')'" -msgstr "format ls-tree dolent: l'element '%s' no acaba en ')'" +msgstr "format incorrecte del ls-tree: l'element '%s' no acaba en «(»" -#, fuzzy, c-format +#, c-format msgid "bad ls-tree format: %%%.*s" -msgstr "format incorrecte de ls-tree:%%.*s" +msgstr "format incorrecte de ls-tree: %%%.*s" msgid "only show trees" msgstr "mostra només els arbres" @@ -7877,7 +7967,6 @@ msgstr "mida de l'objecte d'inclusió" msgid "list only filenames" msgstr "llista només els noms de fitxer" -#, fuzzy msgid "list only objects" msgstr "llista només els objectes" @@ -7888,7 +7977,6 @@ msgid "list entire tree; not just current directory (implies --full-name)" msgstr "" "llista l'arbre sencer; no només el directori actual (implica --full-name)" -#, fuzzy msgid "--format can't be combined with other format-altering options" msgstr "--format no es pot combinar amb altres opcions d'alteració de format" @@ -7924,14 +8012,13 @@ msgid "<action>" msgstr "<acció>" msgid "action when quoted CR is found" -msgstr "acció quan es troba un CR en una cita" +msgstr "acció quan es troba un CR entre cometes" msgid "use headers in message's body" msgstr "utilitza les capçaleres en el cos del missatge" -#, fuzzy msgid "reading patches from stdin/tty..." -msgstr "llegir pedaços de stdin/tty..." +msgstr "s'estan llegint pedaços de stdin/tty..." #, c-format msgid "empty mbox: '%s'" @@ -8027,6 +8114,39 @@ msgstr "no s'ha pogut resoldre la referència «%s»" msgid "Merging %s with %s\n" msgstr "S'està fusionant %s amb %s\n" +msgid "not something we can merge" +msgstr "no és quelcom que puguem fusionar" + +msgid "refusing to merge unrelated histories" +msgstr "s'està refusant fusionar històries no relacionades" + +msgid "failure to merge" +msgstr "s'ha produït un error en fusionar" + +msgid "git merge-tree [--write-tree] [<options>] <branch1> <branch2>" +msgstr "git merge-tree [--write-tree] [<options>] <branch1> <branch2>" + +msgid "git merge-tree [--trivial-merge] <base-tree> <branch1> <branch2>" +msgstr "git merge-tree [--trivial-merge] <base-tree> <branch1> <branch2>" + +msgid "do a real merge instead of a trivial merge" +msgstr "fes una fusió real en lloc d'una fusió trivial" + +msgid "do a trivial merge only" +msgstr "fes només una fusió trivial" + +msgid "also show informational/conflict messages" +msgstr "també mostra missatges informatius i de conflictes" + +msgid "list filenames without modes/oids/stages" +msgstr "llista els noms de fitxer sense modes/oids/stages" + +msgid "allow merging unrelated histories" +msgstr "permet fusionar històries no relacionades" + +msgid "--trivial-merge is incompatible with all other options" +msgstr "--trivial-merge és incompatible amb totes les altres opcions" + msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<opcions>] [<comissió>...]" @@ -8106,10 +8226,7 @@ msgid "--abort but leave index and working tree alone" msgstr "--abort però deixa l'índex i l'arbre de treball intactes" msgid "continue the current in-progress merge" -msgstr "continua la fusió en curs actual" - -msgid "allow merging unrelated histories" -msgstr "permet fusionar històries no relacionades" +msgstr "continua la fusió actual en curs" msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "evita els lligams pre-merge-commit i commit-msg" @@ -8230,9 +8347,6 @@ msgstr "no s'ha pogut tancar «%s»" msgid "not something we can merge in %s: %s" msgstr "no és quelcom que puguem fusionar en %s: %s" -msgid "not something we can merge" -msgstr "no és quelcom que puguem fusionar" - msgid "--abort expects no arguments" msgstr "--abort no espera cap argument" @@ -8271,26 +8385,31 @@ msgstr "" "establert." msgid "Squash commit into empty head not supported yet" -msgstr "Una comissió «squash» a un HEAD buit encara no es permet" +msgstr "Una comissió «squash» a una HEAD buida encara no es permet" msgid "Non-fast-forward commit does not make sense into an empty head" -msgstr "Una comissió no d'avanç ràpid no té sentit a un HEAD buit" +msgstr "Una comissió no d'avanç ràpid no té sentit a una HEAD buida" #, c-format msgid "%s - not something we can merge" msgstr "%s - no és una cosa que puguem fusionar" msgid "Can merge only exactly one commit into empty head" -msgstr "Es pot fusionar només una comissió a un HEAD buit" - -msgid "refusing to merge unrelated histories" -msgstr "s'està refusant fusionar històries no relacionades" +msgstr "Es pot fusionar només una comissió a una HEAD buida" #, c-format msgid "Updating %s..%s\n" msgstr "S'estan actualitzant %s..%s\n" #, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" +"Els canvis locals als fitxers següents se sobreescriuran per la fusió:\n" +" %s" + +#, c-format msgid "Trying really trivial in-index merge...\n" msgstr "S'està intentant una fusió molt trivial en l'índex...\n" @@ -8325,6 +8444,10 @@ msgstr "" "demanat\n" #, c-format +msgid "When finished, apply stashed changes with `git stash pop`\n" +msgstr "Quan acabi, aplica els canvis «stashed» amb «git stash pop»\n" + +#, c-format msgid "warning: tag input does not pass fsck: %s" msgstr "avís: l'entrada d'etiqueta no passa fsck: %s" @@ -8381,9 +8504,8 @@ msgstr "git multi-pack-index [<opcions>] expire" msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]" msgstr "git multi-pack-index [<opcions>] repack [--batch-size=<mida>]" -#, fuzzy msgid "directory" -msgstr "fitxer/directori" +msgstr "directori" msgid "object directory containing set of packfile and pack-index pairs" msgstr "" @@ -8447,6 +8569,9 @@ msgstr "S'està comprovant el canvi de nom de «%s» a «%s»\n" msgid "bad source" msgstr "origen incorrecte" +msgid "destination exists" +msgstr "el destí existeix" + msgid "can not move directory into itself" msgstr "no es pot moure un directori a dins d'ell mateix" @@ -8462,9 +8587,6 @@ msgstr "no està sota control de versions" msgid "conflicted" msgstr "en conflicte" -msgid "destination exists" -msgstr "el destí existeix" - #, c-format msgid "overwriting '%s'" msgstr "s'està sobreescrivint «%s»" @@ -8478,6 +8600,9 @@ msgstr "múltiples orígens per al mateix destí" msgid "destination directory does not exist" msgstr "el directori destí no existeix" +msgid "destination exists in the index" +msgstr "el destí existeix a l'índex" + #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, origen=%s, destí=%s" @@ -8514,11 +8639,9 @@ msgstr "ignora les referències que coincideixin amb <patró>" msgid "list all commits reachable from all refs" msgstr "llista totes les comissions abastables de totes les referències" -#, fuzzy msgid "deprecated: use --annotate-stdin instead" -msgstr "obsolet: useu annotate-stdin" +msgstr "obsolet: useu en comptes --annotate-stdin" -#, fuzzy msgid "annotate text from stdin" msgstr "anota el text de stdin" @@ -8842,8 +8965,8 @@ msgid "use notes from <notes-ref>" msgstr "usa les notes de <referència-de-notes>" #, c-format -msgid "unknown subcommand: %s" -msgstr "subordre desconeguda: %s" +msgid "unknown subcommand: `%s'" +msgstr "subordre desconeguda: «%s»" msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" @@ -8986,21 +9109,18 @@ msgstr "no s'ha pogut obtenir el tipus de l'objecte %s al paquet %s" msgid "could not find pack '%s'" msgstr "no s'ha pogut trobar el paquet «%s»" -#, fuzzy, c-format +#, c-format msgid "packfile %s cannot be accessed" -msgstr "el fitxer de paquet %s no es pot mapar%s" +msgstr "no es pot accedir al fitxer de paquet %s" -#, fuzzy msgid "Enumerating cruft objects" -msgstr "S'estan enumerant els objectes" +msgstr "S'estan enumerant els objectes superflus" -#, fuzzy msgid "unable to add cruft objects" -msgstr "no s'han pogut afegir els objectes recents" +msgstr "no s'han pogut afegir els objectes superflus" -#, fuzzy msgid "Traversing cruft objects" -msgstr "S'estan comprimint els objectes" +msgstr "S'estan recorrent els objectes superflus" #, c-format msgid "" @@ -9018,9 +9138,8 @@ msgstr "" "s'esperava un identificador d'objecte, s'ha rebut brossa:\n" " %s" -#, fuzzy msgid "could not load cruft pack .mtimes" -msgstr "no s'ha pogut carregar el paquet" +msgstr "no s'ha pogut carregar superflus del paquet superflu" msgid "cannot open pack index" msgstr "no s'ha pogut obrir l'índex del paquet" @@ -9090,16 +9209,16 @@ msgid "use OFS_DELTA objects" msgstr "usa objectes OFS_DELTA" msgid "use threads when searching for best delta matches" -msgstr "usa fils en cercar les millores coincidències de diferències" +msgstr "usa fils en cercar les millors coincidències de diferències" msgid "do not create an empty pack output" -msgstr "no creïs una emissió de paquet buida" +msgstr "no creïs una emissió de paquet buit" msgid "read revision arguments from standard input" msgstr "llegeix els arguments de revisió des de l'entrada estàndard" msgid "limit the objects to those that are not yet packed" -msgstr "limita els objectes als quals encara no s'hagin empaquetat" +msgstr "limita els objectes a aquells que encara no estan empaquetats" msgid "include objects reachable from any reference" msgstr "inclou els objectes abastables de qualsevol referència" @@ -9131,13 +9250,11 @@ msgstr "empaqueta els objectes inabastables solts" msgid "unpack unreachable objects newer than <time>" msgstr "desempaqueta els objectes inabastables més nous que <data>" -#, fuzzy msgid "create a cruft pack" -msgstr "crea paquets prims" +msgstr "crea un paquet superflu" -#, fuzzy msgid "expire cruft objects older than <time>" -msgstr "fes caducar els objectes més antics que <data>" +msgstr "fes caducar els objectes superflus més antics que <data>" msgid "use the sparse reachability algorithm" msgstr "utilitza l'algorisme d'accessibilitat dispers" @@ -9175,7 +9292,7 @@ msgid "handling for missing objects" msgstr "gestió dels objectes absents" msgid "do not pack objects in promisor packfiles" -msgstr "empaquetis els objectes als fitxers de paquet «promisor»" +msgstr "no empaquetis els objectes als fitxers de paquet «promisor»" msgid "respect islands during delta compression" msgstr "respecta les illes durant la compressió delta" @@ -9219,17 +9336,14 @@ msgstr "no es pot utilitzar --filter sense --stdin-packs" msgid "cannot use internal rev list with --stdin-packs" msgstr "no es pot utilitzar la llista de revisió interna amb --stdin-packs" -#, fuzzy msgid "cannot use internal rev list with --cruft" -msgstr "no es pot utilitzar la llista de revisió interna amb --stdin-packs" +msgstr "no es pot utilitzar la llista de revisió interna amb --cruft" -#, fuzzy msgid "cannot use --stdin-packs with --cruft" -msgstr "no es pot usar -a amb -d" +msgstr "no es pot --stdin-packs amb --cruft" -#, fuzzy msgid "cannot use --max-pack-size with --cruft" -msgstr "no es pot usar -a amb -d" +msgstr "no es pot usar --max-pack-size amb --cruft" msgid "Enumerating objects" msgstr "S'estan enumerant els objectes" @@ -9408,7 +9522,7 @@ msgstr "" "preferència per defecte per a tots els repositoris. Podeu també usar --" "rebase,\n" "--no-rebase o --ff-only en la línia d'ordres per a sobreescriure el valor\n" -"per defecte configuració en aquesta execució.\n" +"per defecte de la configuració en aquesta execució.\n" msgid "Updating an unborn branch with changes added to the index." msgstr "" @@ -9448,7 +9562,7 @@ msgstr "" "per a recuperar." msgid "Cannot merge multiple branches into empty head." -msgstr "No es poden fusionar múltiples branques a un HEAD buit." +msgstr "No es poden fusionar múltiples branques a una HEAD buida." msgid "Cannot rebase onto multiple branches." msgstr "No es pot fer «rebase» sobre múltiples branques." @@ -9473,14 +9587,13 @@ msgstr "abreviatura d'etiqueta sense <tag>" msgid "--delete only accepts plain target ref names" msgstr "--delete només accepta noms de referència de destí senzills" -#, fuzzy msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'.\n" msgstr "" "\n" -"Per a triar qualsevol opció permanentment, vegeu push.default a «git help " -"config»." +"Per a triar qualsevol de les opcions permanentment, vegeu push.default a " +"«git help config».\n" msgid "" "\n" @@ -9489,8 +9602,13 @@ msgid "" "autoSetupMerge\n" "in 'git help config'.\n" msgstr "" +"\n" +"Per a evitar configurar automàticament les branques font quan el seu nom\n" +"no coincideix amb el de la branca local, vegeu l'opció «simple» de «branch." +"autoSetupMerge»\n" +"a «git help config».\n" -#, fuzzy, c-format +#, c-format msgid "" "The upstream branch of your current branch does not match\n" "the name of your current branch. To push to the upstream branch\n" @@ -9512,7 +9630,7 @@ msgstr "" "Per a pujar a la branca del mateix nom en el remot, useu\n" "\n" " git push %s HEAD\n" -"%s" +"%s%s" #, c-format msgid "" @@ -9533,8 +9651,12 @@ msgid "" "To have this happen automatically for branches without a tracking\n" "upstream, see 'push.autoSetupRemote' in 'git help config'.\n" msgstr "" +"\n" +"Per fer que això succeeixi automàticament per a les branques sense " +"seguiment\n" +"font, vegeu «push.autoSetupRemote» a «git help config».\n" -#, fuzzy, c-format +#, c-format msgid "" "The current branch %s has no upstream branch.\n" "To push the current branch and set the remote as upstream, use\n" @@ -9546,6 +9668,7 @@ msgstr "" "Per a pujar la branca actual i establir el remot com a font, useu\n" "\n" " git push --set-upstream %s %s\n" +"%s" #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." @@ -9761,11 +9884,16 @@ msgid "only emit output related to the second range" msgstr "emet només la sortida relacionada amb el segon interval" #, c-format +msgid "not a revision: '%s'" +msgstr "«%s» no és una revisió" + +#, c-format msgid "not a commit range: '%s'" msgstr "no és un rang de comissions: «%s»" -msgid "single arg format must be symmetric range" -msgstr "el format de l'argument únic ha de ser de rang simètric" +#, c-format +msgid "not a symmetric range: '%s'" +msgstr "no és un rang simètric: «%s»" msgid "need two commit ranges" msgstr "calen dos rangs de comissió" @@ -9804,7 +9932,7 @@ msgid "<subdirectory>/" msgstr "<subdirectori>/" msgid "read the tree into the index under <subdirectory>/" -msgstr "llegiu l'arbre a l'índex sota <subdirectori>/" +msgstr "llegeix l'arbre a l'índex sota <subdirectori>/" msgid "update working tree with merge result" msgstr "actualitza l'arbre de treball amb el resultat de fusió" @@ -9983,7 +10111,7 @@ msgid "add a Signed-off-by trailer to each commit" msgstr "afegeix un «trailer» tipus «Signed-off-by» a cada comissió" msgid "make committer date match author date" -msgstr "fes que la data del «comitter» coincideixi amb la data de l'autor" +msgstr "fes que la data del «committer» coincideixi amb la data de l'autor" msgid "ignore author date and use current date" msgstr "ignora la data de l'autor i utilitza la data actual" @@ -10027,9 +10155,8 @@ msgstr "utilitza estratègies de fusió per a fer «rebase»" msgid "let the user edit the list of commits to rebase" msgstr "permet a l'usuari editar la llista de comissions a fer «rebase»" -#, fuzzy msgid "(REMOVED) was: try to recreate merges instead of ignoring them" -msgstr "(EN DESÚS) intenta recrear fusions en lloc d'ignorar-les" +msgstr "(SUPRIMIT) era: intenta recrear fusions en lloc d'ignorar-les" msgid "how to handle commits that become empty" msgstr "com gestionar les comissions que queden buides" @@ -10040,6 +10167,11 @@ msgstr "manté les comissions que comencen en blanc" msgid "move commits that begin with squash!/fixup! under -i" msgstr "mou les comissions que comencen amb squash!/fixup! sota -i" +msgid "update branches that point to commits that are being rebased" +msgstr "" +"actualitza les branques que apunten a comissions a les quals se'ls està fent " +"«rebase»" + msgid "add exec lines after each commit of the editable list" msgstr "afegeix línies d'exec després de cada comissió de la llista editable" @@ -10078,12 +10210,18 @@ msgid "" "Use `git rebase --abort` to terminate current rebase.\n" "Or downgrade to v2.33, or earlier, to complete the rebase." msgstr "" +"«rebase --preserve-merges» (-p) ja no és admès.\n" +"Utilitzeu «git rebase --abort» per a finalitzar el «rebase» actual.\n" +"O bé baixeu a la versió v2.33, o anterior, per a completar el «rebase»." msgid "" "--preserve-merges was replaced by --rebase-merges\n" "Note: Your `pull.rebase` configuration may also be set to 'preserve',\n" "which is no longer supported; use 'merges' instead" msgstr "" +"--preserve-merges s'ha substituït per --rebase-merges\n" +"Nota: la configuració «pull.rebase» també podria estar establerta a\n" +"+-«preserve», que ja no s'admet; utilitzeu «merge» en el seu lloc" msgid "No rebase in progress?" msgstr "No hi ha un «rebase» en curs?" @@ -10195,7 +10333,7 @@ msgid "Current branch %s is up to date, rebase forced.\n" msgstr "La branca actual %s està al dia; «rebase» forçat.\n" msgid "The pre-rebase hook refused to rebase." -msgstr "El lligam pre-«rebase» ha refusat a fer «rebase»." +msgstr "El lligam pre-rebase ha refusat a fer «rebase»." #, c-format msgid "Changes to %s:\n" @@ -10302,13 +10440,12 @@ msgstr "" msgid "git reflog exists <ref>" msgstr "git reflog exists <referència>" -#, fuzzy, c-format +#, c-format msgid "invalid timestamp '%s' given to '--%s'" -msgstr "el codi de temps «%s» no és vàlid donat a «--%s»" +msgstr "marca de temps «%s» donada a «--%s» no és vàlida" -#, fuzzy msgid "do not actually prune any entries" -msgstr "no practiquis cap entrada" +msgstr "no eliminis cap entrada" msgid "" "rewrite the old SHA1 with the new SHA1 of the entry that now precedes it" @@ -10317,34 +10454,28 @@ msgstr "reescriu l'antic SHA1 amb el nou SHA1 de l'entrada que ara precedeix" msgid "update the reference to the value of the top reflog entry" msgstr "actualitza la referència al valor de l'entrada de reflog superior" -#, fuzzy msgid "print extra information on screen" msgstr "imprimeix informació extra a la pantalla" msgid "timestamp" msgstr "marca de temps" -#, fuzzy msgid "prune entries older than the specified time" msgstr "poda les entrades més antigues que el temps especificat" -#, fuzzy msgid "" "prune entries older than <time> that are not reachable from the current tip " "of the branch" msgstr "" -"poda les entrades més antigues de <time> que no es poden accedir des de la " +"poda les entrades més antigues de <data> que no es poden accedir des de la " "punta actual de la branca" -#, fuzzy msgid "prune any reflog entries that point to broken commits" msgstr "poda qualsevol entrada de reflog que apunti a comissions trencades" -#, fuzzy msgid "process the reflogs of all references" msgstr "processa els reflogs de totes les referències" -#, fuzzy msgid "limits processing to reflogs from the current worktree only" msgstr "limita el processament a reflogs només de l'arbre de treball actual" @@ -10532,9 +10663,8 @@ msgstr "" "\t%s\n" "\tActualitzeu la configuració manualment si és necessari." -#, fuzzy msgid "Renaming remote references" -msgstr "Canviant el nom de les referències remotes" +msgstr "S'està canviant el nom de les referències remotes" #, c-format msgid "deleting '%s' failed" @@ -10569,6 +10699,9 @@ msgstr " nou (la pròxima obtenció emmagatzemarà a remotes/%s)" msgid " tracked" msgstr " seguit" +msgid " skipped" +msgstr " omès" + msgid " stale (use 'git remote prune' to remove)" msgstr " estancat (useu «git remote prune» per a eliminar)" @@ -10795,7 +10928,6 @@ msgstr "sigues detallat; s'ha de col·locar abans d'una subordre" msgid "git repack [<options>]" msgstr "git repack [<opcions>]" -#, fuzzy msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writeBitmaps configuration." @@ -10803,7 +10935,7 @@ msgstr "" "Els reempaquetaments incrementals són incompatibles amb els índexs de mapes " "de bits. Useu\n" "--no-write-bitmap-index o inhabiliteu el paràmetre de configuració pack." -"writebitmaps." +"writeBitmaps." msgid "could not start pack-objects to repack promisor objects" msgstr "" @@ -10847,16 +10979,16 @@ msgstr "empaqueta-ho tot en un únic paquet" msgid "same as -a, and turn unreachable objects loose" msgstr "el mateix que -a, i solta els objectes inabastables" -#, fuzzy msgid "same as -a, pack unreachable cruft objects separately" -msgstr "el mateix que -a, i solta els objectes inabastables" +msgstr "" +"el mateix que -a, empaqueta els objectes superflus inabastables de forma " +"separada" msgid "approxidate" msgstr "data aproximada" -#, fuzzy msgid "with -C, expire objects older than this" -msgstr "fes caducar els objectes més antics que <data>" +msgstr "amb -C, venç els objectes més antics que aquest" msgid "remove redundant packs, and run git-prune-packed" msgstr "elimina els paquets redundants, i executeu git-prune-packed" @@ -10923,9 +11055,9 @@ msgstr "no es poden suprimir paquets en un repositori d'objectes preciosos" msgid "Nothing new to pack." msgstr "Res nou a empaquetar." -#, fuzzy, c-format +#, c-format msgid "pack prefix %s does not begin with objdir %s" -msgstr "el nom del fitxer de paquet «%s» no acaba amb «.%s»" +msgstr "el prefix de paquet %s no comença amb objdir %s" #, c-format msgid "missing required file: %s" @@ -11168,7 +11300,7 @@ msgid "keep" msgstr "reteniment" msgid "You do not have a valid HEAD." -msgstr "No teniu un HEAD vàlid." +msgstr "No teniu una HEAD vàlida." msgid "Failed to find tree of HEAD." msgstr "S'ha produït un error en trobar l'arbre de HEAD." @@ -11230,14 +11362,14 @@ msgstr "el restabliment de %s no es permet en un repositori nu" msgid "Unstaged changes after reset:" msgstr "Canvis «unstaged» després del restabliment:" -#, fuzzy, c-format +#, c-format msgid "" "It took %.2f seconds to refresh the index after reset. You can use\n" "'--no-refresh' to avoid this." msgstr "" -"Es van trigar un temps de,2f segons a actualitzar l'índex després de " -"reiniciar. Pots utilitzar\n" -".--no-refresh' per evitar això." +"Es van trigar %.2f segons a actualitzar l'índex després de reiniciar. Podeu " +"usar\n" +".--no-refresh' per a evitar això." #, c-format msgid "Could not reset index file to revision '%s'." @@ -11250,6 +11382,10 @@ msgstr "No s'ha pogut escriure el fitxer d'índex nou." msgid "unable to get disk usage of %s" msgstr "no s'ha pogut obtenir l'ús del disc de %s" +#, c-format +msgid "invalid value for '%s': '%s', the only allowed format is '%s'" +msgstr "valor no vàlid per a «%s»: «%s», l'únic format permès és «%s»" + msgid "rev-list does not support display of notes" msgstr "el rev-list no permet mostrar notes" @@ -11275,6 +11411,9 @@ msgstr "final prematur de l'entrada" msgid "no usage string given before the `--' separator" msgstr "no s'ha indicat cap cadena d'ús abans del separador «--»" +msgid "missing opt-spec before option flags" +msgstr "manca l'opció opt-spec abans de les altres opcions" + msgid "Needed a single revision" msgstr "Cal una sola revisió" @@ -11392,7 +11531,7 @@ msgid "keep redundant, empty commits" msgstr "retén les comissions redundants i buides" msgid "use the 'reference' format to refer to commits" -msgstr "" +msgstr "useu el format «referència» per a referir-vos a les comissions" msgid "revert failed" msgstr "la reversió ha fallat" @@ -11511,7 +11650,7 @@ msgid "unknown group type: %s" msgstr "tipus de grup desconegut: %s" msgid "group by committer rather than author" -msgstr "agrupa per «comitter» en comptes de per autor" +msgstr "agrupa per «committer» en comptes de per autor" msgid "sort output according to the number of commits per author" msgstr "ordena la sortida segons el nombre de comissions per autor" @@ -11675,7 +11814,7 @@ msgid "dereference tags into object IDs" msgstr "desreferencia les etiquetes a ID d'objecte" msgid "only show SHA1 hash using <n> digits" -msgstr "mostra el hash SHA1 usant només <n> xifres" +msgstr "mostra el resum SHA1 usant només <n> xifres" msgid "do not print results to stdout (useful with --verify)" msgstr "no imprimeixis els resultats a stdout (útil amb --verify)" @@ -11709,9 +11848,8 @@ msgstr "s'ha produït un error en suprimir el directori «%s»" msgid "failed to create directory for sparse-checkout file" msgstr "no s'ha pogut crear el directori per al fitxer sparse-checkout" -#, fuzzy msgid "failed to initialize worktree config" -msgstr "no s'ha pogut inicialitzar l'arbre de treball to" +msgstr "no s'ha pogut inicialitzar la configuració de l'arbre de treball" msgid "failed to modify sparse-index config" msgstr "no s'ha pogut modificar la configuració de l'índex dispers" @@ -11736,7 +11874,7 @@ msgstr "no s'ha pogut normalitzar el camí %s" #, c-format msgid "unable to unquote C-style string '%s'" -msgstr "no s'ha pogut treure la cita a la cadena amb estil C «%s»" +msgstr "no s'han pogut treure les cometes a la cadena amb estil C «%s»" msgid "unable to load existing sparse-checkout patterns" msgstr "no s'han pogut carregar els patrons de «sparse-checkout» existents" @@ -11744,51 +11882,45 @@ msgstr "no s'han pogut carregar els patrons de «sparse-checkout» existents" msgid "existing sparse-checkout patterns do not use cone mode" msgstr "els patrons de «sparse-checkout» existents no usen el mode con" -#, fuzzy msgid "please run from the toplevel directory in non-cone mode" -msgstr "" -"executeu des del directori de nivell superior en mode que no sigui compatible" +msgstr "executeu des del directori de nivell superior en mode que no sigui con" -#, fuzzy msgid "specify directories rather than patterns (no leading slash)" msgstr "especifica els directoris en lloc dels patrons (sense barra inclinada)" -#, fuzzy msgid "" "specify directories rather than patterns. If your directory starts with a " "'!', pass --skip-checks" msgstr "" "especifica els directoris en lloc dels patrons. Si el vostre directori " -"comença amb un '!', passeu --skip-checks" +"comença amb un «!», passeu --skip-checks" -#, fuzzy msgid "" "specify directories rather than patterns. If your directory really has any " "of '*?[]\\' in it, pass --skip-checks" msgstr "" "especifica els directoris en lloc dels patrons. Si el vostre directori " -"realment té alguna de '*?\\\\', passeu --skip-checks" +"realment té alguna de «*?[]\\», useu --skip-checks" -#, fuzzy, c-format +#, c-format msgid "" "'%s' is not a directory; to treat it as a directory anyway, rerun with --" "skip-checks" msgstr "" -"%%s' no és un directori; per tractar-lo com un directori de totes maneres, " -"torneu a executar amb --skip-checks" +"«%s» no és un directori; per a tractar-lo com un directori, torneu a " +"executar amb --skip-checks" -#, fuzzy, c-format +#, c-format msgid "" "pass a leading slash before paths such as '%s' if you want a single file " "(see NON-CONE PROBLEMS in the git-sparse-checkout manual)." msgstr "" "passa una barra d'inici abans dels camins com ara «%s» si voleu un sol " -"fitxer (vegeu els problemes NO CONE al manual de git-sparse-checkout)." +"fitxer (vegeu «NON-CONE PROBLEMS» al manual de git-sparse-checkout)." msgid "git sparse-checkout add [--skip-checks] (--stdin | <patterns>)" msgstr "git sparse-checkout add [--skip-checks] (--stdin | <patterns>)" -#, fuzzy msgid "" "skip some sanity checks on the given paths that might give false positives" msgstr "" @@ -12050,6 +12182,10 @@ msgid "Expecting a full ref name, got %s" msgstr "S'espera un nom de referència ple, s'ha rebut %s" #, c-format +msgid "could not get a repository handle for submodule '%s'" +msgstr "no s'ha pogut obtenir el gestor del repositori pel submòdul «%s»" + +#, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " "authoritative upstream." @@ -12057,12 +12193,6 @@ msgstr "" "no s'ha pogut trobar la configuració «%s». S'assumeix que aquest repositori " "és el seu repositori font autoritzat." -msgid "alternative anchor for relative paths" -msgstr "àncora alternativa per als camins relatius" - -msgid "git submodule--helper list [--prefix=<path>] [<path>...]" -msgstr "git submodule--helper list [--prefix=<camí>] [<camí>...]" - #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "No s'ha trobat cap url per al camí de submòdul «%s» a .gitmodules" @@ -12095,8 +12225,8 @@ msgstr "omet la sortida en entrar a cada ordre del submòdul" msgid "recurse into nested submodules" msgstr "inclou recursivament els submòduls imbricats" -msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" -msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <ordre>" +msgid "git submodule foreach [--quiet] [--recursive] [--] <command>" +msgstr "git submodule foreach [--quiet] [--recursive] [--] <ordre>" #, c-format msgid "Failed to register url for submodule path '%s'" @@ -12121,8 +12251,8 @@ msgstr "" msgid "suppress output for initializing a submodule" msgstr "omet la sortida en inicialitzar un submòdul" -msgid "git submodule--helper init [<options>] [<path>]" -msgstr "git submodule--helper init [<opcions>] [<camí>]" +msgid "git submodule init [<options>] [<path>]" +msgstr "git submodule init [<opcions>] [<camí>]" #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" @@ -12149,9 +12279,6 @@ msgstr "" msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<camí>...]" -msgid "git submodule--helper name <path>" -msgstr "git submodule--helper name <camí>" - #, c-format msgid "* %s %s(blob)->%s(submodule)" msgstr "* %s %s(blob)->%s(submòdul)" @@ -12188,8 +12315,8 @@ msgstr "omet els submòduls amb el valor «ignore_config» establert a «all»" msgid "limit the summary size" msgstr "limita la mida del resum" -msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" -msgstr "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" +msgid "git submodule summary [<options>] [<commit>] [--] [<path>]" +msgstr "git submodule summary [<options>] [<commit>] [--] [<path>]" msgid "could not fetch a revision for HEAD" msgstr "no s'ha pogut obtenir una revisió per a HEAD" @@ -12203,19 +12330,14 @@ msgid "failed to register url for submodule path '%s'" msgstr "s'ha produït un error en registrar l'url per al camí del submòdul «%s»" #, c-format -msgid "failed to get the default remote for submodule '%s'" -msgstr "" -"s'ha produït un error en obtenir el remot per defecte pel submòdul «%s»" - -#, c-format msgid "failed to update remote for submodule '%s'" msgstr "s'ha produït un error en actualitzar el remot pel submòdul «%s»" msgid "suppress output of synchronizing submodule url" msgstr "omet la sortida de la sincronització de l'URL del submòdul" -msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" -msgstr "git submodule--helper sync [--quiet] [--recursive] [<camí>]" +msgid "git submodule sync [--quiet] [--recursive] [<path>]" +msgstr "git submodule sync [--quiet] [--recursive] [<path>]" #, c-format msgid "" @@ -12278,6 +12400,10 @@ msgstr "" "«--reference-if-able' en comptes de «--reference»." #, c-format +msgid "could not get a repository handle for gitdir '%s'" +msgstr "no s'ha pogut obtenir el gestor del repositori per al gitdir «%s»" + +#, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "el submòdul «%s» no pot afegir un alternatiu: %s" @@ -12305,6 +12431,9 @@ msgstr "directori no buit: «%s»" msgid "could not get submodule directory for '%s'" msgstr "no s'ha pogut obtenir el directori de submòdul per a «%s»" +msgid "alternative anchor for relative paths" +msgstr "àncora alternativa per als camins relatius" + msgid "where the new submodule will be cloned to" msgstr "a on es clonarà el submòdul nou" @@ -12323,7 +12452,6 @@ msgstr "força el progrés del clonatge" msgid "disallow cloning into non-empty directory" msgstr "no permetis clonar en un directori no buit" -#, fuzzy msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--filter " @@ -12331,11 +12459,7 @@ msgid "" msgstr "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--filter " -"<filter-spec>]--url <url> --path <path>" - -#, c-format -msgid "Invalid update mode '%s' for submodule path '%s'" -msgstr "Mode d'actualització «%s» no vàlid per al camí de submòdul «%s»" +"<filter-spec>] --url <url> --path <path>" #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" @@ -12412,6 +12536,10 @@ msgstr "" "directa d'aquesta comissió ha fallat." #, c-format +msgid "could not initialize submodule at path '%s'" +msgstr "no s'ha pogut inicialitzar el submòdul al camí «%s»" + +#, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " "the superproject is not on any branch" @@ -12420,25 +12548,21 @@ msgstr "" "superprojecte, però el superprojecte no és en cap branca" #, c-format -msgid "could not get a repository handle for submodule '%s'" -msgstr "no s'ha pogut obtenir el gestor del repositori pel submòdul «%s»" - -#, fuzzy, c-format msgid "Unable to find current revision in submodule path '%s'" msgstr "No s'ha pogut trobar la revisió actual al camí del submòdul «%s»" -#, fuzzy, c-format +#, c-format msgid "Unable to fetch in submodule path '%s'" -msgstr "No s'ha pogut recuperar el camí del submòdul «%s»" +msgstr "No s'ha pogut obtenir el camí del submòdul «%s»" -#, fuzzy, c-format +#, c-format msgid "Unable to find %s revision in submodule path '%s'" -msgstr "" -"No s'ha pogut trobar la revisió de percentatges en el camí del submòdul «%s»" +msgstr "No s'ha pogut trobar la revisió %s en el camí del submòdul «%s»" -#, fuzzy, c-format +#, c-format msgid "Failed to recurse into submodule path '%s'" -msgstr "No s'ha pogut tornar a repetir al camí del submòdul «%s»" +msgstr "" +"s'ha produït un error en cercar recursivament al camí del submòdul «%s»" msgid "force checkout updates" msgstr "força les actualitzacions" @@ -12446,13 +12570,11 @@ msgstr "força les actualitzacions" msgid "initialize uninitialized submodules before update" msgstr "inicialitza els submòduls sense inicialitzar abans d'actualitzar" -#, fuzzy msgid "use SHA-1 of submodule's remote tracking branch" -msgstr "utilitza SHA-1 de la branca de seguiment remota del submòdul" +msgstr "usa el SHA-1 de la branca de seguiment remota del submòdul" -#, fuzzy msgid "traverse submodules recursively" -msgstr "traverteix els submòduls recursivament" +msgstr "recorre els submòduls recursivament" msgid "don't fetch new objects from the remote site" msgstr "no obtinguis els objectes nous del lloc remot" @@ -12460,11 +12582,14 @@ msgstr "no obtinguis els objectes nous del lloc remot" msgid "path into the working tree" msgstr "camí a l'arbre de treball" -msgid "path into the working tree, across nested submodule boundaries" -msgstr "camí a l'arbre de treball, a través de fronteres de submòduls niats" +msgid "use the 'checkout' update strategy (default)" +msgstr "utilitza l'estratègia d'actualització «checkout» (predeterminada)" -msgid "rebase, merge, checkout or none" -msgstr "rebase, merge, checkout o none" +msgid "use the 'merge' update strategy" +msgstr "utilitza l'estratègia d'actualització de «merge»" + +msgid "use the 'rebase' update strategy" +msgstr "utilitza l'estratègia d'actualització de «rebase»" msgid "create a shallow clone truncated to the specified number of revisions" msgstr "crea un clon superficial truncat al nombre de revisions especificat" @@ -12478,6 +12603,9 @@ msgstr "si el clonatge inicial ha de seguir la recomanació de superficialitat" msgid "don't print cloning progress" msgstr "no imprimeixis el progrés del clonatge" +msgid "disallow cloning into non-empty directory, implies --init" +msgstr "no permetis clonar en un directori no buit, implica --init" + msgid "" "git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] " "[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-" @@ -12489,14 +12617,11 @@ msgstr "" "shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] " "[--] [<path>...]" -msgid "bad value for update parameter" -msgstr "valor incorrecte per al paràmetre update" - msgid "recurse into submodules" msgstr "inclou recursivament als submòduls" -msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" -msgstr "git submodule--helper absorb-git-dirs [<opcions>] [<camí>...]" +msgid "git submodule absorbgitdirs [<options>] [<path>...]" +msgstr "git submodule absorbgitdirs [<options>] [<path>...]" msgid "check if it is safe to write to the .gitmodules file" msgstr "comprova si és segur escriure al fitxer .gitmodules" @@ -12516,8 +12641,8 @@ msgstr "assegureu-vos que el fitxer .gitmodules és a l'arbre de treball" msgid "suppress output for setting url of a submodule" msgstr "omet la sortida en configurar un URL d'un submòdul" -msgid "git submodule--helper set-url [--quiet] <path> <newurl>" -msgstr "git submodule--helper set-url [--quiet] <path> <newurl>" +msgid "git submodule set-url [--quiet] <path> <newurl>" +msgstr "git submodule set-url [--quiet] <path> <newurl>" msgid "set the default tracking branch to master" msgstr "estableix la branca de seguiment per defecte a «master»" @@ -12525,13 +12650,11 @@ msgstr "estableix la branca de seguiment per defecte a «master»" msgid "set the default tracking branch" msgstr "estableix la branca de seguiment per defecte" -msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" -msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" +msgid "git submodule set-branch [-q|--quiet] (-d|--default) <path>" +msgstr "git submodule set-branch [-q|--quiet] (-d|--default) <path>" -msgid "" -"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" -msgstr "" -"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" +msgid "git submodule set-branch [-q|--quiet] (-b|--branch) <branch> <path>" +msgstr "git submodule set-branch [-q|--quiet] (-b|--branch) <branch> <path>" msgid "--branch or --default required" msgstr "cal --branch o --default" @@ -12542,17 +12665,15 @@ msgstr "mostra només els missatges d'error" msgid "force creation" msgstr "força la creació" -#, fuzzy msgid "show whether the branch would be created" msgstr "mostra si es crearà la branca" -#, fuzzy msgid "" "git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--" "quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>" msgstr "" "git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--" -"quiet] [-t|--track] [-n|--dry-run] <name> <start_oid> <start_name>" +"quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>" #, c-format msgid "creating branch '%s'" @@ -12624,7 +12745,6 @@ msgstr "permet afegir un camí de submòdul que si no s'hagués ignorat" msgid "borrow the objects from reference repositories" msgstr "manlleva els objectes dels repositoris de referències" -#, fuzzy msgid "" "sets the submodule's name to the given string instead of defaulting to its " "path" @@ -12632,8 +12752,8 @@ msgstr "" "estableix el nom del submòdul a la cadena donada en lloc de per defecte al " "seu camí" -msgid "git submodule--helper add [<options>] [--] <repository> [<path>]" -msgstr "git submodule--helper add [<opcions>] [--] <repositori> [<camí>]" +msgid "git submodule add [<options>] [--] <repository> [<path>]" +msgstr "git submodule add [<options>] [--] <repository> [<path>]" msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" @@ -12841,6 +12961,16 @@ msgstr "Etiqueta «%s» actualitzada (era %s)\n" msgid "pack exceeds maximum allowed size" msgstr "el paquet supera la mida màxima permesa" +msgid "failed to write object in stream" +msgstr "no s'ha pogut escriure l'objecte al flux" + +#, c-format +msgid "inflate returned (%d)" +msgstr "inflate ha retornat (%d)" + +msgid "invalid blob object from stream" +msgstr "l'objecte blob del flux no és vàlid" + msgid "Unpacking objects" msgstr "S'estan desempaquetant els objectes" @@ -13353,7 +13483,7 @@ msgstr "" #, c-format msgid "validation failed, cannot remove working tree: %s" -msgstr "la validació ha fallat, no es pot suprmir l'arbre de treball: %s" +msgstr "la validació ha fallat, no es pot suprimir l'arbre de treball: %s" #, c-format msgid "repair: %s: %s" @@ -13375,9 +13505,30 @@ msgstr "escriu l'objecte d'arbre per a un subdirectori <prefix>" msgid "only useful for debugging" msgstr "només útil per a la depuració" +msgid "core.fsyncMethod = batch is unsupported on this platform" +msgstr "core.fsyncMethod = batch no és compatible amb aquesta plataforma" + +msgid "failed to create temporary file" +msgstr "no s'ha pogut crear un fitxer temporal" + +msgid "insufficient capabilities" +msgstr "capacitats insuficients" + +#, c-format +msgid "failed to download bundle from URI '%s'" +msgstr "no s'ha pogut baixar el paquet de l'URI «%s»" + +#, c-format +msgid "file at URI '%s' is not a bundle" +msgstr "el fitxer a l'URI «%s» no és farcell" + +#, c-format +msgid "failed to unbundle bundle from URI '%s'" +msgstr "s'ha produït un error en desempaquetar el farcell de l'URI «%s»" + #, c-format msgid "unrecognized bundle hash algorithm: %s" -msgstr "algoritme de hash del farcell desconegut: %s" +msgstr "algoritme de resum del farcell desconegut: %s" #, c-format msgid "unknown capability '%s'" @@ -13460,7 +13611,7 @@ msgid "final chunk has non-zero id %<PRIx32>" msgstr "el fragment final té un id %<PRIx32> que no és zero" msgid "invalid hash version" -msgstr "especificació de hash no vàlida" +msgstr "especificació de resum no vàlida" #, c-format msgid "invalid color value: %.*s" @@ -13582,6 +13733,9 @@ msgid "Give an object a human readable name based on an available ref" msgstr "" "Dona un nom llegible per a humans basant-se en les referències disponibles" +msgid "Generate a zip archive of diagnostic information" +msgstr "Genera un arxiu zip d'informació de diagnòstic" + msgid "Show changes between commits, commit and working tree, etc" msgstr "" "Mostra els canvis entre comissions, la comissió i l'arbre de treball, etc" @@ -13714,8 +13868,8 @@ msgstr "Executa una fusió per als fitxers que cal fusionar" msgid "The standard helper program to use with git-merge-index" msgstr "El programa d'ajuda estàndard a utilitzar amb git-merge-index" -msgid "Show three-way merge without touching index" -msgstr "Mostra la fusió de tres vies sense tocar l'índex" +msgid "Perform merge without touching index or working tree" +msgstr "Realitza la fusió sense tocar l'índex o l'arbre de treball" msgid "Run merge conflict resolution tools to resolve merge conflicts" msgstr "" @@ -13916,6 +14070,9 @@ msgstr "Valida els fitxers d'arxius Git empaquetats" msgid "Check the GPG signature of tags" msgstr "Verifica la signatura GPG de les etiquetes" +msgid "Display version information about Git" +msgstr "Mostra informació de la versió del Git" + msgid "Show logs with difference each commit introduces" msgstr "Mostra registres amb la diferència introduïda per cada comissió" @@ -13949,6 +14106,24 @@ msgstr "Un conjunt mínim útil d'ordres diàries del Git" msgid "Frequently asked questions about using Git" msgstr "Preguntes freqüents sobre l'ús del Git" +msgid "The bundle file format" +msgstr "El format del fitxer de farcell" + +msgid "Chunk-based file formats" +msgstr "Formats de fitxer basats en blocs" + +msgid "Git commit graph format" +msgstr "Format de graf de comissions del Git" + +msgid "Git index format" +msgstr "Format de l'índex del Git" + +msgid "Git pack format" +msgstr "format de paquet del Git" + +msgid "Git cryptographic signature formats" +msgstr "Formats de signatura criptogràfica del Git" + msgid "A Git Glossary" msgstr "Un glossari de Git" @@ -13970,6 +14145,21 @@ msgstr "La definició de les propietats de submòduls" msgid "Git namespaces" msgstr "Espais de noms del Git" +msgid "Protocol v0 and v1 capabilities" +msgstr "Capacitats de protocol v0 i v1" + +msgid "Things common to various protocols" +msgstr "Coses comunes en diversos protocols" + +msgid "Git HTTP-based protocols" +msgstr "Protocols basats en HTTP del Git" + +msgid "How packs are transferred over-the-wire" +msgstr "Com es transfereixen els paquets en la xarxa" + +msgid "Git Wire Protocol, Version 2" +msgstr "Protocol Git Wire, versió 2" + msgid "Helper programs to interact with remote repositories" msgstr "Programes d'ajuda per a interactuar amb repositoris remots" @@ -13994,6 +14184,9 @@ msgstr "Interfície web del Git (interfície web pels repositoris Git)" msgid "An overview of recommended workflows with Git" msgstr "Una visió de conjunt de fluxos de treball recomanats amb Git" +msgid "A tool for managing large Git repositories" +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" @@ -14009,7 +14202,7 @@ msgstr "la versió del graf de comissions %X no coincideix amb la versió %X" #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "" -"la versió del hash del graf de comissions %X no coincideix amb la versió %X" +"la versió del resum del graf de comissions %X no coincideix amb la versió %X" #, c-format msgid "commit-graph file is too small to hold %u chunks" @@ -14244,13 +14437,12 @@ msgstr "La comissió %s no té signatura GPG." msgid "Commit %s has a good GPG signature by %s\n" msgstr "La comissió %s té una signatura GPG bona de %s\n" -#, fuzzy msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" "variable i18n.commitEncoding to the encoding your project uses.\n" msgstr "" -"Advertència: el missatge de comissió no és compatible amb UTF-8.\n" +"Avís: el missatge de comissió no és compatible amb UTF-8.\n" "Potser voleu esmenar-lo després de corregir el missatge, o establir\n" "la variable de configuració i18n.commitencoding a la codificació que\n" "usi el vostre projecte.\n" @@ -14261,31 +14453,37 @@ msgstr "no hi ha informació disponible del compilador\n" msgid "no libc information available\n" msgstr "no hi ha informació disponible de libc\n" -#, fuzzy, c-format +#, c-format +msgid "could not determine free disk size for '%s'" +msgstr "no s'ha pogut determinar l'espai de disc lliure per a «%s»" + +#, c-format +msgid "could not get info for '%s'" +msgstr "no s'ha pogut obtenir la informació per a «%s»" + +#, c-format msgid "[GLE %ld] health thread could not open '%ls'" -msgstr "no s'ha pogut commutar a «%s»" +msgstr "[GLE %ld] el fil de salut no ha pogut obrir «%ls»" #, c-format msgid "[GLE %ld] health thread getting BHFI for '%ls'" -msgstr "" +msgstr "[GLE %ld] s'està obtenint BHFI del fil de salut per a «%ls»" -#, fuzzy, c-format +#, c-format msgid "could not convert to wide characters: '%s'" -msgstr "" -"no s'han pogut convertir els següents «grafts»:\n" -"%s" +msgstr "no s'ha pogut convertir a caràcters amples: «%s»" -#, fuzzy, c-format +#, c-format msgid "BHFI changed '%ls'" -msgstr "no es pot canviar a «%s»" +msgstr "S'ha canviat BHFI «%ls»" #, c-format msgid "unhandled case in 'has_worktree_moved': %d" -msgstr "" +msgstr "cas no gestionat a «has_worktree_moved»: %d" #, c-format msgid "health thread wait failed [GLE %ld]" -msgstr "" +msgstr "ha fallat l'espera del fil de salut [GLE %ld]" msgid "Unable to create FSEventStream." msgstr "No s'ha pogut crear el FSEventStream." @@ -14295,102 +14493,100 @@ msgstr "No s'ha pogut iniciar el FSEventStream" #, c-format msgid "[GLE %ld] could not convert path to UTF-8: '%.*ls'" -msgstr "" +msgstr "[GLE %ld] no s'ha pogut convertir el camí a UTF-8: «%.*ls»" -#, fuzzy, c-format +#, c-format msgid "[GLE %ld] could not watch '%s'" -msgstr "no s'ha pogut commutar a «%s»" +msgstr "[GLE %ld] no s'ha pogut vigilar «%s»" -#, fuzzy, c-format +#, c-format msgid "[GLE %ld] could not get longname of '%s'" -msgstr "no s'ha pogut commutar a «%s»" +msgstr "[GLE %ld] no s'ha pogut obtenir el nom llarg de «%s»" #, c-format msgid "ReadDirectoryChangedW failed on '%s' [GLE %ld]" -msgstr "" +msgstr "Ha fallat ReadDirectoryChangedW a «%s» [GLE %ld]" #, c-format msgid "GetOverlappedResult failed on '%s' [GLE %ld]" -msgstr "" +msgstr "Ha fallat GetOverlappedResult a «%s» [GLE %ld]" -#, fuzzy, c-format +#, c-format msgid "could not read directory changes [GLE %ld]" -msgstr "no s'han pogut crear directoris per %s" +msgstr "no s'han pogut llegir els canvis de directori [GLE %ld]" -#, fuzzy, c-format +#, c-format +msgid "[GLE %ld] unable to open for read '%ls'" +msgstr "[GLE %ld] no s'ha pogut obrir per a llegir «%ls»" + +#, c-format +msgid "[GLE %ld] unable to get protocol information for '%ls'" +msgstr "[GLE %ld] no s'ha pogut obtenir la informació del protocol per a «%ls»" + +#, c-format msgid "failed to copy SID (%ld)" -msgstr "s'ha produït un error en copiar el fitxer a «%s»" +msgstr "no s'ha pogut copiar el SID (%ld)" -#, fuzzy, c-format +#, c-format msgid "failed to get owner for '%s' (%ld)" -msgstr "s'ha produït un error en obtenir la branca per defecte per a «%s»" +msgstr "no s'ha pogut obtenir el propietari de «%s» (%ld)" msgid "memory exhausted" msgstr "memòria esgotada" msgid "Success" -msgstr "" +msgstr "Èxit" msgid "No match" -msgstr "" +msgstr "Cap coincidència" -#, fuzzy msgid "Invalid regular expression" -msgstr "usa les expressions regulars POSIX ampliades" +msgstr "Expressió regular no vàlida" -#, fuzzy msgid "Invalid collation character" -msgstr "caràcter de llast" +msgstr "El caràcter de col·lació no és vàlid" -#, fuzzy msgid "Invalid character class name" -msgstr "hi ha caràcters no vàlids en el nom de màquina" +msgstr "Nom de la classe del caràcter no vàlid" msgid "Trailing backslash" -msgstr "" +msgstr "Barra inversa del final" -#, fuzzy msgid "Invalid back reference" -msgstr "referència no vàlida: %s" +msgstr "Referència anterior no vàlida" msgid "Unmatched [ or [^" -msgstr "" +msgstr "[ or [^ no emparellat" msgid "Unmatched ( or \\(" -msgstr "" +msgstr "( o \\( no emparellat" msgid "Unmatched \\{" -msgstr "" +msgstr "\\{ no emparellat" -#, fuzzy msgid "Invalid content of \\{\\}" -msgstr "contingut no vàlid: «%s»" +msgstr "Contingut no vàlid de \\{\\}" -#, fuzzy msgid "Invalid range end" -msgstr "codificació de transferència no vàlida" +msgstr "Fi d'interval no vàlid" -#, fuzzy msgid "Memory exhausted" -msgstr "memòria esgotada" +msgstr "Memòria esgotada" -#, fuzzy msgid "Invalid preceding regular expression" -msgstr "usa les expressions regulars POSIX ampliades" +msgstr "Expressió regular anterior no vàlida" -#, fuzzy msgid "Premature end of regular expression" -msgstr "usa les expressions regulars POSIX ampliades" +msgstr "Fi prematur d'expressió regular" msgid "Regular expression too big" -msgstr "" +msgstr "Expressió regular és massa gran" msgid "Unmatched ) or \\)" -msgstr "" +msgstr ") o \\) no no emparellat" -#, fuzzy msgid "No previous regular expression" -msgstr "usa les expressions regulars compatibles amb Perl" +msgstr "No hi ha expressió regular anterior" msgid "could not send IPC command" msgstr "no s'ha pogut enviar l'ordre IPC" @@ -14406,21 +14602,21 @@ msgstr "no s'ha pogut començar un fil «accept_thread» «%s»" msgid "could not start worker[0] for '%s'" msgstr "no s'ha pogut iniciar el fil[0] per a «%s»" -#, fuzzy, c-format +#, c-format msgid "ConnectNamedPipe failed for '%s' (%lu)" -msgstr "uname() ha fallat amb l'error «%s» (%d)\n" +msgstr "Ha fallat ConnectNamedPipe per a «%s» (%lu)" -#, fuzzy, c-format +#, c-format msgid "could not create fd from pipe for '%s'" -msgstr "no s'han pogut crear directoris per %s" +msgstr "no s'ha pogut crear un fd a partir de la canonada per a «%s»" -#, fuzzy, c-format +#, c-format msgid "could not start thread[0] for '%s'" msgstr "no s'ha pogut iniciar el fil[0] per a «%s»" -#, fuzzy, c-format +#, c-format msgid "wait for hEvent failed for '%s'" -msgstr "S'ha produït un error en autenticar per «%s»" +msgstr "ha fallat l'espera de hEvent per a «%s»" msgid "cannot resume in the background, please use 'fg' to resume" msgstr "no es pot reprendre en segon pla, si us plau useu «fg» per a reprendre" @@ -14877,185 +15073,6 @@ msgid "failed to close rev-list's stdin" msgstr "s'ha produït un error en tancar l'stdin del rev-list" #, c-format -msgid "'%s' does not exist" -msgstr "«%s» no existeix" - -msgid "need a working directory" -msgstr "cal un directori de treball" - -msgid "could not find enlistment root" -msgstr "no s'ha pogut trobar un arrel d'allistament" - -#, c-format -msgid "could not switch to '%s'" -msgstr "no s'ha pogut commutar a «%s»" - -#, c-format -msgid "could not configure %s=%s" -msgstr "no s'ha pogut configurar %s=%s" - -msgid "could not configure log.excludeDecoration" -msgstr "no s'ha pogut configurar log.excludeDecoration" - -msgid "Scalar enlistments require a worktree" -msgstr "Els allistaments escalars requereixen un arbre de treball" - -#, c-format -msgid "could not open directory '%s'" -msgstr "no s'ha pogut obrir el directori «%s»" - -#, fuzzy, c-format -msgid "skipping '%s', which is neither file nor directory" -msgstr "el destí «%s» no és un directori" - -#, fuzzy, c-format -msgid "could not determine free disk size for '%s'" -msgstr "no s'ha pogut crear el directori d'arbre de treball «%s»" - -#, fuzzy, c-format -msgid "could not get info for '%s'" -msgstr "no s'ha pogut llegir el fitxer de registre per a «%s»" - -#, c-format -msgid "remote HEAD is not a branch: '%.*s'" -msgstr "el HEAD remot no és una branca: «%.*s»" - -msgid "failed to get default branch name from remote; using local default" -msgstr "" -"no s'ha pogut obtenir el nom de la branca per defecte del remot; s'usa ela " -"predeterminada localment" - -msgid "failed to get default branch name" -msgstr "s'ha produït un error en obtenir el nom de branca predeterminada" - -msgid "failed to unregister repository" -msgstr "s'ha produït un error en desregistrar el repositori" - -msgid "failed to delete enlistment directory" -msgstr "s'ha produït un error en suprimir l'allistament del directori" - -msgid "branch to checkout after clone" -msgstr "branca a agafar després de clonar" - -msgid "when cloning, create full working directory" -msgstr "quan es clona, crear un directori de treball complet" - -msgid "only download metadata for the branch that will be checked out" -msgstr "només baixa les metadades per a la branca que s'agafarà" - -msgid "scalar clone [<options>] [--] <repo> [<dir>]" -msgstr "scalar clone [<opcions>] [--] <repo> [<dir>]" - -#, c-format -msgid "cannot deduce worktree name from '%s'" -msgstr "no es pot deduir el nom de l'arbre de treball de «%s»" - -#, c-format -msgid "directory '%s' exists already" -msgstr "el directori «%s» ja existeix" - -#, c-format -msgid "failed to get default branch for '%s'" -msgstr "s'ha produït un error en obtenir la branca per defecte per a «%s»" - -#, c-format -msgid "could not configure remote in '%s'" -msgstr "no s'ha pogut configurar el remot a «%s»" - -#, c-format -msgid "could not configure '%s'" -msgstr "no s'ha pogut configurar «%s»" - -msgid "partial clone failed; attempting full clone" -msgstr "ha fallat la clonació parcial; s'està intentant la clonació completa" - -msgid "could not configure for full clone" -msgstr "no s'ha pogut configurar per a una clonació completa" - -#, fuzzy -msgid "scalar diagnose [<enlistment>]" -msgstr "scalar register [<enlistment>]" - -#, fuzzy, c-format -msgid "could not create directory for '%s'" -msgstr "No s'ha pogut crear el directori per a «%s»" - -#, fuzzy -msgid "could not duplicate stdout" -msgstr "no s'ha pogut actualitzar %s" - -#, fuzzy -msgid "failed to write archive" -msgstr "s'ha produït un error en llegir la memòria cau" - -msgid "`scalar list` does not take arguments" -msgstr "«scalar list» no accepta arguments" - -msgid "scalar register [<enlistment>]" -msgstr "scalar register [<enlistment>]" - -msgid "reconfigure all registered enlistments" -msgstr "reconfigura tots els allistaments registrats" - -msgid "scalar reconfigure [--all | <enlistment>]" -msgstr "scalar reconfigure [--all | <enlistment>]" - -msgid "--all or <enlistment>, but not both" -msgstr "--all o <enlistment>, però no ambdós" - -#, c-format -msgid "git repository gone in '%s'" -msgstr "no existeix un repositori de git a: «%s»" - -msgid "" -"scalar run <task> [<enlistment>]\n" -"Tasks:\n" -msgstr "" -"scalar run <task> {<enlistment>]\n" -"Tasques:\n" - -#, c-format -msgid "no such task: '%s'" -msgstr "no existeix la tasca: «%s»" - -msgid "scalar unregister [<enlistment>]" -msgstr "scalar unregister [<enlistment>]" - -msgid "scalar delete <enlistment>" -msgstr "supressió de l'escalar <enlistment>" - -msgid "refusing to delete current working directory" -msgstr "s'ha rebutjat suprimir el directori de treball actual" - -msgid "include Git version" -msgstr "inclou la versió del Git" - -msgid "include Git's build options" -msgstr "inclou les opcions de construcció del Git" - -msgid "scalar verbose [-v | --verbose] [--build-options]" -msgstr "scalar verbose [-v | --verbose] [--build-options]" - -msgid "-C requires a <directory>" -msgstr "-C requereix un <directory>" - -#, c-format -msgid "could not change to '%s'" -msgstr "no s'ha pogut canviar a «%s»" - -msgid "-c requires a <key>=<value> argument" -msgstr "-c requereix un argument <key>=<value>" - -msgid "" -"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n" -"\n" -"Commands:\n" -msgstr "" -"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n" -"\n" -"Ordres:\n" - -#, c-format msgid "illegal crlf_action %d" msgstr "crlf_action %d il·legal" @@ -15068,6 +15085,8 @@ msgid "" "in the working copy of '%s', CRLF will be replaced by LF the next time Git " "touches it" msgstr "" +"a la còpia de treball de «%s», CRLF serà substituït per LF, la propera " +"vegada que el Git ho modifiqui" #, c-format msgid "LF would be replaced by CRLF in %s" @@ -15078,6 +15097,8 @@ msgid "" "in the working copy of '%s', LF will be replaced by CRLF the next time Git " "touches it" msgstr "" +"a la còpia de treball de «%s», LF serà substituït per CRLF la propera vegada " +"que Git ho modifiqui" #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" @@ -15260,6 +15281,32 @@ msgstr "" msgid "Marked %d islands, done.\n" msgstr "Marcades %d illes, fet.\n" +#, c-format +msgid "invalid --%s value '%s'" +msgstr "no és vàlid --%s amb valor «%s»" + +#, c-format +msgid "could not archive missing directory '%s'" +msgstr "no s'ha pogut arxivar el directori que falta «%s»" + +#, c-format +msgid "could not open directory '%s'" +msgstr "no s'ha pogut obrir el directori «%s»" + +#, c-format +msgid "skipping '%s', which is neither file nor directory" +msgstr "s'omet «%s», que no és ni fitxer ni directori" + +msgid "could not duplicate stdout" +msgstr "no s'ha pogut duplicar stdout" + +#, c-format +msgid "could not add directory '%s' to archiver" +msgstr "no s'ha pogut afegir el directori «%s» a l'arxivador" + +msgid "failed to write archive" +msgstr "s'ha produït un error en escriure arxiu" + msgid "--merge-base does not work with ranges" msgstr "--merge-base no funciona amb intervals" @@ -15441,7 +15488,7 @@ msgid "synonym for '-p --stat'" msgstr "sinònim de «-p --stat»" msgid "machine friendly --stat" -msgstr "llegible per màquina --stat" +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" @@ -15666,7 +15713,7 @@ msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "equivalent a --word-diff=color --word-diff-regex=<regex>" msgid "moved lines of code are colored differently" -msgstr "les línies de codi que s'ha mogut s'acoloreixen diferent" +msgstr "les línies de codi que s'han mogut s'acoloreixen diferent" msgid "how white spaces are ignored in --color-moved" msgstr "com s'ignoren els espais en blanc a --color-moved" @@ -15887,6 +15934,9 @@ msgstr "git fetch-pack: s'esperava ACK/NAK, s'ha rebut «%s»" msgid "unable to write to remote" msgstr "no s'ha pogut escriure al remot" +msgid "Server supports filter" +msgstr "El servidor accepta filtratge" + #, c-format msgid "invalid shallow line: %s" msgstr "línia de shallow no vàlida: %s" @@ -15998,9 +16048,6 @@ msgstr "el servidor no és compatible amb l'algorisme «%s»" msgid "Server does not support shallow requests" msgstr "El servidor no permet sol·licituds superficials" -msgid "Server supports filter" -msgstr "El servidor accepta filtratge" - msgid "unable to write request to remote" msgstr "no s'ha pogut escriure la sol·licitud al remot" @@ -16008,9 +16055,9 @@ msgstr "no s'ha pogut escriure la sol·licitud al remot" msgid "expected '%s', received '%s'" msgstr "s'esperava «%s», s'ha rebut «%s»" -#, fuzzy, c-format +#, c-format msgid "expected '%s'" -msgstr "línia inesperada: «%s»" +msgstr "s'esperava «%s»" #, c-format msgid "unexpected acknowledgment line: '%s'" @@ -16082,28 +16129,29 @@ msgstr "fsmonitor--daemon no s'està executant" msgid "could not send '%s' command to fsmonitor--daemon" msgstr "no s'ha pogut enviar l'ordre «%s» a fsmonitor--daemon" -#, fuzzy, c-format +#, c-format msgid "bare repository '%s' is incompatible with fsmonitor" -msgstr "%s és incompatible amb %s" +msgstr "el repositori nu «%s» és incompatible amb fsmonitor" #, c-format msgid "repository '%s' is incompatible with fsmonitor due to errors" -msgstr "" +msgstr "el repositori «%s» és incompatible amb fsmonitor a causa d'errors" -#, fuzzy, c-format +#, c-format msgid "remote repository '%s' is incompatible with fsmonitor" -msgstr "%s és incompatible amb %s" +msgstr "el repositori remot «%s» no és compatible amb fsmonitor" -#, fuzzy, c-format +#, c-format msgid "virtual repository '%s' is incompatible with fsmonitor" -msgstr "%s és incompatible amb %s" +msgstr "el repositori virtual «%s» és incompatible amb fsmonitor" #, c-format msgid "" "repository '%s' is incompatible with fsmonitor due to lack of Unix sockets" msgstr "" +"el repositori «%s» és incompatible amb fsmonitor a causa de la manca de " +"sòcols Unix" -#, fuzzy msgid "" "git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]\n" " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" @@ -16113,7 +16161,7 @@ msgid "" " [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n" " <command> [<args>]" msgstr "" -"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" +"git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]\n" " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" "bare]\n" @@ -16263,9 +16311,8 @@ msgstr "gpg.ssh.defaultKeyCommand ha fallat: %s %s" msgid "gpg failed to sign the data" msgstr "gpg ha fallat en signar les dades" -#, fuzzy msgid "user.signingKey needs to be set for ssh signing" -msgstr "user.signingkey s'ha d'establir per a signar amb ssh" +msgstr "user.signingKey s'ha d'establir per a signar amb ssh" #, c-format msgid "failed writing ssh signing key to '%s'" @@ -16344,6 +16391,12 @@ msgstr "Ordres de baix nivell / Sincronització de repositoris" msgid "Low-level Commands / Internal Helpers" msgstr "Ordres de baix nivell / Ajudants interns" +msgid "User-facing repository, command and file interfaces" +msgstr "Repositori, ordre i interfície de fitxers que veu l'usuari" + +msgid "Developer-facing file formats, protocols and other interfaces" +msgstr "Formats de fitxers, protocols i interfícies que veu el desenvolupador" + #, c-format msgid "available git commands in '%s'" msgstr "ordres de git disponibles en «%s»" @@ -16357,6 +16410,12 @@ msgstr "Aquestes són ordres habituals del Git usades en diverses situacions:" msgid "The Git concept guides are:" msgstr "Les guies de Git de conceptes són:" +msgid "User-facing repository, command and file interfaces:" +msgstr "Repositori, ordre i interfície de fitxers que veu l'usuari:" + +msgid "File formats, protocols and other developer interfaces:" +msgstr "Formats de fitxer, protocols i altres interfícies de desenvolupador:" + msgid "External commands" msgstr "Ordres externes" @@ -16441,19 +16500,15 @@ msgstr "" "Podeu desactivar aquest avís amb «git config advice.ignoredHook false»." #, c-format -msgid "Couldn't start hook '%s'\n" -msgstr "No s'ha pogut iniciar el lligam «%s»'\n" - -#, c-format msgid "argument to --packfile must be a valid hash (got '%s')" msgstr "l'argument a --packfile ha de ser un resum vàlid (s'ha obtingut «%s»)" msgid "not a git repository" msgstr "no és un repositori de git" -#, fuzzy, c-format +#, c-format msgid "negative value for http.postBuffer; defaulting to %d" -msgstr "valor negatiu per http.postbuffer; utilitzant el valor %d" +msgstr "valor negatiu per http.postBuffer; utilitzant el valor %d" msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "No s'admet el control de delegació amb el cURL < 7.22.0" @@ -16631,21 +16686,17 @@ msgid "expected flush after ls-refs arguments" msgstr "s'esperava una neteja després dels arguments ls-refs" msgid "quoted CRLF detected" -msgstr "CRLF citat detectat" - -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -" %s" -msgstr "" -"Els canvis locals als fitxers següents se sobreescriuran per la fusió:\n" -" %s" +msgstr "CRLF entre cometes detectat" #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "S'ha produït un error en fusionar el submòdul %s (no està agafat)" #, c-format +msgid "Failed to merge submodule %s (no merge base)" +msgstr "S'ha produït un error en fusionar el submòdul %s (no hi ha fusió base)" + +#, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "S'ha produït un error en fusionar el submòdul %s (no hi ha comissions)" @@ -16665,28 +16716,10 @@ msgstr "S'ha produït un error en fusionar el submòdul «%s»" #, c-format msgid "" -"Failed to merge submodule %s, but a possible merge resolution exists:\n" -"%s\n" +"Failed to merge submodule %s, but a possible merge resolution exists: %s" msgstr "" "S'ha produït un error en fusionar el submòdul %s, però existeix una solució " -"possible:\n" -"%s\n" - -#, c-format -msgid "" -"If this is correct simply add it to the index for example\n" -"by using:\n" -"\n" -" git update-index --cacheinfo 160000 %s \"%s\"\n" -"\n" -"which will accept this suggestion.\n" -msgstr "" -"Si això és correcte simplement afegiu-ho a l'índex per exemple\n" -"utilitzant:\n" -"\n" -" git update-index --cacheinfo 160000 %s «%s»\n" -"\n" -"que acceptarà aquest suggeriment.\n" +"possible: %s" #, c-format msgid "" @@ -16852,13 +16885,43 @@ msgstr "" "CONFLICTE: (modificació/supressió): %s suprimit a %s i modificat a %s. La " "versió %s de %s s'ha deixat en l'arbre." +#. TRANSLATORS: This is a line of advice to resolve a merge +#. 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" +#. +#, c-format +msgid "" +" - go to submodule (%s), and either merge commit %s\n" +" or update to an existing commit which has merged those changes\n" +msgstr "" +" - aneu al submòdul (%s), i fusioneu la comissió %s\n" +" o actualitzeu-la a una comissió existent que ha fusionat aquests canvis\n" + #, c-format msgid "" -"Note: %s not up to date and in way of checking out conflicted version; old " -"copy renamed to %s" +"Recursive merging with submodules currently only supports trivial cases.\n" +"Please manually handle the merging of each conflicted submodule.\n" +"This can be accomplished with the following steps:\n" +"%s - come back to superproject and run:\n" +"\n" +" git add %s\n" +"\n" +" to record the above merge or update\n" +" - resolve any other conflicts in the superproject\n" +" - commit the resulting index in the superproject\n" msgstr "" -"Nota: %s no està actualitzat i en forma de comprovar la versió en conflicte; " -"còpia antiga reanomenada a %s" +"La fusió recursiva amb submòduls actualment només admet casos trivials.\n" +"Si us plau, manegeu manualment la fusió de cada submòdul en conflicte.\n" +"Això es pot aconseguir amb els passos següents:\n" +"%s - torneu al superprojecte i executeu:\n" +"\n" +" git add %s\n" +"\n" +" per a enregistrar la fusió o actualització de dalt\n" +" - resoleu qualsevol altre conflicte al superprojecte\n" +" - publiqueu l'índex resultant al superprojecte\n" #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge #. base, and 2-3) the trees for the two trees we're merging. @@ -16933,6 +16996,22 @@ msgid "Found a possible merge resolution for the submodule:\n" msgstr "S'ha trobat una possible resolució de fusió pel submòdul:\n" #, c-format +msgid "" +"If this is correct simply add it to the index for example\n" +"by using:\n" +"\n" +" git update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"which will accept this suggestion.\n" +msgstr "" +"Si això és correcte simplement afegiu-ho a l'índex per exemple\n" +"utilitzant:\n" +"\n" +" git update-index --cacheinfo 160000 %s «%s»\n" +"\n" +"que acceptarà aquest suggeriment.\n" + +#, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "" "S'ha produït un error en fusionar el submòdul %s (s'han trobat múltiples " @@ -17123,7 +17202,8 @@ msgstr "no es reconeix la versió %d de l'índex multipaquet" #, c-format msgid "multi-pack-index hash version %u does not match version %u" -msgstr "la versió del hash índex multipaquet %u no coincideix amb la versió %u" +msgstr "" +"la versió del resum índex multipaquet %u no coincideix amb la versió %u" msgid "multi-pack-index missing required pack-name chunk" msgstr "falta un fragment de nom de paquet necessari al multi-index" @@ -17472,6 +17552,22 @@ msgid "confused by unstable object source data for %s" msgstr "confós per la font de dades inestable de l'objecte per a %s" #, c-format +msgid "write stream object %ld != %<PRIuMAX>" +msgstr "escriu l'objecte de flux %ld != %<PRIuMAX>" + +#, c-format +msgid "unable to stream deflate new object (%d)" +msgstr "no s'ha pogut desinflar l'object nou (%d)" + +#, c-format +msgid "deflateEnd on stream object failed (%d)" +msgstr "ha fallat deflateEnd a l'objecte del flux (%d)" + +#, c-format +msgid "unable to create directory %s" +msgstr "s'ha produït un error en crear el directori %s" + +#, c-format msgid "cannot read object for %s" msgstr "no es pot llegir l'objecte per a %s" @@ -17507,7 +17603,7 @@ msgstr "no s'ha pogut obrir %s" #, c-format msgid "hash mismatch for %s (expected %s)" -msgstr "no coincideix la suma per a %s (s'esperava %s)" +msgstr "no coincideix el resum per a %s (s'esperava %s)" #, c-format msgid "unable to mmap %s" @@ -17700,40 +17796,149 @@ msgstr "no s'ha pogut analitzar l'objecte: %s" msgid "hash mismatch %s" msgstr "el resum no coincideix %s" +msgid "trying to write commit not in index" +msgstr "s'està intentant no escriure la publicació a l'índex" + +msgid "failed to load bitmap index (corrupted?)" +msgstr "" +"s'ha produït un error en carregar l'índex de mapa de bits (està malmès?)" + +msgid "corrupted bitmap index (too small)" +msgstr "índex de mapa de bits malmès (massa petit)" + +msgid "corrupted bitmap index file (wrong header)" +msgstr "fitxer d'índex de mapa de bits malmès (capçalera incorrecta)" + +#, c-format +msgid "unsupported version '%d' for bitmap index file" +msgstr "versió «%d» no admesa per al fitxer d'índex de mapa de bits" + +msgid "corrupted bitmap index file (too short to fit hash cache)" +msgstr "" +"fitxer d'índex de mapa de bits malmès (massa curt per a ajustar-se a la " +"memòria cau de hash)" + +msgid "corrupted bitmap index file (too short to fit lookup table)" +msgstr "" +"fitxer d'índex de mapa de bits malmès (massa curt per a ajustar-se a la " +"taula de cerca)" + +#, c-format +msgid "duplicate entry in bitmap index: '%s'" +msgstr "entrada duplicada a l'índex del mapa de bits: «%s»" + +#, c-format +msgid "corrupt ewah bitmap: truncated header for entry %d" +msgstr "mapa de bits ewah malmès: capçalera truncada per a l'entrada %d" + +#, c-format +msgid "corrupt ewah bitmap: commit index %u out of range" +msgstr "mapa de bits ewah malmès: l'índex de comissió %u està fora de rang" + +msgid "corrupted bitmap pack index" +msgstr "índex de paquets de mapa de bits malmès" + +msgid "invalid XOR offset in bitmap pack index" +msgstr "el desplaçament XOR a l'índex de mapa de bits no és vàlid" + +msgid "cannot fstat bitmap file" +msgstr "no es pot fer fstat en el fitxer de mapa de bits" + +#, c-format +msgid "ignoring extra bitmap file: '%s'" +msgstr "s'ignorarà el fitxer extra de mapa de bits: «%s»" + +msgid "checksum doesn't match in MIDX and bitmap" +msgstr "la suma de verificació no coincideix amb el MIDX i el mapa de bits" + msgid "multi-pack bitmap is missing required reverse index" msgstr "falta l'índex invers necessari al mapa de bits multipaquet" -#, fuzzy, c-format +#, c-format msgid "could not open pack %s" -msgstr "no s'ha pogut obrir «%s»" +msgstr "no s'ha pogut obrir el paquet %s" -#, fuzzy, c-format +#, c-format msgid "preferred pack (%s) is invalid" -msgstr "el paquet preferit «%s» ha caducat" +msgstr "el paquet preferit (%s) no és vàlid" + +msgid "corrupt bitmap lookup table: triplet position out of index" +msgstr "" +"taula de cerca de mapa de bits malmesa: posició la tripleta fora de l'índex" + +msgid "corrupt bitmap lookup table: xor chain exceeds entry count" +msgstr "" +"taula de cerca de mapa de bits malmesa: la cadena xor excedeix el nombre " +"d'entrades" + +#, c-format +msgid "corrupt bitmap lookup table: commit index %u out of range" +msgstr "" +"taula de cerca de mapa de bits malmesa: l'índex de comissió %u està fora de " +"rang" + +#, c-format +msgid "corrupt ewah bitmap: truncated header for bitmap of commit \"%s\"" +msgstr "" +"mapa de bits ewah malmès: capçalera truncada per al mapa de bits de la " +"comissió «%s»" + +#, c-format +msgid "object '%s' not found in type bitmaps" +msgstr "no s'ha trobat l'objecte «%s» als tipus de mapes de bits" + +#, c-format +msgid "object '%s' does not have a unique type" +msgstr "l'objecte «%s» no té un tipus únic" + +#, c-format +msgid "object '%s': real type '%s', expected: '%s'" +msgstr "objecte «%s»: tipus real «%s», s'esperava: «%s»" + +#, c-format +msgid "object not in bitmap: '%s'" +msgstr "objecte no trobat al mapa de bits: «%s»" + +msgid "failed to load bitmap indexes" +msgstr "s'ha produït un error en carregar l'índex de mapa de bits" + +msgid "you must specify exactly one commit to test" +msgstr "heu d'especificar exactament una comissió a provar" + +#, c-format +msgid "commit '%s' doesn't have an indexed bitmap" +msgstr "la comissió «%s» no té un mapa de bits indexat" + +msgid "mismatch in bitmap results" +msgstr "no coincideix en els resultats del mapa de bits" #, c-format -msgid "could not find %s in pack %s at offset %<PRIuMAX>" -msgstr "no s'ha pogut trobar %s al paquet %s al desplaçament %<PRIuMAX>" +msgid "could not find '%s' in pack '%s' at offset %<PRIuMAX>" +msgstr "no s'ha pogut trobar «%s» al paquet «%s» al desplaçament %<PRIuMAX>" -#, fuzzy, c-format +#, c-format +msgid "unable to get disk usage of '%s'" +msgstr "no s'ha pogut obtenir l'ús del disc de «%s»" + +#, c-format msgid "mtimes file %s is too small" -msgstr "el fitxer de l'índex multipaquet %s és massa petit" +msgstr "el fitxer mtimes %s és massa petit" -#, fuzzy, c-format +#, c-format msgid "mtimes file %s has unknown signature" -msgstr "el fitxer d'índex invers %s té una signatura desconeguda" +msgstr "el fitxer mtimes %s té una signatura desconeguda" -#, fuzzy, c-format +#, c-format msgid "mtimes file %s has unsupported version %<PRIu32>" -msgstr "el fitxer d'índex invers %s té la versió %<PRIu32> no admesa" +msgstr "el fitxer mtimes %s té la versió %<PRIu32> no admesa" -#, fuzzy, c-format +#, c-format msgid "mtimes file %s has unsupported hash id %<PRIu32>" -msgstr "el fitxer d'índex invers %s té un ID de resum %<PRIu32> no admès" +msgstr "el fitxer mtimes %s té un ID de resum %<PRIu32> no admès" -#, fuzzy, c-format +#, c-format msgid "mtimes file %s is corrupt" -msgstr "el fitxer d'índex invers %s està malmès" +msgstr "el fitxer mtimes %s està malmès" #, c-format msgid "reverse-index file %s is too small" @@ -17839,6 +18044,9 @@ msgstr "voleu dir «--%s» (amb dos guionets)?" msgid "alias of --%s" msgstr "àlies de --%s" +msgid "need a subcommand" +msgstr "cal una subordre" + #, c-format msgid "unknown option `%s'" msgstr "opció desconeguda «%s»" @@ -17991,7 +18199,7 @@ msgstr "l'especificació de camí «%s» és més enllà d'un enllaç simbòlic" #, c-format msgid "line is badly quoted: %s" -msgstr "la línia està mal citada: %s" +msgstr "la línia no està ben envoltada per cometes: %s" msgid "unable to write flush packet" msgstr "no s'ha pogut escriure el paquet de buidatge" @@ -18280,9 +18488,12 @@ msgid "" "l, label <label> = label current HEAD with a name\n" "t, reset <label> = reset HEAD to a label\n" "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" -". create a merge commit using the original merge commit's\n" -". message (or the oneline, if no original merge commit was\n" -". specified); use -c <commit> to reword the commit message\n" +" create a merge commit using the original merge commit's\n" +" message (or the oneline, if no original merge commit was\n" +" specified); use -c <commit> to reword the commit message\n" +"u, update-ref <ref> = track a placeholder for the <ref> to be updated\n" +" to this position in the new commits. The <ref> is\n" +" updated at the end of the rebase\n" "\n" "These lines can be re-ordered; they are executed from top to bottom.\n" msgstr "" @@ -18293,7 +18504,8 @@ msgstr "" "e, edit <comissió> = usa la comissió, però atura't per a esmenar-la\n" "s, squash <comissió> = usa la comissió, però fusiona-la a la comissió " "prèvia\n" -"f, fixup [-C | -c] <commit> = com a «squash», però manté només el missatge\n" +"f, fixup [-C | -c] <comissió> = com a «squash», però manté només el " +"missatge\n" " de comissió previ, a menys que s'usi -C, en aquest cas\n" " manté només el missatge d'aquesta comissió; -c és el " "mateix\n" @@ -18306,11 +18518,16 @@ msgstr "" "l, label <etiqueta> = etiqueta la HEAD actual amb un nom\n" "t, reset <etiqueta> = reinicia HEAD a una etiqueta\n" "m, merge [-C <comissió> | -c <comissió>] <etiqueta> [# <oneline>]\n" -". crea una comissió de fusió usant el missatge de la comissió\n" -". de fusió original (o línia única, si no hi ha cap comissió de fusió " +" crea una comissió de fusió usant el missatge de la comissió de fusió " "original\n" -". especificada). Useu -c <comissió> per a reescriure el missatge de la " -"comissió.\n" +" (o línia única, si no hi ha cap comissió de fusió original " +"especificada).\n" +" Useu -c <comissió> per a reescriure el missatge de la comissió.\n" +"u, update-ref <ref> = segueix un marcador de posició per a actualitzar " +"<ref>\n" +" a aquesta posició en les comissions noves. La <ref> " +"s'actualitza\n" +" al final del «rebase»\n" "\n" "Es pot canviar l'ordre d'aquestes línies; s'executen de dalt a baix.\n" @@ -18786,6 +19003,14 @@ msgstr "error de protocol: s'esperava sha/ref, s'ha obtingut «%s»" msgid "http transport does not support %s" msgstr "El transport http no admet %s" +msgid "protocol error: expected '<url> <path>', missing space" +msgstr "" +"s'ha produït un error de protocol: s'esperava «<url> <path>», falta espai" + +#, c-format +msgid "failed to download file at URL '%s'" +msgstr "no s'ha pogut baixar el fitxer a l'URL «%s»" + msgid "git-http-push failed" msgstr "git-http-push ha fallat" @@ -18796,7 +19021,7 @@ msgid "remote-curl: error reading command stream from git" msgstr "remote-curl: error en llegir el flux d'ordres del git" msgid "remote-curl: fetch attempted without a local repo" -msgstr "remote-curl: s'ha intentat l'obtenció sense un dipòsit local" +msgstr "remote-curl: s'ha intentat l'obtenció sense un repositori local" #, c-format msgid "remote-curl: unknown command '%s' from git" @@ -18813,13 +19038,13 @@ msgstr "més d'un paquet de recepció donat, usant el primer" msgid "more than one uploadpack given, using the first" msgstr "més d'un paquet de càrrega donat, usant el primer" -#, fuzzy, c-format +#, c-format msgid "unrecognized value transfer.credentialsInUrl: '%s'" -msgstr "patró no reconegut: «%s»" +msgstr "valor no conegut per a transfer.credentialsInUrl: «%s»" #, c-format msgid "URL '%s' uses plaintext credentials" -msgstr "" +msgstr "L'URL «%s» utilitza credencials en text pla" #, c-format msgid "Cannot fetch both %s and %s to %s" @@ -18843,12 +19068,12 @@ msgstr "el valor «%s» del patró no té «*»" #, c-format msgid "src refspec %s does not match any" -msgstr "l'especificació de referència src %s no coincideix amb cap referència" +msgstr "l'especificació de referència font %s no coincideix amb cap referència" #, c-format msgid "src refspec %s matches more than one" msgstr "" -"l'especificació de referència de src %s coincideix amb més d'una referència" +"l'especificació de referència de font %s coincideix amb més d'una referència" #. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is @@ -19129,6 +19354,14 @@ msgstr "no s'ha pogut determinar la revisió de HEAD" msgid "failed to find tree of %s" msgstr "s'ha produït un error en cercar l'arbre de %s" +#, c-format +msgid "resolve-undo records `%s` which is missing" +msgstr "resolve-undo indica «%s» que manquen" + +#, c-format +msgid "could not get commit for ancestry-path argument %s" +msgstr "no s'ha pogut obtenir la comissió per a l'argument d'ancestry-path %s" + msgid "--unpacked=<packfile> no longer supported" msgstr "--unpacked=<packfile> ja no s'admet" @@ -19149,6 +19382,174 @@ msgstr "-L no és encara compatible amb formats que no siguin «-p» o «-s»" msgid "cannot create async thread: %s" msgstr "no s'ha pogut crear fil «async»: %s" +#, c-format +msgid "'%s' does not exist" +msgstr "«%s» no existeix" + +#, c-format +msgid "could not switch to '%s'" +msgstr "no s'ha pogut commutar a «%s»" + +msgid "need a working directory" +msgstr "cal un directori de treball" + +msgid "Scalar enlistments require a worktree" +msgstr "Els allistaments escalars requereixen un arbre de treball" + +#, c-format +msgid "could not configure %s=%s" +msgstr "no s'ha pogut configurar %s=%s" + +msgid "could not configure log.excludeDecoration" +msgstr "no s'ha pogut configurar log.excludeDecoration" + +msgid "could not add enlistment" +msgstr "no s'ha afegit a l'allistament" + +msgid "could not set recommended config" +msgstr "no s'ha pogut establir la configuració recomanada" + +msgid "could not turn on maintenance" +msgstr "no s'ha pogut activar el manteniment" + +msgid "could not start the FSMonitor daemon" +msgstr "no s'ha pogut iniciar el dimoni del fsmonitor" + +msgid "could not turn off maintenance" +msgstr "no s'ha pogut desactivar el manteniment" + +msgid "could not remove enlistment" +msgstr "no s'ha pogut eliminar l'allistament" + +#, c-format +msgid "remote HEAD is not a branch: '%.*s'" +msgstr "la HEAD remota no és una branca: «%.*s»" + +msgid "failed to get default branch name from remote; using local default" +msgstr "" +"no s'ha pogut obtenir el nom de la branca per defecte del remot; s'usa ela " +"predeterminada localment" + +msgid "failed to get default branch name" +msgstr "s'ha produït un error en obtenir el nom de branca predeterminada" + +msgid "failed to unregister repository" +msgstr "s'ha produït un error en desregistrar el repositori" + +msgid "failed to stop the FSMonitor daemon" +msgstr "no s'ha pogut aturar el dimoni del FSMonitor" + +msgid "failed to delete enlistment directory" +msgstr "s'ha produït un error en suprimir l'allistament del directori" + +msgid "branch to checkout after clone" +msgstr "branca a agafar després de clonar" + +msgid "when cloning, create full working directory" +msgstr "quan es clona, crear un directori de treball complet" + +msgid "only download metadata for the branch that will be checked out" +msgstr "només baixa les metadades per a la branca que s'agafarà" + +msgid "scalar clone [<options>] [--] <repo> [<dir>]" +msgstr "scalar clone [<opcions>] [--] <repo> [<dir>]" + +#, c-format +msgid "cannot deduce worktree name from '%s'" +msgstr "no es pot deduir el nom de l'arbre de treball de «%s»" + +#, c-format +msgid "directory '%s' exists already" +msgstr "el directori «%s» ja existeix" + +#, c-format +msgid "failed to get default branch for '%s'" +msgstr "s'ha produït un error en obtenir la branca per defecte per a «%s»" + +#, c-format +msgid "could not configure remote in '%s'" +msgstr "no s'ha pogut configurar el remot a «%s»" + +#, c-format +msgid "could not configure '%s'" +msgstr "no s'ha pogut configurar «%s»" + +msgid "partial clone failed; attempting full clone" +msgstr "ha fallat la clonació parcial; s'està intentant la clonació completa" + +msgid "could not configure for full clone" +msgstr "no s'ha pogut configurar per a una clonació completa" + +msgid "scalar diagnose [<enlistment>]" +msgstr "scalar diagnose [<enlistment>]" + +msgid "`scalar list` does not take arguments" +msgstr "«scalar list» no accepta arguments" + +msgid "scalar register [<enlistment>]" +msgstr "scalar register [<enlistment>]" + +msgid "reconfigure all registered enlistments" +msgstr "reconfigura tots els allistaments registrats" + +msgid "scalar reconfigure [--all | <enlistment>]" +msgstr "scalar reconfigure [--all | <enlistment>]" + +msgid "--all or <enlistment>, but not both" +msgstr "--all o <enlistment>, però no ambdós" + +#, c-format +msgid "git repository gone in '%s'" +msgstr "no existeix un repositori de git a: «%s»" + +msgid "" +"scalar run <task> [<enlistment>]\n" +"Tasks:\n" +msgstr "" +"scalar run <task> {<enlistment>]\n" +"Tasques:\n" + +#, c-format +msgid "no such task: '%s'" +msgstr "no existeix la tasca: «%s»" + +msgid "scalar unregister [<enlistment>]" +msgstr "scalar unregister [<enlistment>]" + +msgid "scalar delete <enlistment>" +msgstr "supressió de l'escalar <enlistment>" + +msgid "refusing to delete current working directory" +msgstr "s'ha rebutjat suprimir el directori de treball actual" + +msgid "include Git version" +msgstr "inclou la versió del Git" + +msgid "include Git's build options" +msgstr "inclou les opcions de construcció del Git" + +msgid "scalar verbose [-v | --verbose] [--build-options]" +msgstr "scalar verbose [-v | --verbose] [--build-options]" + +msgid "-C requires a <directory>" +msgstr "-C requereix un <directory>" + +#, c-format +msgid "could not change to '%s'" +msgstr "no s'ha pogut canviar a «%s»" + +msgid "-c requires a <key>=<value> argument" +msgstr "-c requereix un argument <key>=<value>" + +msgid "" +"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n" +"\n" +"Commands:\n" +msgstr "" +"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n" +"\n" +"Ordres:\n" + msgid "unexpected flush packet while reading remote unpack status" msgstr "" "paquet de buidatge no esperat quan estava llegint l'estat del " @@ -19174,7 +19575,7 @@ msgstr "" "l'empenta" msgid "the receiving end does not support this repository's hash algorithm" -msgstr "el receptor de destí no admet l'algorisme de hash del repositori" +msgstr "el receptor de destí no admet l'algorisme de resum del repositori" msgid "the receiving end does not support --signed push" msgstr "el destí receptor no admet pujar --signed" @@ -19273,10 +19674,6 @@ msgstr "els vostres canvis locals se sobreescriurien per %s." msgid "commit your changes or stash them to proceed." msgstr "cometeu els vostres canvis o feu un «stash» per a procedir." -#, c-format -msgid "%s: fast-forward" -msgstr "%s: avanç ràpid" - #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase". #. @@ -19366,7 +19763,7 @@ msgid "" " git commit --amend --reset-author\n" msgstr "" "S'han configurat el vostre nom i adreça electrònica\n" -"automàticament basant-se en el vostre nom d'usuari i nom de màquina. \n" +"automàticament basant-se en el vostre nom d'usuari i nom de màquina.\n" "Comproveu que siguin correctes. Podeu suprimir aquest\n" "missatge establint-los explícitament. Executeu l'ordre següent i\n" "seguiu les instruccions en l'editor per a editar el vostre\n" @@ -19391,7 +19788,7 @@ msgid "" " git commit --amend --reset-author\n" msgstr "" "S'han configurat el vostre nom i adreça electrònica\n" -"automàticament basats en el vostre nom d'usuari i nom de màquina. \n" +"automàticament basats en el vostre nom d'usuari i nom de màquina.\n" "Comproveu que siguin correctes. Podeu suprimir aquest\n" "missatge establint-los explícitament:\n" "\n" @@ -19763,6 +20160,28 @@ msgstr "no s'ha pogut fusionar «%.*s»" msgid "merge: Unable to write new index file" msgstr "fusió: no s'ha pogut escriure un fitxer d'índex nou" +#, c-format +msgid "" +"another 'rebase' process appears to be running; '%s.lock' already exists" +msgstr "" +"sembla que s'està executant un altre procés «rebase»: «%s.lock» ja existeix" + +#, c-format +msgid "" +"Updated the following refs with %s:\n" +"%s" +msgstr "" +"S'han actualitzat els següents refs amb %s:\n" +"%s" + +#, c-format +msgid "" +"Failed to update the following refs with %s:\n" +"%s" +msgstr "" +"No s'han pogut actualitzar les referències següents amb %s:\n" +"%s" + msgid "Cannot autostash" msgstr "No es pot fer un «stash» automàticament" @@ -19930,6 +20349,10 @@ msgid "the script was already rearranged." msgstr "l'script ja estava endreçat." #, c-format +msgid "update-refs file at '%s' is invalid" +msgstr "el fitxer update-refs a «%s» no és vàlid" + +#, c-format msgid "'%s' is outside repository at '%s'" msgstr "«%s» està fora del repositori a «%s»" @@ -20051,11 +20474,19 @@ msgstr "" #, c-format msgid "" -"unsafe repository ('%s' is owned by someone else)\n" -"To add an exception for this directory, call:\n" +"detected dubious ownership in repository at '%s'\n" +"%sTo add an exception for this directory, call:\n" "\n" "\tgit config --global --add safe.directory %s" msgstr "" +"s'ha detectat una propietat dubtosa al repositori a «%s»\n" +"%sPer a afegir una excepció per a aquest directori, executeu:\n" +"\n" +"\tgit config --global --add safe.directory %s" + +#, c-format +msgid "cannot use bare repository '%s' (safe.bareRepository is '%s')" +msgstr "no es pot utilitzar el dipòsit nu «%s» (safe.bareRepository és «%s»)" #, c-format msgid "" @@ -20132,9 +20563,8 @@ msgstr "no s'ha pogut editar «%s»" msgid "ignoring suspicious submodule name: %s" msgstr "s'està ignorant el nom de submòdul sospitós %s" -#, fuzzy msgid "negative values not allowed for submodule.fetchJobs" -msgstr "no es permeten els valors negatius a submodule.fetchjobs" +msgstr "no es permeten els valors negatius a submodule.fetchJobs" #, c-format msgid "ignoring '%s' which may be interpreted as a command-line option: %s" @@ -20936,6 +21366,18 @@ msgstr "número de port no vàlid" msgid "invalid '..' path segment" msgstr "segment de camí «..» no vàlid" +msgid "usage: " +msgstr "ús: " + +msgid "fatal: " +msgstr "fatal: " + +msgid "error: " +msgstr "error: " + +msgid "warning: " +msgstr "avís: " + msgid "Fetching objects" msgstr "S'estan obtenint objectes" @@ -20966,7 +21408,7 @@ msgid ".git file broken" msgstr "fitxer .git malmès" msgid ".git file incorrect" -msgstr "fitxer .git malmès" +msgstr "fitxer .git incorrecte" msgid "not a valid path" msgstr "no és un camí vàlid" @@ -21668,7 +22110,7 @@ msgid "" msgstr "" "y - descarta aquest tros de l'arbre de treball\n" "n - no descartis aquest tros des de l'arbre de treball\n" -"q - surt; no apliquis aquest tros ni cap dels pendents\n" +"q - surt; no descartis aquest tros ni cap dels pendents\n" "a - descarta aquest tros i tots els trossos posteriors en el fitxer\n" "d - no descartis aquest tros ni cap dels trossos posteriors en el fitxer" @@ -21681,7 +22123,7 @@ msgid "" msgstr "" "y - descarta aquest tros de l'índex i de l'arbre de treball\n" "n - no descartis aquest tros des de l'índex i de l'arbre de treball\n" -"q - surt; no apliquis aquest tros ni cap dels pendents\n" +"q - surt; no descartis aquest tros ni cap dels pendents\n" "a - descarta aquest tros i tots els trossos posteriors en el fitxer\n" "d - no descartis aquest tros ni cap dels trossos posteriors en el fitxer" @@ -21739,22 +22181,6 @@ msgstr "Els trossos seleccionats no apliquen a l'índex\n" msgid "ignoring unmerged: %s\n" msgstr "s'està ignorant %s no fusionat\n" -#, perl-format -msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " -msgstr "Aplica el canvi de mode a l'arbre de treball [y,n,q,a,d%s,?]? " - -#, perl-format -msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " -msgstr "Aplica la supressió a l'arbre de treball [y,n,q,a,d%s,?]? " - -#, perl-format -msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " -msgstr "Aplica l'addició a l'arbre de treball [y,n,q,a,d%s,?]? " - -#, perl-format -msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " -msgstr "Aplica aquest tros a l'arbre de treball [y,n,q,a,d%s,?]? " - msgid "No other hunks to goto\n" msgstr "No hi ha altres trossos on anar-hi\n" @@ -22120,13 +22546,13 @@ msgstr "no es pot enviar el missatge en 7 bits" msgid "invalid transfer encoding" msgstr "codificació de transferència no vàlida" -#, fuzzy, perl-format +#, perl-format msgid "" "fatal: %s: rejected by %s hook\n" "%s\n" "warning: no patches were sent\n" msgstr "" -"fatal: %s: rebutjat pel lligam sendemail-validate\n" +"fatal: %s: rebutjat pel lligam %s\n" "%s\n" "avís: no s'ha enviat cap pedaç\n" @@ -22151,302 +22577,83 @@ msgstr "S'està ometent %s amb el sufix de còpia de seguretat «%s».\n" msgid "Do you really want to send %s? [y|N]: " msgstr "Esteu segur que voleu enviar %s? [y|N]: " -#~ msgid "--preserve-merges was replaced by --rebase-merges" -#~ msgstr "--preserve-merges ha estat substituït per --rebase-merges" - -#, c-format -#~ msgid "" -#~ "CRLF will be replaced by LF in %s.\n" -#~ "The file will have its original line endings in your working directory" -#~ msgstr "" -#~ "CRLF serà reemplaçat per LF en %s.\n" -#~ "El fitxer tindrà els seus terminadors de línia originals en el vostre " -#~ "directori de treball" - -#, c-format -#~ msgid "" -#~ "LF will be replaced by CRLF in %s.\n" -#~ "The file will have its original line endings in your working directory" -#~ msgstr "" -#~ "LF serà reemplaçat per CRLF en %s.\n" -#~ "El fitxer tindrà els seus terminadors de línia originals en el vostre " -#~ "directori de treball" - -#, c-format -#~ msgid "error reading section header '%s'" -#~ msgstr "error en llegir la capçalera de la secció «%s»" +#~ msgid "(stats|all)" +#~ msgstr "(stats|all)" -#~ msgid "load_reverse_index: could not open pack" -#~ msgstr "load_reverse_index: no s'ha pogut obrir el paquet" +#~ msgid "git maintenance register" +#~ msgstr "git maintenance register" -#, perl-format -#~ msgid "fatal: %s: rejected by %s hook\n" -#~ msgstr "fatal: %s: rebutjat pel lligam %s\n" +#~ msgid "git maintenance unregister" +#~ msgstr "git maintenance unregister" -#~ msgid "git archive --list" -#~ msgstr "git archive --list" +#~ msgid "git maintenance stop" +#~ msgstr "git maintenance stop" #, c-format -#~ msgid "unknown value for --diff-merges: %s" -#~ msgstr "valor desconegut per a --diff-merges: %s" +#~ msgid "could not parse colored hunk header '%.*s'" +#~ msgstr "no s'ha pogut analitzar la capçalera del tros acolorida «%.*s»" #, c-format -#~ msgid "invalid value '%s' for lsrefs.unborn" -#~ msgstr "valor «%s» no vàlid per a «lsrefs.unborn»" +#~ msgid "Unknown subcommand: %s" +#~ msgstr "Subordre desconeguda: %s" -#~ msgid "backend for `git stash -p`" -#~ msgstr "rerefons per a «git stash -p»" +#~ msgid "checked out in another worktree" +#~ msgstr "s'ha agafat en un altre arbre de treball" -#, c-format -#~ msgid "Invalid value for --empty: %s" -#~ msgstr "Valor no vàlid per a --empty: %s" +#~ msgid "failed to open stdin of 'crontab'" +#~ msgstr "s'ha produït un error en obrir stdin de «crontab»" #, c-format -#~ msgid "Invalid value for --patch-format: %s" -#~ msgstr "Valor no vàlid per a --patch-format: %s" +#~ msgid "invalid subcommand: %s" +#~ msgstr "subordre no vàlida: %s" -#, c-format -#~ msgid "Invalid value for --show-current-patch: %s" -#~ msgstr "Valor no vàlid per --show-current-patch: %s" +#~ msgid "single arg format must be symmetric range" +#~ msgstr "el format de l'argument únic ha de ser de rang simètric" -#~ msgid "" -#~ "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad " -#~ "| --term-new]" -#~ msgstr "" -#~ "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad " -#~ "| --term-new]" +#~ msgid "git submodule--helper list [--prefix=<path>] [<path>...]" +#~ msgstr "git submodule--helper list [--prefix=<camí>] [<camí>...]" -#~ msgid "git bisect--helper --bisect-next" -#~ msgstr "git bisect--helper --bisect-next" - -#~ msgid "git bisect--helper --bisect-visualize" -#~ msgstr "git bisect--helper --bisect-visualize" +#~ msgid "git submodule--helper name <path>" +#~ msgstr "git submodule--helper name <camí>" #, c-format -#~ msgid "invalid color '%s' in color.blame.repeatedLines" -#~ msgstr "color «%s» no vàlid en «color.blame.repeatedLines»" - -#~ msgid "invalid value for blame.coloring" -#~ msgstr "valor no vàlid per a «blame.coloring»" - -#~ msgid "" -#~ "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e " -#~ "| -p | <type> | --textconv | --filters) [--path=<path>] <object>" -#~ msgstr "" -#~ "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e " -#~ "| -p | <tipus> | --textconv | --filters [--path=<camí>]) <objecte>" - -#~ msgid "show object type" -#~ msgstr "mostra el tipus de l'objecte" - -#~ msgid "exit with zero when there's no error" -#~ msgstr "surt amb zero quan no hi ha error" - -#~ msgid "show info and content of objects fed from the standard input" -#~ msgstr "" -#~ "mostra la informació i contingut dels objectes rebuts de l'entrada " -#~ "estàndard" - -#~ msgid "show info about objects fed from the standard input" -#~ msgstr "mostra informació sobre els objectes rebuts de l'entrada estàndard" - -#~ msgid "follow in-tree symlinks (used with --batch or --batch-check)" +#~ msgid "failed to get the default remote for submodule '%s'" #~ msgstr "" -#~ "segueix els enllaços simbòlics en l'arbre (s'usa amb --batch o --batch-" -#~ "check)" - -#~ msgid "show all objects with --batch or --batch-check" -#~ msgstr "mostra tots els objectes amb --batch o --batch-check" - -#~ msgid "do not order --batch-all-objects output" -#~ msgstr "no ordenar la sortida de --batch-all-objects" - -#~ msgid "set up tracking mode (see git-pull(1))" -#~ msgstr "configura el mode de seguiment (vegeu git-pull(1))" - -#~ msgid "Using both --reset-author and --author does not make sense" -#~ msgstr "Usar ambdós --reset-author i --author no té sentit" - -#~ msgid "Options --squash and --fixup cannot be used together" -#~ msgstr "Les opcions --squash i --fixup no es poden usar juntes" - -#~ msgid "Only one of -c/-C/-F/--fixup can be used." -#~ msgstr "Només un de -c/-C/-F/--fixup es pot usar." - -#~ msgid "Option -m cannot be combined with -c/-C/-F." -#~ msgstr "l'opció -m no es pot combinar amb -c/-C/-F/." - -#~ msgid "" -#~ "Only one of --include/--only/--all/--interactive/--patch can be used." -#~ msgstr "" -#~ "Només un de --include/--only/--all/--interactive/--patch es pot usar." - -#~ msgid "git count-objects [-v] [-H | --human-readable]" -#~ msgstr "git count-objects [-v] [-H | --human-readable]" +#~ "s'ha produït un error en obtenir el remot per defecte pel submòdul «%s»" #, c-format -#~ msgid "configuration fetch.output contains invalid value %s" -#~ msgstr "la configuració fetch.output conté un valor no vàlid %s" +#~ msgid "Invalid update mode '%s' for submodule path '%s'" +#~ msgstr "Mode d'actualització «%s» no vàlid per al camí de submòdul «%s»" -#~ msgid "--cached or --untracked cannot be used with --no-index" -#~ msgstr "--cached o --untracked no es pot usar amb --no-index" +#~ msgid "path into the working tree, across nested submodule boundaries" +#~ msgstr "camí a l'arbre de treball, a través de fronteres de submòduls niats" -#~ msgid "--untracked cannot be used with --cached" -#~ msgstr "--untracked no es pot usar amb --cached" +#~ msgid "rebase, merge, checkout or none" +#~ msgstr "rebase, merge, checkout o none" -#~ msgid "git hash-object --stdin-paths" -#~ msgstr "git hash-object --stdin-paths" +#~ msgid "bad value for update parameter" +#~ msgstr "valor incorrecte per al paràmetre update" -#~ msgid "git help [-g|--guides]" -#~ msgstr "git help [-g|--guides]" - -#~ msgid "git help [-c|--config]" -#~ msgstr "git help [-c|--config]" - -#~ msgid "git mktag" -#~ msgstr "git mktag" - -#~ msgid "git mktree [-z] [--missing] [--batch]" -#~ msgstr "git mktree [-z] [--missing] [--batch]" - -#~ msgid "read from stdin" -#~ msgstr "llegeix de stdin" - -#~ msgid "git notes merge --commit [-v | -q]" -#~ msgstr "git notes merge --commit [-v | -q]" - -#~ msgid "git notes merge --abort [-v | -q]" -#~ msgstr "git notes merge --abort [-v | -q]" - -#~ msgid "git notes get-ref" -#~ msgstr "git notes get-ref" - -#~ msgid "invalid value for --missing" -#~ msgstr "valor no vàlid per a --missing" - -#~ msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" -#~ msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" - -#, c-format -#~ msgid "Invalid value for %s: %s" -#~ msgstr "Valor no vàlid per a %s: %s" +#~ msgid "Show three-way merge without touching index" +#~ msgstr "Mostra la fusió de tres vies sense tocar l'índex" +# c-format #, c-format -#~ msgid "Invalid value for pull.ff: %s" -#~ msgstr "Valor no vàlid per a pull.ff: %s" - -#~ msgid "git rebase --continue | --abort | --skip | --edit-todo" -#~ msgstr "git rebase --continue | --abort | --skip | --edit-todo" +#~ msgid "could not create directory for '%s'" +#~ msgstr "no s'ha pogut crear el directori per a «%s»" #, c-format -#~ msgid "'%s' is not a valid timestamp" -#~ msgstr "«%s» no és una marca de temps vàlida" - -#~ msgid "git reflog [ show | expire | delete | exists ]" -#~ msgstr "git reflog [ show | expire | delete | exists ]" - -#~ msgid "git remote [-v | --verbose]" -#~ msgstr "git remote [-v | --verbose]" - -#~ msgid "git replace [-f] --convert-graft-file" -#~ msgstr "git replace [-f] --convert-graft-file" +#~ msgid "Couldn't start hook '%s'\n" +#~ msgstr "No s'ha pogut iniciar el lligam «%s»'\n" #, c-format #~ msgid "" -#~ "\n" -#~ "It took %.2f seconds to enumerate unstaged changes after reset. You can\n" -#~ "use '--quiet' to avoid this. Set the config setting reset.quiet to true\n" -#~ "to make this the default.\n" +#~ "Note: %s not up to date and in way of checking out conflicted version; " +#~ "old copy renamed to %s" #~ msgstr "" -#~ "\n" -#~ "S'ha trigat %.2f segons a enumerar els canvis «unstaged» després del " -#~ "reinici.\n" -#~ "Podeu utilitzar «--quiet» per a evitar-ho. Establiu el paràmetre de " -#~ "configuració\n" -#~ "reset.quiet a true per a fer que aquesta configuració sigui " -#~ "predeterminada.\n" - -#~ msgid "git sparse-checkout list" -#~ msgstr "git sparse-checkout list" - -#~ msgid "unable to upgrade repository format to enable worktreeConfig" -#~ msgstr "" -#~ "no s'ha pogut actualitzar el format del repositori per a habilitar " -#~ "worktreeConfig" - -#~ msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]" -#~ msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]" - -#~ msgid "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]" -#~ msgstr "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]" - -#~ msgid "git sparse-checkout disable" -#~ msgstr "git sparse-checkout disable" - -#~ msgid "" -#~ "the stash.useBuiltin support has been removed!\n" -#~ "See its entry in 'git help config' for details." -#~ msgstr "" -#~ "s'ha eliminat l'opció stash.useBuiltin.\n" -#~ "Per a més detalls vegeu la seva entrada a «git help config»." - -#~ msgid "git stripspace [-s | --strip-comments]" -#~ msgstr "git stripspace [-s | --strip-comments]" - -#~ msgid "git stripspace [-c | --comment-lines]" -#~ msgstr "git stripspace [-c | --comment-lines]" - -#~ msgid "submodule--helper print-default-remote takes no arguments" -#~ msgstr "submodule--helper print-default-remote no pren cap argument" - -#~ msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" -#~ msgstr "git submodule--helper update-clone [--prefix=<camí>] [<camí>...]" - -#~ msgid "suppress output for update by rebase or merge" -#~ msgstr "omet la sortida per les actualitzacions per «rebase» o fusió" - -#~ msgid "overrides update mode in case the repository is a fresh clone" -#~ msgstr "" -#~ "sobreescriu el mode d'actualització en cas que el repositori sigui un " -#~ "clon nou" - -#~ msgid "depth for shallow fetch" -#~ msgstr "profunditat per a les obtencions superficials" +#~ "Nota: %s no està actualitzat i en forma de comprovar la versió en " +#~ "conflicte; còpia antiga reanomenada a %s" -#~ msgid "sha1" -#~ msgstr "sha1" - -#~ msgid "SHA1 expected by superproject" -#~ msgstr "SHA1 esperat per superproject" - -#~ msgid "subsha1" -#~ msgstr "subsha1" - -#~ msgid "SHA1 of submodule's HEAD" -#~ msgstr "SHA1 del HEAD del submòdul" - -#~ msgid "git submodule--helper run-update-procedure [<options>] <path>" -#~ msgstr "git submodule--helper run-update-procedure [<options>] <path>" - -#~ msgid "git submodule--helper config --check-writeable" -#~ msgstr "git submodule--helper config --check-writeable" - -#~ msgid "git update-server-info [--force]" -#~ msgstr "git update-server-info [--force]" - -#~ msgid "Initialize and modify the sparse-checkout" -#~ msgstr "Inicialitza i modifica el «sparse-checkout»" - -#, sh-format -#~ msgid "" -#~ "Unable to find current ${remote_name}/${branch} revision in submodule " -#~ "path '$sm_path'" -#~ msgstr "" -#~ "No s'ha pogut trobar la revisió actual de ${remote_name}/${branch} en el " -#~ "camí de submòdul «$sm_path»" - -#, sh-format -#~ msgid "Failed to recurse into submodule path '$displaypath'" -#~ msgstr "" -#~ "S'ha produït un error en recórrer recursivament dins del camí de submòdul " -#~ "«$displaypath»" +#, c-format +#~ msgid "%s: fast-forward" +#~ msgstr "%s: avanç ràpid" @@ -8,16 +8,16 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2022-06-21 19:57+0000\n" -"PO-Revision-Date: 2022-06-20 21:17+0200\n" -"Last-Translator: Matthias Rüster <matthias.ruester@gmail.com>\n" -"Language-Team: Matthias Rüster <matthias.ruester@gmail.com>\n" +"POT-Creation-Date: 2022-09-28 17:09+0200\n" +"PO-Revision-Date: 2022-09-28 17:10+0200\n" +"Last-Translator: Ralf Thielow <ralf.thielow@gmail.com>\n" +"Language-Team: German\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" -"X-Generator: Poedit 3.1\n" +"X-Generator: Poedit 3.1.1\n" #, c-format msgid "Huh (%s)?" @@ -379,8 +379,8 @@ msgstr "Ergänzung im Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? " #, c-format, perl-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " msgstr "" -"Diesen Patch-Block vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a," -"d%s,?]? " +"Diesen Patch-Block vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d" +"%s,?]? " msgid "" "y - discard this hunk from index and worktree\n" @@ -411,8 +411,8 @@ msgstr "Ergänzung auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? " #, c-format, perl-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " msgstr "" -"Diesen Patch-Block auf Index und Arbeitsverzeichnis anwenden [y,n,q,a," -"d%s,?]? " +"Diesen Patch-Block auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d" +"%s,?]? " msgid "" "y - apply this hunk to index and worktree\n" @@ -428,6 +428,23 @@ msgstr "" "a - diesen und alle weiteren Patch-Blöcke in der Datei anwenden\n" "d - diesen oder alle weiteren Patch-Blöcke in der Datei nicht anwenden\n" +#, c-format, perl-format +msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " +msgstr "Modusänderung auf Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? " + +#, c-format, perl-format +msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " +msgstr "Löschung auf Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? " + +#, c-format, perl-format +msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " +msgstr "Ergänzung auf Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? " + +#, c-format, perl-format +msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Diesen Patch-Block auf das Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? " + msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -445,10 +462,6 @@ msgstr "" msgid "could not parse hunk header '%.*s'" msgstr "Konnte Block-Header '%.*s' nicht parsen." -#, c-format -msgid "could not parse colored hunk header '%.*s'" -msgstr "Konnte farbigen Block-Header '%.*s' nicht parsen." - msgid "could not parse diff" msgstr "konnte Diff nicht parsen" @@ -506,7 +519,6 @@ msgstr "" "Um '%c' Zeilen zu entfernen, löschen Sie diese.\n" "Zeilen, die mit %c beginnen, werden entfernt.\n" -#. #-#-#-#-# git-add--interactive.perl.po #-#-#-#-# #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. msgid "" "If it does not apply cleanly, you will be given an opportunity to\n" @@ -524,14 +536,12 @@ msgstr "konnte Block-Header nicht parsen" msgid "'git apply --cached' failed" msgstr "'git apply --cached' schlug fehl" -#. #-#-#-#-# add-patch.c.po #-#-#-#-# #. TRANSLATORS: do not translate [y/n] #. The program will only accept that input at this point. #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. #. -#. #-#-#-#-# git-add--interactive.perl.po #-#-#-#-# #. TRANSLATORS: do not translate [y/n] #. The program will only accept that input #. at this point. @@ -750,6 +760,26 @@ msgstr "" "'advice.detachedHead' auf 'false' setzen.\n" "\n" +#, c-format +msgid "" +"The following paths have been moved outside the\n" +"sparse-checkout definition but are not sparse due to local\n" +"modifications.\n" +msgstr "" +"Die folgenden Pfade wurden aus der partiellen Checkout-Definition\n" +"verschoben, sind aber aufgrund lokaler Änderungen nicht partiell.\n" + +msgid "" +"To correct the sparsity of these paths, do the following:\n" +"* Use \"git add --sparse <paths>\" to update the index\n" +"* Use \"git sparse-checkout reapply\" to apply the sparsity rules" +msgstr "" +"Um den partiellen Checkout dieser Pfade zu korrigieren, gehen Sie wie folgt " +"vor:\n" +"* Verwenden Sie \"git add --sparse <Pfade>\", um den Index zu aktualisieren\n" +"* Verwenden Sie \"git sparse-checkout reapply\", um die Regeln für partielle " +"Checkouts anzuwenden" + msgid "cmdline ends with \\" msgstr "Befehlszeile endet mit \\" @@ -1272,6 +1302,10 @@ msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "Nicht unterstützter Dateimodus: 0%o (SHA1: %s)" #, c-format +msgid "deflate error (%d)" +msgstr "Fehler beim Komprimieren (%d)" + +#, c-format msgid "unable to start '%s' filter" msgstr "konnte '%s' Filter nicht starten" @@ -1291,10 +1325,6 @@ msgid "path too long (%d chars, SHA1: %s): %s" msgstr "Pfad zu lang (%d Zeichen, SHA1: %s): %s" #, c-format -msgid "deflate error (%d)" -msgstr "Fehler beim Komprimieren (%d)" - -#, c-format msgid "timestamp too large for this system: %<PRIuMAX>" msgstr "Timestamp zu groß für dieses System: %<PRIuMAX>" @@ -1618,12 +1648,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 @@ -1990,8 +2018,8 @@ msgstr "" #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "" -"Falls Sie diesen Patch auslassen möchten, führen Sie stattdessen \"%s --" -"skip\" aus." +"Falls Sie diesen Patch auslassen möchten, führen Sie stattdessen \"%s --skip" +"\" aus." #, c-format msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"." @@ -3108,8 +3136,12 @@ msgstr "libc Info: " msgid "not run from a git repository - no hooks to show\n" msgstr "nicht in einem Git-Repository ausgeführt - keine Hooks zum Anzeigen\n" -msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]" -msgstr "git bugreport [-o|--output-directory <Datei>] [-s|--suffix <Format>]" +msgid "" +"git bugreport [-o|--output-directory <file>] [-s|--suffix <format>] [--" +"diagnose[=<mode>]" +msgstr "" +"git bugreport [-o|--output-directory <Datei>] [-s|--suffix <Format>] [--" +"diagnose[=<Modus>]" msgid "" "Thank you for filling out a Git bug report!\n" @@ -3147,16 +3179,29 @@ msgstr "" "Bitte überprüfen Sie den restlichen Teil des Fehlerberichts unten.\n" "Sie können jede Zeile löschen, die Sie nicht mitteilen möchten.\n" -msgid "specify a destination for the bugreport file" -msgstr "Speicherort für die Datei des Fehlerberichts angeben" +msgid "mode" +msgstr "Modus" -msgid "specify a strftime format suffix for the filename" -msgstr "Dateiendung im strftime-Format für den Dateinamen angeben" +msgid "" +"create an additional zip archive of detailed diagnostics (default 'stats')" +msgstr "" +"ein zusätzliches Zip-Archiv mit detaillierten Diagnosen erstellen (Standard " +"'stats')" + +msgid "specify a destination for the bugreport file(s)" +msgstr "einen Zielort für die Fehlerberichtsdatei(en) angeben" + +msgid "specify a strftime format suffix for the filename(s)" +msgstr "ein Suffix im strftime-Format für den/die Dateinamen angeben" #, c-format msgid "could not create leading directories for '%s'" msgstr "konnte vorangehende Verzeichnisse für '%s' nicht erstellen" +#, c-format +msgid "unable to create diagnostics archive %s" +msgstr "Diagnosearchiv %s kann nicht erstellt werden" + msgid "System Info" msgstr "System Info" @@ -3215,10 +3260,6 @@ msgid "Unbundling objects" msgstr "Entpacken von Objekten" #, c-format -msgid "Unknown subcommand: %s" -msgstr "Unbekannter Unterbefehl: %s" - -#, c-format msgid "cannot read object %s '%s'" msgstr "kann Objekt %s '%s' nicht lesen" @@ -3296,6 +3337,9 @@ msgstr "Objektgröße anzeigen" msgid "allow -s and -t to work with broken/corrupt objects" msgstr "-s und -t mit beschädigten Objekten erlauben" +msgid "use mail map file" +msgstr "\"mailmap\"-Datei verwenden" + msgid "Batch objects requested on stdin (or --batch-all-objects)" msgstr "" "Batch-Objekte von Standard-Eingabe (oder --batch-all-objects) angefordert" @@ -3306,6 +3350,9 @@ msgstr "vollständige Inhalte von <Objekt> oder <Commit> anzeigen" msgid "like --batch, but don't emit <contents>" msgstr "wie --batch, aber keine Ausgabe von <Inhalten>" +msgid "stdin is NUL-terminated" +msgstr "stdin endet mit NUL" + msgid "read commands from stdin" msgstr "Befehle von der Standard-Eingabe lesen" @@ -4198,6 +4245,14 @@ msgstr "" "Initialisiere Datei für partiellen Checkout, um nur Dateien im\n" "Root-Verzeichnis einzubeziehen" +msgid "uri" +msgstr "uri" + +msgid "a URI for downloading bundles before fetching from origin remote" +msgstr "" +"eine URI für das Herunterladen von Bundles vor dem Abruf\n" +"aus dem ursprünglichen Remote-Repository" + #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: Konnte Alternative für '%s' nicht hinzufügen: %s\n" @@ -4257,10 +4312,10 @@ msgstr "kann %s nicht aktualisieren" msgid "failed to initialize sparse-checkout" msgstr "Fehler beim Initialisieren vom partiellen Checkout." -msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" +msgid "remote HEAD refers to nonexistent ref, unable to checkout" msgstr "" -"Externer HEAD bezieht sich auf eine nicht existierende Referenz und kann " -"nicht ausgecheckt werden.\n" +"HEAD des Remote-Repositories verweist auf nicht existierende Referenz, kann " +"nicht ausgecheckt werden" msgid "unable to checkout working tree" msgstr "Arbeitsverzeichnis konnte nicht ausgecheckt werden" @@ -4284,6 +4339,13 @@ msgstr "Sie müssen ein Repository zum Klonen angeben." msgid "options '%s' and '%s %s' cannot be used together" msgstr "die Optionen '%s' und '%s %s' können nicht gemeinsam verwendet werden" +msgid "" +"--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-" +"exclude" +msgstr "" +"--bundle-uri ist inkompatibel mit --depth, --shallow-since und --shallow-" +"exclude" + #, c-format msgid "repository '%s' does not exist" msgstr "Repository '%s' existiert nicht" @@ -4368,6 +4430,13 @@ msgstr "--local wird ignoriert" msgid "cannot clone from filtered bundle" msgstr "kann nicht von gefiltertem Bundle klonen" +msgid "failed to initialize the repo, skipping bundle URI" +msgstr "konnte das Repository nicht initialisieren, überspringe Bundle-URI" + +#, c-format +msgid "failed to fetch objects from bundle URI '%s'" +msgstr "Objekte aus Bundle-URI '%s' konnten nicht abgerufen werden" + msgid "remote transport reported error" msgstr "Remoteübertragung meldete Fehler" @@ -4489,10 +4558,6 @@ msgstr "" msgid "Collecting commits from input" msgstr "Sammle Commits von der Standard-Eingabe" -#, c-format -msgid "unrecognized subcommand: %s" -msgstr "Nicht erkannter Unterbefehl: %s" - msgid "" "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " "<file>)...] <tree>" @@ -4856,9 +4921,6 @@ msgstr "Status im Langformat anzeigen (Standard)" msgid "terminate entries with NUL" msgstr "Einträge mit NUL-Zeichen abschließen" -msgid "mode" -msgstr "Modus" - msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "unversionierte Dateien anzeigen, optionale Modi: all, normal, no. (Standard: " @@ -5449,8 +5511,8 @@ msgstr "Markierung" msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "" -"<Markierung> bei geändertem Arbeitsverzeichnis anhängen (Standard: \"-" -"dirty\")" +"<Markierung> bei geändertem Arbeitsverzeichnis anhängen (Standard: \"-dirty" +"\")" msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "" @@ -5463,6 +5525,22 @@ msgstr "Keine Namen gefunden, kann nichts beschreiben." msgid "option '%s' and commit-ishes cannot be used together" msgstr "Option '%s' und Commit-Angaben können nicht gemeinsam verwendet werden" +msgid "" +"git diagnose [-o|--output-directory <path>] [-s|--suffix <format>] [--" +"mode=<mode>]" +msgstr "" +"git diagnose [-o|--output-directory <Pfad>] [-s|--suffix <Format>] [--" +"mode=<Modus>]" + +msgid "specify a destination for the diagnostics archive" +msgstr "einen Zielort für das Diagnosearchiv angeben" + +msgid "specify a strftime format suffix for the filename" +msgstr "Dateiendung im strftime-Format für den Dateinamen angeben" + +msgid "specify the content of the diagnostic archive" +msgstr "den Inhalt des Diagnosearchivs angeben" + msgid "--merge-base only works with two commits" msgstr "--merge-base funktioniert nur mit zwei Commits" @@ -5597,13 +5675,13 @@ msgstr "Ausgaben unterdrücken; nur git_env_*() Werte als Exit-Code verwenden" #, c-format msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" msgstr "" -"Option `--default' erwartet einen booleschen Wert bei `--type=bool`, nicht " -"`%s`" +"Option `--default' erwartet einen booleschen Wert bei `--type=bool`, nicht `" +"%s`" #, c-format msgid "" -"option `--default' expects an unsigned long value with `--type=ulong`, not " -"`%s`" +"option `--default' expects an unsigned long value with `--type=ulong`, not `" +"%s`" msgstr "" "Option `--default' erwartet einen vorzeichenlosen Long-Wert bei `--" "type=ulong`, nicht `%s`" @@ -5851,11 +5929,8 @@ msgstr "[aktuell]" msgid "[rejected]" msgstr "[zurückgewiesen]" -msgid "can't fetch in current branch" -msgstr "kann \"fetch\" im aktuellen Branch nicht ausführen" - -msgid "checked out in another worktree" -msgstr "in einem anderen Arbeitsverzeichnis ausgecheckt" +msgid "can't fetch into checked-out branch" +msgstr "fetch kann in den ausgecheckten Branch nicht durchgeführt werden" msgid "[tag update]" msgstr "[Tag Aktualisierung]" @@ -6299,6 +6374,10 @@ msgstr "%s: Ungültiger SHA1-Zeiger in Cache-Verzeichnis" msgid "non-tree in cache-tree" msgstr "non-tree in Cache-Verzeichnis" +#, c-format +msgid "%s: invalid sha1 pointer in resolve-undo" +msgstr "%s: Ungültiger sha1-Zeiger in resolve-undo" + msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<Optionen>] [<Objekt>...]" @@ -6639,14 +6718,17 @@ msgstr "" "Fehler beim Ausführen von 'crontab -l'; Ihr System unterstützt eventuell " "'cron' nicht" +msgid "failed to create crontab temporary file" +msgstr "temporäre crontab Datei konnte nicht erstellt werden" + +msgid "failed to open temporary file" +msgstr "temporäre Datei kann nicht geöffnet werden" + msgid "failed to run 'crontab'; your system might not support 'cron'" msgstr "" "Fehler beim Ausführen von 'crontab'; Ihr System unterstützt eventuell 'cron' " "nicht" -msgid "failed to open stdin of 'crontab'" -msgstr "Fehler beim Öffnen der Standard-Eingabe von 'crontab'" - msgid "'crontab' died" msgstr "'crontab' abgebrochen" @@ -6693,10 +6775,6 @@ msgstr "Repository konnte nicht zur globalen Konfiguration hinzugefügt werden" msgid "git maintenance <subcommand> [<options>]" msgstr "git maintenance <Unterbefehl> [<Optionen>]" -#, c-format -msgid "invalid subcommand: %s" -msgstr "ungültiger Unterbefehl: %s" - msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<Optionen>] [-e] <Muster> [<Commit>...] [[--] <Pfad>...]" @@ -6708,7 +6786,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 @@ -6871,6 +6948,9 @@ msgstr "Dateien mit Übereinstimmungen im Anzeigeprogramm anzeigen" msgid "allow calling of grep(1) (ignored by this build)" msgstr "den Aufruf von grep(1) erlauben (von dieser Programmversion ignoriert)" +msgid "maximum number of results per file" +msgstr "maximale Anzahl von Ergebnissen pro Datei" + msgid "no pattern given" msgstr "Kein Muster angegeben." @@ -6962,11 +7042,21 @@ msgstr "Beschreibung des Befehls ausgeben" msgid "print list of useful guides" msgstr "Liste von allgemein verwendeten Anleitungen anzeigen" +msgid "print list of user-facing repository, command and file interfaces" +msgstr "" +"Liste der benutzerseitigen Repository-, Befehls- und Dateischnittstellen " +"ausgeben" + +msgid "print list of file formats, protocols and other developer interfaces" +msgstr "" +"Liste von Dateiformaten, Protokollen und anderen Entwicklerschnittstellen " +"ausgeben" + msgid "print all configuration variable names" msgstr "alle Namen der Konfigurationsvariablen ausgeben" -msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]" -msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<Befehl>]" +msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>|<doc>]" +msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<Befehl>|<Dokument>]" #, c-format msgid "unrecognized help format '%s'" @@ -7438,8 +7528,8 @@ msgstr "Ausgabe der Unterschiede unterdrücken" msgid "show source" msgstr "Quelle anzeigen" -msgid "use mail map file" -msgstr "\"mailmap\"-Datei verwenden" +msgid "clear all previously-defined decoration filters" +msgstr "alle zuvor definierten Dekorationsfilter löschen" msgid "only decorate refs that match <pattern>" msgstr "\"decorate\" nur bei Referenzen anwenden, die <Muster> entsprechen" @@ -7698,6 +7788,11 @@ msgstr "" msgid "percentage by which creation is weighted" msgstr "Prozentsatz mit welchem Erzeugung gewichtet wird" +msgid "show in-body From: even if identical to the e-mail header" +msgstr "" +"From: aus E-Mail Text anzeigen, auch wenn es mit der Kopfzeile der E-Mail " +"identisch ist" + #, c-format msgid "invalid ident line: %s" msgstr "Ungültige Identifikationszeile: %s" @@ -7758,6 +7853,18 @@ msgstr "" "Konnte gefolgten Remote-Branch nicht finden, bitte geben Sie <Upstream> " "manuell an.\n" +#, c-format +msgid "bad ls-files format: element '%s' does not start with '('" +msgstr "ungültiges ls-files-Format: Element '%s' fängt nicht mit '(' an" + +#, c-format +msgid "bad ls-files format: element '%s' does not end in ')'" +msgstr "ungültiges ls-files-Format: Element '%s' endet nicht auf ')'" + +#, c-format +msgid "bad ls-files format: %%%.*s" +msgstr "ungültiges ls-files-Format: %%%.*s" + msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<Optionen>] [<Datei>...]" @@ -7848,6 +7955,13 @@ msgid "show sparse directories in the presence of a sparse index" msgstr "zeige partielle Verzeichnisse, wenn ein partieller Index vorhanden ist" msgid "" +"--format cannot be used with -s, -o, -k, -t, --resolve-undo, --deduplicate, " +"--eol" +msgstr "" +"--format kann nicht mit -s, -o, -k, -t, --resolve-undo, --deduplicate, --eol " +"verwendet werden" + +msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" " [-q | --quiet] [--exit-code] [--get-url]\n" " [--symref] [<repository> [<refs>...]]" @@ -8070,6 +8184,40 @@ msgstr "Konnte Referenz '%s' nicht auflösen" msgid "Merging %s with %s\n" msgstr "Führe %s mit %s zusammen\n" +msgid "not something we can merge" +msgstr "nichts was wir zusammenführen können" + +msgid "refusing to merge unrelated histories" +msgstr "verweigere den Merge von nicht zusammenhängenden Historien" + +msgid "failure to merge" +msgstr "Fehler beim Merge" + +msgid "git merge-tree [--write-tree] [<options>] <branch1> <branch2>" +msgstr "git merge-tree [--write-tree] [<Optionen>] <Branch1> <Branch2>" + +msgid "git merge-tree [--trivial-merge] <base-tree> <branch1> <branch2>" +msgstr "" +"git merge-tree [--trivial-merge] <Basis-Tree-Objekt> <Branch1> <Branch2>" + +msgid "do a real merge instead of a trivial merge" +msgstr "einen echten Merge anstelle eines trivialen Merge durchführen" + +msgid "do a trivial merge only" +msgstr "nur einen trivialen Merge durchführen" + +msgid "also show informational/conflict messages" +msgstr "auch Informations-/Konfliktmeldungen anzeigen" + +msgid "list filenames without modes/oids/stages" +msgstr "Dateinamen ohne Modi/Oids/Stufen auflisten" + +msgid "allow merging unrelated histories" +msgstr "erlaube das Zusammenführen von nicht zusammenhängenden Historien" + +msgid "--trivial-merge is incompatible with all other options" +msgstr "--trivial-merge ist mit allen anderen Optionen inkompatibel" + msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<Optionen>] [<Commit>...]" @@ -8152,9 +8300,6 @@ msgstr "--abort, aber Index und Arbeitsverzeichnis unverändert lassen" msgid "continue the current in-progress merge" msgstr "den sich im Gange befindlichen Merge fortsetzen" -msgid "allow merging unrelated histories" -msgstr "erlaube das Zusammenführen von nicht zusammenhängenden Historien" - msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "Hooks pre-merge-commit und commit-msg umgehen" @@ -8277,9 +8422,6 @@ msgstr "Konnte '%s' nicht schließen." msgid "not something we can merge in %s: %s" msgstr "nichts was wir in %s zusammenführen können: %s" -msgid "not something we can merge" -msgstr "nichts was wir zusammenführen können" - msgid "--abort expects no arguments" msgstr "--abort akzeptiert keine Argumente" @@ -8331,14 +8473,20 @@ msgstr "%s - nichts was wir zusammenführen können" msgid "Can merge only exactly one commit into empty head" msgstr "Kann nur exakt einen Commit in einem leeren Branch zusammenführen" -msgid "refusing to merge unrelated histories" -msgstr "verweigere den Merge von nicht zusammenhängenden Historien" - #, c-format msgid "Updating %s..%s\n" msgstr "Aktualisiere %s..%s\n" #, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" +"Ihre lokalen Änderungen in den folgenden Dateien würden durch den Merge\n" +"überschrieben werden:\n" +" %s" + +#, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Probiere wirklich trivialen \"in-index\"-Merge...\n" @@ -8372,6 +8520,12 @@ msgstr "" "Automatischer Merge abgeschlossen; halte, wie gewünscht, vor dem Commit an\n" #, c-format +msgid "When finished, apply stashed changes with `git stash pop`\n" +msgstr "" +"Wenn Sie fertig sind, wenden Sie die Änderungen aus dem Stash mit `git stash " +"pop` an\n" + +#, c-format msgid "warning: tag input does not pass fsck: %s" msgstr "Warnung: Tag-Eingabe ungültig für fsck: %s" @@ -8493,6 +8647,9 @@ msgstr "Prüfe Umbenennung von '%s' nach '%s'\n" msgid "bad source" msgstr "ungültige Quelle" +msgid "destination exists" +msgstr "Ziel existiert bereits" + msgid "can not move directory into itself" msgstr "kann Verzeichnis nicht in sich selbst verschieben" @@ -8508,9 +8665,6 @@ msgstr "nicht unter Versionskontrolle" msgid "conflicted" msgstr "in Konflikt" -msgid "destination exists" -msgstr "Ziel existiert bereits" - #, c-format msgid "overwriting '%s'" msgstr "überschreibe '%s'" @@ -8524,6 +8678,9 @@ msgstr "mehrere Quellen für dasselbe Ziel" msgid "destination directory does not exist" msgstr "Zielverzeichnis existiert nicht" +msgid "destination exists in the index" +msgstr "Ziel existiert im Index" + #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, Quelle=%s, Ziel=%s" @@ -8889,8 +9046,8 @@ msgid "use notes from <notes-ref>" msgstr "Notizen von <Notiz-Referenz> verwenden" #, c-format -msgid "unknown subcommand: %s" -msgstr "Unbekannter Unterbefehl: %s" +msgid "unknown subcommand: `%s'" +msgstr "unbekannter Unterbefehl: `%s'" msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" @@ -9826,11 +9983,16 @@ msgid "only emit output related to the second range" msgstr "nur Ausgaben anzeigen, die sich auf den zweiten Bereich beziehen" #, c-format +msgid "not a revision: '%s'" +msgstr "kein Commit: '%s'" + +#, c-format msgid "not a commit range: '%s'" msgstr "kein Commit-Bereich: '%s'" -msgid "single arg format must be symmetric range" -msgstr "Format mit einfachem Argument muss symmetrischer Bereich sein." +#, c-format +msgid "not a symmetric range: '%s'" +msgstr "kein symmetrischer Bereich: '%s'" msgid "need two commit ranges" msgstr "Benötige zwei Commit-Bereiche." @@ -9988,8 +10150,8 @@ msgstr "Konnte nicht zu %s wechseln." #, c-format msgid "" -"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and " -"\"ask\"." +"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" +"\"." msgstr "" "nicht erkannter leerer Typ '%s'; gültige Werte sind \"drop\", \"keep\", und " "\"ask\"." @@ -10112,6 +10274,10 @@ msgstr "behalte Commits, die leer beginnen" msgid "move commits that begin with squash!/fixup! under -i" msgstr "bei -i Commits verschieben, die mit squash!/fixup! beginnen" +msgid "update branches that point to commits that are being rebased" +msgstr "" +"Branches aktualisieren, die auf Commits verweisen, die gerade rebased werden" + msgid "add exec lines after each commit of the editable list" msgstr "exec-Zeilen nach jedem Commit der editierbaren Liste hinzufügen" @@ -10654,6 +10820,9 @@ msgstr " neu (wird bei nächstem \"fetch\" in remotes/%s gespeichert)" msgid " tracked" msgstr " gefolgt" +msgid " skipped" +msgstr " übersprungen" + msgid " stale (use 'git remote prune' to remove)" msgstr " veraltet (benutzen Sie 'git remote prune' zum Löschen)" @@ -11335,6 +11504,10 @@ msgstr "Konnte neue Index-Datei nicht schreiben." msgid "unable to get disk usage of %s" msgstr "konnte Festplattennutzung von %s nicht bekommen" +#, c-format +msgid "invalid value for '%s': '%s', the only allowed format is '%s'" +msgstr "ungültiger Wert für '%s': '%s', das einzig zulässige Format ist '%s'" + msgid "rev-list does not support display of notes" msgstr "rev-list unterstützt keine Anzeige von Notizen" @@ -11361,6 +11534,9 @@ msgstr "frühzeitiges Ende der Eingabe" msgid "no usage string given before the `--' separator" msgstr "kein Verwendungstext vor dem `--' Separator angegeben" +msgid "missing opt-spec before option flags" +msgstr "fehlende opt-spec vor Optionsflags" + msgid "Needed a single revision" msgstr "Benötigte einen einzelnen Commit" @@ -12148,6 +12324,10 @@ msgid "Expecting a full ref name, got %s" msgstr "Vollständiger Referenzname erwartet, %s erhalten" #, c-format +msgid "could not get a repository handle for submodule '%s'" +msgstr "Konnte kein Repository-Handle für Submodul '%s' erhalten." + +#, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " "authoritative upstream." @@ -12155,12 +12335,6 @@ msgstr "" "Konnte Konfiguration '%s' nicht nachschlagen. Nehme an, dass dieses\n" "Repository sein eigenes verbindliches Upstream-Repository ist." -msgid "alternative anchor for relative paths" -msgstr "Alternativer Anker für relative Pfade" - -msgid "git submodule--helper list [--prefix=<path>] [<path>...]" -msgstr "git submodule--helper list [--prefix=<Pfad>] [<Pfad>...]" - #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "Keine URL für Submodul-Pfad '%s' in .gitmodules gefunden" @@ -12194,8 +12368,8 @@ msgstr "Ausgaben beim Betreten eines Submodul-Befehls unterdrücken" msgid "recurse into nested submodules" msgstr "Rekursion in verschachtelte Submodule durchführen" -msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" -msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <Befehl>" +msgid "git submodule foreach [--quiet] [--recursive] [--] <command>" +msgstr "git submodule foreach [--quiet] [--recursive] [--] <Befehl>" #, c-format msgid "Failed to register url for submodule path '%s'" @@ -12219,8 +12393,8 @@ msgstr "" msgid "suppress output for initializing a submodule" msgstr "Ausgaben bei Initialisierung eines Submoduls unterdrücken" -msgid "git submodule--helper init [<options>] [<path>]" -msgstr "git submodule--helper init [<Optionen>] [<Pfad>]" +msgid "git submodule init [<options>] [<path>]" +msgstr "git submodule init [<Optionen>] [<Pfad>]" #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" @@ -12246,9 +12420,6 @@ msgstr "" msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<Pfad>...]" -msgid "git submodule--helper name <path>" -msgstr "git submodule--helper name <Pfad>" - #, c-format msgid "* %s %s(blob)->%s(submodule)" msgstr "* %s %s(blob)->%s(submodule)" @@ -12283,8 +12454,8 @@ msgstr "" msgid "limit the summary size" msgstr "Größe der Zusammenfassung begrenzen" -msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" -msgstr "git submodule--helper summary [<Optionen>] [<Commit>] [--] [<Pfad>]" +msgid "git submodule summary [<options>] [<commit>] [--] [<path>]" +msgstr "git submodule summary [<Optionen>] [<Commit>] [--] [<Pfad>]" msgid "could not fetch a revision for HEAD" msgstr "konnte keinen Commit für HEAD holen" @@ -12298,18 +12469,14 @@ msgid "failed to register url for submodule path '%s'" msgstr "Fehler beim Registrieren der URL für Submodul-Pfad '%s'" #, c-format -msgid "failed to get the default remote for submodule '%s'" -msgstr "Fehler beim Lesen des Standard-Remote-Repositories für Submodul '%s'" - -#, c-format msgid "failed to update remote for submodule '%s'" msgstr "Fehler beim Aktualisieren des Remote-Repositories für Submodul '%s'" msgid "suppress output of synchronizing submodule url" msgstr "Ausgaben bei der Synchronisierung der Submodul-URLs unterdrücken" -msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" -msgstr "git submodule--helper sync [--quiet] [--recursive] [<Pfad>]" +msgid "git submodule sync [--quiet] [--recursive] [<path>]" +msgstr "git submodule sync [--quiet] [--recursive] [<Pfad>]" #, c-format msgid "" @@ -12374,6 +12541,10 @@ msgstr "" "'--reference-if-able' statt '--reference'." #, c-format +msgid "could not get a repository handle for gitdir '%s'" +msgstr "konnte kein Repository-Handle für gitdir '%s' erhalten" + +#, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "Submodul '%s' kann Alternative nicht hinzufügen: %s" @@ -12403,6 +12574,9 @@ msgstr "Verzeichnis ist nicht leer: '%s'" msgid "could not get submodule directory for '%s'" msgstr "Konnte Submodul-Verzeichnis '%s' nicht finden." +msgid "alternative anchor for relative paths" +msgstr "Alternativer Anker für relative Pfade" + msgid "where the new submodule will be cloned to" msgstr "Pfad für neues Submodul" @@ -12431,10 +12605,6 @@ msgstr "" "<filter-spec>] --url <URL> --path <Pfad>" #, c-format -msgid "Invalid update mode '%s' for submodule path '%s'" -msgstr "Ungültiger Aktualisierungsmodus '%s' für Submodul-Pfad '%s'." - -#, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "" "Ungültiger Aktualisierungsmodus '%s' für Submodul-Pfad '%s' konfiguriert." @@ -12509,6 +12679,10 @@ msgstr "" "Anfordern dieses Commits ist fehlgeschlagen." #, c-format +msgid "could not initialize submodule at path '%s'" +msgstr "konnte das Submodul unter dem Pfad '%s' nicht initialisieren" + +#, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " "the superproject is not on any branch" @@ -12517,10 +12691,6 @@ msgstr "" "zu erben, aber das Hauptprojekt befindet sich auf keinem Branch." #, c-format -msgid "could not get a repository handle for submodule '%s'" -msgstr "Konnte kein Repository-Handle für Submodul '%s' erhalten." - -#, c-format msgid "Unable to find current revision in submodule path '%s'" msgstr "Konnte aktuellen Commit nicht in Submodul-Pfad '%s' finden" @@ -12554,12 +12724,14 @@ msgstr "keine neuen Objekte von Remote abrufen" msgid "path into the working tree" msgstr "Pfad zum Arbeitsverzeichnis" -msgid "path into the working tree, across nested submodule boundaries" -msgstr "" -"Pfad zum Arbeitsverzeichnis, über verschachtelte Submodul-Grenzen hinweg" +msgid "use the 'checkout' update strategy (default)" +msgstr "die Aktualisierungsstrategie \"checkout\" verwenden (Standard)" + +msgid "use the 'merge' update strategy" +msgstr "die Aktualisierungsstrategie 'merge' verwenden" -msgid "rebase, merge, checkout or none" -msgstr "rebase, merge, checkout oder none" +msgid "use the 'rebase' update strategy" +msgstr "die Aktualisierungsstrategie 'rebase' verwenden" msgid "create a shallow clone truncated to the specified number of revisions" msgstr "" @@ -12577,6 +12749,10 @@ msgstr "" msgid "don't print cloning progress" msgstr "keine Fortschrittsanzeige beim Klonen" +msgid "disallow cloning into non-empty directory, implies --init" +msgstr "" +"klonen in ein nicht leeres Verzeichnis nicht zulassen, impliziert --init" + msgid "" "git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] " "[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-" @@ -12588,14 +12764,11 @@ msgstr "" "shallow] [--reference <Repository>] [--recursive] [--[no-]single-branch] " "[--] [<Pfad>...]" -msgid "bad value for update parameter" -msgstr "Fehlerhafter Wert für update Parameter" - msgid "recurse into submodules" msgstr "Rekursion in Submodule durchführen" -msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" -msgstr "git submodule--helper absorb-git-dirs [<Optionen>] [<Pfad>...]" +msgid "git submodule absorbgitdirs [<options>] [<path>...]" +msgstr "git submodule absorbgitdirs [<Optionen>] [<Pfad>...]" msgid "check if it is safe to write to the .gitmodules file" msgstr "prüfen, ob es sicher ist, in die Datei .gitmodules zu schreiben" @@ -12617,8 +12790,8 @@ msgstr "" msgid "suppress output for setting url of a submodule" msgstr "Ausgaben beim Setzen der URL eines Submoduls unterdrücken" -msgid "git submodule--helper set-url [--quiet] <path> <newurl>" -msgstr "git submodule--helper set-url [--quiet] <Pfad> <neue URL>" +msgid "git submodule set-url [--quiet] <path> <newurl>" +msgstr "git submodule set-url [--quiet] <Pfad> <neue URL>" msgid "set the default tracking branch to master" msgstr "Standard-Tracking-Branch auf master setzen" @@ -12626,13 +12799,11 @@ msgstr "Standard-Tracking-Branch auf master setzen" msgid "set the default tracking branch" msgstr "Standard-Tracking-Branch setzen" -msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" -msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) [<Pfad>]" +msgid "git submodule set-branch [-q|--quiet] (-d|--default) <path>" +msgstr "git submodule set-branch [-q|--quiet] (-d|--default) <Pfad>" -msgid "" -"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" -msgstr "" -"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <Branch> <Pfad>" +msgid "git submodule set-branch [-q|--quiet] (-b|--branch) <branch> <path>" +msgstr "git submodule set-branch [-q|--quiet] (-b|--branch) <Branch> <Pfad>" msgid "--branch or --default required" msgstr "Option --branch oder --default erforderlich" @@ -12732,8 +12903,8 @@ msgstr "" "setzt den Namen des Submoduls auf die angegebene Zeichenkette fest, statt " "standardmäßig dessen Pfad zu nehmen" -msgid "git submodule--helper add [<options>] [--] <repository> [<path>]" -msgstr "git submodule--helper add [<Optionen>] [--] <Repository> [<Pfad>]" +msgid "git submodule add [<options>] [--] <repository> [<path>]" +msgstr "git submodule add [<Optionen>] [--] <Repository> [<Pfad>]" msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" @@ -12942,6 +13113,16 @@ msgstr "Tag '%s' aktualisiert (war %s)\n" msgid "pack exceeds maximum allowed size" msgstr "Paket überschreitet die maximal erlaubte Größe" +msgid "failed to write object in stream" +msgstr "Objekt kann nicht in Stream geschrieben werden" + +#, c-format +msgid "inflate returned (%d)" +msgstr "Dekomprimierung gab (%d) zurück" + +msgid "invalid blob object from stream" +msgstr "ungültiges Blob-Objekt aus Stream" + msgid "Unpacking objects" msgstr "Entpacke Objekte" @@ -13497,6 +13678,27 @@ msgstr "das Tree-Objekt für ein Unterverzeichnis <Präfix> schreiben" msgid "only useful for debugging" msgstr "nur nützlich für Fehlersuche" +msgid "core.fsyncMethod = batch is unsupported on this platform" +msgstr "core.fsyncMethod = batch wird auf dieser Plattform nicht unterstützt" + +msgid "failed to create temporary file" +msgstr "temporäre Datei kann nicht erstellt werden" + +msgid "insufficient capabilities" +msgstr "unzureichende Fähigkeiten" + +#, c-format +msgid "failed to download bundle from URI '%s'" +msgstr "Download des Bundles von URI '%s' fehlgeschlagen" + +#, c-format +msgid "file at URI '%s' is not a bundle" +msgstr "Datei unter URI '%s' ist kein Bundle" + +#, c-format +msgid "failed to unbundle bundle from URI '%s'" +msgstr "Bundle von URI '%s' konnte nicht entpackt werden" + #, c-format msgid "unrecognized bundle hash algorithm: %s" msgstr "unbekannter Paket-Hash-Algorithmus: %s" @@ -13709,6 +13911,9 @@ msgstr "" "einem Objekt einen für Menschen lesbaren Namen basierend auf\n" "einer verfügbaren Referenz geben" +msgid "Generate a zip archive of diagnostic information" +msgstr "Erzeugen eines Zip-Archivs mit Diagnoseinformationen" + msgid "Show changes between commits, commit and working tree, etc" msgstr "" "Änderungen zwischen Commits, Commit und Arbeitsverzeichnis, etc. anzeigen" @@ -13846,8 +14051,8 @@ msgstr "einen Merge für zusammenzuführende Dateien ausführen" msgid "The standard helper program to use with git-merge-index" msgstr "das Standard-Hilfsprogramm für die Verwendung mit git-merge-index" -msgid "Show three-way merge without touching index" -msgstr "3-Wege-Merge anzeigen ohne den Index zu verändern" +msgid "Perform merge without touching index or working tree" +msgstr "Merge ohne Berührung von Index oder Arbeitsverzeichnis durchführen" msgid "Run merge conflict resolution tools to resolve merge conflicts" msgstr "" @@ -14053,6 +14258,9 @@ msgstr "gepackte Git-Archivdateien validieren" msgid "Check the GPG signature of tags" msgstr "die GPG-Signatur von Tags prüfen" +msgid "Display version information about Git" +msgstr "Versionsinformationen über Git anzeigen" + msgid "Show logs with difference each commit introduces" msgstr "Logs mit dem Unterschied, den jeder Commit einführt, anzeigen" @@ -14087,6 +14295,24 @@ msgstr "" msgid "Frequently asked questions about using Git" msgstr "Häufig gestellte Fragen über die Nutzung von Git" +msgid "The bundle file format" +msgstr "Das Bundle-Dateiformat" + +msgid "Chunk-based file formats" +msgstr "Chunk-basierte Dateiformate" + +msgid "Git commit graph format" +msgstr "Git Commit Graph Format" + +msgid "Git index format" +msgstr "Git-Index-Format" + +msgid "Git pack format" +msgstr "Git-Pack-Format" + +msgid "Git cryptographic signature formats" +msgstr "Git kryptographische Signaturformate" + msgid "A Git Glossary" msgstr "ein Git-Glossar" @@ -14108,6 +14334,21 @@ msgstr "Definition von Submodul-Eigenschaften" msgid "Git namespaces" msgstr "Git Namensbereiche" +msgid "Protocol v0 and v1 capabilities" +msgstr "Fähigkeiten des Protokolls v0 und v1" + +msgid "Things common to various protocols" +msgstr "Gemeinsamkeiten zwischen verschiedenen Protokollen" + +msgid "Git HTTP-based protocols" +msgstr "Git HTTP-basierte Protokolle" + +msgid "How packs are transferred over-the-wire" +msgstr "Wie Pakete über die Leitung übertragen werden" + +msgid "Git Wire Protocol, Version 2" +msgstr "Git Wire Protokoll, Version 2" + msgid "Helper programs to interact with remote repositories" msgstr "Hilfsprogramme zur Interaktion mit Remote-Repositories" @@ -14132,6 +14373,9 @@ msgstr "Git Web Interface (Web-Frontend für Git-Repositories)" msgid "An overview of recommended workflows with Git" msgstr "Eine Übersicht über empfohlene Arbeitsabläufe mit Git" +msgid "A tool for managing large Git repositories" +msgstr "Ein Werkzeug zur Verwaltung großer Git-Repositories" + msgid "commit-graph file is too small" msgstr "Commit-Graph-Datei ist zu klein" @@ -14378,6 +14622,14 @@ msgid "no libc information available\n" msgstr "keine libc Informationen verfügbar\n" #, c-format +msgid "could not determine free disk size for '%s'" +msgstr "konnte freien Speicherplatz für '%s' nicht bestimmen" + +#, c-format +msgid "could not get info for '%s'" +msgstr "konnte keine Info für '%s' bekommen" + +#, c-format msgid "[GLE %ld] health thread could not open '%ls'" msgstr "[GLE %ld] health Thread konnte '%ls' nicht öffnen" @@ -14432,6 +14684,14 @@ msgid "could not read directory changes [GLE %ld]" msgstr "konnte Verzeichnisveränderungen nicht lesen [GLE %ld]" #, c-format +msgid "[GLE %ld] unable to open for read '%ls'" +msgstr "[GLE %ld] '%ls' kann nicht zum Lesen geöffnet werden" + +#, c-format +msgid "[GLE %ld] unable to get protocol information for '%ls'" +msgstr "[GLE %ld] kann keine Protokollinformationen für '%ls' erhalten" + +#, c-format msgid "failed to copy SID (%ld)" msgstr "Fehler beim Kopieren von SID (%ld)" @@ -14990,182 +15250,6 @@ msgid "failed to close rev-list's stdin" msgstr "Fehler beim Schließen von rev-lists Standard-Eingabe" #, c-format -msgid "'%s' does not exist" -msgstr "'%s' existiert nicht." - -msgid "need a working directory" -msgstr "Arbeitsverzeichnis benötigt" - -msgid "could not find enlistment root" -msgstr "konnte Root-Verzeichnis für Eintragungen nicht finden" - -#, c-format -msgid "could not switch to '%s'" -msgstr "konnte nicht zu '%s' wechseln" - -#, c-format -msgid "could not configure %s=%s" -msgstr "konnte %s=%s nicht konfigurieren" - -msgid "could not configure log.excludeDecoration" -msgstr "konnte log.excludeDecoration nicht konfigurieren" - -msgid "Scalar enlistments require a worktree" -msgstr "Skalare Eintragungen erfordern ein Arbeitsverzeichnis" - -#, c-format -msgid "could not open directory '%s'" -msgstr "konnte Verzeichnis '%s' nicht öffnen" - -#, c-format -msgid "skipping '%s', which is neither file nor directory" -msgstr "überspringe '%s', das weder Datei noch Verzeichnis ist" - -#, c-format -msgid "could not determine free disk size for '%s'" -msgstr "konnte freien Speicherplatz für '%s' nicht bestimmen" - -#, c-format -msgid "could not get info for '%s'" -msgstr "konnte keine Info für '%s' bekommen" - -#, c-format -msgid "remote HEAD is not a branch: '%.*s'" -msgstr "externer HEAD ist kein Branch: '%.*s'" - -msgid "failed to get default branch name from remote; using local default" -msgstr "" -"Fehler beim Abfragen des Standard-Branchnamens vom Remote-Repository; nutze " -"lokalen Standardwert" - -msgid "failed to get default branch name" -msgstr "Fehler beim Abfragen des Standard-Branchnamens" - -msgid "failed to unregister repository" -msgstr "Fehler beim Austragen des Repositories" - -msgid "failed to delete enlistment directory" -msgstr "Fehler beim Löschen des Eintragungs-Verzeichnisses" - -msgid "branch to checkout after clone" -msgstr "Branch, der nach dem Klonen ausgecheckt werden soll" - -msgid "when cloning, create full working directory" -msgstr "vollständiges Arbeitsverzeichnis beim Klonen erstellen" - -msgid "only download metadata for the branch that will be checked out" -msgstr "lade nur Metadaten des Branches herunter, der ausgecheckt wird" - -msgid "scalar clone [<options>] [--] <repo> [<dir>]" -msgstr "scalar clone [<Optionen>] [--] <Repository> [<Verzeichnis>]" - -#, c-format -msgid "cannot deduce worktree name from '%s'" -msgstr "konnte Name für Arbeitsverzeichnis nicht von '%s' ableiten" - -#, c-format -msgid "directory '%s' exists already" -msgstr "Verzeichnis '%s' existiert bereits" - -#, c-format -msgid "failed to get default branch for '%s'" -msgstr "Fehler beim Abfragen des Default-Branches für '%s'" - -#, c-format -msgid "could not configure remote in '%s'" -msgstr "konnte Remote-Repository in '%s' nicht konfigurieren" - -#, c-format -msgid "could not configure '%s'" -msgstr "konnte '%s' nicht konfigurieren" - -msgid "partial clone failed; attempting full clone" -msgstr "partielles Klonen fehlgeschlagen; versuche vollständiges Klonen" - -msgid "could not configure for full clone" -msgstr "konnte nicht für vollständiges Klonen konfigurieren" - -msgid "scalar diagnose [<enlistment>]" -msgstr "scalar diagnose [<Eintragung>]" - -#, c-format -msgid "could not create directory for '%s'" -msgstr "konnte Verzeichnis für '%s' nicht erstellen" - -msgid "could not duplicate stdout" -msgstr "konnte Standard-Ausgabe nicht duplizieren" - -msgid "failed to write archive" -msgstr "Schreiben des Archivs fehlgeschlagen" - -msgid "`scalar list` does not take arguments" -msgstr "`scalar list` akzeptiert keine Argumente" - -msgid "scalar register [<enlistment>]" -msgstr "scalar register [<Eintragung>]" - -msgid "reconfigure all registered enlistments" -msgstr "alle registrierten Eintragungen neu konfigurieren" - -msgid "scalar reconfigure [--all | <enlistment>]" -msgstr "scalar reconfigure [--all | <Eintragung>]" - -msgid "--all or <enlistment>, but not both" -msgstr "--all oder <Eintragung>, aber nicht beides" - -#, c-format -msgid "git repository gone in '%s'" -msgstr "Git-Repository entfernt in '%s'" - -msgid "" -"scalar run <task> [<enlistment>]\n" -"Tasks:\n" -msgstr "" -"scalar run <Aufgabe> [<Eintragung>]\n" -"Aufgaben:\n" - -#, c-format -msgid "no such task: '%s'" -msgstr "Aufgabe nicht gefunden: '%s'" - -msgid "scalar unregister [<enlistment>]" -msgstr "scalar unregister [<Eintragung>]" - -msgid "scalar delete <enlistment>" -msgstr "scalar delete <Eintragung>" - -msgid "refusing to delete current working directory" -msgstr "Löschen des aktuellen Arbeitsverzeichnisses wurde verweigert" - -msgid "include Git version" -msgstr "Git-Version einbeziehen" - -msgid "include Git's build options" -msgstr "Build-Optionen von Git einbeziehen" - -msgid "scalar verbose [-v | --verbose] [--build-options]" -msgstr "scalar verbose [-v | --verbose] [--build-options]" - -msgid "-C requires a <directory>" -msgstr "-C erfordert ein <Verzeichnis>" - -#, c-format -msgid "could not change to '%s'" -msgstr "konnte nicht zu '%s' wechseln" - -msgid "-c requires a <key>=<value> argument" -msgstr "-c benötigt ein <Schlüssel>=<Wert> Argument" - -msgid "" -"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n" -"\n" -"Commands:\n" -msgstr "" -"scalar [-C <Verzeichnis>] [-c <Schlüssel>=<Wert>] <Befehl> [<Optionen>]\n" -"\n" -"Befehle:\n" - -#, c-format msgid "illegal crlf_action %d" msgstr "Unerlaubte crlf_action %d" @@ -15373,6 +15457,32 @@ msgstr "" msgid "Marked %d islands, done.\n" msgstr "%d Delta-Islands markiert, fertig.\n" +#, c-format +msgid "invalid --%s value '%s'" +msgstr "ungültiger --%s Wert '%s'" + +#, c-format +msgid "could not archive missing directory '%s'" +msgstr "fehlendes Verzeichnis '%s' konnte nicht archiviert werden" + +#, c-format +msgid "could not open directory '%s'" +msgstr "konnte Verzeichnis '%s' nicht öffnen" + +#, c-format +msgid "skipping '%s', which is neither file nor directory" +msgstr "überspringe '%s', das weder Datei noch Verzeichnis ist" + +msgid "could not duplicate stdout" +msgstr "konnte Standard-Ausgabe nicht duplizieren" + +#, c-format +msgid "could not add directory '%s' to archiver" +msgstr "konnte das Verzeichnis '%s' nicht zum Archivierungssystem hinzufügen" + +msgid "failed to write archive" +msgstr "Schreiben des Archivs fehlgeschlagen" + msgid "--merge-base does not work with ranges" msgstr "--merge-base funktioniert nicht mit Bereichen" @@ -16004,6 +16114,9 @@ msgstr "git fetch-pack: ACK/NAK erwartet, '%s' bekommen" msgid "unable to write to remote" msgstr "konnte nicht zum Remote schreiben" +msgid "Server supports filter" +msgstr "Server unterstützt Filter" + #, c-format msgid "invalid shallow line: %s" msgstr "ungültige shallow-Zeile: %s" @@ -16114,9 +16227,6 @@ msgstr "der Server unterstützt Algorithmus '%s' nicht" msgid "Server does not support shallow requests" msgstr "Server unterstützt keine shallow-Anfragen" -msgid "Server supports filter" -msgstr "Server unterstützt Filter" - msgid "unable to write request to remote" msgstr "konnte Anfrage nicht zum Remote schreiben" @@ -16462,6 +16572,12 @@ msgstr "Systembefehle / Repositories synchronisieren" msgid "Low-level Commands / Internal Helpers" msgstr "Systembefehle / Interne Hilfsbefehle" +msgid "User-facing repository, command and file interfaces" +msgstr "Benutzerseitige Repository-, Befehls- und Dateischnittstellen" + +msgid "Developer-facing file formats, protocols and other interfaces" +msgstr "Dateiformate, Protokolle und andere Schnittstellen für Entwickler" + #, c-format msgid "available git commands in '%s'" msgstr "Vorhandene Git-Befehle in '%s'" @@ -16475,6 +16591,12 @@ msgstr "Allgemeine Git-Befehle, verwendet in verschiedenen Situationen:" msgid "The Git concept guides are:" msgstr "Die Git-Konzeptanleitungen sind:" +msgid "User-facing repository, command and file interfaces:" +msgstr "Benutzerseitige Repository-, Befehls- und Dateischnittstellen:" + +msgid "File formats, protocols and other developer interfaces:" +msgstr "Dateiformate, Protokolle und andere Entwicklerschnittstellen:" + msgid "External commands" msgstr "Externe Befehle" @@ -16561,10 +16683,6 @@ msgstr "" "deaktivieren." #, c-format -msgid "Couldn't start hook '%s'\n" -msgstr "Konnte Hook '%s' nicht starten\n" - -#, c-format msgid "argument to --packfile must be a valid hash (got '%s')" msgstr "Argument für --packfile muss ein gültiger Hash sein ('%s' erhalten)" @@ -16752,19 +16870,14 @@ msgid "quoted CRLF detected" msgstr "angeführtes CRLF entdeckt" #, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -" %s" -msgstr "" -"Ihre lokalen Änderungen in den folgenden Dateien würden durch den Merge\n" -"überschrieben werden:\n" -" %s" - -#, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "Fehler beim Merge von Submodul %s (nicht ausgecheckt)." #, c-format +msgid "Failed to merge submodule %s (no merge base)" +msgstr "Merge von Submodul %s fehlgeschlagen (keine Merge-Basis)" + +#, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "Fehler beim Merge von Submodul %s (Commits nicht vorhanden)." @@ -16782,28 +16895,10 @@ msgstr "Fehler beim Zusammenführen von Submodul %s" #, c-format msgid "" -"Failed to merge submodule %s, but a possible merge resolution exists:\n" -"%s\n" +"Failed to merge submodule %s, but a possible merge resolution exists: %s" msgstr "" -"Fehler beim Zusammenführen von Submodul %s, aber es ist eine mögliche " -"Auflösung des Merges vorhanden:\n" -"%s\n" - -#, c-format -msgid "" -"If this is correct simply add it to the index for example\n" -"by using:\n" -"\n" -" git update-index --cacheinfo 160000 %s \"%s\"\n" -"\n" -"which will accept this suggestion.\n" -msgstr "" -"Falls das korrekt ist, fügen Sie es einfach der Staging-Area, zum Beispiel " -"mit:\n" -"\n" -" git update-index --cacheinfo 160000 %s \"%s\"\n" -"\n" -"hinzu, um diesen Vorschlag zu akzeptieren.\n" +"Der Merge von Submodul %s ist fehlgeschlagen, aber es gibt eine mögliche " +"Auflösung des Merges: %s" #, c-format msgid "" @@ -16971,13 +17066,46 @@ msgstr "" "KONFLIKT (ändern/löschen): %s gelöscht in %s und geändert in %s. Stand %s " "von %s wurde im Arbeitsbereich gelassen." +#. TRANSLATORS: This is a line of advice to resolve a merge +#. 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" +#. #, c-format msgid "" -"Note: %s not up to date and in way of checking out conflicted version; old " -"copy renamed to %s" +" - go to submodule (%s), and either merge commit %s\n" +" or update to an existing commit which has merged those changes\n" msgstr "" -"Hinweis: %s nicht aktuell und konfliktbehaftete Version während des " -"Auscheckens; alte Kopie zu %s umbenannt" +" - gehen Sie zu Submodul (%s) und mergen Sie entweder Commit %s\n" +" oder aktualisieren Sie zu einem bestehenden Commit, der diese Änderungen " +"zusammengeführt hat\n" + +#, c-format +msgid "" +"Recursive merging with submodules currently only supports trivial cases.\n" +"Please manually handle the merging of each conflicted submodule.\n" +"This can be accomplished with the following steps:\n" +"%s - come back to superproject and run:\n" +"\n" +" git add %s\n" +"\n" +" to record the above merge or update\n" +" - resolve any other conflicts in the superproject\n" +" - commit the resulting index in the superproject\n" +msgstr "" +"Das rekursive Zusammenführen mit Submodulen unterstützt derzeit nur triviale " +"Fälle.\n" +"Bitte führen Sie die Zusammenführung der einzelnen konfliktbehafteten " +"Submodule manuell durch.\n" +"Dies kann mit den folgenden Schritten erreicht werden:\n" +"%s - zurück zum Hauptprojekt und dann ausführen:\n" +"\n" +" git add %s\n" +"\n" +" um die obige Zusammenführung oder Aktualisierung aufzuzeichnen\n" +" - lösen Sie alle anderen Konflikte im Hauptprojekt\n" +" - committen Sie den resultierenden Index in das Hauptprojekt\n" #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge #. base, and 2-3) the trees for the two trees we're merging. @@ -17053,6 +17181,22 @@ msgid "Found a possible merge resolution for the submodule:\n" msgstr "Mögliche Auflösung des Merges für Submodul gefunden:\n" #, c-format +msgid "" +"If this is correct simply add it to the index for example\n" +"by using:\n" +"\n" +" git update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"which will accept this suggestion.\n" +msgstr "" +"Falls das korrekt ist, fügen Sie es einfach der Staging-Area, zum Beispiel " +"mit:\n" +"\n" +" git update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"hinzu, um diesen Vorschlag zu akzeptieren.\n" + +#, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "Fehler beim Merge von Submodul %s (mehrere Merges gefunden)" @@ -17128,8 +17272,8 @@ msgstr "" #, c-format msgid "" -"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename " -"\"%s\"->\"%s\" in \"%s\"%s" +"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" +"\"->\"%s\" in \"%s\"%s" msgstr "" "KONFLIKT (umbenennen/umbenennen): Benenne um \"%s\"->\"%s\" in Branch \"%s\" " "und \"%s\"->\"%s\" in Branch \"%s\"%s" @@ -17593,6 +17737,22 @@ msgid "confused by unstable object source data for %s" msgstr "Fehler wegen instabilen Objektquelldaten für %s" #, c-format +msgid "write stream object %ld != %<PRIuMAX>" +msgstr "stream-Objekt schreiben %ld!= %<PRIuMAX>" + +#, c-format +msgid "unable to stream deflate new object (%d)" +msgstr "neues Objekt kann nicht aus Stream entpackt werden (%d)" + +#, c-format +msgid "deflateEnd on stream object failed (%d)" +msgstr "deflateEnd auf Stream-Objekt fehlgeschlagen (%d)" + +#, c-format +msgid "unable to create directory %s" +msgstr "Verzeichnis %s kann nicht erstellt werden" + +#, c-format msgid "cannot read object for %s" msgstr "Kann Objekt für %s nicht lesen." @@ -17657,7 +17817,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" @@ -17666,7 +17826,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. @@ -17682,7 +17842,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]" @@ -17823,6 +17983,58 @@ msgstr "Konnte Objekt '%s' nicht parsen." msgid "hash mismatch %s" msgstr "Hash stimmt nicht mit %s überein." +msgid "trying to write commit not in index" +msgstr "Versuch, einen Commit zu schreiben, der nicht im Index steht" + +msgid "failed to load bitmap index (corrupted?)" +msgstr "bitmap-Index kann nicht geladen werden (beschädigt?)" + +msgid "corrupted bitmap index (too small)" +msgstr "beschädigter Bitmap-Index (zu klein)" + +msgid "corrupted bitmap index file (wrong header)" +msgstr "beschädigte Bitmap-Indexdatei (falscher Header)" + +#, c-format +msgid "unsupported version '%d' for bitmap index file" +msgstr "nicht unterstützte Version '%d' für Bitmap-Indexdatei" + +msgid "corrupted bitmap index file (too short to fit hash cache)" +msgstr "" +"beschädigte Bitmap-Indexdatei (zu kurz, um in den Hash-Cache zu passen)" + +msgid "corrupted bitmap index file (too short to fit lookup table)" +msgstr "" +"beschädigte Bitmap-Indexdatei (zu kurz, um in die Lookup-Tabelle zu passen)" + +#, c-format +msgid "duplicate entry in bitmap index: '%s'" +msgstr "duplizierter Eintrag im Bitmap-Index: '%s'" + +#, c-format +msgid "corrupt ewah bitmap: truncated header for entry %d" +msgstr "fehlerhafte ewah-Bitmap: abgeschnittener Header für Eintrag %d" + +#, c-format +msgid "corrupt ewah bitmap: commit index %u out of range" +msgstr "fehlerhafte ewah-Bitmap: Commit-Index %u außerhalb des Bereichs" + +msgid "corrupted bitmap pack index" +msgstr "beschädigter Bitmap-Pack-Index" + +msgid "invalid XOR offset in bitmap pack index" +msgstr "ungültiger XOR-Offset im Bitmap-Pack-Index" + +msgid "cannot fstat bitmap file" +msgstr "kann Bitmap-Datei nicht lesen" + +#, c-format +msgid "ignoring extra bitmap file: '%s'" +msgstr "ignoriere zusätzliche Bitmap-Datei: '%s'" + +msgid "checksum doesn't match in MIDX and bitmap" +msgstr "Prüfsumme stimmt in MIDX und Bitmap nicht überein" + msgid "multi-pack bitmap is missing required reverse index" msgstr "Multi-Pack-Bitmap fehlt erforderlicher Reverse-Index" @@ -17834,9 +18046,60 @@ msgstr "konnte Paket '%s' nicht öffnen" msgid "preferred pack (%s) is invalid" msgstr "bevorzugtes Paket (%s) ist ungültig" +msgid "corrupt bitmap lookup table: triplet position out of index" +msgstr "Bitmap-Lookup-Tabelle beschädigt: Triplet-Position außerhalb des Index" + +msgid "corrupt bitmap lookup table: xor chain exceeds entry count" +msgstr "" +"fehlerhafte Bitmap-Lookup-Tabelle: XOR-Kette überschreitet die Anzahl der " +"Einträge" + +#, c-format +msgid "corrupt bitmap lookup table: commit index %u out of range" +msgstr "" +"Bitmap-Lookup-Tabelle beschädigt: Commit-Index %u außerhalb des Bereichs" + +#, c-format +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 "object '%s' not found in type bitmaps" +msgstr "Objekt '%s' nicht im Typ Bitmaps gefunden" + +#, c-format +msgid "object '%s' does not have a unique type" +msgstr "das Objekt '%s' hat keinen eindeutigen Typ" + +#, c-format +msgid "object '%s': real type '%s', expected: '%s'" +msgstr "Objekt '%s': reeller Typ '%s', erwartet: '%s'" + +#, c-format +msgid "object not in bitmap: '%s'" +msgstr "Objekt nicht in Bitmap: '%s'" + +msgid "failed to load bitmap indexes" +msgstr "Bitmap-Indizes konnten nicht geladen werden" + +msgid "you must specify exactly one commit to test" +msgstr "Sie müssen genau einen Commit zum Testen angeben" + +#, c-format +msgid "commit '%s' doesn't have an indexed bitmap" +msgstr "Commit '%s' hat keine indizierte Bitmap" + +msgid "mismatch in bitmap results" +msgstr "Unstimmigkeiten bei Bitmap-Ergebnissen" + #, c-format -msgid "could not find %s in pack %s at offset %<PRIuMAX>" -msgstr "konnte %s nicht in Paket %s bei Offset %<PRIuMAX> finden" +msgid "could not find '%s' in pack '%s' at offset %<PRIuMAX>" +msgstr "konnte '%s' in Paket '%s' bei Offset %<PRIuMAX> nicht finden" + +#, c-format +msgid "unable to get disk usage of '%s'" +msgstr "Festplattennutzung von '%s' kann nicht abgerufen werden" #, c-format msgid "mtimes file %s is too small" @@ -17963,6 +18226,9 @@ msgstr "Meinten Sie `--%s` (mit zwei Strichen)?" msgid "alias of --%s" msgstr "Alias für --%s" +msgid "need a subcommand" +msgstr "benötige einen Unterbefehl" + #, c-format msgid "unknown option `%s'" msgstr "Unbekannte Option: `%s'" @@ -18405,9 +18671,12 @@ msgid "" "l, label <label> = label current HEAD with a name\n" "t, reset <label> = reset HEAD to a label\n" "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" -". create a merge commit using the original merge commit's\n" -". message (or the oneline, if no original merge commit was\n" -". specified); use -c <commit> to reword the commit message\n" +" create a merge commit using the original merge commit's\n" +" message (or the oneline, if no original merge commit was\n" +" specified); use -c <commit> to reword the commit message\n" +"u, update-ref <ref> = track a placeholder for the <ref> to be updated\n" +" to this position in the new commits. The <ref> is\n" +" updated at the end of the rebase\n" "\n" "These lines can be re-ordered; they are executed from top to bottom.\n" msgstr "" @@ -18429,11 +18698,16 @@ msgstr "" "l, label <Label> = aktuellen HEAD mit Label versehen\n" "t, reset <Label> = HEAD zu einem Label umsetzen\n" "m, merge [-C <Commit> | -c <Commit>] <Label> [# <eineZeile>]\n" -". Merge-Commit mit der originalen Merge-Commit-Beschreibung erstellen\n" -". (oder die eine Zeile, wenn keine originale Merge-Commit-" +" Merge-Commit mit der originalen Merge-Commit-Beschreibung erstellen\n" +" (oder die eine Zeile, wenn keine originale Merge-Commit-" "Beschreibung\n" -". spezifiziert ist). Benutzen Sie -c <Commit> zum Bearbeiten der\n" -". Commit-Beschreibung.\n" +" spezifiziert ist). Benutzen Sie -c <Commit> zum Bearbeiten der\n" +" Commit-Beschreibung.\n" +"u, update-ref <Referenz>= einen Platzhalter für die zu aktualisierende " +"<Referenz>\n" +" zu dieser Position in den neuen Commits erstellen. Die " +"<Referenz>wird\n" +" am Ende des Rebase aktualisiert\n" "\n" "Diese Zeilen können umsortiert werden; sie werden von oben nach unten\n" "ausgeführt.\n" @@ -18908,6 +19182,13 @@ msgstr "Protokollfehler: SHA-1/Referenz erwartet, '%s' bekommen" msgid "http transport does not support %s" msgstr "HTTP-Transport unterstützt nicht %s" +msgid "protocol error: expected '<url> <path>', missing space" +msgstr "Protokollfehler: erwartet '<url> <path>', fehlendes Leerzeichen" + +#, c-format +msgid "failed to download file at URL '%s'" +msgstr "Datei unter URL '%s' konnte nicht heruntergeladen werden" + msgid "git-http-push failed" msgstr "\"git-http-push\" fehlgeschlagen" @@ -19258,6 +19539,14 @@ msgstr "Konnte HEAD-Commit nicht bestimmen." msgid "failed to find tree of %s" msgstr "Fehler beim Finden des \"Tree\"-Objektes von %s." +#, c-format +msgid "resolve-undo records `%s` which is missing" +msgstr "resolve-undo zeichnet `%s` auf, das fehlt" + +#, c-format +msgid "could not get commit for ancestry-path argument %s" +msgstr "konnte kein Commit für das Argument ancestry-path %s erhalten" + msgid "--unpacked=<packfile> no longer supported" msgstr "--unpacked=<Pack-Datei> wird nicht länger unterstützt" @@ -19278,6 +19567,174 @@ msgstr "-L unterstützt noch keine anderen Diff-Formate außer -p und -s" msgid "cannot create async thread: %s" msgstr "Konnte Thread für async nicht erzeugen: %s" +#, c-format +msgid "'%s' does not exist" +msgstr "'%s' existiert nicht." + +#, c-format +msgid "could not switch to '%s'" +msgstr "konnte nicht zu '%s' wechseln" + +msgid "need a working directory" +msgstr "Arbeitsverzeichnis benötigt" + +msgid "Scalar enlistments require a worktree" +msgstr "Skalare Eintragungen erfordern ein Arbeitsverzeichnis" + +#, c-format +msgid "could not configure %s=%s" +msgstr "konnte %s=%s nicht konfigurieren" + +msgid "could not configure log.excludeDecoration" +msgstr "konnte log.excludeDecoration nicht konfigurieren" + +msgid "could not add enlistment" +msgstr "konnte keine Eintragung hinzufügen" + +msgid "could not set recommended config" +msgstr "konnte die empfohlene Konfiguration nicht setzen" + +msgid "could not turn on maintenance" +msgstr "konnte die Wartung nicht einschalten" + +msgid "could not start the FSMonitor daemon" +msgstr "konnte den FSMonitor-Daemon nicht starten" + +msgid "could not turn off maintenance" +msgstr "konnte die Wartung nicht abschalten" + +msgid "could not remove enlistment" +msgstr "konnte die Eintragung nicht aufheben" + +#, c-format +msgid "remote HEAD is not a branch: '%.*s'" +msgstr "externer HEAD ist kein Branch: '%.*s'" + +msgid "failed to get default branch name from remote; using local default" +msgstr "" +"Fehler beim Abfragen des Standard-Branchnamens vom Remote-Repository; nutze " +"lokalen Standardwert" + +msgid "failed to get default branch name" +msgstr "Fehler beim Abfragen des Standard-Branchnamens" + +msgid "failed to unregister repository" +msgstr "Fehler beim Austragen des Repositories" + +msgid "failed to stop the FSMonitor daemon" +msgstr "der FSMonitor-Daemon konnte nicht gestoppt werden" + +msgid "failed to delete enlistment directory" +msgstr "Fehler beim Löschen des Eintragungs-Verzeichnisses" + +msgid "branch to checkout after clone" +msgstr "Branch, der nach dem Klonen ausgecheckt werden soll" + +msgid "when cloning, create full working directory" +msgstr "vollständiges Arbeitsverzeichnis beim Klonen erstellen" + +msgid "only download metadata for the branch that will be checked out" +msgstr "lade nur Metadaten des Branches herunter, der ausgecheckt wird" + +msgid "scalar clone [<options>] [--] <repo> [<dir>]" +msgstr "scalar clone [<Optionen>] [--] <Repository> [<Verzeichnis>]" + +#, c-format +msgid "cannot deduce worktree name from '%s'" +msgstr "konnte Name für Arbeitsverzeichnis nicht von '%s' ableiten" + +#, c-format +msgid "directory '%s' exists already" +msgstr "Verzeichnis '%s' existiert bereits" + +#, c-format +msgid "failed to get default branch for '%s'" +msgstr "Fehler beim Abfragen des Default-Branches für '%s'" + +#, c-format +msgid "could not configure remote in '%s'" +msgstr "konnte Remote-Repository in '%s' nicht konfigurieren" + +#, c-format +msgid "could not configure '%s'" +msgstr "konnte '%s' nicht konfigurieren" + +msgid "partial clone failed; attempting full clone" +msgstr "partielles Klonen fehlgeschlagen; versuche vollständiges Klonen" + +msgid "could not configure for full clone" +msgstr "konnte nicht für vollständiges Klonen konfigurieren" + +msgid "scalar diagnose [<enlistment>]" +msgstr "scalar diagnose [<Eintragung>]" + +msgid "`scalar list` does not take arguments" +msgstr "`scalar list` akzeptiert keine Argumente" + +msgid "scalar register [<enlistment>]" +msgstr "scalar register [<Eintragung>]" + +msgid "reconfigure all registered enlistments" +msgstr "alle registrierten Eintragungen neu konfigurieren" + +msgid "scalar reconfigure [--all | <enlistment>]" +msgstr "scalar reconfigure [--all | <Eintragung>]" + +msgid "--all or <enlistment>, but not both" +msgstr "--all oder <Eintragung>, aber nicht beides" + +#, c-format +msgid "git repository gone in '%s'" +msgstr "Git-Repository entfernt in '%s'" + +msgid "" +"scalar run <task> [<enlistment>]\n" +"Tasks:\n" +msgstr "" +"scalar run <Aufgabe> [<Eintragung>]\n" +"Aufgaben:\n" + +#, c-format +msgid "no such task: '%s'" +msgstr "Aufgabe nicht gefunden: '%s'" + +msgid "scalar unregister [<enlistment>]" +msgstr "scalar unregister [<Eintragung>]" + +msgid "scalar delete <enlistment>" +msgstr "scalar delete <Eintragung>" + +msgid "refusing to delete current working directory" +msgstr "Löschen des aktuellen Arbeitsverzeichnisses wurde verweigert" + +msgid "include Git version" +msgstr "Git-Version einbeziehen" + +msgid "include Git's build options" +msgstr "Build-Optionen von Git einbeziehen" + +msgid "scalar verbose [-v | --verbose] [--build-options]" +msgstr "scalar verbose [-v | --verbose] [--build-options]" + +msgid "-C requires a <directory>" +msgstr "-C erfordert ein <Verzeichnis>" + +#, c-format +msgid "could not change to '%s'" +msgstr "konnte nicht zu '%s' wechseln" + +msgid "-c requires a <key>=<value> argument" +msgstr "-c benötigt ein <Schlüssel>=<Wert> Argument" + +msgid "" +"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n" +"\n" +"Commands:\n" +msgstr "" +"scalar [-C <Verzeichnis>] [-c <Schlüssel>=<Wert>] <Befehl> [<Optionen>]\n" +"\n" +"Befehle:\n" + msgid "unexpected flush packet while reading remote unpack status" msgstr "Unerwartetes Flush-Paket beim Lesen des Remote-Unpack-Status." @@ -19403,10 +19860,6 @@ msgid "commit your changes or stash them to proceed." msgstr "" "Committen Sie Ihre Änderungen oder benutzen Sie \"stash\", um fortzufahren." -#, c-format -msgid "%s: fast-forward" -msgstr "%s: Vorspulen" - #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase". #. @@ -19900,6 +20353,28 @@ msgstr "konnte nicht einmal versuchen '%.*s' zu mergen" msgid "merge: Unable to write new index file" msgstr "merge: Konnte neue Index-Datei nicht schreiben." +#, c-format +msgid "" +"another 'rebase' process appears to be running; '%s.lock' already exists" +msgstr "" +"ein weiterer 'rebase'-Prozess scheint zu laufen; '%s.lock' existiert bereits" + +#, c-format +msgid "" +"Updated the following refs with %s:\n" +"%s" +msgstr "" +"Die folgenden Referenzen wurden mit %s aktualisiert:\n" +"%s" + +#, c-format +msgid "" +"Failed to update the following refs with %s:\n" +"%s" +msgstr "" +"Die Aktualisierung der folgenden Referenzen mit %s ist fehlgeschlagen:\n" +"%s" + msgid "Cannot autostash" msgstr "Kann automatischen Stash nicht erzeugen" @@ -20071,6 +20546,10 @@ msgid "the script was already rearranged." msgstr "Das Script wurde bereits umgeordnet." #, c-format +msgid "update-refs file at '%s' is invalid" +msgstr "update-refs-Datei bei '%s' ist ungültig" + +#, c-format msgid "'%s' is outside repository at '%s'" msgstr "'%s' liegt außerhalb des Repositories von '%s'" @@ -20192,17 +20671,22 @@ msgstr "" #, c-format msgid "" -"unsafe repository ('%s' is owned by someone else)\n" -"To add an exception for this directory, call:\n" +"detected dubious ownership in repository at '%s'\n" +"%sTo add an exception for this directory, call:\n" "\n" "\tgit config --global --add safe.directory %s" msgstr "" -"unsicheres Repository ('%s' gehört jemand anderem)\n" -"Um eine Ausnahme für dieses Repository hinzuzufügen, führen Sie aus:\n" +"dubiose Besitzverhältnisse im Repository bei '%s' entdeckt\n" +"%sUm eine Ausnahme für dieses Verzeichnis hinzuzufügen, rufen Sie auf:\n" "\n" "\tgit config --global --add safe.directory %s" #, c-format +msgid "cannot use bare repository '%s' (safe.bareRepository is '%s')" +msgstr "" +"kann Bare-Repository '%s' nicht verwenden (safe.bareRepository ist '%s')" + +#, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" "The owner of files must always have read and write permissions." @@ -21091,6 +21575,18 @@ msgstr "ungültige Portnummer" msgid "invalid '..' path segment" msgstr "ungültiges '..' Pfadsegment" +msgid "usage: " +msgstr "Verwendung: " + +msgid "fatal: " +msgstr "Schwerwiegend: " + +msgid "error: " +msgstr "Fehler: " + +msgid "warning: " +msgstr "Warnung: " + msgid "Fetching objects" msgstr "Anfordern der Objekte" @@ -21474,8 +21970,8 @@ msgstr "Sie führen gerade \"cherry-pick\" von Commit %s aus." msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" -" (beheben Sie die Konflikte und führen Sie dann \"git cherry-pick --" -"continue\" aus)" +" (beheben Sie die Konflikte und führen Sie dann \"git cherry-pick --continue" +"\" aus)" msgid " (run \"git cherry-pick --continue\" to continue)" msgstr " (Führen Sie \"git cherry-pick --continue\" aus, um weiterzumachen)" @@ -21948,23 +22444,6 @@ msgstr "" msgid "ignoring unmerged: %s\n" msgstr "ignoriere nicht zusammengeführte Datei: %s\n" -#, perl-format -msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " -msgstr "Modusänderung auf Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? " - -#, perl-format -msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " -msgstr "Löschung auf Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? " - -#, perl-format -msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " -msgstr "Ergänzung auf Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? " - -#, perl-format -msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " -msgstr "" -"Diesen Patch-Block auf das Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? " - msgid "No other hunks to goto\n" msgstr "Keine anderen Patch-Blöcke verbleibend\n" @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2022-06-16 08:28-0600\n" -"PO-Revision-Date: 2021-11-07 18:53-0500\n" +"POT-Creation-Date: 2022-09-27 21:02-0600\n" +"PO-Revision-Date: 2022-09-27 22:56-0600\n" "Last-Translator: Alex Henrie <alexhenrie24@gmail.com>\n" "Language-Team: CodeLabora <codelabora@gmail.com>\n" "Language: es\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 3.0\n" +"X-Generator: Poedit 3.1\n" #, c-format msgid "Huh (%s)?" @@ -420,6 +420,22 @@ msgstr "" "a - aplicar este fragmento y todos los posteriores en el archivo\n" "d - no aplicar este fragmento ni ninguno de los siguientes en este archivo\n" +#, c-format, perl-format +msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " +msgstr "¿Aplicar cambio de modo al árbol de trabajo [y,n,q,a,d%s,?]? " + +#, c-format, perl-format +msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " +msgstr "¿Aplicar eliminación al árbol de trabajo [y,n,q,a,d%s,?]? " + +#, c-format, perl-format +msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " +msgstr "¿Aplicar adición al árbol de trabajo [y,n,q,a,d%s,?]? " + +#, c-format, perl-format +msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " +msgstr "¿Aplicar este fragmento al árbol de trabajo [y,n,q,a,d,/%s,?]? " + msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -437,10 +453,6 @@ msgstr "" msgid "could not parse hunk header '%.*s'" msgstr "no se puede analizar hunk header '%.*s'" -#, c-format -msgid "could not parse colored hunk header '%.*s'" -msgstr "no se puede analizar hunk header '%.*s'" - msgid "could not parse diff" msgstr "no se puede analizar diff" @@ -496,7 +508,6 @@ msgstr "" "Para eliminar '%c' líneas, bórrelas.\n" "Líneas comenzando con %c serán eliminadas.\n" -#. #-#-#-#-# git-add--interactive.perl.po #-#-#-#-# #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. msgid "" "If it does not apply cleanly, you will be given an opportunity to\n" @@ -514,14 +525,12 @@ msgstr "no se puede analizar hunk header" msgid "'git apply --cached' failed" msgstr "falló 'git apply --cached'" -#. #-#-#-#-# add-patch.c.po #-#-#-#-# #. TRANSLATORS: do not translate [y/n] #. The program will only accept that input at this point. #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. #. -#. #-#-#-#-# git-add--interactive.perl.po #-#-#-#-# #. TRANSLATORS: do not translate [y/n] #. The program will only accept that input #. at this point. @@ -731,6 +740,25 @@ msgstr "" "false\n" "\n" +#, c-format +msgid "" +"The following paths have been moved outside the\n" +"sparse-checkout definition but are not sparse due to local\n" +"modifications.\n" +msgstr "" +"Las rutas siguientes se han movido fuera de la definición\n" +"de sparse-checkout pero no son escasas a causa de\n" +"modificaciones locales.\n" + +msgid "" +"To correct the sparsity of these paths, do the following:\n" +"* Use \"git add --sparse <paths>\" to update the index\n" +"* Use \"git sparse-checkout reapply\" to apply the sparsity rules" +msgstr "" +"Para corregir la escasez de estas rutas, haz lo siguiente:\n" +"* Usa \"git add --sparse <rutas>\" para actualizar el índice\n" +"* Usa \"git sparse-checkout reapply\" para aplicar las reglas de escasez" + msgid "cmdline ends with \\" msgstr "cmdline termina en \\" @@ -745,13 +773,13 @@ msgstr "opción de espacios en blanco no reconocida '%s'" msgid "unrecognized whitespace ignore option '%s'" msgstr "opción de ignorar espacios en blanco no reconocida '%s'" -#, fuzzy, c-format +#, c-format msgid "options '%s' and '%s' cannot be used together" -msgstr "Opciones --squash y --fixup no pueden ser usadas juntas" +msgstr "las opciones '%s' y '%s' no pueden ser usados juntos" -#, fuzzy, c-format +#, c-format msgid "'%s' outside a repository" -msgstr "--3way está fuera de un repositorio" +msgstr "'%s' fuera de un repositorio" #, c-format msgid "Cannot prepare timestamp regexp %s" @@ -836,7 +864,7 @@ msgstr "parche corrupto en la línea %d" #, c-format msgid "new file %s depends on old contents" -msgstr "nuevo archivo %s depende en contenidos viejos" +msgstr "nuevo archivo %s depende de contenidos viejos" #, c-format msgid "deleted file %s still has contents" @@ -844,7 +872,7 @@ msgstr "el archivo borrado %s todavía tiene contenido" #, c-format msgid "** warning: file %s becomes empty but is not deleted" -msgstr "** peligro: el archivo %s está vacío pero no es borrado" +msgstr "** advertencia: el archivo %s se volverá vacío pero no se borrará" #, c-format msgid "corrupt binary patch at line %d: %.*s" @@ -1113,7 +1141,7 @@ msgid "Skipped patch '%s'." msgstr "Parche '%s' saltado." msgid "No valid patches in input (allow with \"--allow-empty\")" -msgstr "" +msgstr "No hay parches válidos en la entrada (permitir con \"--allow-empty\")" msgid "unable to read index file" msgstr "no es posible leer el archivo índice" @@ -1240,7 +1268,7 @@ msgid "prepend <root> to all filenames" msgstr "anteponer <root> a todos los nombres de archivos" msgid "don't return error for empty patches" -msgstr "" +msgstr "no devolver error por parches vacíos" #, c-format msgid "cannot stream blob %s" @@ -1251,6 +1279,10 @@ msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "modo de archivo no soportado: 0%o (SHA1: %s)" #, c-format +msgid "deflate error (%d)" +msgstr "error al desinflar (%d)" + +#, c-format msgid "unable to start '%s' filter" msgstr "no se puede comenzar filtro '%s'" @@ -1270,21 +1302,17 @@ msgid "path too long (%d chars, SHA1: %s): %s" msgstr "ruta demasiada larga (%d chars, SHA1: %s): %s" #, c-format -msgid "deflate error (%d)" -msgstr "error al desinflar (%d)" - -#, c-format msgid "timestamp too large for this system: %<PRIuMAX>" msgstr "timestamp demasiado grande para este sistema: %<PRIuMAX>" msgid "git archive [<options>] <tree-ish> [<path>...]" -msgstr "git archive [<opciones>] <parte-del-árbol> [<ruta>...]" +msgstr "git archive [<opciones>] <árbol-ismo> [<ruta>...]" msgid "" "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" msgstr "" -"git archive --remote <repo> [--exec <comando> ] [<opciones>] <parte-del-" -"árbol> [<ruta>...]" +"git archive --remote <repositorio> [--exec <comando> ] [<opciones>] <árbol-" +"ismo> [<ruta>...]" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <repo> [--exec <comando>] --list" @@ -1320,17 +1348,17 @@ msgstr "Archivo no encontrado: %s" msgid "Not a regular file: %s" msgstr "No es un archivo regular: %s" -#, fuzzy, c-format +#, c-format msgid "unclosed quote: '%s'" -msgstr "comillas incompletas" +msgstr "comilla sin pareja: '%s'" -#, fuzzy, c-format +#, c-format msgid "missing colon: '%s'" -msgstr "valor faltante para '%s'" +msgstr "falta un colon: '%s'" -#, fuzzy, c-format +#, c-format msgid "empty file name: '%s'" -msgstr "mbox vacío: '%s'" +msgstr "nombre vacío de archivo: '%s'" msgid "fmt" msgstr "fmt" @@ -1350,9 +1378,8 @@ msgstr "archivo" msgid "add untracked file to archive" msgstr "incluir archivos sin seguimiento a la crónica" -#, fuzzy msgid "path:content" -msgstr "contenido" +msgstr "ruta:contenido" msgid "write the archive to this file" msgstr "escribe la crónica en este archivo" @@ -1384,9 +1411,9 @@ msgstr "ruta para el comando git-upload-archive remoto" msgid "Unexpected option --remote" msgstr "Opción inesperada --remote" -#, fuzzy, c-format +#, c-format msgid "the option '%s' requires '%s'" -msgstr "opción `%s' requiere un valor" +msgstr "la opción `%s' requiere '%s'" msgid "Unexpected option --output" msgstr "Opción inesperada --output" @@ -1548,68 +1575,64 @@ msgid "" "cannot inherit upstream tracking configuration of multiple refs when " "rebasing is requested" msgstr "" +"no se puede heredar la configuración de rastreo upstream de múltiples " +"referencias cuando se pide rebasar" -#, fuzzy, c-format +#, c-format msgid "not setting branch '%s' as its own upstream" -msgstr "La rama %s no se configura como su propio upstream." +msgstr "no configurando la rama %s como su propio upstream" -#, fuzzy, c-format +#, c-format msgid "branch '%s' set up to track '%s' by rebasing." -msgstr "" -"Rama '%s' configurada para hacer seguimiento a la referencia local '%s' por " -"rebase." +msgstr "rama '%s' configurada para rastrear '%s' por rebase." -#, fuzzy, c-format +#, c-format msgid "branch '%s' set up to track '%s'." -msgstr "" -"Rama '%s' configurada para hacer seguimiento a la referencia local '%s'." +msgstr "rama '%s' configurada para rastrear '%s'." -#, fuzzy, c-format +#, c-format msgid "branch '%s' set up to track:" -msgstr "" -"Rama '%s' configurada para hacer seguimiento a la referencia local '%s'." +msgstr "rama '%s' configurada para rastrear:" -#, fuzzy msgid "unable to write upstream branch configuration" -msgstr "No es posible escribir la configuración de la rama upstream" +msgstr "no es posible escribir la configuración de la rama upstream" -#, fuzzy msgid "" "\n" "After fixing the error cause you may try to fix up\n" "the remote tracking information by invoking:" msgstr "" "\n" -"Tras arreglar la causa del error puedes intentar arreglar\n" -"la información del rastreo remoto invocando\n" -"\"git branch --set-upstream-to=%s%s%s\"." +"Tras arreglar la causa del error puedes intentar\n" +"arreglar la información de rastreo remoto invocando:" #, c-format msgid "asked to inherit tracking from '%s', but no remote is set" msgstr "" +"se pidió heredar el rastreo de '%s', pero no se ha configurado ningún remoto" #, c-format msgid "asked to inherit tracking from '%s', but no merge configuration is set" msgstr "" +"se pidió heredar el rastreo de '%s', pero no se ha configurado ninguna " +"configuración de fusión" -#, fuzzy, c-format +#, c-format msgid "not tracking: ambiguous information for ref '%s'" -msgstr "No rastreando: información ambigua para la referencia %s" +msgstr "no rastreando: información ambigua para la referencia '%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 #. around. #. -#, fuzzy, c-format +#, c-format msgid " %s\n" -msgstr " %s" +msgstr " %s\n" #. TRANSLATORS: The second argument is a \n-delimited list of #. duplicate refspecs, composed above. @@ -1625,24 +1648,34 @@ msgid "" "different remotes' fetch refspecs map into different\n" "tracking namespaces." msgstr "" +"Hay múltiples remotos cuyas especificaciones de referencia de\n" +"fetch corresponden a la referencia de rastreo remoto '%s':\n" +"%s\n" +"Esto es típicamente un error de configuración.\n" +"\n" +"Para soportar configuración de ramas que rastrean, asegura que\n" +"las especificationes de referencia de fetch de remotos distintos\n" +"mapeen a espacios de nombres de rastreo distintos." -#, fuzzy, c-format +#, c-format msgid "'%s' is not a valid branch name" -msgstr "'%s' no es un nombre válido de rama." +msgstr "'%s' no es un nombre válido de rama" -#, fuzzy, c-format +#, c-format msgid "a branch named '%s' already exists" -msgstr "Una rama llamada '%s' ya existe." +msgstr "una rama llamada '%s' ya existe" -#, fuzzy, c-format +#, c-format msgid "cannot force update the branch '%s' checked out at '%s'" -msgstr "No se puede borrar rama '%s' que cuenta con checkout en '%s'" +msgstr "" +"no se puede actualizar la rama '%s' a la fuerza que cuenta con checkout en " +"'%s'" -#, fuzzy, c-format +#, c-format msgid "cannot set up tracking information; starting point '%s' is not a branch" msgstr "" -"No se puede configurar el rastreo de información; el punto de partida '%s' " -"no es una rama." +"no se puede configurar la información de rastreo; el punto de partida '%s' " +"no es una rama" #, c-format msgid "the requested upstream branch '%s' does not exist" @@ -1672,27 +1705,29 @@ msgstr "" msgid "not a valid object name: '%s'" msgstr "nombre de objeto no válido: '%s'" -#, fuzzy, c-format +#, c-format msgid "ambiguous object name: '%s'" -msgstr "Nombre de objeto ambiguo: '%s'." +msgstr "nombre de objeto ambiguo: '%s'" -#, fuzzy, c-format +#, c-format msgid "not a valid branch point: '%s'" -msgstr "Punto de rama no válido: '%s'." +msgstr "punto de bifurcación no válido: '%s'" -#, fuzzy, c-format +#, c-format msgid "submodule '%s': unable to find submodule" -msgstr "submódulo '%s' tiene un índice corrupto" +msgstr "submódulo '%s': incapaz de encontrar el submódulo" #, c-format msgid "" "You may try updating the submodules using 'git checkout %s && git submodule " "update --init'" msgstr "" +"Se puede intentar actualizar los submódulos usando 'git checkout %s && git " +"submodule update --init'" -#, fuzzy, c-format +#, c-format msgid "submodule '%s': cannot create branch '%s'" -msgstr "submódulo '%s' no puede agregar alterno: %s" +msgstr "submódulo '%s': no se puede crear la rama '%s'" #, c-format msgid "'%s' is already checked out at '%s'" @@ -1850,9 +1885,10 @@ msgstr "falló al agregar archivos" msgid "--chmod param '%s' must be either -x or +x" msgstr "El parámetro '%s' para --chmod debe ser -x o +x" -#, fuzzy, c-format +#, c-format msgid "'%s' and pathspec arguments cannot be used together" -msgstr "-x y -X no pueden ser usadas juntas" +msgstr "" +"'%s' y los argumentos de especificación de ruta no pueden ser usados juntos" #, c-format msgid "Nothing specified, nothing added.\n" @@ -1874,9 +1910,9 @@ msgstr "archivo índice corrompido" msgid "bad action '%s' for '%s'" msgstr "mala acción '%s' para '%s'" -#, fuzzy, c-format +#, c-format msgid "invalid value for '%s': '%s'" -msgstr "valor inválido para %s: %s" +msgstr "valor inválido para '%s': '%s'" #, c-format msgid "could not read '%s'" @@ -1946,10 +1982,11 @@ msgstr "Cuando hayas resuelto este problema, ejecuta \"%s --continue\"." msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Si prefieres saltar este parche, ejecuta \"%s --skip\"." -#, fuzzy, c-format +#, c-format msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"." msgstr "" -"Para restaurar la rama original y detener el parcheo, ejecuta \"%s --abort\"." +"Para registrar el parche vacío como un commit vacío, ejecuta \"%s --allow-" +"empty\"." #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." @@ -2025,13 +2062,13 @@ msgstr "no es posible escribir el archivo índice" msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Índice sucio: no se puede aplicar parches (sucio: %s)" -#, fuzzy, c-format +#, c-format msgid "Skipping: %.*s" -msgstr "Aplicando: %.*s" +msgstr "Saltando: %.*s" -#, fuzzy, c-format +#, c-format msgid "Creating an empty commit: %.*s" -msgstr "mantener commits redundantes, vacíos" +msgstr "Creando un commit vacío: %.*s" msgid "Patch is empty." msgstr "El parche está vacío." @@ -2050,9 +2087,8 @@ msgstr "El parche falló en %s %.*s" msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "Usa 'git am --show-current-patch=diff' para ver el parche fallido" -#, fuzzy msgid "No changes - recorded it as an empty commit." -msgstr "no se agregaron cambios al commit\n" +msgstr "Sin cambios - se ha registrado como un commit vacío." msgid "" "No changes - did you forget to use 'git add'?\n" @@ -2096,9 +2132,9 @@ msgstr "" msgid "failed to read '%s'" msgstr "falló al leer '%s'" -#, fuzzy, c-format +#, c-format msgid "options '%s=%s' and '%s=%s' cannot be used together" -msgstr "Opciones --squash y --fixup no pueden ser usadas juntas" +msgstr "las opciones '%s=%s' y '%s=%s' no pueden ser usadas juntas" msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<opciones>] [(<mbox> | <Directorio-de-correo>)...]" @@ -2180,7 +2216,7 @@ msgid "show the patch being applied" msgstr "mostrar el parche siendo aplicado" msgid "record the empty patch as an empty commit" -msgstr "" +msgstr "registrar el parche vacío como un commit vacío" msgid "lie about committer date" msgstr "mentir sobre la fecha del committer" @@ -2194,9 +2230,8 @@ msgstr "key-id" msgid "GPG-sign commits" msgstr "firmar los commits con GPG" -#, fuzzy msgid "how to handle empty patches" -msgstr "mostrar el parche actual" +msgstr "cómo manejar parches vacíos" msgid "(internal use for git-rebase)" msgstr "(uso interno para git-rebase)" @@ -2366,16 +2401,16 @@ msgid "Are you sure [Y/n]? " msgstr "¿Estás seguro [Y/n]? " msgid "status: waiting for both good and bad commits\n" -msgstr "" +msgstr "estado: esperando ambos commits buenos y malos\n" #, c-format msgid "status: waiting for bad commit, %d good commit known\n" msgid_plural "status: waiting for bad commit, %d good commits known\n" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "estado: esperando commit malo, %d commit bueno conocido\n" +msgstr[1] "estado: esperando commit malo, %d commits buenos conocidos\n" msgid "status: waiting for good commit(s), bad commit known\n" -msgstr "" +msgstr "estado: esperando commit bueno, commit malo conocido\n" msgid "no terms defined" msgstr "no hay términos definidos" @@ -2475,13 +2510,13 @@ msgstr "ejecutando %s\n" msgid "bisect run failed: no command provided." msgstr "bisect falló: no se proveyó comando." -#, fuzzy, c-format +#, c-format msgid "unable to verify '%s' on good revision" -msgstr "no es posible escribir el archivo '%s' modo %o" +msgstr "no se puede verificar '%s' en la revisión buena" #, c-format msgid "bogus exit code %d for good revision" -msgstr "" +msgstr "código de salida malogrado %d de la revisión buena" #, c-format msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128" @@ -2540,9 +2575,8 @@ msgstr "saltar algunos commits para checkout" msgid "visualize the bisection" msgstr "visualizar bisección" -#, fuzzy msgid "use <cmd>... to automatically bisect" -msgstr "use <cmd>... para aplicar bisección automática." +msgstr "usa <cmd>... para bisecar automáticamente" msgid "no log for BISECT_WRITE" msgstr "no hay log para BISECT_WRITE" @@ -2695,15 +2729,15 @@ msgstr "Blaming a líneas" msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]" msgstr "git branch [<opciones>] [-r | -a] [--merged] [--no-merged]" -#, fuzzy msgid "" "git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-" "point>]" -msgstr "git branch [<opciones>] [-l] [-f] <nombre-de-rama> [<punto-inicial>]" +msgstr "" +"git branch [<opciones>] [-l] [-f] [--recurse-submodules] <nombre-de-rama> " +"[<punto-de-partida>]" -#, fuzzy msgid "git branch [<options>] [-l] [<pattern>...]" -msgstr "git for-each-ref [<opciones>] [<patrón>]" +msgstr "git branch [<opciones>] [-l] [<patrón>...]" msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "git branch [<opciones>] [-r] (-d | -D) <nombre-de-rama>..." @@ -2852,9 +2886,8 @@ msgstr "mostrar hash y tema, dar dos veces para rama upstream" msgid "suppress informational messages" msgstr "suprimir mensajes informativos" -#, fuzzy msgid "set branch tracking configuration" -msgstr "mostrar información de la rama" +msgstr "configurar rastreo de rama" msgid "do not use" msgstr "no usar" @@ -2953,9 +2986,11 @@ msgid "" "branch with --recurse-submodules can only be used if submodule." "propagateBranches is enabled" msgstr "" +"branch con --recurse-submodules solo se puede usar si submodule." +"propagateBranches está habilitado" msgid "--recurse-submodules can only be used to create branches" -msgstr "" +msgstr "--recurse-submodules solo se puede usar para crear ramas" msgid "branch name required" msgstr "se necesita el nombre de la rama" @@ -3040,9 +3075,12 @@ msgstr "información de libc: " msgid "not run from a git repository - no hooks to show\n" msgstr "no ejecutado desde un repositorio git - no hay hooks para mostrar\n" -msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]" +msgid "" +"git bugreport [-o|--output-directory <file>] [-s|--suffix <format>] [--" +"diagnose[=<mode>]" msgstr "" -"git bugreport [-o|--output-directory <archivo>] [-s|--suffix <formato>]" +"git bugreport [-o|--output-directory <archivo>] [-s|--suffix <formato>] [--" +"diagnose[=<modo>]" msgid "" "Thank you for filling out a Git bug report!\n" @@ -3079,17 +3117,30 @@ msgstr "" "Por favor revisa el resto del reporte abajo.\n" "Puedes borrar cualquier línea que no desees compartir.\n" -msgid "specify a destination for the bugreport file" -msgstr "especificar el destino para el archivo de reporte de bug" +msgid "mode" +msgstr "modo" -msgid "specify a strftime format suffix for the filename" +msgid "" +"create an additional zip archive of detailed diagnostics (default 'stats')" msgstr "" -"especificar el sufijo de formato de strftime para el nombre del archivo" +"crear una crónica zip adicional con diagnósticos detallados (por defecto " +"'stats')" + +msgid "specify a destination for the bugreport file(s)" +msgstr "especificar un destino para los archivos de reporte de bug" + +msgid "specify a strftime format suffix for the filename(s)" +msgstr "" +"especificar un sufijo de formato de strftime para los nombres de los archivos" #, c-format msgid "could not create leading directories for '%s'" msgstr "no se pudo crear directorios principales para '%s'" +#, c-format +msgid "unable to create diagnostics archive %s" +msgstr "no se puede crear la crónica diagnóstica %s" + msgid "System Info" msgstr "Información del sistema" @@ -3148,83 +3199,76 @@ msgid "Unbundling objects" msgstr "Desagrupando objetos" #, c-format -msgid "Unknown subcommand: %s" -msgstr "Sub-comando desconocido: %s" - -#, c-format msgid "cannot read object %s '%s'" msgstr "no se puede leer el objeto %s '%s'" msgid "flush is only for --buffer mode" -msgstr "" +msgstr "flush solo es para el modo --buffer" -#, fuzzy msgid "empty command in input" -msgstr "comando exec vacío" +msgstr "comando vacío en la entrada" -#, fuzzy, c-format +#, c-format msgid "whitespace before command: '%s'" -msgstr "editar mensaje antes de realizar commit" +msgstr "espacio en blanco antes del comando: '%s'" -#, fuzzy, c-format +#, c-format msgid "%s requires arguments" -msgstr "-n requiere un argumento" +msgstr "%s requiere argumentos" -#, fuzzy, c-format +#, c-format msgid "%s takes no arguments" -msgstr "%s no toma valores" +msgstr "%s no toma argumentos" -#, fuzzy, c-format +#, c-format msgid "unknown command: '%s'" -msgstr "comando desconocido: %d" +msgstr "comando desconocido: '%s'" msgid "only one batch option may be specified" msgstr "solo se puede especificar una opción batch" -#, fuzzy msgid "git cat-file <type> <object>" -msgstr "git notes edit [<objeto>]" +msgstr "git cat-file <tipo> <objeto>" -#, fuzzy msgid "git cat-file (-e | -p) <object>" -msgstr "git notes edit [<objeto>]" +msgstr "git cat-file (-e | -p) <objeto>" msgid "git cat-file (-t | -s) [--allow-unknown-type] <object>" -msgstr "" +msgstr "git cat-file (-t | -s) [--allow-unknown-type] <objeto>" -#, fuzzy msgid "" "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" "objects]\n" " [--buffer] [--follow-symlinks] [--unordered]\n" " [--textconv | --filters]" msgstr "" -"git cat-file (--batch[=<formato>] | --batch-check[=<formato>]) [--follow-" -"symlinks] [--textconv | --filters]" +"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" +"objects]\n" +" [--buffer] [--follow-symlinks] [--unordered]\n" +" [--textconv | --filters]" msgid "" "git cat-file (--textconv | --filters)\n" " [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]" msgstr "" +"git cat-file (--textconv | --filters)\n" +" [<revisión>:<ruta|árbol-ismo> | --path=<ruta|árbol-ismo> " +"<revisión>]" -#, fuzzy msgid "Check object existence or emit object contents" -msgstr "para objetos blob, ejecuta textconv en el contenido del objeto" +msgstr "Comprobar la existencia de un objeto o emitir el contenido del objeto" -#, fuzzy msgid "check if <object> exists" -msgstr "Revisando objetos" +msgstr "comprobar si <objeto> existe" -#, fuzzy msgid "pretty-print <object> content" -msgstr "realizar pretty-print del contenido del objeto" +msgstr "realizar pretty-print del contenido de <objeto>" msgid "Emit [broken] object attributes" -msgstr "" +msgstr "Emitir atributos de objeto [broken]" -#, fuzzy msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)" -msgstr "<tipo> puede ser: blob, tree, commit, tag" +msgstr "mostrar tipo de objeto (uno de 'blob', 'tree', 'commit', 'tag' ...)" msgid "show object size" msgstr "mostrar el tamaño del objeto" @@ -3232,91 +3276,91 @@ msgstr "mostrar el tamaño del objeto" msgid "allow -s and -t to work with broken/corrupt objects" msgstr "permita que -s y -t funcionen con objetos rotos o corruptos" +msgid "use mail map file" +msgstr "usar archivo de mapa de correo" + msgid "Batch objects requested on stdin (or --batch-all-objects)" -msgstr "" +msgstr "Hacer batch a los objecos solicitados en stdin (o --batch-all-objects)" msgid "show full <object> or <rev> contents" -msgstr "" +msgstr "mostrar el contenido completo de <objeto> o <revisión>" msgid "like --batch, but don't emit <contents>" -msgstr "" +msgstr "como --batch, pero no emitir <contenido>" + +msgid "stdin is NUL-terminated" +msgstr "stdin es terminada con NUL" -#, fuzzy msgid "read commands from stdin" -msgstr "leer packs de stdin" +msgstr "leer comandos de stdin" msgid "with --batch[-check]: ignores stdin, batches all known objects" msgstr "" +"con --batch[-check]: ignora stdin, hace batch a todos los objetos conocidos" msgid "Change or optimize batch output" -msgstr "" +msgstr "Cambia o optimiza la salida de batch" msgid "buffer --batch output" msgstr "salida buffer --batch" -#, fuzzy msgid "follow in-tree symlinks" -msgstr "no se pudo leer el symlink %s" +msgstr "seguir symlinks en el árbol" -#, fuzzy msgid "do not order objects before emitting them" -msgstr "no se pudo leer el objeto %s para el symlink %s" +msgstr "no ordenar objetos antes de emitirlos" msgid "" "Emit object (blob or tree) with conversion or filter (stand-alone, or with " "batch)" msgstr "" +"Emitir objeto (blob o árbol) con conversión o filtro (independiente, o con " +"batch)" -#, fuzzy msgid "run textconv on object's content" -msgstr "para objetos blob, ejecuta textconv en el contenido del objeto" +msgstr "ejecuta textconv en el contenido del objeto" -#, fuzzy msgid "run filters on object's content" -msgstr "para objetos blob, ejecuta filters en el contenido del objeto" +msgstr "ejecuta filtros en el contenido del objeto" -#, fuzzy msgid "blob|tree" -msgstr "blob" +msgstr "blob|árbol" -#, fuzzy msgid "use a <path> for (--textconv | --filters); Not with 'batch'" -msgstr "usar una ruta específica para --textconv/--filters" +msgstr "usar una <ruta> para (--textconv | --filters); No con 'batch'" #, c-format msgid "'%s=<%s>' needs '%s' or '%s'" -msgstr "" +msgstr "'%s=<%s>' necesita '%s' o '%s'" -#, fuzzy msgid "path|tree-ish" -msgstr "árbol-ismo" +msgstr "ruta|árbol-ismo" -#, fuzzy, c-format +#, c-format msgid "'%s' requires a batch mode" -msgstr "%s requiere un valor" +msgstr "'%s' requiere un modo de batch" -#, fuzzy, c-format +#, c-format msgid "'-%c' is incompatible with batch mode" -msgstr "%s es incompatible con %s" +msgstr "'-%c' es incompatible con el modo de batch" -#, fuzzy msgid "batch modes take no arguments" -msgstr "esta opción no requiere argumentos" +msgstr "los modos de batch no toman argumentos" #, c-format msgid "<rev> required with '%s'" -msgstr "" +msgstr "se requiere <revisión> con '%s'" #, c-format msgid "<object> required with '-%c'" -msgstr "" +msgstr "<objeto> requerido con '-%c'" msgid "too many arguments" msgstr "demasiados argumentos" #, c-format msgid "only two arguments allowed in <type> <object> mode, not %d" -msgstr "" +msgstr "solo se permiten dos argumentos en modo de <objeto> de <tipo>, no %d" msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." msgstr "git check-attr [-a | --all | <attr>...] [--] <nombre-de-ruta>..." @@ -3395,7 +3439,7 @@ msgid "check out all files in the index" msgstr "revisar todos los archivos en el índice" msgid "do not skip files with skip-worktree set" -msgstr "" +msgstr "no saltar archivos con skip-worktree configurado" msgid "force overwrite of existing files" msgstr "forzar sobreescritura de los archivos existentes" @@ -3555,12 +3599,12 @@ msgid_plural "" "\n" "%s\n" msgstr[0] "" -"Peligro: estás dejando %d commit atrás, no está conectado\n" +"Advertencia: estás dejando %d commit atrás, no está conectado\n" "a ninguna rama:\n" "\n" "%s\n" msgstr[1] "" -"Peligro: estás dejando %d commits atrás, no están conectados\n" +"Advertencia: estás dejando %d commits atrás, no están conectados\n" "a ninguna rama:\n" "\n" "%s\n" @@ -3618,7 +3662,7 @@ msgid "" "one remote, e.g. the 'origin' remote, consider setting\n" "checkout.defaultRemote=origin in your config." msgstr "" -"Si querías hacer un check out a una rama rastreada remota, como 'origin',\n" +"Si querías hacer un check out a una rama remota rastreada, como 'origin',\n" "puedes hacerlo proporcionando el nombre completo con la opción --track:\n" "\n" " git checkout --track origin/<nombre>\n" @@ -3665,6 +3709,8 @@ msgstr "se espera una rama, se obtuvo commit '%s'" msgid "" "If you want to detach HEAD at the commit, try again with the --detach option." msgstr "" +"Si quieres desacoplar HEAD al commit, intenta de nuevo con la opción --" +"detach." msgid "" "cannot switch branch while merging\n" @@ -3732,9 +3778,8 @@ msgstr "realizar una fusión de tres vías con la rama nueva" msgid "style" msgstr "estilo" -#, fuzzy msgid "conflict style (merge, diff3, or zdiff3)" -msgstr "estilo de conflictos (merge o diff3)" +msgstr "estilo de conflictos (merge, diff3 o zdiff3)" msgid "detach HEAD at named commit" msgstr "desacoplar HEAD en el commit nombrado" @@ -3763,9 +3808,9 @@ msgstr "hacer checkout a su versión para los archivos sin fusionar" msgid "do not limit pathspecs to sparse entries only" msgstr "no limitar pathspecs a entradas escasas solamente" -#, fuzzy, c-format +#, c-format msgid "options '-%c', '-%c', and '%s' cannot be used together" -msgstr "Opciones --squash y --fixup no pueden ser usadas juntas" +msgstr "las opciones '-%c', '-%c' y '%s' no pueden ser usadas juntas" msgid "--track needs a branch name" msgstr "--track necesita el nombre de una rama" @@ -3873,13 +3918,11 @@ msgstr "falló al borrar %s" msgid "could not lstat %s\n" msgstr "no se pudo lstat %s\n" -#, fuzzy msgid "Refusing to remove current working directory\n" -msgstr "no es posible obtener el directorio de trabajo actual" +msgstr "Rehusando eliminar el directorio de trabajo actual\n" -#, fuzzy msgid "Would refuse to remove current working directory\n" -msgstr "no es posible obtener el directorio de trabajo actual" +msgstr "Se rehusaría eliminar el directorio de trabajo actual\n" #, c-format msgid "" @@ -3923,7 +3966,7 @@ msgstr "Ingresa los patrones que ignorar>> " #, c-format msgid "WARNING: Cannot find items matched by: %s" -msgstr "PELIGRO: No se puede encontrar objetos que concuerden con: %s" +msgstr "ADVERTENCIA: No se puede encontrar objetos que concuerden con: %s" msgid "Select items to delete" msgstr "Seleccionar objetos para borrar" @@ -4108,7 +4151,7 @@ msgid "use IPv6 addresses only" msgstr "solo usar direcciones IPv6" msgid "apply partial clone filters to submodules" -msgstr "" +msgstr "aplicar filtros de clonación parcial a los submódulos" msgid "any cloned submodules will use their remote-tracking branch" msgstr "cualquier submódulo clonado usará su branch de rastreo remoto" @@ -4117,6 +4160,13 @@ msgid "initialize sparse-checkout file to include only files at root" msgstr "" "inicializar archivo sparse-checkout para incluir solo archivos en la raíz" +msgid "uri" +msgstr "uri" + +msgid "a URI for downloading bundles before fetching from origin remote" +msgstr "" +"un URI para descargar bundles antes de hacer fetch del remoto de origen" + #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: No se pudo agregar un alterno para '%s': %s\n" @@ -4176,9 +4226,10 @@ msgstr "incapaz de actualizar %s" msgid "failed to initialize sparse-checkout" msgstr "falló al inicializar sparse-checkout" -msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" +msgid "remote HEAD refers to nonexistent ref, unable to checkout" msgstr "" -"remoto HEAD refiere a un ref inexistente, no se puede hacer checkout.\n" +"la HEAD remota refiere a una referencia inexistente, no se puede hacer " +"checkout" msgid "unable to checkout working tree" msgstr "no es posible realizar checkout en el árbol de trabajo" @@ -4198,9 +4249,15 @@ msgstr "Demasiados argumentos." msgid "You must specify a repository to clone." msgstr "Tienes que especificar un repositorio para clonar." -#, fuzzy, c-format +#, c-format msgid "options '%s' and '%s %s' cannot be used together" -msgstr "Opciones --squash y --fixup no pueden ser usadas juntas" +msgstr "las opciones '%s' y '%s %s' no pueden ser usadas juntas" + +msgid "" +"--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-" +"exclude" +msgstr "" +"--bundle-uri es incompatible con --depth, --shallow-since y --shallow-exclude" #, c-format msgid "repository '%s' does not exist" @@ -4274,7 +4331,14 @@ msgid "--local is ignored" msgstr "--local es ignorado" msgid "cannot clone from filtered bundle" -msgstr "" +msgstr "no se puede clonar de un bundle filtrado" + +msgid "failed to initialize the repo, skipping bundle URI" +msgstr "falló al inicializar el repositorio, saltando el URI de bundle" + +#, c-format +msgid "failed to fetch objects from bundle URI '%s'" +msgstr "falló al hacer fetch de objetos del URI de bundle '%s'" msgid "remote transport reported error" msgstr "transporte remoto reportó error" @@ -4389,10 +4453,6 @@ msgstr "usa como máximo uno de --reachable, --stdin-commits, o --stdin-packs" msgid "Collecting commits from input" msgstr "Recolectando commits del input" -#, c-format -msgid "unrecognized subcommand: %s" -msgstr "subcomando desconocido: %s" - msgid "" "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " "<file>)...] <tree>" @@ -4569,9 +4629,9 @@ msgstr "no se pudo leer log desde standard input" msgid "could not read log file '%s'" msgstr "no se pudo leer el log '%s'" -#, fuzzy, c-format +#, c-format msgid "options '%s' and '%s:%s' cannot be used together" -msgstr "Opciones --squash y --fixup no pueden ser usadas juntas" +msgstr "las opciones '%s' y '%s:%s' no pueden ser usadas juntas" msgid "could not read SQUASH_MSG" msgstr "no se pudo leer SQUASH_MSG" @@ -4694,13 +4754,13 @@ msgstr "Estás en medio de una fusión -- no se puede refrasear." msgid "You are in the middle of a cherry-pick -- cannot reword." msgstr "Estás en medio de un cherry-pick -- no se puede refrasear." -#, fuzzy, c-format +#, c-format msgid "reword option of '%s' and path '%s' cannot be used together" -msgstr "Opciones --squash y --fixup no pueden ser usadas juntas" +msgstr "la opción reword de '%s' y la ruta '%s' no pueden ser usadas juntas" -#, fuzzy, c-format +#, c-format msgid "reword option of '%s' and '%s' cannot be used together" -msgstr "Opciones --squash y --fixup no pueden ser usadas juntas" +msgstr "la opción reword de '%s' y '%s' no pueden ser usadas juntas" msgid "You have nothing to amend." msgstr "No tienes nada que enmendar." @@ -4749,9 +4809,6 @@ msgstr "mostrar status en formato largo (default)" msgid "terminate entries with NUL" msgstr "terminar entradas con NUL" -msgid "mode" -msgstr "modo" - msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "mostrar archivos sin seguimiento, modos opcionales: all, normal, no. " @@ -5342,9 +5399,26 @@ msgstr "adjuntar <marca> en un árbol de trabajo roto (default: \"-broken\")" msgid "No names found, cannot describe anything." msgstr "No se encontraron nombres, no se puede describir nada." -#, fuzzy, c-format +#, c-format msgid "option '%s' and commit-ishes cannot be used together" -msgstr "Opciones --squash y --fixup no pueden ser usadas juntas" +msgstr "la opción '%s' y los commit-ismos no pueden ser usados juntos" + +msgid "" +"git diagnose [-o|--output-directory <path>] [-s|--suffix <format>] [--" +"mode=<mode>]" +msgstr "" +"git diagnose [-o|--output-directory <ruta>] [-s|--suffix <formato>] [--" +"mode=<modo>]" + +msgid "specify a destination for the diagnostics archive" +msgstr "especificar un destino para la crónica diagnóstica" + +msgid "specify a strftime format suffix for the filename" +msgstr "" +"especificar el sufijo de formato de strftime para el nombre del archivo" + +msgid "specify the content of the diagnostic archive" +msgstr "especificar el contenido de la crónica diagnóstica" msgid "--merge-base only works with two commits" msgstr "--merge-base solo funciona con dos commits" @@ -5488,9 +5562,8 @@ msgid "" msgstr "" "opción `--default' espera un valor unsigned long con `--type=ulong`, no `%s`" -#, fuzzy msgid "git fast-export [<rev-list-opts>]" -msgstr "git fast-export [rev-list-opts]" +msgstr "git fast-export [<opciones-de-rev-list>]" msgid "Error: Cannot export nested tags unless --mark-tags is specified." msgstr "" @@ -5669,7 +5742,7 @@ msgid "convert to a complete repository" msgstr "convertir a un repositorio completo" msgid "re-fetch without negotiating common commits" -msgstr "" +msgstr "hacer fetch de nuevo sin negociar commits en común" msgid "prepend this to submodule path output" msgstr "anteponer esto a la salida de ruta del submódulo" @@ -5688,15 +5761,15 @@ msgid "refmap" msgstr "refmap" msgid "specify fetch refmap" -msgstr "especificar extracción de refmap" +msgstr "especificar el mapa de referencias de fetch" msgid "report that we have only objects reachable from this object" msgstr "reportar que solo tenemos objetos alcanzables de este objeto" msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" msgstr "" -"no realizar fetch al packfile; en lugar de eso, mostrar los ancestros de las " -"puntas de negociación" +"no realizar fetch de un archivo de pack; en lugar de eso, mostrar los " +"ancestros de las puntas de negociación" msgid "run 'maintenance --auto' after fetching" msgstr "ejecutar 'maintenance --auto' después de buscar" @@ -5710,9 +5783,8 @@ msgstr "escribir commit-graph luego del fetch" msgid "accept refspecs from stdin" msgstr "aceptar refspecs de stdin" -#, fuzzy msgid "couldn't find remote ref HEAD" -msgstr "No se pudo encontrar ref remota HEAD" +msgstr "no se pudo encontrar la referencia remota HEAD" #, c-format msgid "object %s not found" @@ -5724,12 +5796,8 @@ msgstr "[actualizado]" msgid "[rejected]" msgstr "[rechazado]" -msgid "can't fetch in current branch" -msgstr "no se puede traer en la rama actual" - -#, fuzzy -msgid "checked out in another worktree" -msgstr "buscar en el índice en lugar del árbol de trabajo" +msgid "can't fetch into checked-out branch" +msgstr "no se puede hacer fetch a la rama actual" msgid "[tag update]" msgstr "[actualización de tag]" @@ -5759,25 +5827,24 @@ msgstr "avance no rápido" msgid "cannot open '%s'" msgstr "no se puede abrir '%s'" -#, fuzzy msgid "" "fetch normally indicates which branches had a forced update,\n" "but that check has been disabled; to re-enable, use '--show-forced-updates'\n" "flag or run 'git config fetch.showForcedUpdates true'" msgstr "" -"Fetch normalmente incida qué branches han tenido un update forzado,\n" +"fetch normalmente indica cuáles ramas han tenido una actualización forzada,\n" "pero esa validación ha sido deshabilitada. Para activarla de nuevo usa '--" "show-forced-updates'\n" -"o ejecuta 'git config fetch.showForcedUpdates true'." +"o ejecuta 'git config fetch.showForcedUpdates true'" -#, fuzzy, c-format +#, c-format msgid "" "it took %.2f seconds to check forced updates; you can use\n" "'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates " "false'\n" "to avoid this check\n" msgstr "" -"Tomó %.2f segundos validar los updates forzados. Puedes usar\n" +"tomó %.2f segundos validar las actualizaciones forzadas. Se puede usar\n" "'--no-show-forced-updates' o ejecutar 'git config fetch.showForcedUpdates " "false'\n" "para evitar esta validación.\n" @@ -5816,17 +5883,17 @@ msgstr "[eliminado]" msgid "(none)" msgstr "(nada)" -#, fuzzy, c-format +#, c-format msgid "refusing to fetch into branch '%s' checked out at '%s'" -msgstr "No se puede borrar rama '%s' que cuenta con checkout en '%s'" +msgstr "rehusando hacer fetch a la rama '%s' que cuenta con checkout en '%s'" -#, fuzzy, c-format +#, c-format msgid "option \"%s\" value \"%s\" is not valid for %s" -msgstr "Valor \"%2$s\" de opción \"%1$s\" no es válido para %3$s" +msgstr "el valor \"%2$s\" de la opción \"%1$s\" no es válido para %3$s" -#, fuzzy, c-format +#, c-format msgid "option \"%s\" is ignored for %s\n" -msgstr "Opción \"%s\" es ignorada por %s\n" +msgstr "la opción \"%s\" es ignorada por %s\n" #, c-format msgid "%s is not a valid object" @@ -5839,13 +5906,13 @@ msgstr "el objeto %s no existe" msgid "multiple branches detected, incompatible with --set-upstream" msgstr "múltiples ramas detectadas, incompatible con --set-upstream" -#, fuzzy, c-format +#, c-format msgid "" "could not set upstream of HEAD to '%s' from '%s' when it does not point to " "any branch." msgstr "" -"no se pudo configurar upstream de HEAD a %s cuando este no apunta a ninguna " -"rama." +"no se pudo cambiar el upstream de HEAD de '%s' a '%s' cuando este no apunta " +"a ninguna rama." msgid "not setting upstream for a remote remote-tracking branch" msgstr "no configurar upstream para una rama de rastreo remoto" @@ -5856,45 +5923,40 @@ msgstr "no configurar upstream para un tag remoto" msgid "unknown branch type" msgstr "tipo de branch desconocido" -#, fuzzy msgid "" "no source branch found;\n" "you need to specify exactly one branch with the --set-upstream option" msgstr "" "no se encontró rama fuente.\n" -"tienes que especificar exactamente una rama con la opción --set-upstream." +"hay que especificar exactamente una rama con la opción --set-upstream" #, c-format msgid "Fetching %s\n" msgstr "Extrayendo %s\n" -#, fuzzy, c-format +#, c-format msgid "could not fetch %s" -msgstr "No se pudo extraer %s" +msgstr "no se pudo hacer fetch de %s" #, c-format msgid "could not fetch '%s' (exit code: %d)\n" msgstr "no se pudo hacer fetch a '%s' (código de salida: %d)\n" -#, fuzzy msgid "" "no remote repository specified; please specify either a URL or a\n" "remote name from which new revisions should be fetched" msgstr "" -"No hay repositorio remoto especificado. Por favor, especifica un URL o un\n" -"nombre remoto del cual las nuevas revisiones deben ser extraídas." +"no hay repositorio remoto especificado. Por favor, especifica un URL o un\n" +"nombre remoto del cual hacer fetch de las nuevas revisiones" -#, fuzzy msgid "you need to specify a tag name" -msgstr "Tienes que especificar un nombre de tag." +msgstr "hay que especificar un nombre de etiqueta" -#, fuzzy msgid "--negotiate-only needs one or more --negotiation-tip=*" -msgstr "--negotiate-only necesita uno o más --negotiate-tip=*" +msgstr "--negotiate-only necesita uno o más --negotiation-tip=*" -#, fuzzy msgid "negative depth in --deepen is not supported" -msgstr "Profundidad negativa en --deepen no soportada" +msgstr "profundidad negativa en --deepen no es soportada" msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow no tiene sentido en un repositorio completo" @@ -5905,20 +5967,20 @@ msgstr "fetch --all no toma un argumento de repositorio" msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all no tiene sentido con refspecs" -#, fuzzy, c-format +#, c-format msgid "no such remote or remote group: %s" -msgstr "No existe el remoto o grupo remoto: %s" +msgstr "no existe tal remoto o grupo remoto: %s" -#, fuzzy msgid "fetching a group and specifying refspecs does not make sense" -msgstr "Extraer un grupo y especificar refspecs no tiene sentido" +msgstr "" +"hacer fetch de un grupo y especificar especificaciones de referencia no " +"tiene sentido" msgid "must supply remote when using --negotiate-only" msgstr "tiene que proveer un remoto cuando usa --negotiate-only" -#, fuzzy msgid "protocol does not support --negotiate-only, exiting" -msgstr "Protocolo no soporta --negotiate-only, saliendo." +msgstr "el protocolo no soporta --negotiate-only, saliendo" msgid "" "--filter can only be used with the remote configured in extensions." @@ -5950,9 +6012,8 @@ msgstr "texto" msgid "use <text> as start of message" msgstr "usar <text> como comienzo de mensaje" -#, fuzzy msgid "use <name> instead of the real target branch" -msgstr "usar <nombre> en lugar de 'origin' para rastrear upstream" +msgstr "usar <nombre> en lugar de la rama de destino real" msgid "file to read from" msgstr "archivo del cual leer" @@ -6025,7 +6086,7 @@ msgstr "error en %s %s: %s" #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> #, c-format msgid "warning in %s %s: %s" -msgstr "peligro en %s %s: %s" +msgstr "advertencia en %s %s: %s" #, c-format msgid "broken link from %7s %s" @@ -6093,11 +6154,11 @@ msgstr "tagged %s %s (%s) en %s" #, c-format msgid "%s: object corrupt or missing" -msgstr "%s: objecto corrupto o faltante" +msgstr "%s: objeto corrupto o faltante" #, c-format msgid "%s: invalid reflog entry %s" -msgstr "%s: referencia inválida %s" +msgstr "%s: entrada de log de referencias inválida %s" #, c-format msgid "Checking reflog %s->%s" @@ -6170,6 +6231,10 @@ msgstr "%s: puntero inválido sha1 en cache-tree" msgid "non-tree in cache-tree" msgstr "non-tree en cache-tree" +#, c-format +msgid "%s: invalid sha1 pointer in resolve-undo" +msgstr "%s: puntero inválido sha1 en resolve-undo" + msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<opciones>] [<objeto>...]" @@ -6220,79 +6285,73 @@ msgstr "%s: objeto faltante" msgid "invalid parameter: expected sha1, got '%s'" msgstr "parámetro inválido: sha1 esperado, se obtuvo '%s'" -#, fuzzy msgid "git fsmonitor--daemon start [<options>]" -msgstr "git stash list [<opciones>]" +msgstr "git fsmonitor--daemon start [<opciones>]" -#, fuzzy msgid "git fsmonitor--daemon run [<options>]" -msgstr "git notes prune [<opciones>]" +msgstr "git fsmonitor--daemon run [<opciones>]" msgid "git fsmonitor--daemon stop" -msgstr "" +msgstr "git fsmonitor--daemon stop" msgid "git fsmonitor--daemon status" -msgstr "" +msgstr "git fsmonitor--daemon status" -#, fuzzy, c-format +#, c-format msgid "value of '%s' out of range: %d" -msgstr "largo de abreviatura fuera de rango: %d" +msgstr "valor de '%s' fuera de rango: %d" -#, fuzzy, c-format +#, c-format msgid "value of '%s' not bool or int: %d" -msgstr "valor es --bool o --int" +msgstr "valor de '%s' no bool ni int: %d" #, c-format msgid "fsmonitor-daemon is watching '%s'\n" -msgstr "" +msgstr "fsmonitor-daemon está vigilando '%s'\n" #, c-format msgid "fsmonitor-daemon is not watching '%s'\n" -msgstr "" +msgstr "fsmonitor-daemon no está vigilando '%s'\n" -#, fuzzy, c-format +#, c-format msgid "could not create fsmonitor cookie '%s'" -msgstr "no se pudo crear el archivo '%s'" +msgstr "no se pudo crear la galleta de fsmonitor '%s'" #, c-format msgid "fsmonitor: cookie_result '%d' != SEEN" -msgstr "" +msgstr "fsmonitor: cookie_result '%d' != SEEN" -#, fuzzy, c-format +#, c-format msgid "could not start IPC thread pool on '%s'" -msgstr "no se pudo iniciar el servidor en: '%s'" +msgstr "no se pudo iniciar el pool de hilos IPC en '%s'" -#, fuzzy msgid "could not start fsmonitor listener thread" -msgstr "no se pudo comenzar ls-files en .." +msgstr "no se pudo iniciar el hilo escuchante de fsmonitor" -#, fuzzy msgid "could not start fsmonitor health thread" -msgstr "no se pudo iniciar el accept_thread '%s'" +msgstr "no se pudo iniciar el hilo de salud de fsmonitor" -#, fuzzy msgid "could not initialize listener thread" -msgstr "no se pudo guardar el árbol de índice" +msgstr "no se pudo inicializar el hilo escuchante" -#, fuzzy msgid "could not initialize health thread" -msgstr "no se pudo normalizar la ruta %s" +msgstr "no se pudo inicializar el hilo de salud" -#, fuzzy, c-format +#, c-format msgid "could not cd home '%s'" -msgstr "no se pudo cerrar '%s'" +msgstr "no se pudo cambiar al directorio personal '%s'" #, c-format msgid "fsmonitor--daemon is already running '%s'" -msgstr "" +msgstr "fsmonitor--daemon ya está ejecutando '%s'" #, c-format msgid "running fsmonitor-daemon in '%s'\n" -msgstr "" +msgstr "ejecutando fsmonitor-daemon en '%s'\n" -#, fuzzy, c-format +#, c-format msgid "starting fsmonitor-daemon in '%s'\n" -msgstr "Probando mtime en '%s' " +msgstr "iniciando fsmonitor-daemon en '%s'\n" msgid "daemon failed to start" msgstr "falló al iniciar demonio" @@ -6300,32 +6359,28 @@ msgstr "falló al iniciar demonio" msgid "daemon not online yet" msgstr "demonio no está en línea todavía" -#, fuzzy msgid "daemon terminated" -msgstr "no hay términos definidos" +msgstr "demonio terminado" -#, fuzzy msgid "detach from console" -msgstr "HEAD desacoplada de " +msgstr "desacoplar de la consola" -#, fuzzy msgid "use <n> ipc worker threads" -msgstr "usar <n> hilos de trabajo" +msgstr "usar <n> hilos de trabajo ipc" -#, fuzzy msgid "max seconds to wait for background daemon startup" -msgstr "segundos a esperar para que el dominio empiece o se detenga" +msgstr "segundos máximos a esperar el inicio del demonio de fondo" -#, fuzzy, c-format +#, c-format msgid "invalid 'ipc-threads' value (%d)" -msgstr "valor --stat inválido: %s" +msgstr "valor 'ipc-threads' inválido (%d)" -#, fuzzy, c-format +#, c-format msgid "Unhandled subcommand '%s'" -msgstr "subcomando no válido: %s" +msgstr "Subcomando no manejado '%s'" msgid "fsmonitor--daemon not supported on this platform" -msgstr "" +msgstr "fsmonitor--daemon no es soportado en este plataforma" msgid "git gc [<options>]" msgstr "git gc [<opciones>]" @@ -6359,9 +6414,8 @@ msgstr "" msgid "prune unreferenced objects" msgstr "recortar objetos no referenciados" -#, fuzzy msgid "pack unreferenced objects separately" -msgstr "recortar objetos no referenciados" +msgstr "empacar separadamente objetos no referenciados" msgid "be more thorough (increased runtime)" msgstr "ser más exhaustivo (aumentar runtime)" @@ -6376,8 +6430,8 @@ msgid "repack all other packs except the largest pack" msgstr "reempaquetar todos los otros paquetes excepto el paquete más grande" #, c-format -msgid "failed to parse gc.logexpiry value %s" -msgstr "falló al analizar valor %s de gc.logexpiry" +msgid "failed to parse gc.logExpiry value %s" +msgstr "falló al analizar el valor %s de gc.logExpiry" #, c-format msgid "failed to parse prune expiry value %s" @@ -6514,13 +6568,16 @@ msgid "failed to run 'crontab -l'; your system might not support 'cron'" msgstr "" "no se pudo ejecutar 'crontab -l'; es posible que su sistema no soporte 'cron'" +msgid "failed to create crontab temporary file" +msgstr "falló al crear el archivo temporal de crontab" + +msgid "failed to open temporary file" +msgstr "falló al abrir un archivo temporal" + msgid "failed to run 'crontab'; your system might not support 'cron'" msgstr "" "no se pudo ejecutar 'crontab'; es posible que su sistema no soporte 'cron'" -msgid "failed to open stdin of 'crontab'" -msgstr "no se pudo abrir stdin de 'crontab'" - msgid "'crontab' died" msgstr "'crontab' murió" @@ -6567,10 +6624,6 @@ msgstr "no se pudo agregar el repositorio a la configuración global" msgid "git maintenance <subcommand> [<options>]" msgstr "git maintenance <subcomando> [<opciones>]" -#, c-format -msgid "invalid subcommand: %s" -msgstr "subcomando no válido: %s" - msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<opciones>] [-e] <patrón> [<rev>...] [[--] <ruta>...]" @@ -6582,7 +6635,6 @@ msgstr "grep: falló al crear el hilo: %s" msgid "invalid number of threads specified (%d) for %s" msgstr "número inválido de hilos especificado (%d) para %s" -#. #-#-#-#-# grep.c.po #-#-#-#-# #. TRANSLATORS: %s is the configuration #. variable for tweaking threads, currently #. grep.threads @@ -6745,6 +6797,9 @@ msgstr "mostrar archivos concordantes en el paginador" msgid "allow calling of grep(1) (ignored by this build)" msgstr "permitir el llamado de grep(1) (ignorado por esta build)" +msgid "maximum number of results per file" +msgstr "número máximo de resultados por archivo" + msgid "no pattern given" msgstr "no se ha entregado ningún patrón" @@ -6808,13 +6863,11 @@ msgstr "procesar el archivo como si fuera de esta ruta" msgid "print all available commands" msgstr "mostrar todos los comandos disponibles" -#, fuzzy msgid "show external commands in --all" -msgstr "Comandos externos" +msgstr "mostrar comandos externos en --all" -#, fuzzy msgid "show aliases in --all" -msgstr "mostrar lista de tags en columnas" +msgstr "mostrar aliases en --all" msgid "exclude guides" msgstr "excluir las guias" @@ -6834,14 +6887,21 @@ msgstr "imprimir descripción del comando" msgid "print list of useful guides" msgstr "mostrar una lista de guías útiles" +msgid "print list of user-facing repository, command and file interfaces" +msgstr "" +"imprimir lista de interfaces de repositorio, comando y archivo orientadas al " +"usuario" + +msgid "print list of file formats, protocols and other developer interfaces" +msgstr "" +"imprimir lista de formatos de archivos, protocolos y otras interfaces para " +"el desarrollador" + msgid "print all configuration variable names" msgstr "imprimir todos los nombres de variables de configuración" -#, fuzzy -msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]" -msgstr "" -"git help [-a|--all] [--[no-]verbose]]\n" -" [[-i|--info] [-m|--man] [-w|--web]] [<command>]" +msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>|<doc>]" +msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<comando>|<documento>]" #, c-format msgid "unrecognized help format '%s'" @@ -6895,13 +6955,15 @@ msgstr "'%s' tiene el alias '%s'" msgid "bad alias.%s string: %s" msgstr "mal alias.%s string: %s" -#, fuzzy, c-format +#, c-format msgid "the '%s' option doesn't take any non-option arguments" -msgstr "esta opción no requiere argumentos" +msgstr "la opción '%s' no toma ningún argumento aparte de opciones" msgid "" "the '--no-[external-commands|aliases]' options can only be used with '--all'" msgstr "" +"las opciones '--no-[external-commands|aliases]' solo pueden ser usadas con " +"'--all'" #, c-format msgid "usage: %s%s" @@ -6912,9 +6974,10 @@ msgstr "'git help config' para más información" msgid "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]" msgstr "" +"git hook run [--ignore-missing] <nombre-de-hook> [-- <argumentos-de-hook>]" msgid "silently ignore missing requested <hook-name>" -msgstr "" +msgstr "ignorar silenciosamente <nombre-de-hook> solicitado y faltante" #, c-format msgid "object type mismatch at %s" @@ -6946,9 +7009,9 @@ msgstr "se usaron más bytes de los disponibles" msgid "pack too large for current definition of off_t" msgstr "paquete demasiado grande para la definición actual de off_t" -#, fuzzy, c-format +#, c-format msgid "pack exceeds maximum allowed size (%s)" -msgstr "paquete excede el máximo tamaño permitido" +msgstr "el pack excede el tamaño máximo permitido (%s)" msgid "pack signature mismatch" msgstr "firma del paquete no concuerda" @@ -6981,8 +7044,8 @@ msgstr "no se puede hacer pread en el paquete" #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" -msgstr[0] "final prematuro de archivo de paquete, %<PRIuMAX> byte faltante" -msgstr[1] "final prematuro de archivo de paquete, %<PRIuMAX> bytes faltantes" +msgstr[0] "fin prematuro de archivo de paquete, %<PRIuMAX> byte faltante" +msgstr[1] "fin prematuro de archivo de paquete, %<PRIuMAX> bytes faltantes" msgid "serious inflate inconsistency" msgstr "inconsistencia seria en inflate" @@ -7089,8 +7152,8 @@ msgid "error while closing pack file" msgstr "error mientras se cerraba el archivo paquete" #, c-format -msgid "bad pack.indexversion=%<PRIu32>" -msgstr "mal pack.indexversion=%<PRIu32>" +msgid "bad pack.indexVersion=%<PRIu32>" +msgstr "mal pack.indexVersion=%<PRIu32>" #, c-format msgid "Cannot open existing pack file '%s'" @@ -7311,8 +7374,8 @@ msgstr "suprimir salida de diff" msgid "show source" msgstr "mostrar fuente" -msgid "use mail map file" -msgstr "usar archivo de mapa de mail" +msgid "clear all previously-defined decoration filters" +msgstr "limpiar todos los filtros de decoración previamente definidos" msgid "only decorate refs that match <pattern>" msgstr "solo decorar refs que concuerden con <patrón>" @@ -7341,9 +7404,8 @@ msgstr "-L<rango>:<archivo> no se puede usar con pathspec" msgid "Final output: %d %s\n" msgstr "Salida final: %d %s\n" -#, fuzzy msgid "unable to create temporary object directory" -msgstr "no es posible crear un archivo temporal" +msgstr "incapaz de crear directorio temporal de objetos" #, c-format msgid "git show %s: bad file" @@ -7572,6 +7634,9 @@ msgstr "mostrar cambios contra <refspec> en cover letter o en un solo parche" msgid "percentage by which creation is weighted" msgstr "porcentaje por el cual la creación es pesada" +msgid "show in-body From: even if identical to the e-mail header" +msgstr "mostrar From: en el cuerpo aunque sea idéntico a la cabecera de e-mail" + #, c-format msgid "invalid ident line: %s" msgstr "línea de identificación inválida: %s" @@ -7585,9 +7650,8 @@ msgstr "--name-status no tiene sentido" msgid "--check does not make sense" msgstr "--check no tiene sentido" -#, fuzzy msgid "--remerge-diff does not make sense" -msgstr "--name-only no tiene sentido" +msgstr "--remerge-diff no tiene sentido" #, c-format msgid "could not create directory '%s'" @@ -7633,6 +7697,18 @@ msgstr "" "No se pudo encontrar una rama remota rastreada, por favor especifica " "<upstream> manualmente.\n" +#, c-format +msgid "bad ls-files format: element '%s' does not start with '('" +msgstr "formato malo de ls-files: el elemento '%s' no comienza con '('" + +#, c-format +msgid "bad ls-files format: element '%s' does not end in ')'" +msgstr "formato malo de ls-files: el elemento '%s' no termina en ')'" + +#, c-format +msgid "bad ls-files format: %%%.*s" +msgstr "formato malo de ls-files: %%%.*s" + msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<opciones>] [<archivo>...]" @@ -7716,9 +7792,15 @@ msgstr "mostrar data de debug" msgid "suppress duplicate entries" msgstr "suprimir entradas duplicadas" -#, fuzzy msgid "show sparse directories in the presence of a sparse index" -msgstr "activar el uso de un índice sparse" +msgstr "mostrar directorios escasos en la presencia de un índice escaso" + +msgid "" +"--format cannot be used with -s, -o, -k, -t, --resolve-undo, --deduplicate, " +"--eol" +msgstr "" +"--format no puede ser usado con -s, -o, -k, -t, --resolve-undo, --" +"deduplicate, --eol" msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" @@ -7759,21 +7841,21 @@ msgstr "mostrar ref subyacente en adición al objeto apuntado por él" msgid "git ls-tree [<options>] <tree-ish> [<path>...]" msgstr "git ls-tree [<opciones>] <árbol-ismo> [<ruta>...]" -#, fuzzy, c-format +#, c-format msgid "could not get object info about '%s'" -msgstr "no se pudo analizar el objeto '%s'" +msgstr "no se pudo averiguar información sobre el objeto '%s'" -#, fuzzy, c-format +#, c-format msgid "bad ls-tree format: element '%s' does not start with '('" -msgstr "el nombre del archivo de paquete '%s' no termina con '.%s'" +msgstr "formato malo de ls-tree: el elemento '%s' no comienza con '('" -#, fuzzy, c-format +#, c-format msgid "bad ls-tree format: element '%s' does not end in ')'" -msgstr "el nombre del archivo de paquete '%s' no termina con '.%s'" +msgstr "formato malo de ls-tree: el elemento '%s' no termina en ')'" -#, fuzzy, c-format +#, c-format msgid "bad ls-tree format: %%%.*s" -msgstr "formato inválido: %s" +msgstr "formato malo de ls-tree: %%%.*s" msgid "only show trees" msgstr "solo mostrar árboles" @@ -7793,9 +7875,8 @@ msgstr "incluir tamaño de objeto" msgid "list only filenames" msgstr "listar solo nombres de archivos" -#, fuzzy msgid "list only objects" -msgstr "Escribiendo objetos" +msgstr "listar solo objetos" msgid "use full path names" msgstr "usar rutas completas" @@ -7804,9 +7885,9 @@ msgid "list entire tree; not just current directory (implies --full-name)" msgstr "" "mostrar todo el árbol; no solo el directorio actual (implica --full-name)" -#, fuzzy msgid "--format can't be combined with other format-altering options" -msgstr "--mirror no puede ser combinado con refspecs" +msgstr "" +"--format no se puede combinar con otras opciones que alteren el formato" #. TRANSLATORS: keep <> in "<" mail ">" info. msgid "git mailinfo [<options>] <msg> <patch> < mail >info" @@ -7845,9 +7926,8 @@ msgstr "actión cuando se encuentra un CR citado" msgid "use headers in message's body" msgstr "usar cabeceras en el cuerpo del mensaje" -#, fuzzy msgid "reading patches from stdin/tty..." -msgstr "leer actualizaciones de stdin" +msgstr "leyendo parches de stdin/tty..." #, c-format msgid "empty mbox: '%s'" @@ -7896,9 +7976,8 @@ msgstr "mandar resultados a standard output" msgid "use a diff3 based merge" msgstr "usar una fusión basada en diff3" -#, fuzzy msgid "use a zealous diff3 based merge" -msgstr "usar una fusión basada en diff3" +msgstr "usar una fusión celosa basada en diff3" msgid "for conflicts, use our version" msgstr "por conflictos, usar nuestra versión" @@ -7943,6 +8022,39 @@ msgstr "no se pudo resolver ref '%s'" msgid "Merging %s with %s\n" msgstr "Fusionando %s con %s\n" +msgid "not something we can merge" +msgstr "no es nada que se pueda fusionar" + +msgid "refusing to merge unrelated histories" +msgstr "rehusando fusionar historias no relacionadas" + +msgid "failure to merge" +msgstr "falló al fusionar" + +msgid "git merge-tree [--write-tree] [<options>] <branch1> <branch2>" +msgstr "git merge-tree [--write-tree] [<opciones>] <rama1> <rama2>" + +msgid "git merge-tree [--trivial-merge] <base-tree> <branch1> <branch2>" +msgstr "git merge-tree [--trivial-merge] <árbol-base> <rama1> <rama2>" + +msgid "do a real merge instead of a trivial merge" +msgstr "hacer una fusión real en vez de una fusión trivial" + +msgid "do a trivial merge only" +msgstr "hacer solo una fusión trivial" + +msgid "also show informational/conflict messages" +msgstr "también mostrar mensajes informativos o de conflictos" + +msgid "list filenames without modes/oids/stages" +msgstr "listar nombres de archivo sin modos/oids/etapas" + +msgid "allow merging unrelated histories" +msgstr "permitir fusionar historias no relacionadas" + +msgid "--trivial-merge is incompatible with all other options" +msgstr "--trivial-merge es incompatible con cualquier otra opción" + msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<opciones>] [<commit>...]" @@ -8012,9 +8124,8 @@ msgstr "opción para la estrategia de fusión seleccionada" msgid "merge commit message (for a non-fast-forward merge)" msgstr "fusionar mensaje de commit (para una fusión no fast-forward)" -#, fuzzy msgid "use <name> instead of the real target" -msgstr "usar <nombre> en lugar de 'origin' para rastrear upstream" +msgstr "usar <nombre> en lugar del destino real" msgid "abort the current in-progress merge" msgstr "abortar la fusión en progreso actual" @@ -8025,9 +8136,6 @@ msgstr "--abort pero no tocar el índice ni el árbol de trabajo" msgid "continue the current in-progress merge" msgstr "continuar la fusión en progreso actual" -msgid "allow merging unrelated histories" -msgstr "permitir fusionar historias no relacionadas" - msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "hacer un bypass a hooks pre-merge-commit y commit-msg" @@ -8149,9 +8257,6 @@ msgstr "no se pudo cerrar '%s'" msgid "not something we can merge in %s: %s" msgstr "nada que podamos fusionar en %s: %s" -msgid "not something we can merge" -msgstr "nada que podamos fusionar" - msgid "--abort expects no arguments" msgstr "--abort no espera argumentos" @@ -8201,14 +8306,20 @@ msgstr "%s - nada que podamos fusionar" msgid "Can merge only exactly one commit into empty head" msgstr "Solo se puede fusionar exactamente un commit en un head vacío" -msgid "refusing to merge unrelated histories" -msgstr "rehusando fusionar historias no relacionadas" - #, c-format msgid "Updating %s..%s\n" msgstr "Actualizando %s..%s\n" #, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" +"Los cambios locales a los archivos siguientes serían sobreescritos al " +"fusionar:\n" +" %s" + +#, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Intentando fusión en índice realmente trivial...\n" @@ -8242,8 +8353,13 @@ msgstr "" "Fusión automática fue bien; detenida antes del commit como se solicitó\n" #, c-format +msgid "When finished, apply stashed changes with `git stash pop`\n" +msgstr "" +"Cuando esté terminado, aplica los cambios en stash con `git stash pop`\n" + +#, c-format msgid "warning: tag input does not pass fsck: %s" -msgstr "peligro: información de tag no pasa fsck: %s" +msgstr "advertencia: la información de etiqueta no pasa fsck: %s" #, c-format msgid "error: tag input does not pass fsck: %s" @@ -8298,9 +8414,8 @@ msgstr "git multi-pack-index [<opciones>] expire" msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]" msgstr "git multi-pack-index [<opciones>] repack [--batch-size=<tamaño>]" -#, fuzzy msgid "directory" -msgstr "archivo/directorio" +msgstr "directorio" msgid "object directory containing set of packfile and pack-index pairs" msgstr "" @@ -8361,6 +8476,9 @@ msgstr "Revisando cambio de nombre de '%s' a '%s'\n" msgid "bad source" msgstr "mala fuente" +msgid "destination exists" +msgstr "el destino existe" + msgid "can not move directory into itself" msgstr "no se puede mover un directorio en sí mismo" @@ -8376,9 +8494,6 @@ msgstr "no se encuentra bajo control de versiones" msgid "conflicted" msgstr "en conflicto" -msgid "destination exists" -msgstr "destino existe" - #, c-format msgid "overwriting '%s'" msgstr "sobrescribiendo '%s'" @@ -8392,6 +8507,9 @@ msgstr "múltiples fuentes para el mismo destino" msgid "destination directory does not exist" msgstr "el directorio de destino no existe" +msgid "destination exists in the index" +msgstr "el destino existe en el índice" + #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, fuente=%s, destino=%s" @@ -8410,9 +8528,8 @@ msgstr "git name-rev [<opciones>] <commit>..." msgid "git name-rev [<options>] --all" msgstr "git name-rev [<opciones>] --all" -#, fuzzy msgid "git name-rev [<options>] --annotate-stdin" -msgstr "git name-rev [<opciones>] --stdin" +msgstr "git name-rev [<opciones>] --annotate-stdin" msgid "print only ref-based names (no object names)" msgstr "imprimir solo nombres basados en referencias (sin nombres de objetos)" @@ -8429,12 +8546,11 @@ msgstr "ignorar refs que concuerden con <patrón>" msgid "list all commits reachable from all refs" msgstr "listar todos los commits alcanzables desde todas las referencias" -msgid "deprecated: use annotate-stdin instead" -msgstr "" +msgid "deprecated: use --annotate-stdin instead" +msgstr "deprecado: usa --annotate-stdin en su lugar" -#, fuzzy msgid "annotate text from stdin" -msgstr "leer el objeto de stdin" +msgstr "anotar el texto de stdin" msgid "allow to print `undefined` names (default)" msgstr "permitir imprimir nombres `undefined` (predeterminado)" @@ -8753,8 +8869,8 @@ msgid "use notes from <notes-ref>" msgstr "usar notas desde <referencia-de-notas>" #, c-format -msgid "unknown subcommand: %s" -msgstr "subcomando desconocido: %s" +msgid "unknown subcommand: `%s'" +msgstr "subcomando desconocido: '%s'" msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" @@ -8896,21 +9012,18 @@ msgstr "no se puede obtener el tipo de objeto %s en pack %s" msgid "could not find pack '%s'" msgstr "no se pudo encontrar pack '%s'" -#, fuzzy, c-format +#, c-format msgid "packfile %s cannot be accessed" -msgstr "objeto %s no puede ser mapeado %s" +msgstr "no se puede acceder al archivo de pack %s" -#, fuzzy msgid "Enumerating cruft objects" -msgstr "Enumerando objetos" +msgstr "Enumerando objetos inalcanzables" -#, fuzzy msgid "unable to add cruft objects" -msgstr "incapaz de añadir objetos recientes" +msgstr "incapaz de añadir objetos inalcanzables" -#, fuzzy msgid "Traversing cruft objects" -msgstr "Comprimiendo objetos" +msgstr "Atravesando objetos inalcanzables" #, c-format msgid "" @@ -8928,9 +9041,8 @@ msgstr "" "se esperaba ID de objeto, se obtuvo basura:\n" "%s" -#, fuzzy msgid "could not load cruft pack .mtimes" -msgstr "no se pudo cargar pack" +msgstr "no se pudo cargar el .mtimes del pack de inalcanzables" msgid "cannot open pack index" msgstr "no se puede abrir índice de paquetes" @@ -8940,7 +9052,7 @@ msgid "loose object at %s could not be examined" msgstr "objeto suelto en %s no pudo ser examinado" msgid "unable to force loose object" -msgstr "incapaz de forzar que el objecto se suelte" +msgstr "incapaz de forzar que el objeto se suelte" #, c-format msgid "not a rev '%s'" @@ -9034,13 +9146,11 @@ msgstr "empaquetar objetos sueltos inalcanzables" msgid "unpack unreachable objects newer than <time>" msgstr "desempaquetar objetos inalcanzables más nuevos que <tiempo>" -#, fuzzy msgid "create a cruft pack" -msgstr "crear paquetes delgados" +msgstr "crear un pack de inalcanzables" -#, fuzzy msgid "expire cruft objects older than <time>" -msgstr "caducar objetos más viejos a <tiempo>" +msgstr "caducar objetos inalcanzables más viejos a <tiempo>" msgid "use the sparse reachability algorithm" msgstr "usar el algoritmo sparse reachability" @@ -9119,19 +9229,16 @@ msgid "cannot use --filter with --stdin-packs" msgstr "no se puede usar --filter con --stdin-packs" msgid "cannot use internal rev list with --stdin-packs" -msgstr "no se puede usar un lista interna de rev con --stdin-packs" +msgstr "no se puede usar un lista interna de revisiones con --stdin-packs" -#, fuzzy msgid "cannot use internal rev list with --cruft" -msgstr "no se puede usar un lista interna de rev con --stdin-packs" +msgstr "no se puede usar un lista interna de revisiones con --cruft" -#, fuzzy msgid "cannot use --stdin-packs with --cruft" -msgstr "no se puede usar -a con -d" +msgstr "no se puede usar --stdin-packs con --cruft" -#, fuzzy msgid "cannot use --max-pack-size with --cruft" -msgstr "no se puede usar -a con -d" +msgstr "no se puede usar --max-pack-size con --cruft" msgid "Enumerating objects" msgstr "Enumerando objetos" @@ -9197,9 +9304,8 @@ msgstr "incorporar cambios por rebase en lugar de fusión" msgid "allow fast-forward" msgstr "permitir fast-forward" -#, fuzzy msgid "control use of pre-merge-commit and commit-msg hooks" -msgstr "hacer un bypass a hooks pre-merge-commit y commit-msg" +msgstr "controlar el uso de los hooks pre-merge-commit y commit-msg" msgid "automatically stash/stash pop before and after" msgstr "ejecutar automáticamente stash/stash pop antes y después" @@ -9283,7 +9389,6 @@ msgstr "no es posible acceder al commit %s" msgid "ignoring --verify-signatures for rebase" msgstr "ignorando --verify-signatures para rebase" -#, fuzzy msgid "" "You have divergent branches and need to specify how to reconcile them.\n" "You can do so by running one of the following commands sometime before\n" @@ -9299,18 +9404,18 @@ msgid "" "or --ff-only on the command line to override the configured default per\n" "invocation.\n" msgstr "" -"Hacer un pull sin especificar cómo reconciliar las ramas es poco\n" -"recomendable. Puedes eliminar este mensaje usando uno de los\n" -"siguientes comandos antes de tu siguiente pull:\n" +"Las ramas se han divergido y hay que especificar cómo reconciliarlas.\n" +"Se puede hacerlo ejecutando uno de los comandos siguiente antes del\n" +"próximo pull:\n" "\n" -" git config pull.rebase false # hacer merge (estrategia por defecto)\n" -" git config pull.rebase true # aplicar rebase\n" -" git config pull.ff only # aplicar solo fast-forward\n" +" git config pull.rebase false # fusionar\n" +" git config pull.rebase true # rebasar\n" +" git config pull.ff only # solo avance rápido\n" "\n" -"Puedes reemplazar \"git config\" con \"git config --global\" para aplicar\n" -"la preferencia en todos los repositorios. Puedes también pasar --rebase,\n" -"--no-rebase, o --ff-only en el comando para sobrescribir la configuración\n" -"por defecto en cada invocación.\n" +"Se puede reemplazar \"git config\" con \"git config --global\" para aplicar\n" +"la preferencia en todos los repositorios. También se puede pasar\n" +"--rebase, --no-rebase o --ff-only en el comando para sobrescribir la\n" +"configuración por defecto en cada invocación.\n" msgid "Updating an unborn branch with changes added to the index." msgstr "Actualizando una rama no nacida con cambios agregados al índice." @@ -9373,14 +9478,13 @@ msgstr "taquigrafía de tag sin <tag>" msgid "--delete only accepts plain target ref names" msgstr "--delete solo acepta como objetivos nombres de ref planos" -#, fuzzy msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'.\n" msgstr "" "\n" -"Para elegir si la opción es permanente, mira push.default en 'git help " -"config'." +"Para elegir una de las opciones permanentemente, mira push.default en 'git " +"help config'.\n" msgid "" "\n" @@ -9389,8 +9493,12 @@ msgid "" "autoSetupMerge\n" "in 'git help config'.\n" msgstr "" +"\n" +"Para evitar configurar una rama upstream automáticamente cuando su nombre\n" +"no coincida con el de la rama local, mira la opción 'simple' de\n" +"branch.autoSetupMerge en 'git help config'.\n" -#, fuzzy, c-format +#, c-format msgid "" "The upstream branch of your current branch does not match\n" "the name of your current branch. To push to the upstream branch\n" @@ -9412,7 +9520,7 @@ msgstr "" "Para empujar a la rama del mismo nombre en el remoto, ejecuta\n" "\n" " git push %s HEAD\n" -"%s" +"%s%s" #, c-format msgid "" @@ -9433,8 +9541,11 @@ msgid "" "To have this happen automatically for branches without a tracking\n" "upstream, see 'push.autoSetupRemote' in 'git help config'.\n" msgstr "" +"\n" +"Para hacer que esto pase automáticamente para las ramas que no rastrean\n" +"un upstream, mira 'push.autoSetupRemote' en 'git help config'.\n" -#, fuzzy, c-format +#, c-format msgid "" "The current branch %s has no upstream branch.\n" "To push the current branch and set the remote as upstream, use\n" @@ -9445,7 +9556,8 @@ msgstr "" "La rama actual %s no tiene una rama upstream.\n" "Para empujar la rama actual y configurar el remoto como upstream, usa\n" "\n" -"\tgit push --set-upstream %s %s\n" +" git push --set-upstream %s %s\n" +"%s" #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." @@ -9536,9 +9648,9 @@ msgstr "Empujando a %s\n" msgid "failed to push some refs to '%s'" msgstr "falló el empuje de algunas referencias a '%s'" -#, fuzzy, c-format +#, c-format msgid "invalid value for '%s'" -msgstr "valor inválido para %s" +msgstr "valor inválido para '%s'" msgid "repository" msgstr "repositorio" @@ -9658,11 +9770,16 @@ msgid "only emit output related to the second range" msgstr "solo emite salida relacionada con el segundo rango" #, c-format +msgid "not a revision: '%s'" +msgstr "no es una revisión: '%s'" + +#, c-format msgid "not a commit range: '%s'" msgstr "no es un rango de commit: '%s'" -msgid "single arg format must be symmetric range" -msgstr "argumento único de formato debe ser un rango simétrico" +#, c-format +msgid "not a symmetric range: '%s'" +msgstr "no es un rango simétrico: '%s'" msgid "need two commit ranges" msgstr "se necesitan dos rangos de commits" @@ -9923,9 +10040,8 @@ msgstr "usar estrategias de fusión para el rebase" msgid "let the user edit the list of commits to rebase" msgstr "permitir al usuario editar la lista de commits para rebasar" -#, fuzzy msgid "(REMOVED) was: try to recreate merges instead of ignoring them" -msgstr "(DEPRECADO) intentar recrear merges en lugar de ignorarlos" +msgstr "(DEPRECADO) era: intentar recrear fusiones en lugar de ignorarlas" msgid "how to handle commits that become empty" msgstr "como manejar commits que se vuelven vacíos" @@ -9936,6 +10052,9 @@ msgstr "mantener commits que comiencen con vacío" msgid "move commits that begin with squash!/fixup! under -i" msgstr "mover commits que comiencen con squash!/fixup! bajo -i" +msgid "update branches that point to commits that are being rebased" +msgstr "actualizar ramas que apuntan a commits que se rebasan" + msgid "add exec lines after each commit of the editable list" msgstr "agregar líneas exec tras cada commit de la lista editable" @@ -9976,12 +10095,19 @@ msgid "" "Use `git rebase --abort` to terminate current rebase.\n" "Or downgrade to v2.33, or earlier, to complete the rebase." msgstr "" +"`rebase --preserve-merges` (-p) ya no es soportado.\n" +"Usa `git rebase --abort` para terminar la rebase actual.\n" +"O regresa a v2.33, o más antes, para completar la rebase." msgid "" "--preserve-merges was replaced by --rebase-merges\n" -"Note: Your `pull.rebase` configuration may also be set to 'preserve',\n" +"Note: Your `pull.rebase` configuration may also be set to 'preserve',\n" "which is no longer supported; use 'merges' instead" msgstr "" +"--rebase-merges ha reemplazado --preserve-merges\n" +"Nota: Tu configuración de `pull.rebase` también podría estar\n" +"configurada a 'preserve', el cual ya no es soportado; usa 'merges' en\n" +"su lugar" msgid "No rebase in progress?" msgstr "¿No hay rebase en progreso?" @@ -10037,9 +10163,10 @@ msgstr "Modo desconocido: %s" msgid "--strategy requires --merge or --interactive" msgstr "--strategy requiere --merge o --interactive" -#, fuzzy msgid "apply options and merge options cannot be used together" -msgstr "Opciones --add-file y --remote no pueden ser usadas juntas" +msgstr "" +"las opciones de aplicación y las opciones de fusión no pueden ser usadas " +"juntas" #, c-format msgid "Unknown rebase backend: %s" @@ -10176,82 +10303,80 @@ msgstr "" msgid "quiet" msgstr "silencioso" -#, fuzzy msgid "you must specify a directory" -msgstr "Se tiene que especificar un directorio." +msgstr "hay que especificar un directorio" -#, fuzzy msgid "git reflog [show] [<log-options>] [<ref>]" -msgstr "git remote show [<opciones>] <nombre>" +msgstr "git reflog [show] [<opciones-de-log>] [<referencia>]" -#, fuzzy msgid "" "git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n" " [--rewrite] [--updateref] [--stale-fix]\n" " [--dry-run | -n] [--verbose] [--all [--single-worktree] | " "<refs>...]" msgstr "" -"git reflog expire [--expire=<tiempo>] [--expire-unreachable=<tiempo>] [--" -"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] " -"<refs>..." +"git reflog expire [--expire=<tiempo>] [--expire-unreachable=<tiempo>]\n" +" [--rewrite] [--updateref] [--stale-fix]\n" +" [--dry-run | -n] [--verbose] [--all [--single-worktree] | " +"<referencias>...]" -#, fuzzy msgid "" "git reflog delete [--rewrite] [--updateref]\n" " [--dry-run | -n] [--verbose] <ref>@{<specifier>}..." msgstr "" -"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] " -"<refs>..." +"git reflog delete [--rewrite] [--updateref]\n" +" [--dry-run | -n] [--verbose] " +"<referencia>@{<especificador>}..." msgid "git reflog exists <ref>" -msgstr "git reflog existe <ref>" +msgstr "git reflog exists <referencia>" -#, fuzzy, c-format +#, c-format msgid "invalid timestamp '%s' given to '--%s'" -msgstr "regex inválido para -I: '%s'" +msgstr "marca de tiempo inválida '%s' pasada a '--%s'" -#, fuzzy msgid "do not actually prune any entries" -msgstr "no tocar entradas index-only" +msgstr "no recortar de verdad ninguna entrada" msgid "" "rewrite the old SHA1 with the new SHA1 of the entry that now precedes it" msgstr "" +"reescribir el SHA1 antiguo con el SHA1 nuevo de la entrada que ya lo precede" msgid "update the reference to the value of the top reflog entry" -msgstr "" +msgstr "actualizar la referencia al valor de la entrada superior del reflog" -#, fuzzy msgid "print extra information on screen" -msgstr "Información de output en cada ref" +msgstr "imprimir información extra a la pantalla" -#, fuzzy msgid "timestamp" -msgstr "timestamp inválido" +msgstr "marca de tiempo" -#, fuzzy msgid "prune entries older than the specified time" -msgstr "caducar árboles de trabajo más viejos a <tiempo>" +msgstr "recortar entradas más viejas al tiempo especificado" msgid "" "prune entries older than <time> that are not reachable from the current tip " "of the branch" msgstr "" +"recortar entradas más viejas de <tiempo> que están inalcanzables de la punta " +"actual de la rama" -#, fuzzy msgid "prune any reflog entries that point to broken commits" -msgstr "mostrar solo ramas que contengan el commit" +msgstr "" +"recortar cualquier entrada del log de referencias que apunte a un commit roto" -#, fuzzy msgid "process the reflogs of all references" -msgstr "forzar sobrescritura de referencia local" +msgstr "procesar los logs de referencias de todas las referencias" msgid "limits processing to reflogs from the current worktree only" msgstr "" +"limita procesamiento a solo los logs de referencias del árbol de trabajo " +"actual" #, c-format msgid "Marking reachable objects..." -msgstr "Marcando objectos alcanzables..." +msgstr "Marcando objetos alcanzables..." #, c-format msgid "%s points nowhere!" @@ -10271,9 +10396,8 @@ msgstr "" "git remote add [-t <rama>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <nombre> <url>" -#, fuzzy msgid "git remote rename [--[no-]progress] <old> <new>" -msgstr "git remote rename <viejo> <nuevo>" +msgstr "git remote rename [--[no-]progress] <viejo> <nuevo>" msgid "git remote remove <name>" msgstr "git remote remove <nombre>" @@ -10431,9 +10555,8 @@ msgstr "" "\t%s\n" "\tPor favor actualiza la configuración manualmente si es necesario." -#, fuzzy msgid "Renaming remote references" -msgstr "no se pudo eliminar la referencia %s" +msgstr "Renombrando referencias remotas" #, c-format msgid "deleting '%s' failed" @@ -10468,6 +10591,9 @@ msgstr " nuevo (siguiente fetch se guardará en remotes/%s)" msgid " tracked" msgstr " rastreada" +msgid " skipped" +msgstr "saltado" + msgid " stale (use 'git remote prune' to remove)" msgstr " viejo (usa 'git remote prune' para eliminar)" @@ -10696,10 +10822,11 @@ msgstr "git repack [<opciones>]" msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" -"--no-write-bitmap-index or disable the pack.writebitmaps configuration." +"--no-write-bitmap-index or disable the pack.writeBitmaps configuration." msgstr "" -"Reempaquetados incrementales son incompatibles con índices bitmap. Usa\n" -"--no-write-bitmap-index o deshabilita la configuración pack.writebitmaps." +"Los reempaquetados incrementales son incompatibles con las índices de " +"bitmap.\n" +"Usa --no-write-bitmap-index o deshabilita la configuración pack.writeBitmaps." msgid "could not start pack-objects to repack promisor objects" msgstr "no se puede iniciar pack-objects para reempaquetar objetos promisores" @@ -10739,16 +10866,14 @@ msgstr "empaquetar todo en un único paquete" msgid "same as -a, and turn unreachable objects loose" msgstr "lo mismo que -a, y soltar objetos inalcanzables" -#, fuzzy msgid "same as -a, pack unreachable cruft objects separately" -msgstr "lo mismo que -a, y soltar objetos inalcanzables" +msgstr "lo mismo que -a, empacar objetos inalcanzables separadamente" msgid "approxidate" msgstr "approxidate" -#, fuzzy msgid "with -C, expire objects older than this" -msgstr "caducar objetos más viejos a <tiempo>" +msgstr "con -C, caducar objetos más viejos a esto" msgid "remove redundant packs, and run git-prune-packed" msgstr "eliminar paquetes redundantes, y ejecutar git-prune-packed" @@ -10815,9 +10940,9 @@ msgstr "no se pueden borrar paquetes en un repositorio de objetos preciosos" msgid "Nothing new to pack." msgstr "Nada nuevo para empaquetar." -#, fuzzy, c-format +#, c-format msgid "pack prefix %s does not begin with objdir %s" -msgstr "el nombre del archivo de paquete '%s' no termina con '.%s'" +msgstr "el prefijo %s de pack no comienza con el objdir %s" #, c-format msgid "missing required file: %s" @@ -11081,7 +11206,7 @@ msgid "be quiet, only report errors" msgstr "ser silencioso, solo reportar errores" msgid "skip refreshing the index after reset" -msgstr "" +msgstr "saltar refrescar el índice después de hacer reset" msgid "reset HEAD and index" msgstr "reiniciar HEAD e índice" @@ -11121,14 +11246,13 @@ msgstr "%s reset no está permitido en un repositorio vacío" msgid "Unstaged changes after reset:" msgstr "Cambios fuera del área de stage tras el reset:" -#, fuzzy, c-format +#, c-format msgid "" "It took %.2f seconds to refresh the index after reset. You can use\n" "'--no-refresh' to avoid this." msgstr "" -"\n" -"Tomó %.2f segundos para calcular los valores anterior/posterior del branch.\n" -"Puedes usar '--no-ahead-behind' para evitar esto.\n" +"Tomó %.2f segundos para refrescar el índice después de reiniciar.\n" +"Se puede usar '--no-refresh' para evitar esto." #, c-format msgid "Could not reset index file to revision '%s'." @@ -11141,12 +11265,16 @@ msgstr "No se puede escribir un nuevo archivo índice." msgid "unable to get disk usage of %s" msgstr "no se puede obtener el uso de disco de %s" +#, c-format +msgid "invalid value for '%s': '%s', the only allowed format is '%s'" +msgstr "valor inválido para '%s': '%s', el único formato permitido es '%s'" + msgid "rev-list does not support display of notes" msgstr "rev-list no soporta mostrar notas" -#, fuzzy, c-format +#, c-format msgid "marked counting and '%s' cannot be used together" -msgstr "--reject y --3way no se pueden utilizar juntas." +msgstr "el conteo marcado y '%s' no pueden ser usados juntos" msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<opciones>] -- [<args>...]" @@ -11166,6 +11294,9 @@ msgstr "fin de input prematuro" msgid "no usage string given before the `--' separator" msgstr "no se ha entregado cadena antes del separador`--'" +msgid "missing opt-spec before option flags" +msgstr "falta opt-spec antes de los flags de opción" + msgid "Needed a single revision" msgstr "Se necesitó una revisión singular" @@ -11283,7 +11414,7 @@ msgid "keep redundant, empty commits" msgstr "mantener commits redundantes, vacíos" msgid "use the 'reference' format to refer to commits" -msgstr "" +msgstr "usar el formato 'de referencia' para referir a los commits" msgid "revert failed" msgstr "falló al revertir" @@ -11573,9 +11704,8 @@ msgstr "mostrar refs de stdin que no estén en el repositorio local" msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <opciones>" -#, fuzzy msgid "this worktree is not sparse" -msgstr "HEAD del árbol de trabajo %s no está actualizada" +msgstr "este árbol de trabajo no es escaso" msgid "this worktree is not sparse (sparse-checkout file may not exist)" msgstr "" @@ -11597,9 +11727,8 @@ msgstr "falló al borrar directorio '%s'" msgid "failed to create directory for sparse-checkout file" msgstr "falló al crear directorio para el archivo sparse-checkout" -#, fuzzy msgid "failed to initialize worktree config" -msgstr "falló al inicializar sparse-checkout" +msgstr "falló al inicializar la configuración del árbol de trabajo" msgid "failed to modify sparse-index config" msgstr "falló al modificar la configuración del índice sparse" @@ -11629,61 +11758,70 @@ msgstr "no es posible dequote la cadena de estilo C '%s'" msgid "unable to load existing sparse-checkout patterns" msgstr "no se pudo cargar patrones de sparse-checkout existentes" -#, fuzzy msgid "existing sparse-checkout patterns do not use cone mode" -msgstr "no se pudo cargar patrones de sparse-checkout existentes" +msgstr "los patrones de checkout escaso existentes no usan el modo de cono" msgid "please run from the toplevel directory in non-cone mode" -msgstr "" +msgstr "por favor ejecuta desde el directorio superior en el modo no de cono" msgid "specify directories rather than patterns (no leading slash)" -msgstr "" +msgstr "especificar directorios en vez de patrones (sin slash inicial)" msgid "" "specify directories rather than patterns. If your directory starts with a " "'!', pass --skip-checks" msgstr "" +"especificar directorios en vez de patrones. Si el directorio comienza con " +"un '!', se necesita --skip-checks también" msgid "" "specify directories rather than patterns. If your directory really has any " "of '*?[]\\' in it, pass --skip-checks" msgstr "" +"especificar directorios en vez de patrones. Si el directorio realmente " +"lleva cualquier de '*?[]\\', se necesita --skip-checks también" #, c-format msgid "" "'%s' is not a directory; to treat it as a directory anyway, rerun with --" "skip-checks" msgstr "" +"'%s' no es un directorio; para tratarlo como directorio de todas maneras, " +"ejecuta otra vez con --skip-checks" #, c-format msgid "" "pass a leading slash before paths such as '%s' if you want a single file " "(see NON-CONE PROBLEMS in the git-sparse-checkout manual)." msgstr "" +"pasa un slash inicial antes de rutas como '%s' si quieres un archivo soltero " +"(mira NON-CONE PROBLEMS en el manual de git-sparse-checkout)." -#, fuzzy msgid "git sparse-checkout add [--skip-checks] (--stdin | <patterns>)" -msgstr "git sparse-checkout (set|add) (--stdin | <patrones>)" +msgstr "git sparse-checkout add [--skip-checks] (--stdin | <patrones>)" msgid "" "skip some sanity checks on the given paths that might give false positives" msgstr "" +"saltar algunas pruebas de sensatez en las rutas proporcionadas que podrían " +"resultar en positivos falsos" msgid "read patterns from standard in" msgstr "leer patrones de standard in" -#, fuzzy msgid "no sparse-checkout to add to" -msgstr "git sparse-checkout list" +msgstr "no hay checkout escaso a que añadir" -#, fuzzy msgid "" "git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] " "(--stdin | <patterns>)" -msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]" +msgstr "" +"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] " +"(--stdin | <patrones>)" msgid "must be in a sparse-checkout to reapply sparsity patterns" msgstr "" +"hay que estar en un checkout escaso para volver a aplicar patrones de escasez" msgid "error while refreshing working directory" msgstr "error al refrescar directorio de trabajo" @@ -11703,7 +11841,6 @@ msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <nombre-de-rama> [<stash>]" -#, fuzzy msgid "" "git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" "quiet]\n" @@ -11711,18 +11848,19 @@ msgid "" " [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" " [--] [<pathspec>...]]" msgstr "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" +"quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <mensaje>]\n" " [--pathspec-from-file=<archivo> [--pathspec-file-nul]]\n" " [--] [<pathspec>...]]" -#, fuzzy msgid "" "git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" "quiet]\n" " [-u|--include-untracked] [-a|--all] [<message>]" msgstr "" -"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" +"quiet]\n" " [-u|--include-untracked] [-a|--all] [<mensaje>]" msgid "git stash pop [--index] [-q|--quiet] [<stash>]" @@ -11845,9 +11983,8 @@ msgstr "mensaje de stash" msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" requiere un argumento <commit>" -#, fuzzy msgid "No staged changes" -msgstr "Sin cambios" +msgstr "No hay cambios en stage" msgid "No changes selected" msgstr "Sin cambios seleccionados" @@ -11864,9 +12001,8 @@ msgstr "No se pueden guardar los archivos no rastreados" msgid "Cannot save the current worktree state" msgstr "No se puede guardar el estado actual del árbol de trabajo" -#, fuzzy msgid "Cannot save the current staged state" -msgstr "No se puede guardar el estado actual del índice" +msgstr "No se puede guardar el estado actualmente en stage" msgid "Cannot record working tree state" msgstr "No se puede grabar el estado del árbol de trabajo" @@ -11874,9 +12010,9 @@ msgstr "No se puede grabar el estado del árbol de trabajo" msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "No se puede usar --patch y --include-untracked o --all al mismo tiempo" -#, fuzzy msgid "Can't use --staged and --include-untracked or --all at the same time" -msgstr "No se puede usar --patch y --include-untracked o --all al mismo tiempo" +msgstr "" +"No se puede usar --staged y --include-untracked o --all al mismo tiempo" msgid "Did you forget to 'git add'?" msgstr "¿Olvidaste 'git add'?" @@ -11901,7 +12037,7 @@ msgid "keep index" msgstr "mantener index" msgid "stash staged changes only" -msgstr "" +msgstr "hacer stash a solo los cambios en stage" msgid "stash in patch mode" msgstr "stash en modo patch" @@ -11927,6 +12063,10 @@ msgid "Expecting a full ref name, got %s" msgstr "Se esperaba un nombre de ref completo, se obtuvo %s" #, c-format +msgid "could not get a repository handle for submodule '%s'" +msgstr "no se pudo conseguir un handle de repositorio para el submódulo '%s'" + +#, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " "authoritative upstream." @@ -11934,12 +12074,6 @@ msgstr "" "no se pudo encontrar configuración '%s'. Asumiendo que este repositorio es " "su propio upstream autoritario." -msgid "alternative anchor for relative paths" -msgstr "ancho alternativo para rutas relativas" - -msgid "git submodule--helper list [--prefix=<path>] [<path>...]" -msgstr "git submodule--helper list [--prefix=<ruta>] [<ruta>...]" - #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "No se encontró url para la ruta del submódulo '%s' en .gitmodules" @@ -11972,12 +12106,12 @@ msgstr "suprime la salida de inicializar cada comando de submódulo" msgid "recurse into nested submodules" msgstr "recursar en submódulos anidados" -msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" -msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <comando>" +msgid "git submodule foreach [--quiet] [--recursive] [--] <command>" +msgstr "git submodule foreach [--quiet] [--recursive] [--] <comando>" #, c-format msgid "Failed to register url for submodule path '%s'" -msgstr "Falló al registrar el url para la ruta del submódulo '%s'" +msgstr "Falló al registrar el url para la ruta de submódulo '%s'" #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" @@ -11986,7 +12120,8 @@ msgstr "Submódulo '%s' (%s) registrado para ruta '%s'\n" #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "" -"peligro: modo de actualización de comandos sugerido para el submódulo '%s'\n" +"advertencia: modo de actualización de comandos sugerido para el submódulo " +"'%s'\n" #, c-format msgid "Failed to register update mode for submodule path '%s'" @@ -11996,8 +12131,8 @@ msgstr "" msgid "suppress output for initializing a submodule" msgstr "suprime la salida de inicializar un submódulo" -msgid "git submodule--helper init [<options>] [<path>]" -msgstr "git submodule--helper init [<opciones>] [<path>]" +msgid "git submodule init [<options>] [<path>]" +msgstr "git submodule init [<opciones>] [<ruta>]" #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" @@ -12025,9 +12160,6 @@ msgstr "" msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<ruta>...]" -msgid "git submodule--helper name <path>" -msgstr "git submodule--helper name <ruta>" - #, c-format msgid "* %s %s(blob)->%s(submodule)" msgstr "* %s %s(blob)->%s(submodule)" @@ -12064,8 +12196,8 @@ msgstr "omitir submódulos con el valor 'ignore_config' establecido en 'all'" msgid "limit the summary size" msgstr "limitar el tamaño de resumen" -msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" -msgstr "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" +msgid "git submodule summary [<options>] [<commit>] [--] [<path>]" +msgstr "git submodule summary [<opciones>] [<commit>] [--] [<ruta>]" msgid "could not fetch a revision for HEAD" msgstr "no se puede obtener la revisión para HEAD" @@ -12076,29 +12208,25 @@ msgstr "Sincronizando url del submódulo para '%s'\n" #, c-format msgid "failed to register url for submodule path '%s'" -msgstr "falló al registrar el url para la ruta del submódulo '%s'" - -#, c-format -msgid "failed to get the default remote for submodule '%s'" -msgstr "error al conseguir el remoto por defecto para el submódulo '%s'" +msgstr "falló al registrar el url para la ruta de submódulo '%s'" #, c-format msgid "failed to update remote for submodule '%s'" msgstr "error al actualizar el remoto para el submódulo '%s'" msgid "suppress output of synchronizing submodule url" -msgstr "suprime la salida de sincronizar el url del submódulo" +msgstr "suprimir la salida de sincronizar el url del submódulo" -msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" -msgstr "git submodule--helper sync [--quiet] [--recursive] [<ruta>]" +msgid "git submodule sync [--quiet] [--recursive] [<path>]" +msgstr "git submodule sync [--quiet] [--recursive] [<ruta>]" -#, fuzzy, c-format +#, c-format msgid "" "Submodule work tree '%s' contains a .git directory. This will be replaced " "with a .git file by using absorbgitdirs." msgstr "" -"El árbol de trabajo de submódulo '%s' contiene un directorio .git (usa 'rm -" -"rf' si realmente quieres eliminarlo incluyendo todo en su historia)" +"El árbol de trabajo de submódulo '%s' contiene un directorio .git. Este será " +"reemplazado con un archivo .git usando absorbgitdirs." #, c-format msgid "" @@ -12153,6 +12281,11 @@ msgstr "" "'--reference-if-able' en lugar de '--reference'." #, c-format +msgid "could not get a repository handle for gitdir '%s'" +msgstr "" +"no se pudo conseguir un handle de repositorio para el directorio de git '%s'" + +#, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "submódulo '%s' no puede agregar alterno: %s" @@ -12180,6 +12313,9 @@ msgstr "directorio no está vacío: '%s'" msgid "could not get submodule directory for '%s'" msgstr "no se pudo obtener el directorio de submódulo para '%s'" +msgid "alternative anchor for relative paths" +msgstr "ancla alternativa para rutas relativas" + msgid "where the new submodule will be cloned to" msgstr "a donde el nuevo submódulo será clonado" @@ -12198,19 +12334,14 @@ msgstr "forzar el proceso de clonación" msgid "disallow cloning into non-empty directory" msgstr "no permitir clonar en directorios no vacíos" -#, fuzzy msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--filter " "<filter-spec>] --url <url> --path <path>" msgstr "" "git submodule--helper clone [--prefix=<ruta>] [--quiet] [--reference " -"<repositorio>] [--name <nombre>] [--depth <profundidad>] [--single-branch] --" -"url <url> --path <ruta>" - -#, c-format -msgid "Invalid update mode '%s' for submodule path '%s'" -msgstr "Modo de actualización inválido '%s' para ruta de submódulo '%s'" +"<repositorio>] [--name <nombre>] [--depth <profundidad>] [--single-branch] " +"[--filter <especificación-de-filtro>] --url <url> --path <ruta>" #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" @@ -12287,6 +12418,10 @@ msgstr "" "directo del commit falló." #, c-format +msgid "could not initialize submodule at path '%s'" +msgstr "no se pudo inicializar el submódulo a la ruta '%s'" + +#, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " "the superproject is not on any branch" @@ -12295,42 +12430,32 @@ msgstr "" "el superproyecto no está en ninguna rama" #, c-format -msgid "could not get a repository handle for submodule '%s'" -msgstr "no se pudo conseguir un handle de repositorio para el submódulo '%s'" - -#, fuzzy, c-format msgid "Unable to find current revision in submodule path '%s'" -msgstr "" -"No se pudo encontrar la revisión actual en la ruta de submódulo " -"'$displaypath'" +msgstr "Incapaz de encontrar la revisión actual en la ruta de submódulo '%s'" -#, fuzzy, c-format +#, c-format msgid "Unable to fetch in submodule path '%s'" -msgstr "No es posible realizar fetch en la ruta de submódulo '$sm_path'" +msgstr "Incapaz de realizar fetch en la ruta de submódulo '%s'" -#, fuzzy, c-format +#, c-format msgid "Unable to find %s revision in submodule path '%s'" -msgstr "" -"No se pudo encontrar la revisión actual en la ruta de submódulo " -"'$displaypath'" +msgstr "Incapaz de encontrar la revisión %s en la ruta de submódulo '%s'" -#, fuzzy, c-format +#, c-format msgid "Failed to recurse into submodule path '%s'" -msgstr "falló al recursar en el submódulo '%s'" +msgstr "Falló al recursar en la ruta de submódulo '%s'" msgid "force checkout updates" msgstr "forzar actualizaciones de checkout" -#, fuzzy msgid "initialize uninitialized submodules before update" -msgstr "inicializar submódulos en el clon" +msgstr "inicializar submódulos no inicializados antes de actualizar" -#, fuzzy msgid "use SHA-1 of submodule's remote tracking branch" -msgstr "cualquier submódulo clonado usará su branch de rastreo remoto" +msgstr "usar el SHA-1 de la rama remota que el submódulo rastrea" msgid "traverse submodules recursively" -msgstr "" +msgstr "atravesar los submódulos recursivamente" msgid "don't fetch new objects from the remote site" msgstr "no recuperar objetos nuevos del sitio remoto" @@ -12338,11 +12463,14 @@ msgstr "no recuperar objetos nuevos del sitio remoto" msgid "path into the working tree" msgstr "ruta al árbol de trabajo" -msgid "path into the working tree, across nested submodule boundaries" -msgstr "ruta al árbol de trabajo, a través de fronteras de submódulos anidados" +msgid "use the 'checkout' update strategy (default)" +msgstr "usar la estrategia de actualización 'checkout' (por defecto)" -msgid "rebase, merge, checkout or none" -msgstr "rebase, merge, checkout o none" +msgid "use the 'merge' update strategy" +msgstr "usar la estrategia de actualización 'merge'" + +msgid "use the 'rebase' update strategy" +msgstr "usar la estrategia de actualización 'rebase'" msgid "create a shallow clone truncated to the specified number of revisions" msgstr "crea un clon superficial truncado al número especificado de revisiones" @@ -12356,21 +12484,25 @@ msgstr "si el clon inicial debe seguir la recomendación de superficialidad" msgid "don't print cloning progress" msgstr "no mostrar el progreso de clonación" +msgid "disallow cloning into non-empty directory, implies --init" +msgstr "no permitir clonar en directorios no vacíos, implica --init" + msgid "" "git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] " "[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-" "shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] " "[--] [<path>...]" msgstr "" - -msgid "bad value for update parameter" -msgstr "mal valor para parámetro update" +"git submodule [--quiet] update [--init [--filter=<especificación-de-" +"filtro>]] [--remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--" +"rebase] [--[no-]recommend-shallow] [--reference <repositorio>] [--recursive] " +"[--[no-]single-branch] [--] [<ruta>...]" msgid "recurse into submodules" msgstr "recurrir a submódulos" -msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" -msgstr "git submodule--helper absorb-git-dirs [<opciones>] [<path>...]" +msgid "git submodule absorbgitdirs [<options>] [<path>...]" +msgstr "git submodule absorbgitdirs [<opciones>] [<ruta>...]" msgid "check if it is safe to write to the .gitmodules file" msgstr "revisar si es seguro escribir al archivo .gitmodules" @@ -12391,8 +12523,8 @@ msgstr "" msgid "suppress output for setting url of a submodule" msgstr "suprime la salida de inicializar la url de un submódulo" -msgid "git submodule--helper set-url [--quiet] <path> <newurl>" -msgstr "git submodule--helper set-url [--quiet] <ruta> <nueva url>" +msgid "git submodule set-url [--quiet] <path> <newurl>" +msgstr "git submodule set-url [--quiet] <ruta> <url-nuevo>" msgid "set the default tracking branch to master" msgstr "configurar la rama de rastreo por defecto a master" @@ -12400,13 +12532,11 @@ msgstr "configurar la rama de rastreo por defecto a master" msgid "set the default tracking branch" msgstr "configurar la rama de rastreo por defecto" -msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" -msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <ruta>" +msgid "git submodule set-branch [-q|--quiet] (-d|--default) <path>" +msgstr "git submodule set-branch [-q|--quiet] (-d|--default) <ruta>" -msgid "" -"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" -msgstr "" -"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <rama> <ruta>" +msgid "git submodule set-branch [-q|--quiet] (-b|--branch) <branch> <path>" +msgstr "git submodule set-branch [-q|--quiet] (-b|--branch) <rama> <ruta>" msgid "--branch or --default required" msgstr "--branch o --default requerido" @@ -12415,20 +12545,21 @@ msgid "print only error messages" msgstr "mostrar solo mensajes de error" msgid "force creation" -msgstr "" +msgstr "forzar creación" -#, fuzzy msgid "show whether the branch would be created" -msgstr "mostrar lo que sería incluido en el commit" +msgstr "mostrar si la rama sería creada" msgid "" "git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--" "quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>" msgstr "" +"git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--" +"quiet] [-t|--track] [-n|--dry-run] <nombre> <oid-inicial> <nombre-inicial>" -#, fuzzy, c-format +#, c-format msgid "creating branch '%s'" -msgstr "Reiniciar rama '%s'\n" +msgstr "creando la rama '%s'" #, c-format msgid "Adding existing repo at '%s' to the index\n" @@ -12497,16 +12628,15 @@ msgstr "permitir agregar una ruta de submódulo que de otro modo se ignora" msgid "borrow the objects from reference repositories" msgstr "prestar los objetos de los repositorios de referencia" -#, fuzzy msgid "" "sets the submodule's name to the given string instead of defaulting to its " "path" msgstr "" -"configura el nombre del submódulo para el string dado en lugar de ir a la " -"ruta por defecto" +"configura el nombre del submódulo a la cadena proporcionada en lugar de usar " +"por defecto la ruta suya" -msgid "git submodule--helper add [<options>] [--] <repository> [<path>]" -msgstr "git submodule--helper add [<options>] [--] <repository> [<path>]" +msgid "git submodule add [<options>] [--] <repository> [<path>]" +msgstr "git submodule add [<opciones>] [--] <repositorio> [<ruta>]" msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" @@ -12690,9 +12820,9 @@ msgstr "solo imprimir las tags que no estén fusionadas" msgid "print only tags of the object" msgstr "solo imprimir tags del objeto" -#, fuzzy, c-format +#, c-format msgid "the '%s' option is only allowed in list mode" -msgstr "opción -n solo es permitida en modo lista" +msgstr "la opción '%s' solo es permitida en el modo de lista" #, c-format msgid "'%s' is not a valid tag name." @@ -12713,6 +12843,16 @@ msgstr "Etiqueta '%s' actualizada (era %s)\n" msgid "pack exceeds maximum allowed size" msgstr "paquete excede el máximo tamaño permitido" +msgid "failed to write object in stream" +msgstr "falló al escribir objeto al stream" + +#, c-format +msgid "inflate returned (%d)" +msgstr "inflate devolvió (%d)" + +msgid "invalid blob object from stream" +msgstr "objeto blob inválido del stream" + msgid "Unpacking objects" msgstr "Desempaquetando objetos" @@ -13000,9 +13140,8 @@ msgstr "git worktree prune [<opciones>]" msgid "git worktree remove [<options>] <worktree>" msgstr "git worktree remove [<opciones>] <worktree>" -#, fuzzy msgid "git worktree repair [<path>...]" -msgstr "git worktree prune [<opciones>]" +msgstr "git worktree repair [<ruta>...]" msgid "git worktree unlock <path>" msgstr "git worktree unlock <ruta>" @@ -13045,14 +13184,16 @@ msgstr "" #, c-format msgid "failed to copy '%s' to '%s'; sparse-checkout may not work correctly" msgstr "" +"falló al copiar '%s' a '%s'; puede que el checkout escaso no funcione " +"correctamente" -#, fuzzy, c-format +#, c-format msgid "failed to copy worktree config from '%s' to '%s'" -msgstr "falló al copiar notas de '%s' a '%s'" +msgstr "falló al copiar la configuración del árbol de trabajo de '%s' a '%s'" -#, fuzzy, c-format +#, c-format msgid "failed to unset '%s' in '%s'" -msgstr "falló al mover '%s' a '%s'" +msgstr "falló al desconfigurar '%s' en '%s'" #, c-format msgid "could not create directory of '%s'" @@ -13104,9 +13245,9 @@ msgid "try to match the new branch name with a remote-tracking branch" msgstr "" "intentar emparejar el nuevo nombre de rama con una rama de rastreo remoto" -#, fuzzy, c-format +#, c-format msgid "options '%s', '%s', and '%s' cannot be used together" -msgstr "Opciones --squash y --fixup no pueden ser usadas juntas" +msgstr "las opciones '%s', '%s' y '%s' no pueden ser usadas juntas" msgid "added with --lock" msgstr "agregado con --lock" @@ -13121,9 +13262,8 @@ msgid "add 'prunable' annotation to worktrees older than <time>" msgstr "" "agregar la anotación 'podable' a los árboles de trabajo anteriores a <tiempo>" -#, fuzzy msgid "terminate records with a NUL character" -msgstr "terminar registros de entrada y salida con un carácter NUL" +msgstr "terminar registros con un carácter NUL" #, c-format msgid "'%s' is not a working tree" @@ -13238,6 +13378,27 @@ msgstr "escribir objeto de árbol para un subdirectorio <prefijo>" msgid "only useful for debugging" msgstr "solo útil para depurar" +msgid "core.fsyncMethod = batch is unsupported on this platform" +msgstr "core.fsyncMethod = batch no es soportado en este plataforma" + +msgid "failed to create temporary file" +msgstr "falló al crear archivo temporal" + +msgid "insufficient capabilities" +msgstr "capacidades insuficientes" + +#, c-format +msgid "failed to download bundle from URI '%s'" +msgstr "falló al descargar bundle del URI '%s'" + +#, c-format +msgid "file at URI '%s' is not a bundle" +msgstr "el archivo al URI '%s' no es un bundle" + +#, c-format +msgid "failed to unbundle bundle from URI '%s'" +msgstr "falló al extraer bundle del URI '%s'" + #, c-format msgid "unrecognized bundle hash algorithm: %s" msgstr "algoritmo bundle hash desconocido %s" @@ -13260,20 +13421,20 @@ msgstr "Al repositorio le faltan estos commits prerrequisitos:" msgid "need a repository to verify a bundle" msgstr "se necesita un repositorio para verificar un bundle" -#, fuzzy, c-format +#, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %<PRIuMAX> refs:" msgstr[0] "El bundle contiene esta referencia:" -msgstr[1] "El bundle contiene estas %d referencias:" +msgstr[1] "El bundle contiene estas %<PRIuMAX> referencias:" msgid "The bundle records a complete history." msgstr "El bundle registra una historia completa." -#, fuzzy, c-format +#, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %<PRIuMAX> refs:" msgstr[0] "El bundle requiere esta referencia:" -msgstr[1] "El bundle requiere estas %d referencias:" +msgstr[1] "El bundle requiere estas %<PRIuMAX> referencias:" msgid "unable to dup bundle descriptor" msgstr "incapaz de duplicar bundle descriptor" @@ -13445,6 +13606,9 @@ msgstr "" "Dar a un objeto un nombre legible por humanos basado en una referencia " "disponible" +msgid "Generate a zip archive of diagnostic information" +msgstr "Generar una crónica zip de información diagnóstica" + msgid "Show changes between commits, commit and working tree, etc" msgstr "Mostrar los cambios entre commits, commit y árbol de trabajo, etc" @@ -13512,7 +13676,7 @@ msgid "Display help information about Git" msgstr "Mostrar información de ayuda sobre Git" msgid "Run git hooks" -msgstr "" +msgstr "Ejecutar hooks de git" msgid "Server side implementation of Git over HTTP" msgstr "Implementación de lado de servidor de Git por HTTP" @@ -13574,8 +13738,8 @@ msgstr "Ejecutar una fusión para archivos que la necesiten" msgid "The standard helper program to use with git-merge-index" msgstr "El programa de ayuda estándar para usar con git-merge-index" -msgid "Show three-way merge without touching index" -msgstr "Mostrar fusión de tres vías sin tocar el índice" +msgid "Perform merge without touching index or working tree" +msgstr "Realizar fusión sin tocar el índice o el árbol de trabajo" msgid "Run merge conflict resolution tools to resolve merge conflicts" msgstr "" @@ -13709,9 +13873,8 @@ msgstr "Mostrar el índice de crónica empaquetado" msgid "List references in a local repository" msgstr "Listar referencias en el repositorio local" -#, fuzzy msgid "Reduce your working tree to a subset of tracked files" -msgstr " (usa la opción -u para mostrar los archivos sin seguimiento)" +msgstr "Reducir el árbol de trabajo a un subconjunto de archivos rastreados" msgid "Add file contents to the staging area" msgstr "Agregar contenidos de un archivo al área de staging" @@ -13776,6 +13939,9 @@ msgstr "Validar crónicas Git empaquetadas" msgid "Check the GPG signature of tags" msgstr "Verificar la firma GPG de etiquetas" +msgid "Display version information about Git" +msgstr "Mostrar información de versión sobre Git" + msgid "Show logs with difference each commit introduces" msgstr "Mostrar logs con las diferencias que cada commit introduce" @@ -13809,6 +13975,24 @@ msgstr "Un conjunto mínimo útil de comandos cotidianos de Git" msgid "Frequently asked questions about using Git" msgstr "Preguntas frecuentes sobre el uso de Git" +msgid "The bundle file format" +msgstr "Formato de archivo de bundle" + +msgid "Chunk-based file formats" +msgstr "Formatos de archivo basados en fragmentos" + +msgid "Git commit graph format" +msgstr "Formato de grafo de commits de Git" + +msgid "Git index format" +msgstr "Formato de índice de Git" + +msgid "Git pack format" +msgstr "Formato de pack de Git" + +msgid "Git cryptographic signature formats" +msgstr "Formatos de firma criptográfica de Git" + msgid "A Git Glossary" msgstr "Un Glosario de Git" @@ -13832,6 +14016,21 @@ msgstr "Definir las propiedades de submódulo" msgid "Git namespaces" msgstr "Namespaces de Git" +msgid "Protocol v0 and v1 capabilities" +msgstr "Capacidades de los protocolos v0 y v1" + +msgid "Things common to various protocols" +msgstr "Cosas en común entre varios protocolos" + +msgid "Git HTTP-based protocols" +msgstr "Protocolos de Git basados en HTTP" + +msgid "How packs are transferred over-the-wire" +msgstr "Cómo los packs se transfieren en el alambre" + +msgid "Git Wire Protocol, Version 2" +msgstr "Protocolo de alambre de Git, versión 2" + msgid "Helper programs to interact with remote repositories" msgstr "Programas de ayuda para interactuar con repositorios remotos" @@ -13856,6 +14055,9 @@ msgstr "Interfaz web Git (interfaz web para repositorios Git)" msgid "An overview of recommended workflows with Git" msgstr "Una visión general de flujos de trabajo recomendados con Git" +msgid "A tool for managing large Git repositories" +msgstr "Una herramienta para gestionar repositorios de Git grandes" + msgid "commit-graph file is too small" msgstr "archivo commit-graph es demasiado pequeño" @@ -13921,11 +14123,11 @@ msgstr "Calculando números de generación de commit graph" msgid "Collecting referenced commits" msgstr "Recolectando commits referenciados" -#, fuzzy, c-format +#, c-format msgid "Finding commits for commit graph in %<PRIuMAX> pack" msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs" -msgstr[0] "Encontrando commits para commit graph en %d pack" -msgstr[1] "Encontrando commits para commit graph en %d packs" +msgstr[0] "Encontrando commits para el grafo de commits en %<PRIuMAX> pack" +msgstr[1] "Encontrando commits para el grafo de commits en %<PRIuMAX> packs" #, c-format msgid "error adding pack %s" @@ -14087,12 +14289,12 @@ msgstr "El commit %s tiene una buena firma GPG por %s\n" msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" -"variable i18n.commitencoding to the encoding your project uses.\n" +"variable i18n.commitEncoding to the encoding your project uses.\n" msgstr "" -"Peligro: el mensaje del commit no se ajusta a UTF-8.\n" +"Advertencia: el mensaje del commit no se ajusta a UTF-8.\n" "Tal vez quieras enmendarlo después de arreglar el mensaje, o arreglar la\n" -"variable de configuración i18n.commitencoding para la codificación que use " -"tu proyecto.\n" +"variable de configuración i18n.commitEncoding para la codificación que el " +"proyecto use.\n" msgid "no compiler information available\n" msgstr "no hay información disponible del compilador\n" @@ -14100,138 +14302,140 @@ msgstr "no hay información disponible del compilador\n" msgid "no libc information available\n" msgstr "no hay información disponible de libc\n" -#, fuzzy, c-format +#, c-format +msgid "could not determine free disk size for '%s'" +msgstr "no se pudo determinar el espacio de disco libre de '%s'" + +#, c-format +msgid "could not get info for '%s'" +msgstr "no se pudo averiguar la información de '%s'" + +#, c-format msgid "[GLE %ld] health thread could not open '%ls'" -msgstr "no se pudo abrir '%s'" +msgstr "[GLE %ld] el hilo de salud no pudo abrir '%ls'" #, c-format msgid "[GLE %ld] health thread getting BHFI for '%ls'" -msgstr "" +msgstr "[GLE %ld] hilo de salud averiguando BHFI de '%ls'" -#, fuzzy, c-format +#, c-format msgid "could not convert to wide characters: '%s'" -msgstr "" -"no se pudo convertir el siguiente graft(s):\n" -"%s" +msgstr "no se pudo convertir a caracteres anchos: '%s'" -#, fuzzy, c-format +#, c-format msgid "BHFI changed '%ls'" -msgstr "no se puede cambiar a '%s'" +msgstr "BHFI cambió '%ls'" #, c-format msgid "unhandled case in 'has_worktree_moved': %d" -msgstr "" +msgstr "caso no manejado en 'has_worktree_moved': %d" #, c-format msgid "health thread wait failed [GLE %ld]" -msgstr "" +msgstr "falló la espera del hilo de salud [GLE %ld]" -#, fuzzy msgid "Unable to create FSEventStream." -msgstr "no es posible crear hilo: %s" +msgstr "Incapaz de crear FSEventStream." -#, fuzzy msgid "Failed to start the FSEventStream" -msgstr "Falló al iniciar emacsclient." +msgstr "Falló al iniciar el FSEventStream" #, c-format msgid "[GLE %ld] could not convert path to UTF-8: '%.*ls'" -msgstr "" +msgstr "[GLE %ld] no se pudo convertir la ruta a UTF-8: '%.*ls'" -#, fuzzy, c-format +#, c-format msgid "[GLE %ld] could not watch '%s'" -msgstr "no se pudo hacer stat en '%s'" +msgstr "[GLE %ld] no se pudo vigilar '%s'" -#, fuzzy, c-format +#, c-format msgid "[GLE %ld] could not get longname of '%s'" -msgstr "no se pudo conseguir 'onto': '%s'" +msgstr "[GLE %ld] no se pudo averiguar el nombre largo de '%s'" #, c-format msgid "ReadDirectoryChangedW failed on '%s' [GLE %ld]" -msgstr "" +msgstr "Falló ReadDirectoryChangedW en '%s' [GLE %ld]" #, c-format msgid "GetOverlappedResult failed on '%s' [GLE %ld]" -msgstr "" +msgstr "Falló GetOverlappedResult en '%s' [GLE %ld]" -#, fuzzy, c-format +#, c-format msgid "could not read directory changes [GLE %ld]" -msgstr "no se pudo crear directorios para %s" +msgstr "no se pudo leer los cambios de directorio [GLE %ld]" + +#, c-format +msgid "[GLE %ld] unable to open for read '%ls'" +msgstr "[GLE %ld] incapaz de abrir para leer '%ls'" + +#, c-format +msgid "[GLE %ld] unable to get protocol information for '%ls'" +msgstr "[GLE %ld] incapaz de averiguar la información de protocolo de '%ls'" -#, fuzzy, c-format +#, c-format msgid "failed to copy SID (%ld)" -msgstr "falló al copiar archivo a '%s'" +msgstr "falló al copiar SID (%ld)" -#, fuzzy, c-format +#, c-format msgid "failed to get owner for '%s' (%ld)" -msgstr "falló al iterar sobre '%s'" +msgstr "falló al averiguar el propietario de '%s' (%ld)" msgid "memory exhausted" msgstr "memoria agotada" msgid "Success" -msgstr "" +msgstr "Éxito" msgid "No match" -msgstr "" +msgstr "Ninguna coincidencia" -#, fuzzy msgid "Invalid regular expression" -msgstr "usar expresiones regulares POSIX extendidas" +msgstr "Expresión regular inválida" -#, fuzzy msgid "Invalid collation character" -msgstr "carácter lastre" +msgstr "Carácter de colación inválido" -#, fuzzy msgid "Invalid character class name" -msgstr "carácter inválido en el nombre del host" +msgstr "Nombre de clase de carácter inválido" msgid "Trailing backslash" -msgstr "" +msgstr "Backslash al final" -#, fuzzy msgid "Invalid back reference" -msgstr "referencia inválida: %s" +msgstr "Referencia atrás inválida" msgid "Unmatched [ or [^" -msgstr "" +msgstr "[ o [^ sin pareja" msgid "Unmatched ( or \\(" -msgstr "" +msgstr "( o \\( sin pareja" msgid "Unmatched \\{" -msgstr "" +msgstr "\\{ sin pareja" -#, fuzzy msgid "Invalid content of \\{\\}" -msgstr "contenido inválido: '%s'" +msgstr "Contenido inválido de \\{\\}" -#, fuzzy msgid "Invalid range end" -msgstr "codificación de transferencia inválida" +msgstr "Fin inválido de rango" -#, fuzzy msgid "Memory exhausted" -msgstr "memoria agotada" +msgstr "Memoria agotada" -#, fuzzy msgid "Invalid preceding regular expression" -msgstr "usar expresiones regulares POSIX extendidas" +msgstr "Expresión regular precedente inválida" -#, fuzzy msgid "Premature end of regular expression" -msgstr "usar expresiones regulares POSIX extendidas" +msgstr "Fin prematuro de expresión regular" msgid "Regular expression too big" -msgstr "" +msgstr "Expresión regular demasiada larga" msgid "Unmatched ) or \\)" -msgstr "" +msgstr ") o \\) sin pareja" -#, fuzzy msgid "No previous regular expression" -msgstr "usar expresiones regulares compatibles con Perl" +msgstr "No hay expresión regular previa" msgid "could not send IPC command" msgstr "no se pudo enviar el comando IPC" @@ -14247,28 +14451,27 @@ msgstr "no se pudo iniciar el accept_thread '%s'" msgid "could not start worker[0] for '%s'" msgstr "no se pudo iniciar el worker[0] para '%s'" -#, fuzzy, c-format +#, c-format msgid "ConnectNamedPipe failed for '%s' (%lu)" -msgstr "uname() falló con error '%s' (%d)\n" +msgstr "ConnectNamedPipe falló en '%s' (%lu)" -#, fuzzy, c-format +#, c-format msgid "could not create fd from pipe for '%s'" -msgstr "no se pudo crear directorios para %s" +msgstr "no se pudo crear descriptor de archivo del pipe para '%s'" -#, fuzzy, c-format +#, c-format msgid "could not start thread[0] for '%s'" -msgstr "no se pudo iniciar el worker[0] para '%s'" +msgstr "no se pudo iniciar thread[0] para '%s'" -#, fuzzy, c-format +#, c-format msgid "wait for hEvent failed for '%s'" -msgstr "Autenticación falló para '%s'" +msgstr "espera de hEvent falló en '%s'" msgid "cannot resume in the background, please use 'fg' to resume" -msgstr "" +msgstr "no se puede resumir en el fondo, por favor usa 'fg' para resumir" -#, fuzzy msgid "cannot restore terminal settings" -msgstr "no se puede guardar el archivo índice" +msgstr "no se puede restaurar la configuración de terminal" #, c-format msgid "" @@ -14299,6 +14502,8 @@ msgid "" "remote URLs cannot be configured in file directly or indirectly included by " "includeIf.hasconfig:remote.*.url" msgstr "" +"no se pueden configurar URLs remotos en archivo incluido directa o " +"indirectamente por includeIf.hasconfig:remote.*.url" #, c-format msgid "invalid config format: %s" @@ -14415,13 +14620,13 @@ msgstr "" msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "mal valor de config numérico '%s' para '%s' en %s: %s" -#, fuzzy, c-format +#, c-format msgid "invalid value for variable %s" -msgstr "valor inválido para %s" +msgstr "valor inválido para la variable %s" #, c-format msgid "ignoring unknown core.fsync component '%s'" -msgstr "" +msgstr "ignorando componente desconocido de core.fsync '%s'" #, c-format msgid "bad boolean config value '%s' for '%s'" @@ -14448,10 +14653,10 @@ msgstr "core.commentChar debería tener solo un carácter" #, c-format msgid "ignoring unknown core.fsyncMethod value '%s'" -msgstr "" +msgstr "ignorando valor desconocido de core.fsyncMethod '%s'" msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead" -msgstr "" +msgstr "core.fsyncObjectFiles es deprecado; usa core.fsync en su lugar" #, c-format msgid "invalid mode for object creation: %s" @@ -14708,190 +14913,6 @@ msgid "failed to close rev-list's stdin" msgstr "falló al cerrar la entrada standard de rev-list" #, c-format -msgid "'%s' does not exist" -msgstr "'%s' no existe" - -#, fuzzy -msgid "need a working directory" -msgstr "Incapaz de leer el directorio de trabajo actual" - -#, fuzzy -msgid "could not find enlistment root" -msgstr "no se pudo encontrar commit %s" - -#, fuzzy, c-format -msgid "could not switch to '%s'" -msgstr "no se pudo cambiar a %s" - -#, fuzzy, c-format -msgid "could not configure %s=%s" -msgstr "no se pudo bloquear archivo de configuración %s" - -msgid "could not configure log.excludeDecoration" -msgstr "" - -msgid "Scalar enlistments require a worktree" -msgstr "" - -#, c-format -msgid "could not open directory '%s'" -msgstr "no se pudo abrir el directorio '%s'" - -#, fuzzy, c-format -msgid "skipping '%s', which is neither file nor directory" -msgstr "destino '%s' no es un directorio" - -#, fuzzy, c-format -msgid "could not determine free disk size for '%s'" -msgstr "no se pudo crear un árbol de trabajo '%s'" - -#, fuzzy, c-format -msgid "could not get info for '%s'" -msgstr "no se pudo leer el log para '%s'" - -#, fuzzy, c-format -msgid "remote HEAD is not a branch: '%.*s'" -msgstr " Rama HEAD: %s" - -msgid "failed to get default branch name from remote; using local default" -msgstr "" - -#, fuzzy -msgid "failed to get default branch name" -msgstr "falló al formatear el valor por defecto de configuración: %s" - -#, fuzzy -msgid "failed to unregister repository" -msgstr "falló al crear directorio %s" - -#, fuzzy -msgid "failed to delete enlistment directory" -msgstr "falló al eliminar directorio %s" - -msgid "branch to checkout after clone" -msgstr "" - -#, fuzzy -msgid "when cloning, create full working directory" -msgstr "no es posible obtener el directorio de trabajo actual" - -msgid "only download metadata for the branch that will be checked out" -msgstr "" - -#, fuzzy -msgid "scalar clone [<options>] [--] <repo> [<dir>]" -msgstr "git clone [<opciones>] [--] <repo> [<directorio>]" - -#, fuzzy, c-format -msgid "cannot deduce worktree name from '%s'" -msgstr "No se puede acceder al árbol de trabajo '%s'" - -#, c-format -msgid "directory '%s' exists already" -msgstr "" - -#, fuzzy, c-format -msgid "failed to get default branch for '%s'" -msgstr "error al conseguir el remoto por defecto para el submódulo '%s'" - -#, fuzzy, c-format -msgid "could not configure remote in '%s'" -msgstr "no se pudo crear el archivo '%s'" - -#, fuzzy, c-format -msgid "could not configure '%s'" -msgstr "no se pudo cerrar '%s'" - -msgid "partial clone failed; attempting full clone" -msgstr "" - -#, fuzzy -msgid "could not configure for full clone" -msgstr "no se pudo bloquear archivo de configuración %s" - -msgid "scalar diagnose [<enlistment>]" -msgstr "" - -#, fuzzy, c-format -msgid "could not create directory for '%s'" -msgstr "No se pudo crear el directorio para '%s'" - -#, fuzzy -msgid "could not duplicate stdout" -msgstr "no se puede actualizar %s" - -#, fuzzy -msgid "failed to write archive" -msgstr "falló al leer la cache" - -#, fuzzy -msgid "`scalar list` does not take arguments" -msgstr "%%(rest) no toma ningún argumento" - -msgid "scalar register [<enlistment>]" -msgstr "" - -msgid "reconfigure all registered enlistments" -msgstr "" - -msgid "scalar reconfigure [--all | <enlistment>]" -msgstr "" - -msgid "--all or <enlistment>, but not both" -msgstr "" - -#, fuzzy, c-format -msgid "git repository gone in '%s'" -msgstr "no es un repositorio git: '%s'" - -msgid "" -"scalar run <task> [<enlistment>]\n" -"Tasks:\n" -msgstr "" - -#, fuzzy, c-format -msgid "no such task: '%s'" -msgstr "no existe tal rama: '%s'" - -msgid "scalar unregister [<enlistment>]" -msgstr "" - -msgid "scalar delete <enlistment>" -msgstr "" - -#, fuzzy -msgid "refusing to delete current working directory" -msgstr "no es posible obtener el directorio de trabajo actual" - -#, fuzzy -msgid "include Git version" -msgstr "versión de hash inválida" - -msgid "include Git's build options" -msgstr "" - -msgid "scalar verbose [-v | --verbose] [--build-options]" -msgstr "" - -#, fuzzy -msgid "-C requires a <directory>" -msgstr "--stdin requiere un repositorio git" - -#, fuzzy, c-format -msgid "could not change to '%s'" -msgstr "no se puede cambiar a '%s'" - -#, fuzzy -msgid "-c requires a <key>=<value> argument" -msgstr "-n requiere un argumento" - -msgid "" -"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n" -"\n" -"Commands:\n" -msgstr "" - -#, c-format msgid "illegal crlf_action %d" msgstr "crlf_action %d ilegal" @@ -14904,6 +14925,8 @@ msgid "" "in the working copy of '%s', CRLF will be replaced by LF the next time Git " "touches it" msgstr "" +"en la copia de trabajo de '%s', CRLF será reemplazado con LF la próxima vez " +"que Git la toque" #, c-format msgid "LF would be replaced by CRLF in %s" @@ -14914,6 +14937,8 @@ msgid "" "in the working copy of '%s', LF will be replaced by CRLF the next time Git " "touches it" msgstr "" +"en la copia de trabajo de '%s', LF será reemplazado con CRLF la próxima vez " +"que Git la toque" #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" @@ -15092,6 +15117,32 @@ msgstr "regex isla de config tiene demasiados grupos de captura (max=%d)" msgid "Marked %d islands, done.\n" msgstr "%d islas marcadas, listo.\n" +#, c-format +msgid "invalid --%s value '%s'" +msgstr "valor de --%s inválido '%s'" + +#, c-format +msgid "could not archive missing directory '%s'" +msgstr "no se pudo archivar el directorio faltante '%s'" + +#, c-format +msgid "could not open directory '%s'" +msgstr "no se pudo abrir el directorio '%s'" + +#, c-format +msgid "skipping '%s', which is neither file nor directory" +msgstr "saltando '%s', el cual no es ni archivo ni directorio" + +msgid "could not duplicate stdout" +msgstr "no se pudo duplicar stdout" + +#, c-format +msgid "could not add directory '%s' to archiver" +msgstr "no se pudo añadir el directorio '%s' al cronista" + +msgid "failed to write archive" +msgstr "falló al escribir crónica" + msgid "--merge-base does not work with ranges" msgstr "--merge-base no funciona con rangos" @@ -15165,18 +15216,21 @@ msgstr "" msgid "external diff died, stopping at %s" msgstr "diff externo murió, deteniendo en %s" -#, fuzzy, c-format +#, c-format msgid "options '%s', '%s', '%s', and '%s' cannot be used together" -msgstr "Opciones --squash y --fixup no pueden ser usadas juntas" +msgstr "las opciones '%s', '%s', '%s' y '%s' no pueden ser usadas juntas" -#, fuzzy, c-format +#, c-format msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'" -msgstr "'%s' o '%s' no puede ser usado con %s" +msgstr "" +"las opciones '%s' y '%s' no pueden ser usadas juntas, usa '%s' con '%s'" -#, fuzzy, c-format +#, c-format msgid "" "options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'" -msgstr "'%s' o '%s' no puede ser usado con %s" +msgstr "" +"las opciones '%s' y '%s' no pueden ser usadas juntas, usa '%s' con '%s' y " +"'%s'" msgid "--follow requires exactly one pathspec" msgstr "--follow requiere exactamente un pathspec" @@ -15596,9 +15650,8 @@ msgstr "seleccionar archivos por tipo de diff" msgid "<file>" msgstr "<archivo>" -#, fuzzy msgid "output to a specific file" -msgstr "Output a un archivo específico" +msgstr "emitir a un archivo específico" msgid "exhaustive rename detection was skipped due to too many files." msgstr "" @@ -15714,6 +15767,9 @@ msgstr "git fetch-pack: se esperaba ACK/NAK, se obtuvo '%s'" msgid "unable to write to remote" msgstr "no se puede escribir al remoto" +msgid "Server supports filter" +msgstr "El servidor soporta filtración" + #, c-format msgid "invalid shallow line: %s" msgstr "línea shallow inválida: %s" @@ -15824,9 +15880,6 @@ msgstr "el servidor no soporta el algoritmo '%s'" msgid "Server does not support shallow requests" msgstr "El servidor no soporta peticiones superficiales" -msgid "Server supports filter" -msgstr "El servidor soporta filtración" - msgid "unable to write request to remote" msgstr "no se puede escribir request al remoto" @@ -15834,9 +15887,9 @@ msgstr "no se puede escribir request al remoto" msgid "expected '%s', received '%s'" msgstr "se esperaba '%s', se recibió '%s'" -#, fuzzy, c-format +#, c-format msgid "expected '%s'" -msgstr "línea inesperada: '%s'" +msgstr "se esperó '%s'" #, c-format msgid "unexpected acknowledgment line: '%s'" @@ -15849,16 +15902,17 @@ msgstr "error al procesar acks: %d" #. TRANSLATORS: The parameter will be 'ready', a protocol #. keyword. #. -#, fuzzy, c-format +#, c-format msgid "expected packfile to be sent after '%s'" -msgstr "se esperaba que el packfile fuera enviado luego del 'listo'" +msgstr "se esperaba que el archivo de pack fuera enviado luego del '%s'" #. TRANSLATORS: The parameter will be 'ready', a protocol #. keyword. #. -#, fuzzy, c-format +#, c-format msgid "expected no other sections to be sent after no '%s'" -msgstr "se esperaba que ninguna otra sección fuera enviada luego del 'listo'" +msgstr "" +"se esperaba que ninguna otra sección fuera enviada luego de la falta de '%s'" #, c-format msgid "error processing shallow info: %d" @@ -15895,41 +15949,42 @@ msgstr "El servidor no permite solicitudes de objetos inadvertidos %s" #, c-format msgid "fsmonitor_ipc__send_query: invalid path '%s'" -msgstr "" +msgstr "fsmonitor_ipc__send_query: ruta inválida '%s'" #, c-format msgid "fsmonitor_ipc__send_query: unspecified error on '%s'" -msgstr "" +msgstr "fsmonitor_ipc__send_query: error no especificado en '%s'" msgid "fsmonitor--daemon is not running" -msgstr "" +msgstr "fsmonitor--daemon no está ejecutándose" -#, fuzzy, c-format +#, c-format msgid "could not send '%s' command to fsmonitor--daemon" -msgstr "no se pudo enviar el comando IPC" +msgstr "no se pudo enviar el comando '%s' a fsmonitor--daemon" -#, fuzzy, c-format +#, c-format msgid "bare repository '%s' is incompatible with fsmonitor" -msgstr "%s es incompatible con %s" +msgstr "el repositorio desnudo '%s es incompatible con fsmonitor" #, c-format msgid "repository '%s' is incompatible with fsmonitor due to errors" -msgstr "" +msgstr "el repositorio '%s' es incompatible con fsmonitor a causa de errores" -#, fuzzy, c-format +#, c-format msgid "remote repository '%s' is incompatible with fsmonitor" -msgstr "%s es incompatible con %s" +msgstr "el repositorio remoto '%s' es incompatible con fsmonitor" -#, fuzzy, c-format +#, c-format msgid "virtual repository '%s' is incompatible with fsmonitor" -msgstr "%s es incompatible con %s" +msgstr "el repositorio virtual '%s' es incompatible con fsmonitor" #, c-format msgid "" "repository '%s' is incompatible with fsmonitor due to lack of Unix sockets" msgstr "" +"el repositorio '%s' es incompatible con fsmonitor a causa de falta de " +"sockets de Unix" -#, fuzzy msgid "" "git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]\n" " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" @@ -15939,14 +15994,14 @@ msgid "" " [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n" " <command> [<args>]" msgstr "" -"git [--version] [--help] [-C <ruta>] [-c <nombre>=<valor>]\n" -" [--exec-path [= <path>]] [--html-path] [--man-path] [--info-" -"path]\n" -" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" +"git [-v | --version] [-h | --help] [-C <ruta>] [-c <nombre>=<valor>]\n" +" [--exec-path[=<ruta>]] [--html-path] [--man-path] [--info-path]\n" +" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" "bare]\n" -" [--git-dir=<ruta>] [--work-tree=<ruta>] [--namespace=<nombre>]\n" -" [--super-prefix=<ruta>] [--config-env=<nombre>=<envvar>]\n" -" <comando> [<args>]" +" [--git-dir=<ruta>] [--work-tree=<ruta>] [--namespace=<nombre>]\n" +" [--super-prefix=<ruta>] [--config-env=<nombre>=<variable-de-" +"entorno>]\n" +" <comando> [<argumentos>]" msgid "" "'git help -a' and 'git help -g' list available subcommands and some\n" @@ -15963,9 +16018,9 @@ msgstr "" msgid "unsupported command listing type '%s'" msgstr "tipo de listado de comandos no soportado '%s'" -#, fuzzy, c-format +#, c-format msgid "no directory given for '%s' option\n" -msgstr "no se entregó directorio para -C\n" +msgstr "no se entregó un directorio para la opción '%s'\n" #, c-format msgid "no namespace given for --namespace\n" @@ -16090,8 +16145,8 @@ msgstr "gpg.ssh.defaultKeyCommand falló: %s %s" msgid "gpg failed to sign the data" msgstr "gpg falló al firmar los datos" -msgid "user.signingkey needs to be set for ssh signing" -msgstr "user.signingkey necesita ser configurado para firmar con ssh" +msgid "user.signingKey needs to be set for ssh signing" +msgstr "user.signingKey necesita ser configurado para firmar con ssh" #, c-format msgid "failed writing ssh signing key to '%s'" @@ -16170,6 +16225,14 @@ msgstr "Comandos de bajo nivel / Sincronización de repositorios" msgid "Low-level Commands / Internal Helpers" msgstr "Comandos de bajo nivel / Auxiliares internos" +msgid "User-facing repository, command and file interfaces" +msgstr "Interfaces de repositorio, comando y archivo orientadas al usuario" + +msgid "Developer-facing file formats, protocols and other interfaces" +msgstr "" +"Formatos de archivo, protocolos e otras interfaces orientados al " +"desarrollador" + #, c-format msgid "available git commands in '%s'" msgstr "comandos disponibles de git en '%s'" @@ -16183,6 +16246,13 @@ msgstr "Estos son comandos comunes de Git usados en varias situaciones:" msgid "The Git concept guides are:" msgstr "Las guías de conceptos de Git son:" +msgid "User-facing repository, command and file interfaces:" +msgstr "Interfaces de repositorio, comando y archivo orientadas al usuario:" + +msgid "File formats, protocols and other developer interfaces:" +msgstr "" +"Formatos de archivo, protocolos y otras interfaces para el desarrollador:" + msgid "External commands" msgstr "Comandos externos" @@ -16209,15 +16279,15 @@ msgstr "Oh oh. Tu sistema no reporta ningún comando de Git." #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." -msgstr "PELIGRO: Has llamado a un comando de Git '%s', el cual no existe." +msgstr "ADVERTENCIA: Has llamado a un comando de Git '%s', el cual no existe." #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "Continuando asumiendo que quisiste decir '%s'." -#, fuzzy, c-format +#, c-format msgid "Run '%s' instead [y/N]? " -msgstr "Ejecutar '%s' en su lugar? (y/N)" +msgstr "¿Ejecutar '%s' en su lugar [y/N]? " #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." @@ -16264,10 +16334,6 @@ msgstr "" "El hook '%s' fue ignorado porque no ha sido configurado como ejecutable.\n" "Puedes desactivar esta advertencia con `git config advice.ignoredHook false`." -#, fuzzy, c-format -msgid "Couldn't start hook '%s'\n" -msgstr "No se pudo hacer stat en '%s'" - #, c-format msgid "argument to --packfile must be a valid hash (got '%s')" msgstr "argumento para --packfile tiene que se un hash válido (se obtuvo '%s')" @@ -16276,8 +16342,8 @@ msgid "not a git repository" msgstr "no es un repositorio git" #, c-format -msgid "negative value for http.postbuffer; defaulting to %d" -msgstr "valor negativo para http.postbuffer; poniendo el default %d" +msgid "negative value for http.postBuffer; defaulting to %d" +msgstr "valor negativo de http.postBuffer; usando el valor por defecto %d" msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "Delegación de control no es soportada con cURL < 7.22.0" @@ -16454,19 +16520,14 @@ msgid "quoted CRLF detected" msgstr "CRLF con comillas detectado" #, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -" %s" -msgstr "" -"Los cambios locales de los siguientes archivos serán sobreescritos por " -"merge:\n" -" %s" - -#, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "Falló al fusionar el submódulo %s (no revisado)" #, c-format +msgid "Failed to merge submodule %s (no merge base)" +msgstr "Falló al fusionar el submódulo %s (no hay base de fusión)" + +#, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "Falló al fusionar el submódulo %s (commits no presentes)" @@ -16484,28 +16545,10 @@ msgstr "Falló al fusionar el submódulo %s" #, c-format msgid "" -"Failed to merge submodule %s, but a possible merge resolution exists:\n" -"%s\n" +"Failed to merge submodule %s, but a possible merge resolution exists: %s" msgstr "" -"Falló al fusionar el submódulo %s, pero existen posibles soluciones de " -"fusión:\n" -"%s\n" - -#, c-format -msgid "" -"If this is correct simply add it to the index for example\n" -"by using:\n" -"\n" -" git update-index --cacheinfo 160000 %s \"%s\"\n" -"\n" -"which will accept this suggestion.\n" -msgstr "" -"Si esto es correcto simplemente agrégalo al índice por ejemplo\n" -"usando:\n" -"\n" -" git update-index --cacheinfo 160000 %s \"%s\"\n" -"\n" -"el cual aceptará esta sugerencia.\n" +"Falló al fusionar el submódulo %s, pero existe una solución de fusión " +"posible: %s" #, c-format msgid "" @@ -16559,7 +16602,7 @@ msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " "renamed." msgstr "" -"PELIGRO: Evitando aplicar %s -> %s renombrado a %s, porque %s mismo fue " +"ADVERTENCIA: Evitando aplicar %s -> %s renombrado a %s, porque %s mismo fue " "renombrado." #, c-format @@ -16671,13 +16714,45 @@ msgstr "" "CONFLICTO (modificar / eliminar): %s eliminado en %s y modificado en %s. " "Versión %s de %s restante en el árbol." +#. TRANSLATORS: This is a line of advice to resolve a merge +#. 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" +#. #, c-format msgid "" -"Note: %s not up to date and in way of checking out conflicted version; old " -"copy renamed to %s" +" - go to submodule (%s), and either merge commit %s\n" +" or update to an existing commit which has merged those changes\n" msgstr "" -"Nota: %s no está actualizado y en conflicto con la versión; la copia antigua " -"fue renombrada a %s" +" - ve al submódulo (%s), y después o fusiona el commit %s\n" +" o actualiza a un commit existente en que ya se han fusionado esos " +"cambios\n" + +#, c-format +msgid "" +"Recursive merging with submodules currently only supports trivial cases.\n" +"Please manually handle the merging of each conflicted submodule.\n" +"This can be accomplished with the following steps:\n" +"%s - come back to superproject and run:\n" +"\n" +" git add %s\n" +"\n" +" to record the above merge or update\n" +" - resolve any other conflicts in the superproject\n" +" - commit the resulting index in the superproject\n" +msgstr "" +"La fusión recursiva con submódulos actualmente solo soporta casos " +"triviales.\n" +"Por favor, maneja manualmente la fusión de cada submódulo en conflicto.\n" +"Esto se puede lograr con los pasos siguientes:\n" +"%s - volver al superproyecto y ejecutar:\n" +"\n" +" git add %s\n" +"\n" +" para registrar la fusión de arriba o actualizar\n" +" - resolver cualquier otro conflicto en el superproyecto\n" +" - hace commit al índice resultante en el superproyecto\n" #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge #. base, and 2-3) the trees for the two trees we're merging. @@ -16750,6 +16825,22 @@ msgid "Found a possible merge resolution for the submodule:\n" msgstr "Se encontró una posible solución de fusión para el submódulo:\n" #, c-format +msgid "" +"If this is correct simply add it to the index for example\n" +"by using:\n" +"\n" +" git update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"which will accept this suggestion.\n" +msgstr "" +"Si esto es correcto simplemente agrégalo al índice por ejemplo\n" +"usando:\n" +"\n" +" git update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"el cual aceptará esta sugerencia.\n" + +#, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "Falló al fusionar el submódulo %s (múltiples fusiones encontradas)" @@ -17020,9 +17111,8 @@ msgstr "pack de referencia '% s' ha expirado" msgid "no pack files to index." msgstr "no hay archivos pack para indexar." -#, fuzzy msgid "refusing to write multi-pack .bitmap without any objects" -msgstr "no se pudo escribir bitmap multi-paquete" +msgstr "rehusando escribir .bitmap de multi-pack sin ningún objeto" msgid "could not write multi-pack bitmap" msgstr "no se pudo escribir bitmap multi-paquete" @@ -17283,6 +17373,22 @@ msgid "confused by unstable object source data for %s" msgstr "confundido por fuente de data de objetos inestable para %s" #, c-format +msgid "write stream object %ld != %<PRIuMAX>" +msgstr "objeto de stream de escritura %ld != %<PRIuMAX>" + +#, c-format +msgid "unable to stream deflate new object (%d)" +msgstr "incapaz de desinflar dinamicamente el objeto nuevo (%d)" + +#, c-format +msgid "deflateEnd on stream object failed (%d)" +msgstr "deflateEnd en el objeto de stream falló (%d)" + +#, c-format +msgid "unable to create directory %s" +msgstr "incapaz de crear directorio %s" + +#, c-format msgid "cannot read object for %s" msgstr "no se pudo leer el objeto para %s" @@ -17340,23 +17446,23 @@ msgstr "no es posible desempaquetar contenidos de %s" #. output shown when we cannot look up or parse the #. object in question. E.g. "deadbeef [bad object]". #. -#, fuzzy, c-format +#, c-format msgid "%s [bad object]" -msgstr "tipo de objeto erróneo." +msgstr "%s [mal objeto]" #. 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" #. -#, fuzzy, c-format +#, c-format msgid "%s commit %s - %s" -msgstr "%s: %s - %s" +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. @@ -17364,33 +17470,33 @@ msgstr "%s: %s - %s" #. The third argument is the "tag" string #. from object.c. #. -#, fuzzy, c-format +#, c-format msgid "%s tag %s - %s" -msgstr "%s: %s - %s" +msgstr "%s etiqueta %s - %s" #. TRANSLATORS: This is a line of ambiguous #. 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]" #. -#, fuzzy, c-format +#, c-format msgid "%s [bad tag, could not parse it]" -msgstr "%s: no se pudo analizar objeto: %s" +msgstr "%s [mala etiqueta, no se pudo analizar]" #. TRANSLATORS: This is a line of ambiguous <type> #. object output. E.g. "deadbeef tree". #. -#, fuzzy, c-format +#, c-format msgid "%s tree" -msgstr "hilo %s falló" +msgstr "árbol %s" #. TRANSLATORS: This is a line of ambiguous <type> #. object output. E.g. "deadbeef blob". #. -#, fuzzy, c-format +#, c-format msgid "%s blob" -msgstr "blob" +msgstr "blob %s" #, c-format msgid "short object ID %s is ambiguous" @@ -17400,11 +17506,13 @@ msgstr "el ID de objeto corto %s es ambiguo" #. objects composed in show_ambiguous_object(). See #. its "TRANSLATORS" comments for details. #. -#, fuzzy, c-format +#, c-format msgid "" "The candidates are:\n" "%s" -msgstr "Los candidatos son:" +msgstr "" +"Los candidatos son:\n" +"%s" msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" @@ -17482,7 +17590,7 @@ msgstr "" #, c-format msgid "<object>:<path> required, only <object> '%s' given" -msgstr "" +msgstr "<objeto>:<ruta> requerido, solo <objeto> '%s' proporcionado" #, c-format msgid "invalid object name '%.*s'." @@ -17508,40 +17616,144 @@ msgstr "incapaz de analizar objeto: %s" msgid "hash mismatch %s" msgstr "hash no concuerda %s" +msgid "trying to write commit not in index" +msgstr "intentando escribir un commit que no está en el índice" + +msgid "failed to load bitmap index (corrupted?)" +msgstr "falló al cargar el índice de bitmap (¿corrupto?)" + +msgid "corrupted bitmap index (too small)" +msgstr "índice de bitmap corrupto (demasiado pequeño)" + +msgid "corrupted bitmap index file (wrong header)" +msgstr "archivo de índice de bitmap corrupto (cabecera errónea)" + +#, c-format +msgid "unsupported version '%d' for bitmap index file" +msgstr "versión no soportada '%d' de archivo de índice de bitmap" + +msgid "corrupted bitmap index file (too short to fit hash cache)" +msgstr "" +"archivo de índice de bitmap corrupto (demasiado corto para el cache de hash)" + +msgid "corrupted bitmap index file (too short to fit lookup table)" +msgstr "" +"archivo de índice de bitmap corrupto (demasiado corto para la tabla de " +"consultación)" + +#, c-format +msgid "duplicate entry in bitmap index: '%s'" +msgstr "entrada duplicada en el índice de bitmap: '%s'" + +#, c-format +msgid "corrupt ewah bitmap: truncated header for entry %d" +msgstr "bitmap ewah corrupto: cabecera truncada en la entrada %d" + +#, c-format +msgid "corrupt ewah bitmap: commit index %u out of range" +msgstr "bitmap ewah corrupto: índice de commit %u fuera de rango" + +msgid "corrupted bitmap pack index" +msgstr "índice de pack de bitmap corrupto" + +msgid "invalid XOR offset in bitmap pack index" +msgstr "offset XOR inválido en el índice de pack de bitmap" + +msgid "cannot fstat bitmap file" +msgstr "no se puede hacer fstat en el archivo de bitmap" + +#, c-format +msgid "ignoring extra bitmap file: '%s'" +msgstr "ignorando el archivo extra de bitmap: '%s'" + +msgid "checksum doesn't match in MIDX and bitmap" +msgstr "no se concuerden los checksums del MIDX y del bitmap" + msgid "multi-pack bitmap is missing required reverse index" msgstr "a multi-pack-index le falta un índice reveretido" -#, fuzzy, c-format +#, c-format msgid "could not open pack %s" -msgstr "no se pudo abrir '%s'" +msgstr "no se pudo abrir el pack %s" -#, fuzzy, c-format +#, c-format msgid "preferred pack (%s) is invalid" -msgstr "pack de referencia '% s' ha expirado" +msgstr "el pack preferido (%s) es inválido" + +msgid "corrupt bitmap lookup table: triplet position out of index" +msgstr "tabla de consultación corrupta: posición de trillizo fuera del índice" + +msgid "corrupt bitmap lookup table: xor chain exceeds entry count" +msgstr "" +"tabla de consultación de bitmap corrupta: la cadena xor excede el número de " +"entradas" + +#, c-format +msgid "corrupt bitmap lookup table: commit index %u out of range" +msgstr "" +"tabla de consultación de bitmap corrupta: índice de commit %u fuera de rango" + +#, c-format +msgid "corrupt ewah bitmap: truncated header for bitmap of commit \"%s\"" +msgstr "bitmap ewah corrupto: cabecera truncada del bitmap del commit \"%s\"" + +#, c-format +msgid "object '%s' not found in type bitmaps" +msgstr "objeto '%s' no encontrado en bitmaps de tipo" + +#, c-format +msgid "object '%s' does not have a unique type" +msgstr "el objeto '%s' no tiene un tipo único" + +#, c-format +msgid "object '%s': real type '%s', expected: '%s'" +msgstr "objeto '%s': tipo real '%s', esperado: '%s'" + +#, c-format +msgid "object not in bitmap: '%s'" +msgstr "objeto no en bitmap: '%s'" + +msgid "failed to load bitmap indexes" +msgstr "falló en cargar índices de bitmap" + +msgid "you must specify exactly one commit to test" +msgstr "hay que especificar exactamente un commit para probar" + +#, c-format +msgid "commit '%s' doesn't have an indexed bitmap" +msgstr "el commit '%s' no tiene un bitmap indexado" + +msgid "mismatch in bitmap results" +msgstr "discordancia en los resultados de bitmap" #, c-format -msgid "could not find %s in pack %s at offset %<PRIuMAX>" -msgstr "no se pudo encontrar %s en paquete %s en el offset %<PRIuMAX>" +msgid "could not find '%s' in pack '%s' at offset %<PRIuMAX>" +msgstr "no se pudo encontrar '%s' en el pack '%s' al offset %<PRIuMAX>" -#, fuzzy, c-format +#, c-format +msgid "unable to get disk usage of '%s'" +msgstr "incapaz de obtener el uso de disco de '%s'" + +#, c-format msgid "mtimes file %s is too small" -msgstr "el archivo multi-pack-index %s es demasiado pequeño" +msgstr "el archivo de mtimes %s es demasiado pequeño" -#, fuzzy, c-format +#, c-format msgid "mtimes file %s has unknown signature" -msgstr "el archivo de índice inverso %s tiene una firma desconocida" +msgstr "el archivo de mtimes %s tiene una firma desconocida" -#, fuzzy, c-format +#, c-format msgid "mtimes file %s has unsupported version %<PRIu32>" -msgstr "archivo reverse-index %s tiene una versión no soportada %<PRIu32>" +msgstr "el archivo de mtimes %s tiene una versión no soportada %<PRIu32>" -#, fuzzy, c-format +#, c-format msgid "mtimes file %s has unsupported hash id %<PRIu32>" -msgstr "archivo reverse-index %s tiene un id de hash no soportado %<PRIu32>" +msgstr "" +"el archivo de mtimes %s tiene un identificador de hash no soportado %<PRIu32>" -#, fuzzy, c-format +#, c-format msgid "mtimes file %s is corrupt" -msgstr "el archivo de índice inverso %s está dañado" +msgstr "el archivo de mtimes %s es corrupto" #, c-format msgid "reverse-index file %s is too small" @@ -17557,11 +17769,13 @@ msgstr "el archivo de índice inverso %s tiene una firma desconocida" #, c-format msgid "reverse-index file %s has unsupported version %<PRIu32>" -msgstr "archivo reverse-index %s tiene una versión no soportada %<PRIu32>" +msgstr "el archivo reverse-index %s tiene la versión no soportada %<PRIu32>" #, c-format msgid "reverse-index file %s has unsupported hash id %<PRIu32>" -msgstr "archivo reverse-index %s tiene un id de hash no soportado %<PRIu32>" +msgstr "" +"el archivo reverse-index %s tiene el identificador de hash no soportado " +"%<PRIu32>" msgid "cannot both write and verify reverse index" msgstr "no puede escribir y verificar el índice inverso" @@ -17607,9 +17821,9 @@ msgstr "opción `%s' puede usar \"always\", \"auto\", o \"never\"" msgid "malformed object name '%s'" msgstr "nombre de objeto mal formado '%s'" -#, fuzzy, c-format +#, c-format msgid "option `%s' expects \"%s\" or \"%s\"" -msgstr "opción `%s' puede usar \"always\", \"auto\", o \"never\"" +msgstr "la opción `%s' espera \"%s\" o \"%s\"" #, c-format msgid "%s requires a value" @@ -17647,6 +17861,9 @@ msgstr "¿quisiste decir `--%s` (con dos guiones)?" msgid "alias of --%s" msgstr "alias de --%s" +msgid "need a subcommand" +msgstr "se necesita un subcomando" + #, c-format msgid "unknown option `%s'" msgstr "opción `%s' desconocida" @@ -18025,9 +18242,8 @@ msgstr "no se pudo refrescar el índice compartido '%s'" msgid "broken index, expect %s in %s, got %s" msgstr "index roto, se esperaba %s en %s, se obtuvo %s" -#, fuzzy msgid "cannot write split index for a sparse index" -msgstr "activar el uso de un índice sparse" +msgstr "no se puede escribir un índice dividido para un índice escaso" msgid "failed to convert to a sparse-index" msgstr "falló al convertir a un índice sparse" @@ -18084,9 +18300,12 @@ msgid "" "l, label <label> = label current HEAD with a name\n" "t, reset <label> = reset HEAD to a label\n" "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" -". create a merge commit using the original merge commit's\n" -". message (or the oneline, if no original merge commit was\n" -". specified); use -c <commit> to reword the commit message\n" +" create a merge commit using the original merge commit's\n" +" message (or the oneline, if no original merge commit was\n" +" specified); use -c <commit> to reword the commit message\n" +"u, update-ref <ref> = track a placeholder for the <ref> to be updated\n" +" to this position in the new commits. The <ref> is\n" +" updated at the end of the rebase\n" "\n" "These lines can be re-ordered; they are executed from top to bottom.\n" msgstr "" @@ -18096,20 +18315,23 @@ msgstr "" "r, reword <commit> = usar commit, pero refrasear el mensaje de commit\n" "e, edit <commit> = usar commit, pero parar para enmendar\n" "s, squash <commit> = usar commit, pero aplastarlo en el commit previo\n" -"f, fixup <commit> = como \"squash\", pero descarta el mensaje del log de " -"este commit\n" -"\t, a menos que se use -C, en cuyo caso\n" -"\tmantiene solo el mensaje del commit; -c es lo mismo que -C\n" -"\tpero abre el editor\n" +"f, fixup [-C | -c] <commit> = como \"squash\", pero descarta el mensaje del\n" +" log de este commit, a menos que se use -C, en cuyo caso\n" +" mantiene solo el mensaje del commit; -c es lo mismo que\n" +" -C pero abre el editor\n" "x, exec <commit> = ejecutar comando (el resto de la línea) usando un shell\n" "b, break = parar aquí (continuar rebase luego con 'git rebase --continue')\n" "d, drop <commit> = eliminar commit\n" "l, label <label> = poner label al HEAD actual con un nombre\n" "t, reset <label> = reiniciar HEAD al label\n" "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" -". crear un commit de fusión usando el mensaje original de\n" -". fusión (o la línea de oneline, si no se especifica un mensaje\n" -". de commit). Use -c <commit> para reescribir el mensaje del commit.\n" +" crear un commit de fusión usando el mensaje original de\n" +" fusión (o la línea de oneline, si no se especifica un mensaje\n" +" de commit). Use -c <commit> para reescribir el mensaje del commit.\n" +"u, update-ref <referencia> = rasrear un marcador de posición para que la\n" +" <referencia> sea actualizada a esta posición\n" +" en los commits nuevos. Se actualiza la\n" +" <referencia> al fin de la rebase\n" "\n" "Estas líneas pueden ser reordenadas; son ejecutadas desde arriba hacia " "abajo.\n" @@ -18165,7 +18387,8 @@ msgid "" "Warning: some commits may have been dropped accidentally.\n" "Dropped commits (newer to older):\n" msgstr "" -"Peligro: algunos commits pueden haber sido descartados de forma accidental.\n" +"Advertencia: algunos commits pueden haber sido descartados de forma " +"accidental.\n" "Commits descartados (empezando con el más nuevo):\n" #, c-format @@ -18291,9 +18514,9 @@ msgstr "" "no es un repositorio git, pero el campo '%.*s' requiere acceso a los datos " "de objeto" -#, fuzzy, c-format +#, c-format msgid "format: %%(%s) atom used without a %%(%s) atom" -msgstr "formato: átomo %%(else) usado sin un átomo %%(if)" +msgstr "formato: átomo %%(%s) usado sin un átomo %%(%s)" #, c-format msgid "format: %%(then) atom used more than once" @@ -18584,6 +18807,13 @@ msgstr "error de protocolo: se esperaba sha/ref, se obtuvo '%s'" msgid "http transport does not support %s" msgstr "http transport no soporta %s" +msgid "protocol error: expected '<url> <path>', missing space" +msgstr "error de protocolo: se esperaba '<url> <ruta>', falta el espacio" + +#, c-format +msgid "failed to download file at URL '%s'" +msgstr "falló al descargar el archivo al URL '%s'" + msgid "git-http-push failed" msgstr "git-http-push falló" @@ -18610,13 +18840,13 @@ msgstr "más de un receivepack dado, usando el primero" msgid "more than one uploadpack given, using the first" msgstr "más de un uploadpack dado, usando el primero" -#, fuzzy, c-format -msgid "unrecognized value fetch.credentialsInURL: '%s'" -msgstr "patrón desconocido: '%s'" +#, c-format +msgid "unrecognized value transfer.credentialsInUrl: '%s'" +msgstr "valor desconocido de transfer.credentialsInUrl: '%s'" #, c-format msgid "URL '%s' uses plaintext credentials" -msgstr "" +msgstr "El URL '%s' usa credenciales de texto claro" #, c-format msgid "Cannot fetch both %s and %s to %s" @@ -18925,6 +19155,14 @@ msgstr "no se pudo determinar revisión HEAD" msgid "failed to find tree of %s" msgstr "falló al encontrar árbol de %s" +#, c-format +msgid "resolve-undo records `%s` which is missing" +msgstr "resolve-undo registra '%s' el cual falta" + +#, c-format +msgid "could not get commit for ancestry-path argument %s" +msgstr "no se pudo determinar el commit del argumento de ancestry-path %s" + msgid "--unpacked=<packfile> no longer supported" msgstr "--unpacked=<packfile> ya no es soportado" @@ -18945,6 +19183,174 @@ msgstr "-L no soporta todavía formatos de diff fuera de -p y -s" msgid "cannot create async thread: %s" msgstr "no es posible crear hilo async: %s" +#, c-format +msgid "'%s' does not exist" +msgstr "'%s' no existe" + +#, c-format +msgid "could not switch to '%s'" +msgstr "no se pudo cambiar a '%s'" + +msgid "need a working directory" +msgstr "se necesita un directorio de trabajo" + +msgid "Scalar enlistments require a worktree" +msgstr "alistamientos de Scalar requieren un árbol de trabajo" + +#, c-format +msgid "could not configure %s=%s" +msgstr "no se pudo configurar %s=%s" + +msgid "could not configure log.excludeDecoration" +msgstr "no se pudo configurar log.excludeDecoration" + +msgid "could not add enlistment" +msgstr "no se pudo añadir alistamiento" + +msgid "could not set recommended config" +msgstr "no se pudo establecer la configuración recomendada" + +msgid "could not turn on maintenance" +msgstr "no se pudo activar mantenimiento" + +msgid "could not start the FSMonitor daemon" +msgstr "no se pudo iniciar el demonio de FSMonitor" + +msgid "could not turn off maintenance" +msgstr "no se pudo desactivar mantenimiento" + +msgid "could not remove enlistment" +msgstr "no se pudo eliminar alistamiento" + +#, c-format +msgid "remote HEAD is not a branch: '%.*s'" +msgstr "la HEAD remota no es una rama: '%.*s'" + +msgid "failed to get default branch name from remote; using local default" +msgstr "" +"falló al obtener el nombre de rama por defecto del remoto; usando el valor " +"local por defecto" + +msgid "failed to get default branch name" +msgstr "falló al determinar el nombre de rama por defecto" + +msgid "failed to unregister repository" +msgstr "falló al desregistrar repositorio" + +msgid "failed to stop the FSMonitor daemon" +msgstr "falló al parar el demonio de FSMonitor" + +msgid "failed to delete enlistment directory" +msgstr "falló al eliminar el directorio de alistamiento" + +msgid "branch to checkout after clone" +msgstr "rama a que cambiar después de clonar" + +msgid "when cloning, create full working directory" +msgstr "cuando se clona, crear un directorio pleno de trabajo" + +msgid "only download metadata for the branch that will be checked out" +msgstr "solo descargar metadatos de la rama a que cambiar" + +msgid "scalar clone [<options>] [--] <repo> [<dir>]" +msgstr "scalar clone [<opciones>] [--] <repositorio> [<directorio>]" + +#, c-format +msgid "cannot deduce worktree name from '%s'" +msgstr "no se puede deducir de '%s' el nombre del árbol de trabajo" + +#, c-format +msgid "directory '%s' exists already" +msgstr "el directorio '%s' ya existe" + +#, c-format +msgid "failed to get default branch for '%s'" +msgstr "falló al determinar la rama por defecto para '%s'" + +#, c-format +msgid "could not configure remote in '%s'" +msgstr "no se pudo configurar el remoto en '%s'" + +#, c-format +msgid "could not configure '%s'" +msgstr "no se pudo configurar '%s'" + +msgid "partial clone failed; attempting full clone" +msgstr "falló la clonación parcial; intentando clonación plena" + +msgid "could not configure for full clone" +msgstr "no se pudo configurar para una clonación plena" + +msgid "scalar diagnose [<enlistment>]" +msgstr "scalar diagnose [<alistamiento>]" + +msgid "`scalar list` does not take arguments" +msgstr "`scalar list` no toma ningún argumento" + +msgid "scalar register [<enlistment>]" +msgstr "scalar register [<alistamiento>]" + +msgid "reconfigure all registered enlistments" +msgstr "reconfigurar todos los alistamientos registrados" + +msgid "scalar reconfigure [--all | <enlistment>]" +msgstr "scalar reconfigure [--all | <alistamiento>]" + +msgid "--all or <enlistment>, but not both" +msgstr "--all o <alistamiento>, pero no los dos" + +#, c-format +msgid "git repository gone in '%s'" +msgstr "el repositorio de git en '%s' ya no está" + +msgid "" +"scalar run <task> [<enlistment>]\n" +"Tasks:\n" +msgstr "" +"scalar run <tarea> [<alistamiento>]\n" +"Tareas:\n" + +#, c-format +msgid "no such task: '%s'" +msgstr "no existe tal tarea: '%s'" + +msgid "scalar unregister [<enlistment>]" +msgstr "scalar unregister [<alistamiento>]" + +msgid "scalar delete <enlistment>" +msgstr "scalar delete <alistamiento>" + +msgid "refusing to delete current working directory" +msgstr "rehusando eliminar el directorio de trabajo actual" + +msgid "include Git version" +msgstr "incluir la versión de Git" + +msgid "include Git's build options" +msgstr "incluir las opciones de compilación de Git" + +msgid "scalar verbose [-v | --verbose] [--build-options]" +msgstr "scalar verbose [-v | --verbose] [--build-options]" + +msgid "-C requires a <directory>" +msgstr "-C requiere un <directorio>" + +#, c-format +msgid "could not change to '%s'" +msgstr "no se pudo cambiar a '%s'" + +msgid "-c requires a <key>=<value> argument" +msgstr "-c requiere un argumento <clave>=<valor>" + +msgid "" +"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n" +"\n" +"Commands:\n" +msgstr "" +"scalar [-C <directorio>] [-c <clave>=<valor>] <comando> [<opciones>]\n" +"\n" +"Comandos:\n" + msgid "unexpected flush packet while reading remote unpack status" msgstr "" "flush packet inesperado mientras se leía estatus de desempaquetado remoto" @@ -19067,10 +19473,6 @@ msgstr "tus cambios locales serán sobreescritos por %s." msgid "commit your changes or stash them to proceed." msgstr "realiza un commit con tus cambios o haz un stash para proceder." -#, c-format -msgid "%s: fast-forward" -msgstr "%s: avance rápido" - #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase". #. @@ -19421,7 +19823,7 @@ msgstr "final de archivo inesperado" #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" -msgstr "archivo HEAD '%s' guardado antes de cherry-pick está corrupto" +msgstr "archivo HEAD '%s' guardado antes de cherry-pick está corrupto" msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "Parece que se ha movido HEAD. No se hace rebobinado, ¡revisa tu HEAD!" @@ -19555,6 +19957,28 @@ msgstr "ni se pudo intentar fusionar '%.*s'" msgid "merge: Unable to write new index file" msgstr "fusión: No se puede escribir el nuevo archivo índice" +#, c-format +msgid "" +"another 'rebase' process appears to be running; '%s.lock' already exists" +msgstr "" +"parece que otro proceso 'rebase' ya se está ejecutando; '%s.lock' ya existe" + +#, c-format +msgid "" +"Updated the following refs with %s:\n" +"%s" +msgstr "" +"Se han actualizado las referencias siguientes con %s:\n" +"%s" + +#, c-format +msgid "" +"Failed to update the following refs with %s:\n" +"%s" +msgstr "" +"Falló al abrir las referencias siguientes con %s:\n" +"%s" + msgid "Cannot autostash" msgstr "No se puede ejecutar autostash" @@ -19723,6 +20147,10 @@ msgid "the script was already rearranged." msgstr "este script ya fue reorganizado." #, c-format +msgid "update-refs file at '%s' is invalid" +msgstr "el archivo de update-refs a '%s' es inválido" + +#, c-format msgid "'%s' is outside repository at '%s'" msgstr "'%s' está fuera del repositorio en '%s'" @@ -19845,11 +20273,20 @@ msgstr "" #, c-format msgid "" -"unsafe repository ('%s' is owned by someone else)\n" -"To add an exception for this directory, call:\n" +"detected dubious ownership in repository at '%s'\n" +"%sTo add an exception for this directory, call:\n" "\n" "\tgit config --global --add safe.directory %s" msgstr "" +"posesión dudosa detectada en el repositorio a '%s'\n" +"%sPara añadir una excepción para este directorio, ejecuta:\n" +"\n" +"\tgit config --global --add safe.directory %s" + +#, c-format +msgid "cannot use bare repository '%s' (safe.bareRepository is '%s')" +msgstr "" +"no se puede usar el repositorio desnudo '%s' (safe.bareRepository es '%s')" #, c-format msgid "" @@ -19869,9 +20306,8 @@ msgstr "falló setsid" msgid "index entry is a directory, but not sparse (%08x)" msgstr "la entrada de índice es un directorio, pero no escaso (%08x)" -#, fuzzy msgid "cannot use split index with a sparse index" -msgstr "no se puede leer el índice" +msgstr "no se puede usar un índice dividido con un índice escaso" #. TRANSLATORS: IEC 80000-13:2008 gibibyte #, c-format @@ -19925,8 +20361,8 @@ msgstr "no se pudo editar '%s'" msgid "ignoring suspicious submodule name: %s" msgstr "ignorando nombre de submódulo sospechoso: %s" -msgid "negative values not allowed for submodule.fetchjobs" -msgstr "no se permiten valores negativos para submodule.fetchjobs" +msgid "negative values not allowed for submodule.fetchJobs" +msgstr "no se permiten valores negativos para submodule.fetchJobs" #, c-format msgid "ignoring '%s' which may be interpreted as a command-line option: %s" @@ -20006,13 +20442,13 @@ msgstr "Haciendo fetch al submódulo %s%s\n" msgid "Could not access submodule '%s'\n" msgstr "No se pudo acceder al submódulo '%s'\n" -#, fuzzy, c-format +#, c-format msgid "Could not access submodule '%s' at commit %s\n" -msgstr "No se pudo acceder al submódulo '%s'\n" +msgstr "No se pudo acceder al submódulo '%s' al commit %s\n" -#, fuzzy, c-format +#, c-format msgid "Fetching submodule %s%s at commit %s\n" -msgstr "Haciendo fetch al submódulo %s%s\n" +msgstr "Haciendo fetch al submódulo %s%s al commit %s\n" #, c-format msgid "" @@ -20158,7 +20594,7 @@ msgid "number of threads in server thread pool" msgstr "número de hilos en el pool de hilos del servidor" msgid "seconds to wait for daemon to start or stop" -msgstr "segundos a esperar para que el dominio empiece o se detenga" +msgstr "segundos a esperar que el demonio se inicie o se detenga" msgid "number of bytes" msgstr "número de bytes" @@ -20519,11 +20955,13 @@ msgstr "" "seguimiento en ellos:\n" "%s" -#, fuzzy, c-format +#, c-format msgid "" "Refusing to remove the current working directory:\n" "%s" -msgstr "no es posible obtener el directorio de trabajo actual" +msgstr "" +"Rehusando eliminar el directorio de trabajo actual:\n" +"%s" #, c-format msgid "" @@ -20712,7 +21150,7 @@ msgid "expected flush after fetch arguments" msgstr "se espera flush tras argumentos fetch" msgid "invalid URL scheme name or missing '://' suffix" -msgstr "nombre de URL inválido o sufijo '://' faltante" +msgstr "nombre de URL inválido o sufijo '://' faltante" #, c-format msgid "invalid %XX escape sequence" @@ -20728,11 +21166,23 @@ msgid "invalid characters in host name" msgstr "carácter inválido en el nombre del host" msgid "invalid port number" -msgstr "número de puerto inválido" +msgstr "número de puerto inválido" msgid "invalid '..' path segment" msgstr "segmento de ruta '..' inválido" +msgid "usage: " +msgstr "uso: " + +msgid "fatal: " +msgstr "fatal: " + +msgid "error: " +msgstr "error: " + +msgid "warning: " +msgstr "advertencia: " + msgid "Fetching objects" msgstr "Haciendo fetch a objetos" @@ -20807,13 +21257,13 @@ msgstr "archivo gitdir inválido" msgid "gitdir file points to non-existent location" msgstr "archivo gitdir apunta a una ubicación inexistente" -#, fuzzy, c-format +#, c-format msgid "unable to set %s in '%s'" -msgstr "incapaz de hacer stat en '%s'" +msgstr "incapaz de configurar %s en '%s'" -#, fuzzy, c-format +#, c-format msgid "unable to unset %s in '%s'" -msgstr "no se pudo poner permisos a '%s'" +msgstr "incapaz de desconfigurar %s en '%s'" msgid "failed to set extensions.worktreeConfig setting" msgstr "falló al configurar opción extensions.worktreeConfig" @@ -20893,7 +21343,7 @@ msgstr "" #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" -" (usa \"git %s <archivo>...\" para incluirlo a lo que se será confirmado)" +" (usa \"git %s <archivo>...\" para incluirlo a lo que será confirmado)" msgid "both deleted:" msgstr "borrados por ambos:" @@ -21005,10 +21455,11 @@ msgstr " (arregla los conflictos y luego ejecuta \"git am --continue\"" msgid " (use \"git am --skip\" to skip this patch)" msgstr " (usa \"git am --skip\" para saltar este parche)" -#, fuzzy msgid "" " (use \"git am --allow-empty\" to record this patch as an empty commit)" -msgstr " (usa \"git commit --amend\" para enmendar el commit actual)" +msgstr "" +" (usa \"git am --allow-empty\" para registrar este parche como un commit " +"vacío)" msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (usa \"git am --abort\" para restaurar la rama original)" @@ -21019,11 +21470,11 @@ msgstr "git-rebase-todo no está presente." msgid "No commands done." msgstr "No se realizaron los comandos." -#, fuzzy, c-format +#, c-format msgid "Last command done (%<PRIuMAX> command done):" msgid_plural "Last commands done (%<PRIuMAX> commands done):" -msgstr[0] "El último comando realizado (%d comando realizado):" -msgstr[1] "Los últimos comandos realizados (%d comandos realizados):" +msgstr[0] "El último comando realizado (%<PRIuMAX> comando realizado):" +msgstr[1] "Los últimos comandos realizados (%<PRIuMAX> comandos realizados):" #, c-format msgid " (see more in file %s)" @@ -21032,11 +21483,11 @@ msgstr " (ver más en el archivo %s)" msgid "No commands remaining." msgstr "No quedan más comandos." -#, fuzzy, c-format +#, c-format msgid "Next command to do (%<PRIuMAX> remaining command):" msgid_plural "Next commands to do (%<PRIuMAX> remaining commands):" -msgstr[0] "Siguiente comando a realizar (%d comando restante):" -msgstr[1] "Siguientes comandos a realizar (%d comandos faltantes):" +msgstr[0] "Siguiente comando a realizar (%<PRIuMAX> comando restante):" +msgstr[1] "Siguientes comandos a realizar (%<PRIuMAX> comandos faltantes):" msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (usa \"git rebase --edit-todo\" para ver y editar)" @@ -21547,22 +21998,6 @@ msgstr "¡Los hunks seleccionados no aplican al índice!\n" msgid "ignoring unmerged: %s\n" msgstr "ignorando lo no fusionado: %s\n" -#, perl-format -msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " -msgstr "¿Aplicar cambio de modo al árbol de trabajo [y,n,q,a,d%s,?]? " - -#, perl-format -msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " -msgstr "¿Aplicar eliminación al árbol de trabajo [y,n,q,a,d%s,?]? " - -#, perl-format -msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " -msgstr "¿Aplicar adición al árbol de trabajo [y,n,q,a,d%s,?]? " - -#, perl-format -msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " -msgstr "¿Aplicar este fragmento al árbol de trabajo [y,n,q,a,d,/%s,?]? " - msgid "No other hunks to goto\n" msgstr "No hay más fragmentos a que ir\n" @@ -21693,11 +22128,11 @@ msgstr "Configuración --confirm desconocida: '%s'\n" #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" -msgstr "peligro: alias de sendmail con comillas no es soportado: %s\n" +msgstr "advertencia: alias de sendmail con comillas no es soportado: %s\n" #, perl-format msgid "warning: `:include:` not supported: %s\n" -msgstr "peligro: `:include:` no soportado: %s\n" +msgstr "advertencia: `:include:` no soportado: %s\n" #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" @@ -21929,15 +22364,15 @@ msgstr "no se puede mandar mensaje como 7bit" msgid "invalid transfer encoding" msgstr "codificación de transferencia inválida" -#, fuzzy, perl-format +#, perl-format msgid "" "fatal: %s: rejected by %s hook\n" "%s\n" "warning: no patches were sent\n" msgstr "" -"fatal: %s: rechazado por hook sendmail-validate\n" +"fatal: %s: rechazado por el hook %s\n" "%s\n" -"peligro: no se mandaron parches\n" +"advertencia: no se mandó ningún parche\n" #, perl-format msgid "unable to open %s: %s\n" @@ -21949,7 +22384,7 @@ msgid "" "warning: no patches were sent\n" msgstr "" "fatal: %s: %d es más grande que 998 caracteres\n" -"peligro: no se mandaron parches\n" +"advertencia: no se mandó ningún parche\n" #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" @@ -78,8 +78,8 @@ msgid "" msgstr "" "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2022-06-24 21:43+0200\n" -"PO-Revision-Date: 2022-06-24 21:58+0200\n" +"POT-Creation-Date: 2022-09-28 21:43+0200\n" +"PO-Revision-Date: 2022-09-28 21:45+0200\n" "Last-Translator: Cédric Malard <c.malard-git@valdun.net>\n" "Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n" "Language: fr\n" @@ -491,6 +491,23 @@ msgstr "" "a - appliquer cette section et toutes les suivantes de ce fichier\n" "d - ne pas appliquer cette section ni les suivantes de ce fichier\n" +#, c-format, perl-format +msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Appliquer le changement de mode dans l'arbre de travail [y,n,q,a,d%s,?] ? " + +#, c-format, perl-format +msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " +msgstr "Appliquer la suppression dans l'arbre de travail [y,n,q,a,d%s,?] ? " + +#, c-format, perl-format +msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " +msgstr "Appliquer l'ajout dans l'arbre de travail [y,n,q,a,d%s,?] ? " + +#, c-format, perl-format +msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " +msgstr "Appliquer la section à l'arbre de travail [y,n,q,a,d%s,?] ? " + msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -508,10 +525,6 @@ msgstr "" msgid "could not parse hunk header '%.*s'" msgstr "impossible d'analyser l'entête de section '%.*s'" -#, c-format -msgid "could not parse colored hunk header '%.*s'" -msgstr "impossible d'analyser l'entête coloré de section '%.*s'" - msgid "could not parse diff" msgstr "impossible d'analyser la diff" @@ -803,6 +816,25 @@ msgstr "" "detachedHead à false\n" "\n" +#, c-format +msgid "" +"The following paths have been moved outside the\n" +"sparse-checkout definition but are not sparse due to local\n" +"modifications.\n" +msgstr "" +"Les chemins suivants ont été déplacés hors de\n" +"la définition d'extraction clairsemée mai ne sont pas\n" +"clairsemés à cause de modifications locales\n" + +msgid "" +"To correct the sparsity of these paths, do the following:\n" +"* Use \"git add --sparse <paths>\" to update the index\n" +"* Use \"git sparse-checkout reapply\" to apply the sparsity rules" +msgstr "" +"Pour corriger l'état clairsemé de ces chemins, faites ceci :\n" +"* Lancez \"git add --sparse <chemins>\" pour mettre l'index à jour\n" +"* Lancez \"git sparse-checkout reapply\" pour réappliquer les règles" + msgid "cmdline ends with \\" msgstr "cmdline se termine par \\" @@ -1323,6 +1355,10 @@ msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "mode de fichier non supporté :0%o (SHA1: %s)" #, c-format +msgid "deflate error (%d)" +msgstr "erreur de compression (%d)" + +#, c-format msgid "unable to start '%s' filter" msgstr "impossible de démarrer le filtre '%s'" @@ -1342,10 +1378,6 @@ msgid "path too long (%d chars, SHA1: %s): %s" msgstr "le chemin est trop long (%d caractères, SHA1 : %s) : %s" #, c-format -msgid "deflate error (%d)" -msgstr "erreur de compression (%d)" - -#, c-format msgid "timestamp too large for this system: %<PRIuMAX>" msgstr "l'horodatage est trop grand pour ce système : %<PRIuMAX>" @@ -3143,8 +3175,12 @@ msgstr "info libc : " msgid "not run from a git repository - no hooks to show\n" msgstr "lancé hors d'un dépôt git - aucun crochet à montrer\n" -msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]" -msgstr "git bugreport [-o|--output-directory <fichier>] [-s|--suffix <format>]" +msgid "" +"git bugreport [-o|--output-directory <file>] [-s|--suffix <format>] [--" +"diagnose[=<mode>]" +msgstr "" +"git bugreport [-o|--output-directory <fichier>] [-s|--suffix <format>] [--" +"diagnose[=<mode>]]" msgid "" "Thank you for filling out a Git bug report!\n" @@ -3182,16 +3218,29 @@ msgstr "" "Veuillez relire le rapport de bogue ci-dessous.\n" "Vous pouvez supprimer toute ligne que vous ne souhaitez pas envoyer.\n" -msgid "specify a destination for the bugreport file" -msgstr "spécifier la destination du fichier de rapport de bogue" +msgid "mode" +msgstr "mode" + +msgid "" +"create an additional zip archive of detailed diagnostics (default 'stats')" +msgstr "" +"créer une archive zip supplémentaire de diagnostique détaillé (par défaut " +"'stats')" -msgid "specify a strftime format suffix for the filename" -msgstr "spécifier une suffixe au format strftime pour le nom de fichier" +msgid "specify a destination for the bugreport file(s)" +msgstr "spécifier la destination du/des fichier(s) de rapport de bogue" + +msgid "specify a strftime format suffix for the filename(s)" +msgstr "spécifier une suffixe au format strftime pour le(s) nom(s) de fichier" #, c-format msgid "could not create leading directories for '%s'" msgstr "impossible de créer les répertoires de premier niveau pour '%s'" +#, c-format +msgid "unable to create diagnostics archive %s" +msgstr "impossible de créer l'archive de diagnostique %s" + msgid "System Info" msgstr "Info système" @@ -3250,10 +3299,6 @@ msgid "Unbundling objects" msgstr "Dépaquetage d'objets" #, c-format -msgid "Unknown subcommand: %s" -msgstr "Sous-commande inconnue : %s" - -#, c-format msgid "cannot read object %s '%s'" msgstr "impossible de lire l'objet %s '%s'" @@ -3330,6 +3375,9 @@ msgstr "afficher la taille de l'objet" msgid "allow -s and -t to work with broken/corrupt objects" msgstr "autoriser -s et -t à travailler sur des objets cassés/corrompus" +msgid "use mail map file" +msgstr "utiliser le fichier de correspondance de mail" + msgid "Batch objects requested on stdin (or --batch-all-objects)" msgstr "Traiter par lot les objets demandés sur stdin (ou --batch-all-objects)" @@ -3339,6 +3387,9 @@ msgstr "afficher tout le contenu de <objet> ou <rev>" msgid "like --batch, but don't emit <contents>" msgstr "comme --batch, mais ne pas émettre <contenu>" +msgid "stdin is NUL-terminated" +msgstr "l'entrée se termine par NUL" + msgid "read commands from stdin" msgstr "lire les commandes depuis l'entrée standard" @@ -4225,6 +4276,14 @@ msgstr "" "initialiser le fichier d'extraction clairsemée pour n'inclure que les " "fichiers à la racine" +msgid "uri" +msgstr "uri" + +msgid "a URI for downloading bundles before fetching from origin remote" +msgstr "" +"un URI pour télécharger des paquets avant de récupérer depuis le distant " +"d'origine" + #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info : impossible d'ajouter une alternative pour '%s' : %s\n" @@ -4284,10 +4343,10 @@ msgstr "impossible de mettre à jour %s" msgid "failed to initialize sparse-checkout" msgstr "échec lors de l'initialisation l'extraction clairsemée" -msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" +msgid "remote HEAD refers to nonexistent ref, unable to checkout" msgstr "" "la HEAD distante réfère à une référence non existante, impossible de " -"l'extraire.\n" +"l'extraire" msgid "unable to checkout working tree" msgstr "impossible d'extraire la copie de travail" @@ -4311,6 +4370,13 @@ msgstr "Vous devez spécifier un dépôt à cloner." msgid "options '%s' and '%s %s' cannot be used together" msgstr "les options '%s' et '%s %s' ne peuvent pas être utilisées ensemble" +msgid "" +"--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-" +"exclude" +msgstr "" +"--bundle-uri est incompatible avec --depth, --shallow-since, et --shallow-" +"exclude" + #, c-format msgid "repository '%s' does not exist" msgstr "le dépôt '%s' n'existe pas" @@ -4388,6 +4454,13 @@ msgstr "--local est ignoré" msgid "cannot clone from filtered bundle" msgstr "impossible de cloner depuis un colis filtré" +msgid "failed to initialize the repo, skipping bundle URI" +msgstr "échec lors de l'initialisation du dépôt, URI du paquet ignoré" + +#, c-format +msgid "failed to fetch objects from bundle URI '%s'" +msgstr "impossible de récupérer les objets depuis l'URI de paquet '%s'" + msgid "remote transport reported error" msgstr "le transport distant a retourné une erreur" @@ -4504,10 +4577,6 @@ msgstr "utilisez un seul parmi --reachable, --stdin-commits ou --stdin-packs" msgid "Collecting commits from input" msgstr "Collecte des commits depuis l'entrée" -#, c-format -msgid "unrecognized subcommand: %s" -msgstr "sous-commande non reconnue : %s" - msgid "" "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " "<file>)...] <tree>" @@ -4869,9 +4938,6 @@ msgstr "afficher l'état en format long (par défaut)" msgid "terminate entries with NUL" msgstr "terminer les éléments par NUL" -msgid "mode" -msgstr "mode" - msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "afficher les fichiers non suivis, \"mode\" facultatif : all (tous), normal, " @@ -5476,6 +5542,22 @@ msgid "option '%s' and commit-ishes cannot be used together" msgstr "" "l'option '%s' et des commit-esques ne peuvent pas être utilisées ensemble" +msgid "" +"git diagnose [-o|--output-directory <path>] [-s|--suffix <format>] [--" +"mode=<mode>]" +msgstr "" +"git diagnose [-o|--output-directory <fichier>] [-s|--suffix <format>] [--" +"mode=<mode>]" + +msgid "specify a destination for the diagnostics archive" +msgstr "spécifier la destination de l'archive de diagnostique" + +msgid "specify a strftime format suffix for the filename" +msgstr "spécifier une suffixe au format strftime pour le nom de fichier" + +msgid "specify the content of the diagnostic archive" +msgstr "spécifier le contenu de l'archive de diagnostique" + msgid "--merge-base only works with two commits" msgstr "--merge-base ne fonctionne qu'avec deux commits" @@ -5865,11 +5947,8 @@ msgstr "[à jour]" msgid "[rejected]" msgstr "[rejeté]" -msgid "can't fetch in current branch" -msgstr "impossible de récupérer dans la branche actuelle" - -msgid "checked out in another worktree" -msgstr "extrait dans un autre arbre de travail" +msgid "can't fetch into checked-out branch" +msgstr "impossible de récupérer dans la branche extraite" msgid "[tag update]" msgstr "[mise à jour de l'étiquette]" @@ -6303,6 +6382,10 @@ msgstr "%s : pointer sha1 invalide dans l'arbre de cache" msgid "non-tree in cache-tree" msgstr "non-arbre dans l'arbre de cache" +#, c-format +msgid "%s: invalid sha1 pointer in resolve-undo" +msgstr "%s : pointeur sha1 invalide dans resolve-undo" + msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<options>] [<objet>...]" @@ -6640,14 +6723,17 @@ msgstr "" "echec du lancement de 'crontab -l' ; votre système n'a pas l'air de fournir " "'cron'" +msgid "failed to create crontab temporary file" +msgstr "impossible de créer un fichier crontab temporaire" + +msgid "failed to open temporary file" +msgstr "impossible d'ouvrir un fichier temporaire" + msgid "failed to run 'crontab'; your system might not support 'cron'" msgstr "" "echec du lancement de 'crontab' ; votre système n'a pas l'air de fournir " "'cron'" -msgid "failed to open stdin of 'crontab'" -msgstr "échec à l'ouverture de stdin de 'crontab'" - msgid "'crontab' died" msgstr "'crontab' est mort" @@ -6696,10 +6782,6 @@ msgstr "échec de l'ajout du dépôt à la config globale" msgid "git maintenance <subcommand> [<options>]" msgstr "git maintenance <subcommand> [<options>]" -#, c-format -msgid "invalid subcommand: %s" -msgstr "sous-commande invalide : %s" - msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<options>] [-e] <motif> [<révision>...] [[--] <chemin>...]" @@ -6877,6 +6959,9 @@ msgstr "afficher les fichiers correspondant dans le pagineur" msgid "allow calling of grep(1) (ignored by this build)" msgstr "permettre l'appel de grep(1) (ignoré par ce build)" +msgid "maximum number of results per file" +msgstr "nombre maximum de résultats par fichier" + msgid "no pattern given" msgstr "aucun motif fourni" @@ -6965,11 +7050,19 @@ msgstr "afficher la description de la commande" msgid "print list of useful guides" msgstr "afficher une liste de guides utiles" +msgid "print list of user-facing repository, command and file interfaces" +msgstr "afficher les liste des dépôts publics, des commandes et des interfaces" + +msgid "print list of file formats, protocols and other developer interfaces" +msgstr "" +"afficher la liste des formats de fichier, des protocoles et des autres " +"interfaces pour développeur" + msgid "print all configuration variable names" msgstr "afficher tous les noms de variables de configuration" -msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]" -msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<commande>]" +msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>|<doc>]" +msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<commande>|<doc>]" #, c-format msgid "unrecognized help format '%s'" @@ -7442,8 +7535,8 @@ msgstr "supprimer la sortie des différences" msgid "show source" msgstr "afficher la source" -msgid "use mail map file" -msgstr "utiliser le fichier de correspondance de mail" +msgid "clear all previously-defined decoration filters" +msgstr "effacer tous les filtres de décoration précédemment définis" msgid "only decorate refs that match <pattern>" msgstr "décorer seulement les références correspondant à <motif>" @@ -7711,6 +7804,11 @@ msgstr "" msgid "percentage by which creation is weighted" msgstr "pourcentage par lequel la création est pondérée" +msgid "show in-body From: even if identical to the e-mail header" +msgstr "" +"montrer les From: inclus même s'ils sont identiques à celui de l'entête du " +"courriel" + #, c-format msgid "invalid ident line: %s" msgstr "ligne d'identification invalide : %s" @@ -7771,6 +7869,18 @@ msgstr "" "Impossible de trouver une branche distante suivie, merci de spécifier " "<branche_amont> manuellement.\n" +#, c-format +msgid "bad ls-files format: element '%s' does not start with '('" +msgstr "mauvais format ls-files : l'élément '%s' ne commence pas par '('" + +#, c-format +msgid "bad ls-files format: element '%s' does not end in ')'" +msgstr "mauvais format ls-files : l'élément '%s' ne se termine pas par ')'" + +#, c-format +msgid "bad ls-files format: %%%.*s" +msgstr "mauvais format ls-files : %%%.*s" + msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<options>] [<fichier>...]" @@ -7859,6 +7969,13 @@ msgid "show sparse directories in the presence of a sparse index" msgstr "afficher les répertoires clairsemés en présence d'un index clairsemé" msgid "" +"--format cannot be used with -s, -o, -k, -t, --resolve-undo, --deduplicate, " +"--eol" +msgstr "" +"--format ne peut pas être utilisé avec -s, -o, -k, -t, --resolve-undo, --" +"deduplicate, --eol" + +msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" " [-q | --quiet] [--exit-code] [--get-url]\n" " [--symref] [<repository> [<refs>...]]" @@ -8082,6 +8199,39 @@ msgstr "impossible de résoudre la référence '%s'" msgid "Merging %s with %s\n" msgstr "Fusion de %s avec %s\n" +msgid "not something we can merge" +msgstr "pas possible de fusionner ceci" + +msgid "refusing to merge unrelated histories" +msgstr "refus de fusionner des historiques sans relation" + +msgid "failure to merge" +msgstr "échec de la fusion" + +msgid "git merge-tree [--write-tree] [<options>] <branch1> <branch2>" +msgstr "git merge-tree [--write-tree] [<options>] <branche1> <branche2>" + +msgid "git merge-tree [--trivial-merge] <base-tree> <branch1> <branch2>" +msgstr "git merge-tree [--trivial-merge] <arbre-de-base> <branche1> <branche2>" + +msgid "do a real merge instead of a trivial merge" +msgstr "faire une fusion réelle au lieu d'une fusion triviale" + +msgid "do a trivial merge only" +msgstr "faire seulement une fusion triviale" + +msgid "also show informational/conflict messages" +msgstr "afficher aussi les messages d'information/de conflit" + +msgid "list filenames without modes/oids/stages" +msgstr "lister les noms de fichier sans modes/oids/indexation" + +msgid "allow merging unrelated histories" +msgstr "permettre la fusion d'historiques sans rapport" + +msgid "--trivial-merge is incompatible with all other options" +msgstr "--trivial-merge est incompatible avec d'autres options" + msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<options>] [<commit>...]" @@ -8164,9 +8314,6 @@ msgstr "--abort mais laisser l'index et l'arbre de travail inchangés" msgid "continue the current in-progress merge" msgstr "continuer la fusion en cours" -msgid "allow merging unrelated histories" -msgstr "permettre la fusion d'historiques sans rapport" - msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "ne pas utiliser les crochets pre-merge-commit et commit-msg" @@ -8289,9 +8436,6 @@ msgstr "impossible de fermer '%s'" msgid "not something we can merge in %s: %s" msgstr "pas possible de fusionner ceci dans %s : %s" -msgid "not something we can merge" -msgstr "pas possible de fusionner ceci" - msgid "--abort expects no arguments" msgstr "--abort n'accepte pas d'argument" @@ -8342,14 +8486,20 @@ msgid "Can merge only exactly one commit into empty head" msgstr "" "Possible de fusionner exactement une seule validation dans une tête vide" -msgid "refusing to merge unrelated histories" -msgstr "refus de fusionner des historiques sans relation" - #, c-format msgid "Updating %s..%s\n" msgstr "Mise à jour %s..%s\n" #, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" +"Vos modifications locales aux fichiers suivants seraient écrasées par la " +"fusion :\n" +" %s" + +#, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Essai de fusion vraiment triviale dans l'index...\n" @@ -8383,6 +8533,11 @@ msgstr "" "La fusion automatique a réussi ; stoppée avant la validation comme demandé\n" #, c-format +msgid "When finished, apply stashed changes with `git stash pop`\n" +msgstr "" +"Une fois terminé, appliquer les modifications remisées avec `git stash pop`\n" + +#, c-format msgid "warning: tag input does not pass fsck: %s" msgstr "attention : l'entrée d'étiquette ne passe pas fsck : %s" @@ -8502,6 +8657,9 @@ msgstr "Vérification du renommage de '%s' en '%s'\n" msgid "bad source" msgstr "mauvaise source" +msgid "destination exists" +msgstr "la destination existe" + msgid "can not move directory into itself" msgstr "impossible de déplacer un répertoire dans lui-même" @@ -8517,9 +8675,6 @@ msgstr "pas sous le contrôle de version" msgid "conflicted" msgstr "en conflit" -msgid "destination exists" -msgstr "la destination existe" - #, c-format msgid "overwriting '%s'" msgstr "écrasement de '%s'" @@ -8533,6 +8688,9 @@ msgstr "multiples sources pour la même destination" msgid "destination directory does not exist" msgstr "le répertoire de destination n'existe pas" +msgid "destination exists in the index" +msgstr "la destination existe dans l'index" + #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, source=%s, destination=%s" @@ -8894,8 +9052,8 @@ msgid "use notes from <notes-ref>" msgstr "utiliser les notes depuis <références-notes>" #, c-format -msgid "unknown subcommand: %s" -msgstr "sous-commande inconnue : %s" +msgid "unknown subcommand: `%s'" +msgstr "sous-commande inconnue : `%s'" msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" @@ -9442,7 +9600,7 @@ msgstr "" "les réconcilier. Vous pouvez le faire en lançant une des\n" "commandes suivantes avant votre prochain tirage :\n" "\n" -" git config pull.rebase false # fusion (stratégie par défaut)\n" +" git config pull.rebase false # fusion\n" " git config pull.rebase true # rebasage\n" " git config pull.ff only # avance rapide seulement\n" "\n" @@ -9823,11 +9981,16 @@ msgid "only emit output related to the second range" msgstr "afficher seulement les sorties liées à la deuxième plage" #, c-format +msgid "not a revision: '%s'" +msgstr "'%s' n'est pas une révision" + +#, c-format msgid "not a commit range: '%s'" msgstr "pas une plage de commit : '%s'" -msgid "single arg format must be symmetric range" -msgstr "un format d'argument unique doit être une plage symétrique" +#, c-format +msgid "not a symmetric range: '%s'" +msgstr "pas une plage symétrique : '%s'" msgid "need two commit ranges" msgstr "plage entre deux commits requise" @@ -10103,6 +10266,11 @@ msgstr "conserver les commits qui commencent vides" msgid "move commits that begin with squash!/fixup! under -i" msgstr "déplace les commits qui commencent par squash!/fixup! sous -i" +msgid "update branches that point to commits that are being rebased" +msgstr "" +"mettre à jour les branches qui pointent sur les commits qui sont en cours de " +"rebasage" + msgid "add exec lines after each commit of the editable list" msgstr "ajouter les lignes exec après chaque commit de la liste éditable" @@ -10639,6 +10807,9 @@ msgstr " nouveau (le prochain rapatriement (fetch) stockera dans remotes/%s)" msgid " tracked" msgstr " suivi" +msgid " skipped" +msgstr " sauté" + msgid " stale (use 'git remote prune' to remove)" msgstr " dépassé (utilisez 'git remote prune' pour supprimer)" @@ -11322,6 +11493,10 @@ msgstr "Impossible d'écrire le nouveau fichier d'index." msgid "unable to get disk usage of %s" msgstr "impossible de récupérer l'utilisation du disque de %s" +#, c-format +msgid "invalid value for '%s': '%s', the only allowed format is '%s'" +msgstr "valeur invalide pour '%s' : '%s', le seul format permis est '%s'" + msgid "rev-list does not support display of notes" msgstr "rev-list ne supporte l'affichage des notes" @@ -11347,6 +11522,9 @@ msgstr "fin prématurée de l'entrée" msgid "no usage string given before the `--' separator" msgstr "pas de chaîne d'usage fournie avant le séparateur `--'" +msgid "missing opt-spec before option flags" +msgstr "opt-spec manquant avant les drapeaux d'option" + msgid "Needed a single revision" msgstr "Une seule révision attendue" @@ -12133,6 +12311,10 @@ msgid "Expecting a full ref name, got %s" msgstr "Nom de référence complet attendu, %s obtenu" #, c-format +msgid "could not get a repository handle for submodule '%s'" +msgstr "impossible de trouver une poignée de dépôt pour le sous-module '%s'" + +#, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " "authoritative upstream." @@ -12140,12 +12322,6 @@ msgstr "" "impossible de trouver la configuration '%s'. Ce dépôt est considéré comme " "son propre amont d'autorité." -msgid "alternative anchor for relative paths" -msgstr "ancre alternative pour les chemins relatifs" - -msgid "git submodule--helper list [--prefix=<path>] [<path>...]" -msgstr "git submodule--helper list [--prefix=<chemin>] [<chemin>...]" - #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "URL non trouvée pour le chemin de sous-module '%s' dans .gitmodules" @@ -12179,8 +12355,8 @@ msgstr "" msgid "recurse into nested submodules" msgstr "parcourir récursivement les sous-modules" -msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" -msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <commande>" +msgid "git submodule foreach [--quiet] [--recursive] [--] <command>" +msgstr "git submodule foreach [--quiet] [--recursive] [--] <commande>" #, c-format msgid "Failed to register url for submodule path '%s'" @@ -12205,8 +12381,8 @@ msgstr "" msgid "suppress output for initializing a submodule" msgstr "supprimer la sortie lors de l'initialisation d'un sous-module" -msgid "git submodule--helper init [<options>] [<path>]" -msgstr "git submodule--helper init [<options>] [<chemin>]" +msgid "git submodule init [<options>] [<path>]" +msgstr "git submodule init [<options>] [<chemin>]" #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" @@ -12235,9 +12411,6 @@ msgstr "" msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<chemin>...]" -msgid "git submodule--helper name <path>" -msgstr "git submodule--helper <nom> <chemin>" - #, c-format msgid "* %s %s(blob)->%s(submodule)" msgstr "* %s %s(blob)->%s(submodule)" @@ -12271,8 +12444,8 @@ msgstr "sauter les sous-modules avec la valeur 'ignore_config' à 'all'" msgid "limit the summary size" msgstr "limiter la taille du résumé" -msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" -msgstr "git submodule--helper summary [<options>] [<commit>] [--] [<chemin>]" +msgid "git submodule summary [<options>] [<commit>] [--] [<path>]" +msgstr "git submodule summary [<options>] [<commit>] [--] [<chemin>]" msgid "could not fetch a revision for HEAD" msgstr "impossible de récupérer une révision pour HEAD" @@ -12286,10 +12459,6 @@ msgid "failed to register url for submodule path '%s'" msgstr "échec d'enregistrement de l'URL pour le chemin de sous-module '%s'" #, c-format -msgid "failed to get the default remote for submodule '%s'" -msgstr "échec d'obtention du dépôt distant par défaut pour le sous-module '%s'" - -#, c-format msgid "failed to update remote for submodule '%s'" msgstr "échec de mise à jour du dépôt distant pour le sous-module '%s'" @@ -12297,8 +12466,8 @@ msgid "suppress output of synchronizing submodule url" msgstr "" "supprimer la sortie lors de la synchronisation de l'URL d'un sous-module" -msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" -msgstr "git submodule--helper sync [--quiet] [--recursive] [<chemin>]" +msgid "git submodule sync [--quiet] [--recursive] [<path>]" +msgstr "git submodule sync [--quiet] [--recursive] [<chemin>]" #, c-format msgid "" @@ -12361,6 +12530,10 @@ msgstr "" "clonez avec '--reference-if-able' au lieu de '--reference'." #, c-format +msgid "could not get a repository handle for gitdir '%s'" +msgstr "impossible de trouver une poignée de dépôt pour le répertoire git '%s'" + +#, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "le sous-module '%s' ne peut pas ajouter d'alternative : %s" @@ -12390,6 +12563,9 @@ msgstr "le répertoire n'est pas vide : '%s'" msgid "could not get submodule directory for '%s'" msgstr "impossible de créer le répertoire de sous-module pour '%s'" +msgid "alternative anchor for relative paths" +msgstr "ancre alternative pour les chemins relatifs" + msgid "where the new submodule will be cloned to" msgstr "emplacement où le sous-module sera cloné" @@ -12418,10 +12594,6 @@ msgstr "" "<spécificateur-de-filtre>]--url <url> --path <chemin>" #, c-format -msgid "Invalid update mode '%s' for submodule path '%s'" -msgstr "Mode de mise à jour '%s' invalide pour le chemin de sous-module '%s'" - -#, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "" "Mode de mise à jour '%s'invalide configuré pour le chemin de sous-module '%s'" @@ -12496,6 +12668,10 @@ msgstr "" "récupération directe de ce commit a échoué." #, c-format +msgid "could not initialize submodule at path '%s'" +msgstr "impossible d'initialiser le sous-module dans le chemin '%s'" + +#, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " "the superproject is not on any branch" @@ -12504,10 +12680,6 @@ msgstr "" "superprojet, mais le superprojet n'est sur aucune branche" #, c-format -msgid "could not get a repository handle for submodule '%s'" -msgstr "impossible de trouver une poignée de dépôt pour le sous-module '%s'" - -#, c-format msgid "Unable to find current revision in submodule path '%s'" msgstr "" "Impossible de trouver la révision actuelle dans le chemin de sous-module '%s'" @@ -12543,12 +12715,14 @@ msgstr "ne pas récupérer les nouveaux objets depuis le site distant" msgid "path into the working tree" msgstr "chemin dans la copie de travail" -msgid "path into the working tree, across nested submodule boundaries" -msgstr "" -"chemin dans la copie de travail, traversant les frontières de sous-modules" +msgid "use the 'checkout' update strategy (default)" +msgstr "utiliser la stratégie de mise à jour 'checkout' (valeur par défaut)" + +msgid "use the 'merge' update strategy" +msgstr "utiliser la stratégie de mise à jour par fusion" -msgid "rebase, merge, checkout or none" -msgstr "valeurs possibles : rebase, merge, checkout ou none" +msgid "use the 'rebase' update strategy" +msgstr "utiliser la stratégie de mise à jour par rebasage" msgid "create a shallow clone truncated to the specified number of revisions" msgstr "créer un clone superficiel tronqué au nombre de révisions spécifié" @@ -12562,6 +12736,9 @@ msgstr "spécifie si le clonage initial doit être aussi superficiel" msgid "don't print cloning progress" msgstr "ne pas afficher la progression du clonage" +msgid "disallow cloning into non-empty directory, implies --init" +msgstr "interdire de cloner dans un répertoire non-vide, implique --init" + msgid "" "git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] " "[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-" @@ -12573,14 +12750,11 @@ msgstr "" "[no-]recommend-shallow] [--reference <dépôt>] [--recursive] [--[no-]single-" "branch] [--] [<chemin>...]" -msgid "bad value for update parameter" -msgstr "valeur invalide pour la mise à jour du paramètre" - msgid "recurse into submodules" msgstr "parcourir récursivement les sous-modules" -msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" -msgstr "git submodule--helper absorb-git-dirs [<options>] [<chemin>...]" +msgid "git submodule absorbgitdirs [<options>] [<path>...]" +msgstr "git submodule absorbgitdirs [<options>] [<chemin>...]" msgid "check if it is safe to write to the .gitmodules file" msgstr "vérifier si écrire dans le fichier .gitmodules est sur" @@ -12601,8 +12775,8 @@ msgstr "" msgid "suppress output for setting url of a submodule" msgstr "supprimer la sortie lors du paramétrage de l'url d'un sous-module" -msgid "git submodule--helper set-url [--quiet] <path> <newurl>" -msgstr "git submodule--helper sync [--quiet] <chemin> <nouvelle-url>" +msgid "git submodule set-url [--quiet] <path> <newurl>" +msgstr "git submodule set-url [--quiet] <chemin> <nouvelle-url>" msgid "set the default tracking branch to master" msgstr "régler la branche de suivi par défaut à master" @@ -12610,14 +12784,11 @@ msgstr "régler la branche de suivi par défaut à master" msgid "set the default tracking branch" msgstr "régler la branche de suivi par défaut" -msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" -msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <chemin>" +msgid "git submodule set-branch [-q|--quiet] (-d|--default) <path>" +msgstr "git submodule set-branch [-q|--quiet] (-d|--default) <chemin>" -msgid "" -"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" -msgstr "" -"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branche> " -"<chemin>" +msgid "git submodule set-branch [-q|--quiet] (-b|--branch) <branch> <path>" +msgstr "git submodule set-branch [-q|--quiet] (-b|--branch) <branche> <chemin>" msgid "--branch or --default required" msgstr "--branch ou --default requis" @@ -12716,8 +12887,8 @@ msgstr "" "configurer le nom du sous-module avec la chaîne passée au lieu d'utiliser " "par défaut son chemin" -msgid "git submodule--helper add [<options>] [--] <repository> [<path>]" -msgstr "git submodule--helper add [<options>] [--] <dépôt> [<chemin>]" +msgid "git submodule add [<options>] [--] <repository> [<path>]" +msgstr "git submodule add [<options>] [--] <dépôt> [<chemin>]" msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" @@ -12927,6 +13098,16 @@ msgstr "Étiquette '%s' mise à jour (elle était sur %s)\n" msgid "pack exceeds maximum allowed size" msgstr "le paquet dépasse la taille maximale permise" +msgid "failed to write object in stream" +msgstr "impossible d'écrire l'objet dans le flux" + +#, c-format +msgid "inflate returned (%d)" +msgstr "la décompression (inflate) a retourné (%d)" + +msgid "invalid blob object from stream" +msgstr "objet blob invalide depuis le flux" + msgid "Unpacking objects" msgstr "Dépaquetage des objets" @@ -13470,6 +13651,27 @@ msgstr "écrire l'objet arbre pour un sous-répertoire <préfixe>" msgid "only useful for debugging" msgstr "seulement utile pour le débogage" +msgid "core.fsyncMethod = batch is unsupported on this platform" +msgstr "core.fsyncMethod = batch non géré sur cette plateforme" + +msgid "failed to create temporary file" +msgstr "impossible de créer un fichier temporaire" + +msgid "insufficient capabilities" +msgstr "capacités insuffisantes" + +#, c-format +msgid "failed to download bundle from URI '%s'" +msgstr "impossible de télécharger le colis depuis l'URI '%s'" + +#, c-format +msgid "file at URI '%s' is not a bundle" +msgstr "le fichier à l'URI '%s' n'est pas un colis" + +#, c-format +msgid "failed to unbundle bundle from URI '%s'" +msgstr "échec pour ouvrir le colis de l'URI '%s'" + #, c-format msgid "unrecognized bundle hash algorithm: %s" msgstr "algorithme d'empreinte du colis inconnu : %s" @@ -13679,6 +13881,9 @@ msgid "Give an object a human readable name based on an available ref" msgstr "" "Baptiser un objet avec un nom lisible à partir d'une référence disponible" +msgid "Generate a zip archive of diagnostic information" +msgstr "Générer une archive zip d'information de diagnostic" + msgid "Show changes between commits, commit and working tree, etc" msgstr "" "Afficher les changements entre les validations, entre validation et copie de " @@ -13815,8 +14020,8 @@ msgstr "Lancer une fusion à 3 points pour les fichiers à fusionner" msgid "The standard helper program to use with git-merge-index" msgstr "Le programme assistant standard à utiliser avec git-merge-index" -msgid "Show three-way merge without touching index" -msgstr "Afficher la fusion à trois points sans modifier l'index" +msgid "Perform merge without touching index or working tree" +msgstr "effectuer la fusion sans toucher à l'index ni à l'arbre de travail" msgid "Run merge conflict resolution tools to resolve merge conflicts" msgstr "" @@ -14018,6 +14223,9 @@ msgstr "Valider des fichiers d'archive Git empaquetés" msgid "Check the GPG signature of tags" msgstr "Vérifier la signature GPG d'étiquettes" +msgid "Display version information about Git" +msgstr "Afficher l'information de version à propos de Git" + msgid "Show logs with difference each commit introduces" msgstr "Afficher les journaux avec la différence que chaque commit introduit" @@ -14051,6 +14259,24 @@ msgstr "Un ensemble minimal utile des commandes de Git pour tous les jours" msgid "Frequently asked questions about using Git" msgstr "Foire aux questions sur l'utilisation de Git" +msgid "The bundle file format" +msgstr "le format du fichier de colis" + +msgid "Chunk-based file formats" +msgstr "format de fichier avec des sections" + +msgid "Git commit graph format" +msgstr "format de graphe de commit de Gti" + +msgid "Git index format" +msgstr "format d'index Git" + +msgid "Git pack format" +msgstr "format de paquet Git" + +msgid "Git cryptographic signature formats" +msgstr "formats de signature cryptographique Git" + msgid "A Git Glossary" msgstr "Un glossaire Git" @@ -14073,6 +14299,21 @@ msgstr "Définition des propriétés de sous-module" msgid "Git namespaces" msgstr "Espaces de nom de Git" +msgid "Protocol v0 and v1 capabilities" +msgstr "Capacités des protocoles v0 et v1" + +msgid "Things common to various protocols" +msgstr "Choses communes aux différents protocoles" + +msgid "Git HTTP-based protocols" +msgstr "protocoles Git basés sur HTTP" + +msgid "How packs are transferred over-the-wire" +msgstr "Comment les paquets sont transférés sur le réseau" + +msgid "Git Wire Protocol, Version 2" +msgstr "Protocole réseau Git, version 2" + msgid "Helper programs to interact with remote repositories" msgstr "Programmes assistants pour interagir avec des dépôts distants" @@ -14097,6 +14338,9 @@ msgstr "Interface web de Git" msgid "An overview of recommended workflows with Git" msgstr "Un aperçu des flux de travail recommandés avec Git" +msgid "A tool for managing large Git repositories" +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" @@ -14359,6 +14603,14 @@ msgid "no libc information available\n" msgstr "aucune information de libc disponible\n" #, c-format +msgid "could not determine free disk size for '%s'" +msgstr "impossible de déterminer l'espace libre du disque pour '%s'" + +#, c-format +msgid "could not get info for '%s'" +msgstr "impossible d'avoir des informations pour '%s'" + +#, c-format msgid "[GLE %ld] health thread could not open '%ls'" msgstr "[GLE %ld] le fil de santé n'a pas pu ouvrir '%ls'" @@ -14413,6 +14665,14 @@ msgid "could not read directory changes [GLE %ld]" msgstr "impossible de lire les modifications du répertoire [GLE %ld]" #, c-format +msgid "[GLE %ld] unable to open for read '%ls'" +msgstr "[GLE %ld] impossible d'ouvrir pour lire '%ls'" + +#, c-format +msgid "[GLE %ld] unable to get protocol information for '%ls'" +msgstr "[GLE %ld] impossible d'obtenir l'information de protocole pour '%ls'" + +#, c-format msgid "failed to copy SID (%ld)" msgstr "échec de la copie du SID (%ld)" @@ -14970,182 +15230,6 @@ msgid "failed to close rev-list's stdin" msgstr "impossible de fermer l'entrée standard du rev-list" #, c-format -msgid "'%s' does not exist" -msgstr "'%s' n'existe pas" - -msgid "need a working directory" -msgstr "répertoire de travail nécessaire" - -msgid "could not find enlistment root" -msgstr "impossible de trouver la racine d'enrôlement" - -#, c-format -msgid "could not switch to '%s'" -msgstr "impossible de basculer vers '%s'" - -#, c-format -msgid "could not configure %s=%s" -msgstr "impossible de configurer %s=%s" - -msgid "could not configure log.excludeDecoration" -msgstr "impossible de configurer log.excludeDecoration" - -msgid "Scalar enlistments require a worktree" -msgstr "Les enrôlements scalaires requièrent un arbre de travail" - -#, c-format -msgid "could not open directory '%s'" -msgstr "impossible d'ouvrir le répertoire '%s'" - -#, c-format -msgid "skipping '%s', which is neither file nor directory" -msgstr "'%s' sauté, qui n'est ni un fichier ni un répertoire" - -#, c-format -msgid "could not determine free disk size for '%s'" -msgstr "impossible de déterminer l'espace libre du disque pour '%s'" - -#, c-format -msgid "could not get info for '%s'" -msgstr "impossible d'avoir des informations pour '%s'" - -#, c-format -msgid "remote HEAD is not a branch: '%.*s'" -msgstr "la HEAD distante n'est pas une branche : '%.*s'" - -msgid "failed to get default branch name from remote; using local default" -msgstr "" -"échec de récupération de la branche par défaut depuis le distant ; " -"utilisation de la valeur par défaut locale" - -msgid "failed to get default branch name" -msgstr "échec de l'obtention du nom de branche par défaut" - -msgid "failed to unregister repository" -msgstr "échec du désenregistrement du dépôt" - -msgid "failed to delete enlistment directory" -msgstr "échec de la suppression du répertoire d'enrôlement" - -msgid "branch to checkout after clone" -msgstr "branche à extraire après le clonage" - -msgid "when cloning, create full working directory" -msgstr "lors d'un clonage, créer un répertoire de travail complet" - -msgid "only download metadata for the branch that will be checked out" -msgstr "ne télécharger les méta-données que pour la branche qui sera extraite" - -msgid "scalar clone [<options>] [--] <repo> [<dir>]" -msgstr "scalar clone [<options>] [--] <dépôt> [<répertoire>]" - -#, c-format -msgid "cannot deduce worktree name from '%s'" -msgstr "impossible de déduire le nom de l'arbre de travail depuis '%s'" - -#, c-format -msgid "directory '%s' exists already" -msgstr "le répertoire '%s' existe déjà" - -#, c-format -msgid "failed to get default branch for '%s'" -msgstr "échec d'obtention de la branche par défaut pour '%s'" - -#, c-format -msgid "could not configure remote in '%s'" -msgstr "impossible de paramétrer le distant dans '%s'" - -#, c-format -msgid "could not configure '%s'" -msgstr "impossible de configurer '%s'" - -msgid "partial clone failed; attempting full clone" -msgstr "échec du clonage partiel ; tentative de clonage complet" - -msgid "could not configure for full clone" -msgstr "impossible de configurer pour le clonage complet" - -msgid "scalar diagnose [<enlistment>]" -msgstr "scalar diagnose [<enrôlement>]" - -#, c-format -msgid "could not create directory for '%s'" -msgstr "impossible de créer le répertoire pour '%s'" - -msgid "could not duplicate stdout" -msgstr "impossible de dupliquer stdout" - -msgid "failed to write archive" -msgstr "impossible d'écrire l'archive" - -msgid "`scalar list` does not take arguments" -msgstr "`scalar list` n'accepte pas d'argument" - -msgid "scalar register [<enlistment>]" -msgstr "scalar register [<enrôlement>]" - -msgid "reconfigure all registered enlistments" -msgstr "reconfigurer tous les enrôlements enregistrés" - -msgid "scalar reconfigure [--all | <enlistment>]" -msgstr "scala reconfigure [--all|<enrôlement>]" - -msgid "--all or <enlistment>, but not both" -msgstr "--all ou <enrôlement>, mais pas les deux" - -#, c-format -msgid "git repository gone in '%s'" -msgstr "dépôt git parti dans '%s'" - -msgid "" -"scalar run <task> [<enlistment>]\n" -"Tasks:\n" -msgstr "" -"scalar run <tâche> [<enrôlement>]\n" -"Tâches :\n" - -#, c-format -msgid "no such task: '%s'" -msgstr "pas de tâche : '%s'" - -msgid "scalar unregister [<enlistment>]" -msgstr "scalar unregister [<enrôlement>]" - -msgid "scalar delete <enlistment>" -msgstr "scalar delete <enrôlement>" - -msgid "refusing to delete current working directory" -msgstr "refus de la suppression du répertoire de travail actuel" - -msgid "include Git version" -msgstr "inclure la version Git" - -msgid "include Git's build options" -msgstr "inclure les options de construction de Git" - -msgid "scalar verbose [-v | --verbose] [--build-options]" -msgstr "scalar verbose [-v | --verbose] [--build-options]" - -msgid "-C requires a <directory>" -msgstr "-C requiert un <répertoire>" - -#, c-format -msgid "could not change to '%s'" -msgstr "échec de modification en '%s'" - -msgid "-c requires a <key>=<value> argument" -msgstr "-c exige un argument <clé>=<valeur>" - -msgid "" -"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n" -"\n" -"Commands:\n" -msgstr "" -"scalar [-C <répertoire>] [-c <clé>=<valeur>] <commande> [<options>]\n" -"\n" -"Commandes :\n" - -#, c-format msgid "illegal crlf_action %d" msgstr "crlf_action illégal %d" @@ -15357,6 +15441,32 @@ msgstr "" msgid "Marked %d islands, done.\n" msgstr "Marquage de %d îlots, fait.\n" +#, c-format +msgid "invalid --%s value '%s'" +msgstr "valeur invalide de --%s : %s" + +#, c-format +msgid "could not archive missing directory '%s'" +msgstr "impossible d'archiver le répertoire manquant '%s'" + +#, c-format +msgid "could not open directory '%s'" +msgstr "impossible d'ouvrir le répertoire '%s'" + +#, c-format +msgid "skipping '%s', which is neither file nor directory" +msgstr "'%s' sauté, qui n'est ni un fichier ni un répertoire" + +msgid "could not duplicate stdout" +msgstr "impossible de dupliquer stdout" + +#, c-format +msgid "could not add directory '%s' to archiver" +msgstr "impossible d'ajouter le répertoire '%s' à l'archiveur" + +msgid "failed to write archive" +msgstr "impossible d'écrire l'archive" + msgid "--merge-base does not work with ranges" msgstr "--merge-base ne fonctionne pas avec des plages" @@ -16000,6 +16110,9 @@ msgstr "git fetch-pack : ACK/NACK attendu, '%s' reçu" msgid "unable to write to remote" msgstr "impossible d'écrire sur un distant" +msgid "Server supports filter" +msgstr "Le serveur supporte filter" + #, c-format msgid "invalid shallow line: %s" msgstr "ligne de superficiel invalide : %s" @@ -16110,9 +16223,6 @@ msgstr "le serveur ne supporte pas l'algorithme '%s'" msgid "Server does not support shallow requests" msgstr "Le serveur ne supporte pas les requêtes superficielles" -msgid "Server supports filter" -msgstr "Le serveur supporte filter" - msgid "unable to write request to remote" msgstr "impossible d'écrire la requête sur le distant" @@ -16458,6 +16568,12 @@ msgstr "Commandes bas niveau / Synchronisation de dépôts" msgid "Low-level Commands / Internal Helpers" msgstr "Commandes bas niveau / Assistants internes" +msgid "User-facing repository, command and file interfaces" +msgstr "dépôts publics, commandes et interfaces de fichier" + +msgid "Developer-facing file formats, protocols and other interfaces" +msgstr "Formats de fichier, protocoles et interfaces de niveau développeur" + #, c-format msgid "available git commands in '%s'" msgstr "commandes git disponibles dans '%s'" @@ -16471,6 +16587,12 @@ msgstr "Ci-dessous les commandes Git habituelles dans diverses situations :" msgid "The Git concept guides are:" msgstr "Les guides des concepts de Git sont :" +msgid "User-facing repository, command and file interfaces:" +msgstr "Dépôts publics, commandes et interfaces de fichier :" + +msgid "File formats, protocols and other developer interfaces:" +msgstr "formats de fichiers, protocoles et interfaces de niveau développeur :" + msgid "External commands" msgstr "Commandes externes" @@ -16558,10 +16680,6 @@ msgstr "" "false`." #, c-format -msgid "Couldn't start hook '%s'\n" -msgstr "impossible de démarrer le crochet '%s'\n" - -#, c-format msgid "argument to --packfile must be a valid hash (got '%s')" msgstr "l'argument de --packfile doit être une empreinte valide ('%s' reçu)" @@ -16750,19 +16868,14 @@ msgid "quoted CRLF detected" msgstr "CRLF citées détectées" #, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -" %s" -msgstr "" -"Vos modifications locales aux fichiers suivants seraient écrasées par la " -"fusion :\n" -" %s" - -#, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "Échec de la fusion du sous-module %s (non extrait)" #, c-format +msgid "Failed to merge submodule %s (no merge base)" +msgstr "Échec de la fusion du sous-module %s (pas de base de fusion)" + +#, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "Échec de fusion du sous-module %s (commits non présents)" @@ -16782,28 +16895,10 @@ msgstr "Échec de la fusion du sous-module %s" #, c-format msgid "" -"Failed to merge submodule %s, but a possible merge resolution exists:\n" -"%s\n" +"Failed to merge submodule %s, but a possible merge resolution exists: %s" msgstr "" "Échec de fusion du sous-module %s mais une résolution possible de fusion " -"existe :\n" -"%s\n" - -#, c-format -msgid "" -"If this is correct simply add it to the index for example\n" -"by using:\n" -"\n" -" git update-index --cacheinfo 160000 %s \"%s\"\n" -"\n" -"which will accept this suggestion.\n" -msgstr "" -"Si c'est correct, ajoutez le simplement à l'index\n" -"en utilisant par exemple :\n" -"\n" -" git update-index --cacheinfo 160000 %s \"%s\"\n" -"\n" -"qui acceptera cette suggestion.\n" +"existe : %s" #, c-format msgid "" @@ -16968,13 +17063,46 @@ msgstr "" "CONFLIT (modification/suppression) : %s supprimé dans %s et modifié dans %s. " "Version %s de %s laissée dans l'arbre." +#. TRANSLATORS: This is a line of advice to resolve a merge +#. 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" +#. +#, c-format +msgid "" +" - go to submodule (%s), and either merge commit %s\n" +" or update to an existing commit which has merged those changes\n" +msgstr "" +" - aller au sous-module (%s), et soit fusionner le commit %s,\n" +" soit mettre à jour vers un commit exstant qui intègre déjà ces " +"modifications\n" + #, c-format msgid "" -"Note: %s not up to date and in way of checking out conflicted version; old " -"copy renamed to %s" +"Recursive merging with submodules currently only supports trivial cases.\n" +"Please manually handle the merging of each conflicted submodule.\n" +"This can be accomplished with the following steps:\n" +"%s - come back to superproject and run:\n" +"\n" +" git add %s\n" +"\n" +" to record the above merge or update\n" +" - resolve any other conflicts in the superproject\n" +" - commit the resulting index in the superproject\n" msgstr "" -"Note :%s pas à jour et au milieu de l'extraction d'une version " -"conflictuelle ; la vielle copie a été renommée en %s" +"La fusion récursive des sous-modules ne gère actuellement que les cas " +"triviaux.\n" +"Veuillez procéder à la fusion manuellement pour chaque sous-module en " +"conflit.\n" +"Ceci peut être réalisé par les étapes suivantes :\n" +"%s - revenir au super-projet et lancer :\n" +"\n" +" git add %s\n" +"\n" +" pour enregistrer la fusion ci-dessus et mettre à jour\n" +" - résoudre tous les autres conflits dans le super-projet\n" +" - valider l'index résultant dans le super-projet\n" #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge #. base, and 2-3) the trees for the two trees we're merging. @@ -17046,6 +17174,22 @@ msgid "Found a possible merge resolution for the submodule:\n" msgstr "Résolution possible de fusion trouvée pour le sous-module :\n" #, c-format +msgid "" +"If this is correct simply add it to the index for example\n" +"by using:\n" +"\n" +" git update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"which will accept this suggestion.\n" +msgstr "" +"Si c'est correct, ajoutez le simplement à l'index\n" +"en utilisant par exemple :\n" +"\n" +" git update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"qui acceptera cette suggestion.\n" + +#, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "Échec de fusion du sous-module %s (plusieurs fusions trouvées)" @@ -17572,6 +17716,22 @@ msgid "confused by unstable object source data for %s" msgstr "données de source d'objet instable pour %s" #, c-format +msgid "write stream object %ld != %<PRIuMAX>" +msgstr "écrire l'objet de flux %ld != %<PRIuMAX>" + +#, c-format +msgid "unable to stream deflate new object (%d)" +msgstr "impossible de compresser le nouvel objet dans le flux (%d)" + +#, c-format +msgid "deflateEnd on stream object failed (%d)" +msgstr "échec de deflateEnd sur l'objet (%d)" + +#, c-format +msgid "unable to create directory %s" +msgstr "échec de la création du répertoire %s" + +#, c-format msgid "cannot read object for %s" msgstr "impossible de lire l'objet pour %s" @@ -17801,6 +17961,60 @@ msgstr "impossible d'analyser l'objet : %s" msgid "hash mismatch %s" msgstr "incohérence de hachage %s" +msgid "trying to write commit not in index" +msgstr "échec de l'écriture de l'objet commit absent de l'index" + +msgid "failed to load bitmap index (corrupted?)" +msgstr "échec du chargement de l'index en bitmap (corruption ?)" + +msgid "corrupted bitmap index (too small)" +msgstr "index en bitmap corrompu (trop court)" + +msgid "corrupted bitmap index file (wrong header)" +msgstr "fichier d'index en bitmap corrompu (mauvais entête)" + +#, c-format +msgid "unsupported version '%d' for bitmap index file" +msgstr "version non gérée '%d' pour le fichier d'index en bitmap" + +msgid "corrupted bitmap index file (too short to fit hash cache)" +msgstr "" +"fichier d'index en bitmap corrompu (trop court pour correspondre à un cache " +"d'empreinte)" + +msgid "corrupted bitmap index file (too short to fit lookup table)" +msgstr "" +"fichier d'index en bitmap corrompu (trop court pour correspondre à une table " +"de recherche)" + +#, c-format +msgid "duplicate entry in bitmap index: '%s'" +msgstr "entrée dupliquée dans l'index en bitmap : '%s'" + +#, c-format +msgid "corrupt ewah bitmap: truncated header for entry %d" +msgstr "bitmap ewah corrompu : entête tronqué pour l'entrée %d" + +#, c-format +msgid "corrupt ewah bitmap: commit index %u out of range" +msgstr "bitmap ewah corrompu : index de commit %u hors plage" + +msgid "corrupted bitmap pack index" +msgstr "index de paquet en bitmap corrompu" + +msgid "invalid XOR offset in bitmap pack index" +msgstr "décalage XOR invalide dans l'index de paquet en bitmap" + +msgid "cannot fstat bitmap file" +msgstr "impossible d'obtenir le statut (fstat) du fichier de bitmap" + +#, c-format +msgid "ignoring extra bitmap file: '%s'" +msgstr "fichier bitmap extra ignoré : '%s'" + +msgid "checksum doesn't match in MIDX and bitmap" +msgstr "la somme de contrôle ne correspond pas entre MIDX et bitmap" + msgid "multi-pack bitmap is missing required reverse index" msgstr "l'index inverse requis manque dans l'index multi-paquet" @@ -17812,9 +18026,59 @@ msgstr "impossible d'ouvrir le paquet '%s'" msgid "preferred pack (%s) is invalid" msgstr "le paquet préféré (%s) est invalide" +msgid "corrupt bitmap lookup table: triplet position out of index" +msgstr "" +"table de recherche en bitmap corrompue : position de triplet hors d'index" + +msgid "corrupt bitmap lookup table: xor chain exceeds entry count" +msgstr "" +"table de recherche en bitmap corrompue : la chaîne de xor dépasse le nombre " +"d'entrées" + +#, c-format +msgid "corrupt bitmap lookup table: commit index %u out of range" +msgstr "table de recherche en bitmap corrompue : index de commit %u hors plage" + #, c-format -msgid "could not find %s in pack %s at offset %<PRIuMAX>" -msgstr "impossible de trouver %s dans le paquet %s à l'offset %<PRIuMAX>" +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 "object '%s' not found in type bitmaps" +msgstr "objet '%s' non trouvé dans les bitmaps de type" + +#, c-format +msgid "object '%s' does not have a unique type" +msgstr "l'objet '%s' n'a pas un type unique" + +#, c-format +msgid "object '%s': real type '%s', expected: '%s'" +msgstr "objet '%s' : type réel '%s', attendu : '%s'" + +#, c-format +msgid "object not in bitmap: '%s'" +msgstr "objet non trouvé dans la bitmap : '%s'" + +msgid "failed to load bitmap indexes" +msgstr "échec de chargement des index de bitmap" + +msgid "you must specify exactly one commit to test" +msgstr "vous devez spécifier un seul commit à tester" + +#, c-format +msgid "commit '%s' doesn't have an indexed bitmap" +msgstr "le commit '%s' n'a pas de bitmap indexée" + +msgid "mismatch in bitmap results" +msgstr "décalage dans le résultats de bitmap" + +#, c-format +msgid "could not find '%s' in pack '%s' at offset %<PRIuMAX>" +msgstr "impossible de trouver '%s' dans le paquet '%s' à l'offset %<PRIuMAX>" + +#, c-format +msgid "unable to get disk usage of '%s'" +msgstr "impossible de récupérer l'utilisation du disque de '%s'" #, c-format msgid "mtimes file %s is too small" @@ -17939,6 +18203,9 @@ msgstr "vouliez-vous dire `--%s` (avec deux signes moins)?" msgid "alias of --%s" msgstr "alias pour --%s" +msgid "need a subcommand" +msgstr "sous-commande requise" + #, c-format msgid "unknown option `%s'" msgstr "option inconnue « %s »" @@ -18385,9 +18652,12 @@ msgid "" "l, label <label> = label current HEAD with a name\n" "t, reset <label> = reset HEAD to a label\n" "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" -". create a merge commit using the original merge commit's\n" -". message (or the oneline, if no original merge commit was\n" -". specified); use -c <commit> to reword the commit message\n" +" create a merge commit using the original merge commit's\n" +" message (or the oneline, if no original merge commit was\n" +" specified); use -c <commit> to reword the commit message\n" +"u, update-ref <ref> = track a placeholder for the <ref> to be updated\n" +" to this position in the new commits. The <ref> is\n" +" updated at the end of the rebase\n" "\n" "These lines can be re-ordered; they are executed from top to bottom.\n" msgstr "" @@ -18415,6 +18685,11 @@ msgstr "" " créer un commit de fusion utilisant le message de fusion original\n" " (ou l'uniligne, si aucun commit de fusion n'a été spécifié).\n" " Utilisez -c <commit> pour reformuler le message de validation.\n" +" u, update-ref <réf> = suivre un espace réservé pour la <réf> à mettre à " +"jour\n" +" à cette position dans les nouveaux commits. La <réf> " +"est\n" +" mise à jour à la fin du rebasage\n" "\n" "Vous pouvez réordonner ces lignes ; elles sont exécutées de haut en bas.\n" @@ -18886,6 +19161,13 @@ msgstr "erreur de protocole : sha/ref attendu, '%s' trouvé" msgid "http transport does not support %s" msgstr "le transport http ne supporte pas %s" +msgid "protocol error: expected '<url> <path>', missing space" +msgstr "erreur de protocole : '<url> <chemin>' attendu, espace manquant" + +#, c-format +msgid "failed to download file at URL '%s'" +msgstr "échec du téléchargement du fichier à l'URL '%s'" + msgid "git-http-push failed" msgstr "échec de git-http-push" @@ -19236,6 +19518,15 @@ msgstr "impossible de déterminer la révision HEAD" msgid "failed to find tree of %s" msgstr "impossible de trouver l'arbre de %s" +#, c-format +msgid "resolve-undo records `%s` which is missing" +msgstr "resolve-undo enregistre `%s` qui manque" + +#, c-format +msgid "could not get commit for ancestry-path argument %s" +msgstr "" +"impossible de récupérer le commit pour l'argument de chemin d'ascendance %s" + msgid "--unpacked=<packfile> no longer supported" msgstr "--unpacked=<fichier-paquet> n'est plus géré" @@ -19256,6 +19547,174 @@ msgstr "-L ne supporte pas encore les formats de diff autres que -p et -s" msgid "cannot create async thread: %s" msgstr "impossible de créer un fil asynchrone : %s" +#, c-format +msgid "'%s' does not exist" +msgstr "'%s' n'existe pas" + +#, c-format +msgid "could not switch to '%s'" +msgstr "impossible de basculer vers '%s'" + +msgid "need a working directory" +msgstr "répertoire de travail nécessaire" + +msgid "Scalar enlistments require a worktree" +msgstr "Les enrôlements scalaires requièrent un arbre de travail" + +#, c-format +msgid "could not configure %s=%s" +msgstr "impossible de configurer %s=%s" + +msgid "could not configure log.excludeDecoration" +msgstr "impossible de configurer log.excludeDecoration" + +msgid "could not add enlistment" +msgstr "impossible d'ajouter l'enrôlement" + +msgid "could not set recommended config" +msgstr "impossible de réglér la configuration recommandée" + +msgid "could not turn on maintenance" +msgstr "impossible d'activer la maintenance" + +msgid "could not start the FSMonitor daemon" +msgstr "impossible de démarrer le daemon FSMonitor" + +msgid "could not turn off maintenance" +msgstr "impossible de désactiver la maintenance" + +msgid "could not remove enlistment" +msgstr "impossible de supprimer l'enrôlement" + +#, c-format +msgid "remote HEAD is not a branch: '%.*s'" +msgstr "la HEAD distante n'est pas une branche : '%.*s'" + +msgid "failed to get default branch name from remote; using local default" +msgstr "" +"échec de récupération de la branche par défaut depuis le distant ; " +"utilisation de la valeur par défaut locale" + +msgid "failed to get default branch name" +msgstr "échec de l'obtention du nom de branche par défaut" + +msgid "failed to unregister repository" +msgstr "échec du désenregistrement du dépôt" + +msgid "failed to stop the FSMonitor daemon" +msgstr "Échec de l'arrêt de FSEVEntStream" + +msgid "failed to delete enlistment directory" +msgstr "échec de la suppression du répertoire d'enrôlement" + +msgid "branch to checkout after clone" +msgstr "branche à extraire après le clonage" + +msgid "when cloning, create full working directory" +msgstr "lors d'un clonage, créer un répertoire de travail complet" + +msgid "only download metadata for the branch that will be checked out" +msgstr "ne télécharger les méta-données que pour la branche qui sera extraite" + +msgid "scalar clone [<options>] [--] <repo> [<dir>]" +msgstr "scalar clone [<options>] [--] <dépôt> [<répertoire>]" + +#, c-format +msgid "cannot deduce worktree name from '%s'" +msgstr "impossible de déduire le nom de l'arbre de travail depuis '%s'" + +#, c-format +msgid "directory '%s' exists already" +msgstr "le répertoire '%s' existe déjà" + +#, c-format +msgid "failed to get default branch for '%s'" +msgstr "échec d'obtention de la branche par défaut pour '%s'" + +#, c-format +msgid "could not configure remote in '%s'" +msgstr "impossible de paramétrer le distant dans '%s'" + +#, c-format +msgid "could not configure '%s'" +msgstr "impossible de configurer '%s'" + +msgid "partial clone failed; attempting full clone" +msgstr "échec du clonage partiel ; tentative de clonage complet" + +msgid "could not configure for full clone" +msgstr "impossible de configurer pour le clonage complet" + +msgid "scalar diagnose [<enlistment>]" +msgstr "scalar diagnose [<enrôlement>]" + +msgid "`scalar list` does not take arguments" +msgstr "`scalar list` n'accepte pas d'argument" + +msgid "scalar register [<enlistment>]" +msgstr "scalar register [<enrôlement>]" + +msgid "reconfigure all registered enlistments" +msgstr "reconfigurer tous les enrôlements enregistrés" + +msgid "scalar reconfigure [--all | <enlistment>]" +msgstr "scala reconfigure [--all|<enrôlement>]" + +msgid "--all or <enlistment>, but not both" +msgstr "--all ou <enrôlement>, mais pas les deux" + +#, c-format +msgid "git repository gone in '%s'" +msgstr "dépôt git parti dans '%s'" + +msgid "" +"scalar run <task> [<enlistment>]\n" +"Tasks:\n" +msgstr "" +"scalar run <tâche> [<enrôlement>]\n" +"Tâches :\n" + +#, c-format +msgid "no such task: '%s'" +msgstr "pas de tâche : '%s'" + +msgid "scalar unregister [<enlistment>]" +msgstr "scalar unregister [<enrôlement>]" + +msgid "scalar delete <enlistment>" +msgstr "scalar delete <enrôlement>" + +msgid "refusing to delete current working directory" +msgstr "refus de la suppression du répertoire de travail actuel" + +msgid "include Git version" +msgstr "inclure la version Git" + +msgid "include Git's build options" +msgstr "inclure les options de construction de Git" + +msgid "scalar verbose [-v | --verbose] [--build-options]" +msgstr "scalar verbose [-v | --verbose] [--build-options]" + +msgid "-C requires a <directory>" +msgstr "-C requiert un <répertoire>" + +#, c-format +msgid "could not change to '%s'" +msgstr "échec de modification en '%s'" + +msgid "-c requires a <key>=<value> argument" +msgstr "-c exige un argument <clé>=<valeur>" + +msgid "" +"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n" +"\n" +"Commands:\n" +msgstr "" +"scalar [-C <répertoire>] [-c <clé>=<valeur>] <commande> [<options>]\n" +"\n" +"Commandes :\n" + msgid "unexpected flush packet while reading remote unpack status" msgstr "" "paquet de nettoyage inattendu pendant la lecture de l'état de dépaquetage " @@ -19379,10 +19838,6 @@ msgstr "vos modifications locales seraient écrasées par %s." msgid "commit your changes or stash them to proceed." msgstr "validez vos modifications ou les remiser pour continuer." -#, c-format -msgid "%s: fast-forward" -msgstr "%s : avance rapide" - #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase". #. @@ -19872,6 +20327,27 @@ msgstr "impossible de seulement essayer de fusionner '%.*s'" msgid "merge: Unable to write new index file" msgstr "fusion : Impossible d'écrire le nouveau fichier index" +#, c-format +msgid "" +"another 'rebase' process appears to be running; '%s.lock' already exists" +msgstr "un processu 'rebase' semble déjà lancé; '%s.lock' existe déjà" + +#, c-format +msgid "" +"Updated the following refs with %s:\n" +"%s" +msgstr "" +"Les références suivantes ont été mises à jour avec %s :\n" +"%s" + +#, c-format +msgid "" +"Failed to update the following refs with %s:\n" +"%s" +msgstr "" +"Échec des mises à jour des références suivantes avec %s :\n" +"%s" + msgid "Cannot autostash" msgstr "Autoremisage impossible" @@ -20039,6 +20515,10 @@ msgid "the script was already rearranged." msgstr "le script a déjà été réarrangé." #, c-format +msgid "update-refs file at '%s' is invalid" +msgstr "le fichier update-refs %s est invalide" + +#, c-format msgid "'%s' is outside repository at '%s'" msgstr "'%s' est hors du dépôt à '%s'" @@ -20164,17 +20644,21 @@ msgstr "" #, c-format msgid "" -"unsafe repository ('%s' is owned by someone else)\n" -"To add an exception for this directory, call:\n" +"detected dubious ownership in repository at '%s'\n" +"%sTo add an exception for this directory, call:\n" "\n" "\tgit config --global --add safe.directory %s" msgstr "" -"dépôt non sécurisé ('%s' appartient à quelqu'un d'autre)\n" -"Pour ajouter une exception pour ce dépôt, lancez :\n" +"propriétaire douteux détecté dans le dépôt à '%s'\n" +"%sPour ajouter une exception pour ce dépôt, lancez :\n" "\n" "\tgit config --global --add safe.directory %s" #, c-format +msgid "cannot use bare repository '%s' (safe.bareRepository is '%s')" +msgstr "impossible d'utiliser le dépôt nu '%s' (safe.bareRepository vaut '%s')" + +#, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" "The owner of files must always have read and write permissions." @@ -21061,6 +21545,18 @@ msgstr "numéro de port invalide" msgid "invalid '..' path segment" msgstr "segment de chemin '..' invalide" +msgid "usage: " +msgstr "usage : " + +msgid "fatal: " +msgstr "fatal : " + +msgid "error: " +msgstr "erreur : " + +msgid "warning: " +msgstr "avertissement : " + msgid "Fetching objects" msgstr "Récupération des objets" @@ -21502,7 +21998,7 @@ msgid "HEAD detached from " msgstr "HEAD détachée depuis " msgid "Not currently on any branch." -msgstr "Actuellement sur aucun branche." +msgstr "Actuellement sur aucune branche." msgid "Initial commit" msgstr "Validation initiale" @@ -21874,23 +22370,6 @@ msgstr "Les sections sélectionnées ne s'applique pas à l'index !\n" msgid "ignoring unmerged: %s\n" msgstr "fichier non-fusionné ignoré : %s\n" -#, perl-format -msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " -msgstr "" -"Appliquer le changement de mode dans l'arbre de travail [y,n,q,a,d%s,?] ? " - -#, perl-format -msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " -msgstr "Appliquer la suppression dans l'arbre de travail [y,n,q,a,d%s,?] ? " - -#, perl-format -msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " -msgstr "Appliquer l'ajout dans l'arbre de travail [y,n,q,a,d%s,?] ? " - -#, perl-format -msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " -msgstr "Appliquer la section à l'arbre de travail [y,n,q,a,d%s,?] ? " - msgid "No other hunks to goto\n" msgstr "Aucune autre section à atteindre\n" @@ -22289,5 +22768,87 @@ 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 "(stats|all)" +#~ msgstr "(stats|all)" + +#~ msgid "git maintenance register" +#~ msgstr "git maintenance register" + +#~ msgid "git maintenance unregister" +#~ msgstr "git maintenance unregister" + +#~ msgid "git maintenance stop" +#~ msgstr "git maintenance stop" + +#, c-format +#~ msgid "could not parse colored hunk header '%.*s'" +#~ msgstr "impossible d'analyser l'entête coloré de section '%.*s'" + +#, c-format +#~ msgid "Unknown subcommand: %s" +#~ msgstr "Sous-commande inconnue : %s" + +#~ msgid "checked out in another worktree" +#~ msgstr "extrait dans un autre arbre de travail" + +#~ msgid "failed to open stdin of 'crontab'" +#~ msgstr "échec à l'ouverture de stdin de 'crontab'" + +#, c-format +#~ msgid "invalid subcommand: %s" +#~ msgstr "sous-commande invalide : %s" + +#~ msgid "single arg format must be symmetric range" +#~ msgstr "un format d'argument unique doit être une plage symétrique" + +#~ msgid "git submodule--helper list [--prefix=<path>] [<path>...]" +#~ msgstr "git submodule--helper list [--prefix=<chemin>] [<chemin>...]" + +#~ msgid "git submodule--helper name <path>" +#~ msgstr "git submodule--helper <nom> <chemin>" + +#, c-format +#~ msgid "failed to get the default remote for submodule '%s'" +#~ msgstr "" +#~ "échec d'obtention du dépôt distant par défaut pour le sous-module '%s'" + +#, c-format +#~ msgid "Invalid update mode '%s' for submodule path '%s'" +#~ msgstr "" +#~ "Mode de mise à jour '%s' invalide pour le chemin de sous-module '%s'" + +#~ msgid "path into the working tree, across nested submodule boundaries" +#~ msgstr "" +#~ "chemin dans la copie de travail, traversant les frontières de sous-modules" + +#~ msgid "rebase, merge, checkout or none" +#~ msgstr "valeurs possibles : rebase, merge, checkout ou none" + +#~ msgid "bad value for update parameter" +#~ msgstr "valeur invalide pour la mise à jour du paramètre" + +#~ msgid "Show three-way merge without touching index" +#~ msgstr "Afficher la fusion à trois points sans modifier l'index" + +#, c-format +#~ msgid "could not create directory for '%s'" +#~ msgstr "impossible de créer le répertoire pour '%s'" + +#, c-format +#~ msgid "Couldn't start hook '%s'\n" +#~ msgstr "impossible de démarrer le crochet '%s'\n" + +#, c-format +#~ msgid "" +#~ "Note: %s not up to date and in way of checking out conflicted version; " +#~ "old copy renamed to %s" +#~ msgstr "" +#~ "Note :%s pas à jour et au milieu de l'extraction d'une version " +#~ "conflictuelle ; la vielle copie a été renommée en %s" + +#, c-format +#~ msgid "%s: fast-forward" +#~ msgstr "%s : avance rapide" + #~ msgid "--preserve-merges was replaced by --rebase-merges" #~ msgstr "--preserve-merges a été remplacé par --rebase-merges" @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2022-06-21 20:20+0000\n" -"PO-Revision-Date: 2022-06-18 16:30+0700\n" +"POT-Creation-Date: 2022-09-28 14:31+0700\n" +"PO-Revision-Date: 2022-09-28 14:50+0700\n" "Last-Translator: Bagas Sanjaya <bagasdotme@gmail.com>\n" "Language-Team: Indonesian\n" "Language: id\n" @@ -22,7 +22,7 @@ msgstr "" msgid "Huh (%s)?" msgstr "Huh (%s)?" -#: add-interactive.c builtin/rebase.c reset.c sequencer.c +#: add-interactive.c builtin/merge.c builtin/rebase.c reset.c sequencer.c msgid "could not read index" msgstr "tidak dapat membaca indeks" @@ -203,8 +203,8 @@ msgid "unstaged" msgstr "tak tergelar" #: add-interactive.c apply.c builtin/am.c builtin/bugreport.c builtin/clone.c -#: builtin/fetch.c builtin/merge.c builtin/pull.c builtin/submodule--helper.c -#: git-add--interactive.perl +#: builtin/diagnose.c builtin/fetch.c builtin/merge.c builtin/pull.c +#: builtin/submodule--helper.c git-add--interactive.perl msgid "path" msgstr "jalur" @@ -464,22 +464,22 @@ msgstr "" #: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " -msgstr "Terapkan perubahan mode ke indeks dan pohon kerja [y,n,q,a,d%s,?]? " +msgstr "Terapkan perubahan mode pada indeks dan pohon kerja [y,n,q,a,d%s,?]? " #: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " -msgstr "Terapkan penghapusan ke indeks dan pohon kerja [y,n,q,a,d%s,?]? " +msgstr "Terapkan penghapusan pada indeks dan pohon kerja [y,n,q,a,d%s,?]? " #: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " -msgstr "Terapkan penambahan ke indeks dan pohon kerja [y,n,q,a,d%s,?]? " +msgstr "Terapkan penambahan pada indeks dan pohon kerja [y,n,q,a,d%s,?]? " #: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " -msgstr "Terapkan bingkah ini ke indeks dan pohon kerja [y,n,q,a,d%s,?]? " +msgstr "Terapkan bingkah ini pada indeks dan pohon kerja [y,n,q,a,d%s,?]? " #: add-patch.c msgid "" @@ -495,6 +495,26 @@ msgstr "" "a - terapkan bingkah ini dan semua bingkah selanjutnya dalam berkas\n" "d - jangan terapkan bingkah ini atau bingkah selanjutnya dalam berkas\n" +#: add-patch.c git-add--interactive.perl +#, c-format, perl-format +msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " +msgstr "Terapkan perubahan mode pada pohon kerja [y,n,q,a,d%s,?]?" + +#: add-patch.c git-add--interactive.perl +#, c-format, perl-format +msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " +msgstr "Terapkan penghapusan pada pohon kerja [y,n,q,a,d%s,?]?" + +#: add-patch.c git-add--interactive.perl +#, c-format, perl-format +msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " +msgstr "Terapkan penambahan pada pohon kerja [y,n,q,a,d%s,?]?" + +#: add-patch.c git-add--interactive.perl +#, c-format, perl-format +msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " +msgstr "Terapkan bingkah ini pada pohon kerja [y,n,q,a,d%s,?]?" + #: add-patch.c msgid "" "y - apply this hunk to worktree\n" @@ -515,11 +535,6 @@ msgid "could not parse hunk header '%.*s'" msgstr "tidak dapat menguraikan kepala bingkah '%.*s'" #: add-patch.c -#, c-format -msgid "could not parse colored hunk header '%.*s'" -msgstr "tidak dapat menguraikan kepala bingkah berwarna '%.*s'" - -#: add-patch.c msgid "could not parse diff" msgstr "tidak dapat menguraikan diff" @@ -626,11 +641,11 @@ msgstr "" #: add-patch.c msgid "The selected hunks do not apply to the index!" -msgstr "Bingkah yang dipilih tidak diterapkan ke indeks!" +msgstr "Bingkah yang dipilih tidak diterapkan pada indeks!" #: add-patch.c git-add--interactive.perl msgid "Apply them to the worktree anyway? " -msgstr "Tetap terapkan itu ke pohon kerja? " +msgstr "Tetap terapkan pada pohon kerja? " #: add-patch.c git-add--interactive.perl msgid "Nothing was applied.\n" @@ -857,6 +872,26 @@ msgstr "" "ke false\n" "\n" +#: advice.c +#, c-format +msgid "" +"The following paths have been moved outside the\n" +"sparse-checkout definition but are not sparse due to local\n" +"modifications.\n" +msgstr "" +"Jalur berikut sudah dipindahkan di luar definisi sparse-checkout\n" +"tetapi bukan jarang karena perubahan lokal.\n" + +#: advice.c +msgid "" +"To correct the sparsity of these paths, do the following:\n" +"* Use \"git add --sparse <paths>\" to update the index\n" +"* Use \"git sparse-checkout reapply\" to apply the sparsity rules" +msgstr "" +"Untuk memperbaiki kejarangan jalur tersebut, lakukan hal-hal berikut:\n" +"* Gunakan \"git add --sparse <jalur>\" untuk memperbarui indeks\n" +"* Gunakan \"git sparse-checkout reapply\" untuk menerapkan aturan kejarangan" + #: alias.c msgid "cmdline ends with \\" msgstr "baris perintah diakhiri dengan \\" @@ -1097,7 +1132,7 @@ msgstr "" msgid "patch failed: %s:%ld" msgstr "tambalan gagal: %s:%ld" -#: apply.c +#: apply.c builtin/mv.c #, c-format msgid "cannot checkout %s" msgstr "tidak dapat men-checkout %s" @@ -1495,6 +1530,11 @@ msgstr "tidak dapat mengaruskan blob %s" msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "mode berkas tidak didukung: 0%o (SHA1: %s)" +#: archive-tar.c archive-zip.c builtin/pack-objects.c +#, c-format +msgid "deflate error (%d)" +msgstr "kesalahan deflasi (%d)" + #: archive-tar.c #, c-format msgid "unable to start '%s' filter" @@ -1519,11 +1559,6 @@ msgstr "jalur bukan UTF-8 valid: %s" msgid "path too long (%d chars, SHA1: %s): %s" msgstr "jalur terlalu panjang (%d karakter, SHA1: %s): %s" -#: archive-zip.c builtin/pack-objects.c -#, c-format -msgid "deflate error (%d)" -msgstr "kesalahan deflasi (%d)" - #: archive-zip.c #, c-format msgid "timestamp too large for this system: %<PRIuMAX>" @@ -1841,8 +1876,8 @@ msgstr "" "--reverse dan --first-parent bersama-sama butuh komit terbaru yang disebutkan" #: blame.c builtin/commit.c builtin/log.c builtin/merge.c -#: builtin/pack-objects.c builtin/shortlog.c bundle.c midx.c ref-filter.c -#: remote.c sequencer.c submodule.c +#: builtin/pack-objects.c builtin/shortlog.c bundle.c midx.c pack-bitmap.c +#: ref-filter.c remote.c sequencer.c submodule.c msgid "revision walk setup failed" msgstr "persiapan jalan revisi gagal" @@ -1937,7 +1972,7 @@ msgstr "tak melacak: informasi ambigu untuk referensi '%s'" #: branch.c object-name.c #, c-format msgid " %s\n" -msgstr "" +msgstr " %s\n" #. TRANSLATORS: The second argument is a \n-delimited list of #. duplicate refspecs, composed above. @@ -1954,6 +1989,13 @@ msgid "" "different remotes' fetch refspecs map into different\n" "tracking namespaces." msgstr "" +"Ada banyak remote yang spek referensi pengambilan terpetakan ke referensi\n" +"pelacak remote '%s'\n" +"%s\n" +"Hal ini biasanya merupakan kesalahan konfigurasi.\n" +"\n" +"Untuk mendukung menyetel cabang pelacakan, pastikan bahwa spek referensi\n" +"remote yang berbeda terpetakan ke ruang nama pelacakan yang berbeda." #: branch.c #, c-format @@ -1993,6 +2035,14 @@ msgid "" "will track its remote counterpart, you may want to use\n" "\"git push -u\" to set the upstream config as you push." msgstr "" +"\n" +"Jika Anda berencana mendasarkan karya Anda pada sebuah cabang hulu\n" +"yang sudah ada pada remote, Anda mungkin perlu menjalankan\n" +"\"git fetch\" untuk mendapatkannya.\n" +"\n" +"Jika Anda berencana mendorong sebuah cabang lokal baru yang akan melacak\n" +"pasangan remotenya, Anda dapat menggunakan \"git push -u\" untuk menyetel\n" +"konfigurasi hulu saat Anda dorong." #: branch.c builtin/replace.c #, c-format @@ -2248,19 +2298,19 @@ msgstr "" #: builtin/reset.c builtin/rm.c builtin/submodule--helper.c read-cache.c #: rerere.c submodule.c msgid "index file corrupt" -msgstr "" +msgstr "berkas indeks rusak" #: builtin/am.c builtin/mailinfo.c mailinfo.c #, c-format msgid "bad action '%s' for '%s'" -msgstr "" +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 #, c-format msgid "invalid value for '%s': '%s'" -msgstr "" +msgstr "nilai tidak valid untuk '%s': '%s'" #: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c #, c-format @@ -2274,7 +2324,7 @@ msgstr "tidak dapat mengurai skrip pengarang" #: builtin/am.c builtin/replace.c commit.c sequencer.c #, c-format msgid "could not parse %s" -msgstr "" +msgstr "tidak dapat menguraikan %s" #: builtin/am.c #, c-format @@ -2300,7 +2350,7 @@ msgstr "fseek gagal" msgid "could not open '%s' for reading" msgstr "tidak dapat membuka '%s' untuk dibaca" -#: builtin/am.c builtin/rebase.c strbuf.c wrapper.c +#: builtin/am.c builtin/rebase.c sequencer.c strbuf.c wrapper.c #, c-format msgid "could not open '%s' for writing" msgstr "tidak dapat membuka '%s' untuk ditulis" @@ -2384,7 +2434,7 @@ msgstr "baris identitas tidak valid: %.*s" #: builtin/am.c builtin/checkout.c builtin/clone.c commit-graph.c #, c-format msgid "unable to parse commit %s" -msgstr "" +msgstr "tidak dapat menguraikan komit %s" #: builtin/am.c msgid "Repository lacks necessary blobs to fall back on 3-way merge." @@ -2618,8 +2668,8 @@ msgid "n" msgstr "n" #: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c -#: builtin/for-each-ref.c builtin/ls-tree.c builtin/replace.c builtin/tag.c -#: builtin/verify-tag.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 msgid "format" msgstr "format" @@ -2723,7 +2773,7 @@ msgstr "mode interaktif butuh tambalan pada baris perintah" msgid "git apply [<options>] [<patch>...]" msgstr "git apply [<opsi>] [<tambalan>...]" -#: builtin/archive.c contrib/scalar/scalar.c +#: builtin/archive.c diagnose.c msgid "could not redirect output" msgstr "tidak dapat mengalihkan keluaran" @@ -3611,8 +3661,8 @@ msgstr "pengurutan dan penyaringan tak peka kapital" msgid "recurse through submodules" msgstr "rekursi melalui submodul" -#: builtin/branch.c builtin/for-each-ref.c builtin/ls-tree.c builtin/tag.c -#: builtin/verify-tag.c +#: builtin/branch.c builtin/for-each-ref.c builtin/ls-files.c builtin/ls-tree.c +#: builtin/tag.c builtin/verify-tag.c msgid "format to use for the output" msgstr "format yang digunakan untuk keluaran" @@ -3721,28 +3771,34 @@ msgstr "" #: builtin/bugreport.c msgid "git version:\n" -msgstr "" +msgstr "versi git:\n" #: builtin/bugreport.c #, c-format msgid "uname() failed with error '%s' (%d)\n" -msgstr "" +msgstr "uname() gagal dengan kesalahan '%s' (%d)\n" #: builtin/bugreport.c msgid "compiler info: " -msgstr "" +msgstr "info pengompilasi: " #: builtin/bugreport.c msgid "libc info: " -msgstr "" +msgstr "info pustaka c: " #: builtin/bugreport.c msgid "not run from a git repository - no hooks to show\n" msgstr "" +"tidak dijalankan dari sebuah repositori git - tidak ada kait yang " +"diperlihatkan\n" #: builtin/bugreport.c -msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]" +msgid "" +"git bugreport [-o|--output-directory <file>] [-s|--suffix <format>] [--" +"diagnose[=<mode>]" msgstr "" +"git bugreport [-o|--output-directory <berkas>] [-s|--suffix <format>] [--" +"diagnose[=<mode>]]" #: builtin/bugreport.c msgid "" @@ -3762,37 +3818,67 @@ msgid "" "Please review the rest of the bug report below.\n" "You can delete any lines you don't wish to share.\n" msgstr "" +"Terima kasih telah mengisi laporan bug Git!\n" +"Mohon jawab pertanyaan berikut untuk membantu memahami masalah Anda.\n" +"\n" +"Apa yang Anda lakukan sebelum bug terjadi? (Tahap-tahap untuk mereproduksi " +"masalah Anda)\n" +"Apa yang Anda harapkan? (Perilaku yang diharapkan)\n" +"\n" +"Apa yang terjadi? (Perilaku sebenarnya)\n" +"\n" +"Apa yang berbeda antara apa yang Anda harapkan dan yang sebenarnya terjadi?\n" +"\n" +"Apalagi yang Anda ingin tambahkan?\n" +"\n" +"Mohon tinjau sisa laporan bug di bawah ini.\n" +"Anda dapat menghapus baris-baris yang Anda tidak ingin dibagi.\n" + +#: builtin/bugreport.c builtin/commit.c builtin/fast-export.c builtin/rebase.c +#: parse-options.h +msgid "mode" +msgstr "mode" #: builtin/bugreport.c -msgid "specify a destination for the bugreport file" -msgstr "" +msgid "" +"create an additional zip archive of detailed diagnostics (default 'stats')" +msgstr "buat arsip zip tambahan dari diagnostik terperinci (asali 'stats')" #: builtin/bugreport.c -msgid "specify a strftime format suffix for the filename" -msgstr "" +msgid "specify a destination for the bugreport file(s)" +msgstr "sebutkan tujuan untuk berkas(-berkas) laporan bug" #: builtin/bugreport.c +msgid "specify a strftime format suffix for the filename(s)" +msgstr "sebutkan akhiran format strftime untuk nama(-nama) berkas" + +#: builtin/bugreport.c builtin/diagnose.c #, c-format msgid "could not create leading directories for '%s'" -msgstr "" +msgstr "tidak dapat membuat direktori utama untuk '%s'" + +#: builtin/bugreport.c builtin/diagnose.c +#, c-format +msgid "unable to create diagnostics archive %s" +msgstr "tidak dapat membuat arsip diagnostik %s" #: builtin/bugreport.c msgid "System Info" -msgstr "" +msgstr "Informasi Sistem" #: builtin/bugreport.c msgid "Enabled Hooks" -msgstr "" +msgstr "Kait Aktif" #: builtin/bugreport.c #, c-format msgid "unable to write to %s" -msgstr "" +msgstr "tidak dapat menulis ke %s" #: builtin/bugreport.c #, c-format msgid "Created new report at '%s'.\n" -msgstr "" +msgstr "Laporan baru dibuat pada '%s'.\n" #: builtin/bundle.c msgid "git bundle create [<options>] <file> <git-rev-list args>" @@ -3851,11 +3937,6 @@ msgstr "Perlu sebuah repositori untuk membongkar bundel." msgid "Unbundling objects" msgstr "Membongkar bundel objek" -#: builtin/bundle.c builtin/remote.c -#, c-format -msgid "Unknown subcommand: %s" -msgstr "Subperintah tidak dikenal: %s" - #: builtin/cat-file.c merge-recursive.c #, c-format msgid "cannot read object %s '%s'" @@ -3954,6 +4035,10 @@ msgstr "perlihatkan ukuran objek" msgid "allow -s and -t to work with broken/corrupt objects" msgstr "perbolehkan -s dan -t bekerja dengan objek rusak" +#: builtin/cat-file.c builtin/log.c +msgid "use mail map file" +msgstr "gunakan berkas peta surat" + #: builtin/cat-file.c msgid "Batch objects requested on stdin (or --batch-all-objects)" msgstr "Objek batch diminta pada masukan standar (atau --batch-all-objects)" @@ -3967,6 +4052,10 @@ msgid "like --batch, but don't emit <contents>" msgstr "seperti --batch, tapi jangan keluarkan <isi>" #: builtin/cat-file.c +msgid "stdin is NUL-terminated" +msgstr "stdin diakhiri dengan NUL" + +#: builtin/cat-file.c msgid "read commands from stdin" msgstr "baca perintah dari masukan standar" @@ -4062,137 +4151,139 @@ msgstr "" #: builtin/check-attr.c msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." -msgstr "" +msgstr "git check-attr [-a | --all | <atribut>...] [--] <nama jalur>..." #: builtin/check-attr.c msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" -msgstr "" +msgstr "git check-attr --stdin [-z] [-a | --all | <attribut>...]" #: builtin/check-attr.c msgid "report all attributes set on file" -msgstr "" +msgstr "laporkan semua atribut yang disetel pada berkas" #: builtin/check-attr.c msgid "use .gitattributes only from the index" -msgstr "" +msgstr "hanya gunakan .gitattributes dari indeks" #: builtin/check-attr.c builtin/check-ignore.c builtin/hash-object.c msgid "read file names from stdin" -msgstr "" +msgstr "baca nama berkas dari masukan standar" #: builtin/check-attr.c builtin/check-ignore.c msgid "terminate input and output records by a NUL character" -msgstr "" +msgstr "akhiri masukan dan keluarkan rekaman oleh sebuah karakter NUL" #: builtin/check-ignore.c builtin/checkout.c builtin/gc.c builtin/worktree.c msgid "suppress progress reporting" -msgstr "" +msgstr "padamkan pelaporan kemajuan" #: builtin/check-ignore.c msgid "show non-matching input paths" -msgstr "" +msgstr "perlihatkan jalur input yang tak cocok" #: builtin/check-ignore.c msgid "ignore index when checking" -msgstr "" +msgstr "abaikan indeks ketika memeriksa" #: builtin/check-ignore.c msgid "cannot specify pathnames with --stdin" -msgstr "" +msgstr "tidak dapat menyebutkan nama jalur dengan --stdin" #: builtin/check-ignore.c msgid "-z only makes sense with --stdin" -msgstr "" +msgstr "-z hanya masuk akal dengan --stdin" #: builtin/check-ignore.c msgid "no path specified" -msgstr "" +msgstr "tidak ada jalur yang disebutkan" #: builtin/check-ignore.c msgid "--quiet is only valid with a single pathname" -msgstr "" +msgstr "--quiet hanya valid dengan satu nama jalur" #: builtin/check-ignore.c msgid "cannot have both --quiet and --verbose" -msgstr "" +msgstr "tidak dapat punya baik --quiet dan --verbose" #: builtin/check-ignore.c msgid "--non-matching is only valid with --verbose" -msgstr "" +msgstr "--non-matching hanya valid dengan --verbose" #: builtin/check-mailmap.c msgid "git check-mailmap [<options>] <contact>..." -msgstr "" +msgstr "git check-mailmap [<opsi>] <kontak>..." #: builtin/check-mailmap.c msgid "also read contacts from stdin" -msgstr "" +msgstr "juga baca kontak dari masukan standar" #: builtin/check-mailmap.c #, c-format msgid "unable to parse contact: %s" -msgstr "" +msgstr "tidak dapat menguraikan kontak: %s" #: builtin/check-mailmap.c msgid "no contacts specified" -msgstr "" +msgstr "tidak ada kontak yang disebutkan" #: builtin/checkout--worker.c msgid "git checkout--worker [<options>]" -msgstr "" +msgstr "git checkout--worker [<opsi>]" #: builtin/checkout--worker.c builtin/checkout-index.c builtin/column.c #: builtin/submodule--helper.c builtin/worktree.c msgid "string" -msgstr "" +msgstr "untai" #: builtin/checkout--worker.c builtin/checkout-index.c msgid "when creating files, prepend <string>" -msgstr "" +msgstr "saat membuat berkas, awali dengan <string>" #: builtin/checkout-index.c msgid "git checkout-index [<options>] [--] [<file>...]" -msgstr "" +msgstr "git checkout-index [<opsi>] [--] [<berkas>...]" #: builtin/checkout-index.c msgid "stage should be between 1 and 3 or all" -msgstr "" +msgstr "tahap seharusnya antara 1 dan 3 atau semua" #: builtin/checkout-index.c msgid "check out all files in the index" -msgstr "" +msgstr "check out semua berkas di dalam indeks" #: builtin/checkout-index.c msgid "do not skip files with skip-worktree set" -msgstr "" +msgstr "jangan lewatkan berkas dengan skip-worktree tersetel" #: builtin/checkout-index.c msgid "force overwrite of existing files" -msgstr "" +msgstr "paksa timpa berkas yang ada" #: builtin/checkout-index.c msgid "no warning for existing files and files not in index" msgstr "" +"tanpa peringatan untuk berkas yang ada dan berkas yang tidak ada di dalam " +"indeks" #: builtin/checkout-index.c msgid "don't checkout new files" -msgstr "" +msgstr "jangan checkout berkas baru" #: builtin/checkout-index.c msgid "update stat information in the index file" -msgstr "" +msgstr "perbarui informasi stat di dalam berkas indeks" #: builtin/checkout-index.c msgid "read list of paths from the standard input" -msgstr "" +msgstr "baca daftar jalur dari masukan standar" #: builtin/checkout-index.c msgid "write the content to temporary files" -msgstr "" +msgstr "tulis isi ke berkas sementara" #: builtin/checkout-index.c msgid "copy out the files from named stage" -msgstr "" +msgstr "salin berkas dari tahap bernama" #: builtin/checkout.c msgid "git checkout [<options>] <branch>" @@ -5063,6 +5154,14 @@ msgstr "" "inisialisasi berkas checkout tipis agar memasukkan hanya berkas pada akar" #: builtin/clone.c +msgid "uri" +msgstr "URI" + +#: builtin/clone.c +msgid "a URI for downloading bundles before fetching from origin remote" +msgstr "sebuah URI untuk mengunduh bundel sebelum mengambil dari remote asal" + +#: builtin/clone.c #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: Tidak dapat menambahkan alternatif untuk '%s': %s\n" @@ -5136,9 +5235,8 @@ msgid "failed to initialize sparse-checkout" msgstr "gagal menginisalisasi checkout tipis" #: builtin/clone.c -msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" -msgstr "" -"HEAD remote merujuk pada ref yang tidak ada, tidak dapat men-checkout.\n" +msgid "remote HEAD refers to nonexistent ref, unable to checkout" +msgstr "HEAD remote merujuk pada ref yang tidak ada, tidak dapat men-checkout" #: builtin/clone.c msgid "unable to checkout working tree" @@ -5160,7 +5258,7 @@ msgstr "tidak dapat batal-taut berkas alternatif sementara" msgid "Too many arguments." msgstr "Terlalu banyak argumen." -#: builtin/clone.c contrib/scalar/scalar.c +#: builtin/clone.c scalar.c msgid "You must specify a repository to clone." msgstr "Anda harus sebutkan repositori untuk diklon." @@ -5170,6 +5268,14 @@ msgid "options '%s' and '%s %s' cannot be used together" msgstr "opsi '%s' dan '%s %s' tidak dapat digunakan bersamaan" #: builtin/clone.c +msgid "" +"--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-" +"exclude" +msgstr "" +"--bundle-uri tidak kompatibel dengan --depth, --shallow-since, dan --shallow-" +"exclude" + +#: builtin/clone.c #, c-format msgid "repository '%s' does not exist" msgstr "repositori '%s' tidak ada" @@ -5262,6 +5368,15 @@ msgid "cannot clone from filtered bundle" msgstr "tidak dapat mengkloning dari bundel tersaring" #: builtin/clone.c +msgid "failed to initialize the repo, skipping bundle URI" +msgstr "gagal menginisialisasi repo, melewatkan URI bundel" + +#: builtin/clone.c +#, c-format +msgid "failed to fetch objects from bundle URI '%s'" +msgstr "gagal mengambil objek dari URI bundel '%s'" + +#: builtin/clone.c msgid "remote transport reported error" msgstr "transportasi remote melaporkan kesalahan" @@ -5276,40 +5391,42 @@ msgstr "Anda tampaknya mengklon repositori kosong." #: builtin/column.c msgid "git column [<options>]" -msgstr "" +msgstr "git column [<opsi>]" #: builtin/column.c msgid "lookup config vars" -msgstr "" +msgstr "cari variabel konfigurasi" #: builtin/column.c msgid "layout to use" -msgstr "" +msgstr "layout yang digunakan" #: builtin/column.c msgid "maximum width" -msgstr "" +msgstr "lebar maksimum" #: builtin/column.c msgid "padding space on left border" -msgstr "" +msgstr "bantalan spasi pada perbatasan kiri" #: builtin/column.c msgid "padding space on right border" -msgstr "" +msgstr "bantalan spasi pada perbatasan kanan" #: builtin/column.c msgid "padding space between columns" -msgstr "" +msgstr "bantalan spasi di antara kolom" #: builtin/column.c msgid "--command must be the first argument" -msgstr "" +msgstr "--command harus menjadi argumen pertama" #: builtin/commit-graph.c msgid "" "git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" msgstr "" +"git commit-graph verify [--object-dir <direktori objek>] [--shallow] [--" +"[no-]progress]" #: builtin/commit-graph.c msgid "" @@ -5317,96 +5434,96 @@ msgid "" "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" "paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>" msgstr "" +"git commit-graph write [--object-dir <direktori objek>] [--append] [--" +"split[=<strategi>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" +"paths] [--[no-]max-new-filters <n>] [--[-no-]progrss] <opsi pemisah>" #: builtin/commit-graph.c builtin/fetch.c builtin/log.c msgid "dir" -msgstr "" +msgstr "direktori" #: builtin/commit-graph.c msgid "the object directory to store the graph" -msgstr "" +msgstr "direktori objek untuk menyimpan grafik" #: builtin/commit-graph.c msgid "if the commit-graph is split, only verify the tip file" -msgstr "" +msgstr "jika grafik komit terpisah, hanya verifikasi berkas ujung" #: builtin/commit-graph.c #, c-format msgid "Could not open commit-graph '%s'" -msgstr "" +msgstr "Tidak dapat membuka grafik komit '%s'" #: builtin/commit-graph.c #, c-format msgid "unrecognized --split argument, %s" -msgstr "" +msgstr "argumen --split tidak dikenal, %s" #: builtin/commit-graph.c #, c-format msgid "unexpected non-hex object ID: %s" -msgstr "" +msgstr "ID objek non-heks tidak diharapkan: %s" #: builtin/commit-graph.c #, c-format msgid "invalid object: %s" -msgstr "" +msgstr "objek tidak valid: %s" #: builtin/commit-graph.c parse-options-cb.c #, c-format msgid "option `%s' expects a numerical value" -msgstr "" +msgstr "opsi `%s' mengharapkan nilai numerik" #: builtin/commit-graph.c msgid "start walk at all refs" -msgstr "" +msgstr "mulai berjalan pada semua referensi" #: builtin/commit-graph.c msgid "scan pack-indexes listed by stdin for commits" -msgstr "" +msgstr "pindai indeks pak yang disebutkan oleh masukan standar untuk komit" #: builtin/commit-graph.c msgid "start walk at commits listed by stdin" -msgstr "" +msgstr "mulai berjalan pada komit yang disebutkan oleh masukan standar" #: builtin/commit-graph.c msgid "include all commits already in the commit-graph file" -msgstr "" +msgstr "masukkan semua komit yang sudah ada di dalam berkas grafik komit" #: builtin/commit-graph.c msgid "enable computation for changed paths" -msgstr "" +msgstr "aktifkan perhitungan perubahan jalur" #: builtin/commit-graph.c msgid "allow writing an incremental commit-graph file" -msgstr "" +msgstr "perbolehkan menulis berkas grafik komit bertambah" #: builtin/commit-graph.c msgid "maximum number of commits in a non-base split commit-graph" -msgstr "" +msgstr "jumlah komit maksimal di dalam grafik komit terpisah non-dasar" #: builtin/commit-graph.c msgid "maximum ratio between two levels of a split commit-graph" -msgstr "" +msgstr "rasio maksimum di antara dua tingkat grafik komit terpisah" #: builtin/commit-graph.c msgid "only expire files older than a given date-time" msgstr "" +"hanya kadaluarsakan berkas yang lebih tua dari tanggal-waktu yang diberikan" #: builtin/commit-graph.c msgid "maximum number of changed-path Bloom filters to compute" -msgstr "" +msgstr "jumlah penyaring Bloom berubah jalur maksimum yang dihitung" #: builtin/commit-graph.c msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "" +"gunakan hanya satu dari --reachable, --stdin-commits, atau --stdin-packs" #: builtin/commit-graph.c msgid "Collecting commits from input" -msgstr "" - -#: builtin/commit-graph.c builtin/multi-pack-index.c -#, c-format -msgid "unrecognized subcommand: %s" -msgstr "" +msgstr "Mengumpulkan komit dari masukan" #: builtin/commit-tree.c msgid "" @@ -5842,10 +5959,6 @@ msgstr "perlihatkan status dalam format panjang (asali)" msgid "terminate entries with NUL" msgstr "akhiri entri dengan NUL" -#: builtin/commit.c builtin/fast-export.c builtin/rebase.c parse-options.h -msgid "mode" -msgstr "mode" - #: builtin/commit.c msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" @@ -6416,23 +6529,28 @@ msgid "" "\n" "\tchmod 0700 %s" msgstr "" +"Perizinan pada direktori soket Anda terlalu longgar; pengguna lainnya\n" +"dapat membaca kredensial tertembolok Anda. Pertimbangkan menjalankan:\n" +"\n" +"\tchmod 0700 %s" #: builtin/credential-cache--daemon.c msgid "print debugging messages to stderr" -msgstr "" +msgstr "cetak pesan penirkutuan ke kesalahan standar" #: builtin/credential-cache--daemon.c msgid "credential-cache--daemon unavailable; no unix socket support" -msgstr "" +msgstr "credential-cache--daemon tidak tersedia; tidak ada dukungan soket unix" #: builtin/credential-cache.c msgid "credential-cache unavailable; no unix socket support" -msgstr "" +msgstr "credential-cache tidak tersedia; tidak ada dukungan soket unix" #: builtin/credential-store.c #, c-format msgid "unable to get credential storage lock in %d ms" msgstr "" +"tidak dapat mendapatkan kunci penyimpanan kredensial dalam %d milidetik" #: builtin/describe.c msgid "git describe [<options>] [<commit-ish>...]" @@ -6593,6 +6711,26 @@ msgstr "Tidak ada nama yang ditemukan, tidak dapat menjelaskan apapun." msgid "option '%s' and commit-ishes cannot be used together" msgstr "opsi '%s' dan mirip-komit tidak dapat digunakan bersamaan" +#: builtin/diagnose.c +msgid "" +"git diagnose [-o|--output-directory <path>] [-s|--suffix <format>] [--" +"mode=<mode>]" +msgstr "" +"git diagnose [-o|--output-directory <jalur>] [-s|--suffix <format>] [--" +"mode=<mode>]" + +#: builtin/diagnose.c +msgid "specify a destination for the diagnostics archive" +msgstr "sebutkan tujuan untuk arsip diagnostik" + +#: builtin/diagnose.c +msgid "specify a strftime format suffix for the filename" +msgstr "sebutkan akhiran format strftime untuk nama berkas" + +#: builtin/diagnose.c +msgid "specify the content of the diagnostic archive" +msgstr "sebutkan isi arsip diagnostik" + #: builtin/diff-tree.c msgid "--merge-base only works with two commits" msgstr "--merge-base hanya bekerja dengan dua komit" @@ -6749,20 +6887,22 @@ msgstr "tidak ada <perintah> yang diberikan untuk --extcmd=<perintah>" #: builtin/env--helper.c msgid "git env--helper --type=[bool|ulong] <options> <env-var>" -msgstr "" +msgstr "git env--helper --type=[bool|ulong] <opsi> <variabel lingkungan>" #: builtin/env--helper.c msgid "default for git_env_*(...) to fall back on" -msgstr "" +msgstr "asali untuk git_env_*(...) agar kembali" #: builtin/env--helper.c msgid "be quiet only use git_env_*() value as exit code" -msgstr "" +msgstr "jadi diam; hanya gunakan nilai git_env_*() sebagai kode keluar" #: builtin/env--helper.c #, c-format msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" msgstr "" +"opsi `--default' mengharapkan sebuah nilai boolean dengan `--type=bool`, " +"bukan `%s`" #: builtin/env--helper.c #, c-format @@ -6770,6 +6910,8 @@ msgid "" "option `--default' expects an unsigned long value with `--type=ulong`, not `" "%s`" msgstr "" +"opsi `--default' mengharapkan sebuah nilai unsigned long dengan `--" +"type=ulong`, bukan `%s`" #: builtin/fast-export.c msgid "git fast-export [<rev-list-opts>]" @@ -7074,12 +7216,8 @@ msgid "[rejected]" msgstr "[tertolak]" #: builtin/fetch.c -msgid "can't fetch in current branch" -msgstr "tidak dapat mengambil di cabang saat ini" - -#: builtin/fetch.c -msgid "checked out in another worktree" -msgstr "ter-check out di dalam pohon kerja lainnya" +msgid "can't fetch into checked-out branch" +msgstr "tidak dapat mengambil ke dalam cabang ter-checkout" #: builtin/fetch.c msgid "[tag update]" @@ -7327,106 +7465,107 @@ msgstr "--stdin hanya dapat digunakan saat mengambil dari satu remote" msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "" +"git fmt-merge-msg [-m <pesan>] [--log[=<n>] | --no-log] [--file <berkas>]" #: builtin/fmt-merge-msg.c msgid "populate log with at most <n> entries from shortlog" -msgstr "" +msgstr "isi log dengan paling banyak <n> entri dari shortlog" #: builtin/fmt-merge-msg.c msgid "alias for --log (deprecated)" -msgstr "" +msgstr "alias untuk --log (usang)" #: builtin/fmt-merge-msg.c msgid "text" -msgstr "" +msgstr "teks" #: builtin/fmt-merge-msg.c msgid "use <text> as start of message" -msgstr "" +msgstr "gunakan <teks> sebagai awal pesan" #: builtin/fmt-merge-msg.c msgid "use <name> instead of the real target branch" -msgstr "" +msgstr "gunakan <nama> daripada cabang target sebenarnya" #: builtin/fmt-merge-msg.c msgid "file to read from" -msgstr "" +msgstr "berkas untuk dibaca" #: builtin/for-each-ref.c msgid "git for-each-ref [<options>] [<pattern>]" -msgstr "" +msgstr "git for-each-ref [<opsi>] [<pola>]" #: builtin/for-each-ref.c msgid "git for-each-ref [--points-at <object>]" -msgstr "" +msgstr "git for-each-ref [--points-at <objek>]" #: builtin/for-each-ref.c msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]" -msgstr "" +msgstr "git for-each-ref [--merged [<komit>]] [--no-merged [<komit>]]" #: builtin/for-each-ref.c msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" -msgstr "" +msgstr "git for-each-ref [--contains [<komit>]] [--no-contains [<komit>]]" #: builtin/for-each-ref.c msgid "quote placeholders suitably for shells" -msgstr "" +msgstr "kutip tempat penampung yang sesuai untuk cangkang" #: builtin/for-each-ref.c msgid "quote placeholders suitably for perl" -msgstr "" +msgstr "kutip tempat penampung yang sesuai untuk perl" #: builtin/for-each-ref.c msgid "quote placeholders suitably for python" -msgstr "" +msgstr "kutip tempat penampung yang sesuai untuk python" #: builtin/for-each-ref.c msgid "quote placeholders suitably for Tcl" -msgstr "" +msgstr "kutip tempat penampung yang sesuai untuk Tcl" #: builtin/for-each-ref.c msgid "show only <n> matched refs" -msgstr "" +msgstr "hanya perlihatkan <n> referensi yang cocok" #: builtin/for-each-ref.c builtin/tag.c msgid "respect format colors" -msgstr "" +msgstr "hargai warna format" #: builtin/for-each-ref.c msgid "print only refs which points at the given object" -msgstr "" +msgstr "hanya cetak referensi yang menunjuk pada objek yang diberikan" #: builtin/for-each-ref.c msgid "print only refs that are merged" -msgstr "" +msgstr "hanya cetak referensi yang tergabung" #: builtin/for-each-ref.c msgid "print only refs that are not merged" -msgstr "" +msgstr "hanya cetak referensi yang tidak tergabung" #: builtin/for-each-ref.c msgid "print only refs which contain the commit" -msgstr "" +msgstr "hanya cetak referensi yang berisi komit" #: builtin/for-each-ref.c msgid "print only refs which don't contain the commit" -msgstr "" +msgstr "hanya cetak referensi yang tidak berisi komit" #: builtin/for-each-repo.c msgid "git for-each-repo --config=<config> <command-args>" -msgstr "" +msgstr "git for-each-repo --config=<konfigurasi> <argumen perintah>" #: builtin/for-each-repo.c msgid "config" -msgstr "" +msgstr "konfigurasi" #: builtin/for-each-repo.c msgid "config key storing a list of repository paths" -msgstr "" +msgstr "kunci konfigurasi yang menampung daftar jalur repositori" #: builtin/for-each-repo.c msgid "missing --config=<config>" -msgstr "" +msgstr "kehilangan --config=<config>" #: builtin/fsck.c msgid "unknown" @@ -7626,6 +7765,11 @@ msgid "non-tree in cache-tree" msgstr "bukan pohon pada pohon tembolok" #: builtin/fsck.c +#, c-format +msgid "%s: invalid sha1 pointer in resolve-undo" +msgstr "%s: penunjuk sha1 tidak valid di resolve-undo" + +#: builtin/fsck.c msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<opsi>] [<objek>...]" @@ -7693,128 +7837,129 @@ msgstr "parameter tidak valid: sha1 diharapkan, dapat '%s'" #: builtin/fsmonitor--daemon.c msgid "git fsmonitor--daemon start [<options>]" -msgstr "" +msgstr "git fsmonitor--daemon start [<opsi>]" #: builtin/fsmonitor--daemon.c msgid "git fsmonitor--daemon run [<options>]" -msgstr "" +msgstr "git fsmonitor--daemon run [<opsi>]" #: builtin/fsmonitor--daemon.c msgid "git fsmonitor--daemon stop" -msgstr "" +msgstr "git fsmonitor--daemon stop" #: builtin/fsmonitor--daemon.c msgid "git fsmonitor--daemon status" -msgstr "" +msgstr "git fsmonitor--daemon status" #: builtin/fsmonitor--daemon.c #, c-format msgid "value of '%s' out of range: %d" -msgstr "" +msgstr "nilai '%s' di luar jangkauan: %d" #: builtin/fsmonitor--daemon.c #, c-format msgid "value of '%s' not bool or int: %d" -msgstr "" +msgstr "nilai '%s' bukan bool atau int: %d" #: builtin/fsmonitor--daemon.c #, c-format msgid "fsmonitor-daemon is watching '%s'\n" -msgstr "" +msgstr "fsmonitor-daemon mengawasi '%s'\n" #: builtin/fsmonitor--daemon.c #, c-format msgid "fsmonitor-daemon is not watching '%s'\n" -msgstr "" +msgstr "fsmonitor-daemon tidak mengawasi '%s'\n" #: builtin/fsmonitor--daemon.c #, c-format msgid "could not create fsmonitor cookie '%s'" -msgstr "" +msgstr "tidak dapat membuat kuki fsmonitor '%s'" #: builtin/fsmonitor--daemon.c #, c-format msgid "fsmonitor: cookie_result '%d' != SEEN" -msgstr "" +msgstr "fsmonitor: cookie_result '%d' != SEEN" #: builtin/fsmonitor--daemon.c #, c-format msgid "could not start IPC thread pool on '%s'" -msgstr "" +msgstr "tidak dapat memulai lubuk utas IPC pada '%s'" #: builtin/fsmonitor--daemon.c msgid "could not start fsmonitor listener thread" -msgstr "" +msgstr "tidak dapat memulai utas pendengar fsmonitor" #: builtin/fsmonitor--daemon.c msgid "could not start fsmonitor health thread" -msgstr "" +msgstr "tidak dapat memulai utas kesehatan fsmonitor" #: builtin/fsmonitor--daemon.c msgid "could not initialize listener thread" -msgstr "" +msgstr "tidak dapat menginisialisasi utas pendengar" #: builtin/fsmonitor--daemon.c msgid "could not initialize health thread" -msgstr "" +msgstr "tidak dapat menginisialisasi utas kesehatan" #: builtin/fsmonitor--daemon.c #, c-format msgid "could not cd home '%s'" -msgstr "" +msgstr "tidak dapat berganti direktori ke rumah '%s'" #: builtin/fsmonitor--daemon.c #, c-format msgid "fsmonitor--daemon is already running '%s'" -msgstr "" +msgstr "fsmonitor--daemon sudah berjalan '%s'" #: builtin/fsmonitor--daemon.c #, c-format msgid "running fsmonitor-daemon in '%s'\n" -msgstr "" +msgstr "menjalankan fsmonitor-daemon di '%s'\n" #: builtin/fsmonitor--daemon.c #, c-format msgid "starting fsmonitor-daemon in '%s'\n" -msgstr "" +msgstr "menjalankan fsmonitor-daemon di '%s'\n" #: builtin/fsmonitor--daemon.c msgid "daemon failed to start" -msgstr "" +msgstr "daemon gagal dijalankan" #: builtin/fsmonitor--daemon.c msgid "daemon not online yet" -msgstr "" +msgstr "daemon belum daring" #: builtin/fsmonitor--daemon.c msgid "daemon terminated" -msgstr "" +msgstr "daemon berhenti" #: builtin/fsmonitor--daemon.c msgid "detach from console" -msgstr "" +msgstr "lepas dari konsol" #: builtin/fsmonitor--daemon.c msgid "use <n> ipc worker threads" -msgstr "" +msgstr "gunakan <n> utas pekerja ipc" #: builtin/fsmonitor--daemon.c msgid "max seconds to wait for background daemon startup" msgstr "" +"maksimal waktu (detik) untuk menunggu dimulainya daemon dari balik layar" #: builtin/fsmonitor--daemon.c #, c-format msgid "invalid 'ipc-threads' value (%d)" -msgstr "" +msgstr "nilai 'ipc-threads' tidak valid (%d)" #: builtin/fsmonitor--daemon.c #, c-format msgid "Unhandled subcommand '%s'" -msgstr "" +msgstr "Subperintah tidak tertangani '%s'" #: builtin/fsmonitor--daemon.c msgid "fsmonitor--daemon not supported on this platform" -msgstr "" +msgstr "fsmonitor--daemon tidak didukung pada platform ini" #: builtin/gc.c msgid "git gc [<options>]" @@ -8048,15 +8193,19 @@ msgstr "" "gagal menjalankan 'crontab -l'; sistem Anda mungkin tidak mendukung 'cron'" #: builtin/gc.c +msgid "failed to create crontab temporary file" +msgstr "tidak dapat membuat berkas crontab sementara" + +#: builtin/gc.c +msgid "failed to open temporary file" +msgstr "tidak dapat membuka berkas sementara" + +#: builtin/gc.c msgid "failed to run 'crontab'; your system might not support 'cron'" msgstr "" "gagal menjalankan 'crontab'; sistem Anda mungkin tidak mendukung 'cron'" #: builtin/gc.c -msgid "failed to open stdin of 'crontab'" -msgstr "gagal membuka masukan standar dari 'crontab'" - -#: builtin/gc.c msgid "'crontab' died" msgstr "'crontab' mati" @@ -8116,11 +8265,6 @@ msgstr "gagal menambahkan repositori ke konfigurasi global" msgid "git maintenance <subcommand> [<options>]" msgstr "git maintenance <subperintah> [<opsi>]" -#: builtin/gc.c -#, c-format -msgid "invalid subcommand: %s" -msgstr "subperintah tidak valid: %s" - #: builtin/grep.c msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<opsi>] [-e] <pola> [<revisi>...] [[--] <pola>...]" @@ -8346,6 +8490,10 @@ msgid "allow calling of grep(1) (ignored by this build)" msgstr "perbolehkan pemanggilan grep(1) (diabaikan oleh bangunan ini)" #: builtin/grep.c +msgid "maximum number of results per file" +msgstr "jumlah hasil maksimum tiap berkas" + +#: builtin/grep.c msgid "no pattern given" msgstr "tidak ada pola yang diberikan" @@ -8458,12 +8606,23 @@ msgid "print list of useful guides" msgstr "cetak daftar panduan berguna" #: builtin/help.c +msgid "print list of user-facing repository, command and file interfaces" +msgstr "" +"cetak daftar repositori, perintah, dan antarmuka berkas yang menghadap " +"pengguna" + +#: builtin/help.c +msgid "print list of file formats, protocols and other developer interfaces" +msgstr "cetak daftar format berkas, protokol, dan antarmuka pengembang lainnya" + +#: builtin/help.c msgid "print all configuration variable names" msgstr "cetak semua nama variabel konfigurasi" #: builtin/help.c -msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]" -msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<perintah>]" +msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>|<doc>]" +msgstr "" +"git help [[-i|--info] [-m|--man] [-w|--web]] [<perintah>|<dokumentasi>]" #: builtin/help.c #, c-format @@ -8538,6 +8697,7 @@ msgstr "opsi '%s' tidak mengambil argumen bukan opsi" msgid "" "the '--no-[external-commands|aliases]' options can only be used with '--all'" msgstr "" +"opsi '--no-[external-commands|aliases]' hanya dapat digunakan dengan '--all'" #: builtin/help.c #, c-format @@ -8550,11 +8710,11 @@ msgstr "'git help config' untuk informasi lebih lanjut" #: builtin/hook.c msgid "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]" -msgstr "" +msgstr "git hook run [--ignore-missing] <nama kait> [-- <argumen kait>]" #: builtin/hook.c msgid "silently ignore missing requested <hook-name>" -msgstr "" +msgstr "diam-diam abaikan <nama kait> yang diminta yang hilang" #: builtin/index-pack.c #, c-format @@ -8980,58 +9140,60 @@ msgid "" "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " "<token>[(=|:)<value>])...] [<file>...]" msgstr "" +"git interpret-trailers [--in-place] [--trim-empty] [(--trailer " +"<token>[(=|:)<nilai>])...] [<berkas>...]" #: builtin/interpret-trailers.c msgid "edit files in place" -msgstr "" +msgstr "sunting berkas di tempat" #: builtin/interpret-trailers.c msgid "trim empty trailers" -msgstr "" +msgstr "pangkas trailer kosong" #: builtin/interpret-trailers.c msgid "where to place the new trailer" -msgstr "" +msgstr "dimana trailer baru ditempatkan" #: builtin/interpret-trailers.c msgid "action if trailer already exists" -msgstr "" +msgstr "tindakan jika trailer sudah ada" #: builtin/interpret-trailers.c msgid "action if trailer is missing" -msgstr "" +msgstr "tindakan jika trailer hilang" #: builtin/interpret-trailers.c msgid "output only the trailers" -msgstr "" +msgstr "keluarkan hanya trailer" #: builtin/interpret-trailers.c msgid "do not apply config rules" -msgstr "" +msgstr "jangan terapkan aturan konfigurasi" #: builtin/interpret-trailers.c msgid "join whitespace-continued values" -msgstr "" +msgstr "gabungkan nilai yang dilanjutkan oleh spasi" #: builtin/interpret-trailers.c msgid "set parsing options" -msgstr "" +msgstr "setel opsi penguraian" #: builtin/interpret-trailers.c msgid "do not treat --- specially" -msgstr "" +msgstr "jangan memperlakukan khusus ---" #: builtin/interpret-trailers.c msgid "trailer(s) to add" -msgstr "" +msgstr "trailer untuk ditambah" #: builtin/interpret-trailers.c msgid "--trailer with --only-input does not make sense" -msgstr "" +msgstr "--trailer dengan --only-input tidak masuk akal" #: builtin/interpret-trailers.c msgid "no input file given for in-place editing" -msgstr "" +msgstr "tidak ada berkas masukan yang diberikan untuk penyuntingan di tempat" #: builtin/log.c msgid "git log [<options>] [<revision-range>] [[--] <path>...]" @@ -9055,8 +9217,8 @@ msgid "show source" msgstr "perlihatkan sumber" #: builtin/log.c -msgid "use mail map file" -msgstr "gunakan berkas peta surat" +msgid "clear all previously-defined decoration filters" +msgstr "bersihkan semua penyaring dekorasi yang sebelumnya didefinisikan" #: builtin/log.c msgid "only decorate refs that match <pattern>" @@ -9390,6 +9552,10 @@ msgid "percentage by which creation is weighted" msgstr "persentase dimana pembuatan tertimbang" #: builtin/log.c +msgid "show in-body From: even if identical to the e-mail header" +msgstr "perlihatkan From: dalam tubuh bahkan jika sama dengan kepala surel" + +#: builtin/log.c #, c-format msgid "invalid ident line: %s" msgstr "baris identitas tidak valid: %s" @@ -9467,10 +9633,25 @@ msgstr "" "secara manual.\n" #: builtin/ls-files.c +#, c-format +msgid "bad ls-files format: element '%s' does not start with '('" +msgstr "format ls-files jelek: elemen '%s' tidak dimulai dengan '('" + +#: builtin/ls-files.c +#, c-format +msgid "bad ls-files format: element '%s' does not end in ')'" +msgstr "format ls-files jelek: elemen '%s' tidak diakhiri dengan ')'" + +#: builtin/ls-files.c +#, c-format +msgid "bad ls-files format: %%%.*s" +msgstr "format ls-files jelek: %%%.*s" + +#: builtin/ls-files.c msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<opsi>] [<berkas>...]" -#: builtin/ls-files.c +#: builtin/ls-files.c builtin/merge-tree.c msgid "separate paths with the NUL character" msgstr "pisahkan jalur dengan karakter NUL" @@ -9579,6 +9760,14 @@ msgstr "hapus entri duplikat" msgid "show sparse directories in the presence of a sparse index" msgstr "perlihatkan direktori tipis di hadapan indeks tipis" +#: builtin/ls-files.c +msgid "" +"--format cannot be used with -s, -o, -k, -t, --resolve-undo, --deduplicate, " +"--eol" +msgstr "" +"--format tidak dapat digunakan dengan -s, -o, -k, -t, --resolve-undo, --" +"deduplicate, --eol" + #: builtin/ls-remote.c msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" @@ -9695,60 +9884,60 @@ msgstr "--format tidak dapat digabungkan opsi pengubah format lainnya" #. TRANSLATORS: keep <> in "<" mail ">" info. #: builtin/mailinfo.c msgid "git mailinfo [<options>] <msg> <patch> < mail >info" -msgstr "" +msgstr "git mailinfo [<opsi>] <pesan> <tambalan> < surat >info" #: builtin/mailinfo.c msgid "keep subject" -msgstr "" +msgstr "pertahankan subjek" #: builtin/mailinfo.c msgid "keep non patch brackets in subject" -msgstr "" +msgstr "pertahankan tanda kurung non tambalan dalam subjek" #: builtin/mailinfo.c msgid "copy Message-ID to the end of commit message" -msgstr "" +msgstr "salin Message-ID pada akhir pesan komit" #: builtin/mailinfo.c msgid "re-code metadata to i18n.commitEncoding" -msgstr "" +msgstr "kodekan ulang metadata ke i18n.commitEncoding" #: builtin/mailinfo.c msgid "disable charset re-coding of metadata" -msgstr "" +msgstr "nonaktifkan pengkodean ulang set karakter metadata" #: builtin/mailinfo.c msgid "encoding" -msgstr "" +msgstr "pengkodean" #: builtin/mailinfo.c msgid "re-code metadata to this encoding" -msgstr "" +msgstr "kodekan ulang metadata ke pengkodean ini" #: builtin/mailinfo.c msgid "use scissors" -msgstr "" +msgstr "gunakan gunting" #: builtin/mailinfo.c msgid "<action>" -msgstr "" +msgstr "<tindakan>" #: builtin/mailinfo.c msgid "action when quoted CR is found" -msgstr "" +msgstr "bertindak ketika CR terkutip ditemukan" #: builtin/mailinfo.c msgid "use headers in message's body" -msgstr "" +msgstr "gunakan kepala di dalam badan pesan" #: builtin/mailsplit.c msgid "reading patches from stdin/tty..." -msgstr "" +msgstr "membaca tambalan dari masukan standar/tty..." #: builtin/mailsplit.c #, c-format msgid "empty mbox: '%s'" -msgstr "" +msgstr "mbox kosong: '%s'" #: builtin/merge-base.c msgid "git merge-base [-a | --all] <commit> <commit>..." @@ -9795,73 +9984,119 @@ msgid "" "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " "<orig-file> <file2>" msgstr "" +"git merge-file [<opsi>] [-L <nama 1> [-L <asli> [-L <nama 2>]]] <berkas 1> " +"<berkas asli> <berkas 2>" #: builtin/merge-file.c msgid "send results to standard output" -msgstr "" +msgstr "kirim hasil ke keluaran standar" #: builtin/merge-file.c msgid "use a diff3 based merge" -msgstr "" +msgstr "gunakan penggabungan berdasarkan diff3" #: builtin/merge-file.c msgid "use a zealous diff3 based merge" -msgstr "" +msgstr "gunakan penggabungan berdasarkan diff3 yang bersemangat" #: builtin/merge-file.c msgid "for conflicts, use our version" -msgstr "" +msgstr "untuk konflik, gunakan versi kami" #: builtin/merge-file.c msgid "for conflicts, use their version" -msgstr "" +msgstr "untuk konflik, gunakan versi mereka" #: builtin/merge-file.c msgid "for conflicts, use a union version" -msgstr "" +msgstr "untuk konflik, gunakan versi bersatu" #: builtin/merge-file.c msgid "for conflicts, use this marker size" -msgstr "" +msgstr "untuk konflik, gunakan ukuran penanda ini" #: builtin/merge-file.c msgid "do not warn about conflicts" -msgstr "" +msgstr "jangan peringatkan tentang konflik" #: builtin/merge-file.c msgid "set labels for file1/orig-file/file2" -msgstr "" +msgstr "setel label untuk file1/orig-file/file2" #: builtin/merge-recursive.c #, c-format msgid "unknown option %s" -msgstr "" +msgstr "opsi tidak dikenal %s" #: builtin/merge-recursive.c #, c-format msgid "could not parse object '%s'" -msgstr "" +msgstr "tidak dapat menguraikan objek '%s'" #: builtin/merge-recursive.c #, c-format msgid "cannot handle more than %d base. Ignoring %s." msgid_plural "cannot handle more than %d bases. Ignoring %s." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "tidak dapat menangani lebih dari %d dasar. Mengabaikan %s." +msgstr[1] "tidak dapat menangani lebih dari %d dasar. Mengabaikan %s." #: builtin/merge-recursive.c msgid "not handling anything other than two heads merge." -msgstr "" +msgstr "tidak menangani apapun selain penggabungan dua kepala" #: builtin/merge-recursive.c #, c-format msgid "could not resolve ref '%s'" -msgstr "" +msgstr "tidak dapat menguraikan referensi '%s'" #: builtin/merge-recursive.c #, c-format msgid "Merging %s with %s\n" -msgstr "" +msgstr "Menggabungkan %s dengan %s\n" + +#: builtin/merge-tree.c builtin/merge.c +msgid "not something we can merge" +msgstr "bukan sesuatu yang kami bisa gabungkan" + +#: builtin/merge-tree.c builtin/merge.c +msgid "refusing to merge unrelated histories" +msgstr "menolak menggabungkan riwayat tak terkait" + +#: builtin/merge-tree.c +msgid "failure to merge" +msgstr "kegagalan penggabungan" + +#: builtin/merge-tree.c +msgid "git merge-tree [--write-tree] [<options>] <branch1> <branch2>" +msgstr "git merge-tree [--write-tree] [<opsi>] <cabang 1> <cabang 2>" + +#: builtin/merge-tree.c +msgid "git merge-tree [--trivial-merge] <base-tree> <branch1> <branch2>" +msgstr "git merge-tree [--trivial-merge] <pohon dasar> <cabang 1> <cabang 2>" + +#: builtin/merge-tree.c +msgid "do a real merge instead of a trivial merge" +msgstr "lakukan penggabungan sebenarnya daripada penggabungan sepele" + +#: builtin/merge-tree.c +msgid "do a trivial merge only" +msgstr "hanya lakukan penggabungan sepele" + +#: builtin/merge-tree.c +msgid "also show informational/conflict messages" +msgstr "perlihatkan juga pesan informasi/konflik" + +#: builtin/merge-tree.c +msgid "list filenames without modes/oids/stages" +msgstr "daftar nama berkas tanpa mode/oid/tahap" + +#: builtin/merge-tree.c builtin/merge.c builtin/pull.c +msgid "allow merging unrelated histories" +msgstr "perbolehkan penggabungan riwayat yang tak terkait" + +#: builtin/merge-tree.c +msgid "--trivial-merge is incompatible with all other options" +msgstr "--trivial-merge tidak kompatibel dengan semua opsi lainnya" #: builtin/merge.c msgid "git merge [<options>] [<commit>...]" @@ -9969,10 +10204,6 @@ msgstr "--abort tapi biarkan indeks dan pohon kerja" msgid "continue the current in-progress merge" msgstr "lanjutkan penggabungan yang sedang berlangsung saat ini" -#: builtin/merge.c builtin/pull.c -msgid "allow merging unrelated histories" -msgstr "perbolehkan penggabungan riwayat yang tak terkait" - #: builtin/merge.c msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "lewati kail pre-merge-commit dan commit-msg" @@ -10114,7 +10345,7 @@ msgstr "Nilai jelek '%s' dalam lingkungan '%s'" #: builtin/merge.c read-cache.c strbuf.c wrapper.c #, c-format msgid "could not close '%s'" -msgstr "" +msgstr "tidak dapat menutup '%s'" #: builtin/merge.c #, c-format @@ -10122,10 +10353,6 @@ msgid "not something we can merge in %s: %s" msgstr "bukan sesuatu yang kami bisa gabungkan di %s: %s" #: builtin/merge.c -msgid "not something we can merge" -msgstr "bukan sesuatu yang kami bisa gabungkan" - -#: builtin/merge.c msgid "--abort expects no arguments" msgstr "--abort harap tanpa argumen" @@ -10188,14 +10415,20 @@ msgid "Can merge only exactly one commit into empty head" msgstr "Hanya bisa menggabungkan tepantnya satu komit ke kepala kosong" #: builtin/merge.c -msgid "refusing to merge unrelated histories" -msgstr "menolak menggabungkan riwayat tak terkait" - -#: builtin/merge.c #, c-format msgid "Updating %s..%s\n" msgstr "Memperbarui %s..%s\n" +#: builtin/merge.c merge-ort-wrappers.c merge-recursive.c +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" +"Perubahan lokal Anda terhadap berkas berikut akan ditimpa oleh " +"penggabungan:\n" +" %s" + #: builtin/merge.c #, c-format msgid "Trying really trivial in-index merge...\n" @@ -10238,30 +10471,35 @@ msgstr "" "Penggabungan otomatis berjalan baik; berhenti sebelum mengkomit seperti yang " "diminta\n" +#: builtin/merge.c +#, c-format +msgid "When finished, apply stashed changes with `git stash pop`\n" +msgstr "Ketika selesai, terapkan perubahan terstase dengan `git stash pop`\n" + #: builtin/mktag.c #, c-format msgid "warning: tag input does not pass fsck: %s" -msgstr "" +msgstr "peringatan: masukan tag tidak lolos fsck: %s" #: builtin/mktag.c #, c-format msgid "error: tag input does not pass fsck: %s" -msgstr "" +msgstr "kesalahan: masukan tag tidak lolos fsck: %s" #: builtin/mktag.c #, c-format msgid "%d (FSCK_IGNORE?) should never trigger this callback" -msgstr "" +msgstr "%d (FSCK_IGNORE?) seharusnya tidak pernah memicu pemanggilan balik ini" #: builtin/mktag.c #, c-format msgid "could not read tagged object '%s'" -msgstr "" +msgstr "tidak dapat membaca objek tertag '%s'" #: builtin/mktag.c #, c-format msgid "object '%s' tagged as '%s', but is a '%s' type" -msgstr "" +msgstr "objek '%s' ditag sebagai '%s', tetapi bertipe '%s'" #: builtin/mktag.c imap-send.c trailer.c msgid "could not read from stdin" @@ -10269,27 +10507,27 @@ msgstr "tidak dapat membaca dari masukan standar" #: builtin/mktag.c msgid "tag on stdin did not pass our strict fsck check" -msgstr "" +msgstr "tag pada masukan standar tidak lolos pemeriksaan fsck ketat kami" #: builtin/mktag.c msgid "tag on stdin did not refer to a valid object" -msgstr "" +msgstr "tag pada masukan standar tidak merujuk pada objek valid" #: builtin/mktag.c builtin/tag.c msgid "unable to write tag file" -msgstr "" +msgstr "tidak dapat menulis berkas tag" #: builtin/mktree.c msgid "input is NUL terminated" -msgstr "" +msgstr "masukan diakhiri dengan NUL" #: builtin/mktree.c builtin/write-tree.c msgid "allow missing objects" -msgstr "" +msgstr "perbolehkan objek hilang" #: builtin/mktree.c msgid "allow creation of more than one tree" -msgstr "" +msgstr "perbolehkan pembuatan lebih dari satu pohon" #: builtin/multi-pack-index.c msgid "" @@ -10388,6 +10626,10 @@ msgid "bad source" msgstr "sumber jelek" #: builtin/mv.c +msgid "destination exists" +msgstr "tujuan ada" + +#: builtin/mv.c msgid "can not move directory into itself" msgstr "tidak dapat memindahkan direktori ke dirinya sendiri" @@ -10408,10 +10650,6 @@ msgid "conflicted" msgstr "terkonflik" #: builtin/mv.c -msgid "destination exists" -msgstr "tujuan ada" - -#: builtin/mv.c #, c-format msgid "overwriting '%s'" msgstr "menimpa '%s'" @@ -10429,6 +10667,10 @@ msgid "destination directory does not exist" msgstr "direktori tujuan tidak ada" #: builtin/mv.c +msgid "destination exists in the index" +msgstr "tujuan ada dalam indeks" + +#: builtin/mv.c #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, source=%s, destination=%s" @@ -10882,10 +11124,10 @@ msgstr "referensi catatan" msgid "use notes from <notes-ref>" msgstr "gunakan catatan dari <referensi catatan>" -#: builtin/notes.c builtin/stash.c +#: builtin/notes.c builtin/remote.c parse-options.c #, c-format -msgid "unknown subcommand: %s" -msgstr "subperintah tidak dikenal: %s" +msgid "unknown subcommand: `%s'" +msgstr "subperintah tidak dikenal: `%s'" #: builtin/pack-objects.c msgid "" @@ -11371,6 +11613,11 @@ msgid "" "and let us know you still use it by sending an e-mail\n" "to <git@vger.kernel.org>. Thanks.\n" msgstr "" +"'git pack-redundant' dinominasikan untuk dihapus.\n" +"Jika Anda masih menggunakan perintah ini, mohon tambahkan sebuah opsi\n" +"ekstra, '--i-still-use-this', pada baris perintah dan beri tahu kami jika\n" +"Anda masih menggunakannya dengan mengirimkan surel ke\n" +"<git@vger.kernel.org>. Terima kasih.\n" #: builtin/pack-refs.c msgid "git pack-refs [<options>]" @@ -11498,7 +11745,7 @@ msgstr "Lihat git-pull(1) untuk selengkapnya." msgid "<remote>" msgstr "<remote>" -#: builtin/pull.c contrib/scalar/scalar.c +#: builtin/pull.c scalar.c msgid "<branch>" msgstr "<cabang>" @@ -11944,47 +12191,54 @@ msgstr "opsi dorong harus tidak ada karakter baris baru" #: builtin/range-diff.c msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>" msgstr "" +"git range-diff [<opsi>] <dasar lama>..<ujung lama> <dasar-baru>..<ujung baru>" #: builtin/range-diff.c msgid "git range-diff [<options>] <old-tip>...<new-tip>" -msgstr "" +msgstr "git range-diff [<opsi>] <ujung lama>...<ujung baru>" #: builtin/range-diff.c msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" -msgstr "" +msgstr "git range-diff [<opsi>] <dasar> <ujung lama> <ujung baru>" #: builtin/range-diff.c msgid "use simple diff colors" -msgstr "" +msgstr "gunakan warna diff sederhana" #: builtin/range-diff.c msgid "notes" -msgstr "" +msgstr "catatan" #: builtin/range-diff.c msgid "passed to 'git log'" -msgstr "" +msgstr "lewatkan ke 'git log'" #: builtin/range-diff.c msgid "only emit output related to the first range" -msgstr "" +msgstr "hanya keluarkan keluaran relatif terhadap rentang pertama" #: builtin/range-diff.c msgid "only emit output related to the second range" -msgstr "" +msgstr "hanya keluarkan keluaran relatif terhadap rentang kedua" + +#: builtin/range-diff.c +#, c-format +msgid "not a revision: '%s'" +msgstr "bukan sebuah revisi: '%s'" #: builtin/range-diff.c #, c-format msgid "not a commit range: '%s'" -msgstr "" +msgstr "bukan sebuah rentang komit '%s'" #: builtin/range-diff.c -msgid "single arg format must be symmetric range" -msgstr "" +#, c-format +msgid "not a symmetric range: '%s'" +msgstr "bukan sebuah rentang simetris: '%s'" #: builtin/range-diff.c msgid "need two commit ranges" -msgstr "" +msgstr "butuh dua rentang komit" #: builtin/read-tree.c msgid "" @@ -12323,6 +12577,10 @@ msgid "move commits that begin with squash!/fixup! under -i" msgstr "pindahakan komit yang diawali dengan squash!/fixup! di bawah -i" #: builtin/rebase.c +msgid "update branches that point to commits that are being rebased" +msgstr "perbarui cabang yang menunjuk pada komit yang akan didasarkan ulang" + +#: builtin/rebase.c msgid "add exec lines after each commit of the editable list" msgstr "" "tambahkan baris exec setelah setiap komit dari daftar yang bisa disunting" @@ -12373,6 +12631,9 @@ msgid "" "Use `git rebase --abort` to terminate current rebase.\n" "Or downgrade to v2.33, or earlier, to complete the rebase." msgstr "" +"`rebase --preserve-merges` (-p) tidak lagi didukung.\n" +"Gunakan `git rebase --abort` untuk menghentikan pendasaran ulang saat ini.\n" +"Atau turun ke v2.33 atau lebih awal untuk menyelesaikan pendasaran ulang." #: builtin/rebase.c msgid "" @@ -12380,6 +12641,9 @@ msgid "" "Note: Your `pull.rebase` configuration may also be set to 'preserve',\n" "which is no longer supported; use 'merges' instead" msgstr "" +"--preserve-merges diganti oleh --rebase-merges\n" +"Catatan: Konfigurasi `pull.rebase` Anda mungkin juga disetel ke 'preserve',\n" +"yang tidak lagi didukung; gunakan 'merges' sebagai gantinya" #: builtin/rebase.c msgid "No rebase in progress?" @@ -12956,6 +13220,10 @@ msgid " tracked" msgstr " dilacak" #: builtin/remote.c +msgid " skipped" +msgstr " dilewati" + +#: builtin/remote.c msgid " stale (use 'git remote prune' to remove)" msgstr " basi (gunakan 'git remote prune' untuk hapus)" @@ -13412,23 +13680,23 @@ msgstr "tidak dapat membatal taut: %s" #: builtin/replace.c msgid "git replace [-f] <object> <replacement>" -msgstr "" +msgstr "git replace [-f] <objek> <pengganti>" #: builtin/replace.c msgid "git replace [-f] --edit <object>" -msgstr "" +msgstr "git replace [-f] --edit <objek>" #: builtin/replace.c msgid "git replace [-f] --graft <commit> [<parent>...]" -msgstr "" +msgstr "git replace [-f] --graft <komit> [<induk>...]" #: builtin/replace.c msgid "git replace -d <object>..." -msgstr "" +msgstr "git replace -d <objek>..." #: builtin/replace.c msgid "git replace [--format=<format>] [-l [<pattern>]]" -msgstr "" +msgstr "git replace [--format=<format>] [-l [<pola>]]" #: builtin/replace.c #, c-format @@ -13436,26 +13704,28 @@ msgid "" "invalid replace format '%s'\n" "valid formats are 'short', 'medium' and 'long'" msgstr "" +"format penggantian '%s' tidak valid\n" +"yang valid adalah 'short', 'medium' dan 'long'" #: builtin/replace.c #, c-format msgid "replace ref '%s' not found" -msgstr "" +msgstr "referensi penggantian '%s' tidak ditemukan" #: builtin/replace.c #, c-format msgid "Deleted replace ref '%s'" -msgstr "" +msgstr "Referensi penggantian '%s' dihapus" #: builtin/replace.c #, c-format msgid "'%s' is not a valid ref name" -msgstr "" +msgstr "'%s' bukan nama referensi valid" #: builtin/replace.c #, c-format msgid "replace ref '%s' already exists" -msgstr "" +msgstr "referensi penggantian '%s' sudah ada" #: builtin/replace.c #, c-format @@ -13464,74 +13734,77 @@ msgid "" "'%s' points to a replaced object of type '%s'\n" "while '%s' points to a replacement object of type '%s'." msgstr "" +"Objek harus bertipe sama.\n" +"'%s' menunjuk pada objek yang diganti bertipe '%s'\n" +"sedangkan '%s' menunjuk pada objek pengganti bertipe '%s'." #: builtin/replace.c #, c-format msgid "unable to open %s for writing" -msgstr "" +msgstr "tidak dapat membuka %s untuk ditulis" #: builtin/replace.c msgid "cat-file reported failure" -msgstr "" +msgstr "cat-file melaporkan kegagalan" #: builtin/replace.c #, c-format msgid "unable to open %s for reading" -msgstr "" +msgstr "tidak dapat membuka %s untuk dibaca" #: builtin/replace.c msgid "unable to spawn mktree" -msgstr "" +msgstr "tidak dapat memunculkan mktree" #: builtin/replace.c msgid "unable to read from mktree" -msgstr "" +msgstr "tidak dapat membaca dari mktree" #: builtin/replace.c msgid "mktree reported failure" -msgstr "" +msgstr "mktree melaporkan kegagalan" #: builtin/replace.c msgid "mktree did not return an object name" -msgstr "" +msgstr "mktree tidak mengembalikan sebuah nama objek" #: builtin/replace.c #, c-format msgid "unable to fstat %s" -msgstr "" +msgstr "tidak dapat men-fstat %s" #: builtin/replace.c msgid "unable to write object to database" -msgstr "" +msgstr "tidak dapat menulis objek ke basis data" #: builtin/replace.c #, c-format msgid "unable to get object type for %s" -msgstr "" +msgstr "tidak dapat mendapatkan tipe objek untuk %s" #: builtin/replace.c msgid "editing object file failed" -msgstr "" +msgstr "gagal menyunting berkas objek" #: builtin/replace.c #, c-format msgid "new object is the same as the old one: '%s'" -msgstr "" +msgstr "objek baru sama dengan objek lama: '%s'" #: builtin/replace.c #, c-format msgid "could not parse %s as a commit" -msgstr "" +msgstr "tidak dapat menguraikan %s sebagai sebuah komit" #: builtin/replace.c #, c-format msgid "bad mergetag in commit '%s'" -msgstr "" +msgstr "tag penggabungan jelek pada komit '%s'" #: builtin/replace.c #, c-format msgid "malformed mergetag in commit '%s'" -msgstr "" +msgstr "tag penggabungan rusak pada komit '%s'" #: builtin/replace.c #, c-format @@ -13539,30 +13812,32 @@ msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " "instead of --graft" msgstr "" +"komit asal '%s' berisi tag penggabungan '%s' yang dibuang; gunakan --edit " +"daripada --graft" #: builtin/replace.c #, c-format msgid "the original commit '%s' has a gpg signature" -msgstr "" +msgstr "komit asal '%s' punya tandatangan gpg" #: builtin/replace.c msgid "the signature will be removed in the replacement commit!" -msgstr "" +msgstr "tandatangan akan dihapus di dalam komit pengganti!" #: builtin/replace.c #, c-format msgid "could not write replacement commit for: '%s'" -msgstr "" +msgstr "tidak dapat menulis komit pengganti untuk: '%s'" #: builtin/replace.c #, c-format msgid "graft for '%s' unnecessary" -msgstr "" +msgstr "cangkuk untuk '%s' tidak diperlukan" #: builtin/replace.c #, c-format msgid "new commit is the same as the old one: '%s'" -msgstr "" +msgstr "komit baru sama dengan komit lama: '%s'" #: builtin/replace.c #, c-format @@ -13570,91 +13845,93 @@ msgid "" "could not convert the following graft(s):\n" "%s" msgstr "" +"tidak dapat mengkonversi cangkuk berikut:\n" +"%s" #: builtin/replace.c msgid "list replace refs" -msgstr "" +msgstr "daftar referensi penggantian" #: builtin/replace.c msgid "delete replace refs" -msgstr "" +msgstr "hapus referensi penggantian" #: builtin/replace.c msgid "edit existing object" -msgstr "" +msgstr "sunting objek yang ada" #: builtin/replace.c msgid "change a commit's parents" -msgstr "" +msgstr "ubah induk sebuah komit" #: builtin/replace.c msgid "convert existing graft file" -msgstr "" +msgstr "konversi berkas cangkuk yang anda" #: builtin/replace.c msgid "replace the ref if it exists" -msgstr "" +msgstr "ganti referensi jika ada" #: builtin/replace.c msgid "do not pretty-print contents for --edit" -msgstr "" +msgstr "jangan cetak cantik isi untuk --edit" #: builtin/replace.c msgid "use this format" -msgstr "" +msgstr "gunakan format ini" #: builtin/replace.c msgid "--format cannot be used when not listing" -msgstr "" +msgstr "--format tidak dapat digunakan ketika mendaftar" #: builtin/replace.c msgid "-f only makes sense when writing a replacement" -msgstr "" +msgstr "-f hanya masuk akal ketika menulis pengganti" #: builtin/replace.c msgid "--raw only makes sense with --edit" -msgstr "" +msgstr "--raw hanya masuk akal dengan --edit" #: builtin/replace.c msgid "-d needs at least one argument" -msgstr "" +msgstr "-d butuh setidaknya satu argumen" #: builtin/replace.c msgid "bad number of arguments" -msgstr "" +msgstr "jumlah argumen jelek" #: builtin/replace.c msgid "-e needs exactly one argument" -msgstr "" +msgstr "-e butuh tepat satu argumen" #: builtin/replace.c msgid "-g needs at least one argument" -msgstr "" +msgstr "-g butuh setidaknya satu argumen" #: builtin/replace.c msgid "--convert-graft-file takes no argument" -msgstr "" +msgstr "--convert-graft-file tidak mengambil argumen" #: builtin/replace.c msgid "only one pattern can be given with -l" -msgstr "" +msgstr "hanya satu pola yang dapat diberikan dengan -l" #: builtin/rerere.c msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" -msgstr "" +msgstr "git rerere [clear | forge <jalur>... | status | remaining | diff | gc]" #: builtin/rerere.c msgid "register clean resolutions in index" -msgstr "" +msgstr "daftar resolusi bersih di dalam indeks" #: builtin/rerere.c msgid "'git rerere forget' without paths is deprecated" -msgstr "" +msgstr "'git rerere forget' tanpa jalur usang" #: builtin/rerere.c #, c-format msgid "unable to generate diff for '%s'" -msgstr "" +msgstr "tidak dapat membuat diff untuk '%s'" #: builtin/reset.c msgid "" @@ -13725,7 +14002,7 @@ msgstr "diam, hanya laporkan kesalahan" #: builtin/reset.c msgid "skip refreshing the index after reset" -msgstr "" +msgstr "lewati penyegaran indeks setelah reset" #: builtin/reset.c msgid "reset HEAD and index" @@ -13794,10 +14071,16 @@ msgstr "Tidak dapat menyetel ulang berkas indeks ke revisi '%s'." msgid "Could not write new index file." msgstr "Tidak dapat menulis berkas indeks baru." -#: builtin/rev-list.c pack-bitmap.c +#: builtin/rev-list.c #, c-format msgid "unable to get disk usage of %s" +msgstr "tidak dapat mendapatkan penggunaan disk %s" + +#: builtin/rev-list.c +#, c-format +msgid "invalid value for '%s': '%s', the only allowed format is '%s'" msgstr "" +"nilai tidak valid untuk '%s': '%s', format yang diperbolehkan hanyalah '%s'" #: builtin/rev-list.c msgid "rev-list does not support display of notes" @@ -13833,6 +14116,10 @@ msgid "no usage string given before the `--' separator" msgstr "tidak ada untai penggunaan yang diberikan sebelum pemisah `--'" #: builtin/rev-parse.c +msgid "missing opt-spec before option flags" +msgstr "kehilangan spek opsi sebelum bendera opsi" + +#: builtin/rev-parse.c msgid "Needed a single revision" msgstr "Butuh satu revisi" @@ -13982,7 +14269,7 @@ msgstr "simpan komit kosong mubazir" #: builtin/revert.c msgid "use the 'reference' format to refer to commits" -msgstr "" +msgstr "gunakan format 'reference' untuk merujuk pada komit" #: builtin/revert.c msgid "revert failed" @@ -14392,10 +14679,10 @@ msgstr "inisialisasi checkout tipis dalam mode kerucut" msgid "toggle the use of a sparse index" msgstr "gunakan indeks tipis" -#: builtin/sparse-checkout.c commit-graph.c midx.c +#: builtin/sparse-checkout.c commit-graph.c midx.c sequencer.c #, c-format msgid "unable to create leading directories of %s" -msgstr "" +msgstr "tidak dapat membuat direktori utama dari %s" #: builtin/sparse-checkout.c #, c-format @@ -14787,11 +15074,11 @@ msgstr "masukkan berkas ignore" #: builtin/stripspace.c msgid "skip and remove all lines starting with comment character" -msgstr "" +msgstr "lewati dan hapus semua baris yang diawali dengan karakter komentar" #: builtin/stripspace.c msgid "prepend comment character and space to each line" -msgstr "" +msgstr "tambahkan karakter komentar dan spasi di awal setiap baris" #: builtin/submodule--helper.c #, c-format @@ -14800,6 +15087,11 @@ msgstr "Mengharapkan nama referensi penuh, dapat %s" #: builtin/submodule--helper.c #, c-format +msgid "could not get a repository handle for submodule '%s'" +msgstr "tidak dapat mendapat pegangan repositori untuk submodul '%s'" + +#: builtin/submodule--helper.c +#, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " "authoritative upstream." @@ -14808,14 +15100,6 @@ msgstr "" "hulu otoritatif tersendiri." #: builtin/submodule--helper.c -msgid "alternative anchor for relative paths" -msgstr "jangkar alternatif untuk jalur relatif" - -#: builtin/submodule--helper.c -msgid "git submodule--helper list [--prefix=<path>] [<path>...]" -msgstr "git submodule--helper list [--prefix=<jalur>] [<jalur>...]" - -#: builtin/submodule--helper.c #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "Tidak ada url yang ditemukan untuk jalur submodul '%s' di .gitmodules" @@ -14854,9 +15138,8 @@ msgid "recurse into nested submodules" msgstr "rekursi ke dalam submodul bersarang" #: builtin/submodule--helper.c -msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" -msgstr "" -"git submodule--helper foreach [--quiet] [--recursive] [--] [<perintah>]" +msgid "git submodule foreach [--quiet] [--recursive] [--] <command>" +msgstr "git submodule foreach [--quiet] [--recursive] [--] [<perintah>]" #: builtin/submodule--helper.c #, c-format @@ -14883,8 +15166,8 @@ msgid "suppress output for initializing a submodule" msgstr "sembunyikan keluaran menginisialisasi submodul" #: builtin/submodule--helper.c -msgid "git submodule--helper init [<options>] [<path>]" -msgstr "git submodule--helper init [<opsi>] [<jalur>]" +msgid "git submodule init [<options>] [<path>]" +msgstr "git submodule init [<opsi>] [<jalur>]" #: builtin/submodule--helper.c #, c-format @@ -14918,10 +15201,6 @@ msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<jalur>...]" #: builtin/submodule--helper.c -msgid "git submodule--helper name <path>" -msgstr "git submodule--helper name <jalur>" - -#: builtin/submodule--helper.c #, c-format msgid "* %s %s(blob)->%s(submodule)" msgstr "* %s %s(blob)->%s(submodul)" @@ -14963,8 +15242,8 @@ msgid "limit the summary size" msgstr "batasi ukuran ringkasan" #: builtin/submodule--helper.c -msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" -msgstr "git submodule--helper summary [<opsi>] [<commit>] -- [<jalur>]" +msgid "git submodule summary [<options>] [<commit>] [--] [<path>]" +msgstr "git submodule summary [<opsi>] [<commit>] -- [<jalur>]" #: builtin/submodule--helper.c msgid "could not fetch a revision for HEAD" @@ -14982,11 +15261,6 @@ msgstr "gagal mendaftarkan url untuk jalur submodul '%s'" #: builtin/submodule--helper.c #, c-format -msgid "failed to get the default remote for submodule '%s'" -msgstr "gagal mendapatkan remote asali untuk submodul '%s'" - -#: builtin/submodule--helper.c -#, c-format msgid "failed to update remote for submodule '%s'" msgstr "gagal memperbarui remote untuk submodul '%s'" @@ -14995,8 +15269,8 @@ msgid "suppress output of synchronizing submodule url" msgstr "sembunyikan keluaran mensinkronisasi url submodul" #: builtin/submodule--helper.c -msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" -msgstr "git submodule--helper sync [--quiet] [--recursive] [<jalur>]" +msgid "git submodule sync [--quiet] [--recursive] [<path>]" +msgstr "git submodule sync [--quiet] [--recursive] [<jalur>]" #: builtin/submodule--helper.c #, c-format @@ -15069,6 +15343,11 @@ msgstr "" #: builtin/submodule--helper.c #, c-format +msgid "could not get a repository handle for gitdir '%s'" +msgstr "tidak dapat mendapat pegangan repositori untuk direktori git '%s'" + +#: builtin/submodule--helper.c +#, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "submodul '%s' tidak dapat menambahkan pengganti: %s" @@ -15104,6 +15383,10 @@ msgid "could not get submodule directory for '%s'" msgstr "tidak dapat mendapatkan direktori submodul untuk '%s'" #: builtin/submodule--helper.c +msgid "alternative anchor for relative paths" +msgstr "jangkar alternatif untuk jalur relatif" + +#: builtin/submodule--helper.c msgid "where the new submodule will be cloned to" msgstr "di mana submodul baru akan dikloning" @@ -15139,11 +15422,6 @@ msgstr "" #: builtin/submodule--helper.c #, c-format -msgid "Invalid update mode '%s' for submodule path '%s'" -msgstr "Mode pembaruan '%s' tidak valid untuk jalur submodul '%s'" - -#: builtin/submodule--helper.c -#, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "Mode pembaruan '%s' tidak valid untuk jalur submodul '%s'" @@ -15234,6 +15512,11 @@ msgstr "" #: builtin/submodule--helper.c #, c-format +msgid "could not initialize submodule at path '%s'" +msgstr "tidak dapat menginisialisasi submodul pada jalur '%s'" + +#: builtin/submodule--helper.c +#, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " "the superproject is not on any branch" @@ -15243,11 +15526,6 @@ msgstr "" #: builtin/submodule--helper.c #, c-format -msgid "could not get a repository handle for submodule '%s'" -msgstr "tidak dapat mendapat pegangan repositori untuk submodul '%s'" - -#: builtin/submodule--helper.c -#, c-format msgid "Unable to find current revision in submodule path '%s'" msgstr "Tidak dapat menemukan revisi saat ini pada jalur submodul '%s'" @@ -15291,12 +15569,16 @@ msgid "path into the working tree" msgstr "jalur ke dalam pohon kerja" #: builtin/submodule--helper.c -msgid "path into the working tree, across nested submodule boundaries" -msgstr "jalur ke dalam pohon kerja, melintasi perbatasan submodul bersarang" +msgid "use the 'checkout' update strategy (default)" +msgstr "gunakan strategi pembaruan 'checkout' (asali)" #: builtin/submodule--helper.c -msgid "rebase, merge, checkout or none" -msgstr "dasarkan ulang, gabungkan, checkout atau tidak sama sekali" +msgid "use the 'merge' update strategy" +msgstr "gunakan strategi penmbaruan 'merge'" + +#: builtin/submodule--helper.c +msgid "use the 'rebase' update strategy" +msgstr "gunakan strategi pembaruan 'rebase'" #: builtin/submodule--helper.c msgid "create a shallow clone truncated to the specified number of revisions" @@ -15315,6 +15597,11 @@ msgid "don't print cloning progress" msgstr "jangan cetak perkembangan pengkloningan" #: builtin/submodule--helper.c +msgid "disallow cloning into non-empty directory, implies --init" +msgstr "" +"tak perbolehkan kloning ke dalam direktori berisi, mengimplikasikan --init" + +#: builtin/submodule--helper.c msgid "" "git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] " "[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-" @@ -15327,16 +15614,12 @@ msgstr "" "[--] [<jalur>...]" #: builtin/submodule--helper.c -msgid "bad value for update parameter" -msgstr "nilai jelek untuk parameter pembaruan" - -#: builtin/submodule--helper.c msgid "recurse into submodules" msgstr "rekursi ke dalam submodul" #: builtin/submodule--helper.c -msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" -msgstr "git submodule--helper absorb-git-dirs [<opsi>] [<jalur>...]" +msgid "git submodule absorbgitdirs [<options>] [<path>...]" +msgstr "git submodule absorbgitdirs [<opsi>] [<jalur>...]" #: builtin/submodule--helper.c msgid "check if it is safe to write to the .gitmodules file" @@ -15363,8 +15646,8 @@ msgid "suppress output for setting url of a submodule" msgstr "sembunyikan keluaran penyetelan url submodule" #: builtin/submodule--helper.c -msgid "git submodule--helper set-url [--quiet] <path> <newurl>" -msgstr "git submodule--helper set-url [--quiet] <jalur> <url baru>" +msgid "git submodule set-url [--quiet] <path> <newurl>" +msgstr "git submodule set-url [--quiet] <jalur> <url baru>" #: builtin/submodule--helper.c msgid "set the default tracking branch to master" @@ -15375,14 +15658,12 @@ msgid "set the default tracking branch" msgstr "setel cabang pelacak asali" #: builtin/submodule--helper.c -msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" -msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <jalur>" +msgid "git submodule set-branch [-q|--quiet] (-d|--default) <path>" +msgstr "git submodule set-branch [-q|--quiet] (-d|--default) <jalur>" #: builtin/submodule--helper.c -msgid "" -"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" -msgstr "" -"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <cabang> <jalur>" +msgid "git submodule set-branch [-q|--quiet] (-b|--branch) <branch> <path>" +msgstr "git submodule set-branch [-q|--quiet] (-b|--branch) <cabang> <jalur>" #: builtin/submodule--helper.c msgid "--branch or --default required" @@ -15478,7 +15759,7 @@ msgstr "'%s' sudah ada di dalam indeks dan bukan submodul" #: builtin/submodule--helper.c read-cache.c #, c-format msgid "'%s' does not have a commit checked out" -msgstr "" +msgstr "'%s' tidak punya sebuah komit tercheckout" #: builtin/submodule--helper.c msgid "branch of repository to add as submodule" @@ -15500,8 +15781,8 @@ msgstr "" "setel nama submodul ke untai yang diberikan daripada diasalkan ke jalurnya" #: builtin/submodule--helper.c -msgid "git submodule--helper add [<options>] [--] <repository> [<path>]" -msgstr "git submodule--helper add [<opsi>] [--] <repositori> [<jalur>]" +msgid "git submodule add [<options>] [--] <repository> [<path>]" +msgstr "git submodule add [<opsi>] [--] <repositori> [<jalur>]" #: builtin/submodule--helper.c msgid "Relative path can only be used from the toplevel of the working tree" @@ -15758,6 +16039,19 @@ msgid "pack exceeds maximum allowed size" msgstr "paket melebihi ukuran maksimum yang diperbolehkan" #: builtin/unpack-objects.c +msgid "failed to write object in stream" +msgstr "gagal menulis objek di dalam arus" + +#: builtin/unpack-objects.c +#, c-format +msgid "inflate returned (%d)" +msgstr "inflate mengembalikan (%d)" + +#: builtin/unpack-objects.c +msgid "invalid blob object from stream" +msgstr "objek blob tidak valid dari arus" + +#: builtin/unpack-objects.c msgid "Unpacking objects" msgstr "Membongkar objek" @@ -16414,6 +16708,33 @@ msgstr "tulis objek pohon untuk subdirektori <prefiks>" msgid "only useful for debugging" msgstr "hanya berguna untuk penirkutuan" +#: bulk-checkin.c +msgid "core.fsyncMethod = batch is unsupported on this platform" +msgstr "core.fsyncMethod = batch tidak didukung pada platform ini" + +#: bundle-uri.c +msgid "failed to create temporary file" +msgstr "tidak dapat membuat berkas sementara" + +#: bundle-uri.c +msgid "insufficient capabilities" +msgstr "tidak cukup kemampuan" + +#: bundle-uri.c +#, c-format +msgid "failed to download bundle from URI '%s'" +msgstr "gagal mengunduh bundel dari URI '%s'" + +#: bundle-uri.c +#, c-format +msgid "file at URI '%s' is not a bundle" +msgstr "berkas pada URI '%s' bukan sebuah bundle" + +#: bundle-uri.c +#, c-format +msgid "failed to unbundle bundle from URI '%s'" +msgstr "gagal membongkar bundel dari URI '%s'" + #: bundle.c #, c-format msgid "unrecognized bundle hash algorithm: %s" @@ -16502,941 +16823,1013 @@ msgstr "index-pack mati" #: chunk-format.c msgid "terminating chunk id appears earlier than expected" -msgstr "" +msgstr "id bingkah pengakhiran muncul lebih awal dari yang diharapkan" #: chunk-format.c #, c-format msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>" -msgstr "" +msgstr "offset bingkah %<PRIx64> dan %<PRIx64> tidak tepat" #: chunk-format.c #, c-format msgid "duplicate chunk ID %<PRIx32> found" -msgstr "" +msgstr "ID bingkah duplikat %<PRIx32> ditemukan" #: chunk-format.c #, c-format msgid "final chunk has non-zero id %<PRIx32>" -msgstr "" +msgstr "bingkah terakhir punya id bukan nol %<PRIx32>" #: chunk-format.c msgid "invalid hash version" -msgstr "" +msgstr "versi hash tidak valid" #: color.c #, c-format msgid "invalid color value: %.*s" -msgstr "" +msgstr "nilai warna tidak valid: %.*s" #: command-list.h msgid "Add file contents to the index" -msgstr "" +msgstr "Tambahkan isi berkas ke indeks" #: command-list.h msgid "Apply a series of patches from a mailbox" -msgstr "" +msgstr "Terapkan rangkaian tambalan dari kotak surat" #: command-list.h msgid "Annotate file lines with commit information" -msgstr "" +msgstr "Anotasi baris berkas dengan informasi komit" #: command-list.h msgid "Apply a patch to files and/or to the index" -msgstr "" +msgstr "Terapkan tambalan pada berkas dan/atau pada indeks" #: command-list.h msgid "Import a GNU Arch repository into Git" -msgstr "" +msgstr "Impor repositori GNU Arch ke dalam Git" #: command-list.h msgid "Create an archive of files from a named tree" -msgstr "" +msgstr "Buat arsip berkas dari pohon bernama" #: command-list.h msgid "Use binary search to find the commit that introduced a bug" -msgstr "" +msgstr "Gunakan pencarian biner untuk mencari komit yang memasukkan bug" #: command-list.h msgid "Show what revision and author last modified each line of a file" msgstr "" +"Perlihatkan revisi dan pengarang apa yang terakhir kali mengubah setiap " +"baris berkas" #: command-list.h msgid "List, create, or delete branches" -msgstr "" +msgstr "Daftar, buat, atau hapus cabang" #: command-list.h msgid "Collect information for user to file a bug report" -msgstr "" +msgstr "Kumpulkan informasi agar pengguna melaporkan laporan bug" #: command-list.h msgid "Move objects and refs by archive" -msgstr "" +msgstr "Pindahkan objek dan referensi oleh arsip" #: command-list.h msgid "Provide content or type and size information for repository objects" msgstr "" +"Sediakan isi atau informasi tipe dan ukuran berkas untuk objek repositori" #: command-list.h msgid "Display gitattributes information" -msgstr "" +msgstr "Perlihatkan informasi gitattributes" #: command-list.h msgid "Debug gitignore / exclude files" -msgstr "" +msgstr "Nirkutukan berkas gitignore / exclude" #: command-list.h msgid "Show canonical names and email addresses of contacts" -msgstr "" +msgstr "Perlihatkan nama dan alamat email kanonikal" #: command-list.h msgid "Ensures that a reference name is well formed" -msgstr "" +msgstr "Pastikan bahwa nama referensi baik dan benar" #: command-list.h msgid "Switch branches or restore working tree files" -msgstr "" +msgstr "Ganti cabang atau kembalikan berkas pohon kerja" #: command-list.h msgid "Copy files from the index to the working tree" -msgstr "" +msgstr "Salin berkas dari indeks ke pohon kerja" #: command-list.h msgid "Find commits yet to be applied to upstream" -msgstr "" +msgstr "Cari komit yang belum diterapkan pada hulu" #: command-list.h msgid "Apply the changes introduced by some existing commits" -msgstr "" +msgstr "Terapkan perubahan yang dimasukkan oleh beberapa komit yang ada" #: command-list.h msgid "Graphical alternative to git-commit" -msgstr "" +msgstr "Alternatif grafik untuk git-commit" #: command-list.h msgid "Remove untracked files from the working tree" -msgstr "" +msgstr "Hapus berkas tak terlacak dari pohon kerja" #: command-list.h msgid "Clone a repository into a new directory" -msgstr "" +msgstr "Salin repositori ke dalam direktori baru" #: command-list.h msgid "Display data in columns" -msgstr "" +msgstr "Tampilkan data dalam kolom" #: command-list.h msgid "Record changes to the repository" -msgstr "" +msgstr "Rekam perubahan ke dalam repositori" #: command-list.h msgid "Write and verify Git commit-graph files" -msgstr "" +msgstr "Tulis dan verifikasi berkas Git commit-graph" #: command-list.h msgid "Create a new commit object" -msgstr "" +msgstr "Buat objek komit baru" #: command-list.h msgid "Get and set repository or global options" -msgstr "" +msgstr "Dapatkan dan setel opsi repositori atau global" #: command-list.h msgid "Count unpacked number of objects and their disk consumption" -msgstr "" +msgstr "Hitung jumlah berkas tak terlacak dan penggunaan disknya" #: command-list.h msgid "Retrieve and store user credentials" -msgstr "" +msgstr "Dapatkan dan simpan kredensial pengguna" #: command-list.h msgid "Helper to temporarily store passwords in memory" -msgstr "" +msgstr "Pembantu untuk sementara simpan kata sandi di memori" #: command-list.h msgid "Helper to store credentials on disk" -msgstr "" +msgstr "Pembantu untuk menyimpan kredensial pada disk" #: command-list.h msgid "Export a single commit to a CVS checkout" -msgstr "" +msgstr "Ekspor satu komit tunggal ke checkout CVS" #: command-list.h msgid "Salvage your data out of another SCM people love to hate" -msgstr "" +msgstr "Selamatkan data karena pengguna SCM lainnya yang suka membenci" #: command-list.h msgid "A CVS server emulator for Git" -msgstr "" +msgstr "Emulator peladen CVS untuk Git" #: command-list.h msgid "A really simple server for Git repositories" -msgstr "" +msgstr "Peladen sederhana beneran untuk repositori Git" #: command-list.h msgid "Give an object a human readable name based on an available ref" msgstr "" +"Berikan nama yang dapat dibaca manusia pada objek berdasarkan referensi yang " +"ada" + +#: command-list.h +msgid "Generate a zip archive of diagnostic information" +msgstr "Buat arsip zip informasi diagnostik" #: command-list.h msgid "Show changes between commits, commit and working tree, etc" msgstr "" +"Perlihatkan perubahan di antara komit-komit, komit dan pohon kerja, dll" #: command-list.h msgid "Compares files in the working tree and the index" -msgstr "" +msgstr "Bandingkan berkas di dalam pohon kerja dan indeks" #: command-list.h msgid "Compare a tree to the working tree or index" -msgstr "" +msgstr "Bandingkan pohon kepada pohon kerja atau indeks" #: command-list.h msgid "Compares the content and mode of blobs found via two tree objects" -msgstr "" +msgstr "Bandingkan isi dan mode blob yang ditemukan lewat dua objek pohon" #: command-list.h msgid "Show changes using common diff tools" -msgstr "" +msgstr "Perlihatkan perubahan menggunakan alat diff umum" #: command-list.h msgid "Git data exporter" -msgstr "" +msgstr "Eksportir data Git" #: command-list.h msgid "Backend for fast Git data importers" -msgstr "" +msgstr "Tulang punggung untuk importir data Git" #: command-list.h msgid "Download objects and refs from another repository" -msgstr "" +msgstr "Unduh objek dan referensi dari repositori yang lain" #: command-list.h msgid "Receive missing objects from another repository" -msgstr "" +msgstr "Terima objek yang hilang dari repositori yang lain" #: command-list.h msgid "Rewrite branches" -msgstr "" +msgstr "Tulis ulang cabang" #: command-list.h msgid "Produce a merge commit message" -msgstr "" +msgstr "Buat pesan komit penggabungan" #: command-list.h msgid "Output information on each ref" -msgstr "" +msgstr "Keluarkan informasi pada setiap referensi" #: command-list.h msgid "Run a Git command on a list of repositories" -msgstr "" +msgstr "Jalankan perintah Git pada daftar repositori" #: command-list.h msgid "Prepare patches for e-mail submission" -msgstr "" +msgstr "Siapkan tambalan untuk pengiriman surel" #: command-list.h msgid "Verifies the connectivity and validity of the objects in the database" -msgstr "" +msgstr "Verifikasi hubungan dan validitas objek di dalam basis data" #: command-list.h msgid "Cleanup unnecessary files and optimize the local repository" -msgstr "" +msgstr "Bersihkan berkas yang tak perlu dan optimalkan repositori lokal" #: command-list.h msgid "Extract commit ID from an archive created using git-archive" -msgstr "" +msgstr "Ekstrak ID komit dari arsip yang dibuat dengan git-archive" #: command-list.h msgid "Print lines matching a pattern" -msgstr "" +msgstr "Cetak baris yang cocok dengan sebuah pola" #: command-list.h msgid "A portable graphical interface to Git" -msgstr "" +msgstr "Sebuah antarmuka grafis Git portabel" #: command-list.h msgid "Compute object ID and optionally creates a blob from a file" -msgstr "" +msgstr "Hitung ID objek dan buat blob dari berkas (opsional)" #: command-list.h msgid "Display help information about Git" -msgstr "" +msgstr "Perlihatkan bantuan mengenai Git" #: command-list.h msgid "Run git hooks" -msgstr "" +msgstr "Jalankan kait git" #: command-list.h msgid "Server side implementation of Git over HTTP" -msgstr "" +msgstr "Impementasi sisi peladen dari Git lewat HTTP" #: command-list.h msgid "Download from a remote Git repository via HTTP" -msgstr "" +msgstr "Unduh dari repositori Git remote lewat HTTP" #: command-list.h msgid "Push objects over HTTP/DAV to another repository" -msgstr "" +msgstr "Dorong objek lewat HTTP/DAV ke repositori lainnya" #: command-list.h msgid "Send a collection of patches from stdin to an IMAP folder" -msgstr "" +msgstr "Kirim koleksi tambalan dari masukan standar ke sebuah direktori IMAP" #: command-list.h msgid "Build pack index file for an existing packed archive" -msgstr "" +msgstr "Bangun berkas indeks pak dari arsip terpak yang sudah ada" #: command-list.h msgid "Create an empty Git repository or reinitialize an existing one" -msgstr "" +msgstr "Buat repositori Git kosong atau inisialisasi ulang yang sudah ada" #: command-list.h msgid "Instantly browse your working repository in gitweb" -msgstr "" +msgstr "Jelajahi repositori kerja Anda secara instan di gitweb" #: command-list.h msgid "Add or parse structured information in commit messages" -msgstr "" +msgstr "Tambah atau urai informasi terstruktur di dalam pesan komit" #: command-list.h msgid "Show commit logs" -msgstr "" +msgstr "Perlihatkan log komit" #: command-list.h msgid "Show information about files in the index and the working tree" msgstr "" +"Perlihatkan informasi mengenai berkas-berkas di dalam indeks dan pohon kerja" #: command-list.h msgid "List references in a remote repository" -msgstr "" +msgstr "Daftar referensi di repositori remote" #: command-list.h msgid "List the contents of a tree object" -msgstr "" +msgstr "Daftar isi objek pohon" #: command-list.h msgid "Extracts patch and authorship from a single e-mail message" -msgstr "" +msgstr "Ekstrak berkas dan kepengarangan dari pesan surel tunggal" #: command-list.h msgid "Simple UNIX mbox splitter program" -msgstr "" +msgstr "Program pemisah mbox UNIX sederhana" #: command-list.h msgid "Run tasks to optimize Git repository data" -msgstr "" +msgstr "Jalankan tugas untuk mengoptimalkan data repositori Git" #: command-list.h msgid "Join two or more development histories together" -msgstr "" +msgstr "Gabungkan dua riwayat pengembangan atau lebih bersama-sama" #: command-list.h msgid "Find as good common ancestors as possible for a merge" -msgstr "" +msgstr "Cari leluhur umum sebaik-baiknya untuk penggabungan" #: command-list.h msgid "Run a three-way file merge" -msgstr "" +msgstr "Lakukan penggabungan berkas tiga arah" #: command-list.h msgid "Run a merge for files needing merging" -msgstr "" +msgstr "Lakukan penggabungan untuk berkas yang perlu digabungkan" #: command-list.h msgid "The standard helper program to use with git-merge-index" -msgstr "" +msgstr "Program pembantu standar untuk digunakan dengan git-merge-index" #: command-list.h -msgid "Show three-way merge without touching index" -msgstr "" +msgid "Perform merge without touching index or working tree" +msgstr "Lakukan penggabungan tanpa menyentuh indeks atau pohon kerja" #: command-list.h msgid "Run merge conflict resolution tools to resolve merge conflicts" msgstr "" +"Jalankan alat penyelesaian konflik penggabungan untuk menyelesaikan konflik " +"penggabungan" #: command-list.h msgid "Creates a tag object with extra validation" -msgstr "" +msgstr "Buat objek tag dengan validasi ekstra" #: command-list.h msgid "Build a tree-object from ls-tree formatted text" -msgstr "" +msgstr "Bangun objek pohon dari teks berformat ls-tree" #: command-list.h msgid "Write and verify multi-pack-indexes" -msgstr "" +msgstr "Tulis dan verifikasi indeks multipak" #: command-list.h msgid "Move or rename a file, a directory, or a symlink" -msgstr "" +msgstr "Pindahkan atau namai ulang berkas, direktori, atau tautan simbolik" #: command-list.h msgid "Find symbolic names for given revs" -msgstr "" +msgstr "Cari nama simbolik untuk revisi yang diberikan" #: command-list.h msgid "Add or inspect object notes" -msgstr "" +msgstr "Tambahkan atau inspeksi catatan objek" #: command-list.h msgid "Import from and submit to Perforce repositories" -msgstr "" +msgstr "Impor dari dan kirimkan ke repositori Perfore" #: command-list.h msgid "Create a packed archive of objects" -msgstr "" +msgstr "Buat arsip terpak dari objek" #: command-list.h msgid "Find redundant pack files" -msgstr "" +msgstr "Cari berkas pak berlebihan" #: command-list.h msgid "Pack heads and tags for efficient repository access" -msgstr "" +msgstr "Pak kepala dan tag untuk akses repositori yang efisien" #: command-list.h msgid "Compute unique ID for a patch" -msgstr "" +msgstr "Hitung ID unik untuk sebuah tambalan" #: command-list.h msgid "Prune all unreachable objects from the object database" -msgstr "" +msgstr "Pangkas semua objek tak tercapai dari basis data objek" #: command-list.h msgid "Remove extra objects that are already in pack files" -msgstr "" +msgstr "Hapus semua objek ekstra yang sudah ada di dalam berkas pak" #: command-list.h msgid "Fetch from and integrate with another repository or a local branch" -msgstr "" +msgstr "Ambil dan integrasikan dengan repositori lain atau sebuah cabang lokal" #: command-list.h msgid "Update remote refs along with associated objects" -msgstr "" +msgstr "Perbarui referensi remote bersama dengan objek yang terkait" #: command-list.h msgid "Applies a quilt patchset onto the current branch" -msgstr "" +msgstr "Terapkan set tambalan quilt pada cabang saat ini" #: command-list.h msgid "Compare two commit ranges (e.g. two versions of a branch)" -msgstr "" +msgstr "Bandingkan dua rentang komit (misalnya dua versi cabang)" #: command-list.h msgid "Reads tree information into the index" -msgstr "" +msgstr "Baca informasi pohon ke dalam indeks" #: command-list.h msgid "Reapply commits on top of another base tip" -msgstr "" +msgstr "Terapkan ulang komit-komit di atas dasar ujung yang lainnya" #: command-list.h msgid "Receive what is pushed into the repository" -msgstr "" +msgstr "Terima apa yang didorong pada repositori" #: command-list.h msgid "Manage reflog information" -msgstr "" +msgstr "Kelola informasi log referensi" #: command-list.h msgid "Manage set of tracked repositories" -msgstr "" +msgstr "Kelola set repositori terlacak" #: command-list.h msgid "Pack unpacked objects in a repository" -msgstr "" +msgstr "Pak objek tak terpak di dalam repositori" #: command-list.h msgid "Create, list, delete refs to replace objects" -msgstr "" +msgstr "Buat, daftar, hapus referensi untuk mengganti objek" #: command-list.h msgid "Generates a summary of pending changes" -msgstr "" +msgstr "Buat ringkasan perubahan tertunda" #: command-list.h msgid "Reuse recorded resolution of conflicted merges" -msgstr "" +msgstr "Gunakan ulang resolusi konflik penggabungan terekam" #: command-list.h msgid "Reset current HEAD to the specified state" -msgstr "" +msgstr "Setel ulang HEAD saat ini ke keadaan yang disebutkan" #: command-list.h msgid "Restore working tree files" -msgstr "" +msgstr "Pulihkan berkas pohon kerja" #: command-list.h msgid "Lists commit objects in reverse chronological order" -msgstr "" +msgstr "Daftar objek komit dalam urutan kronologis terbalik" #: command-list.h msgid "Pick out and massage parameters" -msgstr "" +msgstr "Ambil dan pijat parameter" #: command-list.h msgid "Revert some existing commits" -msgstr "" +msgstr "Balikkan beberapa komit yang sudah ada" #: command-list.h msgid "Remove files from the working tree and from the index" -msgstr "" +msgstr "Hapus berkas dari pohon kerja dan indeks" #: command-list.h msgid "Send a collection of patches as emails" -msgstr "" +msgstr "Kirim koleksi tambalan sebagai surel" #: command-list.h msgid "Push objects over Git protocol to another repository" -msgstr "" +msgstr "Dorong objek lewat protokol Git ke repositori lainnya" #: command-list.h msgid "Git's i18n setup code for shell scripts" -msgstr "" +msgstr "kode penyusunan i18n Git untuk skrip cangkang" #: command-list.h msgid "Common Git shell script setup code" -msgstr "" +msgstr "kode penyusunan skrip cangkang umum Git" #: command-list.h msgid "Restricted login shell for Git-only SSH access" -msgstr "" +msgstr "Cangkang masuk terbatas untuk akses SSH hanya Git" #: command-list.h msgid "Summarize 'git log' output" -msgstr "" +msgstr "Rangkum keluaran 'git log'" #: command-list.h msgid "Show various types of objects" -msgstr "" +msgstr "Perlihatkan berbagai tipe objek" #: command-list.h msgid "Show branches and their commits" -msgstr "" +msgstr "Perlihatkan cabang dan komitnya" #: command-list.h msgid "Show packed archive index" -msgstr "" +msgstr "Perlihatkan indeks arsip terpak" #: command-list.h msgid "List references in a local repository" -msgstr "" +msgstr "Daftar referensi di repositori lokal" #: command-list.h msgid "Reduce your working tree to a subset of tracked files" -msgstr "" +msgstr "Kurangi pohon kerja Anda sampai subset berkas terlacak" #: command-list.h msgid "Add file contents to the staging area" -msgstr "" +msgstr "Tambahkan isi berkas ke area penggelaran" #: command-list.h msgid "Stash the changes in a dirty working directory away" -msgstr "" +msgstr "Stase perubahan di dalam direktori kerja" #: command-list.h msgid "Show the working tree status" -msgstr "" +msgstr "Perlihatkan status pohon kerja" #: command-list.h msgid "Remove unnecessary whitespace" -msgstr "" +msgstr "Hapus spasi yang tidak diperlukan" #: command-list.h msgid "Initialize, update or inspect submodules" -msgstr "" +msgstr "Inisialisasi, perbarui atau inspeksi submodul" #: command-list.h msgid "Bidirectional operation between a Subversion repository and Git" -msgstr "" +msgstr "Operasi dua arah antara repositori Subversion dan Git" #: command-list.h msgid "Switch branches" -msgstr "" +msgstr "Ganti cabang" #: command-list.h msgid "Read, modify and delete symbolic refs" -msgstr "" +msgstr "Baca, ubah dan hapus referensi simbolik" #: command-list.h msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "" +"Buat, daftar, hapus atau verifikasi objek tag yang ditandatangani dengan GPG" #: command-list.h msgid "Creates a temporary file with a blob's contents" -msgstr "" +msgstr "Buat berkas sementara dengan isi blob" #: command-list.h msgid "Unpack objects from a packed archive" -msgstr "" +msgstr "Bongkar objek dari arsip terpak" #: command-list.h msgid "Register file contents in the working tree to the index" -msgstr "" +msgstr "Daftarkan isi berkas dalam pohon kerja ke indeks" #: command-list.h msgid "Update the object name stored in a ref safely" -msgstr "" +msgstr "Perbarui nama objek yang disimpan di dalam referensi secara aman" #: command-list.h msgid "Update auxiliary info file to help dumb servers" -msgstr "" +msgstr "Perbarui berkas info tambahan untuk membantu peladen bodoh" #: command-list.h msgid "Send archive back to git-archive" -msgstr "" +msgstr "Kirim arsip kembali ke git-archive" #: command-list.h msgid "Send objects packed back to git-fetch-pack" -msgstr "" +msgstr "Kirim objek terpak kembali ke git-fetch-pack" #: command-list.h msgid "Show a Git logical variable" -msgstr "" +msgstr "Perlihatkan variabel logikal Git" #: command-list.h msgid "Check the GPG signature of commits" -msgstr "" +msgstr "Periksa tandatangan GPG komit" #: command-list.h msgid "Validate packed Git archive files" -msgstr "" +msgstr "Validasi berkas arsip Git terpak" #: command-list.h msgid "Check the GPG signature of tags" -msgstr "" +msgstr "Periksa tandatangan GPG tag" + +#: command-list.h +msgid "Display version information about Git" +msgstr "Perlihatkan info versi Git" #: command-list.h msgid "Show logs with difference each commit introduces" -msgstr "" +msgstr "Perlihatkan log dengan perbedaan yang dimasukkan setiap komit" #: command-list.h msgid "Manage multiple working trees" -msgstr "" +msgstr "Kelola banyak pohon kerja" #: command-list.h msgid "Create a tree object from the current index" -msgstr "" +msgstr "Buat objek pohon dari indeks saat ini" #: command-list.h msgid "Defining attributes per path" -msgstr "" +msgstr "Tentukan atribut tiap jalur" #: command-list.h msgid "Git command-line interface and conventions" -msgstr "" +msgstr "Antarmuka baris perintah dan konvensi Git" #: command-list.h msgid "A Git core tutorial for developers" -msgstr "" +msgstr "Tutorial Git dasar untuk pengembang" #: command-list.h msgid "Providing usernames and passwords to Git" -msgstr "" +msgstr "Sediakan nama pengguna dan kata sandi ke Git" #: command-list.h msgid "Git for CVS users" -msgstr "" +msgstr "Git untuk pengguna CVS" #: command-list.h msgid "Tweaking diff output" -msgstr "" +msgstr "Ubah keluaran diff" #: command-list.h msgid "A useful minimum set of commands for Everyday Git" -msgstr "" +msgstr "Set perintah berguna minimal untuk Git setiap hari" #: command-list.h msgid "Frequently asked questions about using Git" -msgstr "" +msgstr "Pertanyaan yang sering diajukan tentang penggunaan Git" + +#: command-list.h +msgid "The bundle file format" +msgstr "Format berkas bundel" + +#: command-list.h +msgid "Chunk-based file formats" +msgstr "Berkas format berbasis bingkah" + +#: command-list.h +msgid "Git commit graph format" +msgstr "Format grafik komit Git" + +#: command-list.h +msgid "Git index format" +msgstr "Format indeks Git" + +#: command-list.h +msgid "Git pack format" +msgstr "Format pak Git" + +#: command-list.h +msgid "Git cryptographic signature formats" +msgstr "Format tandatangan kriptografik Git" #: command-list.h msgid "A Git Glossary" -msgstr "" +msgstr "Glosarium Git" #: command-list.h msgid "Hooks used by Git" -msgstr "" +msgstr "Kait yang digunakan oleh Git" #: command-list.h msgid "Specifies intentionally untracked files to ignore" -msgstr "" +msgstr "Sengaja menyebutkan berkas tak terlacak untuk diabaikan" #: command-list.h msgid "The Git repository browser" -msgstr "" +msgstr "Penjelajah repositori Git" #: command-list.h msgid "Map author/committer names and/or E-Mail addresses" -msgstr "" +msgstr "Petakan nama pengarang/pengkomit dan/atau alamat surel" #: command-list.h msgid "Defining submodule properties" -msgstr "" +msgstr "Menentukan properti submodul" #: command-list.h msgid "Git namespaces" -msgstr "" +msgstr "Nama lingkup Git" + +#: command-list.h +msgid "Protocol v0 and v1 capabilities" +msgstr "Kemampuan protokol v0 dan v1" + +#: command-list.h +msgid "Things common to various protocols" +msgstr "Hal-hal yang umum pada berbagai protokol" + +#: command-list.h +msgid "Git HTTP-based protocols" +msgstr "Protokol Git berbasis HTTP" + +#: command-list.h +msgid "How packs are transferred over-the-wire" +msgstr "Bagaimana pak ditransfer lewat kabel" + +#: command-list.h +msgid "Git Wire Protocol, Version 2" +msgstr "Protokol kabel Git, versi 2" #: command-list.h msgid "Helper programs to interact with remote repositories" -msgstr "" +msgstr "Program pembantu untuk berinteraksi dengan repositori remote" #: command-list.h msgid "Git Repository Layout" -msgstr "" +msgstr "Tata letak repositori Git" #: command-list.h msgid "Specifying revisions and ranges for Git" -msgstr "" +msgstr "Menyebutkan revisi dan rentang untuk Git" #: command-list.h msgid "Mounting one repository inside another" -msgstr "" +msgstr "Menaiki satu repositori di dalam lainnya" #: command-list.h msgid "A tutorial introduction to Git" -msgstr "" +msgstr "Tutorial perkenalan Git" #: command-list.h msgid "A tutorial introduction to Git: part two" -msgstr "" +msgstr "Tutorial perkenalan Git: bagian dua" #: command-list.h msgid "Git web interface (web frontend to Git repositories)" -msgstr "" +msgstr "Antarmuka web Git (tampilan depan web untuk repositori Git)" #: command-list.h msgid "An overview of recommended workflows with Git" -msgstr "" +msgstr "Selayang pandang alur kerja yang direkomendasikan dengan Git" + +#: command-list.h +msgid "A tool for managing large Git repositories" +msgstr "Alat untuk mengelola repositori Git besar" #: commit-graph.c msgid "commit-graph file is too small" -msgstr "" +msgstr "berkas grafik komit terlalu kecil" #: commit-graph.c #, c-format msgid "commit-graph signature %X does not match signature %X" -msgstr "" +msgstr "tanda tangan grafik komit %X tidak cocok dengan tanda tangan %X" #: commit-graph.c #, c-format msgid "commit-graph version %X does not match version %X" -msgstr "" +msgstr "versi grafik komit %X tidak cocok dengan versi %X" #: commit-graph.c #, c-format msgid "commit-graph hash version %X does not match version %X" -msgstr "" +msgstr "versi hash grafik komit %X tidak cocok dengan versi %X" #: commit-graph.c #, c-format msgid "commit-graph file is too small to hold %u chunks" -msgstr "" +msgstr "berkas grafik komit terlalu kecil untuk menyimpan %u bingkah" #: commit-graph.c msgid "commit-graph has no base graphs chunk" -msgstr "" +msgstr "grafik komit tidak punya bingkah grafik dasar" #: commit-graph.c msgid "commit-graph chain does not match" -msgstr "" +msgstr "rantai grafik komit tidak cocok" #: commit-graph.c #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" -msgstr "" +msgstr "rantai grafik komit tidak cocok: baris '%s' bukan sebuah hash" #: commit-graph.c msgid "unable to find all commit-graph files" -msgstr "" +msgstr "tidak dapat menemukan semua berkas grafik komit" #: commit-graph.c msgid "invalid commit position. commit-graph is likely corrupt" -msgstr "" +msgstr "posisi komit tidak valid. grafik komit mungkin rusak" #: commit-graph.c #, c-format msgid "could not find commit %s" -msgstr "" +msgstr "tidak dapat menemukan komit %s" #: commit-graph.c msgid "commit-graph requires overflow generation data but has none" -msgstr "" +msgstr "grafik komit memerlukan pembuatan data meluap tapi tidak punya" #: commit-graph.c msgid "Loading known commits in commit graph" -msgstr "" +msgstr "Memuat komit yang dikenal di grafik komit" #: commit-graph.c msgid "Expanding reachable commits in commit graph" -msgstr "" +msgstr "Memperluas komit yang dapat dijangkau di grafik komit" #: commit-graph.c msgid "Clearing commit marks in commit graph" -msgstr "" +msgstr "Membersihkan penanda komit di grafik komit" #: commit-graph.c msgid "Computing commit graph topological levels" -msgstr "" +msgstr "Menghitung tingat topologis grafik komit" #: commit-graph.c msgid "Computing commit graph generation numbers" -msgstr "" +msgstr "Menghitung jumlah pembuatan grafik komit" #: commit-graph.c msgid "Computing commit changed paths Bloom filters" -msgstr "" +msgstr "Menghitung komit yang berubah jalurnya oleh penyaring Bloom" #: commit-graph.c msgid "Collecting referenced commits" -msgstr "" +msgstr "Mengumpulkan komit tereferensi" #: commit-graph.c #, c-format msgid "Finding commits for commit graph in %<PRIuMAX> pack" msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Mencari komit untuk grafik komit di dalam pak %<PRIuMAX>" +msgstr[1] "Mencari komit untuk grafik komit di dalam pak %<PRIuMAX>" #: commit-graph.c #, c-format msgid "error adding pack %s" -msgstr "" +msgstr "kesalahan menambahkan pak %s" #: commit-graph.c #, c-format msgid "error opening index for %s" -msgstr "" +msgstr "kesalahan membuka indeks untuk %s" #: commit-graph.c msgid "Finding commits for commit graph among packed objects" -msgstr "" +msgstr "Mencari komit untuk grafik komit di antara objek terpak" #: commit-graph.c msgid "Finding extra edges in commit graph" -msgstr "" +msgstr "Mencari tepi ekstra di dalam grafik komit" #: commit-graph.c msgid "failed to write correct number of base graph ids" -msgstr "" +msgstr "gagal menulis jumlah id grafik dasar yang benar" #: commit-graph.c msgid "unable to create temporary graph layer" -msgstr "" +msgstr "tidak dapat membuat lapisan grafik dasar" #: commit-graph.c #, c-format msgid "unable to adjust shared permissions for '%s'" -msgstr "" +msgstr "tidak dapat menyesuaikan perizinan berbagi untuk '%s'" #: commit-graph.c #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Menulis grafik komit dalam %d fase" +msgstr[1] "Menulis grafik komit dalam %d fase" #: commit-graph.c msgid "unable to open commit-graph chain file" -msgstr "" +msgstr "tidak dapat membuka berkas rantai grafik komit" #: commit-graph.c msgid "failed to rename base commit-graph file" -msgstr "" +msgstr "gagal menamai ulang berkas grafik komit dasar" #: commit-graph.c msgid "failed to rename temporary commit-graph file" -msgstr "" +msgstr "gagal menamai ulang berkas grafik komit sementara" #: commit-graph.c msgid "Scanning merged commits" -msgstr "" +msgstr "Memindai komit tergabung" #: commit-graph.c msgid "Merging commit-graph" -msgstr "" +msgstr "Menggabungkan grafik komit" #: commit-graph.c msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" -msgstr "" +msgstr "mencoba menulis grafik komit, tapi 'core.commitGraph' dimatikan" #: commit-graph.c msgid "too many commits to write graph" -msgstr "" +msgstr "terlalu banyak komit untuk menulis grafik" #: commit-graph.c msgid "the commit-graph file has incorrect checksum and is likely corrupt" -msgstr "" +msgstr "berkas grafik komit punya checksum salah dan mungkin rusak" #: commit-graph.c #, c-format msgid "commit-graph has incorrect OID order: %s then %s" -msgstr "" +msgstr "grafik komit punya urutan OID salah: %s lalu %s" #: commit-graph.c #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" -msgstr "" +msgstr "grafik komit punya nilai kipas keluar salah: fanout[%d] = %u != %u" #: commit-graph.c #, c-format msgid "failed to parse commit %s from commit-graph" -msgstr "" +msgstr "gagal menguraikan komit %s dari grafik komit" #: commit-graph.c msgid "Verifying commits in commit graph" -msgstr "" +msgstr "Memverifikasi komit di dalam grafik komit" #: commit-graph.c #, c-format msgid "failed to parse commit %s from object database for commit-graph" -msgstr "" +msgstr "gagal menguraikan komit %s dari basis data objek untuk grafik komit" #: commit-graph.c #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" -msgstr "" +msgstr "OID pohon akar untuk komit %s di dalam grafik komit yaitu %s != %s" #: commit-graph.c #, c-format msgid "commit-graph parent list for commit %s is too long" -msgstr "" +msgstr "daftar induk grafik komit untuk %s terlalu panjang" #: commit-graph.c #, c-format msgid "commit-graph parent for %s is %s != %s" -msgstr "" +msgstr "induk grafik komit untuk %s adalah %s != %s" #: commit-graph.c #, c-format msgid "commit-graph parent list for commit %s terminates early" -msgstr "" +msgstr "daftar induk grafik komit untuk komit %s berakhir lebih awal" #: commit-graph.c #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" msgstr "" +"grafik komit punya angka pembuatan nol untuk komit %s, tapi bukan nol di " +"tempat lain" #: commit-graph.c #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" msgstr "" +"grafik komit punya angka pembuatan bukan nol untuk komit %s, tapi nol di " +"tempat lain" #: commit-graph.c #, c-format msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>" -msgstr "" +msgstr "pembuatan grafik komit untuk komit %s yaitu %<PRIuMAX> < %<PRIuMAX>" #: commit-graph.c #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" +"tanggal komit untuk komit %s di dalam grafik komit yaitu %<PRIuMAX> != " +"%<PRIuMAX>" #: commit.c #, c-format msgid "%s %s is not a commit!" -msgstr "" +msgstr "%s %s bukan sebuah komit!" #: commit.c msgid "" @@ -17449,26 +17842,34 @@ msgid "" "Turn this message off by running\n" "\"git config advice.graftFileDeprecated false\"" msgstr "" +"Dukungan untuk <GIT_DIR>/info/grafts usang dan akan dihapus\n" +"pada versi Git di masa yang akan datang.\n" +"\n" +"Mohon gunakan \"git replace --convert-graft-file\"\n" +"untuk mengkonversi cangkuk ke referensi penggantian.\n" +"\n" +"Matikan pesan ini dengan menjalankan\n" +"\"git config advice.graftFileDeprecated false\"" #: commit.c #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." -msgstr "" +msgstr "Komit %s punya tandatangan GPG tak dipercaya, dituduh sebagai %s." #: commit.c #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." -msgstr "" +msgstr "Komit %s punya tandatangan GPG tak jelek, dituduh sebagai %s." #: commit.c #, c-format msgid "Commit %s does not have a GPG signature." -msgstr "" +msgstr "Komit %s tidak punya tandatangan GPG." #: commit.c #, c-format msgid "Commit %s has a good GPG signature by %s\n" -msgstr "" +msgstr "Komit %s punya tandatangan GPG bagus oleh %s\n" #: commit.c msgid "" @@ -17476,214 +17877,239 @@ msgid "" "You may want to amend it after fixing the message, or set the config\n" "variable i18n.commitEncoding to the encoding your project uses.\n" msgstr "" +"Peringatan: pesan komit tidak sesuai dengan UTF-8.\n" +"Anda dapat mengubahnya setelah memperbaiki pesan, atau menyetel variabel\n" +"konfigurasi i18n.commitEncoding ke pengkodean yang proyek Anda gunakan.\n" #: compat/compiler.h msgid "no compiler information available\n" -msgstr "" +msgstr "informasi pengompilasi tidak tersedia\n" #: compat/compiler.h msgid "no libc information available\n" -msgstr "" +msgstr "informasi libc tidak tersedia\n" + +#: compat/disk.h +#, c-format +msgid "could not determine free disk size for '%s'" +msgstr "tidak dapat menentukan ukuran disk kosong untuk '%s'" + +#: compat/disk.h +#, c-format +msgid "could not get info for '%s'" +msgstr "tidak dapat mendapatkan informasi untuk '%s'" #: compat/fsmonitor/fsm-health-win32.c #, c-format msgid "[GLE %ld] health thread could not open '%ls'" -msgstr "" +msgstr "[GLE %ld] utas kesehatan tidak dapat membuka '%ls'" #: compat/fsmonitor/fsm-health-win32.c #, c-format msgid "[GLE %ld] health thread getting BHFI for '%ls'" -msgstr "" +msgstr "[GLE %ld] utas kesehatan mendapatkan BHFI untuk '%ls'" #: compat/fsmonitor/fsm-health-win32.c compat/fsmonitor/fsm-listen-win32.c #, c-format msgid "could not convert to wide characters: '%s'" -msgstr "" +msgstr "tidak dapat mengkonversi ke karakter lebar: '%s'" #: compat/fsmonitor/fsm-health-win32.c #, c-format msgid "BHFI changed '%ls'" -msgstr "" +msgstr "BHFI mengubah '%ls'" #: compat/fsmonitor/fsm-health-win32.c #, c-format msgid "unhandled case in 'has_worktree_moved': %d" -msgstr "" +msgstr "kasus tak tertangani di 'has_worktree_moved': %d" #: compat/fsmonitor/fsm-health-win32.c #, c-format msgid "health thread wait failed [GLE %ld]" -msgstr "" +msgstr "antri utas kesehatan gagal [GLE %ld]" #: compat/fsmonitor/fsm-listen-darwin.c msgid "Unable to create FSEventStream." -msgstr "" +msgstr "tidak dapat membuat FSEventStream." #: compat/fsmonitor/fsm-listen-darwin.c msgid "Failed to start the FSEventStream" -msgstr "" +msgstr "Gagal memulai FSEventStream" #: compat/fsmonitor/fsm-listen-win32.c #, c-format msgid "[GLE %ld] could not convert path to UTF-8: '%.*ls'" -msgstr "" +msgstr "[GLE %ld] tidak dapat mengkonversi jalur ke UTF-8: '%.*ls'" #: compat/fsmonitor/fsm-listen-win32.c #, c-format msgid "[GLE %ld] could not watch '%s'" -msgstr "" +msgstr "[GLE %ld] tidak dapat menonton '%s'" #: compat/fsmonitor/fsm-listen-win32.c #, c-format msgid "[GLE %ld] could not get longname of '%s'" -msgstr "" +msgstr "[GLE %ld] tidak dapat mendapatkan nama panjang dari '%s'" #: compat/fsmonitor/fsm-listen-win32.c #, c-format msgid "ReadDirectoryChangedW failed on '%s' [GLE %ld]" -msgstr "" +msgstr "ReadDirectoryChangedW gagal pada '%s' [GLE %ld]" #: compat/fsmonitor/fsm-listen-win32.c #, c-format msgid "GetOverlappedResult failed on '%s' [GLE %ld]" -msgstr "" +msgstr "GetOverlappedResult gagal pada '%s' [GLE %ld]" #: compat/fsmonitor/fsm-listen-win32.c #, c-format msgid "could not read directory changes [GLE %ld]" -msgstr "" +msgstr "tidak dapat membaca perubahan direktori [GLE %ld]" + +#: compat/fsmonitor/fsm-settings-win32.c +#, c-format +msgid "[GLE %ld] unable to open for read '%ls'" +msgstr "[GLE %ld] tidak dapat membuka untuk dibaca '%ls'" + +#: compat/fsmonitor/fsm-settings-win32.c +#, c-format +msgid "[GLE %ld] unable to get protocol information for '%ls'" +msgstr "[GLE %ld] tidak dapat mendapatkan informasi protokol untuk '%ls'" #: compat/mingw.c #, c-format msgid "failed to copy SID (%ld)" -msgstr "" +msgstr "gagal menyalin SID (%ld)" #: compat/mingw.c #, c-format msgid "failed to get owner for '%s' (%ld)" -msgstr "" +msgstr "gagal mendapatkan pemilik untuk '%s' (%ld)" #: compat/obstack.c msgid "memory exhausted" -msgstr "" +msgstr "memory habis" #: compat/regex/regcomp.c msgid "Success" -msgstr "" +msgstr "Success" #: compat/regex/regcomp.c msgid "No match" -msgstr "" +msgstr "Tidak ada yang cocok" #: compat/regex/regcomp.c msgid "Invalid regular expression" -msgstr "" +msgstr "Ekspresi reguler tidak valid" #: compat/regex/regcomp.c msgid "Invalid collation character" -msgstr "" +msgstr "Karakter kolase tidak valid" #: compat/regex/regcomp.c msgid "Invalid character class name" -msgstr "" +msgstr "Nama kelas karakter tidak valid" #: compat/regex/regcomp.c msgid "Trailing backslash" -msgstr "" +msgstr "Garis miring terbalik tertinggal" #: compat/regex/regcomp.c msgid "Invalid back reference" -msgstr "" +msgstr "Referensi balik tidak valid" #: compat/regex/regcomp.c msgid "Unmatched [ or [^" -msgstr "" +msgstr "[ atau [^ tak tercocok" #: compat/regex/regcomp.c msgid "Unmatched ( or \\(" -msgstr "" +msgstr "( atau \\( tak tercocok" #: compat/regex/regcomp.c msgid "Unmatched \\{" -msgstr "" +msgstr "\\{ tak tercocok" #: compat/regex/regcomp.c msgid "Invalid content of \\{\\}" -msgstr "" +msgstr "Isi \\{\\} tidak valid" #: compat/regex/regcomp.c msgid "Invalid range end" -msgstr "" +msgstr "Ujung rentang tidak valid" #: compat/regex/regcomp.c msgid "Memory exhausted" -msgstr "" +msgstr "Memori habis" #: compat/regex/regcomp.c msgid "Invalid preceding regular expression" -msgstr "" +msgstr "Ekspresi reguler sebelumnya tidak valid" #: compat/regex/regcomp.c msgid "Premature end of regular expression" -msgstr "" +msgstr "Akhir ekspresi reguler prematur" #: compat/regex/regcomp.c msgid "Regular expression too big" -msgstr "" +msgstr "Ekspresi reguler terlalu besar" #: compat/regex/regcomp.c msgid "Unmatched ) or \\)" -msgstr "" +msgstr ") atau \\) tak tercocok" #: compat/regex/regcomp.c msgid "No previous regular expression" -msgstr "" +msgstr "Tidak ada ekspresi reguler sebelumnya" #: compat/simple-ipc/ipc-unix-socket.c compat/simple-ipc/ipc-win32.c msgid "could not send IPC command" -msgstr "" +msgstr "tidak dapat mengirimkan perintah IPC" #: compat/simple-ipc/ipc-unix-socket.c compat/simple-ipc/ipc-win32.c msgid "could not read IPC response" -msgstr "" +msgstr "tidak dapat membaca jawaban IPC" #: compat/simple-ipc/ipc-unix-socket.c #, c-format msgid "could not start accept_thread '%s'" -msgstr "" +msgstr "tidak dapat memulai accept_thread '%s'" #: compat/simple-ipc/ipc-unix-socket.c #, c-format msgid "could not start worker[0] for '%s'" -msgstr "" +msgstr "tidak dapat memulai worker[0] untuk '%s'" #: compat/simple-ipc/ipc-win32.c #, c-format msgid "ConnectNamedPipe failed for '%s' (%lu)" -msgstr "" +msgstr "ConnectNamedPipe gagal untuk '%s' (%lu)" #: compat/simple-ipc/ipc-win32.c #, c-format msgid "could not create fd from pipe for '%s'" -msgstr "" +msgstr "tidak dapat membuat penjelas berkas dari pipa untuk '%s'" #: compat/simple-ipc/ipc-win32.c #, c-format msgid "could not start thread[0] for '%s'" -msgstr "" +msgstr "tidak dapat memulai thread[0] untuk '%s'" #: compat/simple-ipc/ipc-win32.c #, c-format msgid "wait for hEvent failed for '%s'" -msgstr "" +msgstr "antri untuk hEvent gagal untuk '%s'" #: compat/terminal.c msgid "cannot resume in the background, please use 'fg' to resume" msgstr "" +"tidak dapat melanjutkan di belakang layar, mohon gunakan 'fg' untuk " +"melanjutkan" #: compat/terminal.c msgid "cannot restore terminal settings" -msgstr "" +msgstr "tidak dapat mengembalikan setelan terminal" #: config.c #, c-format @@ -18231,233 +18657,15 @@ msgstr "gagal menulis ke rev-list" msgid "failed to close rev-list's stdin" msgstr "gagal menutup masukan standar rev-list" -#: contrib/scalar/scalar.c worktree.c -#, c-format -msgid "'%s' does not exist" -msgstr "'%s' tidak ada" - -#: contrib/scalar/scalar.c -msgid "need a working directory" -msgstr "" - -#: contrib/scalar/scalar.c -msgid "could not find enlistment root" -msgstr "" - -#: contrib/scalar/scalar.c -#, c-format -msgid "could not switch to '%s'" -msgstr "" - -#: contrib/scalar/scalar.c -#, c-format -msgid "could not configure %s=%s" -msgstr "" - -#: contrib/scalar/scalar.c -msgid "could not configure log.excludeDecoration" -msgstr "" - -#: contrib/scalar/scalar.c -msgid "Scalar enlistments require a worktree" -msgstr "" - -#: contrib/scalar/scalar.c dir.c -#, c-format -msgid "could not open directory '%s'" -msgstr "" - -#: contrib/scalar/scalar.c -#, c-format -msgid "skipping '%s', which is neither file nor directory" -msgstr "" - -#: contrib/scalar/scalar.c -#, c-format -msgid "could not determine free disk size for '%s'" -msgstr "" - -#: contrib/scalar/scalar.c -#, c-format -msgid "could not get info for '%s'" -msgstr "" - -#: contrib/scalar/scalar.c -#, c-format -msgid "remote HEAD is not a branch: '%.*s'" -msgstr "" - -#: contrib/scalar/scalar.c -msgid "failed to get default branch name from remote; using local default" -msgstr "" - -#: contrib/scalar/scalar.c -msgid "failed to get default branch name" -msgstr "" - -#: contrib/scalar/scalar.c -msgid "failed to unregister repository" -msgstr "" - -#: contrib/scalar/scalar.c -msgid "failed to delete enlistment directory" -msgstr "" - -#: contrib/scalar/scalar.c -msgid "branch to checkout after clone" -msgstr "" - -#: contrib/scalar/scalar.c -msgid "when cloning, create full working directory" -msgstr "" - -#: contrib/scalar/scalar.c -msgid "only download metadata for the branch that will be checked out" -msgstr "" - -#: contrib/scalar/scalar.c -msgid "scalar clone [<options>] [--] <repo> [<dir>]" -msgstr "" - -#: contrib/scalar/scalar.c -#, c-format -msgid "cannot deduce worktree name from '%s'" -msgstr "" - -#: contrib/scalar/scalar.c -#, c-format -msgid "directory '%s' exists already" -msgstr "" - -#: contrib/scalar/scalar.c -#, c-format -msgid "failed to get default branch for '%s'" -msgstr "" - -#: contrib/scalar/scalar.c -#, c-format -msgid "could not configure remote in '%s'" -msgstr "" - -#: contrib/scalar/scalar.c -#, c-format -msgid "could not configure '%s'" -msgstr "" - -#: contrib/scalar/scalar.c -msgid "partial clone failed; attempting full clone" -msgstr "" - -#: contrib/scalar/scalar.c -msgid "could not configure for full clone" -msgstr "" - -#: contrib/scalar/scalar.c -msgid "scalar diagnose [<enlistment>]" -msgstr "" - -#: contrib/scalar/scalar.c -#, c-format -msgid "could not create directory for '%s'" -msgstr "" - -#: contrib/scalar/scalar.c -msgid "could not duplicate stdout" -msgstr "" - -#: contrib/scalar/scalar.c -msgid "failed to write archive" -msgstr "" - -#: contrib/scalar/scalar.c -msgid "`scalar list` does not take arguments" -msgstr "" - -#: contrib/scalar/scalar.c -msgid "scalar register [<enlistment>]" -msgstr "" - -#: contrib/scalar/scalar.c -msgid "reconfigure all registered enlistments" -msgstr "" - -#: contrib/scalar/scalar.c -msgid "scalar reconfigure [--all | <enlistment>]" -msgstr "" - -#: contrib/scalar/scalar.c -msgid "--all or <enlistment>, but not both" -msgstr "" - -#: contrib/scalar/scalar.c -#, c-format -msgid "git repository gone in '%s'" -msgstr "" - -#: contrib/scalar/scalar.c -msgid "" -"scalar run <task> [<enlistment>]\n" -"Tasks:\n" -msgstr "" - -#: contrib/scalar/scalar.c -#, c-format -msgid "no such task: '%s'" -msgstr "" - -#: contrib/scalar/scalar.c -msgid "scalar unregister [<enlistment>]" -msgstr "" - -#: contrib/scalar/scalar.c -msgid "scalar delete <enlistment>" -msgstr "" - -#: contrib/scalar/scalar.c -msgid "refusing to delete current working directory" -msgstr "" - -#: contrib/scalar/scalar.c -msgid "include Git version" -msgstr "" - -#: contrib/scalar/scalar.c -msgid "include Git's build options" -msgstr "" - -#: contrib/scalar/scalar.c -msgid "scalar verbose [-v | --verbose] [--build-options]" -msgstr "" - -#: contrib/scalar/scalar.c -msgid "-C requires a <directory>" -msgstr "" - -#: contrib/scalar/scalar.c -#, c-format -msgid "could not change to '%s'" -msgstr "" - -#: contrib/scalar/scalar.c -msgid "-c requires a <key>=<value> argument" -msgstr "" - -#: contrib/scalar/scalar.c -msgid "" -"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n" -"\n" -"Commands:\n" -msgstr "" - #: convert.c #, c-format msgid "illegal crlf_action %d" -msgstr "" +msgstr "crlf_action %d ilegal" #: convert.c #, c-format msgid "CRLF would be replaced by LF in %s" -msgstr "" +msgstr "CRLF akan digantikan oleh LF di %s" #: convert.c #, c-format @@ -18465,11 +18673,13 @@ msgid "" "in the working copy of '%s', CRLF will be replaced by LF the next time Git " "touches it" msgstr "" +"di dalam salinan kerja '%s', CRLF akan digantikan oleh LF pada saat Git " +"menyentuhnya lain kali" #: convert.c #, c-format msgid "LF would be replaced by CRLF in %s" -msgstr "" +msgstr "LF akan digantikan oleh CRLF di %s" #: convert.c #, c-format @@ -18477,11 +18687,13 @@ msgid "" "in the working copy of '%s', LF will be replaced by CRLF the next time Git " "touches it" msgstr "" +"di dalam salinan kerja '%s', LF akan digantikan oleh LF pada saat Git " +"menyentuhnya lain kali" #: convert.c #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" -msgstr "" +msgstr "BOM tidak diperbolehkan di '%s' jika dikodekan sebagai %s" #: convert.c #, c-format @@ -18489,11 +18701,13 @@ msgid "" "The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as " "working-tree-encoding." msgstr "" +"Berkas '%s' berisi tanda urutan bita (BOM). Mohon gunakan UTF-%.*s sebagai " +"pengkodean pohon kerja." #: convert.c #, c-format msgid "BOM is required in '%s' if encoded as %s" -msgstr "" +msgstr "BOM diperlukan di '%s' jika dikodekan sebagai %s" #: convert.c #, c-format @@ -18501,49 +18715,51 @@ msgid "" "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" "%sLE (depending on the byte order) as working-tree-encoding." msgstr "" +"Berkas '%s' kehilangan tanda urutan bita (BOM). Mohon gunakan UTF-%sBE atau " +"UTF-%sLE (tergantung pada urutan bita) sebagai pengkodean pohon kerja." #: convert.c #, c-format msgid "failed to encode '%s' from %s to %s" -msgstr "" +msgstr "gagal mengkodekan '%s' dari %s ke %s" #: convert.c #, c-format msgid "encoding '%s' from %s to %s and back is not the same" -msgstr "" +msgstr "pengkodean '%s' dari %s ke %s dan sebaliknya berbeda" #: convert.c #, c-format msgid "cannot fork to run external filter '%s'" -msgstr "" +msgstr "tidak dapat menggarpu untuk menjalankan penyaring eksternal '%s'" #: convert.c #, c-format msgid "cannot feed the input to external filter '%s'" -msgstr "" +msgstr "tidak dapat mengumpan masukan ke penyaring eksternal '%s'" #: convert.c #, c-format msgid "external filter '%s' failed %d" -msgstr "" +msgstr "penyaring eksternal '%s' gagal %d" #: convert.c #, c-format msgid "read from external filter '%s' failed" -msgstr "" +msgstr "gagal membaca dari penyaring eksternal '%s'" #: convert.c #, c-format msgid "external filter '%s' failed" -msgstr "" +msgstr "penyaring eksternal '%s' gagal" #: convert.c msgid "unexpected filter type" -msgstr "" +msgstr "tipe penyaring tidak diharapkan" #: convert.c msgid "path name too long for external filter" -msgstr "" +msgstr "nama jalur terlalu panjang untuk penyaring eksternal" #: convert.c #, c-format @@ -18551,48 +18767,50 @@ msgid "" "external filter '%s' is not available anymore although not all paths have " "been filtered" msgstr "" +"penyaring eksternal '%s' tidak tersedia lagi walaupun tidak semua jalur " +"sudah disaring" #: convert.c msgid "true/false are no valid working-tree-encodings" -msgstr "" +msgstr "true/false bukanlah pengkodean pohon kerja valid" #: convert.c #, c-format msgid "%s: clean filter '%s' failed" -msgstr "" +msgstr "%s: penyaring bersih '%s' gagal" #: convert.c #, c-format msgid "%s: smudge filter %s failed" -msgstr "" +msgstr "%s: penyaring noda %s gagal" #: credential.c #, c-format msgid "skipping credential lookup for key: credential.%s" -msgstr "" +msgstr "melewati pencarian kredensial untuk kunci: credential.%s" #: credential.c msgid "refusing to work with credential missing host field" -msgstr "" +msgstr "menolak bekerja dengan kredensial yang kehilangan bidang host" #: credential.c msgid "refusing to work with credential missing protocol field" -msgstr "" +msgstr "menolak bekerja dengan kredensial yang kehilangan bidang protokol" #: credential.c #, c-format msgid "url contains a newline in its %s component: %s" -msgstr "" +msgstr "url berisi baris baru pada komponen %s: %s" #: credential.c #, c-format msgid "url has no scheme: %s" -msgstr "" +msgstr "url tidak punya skema: %s" #: credential.c #, c-format msgid "credential url cannot be parsed: %s" -msgstr "" +msgstr "url kredensial tidak dapat diuraikan: %s" #: date.c msgid "in the future" @@ -18664,57 +18882,93 @@ msgstr[1] "%<PRIuMAX> tahun yang lalu" #: delta-islands.c msgid "Propagating island marks" -msgstr "" +msgstr "Menyebarkan penanda pulau" #: delta-islands.c #, c-format msgid "bad tree object %s" -msgstr "" +msgstr "objek pohon jelek %s" #: delta-islands.c #, c-format msgid "failed to load island regex for '%s': %s" -msgstr "" +msgstr "gagal memuat regex pulau untuk '%s': %s" #: delta-islands.c #, c-format msgid "island regex from config has too many capture groups (max=%d)" msgstr "" +"regeks pulau dari konfigurasi punya terlalu banyak grup tangkap (max=%d)" #: delta-islands.c #, c-format msgid "Marked %d islands, done.\n" -msgstr "" +msgstr "%d pulau ditandai, selesai.\n" + +#: diagnose.c +#, c-format +msgid "invalid --%s value '%s'" +msgstr "nilai --%s tidak valid '%s'" + +#: diagnose.c +#, c-format +msgid "could not archive missing directory '%s'" +msgstr "tidak dapat mengarsipkan direktori hilang '%s'" + +#: diagnose.c dir.c +#, c-format +msgid "could not open directory '%s'" +msgstr "tidak dapat membuka direktori '%s'" + +#: diagnose.c +#, c-format +msgid "skipping '%s', which is neither file nor directory" +msgstr "melewatkan '%s', yang bukan berkas atau direktori" + +#: diagnose.c +msgid "could not duplicate stdout" +msgstr "tidak dapat menggandakan keluaran standar" + +#: diagnose.c +#, c-format +msgid "could not add directory '%s' to archiver" +msgstr "tidak dapat menambahkan direktori '%s' ke pengarsip" + +#: diagnose.c +msgid "failed to write archive" +msgstr "gagal menulis arsip" #: diff-lib.c msgid "--merge-base does not work with ranges" -msgstr "" +msgstr "--merge-base tidak bekerja dengan rentang" #: diff-lib.c msgid "--merge-base only works with commits" -msgstr "" +msgstr "--merge-base hanya bekerja dengan komit" #: diff-lib.c msgid "unable to get HEAD" -msgstr "" +msgstr "tidak dapat mendapatkan HEAD" #: diff-lib.c msgid "no merge base found" -msgstr "" +msgstr "dasar penggabungan tidak ditemukan" #: diff-lib.c msgid "multiple merge bases found" -msgstr "" +msgstr "banyak dasar penggabungan ditemukan" #: diff-no-index.c msgid "git diff --no-index [<options>] <path> <path>" -msgstr "" +msgstr "git diff --no-index [<opsi>] <jalur> <jalur>" #: diff-no-index.c msgid "" "Not a git repository. Use --no-index to compare two paths outside a working " "tree" msgstr "" +"Bukan sebuah repositori git. Gunakan --no-index untuk membandingkan dua " +"jalur di luar pohon kerja" #: diff.c #, c-format @@ -18802,7 +19056,7 @@ msgstr "nilai --stat tidak valid: %s" #: diff.c parse-options.c #, c-format msgid "%s expects a numerical value" -msgstr "%s harap nilai numerik" +msgstr "%s berharap nilai numerik" #: diff.c #, c-format @@ -19343,53 +19597,53 @@ msgstr "" #: diffcore-order.c #, c-format msgid "failed to read orderfile '%s'" -msgstr "" +msgstr "gagal membaca berkas urutan '%s'" #: diffcore-rename.c msgid "Performing inexact rename detection" -msgstr "" +msgstr "Melakukan deteksi penamaan ulang tidak eksak" #: diffcore-rotate.c #, c-format msgid "No such path '%s' in the diff" -msgstr "" +msgstr "Tidak ada jalur seperti '%s' di dalam diff" #: dir.c #, c-format msgid "pathspec '%s' did not match any file(s) known to git" -msgstr "" +msgstr "spek jalur '%s' tidak cocok dengan berkas apapun yang git kenal" #: dir.c #, c-format msgid "unrecognized pattern: '%s'" -msgstr "" +msgstr "pola tidak dikenal: '%s'" #: dir.c #, c-format msgid "unrecognized negative pattern: '%s'" -msgstr "" +msgstr "pola negatif tidak dikenal: '%s'" #: dir.c #, c-format msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" -msgstr "" +msgstr "berkas sparse-checkout Anda mungkin ada masalah: pola '%s' diulangi" #: dir.c msgid "disabling cone pattern matching" -msgstr "" +msgstr "mematikan pencocokan pola kerucut" #: dir.c #, c-format msgid "cannot use %s as an exclude file" -msgstr "" +msgstr "tidak dapat menggunakan %s sebagai berkas pengecualian" #: dir.c msgid "failed to get kernel name and information" -msgstr "" +msgstr "gagal mendapatkan nama dan informasi kernel" #: dir.c msgid "untracked cache is disabled on this system or location" -msgstr "" +msgstr "tembolok tak terlacat dimatikan pada sistem atau lokasi ini" #: dir.c msgid "" @@ -19402,41 +19656,41 @@ msgstr "" #: dir.c #, c-format msgid "index file corrupt in repo %s" -msgstr "" +msgstr "berkas indeks rusak pada repo %s" #: dir.c #, c-format msgid "could not create directories for %s" -msgstr "" +msgstr "tidak dapat membuat direktori untuk %s" #: dir.c #, c-format msgid "could not migrate git directory from '%s' to '%s'" -msgstr "" +msgstr "tidak dapat memigrasikan direktori git dari '%s' ke '%s'" #: editor.c #, c-format msgid "hint: Waiting for your editor to close the file...%c" -msgstr "" +msgstr "petunjuk: Menunggu penyunting Anda untuk menutup berkas...%c" #: entry.c msgid "Filtering content" -msgstr "" +msgstr "Menyaring isi" #: entry.c #, c-format msgid "could not stat file '%s'" -msgstr "" +msgstr "tidak dapat men-stat berkas '%s'" #: environment.c #, c-format msgid "bad git namespace path \"%s\"" -msgstr "" +msgstr "jalur ruang nama git jelek \"%s\"" #: exec-cmd.c #, c-format msgid "too many args to run %s" -msgstr "" +msgstr "terlalu banyak argumen untuk menjalankan %s" #: fetch-pack.c msgid "git fetch-pack: expected shallow list" @@ -19460,6 +19714,10 @@ msgid "unable to write to remote" msgstr "tidak dapat menulis ke remote" #: fetch-pack.c +msgid "Server supports filter" +msgstr "Peladen mendukung saringan" + +#: fetch-pack.c #, c-format msgid "invalid shallow line: %s" msgstr "baris dangkal tidak valid: %s" @@ -19601,10 +19859,6 @@ msgid "Server does not support shallow requests" msgstr "Peladen tidak mendukung permintaan dangkal" #: fetch-pack.c -msgid "Server supports filter" -msgstr "Peladen mendukung saringan" - -#: fetch-pack.c msgid "unable to write request to remote" msgstr "tidak dapat menulis permintaan kepada remote" @@ -19690,47 +19944,49 @@ msgstr "Peladen tidak memperbolehkan permintaan untuk objek tak diiklankan %s" #: fsmonitor-ipc.c #, c-format msgid "fsmonitor_ipc__send_query: invalid path '%s'" -msgstr "" +msgstr "fsmonitor_ipc__send_query: jalur tidak valid '%s'" #: fsmonitor-ipc.c #, c-format msgid "fsmonitor_ipc__send_query: unspecified error on '%s'" -msgstr "" +msgstr "fsmonitor_ipc__send_query: kesalahan tidak dijelaskan pada '%s'" #: fsmonitor-ipc.c msgid "fsmonitor--daemon is not running" -msgstr "" +msgstr "fsmonitor--daemon tidak berjalan" #: fsmonitor-ipc.c #, c-format msgid "could not send '%s' command to fsmonitor--daemon" -msgstr "" +msgstr "tidak dapat mengirimkan perintah '%s' ke fsmonitor--daemon" #: fsmonitor-settings.c #, c-format msgid "bare repository '%s' is incompatible with fsmonitor" -msgstr "" +msgstr "repositori bare '%s' tidak kompatibel dengan fsmonitor" #: fsmonitor-settings.c #, c-format msgid "repository '%s' is incompatible with fsmonitor due to errors" -msgstr "" +msgstr "repositori '%s' tidak kompatibel dengan fsmonitor karena kesalahan" #: fsmonitor-settings.c #, c-format msgid "remote repository '%s' is incompatible with fsmonitor" -msgstr "" +msgstr "repositori remote '%s' tidak kompatibel dengan fsmonitor" #: fsmonitor-settings.c #, c-format msgid "virtual repository '%s' is incompatible with fsmonitor" -msgstr "" +msgstr "repositori virtual '%s' tidka kompatibel dengan fsmonitor" #: fsmonitor-settings.c #, c-format msgid "" "repository '%s' is incompatible with fsmonitor due to lack of Unix sockets" msgstr "" +"repositori '%s' tidak kompatibel dengan fsmonitor karena kekurangan soket " +"Unix" #: git.c msgid "" @@ -20027,6 +20283,14 @@ msgid "Low-level Commands / Internal Helpers" msgstr "Perintah Tingak Rendah / Pembantu Internal" #: help.c +msgid "User-facing repository, command and file interfaces" +msgstr "Antarmuka repositori, perintah, dan berkas menghadap-pengguna" + +#: help.c +msgid "Developer-facing file formats, protocols and other interfaces" +msgstr "Antarmuka menghadap-pengembang format berkas, protokol, dan lainnya" + +#: help.c #, c-format msgid "available git commands in '%s'" msgstr "perintah git yang tersedia di '%s'" @@ -20044,6 +20308,14 @@ msgid "The Git concept guides are:" msgstr "Panduan konsep Git adalah:" #: help.c +msgid "User-facing repository, command and file interfaces:" +msgstr "Antarmuka repositori, perintah, dan berkas menghadap-pengguna:" + +#: help.c +msgid "File formats, protocols and other developer interfaces:" +msgstr "Antarmuka format berkas, protokol, dan antarmuka lainnya:" + +#: help.c msgid "External commands" msgstr "Perintah eksternal" @@ -20140,51 +20412,48 @@ msgstr "" "Anda dapat menonaktifkan peringatan ini dengan `git config advice." "ignoredHook false`." -#: hook.c -#, c-format -msgid "Couldn't start hook '%s'\n" -msgstr "Tidak dapat memulai kait '%s'\n" - #: http-fetch.c #, c-format msgid "argument to --packfile must be a valid hash (got '%s')" -msgstr "" +msgstr "argumen ke --packfile harus sebuah hash valid (dapat '%s')" #: http-fetch.c msgid "not a git repository" -msgstr "" +msgstr "bukan sebuah repositori git" #: http.c #, c-format msgid "negative value for http.postBuffer; defaulting to %d" -msgstr "" +msgstr "nilai negatif untuk http.postBuffer; asalkan ke %d" #: http.c msgid "Delegation control is not supported with cURL < 7.22.0" -msgstr "" +msgstr "Kontrol delegasi tidak didukung oleh cURL < 7.22.0" #: http.c msgid "Public key pinning not supported with cURL < 7.39.0" -msgstr "" +msgstr "Penyematan kunci publik tidak didukung oleh cURL < 7.39.0" #: http.c msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" -msgstr "" +msgstr "CURLSSLOPT_NO_REVOKE tidak didukung dengan cURL < 7.44.0" #: http.c #, c-format msgid "Unsupported SSL backend '%s'. Supported SSL backends:" -msgstr "" +msgstr "Tulang punggung SSL '%s' tidak didukung, yang didukung:" #: http.c #, c-format msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" msgstr "" +"Tidak dapat menyetel tulang punggung SSL ke '%s': cURL dibangun tanpa tulang " +"punggung SSL" #: http.c #, c-format msgid "Could not set SSL backend to '%s': already set" -msgstr "" +msgstr "Tidak dapat menyetel tulang punggung SSL ke '%s': sudah disetel" #: http.c #, c-format @@ -20193,6 +20462,9 @@ msgid "" " asked for: %s\n" " redirect: %s" msgstr "" +"tidak dapat memperbarui dasar url dari pengalihan:\n" +" diminta: %s\n" +" pengalihan: %s" #: ident.c msgid "Author identity unknown\n" @@ -20258,71 +20530,72 @@ msgstr "nama hanya terdiri dari karakter yang tidak diperbolehkan: %s" #: list-objects-filter-options.c msgid "expected 'tree:<depth>'" -msgstr "" +msgstr "'tree:<kedalaman> diharapkan'" #: list-objects-filter-options.c msgid "sparse:path filters support has been dropped" -msgstr "" +msgstr "dukungan penyaring sparse:path sudah ditiadakan" #: list-objects-filter-options.c #, c-format msgid "'%s' for 'object:type=<type>' is not a valid object type" -msgstr "" +msgstr "'%s' untuk 'object:type=<tipe>' bukan tipe objek valid" #: list-objects-filter-options.c #, c-format msgid "invalid filter-spec '%s'" -msgstr "" +msgstr "spek penyaring tidak valid '%s'" #: list-objects-filter-options.c #, c-format msgid "must escape char in sub-filter-spec: '%c'" -msgstr "" +msgstr "harus melarikan karakter pada spek subpenyaring: '%c'" #: list-objects-filter-options.c msgid "expected something after combine:" -msgstr "" +msgstr "sesuatu setelah pencampuran diharapkan:" #: list-objects-filter-options.c msgid "multiple filter-specs cannot be combined" -msgstr "" +msgstr "spek penyaring lebih dari satu tidak dapat dicampurkan" #: list-objects-filter-options.c msgid "unable to upgrade repository format to support partial clone" msgstr "" +"tidak dapat meningkatkan format repositori untuk mendukung klon parsial" #: list-objects-filter-options.h msgid "args" -msgstr "" +msgstr "argumen" #: list-objects-filter-options.h msgid "object filtering" -msgstr "" +msgstr "penyaringan objek" #: list-objects-filter.c #, c-format msgid "unable to access sparse blob in '%s'" -msgstr "" +msgstr "tidak dapat mengakses blob tipis di '%s'" #: list-objects-filter.c #, c-format msgid "unable to parse sparse filter data in %s" -msgstr "" +msgstr "tidak dapat menyaring data penyaring tipis di %s" #: list-objects.c #, c-format msgid "entry '%s' in tree %s has tree mode, but is not a tree" -msgstr "" +msgstr "entri '%s' di dalam pohon %s punya mode pohon, tetapi bukan pohon" #: list-objects.c #, c-format msgid "entry '%s' in tree %s has blob mode, but is not a blob" -msgstr "" +msgstr "entri '%s' di dalam pohon %s punya mode blob, tetapi bukan blob" #: list-objects.c #, c-format msgid "unable to load root tree for commit %s" -msgstr "" +msgstr "tidak dapat memuat pohon akar untuk komit %s" #: lockfile.c #, c-format @@ -20335,40 +20608,41 @@ msgid "" "may have crashed in this repository earlier:\n" "remove the file manually to continue." msgstr "" +"Tidak dapat membuat '%s.lock': %s.\n" +"\n" +"Sepertinya proses git lainnya berjalan pada repositori ini, seperti\n" +"penyunting yang dibuka oleh 'git commit'. Mohon pastikan semua proses\n" +"berhenti dan coba lagi. Jika masih gagal, mungkin sebuah proses git hancur\n" +"pada repositori ini sebelumnya: hapus berkas secara manual untuk melanjutkan." #: lockfile.c #, c-format msgid "Unable to create '%s.lock': %s" -msgstr "" +msgstr "Tidak dapat membuat '%s.lock': %s" #: ls-refs.c #, c-format msgid "unexpected line: '%s'" -msgstr "" +msgstr "baris tak diharapkan: '%s'" #: ls-refs.c msgid "expected flush after ls-refs arguments" -msgstr "" +msgstr "bilasan diharapkan setelah argumen ls-refs" #: mailinfo.c msgid "quoted CRLF detected" -msgstr "" - -#: merge-ort-wrappers.c merge-recursive.c -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -" %s" -msgstr "" -"Perubahan lokal Anda terhadap berkas berikut akan ditimpa oleh " -"penggabungan:\n" -" %s" +msgstr "CRLF terkutip terdeteksi" #: merge-ort.c merge-recursive.c #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "Gagal menggabungkan submodul %s (tidak di-checkout)" +#: merge-ort.c +#, c-format +msgid "Failed to merge submodule %s (no merge base)" +msgstr "Gagal menggabungkan submodul %s (tidak ada dasar penggabungan)" + #: merge-ort.c merge-recursive.c #, c-format msgid "Failed to merge submodule %s (commits not present)" @@ -20393,28 +20667,10 @@ msgstr "Gagal menggabungkan submodul %s" #: merge-ort.c #, c-format msgid "" -"Failed to merge submodule %s, but a possible merge resolution exists:\n" -"%s\n" +"Failed to merge submodule %s, but a possible merge resolution exists: %s" msgstr "" -"Gagal menggabungkan submodul %s, tetapi sebuah penyelesaian penggabungan " -"yang mungkin ada:\n" -"%s\n" - -#: merge-ort.c merge-recursive.c -#, c-format -msgid "" -"If this is correct simply add it to the index for example\n" -"by using:\n" -"\n" -" git update-index --cacheinfo 160000 %s \"%s\"\n" -"\n" -"which will accept this suggestion.\n" -msgstr "" -"Jika benar, cukup misalkan tambahkan ke indeks dengan menggunakan:\n" -"\n" -" git update-index --cacheinfo 160000 %s \"%s\"\n" -"\n" -"yang akan menerima saran ini.\n" +"Gagal menggabungkan submodul %s, tetapi ada kemungkinan penyelesaian " +"penggabungan: %s" #: merge-ort.c #, c-format @@ -20603,14 +20859,47 @@ msgstr "" "KONFLIK (pengubahan/penghapusan): %s dihapus di %s dan diubah di %s. Versi " "%s dari %s ditinggalkan di dalam pohon." +#. TRANSLATORS: This is a line of advice to resolve a merge +#. 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" +#. #: merge-ort.c #, c-format msgid "" -"Note: %s not up to date and in way of checking out conflicted version; old " -"copy renamed to %s" +" - go to submodule (%s), and either merge commit %s\n" +" or update to an existing commit which has merged those changes\n" msgstr "" -"Catatan: %s tidak terbaru dan dalam men-checkout versi berkonflik; salinan " -"lama dinamai ulang ke %s" +" - pergi ke submodul (%s), dan baik gabungkan komit %s\n" +" atau perbarui ke komit yang sudah ada yang sudah menggabungkan " +"perubahan tersebut\n" + +#: merge-ort.c +#, c-format +msgid "" +"Recursive merging with submodules currently only supports trivial cases.\n" +"Please manually handle the merging of each conflicted submodule.\n" +"This can be accomplished with the following steps:\n" +"%s - come back to superproject and run:\n" +"\n" +" git add %s\n" +"\n" +" to record the above merge or update\n" +" - resolve any other conflicts in the superproject\n" +" - commit the resulting index in the superproject\n" +msgstr "" +"Saat ini penggabungan rekursif dengan submodul hanya mendukung kasus-kasus " +"sepele.\n" +"Mohon tangani penggabungan setiap submodul berkonflik secara manual.\n" +"Hal ini dapat dicapai dengan langkah berikut:\n" +"%s - kembali ke proyek induk dan jalankan:\n" +"\n" +" git add %s\n" +"\n" +" untuk merekam penggabungan di atas atau perbarui\n" +" - selesaikan semua konflik lainnya di dalam proyek induk\n" +" - komit hasil indeks di dalam proyek induk\n" #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge #. base, and 2-3) the trees for the two trees we're merging. @@ -20702,6 +20991,22 @@ msgstr "Sebuah resolusi penggabungan yang mungkin ditemukan untuk submodul:\n" #: merge-recursive.c #, c-format +msgid "" +"If this is correct simply add it to the index for example\n" +"by using:\n" +"\n" +" git update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"which will accept this suggestion.\n" +msgstr "" +"Jika benar, cukup misalkan tambahkan ke indeks dengan menggunakan:\n" +"\n" +" git update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"yang akan menerima saran ini.\n" + +#: merge-recursive.c +#, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "Gagal menggabungkan submodul %s (banyak penggabungan ditemukan)" @@ -21120,17 +21425,17 @@ msgstr "tidak dapat menyelesaikan pack-objects" #: name-hash.c #, c-format msgid "unable to create lazy_dir thread: %s" -msgstr "" +msgstr "tidak dapat membuat utas lazy_dir: %s" #: name-hash.c #, c-format msgid "unable to create lazy_name thread: %s" -msgstr "" +msgstr "tidak dapat membuat utas lazy_name: %s" #: name-hash.c #, c-format msgid "unable to join lazy_name thread: %s" -msgstr "" +msgstr "tidak dapat menggabungkan utas lazy_name: %s" #: notes-merge.c #, c-format @@ -21139,25 +21444,29 @@ msgid "" "Please, use 'git notes merge --commit' or 'git notes merge --abort' to " "commit/abort the previous merge before you start a new notes merge." msgstr "" +"Anda belum menyelesaikan penggabungan catatan Anda sebelumnya (%s ada).\n" +"Mohon gunakan 'git notes merge --commit' atau 'git notes merge --abort' " +"untuk mengkomit/membatalkan penggabungan sebelumnya sebelum Anda memulai " +"penggabungan catatan baru." #: notes-merge.c #, c-format msgid "You have not concluded your notes merge (%s exists)." -msgstr "" +msgstr "Anda belum menyelesaikan penggabungan catatan Anda (%s ada)." #: notes-utils.c msgid "Cannot commit uninitialized/unreferenced notes tree" -msgstr "" +msgstr "Tidak dapat mengkomit pohon catatan tak dinisialisasi/tak dirujuk" #: notes-utils.c #, c-format msgid "Bad notes.rewriteMode value: '%s'" -msgstr "" +msgstr "Nilai notes.rewriteMode jelek: '%s'" #: notes-utils.c #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" -msgstr "" +msgstr "Menolak menulis ulang catatan di %s (di luar refs/notes/)" #. TRANSLATORS: The first %s is the name of #. the environment variable, the second %s is @@ -21166,7 +21475,7 @@ msgstr "" #: notes-utils.c #, c-format msgid "Bad %s value: '%s'" -msgstr "" +msgstr "Nilai %s jelek: '%s'" #: object-file.c #, c-format @@ -21350,6 +21659,26 @@ msgstr "kebingungan oleh data sumber objek tidak stabil untuk %s" #: object-file.c #, c-format +msgid "write stream object %ld != %<PRIuMAX>" +msgstr "tulis objek arus %ld != %<PRIuMAX>" + +#: object-file.c +#, c-format +msgid "unable to stream deflate new object (%d)" +msgstr "tidak dapat mengempis arus objek baru (%d)" + +#: object-file.c +#, c-format +msgid "deflateEnd on stream object failed (%d)" +msgstr "deflateEnd pada objek arus gagal (%d)" + +#: object-file.c +#, c-format +msgid "unable to create directory %s" +msgstr "gagal membuat direktori %s" + +#: object-file.c +#, c-format msgid "cannot read object for %s" msgstr "tidak dapat membaca objek untuk %s" @@ -21616,6 +21945,72 @@ msgstr "tidak dapat menguraikan objek: %s" msgid "hash mismatch %s" msgstr "hash tidak cocok %s" +#: pack-bitmap-write.c +msgid "trying to write commit not in index" +msgstr "mencoba menulis komit yang bukan di indeks" + +#: pack-bitmap.c +msgid "failed to load bitmap index (corrupted?)" +msgstr "gagal menulis indeks bitmap (rusak?)" + +#: pack-bitmap.c +msgid "corrupted bitmap index (too small)" +msgstr "indeks bitmap rusak (terlalu kecil)" + +#: pack-bitmap.c +msgid "corrupted bitmap index file (wrong header)" +msgstr "berkas indeks bitmap rusak (kepala salah)" + +#: pack-bitmap.c +#, c-format +msgid "unsupported version '%d' for bitmap index file" +msgstr "versi '%d' tidak didukung untuk berkas indeks bitmap" + +#: pack-bitmap.c +msgid "corrupted bitmap index file (too short to fit hash cache)" +msgstr "berkas indeks bitmap rusak (terlalu pendek untuk masuk tembolok hash)" + +#: pack-bitmap.c +msgid "corrupted bitmap index file (too short to fit lookup table)" +msgstr "" +"berkas indeks bitmap rusak (terlalu pendek untuk masuk tabel pencarian)" + +#: pack-bitmap.c +#, c-format +msgid "duplicate entry in bitmap index: '%s'" +msgstr "entri duplikat di indeks bitmap: '%s'" + +#: pack-bitmap.c +#, c-format +msgid "corrupt ewah bitmap: truncated header for entry %d" +msgstr "bitmap ewah rusak: kepala terpotong untuk entri %d" + +#: pack-bitmap.c +#, c-format +msgid "corrupt ewah bitmap: commit index %u out of range" +msgstr "bitmap ewah rusak: indeks komit %u di luar jangkauan" + +#: pack-bitmap.c +msgid "corrupted bitmap pack index" +msgstr "indeks pak bitmap rusak" + +#: pack-bitmap.c +msgid "invalid XOR offset in bitmap pack index" +msgstr "offset XOR tidak valid di indeks pak bitmap" + +#: pack-bitmap.c +msgid "cannot fstat bitmap file" +msgstr "tidak dapat fstat berkas bitmap" + +#: pack-bitmap.c +#, c-format +msgid "ignoring extra bitmap file: '%s'" +msgstr "mengabaikan berkas bitmap tambahan: '%s'" + +#: pack-bitmap.c +msgid "checksum doesn't match in MIDX and bitmap" +msgstr "checksum tidak cocok di MIDX dan bitmap" + #: pack-bitmap.c msgid "multi-pack bitmap is missing required reverse index" msgstr "bitmap multipak kehilangan indeks balik yang diperlukan" @@ -21631,9 +22026,69 @@ msgid "preferred pack (%s) is invalid" msgstr "pak yang disukai '%s' kadaluarsa" #: pack-bitmap.c +msgid "corrupt bitmap lookup table: triplet position out of index" +msgstr "tabel pencarian bitmap rusak: posisi kembar tiga di luar indeks" + +#: pack-bitmap.c +msgid "corrupt bitmap lookup table: xor chain exceeds entry count" +msgstr "tabel pencarian bitmap rusak: rantai xor melebihi hitungan entri" + +#: pack-bitmap.c +#, c-format +msgid "corrupt bitmap lookup table: commit index %u out of range" +msgstr "tabel pencarian bitmap rusak: indeks komit %u di luar jangkauan" + +#: pack-bitmap.c +#, c-format +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 "could not find %s in pack %s at offset %<PRIuMAX>" -msgstr "tidak dapat menemukan %s di dalam pak %s pada offset %<PRIuMAX>" +msgid "object '%s' not found in type bitmaps" +msgstr "objek '%s' tidak ditemukan di bitmap tipe" + +#: pack-bitmap.c +#, c-format +msgid "object '%s' does not have a unique type" +msgstr "objek '%s' tidak punya tipe unik" + +#: pack-bitmap.c +#, c-format +msgid "object '%s': real type '%s', expected: '%s'" +msgstr "objek '%s': bertipe sebenarnya '%s', diharapkan '%s'" + +#: pack-bitmap.c +#, c-format +msgid "object not in bitmap: '%s'" +msgstr "object bukan di bitmap: '%s'" + +#: pack-bitmap.c +msgid "failed to load bitmap indexes" +msgstr "gagal memuat indeks bitmap" + +#: pack-bitmap.c +msgid "you must specify exactly one commit to test" +msgstr "Anda harus sebutkan tepat satu komit untuk diuji" + +#: pack-bitmap.c +#, c-format +msgid "commit '%s' doesn't have an indexed bitmap" +msgstr "komit '%s' tidak punya bitmap terindeks" + +#: pack-bitmap.c +msgid "mismatch in bitmap results" +msgstr "ketidaksesuaian di dalam hasil bitmap" + +#: pack-bitmap.c +#, c-format +msgid "could not find '%s' in pack '%s' at offset %<PRIuMAX>" +msgstr "tidak dapat menemukan %s di dalam pak '%s' pada offset %<PRIuMAX>" + +#: pack-bitmap.c +#, c-format +msgid "unable to get disk usage of '%s'" +msgstr "tidak dapat mendapatkan penggunaan disk dari '%s'" #: pack-mtimes.c #, c-format @@ -21726,91 +22181,97 @@ msgstr "offset di luar ujung indeks pak untuk %s (indeks terpotong?)" #: parse-options-cb.c #, c-format msgid "malformed expiration date '%s'" -msgstr "" +msgstr "tanggal kadaluarsa rusak '%s'" #: parse-options-cb.c #, c-format msgid "option `%s' expects \"always\", \"auto\", or \"never\"" -msgstr "" +msgstr "opsi `%s' mengharapkan \"always\", \"auto\", atau \"never\"" #: parse-options-cb.c #, c-format msgid "malformed object name '%s'" -msgstr "" +msgstr "nama objek rusak '%s'" #: parse-options-cb.c #, c-format msgid "option `%s' expects \"%s\" or \"%s\"" -msgstr "" +msgstr "opsi `%s' mengharapkan \"%s\" atau \"%s\"" #: parse-options.c #, c-format msgid "%s requires a value" -msgstr "" +msgstr "%s butuh sebuah nilai" #: parse-options.c #, c-format msgid "%s is incompatible with %s" -msgstr "" +msgstr "%s tidak kompatibel dengan %s" #: parse-options.c #, c-format msgid "%s : incompatible with something else" -msgstr "" +msgstr "%s : tidak kompatibel dengan sesuatu yang lain" #: parse-options.c #, c-format msgid "%s takes no value" -msgstr "" +msgstr "%s tidak mengambil nilai apapun" #: parse-options.c #, c-format msgid "%s isn't available" -msgstr "" +msgstr "%s tidak ada" #: parse-options.c #, c-format msgid "%s expects a non-negative integer value with an optional k/m/g suffix" msgstr "" +"%s mengharapkan nilai bilangan bulat non negatif dengan akhiran opsional k/m/" +"g" #: parse-options.c #, c-format msgid "ambiguous option: %s (could be --%s%s or --%s%s)" -msgstr "" +msgstr "opsi ambigu: %s (bisa jadi --%s%s atau --%s%s)" #: parse-options.c #, c-format msgid "did you mean `--%s` (with two dashes)?" -msgstr "" +msgstr "mungkin maksud Anda `--%s` (dengan dua tanda strip)?" #: parse-options.c #, c-format msgid "alias of --%s" -msgstr "" +msgstr "alias untuk --%s" + +#: parse-options.c +msgid "need a subcommand" +msgstr "butuh sebuah subperintah" #: parse-options.c #, c-format msgid "unknown option `%s'" -msgstr "" +msgstr "opsi tidak dikenal `%s'" #: parse-options.c #, c-format msgid "unknown switch `%c'" -msgstr "" +msgstr "sakelar tidak dikenal `%c'" #: parse-options.c #, c-format msgid "unknown non-ascii option in string: `%s'" -msgstr "" +msgstr "opsi non-ascii di dalam untai tidak dikenal: `%s'" #: parse-options.c msgid "..." -msgstr "" +msgstr "..." #: parse-options.c #, c-format msgid "usage: %s" -msgstr "" +msgstr "penggunaan: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. @@ -21818,7 +22279,7 @@ msgstr "" #: parse-options.c #, c-format msgid " or: %s" -msgstr "" +msgstr " atau: %s" #. TRANSLATORS: You should only need to translate this format #. string if your language is a RTL language (e.g. Arabic, @@ -21842,237 +22303,243 @@ msgstr "" #: parse-options.c #, c-format msgid "%*s%s" -msgstr "" +msgstr "%*s%s" #: parse-options.c #, c-format msgid " %s" -msgstr "" +msgstr " %s" #: parse-options.c msgid "-NUM" -msgstr "" +msgstr "-NUM" #: parse-options.h msgid "expiry-date" -msgstr "" +msgstr "tanggal kadaluarsa" #: parse-options.h msgid "no-op (backward compatibility)" -msgstr "" +msgstr "tanpa operasi (kompatibilitas ke belakang)" #: parse-options.h msgid "be more verbose" -msgstr "" +msgstr "jadi lebih berkata-kata" #: parse-options.h msgid "be more quiet" -msgstr "" +msgstr "jadi lebih dian" #: parse-options.h msgid "use <n> digits to display object names" -msgstr "" +msgstr "gunakan <n> digit untuk menampilkan nama objek" #: parse-options.h msgid "how to strip spaces and #comments from message" -msgstr "" +msgstr "bagaimana cara mengupas spasi dan #komentar dari pesan" #: parse-options.h msgid "read pathspec from file" -msgstr "" +msgstr "baca spek jalur dari berkas" #: parse-options.h msgid "" "with --pathspec-from-file, pathspec elements are separated with NUL character" msgstr "" +"dengan --pathspec-from-file, elemen spek jalur dipisahkan dengan karakter NUL" #: path.c #, c-format msgid "Could not make %s writable by group" -msgstr "" +msgstr "Tidak dapat membuat %s bisa ditulis oleh grup" #: pathspec.c msgid "Escape character '\\' not allowed as last character in attr value" msgstr "" +"Karakter pelarian '\\' tidak diperbolehkan sebagai karakter terakhir dalam " +"nilai atribut" #: pathspec.c msgid "Only one 'attr:' specification is allowed." -msgstr "" +msgstr "Hanya satu spesifikasi 'attr:' yang diperbolehkan." #: pathspec.c msgid "attr spec must not be empty" -msgstr "" +msgstr "spek atribut tidak boleh kosong" #: pathspec.c #, c-format msgid "invalid attribute name %s" -msgstr "" +msgstr "nama atribut tidak valid %s" #: pathspec.c msgid "global 'glob' and 'noglob' pathspec settings are incompatible" -msgstr "" +msgstr "setelan spek jalur global 'glob' dan 'noglob' tidak kompatibel" #: pathspec.c msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" msgstr "" +"setelan spek jalur global 'literal' tidak kompatibel dengan semua setelan " +"spek jalur lainnya" #: pathspec.c msgid "invalid parameter for pathspec magic 'prefix'" -msgstr "" +msgstr "parameter tidak valid untuk spek jalur ajaib 'prefix'" #: pathspec.c #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" -msgstr "" +msgstr "Spek jalur ajaib '%.*s' tidak valid di '%s'" #: pathspec.c #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" -msgstr "" +msgstr "Kehilangan ')' pada akhir spek jalur ajaib di '%s'" #: pathspec.c #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" -msgstr "" +msgstr "Spek jalur ajaib '%c' tidak diterapkan di '%s'" #: pathspec.c #, c-format msgid "%s: 'literal' and 'glob' are incompatible" -msgstr "" +msgstr "%s: 'literal' dan 'glob' tidak kompatibel" #: pathspec.c #, c-format msgid "%s: '%s' is outside repository at '%s'" -msgstr "" +msgstr "%s: '%s' di luar repositori pada '%s'" #: pathspec.c #, c-format msgid "'%s' (mnemonic: '%c')" -msgstr "" +msgstr "'%s' (mnemonik: '%c')" #: pathspec.c #, c-format msgid "%s: pathspec magic not supported by this command: %s" -msgstr "" +msgstr "%s: spek jalur ajaib tidak didukung oleh perintah ini: %s" #: pathspec.c #, c-format msgid "pathspec '%s' is beyond a symbolic link" -msgstr "" +msgstr "spek jalur '%s' di luar tautan simbolik" #: pathspec.c #, c-format msgid "line is badly quoted: %s" -msgstr "" +msgstr "baris dikutip jelek: %s" #: pkt-line.c msgid "unable to write flush packet" -msgstr "" +msgstr "tidak dapat menulis paket bilas" #: pkt-line.c msgid "unable to write delim packet" -msgstr "" +msgstr "tidak dapat menulis paket pembatas" #: pkt-line.c msgid "unable to write response end packet" -msgstr "" +msgstr "tidak dapat menulis paket ujung jawaban" #: pkt-line.c msgid "flush packet write failed" -msgstr "" +msgstr "gagal membilas penulisan paket" #: pkt-line.c msgid "protocol error: impossibly long line" -msgstr "" +msgstr "kesalahan protokol: baris panjang tidak mungkin" #: pkt-line.c msgid "packet write with format failed" -msgstr "" +msgstr "gagal menulis paket dengan format" #: pkt-line.c msgid "packet write failed - data exceeds max packet size" -msgstr "" +msgstr "gagal menulis paket - data melebihi ukuran paket maksimum" #: pkt-line.c #, c-format msgid "packet write failed: %s" -msgstr "" +msgstr "gagal menulis paket: %s" #: pkt-line.c msgid "read error" -msgstr "" +msgstr "kesalahan membaca" #: pkt-line.c msgid "the remote end hung up unexpectedly" -msgstr "" +msgstr "ujung remote menggantung secara tidak terduga" #: pkt-line.c #, c-format msgid "protocol error: bad line length character: %.4s" -msgstr "" +msgstr "kesalahan protokol: karakter panjang baris jelek: %.4s" #: pkt-line.c #, c-format msgid "protocol error: bad line length %d" -msgstr "" +msgstr "kesalahan protokol: panjang baris %d jelek" #: pkt-line.c sideband.c #, c-format msgid "remote error: %s" -msgstr "" +msgstr "kesalahan remote: %s" #: preload-index.c msgid "Refreshing index" -msgstr "" +msgstr "Menyegarkan indeks" #: preload-index.c #, c-format msgid "unable to create threaded lstat: %s" -msgstr "" +msgstr "tidak dapat membuat lstat terutas: %s" #: pretty.c msgid "unable to parse --pretty format" -msgstr "" +msgstr "tidak dapat menguraikan format --pretty" #: promisor-remote.c msgid "promisor-remote: unable to fork off fetch subprocess" -msgstr "" +msgstr "promisor-remote: tidak dapat menggarpu subproses pengambilan" #: promisor-remote.c msgid "promisor-remote: could not write to fetch subprocess" -msgstr "" +msgstr "promisor-remote: tidak dapat menulis ke subproses pengambilan" #: promisor-remote.c msgid "promisor-remote: could not close stdin to fetch subprocess" msgstr "" +"promisor-remote: tidak dapat menutup masukan standar ke subproses pengambilan" #: promisor-remote.c #, c-format msgid "promisor remote name cannot begin with '/': %s" -msgstr "" +msgstr "nama remote penjanji tidak dapat diawali dengan '/': %s" #: protocol-caps.c msgid "object-info: expected flush after arguments" -msgstr "" +msgstr "object-info: bilasan diharapkan setelah argumen" #: prune-packed.c msgid "Removing duplicate objects" -msgstr "" +msgstr "Menghapus objek duplikat" #: range-diff.c msgid "could not start `log`" -msgstr "" +msgstr "tidak dapat memulai `log`" #: range-diff.c msgid "could not read `log` output" -msgstr "" +msgstr "tidak dapat membaca keluaran `log`" #: range-diff.c sequencer.c #, c-format msgid "could not parse commit '%s'" -msgstr "" +msgstr "tidak dapat menguraikan komit '%s'" #: range-diff.c #, c-format @@ -22080,58 +22547,63 @@ msgid "" "could not parse first line of `log` output: did not start with 'commit ': " "'%s'" msgstr "" +"tidak dapat menguraikan baris pertama dari keluaran `log`: tidak dimulai " +"dengan 'commit ': '%s'" #: range-diff.c #, c-format msgid "could not parse git header '%.*s'" -msgstr "" +msgstr "tidak dapat menguraikan kepala git '%.*s'" #: range-diff.c msgid "failed to generate diff" -msgstr "" +msgstr "gagal membuat diff" #: range-diff.c #, c-format msgid "could not parse log for '%s'" -msgstr "" +msgstr "tidak dapat menguraikan log untuk '%s'" #: read-cache.c #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "" +"tidak akan menambahkan alias berkas '%s' ('%s' sudah ada di dalam indeks)" #: read-cache.c msgid "cannot create an empty blob in the object database" -msgstr "" +msgstr "tidak dapat membuat sebuah blob kosong di dalam basis data objek" #: read-cache.c #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" msgstr "" +"%s: hanya dapat menambahkan berkas reguler, tautan simbolik, atau direktori " +"git" #: read-cache.c #, c-format msgid "unable to index file '%s'" -msgstr "" +msgstr "tidak dapat menulis berkas indeks '%s'" #: read-cache.c #, c-format msgid "unable to add '%s' to index" -msgstr "" +msgstr "tidak dapat menambahkan '%s' ke indeks" #: read-cache.c #, c-format msgid "unable to stat '%s'" -msgstr "" +msgstr "tidak dapat men-stat '%s'" #: read-cache.c #, c-format msgid "'%s' appears as both a file and as a directory" -msgstr "" +msgstr "'%s' muncul baik sebagai sebuah berkas dan sebagai sebuah direktori" #: read-cache.c msgid "Refresh index" -msgstr "" +msgstr "Segarkan indeks indeks" #: read-cache.c #, c-format @@ -22139,6 +22611,8 @@ msgid "" "index.version set, but the value is invalid.\n" "Using version %i" msgstr "" +"index.version disetel, tetapi nilainya tidak valid.\n" +"Menggunakan versi %i" #: read-cache.c #, c-format @@ -22146,137 +22620,139 @@ msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" "Using version %i" msgstr "" +"GIT_INDEX_VERSION disetel, tetapi nilainya tidak valid.\n" +"Menggunakan versi %i" #: read-cache.c #, c-format msgid "bad signature 0x%08x" -msgstr "" +msgstr "tandatangan 0x%08x jelek" #: read-cache.c #, c-format msgid "bad index version %d" -msgstr "" +msgstr "versi indeks %d jelek" #: read-cache.c msgid "bad index file sha1 signature" -msgstr "" +msgstr "tandatangan sha1 berkas indeks jelek" #: read-cache.c #, c-format msgid "index uses %.4s extension, which we do not understand" -msgstr "" +msgstr "indeks menggunakan ekstensi %s, yang kami tidak mengerti" #: read-cache.c #, c-format msgid "ignoring %.4s extension" -msgstr "" +msgstr "mengabaikan ekstensi %.4s" #: read-cache.c #, c-format msgid "unknown index entry format 0x%08x" -msgstr "" +msgstr "format entri indeks 0x%08x tidak dikenal" #: read-cache.c #, c-format msgid "malformed name field in the index, near path '%s'" -msgstr "" +msgstr "bidang nama di dalam indeks rusak, di dekat jalur '%s'" #: read-cache.c msgid "unordered stage entries in index" -msgstr "" +msgstr "entri gelaran tidak terurut di dalam indeks" #: read-cache.c #, c-format msgid "multiple stage entries for merged file '%s'" -msgstr "" +msgstr "banyak entri gelaran untuk berkas tergabung '%s'" #: read-cache.c #, c-format msgid "unordered stage entries for '%s'" -msgstr "" +msgstr "entri gelaran tidak terurut untuk '%s'" #: read-cache.c #, c-format msgid "unable to create load_cache_entries thread: %s" -msgstr "" +msgstr "tidak dapat membuat utas load_cache_entries: %s" #: read-cache.c #, c-format msgid "unable to join load_cache_entries thread: %s" -msgstr "" +msgstr "tidak dapat menggabungkan utas load_cache_entries: %s" #: read-cache.c #, c-format msgid "%s: index file open failed" -msgstr "" +msgstr "%s: gagal membuka berkas indeks" #: read-cache.c #, c-format msgid "%s: cannot stat the open index" -msgstr "" +msgstr "%s: tidak dapat men-stat indeks terbuka" #: read-cache.c #, c-format msgid "%s: index file smaller than expected" -msgstr "" +msgstr "%s: berkas indeks lebih kecil dari yang diharapkan" #: read-cache.c #, c-format msgid "%s: unable to map index file%s" -msgstr "" +msgstr "%s: tidak dapat memetakan berkas indeks%s" #: read-cache.c #, c-format msgid "unable to create load_index_extensions thread: %s" -msgstr "" +msgstr "tidak dapat membuat utas load_index_extensions: %s" #: read-cache.c #, c-format msgid "unable to join load_index_extensions thread: %s" -msgstr "" +msgstr "tidak dapat menggabungkan utas load_index_extensions: %s" #: read-cache.c #, c-format msgid "could not freshen shared index '%s'" -msgstr "" +msgstr "tidak dapat menyegarkan indeks berbagi '%s'" #: read-cache.c #, c-format msgid "broken index, expect %s in %s, got %s" -msgstr "" +msgstr "indeks rusak, mengharapkan %s di %s, dapat %s" #: read-cache.c msgid "cannot write split index for a sparse index" -msgstr "" +msgstr "tidak dapat membuat indeks terpisah untuk indeks jarang" #: read-cache.c msgid "failed to convert to a sparse-index" -msgstr "" +msgstr "gagal mengubah ke indeks jarang" #: read-cache.c #, c-format msgid "could not stat '%s'" -msgstr "" +msgstr "tidak dapat men-stat '%s'" #: read-cache.c #, c-format msgid "unable to open git dir: %s" -msgstr "" +msgstr "tidak dapat membuka direktori git: %s" #: read-cache.c #, c-format msgid "unable to unlink: %s" -msgstr "" +msgstr "tidak dapat membatal tautan: %s" #: read-cache.c #, c-format msgid "cannot fix permission bits on '%s'" -msgstr "" +msgstr "tidak dapat memperbaiki bit perizinan pada '%s'" #: read-cache.c #, c-format msgid "%s: cannot drop to stage #0" -msgstr "" +msgstr "%s: tidak dapat menurunkan ke tahap #0" #: rebase-interactive.c msgid "" @@ -22313,9 +22789,12 @@ msgid "" "l, label <label> = label current HEAD with a name\n" "t, reset <label> = reset HEAD to a label\n" "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" -". create a merge commit using the original merge commit's\n" -". message (or the oneline, if no original merge commit was\n" -". specified); use -c <commit> to reword the commit message\n" +" create a merge commit using the original merge commit's\n" +" message (or the oneline, if no original merge commit was\n" +" specified); use -c <commit> to reword the commit message\n" +"u, update-ref <ref> = track a placeholder for the <ref> to be updated\n" +" to this position in the new commits. The <ref> is\n" +" updated at the end of the rebase\n" "\n" "These lines can be re-ordered; they are executed from top to bottom.\n" msgstr "" @@ -22326,20 +22805,23 @@ msgstr "" "e, edit <komit> = gunakan komit, tapi berhenti untuk amandemen\n" "s, squash <komit> = gunakan komit, tapi lebur ke komit sebelumnya\n" "f, fixup [-C | -c] <komit> = seperti \"squash\" tapi hanya pertahankan\n" -" pesan komit sebelumnya, kecuali -C digunakan, dimana\n" -" hanya pertahankan pesan komit ini; -c sama dengan -C " -"tapi\n" -" buka penyuntingx, exec <perintah> = jalankan perintah " -"(sisa baris) menggunakan cangkang\n" +" pesan komit sebelumnya; kecuali -C digunakan, dimana\n" +" hanya pertahankan pesan komit ini; -c sama dengan -C\n" +" tapi buka penyunting\n" +"x, exec <perintah> = jalankan perintah (sisa baris) menggunakan cangkang\n" "b, break = berhenti disini (lanjutkan pendasaran ulang nanti dengan 'git " "rebase --continue')\n" "d, drop <komit> = hapus komit\n" "l, label <label> = tandai HEAD saat ini dengan nama\n" "t, reset <label> = setel ulang HEAD ke sebuah label\n" "m, merge [-C <komit> | -c <komit>] <label> [# <satu baris>]\n" -". buat komit penggabungan dengan pesan komit penggabungan asli\n" -". (atau satu baris, jika tidak ada komit penggabungan asli yang\n" -". disebutkan); gunakan -c <komit> untuk menulis ulang pesan komit\n" +" buat komit penggabungan dengan pesan komit penggabungan asli\n" +" (atau satu baris, jika tidak ada komit penggabungan asli yang\n" +" disebutkan); gunakan -c <komit> untuk menulis ulang pesan komit\n" +"u, update-ref <referensi> = lacak tempat penampung untuk <referensi> yang\n" +" akan diperbarui ke posisi ini di dalam komit\n" +" baru. <referensi> diperbarui pada " +"akhir pendasaran ulang.\n" "\n" "Baris diatas dapat disusun ulang; hal itu dieksekusi dari atas ke bawah.\n" @@ -22431,245 +22913,246 @@ msgstr "%s: 'preserve' digantikan oleh 'merges'" #: ref-filter.c wt-status.c msgid "gone" -msgstr "" +msgstr "pergi" #: ref-filter.c #, c-format msgid "ahead %d" -msgstr "" +msgstr "di depan %d" #: ref-filter.c #, c-format msgid "behind %d" -msgstr "" +msgstr "di belakang %d" #: ref-filter.c #, c-format msgid "ahead %d, behind %d" -msgstr "" +msgstr "di depan %d, di belakang %d" #: ref-filter.c #, c-format msgid "expected format: %%(color:<color>)" -msgstr "" +msgstr "format yang diharapkan: %%(color:<warna>)" #: ref-filter.c #, c-format msgid "unrecognized color: %%(color:%s)" -msgstr "" +msgstr "warna tidak dikenal: %%(color:%s)" #: ref-filter.c #, c-format msgid "Integer value expected refname:lstrip=%s" -msgstr "" +msgstr "Nilai bilangan bulat diharapkan refname:lstrip=%s" #: ref-filter.c #, c-format msgid "Integer value expected refname:rstrip=%s" -msgstr "" +msgstr "Nilai bilangan bulat diharapkan refname:rstrip=%s" #: ref-filter.c #, c-format msgid "unrecognized %%(%s) argument: %s" -msgstr "" +msgstr "argumen %%(%s) tidak dikenal: %s" #: ref-filter.c #, c-format msgid "%%(objecttype) does not take arguments" -msgstr "" +msgstr "%%(objecttype) tidak mengambil argumen" #: ref-filter.c #, c-format msgid "%%(deltabase) does not take arguments" -msgstr "" +msgstr "%%(deltabase) tidak mengambil argumen" #: ref-filter.c #, c-format msgid "%%(body) does not take arguments" -msgstr "" +msgstr "%%(body) tidak mengambil argumen" #: ref-filter.c #, c-format msgid "expected %%(trailers:key=<value>)" -msgstr "" +msgstr "diharapkan %%(trailers:key=<nilai>)" #: ref-filter.c #, c-format msgid "unknown %%(trailers) argument: %s" -msgstr "" +msgstr "argumen %%(trailers) tidak dikenal: %s" #: ref-filter.c #, c-format msgid "positive value expected contents:lines=%s" -msgstr "" +msgstr "nilai positif diharapkan contents:lines=%s" #: ref-filter.c #, c-format msgid "positive value expected '%s' in %%(%s)" -msgstr "" +msgstr "nilai positif '%s' diharapkan di %%(%s)" #: ref-filter.c #, c-format msgid "unrecognized email option: %s" -msgstr "" +msgstr "opsi surel tidak dikenal: %s" #: ref-filter.c #, c-format msgid "expected format: %%(align:<width>,<position>)" -msgstr "" +msgstr "format diharapkan: %%(align:<lebar>,<posisi>)" #: ref-filter.c #, c-format msgid "unrecognized position:%s" -msgstr "" +msgstr "posisi tidak dikenal: %s" #: ref-filter.c #, c-format msgid "unrecognized width:%s" -msgstr "" +msgstr "lebar tidak dikenal: %s" #: ref-filter.c #, c-format msgid "positive width expected with the %%(align) atom" -msgstr "" +msgstr "lebar positif diharapkan dengan atom %%(align)" #: ref-filter.c #, c-format msgid "%%(rest) does not take arguments" -msgstr "" +msgstr "%%(rest) tidak mengambil argumen" #: ref-filter.c #, c-format msgid "malformed field name: %.*s" -msgstr "" +msgstr "nama bidang rusak: %.*s" #: ref-filter.c #, c-format msgid "unknown field name: %.*s" -msgstr "" +msgstr "nama bidang tidak dikenal: %.*s" #: ref-filter.c #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "" +"bukan sebuah repositori git, tapi bidang '%.*s' butuh akses ke data objek" #: ref-filter.c #, c-format msgid "format: %%(%s) atom used without a %%(%s) atom" -msgstr "" +msgstr "format: atom %%(%s) digunakan tanpa sebuah atom %%(%s)" #: ref-filter.c #, c-format msgid "format: %%(then) atom used more than once" -msgstr "" +msgstr "format: atom%%(then) digunakan lebih dari sekali" #: ref-filter.c #, c-format msgid "format: %%(then) atom used after %%(else)" -msgstr "" +msgstr "format: atom %%(then) digunakan setelah %%(else)" #: ref-filter.c #, c-format msgid "format: %%(else) atom used more than once" -msgstr "" +msgstr "format: atom %%(else) digunakan lebih dari sekali" #: ref-filter.c #, c-format msgid "format: %%(end) atom used without corresponding atom" -msgstr "" +msgstr "format: atom %%(end) digunakan tanpa atom yang bersesuaian" #: ref-filter.c #, c-format msgid "malformed format string %s" -msgstr "" +msgstr "untai format %s rusak" #: ref-filter.c #, c-format msgid "this command reject atom %%(%.*s)" -msgstr "" +msgstr "perintah ini menolak atom %%(%.*s)" #: ref-filter.c #, c-format msgid "--format=%.*s cannot be used with --python, --shell, --tcl" -msgstr "" +msgstr "--format=%.*s tidak dapat digunakan dengan --python, --shell, --tcl" #: ref-filter.c #, c-format msgid "(no branch, rebasing %s)" -msgstr "" +msgstr "(tanpa cabang, mendasarkan ulang %s)" #: ref-filter.c #, c-format msgid "(no branch, rebasing detached HEAD %s)" -msgstr "" +msgstr "(tanpa cabang, mendasarkan ulang HEAD tercopot %s)" #: ref-filter.c #, c-format msgid "(no branch, bisect started on %s)" -msgstr "" +msgstr "(tanpa cabang, pembagian dua dimulai pada %s)" #: ref-filter.c #, c-format msgid "(HEAD detached at %s)" -msgstr "" +msgstr "(HEAD tercopot pada %s)" #: ref-filter.c #, c-format msgid "(HEAD detached from %s)" -msgstr "" +msgstr "(HEAD tercopot dari %s)" #: ref-filter.c msgid "(no branch)" -msgstr "" +msgstr "(tanpa cabang)" #: ref-filter.c #, c-format msgid "missing object %s for %s" -msgstr "" +msgstr "objek %s hilang untuk %s" #: ref-filter.c #, c-format msgid "parse_object_buffer failed on %s for %s" -msgstr "" +msgstr "parse_object_buffer gagal pada %s untuk %s" #: ref-filter.c #, c-format msgid "malformed object at '%s'" -msgstr "" +msgstr "objek rusak pada '%s'" #: ref-filter.c #, c-format msgid "ignoring ref with broken name %s" -msgstr "" +msgstr "mengabaikan referensi dengan nama rusak %s" #: ref-filter.c refs.c #, c-format msgid "ignoring broken ref %s" -msgstr "" +msgstr "mengabaikan referensi rusak %s" #: ref-filter.c #, c-format msgid "format: %%(end) atom missing" -msgstr "" +msgstr "format: atom %%(end) hilang" #: ref-filter.c #, c-format msgid "malformed object name %s" -msgstr "" +msgstr "nama objek rusak %s" #: ref-filter.c #, c-format msgid "option `%s' must point to a commit" -msgstr "" +msgstr "opsi `%s' harus menunjuk pada sebuah komit" #: ref-filter.h msgid "key" -msgstr "" +msgstr "kunci" #: ref-filter.h msgid "field name to sort on" -msgstr "" +msgstr "nama bidang untuk diurutkan" #: reflog.c #, c-format @@ -22799,139 +23282,150 @@ msgstr "spek referensi tidak valid '%s'" #: remote-curl.c #, c-format msgid "invalid quoting in push-option value: '%s'" -msgstr "" +msgstr "kuotasi tidak valid dalam nilai push-option: '%s'" #: remote-curl.c #, c-format msgid "%sinfo/refs not valid: is this a git repository?" -msgstr "" +msgstr "%sinfo/refs tidak valid: apakah ini sebuah repositori git?" #: remote-curl.c msgid "invalid server response; expected service, got flush packet" msgstr "" +"tanggapan peladen tidak valid; mengharapkan layanan, dapat bilasan paket" #: remote-curl.c #, c-format msgid "invalid server response; got '%s'" -msgstr "" +msgstr "tanggapan peladen tidak valid; dapat '%s'" #: remote-curl.c #, c-format msgid "repository '%s' not found" -msgstr "" +msgstr "repositori '%s' tidak ditemukan" #: remote-curl.c #, c-format msgid "Authentication failed for '%s'" -msgstr "" +msgstr "Autentikasi gagal untuk '%s'" #: remote-curl.c #, c-format msgid "unable to access '%s' with http.pinnedPubkey configuration: %s" -msgstr "" +msgstr "tidak dapat mengakses '%s' dengan konfigurasi http.pinnedPubkey: %s" #: remote-curl.c #, c-format msgid "unable to access '%s': %s" -msgstr "" +msgstr "tidak dapat mengakses '%s': %s" #: remote-curl.c #, c-format msgid "redirecting to %s" -msgstr "" +msgstr "mengalihkan ke %s" #: remote-curl.c msgid "shouldn't have EOF when not gentle on EOF" -msgstr "" +msgstr "seharusnya tidak punya EOF ketika tidak lembut pada EOF" #: remote-curl.c msgid "remote server sent unexpected response end packet" -msgstr "" +msgstr "peladen remote mengirim paket ujung tanggapan yang tak diharapkan" #: remote-curl.c msgid "unable to rewind rpc post data - try increasing http.postBuffer" msgstr "" +"tidak dapat memutar ulang data post rpc - coba menaikkan http.postBuffer" #: remote-curl.c #, c-format msgid "remote-curl: bad line length character: %.4s" -msgstr "" +msgstr "remote-curl: karakter panjang baris jelek : %.4s" #: remote-curl.c msgid "remote-curl: unexpected response end packet" -msgstr "" +msgstr "remote-curl: paket ujung tanggapan tidak diharapkan" #: remote-curl.c #, c-format msgid "RPC failed; %s" -msgstr "" +msgstr "RPC gagal; %s" #: remote-curl.c msgid "cannot handle pushes this big" -msgstr "" +msgstr "tidak dapat menangani dorongan sebesar ini" #: remote-curl.c #, c-format msgid "cannot deflate request; zlib deflate error %d" -msgstr "" +msgstr "tidak dapat mengempiskan permintaan; kesalahan mengempiskan zlib %d" #: remote-curl.c #, c-format msgid "cannot deflate request; zlib end error %d" -msgstr "" +msgstr "tidak dapat mengempiskan permintaan; kesalahan ujung zlib %d" #: remote-curl.c #, c-format msgid "%d bytes of length header were received" -msgstr "" +msgstr "%d bita dari kepala panjang diterima" #: remote-curl.c #, c-format msgid "%d bytes of body are still expected" -msgstr "" +msgstr "%d bita badan masih diharapkan" #: remote-curl.c msgid "dumb http transport does not support shallow capabilities" -msgstr "" +msgstr "transportasi http bodoh tidak mendukung kemampuan dangkal" #: remote-curl.c msgid "fetch failed." -msgstr "" +msgstr "pengambilan gagal." #: remote-curl.c msgid "cannot fetch by sha1 over smart http" -msgstr "" +msgstr "tidak dapat mengambil oleh sha1 melalui http pintar" #: remote-curl.c #, c-format msgid "protocol error: expected sha/ref, got '%s'" -msgstr "" +msgstr "kesalahan protokol: sha/referensi diharapkan, dapat '%s'" #: remote-curl.c #, c-format msgid "http transport does not support %s" -msgstr "" +msgstr "transportasi http tidak mendukung %s" + +#: remote-curl.c +msgid "protocol error: expected '<url> <path>', missing space" +msgstr "kesalahan protokol: '<url> <jalur>' diharapkan, spasi hilang" + +#: remote-curl.c +#, c-format +msgid "failed to download file at URL '%s'" +msgstr "gagal mengunduh berkas pada URL '%s'" #: remote-curl.c msgid "git-http-push failed" -msgstr "" +msgstr "git-http-push gagal" #: remote-curl.c msgid "remote-curl: usage: git remote-curl <remote> [<url>]" -msgstr "" +msgstr "remote-curl: penggunaan: git remote-curl <remote> [<url>]" #: remote-curl.c msgid "remote-curl: error reading command stream from git" -msgstr "" +msgstr "remote-curl: kesalahan membaca arus perintah dari git" #: remote-curl.c msgid "remote-curl: fetch attempted without a local repo" -msgstr "" +msgstr "remote-curl: pengambilan dicoba tanpa repositori lokal" #: remote-curl.c #, c-format msgid "remote-curl: unknown command '%s' from git" -msgstr "" +msgstr "remote-curl: perintah tidak dikenal '%s' dari git" #: remote.c #, c-format @@ -23176,7 +23670,9 @@ msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" msgstr[0] "" +"Cabang Anda di belakang '%s' oleh %d komit, dan bisa di maju-cepatkan.\n" msgstr[1] "" +"Cabang Anda di belakan '%s' oleh %d komit, dan bisa di maju-cepatkan.\n" #: remote.c msgid " (use \"git pull\" to update your local branch)\n" @@ -23214,17 +23710,17 @@ msgstr "tidak dapat mencopot satu komponen dari url '%s'" #: replace-object.c #, c-format msgid "bad replace ref name: %s" -msgstr "" +msgstr "nama referensi pengganti jelek: %s" #: replace-object.c #, c-format msgid "duplicate replace ref: %s" -msgstr "" +msgstr "referensi pengganti duplikat: %s" #: replace-object.c #, c-format msgid "replace depth too high for object %s" -msgstr "" +msgstr "kedalaman penggantian terlalu tinggi untuk objek %s" #: rerere.c msgid "corrupt MERGE_RR" @@ -23311,6 +23807,8 @@ msgstr "tidak dapat membuka direktori rr-cache" #: rerere.h msgid "update the index with reused conflict resolution if possible" msgstr "" +"perbarui indeks dengan resolusi konflik yang digunakan kembali bila " +"memungkinkan" #: reset.c msgid "could not determine HEAD revision" @@ -23322,6 +23820,16 @@ msgid "failed to find tree of %s" msgstr "gagal menemukan pohon %s" #: revision.c +#, c-format +msgid "resolve-undo records `%s` which is missing" +msgstr "resolve-undo merekam `%s` yang dimana hilang" + +#: revision.c +#, c-format +msgid "could not get commit for ancestry-path argument %s" +msgstr "tidak dapat mendapatkan komit untuk argumen jalur leluhur '%s'" + +#: revision.c msgid "--unpacked=<packfile> no longer supported" msgstr "--unpacked=<berkas pak> tidak didukung lagi" @@ -23345,7 +23853,222 @@ msgstr "-L belum mendukung format diff selain -p dan -s" #: run-command.c #, c-format msgid "cannot create async thread: %s" +msgstr "tidak dapat membuat utas async: %s" + +#: scalar.c worktree.c +#, c-format +msgid "'%s' does not exist" +msgstr "'%s' tidak ada" + +#: scalar.c +#, c-format +msgid "could not switch to '%s'" +msgstr "tidak dapat berganti ke '%s'" + +#: scalar.c +msgid "need a working directory" +msgstr "butuh sebuah direktori kerja" + +#: scalar.c +msgid "Scalar enlistments require a worktree" +msgstr "Pendaftaran scalar membutuhkan pohon kerja" + +#: scalar.c +#, c-format +msgid "could not configure %s=%s" +msgstr "tidak dapat menyetel %s=%s" + +#: scalar.c +msgid "could not configure log.excludeDecoration" +msgstr "tidak dapat menyetel log.excludeDecoration" + +#: scalar.c +msgid "could not add enlistment" +msgstr "tidak dapat menambah pendaftaran" + +#: scalar.c +msgid "could not set recommended config" +msgstr "tidak dapat menyetel konfigurasi yang direkomendasikan" + +#: scalar.c +msgid "could not turn on maintenance" +msgstr "tidak dapat mengaktifkan pemeliharaan" + +#: scalar.c +msgid "could not start the FSMonitor daemon" +msgstr "tidak dapat menjalankan daemon FSMonitor" + +#: scalar.c +msgid "could not turn off maintenance" +msgstr "tidak dapat menonaktifkan pemeliharaan" + +#: scalar.c +msgid "could not remove enlistment" +msgstr "tidak dapat menghapus pendaftaran" + +#: scalar.c +#, c-format +msgid "remote HEAD is not a branch: '%.*s'" +msgstr "HEAD remote bukan sebuah cabang: '%.*s'" + +#: scalar.c +msgid "failed to get default branch name from remote; using local default" msgstr "" +"gagal mendapatkan nama cabang asali dari remote; menggunakan asali lokal" + +#: scalar.c +msgid "failed to get default branch name" +msgstr "gagal mendapatkan nama cabang asali" + +#: scalar.c +msgid "failed to unregister repository" +msgstr "gagal menghapus pendaftaran repositori" + +#: scalar.c +msgid "failed to stop the FSMonitor daemon" +msgstr "gagal menghentikan daemon FSMonitor" + +#: scalar.c +msgid "failed to delete enlistment directory" +msgstr "gagal menghapus direktori pendaftaran" + +#: scalar.c +msgid "branch to checkout after clone" +msgstr "cabang untuk dicheckout setelah kloning" + +#: scalar.c +msgid "when cloning, create full working directory" +msgstr "ketika kloning, buat direktori kerja penuh" + +#: scalar.c +msgid "only download metadata for the branch that will be checked out" +msgstr "hanya unduh metadata untuk cabang yang akan dicheckout" + +#: scalar.c +msgid "scalar clone [<options>] [--] <repo> [<dir>]" +msgstr "scalar clone [<options>] [--] <repositori> [<direktori>]" + +#: scalar.c +#, c-format +msgid "cannot deduce worktree name from '%s'" +msgstr "tidak dapat menyimpulkan nama pohon kerja dari '%s'" + +#: scalar.c +#, c-format +msgid "directory '%s' exists already" +msgstr "direktori '%s' sudah ada" + +#: scalar.c +#, c-format +msgid "failed to get default branch for '%s'" +msgstr "gagal mendapatkan cabang asali untuk '%s'" + +#: scalar.c +#, c-format +msgid "could not configure remote in '%s'" +msgstr "tidak dapat menyetel remote di '%s'" + +#: scalar.c +#, c-format +msgid "could not configure '%s'" +msgstr "tidak dapat menyetel '%s'" + +#: scalar.c +msgid "partial clone failed; attempting full clone" +msgstr "kloning parsial gagal; mencoba kloning penuh" + +#: scalar.c +msgid "could not configure for full clone" +msgstr "tidak dapat menyetel untuk kloning penuh" + +#: scalar.c +msgid "scalar diagnose [<enlistment>]" +msgstr "scalar diagnose [<pendaftaran>]" + +#: scalar.c +msgid "`scalar list` does not take arguments" +msgstr "`scalar list` tidak mengambil argumen" + +#: scalar.c +msgid "scalar register [<enlistment>]" +msgstr "scalar register [<pendaftaran>]" + +#: scalar.c +msgid "reconfigure all registered enlistments" +msgstr "konfigurasi ulang semua pendaftaran yang terdaftar" + +#: scalar.c +msgid "scalar reconfigure [--all | <enlistment>]" +msgstr "scalar reconfigure [--all | <pendaftaran>]" + +#: scalar.c +msgid "--all or <enlistment>, but not both" +msgstr "--all atau <pendaftaran>, tetapi bukan kedua-duanya" + +#: scalar.c +#, c-format +msgid "git repository gone in '%s'" +msgstr "repositori git pergi di '%s'" + +#: scalar.c +msgid "" +"scalar run <task> [<enlistment>]\n" +"Tasks:\n" +msgstr "" +"scalar run <tugas> [<pendaftaran>]\n" +"Tugas:\n" + +#: scalar.c +#, c-format +msgid "no such task: '%s'" +msgstr "tidak ada tugas: '%s'" + +#: scalar.c +msgid "scalar unregister [<enlistment>]" +msgstr "scalar unregister [<pendaftaran>]" + +#: scalar.c +msgid "scalar delete <enlistment>" +msgstr "scalar delete <pendaftaran>" + +#: scalar.c +msgid "refusing to delete current working directory" +msgstr "menolak menghapus direktori kerja saat ini" + +#: scalar.c +msgid "include Git version" +msgstr "masukkan versi Git" + +#: scalar.c +msgid "include Git's build options" +msgstr "masukkan opsi bangun Git" + +#: scalar.c +msgid "scalar verbose [-v | --verbose] [--build-options]" +msgstr "scalar verbose [-v | --verbose] [--build-options]" + +#: scalar.c +msgid "-C requires a <directory>" +msgstr "-C butuh sebuah <direktori>" + +#: scalar.c +#, c-format +msgid "could not change to '%s'" +msgstr "tidak dapat berganti ke '%s'" + +#: scalar.c +msgid "-c requires a <key>=<value> argument" +msgstr "-c butuh argumen <kunci>=<nilai>" + +#: scalar.c +msgid "" +"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n" +"\n" +"Commands:\n" +msgstr "" +"scalar [-C <direktori>] [-c <kunci>=<nilai>] perintah [<opsi>]\n" +"\n" +"Perintah:\n" #: send-pack.c msgid "unexpected flush packet while reading remote unpack status" @@ -23493,11 +24216,6 @@ msgstr "perubahan lokal Anda akan ditimpa oleh %s." msgid "commit your changes or stash them to proceed." msgstr "komit perubahan Anda atau stase untuk melanjutkan." -#: sequencer.c -#, c-format -msgid "%s: fast-forward" -msgstr "%s: maju-cepat" - #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase". #. @@ -24090,6 +24808,30 @@ msgid "merge: Unable to write new index file" msgstr "merge: Tidak dapat menulis berkas indeks baru" #: sequencer.c +#, c-format +msgid "" +"another 'rebase' process appears to be running; '%s.lock' already exists" +msgstr "sepertinya proses 'rebase' lainnya berjalan; '%s.lock' sudah ada" + +#: sequencer.c +#, c-format +msgid "" +"Updated the following refs with %s:\n" +"%s" +msgstr "" +"Referensi berikut diperbarui dengan %s:\n" +"%s" + +#: sequencer.c +#, c-format +msgid "" +"Failed to update the following refs with %s:\n" +"%s" +msgstr "" +"Gagal memperbarui referensi berikut dengan %s:\n" +"%s" + +#: sequencer.c msgid "Cannot autostash" msgstr "Tidak dapat menstase otomatis" @@ -24293,6 +25035,11 @@ msgstr "tidak dapat melewatkan perintah pick yang tidak perlu" msgid "the script was already rearranged." msgstr "skrip sudah ditata ulang." +#: sequencer.c +#, c-format +msgid "update-refs file at '%s' is invalid" +msgstr "berkas update-refs pada '%s' tidak valid" + #: setup.c #, c-format msgid "'%s' is outside repository at '%s'" @@ -24438,18 +25185,24 @@ msgstr "" #: setup.c #, c-format msgid "" -"unsafe repository ('%s' is owned by someone else)\n" -"To add an exception for this directory, call:\n" +"detected dubious ownership in repository at '%s'\n" +"%sTo add an exception for this directory, call:\n" "\n" "\tgit config --global --add safe.directory %s" msgstr "" -"repositori tidak aman ('%s' dimiliki oleh orang lain)\n" -"Untuk menambahkan pengecualian untuk direktori ini, panggil:\n" +"perizinan meragukan terdeteksi di dalam repositori pada '%s'\n" +"%sUntuk menambahkan pengecualian untuk direktori ini, panggil:\n" "\n" "\tgit config --global --add safe.directory %s" #: setup.c #, c-format +msgid "cannot use bare repository '%s' (safe.bareRepository is '%s')" +msgstr "" +"tidak dapat menggunakan repositori bare '%s' (safe.bareRepository yaitu '%s')" + +#: setup.c +#, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" "The owner of files must always have read and write permissions." @@ -24890,16 +25643,16 @@ msgstr "tidak dapat menamai ulang berkas sementara ke %s" #: transport-helper.c msgid "full write to remote helper failed" -msgstr "" +msgstr "gagal menulis penuh ke pembantu remote" #: transport-helper.c #, c-format msgid "unable to find remote helper for '%s'" -msgstr "" +msgstr "tidak dapat menemukan pembantu remote untuk '%s'" #: transport-helper.c msgid "can't dup helper output fd" -msgstr "" +msgstr "tidak dapat menipu penjelas berkas keluaran pembantu" #: transport-helper.c #, c-format @@ -24907,120 +25660,122 @@ msgid "" "unknown mandatory capability %s; this remote helper probably needs newer " "version of Git" msgstr "" +"kemampuan wajib %s tidak dikenal; pembantu remote ini sepertinya butuh versi " +"Git baru" #: transport-helper.c msgid "this remote helper should implement refspec capability" -msgstr "" +msgstr "pembantu remote ini seharusnya menerapkan kemampuan spek referensi" #: transport-helper.c #, c-format msgid "%s unexpectedly said: '%s'" -msgstr "" +msgstr "%s tiba-tiba berkata: '%s'" #: transport-helper.c #, c-format msgid "%s also locked %s" -msgstr "" +msgstr "%s juga mengunci %s" #: transport-helper.c msgid "couldn't run fast-import" -msgstr "" +msgstr "tidak dapat menjalankan fast-import" #: transport-helper.c msgid "error while running fast-import" -msgstr "" +msgstr "kesalahan ketika menjalankan fast-import" #: transport-helper.c #, c-format msgid "could not read ref %s" -msgstr "" +msgstr "tidak dapat membaca referensi %s" #: transport-helper.c #, c-format msgid "unknown response to connect: %s" -msgstr "" +msgstr "tanggapan terhadap hubungan tidak dikenal: %s" #: transport-helper.c msgid "setting remote service path not supported by protocol" -msgstr "" +msgstr "menyetel jalur layanan remote tidak didukung oleh protokol" #: transport-helper.c msgid "invalid remote service path" -msgstr "" +msgstr "jalur layanan remote tidak valid" #: transport-helper.c transport.c msgid "operation not supported by protocol" -msgstr "" +msgstr "operasi tidak didukung oleh protokol" #: transport-helper.c #, c-format msgid "can't connect to subservice %s" -msgstr "" +msgstr "tidak dapat menghubungkan ke sublayanan %s" #: transport-helper.c transport.c msgid "--negotiate-only requires protocol v2" -msgstr "" +msgstr "--negotiate-only butuh protokol v2" #: transport-helper.c msgid "'option' without a matching 'ok/error' directive" -msgstr "" +msgstr "'option' tanpa pengarah 'ok/error' yang bersesuaian" #: transport-helper.c #, c-format msgid "expected ok/error, helper said '%s'" -msgstr "" +msgstr "ok/error diharapkan, pembantu berkata '%s'" #: transport-helper.c #, c-format msgid "helper reported unexpected status of %s" -msgstr "" +msgstr "pembantu melaporkan status %s yang tak diharapkan" #: transport-helper.c #, c-format msgid "helper %s does not support dry-run" -msgstr "" +msgstr "pembantu %s tidak mendukung latihan" #: transport-helper.c #, c-format msgid "helper %s does not support --signed" -msgstr "" +msgstr "pembantu %s tidak mendukung --signed" #: transport-helper.c #, c-format msgid "helper %s does not support --signed=if-asked" -msgstr "" +msgstr "pembantu %s tidak mendukung --signed=if-asked" #: transport-helper.c #, c-format msgid "helper %s does not support --atomic" -msgstr "" +msgstr "pembantu %s tidak mendukung --atomic" #: transport-helper.c #, c-format msgid "helper %s does not support --%s" -msgstr "" +msgstr "pembantu %s tidak mendukung --%s" #: transport-helper.c #, c-format msgid "helper %s does not support 'push-option'" -msgstr "" +msgstr "pembantu %s tidak mendukung 'push-option'" #: transport-helper.c msgid "remote-helper doesn't support push; refspec needed" -msgstr "" +msgstr "pembantu tidak mendukung pendorongan; spek referensi diperlukan" #: transport-helper.c #, c-format msgid "helper %s does not support 'force'" -msgstr "" +msgstr "pembantu %s tidak mendukung 'force'" #: transport-helper.c msgid "couldn't run fast-export" -msgstr "" +msgstr "tidak dapat menjalankan fast-export" #: transport-helper.c msgid "error while running fast-export" -msgstr "" +msgstr "kesalahan ketika menjalankan fast-export" #: transport-helper.c #, c-format @@ -25028,104 +25783,106 @@ msgid "" "No refs in common and none specified; doing nothing.\n" "Perhaps you should specify a branch.\n" msgstr "" +"Tidak ada kesamaan referensi dan tidak ada yang disebutkan; tidak melakuan\n" +"apa-apa. Mungkin Anda perlu menyebutkan sebuah cabang.\n" #: transport-helper.c #, c-format msgid "unsupported object format '%s'" -msgstr "" +msgstr "format objek tidak didukung '%s'" #: transport-helper.c #, c-format msgid "malformed response in ref list: %s" -msgstr "" +msgstr "jawaban rusak di daftar referensi: %s" #: transport-helper.c #, c-format msgid "read(%s) failed" -msgstr "" +msgstr "read(%s) gagal" #: transport-helper.c #, c-format msgid "write(%s) failed" -msgstr "" +msgstr "write(%s) gagal" #: transport-helper.c #, c-format msgid "%s thread failed" -msgstr "" +msgstr "utas %s gagal" #: transport-helper.c #, c-format msgid "%s thread failed to join: %s" -msgstr "" +msgstr "utas %s gagal bergabung: %s" #: transport-helper.c #, c-format msgid "can't start thread for copying data: %s" -msgstr "" +msgstr "tidak dapat memulai utas untuk menyalin data: %s" #: transport-helper.c #, c-format msgid "%s process failed to wait" -msgstr "" +msgstr "proses %s gagal menunggu" #: transport-helper.c #, c-format msgid "%s process failed" -msgstr "" +msgstr "proses %s gagal" #: transport-helper.c msgid "can't start thread for copying data" -msgstr "" +msgstr "tidak dapat memulai utas untuk menyalin data" #: transport.c #, c-format msgid "Would set upstream of '%s' to '%s' of '%s'\n" -msgstr "" +msgstr "Akan menyetel hulu '%s' ke '%s' dari '%s'\n" #: transport.c #, c-format msgid "could not read bundle '%s'" -msgstr "" +msgstr "tidak dapat membaca bundel '%s'" #: transport.c #, c-format msgid "transport: invalid depth option '%s'" -msgstr "" +msgstr "transport: opsi kedalaman '%s' tidak valid" #: transport.c msgid "see protocol.version in 'git help config' for more details" -msgstr "" +msgstr "lihat protocol.version di 'git help config' untuk lebih lengkapnya" #: transport.c msgid "server options require protocol version 2 or later" -msgstr "" +msgstr "opsi peladen butuh protokol versi 2 atau lebih baru" #: transport.c msgid "server does not support wait-for-done" -msgstr "" +msgstr "peladen tidak mendukung wait-for-done" #: transport.c msgid "could not parse transport.color.* config" -msgstr "" +msgstr "tidak dapat menguraikan konfigurasi transport.color.*" #: transport.c msgid "support for protocol v2 not implemented yet" -msgstr "" +msgstr "dukungan untuk protokol v2 belum diterapkan" #: transport.c #, c-format msgid "unknown value for config '%s': %s" -msgstr "" +msgstr "nilai tidak dikenal untuk konfigurasi '%s': %s" #: transport.c #, c-format msgid "transport '%s' not allowed" -msgstr "" +msgstr "transportasi '%s' tidak diperbolehkan" #: transport.c msgid "git-over-rsync is no longer supported" -msgstr "" +msgstr "git-over-rsync tidak lagi didukung" #: transport.c #, c-format @@ -25133,6 +25890,8 @@ msgid "" "The following submodule paths contain changes that can\n" "not be found on any remote:\n" msgstr "" +"Jalur submodul berikut berisi perubahan yang tidak dapat ditemukan\n" +"pada remote apapun:\n" #: transport.c #, c-format @@ -25149,30 +25908,40 @@ msgid "" "to push them to a remote.\n" "\n" msgstr "" +"\n" +"Mohon coba\n" +"\n" +"\tgit push --recurse-submodules=on-demand\n" +"\n" +"atau berganti direktori ke jalur dan gunakan\n" +"\n" +"\tgit push\n" +"untuk mendorong ke remote.\n" +"\n" #: transport.c msgid "Aborting." -msgstr "" +msgstr "Membatalkan." #: transport.c msgid "failed to push all needed submodules" -msgstr "" +msgstr "gagal mendorong semua submodul yang dibutuhkan" #: tree-walk.c msgid "too-short tree object" -msgstr "" +msgstr "objek pohon terlalu pendek" #: tree-walk.c msgid "malformed mode in tree entry" -msgstr "" +msgstr "mode salah di entri pohon" #: tree-walk.c msgid "empty filename in tree entry" -msgstr "" +msgstr "nama berkas kosong di entri pohon" #: tree-walk.c msgid "too-short tree file" -msgstr "" +msgstr "berkas pohon terlalu pendek" #: unpack-trees.c #, c-format @@ -25180,6 +25949,8 @@ msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%sPlease commit your changes or stash them before you switch branches." msgstr "" +"Perubahan lokal Anda terhadap berkas berikut akan ditimpa oleh checkout:\n" +"%%sMohon komit atau stase sebelum Anda mengganti cabang." #: unpack-trees.c #, c-format @@ -25187,6 +25958,8 @@ msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%s" msgstr "" +"Perubahan lokal Anda terhadap berkas berikut akan ditimpa oleh checkout:\n" +"%%s" #: unpack-trees.c #, c-format @@ -25194,6 +25967,9 @@ msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%sPlease commit your changes or stash them before you merge." msgstr "" +"Perubahan lokal Anda terhadap berkas berikut akan ditimpa oleh " +"penggabungan:\n" +"%%sMohon komit atau stase sebelum Anda gabungkan." #: unpack-trees.c #, c-format @@ -25201,6 +25977,9 @@ msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%s" msgstr "" +"Perubahan lokal Anda terhadap berkas berikut akan ditimpa oleh " +"penggabungan:\n" +"%%s" #: unpack-trees.c #, c-format @@ -25208,6 +25987,8 @@ msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%sPlease commit your changes or stash them before you %s." msgstr "" +"Perubahan lokal Anda terhadap berkas berikut akan ditimpa oleh %s:\n" +"%%sMohon komit atau stase sebelum Anda %s." #: unpack-trees.c #, c-format @@ -25215,6 +25996,8 @@ msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%s" msgstr "" +"Perubahan lokal Anda terhadap berkas berikut akan ditimpa oleh %s:\n" +"%%s" #: unpack-trees.c #, c-format @@ -25222,6 +26005,9 @@ msgid "" "Updating the following directories would lose untracked files in them:\n" "%s" msgstr "" +"Memperbarui direktori berikut akan menghilangkan berkas tak terlacak di " +"dalam:\n" +"%s" #: unpack-trees.c #, c-format @@ -25229,6 +26015,8 @@ msgid "" "Refusing to remove the current working directory:\n" "%s" msgstr "" +"Menolak menghapus direktori kerja saat ini:\n" +"%s" #: unpack-trees.c #, c-format @@ -25236,6 +26024,8 @@ msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%sPlease move or remove them before you switch branches." msgstr "" +"Berkas pohon kerja tak terlacak berikut akan dihapus oleh checkout:\n" +"%%sMohon pindahkan atau hapus sebelum Anda berganti cabang." #: unpack-trees.c #, c-format @@ -25243,6 +26033,8 @@ msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%s" msgstr "" +"Berkas pohon kerja tak terlacak berikut akan dihapus oleh checkout:\n" +"%%s" #: unpack-trees.c #, c-format @@ -25250,6 +26042,8 @@ msgid "" "The following untracked working tree files would be removed by merge:\n" "%%sPlease move or remove them before you merge." msgstr "" +"Berkas pohon kerja tak terlacak berikut akan dihapus oleh penggabungan:\n" +"%%sMohon pindahkan atau hapus sebelum Anda gabungkan." #: unpack-trees.c #, c-format @@ -25257,6 +26051,8 @@ msgid "" "The following untracked working tree files would be removed by merge:\n" "%%s" msgstr "" +"Berkas pohon kerja tak terlacak berikut akan dihapus oleh penggabungan:\n" +"%%s" #: unpack-trees.c #, c-format @@ -25264,6 +26060,8 @@ msgid "" "The following untracked working tree files would be removed by %s:\n" "%%sPlease move or remove them before you %s." msgstr "" +"Berkas pohon kerja tak terlacak berikut akan dihapus oleh %s:\n" +"%%sMohon pindahkan atau hapus sebelum Anda %s." #: unpack-trees.c #, c-format @@ -25271,6 +26069,8 @@ msgid "" "The following untracked working tree files would be removed by %s:\n" "%%s" msgstr "" +"Berkas pohon kerja tak terlacak berikut akan dihapus oleh %s:\n" +"%%s" #: unpack-trees.c #, c-format @@ -25279,6 +26079,8 @@ msgid "" "checkout:\n" "%%sPlease move or remove them before you switch branches." msgstr "" +"Berkas pohon kerja tak terlacak berikut akan ditimpa oleh checkout:\n" +"%%sMohon pindahkan atau hapus sebelum Anda berganti cabang." #: unpack-trees.c #, c-format @@ -25287,6 +26089,8 @@ msgid "" "checkout:\n" "%%s" msgstr "" +"Berkas pohon kerja tak terlacak berikut akan ditimpa oleh checkout:\n" +"%%s" #: unpack-trees.c #, c-format @@ -25294,6 +26098,8 @@ msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%sPlease move or remove them before you merge." msgstr "" +"Berkas pohon kerja tak terlacak berikut akan ditimpa oleh penggabungan:\n" +"%%sMohon pindahkan atau hapus sebelum Anda gabungkan." #: unpack-trees.c #, c-format @@ -25301,6 +26107,8 @@ msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%s" msgstr "" +"Berkas pohon kerja tak terlacak berikut akan ditimpa oleh penggabungan:\n" +"%%s" #: unpack-trees.c #, c-format @@ -25308,6 +26116,8 @@ msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%sPlease move or remove them before you %s." msgstr "" +"Berkas pohon kerja tak terlacak berikut akan ditimpa oleh %s:\n" +"%%sMohon pindahkan atau hapus sebelum Anda %s." #: unpack-trees.c #, c-format @@ -25315,11 +26125,13 @@ msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%s" msgstr "" +"Berkas pohon kerja tak terlacak berikut akan ditimpa oleh %s:\n" +"%%s" #: unpack-trees.c #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." -msgstr "" +msgstr "Entri '%s' tumpang tindih dengan '%s'. Tidak dapat mengikat." #: unpack-trees.c #, c-format @@ -25327,6 +26139,8 @@ msgid "" "Cannot update submodule:\n" "%s" msgstr "" +"Tidak dapat memperbarui submodul:\n" +"%s" #: unpack-trees.c #, c-format @@ -25335,6 +26149,8 @@ msgid "" "patterns:\n" "%s" msgstr "" +"Jalur berikut tidak diperbarui dan dibiarkan walaupun merupakan pola tipis:\n" +"%s" #: unpack-trees.c #, c-format @@ -25342,6 +26158,9 @@ msgid "" "The following paths are unmerged and were left despite sparse patterns:\n" "%s" msgstr "" +"Jalur berikut tidak digabungkan dan dibiarkan walaupun merupakan pola " +"tipis:\n" +"%s" #: unpack-trees.c #, c-format @@ -25350,11 +26169,13 @@ msgid "" "patterns:\n" "%s" msgstr "" +"Jalur berikut sudah ada dan tidak diperbarui walaupun merupakan pola tipis:\n" +"%s" #: unpack-trees.c #, c-format msgid "Aborting\n" -msgstr "" +msgstr "Membatalkan\n" #: unpack-trees.c #, c-format @@ -25362,10 +26183,12 @@ msgid "" "After fixing the above paths, you may want to run `git sparse-checkout " "reapply`.\n" msgstr "" +"Setelah memperbarui jalur tersebut, Anda mungkin ingin menjalankan `git " +"sparse-checkout reapply`.\n" #: unpack-trees.c msgid "Updating files" -msgstr "" +msgstr "Memperbarui berkas" #: unpack-trees.c msgid "" @@ -25373,15 +26196,18 @@ msgid "" "on a case-insensitive filesystem) and only one from the same\n" "colliding group is in the working tree:\n" msgstr "" +"jalur berikut bertabrakan (misalnya jalur peka huruf besar-kecil pada\n" +"sistem berkas tidak peka huruf besar-kecil) dan hanya satu dari grup\n" +"bertabrakan yang sama yang berada di dalam pohon kerja:\n" #: unpack-trees.c msgid "Updating index flags" -msgstr "" +msgstr "Memperbarui bendera indeks" #: unpack-trees.c #, c-format msgid "worktree and untracked commit have duplicate entries: %s" -msgstr "" +msgstr "pohon kerja dan komit tak terlacak punya entri duplikat: %s" #: upload-pack.c msgid "expected flush after fetch arguments" @@ -25389,36 +26215,52 @@ msgstr "bilasan diharapkan setelah argumen pengambilan" #: urlmatch.c msgid "invalid URL scheme name or missing '://' suffix" -msgstr "" +msgstr "skema URL tidak valid atau kehilangan akhiran '://'" #: urlmatch.c #, c-format msgid "invalid %XX escape sequence" -msgstr "" +msgstr "urutan pelarian %XX tidak valid" #: urlmatch.c msgid "missing host and scheme is not 'file:'" -msgstr "" +msgstr "kehilangan host dan skema bukan 'file:'" #: urlmatch.c msgid "a 'file:' URL may not have a port number" -msgstr "" +msgstr "sebuah URL 'file:' tidak boleh punya nomor port" #: urlmatch.c msgid "invalid characters in host name" -msgstr "" +msgstr "karakter tidak valid pada nama host" #: urlmatch.c msgid "invalid port number" -msgstr "" +msgstr "nomor port tidak valid" #: urlmatch.c msgid "invalid '..' path segment" -msgstr "" +msgstr "segmen jalur '..' tidak valid" + +#: usage.c +msgid "usage: " +msgstr "penggunaan: " + +#: usage.c +msgid "fatal: " +msgstr "fatal: " + +#: usage.c +msgid "error: " +msgstr "kesalahan: " + +#: usage.c +msgid "warning: " +msgstr "peringatan: " #: walker.c msgid "Fetching objects" -msgstr "" +msgstr "Mengambil objek" #: worktree.c #, c-format @@ -25524,7 +26366,7 @@ msgstr "gagal menyetel setelan extensions.worktreeConfig" #: wrapper.c #, c-format msgid "could not setenv '%s'" -msgstr "" +msgstr "tidak dapat menyetel lingkungan (setenv) '%s'" #: wrapper.c #, c-format @@ -25534,16 +26376,16 @@ msgstr "tidak dapat membuat '%s'" #: wrapper.c #, c-format msgid "could not open '%s' for reading and writing" -msgstr "" +msgstr "tidak dapat membuka '%s' untuk membaca dan menulis" #: wrapper.c #, c-format msgid "unable to access '%s'" -msgstr "" +msgstr "tidak dapat mengakses '%s'" #: wrapper.c msgid "unable to get current working directory" -msgstr "" +msgstr "tidak dapat mendapatkan direktori kerja saat ini" #: wt-status.c msgid "Unmerged paths:" @@ -25960,11 +26802,11 @@ msgstr "sedang mendasarkan ulang; ke " #: wt-status.c msgid "HEAD detached at " -msgstr "" +msgstr "HEAD terlepas pada " #: wt-status.c msgid "HEAD detached from " -msgstr "" +msgstr "HEAD terlepas dari " #: wt-status.c msgid "Not currently on any branch." @@ -26093,84 +26935,86 @@ 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." -#: git-merge-octopus.sh +#: git-merge-octopus.sh git-merge-resolve.sh msgid "" "Error: Your local changes to the following files would be overwritten by " "merge" msgstr "" +"Kesalahan: Perubahan lokal Anda terhadap berkas berikut akan ditimpa oleh " +"penggabungan" #: git-merge-octopus.sh msgid "Automated merge did not work." -msgstr "" +msgstr "Penggabungan otomatis tidak bekerja." #: git-merge-octopus.sh msgid "Should not be doing an octopus." -msgstr "" +msgstr "Seharusnya tidak melakukan gurita." #: git-merge-octopus.sh #, sh-format msgid "Unable to find common commit with $pretty_name" -msgstr "" +msgstr "Tidak dapat menemukan komit umum dengan $pretty_name" #: git-merge-octopus.sh #, sh-format msgid "Already up to date with $pretty_name" -msgstr "" +msgstr "Sudah terbaru dengan $pretty_name" #: git-merge-octopus.sh #, sh-format msgid "Fast-forwarding to: $pretty_name" -msgstr "" +msgstr "Memaju-cepat ke: $pretty_name" #: git-merge-octopus.sh #, sh-format msgid "Trying simple merge with $pretty_name" -msgstr "" +msgstr "Mencoba penggabungan sederhana dengan $pretty_name" #: git-merge-octopus.sh msgid "Simple merge did not work, trying automatic merge." -msgstr "" +msgstr "Penggabungan sederhana tidak berkerja, mencoba penggabungan otomatis." #: git-sh-setup.sh #, sh-format msgid "usage: $dashless $USAGE" -msgstr "" +msgstr "penggunaan: $dashless $USAGE" #: git-sh-setup.sh #, sh-format msgid "Cannot chdir to $cdup, the toplevel of the working tree" -msgstr "" +msgstr "tidak dapat berganti direktori ke $cdup, level atas dari pohon kerja" #: git-sh-setup.sh #, sh-format msgid "fatal: $program_name cannot be used without a working tree." -msgstr "" +msgstr "fatal: $program_name tidak dapat digunakan tanpa pohon kerja." #: git-sh-setup.sh msgid "Cannot rewrite branches: You have unstaged changes." -msgstr "" +msgstr "Tidak dapat menulis ulang cabang: Anda punya perubahan tak tergelar." #: git-sh-setup.sh #, sh-format msgid "Cannot $action: You have unstaged changes." -msgstr "" +msgstr "Tidak dapat $action: Anda punya perubahan tak tergelar." #: git-sh-setup.sh #, sh-format msgid "Cannot $action: Your index contains uncommitted changes." -msgstr "" +msgstr "Tidak dapat $action: Indeks Anda berisi perubahan tak terkomit." #: git-sh-setup.sh msgid "Additionally, your index contains uncommitted changes." -msgstr "" +msgstr "Selain itu, indeks Anda berisi perubahan tak terkomit." #: git-sh-setup.sh msgid "You need to run this command from the toplevel of the working tree." -msgstr "" +msgstr "Anda perlu menjalankan perintah ini dari level atas dari pohon kerja." #: git-sh-setup.sh msgid "Unable to determine absolute path of git directory" -msgstr "" +msgstr "Tidak dapat menentukan jalur absolut direktori git" #. TRANSLATORS: you can adjust this to align "git add -i" status menu #: git-add--interactive.perl @@ -26329,26 +27173,6 @@ msgid "ignoring unmerged: %s\n" msgstr "" #: git-add--interactive.perl -#, perl-format -msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " -msgstr "" - -#: git-add--interactive.perl -#, perl-format -msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " -msgstr "" - -#: git-add--interactive.perl -#, perl-format -msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " -msgstr "" - -#: git-add--interactive.perl -#, perl-format -msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " -msgstr "" - -#: git-add--interactive.perl msgid "No other hunks to goto\n" msgstr "" @@ -5,15 +5,15 @@ # msgid "" msgstr "" -"Project-Id-Version: git 2.37.0\n" +"Project-Id-Version: git 2.38.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2022-06-24 21:19+0100\n" -"PO-Revision-Date: 2022-06-24 21:23+0100\n" +"POT-Creation-Date: 2022-09-26 06:34+0100\n" +"PO-Revision-Date: 2022-09-26 06:35+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Gtranslator 3.38.0\n" @@ -409,6 +409,22 @@ msgstr "" "a - applicera stycket och alla följande i filen\n" "d - applicera inte stycket eller något av de följande i filen\n" +#, c-format, perl-format +msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " +msgstr "Applicera ändrat läge på arbetskatalogen [y,n,q,a,d%s,?]? " + +#, c-format, perl-format +msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " +msgstr "Applicera borttagning på arbetskatalogen [y,n,q,a,d%s,?]? " + +#, c-format, perl-format +msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " +msgstr "Applicera tillägg på arbetskatalogen [y,n,q,a,d%s,?]? " + +#, c-format, perl-format +msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " +msgstr "Applicera stycket på arbetskatalogen [y,n,q,a,d%s,?]? " + msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -426,10 +442,6 @@ msgstr "" msgid "could not parse hunk header '%.*s'" msgstr "kunde inte tolka styckehuvudet \"%.*s\"" -#, c-format -msgid "could not parse colored hunk header '%.*s'" -msgstr "kunde inte tolka färgat styckehuvud \"%.*s\"" - msgid "could not parse diff" msgstr "kunde inte tolka diff" @@ -672,7 +684,7 @@ msgid "" "outside of your sparse-checkout definition, so will not be\n" "updated in the index:\n" msgstr "" -"Följande sökvägar och/eller ökvägsangivelser motsvarar sökvägar\n" +"Följande sökvägar och/eller sökvägsangivelser motsvarar sökvägar\n" "utanför din \"sparse-checkout\"-definition, så de kommer inte\n" "uppdateras i indexet:\n" @@ -727,6 +739,25 @@ msgstr "" "advice.detachedHead till false\n" "\n" +#, c-format +msgid "" +"The following paths have been moved outside the\n" +"sparse-checkout definition but are not sparse due to local\n" +"modifications.\n" +msgstr "" +"Följande sökvägar har flyttats ut från din\n" +"\"sparse-checkout\"-definition, men är inte glesa på grund av\n" +"lokala ändringar.\n" + +msgid "" +"To correct the sparsity of these paths, do the following:\n" +"* Use \"git add --sparse <paths>\" to update the index\n" +"* Use \"git sparse-checkout reapply\" to apply the sparsity rules" +msgstr "" +"För att korrigera glesheten för dessa sökvägar, gör följande:\n" +"* Använd \"git add --sparse <sökväg>\" för att uppdatera indexet\n" +"* Använd \"git sparse-checkout reapply\" för att tillämpa gleshetsreglerna" + msgid "cmdline ends with \\" msgstr "kommandorad avslutas med \\" @@ -1229,6 +1260,10 @@ msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "filens läge stöds ej: 0%o (SHA1: %s)" #, c-format +msgid "deflate error (%d)" +msgstr "fel i deflate (%d)" + +#, c-format msgid "unable to start '%s' filter" msgstr "kunde inte starta filtret \"%s\"" @@ -1248,10 +1283,6 @@ msgid "path too long (%d chars, SHA1: %s): %s" msgstr "sökvägen för lång (%d tecken, SHA1: %s): %s" #, c-format -msgid "deflate error (%d)" -msgstr "fel i deflate (%d)" - -#, c-format msgid "timestamp too large for this system: %<PRIuMAX>" msgstr "tidsstämpeln för stor för detta system: %<PRIuMAX>" @@ -3014,8 +3045,12 @@ msgstr "libc-info:" msgid "not run from a git repository - no hooks to show\n" msgstr "körs inte från ett git-arkiv - inga krokar att visa\n" -msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]" -msgstr "git bugreport [-o|--output-directory <fil>] [-s|--suffix <format>]" +msgid "" +"git bugreport [-o|--output-directory <file>] [-s|--suffix <format>] [--" +"diagnose[=<mode>]" +msgstr "" +"git bugreport [-o|--output-directory <fil>] [-s|--suffix <format>] [--" +"diagnose[=<läge>]" msgid "" "Thank you for filling out a Git bug report!\n" @@ -3052,16 +3087,29 @@ msgstr "" "Se över resten av felrapporten nedan.\n" "Du kan ta bort rader du inte vill dela.\n" -msgid "specify a destination for the bugreport file" -msgstr "ange mål för buggrapporteringsfilen" +msgid "mode" +msgstr "läge" -msgid "specify a strftime format suffix for the filename" -msgstr "ange ett filändelse i strftime-format" +msgid "" +"create an additional zip archive of detailed diagnostics (default 'stats')" +msgstr "" +"skapa ett ytterligare zip-arkiv med detaljerad diagnostik (förval är \"stats" +"\")" + +msgid "specify a destination for the bugreport file(s)" +msgstr "ange mål för buggrapporteringsfilen/-rna" + +msgid "specify a strftime format suffix for the filename(s)" +msgstr "ange filändelse i strftime-format" #, c-format msgid "could not create leading directories for '%s'" msgstr "kunde inte skapa inledande kataloger för \"%s\"" +#, c-format +msgid "unable to create diagnostics archive %s" +msgstr "kunde inte skapa diagnostikarkiven %s" + msgid "System Info" msgstr "Systeminfo" @@ -3120,10 +3168,6 @@ msgid "Unbundling objects" msgstr "Packar upp objektbunt" #, c-format -msgid "Unknown subcommand: %s" -msgstr "Okänt underkommando: %s" - -#, c-format msgid "cannot read object %s '%s'" msgstr "kan inte läsa objektet %s: \"%s\"" @@ -3201,6 +3245,9 @@ msgstr "visa objektstorlek" msgid "allow -s and -t to work with broken/corrupt objects" msgstr "låter -s och -t att fungera med trasiga/sönderskrivna objekt" +msgid "use mail map file" +msgstr "använd e-postmappningsfil" + msgid "Batch objects requested on stdin (or --batch-all-objects)" msgstr "Buntobjekt ombeds på standard in (eller --batch-all-objects)" @@ -3210,6 +3257,9 @@ msgstr "visa komplett innehåll för <objekt> eller <rev>" msgid "like --batch, but don't emit <contents>" msgstr "som --batch, men mata inte ut <innehåll>" +msgid "stdin is NUL-terminated" +msgstr "standard in är NUL-terminerad" + msgid "read commands from stdin" msgstr "läs kommandon från standard in" @@ -4078,6 +4128,12 @@ msgstr "klonade undermoduler kommer använda sin fjärrspårningsgren" msgid "initialize sparse-checkout file to include only files at root" msgstr "initiera sparse-checkout-filen till att bara ta med filer i roten" +msgid "uri" +msgstr "uri" + +msgid "a URI for downloading bundles before fetching from origin remote" +msgstr "en URI för att hämta buntar innan de hämtas från ursprungsfjärr" + #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: Kan inte skapa suppleant för \"%s\": %s\n" @@ -4137,9 +4193,8 @@ msgstr "kan inte uppdatera %s" msgid "failed to initialize sparse-checkout" msgstr "misslyckades initiera sparse-checkout" -msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" -msgstr "" -"HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut.\n" +msgid "remote HEAD refers to nonexistent ref, unable to checkout" +msgstr "HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut" msgid "unable to checkout working tree" msgstr "kunde inte checka ut arbetskatalogen" @@ -4163,6 +4218,13 @@ msgstr "Du måste ange ett arkiv att klona." msgid "options '%s' and '%s %s' cannot be used together" msgstr "flaggorna \"%s\" och \"%s %s\" kan inte användas samtidigt" +msgid "" +"--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-" +"exclude" +msgstr "" +"--bundle-uri är inkompatibelt med --depth, --shallow-since och --shallow-" +"exclude" + #, c-format msgid "repository '%s' does not exist" msgstr "arkivet \"%s\" finns inte" @@ -4234,6 +4296,13 @@ msgstr "--local ignoreras" msgid "cannot clone from filtered bundle" msgstr "kan inte klona från filtrerad bunt" +msgid "failed to initialize the repo, skipping bundle URI" +msgstr "misslyckades initiera arkivet, hoppar över bunt-URI" + +#, c-format +msgid "failed to fetch objects from bundle URI '%s'" +msgstr "misslyckades hämta objekt från bunt-URI \"%s\"" + msgid "remote transport reported error" msgstr "fjärrtransport rapporterade fel" @@ -4348,10 +4417,6 @@ msgstr "använd som mest en av --reachable, --stdin-commits och --stdin-packs" msgid "Collecting commits from input" msgstr "Hämtar incheckningar från indata" -#, c-format -msgid "unrecognized subcommand: %s" -msgstr "okänt underkommando: %s" - msgid "" "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " "<file>)...] <tree>" @@ -4705,9 +4770,6 @@ msgstr "visa status i långt format (standard)" msgid "terminate entries with NUL" msgstr "terminera poster med NUL" -msgid "mode" -msgstr "läge" - msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "visa ospårade filer, valfria lägen: all, normal, no. (Standard: all)" @@ -5296,6 +5358,22 @@ msgstr "Inga namn hittades, kan inte beskriva något." msgid "option '%s' and commit-ishes cannot be used together" msgstr "flaggorna \"%s\" och incheckning-igter kan inte användas samtidigt" +msgid "" +"git diagnose [-o|--output-directory <path>] [-s|--suffix <format>] [--" +"mode=<mode>]" +msgstr "" +"git diagnose [-o|--output-directory <sökväg>] [-s|--suffix <format>] [--" +"mode=<läge>]" + +msgid "specify a destination for the diagnostics archive" +msgstr "ange mål för diagnostikarkivet" + +msgid "specify a strftime format suffix for the filename" +msgstr "ange ett filändelse i strftime-format" + +msgid "specify the content of the diagnostic archive" +msgstr "ange vilket innehåll diagnostikarkivet ska ha" + msgid "--merge-base only works with two commits" msgstr "--merge-base fungerar endast med två incheckningar" @@ -5668,11 +5746,8 @@ msgstr "[àjour]" msgid "[rejected]" msgstr "[refuserad]" -msgid "can't fetch in current branch" -msgstr "kan inte hämta i aktuell gren" - -msgid "checked out in another worktree" -msgstr "utcheckat i en annan arbetskatalog" +msgid "can't fetch into checked-out branch" +msgstr "kan inte hämta i utcheckad gren" msgid "[tag update]" msgstr "[uppdaterad tagg]" @@ -6110,6 +6185,10 @@ msgstr "%s: ogiltig sha1-pekare i cacheträd" msgid "non-tree in cache-tree" msgstr "icke-träd i cacheträd" +#, c-format +msgid "%s: invalid sha1 pointer in resolve-undo" +msgstr "%s: ogiltig sha1-pekare i resolve-undo" + msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<flaggor>] [<objekt>...]" @@ -6441,13 +6520,16 @@ msgstr "misslyckades starta schtasks" msgid "failed to run 'crontab -l'; your system might not support 'cron'" msgstr "" -"kunde inte köra \"crontab -l\"; ditt system kanske inte stöder \"cron\"" +"misslyckades köra \"crontab -l\"; ditt system kanske inte stöder \"cron\"" -msgid "failed to run 'crontab'; your system might not support 'cron'" -msgstr "kunde inte köra \"crontab\"; ditt system kanske inte stöder \"cron\"" +msgid "failed to create crontab temporary file" +msgstr "misslyckades skapa temporär crontab-fil" + +msgid "failed to open temporary file" +msgstr "misslyckades öppna temporär fil" -msgid "failed to open stdin of 'crontab'" -msgstr "misslyckades öppna standard in för \"crontab\"" +msgid "failed to run 'crontab'; your system might not support 'cron'" +msgstr "misslyckades köra \"crontab\"; ditt system kanske inte stöder \"cron\"" msgid "'crontab' died" msgstr "\"crontab\" dog" @@ -6495,10 +6577,6 @@ msgstr "misslyckades lägga till arkiv till global konfiguration" msgid "git maintenance <subcommand> [<options>]" msgstr "git maintenance <underkommando> [<flaggor>]" -#, c-format -msgid "invalid subcommand: %s" -msgstr "felaktigt underkommando: %s" - msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<flaggor>] [-e] <mönster> [<rev>...] [[--] <sökväg>...]" @@ -6669,6 +6747,9 @@ msgstr "visa träffade filer i filbläddraren" msgid "allow calling of grep(1) (ignored by this build)" msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)" +msgid "maximum number of results per file" +msgstr "maximalt antal resultat per fil" + msgid "no pattern given" msgstr "inget mönster angavs" @@ -6755,11 +6836,17 @@ msgstr "visa kommandobeskrivning" msgid "print list of useful guides" msgstr "lista användbara vägledningar" +msgid "print list of user-facing repository, command and file interfaces" +msgstr "lista arkiv-, kommando- och filgränssnitt tänkta för användare" + +msgid "print list of file formats, protocols and other developer interfaces" +msgstr "lista filformat, protokoll och andra utvecklargränssnitt" + msgid "print all configuration variable names" msgstr "visa namn på alla konfigurationsvariabler" -msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]" -msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<kommando>]" +msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>|<doc>]" +msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<kommando>|<doc>]" #, c-format msgid "unrecognized help format '%s'" @@ -7230,8 +7317,8 @@ msgstr "undertryck diff-utdata" msgid "show source" msgstr "visa källkod" -msgid "use mail map file" -msgstr "använd e-postmappningsfil" +msgid "clear all previously-defined decoration filters" +msgstr "rensa alla tidigare definierade dekorationsfilter" msgid "only decorate refs that match <pattern>" msgstr "dekorera endast referenser som motsvarar <mönster>" @@ -7482,6 +7569,9 @@ msgstr "visa ändringar mot <refspec> i omslagsbrev eller ensam patch" msgid "percentage by which creation is weighted" msgstr "procent som skapelse vägs med" +msgid "show in-body From: even if identical to the e-mail header" +msgstr "visa From: i kroppen även om samma som i e-posthuvudet" + #, c-format msgid "invalid ident line: %s" msgstr "ogiltig ident-rad: %s" @@ -7540,6 +7630,18 @@ msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n" +#, c-format +msgid "bad ls-files format: element '%s' does not start with '('" +msgstr "felaktigt ls-files-format: elementet \"%s\" börjar inte med \"(\"" + +#, c-format +msgid "bad ls-files format: element '%s' does not end in ')'" +msgstr "felaktigt ls-files-format: elementet \"%s\" slutar inte med \")\"" + +#, c-format +msgid "bad ls-files format: %%%.*s" +msgstr "felaktigt ls-files-format: %%%.*s" + msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<flaggor>] [<fil>...]" @@ -7625,6 +7727,13 @@ msgid "show sparse directories in the presence of a sparse index" msgstr "visa glesa kataloger när et glest index existerar" msgid "" +"--format cannot be used with -s, -o, -k, -t, --resolve-undo, --deduplicate, " +"--eol" +msgstr "" +"--format kan inte användas med -s, -o, -k, -t, --resolve-undo, --" +"deduplicate, --eol" + +msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" " [-q | --quiet] [--exit-code] [--get-url]\n" " [--symref] [<repository> [<refs>...]]" @@ -7842,6 +7951,39 @@ msgstr "kunde inte bestämma referensen \"%s\"" msgid "Merging %s with %s\n" msgstr "Slår ihop %s med %s\n" +msgid "not something we can merge" +msgstr "inte något vi kan slå ihop" + +msgid "refusing to merge unrelated histories" +msgstr "vägrar slå samman orelaterad historik" + +msgid "failure to merge" +msgstr "misslyckades slå ihop" + +msgid "git merge-tree [--write-tree] [<options>] <branch1> <branch2>" +msgstr "git merge-tree [--write-tree] [<flaggor>] <gren1> <gren2>" + +msgid "git merge-tree [--trivial-merge] <base-tree> <branch1> <branch2>" +msgstr "git merge-tree [--trivial-merge] <baseträd> <gren1> <gren2>" + +msgid "do a real merge instead of a trivial merge" +msgstr "gör en riktig sammanslagning istället för en enkel sammanslagning" + +msgid "do a trivial merge only" +msgstr "gör endast en enkel sammanslagning" + +msgid "also show informational/conflict messages" +msgstr "visa även informations-/konfliktmeddelanden" + +msgid "list filenames without modes/oids/stages" +msgstr "lista filnamn utan lägen/oid/köer" + +msgid "allow merging unrelated histories" +msgstr "tillåt sammanslagning av orelaterade historier" + +msgid "--trivial-merge is incompatible with all other options" +msgstr "--trivial-merge är inkompatibelt med andra flaggor" + msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<flaggor>] [<incheckning>...]" @@ -7922,9 +8064,6 @@ msgstr "--abort men lämna index och arbetskatalog ensamma" msgid "continue the current in-progress merge" msgstr "fortsätt den pågående sammanslagningen" -msgid "allow merging unrelated histories" -msgstr "tillåt sammanslagning av orelaterade historier" - msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "förbigå pre-merge-commit- och commit-msg-krokar" @@ -8045,9 +8184,6 @@ msgstr "kunde inte stänga \"%s\"" msgid "not something we can merge in %s: %s" msgstr "inte något vi kan slå ihop med %s: %s" -msgid "not something we can merge" -msgstr "inte något vi kan slå ihop" - msgid "--abort expects no arguments" msgstr "--abort tar inga argument" @@ -8096,14 +8232,20 @@ msgstr "%s - inte något vi kan slå ihop" msgid "Can merge only exactly one commit into empty head" msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud" -msgid "refusing to merge unrelated histories" -msgstr "vägrar slå samman orelaterad historik" - #, c-format msgid "Updating %s..%s\n" msgstr "Uppdaterar %s..%s\n" #, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" +"Dina lokala ändringar av följande filer skulle skrivas över av " +"sammanslagning:\n" +" %s" + +#, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Försöker riktigt enkel sammanslagning i indexet...\n" @@ -8137,6 +8279,10 @@ msgstr "" "Automatisk sammanslagning lyckades; stoppar före incheckning som önskat\n" #, c-format +msgid "When finished, apply stashed changes with `git stash pop`\n" +msgstr "När färdig, applicerade sparade ändringar med \"git stash pop\"\n" + +#, c-format msgid "warning: tag input does not pass fsck: %s" msgstr "varning: taggindata godkänns inte av fsck: %s" @@ -8253,6 +8399,9 @@ msgstr "Kontrollerar namnbyte av \"%s\" till \"%s\"\n" msgid "bad source" msgstr "felaktig källa" +msgid "destination exists" +msgstr "destinationen finns" + msgid "can not move directory into itself" msgstr "kan inte flytta katalog till sig själv" @@ -8268,9 +8417,6 @@ msgstr "inte versionshanterad" msgid "conflicted" msgstr "i konflikt" -msgid "destination exists" -msgstr "destinationen finns" - #, c-format msgid "overwriting '%s'" msgstr "skriver över \"%s\"" @@ -8284,6 +8430,9 @@ msgstr "flera källor för samma mål" msgid "destination directory does not exist" msgstr "destinationskatalogen finns inte" +msgid "destination exists in the index" +msgstr "destinationen finns i indexet" + #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, källa=%s, mål=%s" @@ -8320,7 +8469,6 @@ msgstr "ignorera referenser som motsvarar <mönster>" msgid "list all commits reachable from all refs" msgstr "lista alla incheckningar som kan nås alla referenser" -#| msgid "deprecated: use annotate-stdin instead" msgid "deprecated: use --annotate-stdin instead" msgstr "avråds: använd --annotate-stdin istället" @@ -8643,8 +8791,8 @@ msgid "use notes from <notes-ref>" msgstr "använd anteckningar från <anteckningsref>" #, c-format -msgid "unknown subcommand: %s" -msgstr "okänt underkommando: %s" +msgid "unknown subcommand: `%s'" +msgstr "okänt underkommando: \"%s\"" msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" @@ -9528,11 +9676,16 @@ msgid "only emit output related to the second range" msgstr "visa endast utdata för det andra intervallet" #, c-format +msgid "not a revision: '%s'" +msgstr "inte en revision: \"%s\"" + +#, c-format msgid "not a commit range: '%s'" msgstr "inte ett incheckningsintervall: \"%s\"" -msgid "single arg format must be symmetric range" -msgstr "ensamt argument måste vara symmetriskt intervall" +#, c-format +msgid "not a symmetric range: '%s'" +msgstr "inte ett symmetriskt intervall: \"%s\"" msgid "need two commit ranges" msgstr "behöver två incheckningsintervall" @@ -9805,6 +9958,9 @@ msgstr "behåller incheckningar som är tomma från början" msgid "move commits that begin with squash!/fixup! under -i" msgstr "flytta incheckningar som börjar med squash!/fixup! under -i" +msgid "update branches that point to commits that are being rebased" +msgstr "uppdatera grenar som pekar på incheckningar som ombaseras" + msgid "add exec lines after each commit of the editable list" msgstr "lägg till exec-rader efter varje incheckning i den redigerbara listan" @@ -10325,6 +10481,9 @@ msgstr " ny (nästa hämtning sparar i remotes/%s)" msgid " tracked" msgstr " spårad" +msgid " skipped" +msgstr " överhoppad" + msgid " stale (use 'git remote prune' to remove)" msgstr " förlegad (använd \"git remote prune\" för att ta bort)" @@ -10990,6 +11149,11 @@ msgstr "Kunde inte skriva ny indexfil." msgid "unable to get disk usage of %s" msgstr "kan inte hämta diskanvändning för %s" +#, c-format +msgid "invalid value for '%s': '%s', the only allowed format is '%s'" +msgstr "" +"felaktigt värde för \"%s\": \"%s\", det enda tillåtna formatet är \"%s\"" + msgid "rev-list does not support display of notes" msgstr "rev-list stöder inte visning av anteckningar" @@ -11015,6 +11179,9 @@ msgstr "för tidigt slut på indata" msgid "no usage string given before the `--' separator" msgstr "ingen användningssträng angavs före \"--\"-avdelaren" +msgid "missing opt-spec before option flags" +msgstr "saknar flagg-spec före alternativflaggor" + msgid "Needed a single revision" msgstr "Behövde ensam revision" @@ -11775,6 +11942,10 @@ msgid "Expecting a full ref name, got %s" msgstr "Förväntade fullt referensnamn, fick %s" #, c-format +msgid "could not get a repository handle for submodule '%s'" +msgstr "kunde inte få tag i arkivhandtag för undermodulen \"%s\"" + +#, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " "authoritative upstream." @@ -11782,12 +11953,6 @@ msgstr "" "kunde inte slå upp konfigurationen \"%s\". Antar att arkivet är sin eget " "officiella uppström." -msgid "alternative anchor for relative paths" -msgstr "alternativa ankare för relativa sökvägar" - -msgid "git submodule--helper list [--prefix=<path>] [<path>...]" -msgstr "git submodule--helper list [--prefix=<sökväg>] [<sökväg>...]" - #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "Hittade ingen url för undermodulsökvägen \"%s\" i .gitmodules" @@ -11820,8 +11985,8 @@ msgstr "dölj utdata från för varje undermodulskommando som startas" msgid "recurse into nested submodules" msgstr "rekursera in i nästlade undermoduler" -msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" -msgstr "git submodule--helper sync [--quiet] [--recursive] [--] [<kommando>]" +msgid "git submodule foreach [--quiet] [--recursive] [--] <command>" +msgstr "git submodule foreach [--quiet] [--recursive] [--] <kommando>" #, c-format msgid "Failed to register url for submodule path '%s'" @@ -11842,8 +12007,8 @@ msgstr "Misslyckades registrera uppdateringsläge för undermodulsökväg \"%s\" msgid "suppress output for initializing a submodule" msgstr "dölj utdata från initiering av undermodul" -msgid "git submodule--helper init [<options>] [<path>]" -msgstr "git submodule--helper init [<flaggor>] [<sökväg>]" +msgid "git submodule init [<options>] [<path>]" +msgstr "git submodule init [<flaggor>] [<sökväg>]" #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" @@ -11870,9 +12035,6 @@ msgstr "" msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quitet] [--cached] [--recursive] [<sökväg>...]" -msgid "git submodule--helper name <path>" -msgstr "git submodule--helper name <sökväg>" - #, c-format msgid "* %s %s(blob)->%s(submodule)" msgstr "* %s %s(blob)->%s(submodule)" @@ -11906,9 +12068,8 @@ msgstr "" msgid "limit the summary size" msgstr "begränsa översiktsstorleken" -msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" -msgstr "" -"git submodule--helper summary [<flaggor>] [<incheckning>] [--] [<sökväg>]" +msgid "git submodule summary [<options>] [<commit>] [--] [<path>]" +msgstr "git submodule summary [<flaggor>] [<incheckning>] [--] [<sökväg>]" msgid "could not fetch a revision for HEAD" msgstr "kunde inte hämta en version för HEAD" @@ -11922,18 +12083,14 @@ msgid "failed to register url for submodule path '%s'" msgstr "misslyckades registrera url för undermodulsökväg \"%s\"" #, c-format -msgid "failed to get the default remote for submodule '%s'" -msgstr "misslyckades hämta standardfjärr för undermodulsökväg \"%s\"" - -#, c-format msgid "failed to update remote for submodule '%s'" msgstr "misslyckades uppdatera fjärr för undermodulsökväg \"%s\"" msgid "suppress output of synchronizing submodule url" msgstr "dölj utdata från synkronisering av undermodul-url" -msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" -msgstr "git submodule--helper sync [--quiet] [--recursive] [<sökväg>]" +msgid "git submodule sync [--quiet] [--recursive] [<path>]" +msgstr "git submodule sync [--quiet] [--recursive] [<sökväg>]" #, c-format msgid "" @@ -11988,12 +12145,16 @@ msgid "" "submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n" "'--reference-if-able' instead of '--reference'." msgstr "" -"En suppleant beräknad från överprojektets suppleant är ogiltig.\n" +"En suppleant beräknad från huvudprojektets suppleant är ogiltig.\n" "För att i så fall låta Git klona utan ett suppleant, sätt\n" "submodule.alternateErrorStrategy till \"info\" eller, likvärdigt, klona\n" "med \"--reference-if-able\" istället för \"--reference\"." #, c-format +msgid "could not get a repository handle for gitdir '%s'" +msgstr "kunde inte få tag i arkivhandtag för gitkatalogen \"%s\"" + +#, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "undermodulen \"%s\" kan inte lägga till suppleant: %s" @@ -12021,6 +12182,9 @@ msgstr "katalogen inte tom: \"%s\"" msgid "could not get submodule directory for '%s'" msgstr "kunde inte få tag i undermodulkatalog för \"%s\"" +msgid "alternative anchor for relative paths" +msgstr "alternativa ankare för relativa sökvägar" + msgid "where the new submodule will be cloned to" msgstr "var den nya undermodulen ska klonas till" @@ -12049,10 +12213,6 @@ msgstr "" "<filterangivelse>] --url <url> --path <sökväg>" #, c-format -msgid "Invalid update mode '%s' for submodule path '%s'" -msgstr "Ogiltigt uppdateringsläge \"%s\" för undermodulsökväg \"%s\"" - -#, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "" "Ogiltigt uppdateringsläge \"%s\" konfigurerat för undermodulsökväg \"%s\"" @@ -12125,6 +12285,10 @@ msgstr "" "hämtning av incheckningen misslyckades." #, c-format +msgid "could not initialize submodule at path '%s'" +msgstr "kunde inte initiera undermodul i sökvägen \"%s\"" + +#, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " "the superproject is not on any branch" @@ -12133,10 +12297,6 @@ msgstr "" "huvudprojektet är inte på någon gren" #, c-format -msgid "could not get a repository handle for submodule '%s'" -msgstr "kunde inte få tag i arkivhandtag för undermodulen \"%s\"" - -#, c-format msgid "Unable to find current revision in submodule path '%s'" msgstr "Kan inte hitta aktuell revision i undermodulsökvägen \"%s\"" @@ -12170,11 +12330,14 @@ msgstr "hämta inte nya objekt från fjärrplatsen" msgid "path into the working tree" msgstr "sökväg inuti arbetskatalogen" -msgid "path into the working tree, across nested submodule boundaries" -msgstr "sökväg inuti arbetskatalogen, genom nästlade undermodulgränser" +msgid "use the 'checkout' update strategy (default)" +msgstr "använd uppdateringsstrategin \"checkout\" (utcheckning; förval)" + +msgid "use the 'merge' update strategy" +msgstr "använd uppdateringsstrategin \"merge\" (sammanslagning)" -msgid "rebase, merge, checkout or none" -msgstr "rebase, merge, checkout eller none" +msgid "use the 'rebase' update strategy" +msgstr "använd uppdateringsstrategin \"rebase\" (ombasering)" msgid "create a shallow clone truncated to the specified number of revisions" msgstr "skapa en grund klon trunkerad till angivet antal revisioner" @@ -12188,6 +12351,9 @@ msgstr "om den första klonen ska följa rekommendation för grund kloning" msgid "don't print cloning progress" msgstr "skriv inte klonförlopp" +msgid "disallow cloning into non-empty directory, implies --init" +msgstr "förhindra kloning till icke-tom katalog, implicerar --init" + msgid "" "git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] " "[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-" @@ -12199,14 +12365,11 @@ msgstr "" "[no-]recommend-shallow] [--reference <arkiv>] [--recursive] [--[no-]single-" "branch] [--] [<sökväg>...]" -msgid "bad value for update parameter" -msgstr "felaktigt värde för parametern update" - msgid "recurse into submodules" msgstr "rekursera ner i undermoduler" -msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" -msgstr "git submodule--helper absorb-git-dirs [<flaggor>] [<sökväg>...]" +msgid "git submodule absorbgitdirs [<options>] [<path>...]" +msgstr "git submodule absorbgitdirs [<flaggor>] [<sökväg>...]" msgid "check if it is safe to write to the .gitmodules file" msgstr "se om det är säkert att skriva till .gitmodules-filen" @@ -12226,8 +12389,8 @@ msgstr "se till att .gitmodules finns i arbetskatalogen" msgid "suppress output for setting url of a submodule" msgstr "dölj utdata från inställning av url för undermodul" -msgid "git submodule--helper set-url [--quiet] <path> <newurl>" -msgstr "git submodule--helper set-url [--quiet] <sökväg> <nyurl>" +msgid "git submodule set-url [--quiet] <path> <newurl>" +msgstr "git submodule set-url [--quiet] <sökväg> <nyurl>" msgid "set the default tracking branch to master" msgstr "välj master som förvald spårad gren" @@ -12235,13 +12398,11 @@ msgstr "välj master som förvald spårad gren" msgid "set the default tracking branch" msgstr "välj förvald spårad gren" -msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" -msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <sökväg>" +msgid "git submodule set-branch [-q|--quiet] (-d|--default) <path>" +msgstr "git submodule set-branch [-q|--quiet] (-d|--default) <sökväg>" -msgid "" -"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" -msgstr "" -"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <gren> <sökväg>" +msgid "git submodule set-branch [-q|--quiet] (-b|--branch) <branch> <path>" +msgstr "git submodule set-branch [-q|--quiet] (-b|--branch) <gren> <sökväg>" msgid "--branch or --default required" msgstr "--branch eller --default krävs" @@ -12339,8 +12500,8 @@ msgstr "" "sätter undermodulens namn till den angivna strängen istället för att använda " "sökvägen" -msgid "git submodule--helper add [<options>] [--] <repository> [<path>]" -msgstr "git submodule--helper add [<flaggor>] [--] <arkiv> [<sökväg>]" +msgid "git submodule add [<options>] [--] <repository> [<path>]" +msgstr "git submodule add [<flaggor>] [--] <arkiv> [<sökväg>]" msgid "Relative path can only be used from the toplevel of the working tree" msgstr "Relativ sökväg kan endast användas från arbetskatalogens toppnivå" @@ -12546,6 +12707,16 @@ msgstr "Uppdaterad tagg \"%s\" (var %s)\n" msgid "pack exceeds maximum allowed size" msgstr "paket är större än tillåten maximal storlek" +msgid "failed to write object in stream" +msgstr "misslyckades skriva objekt i ström" + +#, c-format +msgid "inflate returned (%d)" +msgstr "inflate returnerade (%d)" + +msgid "invalid blob object from stream" +msgstr "ogiltigt blob-objekt från ström" + msgid "Unpacking objects" msgstr "Packar upp objekt" @@ -13061,6 +13232,27 @@ msgstr "visa trädobjekt för underkatalogen <prefix>" msgid "only useful for debugging" msgstr "endast användbart vid felsökning" +msgid "core.fsyncMethod = batch is unsupported on this platform" +msgstr "core.fsyncMethod = batch stöds inte på denna plattform" + +msgid "failed to create temporary file" +msgstr "misslyckades skapa temporär fil" + +msgid "insufficient capabilities" +msgstr "otillräckliga kapabiliteter" + +#, c-format +msgid "failed to download bundle from URI '%s'" +msgstr "kunde inte hämta bunt från URI:en \"%s\"" + +#, c-format +msgid "file at URI '%s' is not a bundle" +msgstr "filen på URI \"%s\" är inte en bunt" + +#, c-format +msgid "failed to unbundle bundle from URI '%s'" +msgstr "misslyckades packa upp bunten från URI:en \"%s\"" + #, c-format msgid "unrecognized bundle hash algorithm: %s" msgstr "okänd hashningsalgoritm för bunt: \"%s\"" @@ -13263,6 +13455,9 @@ msgstr "En riktigt enkel server för Git-arkiv" msgid "Give an object a human readable name based on an available ref" msgstr "Ge ett objekt användarläsbara namn baserade på en tillgänglig referens" +msgid "Generate a zip archive of diagnostic information" +msgstr "Skapa ett zip-arkiv med diagnostisk information" + msgid "Show changes between commits, commit and working tree, etc" msgstr "Visa ändringar mellan incheckningar, med arbetskatalogen, osv" @@ -13390,8 +13585,8 @@ msgstr "Kör en sammanslagning för filer som behöver det" msgid "The standard helper program to use with git-merge-index" msgstr "Förvalt hjälpprogram att använda tillsammans med git-merge-index" -msgid "Show three-way merge without touching index" -msgstr "Visa trevägssammanslagning utan att röra indexet" +msgid "Perform merge without touching index or working tree" +msgstr "Utför sammanslagning utan att röra index eller arbetskatalog" msgid "Run merge conflict resolution tools to resolve merge conflicts" msgstr "Kör verktyg för lösning av sammanslagningskonflikter" @@ -13585,6 +13780,9 @@ msgstr "Bekräfta packade Git-arkivfiler" msgid "Check the GPG signature of tags" msgstr "Kontrollera GPG-signaturer i taggar" +msgid "Display version information about Git" +msgstr "Visa versionsinformation om Git" + msgid "Show logs with difference each commit introduces" msgstr "Visa loggar med differenser varje incheckning introducerar" @@ -13618,6 +13816,24 @@ msgstr "Ett användbart minsta uppsättning kommandon för vardags-Git" msgid "Frequently asked questions about using Git" msgstr "Ofta ställda frågor om att använda Git" +msgid "The bundle file format" +msgstr "Filformat för bunt" + +msgid "Chunk-based file formats" +msgstr "Styckebaserade filformat" + +msgid "Git commit graph format" +msgstr "Format för Git-incheckningsgraf" + +msgid "Git index format" +msgstr "Format för Git-index" + +msgid "Git pack format" +msgstr "Format för Git-paket" + +msgid "Git cryptographic signature formats" +msgstr "Format för kryptografiska signaturer i Git" + msgid "A Git Glossary" msgstr "En Git-ordlista" @@ -13639,6 +13855,21 @@ msgstr "Ange egenskaper för undermoduler" msgid "Git namespaces" msgstr "Git-namnrymder" +msgid "Protocol v0 and v1 capabilities" +msgstr "Kapabiliteter i protokoll v0 och v1" + +msgid "Things common to various protocols" +msgstr "Vad är gemensamt i de olika protokollen" + +msgid "Git HTTP-based protocols" +msgstr "HTTP-baserade Git-protokoll" + +msgid "How packs are transferred over-the-wire" +msgstr "Hur paket överförs på linjen" + +msgid "Git Wire Protocol, Version 2" +msgstr "Gits linjeprotokoll, version 2" + msgid "Helper programs to interact with remote repositories" msgstr "Hjälpprogram för att interagera med fjärrarkiv" @@ -13663,6 +13894,9 @@ msgstr "Git-webbgränssnitt (webbframända för Git-arkiv)" msgid "An overview of recommended workflows with Git" msgstr "Översikt över rekommenderade arbetsflöden med Git" +msgid "A tool for managing large Git repositories" +msgstr "Verktyg för att hantera stora Git-arkiv" + msgid "commit-graph file is too small" msgstr "incheckningsgraffilen %s är för liten" @@ -13910,6 +14144,14 @@ msgid "no libc information available\n" msgstr "ingen libc-information tillgänglig\n" #, c-format +msgid "could not determine free disk size for '%s'" +msgstr "kunde inte ta reda på ledigt diskutrymme för \"%s\"" + +#, c-format +msgid "could not get info for '%s'" +msgstr "kunde inte hämta info för \"%s\"" + +#, c-format msgid "[GLE %ld] health thread could not open '%ls'" msgstr "[GLE %ld] hälsotråden kunde inte öppna \"%ls\"" @@ -13964,6 +14206,14 @@ msgid "could not read directory changes [GLE %ld]" msgstr "kunde inte läsa katalogändringar [GLE %ld]" #, c-format +msgid "[GLE %ld] unable to open for read '%ls'" +msgstr "[GLE %ld] kunde inte öppna \"%ls\" för läsning" + +#, c-format +msgid "[GLE %ld] unable to get protocol information for '%ls'" +msgstr "[GLE %ld] kunde inte hämta protokollinformation för \"%ls\"" + +#, c-format msgid "failed to copy SID (%ld)" msgstr "misslyckades kopiera SID (%ld)" @@ -14507,181 +14757,6 @@ msgid "failed to close rev-list's stdin" msgstr "kunde inte stänga rev-list:s standard in" #, c-format -msgid "'%s' does not exist" -msgstr "\"%s\" finns inte" - -msgid "need a working directory" -msgstr "behöver en arbetskatalog" - -msgid "could not find enlistment root" -msgstr "kunde inte hitta enrolleringsroten" - -#, c-format -msgid "could not switch to '%s'" -msgstr "kunde inte växla till \"%s\"" - -#, c-format -msgid "could not configure %s=%s" -msgstr "kunde inte ställa in %s=%s" - -msgid "could not configure log.excludeDecoration" -msgstr "kunde inte ställa in log.excludeDecoration" - -msgid "Scalar enlistments require a worktree" -msgstr "Scalar-enrolleringar kräver en arbetskatalog" - -#, c-format -msgid "could not open directory '%s'" -msgstr "kunde inte öppna katalogen \"%s\"" - -#, c-format -msgid "skipping '%s', which is neither file nor directory" -msgstr "hoppar över \"%s\", som varken är en fil eller en katalog" - -#, c-format -msgid "could not determine free disk size for '%s'" -msgstr "kunde inte ta reda på ledigt diskutrymme för \"%s\"" - -#, c-format -msgid "could not get info for '%s'" -msgstr "kunde inte hämta info för \"%s\"" - -#, c-format -msgid "remote HEAD is not a branch: '%.*s'" -msgstr "HEAD hos fjärren är inte en gren: \"%.*s\"" - -msgid "failed to get default branch name from remote; using local default" -msgstr "" -"misslyckades hämta namn på standardgren för fjärr; använder lokalt förval" - -msgid "failed to get default branch name" -msgstr "misslyckades hämta namn på standardgren" - -msgid "failed to unregister repository" -msgstr "misslyckades avregistrera arkivet" - -msgid "failed to delete enlistment directory" -msgstr "misslyckades ta bort enrolleringskatalogen" - -msgid "branch to checkout after clone" -msgstr "gren att checka ut efter kloning" - -msgid "when cloning, create full working directory" -msgstr "skapa komplett arbetskatalog vid kloning" - -msgid "only download metadata for the branch that will be checked out" -msgstr "hämta endast metadata för grenen som skall checkas ut" - -msgid "scalar clone [<options>] [--] <repo> [<dir>]" -msgstr "scalar clone [<flaggor>] [--] <arkiv> [<kat>]" - -#, c-format -msgid "cannot deduce worktree name from '%s'" -msgstr "Kan inte härleda arbetsträdsnamn från \"%s\"" - -#, c-format -msgid "directory '%s' exists already" -msgstr "katalogen \"%s\" finns redan" - -#, c-format -msgid "failed to get default branch for '%s'" -msgstr "misslyckades hämta standardgren för \"%s\"" - -#, c-format -msgid "could not configure remote in '%s'" -msgstr "kunde inte ställa in fjärr i \"%s\"" - -#, c-format -msgid "could not configure '%s'" -msgstr "kunde inte ställa in \"%s\"" - -msgid "partial clone failed; attempting full clone" -msgstr "delvis klon misslyckades; försöker med fullständig klon" - -msgid "could not configure for full clone" -msgstr "kunde inte ställa in för komplett klon" - -msgid "scalar diagnose [<enlistment>]" -msgstr "scalar diagnose [<enrollering>]" - -#, c-format -msgid "could not create directory for '%s'" -msgstr "kunde inte skapa katalog för \"%s\"" - -msgid "could not duplicate stdout" -msgstr "kunde inte duplicera standard ut" - -msgid "failed to write archive" -msgstr "misslyckades skriva arkiv" - -msgid "`scalar list` does not take arguments" -msgstr "\"scalar list\" tar inte argument" - -msgid "scalar register [<enlistment>]" -msgstr "scalar register [<enrollering>]" - -msgid "reconfigure all registered enlistments" -msgstr "konfigurera alla registrerade enrolleringar på nytt" - -msgid "scalar reconfigure [--all | <enlistment>]" -msgstr "scalar reconfigure [--all | <enrollering>]" - -msgid "--all or <enlistment>, but not both" -msgstr "--all eller <enrollering>, men inte bägge" - -#, c-format -msgid "git repository gone in '%s'" -msgstr "git-arkiv försvunnet i \"%s\"" - -msgid "" -"scalar run <task> [<enlistment>]\n" -"Tasks:\n" -msgstr "" -"scalar run <uppgift> [<enrollering>]\n" -"Uppgifter:\n" - -#, c-format -msgid "no such task: '%s'" -msgstr "okänd uppgift: \"%s\"" - -msgid "scalar unregister [<enlistment>]" -msgstr "scalar unregister [<enrollering>]" - -msgid "scalar delete <enlistment>" -msgstr "scalar delete <enrollering>" - -msgid "refusing to delete current working directory" -msgstr "vägrar ta bort aktuell arbetskatalog" - -msgid "include Git version" -msgstr "ta med Git-version" - -msgid "include Git's build options" -msgstr "ta med Gits byggflaggor" - -msgid "scalar verbose [-v | --verbose] [--build-options]" -msgstr "scalar verbose [-v | --verbose] [--build-options]" - -msgid "-C requires a <directory>" -msgstr "-C kräver en <katalog>" - -#, c-format -msgid "could not change to '%s'" -msgstr "kunde inte byta till \"%s\"" - -msgid "-c requires a <key>=<value> argument" -msgstr "-c kräver ett argument på formen <nyckel>=<värde>" - -msgid "" -"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n" -"\n" -"Commands:\n" -msgstr "" -"scalar [-C <katalog>] [-c <nyckel>=<värde>] <kommando> [<flaggor>]\n" -"\n" -"Kommandon:\n" - -#, c-format msgid "illegal crlf_action %d" msgstr "felaktig crlf_action %d" @@ -14884,6 +14959,32 @@ msgstr "ö-regex från konfiguration har för många fångstgrupper (max=%d)" msgid "Marked %d islands, done.\n" msgstr "Markerade %d öar, klar.\n" +#, c-format +msgid "invalid --%s value '%s'" +msgstr "ogiltigt värde för --%s: \"%s\"" + +#, c-format +msgid "could not archive missing directory '%s'" +msgstr "kunde inte arkivera saknad katalog \"%s\"" + +#, c-format +msgid "could not open directory '%s'" +msgstr "kunde inte öppna katalogen \"%s\"" + +#, c-format +msgid "skipping '%s', which is neither file nor directory" +msgstr "hoppar över \"%s\", som varken är en fil eller en katalog" + +msgid "could not duplicate stdout" +msgstr "kunde inte duplicera standard ut" + +#, c-format +msgid "could not add directory '%s' to archiver" +msgstr "kunde inte lägga till katalogen \"%s\" till arkiveraren" + +msgid "failed to write archive" +msgstr "misslyckades skriva arkiv" + msgid "--merge-base does not work with ranges" msgstr "--merge-base fungerar inte med intervall" @@ -15490,6 +15591,9 @@ msgstr "git fetch-pack: förväntade ACK/NAK, fick \"%s\"" msgid "unable to write to remote" msgstr "kunde inte skriva till fjärren" +msgid "Server supports filter" +msgstr "Servern stöder filter" + #, c-format msgid "invalid shallow line: %s" msgstr "ogiltig \"shallow\"-rad: %s" @@ -15600,9 +15704,6 @@ msgstr "servern stöder inte algoritmen \"%s\"" msgid "Server does not support shallow requests" msgstr "Servern stöder inte grunda förfrågningar" -msgid "Server supports filter" -msgstr "Servern stöder filter" - msgid "unable to write request to remote" msgstr "kunde inte skriva anrop till fjärren" @@ -15948,6 +16049,12 @@ msgstr "Lågnivåkommandon / synka arkiv" msgid "Low-level Commands / Internal Helpers" msgstr "Lågnivåkommandon / interna hjälpare" +msgid "User-facing repository, command and file interfaces" +msgstr "Arkiv-, kommando- och filgränssnitt tänkta för användare" + +msgid "Developer-facing file formats, protocols and other interfaces" +msgstr "Filformat, protokoll och andra gränssnitt tänkta för utvecklare" + #, c-format msgid "available git commands in '%s'" msgstr "git-kommandon tillgängliga i \"%s\"" @@ -15961,6 +16068,12 @@ msgstr "Dessa vanliga Git-kommandon används i olika situationer:" msgid "The Git concept guides are:" msgstr "Vägledningar för Git-koncept:" +msgid "User-facing repository, command and file interfaces:" +msgstr "Arkiv-, kommando- och filgränssnitt tänkta för användare:" + +msgid "File formats, protocols and other developer interfaces:" +msgstr "Filformat, protokoll och andra utvecklargränssnitt:" + msgid "External commands" msgstr "Externa kommandon" @@ -16044,10 +16157,6 @@ msgstr "" "Du kan inaktivera varningen med \"git config advice.ignoredHook false\"." #, c-format -msgid "Couldn't start hook '%s'\n" -msgstr "Kunde inte starta kroken \"%s\"\n" - -#, c-format msgid "argument to --packfile must be a valid hash (got '%s')" msgstr "" "argumentet till --packfile måste vara ett giltigt hashvärde (fick '%s')" @@ -16230,19 +16339,14 @@ msgid "quoted CRLF detected" msgstr "citerad CRLF upptäcktes" #, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -" %s" -msgstr "" -"Dina lokala ändringar av följande filer skulle skrivas över av " -"sammanslagning:\n" -" %s" - -#, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "Misslyckades slå ihop undermodulen %s (ej utcheckad)" #, c-format +msgid "Failed to merge submodule %s (no merge base)" +msgstr "Misslyckades slå ihop undermodulen %s (ingen sammanslagningsbas)" + +#, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "Misslyckades slå ihop undermodulen %s (incheckningar saknas)" @@ -16262,27 +16366,8 @@ msgstr "Misslyckades slå ihop undermodulen %s" #, c-format msgid "" -"Failed to merge submodule %s, but a possible merge resolution exists:\n" -"%s\n" -msgstr "" -"Misslyckades slå ihop undermodulen %s, men en möjlig lösning finns:\n" -"%s\n" - -#, c-format -msgid "" -"If this is correct simply add it to the index for example\n" -"by using:\n" -"\n" -" git update-index --cacheinfo 160000 %s \"%s\"\n" -"\n" -"which will accept this suggestion.\n" -msgstr "" -"Om detta är riktigt lägger du bara till det i indexet, till\n" -"exempel så här:\n" -"\n" -" git update-index --cacheinfo 160000 %s \"%s\"\n" -"\n" -"vilket godtar lösningen.\n" +"Failed to merge submodule %s, but a possible merge resolution exists: %s" +msgstr "Misslyckades slå ihop undermodulen %s, men en möjlig lösning finns: %s" #, c-format msgid "" @@ -16360,7 +16445,7 @@ msgid "" "in %s, suggesting it should perhaps be moved to %s." msgstr "" "KONFLIKT (filplacering): %s lade till %s inuti en katalog som bytte namn i " -"%s, föreslår att den bör flyttas till%s." +"%s, föreslår att den bör flyttas till %s." #, c-format msgid "" @@ -16443,13 +16528,45 @@ msgstr "" "KONFLIKT (ändra/radera): %s raderad i %s och ändrad i %s. Versionen %s av %s " "lämnad i trädet." +#. TRANSLATORS: This is a line of advice to resolve a merge +#. 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" +#. +#, c-format +msgid "" +" - go to submodule (%s), and either merge commit %s\n" +" or update to an existing commit which has merged those changes\n" +msgstr "" +" - gå till undermodulen (%s), och slå antingen ihop incheckningen %s\n" +" eller uppdatera till en befintlig incheckning som slagit ihop " +"ändringarna\n" + #, c-format msgid "" -"Note: %s not up to date and in way of checking out conflicted version; old " -"copy renamed to %s" +"Recursive merging with submodules currently only supports trivial cases.\n" +"Please manually handle the merging of each conflicted submodule.\n" +"This can be accomplished with the following steps:\n" +"%s - come back to superproject and run:\n" +"\n" +" git add %s\n" +"\n" +" to record the above merge or update\n" +" - resolve any other conflicts in the superproject\n" +" - commit the resulting index in the superproject\n" msgstr "" -"Observera: %s är inte à jour och i vägen för att checka ut version i " -"konflikt; gammal upplaga har nytt namn %s" +"Rekursiv sammanslaning med undermoduler stöder för närvarande endast enkla " +"fall.\n" +"Du måste hantera sammanslagning av undermoduler i konflikt manuellt.\n" +"Detta kan göras genom att utföra följande steg:\n" +"%s - kom tillbaka till huvudprojektet och kör:\n" +"\n" +" git add %s\n" +"\n" +" för att registrera sammanslagningen över eller uppdatera\n" +" - lös eventuella andra konflikter i huvudprojektet\n" +" - checka in det slutförda indexet i huvudprojektet\n" #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge #. base, and 2-3) the trees for the two trees we're merging. @@ -16525,6 +16642,22 @@ msgid "Found a possible merge resolution for the submodule:\n" msgstr "Hittade en möjlig lösning av sammanslagning för undermodulen:\n" #, c-format +msgid "" +"If this is correct simply add it to the index for example\n" +"by using:\n" +"\n" +" git update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"which will accept this suggestion.\n" +msgstr "" +"Om detta är riktigt lägger du bara till det i indexet, till\n" +"exempel så här:\n" +"\n" +" git update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"vilket godtar lösningen.\n" + +#, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "" "Misslyckades slå ihop undermodulen %s (flera sammanslagningar hittades)" @@ -17038,6 +17171,22 @@ msgid "confused by unstable object source data for %s" msgstr "förvirrad av instabil objektkälldata för %s" #, c-format +msgid "write stream object %ld != %<PRIuMAX>" +msgstr "skriv strömobjektet %ld != %<PRIuMAX>" + +#, c-format +msgid "unable to stream deflate new object (%d)" +msgstr "kan inte utföra \"deflate\" på nytt strömobjekt (%d)" + +#, c-format +msgid "deflateEnd on stream object failed (%d)" +msgstr "\"deflateend\" på strömobjektet misslyckades (%d)" + +#, c-format +msgid "unable to create directory %s" +msgstr "kunde inte skapa katalogen %s" + +#, c-format msgid "cannot read object for %s" msgstr "kan inte läsa objekt för %s" @@ -17263,6 +17412,56 @@ msgstr "kunde inte tolka objektet: %s" msgid "hash mismatch %s" msgstr "hashvärde stämmer inte överens %s" +msgid "trying to write commit not in index" +msgstr "försöker skriva incheckning som inte finns i indexet" + +msgid "failed to load bitmap index (corrupted?)" +msgstr "misslyckade läsa in bitkarteindex (trasigt?)" + +msgid "corrupted bitmap index (too small)" +msgstr "trasigt bitkarteindex (för litet)" + +msgid "corrupted bitmap index file (wrong header)" +msgstr "trasigt bitkarteindex (felaktigt huvud)" + +#, c-format +msgid "unsupported version '%d' for bitmap index file" +msgstr "versionen \"%d\" i bitkarteindexfilen stöds inte" + +msgid "corrupted bitmap index file (too short to fit hash cache)" +msgstr "trasigt bitkarteindex (för kort för att få plats för hash-cache)" + +msgid "corrupted bitmap index file (too short to fit lookup table)" +msgstr "trasigt bitkarteindex (för kort för att få plats för uppslagstabell)" + +#, c-format +msgid "duplicate entry in bitmap index: '%s'" +msgstr "duplicerad post i bitkarteindex: \"%s\"" + +#, c-format +msgid "corrupt ewah bitmap: truncated header for entry %d" +msgstr "trasig ewah-bitkarta: avhugget huvud för post %d" + +#, c-format +msgid "corrupt ewah bitmap: commit index %u out of range" +msgstr "trasig ewah-bitkarta: incheckningsindex %u utanför intervall" + +msgid "corrupted bitmap pack index" +msgstr "trasigt bitkarte-packindex" + +msgid "invalid XOR offset in bitmap pack index" +msgstr "ogiltigt XOR-offset i bitkarte-packindex" + +msgid "cannot fstat bitmap file" +msgstr "kan inte utföra \"fstat\" på bitkartefil" + +#, c-format +msgid "ignoring extra bitmap file: '%s'" +msgstr "ignorerar extra bitkartefil: %s" + +msgid "checksum doesn't match in MIDX and bitmap" +msgstr "checksumman stämmer inte i MIDX och bitkarta" + msgid "multi-pack bitmap is missing required reverse index" msgstr "flerpaketsbitkarta saknar nödvändigt omvänt index" @@ -17274,9 +17473,58 @@ msgstr "kunde inte öppna paketfilen %s" msgid "preferred pack (%s) is invalid" msgstr "föredragen paketfil (%s) är ogiltig" +msgid "corrupt bitmap lookup table: triplet position out of index" +msgstr "trasig bitkarteuppslagstabell: trippelposition utanför indexet" + +msgid "corrupt bitmap lookup table: xor chain exceeds entry count" +msgstr "trasig bitkarteuppslagstabell: xor-kedja överskrider postantalet" + +#, c-format +msgid "corrupt bitmap lookup table: commit index %u out of range" +msgstr "" +"trasig bitkarteuppslagstabell: incheckningsindexet %u utanför intervallet" + +#, c-format +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 "object '%s' not found in type bitmaps" +msgstr "objektet \"%s\" hittades inte i typbitkartor" + +#, c-format +msgid "object '%s' does not have a unique type" +msgstr "objektet \"%s\" har inte en unik typ" + +#, c-format +msgid "object '%s': real type '%s', expected: '%s'" +msgstr "objektet \"%s\": riktig typ \"%s\", förväntade \"%s\"" + +#, c-format +msgid "object not in bitmap: '%s'" +msgstr "objekt saknas i bitkarta: %s" + +msgid "failed to load bitmap indexes" +msgstr "misslyckade läsa in bitkarteindex" + +msgid "you must specify exactly one commit to test" +msgstr "du måste ange exakt en incheckning att testa" + +#, c-format +msgid "commit '%s' doesn't have an indexed bitmap" +msgstr "incheckningen \"%s\" har inte en indexerad bitkarta" + +msgid "mismatch in bitmap results" +msgstr "bitkarteresultat stämmer inte överens" + #, c-format -msgid "could not find %s in pack %s at offset %<PRIuMAX>" -msgstr "kunde inte hitta %s i paketet %s på offset %<PRIuMAX>" +msgid "could not find '%s' in pack '%s' at offset %<PRIuMAX>" +msgstr "kunde inte hitta \"%s\" i paketet \"%s\" på offset %<PRIuMAX>" + +#, c-format +msgid "unable to get disk usage of '%s'" +msgstr "kan inte hämta diskanvändning för \"%s\"" #, c-format msgid "mtimes file %s is too small" @@ -17401,6 +17649,9 @@ msgstr "menade du \"--%s\" (med två bindestreck)?" msgid "alias of --%s" msgstr "alias för --%s" +msgid "need a subcommand" +msgstr "behöver ett underkommando" + #, c-format msgid "unknown option `%s'" msgstr "okänd flagga \"%s\"" @@ -17834,9 +18085,12 @@ msgid "" "l, label <label> = label current HEAD with a name\n" "t, reset <label> = reset HEAD to a label\n" "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" -". create a merge commit using the original merge commit's\n" -". message (or the oneline, if no original merge commit was\n" -". specified); use -c <commit> to reword the commit message\n" +" create a merge commit using the original merge commit's\n" +" message (or the oneline, if no original merge commit was\n" +" specified); use -c <commit> to reword the commit message\n" +"u, update-ref <ref> = track a placeholder for the <ref> to be updated\n" +" to this position in the new commits. The <ref> is\n" +" updated at the end of the rebase\n" "\n" "These lines can be re-ordered; they are executed from top to bottom.\n" msgstr "" @@ -17864,9 +18118,12 @@ msgstr "" "l, label <etikett> = ge aktuellt HEAD ett namn\n" "t, reset <etikett> = återställ HEAD till en etikett\n" "m, merge [-C <incheckning> | -c <incheckning>] <etikett> [# <enrads>]\n" -". skapa en sammanslagning med ursprungligt meddelande (eller\n" -". enrads, om inget incheckningsmeddelande angavs); använd\n" -". -c <incheckning> för att skriva om meddelandet.\n" +" skapa en sammanslagning med ursprungligt meddelande (eller\n" +" enrads, om inget incheckningsmeddelande angavs); använd\n" +" -c <incheckning> för att skriva om meddelandet.\n" +"u, update-ref <ref> = spåra en platshållare för <ref> att uppdatera\n" +" till denna position bland nya inchecknngar.\n" +" <ref> uppdateras i slutet av ombaseringen.\n" "\n" "Du kan byta ordning på raderna; de utförs uppifrån och ned.\n" @@ -18335,6 +18592,13 @@ msgstr "protokollfel: förväntade sha/ref, fick \"%s\"" msgid "http transport does not support %s" msgstr "http-transporten stöder inte %s" +msgid "protocol error: expected '<url> <path>', missing space" +msgstr "protokollfel: förväntade \"<url> <sökväg>\", saknar blanksteg" + +#, c-format +msgid "failed to download file at URL '%s'" +msgstr "misslyckades hämta filen på URL \"%s\"" + msgid "git-http-push failed" msgstr "git-http-push misslyckades" @@ -18672,6 +18936,14 @@ msgstr "kunde inte bestämma HEAD-revision" msgid "failed to find tree of %s" msgstr "kunde inte hitta trädet för %s." +#, c-format +msgid "resolve-undo records `%s` which is missing" +msgstr "resolve-undo registrerar \"%s\" som saknas" + +#, c-format +msgid "could not get commit for ancestry-path argument %s" +msgstr "kunde inte hämta incheckning för \"ancestry-path\"-argumentet %s" + msgid "--unpacked=<packfile> no longer supported" msgstr "--unpacked=<paketfil> stöds inte längre" @@ -18692,6 +18964,173 @@ msgstr "-L stöder ännu inte andra diff-format än -p och -s" msgid "cannot create async thread: %s" msgstr "kan inte skapa asynkron tråd: %s" +#, c-format +msgid "'%s' does not exist" +msgstr "\"%s\" finns inte" + +#, c-format +msgid "could not switch to '%s'" +msgstr "kunde inte växla till \"%s\"" + +msgid "need a working directory" +msgstr "behöver en arbetskatalog" + +msgid "Scalar enlistments require a worktree" +msgstr "Scalar-enrolleringar kräver en arbetskatalog" + +#, c-format +msgid "could not configure %s=%s" +msgstr "kunde inte ställa in %s=%s" + +msgid "could not configure log.excludeDecoration" +msgstr "kunde inte ställa in log.excludeDecoration" + +msgid "could not add enlistment" +msgstr "kunde inte lägga till enrollering" + +msgid "could not set recommended config" +msgstr "kan inte ange rekommenderad konfiguration" + +msgid "could not turn on maintenance" +msgstr "kunde inte aktivera underhåll" + +msgid "could not start the FSMonitor daemon" +msgstr "kunde inte starta FSMonitor-server" + +msgid "could not turn off maintenance" +msgstr "kunde inte slå av underhåll" + +msgid "could not remove enlistment" +msgstr "kunde inte ta bort enrollering" + +#, c-format +msgid "remote HEAD is not a branch: '%.*s'" +msgstr "HEAD hos fjärren är inte en gren: \"%.*s\"" + +msgid "failed to get default branch name from remote; using local default" +msgstr "" +"misslyckades hämta namn på standardgren för fjärr; använder lokalt förval" + +msgid "failed to get default branch name" +msgstr "misslyckades hämta namn på standardgren" + +msgid "failed to unregister repository" +msgstr "misslyckades avregistrera arkivet" + +msgid "failed to stop the FSMonitor daemon" +msgstr "misslyckades stoppa FSMonitor-server" + +msgid "failed to delete enlistment directory" +msgstr "misslyckades ta bort enrolleringskatalogen" + +msgid "branch to checkout after clone" +msgstr "gren att checka ut efter kloning" + +msgid "when cloning, create full working directory" +msgstr "skapa komplett arbetskatalog vid kloning" + +msgid "only download metadata for the branch that will be checked out" +msgstr "hämta endast metadata för grenen som skall checkas ut" + +msgid "scalar clone [<options>] [--] <repo> [<dir>]" +msgstr "scalar clone [<flaggor>] [--] <arkiv> [<kat>]" + +#, c-format +msgid "cannot deduce worktree name from '%s'" +msgstr "Kan inte härleda arbetsträdsnamn från \"%s\"" + +#, c-format +msgid "directory '%s' exists already" +msgstr "katalogen \"%s\" finns redan" + +#, c-format +msgid "failed to get default branch for '%s'" +msgstr "misslyckades hämta standardgren för \"%s\"" + +#, c-format +msgid "could not configure remote in '%s'" +msgstr "kunde inte ställa in fjärr i \"%s\"" + +#, c-format +msgid "could not configure '%s'" +msgstr "kunde inte ställa in \"%s\"" + +msgid "partial clone failed; attempting full clone" +msgstr "delvis klon misslyckades; försöker med fullständig klon" + +msgid "could not configure for full clone" +msgstr "kunde inte ställa in för komplett klon" + +msgid "scalar diagnose [<enlistment>]" +msgstr "scalar diagnose [<enrollering>]" + +msgid "`scalar list` does not take arguments" +msgstr "\"scalar list\" tar inte argument" + +msgid "scalar register [<enlistment>]" +msgstr "scalar register [<enrollering>]" + +msgid "reconfigure all registered enlistments" +msgstr "konfigurera alla registrerade enrolleringar på nytt" + +msgid "scalar reconfigure [--all | <enlistment>]" +msgstr "scalar reconfigure [--all | <enrollering>]" + +msgid "--all or <enlistment>, but not both" +msgstr "--all eller <enrollering>, men inte bägge" + +#, c-format +msgid "git repository gone in '%s'" +msgstr "git-arkiv försvunnet i \"%s\"" + +msgid "" +"scalar run <task> [<enlistment>]\n" +"Tasks:\n" +msgstr "" +"scalar run <uppgift> [<enrollering>]\n" +"Uppgifter:\n" + +#, c-format +msgid "no such task: '%s'" +msgstr "okänd uppgift: \"%s\"" + +msgid "scalar unregister [<enlistment>]" +msgstr "scalar unregister [<enrollering>]" + +msgid "scalar delete <enlistment>" +msgstr "scalar delete <enrollering>" + +msgid "refusing to delete current working directory" +msgstr "vägrar ta bort aktuell arbetskatalog" + +msgid "include Git version" +msgstr "ta med Git-version" + +msgid "include Git's build options" +msgstr "ta med Gits byggflaggor" + +msgid "scalar verbose [-v | --verbose] [--build-options]" +msgstr "scalar verbose [-v | --verbose] [--build-options]" + +msgid "-C requires a <directory>" +msgstr "-C kräver en <katalog>" + +#, c-format +msgid "could not change to '%s'" +msgstr "kunde inte byta till \"%s\"" + +msgid "-c requires a <key>=<value> argument" +msgstr "-c kräver ett argument på formen <nyckel>=<värde>" + +msgid "" +"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n" +"\n" +"Commands:\n" +msgstr "" +"scalar [-C <katalog>] [-c <nyckel>=<värde>] <kommando> [<flaggor>]\n" +"\n" +"Kommandon:\n" + msgid "unexpected flush packet while reading remote unpack status" msgstr "oväntat flush-paket vid läsning av fjärruppackningsstatus" @@ -18812,10 +19251,6 @@ msgstr "dina lokala ändringar skulle skrivas över av %s." msgid "commit your changes or stash them to proceed." msgstr "checka in dina ändringar eller använd \"stash\" för att fortsätta." -#, c-format -msgid "%s: fast-forward" -msgstr "%s: snabbspola" - #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase". #. @@ -19302,6 +19737,27 @@ msgstr "kunde inte ens försöka slå ihop \"%.*s\"" msgid "merge: Unable to write new index file" msgstr "sammanslagning: Kunde inte skriva ny indexfil" +#, c-format +msgid "" +"another 'rebase' process appears to be running; '%s.lock' already exists" +msgstr "en annan \"rebase\"-process verkar vara aktiv; \"%s.lock\" finns redan" + +#, c-format +msgid "" +"Updated the following refs with %s:\n" +"%s" +msgstr "" +"Uppdaterade följande referenser med %s:\n" +"%s" + +#, c-format +msgid "" +"Failed to update the following refs with %s:\n" +"%s" +msgstr "" +"Misslyckades uppdatera följande referenser med %s:\n" +"%s" + msgid "Cannot autostash" msgstr "Kan inte utföra \"autostash\"" @@ -19468,6 +19924,10 @@ msgid "the script was already rearranged." msgstr "skriptet har redan omordnats." #, c-format +msgid "update-refs file at '%s' is invalid" +msgstr "update-refs-filen vid \"%s\" är ogiltig" + +#, c-format msgid "'%s' is outside repository at '%s'" msgstr "\"%s\" är utanför arkivet på \"%s\"" @@ -19587,17 +20047,21 @@ msgstr "" #, c-format msgid "" -"unsafe repository ('%s' is owned by someone else)\n" -"To add an exception for this directory, call:\n" +"detected dubious ownership in repository at '%s'\n" +"%sTo add an exception for this directory, call:\n" "\n" "\tgit config --global --add safe.directory %s" msgstr "" -"osäkert arkiv (\"%s\" ägs av någon annan)\n" -"För att lägga till ett undantag för denna katalog, kör:\n" +"upptäckte tveksamt ägarskap i arkivet i \"%s\"\n" +"%sFör att lägga till ett undantag för denna katalog, kör:\n" "\n" "\tgit config --global --add safe.directory %s" #, c-format +msgid "cannot use bare repository '%s' (safe.bareRepository is '%s')" +msgstr "kan inte använda naket arkiv \"%s\" (safe.bareRepository är \"%s\")" + +#, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" "The owner of files must always have read and write permissions." @@ -20467,6 +20931,18 @@ msgstr "felaktigt portnummer" msgid "invalid '..' path segment" msgstr "felaktigt \"..\"-sökvägssegment" +msgid "usage: " +msgstr "användning: " + +msgid "fatal: " +msgstr "ödesdigert: " + +msgid "error: " +msgstr "fel: " + +msgid "warning: " +msgstr "varning: " + msgid "Fetching objects" msgstr "Hämtar objekt" @@ -21257,22 +21733,6 @@ msgstr "Markerade stycken kan inte appliceras på indexet!\n" msgid "ignoring unmerged: %s\n" msgstr "ignorerar ej sammanslagen: %s\n" -#, perl-format -msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " -msgstr "Applicera ändrat läge på arbetskatalogen [y,n,q,a,d%s,?]? " - -#, perl-format -msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " -msgstr "Applicera borttagning på arbetskatalogen [y,n,q,a,d%s,?]? " - -#, perl-format -msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " -msgstr "Applicera tillägg på arbetskatalogen [y,n,q,a,d%s,?]? " - -#, perl-format -msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " -msgstr "Applicera stycket på arbetskatalogen [y,n,q,a,d%s,?]? " - msgid "No other hunks to goto\n" msgstr "Inga andra stycken att gå till\n" @@ -74,6 +74,7 @@ # string | dizi # # subdirectory | altdizin # # submodule | altmodül # +# superproject | üst proje # # symlink | sembolik bağ # # symref | sembolik başvuru # # tag | etiket # @@ -91,8 +92,8 @@ msgid "" msgstr "" "Project-Id-Version: Git Turkish Localization Project\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2022-06-22 12:46+0300\n" -"PO-Revision-Date: 2022-06-22 16:00+0300\n" +"POT-Creation-Date: 2022-09-28 10:54+0300\n" +"PO-Revision-Date: 2022-09-28 14:00+0300\n" "Last-Translator: Emir SARI <emir_sari@icloud.com>\n" "Language-Team: Turkish (https://github.com/bitigchi/git-po/)\n" "Language: tr\n" @@ -494,6 +495,22 @@ msgstr "" "a - bu parçayı ve sonraki tüm parçaları uygula\n" "d - bu parçayı veya sonraki parçalardan herhangi birini uygulama\n" +#, c-format, perl-format +msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " +msgstr "Kip değişimi çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? " + +#, c-format, perl-format +msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " +msgstr "Silme çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? " + +#, c-format, perl-format +msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " +msgstr "Ekleme çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? " + +#, c-format, perl-format +msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " +msgstr "Bu parça çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? " + msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -511,10 +528,6 @@ msgstr "" msgid "could not parse hunk header '%.*s'" msgstr "parça üstbilgisi '%.*s' ayrıştırılamadı" -#, c-format -msgid "could not parse colored hunk header '%.*s'" -msgstr "renklendirilmiş parça üstbilgisi '%.*s' ayrıştırılamadı" - msgid "could not parse diff" msgstr "diff ayrıştırılamadı" @@ -730,7 +743,7 @@ msgid "Exiting because of an unresolved conflict." msgstr "Çözüme kavuşturulmamış bir çakışmadan dolayı çıkılıyor." msgid "You have not concluded your merge (MERGE_HEAD exists)." -msgstr "Birleştirmenizi sonuçlandırmadınız (MERGE_HEAD mevcut)." +msgstr "Birleştirmenizi sonuçlandırmadınız (MERGE_HEAD var)." msgid "Please, commit your changes before merging." msgstr "Birleştirme öncesinde değişikliklerinizi işleyin." @@ -801,6 +814,26 @@ msgstr "" "kapatabilirsiniz.\n" "\n" +#, c-format +msgid "" +"The following paths have been moved outside the\n" +"sparse-checkout definition but are not sparse due to local\n" +"modifications.\n" +msgstr "" +"Aşağıdaki yollar, aralıklı çıkış tanımının dışına\n" +"taşındı; ancak yerel değişikliklerden dolayı\n" +"aralıklı değiller.\n" + +msgid "" +"To correct the sparsity of these paths, do the following:\n" +"* Use \"git add --sparse <paths>\" to update the index\n" +"* Use \"git sparse-checkout reapply\" to apply the sparsity rules" +msgstr "" +"Bu yollardaki aralıklılığı düzeltmek için aşağıdakini yapın:\n" +"* İndeksi güncellemek için \"git add --sparse <yollar>\" kullanın\n" +"* Aralıklılık kurallarını uygulamak için \"git sparse-checkout reapply\" " +"yapın" + msgid "cmdline ends with \\" msgstr "komut satırı \\ ile bitiyor" @@ -1298,6 +1331,10 @@ msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "desteklenmeyen dosya kipi: 0%o (SHA1: %s)" #, c-format +msgid "deflate error (%d)" +msgstr "söndürme hatası (%d)" + +#, c-format msgid "unable to start '%s' filter" msgstr "'%s' süzgeci başlatılamıyor" @@ -1317,10 +1354,6 @@ msgid "path too long (%d chars, SHA1: %s): %s" msgstr "yol çok uzun (%d karakter, SHA1: %s): %s" #, c-format -msgid "deflate error (%d)" -msgstr "söndürme hatası (%d)" - -#, c-format msgid "timestamp too large for this system: %<PRIuMAX>" msgstr "zaman damgası bu sistem için çok büyük: %<PRIuMAX>" @@ -1696,7 +1729,7 @@ msgstr "izleme bilgisi ayarlanamıyor; başlangıç noktası '%s' bir dal değil #, c-format msgid "the requested upstream branch '%s' does not exist" -msgstr "istenen üstkaynak dalı '%s' mevcut değil" +msgstr "istenen üstkaynak dalı '%s' yok" msgid "" "\n" @@ -1739,7 +1772,7 @@ msgid "" "update --init'" msgstr "" "Altmodülleri güncellemeyi 'git checkout %s && git submodule update --init' " -"kullanarak deneyebilirsiniz." +"kullanarak deneyebilirsiniz" #, c-format msgid "submodule '%s': cannot create branch '%s'" @@ -1893,7 +1926,7 @@ msgid "" msgstr "" "Gerçekten eklemek istiyorsanız -f kullanın.\n" "Bu iletiyi 'git config advice.addIgnoredFile false'\n" -"kullanarak kapatabilirsiniz." +"yaparak kapatabilirsiniz" msgid "adding files failed" msgstr "dosya ekleme başarısız" @@ -1917,10 +1950,10 @@ msgid "" msgstr "" "'git add .' mı demek istediniz?\n" "Bu iletiyi 'git config advice.addEmptyPathspec false'\n" -"yaparak kapatabilirsiniz." +"yaparak kapatabilirsiniz" msgid "index file corrupt" -msgstr "indeks dosyası hasar görmüş" +msgstr "indeks dosyası hasarlı" #, c-format msgid "bad action '%s' for '%s'" @@ -2145,7 +2178,7 @@ msgid "" "Not rewinding to ORIG_HEAD" msgstr "" "Son 'am' başarısızlığından bu yana HEAD'i hareket ettirmiş görünüyorsunuz.\n" -"ORIG_HEAD'e geri sarılmıyor." +"ORIG_HEAD'e geri sarılmıyor" #, c-format msgid "failed to read '%s'" @@ -2250,7 +2283,7 @@ msgid "GPG-sign commits" msgstr "GPG imzalı işlemeler" msgid "how to handle empty patches" -msgstr "boş yamaların nasıl değerlendirileceği" +msgstr "boş yamaların nasıl ele alınacağı" msgid "(internal use for git-rebase)" msgstr "(git-rebase için iç kullanım)" @@ -2268,7 +2301,7 @@ msgstr "indeks okunamadı" #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" -"Bir önceki yeniden temellendirme dizini %s hâlâ mevcut; ancak mbox verildi." +"Bir önceki yeniden temellendirme dizini %s hâlâ var; ancak mbox verildi." #, c-format msgid "" @@ -2806,11 +2839,11 @@ msgid "cannot use -a with -d" msgstr "-a, -d ile kullanılamıyor" msgid "Couldn't look up commit object for HEAD" -msgstr "HEAD için işleme nesnesi aranamadı." +msgstr "HEAD için işleme nesnesi aranamadı" #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" -msgstr "'%s' dalı silinemiyor, şurada çıkış yapılmış: '%s'." +msgstr "'%s' dalı silinemiyor, şurada çıkış yapılmış: '%s'" #, c-format msgid "remote-tracking branch '%s' not found." @@ -3044,7 +3077,7 @@ msgstr "'%s' diye bir dal yok" #, c-format msgid "branch '%s' does not exist" -msgstr "'%s' diye bir dal mevcut değil" +msgstr "'%s' diye bir dal yok" msgid "too many arguments to unset upstream" msgstr "üst kaynağı kaldırmak için çok fazla argüman" @@ -3087,8 +3120,12 @@ msgstr "libc bilgisi: " msgid "not run from a git repository - no hooks to show\n" msgstr "bir git deposundan çalıştırılmadı - gösterilecek kanca yok\n" -msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]" -msgstr "git bugreport [-o|--output-directory <dosya>] [-s|--suffix <biçim>]" +msgid "" +"git bugreport [-o|--output-directory <file>] [-s|--suffix <format>] [--" +"diagnose[=<mode>]" +msgstr "" +"git bugreport [-o|--output-directory <dosya>] [-s|--suffix <biçim>] [--" +"diagnose[=<kip>]" msgid "" "Thank you for filling out a Git bug report!\n" @@ -3124,16 +3161,27 @@ msgstr "" "Aşağıda hata raporunun geri kalanına bir göz atın.\n" "Paylaşmak istemediğiniz satırları silebilirsiniz.\n" -msgid "specify a destination for the bugreport file" -msgstr "hata raporu dosyası için bir konum belirtin" +msgid "mode" +msgstr "kip" -msgid "specify a strftime format suffix for the filename" -msgstr "dosya adı için bir strftime biçimli ek belirtin" +msgid "" +"create an additional zip archive of detailed diagnostics (default 'stats')" +msgstr "ayrıntılı tanıların ek bir zip arşivini oluştur (öntanımlı: 'stats')" + +msgid "specify a destination for the bugreport file(s)" +msgstr "hata raporu dosyaları için bir hedef konum belirtin" + +msgid "specify a strftime format suffix for the filename(s)" +msgstr "dosya adları için bir strftime biçim soneki belirtin" #, c-format msgid "could not create leading directories for '%s'" msgstr "'%s' için öncü dizinler oluşturulamadı" +#, c-format +msgid "unable to create diagnostics archive %s" +msgstr "tanı arşivi %s oluşturulamadı" + msgid "System Info" msgstr "Sistem Bilgisi" @@ -3192,10 +3240,6 @@ msgid "Unbundling objects" msgstr "Nesneler demetten çıkarılıyor" #, c-format -msgid "Unknown subcommand: %s" -msgstr "Bilinmeyen altkomut: %s" - -#, c-format msgid "cannot read object %s '%s'" msgstr "%s '%s' nesnesi okunamıyor" @@ -3270,7 +3314,10 @@ msgid "show object size" msgstr "nesne boyutunu göster" msgid "allow -s and -t to work with broken/corrupt objects" -msgstr "-s ve -t'nin bozuk/hasar görmüş nesnelerle çalışmasına izin ver" +msgstr "-s ve -t'nin bozuk/hasarlı nesnelerle çalışmasına izin ver" + +msgid "use mail map file" +msgstr "posta eşlem dosyasını kullan" msgid "Batch objects requested on stdin (or --batch-all-objects)" msgstr "Toplu iş nesneleri stdin'de istendi (veya --batch-all-objects)" @@ -3281,6 +3328,9 @@ msgstr "tam <nesne> veya <revizyon> içeriğini göster" msgid "like --batch, but don't emit <contents>" msgstr "--batch gibi; ancak <içerik> yayma" +msgid "stdin is NUL-terminated" +msgstr "stdin, NUL ile sonlandırılmış" + msgid "read commands from stdin" msgstr "komutları stdin'den oku" @@ -3433,10 +3483,10 @@ msgid "do not skip files with skip-worktree set" msgstr "skip-worktree kümesiyle dosyaları atlama" msgid "force overwrite of existing files" -msgstr "mevcut dosyaların üzerine yazılmasını zorla" +msgstr "var olan dosyaların üzerine yazılmasını zorla" msgid "no warning for existing files and files not in index" -msgstr "mevcut dosyalar ve indekste olmayan dosyalar için uyarma" +msgstr "var olan dosyalar ve indekste olmayan dosyalar için uyarma" msgid "don't checkout new files" msgstr "yeni dosyaları çıkış yapma" @@ -3639,7 +3689,7 @@ msgid "" "Please use -- (and optionally --no-guess) to disambiguate" msgstr "" "'%s' hem bir yerel dosya hem de bir izleme dalı olabilir.\n" -"Lütfen -- (ve isteğe bağlı olarak --no-guess) kullanıp belirsizliği giderin." +"-- (ve isteğe bağlı olarak --no-guess) kullanıp belirsizliği giderin" msgid "" "If you meant to check out a remote tracking branch on, e.g. 'origin',\n" @@ -4150,6 +4200,12 @@ msgstr "" "sparse-checkout dosyasını yalnızca kökteki dosyaları içerecek biçimde " "ilklendir" +msgid "uri" +msgstr "uri" + +msgid "a URI for downloading bundles before fetching from origin remote" +msgstr "uzak konum kökeninden getirmeden önce demetleri indirmek için bir URI" + #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: '%s' için alternatif eklenemedi: %s\n" @@ -4209,9 +4265,8 @@ msgstr "%s güncellenemiyor" msgid "failed to initialize sparse-checkout" msgstr "sparse-checkout ilklendirilemedi" -msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" -msgstr "" -"uzak konum HEAD'i var olmayan başvuruya bağlanıyor, çıkış yapılamıyor.\n" +msgid "remote HEAD refers to nonexistent ref, unable to checkout" +msgstr "uzak konum HEAD'i, var olmayan başvuruya başvuruyor; çıkış yapılamıyor" msgid "unable to checkout working tree" msgstr "çalışma ağacı çıkış yapılamıyor" @@ -4235,9 +4290,15 @@ msgstr "Klonlamak için bir depo belirtmelisiniz." msgid "options '%s' and '%s %s' cannot be used together" msgstr "'%s' ve '%s %s' seçenekleri birlikte kullanılamaz" +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 "repository '%s' does not exist" -msgstr "'%s' deposu mevcut değil" +msgstr "'%s' deposu yok" #, c-format msgid "depth %s is not a positive number" @@ -4245,15 +4306,15 @@ msgstr "%s derinliği pozitif bir sayı değil" #, c-format msgid "destination path '%s' already exists and is not an empty directory." -msgstr "Hedef yolu '%s' halihazırda mevcut ve boş bir dizin değil." +msgstr "Hedef yolu '%s' halihazırda var ve boş bir dizin değil." #, c-format msgid "repository path '%s' already exists and is not an empty directory." -msgstr "Depo yolu '%s' halihazırda mevcut ve boş bir dizin değil." +msgstr "Depo yolu '%s' halihazırda var ve boş bir dizin değil." #, c-format msgid "working tree '%s' already exists." -msgstr "Çalışma ağacı '%s' halihazırda mevcut." +msgstr "Çalışma ağacı '%s' halihazırda var." #, c-format msgid "could not create leading directories of '%s'" @@ -4306,6 +4367,13 @@ msgstr "--local yok sayıldı" msgid "cannot clone from filtered bundle" msgstr "süzülmüş demetten klonlanamıyor" +msgid "failed to initialize the repo, skipping bundle URI" +msgstr "depo ilklendirilemedi, demet URI'si atlanıyor" + +#, c-format +msgid "failed to fetch objects from bundle URI '%s'" +msgstr "'%s' demet URI'sinden nesneler getirilemedi" + msgid "remote transport reported error" msgstr "uzak konum taşıması hata bildirdi" @@ -4423,10 +4491,6 @@ msgstr "" msgid "Collecting commits from input" msgstr "Girdiden işlemeler toplanıyor" -#, c-format -msgid "unrecognized subcommand: %s" -msgstr "tanımlanamayan altkomut: %s" - msgid "" "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " "<file>)...] <tree>" @@ -4584,7 +4648,7 @@ msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "" -"mevcut işleme iletisinde kullanılmayan bir yorum\n" +"geçerli işleme iletisinde kullanılmayan bir yorum\n" "karakteri seçilemiyor" #, c-format @@ -4707,7 +4771,7 @@ msgstr "Lütfen iletiyi -m veya -F seçeneğini kullanarak destekleyin.\n" #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" -"--author '%s', 'Ad <e-posta>' biçiminde değil ve mevcut bir yazarla " +"--author '%s', 'Ad <e-posta>' biçiminde değil ve var olan bir yazarla " "eşleşmiyor" #, c-format @@ -4782,9 +4846,6 @@ msgstr "durumu uzun biçimde göster (öntanımlı)" msgid "terminate entries with NUL" msgstr "girdileri NUL ile sonlandır" -msgid "mode" -msgstr "kip" - msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "izlenmeyen dosyaları göster, ist. bağlı kipler: all, normal, no (Öntanım.: " @@ -4795,7 +4856,7 @@ msgid "" "traditional)" msgstr "" "yok sayılan dosyaları göster, isteğe bağlı kipler: traditional (geleneksel) " -"matching (eşleşen), no (hayır) (Öntanımlı: traditional)." +"matching (eşleşen), no (hayır) (Öntanımlı: traditional)" msgid "when" msgstr "ne zaman" @@ -4805,7 +4866,7 @@ msgid "" "(Default: all)" msgstr "" "altmodüllere olan değişiklikleri yok say, isteğe bağlı ne zaman: all " -"(hepsi), dirty (kirli), untracked (izlenmeyen) (Öntanımlı: all)." +"(hepsi), dirty (kirli), untracked (izlenmeyen) (Öntanımlı: all)" msgid "list untracked files in columns" msgstr "izlenmeyen dosyaları sütunlarla göster" @@ -5173,7 +5234,7 @@ msgid "" msgstr "" "--worktree, worktreeConfig yapılandırma genişletmesi etkinleştirilmediği\n" "sürece birden çok çalışma ağacı ile birlikte kullanılamaz. Ayrıntılar için\n" -"lütfen \"git help worktree\" içindeki \"CONFIGURATION FILE\" bölümünü okuyun." +"lütfen \"git help worktree\" içindeki \"CONFIGURATION FILE\" bölümünü okuyun" msgid "--get-color and variable type are incoherent" msgstr "--get-color ve değişken türü tutarsız" @@ -5272,7 +5333,7 @@ msgstr "ek açıklamalı" #, c-format msgid "annotated tag %s not available" -msgstr "%s ek açıklamalı etiketi mevcut değil" +msgstr "ek açıklamalı etiket %s kullanılamıyor" #, c-format msgid "tag '%s' is externally known as '%s'" @@ -5380,6 +5441,22 @@ msgstr "Hiçbir ad bulunamadı, hiçbir şey betimlenemiyor." msgid "option '%s' and commit-ishes cannot be used together" msgstr "'%s' seçeneği ve işlememsiler birlikte kullanılamaz" +msgid "" +"git diagnose [-o|--output-directory <path>] [-s|--suffix <format>] [--" +"mode=<mode>]" +msgstr "" +"git diagnose [-o|--output-directory <yol>] [-s|--suffix <biçim>] [--" +"mode=<kip>]" + +msgid "specify a destination for the diagnostics archive" +msgstr "tanı arşivi için bir hedef konum belirtin" + +msgid "specify a strftime format suffix for the filename" +msgstr "dosya adı için bir strftime biçimli ek belirtin" + +msgid "specify the content of the diagnostic archive" +msgstr "tanı arşivinin içeriğini belirtin" + msgid "--merge-base only works with two commits" msgstr "--merge-base yalnızca iki işleme ile kullanılabilir" @@ -5400,7 +5477,7 @@ msgstr "Bir git deposu değil" #, c-format msgid "invalid object '%s' given." -msgstr "geçersiz nesne '%s' verildi" +msgstr "geçersiz nesne '%s' verildi." #, c-format msgid "more than two blobs given: '%s'" @@ -5408,7 +5485,7 @@ msgstr "ikiden çok ikili nesne verildi: '%s'" #, c-format msgid "unhandled object '%s' given." -msgstr "ele alınmayan nesne '%s' verildi" +msgstr "ele alınmayan nesne '%s' verildi." #, c-format msgid "%s...%s: multiple merge bases, using %s" @@ -5758,11 +5835,8 @@ msgstr "[güncel]" msgid "[rejected]" msgstr "[reddedildi]" -msgid "can't fetch in current branch" -msgstr "geçerli dalda getirme yapılamıyor" - -msgid "checked out in another worktree" -msgstr "başka bir çalışma ağacında çıkış yapıldı" +msgid "can't fetch into checked-out branch" +msgstr "çıkış yapılmış dala getirilemiyor" msgid "[tag update]" msgstr "[etiket güncellemesi]" @@ -5797,9 +5871,9 @@ msgid "" "but that check has been disabled; to re-enable, use '--show-forced-updates'\n" "flag or run 'git config fetch.showForcedUpdates true'" msgstr "" -"Getirme normalde hangi dallarda zorla güncelleme yapıldığını belirtir;\n" -"ancak bu denetleme kapatılmış. Yeniden açmak için '--show-forced-updates'\n" -"bayrağını kullanın veya 'git config fetch.showForcedUpdates true' çalıştırın." +"Getirme, normalde hangi dallarda zorla güncelleme yapıldığını belirtir;\n" +"ancak bu denetleme kapatılmış; yeniden açmak için '--show-forced-updates'\n" +"bayrağını kullanın veya 'git config fetch.showForcedUpdates true' çalıştırın" #, c-format msgid "" @@ -5891,8 +5965,8 @@ msgid "" "no source branch found;\n" "you need to specify exactly one branch with the --set-upstream option" msgstr "" -"Kaynak dal bulunamadı.\n" -"--set-upstream seçeneği ile tam olarak bir dal belirtmeniz gerekiyor." +"Kaynak dal bulunamadı;\n" +"--set-upstream seçeneği ile tam olarak bir dal belirtmeniz gerekiyor" #, c-format msgid "Fetching %s\n" @@ -5910,8 +5984,8 @@ msgid "" "no remote repository specified; please specify either a URL or a\n" "remote name from which new revisions should be fetched" msgstr "" -"Bir uzak dal belirtilmedi. Lütfen yeni revizyonların\n" -"getirileceği bir URL veya uzak konum adı belirtin." +"Bir uzak dal belirtilmedi; lütfen yeni revizyonların\n" +"getirileceği bir URL veya uzak konum adı belirtin" msgid "you need to specify a tag name" msgstr "bir etiket adı belirtmeniz gerekiyor" @@ -5949,8 +6023,8 @@ msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" msgstr "" -"--filter yalnızca extensions.partialclone içinde yapılandırılmış uzak konum " -"ile kullanılabilir." +"--filter, yalnızca extensions.partialclone içinde yapılandırılmış uzak konum " +"ile kullanılabilir" msgid "--atomic can only be used when fetching from one remote" msgstr "--atomic yalnızca bir uzak konumdan getirirken kullanılabilir" @@ -6118,7 +6192,7 @@ msgstr "%s %s (%s) şurada etiketlendi: %s" #, c-format msgid "%s: object corrupt or missing" -msgstr "%s: nesne hasar görmüş veya kayıp" +msgstr "%s: nesne hasarlı veya kayıp" #, c-format msgid "%s: invalid reflog entry %s" @@ -6145,7 +6219,7 @@ msgstr "%s: sağlama yolu uyuşmazlığı, şurada bulundu: %s" #, c-format msgid "%s: object corrupt or missing: %s" -msgstr "%s: nesne hasar görmüş veya kayıp: %s" +msgstr "%s: nesne hasarlı veya kayıp: %s" #, c-format msgid "%s: object is of unknown type '%s': %s" @@ -6195,6 +6269,10 @@ msgstr "%s: cache-tree içinde geçersiz sha1 işaretçisi" msgid "non-tree in cache-tree" msgstr "cache-tree içinde ağaç olmayan öge" +#, c-format +msgid "%s: invalid sha1 pointer in resolve-undo" +msgstr "%s: resolve-undo içinde geçersiz sha1 işaretçisi" + msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<seçenekler>] [<nesne>...]" @@ -6337,7 +6415,7 @@ msgstr "geçersiz 'ipc-threads' değeri (%d)" #, c-format msgid "Unhandled subcommand '%s'" -msgstr "İşlenmemiş altkomut '%s'" +msgstr "Ele alınmamış altkomut '%s'" msgid "fsmonitor--daemon not supported on this platform" msgstr "fsmonitor--daemon bu platformda desteklenmiyor" @@ -6461,7 +6539,7 @@ msgstr "" #, c-format msgid "lock file '%s' exists, skipping maintenance" -msgstr "kilit dosyası '%s' mevcut, bakım atlanıyor" +msgstr "kilit dosyası '%s' var, bakım atlanıyor" #, c-format msgid "task '%s' failed" @@ -6523,12 +6601,15 @@ msgstr "schtasks başlatılamadı" msgid "failed to run 'crontab -l'; your system might not support 'cron'" msgstr "'crontab -l' çalıştırılamadı; sisteminiz 'cron' desteklemiyor olabilir" +msgid "failed to create crontab temporary file" +msgstr "crontab geçici dosyası oluşturulamadı" + +msgid "failed to open temporary file" +msgstr "geçici dosya açılamadı" + msgid "failed to run 'crontab'; your system might not support 'cron'" msgstr "'crontab' çalıştırılamadı; sisteminiz 'cron' desteklemiyor olabilir" -msgid "failed to open stdin of 'crontab'" -msgstr "'crontab' stdin'i açılamadı" - msgid "'crontab' died" msgstr "'crontab' beklenmedik bir biçimde sonlandı" @@ -6551,11 +6632,11 @@ msgid "unrecognized --scheduler argument '%s'" msgstr "tanımlanamayan --scheduler argümanı, '%s'" msgid "neither systemd timers nor crontab are available" -msgstr "ne systemd zamanlayıcıları ne de crontab mevcut değil" +msgstr "ne systemd zamanlayıcıları ne de crontab kullanılabiliyor" #, c-format msgid "%s scheduler is not available" -msgstr "%s planlayıcısı mevcut değil" +msgstr "%s planlayıcısı kullanılamıyor" msgid "another process is scheduling background maintenance" msgstr "başka bir işlem arka plan bakımı zamanını planlıyor" @@ -6575,10 +6656,6 @@ msgstr "depo, global yapılandırmaya eklenemedi" msgid "git maintenance <subcommand> [<options>]" msgstr "git maintenance <altkomut> [<seçenekler>]" -#, c-format -msgid "invalid subcommand: %s" -msgstr "geçersiz altkomut: %s" - msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<seçenekler>] [-e] <dizgi> [<rev>...] [[--] <yol>...]" @@ -6750,6 +6827,9 @@ msgstr "sayfalayıcıda eşleşen dosyaları göster" msgid "allow calling of grep(1) (ignored by this build)" msgstr "grep(1)'in çağrılmasına izin ver (bu yapım tarafından yok sayıldı)" +msgid "maximum number of results per file" +msgstr "dosya başına en çok sonuç sayısı" + msgid "no pattern given" msgstr "bir dizgi verilmedi" @@ -6837,11 +6917,21 @@ msgstr "komut açıklamasını yazdır" msgid "print list of useful guides" msgstr "kullanışlı kılavuzların listesini çıkar" +msgid "print list of user-facing repository, command and file interfaces" +msgstr "" +"kullanıcıya görünür depolar, komutlar ve dosya arayüzlerinin bir listesini " +"yazdır" + +msgid "print list of file formats, protocols and other developer interfaces" +msgstr "" +"dosya biçimleri, protokoller ve diğer geliştirici arayüzlerinin bir " +"listesini yazdır" + msgid "print all configuration variable names" msgstr "tüm yapılandırma değişkenleri adlarını yazdır" -msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]" -msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<komutlar>]" +msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>|<doc>]" +msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<komut>|<belge>]" #, c-format msgid "unrecognized help format '%s'" @@ -6998,11 +7088,11 @@ msgstr "%s okunamıyor" #, c-format msgid "cannot read existing object info %s" -msgstr "mevcut %s nesne bilgisi okunamıyor" +msgstr "var olan nesne bilgisi %s okunamıyor" #, c-format msgid "cannot read existing object %s" -msgstr "mevcut %s nesnesi okunamıyor" +msgstr "var olan nesne %s okunamıyor" #, c-format msgid "invalid blob object %s" @@ -7025,7 +7115,7 @@ msgid "Indexing objects" msgstr "Nesneler indeksleniyor" msgid "pack is corrupted (SHA1 mismatch)" -msgstr "paket hasar görmüş (SHA1 uyumsuzluğu)" +msgstr "paket hasarlı (SHA1 uyumsuzluğu)" msgid "cannot fstat packfile" msgstr "paket dosyası fstat yapılamıyor" @@ -7099,7 +7189,7 @@ msgstr "Mevcut paket dosyası '%s' açılamıyor" #, c-format msgid "Cannot open existing pack idx file for '%s'" -msgstr "'%s' için mevcut paket idx dosyası açılamıyor" +msgstr "'%s' için var olan paket idx dosyası açılamıyor" #, c-format msgid "non delta: %d object" @@ -7190,11 +7280,11 @@ 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 mevcut paylaşılan Git deposu yeniden ilklendirildi\n" +msgstr "%s%s içindeki var olan paylaşılan Git deposu yeniden ilklendirildi\n" #, c-format msgid "Reinitialized existing Git repository in %s%s\n" -msgstr "%s%s içindeki mevcut Git deposu yeniden ilklendirildi\n" +msgstr "%s%s içindeki var olan Git deposu yeniden ilklendirildi\n" #, c-format msgid "Initialized empty shared Git repository in %s%s\n" @@ -7311,8 +7401,8 @@ msgstr "diff çıktısını gizle" msgid "show source" msgstr "kaynağı göster" -msgid "use mail map file" -msgstr "posta eşlem dosyasını kullan" +msgid "clear all previously-defined decoration filters" +msgstr "tüm önceden tanımlanmış süsleme süzgeçlerini temizle" msgid "only decorate refs that match <pattern>" msgstr "yalnızca <dizgi> ile eşleşen başvuruları süsle" @@ -7408,7 +7498,7 @@ msgstr "" "Üstkaynak alınamadı; taban işlemesinin kaydını kendiliğinden yazmak\n" "istiyorsanız lütfen git branch --set-upstream-to kullanarak bir uzak dalı\n" "izleyin. Bunun dışında taban işlemesini kendiniz --base=<taban-işlemesi-no>\n" -"kullanarak el ile belirtebilirsiniz." +"kullanarak el ile belirtebilirsiniz" msgid "failed to find exact merge base" msgstr "kesin birleştirme temeli bulunamadı" @@ -7566,6 +7656,9 @@ msgstr "" msgid "percentage by which creation is weighted" msgstr "oluşumun tartıldığı yüzde" +msgid "show in-body From: even if identical to the e-mail header" +msgstr "e-posta üstbilgisinin aynısı dahi olsa gövde için From:'u göster" + #, c-format msgid "invalid ident line: %s" msgstr "geçersiz tanımlayıcı satırı: %s" @@ -7624,6 +7717,18 @@ msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "İzlenen bir uzak dal bulunamadı, lütfen el ile <üstkaynak> belirtin.\n" +#, c-format +msgid "bad ls-files format: element '%s' does not start with '('" +msgstr "hatalı ls-files biçimi: '%s' ögesi, '(' ile başlamıyor" + +#, c-format +msgid "bad ls-files format: element '%s' does not end in ')'" +msgstr "hatalı ls-files biçimi: '%s' ögesi, ')' ile sonlanmıyor" + +#, c-format +msgid "bad ls-files format: %%%.*s" +msgstr "hatalı ls-files biçimi: %%%.*s" + msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<seçenekler>] [<dosya>...]" @@ -7709,6 +7814,13 @@ msgid "show sparse directories in the presence of a sparse index" msgstr "bir aralıklı indeks bulunurluğunda aralıklı dizinleri göster" msgid "" +"--format cannot be used with -s, -o, -k, -t, --resolve-undo, --deduplicate, " +"--eol" +msgstr "" +"--format; -s, -o, -k, -t, --resolve-undo, --deduplicate, --eol ile birlikte " +"kullanılamaz" + +msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" " [-q | --quiet] [--exit-code] [--get-url]\n" " [--symref] [<repository> [<refs>...]]" @@ -7926,6 +8038,39 @@ msgstr "'%s' başvurusu çözülemedi" msgid "Merging %s with %s\n" msgstr "%s, %s ile birleştiriliyor\n" +msgid "not something we can merge" +msgstr "birleştirebileceğimiz bir şey değil" + +msgid "refusing to merge unrelated histories" +msgstr "birbiriyle ilişkisi olmayan geçmişleri birleştirme reddediliyor" + +msgid "failure to merge" +msgstr "birleştirilemedi" + +msgid "git merge-tree [--write-tree] [<options>] <branch1> <branch2>" +msgstr "git merge-tree [--write-tree] [<seçenekler>] <dal1> <dal2>" + +msgid "git merge-tree [--trivial-merge] <base-tree> <branch1> <branch2>" +msgstr "git merge-tree [--trivial-merge] <taban-ağaç> <dal1> <dal2>" + +msgid "do a real merge instead of a trivial merge" +msgstr "bir önemsiz birleştirme yerine gerçek bir birleştirme yap" + +msgid "do a trivial merge only" +msgstr "yalnızca bir önemsiz birleştirme yap" + +msgid "also show informational/conflict messages" +msgstr "ayrıcı bilgi/çakışma iletilerini göster" + +msgid "list filenames without modes/oids/stages" +msgstr "kipi/oid'si/hazırlığı olmayan dosya adlarını listele" + +msgid "allow merging unrelated histories" +msgstr "birbiriyle ilişkisi olmayan geçmişlerin birleştirilmesine izin ver" + +msgid "--trivial-merge is incompatible with all other options" +msgstr "--trivial-merge, tüm diğer seçeneklerle uyumsuz" + msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<seçenekler>] [<işleme>...]" @@ -8007,9 +8152,6 @@ msgstr "--abort; ancak indeksi ve çalışma ağacını değiştirmeden bırakı msgid "continue the current in-progress merge" msgstr "ilerlemekte olan geçerli birleştirmeyi sürdürün" -msgid "allow merging unrelated histories" -msgstr "birbiriyle ilişkisi olmayan geçmişlerin birleştirilmesine izin ver" - msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "pre-merge-commit ve commit-msg kancalarını atla" @@ -8027,7 +8169,7 @@ msgid "read-tree failed" msgstr "read-tree başarısız oldu" msgid "Already up to date. (nothing to squash)" -msgstr "Tümü güncel (tıkıştırılacak bir şey yok)." +msgstr "Tümü güncel (tıkıştırılacak bir şey yok)" msgid "Already up to date." msgstr "Tümü güncel." @@ -8126,9 +8268,6 @@ msgstr "'%s' kapatılamadı" msgid "not something we can merge in %s: %s" msgstr "%s içinde birleştirebileceğimiz bir şey değil: %s" -msgid "not something we can merge" -msgstr "birleştirebileceğimiz bir şey değil" - msgid "--abort expects no arguments" msgstr "--abort bir argüman beklemez" @@ -8148,18 +8287,18 @@ msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -"Birleştirmenizi sonuçlandırmadınız (MERGE_HEAD mevcut).\n" +"Birleştirmenizi sonuçlandırmadınız (MERGE_HEAD var).\n" "Lütfen birleştirmeden önce değişikliklerinizi işleyin." msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -"Seç-al'ınızı sonuçlandırmadınız (CHERRY_PICK_HEAD mevcut).\n" +"Seç-al'ınızı sonuçlandırmadınız (CHERRY_PICK_HEAD var).\n" "Lütfen birleştirmeden önce değişikliklerinizi işleyin." msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." -msgstr "Seç-al'ınızı sonuçlandırmadınız (CHERRY_PICK_HEAD mevcut)." +msgstr "Seç-al'ınızı sonuçlandırmadınız (CHERRY_PICK_HEAD var)." msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Belirtilen bir işleme yok ve merge.defaultToUpstream ayarlanmamış." @@ -8178,14 +8317,19 @@ msgstr "%s - birleştirebileceğimiz bir şey değil" msgid "Can merge only exactly one commit into empty head" msgstr "Boş dal ucuna tam olarak yalnızca bir işleme birleştirilebilir" -msgid "refusing to merge unrelated histories" -msgstr "birbiriyle ilişkisi olmayan geçmişleri birleştirme reddediliyor" - #, c-format msgid "Updating %s..%s\n" msgstr "Güncelleniyor: %s..%s\n" #, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" +"Birleştirme ile aşağıdaki yerel değişikliklerin üzerine yazılacak:\n" +"\t%s" + +#, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Gerçekten önemsiz indeks içi birleştirme deneniyor...\n" @@ -8203,7 +8347,7 @@ msgstr "%s birleştirme stratejisi deneniyor...\n" #, c-format msgid "No merge strategy handled the merge.\n" -msgstr "Birleştirmeyi hiçbir birleştirme stratejisi işlemedi\n" +msgstr "Birleştirmeyi hiçbir birleştirme stratejisi ele almadı\n" #, c-format msgid "Merge with strategy %s failed.\n" @@ -8219,6 +8363,10 @@ msgstr "" "Otomatik birleştirme iyi geçti; istendiği üzere gönderme öncesinde durdu.\n" #, c-format +msgid "When finished, apply stashed changes with `git stash pop`\n" +msgstr "Bittiğinde, 'git stash pop' ile zulalalan değişiklikleri uygula\n" + +#, c-format msgid "warning: tag input does not pass fsck: %s" msgstr "uyarı: etiket girdisi fsck'den geçemiyor: %s" @@ -8336,6 +8484,9 @@ msgstr "'%s'->'%s' yeniden adlandırması denetleniyor\n" msgid "bad source" msgstr "hatalı kaynak" +msgid "destination exists" +msgstr "hedef konum var" + msgid "can not move directory into itself" msgstr "dizin kendi içine taşınamıyor" @@ -8351,9 +8502,6 @@ msgstr "sürüm denetimi altında değil" msgid "conflicted" msgstr "çakışmalı" -msgid "destination exists" -msgstr "hedef mevcut" - #, c-format msgid "overwriting '%s'" msgstr "üzerine yazılıyor: '%s'" @@ -8365,7 +8513,10 @@ msgid "multiple sources for the same target" msgstr "aynı hedef için birden çok kaynak" msgid "destination directory does not exist" -msgstr "hedef dizin mevcut değil" +msgstr "hedef dizin yok" + +msgid "destination exists in the index" +msgstr "hedef konum indekste var" #, c-format msgid "%s, source=%s, destination=%s" @@ -8517,11 +8668,11 @@ msgstr "not içeriği %s içinde bırakıldı" #, c-format msgid "could not open or read '%s'" -msgstr "'%s' açılamadı veya okunamadı" +msgstr "'%s', açılamadı veya okunamadı" #, c-format msgid "failed to resolve '%s' as a valid ref." -msgstr "'%s' geçerli bir başvuru olarak çözülemedi" +msgstr "'%s', geçerli bir başvuru olarak çözülemedi." #, c-format msgid "failed to read object '%s'." @@ -8533,7 +8684,7 @@ msgstr "İkili nesne olmayan '%s' nesnesinden not verisi okunamıyor." #, c-format msgid "malformed input line: '%s'." -msgstr "hatalı oluşturulmuş girdi satırı: '%s'" +msgstr "hatalı oluşturulmuş girdi satırı: '%s'." #, c-format msgid "failed to copy notes from '%s' to '%s'" @@ -8574,7 +8725,7 @@ msgid "" "existing notes" msgstr "" "Not eklenemiyor. %s nesnesi için halihazırda var olan notlar bulundu. Bu " -"notların üzerine yazmak için '-f' kullanın." +"notların üzerine yazmak için '-f' kullanın" #, c-format msgid "Overwriting existing notes for object %s\n" @@ -8599,7 +8750,7 @@ msgid "" "existing notes" msgstr "" "Notlar kopyalanamıyor. %s nesnesi için halihazırda var olan notlar bulundu. " -"Bu notların üzerine yazmak için '-f' kullanın." +"Bu notların üzerine yazmak için '-f' kullanın" #, c-format msgid "missing notes on source object %s. Cannot copy." @@ -8629,7 +8780,7 @@ msgid "could not find commit from NOTES_MERGE_PARTIAL." msgstr "işleme, NOTES_MERGE_PARTIAL ögesinden bulunamadı." msgid "could not parse commit from NOTES_MERGE_PARTIAL." -msgstr "işleme, NOTES_MERGE_PARTIAL ögesinden ayrıştırılamadı" +msgstr "işleme, NOTES_MERGE_PARTIAL ögesinden ayrıştırılamadı." msgid "failed to resolve NOTES_MERGE_REF" msgstr "NOTES_MERGE_REF çözülemedi" @@ -8696,7 +8847,7 @@ msgstr "" #, c-format msgid "Failed to resolve '%s' as a valid ref." -msgstr "'%s' geçerli bir başvuru olarak çözülemiyor" +msgstr "'%s', geçerli bir başvuru olarak çözülemiyor." #, c-format msgid "Object %s has no note\n" @@ -8721,8 +8872,8 @@ msgid "use notes from <notes-ref>" msgstr "notları <not-bşvr>'ndan kullan" #, c-format -msgid "unknown subcommand: %s" -msgstr "bilinmeyen altkomut: %s" +msgid "unknown subcommand: `%s'" +msgstr "bilinmeyen altkomut: '%s'" msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" @@ -8749,7 +8900,7 @@ msgstr "%s için hatalı paketlenmiş nesne CRC'si" #, c-format msgid "corrupt packed object for %s" -msgstr "%s için hasar görmüş paketlenmiş nesne" +msgstr "%s için hasarlı paketlenmiş nesne" #, c-format msgid "recursive delta detected for object %s" @@ -9204,7 +9355,7 @@ msgid "Please specify which branch you want to merge with." msgstr "Lütfen hangi dal ile birleştirmek istediğinizi belirtin." msgid "See git-pull(1) for details." -msgstr "Ayrıntılar için: git-pull(1)" +msgstr "Ayrıntılar için git-pull(1)'a bakın." msgid "<remote>" msgstr "<uzak-konum>" @@ -9250,7 +9401,7 @@ msgid "" "or --ff-only on the command line to override the configured default per\n" "invocation.\n" msgstr "" -"Iraksak dallarınız mevcut ve onların nasıl uzlaştırılacağını\n" +"Iraksak dallarınız var ve onların nasıl uzlaştırılacağını\n" "belirtmeniz gerekiyor. Bunu bir sonraki çekimden önce\n" "aşağıdaki komutlardan birini çalıştırarak yapabilirsiniz:\n" "\n" @@ -9431,7 +9582,7 @@ msgid "" msgstr "" "Güncellemeler reddedildi; çünkü geçerli dalınızın ucu kendisinin\n" "uzak konum karşıtından geride. Yeniden itmeden önce uzak konumdaki\n" -"değişiklikleri entegre edin (örn. 'git pull ...').\n" +"değişiklikleri tümleştirin (örn. 'git pull ...').\n" "Ayrıntılar için 'git push --help' içinde 'Notes about fast-forwards'a\n" "bakın." @@ -9443,7 +9594,7 @@ msgid "" msgstr "" "Güncellemeler reddedildi; çünkü itilmiş bir dal ucu kendisinin\n" "uzak konum karşıtından geride. Yeniden itmeden önce bu dalı çıkış\n" -"yapın ve uzak konumdaki değişiklikleri entegre edin (örn. 'git pull\n" +"yapın ve uzak konumdaki değişiklikleri tümleştirin (örn. 'git pull\n" "...'). Ayrıntılar için 'git push --help' içinde 'Notes about\n" "fast-forwards'a bakın." @@ -9456,8 +9607,8 @@ msgid "" msgstr "" "Güncellemeler reddedildi; çünkü uzak konumda henüz yerelde sizde olmayan\n" "değişiklikler var. Bu genelde başka bir deponun aynı başvuruya itmesinden\n" -"dolayı olur. Yeniden itmeden önce uzak konumdaki değişiklikleri entegre\n" -"etmek isteyebilirsiniz (örn. 'git pull ...').\n" +"dolayı olur. Yeniden itmeden önce uzak konumdaki değişiklikleri tümleş-\n" +"tirmek isteyebilirsiniz (örn. 'git pull ...').\n" "Ayrıntılar için 'git push --help' içinde 'Notes about fast-forwards'a\n" "bakın." @@ -9481,7 +9632,7 @@ msgid "" msgstr "" "Güncellemeler reddedildi; çünkü uzak izleme dalının ucu son\n" "çıkıştan bu yana güncellenmiş. Bir güncellemeyi zorlamadan\n" -"önce bu değişiklikleri yerel olarak entegre etmek isteye-\n" +"önce bu değişiklikleri yerel olarak tümleştirmek isteye-\n" "bilirsiniz (örn. 'git pull ...'\n" #, c-format @@ -9521,7 +9672,7 @@ msgid "require old value of ref to be at this value" msgstr "başvurunun eski değerinin bu değerde olmasını gerektir" msgid "require remote updates to be integrated locally" -msgstr "uzak güncellemelerin yerele entegre edilmesini gerektir" +msgstr "uzak güncellemelerin yerele tümleştirilmesini gerektir" msgid "control recursive pushing of submodules" msgstr "altmodüllerin özyineli itilmesini denetle" @@ -9613,11 +9764,16 @@ msgid "only emit output related to the second range" msgstr "yalnızca ikinci erimle ilişkili çıktıyı yay" #, c-format +msgid "not a revision: '%s'" +msgstr "bir revizyon değil: '%s'" + +#, c-format msgid "not a commit range: '%s'" msgstr "bir işleme erimi değil: '%s'" -msgid "single arg format must be symmetric range" -msgstr "tekli argüman biçimi simetrik erim olmalı" +#, c-format +msgid "not a symmetric range: '%s'" +msgstr "bir simetrik erim değil: '%s'" msgid "need two commit ranges" msgstr "iki işleme erimi gerekli" @@ -9895,6 +10051,9 @@ msgstr "boş başlayan işlemeleri tut" msgid "move commits that begin with squash!/fixup! under -i" msgstr "-i altındaki squash!/fixup! ile başlayan işlemeleri taşı" +msgid "update branches that point to commits that are being rebased" +msgstr "yeniden temellendirilen işlemelere işaret eden dalları güncelle" + msgid "add exec lines after each commit of the editable list" msgstr "düzenlenebilir listenin her işlemesinden sonra exec satırları ekle" @@ -9963,7 +10122,7 @@ msgid "" "mark them as resolved using git add" msgstr "" "Önce tüm birleştirme çakışmalarını düzenlemeli ve onları\n" -"git add kullanarak tamamlandı olarak imlemelisiniz." +"git add kullanarak tamamlandı olarak imlemelisiniz" msgid "could not discard worktree changes" msgstr "çalışma ağacı değişiklikleri atılamadı" @@ -10292,7 +10451,7 @@ msgid "" "\t use --mirror=fetch or --mirror=push instead" msgstr "" "--mirror tehlikeli ve artık kullanılmamalı; lütfen\n" -"\t yerine --mirror=fetch veya --mirror=push kullanın." +"\t yerine --mirror=fetch veya --mirror=push kullanın" #, c-format msgid "unknown mirror argument: %s" @@ -10339,7 +10498,7 @@ msgstr "birden çok %s" #, c-format msgid "unhandled branch.%s.rebase=%s; assuming 'true'" -msgstr "ilgilenilmemiş branch.%s.rebase=%s, 'true' olduğu var sayılıyor" +msgstr "ele alınmamış branch.%s.rebase=%s, 'true' olduğu var sayılıyor" #, c-format msgid "Could not get fetch map for refspec %s" @@ -10367,7 +10526,7 @@ msgid "" msgstr "" "Şuradaki %s yapılandırması remote.pushDefault:\n" "\t%s:%d\n" -"artık var olmayan '%s' uzak konumunu adlandırıyor." +"artık var olmayan '%s' uzak konumunu adlandırıyor" #, c-format msgid "No such remote: '%s'" @@ -10422,6 +10581,9 @@ msgstr " yeni (bir sonraki getirme uzak konumlarda depolayacak/%s" msgid " tracked" msgstr " izlendi" +msgid " skipped" +msgstr " atlandı" + msgid " stale (use 'git remote prune' to remove)" msgstr " eskimiş (kaldırmak için 'git remote prune' kullanın)" @@ -10814,7 +10976,7 @@ msgstr "'%s' geçerli bir başvuru adı değil" #, c-format msgid "replace ref '%s' already exists" -msgstr "değiştirme başvurusu '%s' halihazırda mevcut" +msgstr "değiştirme başvurusu '%s' halihazırda var" #, c-format msgid "" @@ -10927,10 +11089,10 @@ msgid "change a commit's parents" msgstr "bir işlemenin üst ögelerini değiştir" msgid "convert existing graft file" -msgstr "mevcut aşı dosyasını dönüştür" +msgstr "var olan aşı dosyasını dönüştür" msgid "replace the ref if it exists" -msgstr "başvuru mevcutsa onu değiştir" +msgstr "başvuru varsa onu değiştir" msgid "do not pretty-print contents for --edit" msgstr "--edit içeriğini hoş biçimde gösterme" @@ -11093,6 +11255,10 @@ msgstr "Yeni indeks dosyası yazılamadı." msgid "unable to get disk usage of %s" msgstr "%s ögesinin disk kullanımı alınamıyor" +#, c-format +msgid "invalid value for '%s': '%s', the only allowed format is '%s'" +msgstr "'%s' için geçersiz değer: '%s', tek izin verilen biçim '%s'" + msgid "rev-list does not support display of notes" msgstr "rev-list not görüntülemesini desteklemiyor" @@ -11118,6 +11284,9 @@ msgstr "zamansız girdi sonu" msgid "no usage string given before the `--' separator" msgstr "'--' ayırıcısı öncesinde bir kullanım dizisi verilmedi" +msgid "missing opt-spec before option flags" +msgstr "seçenek bayraklarından önce eksik opt-spec" + msgid "Needed a single revision" msgstr "Tek bir revizyon gerekiyordu" @@ -11129,8 +11298,8 @@ msgid "" "Run \"git rev-parse --parseopt -h\" for more information on the first usage." msgstr "" "git rev-parse --parseopt [<seçenekler>] -- [<argümanlar>...]\n" -"\tor: git rev-parse --sq-quote [<argümanlar>...]\n" -"\tor: git rev-parse [<seçenekler>] [<argümanlar>...]\n" +" veya: git rev-parse --sq-quote [<argümanlar>...]\n" +" veya: git rev-parse [<seçenekler>] [<argümanlar>...]\n" "\n" "İlki hakkında ek bilgi için \"git rev-parse --parseopt -h\" çalıştırın." @@ -11253,10 +11422,10 @@ msgid_plural "" "file and the HEAD:" msgstr[0] "" "Aşağıdaki dosyanın hem HEAD'den hem de dosyadan farklı hazırlanmış\n" -"içeriği mevcut:" +"içeriği var:" msgstr[1] "" "Aşağıdaki dosyaların hem HEAD'den hem de dosyadan farklı hazırlanmış\n" -"içeriği mevcut:" +"içeriği var:" msgid "" "\n" @@ -11267,8 +11436,8 @@ msgstr "" msgid "the following file has changes staged in the index:" msgid_plural "the following files have changes staged in the index:" -msgstr[0] "Aşağıdaki dosyanın indekste hazırlanmış değişiklikleri mevcut:" -msgstr[1] "Aşağıdaki dosyaların indekste hazırlanmış değişiklikleri mevcut:" +msgstr[0] "Aşağıdaki dosyanın indekste hazırlanmış değişiklikleri var:" +msgstr[1] "Aşağıdaki dosyaların indekste hazırlanmış değişiklikleri var:" msgid "" "\n" @@ -11575,10 +11744,10 @@ msgid "unable to unquote C-style string '%s'" msgstr "C biçemli '%s' dizisinin tırnakları kaldırılamıyor" msgid "unable to load existing sparse-checkout patterns" -msgstr "mevcut aralıklı çıkış dizgileri yüklenemiyor" +msgstr "var olan aralıklı çıkış dizgileri yüklenemiyor" msgid "existing sparse-checkout patterns do not use cone mode" -msgstr "mevcut aralıklı çıkış dizgileri koni kipini kullanmıyor" +msgstr "var olan aralıklı çıkış dizgileri koni kipini kullanmıyor" msgid "please run from the toplevel directory in non-cone mode" msgstr "koni dışı kipte en üst düzey dizinden çalıştırın" @@ -11879,6 +12048,10 @@ msgid "Expecting a full ref name, got %s" msgstr "Tam bir başvuru adı bekleniyordu, %s alındı" #, c-format +msgid "could not get a repository handle for submodule '%s'" +msgstr "'%s' altmodülü için depo tutacağı alınamadı" + +#, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " "authoritative upstream." @@ -11886,12 +12059,6 @@ msgstr "" "'%s' yapılandırması aranamadı. Bu deponun kendi yetkili üstkaynağı olduğu " "varsayılıyor." -msgid "alternative anchor for relative paths" -msgstr "göreceli yollar için alternatif tutturucu" - -msgid "git submodule--helper list [--prefix=<path>] [<path>...]" -msgstr "git submodule--helper list [--prefix=<yol>] [<yol>...]" - #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr ".gitmodules içinde '%s' altmodül yolu için url bulunamadı" @@ -11923,8 +12090,8 @@ msgstr "her bir altmodül komutu girişinin çıktısını gizle" msgid "recurse into nested submodules" msgstr "iç içe geçmiş altmodüle özyinele" -msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" -msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <komut>" +msgid "git submodule foreach [--quiet] [--recursive] [--] <command>" +msgstr "git submodule foreach [--quiet] [--recursive] [--] <komut>" #, c-format msgid "Failed to register url for submodule path '%s'" @@ -11945,8 +12112,8 @@ msgstr "'%s' altmodülü yolu için güncelleme kipi kaydı yapılamadı" msgid "suppress output for initializing a submodule" msgstr "bir altmodül ilklendirmesi çıktısını gizle" -msgid "git submodule--helper init [<options>] [<path>]" -msgstr "git submodule--helper init [<seçenekler>] [<yol>]" +msgid "git submodule init [<options>] [<path>]" +msgstr "git submodule init [<seçenekler>] [<yol>]" #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" @@ -11973,9 +12140,6 @@ msgstr "" msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<yol>...]" -msgid "git submodule--helper name <path>" -msgstr "git submodule--helper name <yol>" - #, c-format msgid "* %s %s(blob)->%s(submodule)" msgstr "* %s %s(ikili nesne)->%s(altmodül)" @@ -12008,8 +12172,8 @@ msgstr "'ignore_config' değeri 'all' olan altmodülleri atla" msgid "limit the summary size" msgstr "özet boyutunu sınırla" -msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" -msgstr "git submodule--helper summary [<seçenekler>] [<işleme>] [--] [<yol>]" +msgid "git submodule summary [<options>] [<commit>] [--] [<path>]" +msgstr "git submodule summary [<seçenekler>] [<işleme>] [--] [<yol>]" msgid "could not fetch a revision for HEAD" msgstr "HEAD için bir revizyon getirilemedi" @@ -12023,18 +12187,14 @@ msgid "failed to register url for submodule path '%s'" msgstr "'%s' altmodülü yolu için url kaydı yapılamadı" #, c-format -msgid "failed to get the default remote for submodule '%s'" -msgstr "'%s' altmodülü için öntanımlı uzak konum alınamadı" - -#, c-format msgid "failed to update remote for submodule '%s'" msgstr "'%s' altmodülü için uzak konum güncellenemedi" msgid "suppress output of synchronizing submodule url" msgstr "altmodül url'si eşitleme çıktısını gizle" -msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" -msgstr "git submodule--helper sync [--quiet] [--recursive] [<yol>]" +msgid "git submodule sync [--quiet] [--recursive] [<path>]" +msgstr "git submodule sync [--quiet] [--recursive] [<yol>]" #, c-format msgid "" @@ -12090,12 +12250,16 @@ msgid "" "submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n" "'--reference-if-able' instead of '--reference'." msgstr "" -"Bir süperprojenin alternatifinden hesaplanan bir alternatif geçersiz.\n" +"Bir üst projenin alternatifinden hesaplanan bir alternatif geçersiz.\n" "Böyle bir durumda Git'in alternatifsiz klonlamasına izin vermek için\n" "submodule.alternateErrorStrategy ayarını 'info'ya ayarlayın veya\n" "--reference yerine --reference-if-able kullanarak klonlayın." #, c-format +msgid "could not get a repository handle for gitdir '%s'" +msgstr "'%s' git dizini için bir depo tutacı alınamadı" + +#, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "'%s' altmodülü alternatif ekleyemiyor: %s" @@ -12124,6 +12288,9 @@ msgstr "dizin boş değil: '%s'" msgid "could not get submodule directory for '%s'" msgstr "'%s' için altmodül dizini alınamadı" +msgid "alternative anchor for relative paths" +msgstr "göreceli yollar için alternatif tutturucu" + msgid "where the new submodule will be cloned to" msgstr "yeni altmodülün nereye klonlanacağı" @@ -12152,10 +12319,6 @@ msgstr "" "belirteci>] --url <url> --path <yol>" #, c-format -msgid "Invalid update mode '%s' for submodule path '%s'" -msgstr "Geçersiz güncelleme kipi '%s', '%s' altmodül yolu için" - -#, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "Geçersiz güncelleme kipi '%s', '%s' altmodül yolu için yapılandırılmış" @@ -12176,7 +12339,7 @@ msgstr "'%s' altmodülü atlanıyor" #, c-format msgid "Failed to clone '%s'. Retry scheduled" -msgstr "'%s' klonlanamadı. Yeniden deneme zamanlandı." +msgstr "'%s' klonlanamadı. Yeniden deneme zamanlandı" #, c-format msgid "Failed to clone '%s' a second time, aborting" @@ -12229,16 +12392,16 @@ msgstr "" "doğrudan getirilmesi başarısız oldu." #, c-format +msgid "could not initialize submodule at path '%s'" +msgstr "'%s' konumundaki altmodül ilklendirilemedi" + +#, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " "the superproject is not on any branch" msgstr "" -"Altmodül (%s) dalı süperproje dalından devralmak üzere yapılandırıldı; ancak " -"süperproje herhangi bir dalda değil" - -#, c-format -msgid "could not get a repository handle for submodule '%s'" -msgstr "'%s' altmodülü için depo tutacağı alınamadı" +"Altmodül (%s) dalı, üst projenin dalından devralmak üzere yapılandırıldı; " +"ancak üst proje, herhangi bir dalda değil" #, c-format msgid "Unable to find current revision in submodule path '%s'" @@ -12274,11 +12437,14 @@ msgstr "yeni nesneleri uzak konumdan getirme" msgid "path into the working tree" msgstr "çalışma ağacına giden yol" -msgid "path into the working tree, across nested submodule boundaries" -msgstr "iç içe geçmiş altmodül sınırları üzerinden çalışma ağacına giden yol" +msgid "use the 'checkout' update strategy (default)" +msgstr "'checkout' güncelleme stratejisini kullan (öntanımlı)" + +msgid "use the 'merge' update strategy" +msgstr "'merge' güncelleme stratejisini kullan" -msgid "rebase, merge, checkout or none" -msgstr "rebase, merge, checkout veya none" +msgid "use the 'rebase' update strategy" +msgstr "'rebase' güncelleme stratejisini kullan" msgid "create a shallow clone truncated to the specified number of revisions" msgstr "belirli bir revizyon sayısına kısaltılmış sığ klon oluştur" @@ -12292,6 +12458,9 @@ msgstr "ilk klonun sığlık üzerine olan tavsiyeyi izleyip izlemeyeceği" msgid "don't print cloning progress" msgstr "klonlama işlemini yazdırma" +msgid "disallow cloning into non-empty directory, implies --init" +msgstr "boş olmayan dizine klonlamaya izin verme, --init ima eder" + msgid "" "git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] " "[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-" @@ -12303,14 +12472,11 @@ msgstr "" "shallow] [--reference <depo>] [--recursive] [--[no-]single-branch] [--] " "[<yol>...]" -msgid "bad value for update parameter" -msgstr "güncelleme parametresi için hatalı değer" - msgid "recurse into submodules" msgstr "altmodüllere özyinele" -msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" -msgstr "git submodule--helper absorb-git-dirs [<seçenekler>] [<yol>...]" +msgid "git submodule absorbgitdirs [<options>] [<path>...]" +msgstr "git submodule absorbgitdirs [<seçenekler>] [<yol>...]" msgid "check if it is safe to write to the .gitmodules file" msgstr ".gitmodules dosyasına yazım güvenli mi değil mi denetle" @@ -12330,8 +12496,8 @@ msgstr ".gitmodules dosyasının çalışma ağacında olduğundan lütfen emin msgid "suppress output for setting url of a submodule" msgstr "bir altmodül url ayarlanması çıktısını gizle" -msgid "git submodule--helper set-url [--quiet] <path> <newurl>" -msgstr "git submodule--helper set-url [--quiet] <yol> <yeniurl>" +msgid "git submodule set-url [--quiet] <path> <newurl>" +msgstr "git submodule set-url [--quiet] <yol> <yeniurl>" msgid "set the default tracking branch to master" msgstr "öntanımlı izleme dalını master olarak ayarla" @@ -12339,13 +12505,11 @@ msgstr "öntanımlı izleme dalını master olarak ayarla" msgid "set the default tracking branch" msgstr "öntanımlı izleme dalını ayarla" -msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" -msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <yol>" +msgid "git submodule set-branch [-q|--quiet] (-d|--default) <path>" +msgstr "git submodule set-branch [-q|--quiet] (-d|--default) <yol>" -msgid "" -"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" -msgstr "" -"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <dal> <yol>" +msgid "git submodule set-branch [-q|--quiet] (-b|--branch) <branch> <path>" +msgstr "git submodule set-branch [-q|--quiet] (-b|--branch) <dal> <yol>" msgid "--branch or --default required" msgstr "--branch veya --default gerekli" @@ -12372,11 +12536,11 @@ msgstr "'%s' dalı oluşturuluyor" #, c-format msgid "Adding existing repo at '%s' to the index\n" -msgstr "'%s' konumundaki mevcut repo indekse ekleniyor\n" +msgstr "'%s' konumundaki var olan depo indekse ekleniyor\n" #, c-format msgid "'%s' already exists and is not a valid git repo" -msgstr "'%s' halihazırda mevcut ve geçerli bir git deposu değil" +msgstr "'%s' halihazırda var ve geçerli bir git deposu değil" #, c-format msgid "A git directory for '%s' is found locally with remote(s):\n" @@ -12441,8 +12605,8 @@ msgid "" msgstr "" "altmodülün adını kendi yoluna öntanımlamak yerine verilen dizi olarak ayarlar" -msgid "git submodule--helper add [<options>] [--] <repository> [<path>]" -msgstr "git submodule--helper add [<seçenekler>] [--] <depo> [<yol>]" +msgid "git submodule add [<options>] [--] <repository> [<path>]" +msgstr "git submodule add [<seçenekler>] [--] <depo> [<yol>]" msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" @@ -12647,6 +12811,16 @@ msgstr "'%s' etiketi güncellendi (%s idi)\n" msgid "pack exceeds maximum allowed size" msgstr "paket izin verilen en büyük boyutu aşıyor" +msgid "failed to write object in stream" +msgstr "akışta nesne yazılamadı" + +#, c-format +msgid "inflate returned (%d)" +msgstr "şişirme programı (%d) döndürdü" + +msgid "invalid blob object from stream" +msgstr "akıştan geçersiz ikili nesne" + msgid "Unpacking objects" msgstr "Nesneler açılıyor" @@ -12739,7 +12913,7 @@ msgid "add to index only; do not add content to object database" msgstr "yalnızca indekse ekle; içeriğe nesne veritabanına ekleme" msgid "remove named paths even if present in worktree" -msgstr "çalışma ağacında mevcut olsa bile ad verilen yolları kaldır" +msgstr "çalışma ağacında var olsa bile ad verilen yolları kaldır" msgid "with --stdin: input lines are terminated by null bytes" msgstr "--stdin ile: girdi satırları boş baytlarla sonlandırılır" @@ -13157,6 +13331,27 @@ msgstr "bir <önek> altdizini için ağaç nesnesi yaz" msgid "only useful for debugging" msgstr "yalnızca hata ayıklama için yararlı" +msgid "core.fsyncMethod = batch is unsupported on this platform" +msgstr "core.fsyncMethod = batch, bu platformda desteklenmiyor" + +msgid "failed to create temporary file" +msgstr "geçici dosya oluşturulamadı" + +msgid "insufficient capabilities" +msgstr "yetersiz yetenekler" + +#, c-format +msgid "failed to download bundle from URI '%s'" +msgstr "'%s' URI'sinden demet indirilemedi" + +#, c-format +msgid "file at URI '%s' is not a bundle" +msgstr "'%s' URI'sindeki dosya bir demet değil" + +#, c-format +msgid "failed to unbundle bundle from URI '%s'" +msgstr "'%s' URI'sindeki demet çözülemedi" + #, c-format msgid "unrecognized bundle hash algorithm: %s" msgstr "bilinmeyen demet sağlama algoritması: %s" @@ -13358,6 +13553,9 @@ msgstr "Git depoları için gerçekten yalın bir sunucu" msgid "Give an object a human readable name based on an available ref" msgstr "Uygun bir başvuruyu temel alıp nesneye okunabilir ad ver" +msgid "Generate a zip archive of diagnostic information" +msgstr "Tanı bilgisinin bir zip arşivini oluştur" + msgid "Show changes between commits, commit and working tree, etc" msgstr "İşlemeler, işleme ve ağaçlar vb. arası değişiklikler" @@ -13368,8 +13566,7 @@ msgid "Compare a tree to the working tree or index" msgstr "Bir ağacı çalışma ağacı veya indeks ile karşılaştır" msgid "Compares the content and mode of blobs found via two tree objects" -msgstr "" -"İki ağaç nesnesi aracılığıyla bulunan ikililerin içerik ve kipini karşılaştır" +msgstr "İki ağaç nesnesiyle bulunan ikililerin içerik/kipini karşılaştır" msgid "Show changes using common diff tools" msgstr "Değişiklikleri yaygın diff araçlarıyla göster" @@ -13485,8 +13682,8 @@ msgstr "Birleştirilmesi gereken dosyaları birleştir" msgid "The standard helper program to use with git-merge-index" msgstr "Bu yardımcı program git-merge-index kullanımı içindir" -msgid "Show three-way merge without touching index" -msgstr "İndekse dokunmadan üçlü birleştirmeyi göster" +msgid "Perform merge without touching index or working tree" +msgstr "İndekse veya çalışma ağacına dokunmadan birleştir" msgid "Run merge conflict resolution tools to resolve merge conflicts" msgstr "Çakışmaları çözmek için çözüm araçlarını çalıştır" @@ -13531,7 +13728,7 @@ msgid "Remove extra objects that are already in pack files" msgstr "Halihazırda paket dosyalarında olan ek nesneleri kaldır" msgid "Fetch from and integrate with another repository or a local branch" -msgstr "Başka bir depo veya yerel daldan getir ve entegre et" +msgstr "Başka bir depo veya yerel daldan getir ve tümleştir" msgid "Update remote refs along with associated objects" msgstr "İlişkin nesnelerle birlikte uzak başvuruları da güncelle" @@ -13618,7 +13815,7 @@ msgid "List references in a local repository" msgstr "Yerel bir depodaki başvuruları listele" msgid "Reduce your working tree to a subset of tracked files" -msgstr "Çalışma ağacını izlenen dosyaların bir alt kümesine küçült" +msgstr "Çalışma ağacını izlenen dosyaların alt kümesine küçült" msgid "Add file contents to the staging area" msgstr "Dosya içeriğini hazırlama alanına ekle" @@ -13681,6 +13878,9 @@ msgstr "Paketlenmiş Git arşiv dosyalarını doğrula" msgid "Check the GPG signature of tags" msgstr "Etiketlerin GPG imzasını doğrula" +msgid "Display version information about Git" +msgstr "Git sürüm bilgisini görüntüle" + msgid "Show logs with difference each commit introduces" msgstr "Günlükleri her işlemenin sunduğu değişikliklerle göster" @@ -13714,6 +13914,24 @@ msgstr "Günlük Git kullanımı için yararlı komutlar" msgid "Frequently asked questions about using Git" msgstr "Git kullanımı hakkında sıkça sorulan sorular" +msgid "The bundle file format" +msgstr "Demet dosya biçimi" + +msgid "Chunk-based file formats" +msgstr "geçersiz gitfile biçimi: %s" + +msgid "Git commit graph format" +msgstr "Git işleme grafiği biçimi" + +msgid "Git index format" +msgstr "Git indeks biçimi" + +msgid "Git pack format" +msgstr "Git paket biçimi" + +msgid "Git cryptographic signature formats" +msgstr "Git kriptografik imza biçimleri" + msgid "A Git Glossary" msgstr "Git Kavram Dizini" @@ -13735,6 +13953,21 @@ msgstr "Altmodül özelliklerini tanımlama" msgid "Git namespaces" msgstr "Git ad alanları" +msgid "Protocol v0 and v1 capabilities" +msgstr "Protokol v0 ve v1 yetenekleri" + +msgid "Things common to various protocols" +msgstr "Çeşitli protokollerde ortak olan şeyler" + +msgid "Git HTTP-based protocols" +msgstr "Git HTTP tabanlı protokolleri" + +msgid "How packs are transferred over-the-wire" +msgstr "Paketlerin nice aktarıldığı" + +msgid "Git Wire Protocol, Version 2" +msgstr "Git Wire Protokolü, Sürüm 2" + msgid "Helper programs to interact with remote repositories" msgstr "Uzak depolar ile etkileşim için yardımcı programlar" @@ -13759,6 +13992,9 @@ msgstr "Git web arabirimi (Git depoları için web ön ucu)" msgid "An overview of recommended workflows with Git" msgstr "Önerilen Git çalışma akışlarına genel bakış" +msgid "A tool for managing large Git repositories" +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" @@ -13792,7 +14028,7 @@ msgid "unable to find all commit-graph files" msgstr "tüm commit-graph dosyaları bulunamıyor" msgid "invalid commit position. commit-graph is likely corrupt" -msgstr "geçersiz işleme konumu, commit-graph büyük olasılıkla hasar görmüş" +msgstr "geçersiz işleme konumu, commit-graph büyük olasılıkla hasarlı" #, c-format msgid "could not find commit %s" @@ -13883,8 +14119,7 @@ msgstr "grafik yazımı için çok fazla işleme" msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" -"commit-graph dosyasının sağlama toplamı yanlış ve büyük olasılıkla hasar " -"görmüş" +"commit-graph dosyasının sağlama toplamı yanlış ve büyük olasılıkla hasarlı" #, c-format msgid "commit-graph has incorrect OID order: %s then %s" @@ -13967,7 +14202,7 @@ msgstr "" "lütfen \"git replace --convert-graft-file\" kullanın.\n" "\n" "\"git config advice.graftFileDeprecated false\"\n" -"kullanarak bu iletiyi kapatabilirsiniz." +"kullanarak bu iletiyi kapatabilirsiniz" #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." @@ -13997,10 +14232,18 @@ msgstr "" "kodlama ile değiştirmek isteyebilirsiniz.\n" msgid "no compiler information available\n" -msgstr "derleyici bilgisi mevcut değil\n" +msgstr "derleyici bilgisi yok\n" msgid "no libc information available\n" -msgstr "libc bilgisi mevcut değil\n" +msgstr "libc bilgisi yok\n" + +#, c-format +msgid "could not determine free disk size for '%s'" +msgstr "'%s' için boş disk alanı belirlenemedi" + +#, c-format +msgid "could not get info for '%s'" +msgstr "'%s' için bilgi alınamadı" #, c-format msgid "[GLE %ld] health thread could not open '%ls'" @@ -14057,6 +14300,14 @@ msgid "could not read directory changes [GLE %ld]" msgstr "dizin değişiklikleri okunamadı [GLE %ld]" #, c-format +msgid "[GLE %ld] unable to open for read '%ls'" +msgstr "[GLE %ld] '%ls', okuma için açılamıyor" + +#, c-format +msgid "[GLE %ld] unable to get protocol information for '%ls'" +msgstr "[GLE %ld] '%ls' için protokol bilgisi alınamıyor" + +#, c-format msgid "failed to copy SID (%ld)" msgstr "SID kopyalanamadı (%ld)" @@ -14600,181 +14851,6 @@ msgid "failed to close rev-list's stdin" msgstr "rev-list'in stdin'i kapatılamadı" #, c-format -msgid "'%s' does not exist" -msgstr "'%s' mevcut değil" - -msgid "need a working directory" -msgstr "bir çalışma dizini gerekiyor" - -msgid "could not find enlistment root" -msgstr "gönüllü yazılma kaydı bulunamıyor" - -#, c-format -msgid "could not switch to '%s'" -msgstr "şuraya geçilemedi: '%s'" - -#, c-format -msgid "could not configure %s=%s" -msgstr "%s=%s yapılandırılamadı" - -msgid "could not configure log.excludeDecoration" -msgstr "log.excludeDecoration yapılandırılamadı" - -msgid "Scalar enlistments require a worktree" -msgstr "Scalar gönüllü kayıtları bir çalışma ağacı gerektiriyor" - -#, c-format -msgid "could not open directory '%s'" -msgstr "'%s' dizini açılamadı" - -#, c-format -msgid "skipping '%s', which is neither file nor directory" -msgstr "ne bir dosya ne de dizin olan '%s' atlanıyor" - -#, c-format -msgid "could not determine free disk size for '%s'" -msgstr "'%s' için boş disk alanı belirlenemedi" - -#, c-format -msgid "could not get info for '%s'" -msgstr "'%s' için bilgi alınamadı" - -#, c-format -msgid "remote HEAD is not a branch: '%.*s'" -msgstr "uzak konum HEAD'i bir dal değil: '%.*s'" - -msgid "failed to get default branch name from remote; using local default" -msgstr "" -"uzak konumdan öntanımlı dal adı alınamadı; yerel öntanımlı kullanılıyor" - -msgid "failed to get default branch name" -msgstr "öntanımlı dal adı alınamadı" - -msgid "failed to unregister repository" -msgstr "depo kaydı silinemedi" - -msgid "failed to delete enlistment directory" -msgstr "gönüllü kayıt dizini silinemedi" - -msgid "branch to checkout after clone" -msgstr "klonlama sonrası çıkış yapılacak dal" - -msgid "when cloning, create full working directory" -msgstr "klonlama sırasında tam çalışma dizini oluştur" - -msgid "only download metadata for the branch that will be checked out" -msgstr "yalnızca çıkış yapılacak dalın üstverisini indir" - -msgid "scalar clone [<options>] [--] <repo> [<dir>]" -msgstr "scalar clone [<seçenekler>] [--] <depo> [<dizin>]" - -#, c-format -msgid "cannot deduce worktree name from '%s'" -msgstr "'%s' ögesinden çalışma ağacı adı ortaya çıkarılamıyor" - -#, c-format -msgid "directory '%s' exists already" -msgstr "'%s' dizini halihazırda var" - -#, c-format -msgid "failed to get default branch for '%s'" -msgstr "'%s' için öntanımlı dal alınamadı" - -#, c-format -msgid "could not configure remote in '%s'" -msgstr "'%s' içindeki uzak konum yapılandırılamadı" - -#, c-format -msgid "could not configure '%s'" -msgstr "'%s' yapılandırılamadı" - -msgid "partial clone failed; attempting full clone" -msgstr "kısımsal klonlama başarısız; tam klonlama deneniyor" - -msgid "could not configure for full clone" -msgstr "tam klonlama için yapılandırılamadı" - -msgid "scalar diagnose [<enlistment>]" -msgstr "scalar diagnose [<gönüllükayıt>]" - -#, c-format -msgid "could not create directory for '%s'" -msgstr "'%s' için dizin oluşturulamadı" - -msgid "could not duplicate stdout" -msgstr "stdout çoğaltılamadı" - -msgid "failed to write archive" -msgstr "arşiv yazılamadı" - -msgid "`scalar list` does not take arguments" -msgstr "'scalar list' argüman almıyor" - -msgid "scalar register [<enlistment>]" -msgstr "scalar register [<gönüllükayıt>]" - -msgid "reconfigure all registered enlistments" -msgstr "tüm kaydı yapılmış gönüllü kayıtları yeniden yapılandır" - -msgid "scalar reconfigure [--all | <enlistment>]" -msgstr "scalar reconfigure [--all | <gönüllükayıt>]" - -msgid "--all or <enlistment>, but not both" -msgstr "--all veya <gönüllükayıt>; ancak ikisi değil" - -#, c-format -msgid "git repository gone in '%s'" -msgstr "git deposu '%s' içinde gitti" - -msgid "" -"scalar run <task> [<enlistment>]\n" -"Tasks:\n" -msgstr "" -"scalar run <görev> [<gönüllükayıt>]\n" -"Görevler:\n" - -#, c-format -msgid "no such task: '%s'" -msgstr "böyle bir görev yok: '%s'" - -msgid "scalar unregister [<enlistment>]" -msgstr "scalar unregister [<enlistment>]" - -msgid "scalar delete <enlistment>" -msgstr "scalar delete <gönüllükayıt>" - -msgid "refusing to delete current working directory" -msgstr "geçerli çalışma dizinini silme reddediliyor" - -msgid "include Git version" -msgstr "Git sürümünü içer" - -msgid "include Git's build options" -msgstr "Git'in yapı seçeneklerini içer" - -msgid "scalar verbose [-v | --verbose] [--build-options]" -msgstr "scalar verbose [-v | --verbose] [--build-options]" - -msgid "-C requires a <directory>" -msgstr "-C, bir <dizin> gerektiriyor" - -#, c-format -msgid "could not change to '%s'" -msgstr "'%s' olarak değiştirilemedi" - -msgid "-c requires a <key>=<value> argument" -msgstr "-c, bir <anahtar>=<değer> argümanı gerektiriyor" - -msgid "" -"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n" -"\n" -"Commands:\n" -msgstr "" -"scalar [-C <dizin>] [-c <anahtar>=<değer>] <komut> [<seçenekler>]\n" -"\n" -"Komutlar:\n" - -#, c-format msgid "illegal crlf_action %d" msgstr "izin verilmeyen crlf_action %d" @@ -14980,6 +15056,32 @@ msgstr "" msgid "Marked %d islands, done.\n" msgstr "%d delta adası imlendi, bitti.\n" +#, c-format +msgid "invalid --%s value '%s'" +msgstr "geçersiz --%s değeri '%s'" + +#, c-format +msgid "could not archive missing directory '%s'" +msgstr "eksik dizin '%s', arşivlenemedi" + +#, c-format +msgid "could not open directory '%s'" +msgstr "'%s' dizini açılamadı" + +#, c-format +msgid "skipping '%s', which is neither file nor directory" +msgstr "ne bir dosya ne de dizin olan '%s' atlanıyor" + +msgid "could not duplicate stdout" +msgstr "stdout çoğaltılamadı" + +#, c-format +msgid "could not add directory '%s' to archiver" +msgstr "'%s' dizini, arşivleyiciye eklenemedi" + +msgid "failed to write archive" +msgstr "arşiv yazılamadı" + msgid "--merge-base does not work with ranges" msgstr "--merge-base erimlerle çalışmaz" @@ -15003,7 +15105,7 @@ msgid "" "tree" msgstr "" "Bir git deposu değil. Bir çalışma ağacının dışındaki iki yolu karşılaştırmak " -"için --no-index kullanın." +"için --no-index kullanın" #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" @@ -15539,7 +15641,7 @@ msgid "" "Please specify a directory on the command line" msgstr "" "Bir dizin adı tahmin edilemedi.\n" -"Lütfen komut satırında bir dizin belirtin." +"Lütfen komut satırında bir dizin belirtin" #, c-format msgid "index file corrupt in repo %s" @@ -15588,6 +15690,9 @@ msgstr "git fetch-pack: ACK/NAK bekleniyordu, '%s' alındı" msgid "unable to write to remote" msgstr "uzak konuma yazılamıyor" +msgid "Server supports filter" +msgstr "Sunucu süzgeç destekliyor" + #, c-format msgid "invalid shallow line: %s" msgstr "geçersiz sığ satır: %s" @@ -15698,9 +15803,6 @@ msgstr "sunucu '%s' algoritmasını desteklemiyor" msgid "Server does not support shallow requests" msgstr "Sunucu sığ istekleri desteklemiyor" -msgid "Server supports filter" -msgstr "Sunucu süzgeç destekliyor" - msgid "unable to write request to remote" msgstr "uzak konuma istek yazılamıyor" @@ -15870,7 +15972,7 @@ msgid "" "You can use '!git' in the alias to do this" msgstr "" "'%s' arması çevre değişkenlerini değiştirir.\n" -"Bunu yapmak için armada '!git' kullanabilirsiniz." +"Bunu yapmak için armada '!git' kullanabilirsiniz" #, c-format msgid "empty alias for %s" @@ -15933,7 +16035,7 @@ msgid "" "verification (available in openssh version 8.2p1+)" msgstr "" "ssh-keygen -Y find-principals/verify, ssh imza doğrulaması için gerekli " -"(openssh 8.21p1+ sürümünde mevcut)" +"(openssh 8.21p1+ sürümünde var)" #, c-format msgid "ssh signing revocation file configured but not found: %s" @@ -15982,7 +16084,7 @@ msgid "" "8.2p1+)" msgstr "" "ssh-keygen -Y imzası, ssh imzalaması için gerekli (openssh 8.21p1+ sürümünde " -"mevcut)" +"var)" #, c-format msgid "failed reading ssh signing data buffer from '%s'" @@ -16047,6 +16149,12 @@ msgstr "Düşük Düzeyli Komutlar / Depo Eşitleme" msgid "Low-level Commands / Internal Helpers" msgstr "Düşük Düzeyli Komutlar / İç Yardımcılar" +msgid "User-facing repository, command and file interfaces" +msgstr "Kullanıcı için depo, komut ve dosya arayüzleri" + +msgid "Developer-facing file formats, protocols and other interfaces" +msgstr "Geliştirici için dosya biçimleri, protokoller ve arayüzler" + #, c-format msgid "available git commands in '%s'" msgstr "'%s' içindeki kullanılabilir git komutları" @@ -16060,6 +16168,12 @@ msgstr "En çok kullanılan temel Git komutlarının bir listesi aşağıdadır: msgid "The Git concept guides are:" msgstr "Git konsept kılavuzları şunlardır:" +msgid "User-facing repository, command and file interfaces:" +msgstr "Kullanıcıya görünür depo, komut ve dosya arayüzleri:" + +msgid "File formats, protocols and other developer interfaces:" +msgstr "Dosya biçimleri, protokoller ve diğer geliştirici arayüzleri:" + msgid "External commands" msgstr "Dış komutlar" @@ -16143,16 +16257,13 @@ msgstr "" "Bu uyarıyı 'git config advice.ignoredHook false' ile kapatabilirsiniz." #, c-format -msgid "Couldn't start hook '%s'\n" -msgstr "'%s' kancası başlatılamadı\n" - -#, c-format msgid "argument to --packfile must be a valid hash (got '%s')" msgstr "--packfile için argüman geçerli bir sağlama olmalıdır ('%s' alındı)" msgid "not a git repository" msgstr "bir git deposu değil" +#, c-format msgid "negative value for http.postBuffer; defaulting to %d" msgstr "http.postBuffer için negatif değer; %d olarak varsayılıyor" @@ -16330,21 +16441,16 @@ msgid "quoted CRLF detected" msgstr "alıntılanmış CRLF algılandı" #, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -" %s" -msgstr "" -"Birleştirme ile aşağıdaki dosyalardaki yerel değişikliklerin üzerine " -"yazılacak:\n" -"\t%s" - -#, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "%s altmodülü birleştirilemedi (çıkış yapılmadı)" #, c-format +msgid "Failed to merge submodule %s (no merge base)" +msgstr "%s altmodülü birleştirilemedi (birleştirme temeli yok)" + +#, c-format msgid "Failed to merge submodule %s (commits not present)" -msgstr "%s altmodülü birleştirilemedi (işlemeler mevcut değil)" +msgstr "%s altmodülü birleştirilemedi (işlemeler yok)" #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" @@ -16360,34 +16466,16 @@ msgstr "'%s' altmodülü birleştirilemedi" #, c-format msgid "" -"Failed to merge submodule %s, but a possible merge resolution exists:\n" -"%s\n" -msgstr "" -"%s altmodülü birleştirilemedi; ancak olası bir birleştirme çözümü mevcut:\n" -"%s\n" - -#, c-format -msgid "" -"If this is correct simply add it to the index for example\n" -"by using:\n" -"\n" -" git update-index --cacheinfo 160000 %s \"%s\"\n" -"\n" -"which will accept this suggestion.\n" +"Failed to merge submodule %s, but a possible merge resolution exists: %s" msgstr "" -"Eğer bu doğruysa yalnızca indekse ekleyin, örneğin:\n" -"\n" -"\tgit update-index --cacheinfo 160000 %s \"%s\"\n" -"\n" -"komutu bu öneriyi kabul edecektir.\n" +"%s altmodülü birleştirilemedi; ancak olası bir birleştirme çözümü var: %s" #, c-format msgid "" "Failed to merge submodule %s, but multiple possible merges exist:\n" "%s" msgstr "" -"%s altmodülü birleştirilemedi; ancak birden çok olası birleştirmeler " -"mevcut:\n" +"%s altmodülü birleştirilemedi; ancak birden çok olası birleştirmeler var:\n" "%s" msgid "Failed to execute internal merge" @@ -16406,7 +16494,7 @@ msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " "implicit directory rename(s) putting the following path(s) there: %s." msgstr "" -"ÇAKIŞMA (örtülü dizin yeniden adlandırma): %s konumundaki mevcut dosya/dizin " +"ÇAKIŞMA (örtülü dizin yeniden adlandırma): %s konumunda var olan dosya/dizin " "örtülü yeniden adlandırmanın aşağıdaki yolları oraya koymasına engel oluyor: " "%s." @@ -16417,7 +16505,7 @@ msgid "" msgstr "" "ÇAKIŞMA (örtülü dizin yeniden adlandırma): %s için birden çok yol " "eşlemlenemiyor; örtülü dizin yeniden adlandırmaları aşağıdaki yolları oraya " -"koymayı denedi: %s." +"koymayı denedi: %s" #, c-format msgid "" @@ -16546,13 +16634,44 @@ msgstr "" "ÇAKIŞMA (değiştir/sil): %s silindi (%s içinde) ve %s içinde değiştirildi. %s " "sürümü (şunun: %s) ağaçta bırakıldı." +#. TRANSLATORS: This is a line of advice to resolve a merge +#. 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" +#. #, c-format msgid "" -"Note: %s not up to date and in way of checking out conflicted version; old " -"copy renamed to %s" +" - go to submodule (%s), and either merge commit %s\n" +" or update to an existing commit which has merged those changes\n" msgstr "" -"Not: %s güncel değil ve çakışmalı sürümlerin çıkışının önünde; eski kopya %s " -"olarak yeniden adlandırıldı." +" - altmodüle gidin (%s) ve %s işlemesini birleştirin\n" +" veya bu değişiklikleri birleştirmiş var olan bir işlemeye güncelleyin\n" + +#, c-format +msgid "" +"Recursive merging with submodules currently only supports trivial cases.\n" +"Please manually handle the merging of each conflicted submodule.\n" +"This can be accomplished with the following steps:\n" +"%s - come back to superproject and run:\n" +"\n" +" git add %s\n" +"\n" +" to record the above merge or update\n" +" - resolve any other conflicts in the superproject\n" +" - commit the resulting index in the superproject\n" +msgstr "" +"Altmodülle özyineli birleştirme şu anda yalnızca önemsiz durumları " +"destekler.\n" +"Her bir çakışan altmodülün birleştirmesini lütfen elle yapın.\n" +"Bu, aşağıdaki adımlarla gerçekleştirilebilir:\n" +"%s - yukarıdaki birleştirmeyi kaydetmek veya güncellemek için\n" +" üst projeye geri gelin ve şunu çalıştırın:\n" +"\n" +" git add %s\n" +"\n" +" - üst projedeki kalan diğer çakışmaları çözün\n" +" - üst projedeki sonuç olarak alınan indeksi işleyin\n" #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge #. base, and 2-3) the trees for the two trees we're merging. @@ -16625,6 +16744,21 @@ msgid "Found a possible merge resolution for the submodule:\n" msgstr "Şu altmodül için olası bir birleştirme çözümü bulundu:\n" #, c-format +msgid "" +"If this is correct simply add it to the index for example\n" +"by using:\n" +"\n" +" git update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"which will accept this suggestion.\n" +msgstr "" +"Eğer bu doğruysa yalnızca indekse ekleyin, örneğin:\n" +"\n" +"\tgit update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"komutu bu öneriyi kabul edecektir.\n" + +#, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "%s altmodülü birleştirilemedi (birden çok birleştirme bulundu)" @@ -16685,7 +16819,7 @@ msgstr "" msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "" "ÇAKIŞMA (yeniden adlandır/ekle): %s->%s olarak adlandırıldı (%s içinde). %s " -"eklendi (%s içinde)." +"eklendi (%s içinde)" #, c-format msgid "%s is a directory in %s adding as %s instead" @@ -16730,7 +16864,7 @@ msgid "" ">%s in %s" msgstr "" "ÇAKIŞMA (y. adlandır/y. adlandır): Dizini %s->%s olarak adlandır (%s " -"içinde). Dizini %s->%s olarak adlandır (%s içinde)." +"içinde). Dizini %s->%s olarak adlandır (%s içinde)" msgid "modify" msgstr "değiştir" @@ -16740,7 +16874,7 @@ msgstr "değiştirilmiş" #, c-format msgid "Skipped %s (merged same as existing)" -msgstr "%s atlandı (mevcut ile aynı biçimde birleştirildi)" +msgstr "%s atlandı (var olan ile aynı biçimde birleştirildi)" #, c-format msgid "Adding as %s instead" @@ -16759,7 +16893,7 @@ msgstr "dizin/dosya" #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" -"ÇAKIŞMA (%s): %s adıyla bir dizin var (%s içinde). %s, %s olarak ekleniyor." +"ÇAKIŞMA (%s): %s adıyla bir dizin var (%s içinde). %s, %s olarak ekleniyor" #, c-format msgid "Adding %s" @@ -16858,7 +16992,7 @@ msgid "malformed line: %s" msgstr "hatalı oluşturulmuş satır: %s" msgid "ignoring existing multi-pack-index; checksum mismatch" -msgstr "mevcut multi-pack-index yok sayılıyor; sağlama toplamı uyumsuzluğu" +msgstr "var olan multi-pack-index yok sayılıyor; sağlama toplamı uyumsuzluğu" msgid "could not load pack" msgstr "paket yüklenemedi" @@ -16903,7 +17037,7 @@ msgid "failed to clear multi-pack-index at %s" msgstr "multi-pack-index %s konumunda temizlenemedi" msgid "multi-pack-index file exists, but failed to parse" -msgstr "multi-pack-index dosyası mevcut, ancak ayrıştırılamadı" +msgstr "multi-pack-index dosyası var; ancak ayrıştırılamadı" msgid "incorrect checksum" msgstr "yanlış sağlama toplamı" @@ -17070,7 +17204,7 @@ msgstr "nesne dosyası %s boş" #, c-format msgid "corrupt loose object '%s'" -msgstr "hasar görmüş gevşek nesne '%s'" +msgstr "hasarlı gevşek nesne '%s'" #, c-format msgid "garbage at end of loose object '%s'" @@ -17101,11 +17235,11 @@ msgstr "%s yedeği %s için bulunamadı" #, c-format msgid "loose object %s (stored in %s) is corrupt" -msgstr "%s gevşek nesnesi (%s içinde depolanıyor) hasar görmüş" +msgstr "%s gevşek nesnesi (%s içinde depolanıyor) hasarlı" #, c-format msgid "packed object %s (stored in %s) is corrupt" -msgstr "paketlenmiş nesne %s (%s içinde depolanıyor) hasar görmüş" +msgstr "paketlenmiş nesne %s (%s içinde depolanıyor) hasarlı" #, c-format msgid "unable to write file %s" @@ -17144,14 +17278,30 @@ msgid "confused by unstable object source data for %s" msgstr "%s için olan nesne kaynak verisinden dolayı kafa karışıklığı" #, c-format +msgid "write stream object %ld != %<PRIuMAX>" +msgstr "akış nesnesini yaz %ld != %<PRIuMAX>" + +#, c-format +msgid "unable to stream deflate new object (%d)" +msgstr "yeni nesne akışı söndürülemiyor (%d)" + +#, c-format +msgid "deflateEnd on stream object failed (%d)" +msgstr "akış nesnesi üzerinde deflateEnd başarısız (%d)" + +#, c-format +msgid "unable to create directory %s" +msgstr "%s dizini oluşturulamıyor" + +#, c-format msgid "cannot read object for %s" msgstr "%s için nesne okunamıyor" msgid "corrupt commit" -msgstr "hasar görmüş işleme" +msgstr "hasarlı işleme" msgid "corrupt tag" -msgstr "hasar görmüş etiket" +msgstr "hasarlı etiket" #, c-format msgid "read error while indexing %s" @@ -17284,12 +17434,12 @@ msgstr "" "oluşturmaz; çünkü 40 onaltılı bir başvuru, onu belirlediğiniz zaman yok\n" "sayılacaktır. Bu başvurular yanlışlıkla oluşturulmuş olabilir. Örneğin:\n" "\n" -"\tgit switch -c $br $(git rev-parse ...)\n" +" git switch -c $br $(git rev-parse ...)\n" "\n" "komutunda \"$br\" bir şekilde boş kalmış ve 40 onaltılı bir başvuru\n" "oluşturulmuş. Lütfen bu başvuruları inceleyin ve gerekirse silin. Bu " "iletiyi\n" -"kapatmak için \"git config advice.objectNameWarning\" yapın." +"kapatmak için \"git config advice.objectNameWarning\" yapın" #, c-format msgid "log for '%.*s' only goes back to %s" @@ -17301,7 +17451,7 @@ msgstr "'%.*s' günlüğünde yalnızca %d girdi var" #, c-format msgid "path '%s' exists on disk, but not in '%.*s'" -msgstr "'%s' yolu disk üzerinde mevcut; ancak '%.*s' içinde değil" +msgstr "'%s' yolu disk üzerinde var; ancak '%.*s' içinde değil" #, c-format msgid "" @@ -17370,6 +17520,58 @@ msgstr "nesne ayrıştırılamıyor: %s" msgid "hash mismatch %s" msgstr "sağlama uyuşmazlığı %s" +msgid "trying to write commit not in index" +msgstr "indekste olmayan işleme yazılmaya çalışılıyor" + +msgid "failed to load bitmap index (corrupted?)" +msgstr "biteşlem indeksi yüklenemedi (hasarlı mı?)" + +msgid "corrupted bitmap index (too small)" +msgstr "hasarlı biteşlem indeksi (pek küçük)" + +msgid "corrupted bitmap index file (wrong header)" +msgstr "hasarlı biteşlem indeks dosyası (yanlış üstbilgi)" + +#, c-format +msgid "unsupported version '%d' for bitmap index file" +msgstr "biteşlem indeks dosyası için desteklenmeyen sürüm '%d'" + +msgid "corrupted bitmap index file (too short to fit hash cache)" +msgstr "" +"hasarlı biteşlem indeks dosyası (sağlama önbelleğine sığmak için pek küçük)" + +msgid "corrupted bitmap index file (too short to fit lookup table)" +msgstr "" +"hasarlı biteşlem indeks dosyası (arama tablosuna sığmak için pek küçük)" + +#, c-format +msgid "duplicate entry in bitmap index: '%s'" +msgstr "biteşlem indeksinde yinelenen girdi: '%s'" + +#, c-format +msgid "corrupt ewah bitmap: truncated header for entry %d" +msgstr "hasarlı ewah biteşlemi: %d girdisi için kısaltılmış üstbilgi" + +#, c-format +msgid "corrupt ewah bitmap: commit index %u out of range" +msgstr "hasarlı ewah biteşlemi: işleme erimi %u, erim dışında" + +msgid "corrupted bitmap pack index" +msgstr "hasarlı biteşlem paket indeksi" + +msgid "invalid XOR offset in bitmap pack index" +msgstr "biteşlem paket indeksinde geçersi XOR ofseti" + +msgid "cannot fstat bitmap file" +msgstr "biteşlem dosyası fstat yapılamıyor" + +#, c-format +msgid "ignoring extra bitmap file: '%s'" +msgstr "ek biteşlem dosyası yok sayılıyor: '%s'" + +msgid "checksum doesn't match in MIDX and bitmap" +msgstr "sağlama toplamı, MIDX ve biteşlem içinde uymuyor" + msgid "multi-pack bitmap is missing required reverse index" msgstr "çoklu paket biteşlemi gereken ters indeksi içermiyor" @@ -17381,9 +17583,57 @@ msgstr "%s paketi açılamadı" msgid "preferred pack (%s) is invalid" msgstr "tercih edilen (%s) paket geçersiz" +msgid "corrupt bitmap lookup table: triplet position out of index" +msgstr "hasarlı biteşlem arama tablosu: üçlü konum indeks dışında" + +msgid "corrupt bitmap lookup table: xor chain exceeds entry count" +msgstr "hasarlı biteşlem arama tablosu: xor zinciri, girdi sayısını aşıyor" + +#, c-format +msgid "corrupt bitmap lookup table: commit index %u out of range" +msgstr "hasarlı biteşlem arama tablosu: işleme indeksi %u, erim dışında" + +#, c-format +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 "object '%s' not found in type bitmaps" +msgstr "'%s' nesnesi, tür biteşlemlerinde bulunamadı" + #, c-format -msgid "could not find %s in pack %s at offset %<PRIuMAX>" -msgstr "%s, %s paketi %<PRIuMAX> ofsetinde bulunamadı" +msgid "object '%s' does not have a unique type" +msgstr "'%s' nesnesinin benzersiz bir türü yok" + +#, c-format +msgid "object '%s': real type '%s', expected: '%s'" +msgstr "'%s' nesnesi: gerçek tür '%s', beklenen: '%s'" + +#, c-format +msgid "object not in bitmap: '%s'" +msgstr "nesne, biteşlemde değil: '%s'" + +msgid "failed to load bitmap indexes" +msgstr "biteşlem indeksi yüklenemedi" + +msgid "you must specify exactly one commit to test" +msgstr "sınamak için tam olarak bir işleme belirtmelisiniz" + +#, c-format +msgid "commit '%s' doesn't have an indexed bitmap" +msgstr "'%s' işlemesinin indekslenmiş bir biteşlemi yok" + +msgid "mismatch in bitmap results" +msgstr "biteşlem sonuçlarında uyuşmazlık" + +#, c-format +msgid "could not find '%s' in pack '%s' at offset %<PRIuMAX>" +msgstr "öge bulunamadı: '%s'; '%s' paketinde, %<PRIuMAX> ofsetinde" + +#, c-format +msgid "unable to get disk usage of '%s'" +msgstr "'%s' ögesinin disk kullanımı alınamadı" #, c-format msgid "mtimes file %s is too small" @@ -17507,6 +17757,9 @@ msgstr "şunu mu demek istediniz: '--%s' (iki tire ile)?" msgid "alias of --%s" msgstr "şunun arması: --%s" +msgid "need a subcommand" +msgstr "bir altkomut gerekli" + #, c-format msgid "unknown option `%s'" msgstr "bilinmeyen seçenek '%s'" @@ -17939,9 +18192,12 @@ msgid "" "l, label <label> = label current HEAD with a name\n" "t, reset <label> = reset HEAD to a label\n" "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" -". create a merge commit using the original merge commit's\n" -". message (or the oneline, if no original merge commit was\n" -". specified); use -c <commit> to reword the commit message\n" +" create a merge commit using the original merge commit's\n" +" message (or the oneline, if no original merge commit was\n" +" specified); use -c <commit> to reword the commit message\n" +"u, update-ref <ref> = track a placeholder for the <ref> to be updated\n" +" to this position in the new commits. The <ref> is\n" +" updated at the end of the rebase\n" "\n" "These lines can be re-ordered; they are executed from top to bottom.\n" msgstr "" @@ -17952,8 +18208,8 @@ msgstr "" "e, edit <işleme> = işlemeyi kullan; ancak değiştirmek için dur\n" "s, squash <işleme> = işlemeyi kullan; ancak önceki işleme içine karıştır\n" "f, fixup [-C | -c] <işleme> = \"squash\" gibi; ancak yalnızca bir önceki\n" -" işlemenin günlük iletisini tutar (-C kullanılmadıysa,\n" -" o zaman yalnızca bu işlemenin iletisini tutar; -c, -C\n" +" işlemenin günlük iletisini tutar (-C kullanılmadıysa\n" +" o zaman yalnızca bu işlemenin iletisini tut; -c, -C\n" " ile aynıdır; ancak ek olarak düzenleyiciyi açar)\n" "x, exec <komut> = komutu (satırın geri kalanı) kabuk kullanarak çalıştır\n" "b, break = burada dur (daha sonra sürdürmek için 'git rebase --continue')\n" @@ -17964,7 +18220,10 @@ msgstr "" ". orijinal birleştirme işlemesi iletisini kullanarak bir\n" ". birleştirme işlemesi oluştur (veya teksatır, eğer bir orijinal\n" ". birleştirme işlemesi belirtilmemişse). İşleme iletisini yeniden\n" -". yazmak için -c <işleme> kullanın.\n" +". yazmak için -c <işleme> kullan.\n" +"u, update-ref <baş> = yeni iletilerde <baş>'ın bu konuma güncellenmesi için\n" +" bir yer tutucu izle. <baş>, yeniden temellendirmenin\n" +" sonunda güncellenir\n" "\n" "Bu satırlar yeniden sıralanabilirler, yukarıdan aşağıya çalıştırılırlar.\n" @@ -18035,9 +18294,9 @@ msgid "" msgstr "" "Bu iletiden kaçınmak için, bir işlemeyi kaldırırken açıkça \"drop\" " "kullanın.\n" -"Uyarıların düzeyini değiştirmek için 'git config rebase.missingCommitsCheck' " -"kullanın.\n" -"Kullanılabilir davranışlar: ignore, warn, error.\n" +"Uyarıların düzeyini değiştirmek için 'git config rebase." +"missingCommitsCheck'\n" +"kullanın. Kullanılabilir davranışlar: ignore, warn, error.\n" "\n" #, c-format @@ -18434,6 +18693,13 @@ msgstr "protokol hatası: sha/ref bekleniyordu, '%s' alındı" msgid "http transport does not support %s" msgstr "http taşıyıcısı %s desteklemiyor" +msgid "protocol error: expected '<url> <path>', missing space" +msgstr "protokol hatası: '<url> <yol>' bekleniyordu, eksik boşluk" + +#, c-format +msgid "failed to download file at URL '%s'" +msgstr "'%s' URL'sindeki dosya indirilemedi" + msgid "git-http-push failed" msgstr "git-http-push başarısız" @@ -18460,6 +18726,7 @@ msgstr "birden fazla receivepack verildi, birincisi kullanılıyor" msgid "more than one uploadpack given, using the first" msgstr "birden fazla uploadpack verildi, birincisi kullanılıyor" +#, c-format msgid "unrecognized value transfer.credentialsInUrl: '%s'" msgstr "tanımlanamayan değer transfer.credentialsInUrl: '%s'" @@ -18770,6 +19037,14 @@ msgstr "HEAD revizyonu saptanamadı" msgid "failed to find tree of %s" msgstr "%s ögesinin ağacı bulunamadı" +#, c-format +msgid "resolve-undo records `%s` which is missing" +msgstr "resolve-undo, kayıp olan '%s' ögesini kaydetmiş" + +#, c-format +msgid "could not get commit for ancestry-path argument %s" +msgstr "soy yolu argümanı %s için işleme alınamadı" + msgid "--unpacked=<packfile> no longer supported" msgstr "--unpacked=<paketdosyası> artık desteklenmiyor" @@ -18790,6 +19065,173 @@ msgstr "-L, -p ve -s dışında başka diff biçimlerini henüz desteklemiyor" msgid "cannot create async thread: %s" msgstr "async iş parçacığı oluşturulamadı: %s" +#, c-format +msgid "'%s' does not exist" +msgstr "'%s' yok" + +#, c-format +msgid "could not switch to '%s'" +msgstr "şuraya geçilemedi: '%s'" + +msgid "need a working directory" +msgstr "bir çalışma dizini gerekiyor" + +msgid "Scalar enlistments require a worktree" +msgstr "Scalar gönüllü kayıtları bir çalışma ağacı gerektiriyor" + +#, c-format +msgid "could not configure %s=%s" +msgstr "%s=%s yapılandırılamadı" + +msgid "could not configure log.excludeDecoration" +msgstr "log.excludeDecoration yapılandırılamadı" + +msgid "could not add enlistment" +msgstr "gönüllü yazılma eklenemedi" + +msgid "could not set recommended config" +msgstr "önerilen yapılandırma ayarlanamadı" + +msgid "could not turn on maintenance" +msgstr "bakım ayarı açılamadı" + +msgid "could not start the FSMonitor daemon" +msgstr "FSMonitor ardalan süreci başlatılamadı" + +msgid "could not turn off maintenance" +msgstr "bakım ayarı kapatılamadı" + +msgid "could not remove enlistment" +msgstr "gönüllü yazılma kaldırılamadı" + +#, c-format +msgid "remote HEAD is not a branch: '%.*s'" +msgstr "uzak konum HEAD'i bir dal değil: '%.*s'" + +msgid "failed to get default branch name from remote; using local default" +msgstr "" +"uzak konumdan öntanımlı dal adı alınamadı; yerel öntanımlı kullanılıyor" + +msgid "failed to get default branch name" +msgstr "öntanımlı dal adı alınamadı" + +msgid "failed to unregister repository" +msgstr "depo kaydı silinemedi" + +msgid "failed to stop the FSMonitor daemon" +msgstr "FSMonitor ardalan süreci durdurulamadı" + +msgid "failed to delete enlistment directory" +msgstr "gönüllü kayıt dizini silinemedi" + +msgid "branch to checkout after clone" +msgstr "klonlama sonrası çıkış yapılacak dal" + +msgid "when cloning, create full working directory" +msgstr "klonlama sırasında tam çalışma dizini oluştur" + +msgid "only download metadata for the branch that will be checked out" +msgstr "yalnızca çıkış yapılacak dalın üstverisini indir" + +msgid "scalar clone [<options>] [--] <repo> [<dir>]" +msgstr "scalar clone [<seçenekler>] [--] <depo> [<dizin>]" + +#, c-format +msgid "cannot deduce worktree name from '%s'" +msgstr "'%s' ögesinden çalışma ağacı adı ortaya çıkarılamıyor" + +#, c-format +msgid "directory '%s' exists already" +msgstr "'%s' dizini halihazırda var" + +#, c-format +msgid "failed to get default branch for '%s'" +msgstr "'%s' için öntanımlı dal alınamadı" + +#, c-format +msgid "could not configure remote in '%s'" +msgstr "'%s' içindeki uzak konum yapılandırılamadı" + +#, c-format +msgid "could not configure '%s'" +msgstr "'%s' yapılandırılamadı" + +msgid "partial clone failed; attempting full clone" +msgstr "kısımsal klonlama başarısız; tam klonlama deneniyor" + +msgid "could not configure for full clone" +msgstr "tam klonlama için yapılandırılamadı" + +msgid "scalar diagnose [<enlistment>]" +msgstr "scalar diagnose [<gönüllükayıt>]" + +msgid "`scalar list` does not take arguments" +msgstr "'scalar list' argüman almıyor" + +msgid "scalar register [<enlistment>]" +msgstr "scalar register [<gönüllükayıt>]" + +msgid "reconfigure all registered enlistments" +msgstr "tüm kaydı yapılmış gönüllü kayıtları yeniden yapılandır" + +msgid "scalar reconfigure [--all | <enlistment>]" +msgstr "scalar reconfigure [--all | <gönüllükayıt>]" + +msgid "--all or <enlistment>, but not both" +msgstr "--all veya <gönüllükayıt>; ancak ikisi değil" + +#, c-format +msgid "git repository gone in '%s'" +msgstr "git deposu '%s' içinde gitti" + +msgid "" +"scalar run <task> [<enlistment>]\n" +"Tasks:\n" +msgstr "" +"scalar run <görev> [<gönüllükayıt>]\n" +"Görevler:\n" + +#, c-format +msgid "no such task: '%s'" +msgstr "böyle bir görev yok: '%s'" + +msgid "scalar unregister [<enlistment>]" +msgstr "scalar unregister [<enlistment>]" + +msgid "scalar delete <enlistment>" +msgstr "scalar delete <gönüllükayıt>" + +msgid "refusing to delete current working directory" +msgstr "geçerli çalışma dizinini silme reddediliyor" + +msgid "include Git version" +msgstr "Git sürümünü içer" + +msgid "include Git's build options" +msgstr "Git'in yapı seçeneklerini içer" + +msgid "scalar verbose [-v | --verbose] [--build-options]" +msgstr "scalar verbose [-v | --verbose] [--build-options]" + +msgid "-C requires a <directory>" +msgstr "-C, bir <dizin> gerektiriyor" + +#, c-format +msgid "could not change to '%s'" +msgstr "'%s' olarak değiştirilemedi" + +msgid "-c requires a <key>=<value> argument" +msgstr "-c, bir <anahtar>=<değer> argümanı gerektiriyor" + +msgid "" +"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n" +"\n" +"Commands:\n" +msgstr "" +"scalar [-C <dizin>] [-c <anahtar>=<değer>] <komut> [<seçenekler>]\n" +"\n" +"Komutlar:\n" + msgid "unexpected flush packet while reading remote unpack status" msgstr "uzak konum açım durumu okunurken beklenmedik floş paketi" @@ -18910,10 +19352,6 @@ msgstr "%s ile yerel değişikliklerinizin üzerine yazılacaktır." msgid "commit your changes or stash them to proceed." msgstr "İlerlemek için değişikliklerinizi işleyin veya zulalayın." -#, c-format -msgid "%s: fast-forward" -msgstr "%s: ileri sar" - #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase". #. @@ -18976,15 +19414,15 @@ msgstr "" "Eğer bu değişikliklerin bir önceki işlemeye eklenmesi\n" "gerekiyorsa şu komutu çalıştırın:\n" "\n" -"\tgit commit --amend %s\n" +" git commit --amend %s\n" "\n" "Yeni bir işleme yapmak istiyorsanız şu komutu çalıştırın:\n" "\n" -"\tgit commit %s\n" +" git commit %s\n" "\n" "Her iki durumda da işiniz bittikten sonra şu komut ile sürdürün:\n" "\n" -"\tgit rebase --continue\n" +" git rebase --continue\n" msgid "'prepare-commit-msg' hook failed" msgstr "'prepare-commit-msg' başarısız oldu" @@ -19397,6 +19835,27 @@ msgstr "şunu birleştirme girişiminde bulunulamadı bile: '%.*s'" msgid "merge: Unable to write new index file" msgstr "merge: Yeni indeks dosyası yazılamıyor" +#, c-format +msgid "" +"another 'rebase' process appears to be running; '%s.lock' already exists" +msgstr "başka bir 'rebase' süreci çalışıyor gibi; '%s.lock' halihazırda var" + +#, c-format +msgid "" +"Updated the following refs with %s:\n" +"%s" +msgstr "" +"Aşağıdaki başvurular, %s ile güncellendi:\n" +"%s" + +#, c-format +msgid "" +"Failed to update the following refs with %s:\n" +"%s" +msgstr "" +"Aşağıdaki başvurular, %s ile güncellenemedi:\n" +"%s" + msgid "Cannot autostash" msgstr "Kendiliğinden zulalanamıyor" @@ -19563,6 +20022,10 @@ msgid "the script was already rearranged." msgstr "betik halihazırda yeniden düzenlenmişti." #, c-format +msgid "update-refs file at '%s' is invalid" +msgstr "'%s' konumundaki update-refs dosyası geçersiz" + +#, c-format msgid "'%s' is outside repository at '%s'" msgstr "'%s', '%s' konumunda depo dışında" @@ -19681,17 +20144,21 @@ msgstr "" #, c-format msgid "" -"unsafe repository ('%s' is owned by someone else)\n" -"To add an exception for this directory, call:\n" +"detected dubious ownership in repository at '%s'\n" +"%sTo add an exception for this directory, call:\n" "\n" "\tgit config --global --add safe.directory %s" msgstr "" -"güvensiz depo ('%s' sahibi bir başkası)\n" -"Bu dizin için bir istisna eklemek için şunu çağırın:\n" +"'%s' konumundaki depoda belirsiz iyelik algılandı\n" +"%sBu dizin için istisna eklemek için şunu çağırın:\n" "\n" "\tgit config --global --add safe.directory %s" #, c-format +msgid "cannot use bare repository '%s' (safe.bareRepository is '%s')" +msgstr "çıplak depo '%s', kullanılamaz (safe.bareRepository '%s')" + +#, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" "The owner of files must always have read and write permissions." @@ -20555,6 +21022,18 @@ msgstr "geçersiz kapı numarası" msgid "invalid '..' path segment" msgstr "geçersiz '..' yol kesimi" +msgid "usage: " +msgstr "kullanım: " + +msgid "fatal: " +msgstr "onulmaz: " + +msgid "error: " +msgstr "hata: " + +msgid "warning: " +msgstr "uyarı: " + msgid "Fetching objects" msgstr "Nesneler getiriliyor" @@ -21345,22 +21824,6 @@ msgstr "Seçili parçalar indekse uygulanamıyor!\n" msgid "ignoring unmerged: %s\n" msgstr "birleştirilmeyenler yok sayılıyor: %s\n" -#, perl-format -msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " -msgstr "Kip değişimi çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? " - -#, perl-format -msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " -msgstr "Silme çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? " - -#, perl-format -msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " -msgstr "Ekleme çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? " - -#, perl-format -msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " -msgstr "Bu parça çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? " - msgid "No other hunks to goto\n" msgstr "Gidilecek başka parça yok\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 7de9c72..b0832be 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -144,8 +144,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2022-06-22 10:25+0100\n" -"PO-Revision-Date: 2022-06-14 20:52+0100\n" +"POT-Creation-Date: 2022-09-28 15:50+0100\n" +"PO-Revision-Date: 2022-09-23 14:53+0100\n" "Last-Translator: Fangyi Zhou <me@fangyi.io>\n" "Language-Team: GitHub <https://github.com/fangyi-zhou/git-po/>\n" "Language: zh_CN\n" @@ -153,14 +153,14 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Gtranslator 40.0\n" +"X-Generator: Gtranslator 42.0\n" #: add-interactive.c #, c-format msgid "Huh (%s)?" msgstr "嗯（%s）？" -#: add-interactive.c builtin/rebase.c reset.c sequencer.c +#: add-interactive.c builtin/merge.c builtin/rebase.c reset.c sequencer.c msgid "could not read index" msgstr "不能读取索引" @@ -341,8 +341,8 @@ msgid "unstaged" msgstr "未缓存" #: add-interactive.c apply.c builtin/am.c builtin/bugreport.c builtin/clone.c -#: builtin/fetch.c builtin/merge.c builtin/pull.c builtin/submodule--helper.c -#: git-add--interactive.perl +#: builtin/diagnose.c builtin/fetch.c builtin/merge.c builtin/pull.c +#: builtin/submodule--helper.c git-add--interactive.perl msgid "path" msgstr "路径" @@ -623,6 +623,26 @@ msgstr "" "a - 应用该块和本文件中后面的全部块\n" "d - 不要应用该块和本文件中后面的全部块\n" +#: add-patch.c git-add--interactive.perl +#, c-format, perl-format +msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " +msgstr "将模式变更应用到工作区 [y,n,q,a,d%s,?]? " + +#: add-patch.c git-add--interactive.perl +#, c-format, perl-format +msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " +msgstr "将删除操作应用到工作区 [y,n,q,a,d%s,?]? " + +#: add-patch.c git-add--interactive.perl +#, c-format, perl-format +msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " +msgstr "将添加操作应用到工作区 [y,n,q,a,d%s,?]? " + +#: add-patch.c git-add--interactive.perl +#, c-format, perl-format +msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " +msgstr "将该块应用到工作区 [y,n,q,a,d%s,?]? " + #: add-patch.c msgid "" "y - apply this hunk to worktree\n" @@ -643,11 +663,6 @@ msgid "could not parse hunk header '%.*s'" msgstr "无法解析数据块头信息 '%.*s'" #: add-patch.c -#, c-format -msgid "could not parse colored hunk header '%.*s'" -msgstr "无法解析彩色数据块头信息 '%.*s'" - -#: add-patch.c msgid "could not parse diff" msgstr "不能解析差异信息" @@ -973,6 +988,26 @@ msgstr "" "通过将配置变量 advice.detachedHead 设置为 false 来关闭此建议\n" "\n" +#: advice.c +#, c-format +msgid "" +"The following paths have been moved outside the\n" +"sparse-checkout definition but are not sparse due to local\n" +"modifications.\n" +msgstr "" +"下列的路径已经被移动至稀疏检出的定义之外，\n" +"但是由于本地的修改而并非稀疏。\n" + +#: advice.c +msgid "" +"To correct the sparsity of these paths, do the following:\n" +"* Use \"git add --sparse <paths>\" to update the index\n" +"* Use \"git sparse-checkout reapply\" to apply the sparsity rules" +msgstr "" +"为了修正这些的路径的稀疏性，请运行下列命令：\n" +"* 使用 \"git add --sparse <路径>\" 来更新索引\n" +"* 使用 \"git sparse-checkout reapply\" 来应用稀疏规则" + #: alias.c msgid "cmdline ends with \\" msgstr "命令行以 \\ 结尾" @@ -1204,7 +1239,7 @@ msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却 msgid "patch failed: %s:%ld" msgstr "打补丁失败：%s:%ld" -#: apply.c +#: apply.c builtin/mv.c #, c-format msgid "cannot checkout %s" msgstr "不能检出 %s" @@ -1597,6 +1632,11 @@ msgstr "不能打开数据对象 %s" msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "不支持的文件模式：0%o (SHA1: %s)" +#: archive-tar.c archive-zip.c builtin/pack-objects.c +#, c-format +msgid "deflate error (%d)" +msgstr "压缩错误 (%d)" + #: archive-tar.c #, c-format msgid "unable to start '%s' filter" @@ -1621,11 +1661,6 @@ msgstr "路径不是有效的 UTF-8：%s" msgid "path too long (%d chars, SHA1: %s): %s" msgstr "路径太长（%d 字符，SHA1：%s）：%s" -#: archive-zip.c builtin/pack-objects.c -#, c-format -msgid "deflate error (%d)" -msgstr "压缩错误 (%d)" - #: archive-zip.c #, c-format msgid "timestamp too large for this system: %<PRIuMAX>" @@ -1941,10 +1976,10 @@ msgid "--reverse and --first-parent together require specified latest commit" msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交" #: blame.c builtin/commit.c builtin/log.c builtin/merge.c -#: builtin/pack-objects.c builtin/shortlog.c bundle.c midx.c ref-filter.c -#: remote.c sequencer.c submodule.c +#: builtin/pack-objects.c builtin/shortlog.c bundle.c midx.c pack-bitmap.c +#: ref-filter.c remote.c sequencer.c submodule.c msgid "revision walk setup failed" -msgstr "版本遍历设置失败" +msgstr "版本遍历初始化失败" #: blame.c msgid "" @@ -2399,7 +2434,7 @@ msgstr "fseek 失败" msgid "could not open '%s' for reading" msgstr "无法打开 '%s' 进行读取" -#: builtin/am.c builtin/rebase.c strbuf.c wrapper.c +#: builtin/am.c builtin/rebase.c sequencer.c strbuf.c wrapper.c #, c-format msgid "could not open '%s' for writing" msgstr "无法打开 '%s' 进行写入" @@ -2700,8 +2735,8 @@ msgid "n" msgstr "n" #: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c -#: builtin/for-each-ref.c builtin/ls-tree.c builtin/replace.c builtin/tag.c -#: builtin/verify-tag.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 msgid "format" msgstr "格式" @@ -2804,7 +2839,7 @@ msgstr "交互式模式需要命令行上提供补丁" msgid "git apply [<options>] [<patch>...]" msgstr "git apply [<选项>] [<补丁>...]" -#: builtin/archive.c contrib/scalar/scalar.c +#: builtin/archive.c diagnose.c msgid "could not redirect output" msgstr "不能重定向输出" @@ -3686,8 +3721,8 @@ msgstr "排序和过滤属于大小写不敏感" msgid "recurse through submodules" msgstr "在子模组中递归" -#: builtin/branch.c builtin/for-each-ref.c builtin/ls-tree.c builtin/tag.c -#: builtin/verify-tag.c +#: builtin/branch.c builtin/for-each-ref.c builtin/ls-files.c builtin/ls-tree.c +#: builtin/tag.c builtin/verify-tag.c msgid "format to use for the output" msgstr "输出格式" @@ -3810,8 +3845,12 @@ msgid "not run from a git repository - no hooks to show\n" msgstr "不是在 git 仓库中执行 - 没有可显示的钩子\n" #: builtin/bugreport.c -msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]" -msgstr "git bugreport [-o|--output-directory <文件>] [-s|--suffix <格式>]" +msgid "" +"git bugreport [-o|--output-directory <file>] [-s|--suffix <format>] [--" +"diagnose[=<mode>]" +msgstr "" +"git bugreport [-o|--output-directory <文件>] [-s|--suffix <格式>] [--" +"diagnose[=<模式>]" #: builtin/bugreport.c msgid "" @@ -3847,19 +3886,34 @@ msgstr "" "请检查下面错误报告中余下的内容。\n" "您可以删除任何您不想共享的内容。\n" +#: builtin/bugreport.c builtin/commit.c builtin/fast-export.c builtin/rebase.c +#: parse-options.h +msgid "mode" +msgstr "模式" + +#: builtin/bugreport.c +msgid "" +"create an additional zip archive of detailed diagnostics (default 'stats')" +msgstr "额外创建详细诊断信息的压缩包（默认 'stats'）" + #: builtin/bugreport.c -msgid "specify a destination for the bugreport file" +msgid "specify a destination for the bugreport file(s)" msgstr "指定错误报告文件的目标位置" #: builtin/bugreport.c -msgid "specify a strftime format suffix for the filename" +msgid "specify a strftime format suffix for the filename(s)" msgstr "指定文件的 strftime 格式后缀" -#: builtin/bugreport.c +#: builtin/bugreport.c builtin/diagnose.c #, c-format msgid "could not create leading directories for '%s'" msgstr "不能为 '%s' 创建先导目录" +#: builtin/bugreport.c builtin/diagnose.c +#, c-format +msgid "unable to create diagnostics archive %s" +msgstr "不能创建诊断归档包 %s" + #: builtin/bugreport.c msgid "System Info" msgstr "系统信息" @@ -3935,11 +3989,6 @@ msgstr "需要一个仓库来解开归档包。" msgid "Unbundling objects" msgstr "解包对象中" -#: builtin/bundle.c builtin/remote.c -#, c-format -msgid "Unknown subcommand: %s" -msgstr "未知子命令：%s" - #: builtin/cat-file.c merge-recursive.c #, c-format msgid "cannot read object %s '%s'" @@ -4037,6 +4086,10 @@ msgstr "显示对象大小" msgid "allow -s and -t to work with broken/corrupt objects" msgstr "允许 -s 和 -t 对损坏的对象生效" +#: builtin/cat-file.c builtin/log.c +msgid "use mail map file" +msgstr "使用邮件映射文件" + #: builtin/cat-file.c msgid "Batch objects requested on stdin (or --batch-all-objects)" msgstr "批量处理标准输入中请求的对象（或者 --batch-all-objects）" @@ -4050,6 +4103,10 @@ msgid "like --batch, but don't emit <contents>" msgstr "类似于 --batch，但不输出 <内容>" #: builtin/cat-file.c +msgid "stdin is NUL-terminated" +msgstr "标准输入以 NUL 字符分隔" + +#: builtin/cat-file.c msgid "read commands from stdin" msgstr "从标准输入读取命令" @@ -4725,7 +4782,7 @@ msgstr "" #: builtin/checkout.c msgid "you must specify path(s) to restore" -msgstr "您必须指定一个要恢复的路径" +msgstr "您必须指定要恢复的路径" #: builtin/checkout.c builtin/clone.c builtin/remote.c #: builtin/submodule--helper.c builtin/worktree.c @@ -5131,6 +5188,14 @@ msgid "initialize sparse-checkout file to include only files at root" msgstr "初始化稀疏检出文件，只包含根目录文件" #: builtin/clone.c +msgid "uri" +msgstr "uri" + +#: builtin/clone.c +msgid "a URI for downloading bundles before fetching from origin remote" +msgstr "用于在从 origin 远程获取之前下载归档包的 URI" + +#: builtin/clone.c #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: 不能为 '%s' 添加一个备用：%s\n" @@ -5204,8 +5269,8 @@ msgid "failed to initialize sparse-checkout" msgstr "无法初始化稀疏检出" #: builtin/clone.c -msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" -msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n" +msgid "remote HEAD refers to nonexistent ref, unable to checkout" +msgstr "远程 HEAD 指向一个不存在的引用，无法检出" #: builtin/clone.c msgid "unable to checkout working tree" @@ -5227,7 +5292,7 @@ msgstr "无法删除临时的 alternates 文件" msgid "Too many arguments." msgstr "太多参数。" -#: builtin/clone.c contrib/scalar/scalar.c +#: builtin/clone.c scalar.c msgid "You must specify a repository to clone." msgstr "您必须指定一个仓库来克隆。" @@ -5237,6 +5302,12 @@ msgid "options '%s' and '%s %s' cannot be used together" msgstr "选项 '%s' 和 '%s %s' 不能同时使用" #: 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 #, c-format msgid "repository '%s' does not exist" msgstr "仓库 '%s' 不存在" @@ -5325,6 +5396,15 @@ msgid "cannot clone from filtered bundle" msgstr "无法从经过过滤的归档包克隆" #: builtin/clone.c +msgid "failed to initialize the repo, skipping bundle URI" +msgstr "无法初始化仓库，跳过归档包 URI" + +#: builtin/clone.c +#, c-format +msgid "failed to fetch objects from bundle URI '%s'" +msgstr "无法从归档包 URI '%s' 获取对象" + +#: builtin/clone.c msgid "remote transport reported error" msgstr "远程传输报告错误" @@ -5471,11 +5551,6 @@ msgstr "不能同时使用 --reachable、--stdin-commits 或 --stdin-packs" msgid "Collecting commits from input" msgstr "正从标准输入收集提交" -#: builtin/commit-graph.c builtin/multi-pack-index.c -#, c-format -msgid "unrecognized subcommand: %s" -msgstr "未识别的子命令：%s" - #: builtin/commit-tree.c msgid "" "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " @@ -5903,10 +5978,6 @@ msgstr "以长格式显示状态（默认）" msgid "terminate entries with NUL" msgstr "条目以 NUL 字符结尾" -#: builtin/commit.c builtin/fast-export.c builtin/rebase.c parse-options.h -msgid "mode" -msgstr "模式" - #: builtin/commit.c msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）" @@ -6644,6 +6715,26 @@ msgstr "没有发现名称，无法描述任何东西。" msgid "option '%s' and commit-ishes cannot be used together" msgstr "选项 '%s' 和提交号不能同时使用" +#: builtin/diagnose.c +msgid "" +"git diagnose [-o|--output-directory <path>] [-s|--suffix <format>] [--" +"mode=<mode>]" +msgstr "" +"git diagnose [-o|--output-directory <文件>] [-s|--suffix <格式>] [--mode=<模" +"式>]" + +#: builtin/diagnose.c +msgid "specify a destination for the diagnostics archive" +msgstr "指定诊断归档包的目标位置" + +#: builtin/diagnose.c +msgid "specify a strftime format suffix for the filename" +msgstr "指定文件的 strftime 格式后缀" + +#: builtin/diagnose.c +msgid "specify the content of the diagnostic archive" +msgstr "指定诊断信息归档包的内容" + #: builtin/diff-tree.c msgid "--merge-base only works with two commits" msgstr "--merge-base 仅适用于两个提交" @@ -7115,12 +7206,8 @@ msgid "[rejected]" msgstr "[已拒绝]" #: builtin/fetch.c -msgid "can't fetch in current branch" -msgstr "当前分支下不能执行获取操作" - -#: builtin/fetch.c -msgid "checked out in another worktree" -msgstr "已在另一个工作树中检出" +msgid "can't fetch into checked-out branch" +msgstr "无法获取到已检出的分支" #: builtin/fetch.c msgid "[tag update]" @@ -7659,6 +7746,11 @@ msgid "non-tree in cache-tree" msgstr "cache-tree 中非树对象" #: builtin/fsck.c +#, c-format +msgid "%s: invalid sha1 pointer in resolve-undo" +msgstr "%s：resolve-undo 中无效的 sha1 指针" + +#: builtin/fsck.c msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<选项>] [<对象>...]" @@ -8075,12 +8167,16 @@ msgid "failed to run 'crontab -l'; your system might not support 'cron'" msgstr "无法执行 'crontab -l'，您的系统可能不支持 'cron'" #: builtin/gc.c -msgid "failed to run 'crontab'; your system might not support 'cron'" -msgstr "无法运行 'crontab'，您的系统可能不支持 'cron'" +msgid "failed to create crontab temporary file" +msgstr "无法创建 crontab 临时文件" #: builtin/gc.c -msgid "failed to open stdin of 'crontab'" -msgstr "无法打开 'crontab' 的标准输入" +msgid "failed to open temporary file" +msgstr "无法打开临时文件" + +#: builtin/gc.c +msgid "failed to run 'crontab'; your system might not support 'cron'" +msgstr "无法运行 'crontab'，您的系统可能不支持 'cron'" #: builtin/gc.c msgid "'crontab' died" @@ -8142,11 +8238,6 @@ msgstr "无法将仓库添加到全局配置" msgid "git maintenance <subcommand> [<options>]" msgstr "git maintenance <子命令> [<选项>]" -#: builtin/gc.c -#, c-format -msgid "invalid subcommand: %s" -msgstr "无效子命令：%s" - #: builtin/grep.c msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]" @@ -8371,6 +8462,10 @@ msgid "allow calling of grep(1) (ignored by this build)" msgstr "允许调用 grep(1)（本次构建忽略）" #: builtin/grep.c +msgid "maximum number of results per file" +msgstr "每个文件的最大结果数量" + +#: builtin/grep.c msgid "no pattern given" msgstr "未提供匹配模式" @@ -8482,12 +8577,20 @@ msgid "print list of useful guides" msgstr "显示有用的指南列表" #: builtin/help.c +msgid "print list of user-facing repository, command and file interfaces" +msgstr "打印面向用户的仓库、命令和文件接口列表" + +#: builtin/help.c +msgid "print list of file formats, protocols and other developer interfaces" +msgstr "打印文件格式、协议和其他开发者接口列表" + +#: builtin/help.c msgid "print all configuration variable names" msgstr "打印所有配置变量名称" #: builtin/help.c -msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]" -msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<命令>]" +msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>|<doc>]" +msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<命令>|<文档>]" #: builtin/help.c #, c-format @@ -9078,8 +9181,8 @@ msgid "show source" msgstr "显示源" #: builtin/log.c -msgid "use mail map file" -msgstr "使用邮件映射文件" +msgid "clear all previously-defined decoration filters" +msgstr "清除所有之前定义的修饰过滤器" #: builtin/log.c msgid "only decorate refs that match <pattern>" @@ -9405,6 +9508,10 @@ msgid "percentage by which creation is weighted" msgstr "创建权重的百分比" #: builtin/log.c +msgid "show in-body From: even if identical to the e-mail header" +msgstr "显示正文内的 From:，即使其与电子邮件头中一致" + +#: builtin/log.c #, c-format msgid "invalid ident line: %s" msgstr "包含无效的身份标识：%s" @@ -9480,10 +9587,25 @@ msgid "" msgstr "不能找到跟踪的远程分支，请手工指定 <上游>。\n" #: builtin/ls-files.c +#, c-format +msgid "bad ls-files format: element '%s' does not start with '('" +msgstr "坏的 ls-files 格式：元素 '%s' 没有以 '(' 开头" + +#: builtin/ls-files.c +#, c-format +msgid "bad ls-files format: element '%s' does not end in ')'" +msgstr "坏的 ls-files 格式：元素 '%s' 没有以 ')' 结尾" + +#: builtin/ls-files.c +#, c-format +msgid "bad ls-files format: %%%.*s" +msgstr "坏的 ls-files 格式: %%%.*s" + +#: builtin/ls-files.c msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<选项>] [<文件>...]" -#: builtin/ls-files.c +#: builtin/ls-files.c builtin/merge-tree.c msgid "separate paths with the NUL character" msgstr "用 NUL 字符分隔路径" @@ -9591,6 +9713,14 @@ msgstr "抑制重复条目" msgid "show sparse directories in the presence of a sparse index" msgstr "在稀疏索引存在时显示稀疏目录" +#: builtin/ls-files.c +msgid "" +"--format cannot be used with -s, -o, -k, -t, --resolve-undo, --deduplicate, " +"--eol" +msgstr "" +"--format 不能和 -s、-o、-k、-t、--resolve-undo、--deduplicate 和 --eol 同时使" +"用" + #: builtin/ls-remote.c msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" @@ -9874,6 +10004,50 @@ msgstr "无法解析引用 '%s'" msgid "Merging %s with %s\n" msgstr "合并 %s 和 %s\n" +#: builtin/merge-tree.c builtin/merge.c +msgid "not something we can merge" +msgstr "不是可以合并的东西" + +#: builtin/merge-tree.c builtin/merge.c +msgid "refusing to merge unrelated histories" +msgstr "拒绝合并无关的历史" + +#: builtin/merge-tree.c +msgid "failure to merge" +msgstr "合并失败" + +#: builtin/merge-tree.c +msgid "git merge-tree [--write-tree] [<options>] <branch1> <branch2>" +msgstr "git merge-tree [--write-tree] [<选项>] <分支1> <分支2>" + +#: builtin/merge-tree.c +msgid "git merge-tree [--trivial-merge] <base-tree> <branch1> <branch2>" +msgstr "git merge-tree [--trivial-merge] <基准树> <分支1> <分支2>" + +#: builtin/merge-tree.c +msgid "do a real merge instead of a trivial merge" +msgstr "进行真正的合并而不是简单的合并" + +#: builtin/merge-tree.c +msgid "do a trivial merge only" +msgstr "只进行简单的合并" + +#: builtin/merge-tree.c +msgid "also show informational/conflict messages" +msgstr "同时显示额外信息/冲突消息" + +#: builtin/merge-tree.c +msgid "list filenames without modes/oids/stages" +msgstr "列出没有模式/对象 ID/暂存的文件名" + +#: builtin/merge-tree.c builtin/merge.c builtin/pull.c +msgid "allow merging unrelated histories" +msgstr "允许合并不相关的历史" + +#: builtin/merge-tree.c +msgid "--trivial-merge is incompatible with all other options" +msgstr "--trivial-merge 与其他所有选项不兼容" + #: builtin/merge.c msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<选项>] [<提交>...]" @@ -9980,10 +10154,6 @@ msgstr "--abort，但是保留索引和工作区" msgid "continue the current in-progress merge" msgstr "继续当前正在进行的合并" -#: builtin/merge.c builtin/pull.c -msgid "allow merging unrelated histories" -msgstr "允许合并不相关的历史" - #: builtin/merge.c msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "绕过 pre-merge-commit 和 commit-msg 钩子" @@ -10129,10 +10299,6 @@ msgid "not something we can merge in %s: %s" msgstr "不能在 %s 中合并：%s" #: builtin/merge.c -msgid "not something we can merge" -msgstr "不能合并" - -#: builtin/merge.c msgid "--abort expects no arguments" msgstr "--abort 不带参数" @@ -10194,14 +10360,19 @@ msgid "Can merge only exactly one commit into empty head" msgstr "只能将一个提交合并到空分支上" #: builtin/merge.c -msgid "refusing to merge unrelated histories" -msgstr "拒绝合并无关的历史" - -#: builtin/merge.c #, c-format msgid "Updating %s..%s\n" msgstr "更新 %s..%s\n" +#: builtin/merge.c merge-ort-wrappers.c merge-recursive.c +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" +"您对下列文件的本地修改将被合并操作覆盖：\n" +" %s" + #: builtin/merge.c #, c-format msgid "Trying really trivial in-index merge...\n" @@ -10242,6 +10413,11 @@ msgstr "使用 %s 策略以准备手工解决。\n" msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "自动合并进展顺利，按要求在提交前停止\n" +#: builtin/merge.c +#, c-format +msgid "When finished, apply stashed changes with `git stash pop`\n" +msgstr "在完成后，使用 `git stash pop` 应用贮藏的变更\n" + #: builtin/mktag.c #, c-format msgid "warning: tag input does not pass fsck: %s" @@ -10390,6 +10566,10 @@ msgid "bad source" msgstr "坏的源" #: builtin/mv.c +msgid "destination exists" +msgstr "目标已存在" + +#: builtin/mv.c msgid "can not move directory into itself" msgstr "不能将目录移动到自身" @@ -10410,10 +10590,6 @@ msgid "conflicted" msgstr "冲突" #: builtin/mv.c -msgid "destination exists" -msgstr "目标已存在" - -#: builtin/mv.c #, c-format msgid "overwriting '%s'" msgstr "覆盖 '%s'" @@ -10431,6 +10607,10 @@ msgid "destination directory does not exist" msgstr "目标目录不存在" #: builtin/mv.c +msgid "destination exists in the index" +msgstr "目标在索引中已存在" + +#: builtin/mv.c #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s，源=%s，目标=%s" @@ -10872,10 +11052,10 @@ msgstr "注解引用" msgid "use notes from <notes-ref>" msgstr "从 <注解引用> 使用注解" -#: builtin/notes.c builtin/stash.c +#: builtin/notes.c builtin/remote.c parse-options.c #, c-format -msgid "unknown subcommand: %s" -msgstr "未知子命令：%s" +msgid "unknown subcommand: `%s'" +msgstr "未知子命令：`%s'" #: builtin/pack-objects.c msgid "" @@ -11473,7 +11653,7 @@ msgstr "详见 git-pull(1)。" msgid "<remote>" msgstr "<远程>" -#: builtin/pull.c contrib/scalar/scalar.c +#: builtin/pull.c scalar.c msgid "<branch>" msgstr "<分支>" @@ -11926,12 +12106,18 @@ msgstr "仅显示与第二个范围有关的输出" #: builtin/range-diff.c #, c-format +msgid "not a revision: '%s'" +msgstr "不是版本：'%s'" + +#: builtin/range-diff.c +#, c-format msgid "not a commit range: '%s'" -msgstr "不是一个提交范围：'%s'" +msgstr "不是提交范围：'%s'" #: builtin/range-diff.c -msgid "single arg format must be symmetric range" -msgstr "单个参数格式必须是对称范围（即包含...）" +#, c-format +msgid "not a symmetric range: '%s'" +msgstr "不是对称的范围：'%s'" #: builtin/range-diff.c msgid "need two commit ranges" @@ -12266,6 +12452,10 @@ msgid "move commits that begin with squash!/fixup! under -i" msgstr "在 -i 交互模式下，移动以 squash!/fixup! 开头的提交" #: builtin/rebase.c +msgid "update branches that point to commits that are being rebased" +msgstr "更新指向正在被变基的提交的分支" + +#: builtin/rebase.c msgid "add exec lines after each commit of the editable list" msgstr "可编辑列表的每一个提交下面增加一行 exec" @@ -12889,6 +13079,10 @@ msgid " tracked" msgstr " 已跟踪" #: builtin/remote.c +msgid " skipped" +msgstr " 已跳过" + +#: builtin/remote.c msgid " stale (use 'git remote prune' to remove)" msgstr " 过时（使用 'git remote prune' 来移除）" @@ -13729,12 +13923,17 @@ msgstr "不能重置索引文件至版本 '%s'。" msgid "Could not write new index file." msgstr "不能写入新的索引文件。" -#: builtin/rev-list.c pack-bitmap.c +#: builtin/rev-list.c #, c-format msgid "unable to get disk usage of %s" msgstr "无法得到 %s 的磁盘使用量" #: builtin/rev-list.c +#, c-format +msgid "invalid value for '%s': '%s', the only allowed format is '%s'" +msgstr "'%s' 的值无效：'%s'，唯一允许的格式是 '%s'" + +#: builtin/rev-list.c msgid "rev-list does not support display of notes" msgstr "rev-list 不支持显示注解" @@ -13768,6 +13967,10 @@ msgid "no usage string given before the `--' separator" msgstr "在 `--' 分隔符之前没有给出使用方法字符串" #: builtin/rev-parse.c +msgid "missing opt-spec before option flags" +msgstr "选项参数之前缺少选项规格" + +#: builtin/rev-parse.c msgid "Needed a single revision" msgstr "需要一个单独的版本" @@ -14317,7 +14520,7 @@ msgstr "初始化稀疏检出为锥形模式" msgid "toggle the use of a sparse index" msgstr "切换稀疏索引的使用" -#: builtin/sparse-checkout.c commit-graph.c midx.c +#: builtin/sparse-checkout.c commit-graph.c midx.c sequencer.c #, c-format msgid "unable to create leading directories of %s" msgstr "不能为 %s 创建先导目录" @@ -14713,20 +14916,17 @@ msgstr "期望一个完整的引用名称，却得到 %s" #: builtin/submodule--helper.c #, c-format +msgid "could not get a repository handle for submodule '%s'" +msgstr "无法获得子模组 '%s' 的仓库句柄" + +#: builtin/submodule--helper.c +#, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " "authoritative upstream." msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。" #: builtin/submodule--helper.c -msgid "alternative anchor for relative paths" -msgstr "相对路径的替代锚记（anchor）" - -#: builtin/submodule--helper.c -msgid "git submodule--helper list [--prefix=<path>] [<path>...]" -msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]" - -#: builtin/submodule--helper.c #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "在 .gitmodules 中未找到子模组路径 '%s' 的 url" @@ -14764,8 +14964,8 @@ msgid "recurse into nested submodules" msgstr "递归进入嵌套子模组中" #: builtin/submodule--helper.c -msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" -msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <命令>" +msgid "git submodule foreach [--quiet] [--recursive] [--] <command>" +msgstr "git submodule foreach [--quiet] [--recursive] [--] <命令>" #: builtin/submodule--helper.c #, c-format @@ -14792,8 +14992,8 @@ msgid "suppress output for initializing a submodule" msgstr "抑制子模组初始化的输出" #: builtin/submodule--helper.c -msgid "git submodule--helper init [<options>] [<path>]" -msgstr "git submodule--helper init [<选项>] [<路径>]" +msgid "git submodule init [<options>] [<path>]" +msgstr "git submodule init [<选项>] [<路径>]" #: builtin/submodule--helper.c #, c-format @@ -14825,10 +15025,6 @@ msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路径>...]" #: builtin/submodule--helper.c -msgid "git submodule--helper name <path>" -msgstr "git submodule--helper name <路径>" - -#: builtin/submodule--helper.c #, c-format msgid "* %s %s(blob)->%s(submodule)" msgstr "* %s %s（数据对象）->%s（子模组）" @@ -14870,8 +15066,8 @@ msgid "limit the summary size" msgstr "限制总结的大小" #: builtin/submodule--helper.c -msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" -msgstr "git submodule--helper summary [<选项>] [<提交>] [--] [<路径>]" +msgid "git submodule summary [<options>] [<commit>] [--] [<path>]" +msgstr "git submodule summary [<选项>] [<提交>] [--] [<路径>]" #: builtin/submodule--helper.c msgid "could not fetch a revision for HEAD" @@ -14889,11 +15085,6 @@ msgstr "无法为子模组路径 '%s' 注册 url" #: builtin/submodule--helper.c #, c-format -msgid "failed to get the default remote for submodule '%s'" -msgstr "无法得到子模组 '%s' 的默认远程关联" - -#: builtin/submodule--helper.c -#, c-format msgid "failed to update remote for submodule '%s'" msgstr "无法为子模组 '%s' 更新远程关联" @@ -14902,8 +15093,8 @@ msgid "suppress output of synchronizing submodule url" msgstr "抑制子模组 URL 同步的输出" #: builtin/submodule--helper.c -msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" -msgstr "git submodule--helper sync [--quiet] [--recursive] [<路径>]" +msgid "git submodule sync [--quiet] [--recursive] [<path>]" +msgstr "git submodule sync [--quiet] [--recursive] [<路径>]" #: builtin/submodule--helper.c #, c-format @@ -14973,6 +15164,11 @@ msgstr "" #: builtin/submodule--helper.c #, c-format +msgid "could not get a repository handle for gitdir '%s'" +msgstr "无法获得 git 目录 '%s' 的仓库句柄" + +#: builtin/submodule--helper.c +#, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "子模组 '%s' 不能添加仓库备选：%s" @@ -15007,6 +15203,10 @@ msgid "could not get submodule directory for '%s'" msgstr "无法得到 '%s' 的子模组目录" #: builtin/submodule--helper.c +msgid "alternative anchor for relative paths" +msgstr "相对路径的替代锚记（anchor）" + +#: builtin/submodule--helper.c msgid "where the new submodule will be cloned to" msgstr "新的子模组将要克隆的路径" @@ -15042,11 +15242,6 @@ msgstr "" #: builtin/submodule--helper.c #, c-format -msgid "Invalid update mode '%s' for submodule path '%s'" -msgstr "子模组路径 '%2$s' 的更新模式 '%1$s' 无效" - -#: builtin/submodule--helper.c -#, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "为子模组路径 '%2$s' 配置的更新模式 '%1$s' 无效" @@ -15133,6 +15328,11 @@ msgstr "获取了子模组路径 '%s'，但是它没有包含 %s。直接获取 #: builtin/submodule--helper.c #, c-format +msgid "could not initialize submodule at path '%s'" +msgstr "无法在路径 '%s' 初始化子模组" + +#: builtin/submodule--helper.c +#, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " "the superproject is not on any branch" @@ -15140,11 +15340,6 @@ msgstr "子模组（%s）的分支配置为继承上级项目的分支，但是 #: builtin/submodule--helper.c #, c-format -msgid "could not get a repository handle for submodule '%s'" -msgstr "无法获得子模组 '%s' 的仓库句柄" - -#: builtin/submodule--helper.c -#, c-format msgid "Unable to find current revision in submodule path '%s'" msgstr "无法在子模组路径 '%s' 中找到当前版本" @@ -15188,12 +15383,16 @@ msgid "path into the working tree" msgstr "到工作区的路径" #: builtin/submodule--helper.c -msgid "path into the working tree, across nested submodule boundaries" -msgstr "工作区中的路径，递归嵌套子模组" +msgid "use the 'checkout' update strategy (default)" +msgstr "使用 'checkout' 更新策略（默认）" #: builtin/submodule--helper.c -msgid "rebase, merge, checkout or none" -msgstr "rebase、merge、checkout 或 none" +msgid "use the 'merge' update strategy" +msgstr "使用 'merge' 更新策略" + +#: builtin/submodule--helper.c +msgid "use the 'rebase' update strategy" +msgstr "使用 'rebase' 更新策略" #: builtin/submodule--helper.c msgid "create a shallow clone truncated to the specified number of revisions" @@ -15212,6 +15411,10 @@ msgid "don't print cloning progress" msgstr "不要输出克隆进度" #: builtin/submodule--helper.c +msgid "disallow cloning into non-empty directory, implies --init" +msgstr "不允许克隆到一个非空目录，暗含 --init" + +#: builtin/submodule--helper.c msgid "" "git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] " "[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-" @@ -15224,16 +15427,12 @@ msgstr "" "径>...]" #: builtin/submodule--helper.c -msgid "bad value for update parameter" -msgstr "update 参数取值错误" - -#: builtin/submodule--helper.c msgid "recurse into submodules" msgstr "在子模组中递归" #: builtin/submodule--helper.c -msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" -msgstr "git submodule--helper absorb-git-dirs [<选项>] [<路径>...]" +msgid "git submodule absorbgitdirs [<options>] [<path>...]" +msgstr "git submodule absorbgitdirs [<选项>] [<路径>...]" #: builtin/submodule--helper.c msgid "check if it is safe to write to the .gitmodules file" @@ -15260,8 +15459,8 @@ msgid "suppress output for setting url of a submodule" msgstr "抑制设置子模组 URL 的输出" #: builtin/submodule--helper.c -msgid "git submodule--helper set-url [--quiet] <path> <newurl>" -msgstr "git submodule--helper set-url [--quiet] <路径> <新地址>" +msgid "git submodule set-url [--quiet] <path> <newurl>" +msgstr "git submodule set-url [--quiet] <路径> <新地址>" #: builtin/submodule--helper.c msgid "set the default tracking branch to master" @@ -15272,14 +15471,12 @@ msgid "set the default tracking branch" msgstr "设置默认跟踪分支" #: builtin/submodule--helper.c -msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" -msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <路径>" +msgid "git submodule set-branch [-q|--quiet] (-d|--default) <path>" +msgstr "git submodule set-branch [-q|--quiet] (-d|--default) <路径>" #: builtin/submodule--helper.c -msgid "" -"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" -msgstr "" -"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <分支> <路径>" +msgid "git submodule set-branch [-q|--quiet] (-b|--branch) <branch> <path>" +msgstr "git submodule set-branch [-q|--quiet] (-b|--branch) <分支> <路径>" #: builtin/submodule--helper.c msgid "--branch or --default required" @@ -15394,8 +15591,8 @@ msgid "" msgstr "将子模组的名称设置为给定的字符串，而非默认为其路径" #: builtin/submodule--helper.c -msgid "git submodule--helper add [<options>] [--] <repository> [<path>]" -msgstr "git submodule--helper add [<选项>] [--] <仓库> [<路径>]" +msgid "git submodule add [<options>] [--] <repository> [<path>]" +msgstr "git submodule add [<选项>] [--] <仓库> [<路径>]" #: builtin/submodule--helper.c msgid "Relative path can only be used from the toplevel of the working tree" @@ -15649,6 +15846,19 @@ msgid "pack exceeds maximum allowed size" msgstr "包超过了最大允许大小" #: builtin/unpack-objects.c +msgid "failed to write object in stream" +msgstr "无法在流中写入对象" + +#: builtin/unpack-objects.c +#, c-format +msgid "inflate returned (%d)" +msgstr "解压缩返回了 (%d)" + +#: builtin/unpack-objects.c +msgid "invalid blob object from stream" +msgstr "流中无效的数据对象" + +#: builtin/unpack-objects.c msgid "Unpacking objects" msgstr "展开对象中" @@ -16290,6 +16500,33 @@ msgstr "将 <前缀> 子目录内容写到一个树对象" msgid "only useful for debugging" msgstr "只对调试有用" +#: bulk-checkin.c +msgid "core.fsyncMethod = batch is unsupported on this platform" +msgstr "core.fsyncMethod = batch 不支持本平台" + +#: bundle-uri.c +msgid "failed to create temporary file" +msgstr "无法创建临时文件" + +#: bundle-uri.c +msgid "insufficient capabilities" +msgstr "缺乏能力" + +#: bundle-uri.c +#, c-format +msgid "failed to download bundle from URI '%s'" +msgstr "无法从 URI '%s' 下载归档包" + +#: bundle-uri.c +#, c-format +msgid "file at URI '%s' is not a bundle" +msgstr "位于 URI '%s' 的文件不是归档包" + +#: bundle-uri.c +#, c-format +msgid "failed to unbundle bundle from URI '%s'" +msgstr "无法从 URI '%s' 解开归档包" + #: bundle.c #, c-format msgid "unrecognized bundle hash algorithm: %s" @@ -16553,6 +16790,10 @@ msgid "Give an object a human readable name based on an available ref" msgstr "基于一个现存的引用为一个对象起一个可读的名称" #: command-list.h +msgid "Generate a zip archive of diagnostic information" +msgstr "生成诊断信息的压缩包" + +#: command-list.h msgid "Show changes between commits, commit and working tree, etc" msgstr "显示提交之间、提交和工作区之间等的差异" @@ -16721,8 +16962,8 @@ msgid "The standard helper program to use with git-merge-index" msgstr "与 git-merge-index 一起使用的标准向导程序" #: command-list.h -msgid "Show three-way merge without touching index" -msgstr "在不动索引的情况下显示三路合并" +msgid "Perform merge without touching index or working tree" +msgstr "在不触碰索引或工作树情况下应用合并" #: command-list.h msgid "Run merge conflict resolution tools to resolve merge conflicts" @@ -16983,6 +17224,10 @@ msgid "Check the GPG signature of tags" msgstr "检查标签的 GPG 签名" #: command-list.h +msgid "Display version information about Git" +msgstr "显示关于 Git 的版本信息" + +#: command-list.h msgid "Show logs with difference each commit introduces" msgstr "显示每一个提交引入的差异日志" @@ -17027,6 +17272,30 @@ msgid "Frequently asked questions about using Git" msgstr "关于使用 Git 的常见问题" #: command-list.h +msgid "The bundle file format" +msgstr "归档包文件格式" + +#: command-list.h +msgid "Chunk-based file formats" +msgstr "块式文件格式" + +#: command-list.h +msgid "Git commit graph format" +msgstr "Git 提交图格式" + +#: command-list.h +msgid "Git index format" +msgstr "Git 索引格式" + +#: command-list.h +msgid "Git pack format" +msgstr "Git 包格式" + +#: command-list.h +msgid "Git cryptographic signature formats" +msgstr "Git 密码学签名格式" + +#: command-list.h msgid "A Git Glossary" msgstr "Git 词汇表" @@ -17036,7 +17305,7 @@ msgstr "Git 使用的钩子" #: command-list.h msgid "Specifies intentionally untracked files to ignore" -msgstr "忽略指定的未跟踪文件" +msgstr "指定故意忽略的未跟踪文件" #: command-list.h msgid "The Git repository browser" @@ -17055,6 +17324,26 @@ msgid "Git namespaces" msgstr "Git 名字空间" #: command-list.h +msgid "Protocol v0 and v1 capabilities" +msgstr "协议 v0 和 v1 能力" + +#: command-list.h +msgid "Things common to various protocols" +msgstr "不同协议的共同部分" + +#: command-list.h +msgid "Git HTTP-based protocols" +msgstr "Git 基于 HTTP 的协议" + +#: command-list.h +msgid "How packs are transferred over-the-wire" +msgstr "包在线路中传输的方式" + +#: command-list.h +msgid "Git Wire Protocol, Version 2" +msgstr "Git 传输协议，第二版" + +#: command-list.h msgid "Helper programs to interact with remote repositories" msgstr "与远程仓库交互的助手程序" @@ -17086,6 +17375,10 @@ msgstr "Git web 界面（Git 仓库的 web 前端）" msgid "An overview of recommended workflows with Git" msgstr "Git 推荐的工作流概览" +#: command-list.h +msgid "A tool for managing large Git repositories" +msgstr "一个管理大型 Git 仓库的工具" + #: commit-graph.c msgid "commit-graph file is too small" msgstr "提交图形文件太小" @@ -17374,6 +17667,16 @@ msgstr "编译器信息不可用\n" msgid "no libc information available\n" msgstr "libc 信息不可用\n" +#: compat/disk.h +#, c-format +msgid "could not determine free disk size for '%s'" +msgstr "不能确定 '%s' 的空余磁盘空间" + +#: compat/disk.h +#, c-format +msgid "could not get info for '%s'" +msgstr "无法获得 '%s' 的信息" + #: compat/fsmonitor/fsm-health-win32.c #, c-format msgid "[GLE %ld] health thread could not open '%ls'" @@ -17442,6 +17745,16 @@ msgstr "GetOverlappedResult 失败于 '%s' [GLE %ld]" msgid "could not read directory changes [GLE %ld]" msgstr "无法获取目录变更 [GLE %ld]" +#: compat/fsmonitor/fsm-settings-win32.c +#, c-format +msgid "[GLE %ld] unable to open for read '%ls'" +msgstr "[GLE %ld] 无法打开要读取的 '%ls'" + +#: compat/fsmonitor/fsm-settings-win32.c +#, c-format +msgid "[GLE %ld] unable to get protocol information for '%ls'" +msgstr "[GLE %ld] 无法获取 '%ls' 的协议信息 " + #: compat/mingw.c #, c-format msgid "failed to copy SID (%ld)" @@ -18115,229 +18428,6 @@ msgstr "写入 rev-list 失败" msgid "failed to close rev-list's stdin" msgstr "无法关闭 rev-list 的标准输入" -#: contrib/scalar/scalar.c worktree.c -#, c-format -msgid "'%s' does not exist" -msgstr "'%s' 不存在" - -#: contrib/scalar/scalar.c -msgid "need a working directory" -msgstr "需要一个工作目录" - -#: contrib/scalar/scalar.c -msgid "could not find enlistment root" -msgstr "无法找到登记根" - -#: contrib/scalar/scalar.c -#, c-format -msgid "could not switch to '%s'" -msgstr "无法切换到 '%s'" - -#: contrib/scalar/scalar.c -#, c-format -msgid "could not configure %s=%s" -msgstr "无法配置 %s=%s" - -#: contrib/scalar/scalar.c -msgid "could not configure log.excludeDecoration" -msgstr "无法配置 log.excludeDecoration" - -#: contrib/scalar/scalar.c -msgid "Scalar enlistments require a worktree" -msgstr "Scalar 登记需要一个工作树" - -#: contrib/scalar/scalar.c dir.c -#, c-format -msgid "could not open directory '%s'" -msgstr "不能打开目录 '%s'" - -#: contrib/scalar/scalar.c -#, c-format -msgid "skipping '%s', which is neither file nor directory" -msgstr "跳过 '%s'，既不是文件又不是目录" - -#: contrib/scalar/scalar.c -#, c-format -msgid "could not determine free disk size for '%s'" -msgstr "不能确定 '%s' 的空余磁盘空间" - -#: contrib/scalar/scalar.c -#, c-format -msgid "could not get info for '%s'" -msgstr "不能获得 '%s' 的信息" - -#: contrib/scalar/scalar.c -#, c-format -msgid "remote HEAD is not a branch: '%.*s'" -msgstr "远程 HEAD 不是一个分支：'%.*s'" - -#: contrib/scalar/scalar.c -msgid "failed to get default branch name from remote; using local default" -msgstr "无法从远程获取默认分支名称；使用本地默认值" - -#: contrib/scalar/scalar.c -msgid "failed to get default branch name" -msgstr "无法获取默认分支名称" - -#: contrib/scalar/scalar.c -msgid "failed to unregister repository" -msgstr "无法取消注册仓库" - -#: contrib/scalar/scalar.c -msgid "failed to delete enlistment directory" -msgstr "无法删除登记目录" - -#: contrib/scalar/scalar.c -msgid "branch to checkout after clone" -msgstr "克隆后要检出的分支" - -#: contrib/scalar/scalar.c -msgid "when cloning, create full working directory" -msgstr "在克隆时，创建完整的工作目录" - -#: contrib/scalar/scalar.c -msgid "only download metadata for the branch that will be checked out" -msgstr "只下载要检出的分支的元信息" - -#: contrib/scalar/scalar.c -msgid "scalar clone [<options>] [--] <repo> [<dir>]" -msgstr "scalar clone [<选项>] [--] <仓库> [<目录>]" - -#: contrib/scalar/scalar.c -#, c-format -msgid "cannot deduce worktree name from '%s'" -msgstr "无法从 '%s' 猜测工作区名称" - -#: contrib/scalar/scalar.c -#, c-format -msgid "directory '%s' exists already" -msgstr "目录 '%s' 已存在" - -#: contrib/scalar/scalar.c -#, c-format -msgid "failed to get default branch for '%s'" -msgstr "无法获取 '%s' 的默认分支" - -#: contrib/scalar/scalar.c -#, c-format -msgid "could not configure remote in '%s'" -msgstr "无法在 '%s' 中配置远程" - -#: contrib/scalar/scalar.c -#, c-format -msgid "could not configure '%s'" -msgstr "无法配置 '%s'" - -#: contrib/scalar/scalar.c -msgid "partial clone failed; attempting full clone" -msgstr "部分克隆失败；尝试完整克隆" - -#: contrib/scalar/scalar.c -msgid "could not configure for full clone" -msgstr "无法配置完整克隆" - -#: contrib/scalar/scalar.c -msgid "scalar diagnose [<enlistment>]" -msgstr "scalar diagnose [<登记>]" - -#: contrib/scalar/scalar.c -#, c-format -msgid "could not create directory for '%s'" -msgstr "不能为 '%s' 创建目录" - -#: contrib/scalar/scalar.c -msgid "could not duplicate stdout" -msgstr "不能复制标准输出" - -#: contrib/scalar/scalar.c -msgid "failed to write archive" -msgstr "无法写入归档" - -#: contrib/scalar/scalar.c -msgid "`scalar list` does not take arguments" -msgstr "`scalar list` 不带参数" - -#: contrib/scalar/scalar.c -msgid "scalar register [<enlistment>]" -msgstr "scalar register [<登记>]" - -#: contrib/scalar/scalar.c -msgid "reconfigure all registered enlistments" -msgstr "重新配置所有注册的登记" - -#: contrib/scalar/scalar.c -msgid "scalar reconfigure [--all | <enlistment>]" -msgstr "scalar reconfigure [--all | <登记>]" - -#: contrib/scalar/scalar.c -msgid "--all or <enlistment>, but not both" -msgstr "--all 或者 <登记>，而不是两个一起" - -#: contrib/scalar/scalar.c -#, c-format -msgid "git repository gone in '%s'" -msgstr "在 '%s' 的 git 仓库已消失" - -#: contrib/scalar/scalar.c -msgid "" -"scalar run <task> [<enlistment>]\n" -"Tasks:\n" -msgstr "" -"scalar run <任务> [<登记>]\n" -"任务：\n" - -#: contrib/scalar/scalar.c -#, c-format -msgid "no such task: '%s'" -msgstr "没有此任务：'%s'" - -#: contrib/scalar/scalar.c -msgid "scalar unregister [<enlistment>]" -msgstr "scalar unregister [<登记>]" - -#: contrib/scalar/scalar.c -msgid "scalar delete <enlistment>" -msgstr "scalar delete <登记>" - -#: contrib/scalar/scalar.c -msgid "refusing to delete current working directory" -msgstr "拒绝删除当前工作目录" - -#: contrib/scalar/scalar.c -msgid "include Git version" -msgstr "包括 Git 的版本" - -#: contrib/scalar/scalar.c -msgid "include Git's build options" -msgstr "包括 Git 的构建选项" - -#: contrib/scalar/scalar.c -msgid "scalar verbose [-v | --verbose] [--build-options]" -msgstr "scalar verbose [-v | --verbose] [--build-options]" - -#: contrib/scalar/scalar.c -msgid "-C requires a <directory>" -msgstr "-C 需要 <目录>" - -#: contrib/scalar/scalar.c -#, c-format -msgid "could not change to '%s'" -msgstr "无法变更到 '%s'" - -#: contrib/scalar/scalar.c -msgid "-c requires a <key>=<value> argument" -msgstr "-c 需要 <键>=<值> 参数" - -#: contrib/scalar/scalar.c -msgid "" -"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n" -"\n" -"Commands:\n" -msgstr "" -"scalar [-C <目录>] [-c <键>=<值>] <命令> [<选项>]\n" -"\n" -"命令：\n" - #: convert.c #, c-format msgid "illegal crlf_action %d" @@ -18578,6 +18668,39 @@ msgstr "来自 config 的数据岛正则表达式有太多的捕获组（最多 msgid "Marked %d islands, done.\n" msgstr "已标记 %d 个数据岛，结束。\n" +#: diagnose.c +#, c-format +msgid "invalid --%s value '%s'" +msgstr "无效的 --%s 值 '%s'" + +#: diagnose.c +#, c-format +msgid "could not archive missing directory '%s'" +msgstr "无法归档缺失的目录 '%s'" + +#: diagnose.c dir.c +#, c-format +msgid "could not open directory '%s'" +msgstr "无法打开目录 '%s'" + +#: diagnose.c +#, c-format +msgid "skipping '%s', which is neither file nor directory" +msgstr "跳过 '%s'，既不是文件又不是目录" + +#: diagnose.c +msgid "could not duplicate stdout" +msgstr "无法复制标准输出" + +#: diagnose.c +#, c-format +msgid "could not add directory '%s' to archiver" +msgstr "无法添加目录 '%s' 至归档器" + +#: diagnose.c +msgid "failed to write archive" +msgstr "无法写入归档" + #: diff-lib.c msgid "--merge-base does not work with ranges" msgstr "--merge-base 不适用于范围" @@ -19328,6 +19451,10 @@ msgid "unable to write to remote" msgstr "无法写到远程" #: fetch-pack.c +msgid "Server supports filter" +msgstr "服务器支持 filter" + +#: fetch-pack.c #, c-format msgid "invalid shallow line: %s" msgstr "无效的 shallow 信息：%s" @@ -19469,10 +19596,6 @@ msgid "Server does not support shallow requests" msgstr "服务器不支持浅克隆请求" #: fetch-pack.c -msgid "Server supports filter" -msgstr "服务器支持 filter" - -#: fetch-pack.c msgid "unable to write request to remote" msgstr "无法将请求写到远程" @@ -19887,6 +20010,14 @@ msgid "Low-level Commands / Internal Helpers" msgstr "低级命令/内部助手" #: help.c +msgid "User-facing repository, command and file interfaces" +msgstr "面向用户的仓库、命令和文件接口" + +#: help.c +msgid "Developer-facing file formats, protocols and other interfaces" +msgstr "面向开发者的文件格式、协议和其他接口" + +#: help.c #, c-format msgid "available git commands in '%s'" msgstr "在 '%s' 下可用的 git 命令" @@ -19904,6 +20035,14 @@ msgid "The Git concept guides are:" msgstr "Git 概念向导有：" #: help.c +msgid "User-facing repository, command and file interfaces:" +msgstr "面向用户的仓库、命令和文件接口：" + +#: help.c +msgid "File formats, protocols and other developer interfaces:" +msgstr "文件格式、协议和其他开发者接口列表：" + +#: help.c msgid "External commands" msgstr "外部命令" @@ -19999,11 +20138,6 @@ msgstr "" "因为没有将钩子 '%s' 设置为可执行，钩子被忽略。您可以通过\n" "配置 `git config advice.ignoredHook false` 来关闭这条警告。" -#: hook.c -#, c-format -msgid "Couldn't start hook '%s'\n" -msgstr "不能启动钩子 '%s'\n" - #: http-fetch.c #, c-format msgid "argument to --packfile must be a valid hash (got '%s')" @@ -20221,20 +20355,16 @@ msgstr "在 ls-refs 参数后应该有一个 flush 包" msgid "quoted CRLF detected" msgstr "检测到被引用的 CRLF" -#: merge-ort-wrappers.c merge-recursive.c -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -" %s" -msgstr "" -"您对下列文件的本地修改将被合并操作覆盖：\n" -" %s" - #: merge-ort.c merge-recursive.c #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "无法合并子模组 %s （没有检出）" +#: merge-ort.c +#, c-format +msgid "Failed to merge submodule %s (no merge base)" +msgstr "无法合并子模组 %s （没有合并基线）" + #: merge-ort.c merge-recursive.c #, c-format msgid "Failed to merge submodule %s (commits not present)" @@ -20258,27 +20388,8 @@ msgstr "无法合并子模组 %s" #: merge-ort.c #, c-format msgid "" -"Failed to merge submodule %s, but a possible merge resolution exists:\n" -"%s\n" -msgstr "" -"无法合并子模组 %s，但是存在一个可能的合并方案：\n" -"%s\n" - -#: merge-ort.c merge-recursive.c -#, c-format -msgid "" -"If this is correct simply add it to the index for example\n" -"by using:\n" -"\n" -" git update-index --cacheinfo 160000 %s \"%s\"\n" -"\n" -"which will accept this suggestion.\n" -msgstr "" -"如果这个正确，将其添加到索引，例如使用命令：\n" -"\n" -" git update-index --cacheinfo 160000 %s \"%s\"\n" -"\n" -"以接受此建议。\n" +"Failed to merge submodule %s, but a possible merge resolution exists: %s" +msgstr "无法合并子模组 %s，但是存在一个可能的合并方案：%s" #: merge-ort.c #, c-format @@ -20455,12 +20566,45 @@ msgstr "" "冲突（修改/删除）：%1$s 在 %2$s 中被删除，在 %3$s 中被修改。%5$s 的 %4$s 版本" "在树中被保留。" +#. TRANSLATORS: This is a line of advice to resolve a merge +#. 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" +#. #: merge-ort.c #, c-format msgid "" -"Note: %s not up to date and in way of checking out conflicted version; old " -"copy renamed to %s" -msgstr "注意：%s 不是最新的，并且与要检出的版本冲突。旧副本重命名为 %s" +" - go to submodule (%s), and either merge commit %s\n" +" or update to an existing commit which has merged those changes\n" +msgstr "" +" - 进入子模组（%s），要么合并提交 %s\n" +" 要么更新至已合并这些变更的提交\n" + +#: merge-ort.c +#, c-format +msgid "" +"Recursive merging with submodules currently only supports trivial cases.\n" +"Please manually handle the merging of each conflicted submodule.\n" +"This can be accomplished with the following steps:\n" +"%s - come back to superproject and run:\n" +"\n" +" git add %s\n" +"\n" +" to record the above merge or update\n" +" - resolve any other conflicts in the superproject\n" +" - commit the resulting index in the superproject\n" +msgstr "" +"子模组内的递归合并现在只支持简单的情况。\n" +"请手动合并每个有冲突的子模组。\n" +"这可以通过下列步骤完成：\n" +"%s - 回到上级项目并运行：\n" +"\n" +" git add %s\n" +"\n" +" 来记录上述的合并或更新\n" +" - 解决上级项目中的其他冲突\n" +" - 提交上级项目中的结果索引\n" #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge #. base, and 2-3) the trees for the two trees we're merging. @@ -20549,6 +20693,22 @@ msgstr "找到子模组的一个可能的合并方案：\n" #: merge-recursive.c #, c-format +msgid "" +"If this is correct simply add it to the index for example\n" +"by using:\n" +"\n" +" git update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"which will accept this suggestion.\n" +msgstr "" +"如果这个正确，将其添加到索引，例如使用命令：\n" +"\n" +" git update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"以接受此建议。\n" + +#: merge-recursive.c +#, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "无法合并子模组 %s （发现多个合并）" @@ -21184,6 +21344,26 @@ msgstr "被 %s 的不稳定对象源数据搞糊涂了" #: object-file.c #, c-format +msgid "write stream object %ld != %<PRIuMAX>" +msgstr "写入流对象 %ld != %<PRIuMAX>" + +#: object-file.c +#, c-format +msgid "unable to stream deflate new object (%d)" +msgstr "不能流式压缩新对象（%d）" + +#: object-file.c +#, c-format +msgid "deflateEnd on stream object failed (%d)" +msgstr "在流对象上调用 deflateEnd 失败（%d）" + +#: object-file.c +#, c-format +msgid "unable to create directory %s" +msgstr "无法创建目录 %s" + +#: object-file.c +#, c-format msgid "cannot read object for %s" msgstr "不能读取对象 %s" @@ -21447,6 +21627,71 @@ msgstr "不能解析对象：%s" msgid "hash mismatch %s" msgstr "哈希值与 %s 不匹配" +#: pack-bitmap-write.c +msgid "trying to write commit not in index" +msgstr "尝试写入未在索引中的提交" + +#: pack-bitmap.c +msgid "failed to load bitmap index (corrupted?)" +msgstr "无法载入位图索引（已损坏？）" + +#: pack-bitmap.c +msgid "corrupted bitmap index (too small)" +msgstr "损坏的位图索引（太小）" + +#: pack-bitmap.c +msgid "corrupted bitmap index file (wrong header)" +msgstr "损坏的位图索引（错误的文件头）" + +#: pack-bitmap.c +#, c-format +msgid "unsupported version '%d' for bitmap index file" +msgstr "不支持的位图索引文件版本 '%d'" + +#: pack-bitmap.c +msgid "corrupted bitmap index file (too short to fit hash cache)" +msgstr "损坏的位图索引（太小，容不下哈希缓存）" + +#: pack-bitmap.c +msgid "corrupted bitmap index file (too short to fit lookup table)" +msgstr "损坏的位图索引（太小，容不下查询表）" + +#: pack-bitmap.c +#, c-format +msgid "duplicate entry in bitmap index: '%s'" +msgstr "位图索引中的重复条目：'%s'" + +#: pack-bitmap.c +#, c-format +msgid "corrupt ewah bitmap: truncated header for entry %d" +msgstr "损坏的 EWAH 位图：条目 %d 截断的文件头" + +#: pack-bitmap.c +#, c-format +msgid "corrupt ewah bitmap: commit index %u out of range" +msgstr "损坏的 EWAH 位图：提交索引 %u 超出范围" + +#: pack-bitmap.c +msgid "corrupted bitmap pack index" +msgstr "损坏的位图包索引" + +#: pack-bitmap.c +msgid "invalid XOR offset in bitmap pack index" +msgstr "位图包索引中 XOR 偏移值无效" + +#: pack-bitmap.c +msgid "cannot fstat bitmap file" +msgstr "不能对位图文件调用 fstat" + +#: pack-bitmap.c +#, c-format +msgid "ignoring extra bitmap file: '%s'" +msgstr "忽略额外的位图文件：'%s'" + +#: pack-bitmap.c +msgid "checksum doesn't match in MIDX and bitmap" +msgstr "MIDX 和位图中的校验码不匹配" + #: pack-bitmap.c msgid "multi-pack bitmap is missing required reverse index" msgstr "多包位图缺少必需的反向索引" @@ -21462,9 +21707,69 @@ msgid "preferred pack (%s) is invalid" msgstr "首选包 (%s) 无效" #: pack-bitmap.c +msgid "corrupt bitmap lookup table: triplet position out of index" +msgstr "损坏的位图查询表：三元组位置超出索引" + +#: pack-bitmap.c +msgid "corrupt bitmap lookup table: xor chain exceeds entry count" +msgstr "损坏的位图查询表：xor 链超出条目数" + +#: pack-bitmap.c +#, c-format +msgid "corrupt bitmap lookup table: commit index %u out of range" +msgstr "损坏的位图查询表：提交索引 %u 超出范围" + +#: pack-bitmap.c +#, c-format +msgid "corrupt ewah bitmap: truncated header for bitmap of commit \"%s\"" +msgstr "损坏的 EWAH 位图：提交 \"%s\" 位图的文件头被截断" + +#: pack-bitmap.c +#, c-format +msgid "object '%s' not found in type bitmaps" +msgstr "对象 %s 为在类型位图中找到" + +#: pack-bitmap.c #, c-format -msgid "could not find %s in pack %s at offset %<PRIuMAX>" -msgstr "在包 %2$s 偏移 %3$<PRIuMAX> 中无法找到 %1$s" +msgid "object '%s' does not have a unique type" +msgstr "对象 '%s' 没有唯一的类型" + +#: pack-bitmap.c +#, c-format +msgid "object '%s': real type '%s', expected: '%s'" +msgstr "对象 '%s'：实际类型 '%s'，预期：'%s'" + +#: pack-bitmap.c +#, c-format +msgid "object not in bitmap: '%s'" +msgstr "对象不在位图中：%s" + +#: pack-bitmap.c +msgid "failed to load bitmap indexes" +msgstr "无法载入位图索引" + +#: pack-bitmap.c +msgid "you must specify exactly one commit to test" +msgstr "您必须准确指定一个提交来测试" + +#: pack-bitmap.c +#, c-format +msgid "commit '%s' doesn't have an indexed bitmap" +msgstr "提交 '%s' 没有索引位图" + +#: pack-bitmap.c +msgid "mismatch in bitmap results" +msgstr "位图结果不一致" + +#: pack-bitmap.c +#, c-format +msgid "could not find '%s' in pack '%s' at offset %<PRIuMAX>" +msgstr "无法在包 '%2$s' 偏移 %3$<PRIuMAX> 中找到 '%1$s'" + +#: pack-bitmap.c +#, c-format +msgid "unable to get disk usage of '%s'" +msgstr "无法得到 '%s' 的磁盘使用量" #: pack-mtimes.c #, c-format @@ -21620,6 +21925,10 @@ msgid "alias of --%s" msgstr "--%s 的别名" #: parse-options.c +msgid "need a subcommand" +msgstr "需要一个子命令" + +#: parse-options.c #, c-format msgid "unknown option `%s'" msgstr "未知选项 `%s'" @@ -22147,9 +22456,12 @@ msgid "" "l, label <label> = label current HEAD with a name\n" "t, reset <label> = reset HEAD to a label\n" "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" -". create a merge commit using the original merge commit's\n" -". message (or the oneline, if no original merge commit was\n" -". specified); use -c <commit> to reword the commit message\n" +" create a merge commit using the original merge commit's\n" +" message (or the oneline, if no original merge commit was\n" +" specified); use -c <commit> to reword the commit message\n" +"u, update-ref <ref> = track a placeholder for the <ref> to be updated\n" +" to this position in the new commits. The <ref> is\n" +" updated at the end of the rebase\n" "\n" "These lines can be re-ordered; they are executed from top to bottom.\n" msgstr "" @@ -22157,7 +22469,7 @@ msgstr "" "命令:\n" "p, pick <提交> = 使用提交\n" "r, reword <提交> = 使用提交，但编辑提交说明\n" -"e, edit <提交> = 使用提交，但停止以便在 shell 中修补提交\n" +"e, edit <提交> = 使用提交，但停止以便修补提交\n" "s, squash <提交> = 使用提交，但挤压到前一个提交\n" "f, fixup [-C | -c] <提交> = 类似于 \"squash\"，但只保留前一个提交\n" " 的提交说明，除非使用了 -C 参数，此情况下则只\n" @@ -22172,6 +22484,9 @@ msgstr "" ". 创建一个合并提交，并使用原始的合并提交说明（如果没有指定\n" ". 原始提交，使用注释部分的 oneline 作为提交说明）。使用\n" ". -c <提交> 可以编辑提交说明。\n" +"u, update-ref <引用> = 为引用 <ref> 设置一个占位符，以将该引用更新为此处的新" +"提交。\n" +" 此 <引用> 在变基结束后更新。\n" "\n" "可以对这些行重新排序，将从上至下执行。\n" @@ -22738,6 +23053,15 @@ msgid "http transport does not support %s" msgstr "http 传输协议不支持 %s" #: remote-curl.c +msgid "protocol error: expected '<url> <path>', missing space" +msgstr "协议错误：预期 '<url> <path>'，缺少空格" + +#: remote-curl.c +#, c-format +msgid "failed to download file at URL '%s'" +msgstr "无法下载位于 URL '%s' 的文件" + +#: remote-curl.c msgid "git-http-push failed" msgstr "git-http-push 失败" @@ -23143,6 +23467,16 @@ msgid "failed to find tree of %s" msgstr "无法找到 %s 指向的树" #: revision.c +#, c-format +msgid "resolve-undo records `%s` which is missing" +msgstr "resolve-undo 记录 `%s`，现缺失" + +#: revision.c +#, c-format +msgid "could not get commit for ancestry-path argument %s" +msgstr "无法获得 ancestry-path 参数 %s 的提交" + +#: revision.c msgid "--unpacked=<packfile> no longer supported" msgstr "不再支持 --unpacked=<packfile>" @@ -23168,6 +23502,220 @@ msgstr "-L 尚不支持 -p 和 -s 之外的差异格式" msgid "cannot create async thread: %s" msgstr "不能创建 async 线程：%s" +#: scalar.c worktree.c +#, c-format +msgid "'%s' does not exist" +msgstr "'%s' 不存在" + +#: scalar.c +#, c-format +msgid "could not switch to '%s'" +msgstr "无法切换到 '%s'" + +#: scalar.c +msgid "need a working directory" +msgstr "需要一个工作目录" + +#: scalar.c +msgid "Scalar enlistments require a worktree" +msgstr "Scalar 登记需要一个工作树" + +#: scalar.c +#, c-format +msgid "could not configure %s=%s" +msgstr "无法配置 %s=%s" + +#: scalar.c +msgid "could not configure log.excludeDecoration" +msgstr "无法配置 log.excludeDecoration" + +#: scalar.c +msgid "could not add enlistment" +msgstr "无法添加登记" + +#: scalar.c +msgid "could not set recommended config" +msgstr "无法设置推荐的配置" + +#: scalar.c +msgid "could not turn on maintenance" +msgstr "无法打开维护模式" + +#: scalar.c +msgid "could not start the FSMonitor daemon" +msgstr "无法启动 FSMonitor 守护进程" + +#: scalar.c +msgid "could not turn off maintenance" +msgstr "无法关闭维护模式" + +#: scalar.c +msgid "could not remove enlistment" +msgstr "无法删除登记" + +#: scalar.c +#, c-format +msgid "remote HEAD is not a branch: '%.*s'" +msgstr "远程 HEAD 不是一个分支：'%.*s'" + +#: scalar.c +msgid "failed to get default branch name from remote; using local default" +msgstr "无法从远程获取默认分支名称；使用本地默认值" + +#: scalar.c +msgid "failed to get default branch name" +msgstr "无法获取默认分支名称" + +#: scalar.c +msgid "failed to unregister repository" +msgstr "无法取消注册仓库" + +#: scalar.c +msgid "failed to stop the FSMonitor daemon" +msgstr "无法停止 FSMonitor 守护进程" + +#: scalar.c +msgid "failed to delete enlistment directory" +msgstr "无法删除登记目录" + +#: scalar.c +msgid "branch to checkout after clone" +msgstr "克隆后要检出的分支" + +#: scalar.c +msgid "when cloning, create full working directory" +msgstr "在克隆时，创建完整的工作目录" + +#: scalar.c +msgid "only download metadata for the branch that will be checked out" +msgstr "只下载要检出的分支的元信息" + +#: scalar.c +msgid "scalar clone [<options>] [--] <repo> [<dir>]" +msgstr "scalar clone [<选项>] [--] <仓库> [<目录>]" + +#: scalar.c +#, c-format +msgid "cannot deduce worktree name from '%s'" +msgstr "无法从 '%s' 猜测工作区名称" + +#: scalar.c +#, c-format +msgid "directory '%s' exists already" +msgstr "目录 '%s' 已存在" + +#: scalar.c +#, c-format +msgid "failed to get default branch for '%s'" +msgstr "无法获取 '%s' 的默认分支" + +#: scalar.c +#, c-format +msgid "could not configure remote in '%s'" +msgstr "无法在 '%s' 中配置远程" + +#: scalar.c +#, c-format +msgid "could not configure '%s'" +msgstr "无法配置 '%s'" + +#: scalar.c +msgid "partial clone failed; attempting full clone" +msgstr "部分克隆失败；尝试完整克隆" + +#: scalar.c +msgid "could not configure for full clone" +msgstr "无法配置完整克隆" + +#: scalar.c +msgid "scalar diagnose [<enlistment>]" +msgstr "scalar diagnose [<登记>]" + +#: scalar.c +msgid "`scalar list` does not take arguments" +msgstr "`scalar list` 不带参数" + +#: scalar.c +msgid "scalar register [<enlistment>]" +msgstr "scalar register [<登记>]" + +#: scalar.c +msgid "reconfigure all registered enlistments" +msgstr "重新配置所有注册的登记" + +#: scalar.c +msgid "scalar reconfigure [--all | <enlistment>]" +msgstr "scalar reconfigure [--all | <登记>]" + +#: scalar.c +msgid "--all or <enlistment>, but not both" +msgstr "--all 或者 <登记>，而不是两个一起" + +#: scalar.c +#, c-format +msgid "git repository gone in '%s'" +msgstr "在 '%s' 的 git 仓库已消失" + +#: scalar.c +msgid "" +"scalar run <task> [<enlistment>]\n" +"Tasks:\n" +msgstr "" +"scalar run <任务> [<登记>]\n" +"任务：\n" + +#: scalar.c +#, c-format +msgid "no such task: '%s'" +msgstr "没有此任务：'%s'" + +#: scalar.c +msgid "scalar unregister [<enlistment>]" +msgstr "scalar unregister [<登记>]" + +#: scalar.c +msgid "scalar delete <enlistment>" +msgstr "scalar delete <登记>" + +#: scalar.c +msgid "refusing to delete current working directory" +msgstr "拒绝删除当前工作目录" + +#: scalar.c +msgid "include Git version" +msgstr "包括 Git 的版本" + +#: scalar.c +msgid "include Git's build options" +msgstr "包括 Git 的构建选项" + +#: scalar.c +msgid "scalar verbose [-v | --verbose] [--build-options]" +msgstr "scalar verbose [-v | --verbose] [--build-options]" + +#: scalar.c +msgid "-C requires a <directory>" +msgstr "-C 需要 <目录>" + +#: scalar.c +#, c-format +msgid "could not change to '%s'" +msgstr "无法变更到 '%s'" + +#: scalar.c +msgid "-c requires a <key>=<value> argument" +msgstr "-c 需要 <键>=<值> 参数" + +#: scalar.c +msgid "" +"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n" +"\n" +"Commands:\n" +msgstr "" +"scalar [-C <目录>] [-c <键>=<值>] <命令> [<选项>]\n" +"\n" +"命令：\n" + #: send-pack.c msgid "unexpected flush packet while reading remote unpack status" msgstr "读取远程解包状态时收到意外的 flush 包" @@ -23308,11 +23856,6 @@ msgstr "您的本地修改将被%s覆盖。" msgid "commit your changes or stash them to proceed." msgstr "提交您的修改或贮藏后再继续。" -#: sequencer.c -#, c-format -msgid "%s: fast-forward" -msgstr "%s：快进" - #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase". #. @@ -23900,6 +24443,30 @@ msgid "merge: Unable to write new index file" msgstr "合并：无法写入新索引文件" #: sequencer.c +#, c-format +msgid "" +"another 'rebase' process appears to be running; '%s.lock' already exists" +msgstr "另一个 'rebase' 进程似乎在运行；'%s.lock' 已存在" + +#: sequencer.c +#, c-format +msgid "" +"Updated the following refs with %s:\n" +"%s" +msgstr "" +"已用 %s 更新下列引用：\n" +"%s" + +#: sequencer.c +#, c-format +msgid "" +"Failed to update the following refs with %s:\n" +"%s" +msgstr "" +"无法用 %s 更新下列引用：\n" +"%s" + +#: sequencer.c msgid "Cannot autostash" msgstr "无法自动贮藏" @@ -24101,6 +24668,11 @@ msgstr "无法跳过不必要的拣选" msgid "the script was already rearranged." msgstr "脚本已经重新编排。" +#: sequencer.c +#, c-format +msgid "update-refs file at '%s' is invalid" +msgstr "位于 '%s' 的 update-refs 文件无效" + #: setup.c #, c-format msgid "'%s' is outside repository at '%s'" @@ -24243,18 +24815,23 @@ msgstr "" #: setup.c #, c-format msgid "" -"unsafe repository ('%s' is owned by someone else)\n" -"To add an exception for this directory, call:\n" +"detected dubious ownership in repository at '%s'\n" +"%sTo add an exception for this directory, call:\n" "\n" "\tgit config --global --add safe.directory %s" msgstr "" -"仓库不安全（'%s' 的所有者是其他人）\n" -"要为本仓库创建特例，请使用：\n" +"在 '%s' 检测到可疑的仓库所有权\n" +"%s要为本仓库创建特例，请运行：\n" "\n" "\tgit config --global --add safe.directory %s" #: setup.c #, c-format +msgid "cannot use bare repository '%s' (safe.bareRepository is '%s')" +msgstr "无法使用纯仓库 '%s' （safe.bareRepository 为 '%s'）" + +#: setup.c +#, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" "The owner of files must always have read and write permissions." @@ -25278,6 +25855,22 @@ msgstr "无效的端口号" msgid "invalid '..' path segment" msgstr "无效的 '..' 路径片段" +#: usage.c +msgid "usage: " +msgstr "用法：" + +#: usage.c +msgid "fatal: " +msgstr "致命错误：" + +#: usage.c +msgid "error: " +msgstr "错误：" + +#: usage.c +msgid "warning: " +msgstr "警告：" + #: walker.c msgid "Fetching objects" msgstr "正在获取对象" @@ -25970,7 +26563,7 @@ msgstr "另外，您的索引中包含未提交的变更。" msgid "cannot %s: Your index contains uncommitted changes." msgstr "不能%s：您的索引中包含未提交的变更。" -#: git-merge-octopus.sh +#: git-merge-octopus.sh git-merge-resolve.sh msgid "" "Error: Your local changes to the following files would be overwritten by " "merge" @@ -26259,26 +26852,6 @@ msgid "ignoring unmerged: %s\n" msgstr "忽略未合入的：%s\n" #: git-add--interactive.perl -#, perl-format -msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " -msgstr "将模式变更应用到工作区 [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl -#, perl-format -msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " -msgstr "将删除操作应用到工作区 [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl -#, perl-format -msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " -msgstr "将添加操作应用到工作区 [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl -#, perl-format -msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " -msgstr "将该块应用到工作区 [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl msgid "No other hunks to goto\n" msgstr "没有其它可供跳转的块\n" diff --git a/po/zh_TW.po b/po/zh_TW.po index 2f7d01c..29b8089 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -22,8 +22,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2022-06-23 21:13+0800\n" -"PO-Revision-Date: 2022-06-23 23:02+0800\n" +"POT-Creation-Date: 2022-09-23 21:57+0000\n" +"PO-Revision-Date: 2022-10-01 19:02+0800\n" "Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n" "Language-Team: Chinese (Traditional) <http://weblate.slat.org/projects/git-" "po/git-cli/zh_Hant/>\n" @@ -32,7 +32,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.1\n" +"X-Generator: Poedit 3.1.1\n" "X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://" "zhconvert.org\n" @@ -41,7 +41,7 @@ msgstr "" msgid "Huh (%s)?" msgstr "嗯（%s）？" -#: add-interactive.c builtin/rebase.c reset.c sequencer.c +#: add-interactive.c builtin/merge.c builtin/rebase.c reset.c sequencer.c msgid "could not read index" msgstr "無法讀取索引" @@ -219,8 +219,8 @@ msgid "unstaged" msgstr "未快取" #: add-interactive.c apply.c builtin/am.c builtin/bugreport.c builtin/clone.c -#: builtin/fetch.c builtin/merge.c builtin/pull.c builtin/submodule--helper.c -#: git-add--interactive.perl +#: builtin/diagnose.c builtin/fetch.c builtin/merge.c builtin/pull.c +#: builtin/submodule--helper.c git-add--interactive.perl msgid "path" msgstr "路徑" @@ -501,6 +501,26 @@ msgstr "" "a - 套用此區塊和本檔案中後面的全部區塊\n" "d - 不要套用此區塊和本檔案中後面的全部區塊\n" +#: add-patch.c git-add--interactive.perl +#, c-format, perl-format +msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " +msgstr "將模式變更套用到工作區 [y,n,q,a,d%s,?]? " + +#: add-patch.c git-add--interactive.perl +#, c-format, perl-format +msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " +msgstr "將刪除變更套用到工作區 [y,n,q,a,d%s,?]? " + +#: add-patch.c git-add--interactive.perl +#, c-format, perl-format +msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " +msgstr "將新增變更套用到工作區 [y,n,q,a,d%s,?]? " + +#: add-patch.c git-add--interactive.perl +#, c-format, perl-format +msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " +msgstr "將此區塊套用到工作區 [y,n,q,a,d%s,?]? " + #: add-patch.c msgid "" "y - apply this hunk to worktree\n" @@ -521,11 +541,6 @@ msgid "could not parse hunk header '%.*s'" msgstr "無法解析區塊標頭 '%.*s'" #: add-patch.c -#, c-format -msgid "could not parse colored hunk header '%.*s'" -msgstr "無法解析上色過的區塊標頭 '%.*s'" - -#: add-patch.c msgid "could not parse diff" msgstr "無法解析差異 (diff)" @@ -589,6 +604,7 @@ msgstr "" "要刪除 '%c' 開始的行，刪除它們。\n" "以 %c 開始的行將被刪除。\n" +#. #-#-#-#-# git-add--interactive.perl.po #-#-#-#-# #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. #: add-patch.c git-add--interactive.perl msgid "" @@ -608,12 +624,14 @@ msgstr "無法解析區塊標頭" msgid "'git apply --cached' failed" msgstr "「git apply --cached」失敗" +#. #-#-#-#-# add-patch.c.po #-#-#-#-# #. TRANSLATORS: do not translate [y/n] #. The program will only accept that input at this point. #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. #. +#. #-#-#-#-# git-add--interactive.perl.po #-#-#-#-# #. TRANSLATORS: do not translate [y/n] #. The program will only accept that input #. at this point. @@ -852,6 +870,26 @@ msgstr "" "將組態變數 advice.detachedHead 設定為 false，即可關閉本建議\n" "\n" +#: advice.c +#, c-format +msgid "" +"The following paths have been moved outside the\n" +"sparse-checkout definition but are not sparse due to local\n" +"modifications.\n" +msgstr "" +"以下路徑已經移到稀疏簽出定義之外的地方，\n" +"但因為有本機更動，因此路徑不是稀疏的。\n" + +#: advice.c +msgid "" +"To correct the sparsity of these paths, do the following:\n" +"* Use \"git add --sparse <paths>\" to update the index\n" +"* Use \"git sparse-checkout reapply\" to apply the sparsity rules" +msgstr "" +"若要更正這些路徑的稀疏狀態，請：\n" +"* 使用 `git add --sparse <路徑>` 更新索引\n" +"* 使用 `git sparse-checkout reapply` 套用稀疏規則" + #: alias.c msgid "cmdline ends with \\" msgstr "指令列以 \\ 結尾" @@ -1081,7 +1119,7 @@ msgstr "到 '%s' 的二進位修補檔產生了不正確的結果（應為 %s， msgid "patch failed: %s:%ld" msgstr "打修補檔失敗：%s:%ld" -#: apply.c +#: apply.c builtin/mv.c #, c-format msgid "cannot checkout %s" msgstr "不能簽出 %s" @@ -1470,6 +1508,11 @@ msgstr "不能開啟資料物件 %s" msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "不支援的檔案模式：0%o (SHA1: %s)" +#: archive-tar.c archive-zip.c builtin/pack-objects.c +#, c-format +msgid "deflate error (%d)" +msgstr "壓縮錯誤 (%d)" + #: archive-tar.c #, c-format msgid "unable to start '%s' filter" @@ -1494,11 +1537,6 @@ msgstr "路徑不是有效的 UTF-8：%s" msgid "path too long (%d chars, SHA1: %s): %s" msgstr "路徑太長（%d 字元，SHA1：%s）：%s" -#: archive-zip.c builtin/pack-objects.c -#, c-format -msgid "deflate error (%d)" -msgstr "壓縮錯誤 (%d)" - #: archive-zip.c #, c-format msgid "timestamp too large for this system: %<PRIuMAX>" @@ -1812,8 +1850,8 @@ msgid "--reverse and --first-parent together require specified latest commit" msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交" #: blame.c builtin/commit.c builtin/log.c builtin/merge.c -#: builtin/pack-objects.c builtin/shortlog.c bundle.c midx.c ref-filter.c -#: remote.c sequencer.c submodule.c +#: builtin/pack-objects.c builtin/shortlog.c bundle.c midx.c pack-bitmap.c +#: ref-filter.c remote.c sequencer.c submodule.c msgid "revision walk setup failed" msgstr "版本遍歷設定失敗" @@ -1888,10 +1926,12 @@ 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 @@ -2272,7 +2312,7 @@ msgstr "fseek 失敗" msgid "could not open '%s' for reading" msgstr "無法開啟 '%s' 進行讀取" -#: builtin/am.c builtin/rebase.c strbuf.c wrapper.c +#: builtin/am.c builtin/rebase.c sequencer.c strbuf.c wrapper.c #, c-format msgid "could not open '%s' for writing" msgstr "無法開啟 '%s' 進行寫入" @@ -2574,8 +2614,8 @@ msgid "n" msgstr "n" #: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c -#: builtin/for-each-ref.c builtin/ls-tree.c builtin/replace.c builtin/tag.c -#: builtin/verify-tag.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 msgid "format" msgstr "格式" @@ -2678,7 +2718,7 @@ msgstr "互動式模式需要指令列上提供修補檔" msgid "git apply [<options>] [<patch>...]" msgstr "git apply [<選項>] [<修補檔>...]" -#: builtin/archive.c contrib/scalar/scalar.c +#: builtin/archive.c diagnose.c msgid "could not redirect output" msgstr "不能重定向輸出" @@ -3561,8 +3601,8 @@ msgstr "排序和過濾屬於大小寫不敏感" msgid "recurse through submodules" msgstr "在子模組中遞迴" -#: builtin/branch.c builtin/for-each-ref.c builtin/ls-tree.c builtin/tag.c -#: builtin/verify-tag.c +#: builtin/branch.c builtin/for-each-ref.c builtin/ls-files.c builtin/ls-tree.c +#: builtin/tag.c builtin/verify-tag.c msgid "format to use for the output" msgstr "輸出格式" @@ -3685,8 +3725,12 @@ msgid "not run from a git repository - no hooks to show\n" msgstr "不是從 git 版本庫執行 - 沒有可顯示的掛鉤\n" #: builtin/bugreport.c -msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]" -msgstr "git bugreport [-o|--output-directory <檔案>] [-s|--suffix <格式>]" +msgid "" +"git bugreport [-o|--output-directory <file>] [-s|--suffix <format>] [--" +"diagnose[=<mode>]" +msgstr "" +"git bugreport [-o|--output-directory <file>] [-s|--suffix <format>] [--" +"diagnose[=<mode>]" #: builtin/bugreport.c msgid "" @@ -3722,19 +3766,34 @@ msgstr "" "請檢閱臭蟲報告下方的剩餘部分。\n" "您可刪除任何您不想分享的地方。\n" +#: builtin/bugreport.c builtin/commit.c builtin/fast-export.c builtin/rebase.c +#: parse-options.h +msgid "mode" +msgstr "模式" + #: builtin/bugreport.c -msgid "specify a destination for the bugreport file" -msgstr "請指定 bugreport 檔案的目的地" +msgid "" +"create an additional zip archive of detailed diagnostics (default 'stats')" +msgstr "建立詳細診斷資訊的額外 zip 封存檔案（預設值是 “stats”）" #: builtin/bugreport.c -msgid "specify a strftime format suffix for the filename" -msgstr "請指定檔案名稱的 strftime 格式後綴" +msgid "specify a destination for the bugreport file(s)" +msgstr "指定錯誤報告檔案的目的地" #: builtin/bugreport.c +msgid "specify a strftime format suffix for the filename(s)" +msgstr "指定檔名，strftime 格式的後綴" + +#: builtin/bugreport.c builtin/diagnose.c #, c-format msgid "could not create leading directories for '%s'" msgstr "無法建立 '%s' 的前置目錄" +#: builtin/bugreport.c builtin/diagnose.c +#, c-format +msgid "unable to create diagnostics archive %s" +msgstr "無法建立 %s 診斷封存檔" + #: builtin/bugreport.c msgid "System Info" msgstr "系統資訊" @@ -3810,11 +3869,6 @@ msgstr "需要版本庫才能拆分套件。" msgid "Unbundling objects" msgstr "正在解包物件" -#: builtin/bundle.c builtin/remote.c -#, c-format -msgid "Unknown subcommand: %s" -msgstr "未知子指令：%s" - #: builtin/cat-file.c merge-recursive.c #, c-format msgid "cannot read object %s '%s'" @@ -3912,6 +3966,10 @@ msgstr "顯示物件大小" msgid "allow -s and -t to work with broken/corrupt objects" msgstr "允許 -s 和 -t 對損壞的物件生效" +#: builtin/cat-file.c builtin/log.c +msgid "use mail map file" +msgstr "使用信件映射檔案" + #: builtin/cat-file.c msgid "Batch objects requested on stdin (or --batch-all-objects)" msgstr "批次處理 stdin 上請求的物件（或 --batch-all-objects）" @@ -3925,6 +3983,10 @@ msgid "like --batch, but don't emit <contents>" msgstr "類似 --batch 但不輸出 <contents>" #: builtin/cat-file.c +msgid "stdin is NUL-terminated" +msgstr "標準輸入的結尾是 NUL" + +#: builtin/cat-file.c msgid "read commands from stdin" msgstr "從標準輸入讀取命令" @@ -4992,6 +5054,14 @@ msgid "initialize sparse-checkout file to include only files at root" msgstr "初始化稀疏簽出檔案，只包含根目錄中的檔案" #: builtin/clone.c +msgid "uri" +msgstr "uri" + +#: builtin/clone.c +msgid "a URI for downloading bundles before fetching from origin remote" +msgstr "在從 origin 遠端抓取前，用來下載套件的 URI" + +#: builtin/clone.c #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: 不能為 '%s' 新增一個備用：%s\n" @@ -5065,8 +5135,8 @@ msgid "failed to initialize sparse-checkout" msgstr "無法初始化稀疏簽出" #: builtin/clone.c -msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" -msgstr "遠端 HEAD 指向一個不存在的引用，無法簽出。\n" +msgid "remote HEAD refers to nonexistent ref, unable to checkout" +msgstr "遠端 HEAD 指向不存在的引用，無法簽出" #: builtin/clone.c msgid "unable to checkout working tree" @@ -5088,7 +5158,7 @@ msgstr "無法刪除暫時的 alternates 檔案" msgid "Too many arguments." msgstr "太多參數。" -#: builtin/clone.c contrib/scalar/scalar.c +#: builtin/clone.c scalar.c msgid "You must specify a repository to clone." msgstr "您必須指定要複製的版本庫。" @@ -5098,6 +5168,12 @@ msgid "options '%s' and '%s %s' cannot be used together" msgstr "「%s」和「%s %s」選項不得同時使用" #: 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 #, c-format msgid "repository '%s' does not exist" msgstr "版本庫 '%s' 不存在" @@ -5186,6 +5262,15 @@ msgid "cannot clone from filtered bundle" msgstr "無法從過濾後的套件複製" #: builtin/clone.c +msgid "failed to initialize the repo, skipping bundle URI" +msgstr "無法初始化版本庫，略過套件 URI" + +#: builtin/clone.c +#, c-format +msgid "failed to fetch objects from bundle URI '%s'" +msgstr "無法從套件 URL “%s” 抓取物件" + +#: builtin/clone.c msgid "remote transport reported error" msgstr "遠端傳輸回報錯誤" @@ -5332,11 +5417,6 @@ msgstr "不能同時使用 --reachable、--stdin-commits 或 --stdin-packs" msgid "Collecting commits from input" msgstr "正在從輸入收集提交" -#: builtin/commit-graph.c builtin/multi-pack-index.c -#, c-format -msgid "unrecognized subcommand: %s" -msgstr "未識別的子指令：%s" - #: builtin/commit-tree.c msgid "" "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " @@ -5769,10 +5849,6 @@ msgstr "以長格式顯示狀態（預設）" msgid "terminate entries with NUL" msgstr "條目以 NUL 字元結尾" -#: builtin/commit.c builtin/fast-export.c builtin/rebase.c parse-options.h -msgid "mode" -msgstr "模式" - #: builtin/commit.c msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "顯示未追蹤的檔案，「模式」的可選參數：all、normal、no。（預設值：all）" @@ -6513,6 +6589,26 @@ msgstr "沒有發現名稱，無法描述任何東西。" msgid "option '%s' and commit-ishes cannot be used together" msgstr "「%s」選項和提交號不得同時使用" +#: builtin/diagnose.c +msgid "" +"git diagnose [-o|--output-directory <path>] [-s|--suffix <format>] [--" +"mode=<mode>]" +msgstr "" +"git diagnose [-o|--output-directory <path>] [-s|--suffix <format>] [--" +"mode=<mode>]" + +#: builtin/diagnose.c +msgid "specify a destination for the diagnostics archive" +msgstr "指定診斷封存檔的目的地" + +#: builtin/diagnose.c +msgid "specify a strftime format suffix for the filename" +msgstr "請指定檔案名稱的 strftime 格式後綴" + +#: builtin/diagnose.c +msgid "specify the content of the diagnostic archive" +msgstr "指定診斷封存檔的內容" + #: builtin/diff-tree.c msgid "--merge-base only works with two commits" msgstr "--merge-base 只對 2 個以上的提交有用" @@ -6984,12 +7080,8 @@ msgid "[rejected]" msgstr "[已拒絕]" #: builtin/fetch.c -msgid "can't fetch in current branch" -msgstr "目前分支下不能執行取得動作" - -#: builtin/fetch.c -msgid "checked out in another worktree" -msgstr "已在其他工作區簽出" +msgid "can't fetch into checked-out branch" +msgstr "無法抓取至已簽出分支" #: builtin/fetch.c msgid "[tag update]" @@ -7531,6 +7623,11 @@ msgid "non-tree in cache-tree" msgstr "cache-tree 中非樹狀物件" #: builtin/fsck.c +#, c-format +msgid "%s: invalid sha1 pointer in resolve-undo" +msgstr "%s：resolve-undo 的 sha1 指針無效" + +#: builtin/fsck.c msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<選項>] [<物件>...]" @@ -7946,12 +8043,16 @@ msgid "failed to run 'crontab -l'; your system might not support 'cron'" msgstr "無法執行 “crontab -l”；您的系統可能不支援 “cron”" #: builtin/gc.c -msgid "failed to run 'crontab'; your system might not support 'cron'" -msgstr "無法執行 “crontab”；您的系統可能不支援 “cron”" +msgid "failed to create crontab temporary file" +msgstr "無法建立 crontab 暫存檔" #: builtin/gc.c -msgid "failed to open stdin of 'crontab'" -msgstr "無法開啟 ‘crontab’ 的標準輸入" +msgid "failed to open temporary file" +msgstr "無法開啟暫存檔" + +#: builtin/gc.c +msgid "failed to run 'crontab'; your system might not support 'cron'" +msgstr "無法執行 “crontab”；您的系統可能不支援 “cron”" #: builtin/gc.c msgid "'crontab' died" @@ -8013,11 +8114,6 @@ msgstr "無法將版本庫加至全域設定" msgid "git maintenance <subcommand> [<options>]" msgstr "git maintenance <子命令> [<選項>]" -#: builtin/gc.c -#, c-format -msgid "invalid subcommand: %s" -msgstr "無效子命令：%s" - #: builtin/grep.c msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<選項>] [-e] <模式> [<版本>...] [[--] <路徑>...]" @@ -8032,6 +8128,7 @@ msgstr "grep：無法建立執行緒：%s" msgid "invalid number of threads specified (%d) for %s" msgstr "為 %2$s 設定的執行緒數 (%1$d) 無效" +#. #-#-#-#-# grep.c.po #-#-#-#-# #. TRANSLATORS: %s is the configuration #. variable for tweaking threads, currently #. grep.threads @@ -8242,6 +8339,10 @@ msgid "allow calling of grep(1) (ignored by this build)" msgstr "允許呼叫 grep(1)（本次組建忽略）" #: builtin/grep.c +msgid "maximum number of results per file" +msgstr "每個檔案的最多結果數" + +#: builtin/grep.c msgid "no pattern given" msgstr "未提供符合模式" @@ -8353,12 +8454,20 @@ msgid "print list of useful guides" msgstr "顯示有用的指南列表" #: builtin/help.c +msgid "print list of user-facing repository, command and file interfaces" +msgstr "輸出面向使用者的版本庫、命令，和檔案介面清單" + +#: builtin/help.c +msgid "print list of file formats, protocols and other developer interfaces" +msgstr "輸出檔案格式、通訊協定和其他開發者介面的清單" + +#: builtin/help.c msgid "print all configuration variable names" msgstr "列印所有設定變數名稱" #: builtin/help.c -msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]" -msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]" +msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>|<doc>]" +msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>|<doc>]" #: builtin/help.c #, c-format @@ -8943,8 +9052,8 @@ msgid "show source" msgstr "顯示來源" #: builtin/log.c -msgid "use mail map file" -msgstr "使用信件映射檔案" +msgid "clear all previously-defined decoration filters" +msgstr "清除所有先前定義的裝飾過濾器" #: builtin/log.c msgid "only decorate refs that match <pattern>" @@ -9270,6 +9379,10 @@ msgid "percentage by which creation is weighted" msgstr "建立權重的百分比" #: builtin/log.c +msgid "show in-body From: even if identical to the e-mail header" +msgstr "顯示內文中的 From：即便和信件標頭的值相同" + +#: builtin/log.c #, c-format msgid "invalid ident line: %s" msgstr "包含無效的身份標記：%s" @@ -9345,10 +9458,25 @@ msgid "" msgstr "不能找到追蹤的遠端分支，請手動指定 <上游>。\n" #: builtin/ls-files.c +#, c-format +msgid "bad ls-files format: element '%s' does not start with '('" +msgstr "ls-files 格式錯誤：“%s” 元素不以 “(” 開頭" + +#: builtin/ls-files.c +#, c-format +msgid "bad ls-files format: element '%s' does not end in ')'" +msgstr "ls-files 格式錯誤：“%s” 元素不以 “)” 結尾" + +#: builtin/ls-files.c +#, c-format +msgid "bad ls-files format: %%%.*s" +msgstr "ls-files 格式錯誤：%%%.*s" + +#: builtin/ls-files.c msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<選項>] [<檔案>...]" -#: builtin/ls-files.c +#: builtin/ls-files.c builtin/merge-tree.c msgid "separate paths with the NUL character" msgstr "用 NUL 字元分隔路徑" @@ -9456,6 +9584,13 @@ msgstr "不顯示重複項目" msgid "show sparse directories in the presence of a sparse index" msgstr "在稀疏索引存在時顯示稀疏目錄" +#: builtin/ls-files.c +msgid "" +"--format cannot be used with -s, -o, -k, -t, --resolve-undo, --deduplicate, " +"--eol" +msgstr "" +"--format 不能和 -s、-o、-k、-t、--resolve-undo、--deduplicate、--eol 一起使用" + #: builtin/ls-remote.c msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" @@ -9738,6 +9873,50 @@ msgstr "無法解析引用 '%s'" msgid "Merging %s with %s\n" msgstr "合併 %s 和 %s\n" +#: builtin/merge-tree.c builtin/merge.c +msgid "not something we can merge" +msgstr "不能合併" + +#: builtin/merge-tree.c builtin/merge.c +msgid "refusing to merge unrelated histories" +msgstr "拒絕合併無關的歷史" + +#: builtin/merge-tree.c +msgid "failure to merge" +msgstr "合併時發生錯誤" + +#: builtin/merge-tree.c +msgid "git merge-tree [--write-tree] [<options>] <branch1> <branch2>" +msgstr "git merge-tree [--write-tree] [<options>] <branch1> <branch2>" + +#: builtin/merge-tree.c +msgid "git merge-tree [--trivial-merge] <base-tree> <branch1> <branch2>" +msgstr "git merge-tree [--trivial-merge] <base-tree> <branch1> <branch2>" + +#: builtin/merge-tree.c +msgid "do a real merge instead of a trivial merge" +msgstr "執行真實合併，而非簡易合併" + +#: builtin/merge-tree.c +msgid "do a trivial merge only" +msgstr "只執行簡易合併" + +#: builtin/merge-tree.c +msgid "also show informational/conflict messages" +msgstr "亦顯示資訊性或衝突訊息" + +#: builtin/merge-tree.c +msgid "list filenames without modes/oids/stages" +msgstr "列出檔名，但不附加 modes/oids/stages" + +#: builtin/merge-tree.c builtin/merge.c builtin/pull.c +msgid "allow merging unrelated histories" +msgstr "允許合並不相關的歷史" + +#: builtin/merge-tree.c +msgid "--trivial-merge is incompatible with all other options" +msgstr "--trivial-merge 和其他所有選項都不相容" + #: builtin/merge.c msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<選項>] [<提交>...]" @@ -9844,10 +10023,6 @@ msgstr "--abort，但是保留索引和工作區" msgid "continue the current in-progress merge" msgstr "繼續目前正在進行的合併" -#: builtin/merge.c builtin/pull.c -msgid "allow merging unrelated histories" -msgstr "允許合並不相關的歷史" - #: builtin/merge.c msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "繞過 pre-merge-commit 和 commit-msg 掛鉤" @@ -9994,10 +10169,6 @@ msgid "not something we can merge in %s: %s" msgstr "不能在 %s 中合併：%s" #: builtin/merge.c -msgid "not something we can merge" -msgstr "不能合併" - -#: builtin/merge.c msgid "--abort expects no arguments" msgstr "--abort 不帶參數" @@ -10059,14 +10230,19 @@ msgid "Can merge only exactly one commit into empty head" msgstr "只能將一個提交合並到空分支上" #: builtin/merge.c -msgid "refusing to merge unrelated histories" -msgstr "拒絕合併無關的歷史" - -#: builtin/merge.c #, c-format msgid "Updating %s..%s\n" msgstr "更新 %s..%s\n" +#: builtin/merge.c merge-ort-wrappers.c merge-recursive.c +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" +"您對下列檔案的本機修改將被合併動作覆蓋：\n" +" %s" + #: builtin/merge.c #, c-format msgid "Trying really trivial in-index merge...\n" @@ -10107,6 +10283,11 @@ msgstr "使用 %s 策略，準備自行解決。\n" msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "自動合併進展順利，按要求在提交前停止\n" +#: builtin/merge.c +#, c-format +msgid "When finished, apply stashed changes with `git stash pop`\n" +msgstr "完成時，使用 `git stash pop` 套用儲藏更改\n" + #: builtin/mktag.c #, c-format msgid "warning: tag input does not pass fsck: %s" @@ -10255,6 +10436,10 @@ msgid "bad source" msgstr "來源損壞" #: builtin/mv.c +msgid "destination exists" +msgstr "目的地已存在" + +#: builtin/mv.c msgid "can not move directory into itself" msgstr "不能將目錄移動到自身" @@ -10275,10 +10460,6 @@ msgid "conflicted" msgstr "衝突" #: builtin/mv.c -msgid "destination exists" -msgstr "目的地已存在" - -#: builtin/mv.c #, c-format msgid "overwriting '%s'" msgstr "覆蓋 '%s'" @@ -10296,6 +10477,10 @@ msgid "destination directory does not exist" msgstr "找不到目的地目錄" #: builtin/mv.c +msgid "destination exists in the index" +msgstr "目的地已存在索引" + +#: builtin/mv.c #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s，來源=%s，目的地=%s" @@ -10737,10 +10922,10 @@ msgstr "註解引用" msgid "use notes from <notes-ref>" msgstr "從 <註解引用> 使用註解" -#: builtin/notes.c builtin/stash.c +#: builtin/notes.c builtin/remote.c parse-options.c #, c-format -msgid "unknown subcommand: %s" -msgstr "未知子指令：%s" +msgid "unknown subcommand: `%s'" +msgstr "未知子指令：「%s」" #: builtin/pack-objects.c msgid "" @@ -11339,7 +11524,7 @@ msgstr "詳見 git-pull(1)。" msgid "<remote>" msgstr "<遠端>" -#: builtin/pull.c contrib/scalar/scalar.c +#: builtin/pull.c scalar.c msgid "<branch>" msgstr "<分支>" @@ -11795,12 +11980,18 @@ msgstr "只發出跟第二個範圍相關的輸出" #: builtin/range-diff.c #, c-format +msgid "not a revision: '%s'" +msgstr "非修訂版：「%s」" + +#: builtin/range-diff.c +#, c-format msgid "not a commit range: '%s'" msgstr "不是提交範圍：「%s」" #: builtin/range-diff.c -msgid "single arg format must be symmetric range" -msgstr "單個參數格式必須是對稱範圍（即包含...）" +#, c-format +msgid "not a symmetric range: '%s'" +msgstr "不是對稱範圍：「%s」" #: builtin/range-diff.c msgid "need two commit ranges" @@ -12136,6 +12327,10 @@ msgid "move commits that begin with squash!/fixup! under -i" msgstr "在 -i 互動模式下，移動以 squash!/fixup! 開頭的提交" #: builtin/rebase.c +msgid "update branches that point to commits that are being rebased" +msgstr "更新指向正在重定基底的提交之分支" + +#: builtin/rebase.c msgid "add exec lines after each commit of the editable list" msgstr "可編輯列表的每一個提交下面增加一行 exec" @@ -12758,6 +12953,10 @@ msgid " tracked" msgstr " 已追蹤" #: builtin/remote.c +msgid " skipped" +msgstr " 略過" + +#: builtin/remote.c msgid " stale (use 'git remote prune' to remove)" msgstr " 過時（使用 'git remote prune' 移除）" @@ -13599,12 +13798,17 @@ msgstr "不能重設索引檔案至版本 '%s'。" msgid "Could not write new index file." msgstr "不能寫入新的索引檔案。" -#: builtin/rev-list.c pack-bitmap.c +#: builtin/rev-list.c #, c-format msgid "unable to get disk usage of %s" msgstr "無法取得 %s 的磁碟用量" #: builtin/rev-list.c +#, c-format +msgid "invalid value for '%s': '%s', the only allowed format is '%s'" +msgstr "「%s」的數值無效：「%s」，唯一允許的格式是「%s」" + +#: builtin/rev-list.c msgid "rev-list does not support display of notes" msgstr "rev-list 不支援顯示註解" @@ -13638,6 +13842,10 @@ msgid "no usage string given before the `--' separator" msgstr "「--」分隔符號前未提供用法字串" #: builtin/rev-parse.c +msgid "missing opt-spec before option flags" +msgstr "選項旗標前缺少 opt-spec" + +#: builtin/rev-parse.c msgid "Needed a single revision" msgstr "需要一個修訂版本" @@ -14182,7 +14390,7 @@ msgstr "以 cone 模式初始化稀疏簽出" msgid "toggle the use of a sparse index" msgstr "切換是否使用稀疏索引" -#: builtin/sparse-checkout.c commit-graph.c midx.c +#: builtin/sparse-checkout.c commit-graph.c midx.c sequencer.c #, c-format msgid "unable to create leading directories of %s" msgstr "不能為 %s 建立先導目錄" @@ -14579,20 +14787,17 @@ msgstr "期望一個完整的引用名稱，卻得到 %s" #: builtin/submodule--helper.c #, c-format +msgid "could not get a repository handle for submodule '%s'" +msgstr "無法獲得子模組 '%s' 的版本庫句柄" + +#: builtin/submodule--helper.c +#, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " "authoritative upstream." msgstr "無法找到設定 '%s'。假定這個版本庫是其自身的官方上游。" #: builtin/submodule--helper.c -msgid "alternative anchor for relative paths" -msgstr "相對路徑的替代錨記（anchor）" - -#: builtin/submodule--helper.c -msgid "git submodule--helper list [--prefix=<path>] [<path>...]" -msgstr "git submodule--helper list [--prefix=<路徑>] [<路徑>...]" - -#: builtin/submodule--helper.c #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "在 .gitmodules 中未找到子模組 '%s' 的 url" @@ -14630,8 +14835,8 @@ msgid "recurse into nested submodules" msgstr "遞迴進入嵌套子模組中" #: builtin/submodule--helper.c -msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" -msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <命令>" +msgid "git submodule foreach [--quiet] [--recursive] [--] <command>" +msgstr "git submodule foreach [--quiet] [--recursive] [--] <command>" #: builtin/submodule--helper.c #, c-format @@ -14658,8 +14863,8 @@ msgid "suppress output for initializing a submodule" msgstr "隱藏初始化子模組的輸出" #: builtin/submodule--helper.c -msgid "git submodule--helper init [<options>] [<path>]" -msgstr "git submodule--helper init [<選項>] [<路徑>]" +msgid "git submodule init [<options>] [<path>]" +msgstr "git submodule init [<options>] [<path>]" #: builtin/submodule--helper.c #, c-format @@ -14691,10 +14896,6 @@ msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路徑>...]" #: builtin/submodule--helper.c -msgid "git submodule--helper name <path>" -msgstr "git submodule--helper name <路徑>" - -#: builtin/submodule--helper.c #, c-format msgid "* %s %s(blob)->%s(submodule)" msgstr "* %s %s(blob)->%s(submodule)" @@ -14736,8 +14937,8 @@ msgid "limit the summary size" msgstr "限制摘要大小" #: builtin/submodule--helper.c -msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" -msgstr "git submodule--helper summary [<選項>] [<提交>] [--] [<路徑>]" +msgid "git submodule summary [<options>] [<commit>] [--] [<path>]" +msgstr "git submodule summary [<options>] [<commit>] [--] [<path>]" #: builtin/submodule--helper.c msgid "could not fetch a revision for HEAD" @@ -14755,11 +14956,6 @@ msgstr "無法為子模組路徑 '%s' 註冊 url" #: builtin/submodule--helper.c #, c-format -msgid "failed to get the default remote for submodule '%s'" -msgstr "無法得到子模組 '%s' 的預設遠端關聯" - -#: builtin/submodule--helper.c -#, c-format msgid "failed to update remote for submodule '%s'" msgstr "無法為子模組 '%s' 更新遠端關聯" @@ -14768,8 +14964,8 @@ msgid "suppress output of synchronizing submodule url" msgstr "隱藏子模組 URL 同步的輸出" #: builtin/submodule--helper.c -msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" -msgstr "git submodule--helper sync [--quiet] [--recursive] [<路徑>]" +msgid "git submodule sync [--quiet] [--recursive] [<path>]" +msgstr "git submodule sync [--quiet] [--recursive] [<path>]" #: builtin/submodule--helper.c #, c-format @@ -14838,6 +15034,11 @@ msgstr "" #: builtin/submodule--helper.c #, c-format +msgid "could not get a repository handle for gitdir '%s'" +msgstr "無法取得 gitdir “%s” 的版本庫控點" + +#: builtin/submodule--helper.c +#, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "子模組 '%s' 不能新增版本庫備選：%s" @@ -14872,6 +15073,10 @@ msgid "could not get submodule directory for '%s'" msgstr "無法得到 '%s' 的子模組目錄" #: builtin/submodule--helper.c +msgid "alternative anchor for relative paths" +msgstr "相對路徑的替代錨記（anchor）" + +#: builtin/submodule--helper.c msgid "where the new submodule will be cloned to" msgstr "新的子模組將要複製的路徑" @@ -14907,11 +15112,6 @@ msgstr "" #: builtin/submodule--helper.c #, c-format -msgid "Invalid update mode '%s' for submodule path '%s'" -msgstr "子模組 '%2$s' 的更新模式 '%1$s' 無效" - -#: builtin/submodule--helper.c -#, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "為子模組 '%2$s' 設定的更新模式 '%1$s' 無效" @@ -14998,6 +15198,11 @@ msgstr "已經取得「%s」子模組路徑，這個路徑卻未包含「%s」 #: builtin/submodule--helper.c #, c-format +msgid "could not initialize submodule at path '%s'" +msgstr "無法在「%s」路徑初始化子模組" + +#: builtin/submodule--helper.c +#, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " "the superproject is not on any branch" @@ -15005,11 +15210,6 @@ msgstr "子模組（%s）的分支設定為繼承上級專案的分支，但是 #: builtin/submodule--helper.c #, c-format -msgid "could not get a repository handle for submodule '%s'" -msgstr "無法獲得子模組 '%s' 的版本庫句柄" - -#: builtin/submodule--helper.c -#, c-format msgid "Unable to find current revision in submodule path '%s'" msgstr "無法在子模組路徑「%s」中尋找目前的修訂版本" @@ -15053,12 +15253,16 @@ msgid "path into the working tree" msgstr "到工作區的路徑" #: builtin/submodule--helper.c -msgid "path into the working tree, across nested submodule boundaries" -msgstr "工作區中的路徑，遞迴嵌套子模組" +msgid "use the 'checkout' update strategy (default)" +msgstr "使用 “checkout” 更新策略（預設值）" #: builtin/submodule--helper.c -msgid "rebase, merge, checkout or none" -msgstr "rebase、merge、checkout 或 none" +msgid "use the 'merge' update strategy" +msgstr "使用 “merge” 更新策略" + +#: builtin/submodule--helper.c +msgid "use the 'rebase' update strategy" +msgstr "使用 “rebase” 更新策略" #: builtin/submodule--helper.c msgid "create a shallow clone truncated to the specified number of revisions" @@ -15077,6 +15281,10 @@ msgid "don't print cloning progress" msgstr "不要輸出複製進度" #: builtin/submodule--helper.c +msgid "disallow cloning into non-empty directory, implies --init" +msgstr "不允許複製進非空白目錄，隱含 --init" + +#: builtin/submodule--helper.c msgid "" "git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] " "[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-" @@ -15089,16 +15297,12 @@ msgstr "" "[--] [<path>...]" #: builtin/submodule--helper.c -msgid "bad value for update parameter" -msgstr "update 參數取值錯誤" - -#: builtin/submodule--helper.c msgid "recurse into submodules" msgstr "在子模組中遞迴" #: builtin/submodule--helper.c -msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" -msgstr "git submodule--helper absorb-git-dirs [<選項>] [<路徑>...]" +msgid "git submodule absorbgitdirs [<options>] [<path>...]" +msgstr "git submodule absorbgitdirs [<options>] [<path>...]" #: builtin/submodule--helper.c msgid "check if it is safe to write to the .gitmodules file" @@ -15125,8 +15329,8 @@ msgid "suppress output for setting url of a submodule" msgstr "隱藏子模組設定 URL 的輸出" #: builtin/submodule--helper.c -msgid "git submodule--helper set-url [--quiet] <path> <newurl>" -msgstr "git submodule--helper set-url [--quiet] <路徑> <新 URL>" +msgid "git submodule set-url [--quiet] <path> <newurl>" +msgstr "git submodule set-url [--quiet] <path> <newurl>" #: builtin/submodule--helper.c msgid "set the default tracking branch to master" @@ -15137,14 +15341,12 @@ msgid "set the default tracking branch" msgstr "設定預設追蹤分支" #: builtin/submodule--helper.c -msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" -msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" +msgid "git submodule set-branch [-q|--quiet] (-d|--default) <path>" +msgstr "git submodule set-branch [-q|--quiet] (-d|--default) <path>" #: builtin/submodule--helper.c -msgid "" -"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" -msgstr "" -"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" +msgid "git submodule set-branch [-q|--quiet] (-b|--branch) <branch> <path>" +msgstr "git submodule set-branch [-q|--quiet] (-b|--branch) <branch> <path>" #: builtin/submodule--helper.c msgid "--branch or --default required" @@ -15259,8 +15461,8 @@ msgid "" msgstr "將子模組的名稱設為指定字串，而非預設為其路徑" #: builtin/submodule--helper.c -msgid "git submodule--helper add [<options>] [--] <repository> [<path>]" -msgstr "git submodule--helper add [<選項>] [--] <版本庫> [<路徑>]" +msgid "git submodule add [<options>] [--] <repository> [<path>]" +msgstr "git submodule add [<options>] [--] <repository> [<path>]" #: builtin/submodule--helper.c msgid "Relative path can only be used from the toplevel of the working tree" @@ -15514,6 +15716,19 @@ msgid "pack exceeds maximum allowed size" msgstr "包超過了最大允許值" #: builtin/unpack-objects.c +msgid "failed to write object in stream" +msgstr "無法在串流中寫入物件" + +#: builtin/unpack-objects.c +#, c-format +msgid "inflate returned (%d)" +msgstr "inflate 回傳 (%d)" + +#: builtin/unpack-objects.c +msgid "invalid blob object from stream" +msgstr "源自串流的 blob 物件無效" + +#: builtin/unpack-objects.c msgid "Unpacking objects" msgstr "展開物件中" @@ -16153,6 +16368,33 @@ msgstr "將 <前綴> 子目錄內容寫到一個樹狀物件" msgid "only useful for debugging" msgstr "只對除錯有用" +#: bulk-checkin.c +msgid "core.fsyncMethod = batch is unsupported on this platform" +msgstr "core.fsyncMethod = batch 不支援本平台" + +#: bundle-uri.c +msgid "failed to create temporary file" +msgstr "無法建立暫存檔" + +#: bundle-uri.c +msgid "insufficient capabilities" +msgstr "功能不足" + +#: bundle-uri.c +#, c-format +msgid "failed to download bundle from URI '%s'" +msgstr "無法從 “%s” URI 下載套件" + +#: bundle-uri.c +#, c-format +msgid "file at URI '%s' is not a bundle" +msgstr "位於 URI “%s” 的檔案不是套件" + +#: bundle-uri.c +#, c-format +msgid "failed to unbundle bundle from URI '%s'" +msgstr "無法解開源自 URI “%s” 的套件" + #: bundle.c #, c-format msgid "unrecognized bundle hash algorithm: %s" @@ -16414,6 +16656,10 @@ msgid "Give an object a human readable name based on an available ref" msgstr "基於一個現存的引用為一個物件起一個可讀的名稱" #: command-list.h +msgid "Generate a zip archive of diagnostic information" +msgstr "產生診斷資訊的 zip 封存檔" + +#: command-list.h msgid "Show changes between commits, commit and working tree, etc" msgstr "顯示提交之間、提交和工作區之間等的差異" @@ -16582,8 +16828,8 @@ msgid "The standard helper program to use with git-merge-index" msgstr "與 git-merge-index 一起使用的標準嚮導程式" #: command-list.h -msgid "Show three-way merge without touching index" -msgstr "顯示三路合併而不動索引" +msgid "Perform merge without touching index or working tree" +msgstr "在不接觸索引或工作區的情況下執行合併" #: command-list.h msgid "Run merge conflict resolution tools to resolve merge conflicts" @@ -16844,6 +17090,10 @@ msgid "Check the GPG signature of tags" msgstr "檢查標籤的 GPG 簽名" #: command-list.h +msgid "Display version information about Git" +msgstr "顯示 Git 的版本資訊" + +#: command-list.h msgid "Show logs with difference each commit introduces" msgstr "顯示每一個提交引入的差異日誌" @@ -16888,6 +17138,30 @@ msgid "Frequently asked questions about using Git" msgstr "Git 使用的常見問題" #: command-list.h +msgid "The bundle file format" +msgstr "套件檔案格式" + +#: command-list.h +msgid "Chunk-based file formats" +msgstr "以區塊為基礎的檔案格式" + +#: command-list.h +msgid "Git commit graph format" +msgstr "Git 提交圖格式" + +#: command-list.h +msgid "Git index format" +msgstr "Git 索引格式" + +#: command-list.h +msgid "Git pack format" +msgstr "Git 封包格式" + +#: command-list.h +msgid "Git cryptographic signature formats" +msgstr "Git 密碼編譯簽章格式" + +#: command-list.h msgid "A Git Glossary" msgstr "Git 詞彙表" @@ -16916,6 +17190,26 @@ msgid "Git namespaces" msgstr "Git 名字空間" #: command-list.h +msgid "Protocol v0 and v1 capabilities" +msgstr "v0 和 v1 版通訊協定功能" + +#: command-list.h +msgid "Things common to various protocols" +msgstr "各種通訊協定共通的部分" + +#: command-list.h +msgid "Git HTTP-based protocols" +msgstr "Git 以 HTTP 為基礎的通訊協定" + +#: command-list.h +msgid "How packs are transferred over-the-wire" +msgstr "封包在線上傳輸的方式" + +#: command-list.h +msgid "Git Wire Protocol, Version 2" +msgstr "Git Wire 通訊協定，第 2 版" + +#: command-list.h msgid "Helper programs to interact with remote repositories" msgstr "用來與遠端版本庫互動的協助工具" @@ -16947,6 +17241,10 @@ msgstr "Git web 介面（Git 版本庫的 web 前端）" msgid "An overview of recommended workflows with Git" msgstr "Git 推薦的工作流概覽" +#: command-list.h +msgid "A tool for managing large Git repositories" +msgstr "用來管理大型 Git 版本庫的工具" + #: commit-graph.c msgid "commit-graph file is too small" msgstr "提交圖形檔案太小" @@ -17233,6 +17531,16 @@ msgstr "沒有可用的編譯器資訊\n" msgid "no libc information available\n" msgstr "沒有可用的 libc 資訊\n" +#: compat/disk.h +#, c-format +msgid "could not determine free disk size for '%s'" +msgstr "無法判斷 “%s” 的剩餘磁碟大小" + +#: compat/disk.h +#, c-format +msgid "could not get info for '%s'" +msgstr "無法取得 “%s” 的資訊" + #: compat/fsmonitor/fsm-health-win32.c #, c-format msgid "[GLE %ld] health thread could not open '%ls'" @@ -17301,6 +17609,16 @@ msgstr "在 “%s” 上呼叫 GetOverlappedResult 失敗 [GLE %ld]" msgid "could not read directory changes [GLE %ld]" msgstr "無法讀取目錄變化 [GLE %ld]" +#: compat/fsmonitor/fsm-settings-win32.c +#, c-format +msgid "[GLE %ld] unable to open for read '%ls'" +msgstr "[GLE %ld] 無法開啟以讀取「%ls」" + +#: compat/fsmonitor/fsm-settings-win32.c +#, c-format +msgid "[GLE %ld] unable to get protocol information for '%ls'" +msgstr "[GLE %ld] 無法取得「%ls」的通訊協定資訊" + #: compat/mingw.c #, c-format msgid "failed to copy SID (%ld)" @@ -17974,229 +18292,6 @@ msgstr "寫入 rev-list 失敗" msgid "failed to close rev-list's stdin" msgstr "關閉 rev-list 的標準輸入失敗" -#: contrib/scalar/scalar.c worktree.c -#, c-format -msgid "'%s' does not exist" -msgstr "'%s' 不存在" - -#: contrib/scalar/scalar.c -msgid "need a working directory" -msgstr "需要工作目錄" - -#: contrib/scalar/scalar.c -msgid "could not find enlistment root" -msgstr "找不到編列名單的根目錄" - -#: contrib/scalar/scalar.c -#, c-format -msgid "could not switch to '%s'" -msgstr "無法切換至「%s」" - -#: contrib/scalar/scalar.c -#, c-format -msgid "could not configure %s=%s" -msgstr "無法設定 %s=%s" - -#: contrib/scalar/scalar.c -msgid "could not configure log.excludeDecoration" -msgstr "無法設定 log.excludeDecoration" - -#: contrib/scalar/scalar.c -msgid "Scalar enlistments require a worktree" -msgstr "純量編列名單需要工作目錄" - -#: contrib/scalar/scalar.c dir.c -#, c-format -msgid "could not open directory '%s'" -msgstr "不能開啟目錄 '%s'" - -#: contrib/scalar/scalar.c -#, c-format -msgid "skipping '%s', which is neither file nor directory" -msgstr "略過 “%s”，其非檔案或目錄" - -#: contrib/scalar/scalar.c -#, c-format -msgid "could not determine free disk size for '%s'" -msgstr "無法判斷 “%s” 的剩餘磁碟大小" - -#: contrib/scalar/scalar.c -#, c-format -msgid "could not get info for '%s'" -msgstr "無法取得 “%s” 的資訊" - -#: contrib/scalar/scalar.c -#, c-format -msgid "remote HEAD is not a branch: '%.*s'" -msgstr "遠端 HEAD 不是分支：「%.*s」" - -#: contrib/scalar/scalar.c -msgid "failed to get default branch name from remote; using local default" -msgstr "無法從遠端取得預設分支名稱。改用本機預設名稱" - -#: contrib/scalar/scalar.c -msgid "failed to get default branch name" -msgstr "無法取得預設分支名稱" - -#: contrib/scalar/scalar.c -msgid "failed to unregister repository" -msgstr "無法取消註冊版本庫" - -#: contrib/scalar/scalar.c -msgid "failed to delete enlistment directory" -msgstr "無法刪除編列名單目錄" - -#: contrib/scalar/scalar.c -msgid "branch to checkout after clone" -msgstr "複製後要簽出的分支" - -#: contrib/scalar/scalar.c -msgid "when cloning, create full working directory" -msgstr "複製時建立完整的工作目錄" - -#: contrib/scalar/scalar.c -msgid "only download metadata for the branch that will be checked out" -msgstr "只下載會簽出的分支中介資料" - -#: contrib/scalar/scalar.c -msgid "scalar clone [<options>] [--] <repo> [<dir>]" -msgstr "scalar clone [<options>] [--] <repo> [<dir>]" - -#: contrib/scalar/scalar.c -#, c-format -msgid "cannot deduce worktree name from '%s'" -msgstr "無法從「%s」推論工作區名稱" - -#: contrib/scalar/scalar.c -#, c-format -msgid "directory '%s' exists already" -msgstr "「%s」目錄已經存在" - -#: contrib/scalar/scalar.c -#, c-format -msgid "failed to get default branch for '%s'" -msgstr "無法取得「%s」的預設分支" - -#: contrib/scalar/scalar.c -#, c-format -msgid "could not configure remote in '%s'" -msgstr "無法設定「%s」中的遠端" - -#: contrib/scalar/scalar.c -#, c-format -msgid "could not configure '%s'" -msgstr "無法設定「%s」" - -#: contrib/scalar/scalar.c -msgid "partial clone failed; attempting full clone" -msgstr "部分複製失敗。嘗試完整複製" - -#: contrib/scalar/scalar.c -msgid "could not configure for full clone" -msgstr "無法設定完整複製" - -#: contrib/scalar/scalar.c -msgid "scalar diagnose [<enlistment>]" -msgstr "scalar diagnose [<enlistment>]" - -#: contrib/scalar/scalar.c -#, c-format -msgid "could not create directory for '%s'" -msgstr "無法建立 “%s” 的目錄" - -#: contrib/scalar/scalar.c -msgid "could not duplicate stdout" -msgstr "無法複製 stdout" - -#: contrib/scalar/scalar.c -msgid "failed to write archive" -msgstr "無法寫入封存" - -#: contrib/scalar/scalar.c -msgid "`scalar list` does not take arguments" -msgstr "`scalar list` 未取引數" - -#: contrib/scalar/scalar.c -msgid "scalar register [<enlistment>]" -msgstr "scalar register [<enlistment>]" - -#: contrib/scalar/scalar.c -msgid "reconfigure all registered enlistments" -msgstr "重新設定所有註冊的編列名單" - -#: contrib/scalar/scalar.c -msgid "scalar reconfigure [--all | <enlistment>]" -msgstr "scalar reconfigure [--all | <enlistment>]" - -#: contrib/scalar/scalar.c -msgid "--all or <enlistment>, but not both" -msgstr "--all 或 <enlistment> 但不能傳入兩者" - -#: contrib/scalar/scalar.c -#, c-format -msgid "git repository gone in '%s'" -msgstr "git 版本庫在「%s」遺失" - -#: contrib/scalar/scalar.c -msgid "" -"scalar run <task> [<enlistment>]\n" -"Tasks:\n" -msgstr "" -"scalar run <task> [<enlistment>]\n" -"作業：\n" - -#: contrib/scalar/scalar.c -#, c-format -msgid "no such task: '%s'" -msgstr "無此作業：「%s」" - -#: contrib/scalar/scalar.c -msgid "scalar unregister [<enlistment>]" -msgstr "scalar unregister [<enlistment>]" - -#: contrib/scalar/scalar.c -msgid "scalar delete <enlistment>" -msgstr "scalar delete <enlistment>" - -#: contrib/scalar/scalar.c -msgid "refusing to delete current working directory" -msgstr "拒絕刪除目前工作目錄" - -#: contrib/scalar/scalar.c -msgid "include Git version" -msgstr "包含 Git 版本" - -#: contrib/scalar/scalar.c -msgid "include Git's build options" -msgstr "包含 Git 組建選項" - -#: contrib/scalar/scalar.c -msgid "scalar verbose [-v | --verbose] [--build-options]" -msgstr "scalar verbose [-v | --verbose] [--build-options]" - -#: contrib/scalar/scalar.c -msgid "-C requires a <directory>" -msgstr "-C 需要 <directory>" - -#: contrib/scalar/scalar.c -#, c-format -msgid "could not change to '%s'" -msgstr "無法更改為「%s」" - -#: contrib/scalar/scalar.c -msgid "-c requires a <key>=<value> argument" -msgstr "-c 需要 <key>=<value> 引數" - -#: contrib/scalar/scalar.c -msgid "" -"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n" -"\n" -"Commands:\n" -msgstr "" -"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n" -"\n" -"命令：\n" - #: convert.c #, c-format msgid "illegal crlf_action %d" @@ -18427,6 +18522,39 @@ msgstr "來自 config 的資料島常規表示式有太多的擷取群組（最 msgid "Marked %d islands, done.\n" msgstr "已標記 %d 個資料島，結束。\n" +#: diagnose.c +#, c-format +msgid "invalid --%s value '%s'" +msgstr "無效的 --%s 值「%s」" + +#: diagnose.c +#, c-format +msgid "could not archive missing directory '%s'" +msgstr "無法封存不存在的路徑「%s」" + +#: diagnose.c dir.c +#, c-format +msgid "could not open directory '%s'" +msgstr "不能開啟目錄 '%s'" + +#: diagnose.c +#, c-format +msgid "skipping '%s', which is neither file nor directory" +msgstr "略過 “%s”，其非檔案或目錄" + +#: diagnose.c +msgid "could not duplicate stdout" +msgstr "無法複製 stdout" + +#: diagnose.c +#, c-format +msgid "could not add directory '%s' to archiver" +msgstr "無法將「%s」路徑加入封存工具中" + +#: diagnose.c +msgid "failed to write archive" +msgstr "無法寫入封存" + #: diff-lib.c msgid "--merge-base does not work with ranges" msgstr "--merge-base 跟範圍無法搭配運作" @@ -19177,6 +19305,10 @@ msgid "unable to write to remote" msgstr "無法寫到遠端" #: fetch-pack.c +msgid "Server supports filter" +msgstr "伺服器支援 filter" + +#: fetch-pack.c #, c-format msgid "invalid shallow line: %s" msgstr "無效的 shallow 訊息：%s" @@ -19318,10 +19450,6 @@ msgid "Server does not support shallow requests" msgstr "伺服器不支援 shallow 請求" #: fetch-pack.c -msgid "Server supports filter" -msgstr "伺服器支援 filter" - -#: fetch-pack.c msgid "unable to write request to remote" msgstr "無法將請求寫到遠端" @@ -19736,6 +19864,14 @@ msgid "Low-level Commands / Internal Helpers" msgstr "低級指令/內部協助工具" #: help.c +msgid "User-facing repository, command and file interfaces" +msgstr "面向使用者的版本庫、命令和檔案介面" + +#: help.c +msgid "Developer-facing file formats, protocols and other interfaces" +msgstr "面向開發者的檔案格式、通訊協定和介面" + +#: help.c #, c-format msgid "available git commands in '%s'" msgstr "在 '%s' 下可用的 git 指令" @@ -19753,6 +19889,14 @@ msgid "The Git concept guides are:" msgstr "Git 概念嚮導有：" #: help.c +msgid "User-facing repository, command and file interfaces:" +msgstr "面向使用者的版本庫、命令和檔案介面：" + +#: help.c +msgid "File formats, protocols and other developer interfaces:" +msgstr "檔案格式、通訊協定和其他開發者介面：" + +#: help.c msgid "External commands" msgstr "外部指令" @@ -19842,11 +19986,6 @@ msgstr "" "因為沒有將掛鉤 '%s' 設定為可執行，掛鉤被忽略。您可以透過\n" "設定 `git config advice.ignoredHook false` 來關閉這條警告。" -#: hook.c -#, c-format -msgid "Couldn't start hook '%s'\n" -msgstr "無法啟動「%s」掛鉤\n" - #: http-fetch.c #, c-format msgid "argument to --packfile must be a valid hash (got '%s')" @@ -20066,20 +20205,16 @@ msgstr "在 ls-refs 引數之後應該有一個 flush 包" msgid "quoted CRLF detected" msgstr "偵測到由可列印字元 (quoted) 所組成的 CRLF" -#: merge-ort-wrappers.c merge-recursive.c -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -" %s" -msgstr "" -"您對下列檔案的本機修改將被合併動作覆蓋：\n" -" %s" - #: merge-ort.c merge-recursive.c #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "無法合併子模組 %s （沒有簽出）" +#: merge-ort.c +#, c-format +msgid "Failed to merge submodule %s (no merge base)" +msgstr "無法合併 %s 子模組（沒有合併基底）" + #: merge-ort.c merge-recursive.c #, c-format msgid "Failed to merge submodule %s (commits not present)" @@ -20103,27 +20238,8 @@ msgstr "無法合併 %s 子模組" #: merge-ort.c #, c-format msgid "" -"Failed to merge submodule %s, but a possible merge resolution exists:\n" -"%s\n" -msgstr "" -"無法合併 %s 子模組，但有找到一個可行的合併方案：\n" -"%s\n" - -#: merge-ort.c merge-recursive.c -#, c-format -msgid "" -"If this is correct simply add it to the index for example\n" -"by using:\n" -"\n" -" git update-index --cacheinfo 160000 %s \"%s\"\n" -"\n" -"which will accept this suggestion.\n" -msgstr "" -"正確的話，就能直接加進索引，例如執行下述命令：\n" -"\n" -" git update-index --cacheinfo 160000 %s \"%s\"\n" -"\n" -"接受本建議。\n" +"Failed to merge submodule %s, but a possible merge resolution exists: %s" +msgstr "無法合併 %s 子模組，但存在合併可行方案：%s" #: merge-ort.c #, c-format @@ -20302,12 +20418,45 @@ msgstr "" "衝突（修改/刪除）：%1$s 已在 %2$s 刪除和在 %3$s 修改。%5$s 的 %4$s 版本留在樹" "上。" +#. TRANSLATORS: This is a line of advice to resolve a merge +#. 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" +#. +#: merge-ort.c +#, c-format +msgid "" +" - go to submodule (%s), and either merge commit %s\n" +" or update to an existing commit which has merged those changes\n" +msgstr "" +" - 前往子模組 (%s)，並合併 %s 提交或\n" +" 更新至已經合併這些更改的提交\n" + #: merge-ort.c #, c-format msgid "" -"Note: %s not up to date and in way of checking out conflicted version; old " -"copy renamed to %s" -msgstr "註：%s 不是最新且干擾到簽出衝突版本。已將舊拷貝重新命名至 %s" +"Recursive merging with submodules currently only supports trivial cases.\n" +"Please manually handle the merging of each conflicted submodule.\n" +"This can be accomplished with the following steps:\n" +"%s - come back to superproject and run:\n" +"\n" +" git add %s\n" +"\n" +" to record the above merge or update\n" +" - resolve any other conflicts in the superproject\n" +" - commit the resulting index in the superproject\n" +msgstr "" +"與子模組進行遞迴合併，目前僅支援簡單的情況。\n" +"請自行處理每個有衝突之子模組的合併問題。\n" +"處理步驟有以下幾步：\n" +"%s - 回到上級專案，並執行：\n" +"\n" +" git add %s\n" +"\n" +" 來記錄上述的合併或更新\n" +" - 解決上級專案中的其它衝突\n" +" - 在上級專案中，提交產生之索引資訊\n" #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge #. base, and 2-3) the trees for the two trees we're merging. @@ -20396,6 +20545,22 @@ msgstr "找到子模組的一個可能的合併方案：\n" #: merge-recursive.c #, c-format +msgid "" +"If this is correct simply add it to the index for example\n" +"by using:\n" +"\n" +" git update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"which will accept this suggestion.\n" +msgstr "" +"正確的話，就能直接加進索引，例如執行下述命令：\n" +"\n" +" git update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"接受本建議。\n" + +#: merge-recursive.c +#, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "無法合併子模組 %s （發現多個合併）" @@ -21031,6 +21196,26 @@ msgstr "被 %s 的不穩定物件來源資料混淆" #: object-file.c #, c-format +msgid "write stream object %ld != %<PRIuMAX>" +msgstr "寫入串流物件 %ld != %<PRIuMAX>" + +#: object-file.c +#, c-format +msgid "unable to stream deflate new object (%d)" +msgstr "不能串流壓縮新物件 (%d)" + +#: object-file.c +#, c-format +msgid "deflateEnd on stream object failed (%d)" +msgstr "串流物件上的 deflateEnd 失敗 (%d)" + +#: object-file.c +#, c-format +msgid "unable to create directory %s" +msgstr "無法建立 %s 目錄" + +#: object-file.c +#, c-format msgid "cannot read object for %s" msgstr "不能讀取物件 %s" @@ -21109,7 +21294,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 @@ -21119,7 +21304,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. @@ -21136,7 +21321,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 @@ -21295,6 +21480,71 @@ msgstr "不能解析物件：%s" msgid "hash mismatch %s" msgstr "雜湊值與 %s 不符合" +#: pack-bitmap-write.c +msgid "trying to write commit not in index" +msgstr "嘗試寫入不在索引的提交" + +#: pack-bitmap.c +msgid "failed to load bitmap index (corrupted?)" +msgstr "無法載入位圖索引（損壞？）" + +#: pack-bitmap.c +msgid "corrupted bitmap index (too small)" +msgstr "位圖索引損壞（過小）" + +#: pack-bitmap.c +msgid "corrupted bitmap index file (wrong header)" +msgstr "位圖索引檔案損壞（標頭錯誤）" + +#: pack-bitmap.c +#, c-format +msgid "unsupported version '%d' for bitmap index file" +msgstr "位圖索引檔案的版本 “%d” 不支援" + +#: pack-bitmap.c +msgid "corrupted bitmap index file (too short to fit hash cache)" +msgstr "位圖索引檔案損壞（不夠長，無法置入雜湊快取）" + +#: pack-bitmap.c +msgid "corrupted bitmap index file (too short to fit lookup table)" +msgstr "位圖索引檔案損壞（不夠長，無法置入查詢表）" + +#: pack-bitmap.c +#, c-format +msgid "duplicate entry in bitmap index: '%s'" +msgstr "位圖索引中有重複項目：「%s」" + +#: pack-bitmap.c +#, c-format +msgid "corrupt ewah bitmap: truncated header for entry %d" +msgstr "ewah 位圖損壞：項目 %d 的標頭遭截斷" + +#: pack-bitmap.c +#, c-format +msgid "corrupt ewah bitmap: commit index %u out of range" +msgstr "ewah 位圖損壞：提交索引 %u 超出範圍" + +#: pack-bitmap.c +msgid "corrupted bitmap pack index" +msgstr "位圖包索引損壞" + +#: pack-bitmap.c +msgid "invalid XOR offset in bitmap pack index" +msgstr "位圖包索引的 XOR 偏移無效" + +#: pack-bitmap.c +msgid "cannot fstat bitmap file" +msgstr "無法 fstat 位圖檔案" + +#: pack-bitmap.c +#, c-format +msgid "ignoring extra bitmap file: '%s'" +msgstr "忽略多出來的位圖檔案：「%s」" + +#: pack-bitmap.c +msgid "checksum doesn't match in MIDX and bitmap" +msgstr "總和檢查碼在 MIDX 和位圖中無符合項目" + #: pack-bitmap.c msgid "multi-pack bitmap is missing required reverse index" msgstr "多包位圖缺少需要的反向索引" @@ -21310,9 +21560,69 @@ msgid "preferred pack (%s) is invalid" msgstr "偏好的封包 (%s) 無效" #: pack-bitmap.c +msgid "corrupt bitmap lookup table: triplet position out of index" +msgstr "位圖查詢表損壞：三元組位置超出索引" + +#: pack-bitmap.c +msgid "corrupt bitmap lookup table: xor chain exceeds entry count" +msgstr "位圖查詢表損壞：XOR 鏈超出項目數" + +#: pack-bitmap.c +#, c-format +msgid "corrupt bitmap lookup table: commit index %u out of range" +msgstr "位圖查詢表損壞：提交索引 %u 超出範圍" + +#: pack-bitmap.c +#, c-format +msgid "corrupt ewah bitmap: truncated header for bitmap of commit \"%s\"" +msgstr "ewah 位圖損壞：提交 “%s” 之位圖的標頭遭截斷" + +#: pack-bitmap.c +#, c-format +msgid "object '%s' not found in type bitmaps" +msgstr "在類型位圖中，找不到「%s」物件" + +#: pack-bitmap.c #, c-format -msgid "could not find %s in pack %s at offset %<PRIuMAX>" -msgstr "找不到 %2$s 包，偏移位置 %3$<PRIuMAX> 的 %1$s" +msgid "object '%s' does not have a unique type" +msgstr "「%s」物件的類型不唯一" + +#: pack-bitmap.c +#, c-format +msgid "object '%s': real type '%s', expected: '%s'" +msgstr "「%s」物件：實際類型是「%s」，但預期是「%s」" + +#: pack-bitmap.c +#, c-format +msgid "object not in bitmap: '%s'" +msgstr "物件不在位圖中：「%s」" + +#: pack-bitmap.c +msgid "failed to load bitmap indexes" +msgstr "無法載入位圖索引" + +#: pack-bitmap.c +msgid "you must specify exactly one commit to test" +msgstr "您必須指定剛好一個要測試的提交" + +#: pack-bitmap.c +#, c-format +msgid "commit '%s' doesn't have an indexed bitmap" +msgstr "提交「%s」無索引過的位圖" + +#: pack-bitmap.c +msgid "mismatch in bitmap results" +msgstr "位圖結果中有不符項目" + +#: pack-bitmap.c +#, c-format +msgid "could not find '%s' in pack '%s' at offset %<PRIuMAX>" +msgstr "在「%2$s」封包，位移 %3$<PRIuMAX> 的地方找不到「%1$s」" + +#: pack-bitmap.c +#, c-format +msgid "unable to get disk usage of '%s'" +msgstr "無法取得「%s」的磁碟用量" #: pack-mtimes.c #, c-format @@ -21468,6 +21778,10 @@ msgid "alias of --%s" msgstr "--%s 的別名" #: parse-options.c +msgid "need a subcommand" +msgstr "需要子命令" + +#: parse-options.c #, c-format msgid "unknown option `%s'" msgstr "未知選項 `%s'" @@ -21996,32 +22310,38 @@ msgid "" "l, label <label> = label current HEAD with a name\n" "t, reset <label> = reset HEAD to a label\n" "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" -". create a merge commit using the original merge commit's\n" -". message (or the oneline, if no original merge commit was\n" -". specified); use -c <commit> to reword the commit message\n" +" create a merge commit using the original merge commit's\n" +" message (or the oneline, if no original merge commit was\n" +" specified); use -c <commit> to reword the commit message\n" +"u, update-ref <ref> = track a placeholder for the <ref> to be updated\n" +" to this position in the new commits. The <ref> is\n" +" updated at the end of the rebase\n" "\n" "These lines can be re-ordered; they are executed from top to bottom.\n" msgstr "" "\n" -"指令：\n" +"命令：\n" "p, pick <提交> = 使用提交\n" "r, reword <提交> = 使用提交，但編輯提交說明\n" "e, edit <提交> = 使用提交，但不直接修補 (amend) \n" "s, squash <提交> = 使用提交，但融合至上個提交\n" -"f, fixup [-C | -c] <提交> = 跟 “squash” 相似，但除非傳入「-C」\n" +"f, fixup [-C | -c] <提交> = 跟 “squash” 相似，但除非傳入 -C，\n" " 否則只保留上一個提交的日誌訊息。傳入 -C 表示只保留這個\n" " 提交的訊息；傳入 -c 與 -C 功能相同，但會開啟編輯器\n" -"x, exec <命令> = 使用 shell 執行指令（這一行的剩餘部分）\n" -"b, break = 在這停止（使用 'git rebase --continue' 繼續重定基底）\n" +"x, exec <命令> = 使用 shell 執行命令（這一列的剩餘部分）\n" +"b, break = 在此停止（使用 “git rebase --continue” 繼續重定基底）\n" "d, drop <提交> = 移除提交\n" "l, label <標籤> = 為目前 HEAD 打上指定名字標籤\n" "t, reset <標籤> = 重設 HEAD 到指定標籤\n" "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" -". 建立一個合併提交，並使用原始的合併提交說明（如果沒有指定\n" -". 原始提交，使用備註部分的 oneline 作為提交說明）。使用\n" -". -c <commit> 可以編輯提交說明。\n" +" 建立一個合併提交，並使用原始的合併提交說明（如果沒有指定\n" +" 原始提交，則使用 <oneline> 作為提交說明）。\n" +" 使用 -c <commit> 編輯提交說明。\n" +"u, update-ref <ref> = 為 <ref> 引用設立佔位符號，\n" +" 以將這個引用更新為此處的新提交。\n" +" <ref> 會在重定基底後更新。\n" "\n" -"可以對這些行重新排序，會從上至下執行。\n" +"可以對這些列重新排序；執行順序由上到下。\n" #: rebase-interactive.c #, c-format @@ -22586,6 +22906,15 @@ msgid "http transport does not support %s" msgstr "http 傳輸協定不支援 %s" #: remote-curl.c +msgid "protocol error: expected '<url> <path>', missing space" +msgstr "協定錯誤：預期是「<URL> <路徑>」，但缺少空白" + +#: remote-curl.c +#, c-format +msgid "failed to download file at URL '%s'" +msgstr "無法下載位於 URL “%s” 的檔案" + +#: remote-curl.c msgid "git-http-push failed" msgstr "git-http-push 失敗" @@ -22990,6 +23319,16 @@ msgid "failed to find tree of %s" msgstr "無法找到 %s 指向的樹" #: revision.c +#, c-format +msgid "resolve-undo records `%s` which is missing" +msgstr "resolve-undo 不存在的「%s」記錄" + +#: revision.c +#, c-format +msgid "could not get commit for ancestry-path argument %s" +msgstr "無法取得 ancestry-path 引數 %s 的提交" + +#: revision.c msgid "--unpacked=<packfile> no longer supported" msgstr "--unpacked=<packfile> 已不受支援" @@ -23015,6 +23354,220 @@ msgstr "-L 尚不支援 -p 和 -s 之外的差異格式" msgid "cannot create async thread: %s" msgstr "不能建立 async 執行緒：%s" +#: scalar.c worktree.c +#, c-format +msgid "'%s' does not exist" +msgstr "'%s' 不存在" + +#: scalar.c +#, c-format +msgid "could not switch to '%s'" +msgstr "無法切換至「%s」" + +#: scalar.c +msgid "need a working directory" +msgstr "需要工作目錄" + +#: scalar.c +msgid "Scalar enlistments require a worktree" +msgstr "純量編列名單需要工作目錄" + +#: scalar.c +#, c-format +msgid "could not configure %s=%s" +msgstr "無法設定 %s=%s" + +#: scalar.c +msgid "could not configure log.excludeDecoration" +msgstr "無法設定 log.excludeDecoration" + +#: scalar.c +msgid "could not add enlistment" +msgstr "無法加入編列清單" + +#: scalar.c +msgid "could not set recommended config" +msgstr "無法設定建議組態" + +#: scalar.c +msgid "could not turn on maintenance" +msgstr "無法開啟維護模式" + +#: scalar.c +msgid "could not start the FSMonitor daemon" +msgstr "無法啟動 FSMonitor 守護程式" + +#: scalar.c +msgid "could not turn off maintenance" +msgstr "無法關閉維護模式" + +#: scalar.c +msgid "could not remove enlistment" +msgstr "無法移除編列清單" + +#: scalar.c +#, c-format +msgid "remote HEAD is not a branch: '%.*s'" +msgstr "遠端 HEAD 不是分支：「%.*s」" + +#: scalar.c +msgid "failed to get default branch name from remote; using local default" +msgstr "無法從遠端取得預設分支名稱。改用本機預設名稱" + +#: scalar.c +msgid "failed to get default branch name" +msgstr "無法取得預設分支名稱" + +#: scalar.c +msgid "failed to unregister repository" +msgstr "無法取消註冊版本庫" + +#: scalar.c +msgid "failed to stop the FSMonitor daemon" +msgstr "無法停止 FSMonitor 守護程式" + +#: scalar.c +msgid "failed to delete enlistment directory" +msgstr "無法刪除編列名單目錄" + +#: scalar.c +msgid "branch to checkout after clone" +msgstr "複製後要簽出的分支" + +#: scalar.c +msgid "when cloning, create full working directory" +msgstr "複製時建立完整的工作目錄" + +#: scalar.c +msgid "only download metadata for the branch that will be checked out" +msgstr "只下載會簽出的分支中介資料" + +#: scalar.c +msgid "scalar clone [<options>] [--] <repo> [<dir>]" +msgstr "scalar clone [<options>] [--] <repo> [<dir>]" + +#: scalar.c +#, c-format +msgid "cannot deduce worktree name from '%s'" +msgstr "無法從「%s」推論工作區名稱" + +#: scalar.c +#, c-format +msgid "directory '%s' exists already" +msgstr "「%s」目錄已經存在" + +#: scalar.c +#, c-format +msgid "failed to get default branch for '%s'" +msgstr "無法取得「%s」的預設分支" + +#: scalar.c +#, c-format +msgid "could not configure remote in '%s'" +msgstr "無法設定「%s」中的遠端" + +#: scalar.c +#, c-format +msgid "could not configure '%s'" +msgstr "無法設定「%s」" + +#: scalar.c +msgid "partial clone failed; attempting full clone" +msgstr "部分複製失敗。嘗試完整複製" + +#: scalar.c +msgid "could not configure for full clone" +msgstr "無法設定完整複製" + +#: scalar.c +msgid "scalar diagnose [<enlistment>]" +msgstr "scalar diagnose [<enlistment>]" + +#: scalar.c +msgid "`scalar list` does not take arguments" +msgstr "`scalar list` 未取引數" + +#: scalar.c +msgid "scalar register [<enlistment>]" +msgstr "scalar register [<enlistment>]" + +#: scalar.c +msgid "reconfigure all registered enlistments" +msgstr "重新設定所有註冊的編列名單" + +#: scalar.c +msgid "scalar reconfigure [--all | <enlistment>]" +msgstr "scalar reconfigure [--all | <enlistment>]" + +#: scalar.c +msgid "--all or <enlistment>, but not both" +msgstr "--all 或 <enlistment> 但不能傳入兩者" + +#: scalar.c +#, c-format +msgid "git repository gone in '%s'" +msgstr "git 版本庫在「%s」遺失" + +#: scalar.c +msgid "" +"scalar run <task> [<enlistment>]\n" +"Tasks:\n" +msgstr "" +"scalar run <task> [<enlistment>]\n" +"作業：\n" + +#: scalar.c +#, c-format +msgid "no such task: '%s'" +msgstr "無此作業：「%s」" + +#: scalar.c +msgid "scalar unregister [<enlistment>]" +msgstr "scalar unregister [<enlistment>]" + +#: scalar.c +msgid "scalar delete <enlistment>" +msgstr "scalar delete <enlistment>" + +#: scalar.c +msgid "refusing to delete current working directory" +msgstr "拒絕刪除目前工作目錄" + +#: scalar.c +msgid "include Git version" +msgstr "包含 Git 版本" + +#: scalar.c +msgid "include Git's build options" +msgstr "包含 Git 組建選項" + +#: scalar.c +msgid "scalar verbose [-v | --verbose] [--build-options]" +msgstr "scalar verbose [-v | --verbose] [--build-options]" + +#: scalar.c +msgid "-C requires a <directory>" +msgstr "-C 需要 <directory>" + +#: scalar.c +#, c-format +msgid "could not change to '%s'" +msgstr "無法更改為「%s」" + +#: scalar.c +msgid "-c requires a <key>=<value> argument" +msgstr "-c 需要 <key>=<value> 引數" + +#: scalar.c +msgid "" +"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n" +"\n" +"Commands:\n" +msgstr "" +"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n" +"\n" +"命令：\n" + #: send-pack.c msgid "unexpected flush packet while reading remote unpack status" msgstr "讀取遠端解包狀態時收到意外的 flush 包" @@ -23159,11 +23712,6 @@ msgstr "您的本機修改將被%s覆蓋。" msgid "commit your changes or stash them to proceed." msgstr "提交您的修改或儲藏後再繼續。" -#: sequencer.c -#, c-format -msgid "%s: fast-forward" -msgstr "%s：快轉" - #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase". #. @@ -23752,6 +24300,30 @@ msgid "merge: Unable to write new index file" msgstr "合併：無法寫入新索引檔案" #: sequencer.c +#, c-format +msgid "" +"another 'rebase' process appears to be running; '%s.lock' already exists" +msgstr "似乎有另一個 “rebase” 程序正在進行；“%s.lock” 已經存在" + +#: sequencer.c +#, c-format +msgid "" +"Updated the following refs with %s:\n" +"%s" +msgstr "" +"已使用 %s 更新下述引用：\n" +"%s" + +#: sequencer.c +#, c-format +msgid "" +"Failed to update the following refs with %s:\n" +"%s" +msgstr "" +"無法使用 %s 更新下述引用：\n" +"%s" + +#: sequencer.c msgid "Cannot autostash" msgstr "無法 autostash" @@ -23953,6 +24525,11 @@ msgstr "無法略過不必要的揀選" msgid "the script was already rearranged." msgstr "腳本已經重新編排。" +#: sequencer.c +#, c-format +msgid "update-refs file at '%s' is invalid" +msgstr "位於「%s」的 update-refs 檔案無效" + #: setup.c #, c-format msgid "'%s' is outside repository at '%s'" @@ -24093,18 +24670,23 @@ msgstr "" #: setup.c #, c-format msgid "" -"unsafe repository ('%s' is owned by someone else)\n" -"To add an exception for this directory, call:\n" +"detected dubious ownership in repository at '%s'\n" +"%sTo add an exception for this directory, call:\n" "\n" "\tgit config --global --add safe.directory %s" msgstr "" -"不安全版本庫（「%s」由其他人所有）\n" -"若要放行本目錄，請呼叫：\n" +"在位於「%s」的版本庫偵測到可疑所有權\n" +"%s若要放行本目錄，請呼叫：\n" "\n" "\tgit config --global --add safe.directory %s" #: setup.c #, c-format +msgid "cannot use bare repository '%s' (safe.bareRepository is '%s')" +msgstr "無法使用 “%s” 純版本庫（safe.bareRepository 是 “%s”）" + +#: setup.c +#, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" "The owner of files must always have read and write permissions." @@ -25126,6 +25708,22 @@ msgstr "無效的埠號" msgid "invalid '..' path segment" msgstr "無效的 '..' 路徑區塊" +#: usage.c +msgid "usage: " +msgstr "用法：" + +#: usage.c +msgid "fatal: " +msgstr "致命錯誤：" + +#: usage.c +msgid "error: " +msgstr "錯誤：" + +#: usage.c +msgid "warning: " +msgstr "警告：" + #: walker.c msgid "Fetching objects" msgstr "正在抓取物件" @@ -25818,7 +26416,7 @@ msgstr "另外，您的索引中包含未提交的變更。" msgid "cannot %s: Your index contains uncommitted changes." msgstr "不能%s：您的索引中包含未提交的變更。" -#: git-merge-octopus.sh +#: git-merge-octopus.sh git-merge-resolve.sh msgid "" "Error: Your local changes to the following files would be overwritten by " "merge" @@ -26106,26 +26704,6 @@ msgid "ignoring unmerged: %s\n" msgstr "忽略未套用的：%s\n" #: git-add--interactive.perl -#, perl-format -msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " -msgstr "將模式變更套用到工作區 [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl -#, perl-format -msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " -msgstr "將刪除變更套用到工作區 [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl -#, perl-format -msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " -msgstr "將新增變更套用到工作區 [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl -#, perl-format -msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " -msgstr "將此區塊套用到工作區 [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl msgid "No other hunks to goto\n" msgstr "沒有其它可供跳轉的區塊\n" |