diff options
| -rw-r--r-- | po/bg.po | 1001 | ||||
| -rw-r--r-- | po/id.po | 2628 | ||||
| -rw-r--r-- | po/sv.po | 889 | ||||
| -rw-r--r-- | po/tr.po | 1135 |
4 files changed, 3927 insertions, 1726 deletions
@@ -1,5 +1,5 @@ # 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. # @@ -64,6 +64,8 @@ # pathspec magic опция за магически пътища # bitmap index индекс на база битови маски # multi-pack bitmap многопакетната битова маска +# ewah bitmap битова маска във формат EWAH +# type bitmap битова маска на видовете # mark маркер # plumbing команди от системно ниво # porcelain команди от потребителско ниво @@ -165,6 +167,7 @@ # scheduler планиращ модул # snapshot снимка # enlistment зачислена директория +# remove enlistment отчислявам директория # zealous merge засилено сливане # unregister отчислявам # marked counting изброяване @@ -184,7 +187,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 - проверка - намират се лесно по „$ # ------------------------ @@ -202,10 +211,10 @@ # 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-16 22:21+0200\n" +"PO-Revision-Date: 2022-09-18 20:48+0200\n" "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" "Language: bg\n" @@ -625,6 +634,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 +669,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 "разликата не може да се анализира" @@ -1461,6 +1484,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 +1507,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 +3338,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 +3381,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 +3463,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 +3541,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 +3557,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 +4448,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 +4520,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 +4547,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 +4633,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 +4761,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 +5129,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 +5745,25 @@ 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 "(stats|all)" +msgstr "„stats“/„all“ (статистика/всичко)" + +msgid "specify the content of the diagnostic archive" +msgstr "указване на съдържанието на диагностичния архив" + msgid "--merge-base only works with two commits" msgstr "опцията „--merge-base“ изисква точно две подавания" @@ -6066,12 +6145,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 "[обновяване на етикетите]" @@ -6514,6 +6590,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 +6658,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" @@ -6827,9 +6907,15 @@ msgstr "изпълнение на определена задача" msgid "use at most one of --auto and --schedule=<frequency>" msgstr "опциите „--auto“ и „--schedule=ЧЕСТОТА“ са несъвместими" +msgid "git maintenance register" +msgstr "git maintenance register" + msgid "failed to run 'git config'" msgstr "неуспешно изпълнение на „git config“" +msgid "git maintenance unregister" +msgstr "git maintenance unregister" + #, c-format msgid "failed to expand path '%s'" msgstr "грешка при заместването на пътя „%s“" @@ -6856,13 +6942,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“ умря" @@ -6906,13 +6995,12 @@ msgstr "ПЛАНИРАЩият_МОДУЛ, който да изпълнява з msgid "failed to add repo to global config" msgstr "неуспешно добавяне на хранилище към файла с глобални настройки" +msgid "git maintenance stop" +msgstr "git maintenance stop" + 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 +7182,9 @@ msgstr "" "позволяване на стартирането на grep(1) (текущият компилат пренебрегва тази " "опция)" +msgid "maximum number of results per file" +msgstr "максимален брой резултати във файл" + msgid "no pattern given" msgstr "не сте задали шаблон" @@ -7178,16 +7269,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 +7500,7 @@ msgstr[1] "действието завърши с %d локални обекта #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" -"Неочаквана последваща сума за грешки за „%s“ (причината може да е грешка в " +"Неочаквана последваща сума за проверка на „%s“ (причината може да е грешка в " "диска)" #, c-format @@ -7666,10 +7763,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 +8031,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 +8098,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 +8198,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 +8429,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 +8544,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 +8666,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 +8720,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 +8768,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 +8894,9 @@ msgstr "Проверка на преименуването на обект от msgid "bad source" msgstr "неправилен обект" +msgid "destination exists" +msgstr "целта съществува" + msgid "can not move directory into itself" msgstr "директория не може да се премести в себе си" @@ -8753,9 +8912,6 @@ msgstr "не е под контрола на Git" msgid "conflicted" msgstr "конфликт" -msgid "destination exists" -msgstr "целта съществува" - #, c-format msgid "overwriting '%s'" msgstr "презаписване на „%s“" @@ -9136,8 +9292,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 +10222,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 +10505,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 +11059,9 @@ msgstr " нов (следващото доставяне ще го разпол msgid " tracked" msgstr " следен" +msgid " skipped" +msgstr " прескочен" + msgid " stale (use 'git remote prune' to remove)" msgstr " стар (изтрийте чрез „git remote prune“)" @@ -11587,6 +11754,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 +11783,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 +12566,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 +12577,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 +12609,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 +12632,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 +12660,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 +12696,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 +12711,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 +12781,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 +12815,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 +12846,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 +12921,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 +12933,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 +12966,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 +12988,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 +13002,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 +13026,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 +13035,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 +13137,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 +13347,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 +13905,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“" @@ -14070,8 +14270,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 "Изпълнение на програмите за коригиране на конфликтите при сливане" @@ -14299,6 +14499,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 +14538,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 "Помощни програми за работа с отдалечените хранилища" @@ -14602,6 +14835,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 +14914,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 +15195,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" @@ -15228,16 +15481,16 @@ msgstr "стандартният вход на списъка с версиит 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“" +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“ не може да се зададе" @@ -15245,24 +15498,23 @@ msgstr "настройката „%s=%s“ не може да се зададе" msgid "could not configure log.excludeDecoration" msgstr "„log.excludeDecoration“ не може да се настрои" -msgid "Scalar enlistments require a worktree" -msgstr "Зачисляването на директории чрез „scalar“ изисква работно дърво" +msgid "could not add enlistment" +msgstr "директория не може да се зачисли" -#, c-format -msgid "could not open directory '%s'" -msgstr "директорията „%s“ не може да бъде отворена" +msgid "could not set recommended config" +msgstr "препоръчаните настройки не може да се зададат" -#, c-format -msgid "skipping '%s', which is neither file nor directory" -msgstr "„%s“ се прескача, защото не е нито файл, нито директория" +msgid "could not turn on maintenance" +msgstr "задачите по поддръжка не може да се включат" -#, c-format -msgid "could not determine free disk size for '%s'" -msgstr "не може да се определи свободното дисково пространство за „%s“" +msgid "could not start the FSMonitor daemon" +msgstr "фоновият процес на FSMonitor не може да бъде спрян" -#, c-format -msgid "could not get info for '%s'" -msgstr "не може да се получи информацията за „%s“" +msgid "could not turn off maintenance" +msgstr "задачите по поддръжка не може да се изключат" + +msgid "could not remove enlistment" +msgstr "директорията не може да се отчисли" #, c-format msgid "remote HEAD is not a branch: '%.*s'" @@ -15279,6 +15531,9 @@ msgstr "неуспешно получаване на името на станд msgid "failed to unregister repository" msgstr "хранилището не може да бъде отчислено" +msgid "failed to stop the FSMonitor daemon" +msgstr "фоновият процес FSMonitor не може да бъде спрян" + msgid "failed to delete enlistment directory" msgstr "зачислената директория не може да бъде изтрита" @@ -15323,16 +15578,6 @@ 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“ не приема аргументи" @@ -15613,6 +15858,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 +16513,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 +16626,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 +16981,12 @@ msgstr "Команди от ниско ниво / Синхронизация н msgid "Low-level Commands / Internal Helpers" msgstr "Команди от ниско ниво / Допълнителни инструменти" +msgid "User-facing repository, command and file interfaces" +msgstr "Команди за хранилища, файлове и др. за потребители:" + +msgid "Developer-facing file file formats, protocols and interfaces" +msgstr "Файлови формати, протоколи и др. за програмисти:" + #, c-format msgid "available git commands in '%s'" msgstr "налични команди на git от „%s“" @@ -16723,6 +17000,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 +17094,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 +17285,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 +17312,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 +17476,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 +17595,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 +17850,8 @@ msgstr "неправилен ред: „%s“." msgid "ignoring existing multi-pack-index; checksum mismatch" msgstr "" -"индексът за множество пакети се прескача, защото контролната сума не съвпада" +"индексът за множество пакети се прескача, защото сумата за проверка не " +"съвпада" msgid "could not load pack" msgstr "пакетът не може да се зареди" @@ -17596,7 +17901,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 +18157,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 +18400,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 +18471,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 exceed 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 "could not find %s in pack %s at offset %<PRIuMAX>" +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 "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 +18666,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 +19122,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 +19154,12 @@ msgstr "" " — създаване на подаване със сливане със съобщението от\n" " първоначалното подаване (или съобщението от ЕДИН_РЕД,\n" " ако не е зададено подаване със сливане. С опцията\n" -" „-c ПОДАВАНЕ“, може да смените съобщението.\n" +" „-c ПОДАВАНЕ“, може да смените съобщението\n" +"u, update-ref УКАЗАТЕЛ\n" +" — проследяване на заместител на УКАЗАТЕЛя, който трябва\n" +" да се обнови до това положение в новите подавания.\n" +" УКАЗАТЕЛят се обновява в края на пребазирането\n" +"\n" "\n" "Може да променяте последователността на редовете — те се изпълняват\n" "последователно отгоре-надолу.\n" @@ -19188,6 +19635,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 +19986,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=ПАКЕТЕН_ФАЙЛ“ вече не се поддържа" @@ -19703,10 +20167,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 +20668,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 +20861,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 +20991,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 +21880,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 +22724,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" @@ -22645,3 +23131,72 @@ msgstr "„%s“ се пропуска, защото е с разширение #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Наистина ли искате да изпратите „%s“? [y|N]: " + +#, c-format +#~ msgid "could not parse colored hunk header '%.*s'" +#~ msgstr "заглавната част на оцветеното парче „%.*s“ не може да се анализира" + +#, c-format +#~ msgid "Unknown subcommand: %s" +#~ msgstr "Непозната подкоманда: %s" + +#~ msgid "checked out in another worktree" +#~ msgstr "изтеглен в друго работно дърво" + +#~ msgid "failed to open stdin of 'crontab'" +#~ msgstr "стандартният вход на „crontab“ не може да се отвори" + +#, c-format +#~ msgid "invalid subcommand: %s" +#~ msgstr "неправилна подкоманда: „%s“" + +#~ msgid "single arg format must be symmetric range" +#~ msgstr "вариантът с единствен аргумент изисква симетричен диапазон" + +#~ msgid "git submodule--helper list [--prefix=<path>] [<path>...]" +#~ msgstr "git submodule--helper list [--prefix=ПЪТ] [ПЪТ…]" + +#~ msgid "git submodule--helper name <path>" +#~ msgstr "git submodule--helper name ПЪТ" + +#, c-format +#~ msgid "failed to get the default remote for submodule '%s'" +#~ msgstr "отдалеченият адрес на подмодула „%s“ не може да бъде получен" + +#, c-format +#~ msgid "Invalid update mode '%s' for submodule path '%s'" +#~ msgstr "Неправилен режим на обновяване „%s“ за пътя към подмодул „%s“" + +#~ msgid "path into the working tree, across nested submodule boundaries" +#~ msgstr "път към работното дърво, през границите на вложените подмодули" + +#~ msgid "rebase, merge, checkout or none" +#~ msgstr "" +#~ "„rebase“ (пребазиране), „merge“ (сливане), „checkout“ (изтегляне) или " +#~ "„none“ (нищо да не се прави)" + +#~ msgid "bad value for update parameter" +#~ msgstr "неправилен параметър към опцията „--update“" + +#~ msgid "Show three-way merge without touching index" +#~ msgstr "Извеждане на тройно сливане без промяна на индекса" + +#, c-format +#~ msgid "could not create directory for '%s'" +#~ msgstr "директорията за „%s“ не може да се създадe" + +#, c-format +#~ msgid "Couldn't start hook '%s'\n" +#~ msgstr "Куката „%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 "" +#~ "Бележка: „%s“ не е актуален и пречи за преминаването към версията с " +#~ "конфликт. Старият вариант е преименуван на „%s“" + +#, c-format +#~ msgid "%s: fast-forward" +#~ msgstr "%s: превъртане" @@ -7,7 +7,7 @@ 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" +"POT-Creation-Date: 2022-09-19 22:57+0000\n" "PO-Revision-Date: 2022-06-18 16:30+0700\n" "Last-Translator: Bagas Sanjaya <bagasdotme@gmail.com>\n" "Language-Team: Indonesian\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" @@ -2248,19 +2283,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 +2309,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 +2335,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 +2419,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 +2653,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 +2758,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 +3646,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 +3756,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 +3803,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 +3922,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 +4020,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 +4037,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" @@ -4139,60 +4213,62 @@ msgstr "" #: 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 +5139,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 +5220,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 +5243,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 +5253,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 +5353,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" @@ -5310,6 +5410,8 @@ msgstr "" 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 +5419,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 +5944,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 "" @@ -6593,6 +6691,28 @@ 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 "" + +#: 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 "" + +#: builtin/diagnose.c +msgid "(stats|all)" +msgstr "" + +#: 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 hanya bekerja dengan dua komit" @@ -7074,12 +7194,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 +7443,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 +7743,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>...]" @@ -8012,10 +8134,18 @@ msgid "use at most one of --auto and --schedule=<frequency>" msgstr "gunakan paling banyak satu dari --auto dan --schedule=<frekuensi>" #: builtin/gc.c +msgid "git maintenance register" +msgstr "git maintenance register" + +#: builtin/gc.c msgid "failed to run 'git config'" msgstr "gagal menjalankan 'git config'" #: builtin/gc.c +msgid "git maintenance unregister" +msgstr "git maintenance unregister" + +#: builtin/gc.c #, c-format msgid "failed to expand path '%s'" msgstr "gagal memperluas jalur '%s'" @@ -8048,15 +8178,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" @@ -8113,13 +8247,12 @@ msgid "failed to add repo to global config" msgstr "gagal menambahkan repositori ke konfigurasi global" #: builtin/gc.c -msgid "git maintenance <subcommand> [<options>]" -msgstr "git maintenance <subperintah> [<opsi>]" +msgid "git maintenance stop" +msgstr "git maintenance stop" #: builtin/gc.c -#, c-format -msgid "invalid subcommand: %s" -msgstr "subperintah tidak valid: %s" +msgid "git maintenance <subcommand> [<options>]" +msgstr "git maintenance <subperintah> [<opsi>]" #: builtin/grep.c msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" @@ -8346,6 +8479,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 +8595,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 +8686,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 +8699,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 @@ -9055,8 +9204,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 "" #: builtin/log.c msgid "only decorate refs that match <pattern>" @@ -9390,6 +9539,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 "" + +#: builtin/log.c #, c-format msgid "invalid ident line: %s" msgstr "baris identitas tidak valid: %s" @@ -9467,10 +9620,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 +9747,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" @@ -9795,73 +9971,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 +10191,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 +10332,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 +10340,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 +10402,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,6 +10458,11 @@ 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" @@ -10388,6 +10613,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 +10637,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 +10654,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 +11111,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 "" @@ -11498,7 +11727,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 +12173,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 +12559,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 "" + +#: 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" @@ -12956,6 +13196,10 @@ msgid " tracked" msgstr " dilacak" #: builtin/remote.c +msgid " skipped" +msgstr "" + +#: builtin/remote.c msgid " stale (use 'git remote prune' to remove)" msgstr " basi (gunakan 'git remote prune' untuk hapus)" @@ -13794,12 +14038,17 @@ 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 "" #: builtin/rev-list.c +#, c-format +msgid "invalid value for '%s': '%s', the only allowed format is '%s'" +msgstr "" + +#: builtin/rev-list.c msgid "rev-list does not support display of notes" msgstr "rev-list tidak mendukung penampilan catatan" @@ -13833,6 +14082,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 "" + +#: builtin/rev-parse.c msgid "Needed a single revision" msgstr "Butuh satu revisi" @@ -14392,7 +14645,7 @@ 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 "" @@ -14800,6 +15053,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 +15066,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 +15104,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 +15132,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 +15167,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 +15208,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 +15227,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 +15235,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 +15309,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 +15349,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 +15388,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 +15478,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 +15492,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 +15535,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 "use the 'merge' update strategy" +msgstr "gunakan strategi penmbaruan 'merge'" #: builtin/submodule--helper.c -msgid "rebase, merge, checkout or none" -msgstr "dasarkan ulang, gabungkan, checkout atau tidak sama sekali" +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 +15563,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 +15580,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 +15612,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 +15624,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" @@ -15500,8 +15747,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 +16005,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 +16674,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 "" + +#: 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,936 +16789,1000 @@ 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 "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 "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 @@ -17485,6 +17836,16 @@ msgstr "" msgid "no libc information available\n" msgstr "" +#: compat/disk.h +#, c-format +msgid "could not determine free disk size for '%s'" +msgstr "" + +#: compat/disk.h +#, c-format +msgid "could not get info for '%s'" +msgstr "" + #: compat/fsmonitor/fsm-health-win32.c #, c-format msgid "[GLE %ld] health thread could not open '%ls'" @@ -17553,6 +17914,16 @@ msgstr "" msgid "could not read directory changes [GLE %ld]" msgstr "" +#: compat/fsmonitor/fsm-settings-win32.c +#, c-format +msgid "[GLE %ld] unable to open for read '%ls'" +msgstr "" + +#: compat/fsmonitor/fsm-settings-win32.c +#, c-format +msgid "[GLE %ld] unable to get protocol information for '%ls'" +msgstr "" + #: compat/mingw.c #, c-format msgid "failed to copy SID (%ld)" @@ -18231,224 +18602,6 @@ 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" @@ -18664,57 +18817,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 +18991,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 +19532,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,22 +19591,22 @@ 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" @@ -19460,6 +19649,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 +19794,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" @@ -20027,6 +20216,14 @@ msgid "Low-level Commands / Internal Helpers" msgstr "Perintah Tingak Rendah / Pembantu Internal" #: help.c +msgid "User-facing repository, command and file interfaces" +msgstr "" + +#: help.c +msgid "Developer-facing file file formats, protocols and interfaces" +msgstr "" + +#: help.c #, c-format msgid "available git commands in '%s'" msgstr "perintah git yang tersedia di '%s'" @@ -20044,6 +20241,14 @@ msgid "The Git concept guides are:" msgstr "Panduan konsep Git adalah:" #: 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 "Perintah eksternal" @@ -20140,11 +20345,6 @@ 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')" @@ -20354,21 +20554,16 @@ msgstr "" 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" - #: 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 +20588,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" -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" +"Failed to merge submodule %s, but a possible merge resolution exists: %s" 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 +20780,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 +20912,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)" @@ -21350,6 +21576,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 +21862,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 +21943,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 exceed 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 "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>" +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 +22098,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 +22196,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,130 +22220,135 @@ 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" @@ -22059,20 +22442,20 @@ msgstr "" #: 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,20 +22463,22 @@ 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 @@ -22313,9 +22698,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 +22714,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 +22822,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 +23191,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 +23579,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 +23619,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 +23716,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 +23729,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,6 +23762,215 @@ 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 "" + +#: 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 "" + +#: scalar.c +msgid "could not configure log.excludeDecoration" +msgstr "" + +#: 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 "" + +#: 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 "" + +#: 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 "" + +#: 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.c +#, c-format +msgid "cannot deduce worktree name from '%s'" +msgstr "" + +#: scalar.c +#, c-format +msgid "directory '%s' exists already" +msgstr "" + +#: scalar.c +#, c-format +msgid "failed to get default branch for '%s'" +msgstr "" + +#: scalar.c +#, c-format +msgid "could not configure remote in '%s'" +msgstr "" + +#: scalar.c +#, c-format +msgid "could not configure '%s'" +msgstr "" + +#: 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.c +msgid "`scalar list` does not take arguments" +msgstr "" + +#: scalar.c +msgid "scalar register [<enlistment>]" +msgstr "" + +#: scalar.c +msgid "reconfigure all registered enlistments" +msgstr "" + +#: scalar.c +msgid "scalar reconfigure [--all | <enlistment>]" +msgstr "" + +#: scalar.c +msgid "--all or <enlistment>, but not both" +msgstr "" + +#: scalar.c +#, c-format +msgid "git repository gone in '%s'" +msgstr "" + +#: scalar.c +msgid "" +"scalar run <task> [<enlistment>]\n" +"Tasks:\n" +msgstr "" + +#: scalar.c +#, c-format +msgid "no such task: '%s'" +msgstr "" + +#: scalar.c +msgid "scalar unregister [<enlistment>]" +msgstr "" + +#: scalar.c +msgid "scalar delete <enlistment>" +msgstr "" + +#: scalar.c +msgid "refusing to delete current working directory" +msgstr "" + +#: scalar.c +msgid "include Git version" +msgstr "" + +#: scalar.c +msgid "include Git's build options" +msgstr "" + +#: scalar.c +msgid "scalar verbose [-v | --verbose] [--build-options]" +msgstr "" + +#: scalar.c +msgid "-C requires a <directory>" +msgstr "" + +#: scalar.c +#, c-format +msgid "could not change to '%s'" +msgstr "" + +#: scalar.c +msgid "-c requires a <key>=<value> argument" +msgstr "" + +#: scalar.c +msgid "" +"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n" +"\n" +"Commands:\n" msgstr "" #: send-pack.c @@ -23493,11 +24119,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 +24711,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 "" + +#: 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 +24938,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 +25088,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." @@ -25180,6 +25836,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 +25845,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 +25854,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 +25864,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 +25874,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 +25883,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 +25892,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 +25902,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 +25911,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 +25920,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 +25929,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 +25938,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 +25947,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 +25956,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 +25966,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 +25976,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 +25985,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 +25994,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 +26003,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 +26012,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 +26026,8 @@ msgid "" "Cannot update submodule:\n" "%s" msgstr "" +"Tidak dapat memperbarui submodul:\n" +"%s" #: unpack-trees.c #, c-format @@ -25335,6 +26036,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 +26045,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 +26056,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 +26070,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 +26083,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" @@ -25416,6 +26129,22 @@ msgstr "" msgid "invalid '..' path segment" msgstr "" +#: 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 "" @@ -26093,7 +26822,7 @@ 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" @@ -26329,26 +27058,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 "" @@ -26810,3 +27519,56 @@ msgstr "Melewati %s dengan akhiran cadangan '%s'.\n" #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Anda benar-benar ingin mengirim %s? [y|N]: " + +#, c-format +#~ msgid "could not parse colored hunk header '%.*s'" +#~ msgstr "tidak dapat menguraikan kepala bingkah berwarna '%.*s'" + +#, c-format +#~ msgid "Unknown subcommand: %s" +#~ msgstr "Subperintah tidak dikenal: %s" + +#~ msgid "checked out in another worktree" +#~ msgstr "ter-check out di dalam pohon kerja lainnya" + +#~ msgid "failed to open stdin of 'crontab'" +#~ msgstr "gagal membuka masukan standar dari 'crontab'" + +#~ msgid "git submodule--helper list [--prefix=<path>] [<path>...]" +#~ msgstr "git submodule--helper list [--prefix=<jalur>] [<jalur>...]" + +#~ msgid "git submodule--helper name <path>" +#~ msgstr "git submodule--helper name <jalur>" + +#, c-format +#~ msgid "failed to get the default remote for submodule '%s'" +#~ msgstr "gagal mendapatkan remote asali untuk submodul '%s'" + +#, c-format +#~ msgid "Invalid update mode '%s' for submodule path '%s'" +#~ msgstr "Mode pembaruan '%s' tidak valid untuk jalur submodul '%s'" + +#~ msgid "path into the working tree, across nested submodule boundaries" +#~ msgstr "jalur ke dalam pohon kerja, melintasi perbatasan submodul bersarang" + +#~ msgid "rebase, merge, checkout or none" +#~ msgstr "dasarkan ulang, gabungkan, checkout atau tidak sama sekali" + +#~ msgid "bad value for update parameter" +#~ msgstr "nilai jelek untuk parameter pembaruan" + +#, c-format +#~ msgid "Couldn't start hook '%s'\n" +#~ msgstr "Tidak dapat memulai kait '%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 "" +#~ "Catatan: %s tidak terbaru dan dalam men-checkout versi berkonflik; " +#~ "salinan lama dinamai ulang ke %s" + +#, c-format +#~ msgid "%s: fast-forward" +#~ msgstr "%s: maju-cepat" @@ -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-16 20:53+0100\n" +"PO-Revision-Date: 2022-09-16 22:02+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" @@ -1229,6 +1241,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 +1264,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 +3026,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 +3068,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 +3149,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 +3226,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 +3238,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 +4109,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 +4174,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 +4199,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 +4277,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 +4398,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 +4751,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 +5339,25 @@ 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 "(stats|all)" +msgstr "(stats|all)" + +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 +5730,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 +6169,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>...]" @@ -6415,9 +6478,15 @@ msgstr "utför en specifik uppgift" msgid "use at most one of --auto and --schedule=<frequency>" msgstr "använd som mest en av --auto och --schedule=<frekvens>" +msgid "git maintenance register" +msgstr "git maintenance register" + msgid "failed to run 'git config'" msgstr "misslyckades köra \"git config\"" +msgid "git maintenance unregister" +msgstr "git maintenance unregister" + #, c-format msgid "failed to expand path '%s'" msgstr "misslyckades expandera sökvägen \"%s\"" @@ -6441,13 +6510,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 stdin of 'crontab'" -msgstr "misslyckades öppna standard in för \"crontab\"" +msgid "failed to open temporary file" +msgstr "misslyckades öppna temporär fil" + +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" @@ -6492,13 +6564,12 @@ msgstr "schemaläggare som utlöser \"git maintenance\"-körning" msgid "failed to add repo to global config" msgstr "misslyckades lägga till arkiv till global konfiguration" +msgid "git maintenance stop" +msgstr "git maintenance stop" + 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 +6740,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 +6829,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 +7310,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 +7562,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 +7623,22 @@ 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: 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 +7724,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 +7948,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 +8061,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 +8181,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 +8229,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 +8276,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 +8396,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 +8414,6 @@ msgstr "inte versionshanterad" msgid "conflicted" msgstr "i konflikt" -msgid "destination exists" -msgstr "destinationen finns" - #, c-format msgid "overwriting '%s'" msgstr "skriver över \"%s\"" @@ -8320,7 +8463,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 +8785,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 +9670,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 +9952,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 +10475,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 +11143,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 +11173,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 +11936,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 +11947,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 +11979,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 +12001,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 +12029,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 +12062,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 +12077,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 +12139,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 +12176,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 +12207,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 +12279,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 +12291,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 +12324,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 "rebase, merge, checkout or none" -msgstr "rebase, merge, checkout eller none" +msgid "use the 'merge' update strategy" +msgstr "använd uppdateringsstrategin \"merge\" (sammanslagning)" + +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 +12345,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 +12359,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 +12383,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 +12392,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 +12494,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 +12701,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 +13226,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\"" @@ -13390,8 +13576,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" @@ -13618,6 +13804,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 +13843,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" @@ -13910,6 +14129,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 +14191,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)" @@ -14510,16 +14745,16 @@ msgstr "kunde inte stänga rev-list:s standard in" 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\"" +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" @@ -14527,24 +14762,23 @@ 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" +msgid "could not add enlistment" +msgstr "kunde inte lägga till enrollering" -#, c-format -msgid "could not open directory '%s'" -msgstr "kunde inte öppna katalogen \"%s\"" +msgid "could not set recommended config" +msgstr "kan inte ange rekommenderad konfiguration" -#, 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 turn on maintenance" +msgstr "kunde inte aktivera underhåll" -#, c-format -msgid "could not determine free disk size for '%s'" -msgstr "kunde inte ta reda på ledigt diskutrymme för \"%s\"" +msgid "could not start the FSMonitor daemon" +msgstr "kunde inte starta FSMonitor-server" -#, c-format -msgid "could not get info for '%s'" -msgstr "kunde inte hämta info för \"%s\"" +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'" @@ -14560,6 +14794,9 @@ 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" @@ -14604,16 +14841,6 @@ 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" @@ -14884,6 +15111,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 +15743,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 +15856,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 +16201,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 file formats, protocols and interfaces" +msgstr "Filformat, protokoll och gränssnitt tänkta för utvecklare" + #, c-format msgid "available git commands in '%s'" msgstr "git-kommandon tillgängliga i \"%s\"" @@ -15961,6 +16220,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 +16309,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 +16491,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 +16518,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 "" @@ -16443,13 +16680,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 "" -"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 "" -"Observera: %s är inte à jour och i vägen för att checka ut version i " -"konflikt; gammal upplaga har nytt namn %s" +" - 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 "" +"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 "" +"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 +16794,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 +17323,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 +17564,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 +17625,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 exceed 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 "could not find %s in pack %s at offset %<PRIuMAX>" -msgstr "kunde inte hitta %s i paketet %s på offset %<PRIuMAX>" +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>" + +#, 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 +17801,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 +18237,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 +18270,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 +18744,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 +19088,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" @@ -18812,10 +19236,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 +19722,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 +19909,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 +20032,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 +20916,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 +21718,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-16 17:47+0300\n" +"PO-Revision-Date: 2022-09-16 23: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." @@ -1298,6 +1311,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 +1334,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 +1709,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 +1752,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 +1906,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 +1930,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 +2158,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 +2263,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 +2281,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 +2819,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 +3057,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 +3100,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 +3141,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 +3220,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 +3294,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 +3308,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 +3463,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 +3669,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 +4180,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 +4245,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 +4270,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 +4286,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 +4347,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 +4471,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 +4628,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 +4751,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 +4826,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 +4836,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 +4846,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 +5214,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 +5313,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 +5421,25 @@ 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 "(stats|all)" +msgstr "(stats|all)" + +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 +5460,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 +5468,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 +5818,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 +5854,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 +5948,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 +5967,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 +6006,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 +6175,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 +6202,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 +6252,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 +6398,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 +6522,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" @@ -6496,9 +6557,15 @@ msgstr "belirli bir görevi çalıştır" msgid "use at most one of --auto and --schedule=<frequency>" msgstr "tek kezde --auto ve --schedule=<sıklık>'tan birini kullan" +msgid "git maintenance register" +msgstr "git maintenance register" + msgid "failed to run 'git config'" msgstr "'git config' çalıştırılamadı" +msgid "git maintenance unregister" +msgstr "git maintenance unregister" + #, c-format msgid "failed to expand path '%s'" msgstr "'%s' yolu oluşturulamadı" @@ -6523,12 +6590,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 +6621,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" @@ -6572,13 +6642,12 @@ msgstr "git bakımını tetikleyecek görev planlayıcı" msgid "failed to add repo to global config" msgstr "depo, global yapılandırmaya eklenemedi" +msgid "git maintenance stop" +msgstr "git maintenance stop" + 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 +6819,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 +6909,19 @@ 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 +7078,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 +7105,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 +7179,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 +7270,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 +7391,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 +7488,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 +7646,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 +7707,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 +7804,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 +8028,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 +8142,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 +8159,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 +8258,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 +8277,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 +8307,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 +8337,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 +8353,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 +8474,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 +8492,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 +8503,7 @@ 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" #, c-format msgid "%s, source=%s, destination=%s" @@ -8517,11 +8655,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 +8671,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 +8712,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 +8737,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 +8767,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 +8834,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 +8859,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 +8887,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 +9342,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 +9388,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 +9569,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 +9581,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 +9594,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 +9619,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 +9659,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 +9751,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 +10038,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 +10109,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 +10438,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 +10485,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 +10513,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 +10568,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 +10963,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 +11076,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 +11242,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 +11271,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 +11285,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 +11409,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 +11423,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 +11731,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 +12035,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 +12046,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 +12077,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 +12099,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 +12127,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 +12159,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 +12174,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 +12237,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 +12275,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 +12306,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 +12326,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 +12379,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 +12424,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 "rebase, merge, checkout or none" -msgstr "rebase, merge, checkout veya none" +msgid "use the 'merge' update strategy" +msgstr "'merge' güncelleme stratejisini kullan" + +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 +12445,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 +12459,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 +12483,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 +12492,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 +12523,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 +12592,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 +12798,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 +12900,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 +13318,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" @@ -13368,8 +13550,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 +13666,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 +13712,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 +13799,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" @@ -13714,6 +13895,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 +13934,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" @@ -13792,7 +14006,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 +14097,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 +14180,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 +14210,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 +14278,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)" @@ -14601,18 +14830,18 @@ 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" +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ı" @@ -14620,24 +14849,23 @@ 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" +msgid "could not add enlistment" +msgstr "gönüllü yazılma eklenemedi" -#, c-format -msgid "could not open directory '%s'" -msgstr "'%s' dizini açılamadı" +msgid "could not set recommended config" +msgstr "önerilen yapılandırma ayarlanamadı" -#, 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 turn on maintenance" +msgstr "bakım ayarı açılamadı" -#, c-format -msgid "could not determine free disk size for '%s'" -msgstr "'%s' için boş disk alanı belirlenemedi" +msgid "could not start the FSMonitor daemon" +msgstr "FSMonitor ardalan süreci başlatılamadı" -#, c-format -msgid "could not get info for '%s'" -msgstr "'%s' için bilgi alınamadı" +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'" @@ -14653,6 +14881,9 @@ 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" @@ -14697,16 +14928,6 @@ 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" @@ -14980,6 +15201,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 +15250,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 +15786,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 +15835,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 +15948,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 +16117,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 +16180,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 +16229,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 +16294,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ıya görünür depo, komut ve dosya arayüzleri" + +msgid "Developer-facing file file formats, protocols and interfaces" +msgstr "Geliştiriciye görünür 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 +16313,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 +16402,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 +16586,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 +16611,16 @@ msgstr "'%s' altmodülü birleştirilemedi" #, 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 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" -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 +16639,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 +16650,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 +16779,43 @@ 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 "" +" - go to submodule (%s), and either merge commit %s\n" +" or update to an existing commit which has merged those changes\n" +msgstr "" +" - 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 "" -"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 "" -"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ü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 +16888,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 +16963,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 +17008,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 +17018,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 +17037,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 +17136,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 +17181,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 +17348,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 +17379,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 +17422,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 +17578,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 +17595,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 +17664,57 @@ 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 +17726,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 exceed 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 "object '%s' does not have a unique type" +msgstr "'%s' nesnesinin benzersiz bir türü yok" + #, c-format -msgid "could not find %s in pack %s at offset %<PRIuMAX>" -msgstr "%s, %s paketi %<PRIuMAX> ofsetinde bulunamadı" +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 +17900,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 +18335,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 +18351,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 +18363,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 +18437,8 @@ 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 +18835,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 +18868,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 +19179,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" @@ -18910,10 +19327,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 +19389,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 +19810,28 @@ 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 +19998,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 +20120,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 +20998,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 +21800,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" |