diff --git a/po/TEAMS b/po/TEAMS index 00472a47135c49..4f0519dc9b1535 100644 --- a/po/TEAMS +++ b/po/TEAMS @@ -67,3 +67,8 @@ Leader: Jiang Xin Members: Ray Chen 依云 Fangyi Zhou + +Language: zh_TW (Traditional Chinese) +Respository: https://github.com/l10n-tw/git-po +Leader: Yi-Jyun Pan +Members: Franklin Weng diff --git a/po/bg.po b/po/bg.po index e446c76d99233e..29ba1c82fed9ee 100644 --- a/po/bg.po +++ b/po/bg.po @@ -1,7 +1,7 @@ # Bulgarian translation of git po-file. -# Copyright (C) 2014, 2015, 2016, 2017, 2018, 2019 Alexander Shopov . +# Copyright (C) 2014, 2015, 2016, 2017, 2018, 2019, 2020 Alexander Shopov . # This file is distributed under the same license as the git package. -# Alexander Shopov , 2014, 2015, 2016, 2017, 2018, 2019. +# Alexander Shopov , 2014, 2015, 2016, 2017, 2018, 2019, 2020. # # ======================== # DICTIONARY TO MERGE IN GIT GUI @@ -139,6 +139,10 @@ # split (commit-graphr) раздробен (граф с подавания) # clobber (a tag) презаписвам (етикет) # blame извеждане на авторство +# refname име на указател +# cone pattern matching пътеводно напасване +# negative pattern отрицателен шаблон +# colored hunk/diff оцветено парче/разлика # ------------------------ # „$var“ - може да не сработва за shell има gettext и eval_gettext - проверка - намират се лесно по „$ # ------------------------ @@ -155,10 +159,10 @@ # for i in `sort -u FILES`; do cnt=`grep $i FILES | wc -l`; echo $cnt $i ;done | sort -n msgid "" msgstr "" -"Project-Id-Version: git 2.24\n" +"Project-Id-Version: git 2.25\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2019-10-28 13:19+0800\n" -"PO-Revision-Date: 2019-10-29 11:35+0100\n" +"POT-Creation-Date: 2020-01-09 16:22+0100\n" +"PO-Revision-Date: 2020-01-09 16:31+0100\n" "Last-Translator: Alexander Shopov \n" "Language-Team: Bulgarian \n" "Language: bg\n" @@ -167,37 +171,467 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: advice.c:109 +#: add-interactive.c:347 +#, c-format +msgid "Huh (%s)?" +msgstr "Неуспешен анализ — „%s“." + +#: add-interactive.c:500 add-interactive.c:801 sequencer.c:3216 +#: sequencer.c:3656 builtin/rebase.c:871 builtin/rebase.c:1643 +#: builtin/rebase.c:2019 builtin/rebase.c:2063 +msgid "could not read index" +msgstr "индексът не може да бъде прочетен" + +#: add-interactive.c:555 git-add--interactive.perl:269 +#: git-add--interactive.perl:294 +msgid "binary" +msgstr "двоично" + +#: add-interactive.c:613 git-add--interactive.perl:278 +#: git-add--interactive.perl:332 +msgid "nothing" +msgstr "нищо" + +#: add-interactive.c:614 git-add--interactive.perl:314 +#: git-add--interactive.perl:329 +msgid "unchanged" +msgstr "няма промени" + +#: add-interactive.c:651 git-add--interactive.perl:643 +msgid "Update" +msgstr "Обновяване" + +#: add-interactive.c:668 add-interactive.c:856 +#, c-format +msgid "could not stage '%s'" +msgstr "неуспешно добавяне в индекса на „%s“" + +#: add-interactive.c:674 add-interactive.c:863 sequencer.c:3409 +#: builtin/rebase.c:895 +msgid "could not write index" +msgstr "индексът не може да бъде записан" + +#: add-interactive.c:677 git-add--interactive.perl:628 +#, c-format, perl-format +msgid "updated %d path\n" +msgid_plural "updated %d paths\n" +msgstr[0] "%d файл обновен\n" +msgstr[1] "%d файла обновени\n" + +#: add-interactive.c:695 git-add--interactive.perl:678 +#, c-format, perl-format +msgid "note: %s is untracked now.\n" +msgstr "БЕЛЕЖКА: „%s“ вече не се следи.\n" + +#: add-interactive.c:700 apply.c:4108 builtin/checkout.c:281 +#: builtin/reset.c:144 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "неуспешно създаване на запис в кеша чрез „make_cache_entry“ за „%s“" + +#: add-interactive.c:730 git-add--interactive.perl:655 +msgid "Revert" +msgstr "Отмяна" + +#: add-interactive.c:746 +msgid "Could not parse HEAD^{tree}" +msgstr "Указателят „HEAD^{tree}“ не може да бъде анализиран" + +#: add-interactive.c:784 git-add--interactive.perl:631 +#, c-format, perl-format +msgid "reverted %d path\n" +msgid_plural "reverted %d paths\n" +msgstr[0] "%d файл с отменени промени\n" +msgstr[1] "%d файла с отменени промени\n" + +#: add-interactive.c:835 git-add--interactive.perl:695 +#, c-format +msgid "No untracked files.\n" +msgstr "Няма неследени файлове.\n" + +#: add-interactive.c:839 git-add--interactive.perl:689 +msgid "Add untracked" +msgstr "Добавяне на неследени" + +#: add-interactive.c:866 git-add--interactive.perl:625 +#, c-format, perl-format +msgid "added %d path\n" +msgid_plural "added %d paths\n" +msgstr[0] "%d файл добавен\n" +msgstr[1] "%d файла добавени\n" + +#: add-interactive.c:896 +#, c-format +msgid "ignoring unmerged: %s" +msgstr "пренебрегване на неслятото: „%s“" + +#: add-interactive.c:908 add-patch.c:1331 git-add--interactive.perl:1366 +#, c-format +msgid "Only binary files changed.\n" +msgstr "Само двоични файлове са променени.\n" + +#: add-interactive.c:910 add-patch.c:1329 git-add--interactive.perl:1368 +#, c-format +msgid "No changes.\n" +msgstr "Няма промени.\n" + +#: add-interactive.c:914 git-add--interactive.perl:1376 +msgid "Patch update" +msgstr "Обновяване на кръпка" + +#: add-interactive.c:953 git-add--interactive.perl:1754 +msgid "Review diff" +msgstr "Преглед на разликата" + +#: add-interactive.c:981 +msgid "show paths with changes" +msgstr "извеждане на пътищата с промени" + +#: add-interactive.c:983 +msgid "add working tree state to the staged set of changes" +msgstr "добавяне на състоянието на работното дърво към промените в индекса" + +#: add-interactive.c:985 +msgid "revert staged set of changes back to the HEAD version" +msgstr "връщане на състоянието на индекса към соченото от „HEAD“" + +#: add-interactive.c:987 +msgid "pick hunks and update selectively" +msgstr "интерактивни избор и промяна на парчета код" + +#: add-interactive.c:989 +msgid "view diff between HEAD and index" +msgstr "разлика между соченото от „HEAD“ и индекса" + +#: add-interactive.c:991 +msgid "add contents of untracked files to the staged set of changes" +msgstr "добавяне на съдържанието на неследените файлове към индекса" + +#: add-interactive.c:999 add-interactive.c:1048 +msgid "Prompt help:" +msgstr "Помощ:" + +#: add-interactive.c:1001 +msgid "select a single item" +msgstr "избор на eдин елемент" + +#: add-interactive.c:1003 +msgid "select a range of items" +msgstr "избор на поредица от елементи" + +#: add-interactive.c:1005 +msgid "select multiple ranges" +msgstr "избор на няколко поредици от елементи" + +#: add-interactive.c:1007 add-interactive.c:1052 +msgid "select item based on unique prefix" +msgstr "избор на базата на уникален префикс" + +#: add-interactive.c:1009 +msgid "unselect specified items" +msgstr "изваждане на указаното от избора" + +#: add-interactive.c:1011 +msgid "choose all items" +msgstr "избор на всички елементи" + +#: add-interactive.c:1013 +msgid "(empty) finish selecting" +msgstr "(празно) приключване на избирането" + +#: add-interactive.c:1050 +msgid "select a numbered item" +msgstr "избор на номериран елемент" + +#: add-interactive.c:1054 +msgid "(empty) select nothing" +msgstr "(празно) без избор на нищо" + +#: add-interactive.c:1062 builtin/clean.c:822 git-add--interactive.perl:1851 +msgid "*** Commands ***" +msgstr "●●● Команди ●●●" + +#: add-interactive.c:1063 builtin/clean.c:823 git-add--interactive.perl:1848 +msgid "What now" +msgstr "Избор на следващо действие" + +#: add-interactive.c:1115 git-add--interactive.perl:213 +msgid "staged" +msgstr "в индекса" + +#: add-interactive.c:1115 git-add--interactive.perl:213 +msgid "unstaged" +msgstr "извън индекса" + +#: add-interactive.c:1115 apply.c:4965 apply.c:4968 builtin/am.c:2197 +#: builtin/am.c:2200 builtin/clone.c:123 builtin/fetch.c:144 +#: builtin/merge.c:273 builtin/pull.c:209 builtin/submodule--helper.c:409 +#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1382 +#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:1878 +#: builtin/submodule--helper.c:2119 git-add--interactive.perl:213 +msgid "path" +msgstr "път" + +#: add-interactive.c:1122 +msgid "could not refresh index" +msgstr "индексът не може да бъде обновен" + +# +#: add-interactive.c:1136 builtin/clean.c:787 git-add--interactive.perl:1765 +#, c-format +msgid "Bye.\n" +msgstr "Изход.\n" + +#: add-patch.c:15 +#, c-format +msgid "Stage mode change [y,n,a,q,d%s,?]? " +msgstr "Добавяне на промяната на правата за достъп [y,n,a,q,d%s,?]? " + +#: add-patch.c:16 +#, c-format +msgid "Stage deletion [y,n,a,q,d%s,?]? " +msgstr "Добавяне на изтриването [y,n,a,q,d%s,?]? " + +#: add-patch.c:17 +#, c-format +msgid "Stage this hunk [y,n,a,q,d%s,?]? " +msgstr "Добавяне на това парче [y,n,a,q,d%s,?]? " + +#: add-patch.c:111 +#, c-format +msgid "could not parse hunk header '%.*s'" +msgstr "заглавната част на парчето „%.*s“ не може да се анализира" + +#: add-patch.c:130 add-patch.c:134 +#, c-format +msgid "could not parse colored hunk header '%.*s'" +msgstr "заглавната част на оцветеното парче „%.*s“ не може да се анализира" + +#: add-patch.c:176 +msgid "could not parse diff" +msgstr "разликата не може да се анализира" + +#: add-patch.c:194 +msgid "could not parse colored diff" +msgstr "оцветената разлика не може да се анализира" + +#: add-patch.c:508 +#, c-format +msgid "" +"expected context line #%d in\n" +"%.*s" +msgstr "" +"очаква се ред №%d от контекста в\n" +"%.*s" + +#: add-patch.c:523 +#, c-format +msgid "" +"hunks do not overlap:\n" +"%.*s\n" +"\tdoes not end with:\n" +"%.*s" +msgstr "" +"парчетата код не се припокриват:\n" +"%.*s\n" +" не завършва с:\n" +"%.*s" + +#: add-patch.c:799 git-add--interactive.perl:1112 +msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" +msgstr "Ръчно редактиране на парчета код — отдолу има подсказка.\n" + +#: add-patch.c:803 +#, c-format +msgid "" +"---\n" +"To remove '%c' lines, make them ' ' lines (context).\n" +"To remove '%c' lines, delete them.\n" +"Lines starting with %c will be removed.\n" +msgstr "" +"———\n" +"За да пропуснете редовете, започващи с „%c“: заменете знака с „ “ (стават " +"контекст)\n" +"За да пропуснете редовете, започващи с „%c“: изтрийте ги.\n" +"Редовете, които започват с „%c“ ще бъдат пропуснати.\n" + +#: add-patch.c:810 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for staging.\n" +msgstr "" +"Ако кръпката може да се приложи чисто, редактираното парче ще бъде " +"незабавно\n" +"добавено към индекса.\n" + +#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. +#: add-patch.c:818 git-add--interactive.perl:1126 +msgid "" +"If it does not apply cleanly, you will be given an opportunity to\n" +"edit again. If all lines of the hunk are removed, then the edit is\n" +"aborted and the hunk is left unchanged.\n" +msgstr "" +"Ако е невъзможно чисто прилагане на кода, ще може пак да редактирате. Ако\n" +"изтриете всички редове от парчето код, то ще бъде оставено непроменено, а\n" +"редактирането — отказано.\n" + +#: add-patch.c:851 +msgid "could not parse hunk header" +msgstr "заглавната част парчето не може да се анализира" + +#: add-patch.c:895 add-patch.c:1294 +msgid "'git apply --cached' failed" +msgstr "неуспешно изпълнение на „git apply --cached“" + +#. TRANSLATORS: do not translate [y/n] +#. The program will only accept that input at this point. +#. Consider translating (saying "no" discards!) as +#. (saying "n" for "no" discards!) if the translation +#. of the word "no" does not start with n. +#. +#. TRANSLATORS: do not translate [y/n] +#. The program will only accept that input +#. at this point. +#. Consider translating (saying "no" discards!) as +#. (saying "n" for "no" discards!) if the translation +#. of the word "no" does not start with n. +#: add-patch.c:952 git-add--interactive.perl:1239 +msgid "" +"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +msgstr "" +"Редактираното парче не може да се приложи. Да се продължи ли с " +"редактирането? (текущите редакции ще се отменят при отказ!): „y“ (да)/ " +"„n“ (не)? " + +#: add-patch.c:1009 +msgid "" +"y - stage this hunk\n" +"n - do not stage this hunk\n" +"q - quit; do not stage this hunk or any of the remaining ones\n" +"a - stage this and all the remaining hunks\n" +"d - do not stage this hunk nor any of the remaining hunks\n" +msgstr "" +"y — добавяне на парчето в индекса\n" +"n — без добавяне на парчето в индекса\n" +"q — изход, без добавяне на това и всички оставащи парчета\n" +"a — добавяне на това и всички следващи парчета в индекса\n" +"d — без добавяне на това и всички оставащи парчета в индекса\n" + +#: add-patch.c:1016 +msgid "" +"j - leave this hunk undecided, see next undecided hunk\n" +"J - leave this hunk undecided, see next hunk\n" +"k - leave this hunk undecided, see previous undecided hunk\n" +"K - leave this hunk undecided, see previous hunk\n" +"g - select a hunk to go to\n" +"/ - search for a hunk matching the given regex\n" +"s - split the current hunk into smaller hunks\n" +"e - manually edit the current hunk\n" +"? - print help\n" +msgstr "" +"j — без решение за парчето, към следващото парче без решение\n" +"J — без решение за парчето, към следващото парче\n" +"k — без решение за парчето, към предишното парче без решение\n" +"K — без решение за парчето, към предишното парче\n" +"g — избор към кое парче да се премине\n" +"/ — търсене на парче, напасващо към даден регулярен израз\n" +"s — разделяне на текущото парче на по-малки\n" +"e — ръчно редактиране на текущото парче\n" +"? — извеждане не помощта\n" + +#: add-patch.c:1137 add-patch.c:1147 +msgid "No previous hunk" +msgstr "Няма друго парче преди това" + +#: add-patch.c:1142 add-patch.c:1152 +msgid "No next hunk" +msgstr "Няма друго парче след това" + +#: add-patch.c:1158 +msgid "No other hunks to goto" +msgstr "Няма други парчета" + +#: add-patch.c:1169 git-add--interactive.perl:1577 +msgid "go to which hunk ( to see more)? " +msgstr "към кое парче да се придвижи (за повече варианти натиснете „enter“)? " + +#: add-patch.c:1170 git-add--interactive.perl:1579 +msgid "go to which hunk? " +msgstr "към кое парче да се придвижи? " + +#: add-patch.c:1181 +#, c-format +msgid "Invalid number: '%s'" +msgstr "Неправилен номер: „%s“" + +#: add-patch.c:1186 +#, c-format +msgid "Sorry, only %d hunk available." +msgid_plural "Sorry, only %d hunks available." +msgstr[0] "Има само %d парче." +msgstr[1] "Има само %d парчета." + +#: add-patch.c:1195 +msgid "No other hunks to search" +msgstr "Няма други парчета за търсене" + +#: add-patch.c:1201 git-add--interactive.perl:1623 +msgid "search for regex? " +msgstr "да се търси с регулярен израз? " + +#: add-patch.c:1216 +#, c-format +msgid "Malformed search regexp %s: %s" +msgstr "Сгрешен регулярен израз „%s“: %s" + +#: add-patch.c:1233 +msgid "No hunk matches the given pattern" +msgstr "Никое парче не напасва на регулярния израз" + +#: add-patch.c:1240 +msgid "Sorry, cannot split this hunk" +msgstr "Това парче не може да бъде разделено" + +#: add-patch.c:1244 +#, c-format +msgid "Split into %d hunks." +msgstr "Разделяне на %d парчета." + +#: add-patch.c:1248 +msgid "Sorry, cannot edit this hunk" +msgstr "Това парче не може да бъде редактирано" + +#: advice.c:111 #, c-format msgid "%shint: %.*s%s\n" msgstr "%sподсказка: %.*s%s\n" -#: advice.c:162 +#: advice.c:164 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "Отбирането на подавания е блокирано от неслети файлове." -#: advice.c:164 +#: advice.c:166 msgid "Committing is not possible because you have unmerged files." msgstr "Подаването е блокирано от неслети файлове." -#: advice.c:166 +#: advice.c:168 msgid "Merging is not possible because you have unmerged files." msgstr "Сливането е блокирано от неслети файлове." -#: advice.c:168 +#: advice.c:170 msgid "Pulling is not possible because you have unmerged files." msgstr "Издърпването е блокирано от неслети файлове." -#: advice.c:170 +#: advice.c:172 msgid "Reverting is not possible because you have unmerged files." msgstr "Отмяната е блокирана от неслети файлове." -#: advice.c:172 +#: advice.c:174 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "Действието „%s“ е блокирано от неслети файлове." -#: advice.c:180 +#: advice.c:182 msgid "" "Fix them up in the work tree, and then use 'git add/rm '\n" "as appropriate to mark resolution and make a commit." @@ -205,23 +639,23 @@ msgstr "" "Редактирайте ги в работното дърво, и тогава ползвайте „git add/rm ФАЙЛ“,\n" "за да отбележите коригирането им. След това извършете подаването." -#: advice.c:188 +#: advice.c:190 msgid "Exiting because of an unresolved conflict." msgstr "Изход от програмата заради некоригиран конфликт." -#: advice.c:193 builtin/merge.c:1332 +#: advice.c:195 builtin/merge.c:1332 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Не сте завършили сливане. (Указателят „MERGE_HEAD“ съществува)." -#: advice.c:195 +#: advice.c:197 msgid "Please, commit your changes before merging." msgstr "Промените трябва да се подадат преди сливане." -#: advice.c:196 +#: advice.c:198 msgid "Exiting because of unfinished merge." msgstr "Изход от програмата заради незавършено сливане." -#: advice.c:202 +#: advice.c:204 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -439,12 +873,12 @@ msgstr "символната връзка „%s“ не може да бъде msgid "unable to open or read %s" msgstr "файлът „%s“ не може да бъде отворен или прочетен" -#: apply.c:2926 +#: apply.c:2936 #, c-format msgid "invalid start of line: '%c'" msgstr "неправилно начало на ред: „%c“" -#: apply.c:3047 +#: apply.c:3057 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." @@ -453,13 +887,13 @@ msgstr[0] "" msgstr[1] "" "%d-то парче код бе успешно приложено на ред %d (отместване от %d реда)." -#: apply.c:3059 +#: apply.c:3069 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" "Контекстът е намален на (%ld/%ld) за прилагането на парчето код на ред %d" -#: apply.c:3065 +#: apply.c:3075 #, c-format msgid "" "while searching for:\n" @@ -468,317 +902,312 @@ msgstr "" "при търсене за:\n" "%.*s" -#: apply.c:3087 +#: apply.c:3097 #, c-format msgid "missing binary patch data for '%s'" msgstr "липсват данните за двоичната кръпка за „%s“" -#: apply.c:3095 +#: apply.c:3105 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" "двоичната кръпка не може да се приложи в обратна посока, когато обратното " "парче за „%s“ липсва" -#: apply.c:3142 +#: apply.c:3152 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "към „%s“ не може да се приложи двоична кръпка без пълен индекс" -#: apply.c:3152 +#: apply.c:3162 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "кръпката съответства на „%s“ (%s), който не съвпада по съдържание." -#: apply.c:3160 +#: apply.c:3170 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "кръпката съответства на „%s“, който трябва да е празен, но не е" -#: apply.c:3178 +#: apply.c:3188 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "" "необходимият резултат след операцията — „%s“ за „%s“ не може да бъде " "прочетен" -#: apply.c:3191 +#: apply.c:3201 #, c-format msgid "binary patch does not apply to '%s'" msgstr "двоичната кръпка не може да бъде приложена върху „%s“" -#: apply.c:3197 +#: apply.c:3207 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "двоичната кръпка за „%s“ води до неправилни резултати (очакваше се: „%s“, а " "бе получено: „%s“)" -#: apply.c:3218 +#: apply.c:3228 #, c-format msgid "patch failed: %s:%ld" msgstr "неуспешно прилагане на кръпка: „%s:%ld“" -#: apply.c:3341 +#: apply.c:3351 #, c-format msgid "cannot checkout %s" msgstr "„%s“ не може да се изтегли" -#: apply.c:3393 apply.c:3404 apply.c:3450 midx.c:61 setup.c:280 +#: apply.c:3403 apply.c:3414 apply.c:3460 midx.c:61 setup.c:280 #, c-format msgid "failed to read %s" msgstr "файлът „%s“ не може да бъде прочетен" -#: apply.c:3401 +#: apply.c:3411 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "изчитане на „%s“ след проследяване на символна връзка" -#: apply.c:3430 apply.c:3673 +#: apply.c:3440 apply.c:3683 #, c-format msgid "path %s has been renamed/deleted" msgstr "обектът с път „%s“ е преименуван или изтрит" -#: apply.c:3516 apply.c:3688 +#: apply.c:3526 apply.c:3698 #, c-format msgid "%s: does not exist in index" msgstr "„%s“ не съществува в индекса" -#: apply.c:3525 apply.c:3696 +#: apply.c:3535 apply.c:3706 #, c-format msgid "%s: does not match index" msgstr "„%s“ не съответства на индекса" -#: apply.c:3560 +#: apply.c:3570 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" "в хранилището липсват необходимите обекти-BLOB, за да се премине към тройно " "сливане." -#: apply.c:3563 +#: apply.c:3573 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Преминаване към тройно сливане…\n" -#: apply.c:3579 apply.c:3583 +#: apply.c:3589 apply.c:3593 #, c-format msgid "cannot read the current contents of '%s'" msgstr "текущото съдържание на „%s“ не може да бъде прочетено" -#: apply.c:3595 +#: apply.c:3605 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Неуспешно преминаване към тройно сливане…\n" -#: apply.c:3609 +#: apply.c:3619 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Конфликти при прилагането на кръпката към „%s“.\n" -#: apply.c:3614 +#: apply.c:3624 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Кръпката бе приложена чисто към „%s“.\n" -#: apply.c:3640 +#: apply.c:3650 msgid "removal patch leaves file contents" msgstr "изтриващата кръпка оставя файла непразен" -#: apply.c:3713 +#: apply.c:3723 #, c-format msgid "%s: wrong type" msgstr "„%s“: неправилен вид" -#: apply.c:3715 +#: apply.c:3725 #, c-format msgid "%s has type %o, expected %o" msgstr "„%s“ е от вид „%o“, а се очакваше „%o“" -#: apply.c:3866 apply.c:3868 read-cache.c:830 read-cache.c:856 -#: read-cache.c:1309 +#: apply.c:3876 apply.c:3878 read-cache.c:830 read-cache.c:856 +#: read-cache.c:1325 #, c-format msgid "invalid path '%s'" msgstr "неправилен път: „%s“" -#: apply.c:3924 +#: apply.c:3934 #, c-format msgid "%s: already exists in index" msgstr "„%s“: вече съществува в индекса" -#: apply.c:3927 +#: apply.c:3937 #, c-format msgid "%s: already exists in working directory" msgstr "„%s“: вече съществува в работното дърво" -#: apply.c:3947 +#: apply.c:3957 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "новите права за достъп (%o) на „%s“ не съвпадат със старите (%o)" -#: apply.c:3952 +#: apply.c:3962 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" "новите права за достъп (%o) на „%s“ не съвпадат със старите (%o) на „%s“" -#: apply.c:3972 +#: apply.c:3982 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "засегнатият файл „%s“ е след символна връзка" -#: apply.c:3976 +#: apply.c:3986 #, c-format msgid "%s: patch does not apply" msgstr "Кръпката „%s“ не може да бъде приложена" -#: apply.c:3991 +#: apply.c:4001 #, c-format msgid "Checking patch %s..." msgstr "Проверяване на кръпката „%s“…" -#: apply.c:4083 +#: apply.c:4093 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "" "информацията за сумата по SHA1 за подмодула липсва или не е достатъчна (%s)." -#: apply.c:4090 +#: apply.c:4100 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "смяна на режима на достъпа на „%s“, който не е в текущия връх „HEAD“" -#: apply.c:4093 +#: apply.c:4103 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "информацията за сумата по SHA1 липсва или не е достатъчна (%s)." -#: apply.c:4098 builtin/checkout.c:279 builtin/reset.c:143 -#, c-format -msgid "make_cache_entry failed for path '%s'" -msgstr "неуспешно създаване на запис в кеша чрез „make_cache_entry“ за „%s“" - -#: apply.c:4102 +#: apply.c:4112 #, c-format msgid "could not add %s to temporary index" msgstr "„%s“ не може да се добави към временния индекс" -#: apply.c:4112 +#: apply.c:4122 #, c-format msgid "could not write temporary index to %s" msgstr "временният индекс не може да се запази в „%s“" -#: apply.c:4250 +#: apply.c:4260 #, c-format msgid "unable to remove %s from index" msgstr "„%s“ не може да се извади от индекса" -#: apply.c:4284 +#: apply.c:4294 #, c-format msgid "corrupt patch for submodule %s" msgstr "повредена кръпка за модула „%s“" -#: apply.c:4290 +#: apply.c:4300 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" "не може да се получи информация чрез „stat“ за новосъздадения файл „%s“" -#: apply.c:4298 +#: apply.c:4308 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" "не може да се за създаде мястото за съхранение на новосъздадения файл „%s“" -#: apply.c:4304 apply.c:4449 +#: apply.c:4314 apply.c:4459 #, c-format msgid "unable to add cache entry for %s" msgstr "не може да се добави запис в кеша за „%s“" -#: apply.c:4347 +#: apply.c:4357 #, c-format msgid "failed to write to '%s'" msgstr "в „%s“ не може да се пише" -#: apply.c:4351 +#: apply.c:4361 #, c-format msgid "closing file '%s'" msgstr "затваряне на файла „%s“" -#: apply.c:4421 +#: apply.c:4431 #, c-format msgid "unable to write file '%s' mode %o" msgstr "файлът „%s“ не може да се запише с режим на достъп „%o“" -#: apply.c:4519 +#: apply.c:4529 #, c-format msgid "Applied patch %s cleanly." msgstr "Кръпката „%s“ бе приложена чисто." -#: apply.c:4527 +#: apply.c:4537 msgid "internal error" msgstr "вътрешна грешка" -#: apply.c:4530 +#: apply.c:4540 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Прилагане на кръпката „%%s“ с %d отхвърлено парче…" msgstr[1] "Прилагане на кръпката „%%s“ с %d отхвърлени парчета…" -#: apply.c:4541 +#: apply.c:4551 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "съкращаване на името на файла с отхвърлените парчета на „ %.*s.rej“" -#: apply.c:4549 builtin/fetch.c:898 builtin/fetch.c:1194 +#: apply.c:4559 builtin/fetch.c:901 builtin/fetch.c:1192 #, c-format msgid "cannot open %s" msgstr "„%s“ не може да бъде отворен" -#: apply.c:4563 +#: apply.c:4573 #, c-format msgid "Hunk #%d applied cleanly." msgstr "%d-то парче бе успешно приложено." -#: apply.c:4567 +#: apply.c:4577 #, c-format msgid "Rejected hunk #%d." msgstr "%d-то парче бе отхвърлено." -#: apply.c:4686 +#: apply.c:4696 #, c-format msgid "Skipped patch '%s'." msgstr "Пропусната кръпка: „%s“" -#: apply.c:4694 +#: apply.c:4704 msgid "unrecognized input" msgstr "непознат вход" -#: apply.c:4714 +#: apply.c:4724 msgid "unable to read index file" msgstr "индексът не може да бъде записан" -#: apply.c:4871 +#: apply.c:4881 #, c-format msgid "can't open patch '%s': %s" msgstr "кръпката „%s“ не може да бъде отворена: %s" -#: apply.c:4898 +#: apply.c:4908 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "пренебрегната е %d грешка в знаците за интервали" msgstr[1] "пренебрегнати са %d грешки в знаците за интервали" -#: apply.c:4904 apply.c:4919 +#: apply.c:4914 apply.c:4929 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d ред добавя грешки в знаците за интервали." msgstr[1] "%d реда добавят грешки в знаците за интервали." -#: apply.c:4912 +#: apply.c:4922 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." @@ -787,144 +1216,135 @@ msgstr[0] "" msgstr[1] "" "Добавени са %d реда след корекцията на грешките в знаците за интервали." -#: apply.c:4928 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 +#: apply.c:4938 builtin/add.c:579 builtin/mv.c:301 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "Новият индекс не може да бъде записан" -#: apply.c:4955 apply.c:4958 builtin/am.c:2197 builtin/am.c:2200 -#: builtin/clone.c:122 builtin/fetch.c:143 builtin/merge.c:273 -#: builtin/pull.c:209 builtin/submodule--helper.c:407 -#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370 -#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853 -#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211 -msgid "path" -msgstr "път" - -#: apply.c:4956 +#: apply.c:4966 msgid "don't apply changes matching the given path" msgstr "без прилагане на промените напасващи на дадения път" -#: apply.c:4959 +#: apply.c:4969 msgid "apply changes matching the given path" msgstr "прилагане на промените напасващи на дадения път" -#: apply.c:4961 builtin/am.c:2206 +#: apply.c:4971 builtin/am.c:2206 msgid "num" msgstr "БРОЙ" -#: apply.c:4962 +#: apply.c:4972 msgid "remove leading slashes from traditional diff paths" msgstr "премахване на този БРОЙ водещи елементи от пътищата в разликата" -#: apply.c:4965 +#: apply.c:4975 msgid "ignore additions made by the patch" msgstr "игнориране на редовете добавени от тази кръпка" -#: apply.c:4967 +#: apply.c:4977 msgid "instead of applying the patch, output diffstat for the input" msgstr "извеждане на статистика на промените без прилагане на кръпката" -#: apply.c:4971 +#: apply.c:4981 msgid "show number of added and deleted lines in decimal notation" msgstr "извеждане на броя на добавените и изтритите редове" -#: apply.c:4973 +#: apply.c:4983 msgid "instead of applying the patch, output a summary for the input" msgstr "извеждане на статистика на входните данни без прилагане на кръпката" -#: apply.c:4975 +#: apply.c:4985 msgid "instead of applying the patch, see if the patch is applicable" msgstr "проверка дали кръпката може да се приложи, без действително прилагане" -#: apply.c:4977 +#: apply.c:4987 msgid "make sure the patch is applicable to the current index" msgstr "проверка дали кръпката може да бъде приложена към текущия индекс" -#: apply.c:4979 +#: apply.c:4989 msgid "mark new files with `git add --intent-to-add`" msgstr "отбелязване на новите файлове с „git add --intent-to-add“" -#: apply.c:4981 +#: apply.c:4991 msgid "apply a patch without touching the working tree" msgstr "прилагане на кръпката без промяна на работното дърво" -#: apply.c:4983 +#: apply.c:4993 msgid "accept a patch that touches outside the working area" msgstr "прилагане на кръпка, която променя и файлове извън работното дърво" -#: apply.c:4986 +#: apply.c:4996 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" "кръпката да бъде приложена. Опцията се комбинира с „--check“/„--stat“/„--" "summary“" -#: apply.c:4988 +#: apply.c:4998 msgid "attempt three-way merge if a patch does not apply" msgstr "пробване с тройно сливане, ако кръпката не може да се приложи директно" -#: apply.c:4990 +#: apply.c:5000 msgid "build a temporary index based on embedded index information" msgstr "" "създаване на временен индекс на база на включената информация за индекса" -#: apply.c:4993 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:5003 builtin/checkout-index.c:173 builtin/ls-files.c:524 msgid "paths are separated with NUL character" msgstr "разделяне на пътищата с нулевия знак „NUL“" -#: apply.c:4995 +#: apply.c:5005 msgid "ensure at least lines of context match" msgstr "да се осигури контекст от поне такъв БРОЙ съвпадащи редове" -#: apply.c:4996 builtin/am.c:2185 builtin/interpret-trailers.c:98 +#: apply.c:5006 builtin/am.c:2185 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3310 builtin/rebase.c:1445 +#: builtin/pack-objects.c:3310 builtin/rebase.c:1474 msgid "action" msgstr "действие" -#: apply.c:4997 +#: apply.c:5007 msgid "detect new or modified lines that have whitespace errors" msgstr "засичане на нови или променени редове с грешки в знаците за интервали" -#: apply.c:5000 apply.c:5003 +#: apply.c:5010 apply.c:5013 msgid "ignore changes in whitespace when finding context" msgstr "" "игнориране на промените в знаците за интервали при откриване на контекста" -#: apply.c:5006 +#: apply.c:5016 msgid "apply the patch in reverse" msgstr "прилагане на кръпката в обратна посока" -#: apply.c:5008 +#: apply.c:5018 msgid "don't expect at least one line of context" msgstr "без изискване на дори и един ред контекст" -#: apply.c:5010 +#: apply.c:5020 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "оставяне на отхвърлените парчета във файлове с разширение „.rej“" -#: apply.c:5012 +#: apply.c:5022 msgid "allow overlapping hunks" msgstr "позволяване на застъпващи се парчета" -#: apply.c:5013 builtin/add.c:291 builtin/check-ignore.c:22 -#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786 -#: builtin/log.c:2085 builtin/mv.c:123 builtin/read-tree.c:128 +#: apply.c:5023 builtin/add.c:309 builtin/check-ignore.c:22 +#: builtin/commit.c:1355 builtin/count-objects.c:98 builtin/fsck.c:774 +#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "повече подробности" -#: apply.c:5015 +#: apply.c:5025 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "пренебрегване на неправилно липсващ знак за нов ред в края на файл" -#: apply.c:5018 +#: apply.c:5028 msgid "do not trust the line counts in the hunk headers" msgstr "без доверяване на номерата на редовете в заглавните части на парчетата" -#: apply.c:5020 builtin/am.c:2194 +#: apply.c:5030 builtin/am.c:2194 msgid "root" msgstr "НАЧАЛНА_ДИРЕКТОРИЯ" -#: apply.c:5021 +#: apply.c:5031 msgid "prepend to all filenames" msgstr "добавяне на тази НАЧАЛНА_ДИРЕКТОРИЯ към имената на всички файлове" @@ -947,7 +1367,7 @@ msgstr "" msgid "git archive --remote [--exec ] --list" msgstr "git archive --remote ХРАНИЛИЩЕ [--exec КОМАНДА] --list" -#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299 +#: archive.c:372 builtin/add.c:180 builtin/add.c:555 builtin/rm.c:299 #, c-format msgid "pathspec '%s' did not match any files" msgstr "пътят „%s“ не съвпада с никой файл" @@ -979,7 +1399,7 @@ msgstr "ФОРМАТ" msgid "archive format" msgstr "ФОРМАТ на архива" -#: archive.c:458 builtin/log.c:1581 +#: archive.c:458 builtin/log.c:1653 msgid "prefix" msgstr "ПРЕФИКС" @@ -987,12 +1407,12 @@ msgstr "ПРЕФИКС" msgid "prepend prefix to each pathname in the archive" msgstr "добавяне на този ПРЕФИКС към всеки път в архива" -#: archive.c:460 builtin/blame.c:861 builtin/blame.c:873 builtin/blame.c:874 +#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866 #: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162 #: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899 #: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563 #: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123 -#: parse-options.h:186 +#: parse-options.h:190 msgid "file" msgstr "ФАЙЛ" @@ -1010,7 +1430,7 @@ msgstr "извеждане на архивираните файлове на с #: archive.c:465 msgid "store only" -msgstr "само съхранение без компресиране" +msgstr "съхранение без компресиране" #: archive.c:466 msgid "compress faster" @@ -1024,8 +1444,8 @@ msgstr "добро компресиране" msgid "list supported archive formats" msgstr "извеждане на списъка с поддържаните формати" -#: archive.c:479 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115 -#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859 +#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 +#: builtin/submodule--helper.c:1391 builtin/submodule--helper.c:1884 msgid "repo" msgstr "хранилище" @@ -1064,17 +1484,17 @@ msgstr "Непознат формат на архив: „%s“" msgid "Argument not supported for format '%s': -%d" msgstr "Аргументът не се поддържа за форма̀та „%s“: -%d" -#: archive-tar.c:125 archive-zip.c:345 +#: archive-tar.c:125 archive-zip.c:350 #, c-format msgid "cannot stream blob %s" msgstr "обектът-BLOB „%s“ не може да бъде обработен" -#: archive-tar.c:266 archive-zip.c:363 +#: archive-tar.c:266 archive-zip.c:368 #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "неподдържани права за достъп до файл: 0%o (SHA1: %s)" -#: archive-tar.c:293 archive-zip.c:353 +#: archive-tar.c:293 archive-zip.c:358 #, c-format msgid "cannot read %s" msgstr "обектът „%s“ не може да бъде прочетен" @@ -1093,37 +1513,37 @@ msgstr "дескрипторът не може да бъде пренасоче msgid "'%s' filter reported error" msgstr "филтърът „%s“ върна грешка" -#: archive-zip.c:314 +#: archive-zip.c:319 #, c-format msgid "path is not valid UTF-8: %s" msgstr "пътят не е правилно кодиран в UTF-8: %s" -#: archive-zip.c:318 +#: archive-zip.c:323 #, c-format msgid "path too long (%d chars, SHA1: %s): %s" msgstr "твърде дълъг път (%d знака, SHA1: %s): %s" -#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233 +#: archive-zip.c:479 builtin/pack-objects.c:230 builtin/pack-objects.c:233 #, c-format msgid "deflate error (%d)" msgstr "грешка при декомпресиране с „deflate“ (%d)" -#: archive-zip.c:609 +#: archive-zip.c:614 #, c-format msgid "timestamp too large for this system: %" msgstr "времевата стойност е твърде голяма за тази система: %" -#: attr.c:213 +#: attr.c:212 #, c-format msgid "%.*s is not a valid attribute name" msgstr "„%.*s“ е неправилно име за атрибут" -#: attr.c:370 +#: attr.c:369 #, c-format msgid "%s not allowed: %s:%d" msgstr "%s: командата не е позволена: „%s:%d“" -#: attr.c:410 +#: attr.c:409 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1264,9 +1684,9 @@ msgstr "" "Едновременното задаване на опциите „--reverse“ и „--first-parent“ изисква " "указването на крайно подаване" -#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:1971 -#: sequencer.c:4305 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:964 -#: builtin/log.c:1452 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411 +#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:2093 +#: sequencer.c:4460 builtin/commit.c:1040 builtin/log.c:388 builtin/log.c:991 +#: builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215 builtin/merge.c:411 #: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143 #: builtin/shortlog.c:192 msgid "revision walk setup failed" @@ -1437,8 +1857,8 @@ msgstr "Файлът „%s“ не изглежда да е пратка на gi msgid "unrecognized header: %s%s (%d)" msgstr "непозната заглавна част: %s%s (%d)" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2221 sequencer.c:2962 -#: builtin/commit.c:791 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2344 sequencer.c:3108 +#: builtin/commit.c:811 #, c-format msgid "could not open '%s'" msgstr "„%s“ не може да се отвори" @@ -1469,43 +1889,43 @@ msgid_plural "The bundle requires these %d refs:" msgstr[0] "Пратката изисква следния указател:" msgstr[1] "Пратката изисква следните %d указатели:" -#: bundle.c:272 +#: bundle.c:273 msgid "unable to dup bundle descriptor" msgstr "неуспешно дублиране на дескриптора на пратката с „dup“" -#: bundle.c:279 +#: bundle.c:280 msgid "Could not spawn pack-objects" msgstr "Командата „git pack-objects“ не може да бъде стартирана" -#: bundle.c:290 +#: bundle.c:291 msgid "pack-objects died" msgstr "Командата „git pack-objects“ не завърши успешно" -#: bundle.c:332 +#: bundle.c:333 msgid "rev-list died" msgstr "Командата „git rev-list“ не завърши успешно" -#: bundle.c:381 +#: bundle.c:382 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "" "указателят „%s“ не е бил включен поради опциите зададени на „git rev-list“" -#: bundle.c:460 builtin/log.c:202 builtin/log.c:1733 builtin/shortlog.c:306 +#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306 #, c-format msgid "unrecognized argument: %s" msgstr "непознат аргумент: %s" -#: bundle.c:468 +#: bundle.c:469 msgid "Refusing to create empty bundle." msgstr "Създаването на празна пратка е невъзможно." -#: bundle.c:478 +#: bundle.c:479 #, c-format msgid "cannot create '%s'" msgstr "Файлът „%s“ не може да бъде създаден" -#: bundle.c:503 +#: bundle.c:504 msgid "index-pack died" msgstr "Командата „git index-pack“ не завърши успешно" @@ -1514,18 +1934,18 @@ msgstr "Командата „git index-pack“ не завърши успешн msgid "invalid color value: %.*s" msgstr "неправилна стойност за цвят: %.*s" -#: commit.c:50 sequencer.c:2665 builtin/am.c:354 builtin/am.c:398 +#: commit.c:51 sequencer.c:2811 builtin/am.c:354 builtin/am.c:398 #: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456 #, c-format msgid "could not parse %s" msgstr "„%s“ не може да се анализира" -#: commit.c:52 +#: commit.c:53 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s не е подаване!" -#: commit.c:192 +#: commit.c:193 msgid "" "Support for /info/grafts is deprecated\n" "and will be removed in a future Git version.\n" @@ -1548,29 +1968,29 @@ msgstr "" "\n" " git config advice.graftFileDeprecated false" -#: commit.c:1128 +#: commit.c:1152 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" "Подаването „%s“ е с недоверен подпис от GPG, който твърди, че е на „%s“." -#: commit.c:1131 +#: commit.c:1155 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" "Подаването „%s“ е с неправилен подпис от GPG, който твърди, че е на „%s“." -#: commit.c:1134 +#: commit.c:1158 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Подаването „%s“ е без подпис от GPG." -#: commit.c:1137 +#: commit.c:1161 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Подаването „%s“ е с коректен подпис от GPG на „%s“.\n" -#: commit.c:1391 +#: commit.c:1415 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" @@ -1580,78 +2000,73 @@ msgstr "" "Може да поправите подаването заедно със съобщението или може да\n" "зададете ползваното кодиране в настройката „i18n.commitencoding“.\n" -#: commit-graph.c:127 +#: commit-graph.c:130 msgid "commit-graph file is too small" msgstr "файлът с гра̀фа на подаванията е твърде малък" -#: commit-graph.c:192 +#: commit-graph.c:195 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "отпечатъкът на гра̀фа с подаванията %X не съвпада с %X" -#: commit-graph.c:199 +#: commit-graph.c:202 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "версията на гра̀фа с подаванията %X не съвпада с %X" -#: commit-graph.c:206 +#: commit-graph.c:209 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "версията на контролната сума на гра̀фа с подаванията %X не съвпада с %X" -#: commit-graph.c:229 +#: commit-graph.c:232 msgid "commit-graph chunk lookup table entry missing; file may be incomplete" msgstr "" "записът в таблицата за откъси липсва, файлът за гра̀фа може да е непълен" -#: commit-graph.c:240 +#: commit-graph.c:243 #, c-format msgid "commit-graph improper chunk offset %08x%08x" msgstr "неправилно отместване на откъс: %08x%08x" -#: commit-graph.c:283 +#: commit-graph.c:286 #, c-format msgid "commit-graph chunk id %08x appears multiple times" msgstr "откъсът %08x се явява многократно" -#: commit-graph.c:347 +#: commit-graph.c:350 msgid "commit-graph has no base graphs chunk" msgstr "базовият откъс липсва в гра̀фа с подаванията" -#: commit-graph.c:357 +#: commit-graph.c:360 msgid "commit-graph chain does not match" msgstr "веригата на гра̀фа с подаванията не съвпада" -#: commit-graph.c:404 +#: commit-graph.c:407 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "" "грешка във веригата на гра̀фа с подаванията: ред „%s“ не е контролна сума" -#: commit-graph.c:430 +#: commit-graph.c:433 msgid "unable to find all commit-graph files" msgstr "някои файлове на гра̀фа с подаванията не могат да бъдат открити" -#: commit-graph.c:561 commit-graph.c:621 +#: commit-graph.c:564 commit-graph.c:624 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "" "неправилна позиция на подаването. Вероятно графът с подаванията е повреден" -#: commit-graph.c:582 +#: commit-graph.c:585 #, c-format msgid "could not find commit %s" msgstr "подаването „%s“ не може да бъде открито" -#: commit-graph.c:855 builtin/am.c:1287 +#: commit-graph.c:858 builtin/am.c:1287 #, c-format msgid "unable to parse commit %s" msgstr "подаването не може да бъде анализирано: %s" -#: commit-graph.c:859 -#, c-format -msgid "unable to get tree for %s" -msgstr "дървото на „%s“ не може да бъде получено" - #: commit-graph.c:1017 builtin/pack-objects.c:2641 #, c-format msgid "unable to get type of object %s" @@ -1718,12 +2133,12 @@ msgstr "Откриване на още върхове в гра̀фа с под msgid "failed to write correct number of base graph ids" msgstr "правилният брой на базовите идентификатори не може да се запише" -#: commit-graph.c:1379 midx.c:810 +#: commit-graph.c:1379 midx.c:814 #, c-format msgid "unable to create leading directories of %s" msgstr "родителските директории на „%s“ не могат да бъдат създадени" -#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:241 +#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:248 #, c-format msgid "unable to create '%s'" msgstr "пакетният файл „%s“ не може да бъде създаден" @@ -1747,85 +2162,85 @@ msgstr "основният файл на гра̀фа с подаванията msgid "failed to rename temporary commit-graph file" msgstr "временният файл на гра̀фа с подаванията не може да бъде преименуван" -#: commit-graph.c:1635 +#: commit-graph.c:1637 msgid "Scanning merged commits" msgstr "Търсене на подаванията със сливания" -#: commit-graph.c:1646 +#: commit-graph.c:1648 #, c-format msgid "unexpected duplicate commit id %s" msgstr "неочакван, повтарящ се идентификатор на подаване: %s" -#: commit-graph.c:1670 +#: commit-graph.c:1672 msgid "Merging commit-graph" msgstr "Сливане на гра̀фа с подаванията" -#: commit-graph.c:1860 +#: commit-graph.c:1862 #, c-format msgid "the commit graph format cannot write %d commits" msgstr "форматът на гра̀фа с подаванията не може да запише %d подавания" -#: commit-graph.c:1871 +#: commit-graph.c:1873 msgid "too many commits to write graph" msgstr "прекалено много подавания за записване на гра̀фа" -#: commit-graph.c:1961 +#: commit-graph.c:1963 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "графът с подаванията е с грешна сума за проверка — вероятно е повреден" -#: commit-graph.c:1971 +#: commit-graph.c:1973 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "" "неправилна подредба на обектите по идентификатор в гра̀фа с подаванията: „%s“ " "е преди „%s“, а не трябва" -#: commit-graph.c:1981 commit-graph.c:1996 +#: commit-graph.c:1983 commit-graph.c:1998 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" "неправилна стойност за откъс в гра̀фа с подаванията: fanout[%d] = %u, а " "трябва да е %u" -#: commit-graph.c:1988 +#: commit-graph.c:1990 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "подаване „%s“ в гра̀фа с подаванията не може да се анализира" -#: commit-graph.c:2006 +#: commit-graph.c:2008 msgid "Verifying commits in commit graph" msgstr "Проверка на подаванията в гра̀фа" -#: commit-graph.c:2020 +#: commit-graph.c:2022 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" "подаване „%s“ в базата от данни към гра̀фа с подаванията не може да се " "анализира" -#: commit-graph.c:2027 +#: commit-graph.c:2029 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" "идентификаторът на обект за кореновото дърво за подаване „%s“ в гра̀фа с " "подаванията е „%s“, а трябва да е „%s“" -#: commit-graph.c:2037 +#: commit-graph.c:2039 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "списъкът с родители на „%s“ в гра̀фа с подаванията е прекалено дълъг" -#: commit-graph.c:2046 +#: commit-graph.c:2048 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "родителят на „%s“ в гра̀фа с подаванията е „%s“, а трябва да е „%s“" -#: commit-graph.c:2059 +#: commit-graph.c:2061 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "списъкът с родители на „%s“ в гра̀фа с подаванията е прекалено къс" -#: commit-graph.c:2064 +#: commit-graph.c:2066 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" @@ -1833,7 +2248,7 @@ msgstr "" "номерът на поколението на подаване „%s“ в гра̀фа с подаванията е 0, а другаде " "не е" -#: commit-graph.c:2068 +#: commit-graph.c:2070 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" @@ -1841,14 +2256,14 @@ msgstr "" "номерът на поколението на подаване „%s“ в гра̀фа с подаванията не е 0, а " "другаде е" -#: commit-graph.c:2083 +#: commit-graph.c:2085 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "" "номерът на поколението на подаване „%s“ в гра̀фа с подаванията е %u, а " "другаде е %u" -#: commit-graph.c:2089 +#: commit-graph.c:2091 #, c-format msgid "commit date for commit %s in commit-graph is % != %" msgstr "" @@ -1897,7 +2312,7 @@ msgstr "ключът не съдържа раздел: „%s“" msgid "key does not contain variable name: %s" msgstr "ключът не съдържа име на променлива: „%s“" -#: config.c:406 sequencer.c:2401 +#: config.c:406 sequencer.c:2530 #, c-format msgid "invalid key: %s" msgstr "неправилен ключ: „%s“" @@ -2019,17 +2434,17 @@ msgstr "настройката „core.commentChar“ трябва да е са msgid "invalid mode for object creation: %s" msgstr "неправилен режим за създаването на обекти: %s" -#: config.c:1425 +#: config.c:1430 #, c-format msgid "malformed value for %s" msgstr "неправилна стойност за „%s“" -#: config.c:1451 +#: config.c:1456 #, c-format msgid "malformed value for %s: %s" msgstr "неправилна стойност за „%s“: „%s“" -#: config.c:1452 +#: config.c:1457 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "" "трябва да е една от следните стойности: „nothing“ (без изтласкване при липса " @@ -2037,132 +2452,132 @@ msgstr "" "„simple“ (клонът със същото име, от който се издърпва), „upstream“ (клонът, " "от който се издърпва) или „current“ (клонът със същото име)" -#: config.c:1513 builtin/pack-objects.c:3394 +#: config.c:1518 builtin/pack-objects.c:3394 #, c-format msgid "bad pack compression level %d" msgstr "неправилно ниво на компресиране при пакетиране: %d" -#: config.c:1634 +#: config.c:1639 #, c-format msgid "unable to load config blob object '%s'" msgstr "обектът-BLOB „%s“ с конфигурации не може да се зареди" -#: config.c:1637 +#: config.c:1642 #, c-format msgid "reference '%s' does not point to a blob" msgstr "указателят „%s“ не сочи към обект-BLOB" -#: config.c:1654 +#: config.c:1659 #, c-format msgid "unable to resolve config blob '%s'" msgstr "обектът-BLOB „%s“ с конфигурации не може да бъде открит" -#: config.c:1684 +#: config.c:1689 #, c-format msgid "failed to parse %s" msgstr "„%s“ не може да бъде анализиран" -#: config.c:1740 +#: config.c:1745 msgid "unable to parse command-line config" msgstr "неправилни настройки от командния ред" -#: config.c:2091 +#: config.c:2096 msgid "unknown error occurred while reading the configuration files" msgstr "неочаквана грешка при изчитането на конфигурационните файлове" -#: config.c:2261 +#: config.c:2266 #, c-format msgid "Invalid %s: '%s'" msgstr "Неправилен %s: „%s“" -#: config.c:2306 +#: config.c:2311 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" "стойността на „splitIndex.maxPercentChange“ трябва да е между 1 и 100, а не " "%d" -#: config.c:2352 +#: config.c:2357 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "неразпозната стойност „%s“ от командния ред" -#: config.c:2354 +#: config.c:2359 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "неправилна настройка „%s“ във файла „%s“ на ред №%d" -#: config.c:2435 +#: config.c:2440 #, c-format msgid "invalid section name '%s'" msgstr "неправилно име на раздел: „%s“" -#: config.c:2467 +#: config.c:2472 #, c-format msgid "%s has multiple values" msgstr "зададени са няколко стойности за „%s“" -#: config.c:2496 +#: config.c:2501 #, c-format msgid "failed to write new configuration file %s" msgstr "новият конфигурационен файл „%s“ не може да бъде запазен" -#: config.c:2748 config.c:3072 +#: config.c:2753 config.c:3077 #, c-format msgid "could not lock config file %s" msgstr "конфигурационният файл „%s“ не може да бъде заключен" -#: config.c:2759 +#: config.c:2764 #, c-format msgid "opening %s" msgstr "отваряне на „%s“" -#: config.c:2794 builtin/config.c:328 +#: config.c:2799 builtin/config.c:328 #, c-format msgid "invalid pattern: %s" msgstr "неправилен шаблон: %s" -#: config.c:2819 +#: config.c:2824 #, c-format msgid "invalid config file %s" msgstr "неправилен конфигурационен файл: „%s“" -#: config.c:2832 config.c:3085 +#: config.c:2837 config.c:3090 #, c-format msgid "fstat on %s failed" msgstr "неуспешно изпълнение на „fstat“ върху „%s“" -#: config.c:2843 +#: config.c:2848 #, c-format msgid "unable to mmap '%s'" msgstr "неуспешно изпълнение на „mmap“ върху „%s“" -#: config.c:2852 config.c:3090 +#: config.c:2857 config.c:3095 #, c-format msgid "chmod on %s failed" msgstr "неуспешна смяна на права с „chmod“ върху „%s“" -#: config.c:2937 config.c:3187 +#: config.c:2942 config.c:3192 #, c-format msgid "could not write config file %s" msgstr "конфигурационният файл „%s“ не може да бъде записан" -#: config.c:2971 +#: config.c:2976 #, c-format msgid "could not set '%s' to '%s'" msgstr "„%s“ не може да се зададе да е „%s“" -#: config.c:2973 builtin/remote.c:782 +#: config.c:2978 builtin/remote.c:781 #, c-format msgid "could not unset '%s'" msgstr "„%s“ не може да се премахне" -#: config.c:3063 +#: config.c:3068 #, c-format msgid "invalid section name: %s" msgstr "неправилно име на раздел: %s" -#: config.c:3230 +#: config.c:3235 #, c-format msgid "missing value for '%s'" msgstr "липсва стойност за „%s“" @@ -2331,19 +2746,19 @@ msgstr "необичайният път „%s“ е блокиран" msgid "unable to fork" msgstr "неуспешно създаване на процес" -#: connected.c:88 builtin/fsck.c:221 builtin/prune.c:43 +#: connected.c:89 builtin/fsck.c:208 builtin/prune.c:43 msgid "Checking connectivity" msgstr "Проверка на свързаността" -#: connected.c:100 +#: connected.c:101 msgid "Could not run 'git rev-list'" msgstr "Командата „git rev-list“ не може да бъде изпълнена." -#: connected.c:120 +#: connected.c:121 msgid "failed write to rev-list" msgstr "неуспешен запис на списъка с версиите" -#: connected.c:127 +#: connected.c:128 msgid "failed to close rev-list's stdin" msgstr "стандартният вход на списъка с версиите не може да бъде затворен" @@ -2384,30 +2799,30 @@ msgstr "" "Файлът ще остане с първоначалните знаци за край на ред в работната ви " "директория." -#: convert.c:280 +#: convert.c:284 #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" msgstr "" "„%s“ не трябва да съдържа маркер за поредността на байтовете (BOM) при " "кодиране „%s“" -#: convert.c:287 +#: convert.c:291 #, c-format msgid "" -"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-" -"tree-encoding." +"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as " +"working-tree-encoding." msgstr "" "Файлът „%s“ съдържа маркер за поредността на байтовете (BOM). Използвайте " -"„UTF-%s“ като кодиране за работното дърво." +"„UTF-%.*s“ като кодиране за работното дърво." -#: convert.c:305 +#: convert.c:304 #, c-format msgid "BOM is required in '%s' if encoded as %s" msgstr "" "„%s“ трябва да съдържа маркер за поредността на байтовете (BOM) при кодиране " "„%s“" -#: convert.c:307 +#: convert.c:306 #, c-format msgid "" "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" @@ -2417,50 +2832,50 @@ msgstr "" "на работното дърво използвайте UTF-%sBE или UTF-%sLE (в зависимост от " "поредността на байтовете)." -#: convert.c:425 convert.c:496 +#: convert.c:419 convert.c:490 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "неуспешно прекодиране на „%s“ от „%s“ към „%s“" -#: convert.c:468 +#: convert.c:462 #, c-format msgid "encoding '%s' from %s to %s and back is not the same" msgstr "Прекодирането на „%s“ от „%s“ към „%s“ и обратно променя файла" -#: convert.c:674 +#: convert.c:668 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "неуспешно създаване на процес за външен филтър „%s“" -#: convert.c:694 +#: convert.c:688 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "входът не може да бъде подаден на външния филтър „%s“" -#: convert.c:701 +#: convert.c:695 #, c-format msgid "external filter '%s' failed %d" msgstr "неуспешно изпълнение на външния филтър „%s“: %d" -#: convert.c:736 convert.c:739 +#: convert.c:730 convert.c:733 #, c-format msgid "read from external filter '%s' failed" msgstr "неуспешно четене от външния филтър „%s“" -#: convert.c:742 convert.c:797 +#: convert.c:736 convert.c:791 #, c-format msgid "external filter '%s' failed" msgstr "неуспешно изпълнение на външния филтър „%s“" -#: convert.c:845 +#: convert.c:839 msgid "unexpected filter type" msgstr "неочакван вид филтър" -#: convert.c:856 +#: convert.c:850 msgid "path name too long for external filter" msgstr "пътят е прекалено дълъг за външен филтър" -#: convert.c:930 +#: convert.c:924 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " @@ -2469,16 +2884,16 @@ msgstr "" "външният филтър „%s“ вече не е наличен, въпреки че не всички пътища са " "филтрирани" -#: convert.c:1229 +#: convert.c:1223 msgid "true/false are no valid working-tree-encodings" msgstr "„true“/„false“ не може да са кодирания на работното дърво" -#: convert.c:1417 convert.c:1451 +#: convert.c:1411 convert.c:1445 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s: неуспешно изпълнение на декодиращ филтър „%s“" -#: convert.c:1495 +#: convert.c:1489 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s: неуспешно изпълнение на кодиращ филтър „%s“" @@ -2654,38 +3069,38 @@ msgstr "" "Грешки в настройката „diff.dirstat“:\n" "%s" -#: diff.c:4218 +#: diff.c:4202 #, c-format msgid "external diff died, stopping at %s" msgstr "" "външната програма за разлики завърши неуспешно. Спиране на работата при „%s“" -#: diff.c:4563 +#: diff.c:4547 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "" "Опциите „--name-only“, „--name-status“, „--check“ и „-s“ са несъвместими " "една с друга" -#: diff.c:4566 +#: diff.c:4550 msgid "-G, -S and --find-object are mutually exclusive" msgstr "Опциите „-G“, „-S“ и „--find-object“ са несъвместими една с друга" -#: diff.c:4644 +#: diff.c:4628 msgid "--follow requires exactly one pathspec" msgstr "Опцията „--follow“ изисква точно един път" -#: diff.c:4692 +#: diff.c:4676 #, c-format msgid "invalid --stat value: %s" msgstr "неправилна стойност за „--stat“: %s" -#: diff.c:4697 diff.c:4702 diff.c:4707 diff.c:4712 diff.c:5225 +#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209 #: parse-options.c:199 parse-options.c:203 #, c-format msgid "%s expects a numerical value" msgstr "опцията „%s“ очаква число за аргумент" -#: diff.c:4729 +#: diff.c:4713 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -2694,44 +3109,44 @@ msgstr "" "Неразпознат параметър към опцията „--dirstat/-X“:\n" "%s" -#: diff.c:4814 +#: diff.c:4798 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "непознат вид промяна: „%c“ в „--diff-filter=%s“" -#: diff.c:4838 +#: diff.c:4822 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "непозната стойност след „ws-error-highlight=%.*s“" -#: diff.c:4852 +#: diff.c:4836 #, c-format msgid "unable to resolve '%s'" msgstr "„%s“ не може да се открие" -#: diff.c:4902 diff.c:4908 +#: diff.c:4886 diff.c:4892 #, c-format msgid "%s expects / form" msgstr "" "опцията „%s“ изисква стойности за МИНИМАЛЕН_%%_ПРОМЯНА_ЗА_ИЗТОЧНИК_/" "МАКСИМАЛЕН_%%_ПРОМЯНА_ЗА_ЗАМЯНА от" -#: diff.c:4920 +#: diff.c:4904 #, c-format msgid "%s expects a character, got '%s'" msgstr "опцията „%s“ изисква знак, а не: „%s“" -#: diff.c:4941 +#: diff.c:4925 #, c-format msgid "bad --color-moved argument: %s" msgstr "неправилен аргумент за „--color-moved“: „%s“" -#: diff.c:4960 +#: diff.c:4944 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "неправилен режим „%s“ за „ --color-moved-ws“" -#: diff.c:5000 +#: diff.c:4984 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -2740,153 +3155,153 @@ msgstr "" "Майерс), „minimal“ (минимизиране на разликите), „patience“ (пасианс) и " "„histogram“ (хистограмен)" -#: diff.c:5036 diff.c:5056 +#: diff.c:5020 diff.c:5040 #, c-format msgid "invalid argument to %s" msgstr "неправилен аргумент към „%s“" -#: diff.c:5194 +#: diff.c:5178 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "неразпознат параметър към опцията „--submodule“: „%s“" -#: diff.c:5250 +#: diff.c:5234 #, c-format msgid "bad --word-diff argument: %s" msgstr "неправилен аргумент към „--word-diff“: „%s“" -#: diff.c:5273 +#: diff.c:5257 msgid "Diff output format options" msgstr "Формат на изхода за разликите" -#: diff.c:5275 diff.c:5281 +#: diff.c:5259 diff.c:5265 msgid "generate patch" msgstr "създаване на кръпки" -#: diff.c:5278 builtin/log.c:172 +#: diff.c:5262 builtin/log.c:173 msgid "suppress diff output" msgstr "без извеждане на разликите" -#: diff.c:5283 diff.c:5397 diff.c:5404 +#: diff.c:5267 diff.c:5381 diff.c:5388 msgid "" msgstr "БРОЙ" -#: diff.c:5284 diff.c:5287 +#: diff.c:5268 diff.c:5271 msgid "generate diffs with lines context" msgstr "файловете с разлики да са с контекст с такъв БРОЙ редове" -#: diff.c:5289 +#: diff.c:5273 msgid "generate the diff in raw format" msgstr "файловете с разлики да са в суров формат" -#: diff.c:5292 +#: diff.c:5276 msgid "synonym for '-p --raw'" msgstr "псевдоним на „-p --stat“" -#: diff.c:5296 +#: diff.c:5280 msgid "synonym for '-p --stat'" msgstr "псевдоним на „-p --stat“" -#: diff.c:5300 +#: diff.c:5284 msgid "machine friendly --stat" msgstr "„--stat“ във формат за четене от програма" -#: diff.c:5303 +#: diff.c:5287 msgid "output only the last line of --stat" msgstr "извеждане само на последния ред на „--stat“" -#: diff.c:5305 diff.c:5313 +#: diff.c:5289 diff.c:5297 msgid "..." msgstr "ПАРАМЕТЪР_1, ПАРАМЕТЪР_2, …" -#: diff.c:5306 +#: diff.c:5290 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "извеждане на разпределението на промените за всяка поддиректория" -#: diff.c:5310 +#: diff.c:5294 msgid "synonym for --dirstat=cumulative" msgstr "псевдоним на „--dirstat=cumulative“" -#: diff.c:5314 +#: diff.c:5298 msgid "synonym for --dirstat=files,param1,param2..." msgstr "псевдоним на „--dirstat=ФАЙЛОВЕ,ПАРАМЕТЪР_1,ПАРАМЕТЪР_2,…“" -#: diff.c:5318 +#: diff.c:5302 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" "предупреждаване, ако промените водят до маркери за конфликт или грешки в " "празните знаци" -#: diff.c:5321 +#: diff.c:5305 msgid "condensed summary such as creations, renames and mode changes" msgstr "" "съкратено резюме на създадените, преименуваните и файловете с промяна на " "режима на достъп" -#: diff.c:5324 +#: diff.c:5308 msgid "show only names of changed files" msgstr "извеждане само на имената на променените файлове" -#: diff.c:5327 +#: diff.c:5311 msgid "show only names and status of changed files" msgstr "извеждане само на имената и статистиката за променените файлове" -#: diff.c:5329 +#: diff.c:5313 msgid "[,[,]]" msgstr "ШИРОЧИНА[,ИМЕ-ШИРОЧИНА[,БРОЙ]]" -#: diff.c:5330 +#: diff.c:5314 msgid "generate diffstat" msgstr "извеждане на статистика за промените" -#: diff.c:5332 diff.c:5335 diff.c:5338 +#: diff.c:5316 diff.c:5319 diff.c:5322 msgid "" msgstr "ШИРОЧИНА" -#: diff.c:5333 +#: diff.c:5317 msgid "generate diffstat with a given width" msgstr "статистика с такава ШИРОЧИНА за промените" -#: diff.c:5336 +#: diff.c:5320 msgid "generate diffstat with a given name width" msgstr "статистика за промените с такава ШИРОЧИНА на имената" -#: diff.c:5339 +#: diff.c:5323 msgid "generate diffstat with a given graph width" msgstr "статистика за промените с такава ШИРОЧИНА на гра̀фа" -#: diff.c:5341 +#: diff.c:5325 msgid "" msgstr "БРОЙ" -#: diff.c:5342 +#: diff.c:5326 msgid "generate diffstat with limited lines" msgstr "ограничаване на БРОя на редовете в статистиката за промените" -#: diff.c:5345 +#: diff.c:5329 msgid "generate compact summary in diffstat" msgstr "кратко резюме в статистиката за промените" -#: diff.c:5348 +#: diff.c:5332 msgid "output a binary diff that can be applied" msgstr "извеждане на двоична разлика във вид за прилагане" -#: diff.c:5351 +#: diff.c:5335 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" "показване на пълните имена на обекти в редовете за индекса при вариантите " "преди и след промяната" -#: diff.c:5353 +#: diff.c:5337 msgid "show colored diff" msgstr "разлики в цвят" -#: diff.c:5354 +#: diff.c:5338 msgid "" msgstr "ВИД" -#: diff.c:5355 +#: diff.c:5339 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" @@ -2894,7 +3309,7 @@ msgstr "" "грешките в празните знаци да се указват в редовете за контекста, вариантите " "преди и след разликата," -#: diff.c:5358 +#: diff.c:5342 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -2902,257 +3317,257 @@ msgstr "" "без преименуване на пътищата. Да се използват нулеви байтове за разделители " "на полета в изхода при ползване на опцията „--raw“ или „--numstat“" -#: diff.c:5361 diff.c:5364 diff.c:5367 diff.c:5473 +#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457 msgid "" msgstr "ПРЕФИКС" -#: diff.c:5362 +#: diff.c:5346 msgid "show the given source prefix instead of \"a/\"" msgstr "префикс вместо „a/“ за източник" -#: diff.c:5365 +#: diff.c:5349 msgid "show the given destination prefix instead of \"b/\"" msgstr "префикс вместо „b/“ за цел" -#: diff.c:5368 +#: diff.c:5352 msgid "prepend an additional prefix to every line of output" msgstr "добавяне на допълнителен префикс за всеки ред на изхода" -#: diff.c:5371 +#: diff.c:5355 msgid "do not show any source or destination prefix" msgstr "без префикс за източника и целта" -#: diff.c:5374 +#: diff.c:5358 msgid "show context between diff hunks up to the specified number of lines" msgstr "" "извеждане на контекст между последователните парчета с разлики от указания " "БРОЙ редове" -#: diff.c:5378 diff.c:5383 diff.c:5388 +#: diff.c:5362 diff.c:5367 diff.c:5372 msgid "" msgstr "ЗНАК" -#: diff.c:5379 +#: diff.c:5363 msgid "specify the character to indicate a new line instead of '+'" msgstr "знак вместо „+“ за нов вариант на ред" -#: diff.c:5384 +#: diff.c:5368 msgid "specify the character to indicate an old line instead of '-'" msgstr "знак вместо „-“ за стар вариант на ред" -#: diff.c:5389 +#: diff.c:5373 msgid "specify the character to indicate a context instead of ' '" msgstr "знак вместо „ “ за контекст" -#: diff.c:5392 +#: diff.c:5376 msgid "Diff rename options" msgstr "Настройки за разлики с преименуване" -#: diff.c:5393 +#: diff.c:5377 msgid "[/]" msgstr "МИНИМАЛЕН_%_ПРОМЯНА_ЗА_ИЗТОЧНИК[/МАКСИМАЛEН_%_ПРОМЯНА_ЗА_ЗАМЯНА]" -#: diff.c:5394 +#: diff.c:5378 msgid "break complete rewrite changes into pairs of delete and create" msgstr "" "заместване на пълните промени с последователност от изтриване и създаване" -#: diff.c:5398 +#: diff.c:5382 msgid "detect renames" msgstr "засичане на преименуванията" -#: diff.c:5402 +#: diff.c:5386 msgid "omit the preimage for deletes" msgstr "без предварителен вариант при изтриване" -#: diff.c:5405 +#: diff.c:5389 msgid "detect copies" msgstr "засичане на копиранията" -#: diff.c:5409 +#: diff.c:5393 msgid "use unmodified files as source to find copies" msgstr "търсене на копирано и от непроменените файлове" -#: diff.c:5411 +#: diff.c:5395 msgid "disable rename detection" msgstr "без търсене на преименувания" -#: diff.c:5414 +#: diff.c:5398 msgid "use empty blobs as rename source" msgstr "празни обекти като източник при преименувания" -#: diff.c:5416 +#: diff.c:5400 msgid "continue listing the history of a file beyond renames" msgstr "" "продължаване на извеждането на историята — без отрязването при преименувания " "на файл" -#: diff.c:5419 +#: diff.c:5403 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" msgstr "" "без засичане на преименувания/копирания, ако броят им надвишава тази стойност" -#: diff.c:5421 +#: diff.c:5405 msgid "Diff algorithm options" msgstr "Опции към алгоритъма за разлики" -#: diff.c:5423 +#: diff.c:5407 msgid "produce the smallest possible diff" msgstr "търсене на възможно най-малка разлика" -#: diff.c:5426 +#: diff.c:5410 msgid "ignore whitespace when comparing lines" msgstr "без промени в празните знаци при сравняване на редове" -#: diff.c:5429 +#: diff.c:5413 msgid "ignore changes in amount of whitespace" msgstr "без промени в празните знаци" -#: diff.c:5432 +#: diff.c:5416 msgid "ignore changes in whitespace at EOL" msgstr "без промени в празните знаци в края на редовете" -#: diff.c:5435 +#: diff.c:5419 msgid "ignore carrier-return at the end of line" msgstr "без промени в знаците за край на ред" -#: diff.c:5438 +#: diff.c:5422 msgid "ignore changes whose lines are all blank" msgstr "без промени в редовете, които са изцяло от празни знаци" -#: diff.c:5441 +#: diff.c:5425 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "" "евристика за преместване на границите на парчетата за улесняване на четенето" -#: diff.c:5444 +#: diff.c:5428 msgid "generate diff using the \"patience diff\" algorithm" msgstr "разлика чрез алгоритъм за подредба като пасианс" -#: diff.c:5448 +#: diff.c:5432 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "разлика по хистограмния алгоритъм" -#: diff.c:5450 +#: diff.c:5434 msgid "" msgstr "АЛГОРИТЪМ" -#: diff.c:5451 +#: diff.c:5435 msgid "choose a diff algorithm" msgstr "избор на АЛГОРИТЪМа за разлики" -#: diff.c:5453 +#: diff.c:5437 msgid "" msgstr "ТЕКСТ" -#: diff.c:5454 +#: diff.c:5438 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "разлика чрез алгоритъма със закотвяне" -#: diff.c:5456 diff.c:5465 diff.c:5468 +#: diff.c:5440 diff.c:5449 diff.c:5452 msgid "" msgstr "РЕЖИМ" -#: diff.c:5457 +#: diff.c:5441 msgid "show word diff, using to delimit changed words" msgstr "" "разлика по думи, като се ползва този РЕЖИМ за отделянето на променените думи" -#: diff.c:5459 diff.c:5462 diff.c:5507 +#: diff.c:5443 diff.c:5446 diff.c:5491 msgid "" msgstr "РЕГУЛЯРЕН_ИЗРАЗ" -#: diff.c:5460 +#: diff.c:5444 msgid "use to decide what a word is" msgstr "РЕГУЛЯРЕН_ИЗРАЗ за разделяне по думи" -#: diff.c:5463 +#: diff.c:5447 msgid "equivalent to --word-diff=color --word-diff-regex=" msgstr "псевдоним на „--word-diff=color --word-diff-regex=РЕГУЛЯРЕН_ИЗРАЗ“" -#: diff.c:5466 +#: diff.c:5450 msgid "moved lines of code are colored differently" msgstr "различен цвят за извеждане на преместените редове" -#: diff.c:5469 +#: diff.c:5453 msgid "how white spaces are ignored in --color-moved" msgstr "" "режим за прескачането на празните знаци при задаването на „--color-moved“" -#: diff.c:5472 +#: diff.c:5456 msgid "Other diff options" msgstr "Други опции за разлики" -#: diff.c:5474 +#: diff.c:5458 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" "при изпълнение от поддиректория да се пренебрегват разликите извън нея и да " "се ползват относителни пътища" -#: diff.c:5478 +#: diff.c:5462 msgid "treat all files as text" msgstr "обработка на всички файлове като текстови" -#: diff.c:5480 +#: diff.c:5464 msgid "swap two inputs, reverse the diff" msgstr "размяна на двата входа — обръщане на разликата" -#: diff.c:5482 +#: diff.c:5466 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "" "завършване с код за състояние 1 при наличието на разлики, а в противен " "случай — с 0" -#: diff.c:5484 +#: diff.c:5468 msgid "disable all output of the program" msgstr "без всякакъв изход от програмата" -#: diff.c:5486 +#: diff.c:5470 msgid "allow an external diff helper to be executed" msgstr "позволяване на изпълнение на външна помощна програма за разлики" -#: diff.c:5488 +#: diff.c:5472 msgid "run external text conversion filters when comparing binary files" msgstr "" "изпълнение на външни програми-филтри при сравнението на двоични файлове" -#: diff.c:5490 +#: diff.c:5474 msgid "" msgstr "КОГА" -#: diff.c:5491 +#: diff.c:5475 msgid "ignore changes to submodules in the diff generation" msgstr "игнориране на промените в подмодулите при извеждането на разликите" -#: diff.c:5494 +#: diff.c:5478 msgid "" msgstr "ФОРМАТ" -#: diff.c:5495 +#: diff.c:5479 msgid "specify how differences in submodules are shown" msgstr "начин за извеждане на промените в подмодулите" -#: diff.c:5499 +#: diff.c:5483 msgid "hide 'git add -N' entries from the index" msgstr "без включване в индекса на записите, добавени с „git add -N“" -#: diff.c:5502 +#: diff.c:5486 msgid "treat 'git add -N' entries as real in the index" msgstr "включване в индекса на записите, добавени с „git add -N“" -#: diff.c:5504 +#: diff.c:5488 msgid "" msgstr "НИЗ" -#: diff.c:5505 +#: diff.c:5489 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "търсене на разлики, които променят броя на поява на указаните низове" -#: diff.c:5508 +#: diff.c:5492 msgid "" "look for differences that change the number of occurrences of the specified " "regex" @@ -3160,97 +3575,118 @@ msgstr "" "търсене на разлики, които променят броя на поява на низовете, които напасват " "на регулярния израз" -#: diff.c:5511 +#: diff.c:5495 msgid "show all changes in the changeset with -S or -G" msgstr "извеждане на всички промени с „-G“/„-S“" -#: diff.c:5514 +#: diff.c:5498 msgid "treat in -S as extended POSIX regular expression" msgstr "НИЗът към „-S“ да се тълкува като разширен регулярен израз по POSIX" -#: diff.c:5517 +#: diff.c:5501 msgid "control the order in which files appear in the output" msgstr "управление на подредбата на файловете в изхода" -#: diff.c:5518 +#: diff.c:5502 msgid "" msgstr "ИДЕНТИФИКАТОР_НА_ОБЕКТ" -#: diff.c:5519 +#: diff.c:5503 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "търсене на разлики, които променят броя на поява на указания обект" -#: diff.c:5521 +#: diff.c:5505 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)…[*]]" -#: diff.c:5522 +#: diff.c:5506 msgid "select files by diff type" msgstr "избор на файловете по вид разлика" -#: diff.c:5524 +#: diff.c:5508 msgid "" msgstr "ФАЙЛ" -#: diff.c:5525 +#: diff.c:5509 msgid "Output to a specific file" msgstr "Изход към указания файл" -#: diff.c:6180 +#: diff.c:6164 msgid "inexact rename detection was skipped due to too many files." msgstr "" "търсенето на преименувания на обекти съчетани с промени се прескача поради " "многото файлове." -#: diff.c:6183 +#: diff.c:6167 msgid "only found copies from modified paths due to too many files." msgstr "" "установени са само точните копия на променените пътища поради многото " "файлове." -#: diff.c:6186 +#: diff.c:6170 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "задайте променливата „%s“ да е поне %d и отново изпълнете командата." -#: dir.c:549 +#: dir.c:554 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "пътят „%s“ не съвпада с никой файл в git" -#: dir.c:938 +#: dir.c:664 +#, c-format +msgid "unrecognized pattern: '%s'" +msgstr "непознат шаблон: „%s“" + +#: dir.c:682 dir.c:696 +#, c-format +msgid "unrecognized negative pattern: '%s'" +msgstr "непознат отрицателен шаблон: „%s“" + +#: dir.c:714 +#, c-format +msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" +msgstr "" +"файлът определящ частичността на изтегленото хранилище може да има проблем: " +"шаблонът „%s“ се повтаря" + +#: dir.c:724 +msgid "disabling cone pattern matching" +msgstr "изключване на пътеводното напасване" + +#: dir.c:1101 #, c-format msgid "cannot use %s as an exclude file" msgstr "„%s“ не може да се ползва за игнорираните файлове (като gitignore)" -#: dir.c:1877 +#: dir.c:2078 #, c-format msgid "could not open directory '%s'" msgstr "директорията „%s“ не може да бъде отворена" -#: dir.c:2128 +#: dir.c:2415 msgid "failed to get kernel name and information" msgstr "името и версията на ядрото не бяха получени" -#: dir.c:2252 +#: dir.c:2539 msgid "untracked cache is disabled on this system or location" msgstr "" "кешът за неследените файлове е изключен на тази система или местоположение" -#: dir.c:3056 +#: dir.c:3343 #, c-format msgid "index file corrupt in repo %s" msgstr "файлът с индекса е повреден в хранилището „%s“" -#: dir.c:3101 dir.c:3106 +#: dir.c:3388 dir.c:3393 #, c-format msgid "could not create directories for %s" msgstr "директориите за „%s“ не може да бъдат създадени" -#: dir.c:3135 +#: dir.c:3422 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "директорията на git не може да се мигрира от „%s“ до „%s“" @@ -3269,12 +3705,12 @@ msgstr "Филтриране на съдържанието" msgid "could not stat file '%s'" msgstr "неуспешно изпълнение на „stat“ върху файла „%s“" -#: environment.c:148 +#: environment.c:149 #, c-format msgid "bad git namespace path \"%s\"" msgstr "неправилен път към пространства от имена „%s“" -#: environment.c:330 +#: environment.c:331 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "GIT_DIR не може да се зададе да е „%s“" @@ -3310,32 +3746,32 @@ msgstr "невъзможно писане към отдалечено храни msgid "--stateless-rpc requires multi_ack_detailed" msgstr "опцията „--stateless-rpc“ изисква „multi_ack_detailed“" -#: fetch-pack.c:356 fetch-pack.c:1280 +#: fetch-pack.c:356 fetch-pack.c:1340 #, c-format msgid "invalid shallow line: %s" msgstr "неправилен плитък ред: „%s“" -#: fetch-pack.c:362 fetch-pack.c:1286 +#: fetch-pack.c:362 fetch-pack.c:1346 #, c-format msgid "invalid unshallow line: %s" msgstr "неправилен неплитък ред: „%s“" -#: fetch-pack.c:364 fetch-pack.c:1288 +#: fetch-pack.c:364 fetch-pack.c:1348 #, c-format msgid "object not found: %s" msgstr "обектът „%s“ липсва" -#: fetch-pack.c:367 fetch-pack.c:1291 +#: fetch-pack.c:367 fetch-pack.c:1351 #, c-format msgid "error in object: %s" msgstr "грешка в обекта: „%s“" -#: fetch-pack.c:369 fetch-pack.c:1293 +#: fetch-pack.c:369 fetch-pack.c:1353 #, c-format msgid "no shallow found: %s" msgstr "не е открит плитък обект: %s" -#: fetch-pack.c:372 fetch-pack.c:1297 +#: fetch-pack.c:372 fetch-pack.c:1357 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "очаква се плитък или не обект, а бе получено: „%s“" @@ -3354,7 +3790,7 @@ msgstr "неправилно подаване: „%s“" msgid "giving up" msgstr "преустановяване" -#: fetch-pack.c:475 progress.c:312 +#: fetch-pack.c:475 progress.c:323 msgid "done" msgstr "действието завърши" @@ -3368,165 +3804,165 @@ msgstr "получено бе %s (%d) %s" msgid "Marking %s as complete" msgstr "Отбелязване на „%s“ като пълно" -#: fetch-pack.c:742 +#: fetch-pack.c:754 #, c-format msgid "already have %s (%s)" msgstr "вече има „%s“ (%s)" -#: fetch-pack.c:781 +#: fetch-pack.c:818 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack: не може да се създаде процес за демултиплексора" -#: fetch-pack.c:789 +#: fetch-pack.c:826 msgid "protocol error: bad pack header" msgstr "протоколна грешка: неправилна заглавна част на пакет" -#: fetch-pack.c:857 +#: fetch-pack.c:900 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: не може да се създаде процес за „%s“" -#: fetch-pack.c:873 +#: fetch-pack.c:916 #, c-format msgid "%s failed" msgstr "неуспешно изпълнение на „%s“" -#: fetch-pack.c:875 +#: fetch-pack.c:918 msgid "error in sideband demultiplexer" msgstr "грешка в демултиплексора" -#: fetch-pack.c:907 +#: fetch-pack.c:965 #, c-format msgid "Server version is %.*s" msgstr "Версията на сървъра е: %.*s" -#: fetch-pack.c:912 fetch-pack.c:918 fetch-pack.c:921 fetch-pack.c:927 -#: fetch-pack.c:931 fetch-pack.c:935 fetch-pack.c:939 fetch-pack.c:943 -#: fetch-pack.c:947 fetch-pack.c:951 fetch-pack.c:955 fetch-pack.c:959 -#: fetch-pack.c:965 fetch-pack.c:971 fetch-pack.c:976 fetch-pack.c:981 +#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985 +#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001 +#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 +#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039 #, c-format msgid "Server supports %s" msgstr "Сървърът поддържа „%s“" -#: fetch-pack.c:914 +#: fetch-pack.c:972 msgid "Server does not support shallow clients" msgstr "Сървърът не поддържа плитки клиенти" -#: fetch-pack.c:974 +#: fetch-pack.c:1032 msgid "Server does not support --shallow-since" msgstr "Сървърът не поддържа опцията „--shallow-since“" -#: fetch-pack.c:979 +#: fetch-pack.c:1037 msgid "Server does not support --shallow-exclude" msgstr "Сървърът не поддържа опцията „--shallow-exclude“" -#: fetch-pack.c:983 +#: fetch-pack.c:1041 msgid "Server does not support --deepen" msgstr "Сървърът не поддържа опцията „--deepen“" -#: fetch-pack.c:1000 +#: fetch-pack.c:1058 msgid "no common commits" msgstr "няма общи подавания" -#: fetch-pack.c:1012 fetch-pack.c:1468 +#: fetch-pack.c:1070 fetch-pack.c:1536 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: неуспешно доставяне." -#: fetch-pack.c:1150 +#: fetch-pack.c:1209 msgid "Server does not support shallow requests" msgstr "Сървърът не поддържа плитки заявки" -#: fetch-pack.c:1157 +#: fetch-pack.c:1216 msgid "Server supports filter" msgstr "Сървърът поддържа филтри" -#: fetch-pack.c:1180 +#: fetch-pack.c:1239 msgid "unable to write request to remote" msgstr "невъзможно писане към отдалечено хранилище" -#: fetch-pack.c:1198 +#: fetch-pack.c:1257 #, c-format msgid "error reading section header '%s'" msgstr "грешка при прочитане на заглавната част на раздел „%s“" -#: fetch-pack.c:1204 +#: fetch-pack.c:1263 #, c-format msgid "expected '%s', received '%s'" msgstr "очаква се „%s“, а бе получено „%s“" -#: fetch-pack.c:1243 +#: fetch-pack.c:1303 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "неочакван ред за потвърждение: „%s“" -#: fetch-pack.c:1248 +#: fetch-pack.c:1308 #, c-format msgid "error processing acks: %d" msgstr "грешка при обработка на потвържденията: %d" -#: fetch-pack.c:1258 +#: fetch-pack.c:1318 msgid "expected packfile to be sent after 'ready'" msgstr "" "очакваше се пакетният файл да бъде изпратен след отговор за готовност (ready)" -#: fetch-pack.c:1260 +#: fetch-pack.c:1320 msgid "expected no other sections to be sent after no 'ready'" msgstr "" "очакваше се след липса на отговор за готовност (ready) да не се се пращат " "други раздели" -#: fetch-pack.c:1302 +#: fetch-pack.c:1362 #, c-format msgid "error processing shallow info: %d" msgstr "грешка при обработка на информация за дълбочината/плиткостта: %d" -#: fetch-pack.c:1349 +#: fetch-pack.c:1409 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "очаква се искан указател, а бе получено: „%s“" -#: fetch-pack.c:1354 +#: fetch-pack.c:1414 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "неочакван искан указател: „%s“" -#: fetch-pack.c:1359 +#: fetch-pack.c:1419 #, c-format msgid "error processing wanted refs: %d" msgstr "грешка при обработката на исканите указатели: %d" -#: fetch-pack.c:1693 +#: fetch-pack.c:1762 msgid "no matching remote head" msgstr "не може да бъде открит подходящ връх от отдалеченото хранилище" -#: fetch-pack.c:1716 builtin/clone.c:685 +#: fetch-pack.c:1785 builtin/clone.c:688 msgid "remote did not send all necessary objects" msgstr "отдалеченото хранилище не изпрати всички необходими обекти." -#: fetch-pack.c:1743 +#: fetch-pack.c:1812 #, c-format msgid "no such remote ref %s" msgstr "такъв отдалечен указател няма: %s" -#: fetch-pack.c:1746 +#: fetch-pack.c:1815 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Сървърът не позволява заявка за необявен обект „%s“" -#: gpg-interface.c:321 -msgid "gpg failed to sign the data" -msgstr "Програмата „gpg“ не подписа данните." - -#: gpg-interface.c:347 +#: gpg-interface.c:223 msgid "could not create temporary file" msgstr "не може да се създаде временен файл" -#: gpg-interface.c:350 +#: gpg-interface.c:226 #, c-format msgid "failed writing detached signature to '%s'" msgstr "Програмата не успя да запише самостоятелния подпис в „%s“" -#: graph.c:97 +#: gpg-interface.c:390 +msgid "gpg failed to sign the data" +msgstr "Програмата „gpg“ не подписа данните." + +#: graph.c:98 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "прескачане на неправилния цвят „%.*s“ в „log.graphColors“" @@ -3544,7 +3980,7 @@ msgstr "" msgid "'%s': unable to read %s" msgstr "„%s“: файлът сочен от „%s“ не може да бъде прочетен" -#: grep.c:2141 setup.c:165 builtin/clone.c:408 builtin/diff.c:82 +#: grep.c:2141 setup.c:165 builtin/clone.c:411 builtin/diff.c:82 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" @@ -3581,11 +4017,11 @@ msgstr "Основни команди от потребителско ниво" #: help.c:32 msgid "Ancillary Commands / Manipulators" -msgstr "Помощни команди/Променящи" +msgstr "Помощни команди / Променящи" #: help.c:33 msgid "Ancillary Commands / Interrogators" -msgstr "Помощни команди/Запитващи" +msgstr "Помощни команди / Запитващи" #: help.c:34 msgid "Interacting with Others" @@ -3593,19 +4029,19 @@ msgstr "Съвместна работа с други хора" #: help.c:35 msgid "Low-level Commands / Manipulators" -msgstr "Команди от ниско ниво/Променящи" +msgstr "Команди от ниско ниво / Променящи" #: help.c:36 msgid "Low-level Commands / Interrogators" -msgstr "Команди от ниско ниво/Запитващи" +msgstr "Команди от ниско ниво / Запитващи" #: help.c:37 -msgid "Low-level Commands / Synching Repositories" -msgstr "Команди от ниско ниво/Синхронизация на хранилища" +msgid "Low-level Commands / Syncing Repositories" +msgstr "Команди от ниско ниво / Синхронизация на хранилища" #: help.c:38 msgid "Low-level Commands / Internal Helpers" -msgstr "Команди от ниско ниво/Допълнителни инструменти" +msgstr "Команди от ниско ниво / Допълнителни инструменти" #: help.c:298 #, c-format @@ -3773,7 +4209,7 @@ msgstr "не може да се ползва празно име като иде msgid "name consists only of disallowed characters: %s" msgstr "името съдържа само непозволени знаци: „%s“" -#: ident.c:436 builtin/commit.c:611 +#: ident.c:436 builtin/commit.c:631 #, c-format msgid "invalid date format: %s" msgstr "неправилен формат на дата: %s" @@ -3859,121 +4295,121 @@ msgid "failed to read the cache" msgstr "кешът не може да бъде прочетен" #: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908 -#: builtin/checkout.c:537 builtin/checkout.c:796 builtin/clone.c:785 +#: builtin/checkout.c:539 builtin/checkout.c:798 builtin/clone.c:809 #: builtin/stash.c:264 msgid "unable to write new index file" msgstr "неуспешно записване на новия индекс" -#: merge-recursive.c:367 +#: merge-recursive.c:356 msgid "(bad commit)\n" msgstr "(лошо подаване)\n" -#: merge-recursive.c:390 +#: merge-recursive.c:379 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "" "неуспешно изпълнение на „add_cacheinfo“ за пътя „%s“. Сливането е " "преустановено." -#: merge-recursive.c:399 +#: merge-recursive.c:388 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "" "неуспешно изпълнение на „add_cacheinfo“ за обновяването на пътя „%s“. " "Сливането е преустановено." -#: merge-recursive.c:885 +#: merge-recursive.c:874 #, c-format msgid "failed to create path '%s'%s" msgstr "грешка при създаването на пътя „%s“%s" -#: merge-recursive.c:896 +#: merge-recursive.c:885 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Изтриване на „%s“, за да се освободи място за поддиректория\n" -#: merge-recursive.c:910 merge-recursive.c:929 +#: merge-recursive.c:899 merge-recursive.c:918 msgid ": perhaps a D/F conflict?" msgstr ": възможно е да има конфликт директория/файл." -#: merge-recursive.c:919 +#: merge-recursive.c:908 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "" "преустановяване на действието, за да не се изтрие неследеният файл „%s“" -#: merge-recursive.c:960 builtin/cat-file.c:41 +#: merge-recursive.c:949 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "обектът „%s“ (%s) не може да бъде прочетен" -#: merge-recursive.c:965 +#: merge-recursive.c:954 #, c-format msgid "blob expected for %s '%s'" msgstr "обектът „%s“ (%s) се очакваше да е BLOB, а не е" -#: merge-recursive.c:990 +#: merge-recursive.c:979 #, c-format msgid "failed to open '%s': %s" msgstr "„%s“ не може да се отвори: %s" -#: merge-recursive.c:1001 +#: merge-recursive.c:990 #, c-format msgid "failed to symlink '%s': %s" msgstr "неуспешно създаване на символната връзка „%s“: %s" -#: merge-recursive.c:1006 +#: merge-recursive.c:995 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "" "не е ясно какво да се прави с обекта „%2$s“ (%3$s) с права за достъп „%1$06o“" -#: merge-recursive.c:1199 +#: merge-recursive.c:1188 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "Неуспешно сливане на подмодула „%s“ (не е изтеглен)" -#: merge-recursive.c:1206 +#: merge-recursive.c:1195 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "Неуспешно сливане на подмодула „%s“ (няма подавания)" -#: merge-recursive.c:1213 +#: merge-recursive.c:1202 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "" "Подмодулът „%s“ не може да бъде слят (базата за сливане не предшества " "подаванията)" -#: merge-recursive.c:1221 merge-recursive.c:1233 +#: merge-recursive.c:1210 merge-recursive.c:1222 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Превъртане на подмодула „%s“ до следното подаване:" -#: merge-recursive.c:1224 merge-recursive.c:1236 +#: merge-recursive.c:1213 merge-recursive.c:1225 #, c-format msgid "Fast-forwarding submodule %s" msgstr "Превъртане на подмодула „%s“" -#: merge-recursive.c:1259 +#: merge-recursive.c:1248 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" "Неуспешно сливане на подмодула „%s“ (липсва сливането, което се предшества " "от подаванията)" -#: merge-recursive.c:1263 +#: merge-recursive.c:1252 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "Неуспешно сливане на подмодула „%s“ (не е превъртане)" -#: merge-recursive.c:1264 +#: merge-recursive.c:1253 msgid "Found a possible merge resolution for the submodule:\n" msgstr "" "Открито е сливане, което може да решава проблема със сливането на " "подмодула:\n" -#: merge-recursive.c:1267 +#: merge-recursive.c:1256 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -3989,31 +4425,31 @@ msgstr "" "\n" "Това приема предложеното.\n" -#: merge-recursive.c:1276 +#: merge-recursive.c:1265 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "Неуспешно сливане на подмодула „%s“ (открити са множество сливания)" -#: merge-recursive.c:1349 +#: merge-recursive.c:1338 msgid "Failed to execute internal merge" msgstr "Неуспешно вътрешно сливане" -#: merge-recursive.c:1354 +#: merge-recursive.c:1343 #, c-format msgid "Unable to add %s to database" msgstr "„%s“ не може да се добави в базата с данни" -#: merge-recursive.c:1386 +#: merge-recursive.c:1375 #, c-format msgid "Auto-merging %s" msgstr "Автоматично сливане на „%s“" -#: merge-recursive.c:1410 +#: merge-recursive.c:1399 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "Грешка: за да не се изтрие неследеният файл „%s“, се записва в „%s“." -#: merge-recursive.c:1482 +#: merge-recursive.c:1471 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -4022,7 +4458,7 @@ msgstr "" "КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s. Версия %s на „%s“ " "е оставена в дървото." -#: merge-recursive.c:1487 +#: merge-recursive.c:1476 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -4031,7 +4467,7 @@ msgstr "" "КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ е преименуван на „%s“ в " "%s. Версия %s на „%s“ е оставена в дървото." -#: merge-recursive.c:1494 +#: merge-recursive.c:1483 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -4040,7 +4476,7 @@ msgstr "" "КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s. Версия %s на „%s“ " "е оставена в дървото: %s." -#: merge-recursive.c:1499 +#: merge-recursive.c:1488 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -4049,45 +4485,45 @@ msgstr "" "КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ е преименуван на „%s“ в " "%s. Версия %s на „%s“ е оставена в дървото: %s." -#: merge-recursive.c:1534 +#: merge-recursive.c:1523 msgid "rename" msgstr "преименуване" -#: merge-recursive.c:1534 +#: merge-recursive.c:1523 msgid "renamed" msgstr "преименуван" -#: merge-recursive.c:1614 merge-recursive.c:2472 merge-recursive.c:3117 +#: merge-recursive.c:1603 merge-recursive.c:2519 merge-recursive.c:3164 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "Преустановяване на действието, за да не се изгуби промененият „%s“" -#: merge-recursive.c:1624 +#: merge-recursive.c:1613 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "" "Отказ да се загуби неследеният файл „%s“, защото е на място, където пречи." -#: merge-recursive.c:1682 +#: merge-recursive.c:1671 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "" "КОНФЛИКТ (преименуване/добавяне): „%s“ е преименуван на „%s“ в клон „%s“, а " "„%s“ е добавен в „%s“" -#: merge-recursive.c:1713 +#: merge-recursive.c:1702 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "„%s“ е директория в „%s“, затова се добавя като „%s“" -#: merge-recursive.c:1718 +#: merge-recursive.c:1707 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "" "Преустановяване на действието, за да не се изгуби неследеният файл „%s“. " "Вместо него се добавя „%s“" -#: merge-recursive.c:1737 +#: merge-recursive.c:1726 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -4096,18 +4532,18 @@ msgstr "" "КОНФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон " "„%s“, а „%s“ е преименуван на „%s“ в „%s“/%s." -#: merge-recursive.c:1742 +#: merge-recursive.c:1731 msgid " (left unresolved)" msgstr " (некоригиран конфликт)" -#: merge-recursive.c:1851 +#: merge-recursive.c:1840 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "КОНФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон " "„%s“, а „%s“ е преименуван на „%s“ в „%s“" -#: merge-recursive.c:2056 +#: merge-recursive.c:2103 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -4118,7 +4554,7 @@ msgstr "" "постави „%s“, защото няколко нови директории поделят съдържанието на " "директория „%s“, като никоя не съдържа мнозинство от файловете ѝ." -#: merge-recursive.c:2088 +#: merge-recursive.c:2135 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -4127,7 +4563,7 @@ msgstr "" "КОНФЛИКТ (косвено преименуване на директория): следният файл или директория " "„%s“ не позволяват косвеното преименуване на следния път/ища: %s." -#: merge-recursive.c:2098 +#: merge-recursive.c:2145 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -4137,7 +4573,7 @@ msgstr "" "съответства на „%s“. Косвено преименуване на директория води до поставянето " "на тези пътища там: %s." -#: merge-recursive.c:2190 +#: merge-recursive.c:2237 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -4146,7 +4582,7 @@ msgstr "" "КОНФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон " "„%s“, а „%s“ е преименуван на „%s“ в „%s“" -#: merge-recursive.c:2435 +#: merge-recursive.c:2482 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -4155,52 +4591,52 @@ msgstr "" "ПРЕДУПРЕЖДЕНИЕ: прескачане на преименуването на „%s“ на „%s“ в „%s“, защото " "„%s“ също е с променено име." -#: merge-recursive.c:2961 +#: merge-recursive.c:3008 #, c-format msgid "cannot read object %s" msgstr "обектът „%s“ не може да се прочете" -#: merge-recursive.c:2964 +#: merge-recursive.c:3011 #, c-format msgid "object %s is not a blob" msgstr "обектът „%s“ не е BLOB" -#: merge-recursive.c:3028 +#: merge-recursive.c:3075 msgid "modify" msgstr "промяна" -#: merge-recursive.c:3028 +#: merge-recursive.c:3075 msgid "modified" msgstr "променен" -#: merge-recursive.c:3040 +#: merge-recursive.c:3087 msgid "content" msgstr "съдържание" -#: merge-recursive.c:3044 +#: merge-recursive.c:3091 msgid "add/add" msgstr "добавяне/добавяне" -#: merge-recursive.c:3067 +#: merge-recursive.c:3114 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Прескачане на „%s“ (слетият резултат е идентичен със сегашния)" -#: merge-recursive.c:3089 git-submodule.sh:937 +#: merge-recursive.c:3136 git-submodule.sh:993 msgid "submodule" msgstr "ПОДМОДУЛ" -#: merge-recursive.c:3090 +#: merge-recursive.c:3137 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "КОНФЛИКТ (%s): Конфликт при сливане на „%s“" -#: merge-recursive.c:3120 +#: merge-recursive.c:3167 #, c-format msgid "Adding as %s instead" msgstr "Добавяне като „%s“" -#: merge-recursive.c:3203 +#: merge-recursive.c:3250 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -4209,7 +4645,7 @@ msgstr "" "Обновен път: „%s“ е добавен в „%s“ в директория, която е преименувана в " "„%s“. Обектът се мести в „%s“." -#: merge-recursive.c:3206 +#: merge-recursive.c:3253 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -4218,7 +4654,7 @@ msgstr "" "КОНФЛИКТ (места на файлове): „%s“ е добавен в „%s“ в директория, която е " "преименувана в „%s“. Предложението е да преместите обекта в „%s“." -#: merge-recursive.c:3210 +#: merge-recursive.c:3257 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -4227,7 +4663,7 @@ msgstr "" "Обновен път: „%s“ е преименуван на „%s“ в „%s“ в директория, която е " "преименувана в „%s“. Обектът се мести в „%s“." -#: merge-recursive.c:3213 +#: merge-recursive.c:3260 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -4236,61 +4672,61 @@ msgstr "" "КОНФЛИКТ (места на файлове): „%s“ е преименуван на „%s“ в „%s“ в директория, " "която е преименувана в „%s“. Предложението е да преместите обекта в „%s“." -#: merge-recursive.c:3327 +#: merge-recursive.c:3374 #, c-format msgid "Removing %s" msgstr "Изтриване на „%s“" -#: merge-recursive.c:3350 +#: merge-recursive.c:3397 msgid "file/directory" msgstr "файл/директория" -#: merge-recursive.c:3355 +#: merge-recursive.c:3402 msgid "directory/file" msgstr "директория/файл" -#: merge-recursive.c:3362 +#: merge-recursive.c:3409 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "КОНФЛИКТ (%s): Съществува директория на име „%s“ в „%s“. Добавяне на „%s“ " "като „%s“" -#: merge-recursive.c:3371 +#: merge-recursive.c:3418 #, c-format msgid "Adding %s" msgstr "Добавяне на „%s“" -#: merge-recursive.c:3380 +#: merge-recursive.c:3427 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "КОНФЛИКТ (добавяне/добавяне): Конфликт при сливане на „%s“" -#: merge-recursive.c:3424 +#: merge-recursive.c:3471 msgid "Already up to date!" msgstr "Вече е обновено!" -#: merge-recursive.c:3433 +#: merge-recursive.c:3480 #, c-format msgid "merging of trees %s and %s failed" msgstr "неуспешно сливане на дърветата „%s“ и „%s“" -#: merge-recursive.c:3537 +#: merge-recursive.c:3584 msgid "Merging:" msgstr "Сливане:" -#: merge-recursive.c:3550 +#: merge-recursive.c:3597 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "открит е %u общ предшественик:" msgstr[1] "открити са %u общи предшественици:" -#: merge-recursive.c:3600 +#: merge-recursive.c:3647 msgid "merge returned no commit" msgstr "сливането не върна подаване" -#: merge-recursive.c:3659 +#: merge-recursive.c:3706 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4299,12 +4735,12 @@ msgstr "" "Сливането ще презапише локалните промени на тези файлове:\n" " %s" -#: merge-recursive.c:3756 +#: merge-recursive.c:3803 #, c-format msgid "Could not parse object '%s'" msgstr "Неуспешен анализ на обекта „%s“" -#: merge-recursive.c:3774 builtin/merge.c:694 builtin/merge.c:874 +#: merge-recursive.c:3821 builtin/merge.c:694 builtin/merge.c:874 msgid "Unable to write index." msgstr "Индексът не може да бъде прочетен" @@ -4379,36 +4815,44 @@ msgstr "" "грешка при създаването на пакетен файл на базата на индекс за множество " "пакети" -#: midx.c:469 +#: midx.c:472 #, c-format msgid "failed to add packfile '%s'" msgstr "пакетният файл „%s“ не може да бъде добавен" -#: midx.c:475 +#: midx.c:478 #, c-format msgid "failed to open pack-index '%s'" msgstr "индексът за пакети „%s“ не може да бъде отворен" -#: midx.c:535 +#: midx.c:538 #, c-format msgid "failed to locate object %d in packfile" msgstr "обект %d в пакетния файл липсва" -#: midx.c:864 +#: midx.c:842 +msgid "Adding packfiles to multi-pack-index" +msgstr "Добавяне на пакетни файлове към индекс за множество пакети" + +#: midx.c:875 #, c-format msgid "did not see pack-file %s to drop" msgstr "пакетният файл за триене „%s“ не може да се открие" -#: midx.c:1035 +#: midx.c:973 +msgid "Writing chunks to multi-pack-index" +msgstr "Запис на откъси към индекс за множество пакети" + +#: midx.c:1052 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "индексът за множество пакети не може да бъде изчистен при „%s“" -#: midx.c:1090 +#: midx.c:1108 msgid "Looking for referenced packfiles" msgstr "Търсене на указаните пакетни файлове" -#: midx.c:1105 +#: midx.c:1123 #, c-format msgid "" "oid fanout out of order: fanout[%d] = % > % = fanout[%d]" @@ -4416,46 +4860,54 @@ msgstr "" "неправилна подредба на откъси (OID fanout): fanout[%d] = % > " "% = fanout[%d]" -#: midx.c:1109 -msgid "Verifying OID order in MIDX" +#: midx.c:1128 +msgid "Verifying OID order in multi-pack-index" msgstr "" -"Проверка на подредбата на идентификатори на обекти в MIDX (файл с индекс към " -"множество пакетни файлове)" +"Проверка на подредбата на идентификатори на обекти във файл с индекс към " +"множество пакетни файлове" -#: midx.c:1118 +#: midx.c:1137 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "" "неправилна подредба на откъси (OID lookup): oid[%d] = %s >= %s = oid[%d]" -#: midx.c:1137 +#: midx.c:1157 msgid "Sorting objects by packfile" msgstr "Подредба на обектите по пакетни файлове" -#: midx.c:1143 +#: midx.c:1164 msgid "Verifying object offsets" msgstr "Проверка на отместването на обекти" -#: midx.c:1159 +#: midx.c:1180 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "записът в пакета за обекта oid[%d] = %s не може да бъде зареден" -#: midx.c:1165 +#: midx.c:1186 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "индексът на пакета „%s“ не може да бъде зареден" -#: midx.c:1174 +#: midx.c:1195 #, c-format msgid "incorrect object offset for oid[%d] = %s: % != %" msgstr "неправилно отместване на обект за oid[%d] = %s: % != %" -#: midx.c:1349 +#: midx.c:1220 +msgid "Counting referenced objects" +msgstr "Преброяване на свързаните обекти" + +#: midx.c:1230 +msgid "Finding and deleting unreferenced packfiles" +msgstr "Търсене и изтриване на несвързаните пакетни файлове" + +#: midx.c:1388 msgid "could not start pack-objects" msgstr "командата „pack-objects“ не може да бъде стартирана" -#: midx.c:1368 +#: midx.c:1407 msgid "could not finish pack-objects" msgstr "командата „pack-objects“ не може да бъде завършена" @@ -4547,19 +4999,19 @@ msgstr "обектът „%s“ не може да бъде анализиран msgid "hash mismatch %s" msgstr "разлика в контролната сума: „%s“" -#: packfile.c:641 +#: packfile.c:629 msgid "offset before end of packfile (broken .idx?)" msgstr "" "отместване преди края на пакетния файл (възможно е индексът да е повреден)" -#: packfile.c:1887 +#: packfile.c:1876 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "" "отместване преди началото на индекса на пакетния файл „%s“ (възможно е " "индексът да е повреден)" -#: packfile.c:1891 +#: packfile.c:1880 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" @@ -4675,34 +5127,34 @@ msgstr "" msgid "malformed object name '%s'" msgstr "неправилно име на обект „%s“" -#: path.c:897 +#: path.c:915 #, c-format msgid "Could not make %s writable by group" msgstr "Не могат да се дадат права за запис в директорията „%s“ на групата" -#: pathspec.c:128 +#: pathspec.c:130 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "" "Екраниращият знак „\\“не може да е последен знак в стойността на атрибут" -#: pathspec.c:146 +#: pathspec.c:148 msgid "Only one 'attr:' specification is allowed." msgstr "Позволено е само едно указване на „attr:“." -#: pathspec.c:149 +#: pathspec.c:151 msgid "attr spec must not be empty" msgstr "„attr:“ трябва да указва стойност" -#: pathspec.c:192 +#: pathspec.c:194 #, c-format msgid "invalid attribute name %s" msgstr "неправилно име на атрибут: „%s“" -#: pathspec.c:257 +#: pathspec.c:259 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "глобалните настройки за пътища „glob“ и „noglob“ са несъвместими" -#: pathspec.c:264 +#: pathspec.c:266 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" @@ -4710,50 +5162,55 @@ msgstr "" "глобалната настройка за дословни пътища „literal“ е несъвместима с всички " "други глобални настройки за пътища" -#: pathspec.c:304 +#: pathspec.c:306 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "неправилен параметър за опцията за магически пътища „prefix“" -#: pathspec.c:325 +#: pathspec.c:327 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "Неправилна стойност за опцията за магически пътища „%.*s“ в „%s“" -#: pathspec.c:330 +#: pathspec.c:332 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "Знакът „)“ липсва в опцията за магически пътища в „%s“" -#: pathspec.c:368 +#: pathspec.c:370 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "Магическите пътища „%c“ са без реализация за „%s“" -#: pathspec.c:427 +#: pathspec.c:429 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: опциите „literal“ и „glob“ са несъвместими" -#: pathspec.c:440 +#: pathspec.c:442 #, c-format msgid "%s: '%s' is outside repository" msgstr "%s: „%s“ е извън хранилището" -#: pathspec.c:514 +#: pathspec.c:516 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "„%s“ (клавиш: „%c“)" -#: pathspec.c:524 +#: pathspec.c:526 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s: магическите пътища не се поддържат от командата „%s“" -#: pathspec.c:591 +#: pathspec.c:593 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "пътят „%s“ е след символна връзка" +#: pathspec.c:638 +#, c-format +msgid "line is badly quoted: %s" +msgstr "неправилно цитиран ред: %s" + #: pkt-line.c:92 msgid "unable to write flush packet" msgstr "пакетът за изчистване на буферите не може да се запише" @@ -4816,44 +5273,44 @@ msgstr "Обновяване на индекса" msgid "unable to create threaded lstat: %s" msgstr "не може да се създаде нишка за изпълнението на „lstat“: %s" -#: pretty.c:966 +#: pretty.c:981 msgid "unable to parse --pretty format" msgstr "аргументът към опцията „--pretty“ не може да се анализира" -#: promisor-remote.c:25 +#: promisor-remote.c:23 msgid "Remote with no URL" msgstr "Липсва адрес за отдалеченото хранилище" -#: promisor-remote.c:61 +#: promisor-remote.c:58 #, c-format msgid "promisor remote name cannot begin with '/': %s" msgstr "" "името отдалеченото хранилище-гарант не може за започва със знака „/“: %s" -#: range-diff.c:71 +#: range-diff.c:75 msgid "could not start `log`" msgstr "командата за журнала с подавания „log“ не може да се стартира" -#: range-diff.c:73 +#: range-diff.c:77 msgid "could not read `log` output" msgstr "" "изходът от командата за журнала с подавания „log“ не може да се прочете" -#: range-diff.c:92 sequencer.c:4985 +#: range-diff.c:96 sequencer.c:5163 #, c-format msgid "could not parse commit '%s'" msgstr "подаването „%s“ не може да бъде анализирано" -#: range-diff.c:118 +#: range-diff.c:122 #, c-format msgid "could not parse git header '%.*s'" msgstr "заглавната част на git „%.*s“ не може да се анализира" -#: range-diff.c:275 +#: range-diff.c:285 msgid "failed to generate diff" msgstr "неуспешно търсене на разлика" -#: range-diff.c:507 range-diff.c:509 +#: range-diff.c:518 range-diff.c:520 #, c-format msgid "could not parse log for '%s'" msgstr "журналът с подаванията на „%s“ не може да бъде анализиран" @@ -4895,16 +5352,21 @@ msgstr "„%s“ не може да се добави в индекса" msgid "unable to stat '%s'" msgstr "„stat“ не може да се изпълни върху „%s“" -#: read-cache.c:1314 +#: read-cache.c:1283 +#, c-format +msgid "filename in tree entry contains backslash: '%s'" +msgstr "името на файл в елемент от обект-дърво съдържа „\\“: „%s“" + +#: read-cache.c:1330 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "„%s“ съществува и като файл, и като директория" -#: read-cache.c:1520 +#: read-cache.c:1536 msgid "Refresh index" msgstr "Обновяване на индекса" -#: read-cache.c:1635 +#: read-cache.c:1651 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -4913,7 +5375,7 @@ msgstr "" "Зададена е неправилна стойност на настройката „index.version“.\n" "Ще се ползва версия %i" -#: read-cache.c:1645 +#: read-cache.c:1661 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -4923,141 +5385,141 @@ msgstr "" "„GIT_INDEX_VERSION“.\n" "Ще се ползва версия %i" -#: read-cache.c:1701 +#: read-cache.c:1717 #, c-format msgid "bad signature 0x%08x" msgstr "неправилен подпис: „0x%08x“" -#: read-cache.c:1704 +#: read-cache.c:1720 #, c-format msgid "bad index version %d" msgstr "неправилна версия на индекса %d" -#: read-cache.c:1713 +#: read-cache.c:1729 msgid "bad index file sha1 signature" msgstr "неправилен подпис за контролна сума по SHA1 на файла на индекса" -#: read-cache.c:1743 +#: read-cache.c:1759 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "" "индексът ползва разширение „%.4s“, което не се поддържа от тази версия на git" -#: read-cache.c:1745 +#: read-cache.c:1761 #, c-format msgid "ignoring %.4s extension" msgstr "игнориране на разширението „%.4s“" -#: read-cache.c:1782 +#: read-cache.c:1798 #, c-format msgid "unknown index entry format 0x%08x" msgstr "непознат формат на запис в индекса: „0x%08x“" -#: read-cache.c:1798 +#: read-cache.c:1814 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "неправилно име на поле в индекса близо до пътя „%s“" -#: read-cache.c:1855 +#: read-cache.c:1871 msgid "unordered stage entries in index" msgstr "неподредени записи в индекса" -#: read-cache.c:1858 +#: read-cache.c:1874 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "множество записи за слетия файл „%s“" -#: read-cache.c:1861 +#: read-cache.c:1877 #, c-format msgid "unordered stage entries for '%s'" msgstr "неподредени записи за „%s“" -#: read-cache.c:1967 read-cache.c:2255 rerere.c:565 rerere.c:599 rerere.c:1111 -#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:468 -#: builtin/checkout.c:652 builtin/clean.c:967 builtin/commit.c:347 +#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111 +#: builtin/add.c:499 builtin/check-ignore.c:178 builtin/checkout.c:470 +#: builtin/checkout.c:654 builtin/clean.c:967 builtin/commit.c:367 #: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145 -#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330 +#: builtin/reset.c:246 builtin/rm.c:271 builtin/submodule--helper.c:332 msgid "index file corrupt" msgstr "файлът с индекса е повреден" -#: read-cache.c:2108 +#: read-cache.c:2124 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "не може да се създаде нишка за зареждане на обектите от кеша: %s" -#: read-cache.c:2121 +#: read-cache.c:2137 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "не може да се изчака нишка за зареждане на обектите от кеша: %s" -#: read-cache.c:2154 +#: read-cache.c:2170 #, c-format msgid "%s: index file open failed" msgstr "%s: неуспешно отваряне на файла на индекса" -#: read-cache.c:2158 +#: read-cache.c:2174 #, c-format msgid "%s: cannot stat the open index" msgstr "%s: не може да се получи информация за отворения индекс със „stat“" -#: read-cache.c:2162 +#: read-cache.c:2178 #, c-format msgid "%s: index file smaller than expected" msgstr "%s: файлът на индекса е по-малък от очакваното" -#: read-cache.c:2166 +#: read-cache.c:2182 #, c-format msgid "%s: unable to map index file" msgstr "%s: неуспешно заделяне на съответстваща памет чрез „mmap“ на индекса" -#: read-cache.c:2208 +#: read-cache.c:2224 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "" "не може да се създаде нишка за зареждане на разширенията на индекса: %s" -#: read-cache.c:2235 +#: read-cache.c:2251 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "" "не може да се създаде нишка за зареждане на разширенията на индекса: %s" -#: read-cache.c:2267 +#: read-cache.c:2283 #, c-format msgid "could not freshen shared index '%s'" msgstr "споделеният индекс „%s“ не може да се обнови" -#: read-cache.c:2314 +#: read-cache.c:2330 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "грешки в индекса — в „%2$s“ се очаква „%1$s“, а бе получено „%3$s“" -#: read-cache.c:3010 wrapper.c:622 builtin/merge.c:1119 +#: read-cache.c:3026 strbuf.c:1145 wrapper.c:622 builtin/merge.c:1119 #, c-format msgid "could not close '%s'" msgstr "„%s“ не може да се затвори" -#: read-cache.c:3113 sequencer.c:2296 sequencer.c:3917 +#: read-cache.c:3129 sequencer.c:2429 sequencer.c:4069 #, c-format msgid "could not stat '%s'" msgstr "неуспешно изпълнение на „stat“ върху „%s“" -#: read-cache.c:3126 +#: read-cache.c:3142 #, c-format msgid "unable to open git dir: %s" msgstr "не може да се отвори директорията на git: %s" -#: read-cache.c:3138 +#: read-cache.c:3154 #, c-format msgid "unable to unlink: %s" msgstr "неуспешно изтриване на „%s“" -#: read-cache.c:3163 +#: read-cache.c:3179 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "правата за достъп до „%s“ не могат да бъдат поправени" -#: read-cache.c:3312 +#: read-cache.c:3328 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s: не може да се премине към етап №0" @@ -5170,8 +5632,8 @@ msgstr "" msgid "Note that empty commits are commented out" msgstr "Празните подавания са коментирани" -#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3388 -#: sequencer.c:3414 sequencer.c:5084 builtin/fsck.c:356 builtin/rebase.c:235 +#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3536 +#: sequencer.c:3562 sequencer.c:5263 builtin/fsck.c:346 builtin/rebase.c:254 #, c-format msgid "could not write '%s'" msgstr "„%s“ не може да се запише" @@ -5242,14 +5704,15 @@ msgstr "указателят „%s“ вече съществува" msgid "unexpected object ID when writing '%s'" msgstr "неочакван идентификатор на обект при записването на „%s“" -#: refs.c:833 sequencer.c:403 sequencer.c:2647 sequencer.c:2851 -#: sequencer.c:2865 sequencer.c:3122 sequencer.c:5001 wrapper.c:620 +#: refs.c:833 sequencer.c:405 sequencer.c:2793 sequencer.c:2997 +#: sequencer.c:3011 sequencer.c:3269 sequencer.c:5179 strbuf.c:1142 +#: wrapper.c:620 #, c-format msgid "could not write to '%s'" msgstr "в „%s“ не може да се пише" -#: refs.c:860 wrapper.c:188 wrapper.c:358 builtin/am.c:714 -#: builtin/rebase.c:1004 +#: refs.c:860 strbuf.c:1140 wrapper.c:188 wrapper.c:358 builtin/am.c:714 +#: builtin/rebase.c:1031 #, c-format msgid "could not open '%s' for writing" msgstr "„%s“ не може да бъде отворен за запис" @@ -5639,7 +6102,7 @@ msgid "" "\n" "Neither worked, so we gave up. You must fully qualify the ref." msgstr "" -"Зададената цел не е пълен указател (не започва с „refs/“).\n" +"Зададената цел не е пълно име на указател (не започва с „refs/“).\n" "Бяха пробвани следните варианти:\n" "\n" " ⁃ указател от отдалеченото хранилище, който да съответства на „%s“;\n" @@ -5915,8 +6378,8 @@ msgstr "излишният обект „%s“ не може да се изтр msgid "Recorded preimage for '%s'" msgstr "Предварителният вариант на „%s“ е запазен" -#: rerere.c:881 submodule.c:2023 builtin/log.c:1790 -#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428 +#: rerere.c:881 submodule.c:2067 builtin/log.c:1871 +#: builtin/submodule--helper.c:1436 builtin/submodule--helper.c:1448 #, c-format msgid "could not create directory '%s'" msgstr "Директорията „%s“ не може да бъде създадена" @@ -5950,35 +6413,35 @@ msgstr "Запазената корекция на конфликт при „%s msgid "unable to open rr-cache directory" msgstr "директорията „rr-cache“ не може да се отвори" -#: revision.c:2509 +#: revision.c:2497 msgid "your current branch appears to be broken" msgstr "Текущият клон е повреден" -#: revision.c:2512 +#: revision.c:2500 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "Текущият клон „%s“ е без подавания " -#: revision.c:2720 +#: revision.c:2708 msgid "--first-parent is incompatible with --bisect" msgstr "опциите „--first-parent“ и „--bisect“ са несъвместими" -#: revision.c:2724 +#: revision.c:2712 msgid "-L does not yet support diff formats besides -p and -s" msgstr "" "опцията „-L“ поддържа единствено форматирането на разликите според опциите „-" "p“ и „-s“" -#: run-command.c:763 +#: run-command.c:762 msgid "open /dev/null failed" msgstr "неуспешно отваряне на „/dev/null“" -#: run-command.c:1269 +#: run-command.c:1268 #, c-format msgid "cannot create async thread: %s" msgstr "не може да се създаде асинхронна нишка: %s" -#: run-command.c:1333 +#: run-command.c:1332 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -5988,32 +6451,32 @@ msgstr "" "За да изключите това предупреждение, изпълнете:\n" " git config advice.ignoredHook false" -#: send-pack.c:142 +#: send-pack.c:144 msgid "unexpected flush packet while reading remote unpack status" msgstr "" "неочакван изчистващ пакет „flush“ при изчитане на състоянието от " "отдалеченото разпакетиране" -#: send-pack.c:144 +#: send-pack.c:146 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "" "състоянието от отдалеченото разпакетиране не може да бъде анализирано: %s" -#: send-pack.c:146 +#: send-pack.c:148 #, c-format msgid "remote unpack failed: %s" msgstr "неуспешно отдалечено разпакетиране: %s" -#: send-pack.c:307 +#: send-pack.c:309 msgid "failed to sign the push certificate" msgstr "сертификатът за изтласкване не може да бъде подписан" -#: send-pack.c:421 +#: send-pack.c:423 msgid "the receiving end does not support --signed push" msgstr "отсрещната страна не поддържа изтласкване с опцията „--signed“" -#: send-pack.c:423 +#: send-pack.c:425 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -6021,47 +6484,47 @@ msgstr "" "отсрещната страна не поддържа изтласкване с опцията „--signed“, затова не се " "използва сертификат" -#: send-pack.c:435 +#: send-pack.c:437 msgid "the receiving end does not support --atomic push" msgstr "получаващата страна не поддържа изтласкване с опцията „--atomic“" -#: send-pack.c:440 +#: send-pack.c:442 msgid "the receiving end does not support push options" msgstr "отсрещната страна не поддържа опции при изтласкване" -#: sequencer.c:187 +#: sequencer.c:189 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "несъществуващ режим на изчистване „%s“ на съобщение при подаване" -#: sequencer.c:292 +#: sequencer.c:294 #, c-format msgid "could not delete '%s'" msgstr "„%s“ не може да бъде изтрит" -#: sequencer.c:311 builtin/rebase.c:760 builtin/rebase.c:1676 builtin/rm.c:369 +#: sequencer.c:313 builtin/rebase.c:781 builtin/rebase.c:1706 builtin/rm.c:369 #, c-format msgid "could not remove '%s'" msgstr "„%s“ не може да бъде изтрит" -#: sequencer.c:321 +#: sequencer.c:323 msgid "revert" msgstr "отмяна" -#: sequencer.c:323 +#: sequencer.c:325 msgid "cherry-pick" msgstr "отбиране" -#: sequencer.c:325 +#: sequencer.c:327 msgid "rebase -i" msgstr "rebase -i" -#: sequencer.c:327 +#: sequencer.c:329 #, c-format msgid "unknown action: %d" msgstr "неизвестно действие: %d" -#: sequencer.c:385 +#: sequencer.c:387 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add ' or 'git rm '" @@ -6069,7 +6532,7 @@ msgstr "" "след коригирането на конфликтите, отбележете съответните\n" "пътища с „git add ПЪТ…“ или „git rm ПЪТ…“." -#: sequencer.c:388 +#: sequencer.c:390 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add ' or 'git rm '\n" @@ -6079,44 +6542,44 @@ msgstr "" "пътища с „git add ПЪТ…“ или „git rm ПЪТ…“, след което\n" "подайте резултата с командата „git commit'“." -#: sequencer.c:401 sequencer.c:2847 +#: sequencer.c:403 sequencer.c:2993 #, c-format msgid "could not lock '%s'" msgstr "„%s“ не може да се заключи" -#: sequencer.c:408 +#: sequencer.c:410 #, c-format msgid "could not write eol to '%s'" msgstr "краят на ред не може да се запише в „%s“" -#: sequencer.c:413 sequencer.c:2652 sequencer.c:2853 sequencer.c:2867 -#: sequencer.c:3130 +#: sequencer.c:415 sequencer.c:2798 sequencer.c:2999 sequencer.c:3013 +#: sequencer.c:3277 #, c-format msgid "failed to finalize '%s'" msgstr "„%s“ не може да се завърши" -#: sequencer.c:436 sequencer.c:1585 sequencer.c:2672 sequencer.c:3112 -#: sequencer.c:3221 builtin/am.c:244 builtin/commit.c:763 builtin/merge.c:1117 -#: builtin/rebase.c:568 +#: sequencer.c:438 sequencer.c:1707 sequencer.c:2818 sequencer.c:3259 +#: sequencer.c:3368 builtin/am.c:244 builtin/commit.c:783 builtin/merge.c:1117 +#: builtin/rebase.c:589 #, c-format msgid "could not read '%s'" msgstr "файлът „%s“ не може да бъде прочетен" -#: sequencer.c:462 +#: sequencer.c:464 #, c-format msgid "your local changes would be overwritten by %s." msgstr "локалните ви промени ще бъдат презаписани при %s." -#: sequencer.c:466 +#: sequencer.c:468 msgid "commit your changes or stash them to proceed." msgstr "подайте или скатайте промените, за да продължите" -#: sequencer.c:498 +#: sequencer.c:500 #, c-format msgid "%s: fast-forward" msgstr "%s: превъртане" -#: sequencer.c:537 builtin/tag.c:565 +#: sequencer.c:539 builtin/tag.c:565 #, c-format msgid "Invalid cleanup mode %s" msgstr "Несъществуващ режим на изчистване „%s“" @@ -6124,65 +6587,69 @@ msgstr "Несъществуващ режим на изчистване „%s“ #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. -#: sequencer.c:631 +#: sequencer.c:633 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: новият индекс не може да бъде запазен" -#: sequencer.c:648 +#: sequencer.c:650 msgid "unable to update cache tree" msgstr "дървото на кеша не може да бъде обновено" -#: sequencer.c:662 +#: sequencer.c:664 msgid "could not resolve HEAD commit" msgstr "подаването, сочено от указателя „HEAD“, не може да бъде открито" -#: sequencer.c:742 +#: sequencer.c:744 #, c-format msgid "no key present in '%.*s'" msgstr "в „%.*s“ няма ключове" -#: sequencer.c:753 +#: sequencer.c:755 #, c-format msgid "unable to dequote value of '%s'" msgstr "цитирането на стойността на „%s“ не може да бъде изчистено" -#: sequencer.c:790 wrapper.c:190 wrapper.c:360 builtin/am.c:705 -#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1046 +#: sequencer.c:792 wrapper.c:190 wrapper.c:360 builtin/am.c:705 +#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1074 #, c-format msgid "could not open '%s' for reading" msgstr "файлът не може да бъде прочетен: „%s“" -#: sequencer.c:800 +#: sequencer.c:802 msgid "'GIT_AUTHOR_NAME' already given" msgstr "настройката за автор „GIT_AUTHOR_NAME“ вече е зададена" -#: sequencer.c:805 +#: sequencer.c:807 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "настройката за е-поща „GIT_AUTHOR_EMAIL“ вече е зададена" -#: sequencer.c:810 +#: sequencer.c:812 msgid "'GIT_AUTHOR_DATE' already given" msgstr "настройката за дата „GIT_AUTHOR_DATE“ вече е зададена" -#: sequencer.c:814 +#: sequencer.c:816 #, c-format msgid "unknown variable '%s'" msgstr "непозната променлива „%s“" -#: sequencer.c:819 +#: sequencer.c:821 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "настройката за автор „GIT_AUTHOR_NAME“ липсва" -#: sequencer.c:821 +#: sequencer.c:823 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "настройката за е-поща „GIT_AUTHOR_EMAIL“ липсва" -#: sequencer.c:823 +#: sequencer.c:825 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "настройката за дата „GIT_AUTHOR_DATE“ липсва" -#: sequencer.c:872 +#: sequencer.c:902 sequencer.c:1427 +msgid "malformed ident line" +msgstr "неправилен формат на ред за идентификация" + +#: sequencer.c:925 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -6211,13 +6678,13 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:1146 +#: sequencer.c:1218 msgid "'prepare-commit-msg' hook failed" msgstr "" "неуспешно изпълнение на куката при промяна на съобщението при подаване " "(prepare-commit-msg)" -#: sequencer.c:1153 +#: sequencer.c:1224 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6246,7 +6713,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1166 +#: sequencer.c:1237 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6272,338 +6739,342 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1208 +#: sequencer.c:1279 msgid "couldn't look up newly created commit" msgstr "току що създаденото подаване не може да бъде открито" -#: sequencer.c:1210 +#: sequencer.c:1281 msgid "could not parse newly created commit" msgstr "току що създаденото подаване не може да бъде анализирано" -#: sequencer.c:1256 +#: sequencer.c:1327 msgid "unable to resolve HEAD after creating commit" msgstr "" "състоянието сочено от указателя „HEAD“ не може да бъде открито след " "подаването" -#: sequencer.c:1258 +#: sequencer.c:1329 msgid "detached HEAD" msgstr "несвързан връх „HEAD“" -#: sequencer.c:1262 +#: sequencer.c:1333 msgid " (root-commit)" msgstr " (начално подаване)" -#: sequencer.c:1283 +#: sequencer.c:1354 msgid "could not parse HEAD" msgstr "указателят „HEAD“ не може да бъде анализиран" -#: sequencer.c:1285 +#: sequencer.c:1356 #, c-format msgid "HEAD %s is not a commit!" msgstr "указателят „HEAD“ „%s“ сочи към нещо, което не е подаване!" -#: sequencer.c:1289 builtin/commit.c:1571 +#: sequencer.c:1360 sequencer.c:1458 builtin/commit.c:1569 msgid "could not parse HEAD commit" msgstr "върховото подаване „HEAD“ не може да бъде прочетено" -#: sequencer.c:1341 sequencer.c:1933 +#: sequencer.c:1411 sequencer.c:2055 msgid "unable to parse commit author" msgstr "авторът на подаването не може да бъде анализиран" -#: sequencer.c:1352 builtin/am.c:1561 builtin/merge.c:684 +#: sequencer.c:1431 +msgid "corrupted author without date information" +msgstr "неправилен автор без дата" + +#: sequencer.c:1447 builtin/am.c:1561 builtin/merge.c:684 msgid "git write-tree failed to write a tree" msgstr "Командата „git write-tree“ не успя да запише обект-дърво" -#: sequencer.c:1369 sequencer.c:1429 +#: sequencer.c:1480 sequencer.c:1550 #, c-format msgid "unable to read commit message from '%s'" msgstr "съобщението за подаване не може да бъде прочетено от „%s“" -#: sequencer.c:1396 builtin/am.c:1583 builtin/commit.c:1670 builtin/merge.c:883 +#: sequencer.c:1516 builtin/am.c:1583 builtin/commit.c:1668 builtin/merge.c:883 #: builtin/merge.c:908 msgid "failed to write commit object" msgstr "обектът за подаването не може да бъде записан" -#: sequencer.c:1456 +#: sequencer.c:1577 #, c-format msgid "could not parse commit %s" msgstr "подаването „%s“ не може да бъде анализирано" -#: sequencer.c:1461 +#: sequencer.c:1582 #, c-format msgid "could not parse parent commit %s" msgstr "родителското подаване „%s“ не може да бъде анализирано" -#: sequencer.c:1535 sequencer.c:1645 +#: sequencer.c:1656 sequencer.c:1767 #, c-format msgid "unknown command: %d" msgstr "непозната команда: %d" -#: sequencer.c:1592 sequencer.c:1617 +#: sequencer.c:1714 sequencer.c:1739 #, c-format msgid "This is a combination of %d commits." msgstr "Това е обединение от %d подавания" -#: sequencer.c:1602 +#: sequencer.c:1724 msgid "need a HEAD to fixup" msgstr "За вкарване в предходното подаване ви трябва указател „HEAD“" -#: sequencer.c:1604 sequencer.c:3157 +#: sequencer.c:1726 sequencer.c:3304 msgid "could not read HEAD" msgstr "указателят „HEAD“ не може да се прочете" -#: sequencer.c:1606 +#: sequencer.c:1728 msgid "could not read HEAD's commit message" msgstr "" "съобщението за подаване към указателя „HEAD“ не може да бъде прочетено: %s" -#: sequencer.c:1612 +#: sequencer.c:1734 #, c-format msgid "cannot write '%s'" msgstr "„%s“ не може да се запази" -#: sequencer.c:1619 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1741 git-rebase--preserve-merges.sh:496 msgid "This is the 1st commit message:" msgstr "Това е 1-то съобщение при подаване:" -#: sequencer.c:1627 +#: sequencer.c:1749 #, c-format msgid "could not read commit message of %s" msgstr "съобщението за подаване към „%s“ не може да бъде прочетено" -#: sequencer.c:1634 +#: sequencer.c:1756 #, c-format msgid "This is the commit message #%d:" msgstr "Това е съобщение при подаване №%d:" -#: sequencer.c:1640 +#: sequencer.c:1762 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Съобщение при подаване №%d ще бъде прескочено:" -#: sequencer.c:1728 +#: sequencer.c:1850 msgid "your index file is unmerged." msgstr "индексът не е слят." -#: sequencer.c:1735 +#: sequencer.c:1857 msgid "cannot fixup root commit" msgstr "началното подаване не може да се вкара в предходното му" -#: sequencer.c:1754 +#: sequencer.c:1876 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "подаването „%s“ е сливане, но не е дадена опцията „-m“" -#: sequencer.c:1762 sequencer.c:1770 +#: sequencer.c:1884 sequencer.c:1892 #, c-format msgid "commit %s does not have parent %d" msgstr "подаването „%s“ няма родител %d" -#: sequencer.c:1776 +#: sequencer.c:1898 #, c-format msgid "cannot get commit message for %s" msgstr "неуспешно извличане на съобщението за подаване на „%s“" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1795 +#: sequencer.c:1917 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: неразпозната стойност за родителското подаване „%s“" -#: sequencer.c:1860 +#: sequencer.c:1982 #, c-format msgid "could not rename '%s' to '%s'" msgstr "„%s“ не може да се преименува на „%s“" -#: sequencer.c:1915 +#: sequencer.c:2037 #, c-format msgid "could not revert %s... %s" msgstr "подаването „%s“… не може да бъде отменено: „%s“" -#: sequencer.c:1916 +#: sequencer.c:2038 #, c-format msgid "could not apply %s... %s" msgstr "подаването „%s“… не може да бъде приложено: „%s“" -#: sequencer.c:1983 +#: sequencer.c:2105 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: неуспешно изчитане на индекса" -#: sequencer.c:1990 +#: sequencer.c:2112 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: неуспешно обновяване на индекса" -#: sequencer.c:2066 +#: sequencer.c:2189 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "„%s“ не приема аргументи: „%s“" -#: sequencer.c:2075 +#: sequencer.c:2198 #, c-format msgid "missing arguments for %s" msgstr "„%s“ изисква аргументи" -#: sequencer.c:2112 +#: sequencer.c:2235 #, c-format msgid "could not parse '%.*s'" msgstr "„%.*s“ не може да се анализира" -#: sequencer.c:2166 +#: sequencer.c:2289 #, c-format msgid "invalid line %d: %.*s" msgstr "неправилен ред %d: %.*s" -#: sequencer.c:2177 +#: sequencer.c:2300 #, c-format msgid "cannot '%s' without a previous commit" msgstr "Без предишно подаване не може да се изпълни „%s“" -#: sequencer.c:2225 builtin/rebase.c:153 builtin/rebase.c:178 -#: builtin/rebase.c:204 builtin/rebase.c:229 +#: sequencer.c:2348 builtin/rebase.c:172 builtin/rebase.c:197 +#: builtin/rebase.c:223 builtin/rebase.c:248 #, c-format msgid "could not read '%s'." msgstr "от „%s“ не може да се чете." -#: sequencer.c:2261 +#: sequencer.c:2384 msgid "cancelling a cherry picking in progress" msgstr "преустановяване на извършваното в момента отбиране на подавания" -#: sequencer.c:2268 +#: sequencer.c:2391 msgid "cancelling a revert in progress" msgstr "преустановяване на извършваното в момента отмяна на подаване" -#: sequencer.c:2302 +#: sequencer.c:2435 msgid "please fix this using 'git rebase --edit-todo'." msgstr "коригирайте това чрез „git rebase --edit-todo“." -#: sequencer.c:2304 +#: sequencer.c:2437 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "неизползваем файл с описание на предстоящите действия: „%s“" -#: sequencer.c:2309 +#: sequencer.c:2442 msgid "no commits parsed." msgstr "никое от подаванията не може да се разпознае." -#: sequencer.c:2320 +#: sequencer.c:2453 msgid "cannot cherry-pick during a revert." msgstr "" "по време на отмяна на подаване не може да се извърши отбиране на подаване." -#: sequencer.c:2322 +#: sequencer.c:2455 msgid "cannot revert during a cherry-pick." msgstr "по време на отбиране не може да се извърши отмяна на подаване." -#: sequencer.c:2404 +#: sequencer.c:2533 #, c-format msgid "invalid value for %s: %s" msgstr "неправилна стойност за „%s“: „%s“" -#: sequencer.c:2491 +#: sequencer.c:2630 msgid "unusable squash-onto" msgstr "подаването, в което другите да се вкарат, не може да се използва" -#: sequencer.c:2507 +#: sequencer.c:2646 #, c-format msgid "malformed options sheet: '%s'" msgstr "неправилен файл с опции: „%s“" -#: sequencer.c:2590 sequencer.c:4308 +#: sequencer.c:2736 sequencer.c:4463 msgid "empty commit set passed" msgstr "зададено е празно множество от подавания" -#: sequencer.c:2606 +#: sequencer.c:2752 msgid "revert is already in progress" msgstr "в момента вече се извършва отмяна на подавания" -#: sequencer.c:2608 +#: sequencer.c:2754 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "използвайте „git cherry-pick (--continue | %s--abort | --quit)“" -#: sequencer.c:2611 +#: sequencer.c:2757 msgid "cherry-pick is already in progress" msgstr "в момента вече се извършва отбиране на подавания" -#: sequencer.c:2613 +#: sequencer.c:2759 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "използвайте „git cherry-pick (--continue | %s--abort | --quit)“" -#: sequencer.c:2627 +#: sequencer.c:2773 #, c-format msgid "could not create sequencer directory '%s'" msgstr "" "директорията за определянето на последователността „%s“ не може да бъде " "създадена" -#: sequencer.c:2642 +#: sequencer.c:2788 msgid "could not lock HEAD" msgstr "указателят „HEAD“ не може да се заключи" -#: sequencer.c:2702 sequencer.c:4057 +#: sequencer.c:2848 sequencer.c:4209 msgid "no cherry-pick or revert in progress" msgstr "" "в момента не се извършва отбиране на подавания или пребазиране на клона" -#: sequencer.c:2704 sequencer.c:2715 +#: sequencer.c:2850 sequencer.c:2861 msgid "cannot resolve HEAD" msgstr "Подаването сочено от указателя „HEAD“ не може да бъде открито" -#: sequencer.c:2706 sequencer.c:2750 +#: sequencer.c:2852 sequencer.c:2896 msgid "cannot abort from a branch yet to be born" msgstr "" "действието не може да бъде преустановено, когато сте на клон, който тепърва " "предстои да бъде създаден" -#: sequencer.c:2736 builtin/grep.c:736 +#: sequencer.c:2882 builtin/grep.c:736 #, c-format msgid "cannot open '%s'" msgstr "„%s“ не може да бъде отворен" -#: sequencer.c:2738 +#: sequencer.c:2884 #, c-format msgid "cannot read '%s': %s" msgstr "„%s“ не може да бъде прочетен: %s" -#: sequencer.c:2739 +#: sequencer.c:2885 msgid "unexpected end of file" msgstr "неочакван край на файл" -#: sequencer.c:2745 +#: sequencer.c:2891 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" "запазеният преди започването на отбирането файл за указателя „HEAD“ — „%s“ е " "повреден" -#: sequencer.c:2756 +#: sequencer.c:2902 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" "Изглежда указателят „HEAD“ е променен. Проверете към какво сочи.\n" "Не се правят промени." -#: sequencer.c:2797 +#: sequencer.c:2943 msgid "no revert in progress" msgstr "в момента не тече пребазиране" -#: sequencer.c:2805 +#: sequencer.c:2951 msgid "no cherry-pick in progress" msgstr "в момента не се извършва отбиране на подавания" -#: sequencer.c:2815 +#: sequencer.c:2961 msgid "failed to skip the commit" msgstr "неуспешно прескачане на подаването" -#: sequencer.c:2822 +#: sequencer.c:2968 msgid "there is nothing to skip" msgstr "няма какво да се прескочи" -#: sequencer.c:2825 +#: sequencer.c:2971 #, c-format msgid "" "have you committed already?\n" @@ -6613,21 +7084,21 @@ msgstr "" "\n" " git %s --continue" -#: sequencer.c:2949 sequencer.c:3969 +#: sequencer.c:3095 sequencer.c:4121 #, c-format msgid "could not update %s" msgstr "„%s“ не може да се обнови" -#: sequencer.c:2987 sequencer.c:3949 +#: sequencer.c:3134 sequencer.c:4101 msgid "cannot read HEAD" msgstr "указателят „HEAD“ не може да бъде прочетен" -#: sequencer.c:3004 +#: sequencer.c:3151 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "„%s“ не може да се копира като „%s“" -#: sequencer.c:3012 +#: sequencer.c:3159 #, c-format msgid "" "You can amend the commit now, with\n" @@ -6646,27 +7117,22 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:3022 +#: sequencer.c:3169 #, c-format msgid "Could not apply %s... %.*s" msgstr "Подаването „%s“… не може да бъде приложено: „%.*s“" -#: sequencer.c:3029 +#: sequencer.c:3176 #, c-format msgid "Could not merge %.*s" msgstr "Невъзможно сливане на „%.*s“" -#: sequencer.c:3043 sequencer.c:3047 builtin/difftool.c:641 +#: sequencer.c:3190 sequencer.c:3194 builtin/difftool.c:641 #, c-format msgid "could not copy '%s' to '%s'" msgstr "„%s“ не може да се копира като „%s“" -#: sequencer.c:3069 sequencer.c:3506 builtin/rebase.c:850 builtin/rebase.c:1613 -#: builtin/rebase.c:1987 builtin/rebase.c:2031 -msgid "could not read index" -msgstr "индексът не може да бъде прочетен" - -#: sequencer.c:3074 +#: sequencer.c:3221 #, c-format msgid "" "execution failed: %s\n" @@ -6681,11 +7147,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3080 +#: sequencer.c:3227 msgid "and made changes to the index and/or the working tree\n" msgstr "и променѝ индекса и/или работното дърво\n" -#: sequencer.c:3086 +#: sequencer.c:3233 #, c-format msgid "" "execution succeeded: %s\n" @@ -6702,76 +7168,72 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3147 +#: sequencer.c:3294 #, c-format msgid "illegal label name: '%.*s'" msgstr "неправилно име на етикет: „%.*s“" -#: sequencer.c:3201 +#: sequencer.c:3348 msgid "writing fake root commit" msgstr "запазване на фалшиво начално подаване" -#: sequencer.c:3206 +#: sequencer.c:3353 msgid "writing squash-onto" msgstr "запазване на подаването, в което другите да се вкарат" -#: sequencer.c:3244 builtin/rebase.c:855 builtin/rebase.c:861 +#: sequencer.c:3391 builtin/rebase.c:876 builtin/rebase.c:882 #, c-format msgid "failed to find tree of %s" msgstr "дървото, сочено от „%s“, не може да бъде открито" -#: sequencer.c:3262 builtin/rebase.c:874 -msgid "could not write index" -msgstr "индексът не може да бъде записан" - -#: sequencer.c:3289 +#: sequencer.c:3436 #, c-format msgid "could not resolve '%s'" msgstr "„%s“ не може да бъде открит" -#: sequencer.c:3320 +#: sequencer.c:3467 msgid "cannot merge without a current revision" msgstr "без текущо подаване не може да се слива" -#: sequencer.c:3342 +#: sequencer.c:3489 #, c-format msgid "unable to parse '%.*s'" msgstr "„%.*s“ не може да се анализира" -#: sequencer.c:3351 +#: sequencer.c:3498 #, c-format msgid "nothing to merge: '%.*s'" msgstr "няма нищо за сливане: „%.*s“" -#: sequencer.c:3363 +#: sequencer.c:3510 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "върху начално подаване не може да се извърши множествено сливане" -#: sequencer.c:3378 +#: sequencer.c:3526 #, c-format msgid "could not get commit message of '%s'" msgstr "съобщението за подаване към „%s“ не може да бъде получено" -#: sequencer.c:3538 +#: sequencer.c:3688 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "сливането на „%.*s“ не може даже да започне" -#: sequencer.c:3554 +#: sequencer.c:3704 msgid "merge: Unable to write new index file" msgstr "сливане: новият индекс не може да бъде запазен" -#: sequencer.c:3623 builtin/rebase.c:712 +#: sequencer.c:3773 builtin/rebase.c:733 #, c-format msgid "Applied autostash.\n" msgstr "Автоматично скатаното е приложено.\n" -#: sequencer.c:3635 +#: sequencer.c:3785 #, c-format msgid "cannot store %s" msgstr "„%s“ не може да бъде запазен" -#: sequencer.c:3638 builtin/rebase.c:728 git-rebase--preserve-merges.sh:113 +#: sequencer.c:3788 builtin/rebase.c:749 git-rebase--preserve-merges.sh:113 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -6782,31 +7244,31 @@ msgstr "" "надеждно скатани. Можете да пробвате да ги приложите чрез „git stash pop“\n" "или да ги изхвърлите чрез „git stash drop“, когато поискате.\n" -#: sequencer.c:3699 +#: sequencer.c:3849 #, c-format msgid "could not checkout %s" msgstr "„%s“ не може да се изтегли" -#: sequencer.c:3713 +#: sequencer.c:3863 #, c-format msgid "%s: not a valid OID" msgstr "„%s“ е неправилен идентификатор на обект" -#: sequencer.c:3718 git-rebase--preserve-merges.sh:779 +#: sequencer.c:3868 git-rebase--preserve-merges.sh:779 msgid "could not detach HEAD" msgstr "указателят „HEAD“ не може да се отдели" -#: sequencer.c:3733 +#: sequencer.c:3883 #, c-format msgid "Stopped at HEAD\n" msgstr "Бе спряно при „HEAD“\n" -#: sequencer.c:3735 +#: sequencer.c:3885 #, c-format msgid "Stopped at %s\n" msgstr "Бе спряно при „%s“\n" -#: sequencer.c:3743 +#: sequencer.c:3893 #, c-format msgid "" "Could not execute the todo command\n" @@ -6829,48 +7291,48 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:3827 +#: sequencer.c:3979 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Спиране при „%s“… %.*s\n" -#: sequencer.c:3898 +#: sequencer.c:4050 #, c-format msgid "unknown command %d" msgstr "непозната команда %d" -#: sequencer.c:3957 +#: sequencer.c:4109 msgid "could not read orig-head" msgstr "указателят за „orig-head“ не може да се прочете" -#: sequencer.c:3962 +#: sequencer.c:4114 msgid "could not read 'onto'" msgstr "указателят за „onto“ не може да се прочете" -#: sequencer.c:3976 +#: sequencer.c:4128 #, c-format msgid "could not update HEAD to %s" msgstr "„HEAD“ не може да бъде обновен до „%s“" -#: sequencer.c:4069 +#: sequencer.c:4221 msgid "cannot rebase: You have unstaged changes." msgstr "не може да пребазирате, защото има промени, които не са в индекса." -#: sequencer.c:4078 +#: sequencer.c:4230 msgid "cannot amend non-existing commit" msgstr "несъществуващо подаване не може да се поправи" -#: sequencer.c:4080 +#: sequencer.c:4232 #, c-format msgid "invalid file: '%s'" msgstr "неправилен файл: „%s“" -#: sequencer.c:4082 +#: sequencer.c:4234 #, c-format msgid "invalid contents: '%s'" msgstr "неправилно съдържание: „%s“" -#: sequencer.c:4085 +#: sequencer.c:4237 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -6880,42 +7342,42 @@ msgstr "" "В работното дърво има неподадени промени. Първо ги подайте, а след това\n" "отново изпълнете „git rebase --continue“." -#: sequencer.c:4121 sequencer.c:4159 +#: sequencer.c:4273 sequencer.c:4312 #, c-format msgid "could not write file: '%s'" msgstr "файлът „%s“ не може да бъде записан" -#: sequencer.c:4174 +#: sequencer.c:4327 msgid "could not remove CHERRY_PICK_HEAD" msgstr "указателят „CHERRY_PICK_HEAD“ не може да бъде изтрит" -#: sequencer.c:4181 +#: sequencer.c:4334 msgid "could not commit staged changes." msgstr "промените в индекса не могат да бъдат подадени." -#: sequencer.c:4285 +#: sequencer.c:4440 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: не може да се отбере „%s“" -#: sequencer.c:4289 +#: sequencer.c:4444 #, c-format msgid "%s: bad revision" msgstr "%s: неправилна версия" -#: sequencer.c:4324 +#: sequencer.c:4479 msgid "can't revert as initial commit" msgstr "първоначалното подаване не може да бъде отменено" -#: sequencer.c:4774 +#: sequencer.c:4952 msgid "make_script: unhandled options" msgstr "make_script: неподдържани опции" -#: sequencer.c:4777 +#: sequencer.c:4955 msgid "make_script: error preparing revisions" msgstr "make_script: грешка при подготовката на версии" -#: sequencer.c:4935 +#: sequencer.c:5113 msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" "continue'.\n" @@ -6925,15 +7387,15 @@ msgstr "" "continue“ след това.\n" "Може и да преустановите пребазирането с командата „git rebase --abort“.\n" -#: sequencer.c:5047 sequencer.c:5064 +#: sequencer.c:5226 sequencer.c:5243 msgid "nothing to do" msgstr "няма какво да се прави" -#: sequencer.c:5078 +#: sequencer.c:5257 msgid "could not skip unnecessary pick commands" msgstr "излишните команди за отбиране не бяха прескочени" -#: sequencer.c:5166 +#: sequencer.c:5351 msgid "the script was already rearranged." msgstr "скриптът вече е преподреден." @@ -7453,6 +7915,11 @@ msgid_plural "%u bytes/s" msgstr[0] "%u байт/сек." msgstr[1] "%u байта/сек." +#: strbuf.c:1149 +#, c-format +msgid "could not edit '%s'" +msgstr "„%s“ не може да се редактира" + #: submodule.c:114 submodule.c:143 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" @@ -7488,7 +7955,7 @@ msgstr "Пътят „%s“ е в подмодула „%.*s“" msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "записът за подмодула „%s“ (%s) е %s, а не подаване!" -#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989 +#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2016 msgid "Failed to resolve HEAD as a valid ref." msgstr "Не може да се открие към какво сочи указателят „HEAD“" @@ -7527,7 +7994,12 @@ msgstr "индексът на подмодула „%s“ не е чист" msgid "Submodule '%s' could not be updated." msgstr "Подмодулът „%s“ не може да се обнови." -#: submodule.c:2007 +#: submodule.c:2027 +#, c-format +msgid "submodule git dir '%s' is inside git dir '%.*s'" +msgstr "„%s“ (директория на подмодул) е в директорията на git: „%.*s“" + +#: submodule.c:2048 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -7535,12 +8007,17 @@ msgstr "" "не се поддържа „relocate_gitdir“ за подмодула „%s“, който има повече от едно " "работно дърво" -#: submodule.c:2019 submodule.c:2074 +#: submodule.c:2060 submodule.c:2119 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "името на подмодула „%s“ не може да бъде намерено" -#: submodule.c:2026 +#: submodule.c:2064 +#, c-format +msgid "refusing to move '%s' into an existing git dir" +msgstr "„%s“ не може да се премести в съществуваща директория на git" + +#: submodule.c:2071 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -7551,16 +8028,16 @@ msgstr "" "„%s“ към\n" "„%s“\n" -#: submodule.c:2109 +#: submodule.c:2154 #, c-format msgid "could not recurse into submodule '%s'" msgstr "неуспешна обработка на поддиректориите в подмодула „%s“" -#: submodule.c:2153 +#: submodule.c:2198 msgid "could not start ls-files in .." msgstr "„ls-stat“ не може да се стартира в „..“" -#: submodule.c:2192 +#: submodule.c:2237 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "„ls-tree“ завърши с неочакван изходен код: %d" @@ -7581,12 +8058,12 @@ msgstr "" "„%s“ се прескача, защото е възможно да се тълкува като опция за командния " "ред: %s" -#: submodule-config.c:490 +#: submodule-config.c:498 #, c-format msgid "invalid value for %s" msgstr "Неправилна стойност за „%s“" -#: submodule-config.c:761 +#: submodule-config.c:769 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Записът „%s“ във файла „.gitmodules“ не може да бъде променен" @@ -7733,7 +8210,7 @@ msgstr "Преустановяване на действието." msgid "failed to push all needed submodules" msgstr "неуспешно изтласкване на всички необходими подмодули" -#: transport.c:1345 transport-helper.c:655 +#: transport.c:1345 transport-helper.c:656 msgid "operation not supported by protocol" msgstr "опцията не се поддържа от протокола" @@ -7746,7 +8223,7 @@ msgstr "неуспешен пълен запис към насрещната п msgid "unable to find remote helper for '%s'" msgstr "насрещната помощна програма за „%s“ не може да бъде открита" -#: transport-helper.c:160 transport-helper.c:569 +#: transport-helper.c:160 transport-helper.c:570 msgid "can't dup helper output fd" msgstr "" "файловият дескриптор от насрещната помощна програма не може да се дублира с " @@ -7777,95 +8254,95 @@ msgstr "„%s“ неочаквано върна: „%s“" msgid "%s also locked %s" msgstr "„%s“ заключи и „%s“" -#: transport-helper.c:491 +#: transport-helper.c:492 msgid "couldn't run fast-import" msgstr "неуспешно изпълнение на бързо внасяне" -#: transport-helper.c:514 +#: transport-helper.c:515 msgid "error while running fast-import" msgstr "грешка при изпълнението на бързо внасяне" -#: transport-helper.c:543 transport-helper.c:1132 +#: transport-helper.c:544 transport-helper.c:1133 #, c-format msgid "could not read ref %s" msgstr "указателят „%s“ не може да се прочете" -#: transport-helper.c:588 +#: transport-helper.c:589 #, c-format msgid "unknown response to connect: %s" msgstr "неочакван отговор при свързване: „%s“" -#: transport-helper.c:610 +#: transport-helper.c:611 msgid "setting remote service path not supported by protocol" msgstr "протоколът не поддържа задаването на път на отдалечената услуга" -#: transport-helper.c:612 +#: transport-helper.c:613 msgid "invalid remote service path" msgstr "неправилен път на отдалечената услуга" -#: transport-helper.c:658 +#: transport-helper.c:659 #, c-format msgid "can't connect to subservice %s" msgstr "неуспешно свързване към подуслугата „%s“" -#: transport-helper.c:734 +#: transport-helper.c:735 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "" "очаква се или успех, или грешка, но насрещната помощна програма върна „%s“" -#: transport-helper.c:787 +#: transport-helper.c:788 #, c-format msgid "helper reported unexpected status of %s" msgstr "насрещната помощна програма завърши с неочакван изходен код: „%s“" -#: transport-helper.c:848 +#: transport-helper.c:849 #, c-format msgid "helper %s does not support dry-run" msgstr "насрещната помощна програма „%s“ не поддържа проби „dry-run“" -#: transport-helper.c:851 +#: transport-helper.c:852 #, c-format msgid "helper %s does not support --signed" msgstr "насрещната помощна програма „%s“ не поддържа опцията „--signed“" -#: transport-helper.c:854 +#: transport-helper.c:855 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "" "насрещната помощна програма „%s“ не поддържа опцията „--signed=if-asked“" -#: transport-helper.c:859 +#: transport-helper.c:860 #, c-format msgid "helper %s does not support --atomic" msgstr "насрещната помощна програма „%s“ не поддържа опцията „--atomic“" -#: transport-helper.c:865 +#: transport-helper.c:866 #, c-format msgid "helper %s does not support 'push-option'" msgstr "насрещната помощна програма „%s“ не поддържа опции за изтласкване" -#: transport-helper.c:963 +#: transport-helper.c:964 msgid "remote-helper doesn't support push; refspec needed" msgstr "" "насрещната помощна програма не поддържа изтласкване. Необходимо е " "изброяване на указателите" -#: transport-helper.c:968 +#: transport-helper.c:969 #, c-format msgid "helper %s does not support 'force'" msgstr "" "насрещната помощна програма не поддържа „%s“ поддържа опцията „--force“" -#: transport-helper.c:1015 +#: transport-helper.c:1016 msgid "couldn't run fast-export" msgstr "не може да се извърши бързо изнасяне" -#: transport-helper.c:1020 +#: transport-helper.c:1021 msgid "error while running fast-export" msgstr "грешка при изпълнението на командата за бързо изнасяне" -#: transport-helper.c:1045 +#: transport-helper.c:1046 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -7874,47 +8351,47 @@ msgstr "" "Няма общи указатели, не са указани никакви указатели — нищо няма да бъде\n" "направено. Пробвайте да укажете клон, напр. “master“.\n" -#: transport-helper.c:1118 +#: transport-helper.c:1119 #, c-format msgid "malformed response in ref list: %s" msgstr "неправилен отговор в списъка с указатели: „%s“" -#: transport-helper.c:1270 +#: transport-helper.c:1271 #, c-format msgid "read(%s) failed" msgstr "неуспешно четене на „%s“" -#: transport-helper.c:1297 +#: transport-helper.c:1298 #, c-format msgid "write(%s) failed" msgstr "неуспешен запис в „%s“" -#: transport-helper.c:1346 +#: transport-helper.c:1347 #, c-format msgid "%s thread failed" msgstr "неуспешно изпълнение на нишката „%s“" -#: transport-helper.c:1350 +#: transport-helper.c:1351 #, c-format msgid "%s thread failed to join: %s" msgstr "завършването на нишката „%s“ не може да се изчака: „%s“" -#: transport-helper.c:1369 transport-helper.c:1373 +#: transport-helper.c:1370 transport-helper.c:1374 #, c-format msgid "can't start thread for copying data: %s" msgstr "неуспешно стартиране на нишка за копиране на данните: „%s“" -#: transport-helper.c:1410 +#: transport-helper.c:1411 #, c-format msgid "%s process failed to wait" msgstr "процесът на „%s“ не успя да изчака чрез „waitpid“" -#: transport-helper.c:1414 +#: transport-helper.c:1415 #, c-format msgid "%s process failed" msgstr "неуспешно изпълнение на „%s“" -#: transport-helper.c:1432 transport-helper.c:1441 +#: transport-helper.c:1433 transport-helper.c:1442 msgid "can't start thread for copying data" msgstr "неуспешно стартиране на нишка за копиране на данните" @@ -8172,6 +8649,10 @@ msgstr "" "във файлови системи, които не различават главни от малки букви)\n" "и само един от участниците в конфликта е в работното дърво:\n" +#: unpack-trees.c:1441 +msgid "Updating index flags" +msgstr "Обновяване на флаговете на индекса" + #: urlmatch.c:163 msgid "invalid URL scheme name or missing '://' suffix" msgstr "неправилна схема за адрес или суфиксът „://“ липсва" @@ -8786,137 +9267,137 @@ msgstr "освен това в индекса има неподадени про msgid "cannot %s: Your index contains uncommitted changes." msgstr "не може да извършите „%s“, защото в индекса има неподадени промени." -#: compat/precompose_utf8.c:58 builtin/clone.c:452 +#: compat/precompose_utf8.c:58 builtin/clone.c:455 #, c-format msgid "failed to unlink '%s'" msgstr "неуспешно изтриване на „%s“" -#: builtin/add.c:25 +#: builtin/add.c:26 msgid "git add [] [--] ..." msgstr "git add [ОПЦИЯ…] [--] ПЪТ…" -#: builtin/add.c:84 +#: builtin/add.c:87 #, c-format msgid "unexpected diff status %c" msgstr "неочакван изходен код при генериране на разлика: %c" -#: builtin/add.c:89 builtin/commit.c:288 +#: builtin/add.c:92 builtin/commit.c:288 msgid "updating files failed" msgstr "неуспешно обновяване на файловете" -#: builtin/add.c:99 +#: builtin/add.c:102 #, c-format msgid "remove '%s'\n" msgstr "изтриване на „%s“\n" -#: builtin/add.c:174 +#: builtin/add.c:177 msgid "Unstaged changes after refreshing the index:" msgstr "Промени, които и след обновяването на индекса не са добавени към него:" -#: builtin/add.c:234 builtin/rev-parse.c:897 +#: builtin/add.c:252 builtin/rev-parse.c:899 msgid "Could not read the index" msgstr "Индексът не може да бъде прочетен" -#: builtin/add.c:245 +#: builtin/add.c:263 #, c-format msgid "Could not open '%s' for writing." msgstr "Файлът „%s“ не може да бъде отворен за запис." -#: builtin/add.c:249 +#: builtin/add.c:267 msgid "Could not write patch" msgstr "Кръпката не може да бъде записана" -#: builtin/add.c:252 +#: builtin/add.c:270 msgid "editing patch failed" msgstr "неуспешно редактиране на кръпка" -#: builtin/add.c:255 +#: builtin/add.c:273 #, c-format msgid "Could not stat '%s'" msgstr "Не може да се получи информация чрез „stat“ за файла „%s“" -#: builtin/add.c:257 +#: builtin/add.c:275 msgid "Empty patch. Aborted." msgstr "Празна кръпка, преустановяване на действието." -#: builtin/add.c:262 +#: builtin/add.c:280 #, c-format msgid "Could not apply '%s'" msgstr "Кръпката „%s“ не може да бъде приложена" -#: builtin/add.c:270 +#: builtin/add.c:288 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Следните пътища ще бъдат игнорирани според някой от файловете „.gitignore“:\n" -#: builtin/add.c:290 builtin/clean.c:910 builtin/fetch.c:162 builtin/mv.c:124 -#: builtin/prune-packed.c:56 builtin/pull.c:223 builtin/push.c:547 -#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165 +#: builtin/add.c:308 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124 +#: builtin/prune-packed.c:56 builtin/pull.c:223 builtin/push.c:548 +#: builtin/remote.c:1344 builtin/rm.c:241 builtin/send-pack.c:165 msgid "dry run" msgstr "пробно изпълнение" -#: builtin/add.c:293 +#: builtin/add.c:311 msgid "interactive picking" msgstr "интерактивно отбиране на промени" -#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306 +#: builtin/add.c:312 builtin/checkout.c:1482 builtin/reset.c:307 msgid "select hunks interactively" msgstr "интерактивен избор на парчета код" -#: builtin/add.c:295 +#: builtin/add.c:313 msgid "edit current diff and apply" msgstr "редактиране на текущата разлика и прилагане" -#: builtin/add.c:296 +#: builtin/add.c:314 msgid "allow adding otherwise ignored files" msgstr "добавяне и на иначе игнорираните файлове" -#: builtin/add.c:297 +#: builtin/add.c:315 msgid "update tracked files" msgstr "обновяване на следените файлове" -#: builtin/add.c:298 +#: builtin/add.c:316 msgid "renormalize EOL of tracked files (implies -u)" msgstr "уеднаквяване на знаците за край на файл (включва опцията „-u“)" -#: builtin/add.c:299 +#: builtin/add.c:317 msgid "record only the fact that the path will be added later" msgstr "отбелязване само на факта, че пътят ще бъде добавен по-късно" -#: builtin/add.c:300 +#: builtin/add.c:318 msgid "add changes from all tracked and untracked files" msgstr "добавяне на всички промени в следените и неследените файлове" -#: builtin/add.c:303 +#: builtin/add.c:321 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" "игнориране на пътищата, които са изтрити от работното дърво (същото като „--" "no-all“)" -#: builtin/add.c:305 +#: builtin/add.c:323 msgid "don't add, only refresh the index" msgstr "без добавяне на нови файлове, само обновяване на индекса" -#: builtin/add.c:306 +#: builtin/add.c:324 msgid "just skip files which cannot be added because of errors" msgstr "" "прескачане на файловете, които не могат да бъдат добавени поради грешки" -#: builtin/add.c:307 +#: builtin/add.c:325 msgid "check if - even missing - files are ignored in dry run" msgstr "" "проверка, че при пробно изпълнение всички файлове, дори и изтритите, се " "игнорират" -#: builtin/add.c:309 builtin/update-index.c:1002 +#: builtin/add.c:327 builtin/update-index.c:1004 msgid "override the executable bit of the listed files" msgstr "изрично задаване на стойността на флага дали файлът е изпълним" -#: builtin/add.c:311 +#: builtin/add.c:329 msgid "warn when adding an embedded repository" msgstr "предупреждаване при добавяне на вградено хранилище" -#: builtin/add.c:326 +#: builtin/add.c:347 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -8947,39 +9428,60 @@ msgstr "" "\n" "За повече информация погледнете „git help submodule“." -#: builtin/add.c:354 +#: builtin/add.c:375 #, c-format msgid "adding embedded git repository: %s" msgstr "добавяне на вградено хранилище: %s" -#: builtin/add.c:372 +#: builtin/add.c:393 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "Използвайте опцията „-f“, за да ги добавите наистина.\n" -#: builtin/add.c:379 +#: builtin/add.c:400 msgid "adding files failed" msgstr "неуспешно добавяне на файлове" -#: builtin/add.c:419 +#: builtin/add.c:428 builtin/commit.c:348 +msgid "--pathspec-from-file is incompatible with --interactive/--patch" +msgstr "" +"опцията „--pathspec-from-file“ е несъвместима с всяка от опциите „--" +"interactive“/„--patch“" + +#: builtin/add.c:434 +msgid "--pathspec-from-file is incompatible with --edit" +msgstr "опциите „--pathspec-from-file“ и „--edit“ са несъвместими" + +#: builtin/add.c:446 msgid "-A and -u are mutually incompatible" msgstr "опциите „-A“ и „-u“ са несъвместими" -#: builtin/add.c:426 +#: builtin/add.c:449 msgid "Option --ignore-missing can only be used together with --dry-run" -msgstr "Опцията „--ignore-missing“ е съвместима само с „--dry-run“" +msgstr "Опцията „--ignore-missing“ изисква „--dry-run“" -#: builtin/add.c:430 +#: builtin/add.c:453 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "параметърът към „--chmod“ — „%s“ може да е или „-x“, или „+x“" -#: builtin/add.c:445 +#: builtin/add.c:471 builtin/checkout.c:1648 builtin/commit.c:354 +#: builtin/reset.c:327 +msgid "--pathspec-from-file is incompatible with pathspec arguments" +msgstr "" +"опцията „--pathspec-from-file“ е несъвместима с аргументи, указващи пътища" + +#: builtin/add.c:478 builtin/checkout.c:1660 builtin/commit.c:360 +#: builtin/reset.c:333 +msgid "--pathspec-file-nul requires --pathspec-from-file" +msgstr "опцията „--pathspec-file-nul“ изисква опция „--pathspec-from-file“" + +#: builtin/add.c:482 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Нищо не е зададено и нищо не е добавено.\n" -#: builtin/add.c:446 +#: builtin/add.c:483 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Вероятно искахте да използвате „git add .“?\n" @@ -9033,7 +9535,7 @@ msgstr "неправилно отместване на часовия пояс" msgid "Patch format detection failed." msgstr "Форматът на кръпката не може да бъде определен." -#: builtin/am.c:948 builtin/clone.c:406 +#: builtin/am.c:948 builtin/clone.c:409 #, c-format msgid "failed to create directory '%s'" msgstr "директорията „%s“ не може да бъде създадена" @@ -9127,7 +9629,7 @@ msgstr "" "Прилагане? „y“ — да/„n“ — не/„e“ — редактиране/„v“ — преглед/„a“ — приемане " "на всичко:" -#: builtin/am.c:1695 builtin/commit.c:374 +#: builtin/am.c:1695 builtin/commit.c:394 msgid "unable to write index file" msgstr "индексът не може да бъде записан" @@ -9178,8 +9680,8 @@ msgstr "" "След корекция на конфликтите изпълнете „git add“ върху поправените файлове.\n" "За да приемете „изтрити от тях“, изпълнете „git rm“ върху изтритите файлове." -#: builtin/am.c:1924 builtin/am.c:1928 builtin/am.c:1940 builtin/reset.c:329 -#: builtin/reset.c:337 +#: builtin/am.c:1924 builtin/am.c:1928 builtin/am.c:1940 builtin/reset.c:346 +#: builtin/reset.c:354 #, c-format msgid "Could not parse object '%s'." msgstr "„%s“ не е разпознат като обект." @@ -9225,7 +9727,7 @@ msgid "allow fall back on 3way merging if needed" msgstr "да се преминава към тройно сливане при нужда." #: builtin/am.c:2165 builtin/init-db.c:494 builtin/prune-packed.c:58 -#: builtin/repack.c:297 builtin/stash.c:812 +#: builtin/repack.c:304 builtin/stash.c:811 msgid "be quiet" msgstr "без извеждане на информация" @@ -9270,12 +9772,12 @@ msgstr "пропускане на всичко преди реда за отря msgid "pass it through git-apply" msgstr "прекарване през „git-apply“" -#: builtin/am.c:2203 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671 -#: builtin/fmt-merge-msg.c:674 builtin/grep.c:883 builtin/merge.c:249 -#: builtin/pull.c:160 builtin/pull.c:219 builtin/rebase.c:1442 -#: builtin/repack.c:308 builtin/repack.c:312 builtin/repack.c:314 +#: builtin/am.c:2203 builtin/commit.c:1386 builtin/fmt-merge-msg.c:673 +#: builtin/fmt-merge-msg.c:676 builtin/grep.c:883 builtin/merge.c:249 +#: builtin/pull.c:160 builtin/pull.c:219 builtin/rebase.c:1469 +#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321 #: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403 -#: parse-options.h:150 parse-options.h:171 parse-options.h:312 +#: parse-options.h:154 parse-options.h:175 parse-options.h:316 msgid "n" msgstr "БРОЙ" @@ -9327,13 +9829,13 @@ msgstr "дата за подаване различна от първонача msgid "use current timestamp for author date" msgstr "използване на текущото време като това за автор" -#: builtin/am.c:2241 builtin/commit-tree.c:120 builtin/commit.c:1511 -#: builtin/merge.c:286 builtin/pull.c:194 builtin/rebase.c:490 -#: builtin/rebase.c:1483 builtin/revert.c:117 builtin/tag.c:418 +#: builtin/am.c:2241 builtin/commit-tree.c:120 builtin/commit.c:1507 +#: builtin/merge.c:286 builtin/pull.c:194 builtin/rebase.c:509 +#: builtin/rebase.c:1513 builtin/revert.c:117 builtin/tag.c:418 msgid "key-id" msgstr "ИДЕНТИФИКАТОР_НА_КЛЮЧ" -#: builtin/am.c:2242 builtin/rebase.c:491 builtin/rebase.c:1484 +#: builtin/am.c:2242 builtin/rebase.c:510 builtin/rebase.c:1514 msgid "GPG-sign commits" msgstr "подписване на подаванията с GPG" @@ -9494,7 +9996,7 @@ msgstr "В момента не се извършва двоично търсен msgid "'%s' is not a valid commit" msgstr "„%s“ не е подаване" -#: builtin/bisect--helper.c:174 +#: builtin/bisect--helper.c:172 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset '." @@ -9502,27 +10004,27 @@ msgstr "" "първоначално указаното „%s“ в указателя „HEAD“ не може да бъде\n" "изтеглено. Пробвайте да изпълните командата „git bisect reset ПОДАВАНЕ“." -#: builtin/bisect--helper.c:215 +#: builtin/bisect--helper.c:216 #, c-format msgid "Bad bisect_write argument: %s" msgstr "Неправилен аргумент на функцията „bisect_write“: „%s“" -#: builtin/bisect--helper.c:220 +#: builtin/bisect--helper.c:221 #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "идентификаторът на обект на версия „%s“ не може да бъде получен" -#: builtin/bisect--helper.c:232 +#: builtin/bisect--helper.c:233 #, c-format msgid "couldn't open the file '%s'" msgstr "файлът „%s“ не може да бъде отворен" -#: builtin/bisect--helper.c:258 +#: builtin/bisect--helper.c:259 #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "Неправилна команда: в момента се изпълнява двоично търсене по %s/%s." -#: builtin/bisect--helper.c:285 +#: builtin/bisect--helper.c:286 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -9531,7 +10033,7 @@ msgstr "" "Трябва да зададете поне една „%s“ и една „%s“ версия. (Това може да се\n" "направи съответно и чрез командите „git bisect %s“ и „git bisect %s“.)" -#: builtin/bisect--helper.c:289 +#: builtin/bisect--helper.c:290 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -9542,7 +10044,7 @@ msgstr "" "Трябва да зададете поне една „%s“ и една „%s“ версия. (Това може да се\n" "направи съответно и чрез командите „git bisect %s“ и „git bisect %s“.)" -#: builtin/bisect--helper.c:321 +#: builtin/bisect--helper.c:322 #, c-format msgid "bisecting only with a %s commit" msgstr "двоично търсене само по „%s“ подаване." @@ -9551,15 +10053,15 @@ msgstr "двоично търсене само по „%s“ подаване." #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:329 +#: builtin/bisect--helper.c:330 msgid "Are you sure [Y/n]? " msgstr "Да се продължи ли? „Y“ — ДА, „n“ — не" -#: builtin/bisect--helper.c:376 +#: builtin/bisect--helper.c:377 msgid "no terms defined" msgstr "не са указани управляващи думи" -#: builtin/bisect--helper.c:379 +#: builtin/bisect--helper.c:380 #, c-format msgid "" "Your current terms are %s for the old state\n" @@ -9568,7 +10070,7 @@ msgstr "" "Текущите управляващи думи са: %s за старото състояние\n" "и %s за новото състояние.\n" -#: builtin/bisect--helper.c:389 +#: builtin/bisect--helper.c:390 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -9577,117 +10079,117 @@ msgstr "" "на „git bisect terms“ е подаден неправилен аргумент „%s“\n" "Поддържат се опциите „--term-good“/„--term-old“ и „--term-bad„/„--term-new“." -#: builtin/bisect--helper.c:475 +#: builtin/bisect--helper.c:476 #, c-format msgid "unrecognized option: '%s'" msgstr "непозната опция: %s" -#: builtin/bisect--helper.c:479 +#: builtin/bisect--helper.c:480 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "„%s“ не изглежда като указател към версия" -#: builtin/bisect--helper.c:511 +#: builtin/bisect--helper.c:512 msgid "bad HEAD - I need a HEAD" msgstr "Неправилен указател „HEAD“" -#: builtin/bisect--helper.c:526 +#: builtin/bisect--helper.c:527 #, c-format msgid "checking out '%s' failed. Try 'git bisect start '." msgstr "" "Неуспешно преминаване към „%s“. Изпълнете командата „git bisect start " "СЪЩЕСТВУВАЩ_КЛОН“." -#: builtin/bisect--helper.c:547 +#: builtin/bisect--helper.c:548 msgid "won't bisect on cg-seek'ed tree" msgstr "" "не може да се търси двоично, когато е изпълнена командата „cg-seek“ от " "„cogito“" -#: builtin/bisect--helper.c:550 +#: builtin/bisect--helper.c:551 msgid "bad HEAD - strange symbolic ref" msgstr "Неправилен указател „HEAD“ — необичаен символен указател" -#: builtin/bisect--helper.c:574 +#: builtin/bisect--helper.c:575 #, c-format msgid "invalid ref: '%s'" msgstr "неправилен указател: „%s“" -#: builtin/bisect--helper.c:630 +#: builtin/bisect--helper.c:631 msgid "perform 'git bisect next'" msgstr "извършване на „git bisect next“" -#: builtin/bisect--helper.c:632 +#: builtin/bisect--helper.c:633 msgid "write the terms to .git/BISECT_TERMS" msgstr "запазване на управляващите думи в „“.git/BISECT_TERMS„“" -#: builtin/bisect--helper.c:634 +#: builtin/bisect--helper.c:635 msgid "cleanup the bisection state" msgstr "изчистване на състоянието на двоичното търсене" -#: builtin/bisect--helper.c:636 +#: builtin/bisect--helper.c:637 msgid "check for expected revs" msgstr "проверка за очакваните версии" -#: builtin/bisect--helper.c:638 +#: builtin/bisect--helper.c:639 msgid "reset the bisection state" msgstr "изчистване на състоянието на двоичното търсене" -#: builtin/bisect--helper.c:640 +#: builtin/bisect--helper.c:641 msgid "write out the bisection state in BISECT_LOG" msgstr "запис на състоянието на двоичното търсене в „BISECT_LOG“" -#: builtin/bisect--helper.c:642 +#: builtin/bisect--helper.c:643 msgid "check and set terms in a bisection state" msgstr "" "проверка и задаване на управляващи думи към състоянието на двоичното търсене" -#: builtin/bisect--helper.c:644 +#: builtin/bisect--helper.c:645 msgid "check whether bad or good terms exist" msgstr "проверка дали съществуват одобряващи/отхвърлящи управляващи думи" -#: builtin/bisect--helper.c:646 +#: builtin/bisect--helper.c:647 msgid "print out the bisect terms" msgstr "извеждане на управляващите думи" -#: builtin/bisect--helper.c:648 +#: builtin/bisect--helper.c:649 msgid "start the bisect session" msgstr "начало на двоично търсене" -#: builtin/bisect--helper.c:650 +#: builtin/bisect--helper.c:651 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "" "обновяване на указателя „BISECT_HEAD“ вместо да се използва текущото подаване" -#: builtin/bisect--helper.c:652 +#: builtin/bisect--helper.c:653 msgid "no log for BISECT_WRITE" msgstr "липсва запис за „BISECT_WRITE“" -#: builtin/bisect--helper.c:669 +#: builtin/bisect--helper.c:670 msgid "--write-terms requires two arguments" msgstr "опцията „--write-terms“ изисква точно 2 аргумента" -#: builtin/bisect--helper.c:673 +#: builtin/bisect--helper.c:674 msgid "--bisect-clean-state requires no arguments" msgstr "опцията „--bisect-clean-state“ не приема аргументи" -#: builtin/bisect--helper.c:680 +#: builtin/bisect--helper.c:681 msgid "--bisect-reset requires either no argument or a commit" msgstr "опцията „--bisect-reset“ изисква или 0 аргументи, или 1 — подаване" -#: builtin/bisect--helper.c:684 +#: builtin/bisect--helper.c:685 msgid "--bisect-write requires either 4 or 5 arguments" msgstr "опцията „--bisect-write“ изисква 4 или 5 аргумента" -#: builtin/bisect--helper.c:690 +#: builtin/bisect--helper.c:691 msgid "--check-and-set-terms requires 3 arguments" msgstr "опцията „--check-and-set-terms“ изисква 3 аргумента" -#: builtin/bisect--helper.c:696 +#: builtin/bisect--helper.c:697 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "опцията „--bisect-next-check“ изисква 2 или 3 аргумента" -#: builtin/bisect--helper.c:702 +#: builtin/bisect--helper.c:703 msgid "--bisect-terms requires 0 or 1 argument" msgstr "опцията „--bisect-terms“ изисква 0 или 1 аргумента" @@ -9798,7 +10300,7 @@ msgstr "" msgid "Ignore whitespace differences" msgstr "Без разлики в знаците за интервали" -#: builtin/blame.c:860 builtin/log.c:1630 +#: builtin/blame.c:860 builtin/log.c:1702 msgid "rev" msgstr "ВЕРС" @@ -9819,49 +10321,45 @@ msgstr "" msgid "color lines by age" msgstr "оцветяване на редовете по възраст" -#: builtin/blame.c:870 -msgid "Use an experimental heuristic to improve diffs" -msgstr "Подобряване на разликите чрез експериментална евристика" - -#: builtin/blame.c:872 +#: builtin/blame.c:864 msgid "Spend extra cycles to find better match" msgstr "Допълнителни изчисления за по-добри резултати" -#: builtin/blame.c:873 +#: builtin/blame.c:865 msgid "Use revisions from instead of calling git-rev-list" msgstr "Изчитане на версиите от ФАЙЛ, а не чрез изпълнение на „git-rev-list“" -#: builtin/blame.c:874 +#: builtin/blame.c:866 msgid "Use 's contents as the final image" msgstr "Използване на съдържанието на ФАЙЛа като крайно положение" -#: builtin/blame.c:875 builtin/blame.c:876 +#: builtin/blame.c:867 builtin/blame.c:868 msgid "score" msgstr "напасване на редовете" -#: builtin/blame.c:875 +#: builtin/blame.c:867 msgid "Find line copies within and across files" msgstr "" "Търсене на копирани редове както в рамките на един файл, така и от един файл " "към друг" -#: builtin/blame.c:876 +#: builtin/blame.c:868 msgid "Find line movements within and across files" msgstr "" "Търсене на преместени редове както в рамките на един файл, така и от един " "файл към друг" -#: builtin/blame.c:877 +#: builtin/blame.c:869 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:877 +#: builtin/blame.c:869 msgid "Process only line range n,m, counting from 1" msgstr "" "Информация само за редовете в диапазона от n до m включително. Броенето " "започва от 1" -#: builtin/blame.c:929 +#: builtin/blame.c:921 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" "опцията „--progress“ е несъвместима с „--incremental“ и форма̀та на командите " @@ -9875,18 +10373,18 @@ msgstr "" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:980 +#: builtin/blame.c:972 msgid "4 years, 11 months ago" msgstr "преди 4 години и 11 месеца" -#: builtin/blame.c:1087 +#: builtin/blame.c:1079 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "има само %2$lu ред във файла „%1$s“" msgstr[1] "има само %2$lu реда във файла „%1$s“" -#: builtin/blame.c:1133 +#: builtin/blame.c:1125 msgid "Blaming lines" msgstr "Редове с авторство" @@ -10098,7 +10596,7 @@ msgstr "задаване на режима на следене (виж git-pull( msgid "do not use" msgstr "да не се ползва" -#: builtin/branch.c:626 builtin/rebase.c:486 +#: builtin/branch.c:626 builtin/rebase.c:505 msgid "upstream" msgstr "клон-източник" @@ -10107,8 +10605,8 @@ msgid "change the upstream info" msgstr "смяна на клона-източник" #: builtin/branch.c:627 -msgid "Unset the upstream info" -msgstr "без клон-източник" +msgid "unset the upstream info" +msgstr "изчистване на информацията за клон-източник" #: builtin/branch.c:628 msgid "use colored output" @@ -10210,7 +10708,7 @@ msgstr "подредбата и филтрирането третират едн msgid "format to use for the output" msgstr "ФОРМАТ за изхода" -#: builtin/branch.c:684 builtin/clone.c:760 +#: builtin/branch.c:684 builtin/clone.c:784 msgid "HEAD not found below refs/heads!" msgstr "В директорията „refs/heads“ липсва файл „HEAD“" @@ -10300,19 +10798,65 @@ msgstr "" "Опцията „--set-upstream“ вече не се поддържа. Използвайте „--track“ или „--" "set-upstream-to“" -#: builtin/bundle.c:45 +#: builtin/bundle.c:15 builtin/bundle.c:23 +msgid "git bundle create [] " +msgstr "git bundle create [ОПЦИЯ…] ФАЙЛ АРГУМЕНТ_ЗА_git_rev-list…" + +#: builtin/bundle.c:16 builtin/bundle.c:28 +msgid "git bundle verify [] " +msgstr "git bundle verify [ОПЦИЯ…] ФАЙЛ…" + +#: builtin/bundle.c:17 builtin/bundle.c:33 +msgid "git bundle list-heads [...]" +msgstr "git bundle list-heads ФАЙЛ [ИМЕ_НА_УКАЗАТЕЛ…]" + +#: builtin/bundle.c:18 builtin/bundle.c:38 +msgid "git bundle unbundle [...]" +msgstr "git bundle unbundle ФАЙЛ [ИМЕ_НА_УКАЗАТЕЛ…]" + +#: builtin/bundle.c:66 builtin/pack-objects.c:3228 +msgid "do not show progress meter" +msgstr "без извеждане на напредъка" + +#: builtin/bundle.c:68 builtin/pack-objects.c:3230 +msgid "show progress meter" +msgstr "извеждане на напредъка" + +#: builtin/bundle.c:70 builtin/pack-objects.c:3232 +msgid "show progress meter during object writing phase" +msgstr "извеждане на напредъка във фазата на запазване на обектите" + +#: builtin/bundle.c:73 builtin/pack-objects.c:3235 +msgid "similar to --all-progress when progress meter is shown" +msgstr "" +"същото действие като опцията „--all-progress“ при извеждането на напредъка" + +#: builtin/bundle.c:93 +msgid "Need a repository to create a bundle." +msgstr "За създаването на пратка е необходимо хранилище." + +#: builtin/bundle.c:104 +msgid "do not show bundle details" +msgstr "без подробна информация за пратките" + +#: builtin/bundle.c:119 #, c-format msgid "%s is okay\n" msgstr "Пратката „%s“ е наред\n" -#: builtin/bundle.c:58 -msgid "Need a repository to create a bundle." -msgstr "За създаването на пратка е необходимо хранилище." - -#: builtin/bundle.c:62 +#: builtin/bundle.c:160 msgid "Need a repository to unbundle." msgstr "За приемането на пратка е необходимо хранилище." +#: builtin/bundle.c:168 builtin/remote.c:1609 +msgid "be verbose; must be placed before a subcommand" +msgstr "повече подробности. Поставя се пред подкоманда" + +#: builtin/bundle.c:190 builtin/remote.c:1640 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "Непозната подкоманда: %s" + #: builtin/cat-file.c:595 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" @@ -10366,7 +10910,7 @@ msgid "for blob objects, run filters on object's content" msgstr "" "да се стартират програмите за преобразуване на съдържанието на обектите-BLOB" -#: builtin/cat-file.c:645 git-submodule.sh:936 +#: builtin/cat-file.c:645 git-submodule.sh:992 msgid "blob" msgstr "обект-BLOB" @@ -10429,7 +10973,7 @@ msgstr "изчитане на имената на файловете от ста msgid "terminate input and output records by a NUL character" msgstr "разделяне на входните и изходните записи с нулевия знак „NUL“" -#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:537 +#: builtin/check-ignore.c:21 builtin/checkout.c:1435 builtin/gc.c:537 #: builtin/worktree.c:506 msgid "suppress progress reporting" msgstr "без показване на напредъка" @@ -10520,8 +11064,8 @@ msgid "write the content to temporary files" msgstr "записване на съдържанието във временни файлове" #: builtin/checkout-index.c:178 builtin/column.c:31 -#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376 -#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857 +#: builtin/submodule--helper.c:1385 builtin/submodule--helper.c:1388 +#: builtin/submodule--helper.c:1396 builtin/submodule--helper.c:1882 #: builtin/worktree.c:679 msgid "string" msgstr "НИЗ" @@ -10550,99 +11094,99 @@ msgstr "git switch [ОПЦИЯ…] КЛОН" msgid "git restore [] [--source=] ..." msgstr "git restore [ОПЦИЯ…] [--source=КЛОН] ФАЙЛ…" -#: builtin/checkout.c:173 builtin/checkout.c:212 +#: builtin/checkout.c:175 builtin/checkout.c:214 #, c-format msgid "path '%s' does not have our version" msgstr "вашата версия липсва в пътя „%s“" -#: builtin/checkout.c:175 builtin/checkout.c:214 +#: builtin/checkout.c:177 builtin/checkout.c:216 #, c-format msgid "path '%s' does not have their version" msgstr "чуждата версия липсва в пътя „%s“" -#: builtin/checkout.c:191 +#: builtin/checkout.c:193 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "някоя от необходимите версии липсва в пътя „%s“" -#: builtin/checkout.c:241 +#: builtin/checkout.c:243 #, c-format msgid "path '%s' does not have necessary versions" msgstr "някоя от необходимите версии липсва в пътя „%s“" -#: builtin/checkout.c:259 +#: builtin/checkout.c:261 #, c-format msgid "path '%s': cannot merge" msgstr "пътят „%s“ не може да бъде слян" -#: builtin/checkout.c:275 +#: builtin/checkout.c:277 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Резултатът за „%s“ не може да бъде слян" -#: builtin/checkout.c:375 +#: builtin/checkout.c:377 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "Пресъздаден е %d конфликт при сливане" msgstr[1] "Пресъздадени са %d конфликта при сливане" -#: builtin/checkout.c:380 +#: builtin/checkout.c:382 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "Обновен е %d път от „%s“" msgstr[1] "Обновени са %d пътя от „%s“" -#: builtin/checkout.c:387 +#: builtin/checkout.c:389 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "Обновен е %d път от индекса" msgstr[1] "Обновени са %d пътя от индекса" -#: builtin/checkout.c:410 builtin/checkout.c:413 builtin/checkout.c:416 -#: builtin/checkout.c:420 +#: builtin/checkout.c:412 builtin/checkout.c:415 builtin/checkout.c:418 +#: builtin/checkout.c:422 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "опцията „%s“ е несъвместима с обновяването на пътища" -#: builtin/checkout.c:423 builtin/checkout.c:426 +#: builtin/checkout.c:425 builtin/checkout.c:428 #, c-format msgid "'%s' cannot be used with %s" msgstr "опцията „%s“ е несъвместима с „%s“" -#: builtin/checkout.c:430 +#: builtin/checkout.c:432 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "Невъзможно е едновременно да обновявате пътища и да преминете към клона „%s“." -#: builtin/checkout.c:434 +#: builtin/checkout.c:436 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "не е указано нито „%s“, нито „%s“" -#: builtin/checkout.c:438 +#: builtin/checkout.c:440 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "опцията „%s“ е задължителна, когато „%s“ не е зададена" -#: builtin/checkout.c:443 builtin/checkout.c:448 +#: builtin/checkout.c:445 builtin/checkout.c:450 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "опцията „%3$s“ е несъвместима както с „%1$s“, така и с „%2$s“" -#: builtin/checkout.c:507 builtin/checkout.c:514 +#: builtin/checkout.c:509 builtin/checkout.c:516 #, c-format msgid "path '%s' is unmerged" msgstr "пътят „%s“ не е слят" -#: builtin/checkout.c:680 +#: builtin/checkout.c:682 builtin/sparse-checkout.c:103 msgid "you need to resolve your current index first" msgstr "първо трябва да коригирате индекса си" -#: builtin/checkout.c:730 +#: builtin/checkout.c:732 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -10652,50 +11196,50 @@ msgstr "" "индекса:\n" "%s" -#: builtin/checkout.c:833 +#: builtin/checkout.c:835 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Журналът на указателите за „%s“ не може да се проследи: %s\n" -#: builtin/checkout.c:875 +#: builtin/checkout.c:877 msgid "HEAD is now at" msgstr "Указателят „HEAD“ в момента сочи към" -#: builtin/checkout.c:879 builtin/clone.c:713 +#: builtin/checkout.c:881 builtin/clone.c:716 msgid "unable to update HEAD" msgstr "Указателят „HEAD“ не може да бъде обновен" -#: builtin/checkout.c:883 +#: builtin/checkout.c:885 #, c-format msgid "Reset branch '%s'\n" msgstr "Зануляване на клона „%s“\n" -#: builtin/checkout.c:886 +#: builtin/checkout.c:888 #, c-format msgid "Already on '%s'\n" msgstr "Вече сте на „%s“\n" -#: builtin/checkout.c:890 +#: builtin/checkout.c:892 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Преминаване към клона „%s“ и зануляване на промените\n" -#: builtin/checkout.c:892 builtin/checkout.c:1289 +#: builtin/checkout.c:894 builtin/checkout.c:1291 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Преминахте към новия клон „%s“\n" -#: builtin/checkout.c:894 +#: builtin/checkout.c:896 #, c-format msgid "Switched to branch '%s'\n" msgstr "Преминахте към клона „%s“\n" -#: builtin/checkout.c:945 +#: builtin/checkout.c:947 #, c-format msgid " ... and %d more.\n" msgstr "… и още %d.\n" -#: builtin/checkout.c:951 +#: builtin/checkout.c:953 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -10717,7 +11261,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:970 +#: builtin/checkout.c:972 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -10744,28 +11288,28 @@ msgstr[1] "" " git branch ИМЕ_НА_НОВИЯ_КЛОН %s\n" "\n" -#: builtin/checkout.c:1005 +#: builtin/checkout.c:1007 msgid "internal error in revision walk" msgstr "вътрешна грешка при обхождането на версиите" -#: builtin/checkout.c:1009 +#: builtin/checkout.c:1011 msgid "Previous HEAD position was" msgstr "Преди това „HEAD“ сочеше към" -#: builtin/checkout.c:1049 builtin/checkout.c:1284 +#: builtin/checkout.c:1051 builtin/checkout.c:1286 msgid "You are on a branch yet to be born" msgstr "В момента сте на клон, който все още не е създаден" -#: builtin/checkout.c:1176 +#: builtin/checkout.c:1178 msgid "only one reference expected" msgstr "очаква се само един указател" -#: builtin/checkout.c:1193 +#: builtin/checkout.c:1195 #, c-format msgid "only one reference expected, %d given." msgstr "очаква се един указател, а сте подали %d." -#: builtin/checkout.c:1230 +#: builtin/checkout.c:1232 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -10774,37 +11318,37 @@ msgstr "" "„%s“ може да е както локален файл, така и следящ клон. За уточняване\n" "ползвайте разделителя „--“ (и евентуално опцията „--no-guess“)" -#: builtin/checkout.c:1243 builtin/worktree.c:290 builtin/worktree.c:455 +#: builtin/checkout.c:1245 builtin/worktree.c:290 builtin/worktree.c:455 #, c-format msgid "invalid reference: %s" msgstr "неправилен указател: %s" -#: builtin/checkout.c:1256 builtin/checkout.c:1618 +#: builtin/checkout.c:1258 builtin/checkout.c:1622 #, c-format msgid "reference is not a tree: %s" msgstr "указателят не сочи към обект-дърво: %s" -#: builtin/checkout.c:1303 +#: builtin/checkout.c:1305 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "очаква се клон, а не етикет — „%s“" -#: builtin/checkout.c:1305 +#: builtin/checkout.c:1307 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "очаква се локален, а не отдалечен клон — „%s“" -#: builtin/checkout.c:1306 builtin/checkout.c:1314 +#: builtin/checkout.c:1308 builtin/checkout.c:1316 #, c-format msgid "a branch is expected, got '%s'" msgstr "очаква се клон, а не „%s“" -#: builtin/checkout.c:1309 +#: builtin/checkout.c:1311 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "очаква се клон, а не подаване — „%s“" -#: builtin/checkout.c:1325 +#: builtin/checkout.c:1327 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -10812,7 +11356,7 @@ msgstr "" "по време на сливане не може да преминете към друг клон.\n" "Пробвайте с „git merge --quit“ или „git worktree add“." -#: builtin/checkout.c:1329 +#: builtin/checkout.c:1331 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -10821,7 +11365,7 @@ msgstr "" "клон.\n" "Пробвайте с „git am --quit“ или „git worktree add“." -#: builtin/checkout.c:1333 +#: builtin/checkout.c:1335 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -10829,7 +11373,7 @@ msgstr "" "по време на пребазиране не може да преминете към друг клон.\n" "Пробвайте с „git rebase --quit“ или „git worktree add“." -#: builtin/checkout.c:1337 +#: builtin/checkout.c:1339 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -10837,7 +11381,7 @@ msgstr "" "по време на отбиране на подавания не може да преминете към друг клон.\n" "Пробвайте с „git cherry-pick --quit“ или „git worktree add“." -#: builtin/checkout.c:1341 +#: builtin/checkout.c:1343 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -10845,124 +11389,121 @@ msgstr "" "по време на отмяна на подавания не може да преминете към друг клон.\n" "Пробвайте с „git revert --quit“ или „git worktree add“." -#: builtin/checkout.c:1345 +#: builtin/checkout.c:1347 msgid "you are switching branch while bisecting" msgstr "преминаване към друг клон по време на двоично търсене" -#: builtin/checkout.c:1352 +#: builtin/checkout.c:1354 msgid "paths cannot be used with switching branches" msgstr "задаването на път е несъвместимо с преминаването от един клон към друг" -#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363 +#: builtin/checkout.c:1357 builtin/checkout.c:1361 builtin/checkout.c:1365 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "опцията „%s“ е несъвместима с преминаването от един клон към друг" -#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373 -#: builtin/checkout.c:1378 builtin/checkout.c:1383 +#: builtin/checkout.c:1369 builtin/checkout.c:1372 builtin/checkout.c:1375 +#: builtin/checkout.c:1380 builtin/checkout.c:1385 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "опцията „%s“ е несъвместима с „%s“" -#: builtin/checkout.c:1380 +#: builtin/checkout.c:1382 #, c-format msgid "'%s' cannot take " msgstr "опцията „%s“ е несъвместима със задаването на НАЧАЛО" -#: builtin/checkout.c:1388 +#: builtin/checkout.c:1390 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" "За да преминете към клон, подайте указател, който сочи към подаване. „%s“ " "не е такъв" -#: builtin/checkout.c:1395 +#: builtin/checkout.c:1397 msgid "missing branch or commit argument" msgstr "липсва аргумент — клон или подаване" -#: builtin/checkout.c:1437 builtin/clone.c:90 builtin/commit-graph.c:59 -#: builtin/commit-graph.c:180 builtin/fetch.c:166 builtin/merge.c:285 -#: builtin/pull.c:138 builtin/push.c:562 builtin/send-pack.c:174 +#: builtin/checkout.c:1439 builtin/clone.c:91 builtin/commit-graph.c:52 +#: builtin/commit-graph.c:113 builtin/fetch.c:167 builtin/merge.c:285 +#: builtin/multi-pack-index.c:27 builtin/pull.c:138 builtin/push.c:563 +#: builtin/send-pack.c:174 msgid "force progress reporting" msgstr "извеждане на напредъка" -#: builtin/checkout.c:1438 +#: builtin/checkout.c:1440 msgid "perform a 3-way merge with the new branch" msgstr "извършване на тройно сливане с новия клон" -#: builtin/checkout.c:1439 builtin/log.c:1618 parse-options.h:318 +#: builtin/checkout.c:1441 builtin/log.c:1690 parse-options.h:322 msgid "style" msgstr "СТИЛ" -#: builtin/checkout.c:1440 +#: builtin/checkout.c:1442 msgid "conflict style (merge or diff3)" msgstr "действие при конфликт (сливане или тройна разлика)" -#: builtin/checkout.c:1452 builtin/worktree.c:503 +#: builtin/checkout.c:1454 builtin/worktree.c:503 msgid "detach HEAD at named commit" msgstr "отделяне на указателя „HEAD“ към указаното подаване" -#: builtin/checkout.c:1453 +#: builtin/checkout.c:1455 msgid "set upstream info for new branch" msgstr "задаване на кой клон бива следен при създаването на новия клон" -#: builtin/checkout.c:1455 +#: builtin/checkout.c:1457 msgid "force checkout (throw away local modifications)" msgstr "принудително изтегляне (вашите промени ще бъдат занулени)" -#: builtin/checkout.c:1457 +#: builtin/checkout.c:1459 msgid "new-branch" msgstr "НОВ_КЛОН" -#: builtin/checkout.c:1457 +#: builtin/checkout.c:1459 msgid "new unparented branch" msgstr "нов клон без родител" -#: builtin/checkout.c:1459 builtin/merge.c:288 +#: builtin/checkout.c:1461 builtin/merge.c:288 msgid "update ignored files (default)" msgstr "обновяване на игнорираните файлове (стандартно)" -#: builtin/checkout.c:1462 +#: builtin/checkout.c:1464 msgid "do not check if another worktree is holding the given ref" msgstr "без проверка дали друго работно дърво държи указателя" -#: builtin/checkout.c:1475 +#: builtin/checkout.c:1477 msgid "checkout our version for unmerged files" msgstr "изтегляне на вашата версия на неслетите файлове" -#: builtin/checkout.c:1478 +#: builtin/checkout.c:1480 msgid "checkout their version for unmerged files" msgstr "изтегляне на чуждата версия на неслетите файлове" -#: builtin/checkout.c:1482 +#: builtin/checkout.c:1484 msgid "do not limit pathspecs to sparse entries only" msgstr "без ограничаване на изброените пътища само до частично изтеглените" -#: builtin/checkout.c:1533 +#: builtin/checkout.c:1537 msgid "-b, -B and --orphan are mutually exclusive" msgstr "Опциите „-b“, „-B“ и „--orphan“ са несъвместими една с друга" -#: builtin/checkout.c:1536 +#: builtin/checkout.c:1540 msgid "-p and --overlay are mutually exclusive" msgstr "опциите „-p“ и „--overlay“ са несъвместими" -#: builtin/checkout.c:1573 +#: builtin/checkout.c:1577 msgid "--track needs a branch name" msgstr "опцията „--track“ изисква име на клон" -#: builtin/checkout.c:1578 +#: builtin/checkout.c:1582 msgid "missing branch name; try -b" msgstr "липсва име на клон, използвайте опцията „-b“" -#: builtin/checkout.c:1611 +#: builtin/checkout.c:1615 #, c-format msgid "could not resolve %s" msgstr "„%s“ не може да бъде открит" -#: builtin/checkout.c:1623 -msgid "you must specify path(s) to restore" -msgstr "трябва да укажете поне един път за възстановяване" - #: builtin/checkout.c:1631 msgid "invalid path specification" msgstr "указан е неправилен път" @@ -10977,7 +11518,15 @@ msgstr "„%s“ не е подаване, затова от него не мо msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: опцията „--detach“ не приема аргумент-път „%s“" -#: builtin/checkout.c:1646 +#: builtin/checkout.c:1651 +msgid "--pathspec-from-file is incompatible with --detach" +msgstr "опциите „--pathspec-from-file“ и „--detach“ са несъвместими" + +#: builtin/checkout.c:1654 builtin/reset.c:324 +msgid "--pathspec-from-file is incompatible with --patch" +msgstr "опциите „--pathspec-from-file“ и „--patch“ са несъвместими" + +#: builtin/checkout.c:1665 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -10985,7 +11534,11 @@ msgstr "" "git checkout: опциите „--ours“/„--theirs“, „--force“ и „--merge“\n" "са несъвместими с изтегляне от индекса." -#: builtin/checkout.c:1666 +#: builtin/checkout.c:1670 +msgid "you must specify path(s) to restore" +msgstr "трябва да укажете поне един път за възстановяване" + +#: builtin/checkout.c:1689 #, c-format msgid "" "'%s' matched more than one remote tracking branch.\n" @@ -11015,69 +11568,69 @@ msgstr "" "\n" " checkout.defaultRemote=origin" -#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1742 -#: builtin/checkout.c:1744 builtin/clone.c:120 builtin/remote.c:169 +#: builtin/checkout.c:1714 builtin/checkout.c:1716 builtin/checkout.c:1765 +#: builtin/checkout.c:1767 builtin/clone.c:121 builtin/remote.c:169 #: builtin/remote.c:171 builtin/worktree.c:499 builtin/worktree.c:501 msgid "branch" msgstr "клон" -#: builtin/checkout.c:1692 +#: builtin/checkout.c:1715 msgid "create and checkout a new branch" msgstr "създаване и преминаване към нов клон" -#: builtin/checkout.c:1694 +#: builtin/checkout.c:1717 msgid "create/reset and checkout a branch" msgstr "създаване/зануляване на клон и преминаване към него" -#: builtin/checkout.c:1695 +#: builtin/checkout.c:1718 msgid "create reflog for new branch" msgstr "създаване на журнал на указателите за нов клон" -#: builtin/checkout.c:1697 +#: builtin/checkout.c:1720 msgid "second guess 'git checkout ' (default)" msgstr "" "опит за отгатване на име на клон след неуспешен опит с „git checkout " "НЕСЪЩЕСТВУВАЩ_КЛОН“ (стандартно)" -#: builtin/checkout.c:1698 +#: builtin/checkout.c:1721 msgid "use overlay mode (default)" msgstr "използване на припокриващ режим (стандартно)" -#: builtin/checkout.c:1743 +#: builtin/checkout.c:1766 msgid "create and switch to a new branch" msgstr "създаване и преминаване към нов клон" -#: builtin/checkout.c:1745 +#: builtin/checkout.c:1768 msgid "create/reset and switch to a branch" msgstr "създаване/зануляване на клон и преминаване към него" -#: builtin/checkout.c:1747 +#: builtin/checkout.c:1770 msgid "second guess 'git switch '" msgstr "" "опит за отгатване на име на клон след неуспешен опит с „git switch " "НЕСЪЩЕСТВУВАЩ_КЛОН“" -#: builtin/checkout.c:1749 +#: builtin/checkout.c:1772 msgid "throw away local modifications" msgstr "зануляване на локалните промени" -#: builtin/checkout.c:1781 +#: builtin/checkout.c:1804 msgid "which tree-ish to checkout from" msgstr "към кой указател към дърво да се премине" -#: builtin/checkout.c:1783 +#: builtin/checkout.c:1806 msgid "restore the index" msgstr "възстановяване на индекса" -#: builtin/checkout.c:1785 +#: builtin/checkout.c:1808 msgid "restore the working tree (default)" msgstr "възстановяване на работното дърво (стандартно)" -#: builtin/checkout.c:1787 +#: builtin/checkout.c:1810 msgid "ignore unmerged entries" msgstr "пренебрегване на неслетите елементи" -#: builtin/checkout.c:1788 +#: builtin/checkout.c:1811 msgid "use overlay mode" msgstr "използване на припокриващ режим" @@ -11116,7 +11669,7 @@ msgstr "файлът „%s“ не може да бъде изтрит" msgid "could not lstat %s\n" msgstr "не може да се получи информация чрез „lstat“ за „%s“\n" -#: builtin/clean.c:301 git-add--interactive.perl:593 +#: builtin/clean.c:301 git-add--interactive.perl:595 #, c-format msgid "" "Prompt help:\n" @@ -11129,7 +11682,7 @@ msgstr "" "ПРЕФИКС — избор на единствен обект по този уникален префикс\n" " — (празно) нищо да не се избира\n" -#: builtin/clean.c:305 git-add--interactive.perl:602 +#: builtin/clean.c:305 git-add--interactive.perl:604 #, c-format msgid "" "Prompt help:\n" @@ -11150,8 +11703,8 @@ msgstr "" "* — избиране на всички обекти\n" " — (празно) завършване на избирането\n" -#: builtin/clean.c:521 git-add--interactive.perl:568 -#: git-add--interactive.perl:573 +#: builtin/clean.c:521 git-add--interactive.perl:570 +#: git-add--interactive.perl:575 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Неправилен избор (%s).\n" @@ -11176,12 +11729,6 @@ msgstr "Избиране на обекти за изтриване" msgid "Remove %s [y/N]? " msgstr "Да се изтрие ли „%s“? „y“ — да, „N“ — НЕ" -# -#: builtin/clean.c:787 git-add--interactive.perl:1763 -#, c-format -msgid "Bye.\n" -msgstr "Изход.\n" - #: builtin/clean.c:795 msgid "" "clean - start cleaning\n" @@ -11200,14 +11747,6 @@ msgstr "" "help — този край\n" "? — подсказка за шаблоните" -#: builtin/clean.c:822 git-add--interactive.perl:1849 -msgid "*** Commands ***" -msgstr "●●● Команди ●●●" - -#: builtin/clean.c:823 git-add--interactive.perl:1846 -msgid "What now" -msgstr "Избор на следващо действие" - #: builtin/clean.c:831 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" @@ -11235,8 +11774,8 @@ msgid "remove whole directories" msgstr "изтриване на цели директории" #: builtin/clean.c:915 builtin/describe.c:548 builtin/describe.c:550 -#: builtin/grep.c:901 builtin/log.c:176 builtin/log.c:178 -#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419 +#: builtin/grep.c:901 builtin/log.c:177 builtin/log.c:179 +#: builtin/ls-files.c:557 builtin/name-rev.c:464 builtin/name-rev.c:466 #: builtin/show-ref.c:179 msgid "pattern" msgstr "ШАБЛОН" @@ -11278,160 +11817,166 @@ msgstr "" msgid "git clone [] [--] []" msgstr "git clone [ОПЦИЯ…] [--] ХРАНИЛИЩЕ [ДИРЕКТОРИЯ]" -#: builtin/clone.c:92 +#: builtin/clone.c:93 msgid "don't create a checkout" msgstr "без създаване на работно дърво" -#: builtin/clone.c:93 builtin/clone.c:95 builtin/init-db.c:489 +#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489 msgid "create a bare repository" msgstr "създаване на голо хранилище" -#: builtin/clone.c:97 +#: builtin/clone.c:98 msgid "create a mirror repository (implies bare)" msgstr "" "създаване на хранилище-огледало (включва опцията „--bare“ за голо хранилище)" -#: builtin/clone.c:99 +#: builtin/clone.c:100 msgid "to clone from a local repository" msgstr "клониране от локално хранилище" -#: builtin/clone.c:101 +#: builtin/clone.c:102 msgid "don't use local hardlinks, always copy" msgstr "без твърди връзки, файловете винаги да се копират" -#: builtin/clone.c:103 +#: builtin/clone.c:104 msgid "setup as shared repository" msgstr "настройване за споделено хранилище" -#: builtin/clone.c:106 +#: builtin/clone.c:107 msgid "pathspec" msgstr "път" -#: builtin/clone.c:106 +#: builtin/clone.c:107 msgid "initialize submodules in the clone" msgstr "инициализиране на подмодулите при това клониране" -#: builtin/clone.c:109 +#: builtin/clone.c:110 msgid "number of submodules cloned in parallel" msgstr "брой подмодули, клонирани паралелно" -#: builtin/clone.c:110 builtin/init-db.c:486 +#: builtin/clone.c:111 builtin/init-db.c:486 msgid "template-directory" msgstr "директория с шаблони" -#: builtin/clone.c:111 builtin/init-db.c:487 +#: builtin/clone.c:112 builtin/init-db.c:487 msgid "directory from which templates will be used" msgstr "директория, която съдържа шаблоните, които да се ползват" -#: builtin/clone.c:113 builtin/clone.c:115 builtin/submodule--helper.c:1380 -#: builtin/submodule--helper.c:1860 +#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1392 +#: builtin/submodule--helper.c:1885 msgid "reference repository" msgstr "еталонно хранилище" -#: builtin/clone.c:117 builtin/submodule--helper.c:1382 -#: builtin/submodule--helper.c:1862 +#: builtin/clone.c:118 builtin/submodule--helper.c:1394 +#: builtin/submodule--helper.c:1887 msgid "use --reference only while cloning" msgstr "опцията „--reference“ може да се използва само при клониране" -#: builtin/clone.c:118 builtin/column.c:27 builtin/merge-file.c:46 -#: builtin/pack-objects.c:3294 builtin/repack.c:320 +#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46 +#: builtin/pack-objects.c:3294 builtin/repack.c:327 msgid "name" msgstr "ИМЕ" -#: builtin/clone.c:119 +#: builtin/clone.c:120 msgid "use instead of 'origin' to track upstream" msgstr "използване на това ИМЕ вместо „origin“ при проследяване на клони" -#: builtin/clone.c:121 +#: builtin/clone.c:122 msgid "checkout instead of the remote's HEAD" msgstr "изтегляне на този КЛОН, а не соченият от отдалечения указател „HEAD“" -#: builtin/clone.c:123 +#: builtin/clone.c:124 msgid "path to git-upload-pack on the remote" msgstr "път към командата „git-upload-pack“ на отдалеченото хранилище" -#: builtin/clone.c:124 builtin/fetch.c:167 builtin/grep.c:840 +#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:840 #: builtin/pull.c:227 msgid "depth" msgstr "ДЪЛБОЧИНА" -#: builtin/clone.c:125 +#: builtin/clone.c:126 msgid "create a shallow clone of that depth" msgstr "плитко клониране до тази ДЪЛБОЧИНА" -#: builtin/clone.c:126 builtin/fetch.c:169 builtin/pack-objects.c:3283 +#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3283 msgid "time" msgstr "ВРЕМЕ" -#: builtin/clone.c:127 +#: builtin/clone.c:128 msgid "create a shallow clone since a specific time" msgstr "плитко клониране до момент във времето" -#: builtin/clone.c:128 builtin/fetch.c:171 builtin/fetch.c:194 -#: builtin/rebase.c:1417 +#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195 +#: builtin/rebase.c:1445 msgid "revision" msgstr "ВЕРСИЯ" -#: builtin/clone.c:129 builtin/fetch.c:172 +#: builtin/clone.c:130 builtin/fetch.c:173 msgid "deepen history of shallow clone, excluding rev" msgstr "задълбочаване на историята на плитко хранилище до изключващ указател" -#: builtin/clone.c:131 +#: builtin/clone.c:132 msgid "clone only one branch, HEAD or --branch" msgstr "" "клониране само на един клон — или сочения от отдалечения „HEAD“, или изрично " "зададения с „--branch“" -#: builtin/clone.c:133 +#: builtin/clone.c:134 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "" "без клониране на етикети, като последващите доставяния няма да ги следят" -#: builtin/clone.c:135 +#: builtin/clone.c:136 msgid "any cloned submodules will be shallow" msgstr "всички клонирани подмодули ще са плитки" -#: builtin/clone.c:136 builtin/init-db.c:495 +#: builtin/clone.c:137 builtin/init-db.c:495 msgid "gitdir" msgstr "СЛУЖЕБНА_ДИРЕКТОРИЯ" -#: builtin/clone.c:137 builtin/init-db.c:496 +#: builtin/clone.c:138 builtin/init-db.c:496 msgid "separate git dir from working tree" msgstr "отделна СЛУЖЕБНА_ДИРЕКТОРИЯ за git извън работното дърво" -#: builtin/clone.c:138 +#: builtin/clone.c:139 msgid "key=value" msgstr "КЛЮЧ=СТОЙНОСТ" -#: builtin/clone.c:139 +#: builtin/clone.c:140 msgid "set config inside the new repository" msgstr "задаване на настройките на новото хранилище" -#: builtin/clone.c:141 builtin/fetch.c:189 builtin/ls-remote.c:76 -#: builtin/push.c:572 builtin/send-pack.c:172 +#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76 +#: builtin/push.c:573 builtin/send-pack.c:172 msgid "server-specific" msgstr "специфични за сървъра" -#: builtin/clone.c:141 builtin/fetch.c:189 builtin/ls-remote.c:76 -#: builtin/push.c:572 builtin/send-pack.c:173 +#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76 +#: builtin/push.c:573 builtin/send-pack.c:173 msgid "option to transmit" msgstr "опция за пренос" -#: builtin/clone.c:142 builtin/fetch.c:190 builtin/pull.c:240 -#: builtin/push.c:573 +#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:240 +#: builtin/push.c:574 msgid "use IPv4 addresses only" msgstr "само адреси IPv4" -#: builtin/clone.c:144 builtin/fetch.c:192 builtin/pull.c:243 -#: builtin/push.c:575 +#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:243 +#: builtin/push.c:576 msgid "use IPv6 addresses only" msgstr "само адреси IPv6" -#: builtin/clone.c:148 +#: builtin/clone.c:149 msgid "any cloned submodules will use their remote-tracking branch" msgstr "всички клонирани подмодули ще ползват следящите си клони" -#: builtin/clone.c:284 +#: builtin/clone.c:151 +msgid "initialize sparse-checkout file to include only files at root" +msgstr "" +"инициализиране на файла за частично изтегляне („.git/info/sparse-checkout“) " +"да съдържа само файловете в основната директория" + +#: builtin/clone.c:287 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -11439,43 +11984,43 @@ msgstr "" "Името на директорията не може да бъде отгатнато.\n" "Задайте директорията изрично на командния ред" -#: builtin/clone.c:337 +#: builtin/clone.c:340 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "" "ПРЕДУПРЕЖДЕНИЕ: не може да се добави алтернативен източник на „%s“: %s\n" -#: builtin/clone.c:410 +#: builtin/clone.c:413 #, c-format msgid "%s exists and is not a directory" msgstr "„%s“ съществува и не е директория" -#: builtin/clone.c:427 +#: builtin/clone.c:430 #, c-format msgid "failed to start iterator over '%s'" msgstr "неуспешно итериране по „%s“" -#: builtin/clone.c:457 +#: builtin/clone.c:460 #, c-format msgid "failed to create link '%s'" msgstr "връзката „%s“ не може да бъде създадена" -#: builtin/clone.c:461 +#: builtin/clone.c:464 #, c-format msgid "failed to copy file to '%s'" msgstr "файлът не може да бъде копиран като „%s“" -#: builtin/clone.c:466 +#: builtin/clone.c:469 #, c-format msgid "failed to iterate over '%s'" msgstr "неуспешно итериране по „%s“" -#: builtin/clone.c:491 +#: builtin/clone.c:494 #, c-format msgid "done.\n" msgstr "действието завърши.\n" -#: builtin/clone.c:505 +#: builtin/clone.c:508 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -11488,99 +12033,103 @@ msgstr "" "\n" " git restore --source=HEAD :/\n" -#: builtin/clone.c:582 +#: builtin/clone.c:585 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" "Клонът „%s“ от отдалеченото хранилище, което клонирате,\n" "и който следва да бъде изтеглен, не съществува." -#: builtin/clone.c:701 +#: builtin/clone.c:704 #, c-format msgid "unable to update %s" msgstr "обектът „%s“ не може да бъде обновен" -#: builtin/clone.c:751 +#: builtin/clone.c:752 +msgid "failed to initialize sparse-checkout" +msgstr "частичното изтегляне не може да се инициализира" + +#: builtin/clone.c:775 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "указателят „HEAD“ от отдалеченото хранилище сочи към нещо,\n" "което не съществува. Не може да се изтегли определен клон.\n" -#: builtin/clone.c:782 +#: builtin/clone.c:806 msgid "unable to checkout working tree" msgstr "работното дърво не може да бъде подготвено" -#: builtin/clone.c:832 +#: builtin/clone.c:856 msgid "unable to write parameters to config file" msgstr "настройките не могат да бъдат записани в конфигурационния файл" -#: builtin/clone.c:895 +#: builtin/clone.c:919 msgid "cannot repack to clean up" msgstr "не може да се извърши пакетиране за изчистване на файловете" -#: builtin/clone.c:897 +#: builtin/clone.c:921 msgid "cannot unlink temporary alternates file" msgstr "временният файл за алтернативни обекти не може да бъде изтрит" -#: builtin/clone.c:937 builtin/receive-pack.c:1948 +#: builtin/clone.c:959 builtin/receive-pack.c:1948 msgid "Too many arguments." msgstr "Прекалено много аргументи." -#: builtin/clone.c:941 +#: builtin/clone.c:963 msgid "You must specify a repository to clone." msgstr "Трябва да укажете кое хранилище искате да клонирате." -#: builtin/clone.c:954 +#: builtin/clone.c:976 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "опциите „--bare“ и „--origin %s“ са несъвместими." -#: builtin/clone.c:957 +#: builtin/clone.c:979 msgid "--bare and --separate-git-dir are incompatible." msgstr "опциите „--bare“ и „--separate-git-dir“ са несъвместими." -#: builtin/clone.c:970 +#: builtin/clone.c:992 #, c-format msgid "repository '%s' does not exist" msgstr "не съществува хранилище „%s“" -#: builtin/clone.c:976 builtin/fetch.c:1790 +#: builtin/clone.c:998 builtin/fetch.c:1787 #, c-format msgid "depth %s is not a positive number" msgstr "дълбочината трябва да е положително цяло число, а не „%s“" -#: builtin/clone.c:986 +#: builtin/clone.c:1008 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "целевият път „%s“ съществува и не е празна директория." -#: builtin/clone.c:996 +#: builtin/clone.c:1018 #, c-format msgid "working tree '%s' already exists." msgstr "в „%s“ вече съществува работно дърво." -#: builtin/clone.c:1011 builtin/clone.c:1032 builtin/difftool.c:271 -#: builtin/log.c:1785 builtin/worktree.c:302 builtin/worktree.c:334 +#: builtin/clone.c:1033 builtin/clone.c:1054 builtin/difftool.c:271 +#: builtin/log.c:1866 builtin/worktree.c:302 builtin/worktree.c:334 #, c-format msgid "could not create leading directories of '%s'" msgstr "родителските директории на „%s“ не могат да бъдат създадени" -#: builtin/clone.c:1016 +#: builtin/clone.c:1038 #, c-format msgid "could not create work tree dir '%s'" msgstr "работното дърво в „%s“ не може да бъде създадено." -#: builtin/clone.c:1036 +#: builtin/clone.c:1058 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Клониране и създаване на голо хранилище в „%s“…\n" -#: builtin/clone.c:1038 +#: builtin/clone.c:1060 #, c-format msgid "Cloning into '%s'...\n" msgstr "Клониране и създаване на хранилище в „%s“…\n" -#: builtin/clone.c:1062 +#: builtin/clone.c:1084 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -11588,44 +12137,44 @@ msgstr "" "Опцията „--recursive“ е несъвместима с опциите „--reference“ и „--reference-" "if-able“" -#: builtin/clone.c:1123 +#: builtin/clone.c:1148 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" "При локално клониране опцията „--depth“ се прескача. Ползвайте схемата " "„file://“." -#: builtin/clone.c:1125 +#: builtin/clone.c:1150 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" "При локално клониране опцията „--shallow-since“ се прескача. Ползвайте " "схемата „file://“." -#: builtin/clone.c:1127 +#: builtin/clone.c:1152 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" "При локално клониране опцията „--shallow-exclude“ се прескача. Ползвайте " "схемата „file://“." -#: builtin/clone.c:1129 +#: builtin/clone.c:1154 msgid "--filter is ignored in local clones; use file:// instead." msgstr "" "При локално клониране опцията „--filter“ се прескача. Ползвайте схемата " "„file://“." -#: builtin/clone.c:1132 +#: builtin/clone.c:1157 msgid "source repository is shallow, ignoring --local" msgstr "клонираното хранилище е плитко, затова опцията „--local“ се прескача" -#: builtin/clone.c:1137 +#: builtin/clone.c:1162 msgid "--local is ignored" msgstr "опцията „--local“ се прескача" -#: builtin/clone.c:1212 builtin/clone.c:1220 +#: builtin/clone.c:1237 builtin/clone.c:1245 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Отдалеченият клон „%s“ липсва в клонираното хранилище „%s“" -#: builtin/clone.c:1223 +#: builtin/clone.c:1248 msgid "You appear to have cloned an empty repository." msgstr "Изглежда клонирахте празно хранилище." @@ -11674,7 +12223,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "прескачане на повтарящ се родител: „%s“" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526 #, c-format msgid "not a valid object name %s" msgstr "неправилно име на обект: „%s“" @@ -11702,13 +12251,13 @@ msgstr "родител" msgid "id of a parent commit object" msgstr "ИДЕНТИФИКАТОР на обекта за подаването-родител" -#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270 +#: builtin/commit-tree.c:114 builtin/commit.c:1496 builtin/merge.c:270 #: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1469 #: builtin/tag.c:412 msgid "message" msgstr "СЪОБЩЕНИЕ" -#: builtin/commit-tree.c:115 builtin/commit.c:1500 +#: builtin/commit-tree.c:115 builtin/commit.c:1496 msgid "commit message" msgstr "СЪОБЩЕНИЕ при подаване" @@ -11716,7 +12265,7 @@ msgstr "СЪОБЩЕНИЕ при подаване" msgid "read commit log message from file" msgstr "изчитане на съобщението за подаване от ФАЙЛ" -#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287 +#: builtin/commit-tree.c:121 builtin/commit.c:1508 builtin/merge.c:287 #: builtin/pull.c:195 builtin/revert.c:118 msgid "GPG sign commit" msgstr "подписване на подаването с GPG" @@ -11797,57 +12346,65 @@ msgstr "" msgid "failed to unpack HEAD tree object" msgstr "върховото дърво (HEAD tree object) не може да бъде извадено от пакет" -#: builtin/commit.c:356 +#: builtin/commit.c:351 +msgid "--pathspec-from-file with -a does not make sense" +msgstr "опциите „-a“ и „--pathspec-from-file“ са несъвместими" + +#: builtin/commit.c:364 +msgid "No paths with --include/--only does not make sense." +msgstr "Опциите „--include“ и „--only“ изискват аргументи." + +#: builtin/commit.c:376 msgid "unable to create temporary index" msgstr "временният индекс не може да бъде създаден" -#: builtin/commit.c:362 +#: builtin/commit.c:382 msgid "interactive add failed" msgstr "неуспешно интерактивно добавяне" -#: builtin/commit.c:376 +#: builtin/commit.c:396 msgid "unable to update temporary index" msgstr "временният индекс не може да бъде обновен" -#: builtin/commit.c:378 +#: builtin/commit.c:398 msgid "Failed to update main cache tree" msgstr "Дървото на основния кеш не може да бъде обновено" -#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472 +#: builtin/commit.c:423 builtin/commit.c:446 builtin/commit.c:492 msgid "unable to write new_index file" msgstr "новият индекс не може да бъде записан" -#: builtin/commit.c:455 +#: builtin/commit.c:475 msgid "cannot do a partial commit during a merge." msgstr "по време на сливане не може да се извърши частично подаване." -#: builtin/commit.c:457 +#: builtin/commit.c:477 msgid "cannot do a partial commit during a cherry-pick." msgstr "по време на отбиране не може да се извърши частично подаване." -#: builtin/commit.c:465 +#: builtin/commit.c:485 msgid "cannot read the index" msgstr "индексът не може да бъде прочетен" -#: builtin/commit.c:484 +#: builtin/commit.c:504 msgid "unable to write temporary index file" msgstr "временният индекс не може да бъде записан" -#: builtin/commit.c:582 +#: builtin/commit.c:602 #, c-format msgid "commit '%s' lacks author header" msgstr "заглавната част за автор в подаването „%s“ липсва" -#: builtin/commit.c:584 +#: builtin/commit.c:604 #, c-format msgid "commit '%s' has malformed author line" msgstr "заглавната част за автор в подаването „%s“ е неправилна" -#: builtin/commit.c:603 +#: builtin/commit.c:623 msgid "malformed --author parameter" msgstr "неправилен параметър към опцията „--author“" -#: builtin/commit.c:656 +#: builtin/commit.c:676 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -11855,38 +12412,38 @@ msgstr "" "не може да се избере знак за коментар — в текущото съобщение за подаване са " "използвани всички подобни знаци" -#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072 +#: builtin/commit.c:714 builtin/commit.c:747 builtin/commit.c:1092 #, c-format msgid "could not lookup commit %s" msgstr "следното подаване не може да бъде открито: %s" -#: builtin/commit.c:706 builtin/shortlog.c:319 +#: builtin/commit.c:726 builtin/shortlog.c:319 #, c-format msgid "(reading log message from standard input)\n" msgstr "(изчитане на съобщението за подаване от стандартния вход)\n" -#: builtin/commit.c:708 +#: builtin/commit.c:728 msgid "could not read log from standard input" msgstr "съобщението за подаване не бе прочетено стандартния вход" -#: builtin/commit.c:712 +#: builtin/commit.c:732 #, c-format msgid "could not read log file '%s'" msgstr "файлът със съобщението за подаване „%s“ не може да бъде прочетен" -#: builtin/commit.c:743 builtin/commit.c:759 +#: builtin/commit.c:763 builtin/commit.c:779 msgid "could not read SQUASH_MSG" msgstr "съобщението за вкарване SQUASH_MSG не може да бъде прочетено" -#: builtin/commit.c:750 +#: builtin/commit.c:770 msgid "could not read MERGE_MSG" msgstr "съобщението за сливане MERGE_MSG не може да бъде прочетено" -#: builtin/commit.c:810 +#: builtin/commit.c:830 msgid "could not write commit template" msgstr "шаблонът за подаване не може да бъде запазен" -#: builtin/commit.c:829 +#: builtin/commit.c:849 #, c-format msgid "" "\n" @@ -11901,7 +12458,7 @@ msgstr "" " %s\n" "и опитайте отново.\n" -#: builtin/commit.c:834 +#: builtin/commit.c:854 #, c-format msgid "" "\n" @@ -11917,7 +12474,7 @@ msgstr "" " %s\n" "и опитайте отново.\n" -#: builtin/commit.c:847 +#: builtin/commit.c:867 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -11926,7 +12483,7 @@ msgstr "" "Въведете съобщението за подаване на промените. Редовете, които започват\n" "с „%c“, ще бъдат пропуснати, а празно съобщение преустановява подаването.\n" -#: builtin/commit.c:855 +#: builtin/commit.c:875 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -11937,151 +12494,147 @@ msgstr "" "с „%c“, също ще бъдат включени — може да ги изтриете вие. Празно \n" "съобщение преустановява подаването.\n" -#: builtin/commit.c:872 +#: builtin/commit.c:892 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sАвтор: %.*s <%.*s>" -#: builtin/commit.c:880 +#: builtin/commit.c:900 #, c-format msgid "%sDate: %s" msgstr "%sДата: %s" -#: builtin/commit.c:887 +#: builtin/commit.c:907 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sПодаващ: %.*s <%.*s>" -#: builtin/commit.c:905 +#: builtin/commit.c:925 msgid "Cannot read index" msgstr "Индексът не може да бъде прочетен" -#: builtin/commit.c:972 +#: builtin/commit.c:992 msgid "Error building trees" msgstr "Грешка при изграждане на дърветата" -#: builtin/commit.c:986 builtin/tag.c:275 +#: builtin/commit.c:1006 builtin/tag.c:275 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Подайте съобщението с някоя от опциите „-m“ или „-F“.\n" -#: builtin/commit.c:1030 +#: builtin/commit.c:1050 #, c-format msgid "--author '%s' is not 'Name ' and matches no existing author" msgstr "" "Опцията „--author '%s'“ не отговаря на форма̀та „Име <е-поща>“ и не съвпада с " "никой автор" -#: builtin/commit.c:1044 +#: builtin/commit.c:1064 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Неправилен режим за игнорираните файлове: „%s“" -#: builtin/commit.c:1062 builtin/commit.c:1304 +#: builtin/commit.c:1082 builtin/commit.c:1322 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Неправилен режим за неследените файлове: „%s“" -#: builtin/commit.c:1102 +#: builtin/commit.c:1122 msgid "--long and -z are incompatible" msgstr "Опциите „--long“ и „-z“ са несъвместими." -#: builtin/commit.c:1146 +#: builtin/commit.c:1166 msgid "Using both --reset-author and --author does not make sense" msgstr "Опциите „--reset-author“ и „--author“ са несъвместими." -#: builtin/commit.c:1155 +#: builtin/commit.c:1175 msgid "You have nothing to amend." msgstr "Няма какво да бъде поправено." -#: builtin/commit.c:1158 +#: builtin/commit.c:1178 msgid "You are in the middle of a merge -- cannot amend." msgstr "В момента се извършва сливане, не можете да поправяте." -#: builtin/commit.c:1160 +#: builtin/commit.c:1180 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "В момента се извършва отбиране на подаване, не можете да поправяте." -#: builtin/commit.c:1163 +#: builtin/commit.c:1183 msgid "Options --squash and --fixup cannot be used together" msgstr "Опциите „--squash“ и „--fixup“ са несъвместими." -#: builtin/commit.c:1173 +#: builtin/commit.c:1193 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Опциите „-c“, „-C“, „-F“ и „--fixup““ са несъвместими." -#: builtin/commit.c:1175 +#: builtin/commit.c:1195 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "Опцията „-m“ е несъвместима с „-c“, „-C“ и „-F“." -#: builtin/commit.c:1183 +#: builtin/commit.c:1203 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" "Опцията „--reset-author“ може да се използва само заедно с „-C“, „-c“ или\n" "„--amend“." -#: builtin/commit.c:1200 +#: builtin/commit.c:1220 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Опциите „--include“, „--only“, „--all“, „--interactive“ и „--patch“ са\n" "несъвместими." -#: builtin/commit.c:1202 -msgid "No paths with --include/--only does not make sense." -msgstr "Опциите „--include“ и „--only“ изискват аргументи." - -#: builtin/commit.c:1208 +#: builtin/commit.c:1226 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "опцията „-a“ е несъвместима със задаването на пътища: „%s…“" -#: builtin/commit.c:1339 builtin/commit.c:1523 +#: builtin/commit.c:1357 builtin/commit.c:1519 msgid "show status concisely" msgstr "кратка информация за състоянието" -#: builtin/commit.c:1341 builtin/commit.c:1525 +#: builtin/commit.c:1359 builtin/commit.c:1521 msgid "show branch information" msgstr "информация за клоните" -#: builtin/commit.c:1343 +#: builtin/commit.c:1361 msgid "show stash information" msgstr "информация за скатаното" -#: builtin/commit.c:1345 builtin/commit.c:1527 +#: builtin/commit.c:1363 builtin/commit.c:1523 msgid "compute full ahead/behind values" msgstr "изчисляване на точните стойности напред/назад" -#: builtin/commit.c:1347 +#: builtin/commit.c:1365 msgid "version" msgstr "версия" -#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:548 +#: builtin/commit.c:1365 builtin/commit.c:1525 builtin/push.c:549 #: builtin/worktree.c:650 msgid "machine-readable output" msgstr "формат на изхода за четене от програма" -#: builtin/commit.c:1350 builtin/commit.c:1531 +#: builtin/commit.c:1368 builtin/commit.c:1527 msgid "show status in long format (default)" msgstr "подробна информация за състоянието (стандартно)" -#: builtin/commit.c:1353 builtin/commit.c:1534 +#: builtin/commit.c:1371 builtin/commit.c:1530 msgid "terminate entries with NUL" msgstr "разделяне на елементите с нулевия знак „NUL“" -#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537 +#: builtin/commit.c:1373 builtin/commit.c:1377 builtin/commit.c:1533 #: builtin/fast-export.c:1153 builtin/fast-export.c:1156 -#: builtin/fast-export.c:1159 builtin/rebase.c:1495 parse-options.h:332 +#: builtin/fast-export.c:1159 builtin/rebase.c:1525 parse-options.h:336 msgid "mode" msgstr "РЕЖИМ" -#: builtin/commit.c:1356 builtin/commit.c:1537 +#: builtin/commit.c:1374 builtin/commit.c:1533 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "извеждане на неследените файлове. Възможните РЕЖИМи са „all“ (подробна " "информация), „normal“ (кратка информация), „no“ (без неследените файлове). " "Стандартният РЕЖИМ е: „all“." -#: builtin/commit.c:1360 +#: builtin/commit.c:1378 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -12090,11 +12643,11 @@ msgstr "" "„traditional“ (традиционен), „matching“ (напасващи), „no“ (без игнорираните " "файлове). Стандартният РЕЖИМ е: „traditional“." -#: builtin/commit.c:1362 parse-options.h:188 +#: builtin/commit.c:1380 parse-options.h:192 msgid "when" msgstr "КОГА" -#: builtin/commit.c:1363 +#: builtin/commit.c:1381 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -12103,176 +12656,176 @@ msgstr "" "една от „all“ (всички), „dirty“ (тези с неподадени промени), " "„untracked“ (неследени)" -#: builtin/commit.c:1365 +#: builtin/commit.c:1383 msgid "list untracked files in columns" msgstr "извеждане на неследените файлове в колони" -#: builtin/commit.c:1366 +#: builtin/commit.c:1384 msgid "do not detect renames" msgstr "без засичане на преименуванията" -#: builtin/commit.c:1368 +#: builtin/commit.c:1386 msgid "detect renames, optionally set similarity index" msgstr "засичане на преименуванията, може да се зададе коефициент на прилика" -#: builtin/commit.c:1388 +#: builtin/commit.c:1406 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "Неподдържана комбинация от аргументи за игнорирани и неследени файлове" -#: builtin/commit.c:1493 +#: builtin/commit.c:1489 msgid "suppress summary after successful commit" msgstr "без информация след успешно подаване" -#: builtin/commit.c:1494 +#: builtin/commit.c:1490 msgid "show diff in commit message template" msgstr "добавяне на разликата към шаблона за съобщението при подаване" -#: builtin/commit.c:1496 +#: builtin/commit.c:1492 msgid "Commit message options" msgstr "Опции за съобщението при подаване" -#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414 +#: builtin/commit.c:1493 builtin/merge.c:274 builtin/tag.c:414 msgid "read message from file" msgstr "взимане на съобщението от ФАЙЛ" -#: builtin/commit.c:1498 +#: builtin/commit.c:1494 msgid "author" msgstr "АВТОР" -#: builtin/commit.c:1498 +#: builtin/commit.c:1494 msgid "override author for commit" msgstr "задаване на АВТОР за подаването" -#: builtin/commit.c:1499 builtin/gc.c:538 +#: builtin/commit.c:1495 builtin/gc.c:538 msgid "date" msgstr "ДАТА" -#: builtin/commit.c:1499 +#: builtin/commit.c:1495 msgid "override date for commit" msgstr "задаване на ДАТА за подаването" -#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503 -#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92 +#: builtin/commit.c:1497 builtin/commit.c:1498 builtin/commit.c:1499 +#: builtin/commit.c:1500 parse-options.h:328 ref-filter.h:92 msgid "commit" msgstr "ПОДАВАНЕ" -#: builtin/commit.c:1501 +#: builtin/commit.c:1497 msgid "reuse and edit message from specified commit" msgstr "преизползване и редактиране на съобщението от указаното ПОДАВАНЕ" -#: builtin/commit.c:1502 +#: builtin/commit.c:1498 msgid "reuse message from specified commit" msgstr "преизползване на съобщението от указаното ПОДАВАНЕ" -#: builtin/commit.c:1503 +#: builtin/commit.c:1499 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "използване на автоматичното съобщение за вкарване на указаното ПОДАВАНЕ в " "предходното без следа" -#: builtin/commit.c:1504 +#: builtin/commit.c:1500 msgid "use autosquash formatted message to squash specified commit" msgstr "" "използване на автоматичното съобщение за вкарване на указаното ПОДАВАНЕ в " "предното" -#: builtin/commit.c:1505 +#: builtin/commit.c:1501 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" "смяна на автора да съвпада с подаващия (използва се с „-C“/„-c“/„--amend“)" -#: builtin/commit.c:1506 builtin/log.c:1565 builtin/merge.c:289 +#: builtin/commit.c:1502 builtin/log.c:1634 builtin/merge.c:289 #: builtin/pull.c:164 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "добавяне на поле за подпис — „Signed-off-by:“" -#: builtin/commit.c:1507 +#: builtin/commit.c:1503 msgid "use specified template file" msgstr "използване на указания шаблонен ФАЙЛ" -#: builtin/commit.c:1508 +#: builtin/commit.c:1504 msgid "force edit of commit" msgstr "редактиране на подаване" -#: builtin/commit.c:1510 +#: builtin/commit.c:1506 msgid "include status in commit message template" msgstr "вмъкване на състоянието в шаблона за съобщението при подаване" -#: builtin/commit.c:1515 +#: builtin/commit.c:1511 msgid "Commit contents options" msgstr "Опции за избор на файлове при подаване" -#: builtin/commit.c:1516 +#: builtin/commit.c:1512 msgid "commit all changed files" msgstr "подаване на всички променени файлове" -#: builtin/commit.c:1517 +#: builtin/commit.c:1513 msgid "add specified files to index for commit" msgstr "добавяне на указаните файлове към индекса за подаване" -#: builtin/commit.c:1518 +#: builtin/commit.c:1514 msgid "interactively add files" msgstr "интерактивно добавяне на файлове" -#: builtin/commit.c:1519 +#: builtin/commit.c:1515 msgid "interactively add changes" msgstr "интерактивно добавяне на промени" -#: builtin/commit.c:1520 +#: builtin/commit.c:1516 msgid "commit only specified files" msgstr "подаване само на указаните файлове" -#: builtin/commit.c:1521 +#: builtin/commit.c:1517 msgid "bypass pre-commit and commit-msg hooks" msgstr "" "без изпълнение на куките преди подаване и при промяна на съобщението за " "подаване (pre-commit и commit-msg)" -#: builtin/commit.c:1522 +#: builtin/commit.c:1518 msgid "show what would be committed" msgstr "отпечатване на това, което би било подадено" -#: builtin/commit.c:1535 +#: builtin/commit.c:1531 msgid "amend previous commit" msgstr "поправяне на предишното подаване" -#: builtin/commit.c:1536 +#: builtin/commit.c:1532 msgid "bypass post-rewrite hook" msgstr "без изпълнение на куката след презаписване (post-rewrite)" -#: builtin/commit.c:1541 +#: builtin/commit.c:1539 msgid "ok to record an empty change" msgstr "позволяване на празни подавания" -#: builtin/commit.c:1543 +#: builtin/commit.c:1541 msgid "ok to record a change with an empty message" msgstr "позволяване на подавания с празни съобщения" -#: builtin/commit.c:1616 +#: builtin/commit.c:1614 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Повреден файл за върха за сливането „MERGE_HEAD“ (%s)" -#: builtin/commit.c:1623 +#: builtin/commit.c:1621 msgid "could not read MERGE_MODE" msgstr "режимът на сливане „MERGE_MODE“ не може да бъде прочетен" -#: builtin/commit.c:1642 +#: builtin/commit.c:1640 #, c-format msgid "could not read commit message: %s" msgstr "съобщението за подаване не може да бъде прочетено: %s" -#: builtin/commit.c:1649 +#: builtin/commit.c:1647 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Неизвършване на подаване поради празно съобщение.\n" -#: builtin/commit.c:1654 +#: builtin/commit.c:1652 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Неизвършване на подаване поради нередактирано съобщение.\n" -#: builtin/commit.c:1688 +#: builtin/commit.c:1686 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -12284,22 +12837,14 @@ msgstr "" "\n" " git restore --staged :/" -#: builtin/commit-graph.c:11 -msgid "git commit-graph [--object-dir ]" -msgstr "git commit-graph [--object-dir ДИР_ОБЕКТИ]" - -#: builtin/commit-graph.c:12 builtin/commit-graph.c:24 -msgid "git commit-graph read [--object-dir ]" -msgstr "git commit-graph read [--object-dir ДИР_ОБЕКТИ]" - -#: builtin/commit-graph.c:13 builtin/commit-graph.c:19 +#: builtin/commit-graph.c:11 builtin/commit-graph.c:17 msgid "" "git commit-graph verify [--object-dir ] [--shallow] [--[no-]progress]" msgstr "" "git commit-graph verify [--object-dir ДИР_ОБЕКТИ] [--shallow] [--" "[no-]progress]" -#: builtin/commit-graph.c:14 builtin/commit-graph.c:29 +#: builtin/commit-graph.c:12 builtin/commit-graph.c:22 msgid "" "git commit-graph write [--object-dir ] [--append|--split] [--" "reachable|--stdin-packs|--stdin-commits] [--[no-]progress] " @@ -12307,60 +12852,59 @@ msgstr "" "git commit-graph write [--object-dir ДИР_ОБЕКТИ] [--append|--split] [--" "reachable|--stdin-packs|--stdin-commits] [--[no-]progress] ОПЦИИ_ЗА_РАЗДЕЛЯНЕ" -#: builtin/commit-graph.c:55 builtin/commit-graph.c:107 -#: builtin/commit-graph.c:170 builtin/commit-graph.c:254 builtin/fetch.c:178 -#: builtin/log.c:1585 +#: builtin/commit-graph.c:48 builtin/commit-graph.c:103 +#: builtin/commit-graph.c:187 builtin/fetch.c:179 builtin/log.c:1657 msgid "dir" msgstr "директория" -#: builtin/commit-graph.c:56 builtin/commit-graph.c:108 -#: builtin/commit-graph.c:171 builtin/commit-graph.c:255 +#: builtin/commit-graph.c:49 builtin/commit-graph.c:104 +#: builtin/commit-graph.c:188 msgid "The object directory to store the graph" msgstr "ДИРекторията_с_ОБЕКТИ за запазване на гра̀фа" -#: builtin/commit-graph.c:58 +#: builtin/commit-graph.c:51 msgid "if the commit-graph is split, only verify the tip file" msgstr "" "ако гра̀фа с подаванията е раздробен, да се проверява само файлът на върха" -#: builtin/commit-graph.c:80 builtin/commit-graph.c:125 +#: builtin/commit-graph.c:73 t/helper/test-read-graph.c:23 #, c-format msgid "Could not open commit-graph '%s'" msgstr "Графът с подаванията не може да се отвори: „%s“" -#: builtin/commit-graph.c:173 +#: builtin/commit-graph.c:106 msgid "start walk at all refs" msgstr "обхождането да започне от всички указатели" -#: builtin/commit-graph.c:175 +#: builtin/commit-graph.c:108 msgid "scan pack-indexes listed by stdin for commits" msgstr "" "проверка на подаванията за индексите на пакетите изброени на командния ред" -#: builtin/commit-graph.c:177 +#: builtin/commit-graph.c:110 msgid "start walk at commits listed by stdin" msgstr "започване на обхождането при подаванията подадени на стандартния вход" -#: builtin/commit-graph.c:179 +#: builtin/commit-graph.c:112 msgid "include all commits already in the commit-graph file" msgstr "" "включване на всички подавания, които вече са във файла с гра̀фа на подаванията" -#: builtin/commit-graph.c:182 +#: builtin/commit-graph.c:115 msgid "allow writing an incremental commit-graph file" msgstr "позволяване на запис на нарастващ файл с гра̀фа на подаванията" -#: builtin/commit-graph.c:184 builtin/commit-graph.c:188 +#: builtin/commit-graph.c:117 builtin/commit-graph.c:121 msgid "maximum number of commits in a non-base split commit-graph" msgstr "максимален брой подавания в небазово ниво на раздробен граф" -#: builtin/commit-graph.c:186 +#: builtin/commit-graph.c:119 msgid "maximum ratio between two levels of a split commit-graph" msgstr "" "максимално отношение на броя подавания в две последователни нива в раздробен " "граф" -#: builtin/commit-graph.c:204 +#: builtin/commit-graph.c:137 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "" "опциите „--reachable“, „--stdin-commits“ и „--stdin-packs“ са несъвместими" @@ -12825,7 +13369,7 @@ msgstr "да се търси само измежду етикетите напа msgid "do not consider tags matching " msgstr "да не се търси измежду етикетите напасващи този ШАБЛОН" -#: builtin/describe.c:553 builtin/name-rev.c:426 +#: builtin/describe.c:553 builtin/name-rev.c:473 msgid "show abbreviated commit object as fallback" msgstr "извеждане на съкратено име на обект като резервен вариант" @@ -13089,7 +13633,7 @@ msgstr "Използване на маркер за завършване на п msgid "Skip output of blob data" msgstr "Без извеждане на съдържанието на обектите-BLOB" -#: builtin/fast-export.c:1177 builtin/log.c:1633 +#: builtin/fast-export.c:1177 builtin/log.c:1705 msgid "refspec" msgstr "УКАЗАТЕЛ_НА_ВЕРСИЯ" @@ -13135,89 +13679,89 @@ msgstr "git fetch --multiple [ОПЦИЯ…] [(ХРАНИЛИЩЕ | ГРУПА) msgid "git fetch --all []" msgstr "git fetch --all [ОПЦИЯ…]" -#: builtin/fetch.c:115 +#: builtin/fetch.c:116 msgid "fetch.parallel cannot be negative" msgstr "опцията „fetch.parallel“ трябва да е неотрицателна" -#: builtin/fetch.c:138 builtin/pull.c:204 +#: builtin/fetch.c:139 builtin/pull.c:204 msgid "fetch from all remotes" msgstr "доставяне от всички отдалечени хранилища" -#: builtin/fetch.c:140 builtin/pull.c:248 +#: builtin/fetch.c:141 builtin/pull.c:248 msgid "set upstream for git pull/fetch" msgstr "задаване на клон за следене за издърпване/доставяне" -#: builtin/fetch.c:142 builtin/pull.c:207 +#: builtin/fetch.c:143 builtin/pull.c:207 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "добавяне към „.git/FETCH_HEAD“ вместо замяна" -#: builtin/fetch.c:144 builtin/pull.c:210 +#: builtin/fetch.c:145 builtin/pull.c:210 msgid "path to upload pack on remote end" msgstr "отдалечен път, където да се качи пакетът" -#: builtin/fetch.c:145 +#: builtin/fetch.c:146 msgid "force overwrite of local reference" msgstr "принудително презаписване на локален указател" -#: builtin/fetch.c:147 +#: builtin/fetch.c:148 msgid "fetch from multiple remotes" msgstr "доставяне от множество отдалечени хранилища" -#: builtin/fetch.c:149 builtin/pull.c:214 +#: builtin/fetch.c:150 builtin/pull.c:214 msgid "fetch all tags and associated objects" msgstr "доставяне на всички етикети и принадлежащи обекти" -#: builtin/fetch.c:151 +#: builtin/fetch.c:152 msgid "do not fetch all tags (--no-tags)" msgstr "без доставянето на всички етикети „--no-tags“" -#: builtin/fetch.c:153 +#: builtin/fetch.c:154 msgid "number of submodules fetched in parallel" msgstr "брой подмодули доставени паралелно" -#: builtin/fetch.c:155 builtin/pull.c:217 +#: builtin/fetch.c:156 builtin/pull.c:217 msgid "prune remote-tracking branches no longer on remote" msgstr "окастряне на клоните следящи вече несъществуващи отдалечени клони" -#: builtin/fetch.c:157 +#: builtin/fetch.c:158 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" "окастряне на локалните етикети, които вече не съществуват в отдалеченото " "хранилище и презаписване на променените" -#: builtin/fetch.c:158 builtin/fetch.c:181 builtin/pull.c:141 +#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:141 msgid "on-demand" msgstr "ПРИ НУЖДА" -#: builtin/fetch.c:159 +#: builtin/fetch.c:160 msgid "control recursive fetching of submodules" msgstr "управление на рекурсивното доставяне на подмодулите" -#: builtin/fetch.c:163 builtin/pull.c:225 +#: builtin/fetch.c:164 builtin/pull.c:225 msgid "keep downloaded pack" msgstr "запазване на изтеглените пакети с обекти" -#: builtin/fetch.c:165 +#: builtin/fetch.c:166 msgid "allow updating of HEAD ref" msgstr "позволяване на обновяването на указателя „HEAD“" -#: builtin/fetch.c:168 builtin/fetch.c:174 builtin/pull.c:228 +#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:228 msgid "deepen history of shallow clone" msgstr "задълбочаване на историята на плитко хранилище" -#: builtin/fetch.c:170 +#: builtin/fetch.c:171 msgid "deepen history of shallow repository based on time" msgstr "задълбочаване на историята на плитко хранилище до определено време" -#: builtin/fetch.c:176 builtin/pull.c:231 +#: builtin/fetch.c:177 builtin/pull.c:231 msgid "convert to a complete repository" msgstr "превръщане в пълно хранилище" -#: builtin/fetch.c:179 +#: builtin/fetch.c:180 msgid "prepend this to submodule path output" msgstr "добавяне на това пред пътя на подмодула" -#: builtin/fetch.c:182 +#: builtin/fetch.c:183 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -13225,90 +13769,94 @@ msgstr "" "стандартно рекурсивно изтегляне на подмодулите (файловете с настройки са с " "приоритет)" -#: builtin/fetch.c:186 builtin/pull.c:234 +#: builtin/fetch.c:187 builtin/pull.c:234 msgid "accept refs that update .git/shallow" msgstr "приемане на указатели, които обновяват „.git/shallow“" -#: builtin/fetch.c:187 builtin/pull.c:236 +#: builtin/fetch.c:188 builtin/pull.c:236 msgid "refmap" msgstr "КАРТА_С_УКАЗАТЕЛИ" -#: builtin/fetch.c:188 builtin/pull.c:237 +#: builtin/fetch.c:189 builtin/pull.c:237 msgid "specify fetch refmap" msgstr "указване на КАРТАта_С_УКАЗАТЕЛИ за доставяне" -#: builtin/fetch.c:195 +#: builtin/fetch.c:196 msgid "report that we have only objects reachable from this object" msgstr "докладване, че всички обекти могат са достижими при започване от този" -#: builtin/fetch.c:198 +#: builtin/fetch.c:199 msgid "run 'gc --auto' after fetching" msgstr "изпълняване на „gc --auto“ след доставяне" -#: builtin/fetch.c:200 builtin/pull.c:246 +#: builtin/fetch.c:201 builtin/pull.c:246 msgid "check for forced-updates on all updated branches" msgstr "проверка за принудителни обновявания на всички клони" -#: builtin/fetch.c:510 +#: builtin/fetch.c:203 +msgid "write the commit-graph after fetching" +msgstr "запазване на гра̀фа с подаванията след доставяне" + +#: builtin/fetch.c:513 msgid "Couldn't find remote ref HEAD" msgstr "Указателят „HEAD“ в отдалеченото хранилище не може да бъде открит" -#: builtin/fetch.c:650 +#: builtin/fetch.c:653 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "настройката „fetch.output“ е с неправилна стойност „%s“" -#: builtin/fetch.c:748 +#: builtin/fetch.c:751 #, c-format msgid "object %s not found" msgstr "обектът „%s“ липсва" -#: builtin/fetch.c:752 +#: builtin/fetch.c:755 msgid "[up to date]" msgstr "[актуализиран]" -#: builtin/fetch.c:765 builtin/fetch.c:781 builtin/fetch.c:853 +#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856 msgid "[rejected]" msgstr "[отхвърлен]" -#: builtin/fetch.c:766 +#: builtin/fetch.c:769 msgid "can't fetch in current branch" msgstr "в текущия клон не може да се доставя" -#: builtin/fetch.c:776 +#: builtin/fetch.c:779 msgid "[tag update]" msgstr "[обновяване на етикетите]" -#: builtin/fetch.c:777 builtin/fetch.c:814 builtin/fetch.c:836 -#: builtin/fetch.c:848 +#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839 +#: builtin/fetch.c:851 msgid "unable to update local ref" msgstr "локален указател не може да бъде обновен" -#: builtin/fetch.c:781 +#: builtin/fetch.c:784 msgid "would clobber existing tag" msgstr "съществуващ етикет ще бъде презаписан" -#: builtin/fetch.c:803 +#: builtin/fetch.c:806 msgid "[new tag]" msgstr "[нов етикет]" -#: builtin/fetch.c:806 +#: builtin/fetch.c:809 msgid "[new branch]" msgstr "[нов клон]" -#: builtin/fetch.c:809 +#: builtin/fetch.c:812 msgid "[new ref]" msgstr "[нов указател]" -#: builtin/fetch.c:848 +#: builtin/fetch.c:851 msgid "forced update" msgstr "принудително обновяване" -#: builtin/fetch.c:853 +#: builtin/fetch.c:856 msgid "non-fast-forward" msgstr "същинско сливане" -#: builtin/fetch.c:874 +#: builtin/fetch.c:877 msgid "" "Fetch normally indicates which branches had a forced update,\n" "but that check has been disabled. To re-enable, use '--show-forced-updates'\n" @@ -13319,7 +13867,7 @@ msgstr "" "\n" " git config fetch.showForcedUpdates true" -#: builtin/fetch.c:878 +#: builtin/fetch.c:881 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -13328,29 +13876,29 @@ msgid "" " to avoid this check.\n" msgstr "" "Проверката за принудителни изтласквания отне %.2f сек. Може да я прескочите " -"еднократно с опцията „--no-show-forced-updates“, а за да я извключите за " +"еднократно с опцията „--no-show-forced-updates“, а за да я изключите за " "постоянно, изпълнете:\n" "\n" " git config fetch.showForcedUpdates false\n" -#: builtin/fetch.c:908 +#: builtin/fetch.c:911 #, c-format msgid "%s did not send all necessary objects\n" msgstr "хранилището „%s“ не изпрати всички необходими обекти\n" -#: builtin/fetch.c:929 +#: builtin/fetch.c:932 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" "отхвърляне на върха „%s“, защото плитките хранилища не могат да бъдат " "обновявани" -#: builtin/fetch.c:1020 builtin/fetch.c:1157 +#: builtin/fetch.c:1017 builtin/fetch.c:1155 #, c-format msgid "From %.*s\n" msgstr "От %.*s\n" -#: builtin/fetch.c:1031 +#: builtin/fetch.c:1028 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -13360,57 +13908,57 @@ msgstr "" "„git remote prune %s“, за да премахнете остарелите клони, които\n" "предизвикват конфликта" -#: builtin/fetch.c:1127 +#: builtin/fetch.c:1125 #, c-format msgid " (%s will become dangling)" msgstr " (обектът „%s“ ще се окаже извън клон)" -#: builtin/fetch.c:1128 +#: builtin/fetch.c:1126 #, c-format msgid " (%s has become dangling)" msgstr " (обектът „%s“ вече е извън клон)" -#: builtin/fetch.c:1160 +#: builtin/fetch.c:1158 msgid "[deleted]" msgstr "[изтрит]" -#: builtin/fetch.c:1161 builtin/remote.c:1036 +#: builtin/fetch.c:1159 builtin/remote.c:1035 msgid "(none)" msgstr "(нищо)" -#: builtin/fetch.c:1184 +#: builtin/fetch.c:1182 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Не може да доставите в текущия клон „%s“ на хранилище, което не е голо" -#: builtin/fetch.c:1203 +#: builtin/fetch.c:1201 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Стойността „%2$s“ за опцията „%1$s“ не е съвместима с „%3$s“" -#: builtin/fetch.c:1206 +#: builtin/fetch.c:1204 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Опцията „%s“ се прескача при „%s“\n" -#: builtin/fetch.c:1414 -msgid "multiple branch detected, incompatible with --set-upstream" +#: builtin/fetch.c:1412 +msgid "multiple branches detected, incompatible with --set-upstream" msgstr "" "засечени са множество клони, това е несъвместимо с опцията „--set-upstream“" -#: builtin/fetch.c:1429 +#: builtin/fetch.c:1427 msgid "not setting upstream for a remote remote-tracking branch" msgstr "не може да указвате клон за следене на отдалечен етикет" -#: builtin/fetch.c:1431 +#: builtin/fetch.c:1429 msgid "not setting upstream for a remote tag" msgstr "не може да указвате клон за следене на отдалечен етикет" -#: builtin/fetch.c:1433 +#: builtin/fetch.c:1431 msgid "unknown branch type" msgstr "непознат вид клон" -#: builtin/fetch.c:1435 +#: builtin/fetch.c:1433 msgid "" "no source branch found.\n" "you need to specify exactly one branch with the --set-upstream option." @@ -13418,22 +13966,22 @@ msgstr "" "не е открит клон за следене.\n" "Трябва изрично да зададете един клон с опцията „--set-upstream option“." -#: builtin/fetch.c:1561 builtin/fetch.c:1623 +#: builtin/fetch.c:1559 builtin/fetch.c:1622 #, c-format msgid "Fetching %s\n" msgstr "Доставяне на „%s“\n" -#: builtin/fetch.c:1571 builtin/fetch.c:1625 builtin/remote.c:100 +#: builtin/fetch.c:1569 builtin/fetch.c:1624 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "„%s“ не може да се достави" -#: builtin/fetch.c:1583 +#: builtin/fetch.c:1581 #, c-format msgid "could not fetch '%s' (exit code: %d)\n" msgstr "„%s“ не може да се достави (изходният код е: %d)\n" -#: builtin/fetch.c:1685 +#: builtin/fetch.c:1684 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -13441,45 +13989,45 @@ msgstr "" "Не сте указали отдалечено хранилище. Задайте или адрес, или име\n" "на отдалечено хранилище, откъдето да се доставят новите версии." -#: builtin/fetch.c:1722 +#: builtin/fetch.c:1721 msgid "You need to specify a tag name." msgstr "Трябва да укажете име на етикет." -#: builtin/fetch.c:1774 +#: builtin/fetch.c:1771 msgid "Negative depth in --deepen is not supported" msgstr "Отрицателна дълбочина като аргумент на „--deepen“ не се поддържа" -#: builtin/fetch.c:1776 +#: builtin/fetch.c:1773 msgid "--deepen and --depth are mutually exclusive" msgstr "опциите „--deepen“ и „--depth“ са несъвместими" -#: builtin/fetch.c:1781 +#: builtin/fetch.c:1778 msgid "--depth and --unshallow cannot be used together" msgstr "опциите „--depth“ и „--unshallow“ са несъвместими" -#: builtin/fetch.c:1783 +#: builtin/fetch.c:1780 msgid "--unshallow on a complete repository does not make sense" msgstr "не можете да използвате опцията „--unshallow“ върху пълно хранилище" -#: builtin/fetch.c:1799 +#: builtin/fetch.c:1796 msgid "fetch --all does not take a repository argument" msgstr "към „git fetch --all“ не можете да добавите аргумент — хранилище" -#: builtin/fetch.c:1801 +#: builtin/fetch.c:1798 msgid "fetch --all does not make sense with refspecs" msgstr "" "към „git fetch --all“ не можете да добавите аргумент — указател на версия" -#: builtin/fetch.c:1810 +#: builtin/fetch.c:1807 #, c-format msgid "No such remote or remote group: %s" msgstr "Няма нито отдалечено хранилище, нито група от хранилища на име „%s“" -#: builtin/fetch.c:1817 +#: builtin/fetch.c:1814 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Указването на група и указването на версия са несъвместими" -#: builtin/fetch.c:1835 +#: builtin/fetch.c:1832 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -13493,25 +14041,25 @@ msgid "" msgstr "" "git fmt-merge-msg [-m СЪОБЩЕНИЕ] [--log[=БРОЙ] | --no-log] [--file ФАЙЛ]" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:674 msgid "populate log with at most entries from shortlog" msgstr "" "вмъкване на журнал състоящ се от не повече от БРОЙ записа от съкратения " "журнал" -#: builtin/fmt-merge-msg.c:675 +#: builtin/fmt-merge-msg.c:677 msgid "alias for --log (deprecated)" msgstr "псевдоним на „--log“ (остаряло)" -#: builtin/fmt-merge-msg.c:678 +#: builtin/fmt-merge-msg.c:680 msgid "text" msgstr "ТЕКСТ" -#: builtin/fmt-merge-msg.c:679 +#: builtin/fmt-merge-msg.c:681 msgid "use as start of message" msgstr "за начало на съобщението да се ползва ТЕКСТ" -#: builtin/fmt-merge-msg.c:680 +#: builtin/fmt-merge-msg.c:682 msgid "file to read from" msgstr "файл, от който да се чете" @@ -13575,32 +14123,32 @@ msgstr "извеждане само на указателите, които съ msgid "print only refs which don't contain the commit" msgstr "извеждане само на указателите, които не съдържат това ПОДАВАНЕ" -#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161 +#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148 msgid "unknown" msgstr "непознат" #. TRANSLATORS: e.g. error in tree 01bfda: -#: builtin/fsck.c:120 builtin/fsck.c:136 +#: builtin/fsck.c:100 builtin/fsck.c:120 #, c-format msgid "error in %s %s: %s" msgstr "грешка в %s „%s“: %s" #. TRANSLATORS: e.g. warning in tree 01bfda: -#: builtin/fsck.c:131 +#: builtin/fsck.c:114 #, c-format msgid "warning in %s %s: %s" msgstr "предупреждение за %s „%s“: %s" -#: builtin/fsck.c:157 builtin/fsck.c:159 +#: builtin/fsck.c:143 builtin/fsck.c:146 #, c-format msgid "broken link from %7s %s" msgstr "скъсана връзка от %7s %s" -#: builtin/fsck.c:168 +#: builtin/fsck.c:155 msgid "wrong object type in link" msgstr "неправилен вид обект във връзката" -#: builtin/fsck.c:184 +#: builtin/fsck.c:171 #, c-format msgid "" "broken link from %7s %s\n" @@ -13609,212 +14157,212 @@ msgstr "" "скъсана връзка от %7s %s\n" " към %7s %s" -#: builtin/fsck.c:295 +#: builtin/fsck.c:282 #, c-format msgid "missing %s %s" msgstr "липсващ обект: %s „%s“" -#: builtin/fsck.c:321 +#: builtin/fsck.c:309 #, c-format msgid "unreachable %s %s" msgstr "недостижим обект: %s „%s“" -#: builtin/fsck.c:340 +#: builtin/fsck.c:329 #, c-format msgid "dangling %s %s" msgstr "извън клон: %s „%s“" -#: builtin/fsck.c:349 +#: builtin/fsck.c:339 msgid "could not create lost-found" msgstr "„lost-found“ не може да се създаде" -#: builtin/fsck.c:360 +#: builtin/fsck.c:350 #, c-format msgid "could not finish '%s'" msgstr "„%s“ не може да се завърши" -#: builtin/fsck.c:377 +#: builtin/fsck.c:367 #, c-format msgid "Checking %s" msgstr "Проверка на „%s“" -#: builtin/fsck.c:415 +#: builtin/fsck.c:405 #, c-format msgid "Checking connectivity (%d objects)" msgstr "Проверка на свързаността (%d обекта)" -#: builtin/fsck.c:434 +#: builtin/fsck.c:424 #, c-format msgid "Checking %s %s" msgstr "Проверяване на %s „%s“" -#: builtin/fsck.c:438 +#: builtin/fsck.c:429 msgid "broken links" msgstr "скъсани връзки" -#: builtin/fsck.c:447 +#: builtin/fsck.c:438 #, c-format msgid "root %s" msgstr "начална директория „%s“" -#: builtin/fsck.c:455 +#: builtin/fsck.c:446 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "приложен етикет „%s“ върху „%s“ (%s) в „%s“" -#: builtin/fsck.c:484 +#: builtin/fsck.c:475 #, c-format msgid "%s: object corrupt or missing" msgstr "%s: липсващ или повреден обект" -#: builtin/fsck.c:509 +#: builtin/fsck.c:500 #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s: неправилен запис в журнала за указатели „%s“" -#: builtin/fsck.c:523 +#: builtin/fsck.c:514 #, c-format msgid "Checking reflog %s->%s" msgstr "Проверка на журнала на указателите: „%s“ до „%s“" -#: builtin/fsck.c:557 +#: builtin/fsck.c:548 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "„%s“: неправилен указател за SHA1: „%s“" -#: builtin/fsck.c:564 +#: builtin/fsck.c:555 #, c-format msgid "%s: not a commit" msgstr "%s: не е подаване!" -#: builtin/fsck.c:619 +#: builtin/fsck.c:609 msgid "notice: No default references" msgstr "внимание: няма указатели по подразбиране" -#: builtin/fsck.c:634 +#: builtin/fsck.c:624 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "„%s“: липсващ обект: „%s“" -#: builtin/fsck.c:647 +#: builtin/fsck.c:637 #, c-format msgid "%s: object could not be parsed: %s" msgstr "„%s“: не може да се анализира: „%s“" -#: builtin/fsck.c:667 +#: builtin/fsck.c:657 #, c-format msgid "bad sha1 file: %s" msgstr "неправилен ред с контролна сума по SHA1: „%s“" -#: builtin/fsck.c:682 +#: builtin/fsck.c:672 msgid "Checking object directory" msgstr "Проверка на директория с обекти" -#: builtin/fsck.c:685 +#: builtin/fsck.c:675 msgid "Checking object directories" msgstr "Проверка на директориите с обекти" -#: builtin/fsck.c:700 +#: builtin/fsck.c:690 #, c-format msgid "Checking %s link" msgstr "Проверка на връзките на „%s“" # -#: builtin/fsck.c:705 builtin/index-pack.c:842 +#: builtin/fsck.c:695 builtin/index-pack.c:842 #, c-format msgid "invalid %s" msgstr "неправилен указател „%s“" -#: builtin/fsck.c:712 +#: builtin/fsck.c:702 #, c-format msgid "%s points to something strange (%s)" msgstr "„%s“ сочи към нещо необичайно (%s)" -#: builtin/fsck.c:718 +#: builtin/fsck.c:708 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s: несвързаният връх „HEAD“ не сочи към нищо" -#: builtin/fsck.c:722 +#: builtin/fsck.c:712 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "предупреждение: „%s“ сочи към все още несъществуващ клон (%s)" -#: builtin/fsck.c:734 +#: builtin/fsck.c:724 msgid "Checking cache tree" msgstr "Проверка на дървото на кеша" -#: builtin/fsck.c:739 +#: builtin/fsck.c:729 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "„%s“: неправилен указател за SHA1 в дървото на кеша" -#: builtin/fsck.c:750 +#: builtin/fsck.c:738 msgid "non-tree in cache-tree" msgstr "в дървото на кеша има нещо, което не е дърво" -#: builtin/fsck.c:781 +#: builtin/fsck.c:769 msgid "git fsck [] [...]" msgstr "git fsck [ОПЦИЯ…] [ОБЕКТ…]" -#: builtin/fsck.c:787 +#: builtin/fsck.c:775 msgid "show unreachable objects" msgstr "показване на недостижимите обекти" -#: builtin/fsck.c:788 +#: builtin/fsck.c:776 msgid "show dangling objects" msgstr "показване на обектите извън клоните" -#: builtin/fsck.c:789 +#: builtin/fsck.c:777 msgid "report tags" msgstr "показване на етикетите" -#: builtin/fsck.c:790 +#: builtin/fsck.c:778 msgid "report root nodes" msgstr "показване на кореновите възли" -#: builtin/fsck.c:791 +#: builtin/fsck.c:779 msgid "make index objects head nodes" msgstr "задаване на обекти от индекса да са коренови" -#: builtin/fsck.c:792 +#: builtin/fsck.c:780 msgid "make reflogs head nodes (default)" msgstr "проследяване и на указателите от журнала с указателите (стандартно)" -#: builtin/fsck.c:793 +#: builtin/fsck.c:781 msgid "also consider packs and alternate objects" msgstr "допълнително да се проверяват пакетите и алтернативните обекти" -#: builtin/fsck.c:794 +#: builtin/fsck.c:782 msgid "check only connectivity" msgstr "проверка само на връзката" -#: builtin/fsck.c:795 +#: builtin/fsck.c:783 msgid "enable more strict checking" msgstr "по-строги проверки" -#: builtin/fsck.c:797 +#: builtin/fsck.c:785 msgid "write dangling objects in .git/lost-found" msgstr "запазване на обектите извън клоните в директорията „.git/lost-found“" -#: builtin/fsck.c:798 builtin/prune.c:132 +#: builtin/fsck.c:786 builtin/prune.c:132 msgid "show progress" msgstr "показване на напредъка" -#: builtin/fsck.c:799 +#: builtin/fsck.c:787 msgid "show verbose names for reachable objects" msgstr "показване на подробни имена на достижимите обекти" -#: builtin/fsck.c:859 builtin/index-pack.c:225 +#: builtin/fsck.c:846 builtin/index-pack.c:225 msgid "Checking objects" msgstr "Проверка на обектите" -#: builtin/fsck.c:887 +#: builtin/fsck.c:874 #, c-format msgid "%s: object missing" msgstr "„%s“: липсващ обект" -#: builtin/fsck.c:899 +#: builtin/fsck.c:885 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "неправилен параметър: очаква се SHA1, а бе получено: „%s“" @@ -14193,8 +14741,7 @@ msgstr "зададен е неправилен брой нишки: %d" #: builtin/grep.c:1096 msgid "--open-files-in-pager only works on the worktree" -msgstr "" -"опцията „--open-files-in-pager“ е съвместима само с търсене в работното дърво" +msgstr "опцията „--open-files-in-pager“ изисква търсене в работното дърво" #: builtin/grep.c:1119 msgid "option not supported with --recurse-submodules" @@ -14402,7 +14949,7 @@ msgstr "използвани са повече от наличните байт msgid "pack too large for current definition of off_t" msgstr "пакетният файл е прекалено голям за текущата стойност на типа „off_t“" -#: builtin/index-pack.c:291 builtin/unpack-objects.c:94 +#: builtin/index-pack.c:291 builtin/unpack-objects.c:95 msgid "pack exceeds maximum allowed size" msgstr "пакетният файл надвишава максималния възможен размер" @@ -14651,7 +15198,7 @@ msgstr "„--stdin“ изисква хранилище на git" msgid "--verify with no packfile name given" msgstr "опцията „--verify“ изисква име на пакетен файл" -#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580 +#: builtin/index-pack.c:1833 builtin/unpack-objects.c:581 msgid "fsck error in pack objects" msgstr "грешка при проверка с „fsck“ на пакетните обекти" @@ -14837,125 +15384,130 @@ msgstr "опцията „--trailer“ е несъвместима с „--name- msgid "no input file given for in-place editing" msgstr "не е зададен входен файл за редактиране на място" -#: builtin/log.c:55 +#: builtin/log.c:56 msgid "git log [] [] [[--] ...]" msgstr "git log [ОПЦИЯ…] [ДИАПАЗОН_НА_ВЕРСИИТЕ] [[--] ПЪТ…]" -#: builtin/log.c:56 +#: builtin/log.c:57 msgid "git show [] ..." msgstr "git show [ОПЦИЯ…] ОБЕКТ…" -#: builtin/log.c:109 +#: builtin/log.c:110 #, c-format msgid "invalid --decorate option: %s" msgstr "неправилна опция „--decorate“: %s" -#: builtin/log.c:173 +#: builtin/log.c:174 msgid "show source" msgstr "извеждане на изходния код" -#: builtin/log.c:174 +#: builtin/log.c:175 msgid "Use mail map file" msgstr "" "Използване на файл за съответствията на имената и адресите на е-поща („." "mailmap“)" -#: builtin/log.c:176 +#: builtin/log.c:177 msgid "only decorate refs that match " msgstr "специален формат само на указателите напасващи на ШАБЛОНа" -#: builtin/log.c:178 +#: builtin/log.c:179 msgid "do not decorate refs that match " msgstr "без специален формат на указателите напасващи на ШАБЛОНа" -#: builtin/log.c:179 +#: builtin/log.c:180 msgid "decorate options" msgstr "настройки на форма̀та на извежданата информация" -#: builtin/log.c:182 +#: builtin/log.c:183 msgid "Process line range n,m in file, counting from 1" msgstr "" "Обработване само на редовете във файла в диапазона от n до m включително. " "Броенето започва от 1" -#: builtin/log.c:280 +#: builtin/log.c:281 #, c-format msgid "Final output: %d %s\n" msgstr "Резултат: %d %s\n" -#: builtin/log.c:534 +#: builtin/log.c:535 #, c-format msgid "git show %s: bad file" msgstr "git show %s: повреден файл" -#: builtin/log.c:549 builtin/log.c:644 +#: builtin/log.c:550 builtin/log.c:645 #, c-format msgid "could not read object %s" msgstr "обектът не може да бъде прочетен: %s" -#: builtin/log.c:669 +#: builtin/log.c:670 #, c-format msgid "unknown type: %d" msgstr "неизвестен вид: %d" -#: builtin/log.c:792 +#: builtin/log.c:814 +#, c-format +msgid "%s: invalid cover from description mode" +msgstr "%s: неправилно придружаващо писмо от режима на описание" + +#: builtin/log.c:821 msgid "format.headers without value" msgstr "не е зададена стойност на „format.headers“" -#: builtin/log.c:909 +#: builtin/log.c:936 msgid "name of output directory is too long" msgstr "прекалено дълго име на директорията за изходната информация" -#: builtin/log.c:925 +#: builtin/log.c:952 #, c-format msgid "cannot open patch file %s" msgstr "файлът-кръпка „%s“ не може да бъде отворен" -#: builtin/log.c:942 +#: builtin/log.c:969 msgid "need exactly one range" msgstr "трябва да зададете точно един диапазон" -#: builtin/log.c:952 +#: builtin/log.c:979 msgid "not a range" msgstr "не е диапазон" -#: builtin/log.c:1075 +#: builtin/log.c:1143 msgid "cover letter needs email format" msgstr "придружаващото писмо трябва да е форматирано като е-писмо" -#: builtin/log.c:1081 +#: builtin/log.c:1149 msgid "failed to create cover-letter file" msgstr "неуспешно създаване на придружаващо писмо" -#: builtin/log.c:1160 +#: builtin/log.c:1228 #, c-format msgid "insane in-reply-to: %s" msgstr "неправилен формат на заглавната част за отговор „in-reply-to“: %s" -#: builtin/log.c:1187 +#: builtin/log.c:1255 msgid "git format-patch [] [ | ]" msgstr "git format-patch [ОПЦИЯ…] [ОТ | ДИАПАЗОН_НА_ВЕРСИИТЕ]" -#: builtin/log.c:1245 +#: builtin/log.c:1313 msgid "two output directories?" msgstr "може да укажете максимум една директория за изход" -#: builtin/log.c:1356 builtin/log.c:2116 builtin/log.c:2118 builtin/log.c:2130 +#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211 #, c-format msgid "unknown commit %s" msgstr "непознато подаване: „%s“" -#: builtin/log.c:1366 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "„%s“ не е указател или не сочи към нищо" -#: builtin/log.c:1371 +#: builtin/log.c:1439 msgid "could not find exact merge base" msgstr "точната база за сливане не може да бъде открита" -#: builtin/log.c:1375 +#: builtin/log.c:1443 msgid "" "failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" @@ -14965,281 +15517,291 @@ msgstr "" "зададете, използвайте „git branch --set-upstream-to“.\n" "Можете ръчно да зададете базово подаване чрез „--base=“." -#: builtin/log.c:1395 +#: builtin/log.c:1463 msgid "failed to find exact merge base" msgstr "точната база при сливане не може да бъде открита" -#: builtin/log.c:1406 +#: builtin/log.c:1474 msgid "base commit should be the ancestor of revision list" msgstr "базовото подаване трябва да е предшественикът на списъка с версиите" -#: builtin/log.c:1410 +#: builtin/log.c:1478 msgid "base commit shouldn't be in revision list" msgstr "базовото подаване не може да е в списъка с версиите" -#: builtin/log.c:1463 +#: builtin/log.c:1531 msgid "cannot get patch id" msgstr "идентификаторът на кръпката не може да бъде получен" -#: builtin/log.c:1515 +#: builtin/log.c:1583 msgid "failed to infer range-diff ranges" msgstr "неуспешно определяне на диапазоните за разлика" -#: builtin/log.c:1560 +#: builtin/log.c:1629 msgid "use [PATCH n/m] even with a single patch" msgstr "номерация „[PATCH n/m]“ дори и при единствена кръпка" -#: builtin/log.c:1563 +#: builtin/log.c:1632 msgid "use [PATCH] even with multiple patches" msgstr "номерация „[PATCH]“ дори и при множество кръпки" -#: builtin/log.c:1567 +#: builtin/log.c:1636 msgid "print patches to standard out" msgstr "извеждане на кръпките на стандартния изход" -#: builtin/log.c:1569 +#: builtin/log.c:1638 msgid "generate a cover letter" msgstr "създаване на придружаващо писмо" -#: builtin/log.c:1571 +#: builtin/log.c:1640 msgid "use simple number sequence for output file names" msgstr "проста числова последователност за имената на файловете-кръпки" -#: builtin/log.c:1572 +#: builtin/log.c:1641 msgid "sfx" msgstr "ЗНАЦИ" -#: builtin/log.c:1573 +#: builtin/log.c:1642 msgid "use instead of '.patch'" msgstr "използване на тези ЗНАЦИ за суфикс вместо „.patch“" -#: builtin/log.c:1575 +#: builtin/log.c:1644 msgid "start numbering patches at instead of 1" msgstr "номерирането на кръпките да започва от този БРОЙ, а не с 1" -#: builtin/log.c:1577 +#: builtin/log.c:1646 msgid "mark the series as Nth re-roll" msgstr "отбелязване, че това е N-тата поредна редакция на поредицата от кръпки" -#: builtin/log.c:1579 +#: builtin/log.c:1648 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Използване на „[RFC PATCH]“ вместо „[PATCH]“" -#: builtin/log.c:1582 +#: builtin/log.c:1651 +msgid "cover-from-description-mode" +msgstr "режим-придружаващо-писмо-по-описание" + +#: builtin/log.c:1652 +msgid "generate parts of a cover letter based on a branch's description" +msgstr "" +"генериране на частите на придружаващото писмо на базата на описанието на " +"клона" + +#: builtin/log.c:1654 msgid "Use [] instead of [PATCH]" msgstr "Използване на този „[ПРЕФИКС]“ вместо „[PATCH]“" -#: builtin/log.c:1585 +#: builtin/log.c:1657 msgid "store resulting files in " msgstr "запазване на изходните файлове в тази ДИРЕКТОРИЯ" -#: builtin/log.c:1588 +#: builtin/log.c:1660 msgid "don't strip/add [PATCH]" msgstr "без добавяне/махане на префикса „[PATCH]“" -#: builtin/log.c:1591 +#: builtin/log.c:1663 msgid "don't output binary diffs" msgstr "без извеждане на разлики между двоични файлове" -#: builtin/log.c:1593 +#: builtin/log.c:1665 msgid "output all-zero hash in From header" msgstr "в заглавната част „From:“ (от) контролната сума да е само от нули" -#: builtin/log.c:1595 +#: builtin/log.c:1667 msgid "don't include a patch matching a commit upstream" msgstr "без кръпки, които присъстват в следения клон" -#: builtin/log.c:1597 +#: builtin/log.c:1669 msgid "show patch format instead of default (patch + stat)" msgstr "" "извеждане във формат за кръпки, а на в стандартния (кръпка и статистика)" -#: builtin/log.c:1599 +#: builtin/log.c:1671 msgid "Messaging" msgstr "Опции при изпращане" -#: builtin/log.c:1600 +#: builtin/log.c:1672 msgid "header" msgstr "ЗАГЛАВНА_ЧАСТ" -#: builtin/log.c:1601 +#: builtin/log.c:1673 msgid "add email header" msgstr "добавяне на тази ЗАГЛАВНА_ЧАСТ" -#: builtin/log.c:1602 builtin/log.c:1604 +#: builtin/log.c:1674 builtin/log.c:1676 msgid "email" msgstr "Е-ПОЩА" -#: builtin/log.c:1602 +#: builtin/log.c:1674 msgid "add To: header" msgstr "добавяне на заглавна част „To:“ (до)" -#: builtin/log.c:1604 +#: builtin/log.c:1676 msgid "add Cc: header" msgstr "добавяне на заглавна част „Cc:“ (и до)" -#: builtin/log.c:1606 +#: builtin/log.c:1678 msgid "ident" msgstr "ИДЕНТИЧНОСТ" -#: builtin/log.c:1607 +#: builtin/log.c:1679 msgid "set From address to (or committer ident if absent)" msgstr "" "задаване на адреса в заглавната част „From“ (от) да е тази ИДЕНТИЧНОСТ. Ако " "не е зададена такава, се взима адреса на подаващия" -#: builtin/log.c:1609 +#: builtin/log.c:1681 msgid "message-id" msgstr "ИДЕНТИФИКАТОР_НА_СЪОБЩЕНИЕ" -#: builtin/log.c:1610 +#: builtin/log.c:1682 msgid "make first mail a reply to " msgstr "" "първото съобщение да е в отговор на е-писмото с този " "ИДЕНТИФИКАТОР_НА_СЪОБЩЕНИЕ" -#: builtin/log.c:1611 builtin/log.c:1614 +#: builtin/log.c:1683 builtin/log.c:1686 msgid "boundary" msgstr "граница" -#: builtin/log.c:1612 +#: builtin/log.c:1684 msgid "attach the patch" msgstr "прикрепяне на кръпката" -#: builtin/log.c:1615 +#: builtin/log.c:1687 msgid "inline the patch" msgstr "включване на кръпката в текста на писмата" -#: builtin/log.c:1619 +#: builtin/log.c:1691 msgid "enable message threading, styles: shallow, deep" msgstr "" "използване на нишки за съобщенията. СТИЛът е „shallow“ (плитък) или " "„deep“ (дълбок)" -#: builtin/log.c:1621 +#: builtin/log.c:1693 msgid "signature" msgstr "подпис" -#: builtin/log.c:1622 +#: builtin/log.c:1694 msgid "add a signature" msgstr "добавяне на поле за подпис" -#: builtin/log.c:1623 +#: builtin/log.c:1695 msgid "base-commit" msgstr "БАЗОВО_ПОДАВАНЕ" -#: builtin/log.c:1624 +#: builtin/log.c:1696 msgid "add prerequisite tree info to the patch series" msgstr "добавяне на необходимото БАЗово дърво към поредицата от кръпки" -#: builtin/log.c:1626 +#: builtin/log.c:1698 msgid "add a signature from a file" msgstr "добавяне на подпис от файл" -#: builtin/log.c:1627 +#: builtin/log.c:1699 msgid "don't print the patch filenames" msgstr "без извеждане на имената на кръпките" -#: builtin/log.c:1629 +#: builtin/log.c:1701 msgid "show progress while generating patches" msgstr "извеждане на напредъка във фазата на създаване на кръпките" -#: builtin/log.c:1631 +#: builtin/log.c:1703 msgid "show changes against in cover letter or single patch" msgstr "" "показване на промените спрямо ВЕРСията в придружаващото писмо или единствена " "кръпка" -#: builtin/log.c:1634 +#: builtin/log.c:1706 msgid "show changes against in cover letter or single patch" msgstr "" "показване на промените спрямо указателя на ВЕРСията в придружаващото писмо " "или единствена кръпка" -#: builtin/log.c:1636 +#: builtin/log.c:1708 msgid "percentage by which creation is weighted" msgstr "процент за претегляне при оценка на създаването" -#: builtin/log.c:1711 +#: builtin/log.c:1792 #, c-format msgid "invalid ident line: %s" msgstr "грешна идентичност: %s" -#: builtin/log.c:1726 +#: builtin/log.c:1807 msgid "-n and -k are mutually exclusive" msgstr "опциите „-n“ и „-k“ са несъвместими" -#: builtin/log.c:1728 +#: builtin/log.c:1809 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "опциите „--subject-prefix“/„-rfc“ и „-k“ са несъвместими" -#: builtin/log.c:1736 +#: builtin/log.c:1817 msgid "--name-only does not make sense" msgstr "опцията „--name-only“ е несъвместима с генерирането на кръпки" -#: builtin/log.c:1738 +#: builtin/log.c:1819 msgid "--name-status does not make sense" msgstr "опцията „--name-status“ е несъвместима с генерирането на кръпки" -#: builtin/log.c:1740 +#: builtin/log.c:1821 msgid "--check does not make sense" msgstr "опцията „--check“ е несъвместима с генерирането на кръпки" -#: builtin/log.c:1773 +#: builtin/log.c:1854 msgid "standard output, or directory, which one?" msgstr "" "изходът може да или стандартният, или да е в директория, но не и двете." -#: builtin/log.c:1877 +#: builtin/log.c:1958 msgid "--interdiff requires --cover-letter or single patch" msgstr "" "опцията „--interdiff“ изисква опция „--cover-letter“ или единствена кръпка" -#: builtin/log.c:1881 +#: builtin/log.c:1962 msgid "Interdiff:" msgstr "Разлика в разликите:" -#: builtin/log.c:1882 +#: builtin/log.c:1963 #, c-format msgid "Interdiff against v%d:" msgstr "Разлика в разликите спрямо v%d:" -#: builtin/log.c:1888 +#: builtin/log.c:1969 msgid "--creation-factor requires --range-diff" msgstr "опцията „--creation-factor“ изисква опция „--range-diff“" -#: builtin/log.c:1892 +#: builtin/log.c:1973 msgid "--range-diff requires --cover-letter or single patch" msgstr "" "опцията „--range-diff“ изисква опция „--cover-letter“ или единствена кръпка" -#: builtin/log.c:1900 +#: builtin/log.c:1981 msgid "Range-diff:" msgstr "Диапазонна разлика:" -#: builtin/log.c:1901 +#: builtin/log.c:1982 #, c-format msgid "Range-diff against v%d:" msgstr "Диапазонна разлика спрямо v%d:" -#: builtin/log.c:1912 +#: builtin/log.c:1993 #, c-format msgid "unable to read signature file '%s'" msgstr "файлът „%s“ с подпис не може да бъде прочетен" -#: builtin/log.c:1948 +#: builtin/log.c:2029 msgid "Generating patches" msgstr "Създаване на кръпки" -#: builtin/log.c:1992 +#: builtin/log.c:2073 msgid "failed to create output files" msgstr "неуспешно създаване на изходни файлове" -#: builtin/log.c:2051 +#: builtin/log.c:2132 msgid "git cherry [-v] [ [ []]]" msgstr "git cherry [-v] [ОТДАЛЕЧЕН_КЛОН [ВРЪХ [ПРЕДЕЛ]]]" -#: builtin/log.c:2105 +#: builtin/log.c:2186 #, c-format msgid "" "Could not find a tracked remote branch, please specify manually.\n" @@ -15367,7 +15929,7 @@ msgstr "" msgid "do not print remote URL" msgstr "без извеждане на адресите на отдалечените хранилища" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1488 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1518 msgid "exec" msgstr "КОМАНДА" @@ -15521,7 +16083,7 @@ msgid "verify that the named commit has a valid GPG signature" msgstr "проверка, че указаното подаване е с правилен подпис на GPG" #: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:187 -#: builtin/rebase.c:493 builtin/rebase.c:1501 builtin/revert.c:114 +#: builtin/rebase.c:512 builtin/rebase.c:1531 builtin/revert.c:114 msgid "strategy" msgstr "СТРАТЕГИЯ" @@ -15971,19 +16533,19 @@ msgstr "разрешаване на създаването на повече о #: builtin/multi-pack-index.c:9 msgid "" -"git multi-pack-index [--object-dir=] (write|verify|expire|repack --" -"batch-size=)" +"git multi-pack-index [] (write|verify|expire|repack --batch-" +"size=)" msgstr "" -"git multi-pack-index [--object-dir=ДИР_ОБЕКТ] (write|verify|expire|repack --" -"batch-size=РАЗМЕР)" +"git multi-pack-index [ОПЦИЯ…] (write|verify|expire|repack --batch-" +"size=РАЗМЕР)" -#: builtin/multi-pack-index.c:23 +#: builtin/multi-pack-index.c:26 msgid "object directory containing set of packfile and pack-index pairs" msgstr "" "ДИРекторията_с_ОБЕКТи съдържа множество двойки пакетни файлове със " "съответния им индекс" -#: builtin/multi-pack-index.c:25 +#: builtin/multi-pack-index.c:29 msgid "" "during repack, collect pack-files of smaller size into a batch that is " "larger than this size" @@ -15991,15 +16553,15 @@ msgstr "" "при препакетиране пакетните файлове, които са с по-малък от този размер, да " "се обединяват в пакети с по-голям от този размер" -#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67 +#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67 msgid "too many arguments" msgstr "прекалено много аргументи" -#: builtin/multi-pack-index.c:52 +#: builtin/multi-pack-index.c:60 msgid "--batch-size option is only for 'repack' subcommand" msgstr "опцията „--batch-size“ изисква подкомандата „repack“" -#: builtin/multi-pack-index.c:61 +#: builtin/multi-pack-index.c:69 #, c-format msgid "unrecognized subcommand: %s" msgstr "непозната подкоманда: %s" @@ -16093,54 +16655,54 @@ msgstr "%s, обект: „%s“, цел: „%s“" msgid "Renaming %s to %s\n" msgstr "Преименуване на „%s“ на „%s“\n" -#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:511 +#: builtin/mv.c:277 builtin/remote.c:716 builtin/repack.c:518 #, c-format msgid "renaming '%s' failed" msgstr "неуспешно преименуване на „%s“" -#: builtin/name-rev.c:356 +#: builtin/name-rev.c:403 msgid "git name-rev [] ..." msgstr "git name-rev [ОПЦИЯ…] ПОДАВАНЕ…" -#: builtin/name-rev.c:357 +#: builtin/name-rev.c:404 msgid "git name-rev [] --all" msgstr "git name-rev [ОПЦИЯ…] --all" -#: builtin/name-rev.c:358 +#: builtin/name-rev.c:405 msgid "git name-rev [] --stdin" msgstr "git name-rev [ОПЦИЯ…] --stdin" -#: builtin/name-rev.c:415 +#: builtin/name-rev.c:462 msgid "print only names (no SHA-1)" msgstr "извеждане само на имената (без сумите по SHA1)" -#: builtin/name-rev.c:416 +#: builtin/name-rev.c:463 msgid "only use tags to name the commits" msgstr "използване само на етикетите за именуване на подаванията" -#: builtin/name-rev.c:418 +#: builtin/name-rev.c:465 msgid "only use refs matching " msgstr "използване само на указателите напасващи на ШАБЛОНа" -#: builtin/name-rev.c:420 +#: builtin/name-rev.c:467 msgid "ignore refs matching " msgstr "игнориране на указателите напасващи на ШАБЛОНа" -#: builtin/name-rev.c:422 +#: builtin/name-rev.c:469 msgid "list all commits reachable from all refs" msgstr "" "извеждане на всички подавания, които могат да бъдат достигнати от всички " "указатели" -#: builtin/name-rev.c:423 +#: builtin/name-rev.c:470 msgid "read from stdin" msgstr "четене от стандартния вход" -#: builtin/name-rev.c:424 +#: builtin/name-rev.c:471 msgid "allow to print `undefined` names (default)" msgstr "да се извеждат и недефинираните имена (стандартна стойност на опцията)" -#: builtin/name-rev.c:430 +#: builtin/name-rev.c:477 msgid "dereference tags in the input (internal use)" msgstr "извеждане на идентификаторите на обекти-етикети (за вътрешни нужди)" @@ -16628,7 +17190,7 @@ msgstr "" msgid "Writing objects" msgstr "Записване на обектите" -#: builtin/pack-objects.c:917 builtin/update-index.c:89 +#: builtin/pack-objects.c:917 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "не може да бъде получена информация чрез „stat“ за „%s“" @@ -16762,23 +17324,6 @@ msgstr "неподдържана версия на индекса „%s“" msgid "bad index version '%s'" msgstr "неправилна версия на индекса „%s“" -#: builtin/pack-objects.c:3228 -msgid "do not show progress meter" -msgstr "без извеждане на напредъка" - -#: builtin/pack-objects.c:3230 -msgid "show progress meter" -msgstr "извеждане на напредъка" - -#: builtin/pack-objects.c:3232 -msgid "show progress meter during object writing phase" -msgstr "извеждане на напредъка във фазата на запазване на обектите" - -#: builtin/pack-objects.c:3235 -msgid "similar to --all-progress when progress meter is shown" -msgstr "" -"същото действие като опцията „--all-progress“ при извеждането на напредъка" - #: builtin/pack-objects.c:3236 msgid "[,]" msgstr "ВЕРСИЯ[,ОТМЕСТВАНЕ]" @@ -17044,7 +17589,7 @@ msgstr "Опции при сливане" msgid "incorporate changes by rebasing rather than merging" msgstr "внасяне на промените чрез пребазиране, а не чрез сливане" -#: builtin/pull.c:177 builtin/rebase.c:448 builtin/revert.c:126 +#: builtin/pull.c:177 builtin/rebase.c:467 builtin/revert.c:126 msgid "allow fast-forward" msgstr "позволяване на превъртания" @@ -17103,7 +17648,7 @@ msgstr "" "Понеже това не е хранилището по подразбиране на текущия клон, трябва\n" "да укажете отдалечения клон на командния ред." -#: builtin/pull.c:448 builtin/rebase.c:1347 git-parse-remote.sh:73 +#: builtin/pull.c:448 builtin/rebase.c:1375 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Извън всички клони." @@ -17120,7 +17665,7 @@ msgid "See git-pull(1) for details." msgstr "За повече информация погледнете ръководството „git-pull(1)“" #: builtin/pull.c:455 builtin/pull.c:461 builtin/pull.c:470 -#: builtin/rebase.c:1353 git-parse-remote.sh:64 +#: builtin/rebase.c:1381 git-parse-remote.sh:64 msgid "" msgstr "ОТДАЛЕЧЕНО_ХРАНИЛИЩЕ" @@ -17129,7 +17674,7 @@ msgstr "ОТДАЛЕЧЕНО_ХРАНИЛИЩЕ" msgid "" msgstr "КЛОН" -#: builtin/pull.c:463 builtin/rebase.c:1345 git-parse-remote.sh:75 +#: builtin/pull.c:463 builtin/rebase.c:1373 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "Текущият клон не следи никой." @@ -17218,15 +17763,15 @@ msgstr "" msgid "git push [] [ [...]]" msgstr "git push [ОПЦИЯ…] [ХРАНИЛИЩЕ [УКАЗАТЕЛ_НА_ВЕРСИЯ…]]" -#: builtin/push.c:111 +#: builtin/push.c:112 msgid "tag shorthand without " msgstr "съкращение за етикет без ЕТИКЕТ" -#: builtin/push.c:121 +#: builtin/push.c:122 msgid "--delete only accepts plain target ref names" msgstr "опцията „--delete“ приема за цел само прости имена на указатели" -#: builtin/push.c:167 +#: builtin/push.c:168 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -17235,7 +17780,7 @@ msgstr "" "За да включите тази опция за постоянно, погледнете документацията за " "настройката „push.default“ в „git help config“." -#: builtin/push.c:170 +#: builtin/push.c:171 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -17260,7 +17805,7 @@ msgstr "" " git push %s HEAD\n" "%s" -#: builtin/push.c:185 +#: builtin/push.c:186 #, c-format msgid "" "You are not currently on a branch.\n" @@ -17274,7 +17819,7 @@ msgstr "" "\n" " git push %s HEAD:ИМЕ_НА_ОТДАЛЕЧЕНИЯ_КЛОН\n" -#: builtin/push.c:199 +#: builtin/push.c:200 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -17288,14 +17833,14 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:207 +#: builtin/push.c:208 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "" "Текущият клон „%s“ следи няколко отдалечени клона, не можете просто да " "изтласкате." -#: builtin/push.c:210 +#: builtin/push.c:211 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -17307,14 +17852,14 @@ msgstr "" "Трябва да укажете коя версия да се изтласка, за обновяване на отдалечения " "клон." -#: builtin/push.c:269 +#: builtin/push.c:270 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "Не сте указали версия за подаване, а настройката „push.default“ е " "„nothing“ (нищо без изрично указана версия да не се изтласква)" -#: builtin/push.c:276 +#: builtin/push.c:277 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -17328,7 +17873,7 @@ msgstr "" "преди отново да изтласкате промените. За повече информация вижте раздела\n" "„Note about fast-forwards“ в страницата от ръководството „git push --help“." -#: builtin/push.c:282 +#: builtin/push.c:283 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -17342,7 +17887,7 @@ msgstr "" "информация погледнете раздела „Note about fast-forwards“ в страницата от\n" "ръководството „git push --help“." -#: builtin/push.c:288 +#: builtin/push.c:289 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -17361,14 +17906,14 @@ msgstr "" "страницата\n" "от ръководството „git push --help“." -#: builtin/push.c:295 +#: builtin/push.c:296 msgid "Updates were rejected because the tag already exists in the remote." msgstr "" "Изтласкването е отхвърлено, защото в отдалеченото хранилище съществува " "етикет,\n" "който ще припокриете с етикет от вашето хранилище." -#: builtin/push.c:298 +#: builtin/push.c:299 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" @@ -17378,102 +17923,102 @@ msgstr "" "указател, който вече сочи към обект, който не е подаване, както и тепърва\n" "да го промените да сочи към подобен обект.\n" -#: builtin/push.c:359 +#: builtin/push.c:360 #, c-format msgid "Pushing to %s\n" msgstr "Изтласкване към „%s“\n" -#: builtin/push.c:366 +#: builtin/push.c:367 #, c-format msgid "failed to push some refs to '%s'" msgstr "част от указателите не бяха изтласкани към „%s“" -#: builtin/push.c:541 +#: builtin/push.c:542 msgid "repository" msgstr "хранилище" -#: builtin/push.c:542 builtin/send-pack.c:164 +#: builtin/push.c:543 builtin/send-pack.c:164 msgid "push all refs" msgstr "изтласкване на всички указатели" -#: builtin/push.c:543 builtin/send-pack.c:166 +#: builtin/push.c:544 builtin/send-pack.c:166 msgid "mirror all refs" msgstr "огледално копие на всички указатели" -#: builtin/push.c:545 +#: builtin/push.c:546 msgid "delete refs" msgstr "изтриване на указателите" -#: builtin/push.c:546 +#: builtin/push.c:547 msgid "push tags (can't be used with --all or --mirror)" msgstr "изтласкване на етикетите (несъвместимо с опциите „--all“ и „--mirror“)" -#: builtin/push.c:549 builtin/send-pack.c:167 +#: builtin/push.c:550 builtin/send-pack.c:167 msgid "force updates" msgstr "принудително обновяване" -#: builtin/push.c:551 builtin/send-pack.c:181 +#: builtin/push.c:552 builtin/send-pack.c:181 msgid ":" -msgstr "УКАЗАТЕЛ:ОЧАКВАНА_СТОЙНОСТ" +msgstr "ИМЕ_НА_УКАЗАТЕЛ:ОЧАКВАНА_СТОЙНОСТ" -#: builtin/push.c:552 builtin/send-pack.c:182 +#: builtin/push.c:553 builtin/send-pack.c:182 msgid "require old value of ref to be at this value" msgstr "УКАЗАТЕЛят трябва първоначално да е с тази ОЧАКВАНА_СТОЙНОСТ" -#: builtin/push.c:555 +#: builtin/push.c:556 msgid "control recursive pushing of submodules" msgstr "управление на рекурсивното изтласкване на подмодулите" -#: builtin/push.c:557 builtin/send-pack.c:175 +#: builtin/push.c:558 builtin/send-pack.c:175 msgid "use thin pack" msgstr "използване на съкратени пакети" -#: builtin/push.c:558 builtin/push.c:559 builtin/send-pack.c:161 +#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161 #: builtin/send-pack.c:162 msgid "receive pack program" msgstr "програма за получаването на пакети" -#: builtin/push.c:560 +#: builtin/push.c:561 msgid "set upstream for git pull/status" msgstr "задаване на отдалеченото хранилище за командите „git pull/status“" -#: builtin/push.c:563 +#: builtin/push.c:564 msgid "prune locally removed refs" msgstr "окастряне на указателите, които са премахнати от локалното хранилище" -#: builtin/push.c:565 +#: builtin/push.c:566 msgid "bypass pre-push hook" msgstr "без изпълнение на куката преди изтласкване (pre-push)" -#: builtin/push.c:566 +#: builtin/push.c:567 msgid "push missing but relevant tags" msgstr "" "изтласкване на липсващите в отдалеченото хранилище, но свързани с текущото " "изтласкване, етикети" -#: builtin/push.c:569 builtin/send-pack.c:169 +#: builtin/push.c:570 builtin/send-pack.c:169 msgid "GPG sign the push" msgstr "подписване на изтласкването с GPG" -#: builtin/push.c:571 builtin/send-pack.c:176 +#: builtin/push.c:572 builtin/send-pack.c:176 msgid "request atomic transaction on remote side" msgstr "изискване на атомарни операции от отсрещната страна" -#: builtin/push.c:589 +#: builtin/push.c:590 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "" "опцията „--delete“ е несъвместима с опциите „--all“, „--mirror“ и „--tags“" -#: builtin/push.c:591 +#: builtin/push.c:592 msgid "--delete doesn't make sense without any refs" msgstr "опцията „--delete“ изисква поне един указател на версия" -#: builtin/push.c:611 +#: builtin/push.c:612 #, c-format msgid "bad repository '%s'" msgstr "неправилно указано хранилище „%s“" -#: builtin/push.c:612 +#: builtin/push.c:613 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -17495,27 +18040,27 @@ msgstr "" "\n" " git push ИМЕ\n" -#: builtin/push.c:627 +#: builtin/push.c:628 msgid "--all and --tags are incompatible" msgstr "опциите „--all“ и „--tags“ са несъвместими" -#: builtin/push.c:629 +#: builtin/push.c:630 msgid "--all can't be combined with refspecs" msgstr "опцията „--all“ е несъвместима с указването на версия" -#: builtin/push.c:633 +#: builtin/push.c:634 msgid "--mirror and --tags are incompatible" msgstr "опциите „--mirror“ и „--tags“ са несъвместими" -#: builtin/push.c:635 +#: builtin/push.c:636 msgid "--mirror can't be combined with refspecs" msgstr "опцията „--mirror“ е несъвместима с указването на версия" -#: builtin/push.c:638 +#: builtin/push.c:639 msgid "--all and --mirror are incompatible" msgstr "опциите „--all“ и „--mirror“ са несъвместими" -#: builtin/push.c:642 +#: builtin/push.c:643 msgid "push options must not have new line characters" msgstr "опциите за изтласкване не трябва да съдържат знак за нов ред" @@ -17531,24 +18076,32 @@ msgstr "git range-diff [ОПЦИЯ…] СТАР_ВРЪХ...НОВ_ВРЪХ" msgid "git range-diff [] " msgstr "git range-diff [ОПЦИЯ…] БАЗА СТАР_ВРЪХ НОВ_ВРЪХ" -#: builtin/range-diff.c:21 +#: builtin/range-diff.c:22 msgid "Percentage by which creation is weighted" msgstr "Процент за оценка на създаването" -#: builtin/range-diff.c:23 +#: builtin/range-diff.c:24 msgid "use simple diff colors" msgstr "използване на прости цветове за разликите" -#: builtin/range-diff.c:46 builtin/range-diff.c:50 +#: builtin/range-diff.c:26 +msgid "notes" +msgstr "бележки" + +#: builtin/range-diff.c:26 +msgid "passed to 'git log'" +msgstr "подава се на командата „git log“" + +#: builtin/range-diff.c:50 builtin/range-diff.c:54 #, c-format msgid "no .. in range: '%s'" msgstr "„..“ липсва в диапазона „%s“" -#: builtin/range-diff.c:60 +#: builtin/range-diff.c:64 msgid "single arg format must be symmetric range" msgstr "вариантът с единствен аргумент изисква симетричен диапазон" -#: builtin/range-diff.c:75 +#: builtin/range-diff.c:79 msgid "need two commit ranges" msgstr "необходими са два диапазона с подавания" @@ -17631,6 +18184,10 @@ msgstr "изчистване на грешки в командата „unpack-t msgid "suppress feedback messages" msgstr "без информационни съобщения" +#: builtin/read-tree.c:188 +msgid "You need to resolve your current index first" +msgstr "Първо трябва да коригирате индекса си" + #: builtin/rebase.c:32 msgid "" "git rebase [-i] [options] [--exec ] [--onto | --keep-base] " @@ -17649,220 +18206,220 @@ msgstr "" msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209 +#: builtin/rebase.c:177 builtin/rebase.c:201 builtin/rebase.c:228 #, c-format msgid "unusable todo list: '%s'" msgstr "неуспешно изтриване на списъка за изпълнение: „%s“" -#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217 +#: builtin/rebase.c:186 builtin/rebase.c:212 builtin/rebase.c:236 #, c-format msgid "could not write '%s'." msgstr "„%s“ не може да се запише." -#: builtin/rebase.c:252 +#: builtin/rebase.c:271 msgid "no HEAD?" msgstr "Липсва указател „HEAD“" -#: builtin/rebase.c:279 +#: builtin/rebase.c:298 #, c-format msgid "could not create temporary %s" msgstr "не може да се създаде временна директория „%s“" -#: builtin/rebase.c:285 +#: builtin/rebase.c:304 msgid "could not mark as interactive" msgstr "невъзможно задаване на интерактивна работа" -#: builtin/rebase.c:343 +#: builtin/rebase.c:362 msgid "could not generate todo list" msgstr "файлът с командите не може да се генерира" -#: builtin/rebase.c:383 +#: builtin/rebase.c:402 msgid "a base commit must be provided with --upstream or --onto" msgstr "опциите „--upstream“ и „--onto“ изискват базово подаване" -#: builtin/rebase.c:438 +#: builtin/rebase.c:457 msgid "git rebase--interactive []" msgstr "git rebase--interactive [ОПЦИЯ…]" -#: builtin/rebase.c:450 +#: builtin/rebase.c:469 msgid "keep empty commits" msgstr "запазване на празните подавания" -#: builtin/rebase.c:452 builtin/revert.c:128 +#: builtin/rebase.c:471 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "позволяване на празни съобщения при подаване" -#: builtin/rebase.c:453 +#: builtin/rebase.c:472 msgid "rebase merge commits" msgstr "пребазиране на подаванията със сливания" -#: builtin/rebase.c:455 +#: builtin/rebase.c:474 msgid "keep original branch points of cousins" msgstr "" "запазване на първоначалните точки на разклоняване на сестринските клони" -#: builtin/rebase.c:457 +#: builtin/rebase.c:476 msgid "move commits that begin with squash!/fixup!" msgstr "преместване на подаванията, които започват със „squash!“/“fixup!“" -#: builtin/rebase.c:458 +#: builtin/rebase.c:477 msgid "sign commits" msgstr "подписване на подаванията" -#: builtin/rebase.c:460 builtin/rebase.c:1427 +#: builtin/rebase.c:479 builtin/rebase.c:1455 msgid "display a diffstat of what changed upstream" msgstr "извеждане на статистика с промените в следения клон" -#: builtin/rebase.c:462 +#: builtin/rebase.c:481 msgid "continue rebase" msgstr "продължаване на пребазирането" -#: builtin/rebase.c:464 +#: builtin/rebase.c:483 msgid "skip commit" msgstr "прескачане на подаване" -#: builtin/rebase.c:465 +#: builtin/rebase.c:484 msgid "edit the todo list" msgstr "редактиране на списъка с команди за изпълнение" -#: builtin/rebase.c:467 +#: builtin/rebase.c:486 msgid "show the current patch" msgstr "извеждане на текущата кръпка" -#: builtin/rebase.c:470 +#: builtin/rebase.c:489 msgid "shorten commit ids in the todo list" msgstr "съкратени идентификатори в списъка за изпълнение" -#: builtin/rebase.c:472 +#: builtin/rebase.c:491 msgid "expand commit ids in the todo list" msgstr "пълни идентификатори в списъка за изпълнение" -#: builtin/rebase.c:474 +#: builtin/rebase.c:493 msgid "check the todo list" msgstr "проверка на списъка за изпълнение" -#: builtin/rebase.c:476 +#: builtin/rebase.c:495 msgid "rearrange fixup/squash lines" msgstr "" "преподреждане на редовете за вкарване на подаванията подаванията в " "предходните им със и без смени на съобщението" -#: builtin/rebase.c:478 +#: builtin/rebase.c:497 msgid "insert exec commands in todo list" msgstr "вмъкване на командите за изпълнение в списъка за изпълнение" -#: builtin/rebase.c:479 +#: builtin/rebase.c:498 msgid "onto" msgstr "върху" -#: builtin/rebase.c:482 +#: builtin/rebase.c:501 msgid "restrict-revision" msgstr "ограничена версия" -#: builtin/rebase.c:482 +#: builtin/rebase.c:501 msgid "restrict revision" msgstr "ограничена версия" -#: builtin/rebase.c:484 +#: builtin/rebase.c:503 msgid "squash-onto" msgstr "подаване, в което другите да се вкарат" -#: builtin/rebase.c:485 +#: builtin/rebase.c:504 msgid "squash onto" msgstr "подаване, в което другите да се вкарат" -#: builtin/rebase.c:487 +#: builtin/rebase.c:506 msgid "the upstream commit" msgstr "подаване на източника" -#: builtin/rebase.c:489 +#: builtin/rebase.c:508 msgid "head-name" msgstr "име на върха" -#: builtin/rebase.c:489 +#: builtin/rebase.c:508 msgid "head name" msgstr "име на върха" -#: builtin/rebase.c:494 +#: builtin/rebase.c:513 msgid "rebase strategy" msgstr "стратегия на пребазиране" -#: builtin/rebase.c:495 +#: builtin/rebase.c:514 msgid "strategy-opts" msgstr "опции на стратегията" -#: builtin/rebase.c:496 +#: builtin/rebase.c:515 msgid "strategy options" msgstr "опции на стратегията" -#: builtin/rebase.c:497 +#: builtin/rebase.c:516 msgid "switch-to" msgstr "преминаване към" -#: builtin/rebase.c:498 +#: builtin/rebase.c:517 msgid "the branch or commit to checkout" msgstr "клонът, към който да се премине" -#: builtin/rebase.c:499 +#: builtin/rebase.c:518 msgid "onto-name" msgstr "име на база" -#: builtin/rebase.c:499 +#: builtin/rebase.c:518 msgid "onto name" msgstr "име на база" -#: builtin/rebase.c:500 +#: builtin/rebase.c:519 msgid "cmd" msgstr "команда" -#: builtin/rebase.c:500 +#: builtin/rebase.c:519 msgid "the command to run" msgstr "команда за изпълнение" -#: builtin/rebase.c:503 builtin/rebase.c:1510 +#: builtin/rebase.c:522 builtin/rebase.c:1540 msgid "automatically re-schedule any `exec` that fails" msgstr "" "автоматично подаване за повторно изпълнение на командите завършили с неуспех" -#: builtin/rebase.c:519 +#: builtin/rebase.c:540 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "опциите „--[no-]rebase-cousins“ изискват опцията „--rebase-merges“" -#: builtin/rebase.c:535 +#: builtin/rebase.c:556 #, c-format msgid "%s requires an interactive rebase" msgstr "„%s“ изисква интерактивно пребазиране" -#: builtin/rebase.c:587 +#: builtin/rebase.c:608 #, c-format msgid "could not get 'onto': '%s'" msgstr "не може да се премине към новата база, зададена с „onto“: „%s“" -#: builtin/rebase.c:602 +#: builtin/rebase.c:623 #, c-format msgid "invalid orig-head: '%s'" msgstr "неправилен указател към първоначален връх „orig-head“: „%s“" -#: builtin/rebase.c:627 +#: builtin/rebase.c:648 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "неправилната стойност на „allow_rerere_autoupdate“ се прескача: „%s“" -#: builtin/rebase.c:703 +#: builtin/rebase.c:724 #, c-format msgid "Could not read '%s'" msgstr "Пътят „%s“ не може да бъде прочетен" -#: builtin/rebase.c:721 +#: builtin/rebase.c:742 #, c-format msgid "Cannot store %s" msgstr "„%s“ не може да бъде запазен" -#: builtin/rebase.c:828 +#: builtin/rebase.c:849 msgid "could not determine HEAD revision" msgstr "не може да се определи към какво да сочи указателят „HEAD“" -#: builtin/rebase.c:951 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:972 git-rebase--preserve-merges.sh:81 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm \", then run \"git rebase --continue\".\n" @@ -17876,7 +18433,7 @@ msgstr "" "За да откажете пребазирането и да се върнете към първоначалното състояние,\n" "изпълнете „git rebase --abort“." -#: builtin/rebase.c:1032 +#: builtin/rebase.c:1060 #, c-format msgid "" "\n" @@ -17894,7 +18451,7 @@ msgstr "" "\n" "В резултат те не могат да се пребазират." -#: builtin/rebase.c:1339 +#: builtin/rebase.c:1367 #, c-format msgid "" "%s\n" @@ -17911,7 +18468,7 @@ msgstr "" " git rebase КЛОН\n" "\n" -#: builtin/rebase.c:1355 +#: builtin/rebase.c:1383 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -17924,139 +18481,151 @@ msgstr "" "\n" " git branch --set-upstream-to=%s/КЛОН %s\n" -#: builtin/rebase.c:1385 +#: builtin/rebase.c:1413 msgid "exec commands cannot contain newlines" msgstr "командите за изпълнение не може да съдържат нови редове" -#: builtin/rebase.c:1389 +#: builtin/rebase.c:1417 msgid "empty exec command" msgstr "празна команда за изпълнение" -#: builtin/rebase.c:1418 +#: builtin/rebase.c:1446 msgid "rebase onto given branch instead of upstream" msgstr "пребазиране върху зададения, а не следения клон" -#: builtin/rebase.c:1420 +#: builtin/rebase.c:1448 msgid "use the merge-base of upstream and branch as the current base" msgstr "за текуща база да се ползва базата за сливане на клона и следеното" -#: builtin/rebase.c:1422 +#: builtin/rebase.c:1450 msgid "allow pre-rebase hook to run" msgstr "позволяване на куката преди пребазиране да се изпълни" -#: builtin/rebase.c:1424 +#: builtin/rebase.c:1452 msgid "be quiet. implies --no-stat" msgstr "без извеждане на информация. Включва опцията „--no-stat“" -#: builtin/rebase.c:1430 +#: builtin/rebase.c:1458 msgid "do not show diffstat of what changed upstream" msgstr "без извеждане на статистика с промените в следения клон" -#: builtin/rebase.c:1433 +#: builtin/rebase.c:1461 msgid "add a Signed-off-by: line to each commit" msgstr "" "добавяне на ред за подпис „Signed-off-by“ в съобщението на всяко подаване" -#: builtin/rebase.c:1435 builtin/rebase.c:1439 builtin/rebase.c:1441 -msgid "passed to 'git am'" -msgstr "подава се на командата „git am“" +#: builtin/rebase.c:1464 +msgid "make committer date match author date" +msgstr "датата на подаване да е датата от автора" + +#: builtin/rebase.c:1466 +msgid "ignore author date and use current date" +msgstr "ползване на текущата дата, а не тази от автора" -#: builtin/rebase.c:1443 builtin/rebase.c:1445 +#: builtin/rebase.c:1468 +msgid "synonym of --reset-author-date" +msgstr "псевдоним на „--reset-author-date“" + +#: builtin/rebase.c:1470 builtin/rebase.c:1474 msgid "passed to 'git apply'" msgstr "подава се на командата „git apply“" -#: builtin/rebase.c:1447 builtin/rebase.c:1450 +#: builtin/rebase.c:1472 +msgid "ignore changes in whitespace" +msgstr "без промени в празните знаци" + +#: builtin/rebase.c:1476 builtin/rebase.c:1479 msgid "cherry-pick all commits, even if unchanged" msgstr "отбиране на всички подавания дори да няма промени" -#: builtin/rebase.c:1452 +#: builtin/rebase.c:1481 msgid "continue" msgstr "продължаване" -#: builtin/rebase.c:1455 +#: builtin/rebase.c:1484 msgid "skip current patch and continue" msgstr "прескачане на текущата кръпка и продължаване" -#: builtin/rebase.c:1457 +#: builtin/rebase.c:1486 msgid "abort and check out the original branch" msgstr "преустановяване и възстановяване на първоначалния клон" -#: builtin/rebase.c:1460 +#: builtin/rebase.c:1489 msgid "abort but keep HEAD where it is" msgstr "преустановяване без промяна към какво сочи „HEAD“" -#: builtin/rebase.c:1461 +#: builtin/rebase.c:1490 msgid "edit the todo list during an interactive rebase" msgstr "редактиране на файла с команди при интерактивно пребазиране" -#: builtin/rebase.c:1464 +#: builtin/rebase.c:1493 msgid "show the patch file being applied or merged" msgstr "показване на кръпката, която се прилага или слива" -#: builtin/rebase.c:1467 +#: builtin/rebase.c:1496 msgid "use merging strategies to rebase" msgstr "при пребазиране да се ползва стратегия за сливане" -#: builtin/rebase.c:1471 +#: builtin/rebase.c:1500 msgid "let the user edit the list of commits to rebase" msgstr "" "позволяване на потребителя да редактира списъка с подавания за пребазиране" -#: builtin/rebase.c:1475 +#: builtin/rebase.c:1504 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "(остаряло) пресъздаване на сливанията вместо да се прескачат" -#: builtin/rebase.c:1479 +#: builtin/rebase.c:1509 msgid "preserve empty commits during rebase" msgstr "запазване на празните подавания при пребазиране" -#: builtin/rebase.c:1481 +#: builtin/rebase.c:1511 msgid "move commits that begin with squash!/fixup! under -i" msgstr "" "преместване на подаванията, които започват със „squash!“/“fixup!“ при „-i“" -#: builtin/rebase.c:1487 +#: builtin/rebase.c:1517 msgid "automatically stash/stash pop before and after" msgstr "автоматично скатаване/прилагане на скатаното преди и след пребазиране" -#: builtin/rebase.c:1489 +#: builtin/rebase.c:1519 msgid "add exec lines after each commit of the editable list" msgstr "" "добавяне на редове с команди за изпълнение след всяко подаване в " "редактирания списък" -#: builtin/rebase.c:1493 +#: builtin/rebase.c:1523 msgid "allow rebasing commits with empty messages" msgstr "позволяване на пребазиране на подавания с празни съобщения" -#: builtin/rebase.c:1496 +#: builtin/rebase.c:1526 msgid "try to rebase merges instead of skipping them" msgstr "опит за пребазиране на сливанията вместо те да се прескачат" -#: builtin/rebase.c:1499 +#: builtin/rebase.c:1529 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "" "за доуточняването на следения клон, използвайте:\n" "\n" " git merge-base --fork-point" -#: builtin/rebase.c:1501 +#: builtin/rebase.c:1531 msgid "use the given merge strategy" msgstr "използване на зададената стратегията на сливане" -#: builtin/rebase.c:1503 builtin/revert.c:115 +#: builtin/rebase.c:1533 builtin/revert.c:115 msgid "option" msgstr "опция" -#: builtin/rebase.c:1504 +#: builtin/rebase.c:1534 msgid "pass the argument through to the merge strategy" msgstr "аргументът да се подаде на стратегията за сливане" -#: builtin/rebase.c:1507 +#: builtin/rebase.c:1537 msgid "rebase all reachable commits up to the root(s)" msgstr "пребазиране на всички достижими подавания до началното им подаване" -#: builtin/rebase.c:1524 +#: builtin/rebase.c:1554 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -18064,41 +18633,41 @@ msgstr "" "поддръжката на „rebase.useBuiltin“ е премахната.\n" "За повече информация вижте „git help config“." -#: builtin/rebase.c:1530 +#: builtin/rebase.c:1560 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "" "Изглежда, че сега се прилагат кръпки чрез командата „git-am“. Не може да " "пребазирате в момента." -#: builtin/rebase.c:1571 +#: builtin/rebase.c:1601 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "" "Опцията „--preserve-merges“ е остаряла. Ползвайте „--rebase-merges“ вместо " "нея." -#: builtin/rebase.c:1576 +#: builtin/rebase.c:1606 msgid "cannot combine '--keep-base' with '--onto'" msgstr "опциите „--keep-base“ и „--onto“ са несъвместими" -#: builtin/rebase.c:1578 +#: builtin/rebase.c:1608 msgid "cannot combine '--keep-base' with '--root'" msgstr "опциите „--keep-base“ и „--root“ са несъвместими" -#: builtin/rebase.c:1582 +#: builtin/rebase.c:1612 msgid "No rebase in progress?" msgstr "Изглежда в момента не тече пребазиране" -#: builtin/rebase.c:1586 +#: builtin/rebase.c:1616 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "Опцията „--edit-todo“ е достъпна само по време на интерактивно пребазиране." -#: builtin/rebase.c:1609 +#: builtin/rebase.c:1639 msgid "Cannot read HEAD" msgstr "Указателят „HEAD“ не може да бъде прочетен" -#: builtin/rebase.c:1621 +#: builtin/rebase.c:1651 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -18106,16 +18675,16 @@ msgstr "" "Трябва да редактирате всички конфликти при сливането. След това\n" "отбележете коригирането им чрез командата „git add“" -#: builtin/rebase.c:1640 +#: builtin/rebase.c:1670 msgid "could not discard worktree changes" msgstr "промените в работното дърво не могат да бъдат занулени" -#: builtin/rebase.c:1659 +#: builtin/rebase.c:1689 #, c-format msgid "could not move back to %s" msgstr "връщането към „%s“ е невъзможно" -#: builtin/rebase.c:1704 +#: builtin/rebase.c:1734 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -18136,163 +18705,163 @@ msgstr "" "за\n" "да не загубите случайно промени.\n" -#: builtin/rebase.c:1725 +#: builtin/rebase.c:1757 msgid "switch `C' expects a numerical value" msgstr "опцията „C“ очаква число за аргумент" -#: builtin/rebase.c:1766 +#: builtin/rebase.c:1798 #, c-format msgid "Unknown mode: %s" msgstr "Неизвестна стратегия: „%s“" -#: builtin/rebase.c:1788 +#: builtin/rebase.c:1820 msgid "--strategy requires --merge or --interactive" msgstr "" "опцията „--strategy“ изисква някоя от опциите „--merge“ или „--interactive“" -#: builtin/rebase.c:1828 +#: builtin/rebase.c:1860 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "" "опцията „--reschedule-failed-exec“ изисква някоя от опциите „--exec“ или „--" "interactive“" -#: builtin/rebase.c:1840 +#: builtin/rebase.c:1872 msgid "cannot combine am options with either interactive or merge options" msgstr "" "опциите за „am“ са несъвместими с опциите за сливане или за интерактивна " "работа" -#: builtin/rebase.c:1859 +#: builtin/rebase.c:1891 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "опциите „--preserve-merges“ и „--rebase-merges“ са несъвместими" -#: builtin/rebase.c:1863 +#: builtin/rebase.c:1895 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" "ГРЕШКА: опциите „--preserve-merges“ и „--reschedule-failed-exec“ са " "несъвместими" -#: builtin/rebase.c:1887 +#: builtin/rebase.c:1919 #, c-format msgid "invalid upstream '%s'" msgstr "неправилен следен клон: „%s“" -#: builtin/rebase.c:1893 +#: builtin/rebase.c:1925 msgid "Could not create new root commit" msgstr "Не може да се създаде ново начално подаване" -#: builtin/rebase.c:1919 +#: builtin/rebase.c:1951 #, c-format msgid "'%s': need exactly one merge base with branch" msgstr "„%s“: изисква се точно една база за сливане с клона" -#: builtin/rebase.c:1922 +#: builtin/rebase.c:1954 #, c-format msgid "'%s': need exactly one merge base" msgstr "„%s“: изисква се точно една база за пребазиране" -#: builtin/rebase.c:1930 +#: builtin/rebase.c:1962 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "Указателят „%s“ не сочи към подаване" -#: builtin/rebase.c:1955 +#: builtin/rebase.c:1987 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "ФАТАЛНА ГРЕШКА: не съществува клон „%s“" -#: builtin/rebase.c:1963 builtin/submodule--helper.c:38 -#: builtin/submodule--helper.c:1934 +#: builtin/rebase.c:1995 builtin/submodule--helper.c:40 +#: builtin/submodule--helper.c:1961 #, c-format msgid "No such ref: %s" msgstr "Такъв указател няма: %s" -#: builtin/rebase.c:1974 +#: builtin/rebase.c:2006 msgid "Could not resolve HEAD to a revision" msgstr "Подаването, сочено от указателя „HEAD“, не може да бъде открито" -#: builtin/rebase.c:2012 +#: builtin/rebase.c:2044 msgid "Cannot autostash" msgstr "Не може да се скатае автоматично" -#: builtin/rebase.c:2015 +#: builtin/rebase.c:2047 #, c-format msgid "Unexpected stash response: '%s'" msgstr "Неочакван резултат при скатаване: „%s“" -#: builtin/rebase.c:2021 +#: builtin/rebase.c:2053 #, c-format msgid "Could not create directory for '%s'" msgstr "Директорията за „%s“ не може да бъде създадена" -#: builtin/rebase.c:2024 +#: builtin/rebase.c:2056 #, c-format msgid "Created autostash: %s\n" msgstr "Автоматично скатано: „%s“\n" -#: builtin/rebase.c:2027 +#: builtin/rebase.c:2059 msgid "could not reset --hard" msgstr "неуспешно изпълнение на „git reset --hard“" -#: builtin/rebase.c:2036 +#: builtin/rebase.c:2068 msgid "Please commit or stash them." msgstr "Промените трябва или да се подадат, или да се скатаят." -#: builtin/rebase.c:2063 +#: builtin/rebase.c:2095 #, c-format msgid "could not parse '%s'" msgstr "„%s“ не може да се анализира" -#: builtin/rebase.c:2076 +#: builtin/rebase.c:2108 #, c-format msgid "could not switch to %s" msgstr "не може да се премине към „%s“" -#: builtin/rebase.c:2087 +#: builtin/rebase.c:2119 msgid "HEAD is up to date." msgstr "Указателят „HEAD“ е напълно актуален." -#: builtin/rebase.c:2089 +#: builtin/rebase.c:2121 #, c-format msgid "Current branch %s is up to date.\n" msgstr "Текущият клон „%s“ е напълно актуален.\n" -#: builtin/rebase.c:2097 +#: builtin/rebase.c:2129 msgid "HEAD is up to date, rebase forced." msgstr "Указателят „HEAD“ е напълно актуален — принудително пребазиране" -#: builtin/rebase.c:2099 +#: builtin/rebase.c:2131 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "Текущият клон „%s“ е напълно актуален — принудително пребазиране\n" -#: builtin/rebase.c:2107 +#: builtin/rebase.c:2139 msgid "The pre-rebase hook refused to rebase." msgstr "Куката за изпълнение преди пребазиране отхвърли пребазирането." -#: builtin/rebase.c:2114 +#: builtin/rebase.c:2146 #, c-format msgid "Changes to %s:\n" msgstr "Промените в „%s“:\n" -#: builtin/rebase.c:2117 +#: builtin/rebase.c:2149 #, c-format msgid "Changes from %s to %s:\n" msgstr "Промените от „%s“ към „%s“:\n" -#: builtin/rebase.c:2142 +#: builtin/rebase.c:2174 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" "Първо, указателят „HEAD“ започва да сочи към базата, върху която " "пребазирате…\n" -#: builtin/rebase.c:2151 +#: builtin/rebase.c:2183 msgid "Could not detach HEAD" msgstr "Указателят „HEAD“ не може да се отделѝ" -#: builtin/rebase.c:2160 +#: builtin/rebase.c:2192 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Превъртане на „%s“ към „%s“.\n" @@ -18587,7 +19156,7 @@ msgstr "(съвпадащи)" msgid "(delete)" msgstr "(за изтриване)" -#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864 +#: builtin/remote.c:629 builtin/remote.c:764 builtin/remote.c:863 #, c-format msgid "No such remote: '%s'" msgstr "Няма отдалечено хранилище на име „%s“" @@ -18608,17 +19177,17 @@ msgstr "" " %s\n" " Променете настройките ръчно, ако е необходимо." -#: builtin/remote.c:702 +#: builtin/remote.c:701 #, c-format msgid "deleting '%s' failed" msgstr "неуспешно изтриване на „%s“" -#: builtin/remote.c:736 +#: builtin/remote.c:735 #, c-format msgid "creating '%s' failed" msgstr "неуспешно създаване на „%s“" -#: builtin/remote.c:802 +#: builtin/remote.c:801 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -18632,121 +19201,121 @@ msgstr[1] "" "Бележка: Няколко клона извън йерархията „refs/remotes/“ не бяха изтрити.\n" "Изтрийте ги чрез командата:" -#: builtin/remote.c:816 +#: builtin/remote.c:815 #, c-format msgid "Could not remove config section '%s'" msgstr "Разделът „%s“ в настройките не може да бъде изтрит" -#: builtin/remote.c:917 +#: builtin/remote.c:916 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " нов (следващото доставяне ще го разположи в „remotes/%s“)" -#: builtin/remote.c:920 +#: builtin/remote.c:919 msgid " tracked" msgstr " следен" -#: builtin/remote.c:922 +#: builtin/remote.c:921 msgid " stale (use 'git remote prune' to remove)" msgstr " стар (изтрийте чрез „git remote prune“)" -#: builtin/remote.c:924 +#: builtin/remote.c:923 msgid " ???" msgstr " неясно състояние" # CHECK -#: builtin/remote.c:965 +#: builtin/remote.c:964 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "" "неправилен клон за сливане „%s“. Невъзможно е да пребазирате върху повече " "от 1 клон" -#: builtin/remote.c:974 +#: builtin/remote.c:973 #, c-format msgid "rebases interactively onto remote %s" msgstr "интерактивно пребазиране върху отдалечения клон „%s“" -#: builtin/remote.c:976 +#: builtin/remote.c:975 #, c-format msgid "rebases interactively (with merges) onto remote %s" msgstr "интерактивно пребазиране (със сливания) върху отдалечения клон „%s“" -#: builtin/remote.c:979 +#: builtin/remote.c:978 #, c-format msgid "rebases onto remote %s" msgstr "пребазиране върху отдалечения клон „%s“" -#: builtin/remote.c:983 +#: builtin/remote.c:982 #, c-format msgid " merges with remote %s" msgstr " сливане с отдалечения клон „%s“" -#: builtin/remote.c:986 +#: builtin/remote.c:985 #, c-format msgid "merges with remote %s" msgstr "сливане с отдалечения клон „%s“" -#: builtin/remote.c:989 +#: builtin/remote.c:988 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s и с отдалечения клон „%s“\n" -#: builtin/remote.c:1032 +#: builtin/remote.c:1031 msgid "create" msgstr "създаден" -#: builtin/remote.c:1035 +#: builtin/remote.c:1034 msgid "delete" msgstr "изтрит" -#: builtin/remote.c:1039 +#: builtin/remote.c:1038 msgid "up to date" msgstr "актуален" -#: builtin/remote.c:1042 +#: builtin/remote.c:1041 msgid "fast-forwardable" msgstr "може да се превърти" -#: builtin/remote.c:1045 +#: builtin/remote.c:1044 msgid "local out of date" msgstr "локалният е изостанал" -#: builtin/remote.c:1052 +#: builtin/remote.c:1051 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s принудително изтласква към %-*s (%s)" -#: builtin/remote.c:1055 +#: builtin/remote.c:1054 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s изтласква към %-*s (%s)" -#: builtin/remote.c:1059 +#: builtin/remote.c:1058 #, c-format msgid " %-*s forces to %s" msgstr " %-*s принудително изтласква към %s" -#: builtin/remote.c:1062 +#: builtin/remote.c:1061 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s изтласква към %s" -#: builtin/remote.c:1130 +#: builtin/remote.c:1129 msgid "do not query remotes" msgstr "без заявки към отдалечените хранилища" -#: builtin/remote.c:1157 +#: builtin/remote.c:1156 #, c-format msgid "* remote %s" msgstr "● отдалечено хранилище „%s“" -#: builtin/remote.c:1158 +#: builtin/remote.c:1157 #, c-format msgid " Fetch URL: %s" msgstr " Адрес за доставяне: %s" -#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314 +#: builtin/remote.c:1158 builtin/remote.c:1174 builtin/remote.c:1313 msgid "(no URL)" msgstr "(без адрес)" @@ -18754,25 +19323,25 @@ msgstr "(без адрес)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1173 builtin/remote.c:1175 +#: builtin/remote.c:1172 builtin/remote.c:1174 #, c-format msgid " Push URL: %s" msgstr " Адрес за изтласкване: %s" -#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181 +#: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180 #, c-format msgid " HEAD branch: %s" msgstr " клон сочен от HEAD: %s" -#: builtin/remote.c:1177 +#: builtin/remote.c:1176 msgid "(not queried)" msgstr "(без проверка)" -#: builtin/remote.c:1179 +#: builtin/remote.c:1178 msgid "(unknown)" msgstr "(непознат)" -#: builtin/remote.c:1183 +#: builtin/remote.c:1182 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" @@ -18781,165 +19350,156 @@ msgstr "" "хранилище\n" " не е еднозначен и е някой от следните):\n" -#: builtin/remote.c:1195 +#: builtin/remote.c:1194 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Отдалечен клон:%s" msgstr[1] " Отдалечени клони:%s" -#: builtin/remote.c:1198 builtin/remote.c:1224 +#: builtin/remote.c:1197 builtin/remote.c:1223 msgid " (status not queried)" msgstr " (състоянието не бе проверено)" -#: builtin/remote.c:1207 +#: builtin/remote.c:1206 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Локален клон настроен за издърпване чрез „git pull“:" msgstr[1] " Локални клони настроени за издърпване чрез „git pull“:" -#: builtin/remote.c:1215 +#: builtin/remote.c:1214 msgid " Local refs will be mirrored by 'git push'" msgstr " Локалните указатели ще бъдат пренесени чрез „ push“" -#: builtin/remote.c:1221 +#: builtin/remote.c:1220 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Локалният указател, настроен за „git push“%s:" msgstr[1] " Локалните указатели, настроени за „git push“%s:" -#: builtin/remote.c:1242 +#: builtin/remote.c:1241 msgid "set refs/remotes//HEAD according to remote" msgstr "задаване на refs/remotes/ИМЕ/HEAD според отдалеченото хранилище" -#: builtin/remote.c:1244 +#: builtin/remote.c:1243 msgid "delete refs/remotes//HEAD" msgstr "изтриване на refs/remotes/ИМЕ/HEAD" -#: builtin/remote.c:1259 +#: builtin/remote.c:1258 msgid "Cannot determine remote HEAD" msgstr "Не може да се установи отдалеченият връх" -#: builtin/remote.c:1261 +#: builtin/remote.c:1260 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" "Множество клони с върхове. Изберете изрично някой от тях чрез командата:" -#: builtin/remote.c:1271 +#: builtin/remote.c:1270 #, c-format msgid "Could not delete %s" msgstr "„%s“ не може да бъде изтрит" -#: builtin/remote.c:1279 +#: builtin/remote.c:1278 #, c-format msgid "Not a valid ref: %s" msgstr "Неправилен указател: %s" -#: builtin/remote.c:1281 +#: builtin/remote.c:1280 #, c-format msgid "Could not setup %s" msgstr "„%s“ не може да се настрои" -#: builtin/remote.c:1299 +#: builtin/remote.c:1298 #, c-format msgid " %s will become dangling!" msgstr "„%s“ ще се превърне в обект извън клоните!" -#: builtin/remote.c:1300 +#: builtin/remote.c:1299 #, c-format msgid " %s has become dangling!" msgstr "„%s“ се превърна в обект извън клоните!" -#: builtin/remote.c:1310 +#: builtin/remote.c:1309 #, c-format msgid "Pruning %s" msgstr "Окастряне на „%s“" -#: builtin/remote.c:1311 +#: builtin/remote.c:1310 #, c-format msgid "URL: %s" msgstr "адрес: %s" -#: builtin/remote.c:1327 +#: builtin/remote.c:1326 #, c-format msgid " * [would prune] %s" msgstr " ● [ще бъде окастрено] %s" -#: builtin/remote.c:1330 +#: builtin/remote.c:1329 #, c-format msgid " * [pruned] %s" msgstr " ● [окастрено] %s" -#: builtin/remote.c:1375 +#: builtin/remote.c:1374 msgid "prune remotes after fetching" msgstr "окастряне на огледалата на отдалечените хранилища след доставяне" -#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560 +#: builtin/remote.c:1437 builtin/remote.c:1491 builtin/remote.c:1559 #, c-format msgid "No such remote '%s'" msgstr "Няма отдалечено хранилище на име „%s“" -#: builtin/remote.c:1454 +#: builtin/remote.c:1453 msgid "add branch" msgstr "добавяне на клон" -#: builtin/remote.c:1461 +#: builtin/remote.c:1460 msgid "no remote specified" msgstr "не е указано отдалечено хранилище" -#: builtin/remote.c:1478 +#: builtin/remote.c:1477 msgid "query push URLs rather than fetch URLs" msgstr "запитване към адресите за изтласкване, а не за доставяне" -#: builtin/remote.c:1480 +#: builtin/remote.c:1479 msgid "return all URLs" msgstr "извеждане на всички адреси" -#: builtin/remote.c:1508 +#: builtin/remote.c:1507 #, c-format msgid "no URLs configured for remote '%s'" msgstr "не е зададен адрес за отдалеченото хранилище „%s“" -#: builtin/remote.c:1534 +#: builtin/remote.c:1533 msgid "manipulate push URLs" msgstr "промяна на адресите за изтласкване" -#: builtin/remote.c:1536 +#: builtin/remote.c:1535 msgid "add URL" msgstr "добавяне на адреси" -#: builtin/remote.c:1538 +#: builtin/remote.c:1537 msgid "delete URLs" msgstr "изтриване на адреси" -#: builtin/remote.c:1545 +#: builtin/remote.c:1544 msgid "--add --delete doesn't make sense" msgstr "опциите „--add“ и „--delete“ са несъвместими" -#: builtin/remote.c:1584 +#: builtin/remote.c:1583 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Неправилен (стар) формат за адрес: %s" -#: builtin/remote.c:1592 +#: builtin/remote.c:1591 #, c-format msgid "No such URL found: %s" msgstr "Такъв адрес не е открит: %s" -#: builtin/remote.c:1594 +#: builtin/remote.c:1593 msgid "Will not delete all non-push URLs" msgstr "Никой от адресите, които не са за изтласкване, няма да се изтрие" -#: builtin/remote.c:1610 -msgid "be verbose; must be placed before a subcommand" -msgstr "повече подробности. Поставя се пред подкоманда" - -#: builtin/remote.c:1641 -#, c-format -msgid "Unknown subcommand: %s" -msgstr "Непозната подкоманда: %s" - #: builtin/repack.c:23 msgid "git repack []" msgstr "git repack [ОПЦИЯ…]" @@ -18959,120 +19519,120 @@ msgstr "" "командата „pack-objects“ не може да се стартира за препакетирането на " "гарантиращите обекти" -#: builtin/repack.c:230 builtin/repack.c:409 +#: builtin/repack.c:230 builtin/repack.c:416 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" -"repack: от „pack-objects“ се очакват редове само с пълни шестнайсетични " +"repack: от „pack-objects“ се изискват редове само с пълни шестнайсетични " "указатели." -#: builtin/repack.c:247 +#: builtin/repack.c:254 msgid "could not finish pack-objects to repack promisor objects" msgstr "" "командата „pack-objects“ не може да завърши за препакетирането на " "гарантиращите обекти" -#: builtin/repack.c:285 +#: builtin/repack.c:292 msgid "pack everything in a single pack" msgstr "пакетиране на всичко в пакет" -#: builtin/repack.c:287 +#: builtin/repack.c:294 msgid "same as -a, and turn unreachable objects loose" msgstr "" "същото като опцията „-a“. Допълнително — недостижимите обекти да станат " "непакетирани" -#: builtin/repack.c:290 +#: builtin/repack.c:297 msgid "remove redundant packs, and run git-prune-packed" msgstr "" "премахване на ненужните пакетирани файлове и изпълнение на командата „git-" "prune-packed“" -#: builtin/repack.c:292 +#: builtin/repack.c:299 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "подаване на опцията „--no-reuse-delta“ на командата „git-pack-objects“" -#: builtin/repack.c:294 +#: builtin/repack.c:301 msgid "pass --no-reuse-object to git-pack-objects" msgstr "" "подаване на опцията „--no-reuse-object“ на командата „git-pack-objects“" -#: builtin/repack.c:296 +#: builtin/repack.c:303 msgid "do not run git-update-server-info" msgstr "без изпълнение на командата „git-update-server-info“" -#: builtin/repack.c:299 +#: builtin/repack.c:306 msgid "pass --local to git-pack-objects" msgstr "подаване на опцията „--local“ на командата „git-pack-objects“" -#: builtin/repack.c:301 +#: builtin/repack.c:308 msgid "write bitmap index" msgstr "създаване и записване на индекси на база битови маски" -#: builtin/repack.c:303 +#: builtin/repack.c:310 msgid "pass --delta-islands to git-pack-objects" msgstr "подаване на опцията „--delta-islands“ на командата „git-pack-objects“" -#: builtin/repack.c:304 +#: builtin/repack.c:311 msgid "approxidate" msgstr "евристична дата" -#: builtin/repack.c:305 +#: builtin/repack.c:312 msgid "with -A, do not loosen objects older than this" msgstr "" "при комбинирането с опцията „-A“ — без разпакетиране на обектите по стари от " "това" -#: builtin/repack.c:307 +#: builtin/repack.c:314 msgid "with -a, repack unreachable objects" msgstr "с „-a“ — препакетиране на недостижимите обекти" -#: builtin/repack.c:309 +#: builtin/repack.c:316 msgid "size of the window used for delta compression" msgstr "размер на прозореца за делта компресията" -#: builtin/repack.c:310 builtin/repack.c:316 +#: builtin/repack.c:317 builtin/repack.c:323 msgid "bytes" msgstr "байтове" -#: builtin/repack.c:311 +#: builtin/repack.c:318 msgid "same as the above, but limit memory size instead of entries count" msgstr "" "същото като горната опция, но ограничението да е по размер на паметта, а не " "по броя на обектите" -#: builtin/repack.c:313 +#: builtin/repack.c:320 msgid "limits the maximum delta depth" msgstr "ограничаване на максималната дълбочина на делтата" -#: builtin/repack.c:315 +#: builtin/repack.c:322 msgid "limits the maximum number of threads" msgstr "ограничаване на максималния брой нишки" -#: builtin/repack.c:317 +#: builtin/repack.c:324 msgid "maximum size of each packfile" msgstr "максимален размер на всеки пакет" -#: builtin/repack.c:319 +#: builtin/repack.c:326 msgid "repack objects in packs marked with .keep" msgstr "препакетиране на обектите в пакети белязани с „.keep“" -#: builtin/repack.c:321 +#: builtin/repack.c:328 msgid "do not repack this pack" msgstr "без препакетиране на този пакет" -#: builtin/repack.c:331 +#: builtin/repack.c:338 msgid "cannot delete packs in a precious-objects repo" msgstr "пакетите в хранилище с важни обекти не може да се трият" -#: builtin/repack.c:335 +#: builtin/repack.c:342 msgid "--keep-unreachable and -A are incompatible" msgstr "Опциите „--keep-unreachable“ и „-A“ са несъвместими" -#: builtin/repack.c:418 +#: builtin/repack.c:425 msgid "Nothing new to pack." msgstr "Нищо ново за пакетиране" -#: builtin/repack.c:479 +#: builtin/repack.c:486 #, c-format msgid "" "WARNING: Some packs in use have been renamed by\n" @@ -19090,7 +19650,7 @@ msgstr "" "ПРЕДУПРЕЖДЕНИЕ: ѝ — за връщането на първоначалните имена.\n" "ПРЕДУПРЕЖДЕНИЕ: Преименувайте файловете в „%s“ ръчно:\n" -#: builtin/repack.c:527 +#: builtin/repack.c:534 #, c-format msgid "failed to remove '%s'" msgstr "директорията „%s“ не може да бъде изтрита" @@ -19367,122 +19927,130 @@ msgstr "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [ПОДАВАНЕ]" #: builtin/reset.c:33 -msgid "git reset [-q] [] [--] ..." -msgstr "git reset [-q] УКАЗАТЕЛ_КЪМ_ДЪРВО [--] ПЪТИЩА…" +msgid "git reset [-q] [] [--] ..." +msgstr "git reset [-q] [УКАЗАТЕЛ_КЪМ_ДЪРВО] [--] ПЪТИЩА…" #: builtin/reset.c:34 -msgid "git reset --patch [] [--] [...]" +msgid "" +"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] []" +msgstr "" +"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] " +"[УКАЗАТЕЛ_КЪМ_ДЪРВО]" + +#: builtin/reset.c:35 +msgid "git reset --patch [] [--] [...]" msgstr "git reset --patch [УКАЗАТЕЛ_КЪМ_ДЪРВО] [--] [ПЪТИЩА…]" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "mixed" msgstr "смесено (mixed)" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "soft" msgstr "меко (soft)" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "hard" msgstr "пълно (hard)" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "merge" msgstr "слято (merge)" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "keep" msgstr "запазващо (keep)" -#: builtin/reset.c:81 +#: builtin/reset.c:82 msgid "You do not have a valid HEAD." msgstr "Указателят „HEAD“ е повреден." -#: builtin/reset.c:83 +#: builtin/reset.c:84 msgid "Failed to find tree of HEAD." msgstr "Дървото, сочено от указателя „HEAD“, не може да бъде открито." -#: builtin/reset.c:89 +#: builtin/reset.c:90 #, c-format msgid "Failed to find tree of %s." msgstr "Дървото, сочено от „%s“, не може да бъде открито." -#: builtin/reset.c:114 +#: builtin/reset.c:115 #, c-format msgid "HEAD is now at %s" msgstr "Указателят „HEAD“ сочи към „%s“" -#: builtin/reset.c:193 +#: builtin/reset.c:194 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "Не може да се извърши %s зануляване по време на сливане." -#: builtin/reset.c:293 builtin/stash.c:520 builtin/stash.c:595 -#: builtin/stash.c:619 +#: builtin/reset.c:294 builtin/stash.c:519 builtin/stash.c:594 +#: builtin/stash.c:618 msgid "be quiet, only report errors" msgstr "по-малко подробности, да се извеждат само грешките" -#: builtin/reset.c:295 +#: builtin/reset.c:296 msgid "reset HEAD and index" msgstr "индекса и указателя „HEAD“, без работното дърво" -#: builtin/reset.c:296 +#: builtin/reset.c:297 msgid "reset only HEAD" msgstr "само указателя „HEAD“, без индекса и работното дърво" -#: builtin/reset.c:298 builtin/reset.c:300 +#: builtin/reset.c:299 builtin/reset.c:301 msgid "reset HEAD, index and working tree" msgstr "указателя „HEAD“, индекса и работното дърво" -#: builtin/reset.c:302 +#: builtin/reset.c:303 msgid "reset HEAD but keep local changes" msgstr "зануляване на указателя „HEAD“, но запазване на локалните промени" -#: builtin/reset.c:308 +#: builtin/reset.c:309 msgid "record only the fact that removed paths will be added later" msgstr "" "отбелязване само на факта, че изтритите пътища ще бъдат добавени по-късно" -#: builtin/reset.c:326 +#: builtin/reset.c:343 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "Стойността „%s“ не е разпозната като съществуваща версия." -#: builtin/reset.c:334 +#: builtin/reset.c:351 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "„%s“ не е разпознат като дърво." -#: builtin/reset.c:343 +#: builtin/reset.c:360 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "" -"опцията „--patch“ е несъвместима с всяка от опциите „--hard/--mixed/--soft“" +"опцията „--patch“ е несъвместима с всяка от опциите „--hard“/„--mixed“/„--" +"soft“" -#: builtin/reset.c:353 +#: builtin/reset.c:370 msgid "--mixed with paths is deprecated; use 'git reset -- ' instead." msgstr "" "опцията „--mixed“ не бива да се използва заедно с пътища. Вместо това " "изпълнете „git reset -- ПЪТ…“." -#: builtin/reset.c:355 +#: builtin/reset.c:372 #, c-format msgid "Cannot do %s reset with paths." msgstr "Не може да извършите %s зануляване, когато сте задали ПЪТ." -#: builtin/reset.c:370 +#: builtin/reset.c:387 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "В голо хранилище не може да извършите %s зануляване" -#: builtin/reset.c:374 +#: builtin/reset.c:391 msgid "-N can only be used with --mixed" -msgstr "Опцията „-N“ е съвместима само с „--mixed“" +msgstr "Опцията „-N“ изисква опцията „--mixed“" -#: builtin/reset.c:395 +#: builtin/reset.c:412 msgid "Unstaged changes after reset:" msgstr "Промени извън индекса след зануляването:" -#: builtin/reset.c:398 +#: builtin/reset.c:415 #, c-format msgid "" "\n" @@ -19495,12 +20063,12 @@ msgstr "" "Опцията „--quiet“ заглушава това съобщение еднократно. За постоянно\n" "заглушаване задайте настройката „reset.quiet“ да е „true“ (истина).\n" -#: builtin/reset.c:408 +#: builtin/reset.c:425 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "Индексът не може да бъде занулен към версия „%s“." -#: builtin/reset.c:412 +#: builtin/reset.c:429 msgid "Could not write new index file." msgstr "Новият индекс не може да бъде записан." @@ -19975,6 +20543,56 @@ msgstr "" "извеждане на указателите приети от стандартния вход, които липсват в " "локалното хранилище" +#: builtin/sparse-checkout.c:20 +msgid "git sparse-checkout (init|list|set|disable) " +msgstr "git sparse-checkout (init|list|set|disable) ОПЦИЯ…" + +#: builtin/sparse-checkout.c:63 +msgid "this worktree is not sparse (sparse-checkout file may not exist)" +msgstr "" +"това не е частично работно дърво (вероятно липсва файл „sparse-checkout“)" + +#: builtin/sparse-checkout.c:241 +msgid "failed to set extensions.worktreeConfig setting" +msgstr "неуспешно задаване на настройката „extensions.worktreeConfig“" + +#: builtin/sparse-checkout.c:258 +msgid "git sparse-checkout init [--cone]" +msgstr "git sparse-checkout init [--cone]" + +#: builtin/sparse-checkout.c:277 +msgid "initialize the sparse-checkout in cone mode" +msgstr "инициализиране на частичното изтегляне в пътеводен режим" + +#: builtin/sparse-checkout.c:283 +msgid "initialize sparse-checkout" +msgstr "инициализиране на частичното изтегляне" + +#: builtin/sparse-checkout.c:316 +#, c-format +msgid "failed to open '%s'" +msgstr "„%s“ не може да се отвори" + +#: builtin/sparse-checkout.c:382 +msgid "git sparse-checkout set (--stdin | )" +msgstr "git sparse-checkout set (--stdin | ШАБЛОН…)" + +#: builtin/sparse-checkout.c:399 +msgid "read patterns from standard in" +msgstr "изчитане на шаблоните от стандартния вход" + +#: builtin/sparse-checkout.c:405 +msgid "set sparse-checkout patterns" +msgstr "задаване на шаблоните за частичното изтегляне" + +#: builtin/sparse-checkout.c:468 +msgid "disable sparse-checkout" +msgstr "без използване на частично изтегляне" + +#: builtin/sparse-checkout.c:480 +msgid "error while refreshing working directory" +msgstr "грешка при обновяване на работната директория" + #: builtin/stash.c:22 builtin/stash.c:37 msgid "git stash list []" msgstr "git stash list [ОПЦИЯ…]" @@ -20039,7 +20657,7 @@ msgstr "„%s“ не е подаване, приличащо на нещо ск msgid "Too many revisions specified:%s" msgstr "Указани са прекалено много версии:%s" -#: builtin/stash.c:161 git-legacy-stash.sh:548 +#: builtin/stash.c:161 git-legacy-stash.sh:549 msgid "No stash entries found." msgstr "Не е открито нищо скатано." @@ -20080,51 +20698,51 @@ msgstr "неследени файлове не могат да се възста msgid "Merging %s with %s" msgstr "Сливане на „%s“ с „%s“" -#: builtin/stash.c:460 git-legacy-stash.sh:680 +#: builtin/stash.c:460 git-legacy-stash.sh:681 msgid "Index was not unstashed." msgstr "Индексът не е изваден от скатаното." -#: builtin/stash.c:522 builtin/stash.c:621 +#: builtin/stash.c:521 builtin/stash.c:620 msgid "attempt to recreate the index" msgstr "опит за повторно създаване на индекса" -#: builtin/stash.c:555 +#: builtin/stash.c:554 #, c-format msgid "Dropped %s (%s)" msgstr "Изтрито: „%s“ (%s)" -#: builtin/stash.c:558 +#: builtin/stash.c:557 #, c-format msgid "%s: Could not drop stash entry" msgstr "Скатаното „%s“ не може да бъде изтрито" -#: builtin/stash.c:583 +#: builtin/stash.c:582 #, c-format msgid "'%s' is not a stash reference" msgstr "„%s“ не е указател към нещо скатано" -#: builtin/stash.c:633 git-legacy-stash.sh:694 +#: builtin/stash.c:632 git-legacy-stash.sh:695 msgid "The stash entry is kept in case you need it again." msgstr "Скатаното е запазено в случай, че ви потрябва отново." -#: builtin/stash.c:656 git-legacy-stash.sh:712 +#: builtin/stash.c:655 git-legacy-stash.sh:713 msgid "No branch name specified" msgstr "Не е указано име на клон" -#: builtin/stash.c:796 builtin/stash.c:833 +#: builtin/stash.c:795 builtin/stash.c:832 #, c-format msgid "Cannot update %s with %s" msgstr "Указателят „%s“ не може да бъде обновен да сочи към „%s“" -#: builtin/stash.c:814 builtin/stash.c:1470 builtin/stash.c:1506 +#: builtin/stash.c:813 builtin/stash.c:1470 builtin/stash.c:1506 msgid "stash message" msgstr "съобщение при скатаване" -#: builtin/stash.c:824 +#: builtin/stash.c:823 msgid "\"git stash store\" requires one argument" msgstr "командата „git stash store“ изисква точно един аргумент-ПОДАВАНЕ" -#: builtin/stash.c:1046 git-legacy-stash.sh:217 +#: builtin/stash.c:1045 git-legacy-stash.sh:218 msgid "No changes selected" msgstr "Не са избрани никакви промени" @@ -20140,16 +20758,16 @@ msgstr "Състоянието на текущия индекс не може д msgid "Cannot save the untracked files" msgstr "Неследените файлове не могат да се запазят" -#: builtin/stash.c:1192 builtin/stash.c:1201 git-legacy-stash.sh:200 -#: git-legacy-stash.sh:213 +#: builtin/stash.c:1192 builtin/stash.c:1201 git-legacy-stash.sh:201 +#: git-legacy-stash.sh:214 msgid "Cannot save the current worktree state" msgstr "Състоянието на работното дърво не може да бъде запазено" -#: builtin/stash.c:1229 git-legacy-stash.sh:233 +#: builtin/stash.c:1229 git-legacy-stash.sh:234 msgid "Cannot record working tree state" msgstr "Състоянието на работното дърво не може да бъде запазено" -#: builtin/stash.c:1278 git-legacy-stash.sh:337 +#: builtin/stash.c:1278 git-legacy-stash.sh:338 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "Опцията „--patch“ е несъвместима с „--include-untracked“ и „--all“" @@ -20157,15 +20775,15 @@ msgstr "Опцията „--patch“ е несъвместима с „--include msgid "Did you forget to 'git add'?" msgstr "Пробвайте да използвате „git add“" -#: builtin/stash.c:1309 git-legacy-stash.sh:345 +#: builtin/stash.c:1309 git-legacy-stash.sh:346 msgid "No local changes to save" msgstr "Няма никакви локални промени за скатаване" -#: builtin/stash.c:1316 git-legacy-stash.sh:350 +#: builtin/stash.c:1316 git-legacy-stash.sh:351 msgid "Cannot initialize stash" msgstr "Скатаването не може да стартира" -#: builtin/stash.c:1331 git-legacy-stash.sh:354 +#: builtin/stash.c:1331 git-legacy-stash.sh:355 msgid "Cannot save the current status" msgstr "Текущото състояние не може да бъде запазено" @@ -20174,7 +20792,7 @@ msgstr "Текущото състояние не може да бъде запа msgid "Saved working directory and index state %s" msgstr "Състоянието на работната директория и индекса e запазено: „%s“" -#: builtin/stash.c:1426 git-legacy-stash.sh:384 +#: builtin/stash.c:1426 git-legacy-stash.sh:385 msgid "Cannot remove worktree changes" msgstr "Промените в работното дърво не могат да бъдат занулени" @@ -20219,41 +20837,41 @@ msgstr "пропускане на всички редове, които запо msgid "prepend comment character and space to each line" msgstr "добавяне на „# “ в началото на всеки ред" -#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943 +#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1970 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Очаква се пълно име на указател, а не „%s“" -#: builtin/submodule--helper.c:62 +#: builtin/submodule--helper.c:64 msgid "submodule--helper print-default-remote takes no arguments" msgstr "" "командата „print-default-remote“ на „submodule--helper“ не приема аргументи" -#: builtin/submodule--helper.c:100 +#: builtin/submodule--helper.c:102 #, c-format msgid "cannot strip one component off url '%s'" msgstr "не може да се махне компонент от адреса „%s“" -#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1380 msgid "alternative anchor for relative paths" msgstr "директория за определянето на относителните пътища" -#: builtin/submodule--helper.c:413 +#: builtin/submodule--helper.c:415 msgid "git submodule--helper list [--prefix=] [...]" msgstr "git submodule--helper list [--prefix=ПЪТ] [ПЪТ…]" -#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628 -#: builtin/submodule--helper.c:651 +#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630 +#: builtin/submodule--helper.c:653 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "Във файла „.gitmodules“ не е открит адрес за пътя към подмодул „%s“" -#: builtin/submodule--helper.c:522 +#: builtin/submodule--helper.c:524 #, c-format msgid "Entering '%s'\n" msgstr "Влизане в „%s“\n" -#: builtin/submodule--helper.c:525 +#: builtin/submodule--helper.c:527 #, c-format msgid "" "run_command returned non-zero status for %s\n" @@ -20262,7 +20880,7 @@ msgstr "" "изпълнената команда завърши с ненулев изход за „%s“\n" "." -#: builtin/submodule--helper.c:547 +#: builtin/submodule--helper.c:549 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -20273,19 +20891,19 @@ msgstr "" "вложени в „%s“\n" "." -#: builtin/submodule--helper.c:563 +#: builtin/submodule--helper.c:565 msgid "Suppress output of entering each submodule command" msgstr "Без извеждане на изход при въвеждането на всяка команда за подмодули" -#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050 +#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1053 msgid "Recurse into nested submodules" msgstr "Рекурсивно обхождане на подмодулите" -#: builtin/submodule--helper.c:570 +#: builtin/submodule--helper.c:572 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] " msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] КОМАНДА" -#: builtin/submodule--helper.c:597 +#: builtin/submodule--helper.c:599 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " @@ -20294,55 +20912,55 @@ msgstr "" "настройката „%s“ липсва. Приема се, че това хранилище е правилният източник " "за себе си." -#: builtin/submodule--helper.c:665 +#: builtin/submodule--helper.c:667 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Неуспешно регистриране на адрес за пътя към подмодул „%s“" -#: builtin/submodule--helper.c:669 +#: builtin/submodule--helper.c:671 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Регистриран е подмодул „%s“ (%s) за пътя към подмодул „%s“\n" -#: builtin/submodule--helper.c:679 +#: builtin/submodule--helper.c:681 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "ПРЕДУПРЕЖДЕНИЕ: препоръчва се режим на обновяване за подмодула „%s“\n" -#: builtin/submodule--helper.c:686 +#: builtin/submodule--helper.c:688 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "" "Неуспешно регистриране на режима на обновяване за пътя към подмодул „%s“" -#: builtin/submodule--helper.c:708 +#: builtin/submodule--helper.c:710 msgid "Suppress output for initializing a submodule" msgstr "Без извеждане на информация при инициализирането на подмодул" -#: builtin/submodule--helper.c:713 +#: builtin/submodule--helper.c:715 msgid "git submodule--helper init [] []" msgstr "git submodule--helper init [ОПЦИЯ…] [ПЪТ]" -#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911 +#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:914 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "Във файла „.gitmodules“ липсва информация за пътя „%s“" -#: builtin/submodule--helper.c:824 +#: builtin/submodule--helper.c:827 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "указателят сочен от „HEAD“ в подмодула „%s“ не може да бъде открит" -#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020 +#: builtin/submodule--helper.c:854 builtin/submodule--helper.c:1023 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "неуспешно рекурсивно обхождане на подмодула „%s“" -#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186 +#: builtin/submodule--helper.c:878 builtin/submodule--helper.c:1189 msgid "Suppress submodule status output" msgstr "Заглушаване на изхода за състоянието на подмодула" -#: builtin/submodule--helper.c:876 +#: builtin/submodule--helper.c:879 msgid "" "Use commit stored in the index instead of the one stored in the submodule " "HEAD" @@ -20350,47 +20968,47 @@ msgstr "" "Използване на подаването указано в индекса, а не това от указателя „HEAD“ на " "подмодула" -#: builtin/submodule--helper.c:877 +#: builtin/submodule--helper.c:880 msgid "recurse into nested submodules" msgstr "рекурсивно обхождане на подмодулите" -#: builtin/submodule--helper.c:882 +#: builtin/submodule--helper.c:885 msgid "git submodule status [--quiet] [--cached] [--recursive] [...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [ПЪТ…]" -#: builtin/submodule--helper.c:906 +#: builtin/submodule--helper.c:909 msgid "git submodule--helper name " msgstr "git submodule--helper name ПЪТ" -#: builtin/submodule--helper.c:970 +#: builtin/submodule--helper.c:973 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "Синхронизиране на адреса на подмодул за „%s“\n" -#: builtin/submodule--helper.c:976 +#: builtin/submodule--helper.c:979 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "неуспешно регистриране на адрес за пътя към подмодул „%s“" -#: builtin/submodule--helper.c:990 +#: builtin/submodule--helper.c:993 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "отдалеченият адрес на подмодула „%s“ не може да бъде получен" -#: builtin/submodule--helper.c:1001 +#: builtin/submodule--helper.c:1004 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "отдалеченият адрес на подмодула „%s“ не може да бъде променен" -#: builtin/submodule--helper.c:1048 +#: builtin/submodule--helper.c:1051 msgid "Suppress output of synchronizing submodule url" msgstr "Без извеждане на информация при синхронизирането на подмодул" -#: builtin/submodule--helper.c:1055 +#: builtin/submodule--helper.c:1058 msgid "git submodule--helper sync [--quiet] [--recursive] []" msgstr "git submodule--helper sync [--quiet] [--recursive] [ПЪТ]" -#: builtin/submodule--helper.c:1109 +#: builtin/submodule--helper.c:1112 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -20399,7 +21017,7 @@ msgstr "" "Работното дърво на подмодул „%s“ съдържа директория „.git“.\n" "(ако искате да ги изтриете заедно с цялата им история, използвайте „rm -rf“)" -#: builtin/submodule--helper.c:1121 +#: builtin/submodule--helper.c:1124 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -20408,83 +21026,99 @@ msgstr "" "Работното дърво на подмодул „%s“ съдържа локални промени. Можете да ги " "отхвърлите с опцията „-f“" -#: builtin/submodule--helper.c:1129 +#: builtin/submodule--helper.c:1132 #, c-format msgid "Cleared directory '%s'\n" msgstr "Директорията „%s“ е изчистена\n" -#: builtin/submodule--helper.c:1131 +#: builtin/submodule--helper.c:1134 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "" "Директорията към работното дърво на подмодула „%s“ не може да бъде изтрита\n" -#: builtin/submodule--helper.c:1142 +#: builtin/submodule--helper.c:1145 #, c-format msgid "could not create empty submodule directory %s" msgstr "празната директория за подмодула „%s“ не може да бъде създадена" -#: builtin/submodule--helper.c:1158 +#: builtin/submodule--helper.c:1161 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "Регистрацията на подмодула „%s“ (%s) за пътя „%s“ е премахната\n" -#: builtin/submodule--helper.c:1187 +#: builtin/submodule--helper.c:1190 msgid "Remove submodule working trees even if they contain local changes" msgstr "" "Изтриване на работните дървета на подмодулите, дори когато те съдържат " "локални промени" -#: builtin/submodule--helper.c:1188 +#: builtin/submodule--helper.c:1191 msgid "Unregister all submodules" msgstr "Премахване на регистрациите на всички подмодули" -#: builtin/submodule--helper.c:1193 +#: builtin/submodule--helper.c:1196 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [...]]" msgstr "git submodule deinit [--quiet] [-f | --force] [--all | [--] [ПЪТ…]]" -#: builtin/submodule--helper.c:1207 +#: builtin/submodule--helper.c:1210 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "Използвайте „--all“, за да премахнете всички подмодули" -#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305 +#: builtin/submodule--helper.c:1275 +msgid "" +"An alternate computed from a superproject's alternate is invalid.\n" +"To allow Git to clone without an alternate in such a case, set\n" +"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n" +"'--reference-if-able' instead of '--reference'." +msgstr "" +"Алтернативният източник, определен от обхващащия проект е неправилен.\n" +"За да позволите на git да клонира без алтернативен източник в този случай,\n" +"задайте настройката „submodule.alternateErrorStrategy“ да е „info“ или\n" +"при клониране ползвайте опцията „--reference-if-able“ вместо „--reference“." + +#: builtin/submodule--helper.c:1314 builtin/submodule--helper.c:1317 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "към подмодула „%s“ не може да се добави алтернативен източник: %s" -#: builtin/submodule--helper.c:1341 +#: builtin/submodule--helper.c:1353 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "" "Непозната стойност „%s“ за настройката „submodule.alternateErrorStrategy“" -#: builtin/submodule--helper.c:1348 +#: builtin/submodule--helper.c:1360 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Непозната стойност „%s“ за настройката „submodule.alternateLocation“" -#: builtin/submodule--helper.c:1371 +#: builtin/submodule--helper.c:1383 msgid "where the new submodule will be cloned to" msgstr "къде да се клонира новият подмодул" -#: builtin/submodule--helper.c:1374 +#: builtin/submodule--helper.c:1386 msgid "name of the new submodule" msgstr "име на новия подмодул" -#: builtin/submodule--helper.c:1377 +#: builtin/submodule--helper.c:1389 msgid "url where to clone the submodule from" msgstr "адрес, от който да се клонира новият подмодул" -#: builtin/submodule--helper.c:1385 +#: builtin/submodule--helper.c:1397 msgid "depth for shallow clones" msgstr "дълбочина на плитките хранилища" -#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872 +#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1897 msgid "force cloning progress" msgstr "извеждане на напредъка на клонирането" -#: builtin/submodule--helper.c:1393 +#: builtin/submodule--helper.c:1402 builtin/submodule--helper.c:1899 +msgid "disallow cloning into non-empty directory" +msgstr "предотвратяване на клониране в непразна история" + +#: builtin/submodule--helper.c:1407 msgid "" "git submodule--helper clone [--prefix=] [--quiet] [--reference " "] [--name ] [--depth ] --url --path " @@ -20492,96 +21126,108 @@ msgstr "" "git submodule--helper clone [--prefix=ПЪТ] [--quiet] [--reference ХРАНИЛИЩЕ] " "[--name ИМЕ] [--depth ДЪЛБОЧИНА] --url АДРЕС --path ПЪТ…" -#: builtin/submodule--helper.c:1424 +#: builtin/submodule--helper.c:1431 +#, c-format +msgid "refusing to create/use '%s' in another submodule's git dir" +msgstr "" +"„%s“ не може нито да се създаде, нито да се ползва в директорията на git на " +"друг подмодул" + +#: builtin/submodule--helper.c:1442 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "Неуспешно клониране на адреса „%s“ в пътя „%s“ като подмодул" -#: builtin/submodule--helper.c:1438 +#: builtin/submodule--helper.c:1446 +#, c-format +msgid "directory not empty: '%s'" +msgstr "директорията не е празна: „%s“" + +#: builtin/submodule--helper.c:1458 #, c-format msgid "could not get submodule directory for '%s'" msgstr "директорията на подмодула „%s“ не може да бъде получена" -#: builtin/submodule--helper.c:1474 +#: builtin/submodule--helper.c:1494 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "Неправилен режим на обновяване „%s“ за пътя към подмодул „%s“" -#: builtin/submodule--helper.c:1478 +#: builtin/submodule--helper.c:1498 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "" "Настроен е неправилен режим на обновяване „%s“ за пътя към подмодул „%s“" -#: builtin/submodule--helper.c:1571 +#: builtin/submodule--helper.c:1594 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Пътят на подмодула „%s“ не е инициализиран" -#: builtin/submodule--helper.c:1575 +#: builtin/submodule--helper.c:1598 msgid "Maybe you want to use 'update --init'?" msgstr "Вероятно искахте да използвате „update --init“?" -#: builtin/submodule--helper.c:1605 +#: builtin/submodule--helper.c:1628 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Прескачане на неслетия подмодул „%s“" -#: builtin/submodule--helper.c:1634 +#: builtin/submodule--helper.c:1657 #, c-format msgid "Skipping submodule '%s'" msgstr "Прескачане на подмодула „%s“" -#: builtin/submodule--helper.c:1778 +#: builtin/submodule--helper.c:1803 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Неуспешен опит за клониране на „%s“. Насрочен е втори опит" -#: builtin/submodule--helper.c:1789 +#: builtin/submodule--helper.c:1814 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "" "Втори неуспешен опит за клониране на „%s“. Действието се преустановява" -#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093 +#: builtin/submodule--helper.c:1876 builtin/submodule--helper.c:2120 msgid "path into the working tree" msgstr "път към работното дърво" -#: builtin/submodule--helper.c:1854 +#: builtin/submodule--helper.c:1879 msgid "path into the working tree, across nested submodule boundaries" msgstr "път към работното дърво, през границите на вложените подмодули" -#: builtin/submodule--helper.c:1858 +#: builtin/submodule--helper.c:1883 msgid "rebase, merge, checkout or none" msgstr "" "„rebase“ (пребазиране), „merge“ (сливане), „checkout“ (изтегляне) или " "„none“ (нищо да не се прави)" -#: builtin/submodule--helper.c:1864 +#: builtin/submodule--helper.c:1889 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "Плитко клониране, отрязано до указания брой версии" -#: builtin/submodule--helper.c:1867 +#: builtin/submodule--helper.c:1892 msgid "parallel jobs" msgstr "брой паралелни процеси" -#: builtin/submodule--helper.c:1869 +#: builtin/submodule--helper.c:1894 msgid "whether the initial clone should follow the shallow recommendation" msgstr "дали първоначалното клониране да е плитко, както се препоръчва" -#: builtin/submodule--helper.c:1870 +#: builtin/submodule--helper.c:1895 msgid "don't print cloning progress" msgstr "без извеждане на напредъка на клонирането" -#: builtin/submodule--helper.c:1877 +#: builtin/submodule--helper.c:1904 msgid "git submodule--helper update-clone [--prefix=] [...]" msgstr "git submodule--helper update-clone [--prefix=ПЪТ] [ПЪТ…]" -#: builtin/submodule--helper.c:1890 +#: builtin/submodule--helper.c:1917 msgid "bad value for update parameter" msgstr "неправилен параметър към опцията „--update“" -#: builtin/submodule--helper.c:1938 +#: builtin/submodule--helper.c:1965 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -20590,50 +21236,50 @@ msgstr "" "Клонът на подмодула „%s“ е настроен да наследява клона от обхващащия проект, " "но той не е на никой клон" -#: builtin/submodule--helper.c:2061 +#: builtin/submodule--helper.c:2088 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "не може да се получи връзка към хранилище за подмодула „%s“" -#: builtin/submodule--helper.c:2094 +#: builtin/submodule--helper.c:2121 msgid "recurse into submodules" msgstr "рекурсивно обхождане подмодулите" -#: builtin/submodule--helper.c:2100 +#: builtin/submodule--helper.c:2127 msgid "git submodule--helper absorb-git-dirs [] [...]" msgstr "git submodule--helper absorb-git-dirs [ОПЦИЯ…] [ПЪТ…]" -#: builtin/submodule--helper.c:2156 +#: builtin/submodule--helper.c:2183 msgid "check if it is safe to write to the .gitmodules file" msgstr "проверка дали писането във файла „.gitmodules“ е безопасно" -#: builtin/submodule--helper.c:2159 +#: builtin/submodule--helper.c:2186 msgid "unset the config in the .gitmodules file" msgstr "изтриване на настройка във файла „.gitmodules“" -#: builtin/submodule--helper.c:2164 +#: builtin/submodule--helper.c:2191 msgid "git submodule--helper config []" msgstr "git submodule--helper config ИМЕ [СТОЙНОСТ]" -#: builtin/submodule--helper.c:2165 +#: builtin/submodule--helper.c:2192 msgid "git submodule--helper config --unset " msgstr "git submodule--helper config --unset ИМЕ" -#: builtin/submodule--helper.c:2166 +#: builtin/submodule--helper.c:2193 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2185 git-submodule.sh:171 +#: builtin/submodule--helper.c:2212 git-submodule.sh:173 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "файлът „.gitmodules“ трябва да е в работното дърво" -#: builtin/submodule--helper.c:2235 git.c:433 git.c:683 +#: builtin/submodule--helper.c:2262 git.c:433 git.c:684 #, c-format msgid "%s doesn't support --super-prefix" msgstr "„%s“ не поддържа опцията „--super-prefix“" -#: builtin/submodule--helper.c:2241 +#: builtin/submodule--helper.c:2268 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "„%s“ не е подкоманда на „submodule--helper“" @@ -20887,222 +21533,226 @@ msgstr "етикетът „%s“ вече съществува" msgid "Updated tag '%s' (was %s)\n" msgstr "Обновен етикет „%s“ (бе „%s“)\n" -#: builtin/unpack-objects.c:500 +#: builtin/unpack-objects.c:501 msgid "Unpacking objects" msgstr "Разпакетиране на обектите" -#: builtin/update-index.c:83 +#: builtin/update-index.c:84 #, c-format msgid "failed to create directory %s" msgstr "директорията „%s“ не може да бъде създадена" -#: builtin/update-index.c:99 +#: builtin/update-index.c:100 #, c-format msgid "failed to create file %s" msgstr "файлът „%s“ не може да бъде създаден" -#: builtin/update-index.c:107 +#: builtin/update-index.c:108 #, c-format msgid "failed to delete file %s" msgstr "файлът „%s“ не може да бъде изтрит" -#: builtin/update-index.c:114 builtin/update-index.c:220 +#: builtin/update-index.c:115 builtin/update-index.c:221 #, c-format msgid "failed to delete directory %s" msgstr "директорията „%s“ не може да бъде изтрита" -#: builtin/update-index.c:139 +#: builtin/update-index.c:140 #, c-format msgid "Testing mtime in '%s' " msgstr "Проверка на времето на промяна (mtime) на файла „%s“" -#: builtin/update-index.c:153 +#: builtin/update-index.c:154 msgid "directory stat info does not change after adding a new file" msgstr "" "информацията получена чрез „stat“ за директорията не се променя след " "добавянето на нов файл" -#: builtin/update-index.c:166 +#: builtin/update-index.c:167 msgid "directory stat info does not change after adding a new directory" msgstr "" "информацията получена чрез „stat“ за директорията не се променя след " "добавянето на нова директория" -#: builtin/update-index.c:179 +#: builtin/update-index.c:180 msgid "directory stat info changes after updating a file" msgstr "" "информацията получена чрез „stat“ за директорията се променя след " "обновяването на нов файл" -#: builtin/update-index.c:190 +#: builtin/update-index.c:191 msgid "directory stat info changes after adding a file inside subdirectory" msgstr "" "информацията получена чрез „stat“ за директорията се променя след добавянето " "на файл в поддиректория" -#: builtin/update-index.c:201 +#: builtin/update-index.c:202 msgid "directory stat info does not change after deleting a file" msgstr "" "информацията получена чрез „stat“ за директорията не се променя след " "изтриването на файл" -#: builtin/update-index.c:214 +#: builtin/update-index.c:215 msgid "directory stat info does not change after deleting a directory" msgstr "" "информацията получена чрез „stat“ за директорията не се променя след " "изтриването на директория" -#: builtin/update-index.c:221 +#: builtin/update-index.c:222 msgid " OK" msgstr " Добре" -#: builtin/update-index.c:589 +#: builtin/update-index.c:591 msgid "git update-index [] [--] [...]" msgstr "git update-index [ОПЦИЯ…] [--] [ФАЙЛ…]" -#: builtin/update-index.c:972 +#: builtin/update-index.c:974 msgid "continue refresh even when index needs update" msgstr "" "продължаване с обновяването, дори когато индексът трябва да бъде обновен" -#: builtin/update-index.c:975 +#: builtin/update-index.c:977 msgid "refresh: ignore submodules" msgstr "подмодулите да се игнорират при обновяването" -#: builtin/update-index.c:978 +#: builtin/update-index.c:980 msgid "do not ignore new files" msgstr "новите файлове да не се игнорират" -#: builtin/update-index.c:980 +#: builtin/update-index.c:982 msgid "let files replace directories and vice-versa" msgstr "файлове да могат да заменят директории и обратно" -#: builtin/update-index.c:982 +#: builtin/update-index.c:984 msgid "notice files missing from worktree" msgstr "предупреждаване при липсващи в работното дърво файлове" -#: builtin/update-index.c:984 +#: builtin/update-index.c:986 msgid "refresh even if index contains unmerged entries" msgstr "обновяване дори и индексът да съдържа неслети обекти" -#: builtin/update-index.c:987 +#: builtin/update-index.c:989 msgid "refresh stat information" msgstr "обновяване на информацията от функцията „stat“" -#: builtin/update-index.c:991 +#: builtin/update-index.c:993 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "" "като опцията „--refresh“, но да се проверят и обектите, които са били приети " "за непроменени" -#: builtin/update-index.c:995 +#: builtin/update-index.c:997 msgid ",," msgstr "РЕЖИМ,ОБЕКТ,ПЪТ" -#: builtin/update-index.c:996 +#: builtin/update-index.c:998 msgid "add the specified entry to the index" msgstr "добавяне на изброените обекти към индекса" -#: builtin/update-index.c:1006 +#: builtin/update-index.c:1008 msgid "mark files as \"not changing\"" msgstr "задаване на флаг, че файлът не се променя" -#: builtin/update-index.c:1009 +#: builtin/update-index.c:1011 msgid "clear assumed-unchanged bit" msgstr "изчистване на флага, че файлът не се променя" -#: builtin/update-index.c:1012 +#: builtin/update-index.c:1014 msgid "mark files as \"index-only\"" msgstr "задаване на флаг, че файловете са само за индекса" -#: builtin/update-index.c:1015 +#: builtin/update-index.c:1017 msgid "clear skip-worktree bit" -msgstr "изчистване на флага, че файловете са само за индекса" +msgstr "изчистване на флага, че файловете са само за индекса" -#: builtin/update-index.c:1018 +#: builtin/update-index.c:1020 +msgid "do not touch index-only entries" +msgstr "без промяна на файловете само за индекса" + +#: builtin/update-index.c:1022 msgid "add to index only; do not add content to object database" msgstr "добавяне само към индекса без добавяне към базата от данни за обектите" -#: builtin/update-index.c:1020 +#: builtin/update-index.c:1024 msgid "remove named paths even if present in worktree" msgstr "изтриване на указаните пътища, дори и да съществуват в работното дърво" -#: builtin/update-index.c:1022 +#: builtin/update-index.c:1026 msgid "with --stdin: input lines are terminated by null bytes" msgstr "" "при комбиниране с опцията „--stdin“ — входните редове са разделени с нулевия " "байт" -#: builtin/update-index.c:1024 +#: builtin/update-index.c:1028 msgid "read list of paths to be updated from standard input" msgstr "изчитане на списъка с пътища за обновяване от стандартния вход" -#: builtin/update-index.c:1028 +#: builtin/update-index.c:1032 msgid "add entries from standard input to the index" msgstr "добавяне на елементите от стандартния вход към индекса" -#: builtin/update-index.c:1032 +#: builtin/update-index.c:1036 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "" "възстановяване на състоянието преди сливане или нужда от обновяване за " "изброените пътища" -#: builtin/update-index.c:1036 +#: builtin/update-index.c:1040 msgid "only update entries that differ from HEAD" msgstr "добавяне само на съдържанието, което се различава от това в „HEAD“" -#: builtin/update-index.c:1040 +#: builtin/update-index.c:1044 msgid "ignore files missing from worktree" msgstr "игнориране на файловете, които липсват в работното дърво" -#: builtin/update-index.c:1043 +#: builtin/update-index.c:1047 msgid "report actions to standard output" msgstr "извеждане на действията на стандартния изход" -#: builtin/update-index.c:1045 +#: builtin/update-index.c:1049 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "" "забравяне на записаната информация за неразрешени конфликти — за командите " "от потребителско ниво" -#: builtin/update-index.c:1049 +#: builtin/update-index.c:1053 msgid "write index in this format" msgstr "записване на индекса в този формат" -#: builtin/update-index.c:1051 +#: builtin/update-index.c:1055 msgid "enable or disable split index" msgstr "включване или изключване на разделянето на индекса" -#: builtin/update-index.c:1053 +#: builtin/update-index.c:1057 msgid "enable/disable untracked cache" msgstr "включване/изключване на кеша за неследените файлове" -#: builtin/update-index.c:1055 +#: builtin/update-index.c:1059 msgid "test if the filesystem supports untracked cache" msgstr "проверка дали файловата система поддържа кеш за неследени файлове" -#: builtin/update-index.c:1057 +#: builtin/update-index.c:1061 msgid "enable untracked cache without testing the filesystem" msgstr "" "включване на кеша за неследените файлове без проверка на файловата система" -#: builtin/update-index.c:1059 +#: builtin/update-index.c:1063 msgid "write out the index even if is not flagged as changed" msgstr "запис на индекса, дори да не е отбелязан като променен" -#: builtin/update-index.c:1061 +#: builtin/update-index.c:1065 msgid "enable or disable file system monitor" msgstr "включване или изключване на наблюдението на файловата система" -#: builtin/update-index.c:1063 +#: builtin/update-index.c:1067 msgid "mark files as fsmonitor valid" msgstr "отбелязване на файловете, че могат да се следят чрез файловата система" -#: builtin/update-index.c:1066 +#: builtin/update-index.c:1070 msgid "clear fsmonitor valid bit" msgstr "изчистване на флага за следенето чрез файловата система" -#: builtin/update-index.c:1169 +#: builtin/update-index.c:1173 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -21110,7 +21760,7 @@ msgstr "" "Настройката „core.splitIndex“ е зададена на „false“ (лъжа). Сменете я или я " "изтрийте, за да включите разделянето на индекса" -#: builtin/update-index.c:1178 +#: builtin/update-index.c:1182 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -21118,7 +21768,7 @@ msgstr "" "Настройката „core.splitIndex“ е зададена на „true“ (истина). Сменете я или " "я изтрийте, за да изключите разделянето на индекса." -#: builtin/update-index.c:1190 +#: builtin/update-index.c:1194 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -21126,11 +21776,11 @@ msgstr "" "Настройката „core.untrackedCache“ е зададена на „true“ (истина). Сменете я " "или я изтрийте, за да изключите кеша за неследените файлове" -#: builtin/update-index.c:1194 +#: builtin/update-index.c:1198 msgid "Untracked cache disabled" msgstr "Кешът за неследените файлове е изключен" -#: builtin/update-index.c:1202 +#: builtin/update-index.c:1206 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -21138,29 +21788,29 @@ msgstr "" "Настройката „core.untrackedCache“ е зададена на „false“ (лъжа). Сменете я " "или я изтрийте, за да включите кеша за неследените файлове" -#: builtin/update-index.c:1206 +#: builtin/update-index.c:1210 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Кешът за неследените файлове е включен за „%s“" -#: builtin/update-index.c:1214 +#: builtin/update-index.c:1218 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "" "Настройката „core.fsmonitor“ не е зададена. Задайте я, за да включите " "следенето чрез файловата система." -#: builtin/update-index.c:1218 +#: builtin/update-index.c:1222 msgid "fsmonitor enabled" msgstr "следенето чрез файловата система е включено" -#: builtin/update-index.c:1221 +#: builtin/update-index.c:1225 msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "" "Настройката „core.fsmonitor“ е зададена. Изтрийте я, за да изключите " "следенето чрез файловата система." -#: builtin/update-index.c:1225 +#: builtin/update-index.c:1229 msgid "fsmonitor disabled" msgstr "следенето чрез файловата система е изключено" @@ -21518,7 +22168,7 @@ msgstr "не може да изпълни „git status“ върху „%s“" #, c-format msgid "'%s' contains modified or untracked files, use --force to delete it" msgstr "" -"„%s“ съдържа провенени или нови файлове, за принудително изтриване е " +"„%s“ съдържа променени или нови файлове, за принудително изтриване е " "необходима опцията „--force“" #: builtin/worktree.c:887 @@ -21570,16 +22220,21 @@ msgstr "запис на обект-дърво за поддиректорият msgid "only useful for debugging" msgstr "само за изчистване на грешки" -#: fast-import.c:3118 +#: fast-import.c:3125 #, c-format msgid "Expected 'mark' command, got %s" msgstr "очаква се команда „mark“, а бе получена: „%s“" -#: fast-import.c:3123 +#: fast-import.c:3130 #, c-format msgid "Expected 'to' command, got %s" msgstr "очаква се команда „to“, а бе получена: „%s“" +#: fast-import.c:3254 +#, c-format +msgid "feature '%s' forbidden in input without --allow-unsafe-features" +msgstr "„%s“ изисква изричното задаване на опцията „--allow-unsafe-features“" + #: credential-cache--daemon.c:223 #, c-format msgid "" @@ -21643,10 +22298,7 @@ msgstr "" "въведения. За помощ за специфична КОМАНДА ползвайте „git help КОМАНДА“, а " "за\n" "някое определено ПОНЯТИЕ използвайте „git help ПОНЯТИЕ“. За преглед на\n" -"системата за помощ използвайте „git help git“.\n" -"\n" -"Български превод на книгата „Pro Git“ от Чакън и Страуб:\n" -"http://i-can.eu/progit2-bg/progit.html" +"системата за помощ използвайте „git help git“." #: git.c:186 #, c-format @@ -21719,17 +22371,17 @@ msgstr "неизвестна грешка при запис на стандар msgid "close failed on standard output" msgstr "грешка при затваряне на стандартния изход" -#: git.c:792 +#: git.c:793 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "зацикляне в псевдонимите: заместванията на „%s“ не приключват:%s" -#: git.c:842 +#: git.c:843 #, c-format msgid "cannot handle %s as a builtin" msgstr "„%s“ не може да се обработи като вградена команда" -#: git.c:855 +#: git.c:856 #, c-format msgid "" "usage: %s\n" @@ -21738,14 +22390,14 @@ msgstr "" "употреба: %s\n" "\n" -#: git.c:875 +#: git.c:876 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "" "неуспешно заместване на псевдонима „%s“ — резултатът „%s“ не е команда на " "git\n" -#: git.c:887 +#: git.c:888 #, c-format msgid "failed to run command '%s': %s\n" msgstr "командата „%s“ не може да се изпълни: %s\n" @@ -21764,34 +22416,34 @@ msgstr "Управлението на делегирането не се под msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "Задаването на постоянен публичен ключ не се поддържа от cURL < 7.44.0" -#: http.c:878 +#: http.c:876 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" msgstr "„CURLSSLOPT_NO_REVOKE“ не се поддържа от cURL < 7.44.0" -#: http.c:951 +#: http.c:949 msgid "Protocol restrictions not supported with cURL < 7.19.4" msgstr "Ограничаването на протоколите не се поддържа от cURL < 7.44.0" -#: http.c:1088 +#: http.c:1086 #, c-format msgid "Unsupported SSL backend '%s'. Supported SSL backends:" msgstr "Неподдържана реализация на SSL „%s“. Поддържат се:" -#: http.c:1095 +#: http.c:1093 #, c-format msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" msgstr "" "Реализацията на SSL не може да се зададе да е „%s“: cURL е компилиран без " "поддръжка на SSL" -#: http.c:1099 +#: http.c:1097 #, c-format msgid "Could not set SSL backend to '%s': already set" msgstr "" "Реализацията на SSL не може да се зададе да е „%s“, защото вече е зададена " "друга" -#: http.c:1968 +#: http.c:1966 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -21928,30 +22580,41 @@ msgstr "АРГУМЕНТИ" msgid "object filtering" msgstr "филтриране по вид на обекта" -#: parse-options.h:179 +#: parse-options.h:183 msgid "expiry-date" msgstr "период на валидност/запазване" -#: parse-options.h:193 +#: parse-options.h:197 msgid "no-op (backward compatibility)" msgstr "нулева операция (за съвместимост с предишни версии)" -#: parse-options.h:305 +#: parse-options.h:309 msgid "be more verbose" msgstr "повече подробности" -#: parse-options.h:307 +#: parse-options.h:311 msgid "be more quiet" msgstr "по-малко подробности" -#: parse-options.h:313 +#: parse-options.h:317 msgid "use digits to display SHA-1s" msgstr "да се показват такъв БРОЙ цифри от сумите по SHA1" -#: parse-options.h:332 +#: parse-options.h:336 msgid "how to strip spaces and #comments from message" msgstr "кои празни знаци и #коментари да се махат от съобщенията" +#: parse-options.h:337 +msgid "read pathspec from file" +msgstr "изчитане на пътищата от ФАЙЛ" + +#: parse-options.h:338 +msgid "" +"with --pathspec-from-file, pathspec elements are separated with NUL character" +msgstr "" +"при ползването на „--pathspec-from-file“, пътищата са разделени с нулевия " +"знак „NUL“" + #: ref-filter.h:101 msgid "key" msgstr "КЛЮЧ" @@ -22476,163 +23139,171 @@ msgid "Common Git shell script setup code" msgstr "Настройки на Git за скриптовете на обвивката" #: command-list.h:171 +msgid "Initialize and modify the sparse-checkout" +msgstr "Инициализиране и промяна на частичното изтегляне" + +#: command-list.h:172 msgid "Stash the changes in a dirty working directory away" msgstr "Скатаване на неподадените промени в работното дърво" -#: command-list.h:172 +#: command-list.h:173 msgid "Add file contents to the staging area" msgstr "Добавяне на съдържанието на файла към индекса" -#: command-list.h:173 +#: command-list.h:174 msgid "Show the working tree status" msgstr "Извеждане на състоянието на работното дърво" -#: command-list.h:174 +#: command-list.h:175 msgid "Remove unnecessary whitespace" msgstr "Премахване на излишните знаци за интервали" -#: command-list.h:175 +#: command-list.h:176 msgid "Initialize, update or inspect submodules" msgstr "Инициализиране, обновяване или разглеждане на подмодули" -#: command-list.h:176 +#: command-list.h:177 msgid "Bidirectional operation between a Subversion repository and Git" msgstr "Двупосочна работа между хранилища под Subversion и Git" -#: command-list.h:177 +#: command-list.h:178 msgid "Switch branches" msgstr "Преминаване към друг клон" -#: command-list.h:178 +#: command-list.h:179 msgid "Read, modify and delete symbolic refs" msgstr "Извеждане, промяна и изтриване на символни указатели" -#: command-list.h:179 +#: command-list.h:180 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "Извеждане, създаване, изтриване, проверка на етикети подписани с GPG" -#: command-list.h:180 +#: command-list.h:181 msgid "Creates a temporary file with a blob's contents" msgstr "Създаване на временен файл със същото съдържание като обектът-BLOB" -#: command-list.h:181 +#: command-list.h:182 msgid "Unpack objects from a packed archive" msgstr "Разпакетиране на обекти от пакетиран архив" -#: command-list.h:182 +#: command-list.h:183 msgid "Register file contents in the working tree to the index" msgstr "Регистриране на съдържанието на файловете от работното дърво в индекса" -#: command-list.h:183 +#: command-list.h:184 msgid "Update the object name stored in a ref safely" msgstr "Безопасно обновяване на името на обект в указател" -#: command-list.h:184 +#: command-list.h:185 msgid "Update auxiliary info file to help dumb servers" msgstr "" "Обновяване на файла с допълнителна информация в помощ на опростените сървъри" -#: command-list.h:185 +#: command-list.h:186 msgid "Send archive back to git-archive" msgstr "Изпращане на архива обратно към „git-archive“" -#: command-list.h:186 +#: command-list.h:187 msgid "Send objects packed back to git-fetch-pack" msgstr "Изпращане на пакетираните обекти обратно към „git-fetch-pack“" -#: command-list.h:187 +#: command-list.h:188 msgid "Show a Git logical variable" msgstr "Извеждане на логическа променлива на Git" -#: command-list.h:188 +#: command-list.h:189 msgid "Check the GPG signature of commits" msgstr "Проверка на подписите GPG върху подаванията" -#: command-list.h:189 +#: command-list.h:190 msgid "Validate packed Git archive files" msgstr "Проверка на пакетираните архивни файлове на Git" -#: command-list.h:190 +#: command-list.h:191 msgid "Check the GPG signature of tags" msgstr "Проверка на подписите GPG върху етикетите" -#: command-list.h:191 +#: command-list.h:192 msgid "Git web interface (web frontend to Git repositories)" msgstr "Уеб интерфейс на Git" -#: command-list.h:192 +#: command-list.h:193 msgid "Show logs with difference each commit introduces" msgstr "Извеждане на журнал с разликите, въведени с всяко подаване" -#: command-list.h:193 +#: command-list.h:194 msgid "Manage multiple working trees" msgstr "Управление на множество работни дървета" -#: command-list.h:194 +#: command-list.h:195 msgid "Create a tree object from the current index" msgstr "Създаване на обект-дърво от текущия индекс" -#: command-list.h:195 +#: command-list.h:196 msgid "Defining attributes per path" msgstr "Указване на атрибути към път" -#: command-list.h:196 +#: command-list.h:197 msgid "Git command-line interface and conventions" msgstr "Команден ред и конвенции на Git" -#: command-list.h:197 +#: command-list.h:198 msgid "A Git core tutorial for developers" msgstr "Въвеждащ урок в Git за разработчици" -#: command-list.h:198 +#: command-list.h:199 msgid "Git for CVS users" msgstr "Git за потребители на CVS" -#: command-list.h:199 +#: command-list.h:200 msgid "Tweaking diff output" msgstr "Настройване на изгледа на разликите" -#: command-list.h:200 +#: command-list.h:201 msgid "A useful minimum set of commands for Everyday Git" msgstr "Полезен минимален набор от команди за ежедневната работа с Git" -#: command-list.h:201 +#: command-list.h:202 msgid "A Git Glossary" msgstr "Речник с термините на Git" -#: command-list.h:202 +#: command-list.h:203 msgid "Hooks used by Git" msgstr "Куки на Git" -#: command-list.h:203 +#: command-list.h:204 msgid "Specifies intentionally untracked files to ignore" msgstr "Указване на неследени файлове, които да бъдат нарочно пренебрегвани" -#: command-list.h:204 +#: command-list.h:205 msgid "Defining submodule properties" msgstr "Дефиниране на свойствата на подмодулите" -#: command-list.h:205 +#: command-list.h:206 msgid "Git namespaces" msgstr "Пространства от имена на Git" -#: command-list.h:206 +#: command-list.h:207 msgid "Git Repository Layout" msgstr "Устройство на хранилището на Git" -#: command-list.h:207 +#: command-list.h:208 msgid "Specifying revisions and ranges for Git" msgstr "Указване на версии и диапазони в Git" -#: command-list.h:208 +#: command-list.h:209 +msgid "Mounting one repository inside another" +msgstr "Монтиране на едно хранилище в друго" + +#: command-list.h:210 msgid "A tutorial introduction to Git: part two" msgstr "Въвеждащ урок за Git: втора част" -#: command-list.h:209 +#: command-list.h:211 msgid "A tutorial introduction to Git" msgstr "Въвеждащ урок за Git" -#: command-list.h:210 +#: command-list.h:212 msgid "An overview of recommended workflows with Git" msgstr "Общ преглед на препоръчваните начини за работа с Git" @@ -22761,121 +23432,121 @@ msgstr "Опит за просто сливане с „$pretty_name“" msgid "Simple merge did not work, trying automatic merge." msgstr "Простото сливане не сработи, пробва се автоматично сливане." -#: git-legacy-stash.sh:220 +#: git-legacy-stash.sh:221 msgid "Cannot remove temporary index (can't happen)" msgstr "Временният индекс не може да бъде изтрит" -#: git-legacy-stash.sh:271 +#: git-legacy-stash.sh:272 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "" "Указателят „${ref_stash}“ не може да бъде обновен да сочи към „${w_commit}“" -#: git-legacy-stash.sh:323 +#: git-legacy-stash.sh:324 #, sh-format msgid "error: unknown option for 'stash push': $option" msgstr "ГРЕШКА: командата „stash push“ не приема опцията „$option“" -#: git-legacy-stash.sh:355 +#: git-legacy-stash.sh:356 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "" "Състоянието на работната директория и индекса са запазени: „$stash_msg“" -#: git-legacy-stash.sh:535 +#: git-legacy-stash.sh:536 #, sh-format msgid "unknown option: $opt" msgstr "непозната опция: ${opt}" -#: git-legacy-stash.sh:555 +#: git-legacy-stash.sh:556 #, sh-format msgid "Too many revisions specified: $REV" msgstr "Указани са прекалено много версии: „${REV}“" -#: git-legacy-stash.sh:570 +#: git-legacy-stash.sh:571 #, sh-format msgid "$reference is not a valid reference" msgstr "Указателят „${reference}“ е грешен" -#: git-legacy-stash.sh:598 +#: git-legacy-stash.sh:599 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "„${args}“ не е подаване, приличащо на нещо скатано" -#: git-legacy-stash.sh:609 +#: git-legacy-stash.sh:610 #, sh-format msgid "'$args' is not a stash reference" msgstr "„${args}“ не е указател към нещо скатано" -#: git-legacy-stash.sh:617 +#: git-legacy-stash.sh:618 msgid "unable to refresh index" msgstr "индексът не може да бъде обновен" -#: git-legacy-stash.sh:621 +#: git-legacy-stash.sh:622 msgid "Cannot apply a stash in the middle of a merge" msgstr "По време на сливане не може да приложите нещо скатано" -#: git-legacy-stash.sh:629 +#: git-legacy-stash.sh:630 msgid "Conflicts in index. Try without --index." msgstr "" "В индекса има конфликти. Пробвайте да изпълните командата без опцията „--" "index“." -#: git-legacy-stash.sh:631 +#: git-legacy-stash.sh:632 msgid "Could not save index tree" msgstr "Дървото сочено от индекса не може да бъде запазено" -#: git-legacy-stash.sh:640 +#: git-legacy-stash.sh:641 msgid "Could not restore untracked files from stash entry" msgstr "Неследени файлове не могат да се възстановят от скатаното" -#: git-legacy-stash.sh:665 +#: git-legacy-stash.sh:666 msgid "Cannot unstage modified files" msgstr "Променените файлове не могат да бъдат извадени от индекса" -#: git-legacy-stash.sh:703 +#: git-legacy-stash.sh:704 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "Изтрито е скатаното „${REV}“ ($s)" -#: git-legacy-stash.sh:704 +#: git-legacy-stash.sh:705 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "Скатаното „${REV}“ не може да бъде изтрито" -#: git-legacy-stash.sh:791 +#: git-legacy-stash.sh:792 msgid "(To restore them type \"git stash apply\")" msgstr "(За да ги възстановите, изпълнете командата „git stash apply“)" -#: git-submodule.sh:200 +#: git-submodule.sh:202 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" "Относителен път може да се ползва само от основната директория на работното " "дърво" -#: git-submodule.sh:210 +#: git-submodule.sh:212 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "" "адрес на хранилище: „${repo}“ трябва или да е абсолютен, или да започва с " "„./“ или „../“" -#: git-submodule.sh:229 +#: git-submodule.sh:231 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "„${sm_path}“ вече съществува в индекса" -#: git-submodule.sh:232 +#: git-submodule.sh:234 #, sh-format msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "„${sm_path}“ вече съществува в индекса и не е подмодул" -#: git-submodule.sh:239 +#: git-submodule.sh:241 #, sh-format msgid "'$sm_path' does not have a commit checked out" msgstr "в „${sm_path}“ не е изтеглено подаване" -#: git-submodule.sh:245 +#: git-submodule.sh:247 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -22886,24 +23557,24 @@ msgstr "" "${sm_path}\n" "Използвайте опцията „-f“, ако за да го добавите наистина." -#: git-submodule.sh:268 +#: git-submodule.sh:270 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "Добавяне на съществуващото хранилище в „${sm_path}“ към индекса" -#: git-submodule.sh:270 +#: git-submodule.sh:272 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "„${sm_path}“ съществува, а не е хранилище на Git" -#: git-submodule.sh:278 +#: git-submodule.sh:280 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" "Открита е локална директория на Git — „${sm_name}“, която сочи към " "отдалечените хранилища:" -#: git-submodule.sh:280 +#: git-submodule.sh:282 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -22920,37 +23591,37 @@ msgstr "" "правилното хранилище или ако не знаете какво означава това, използвайте\n" "друго име като аргумент към опцията „--name“." -#: git-submodule.sh:286 +#: git-submodule.sh:288 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "Активиране на локалното хранилище за подмодула „${sm_name}“ наново." -#: git-submodule.sh:298 +#: git-submodule.sh:300 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Подмодулът „${sm_path}“ не може да бъде изтеглен" -#: git-submodule.sh:303 +#: git-submodule.sh:305 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Неуспешно добавяне на подмодула „${sm_path}“" -#: git-submodule.sh:312 +#: git-submodule.sh:314 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Неуспешно регистриране на подмодула „${sm_path}“" -#: git-submodule.sh:573 +#: git-submodule.sh:580 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "Текущата версия за подмодула в „${displaypath}“ липсва" -#: git-submodule.sh:583 +#: git-submodule.sh:590 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Неуспешно доставяне в пътя към подмодул „${sm_path}“" -#: git-submodule.sh:588 +#: git-submodule.sh:595 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -22959,7 +23630,7 @@ msgstr "" "Текущата версия „${remote_name}/${branch}“ в пътя към подмодул „${sm_path}“ " "липсва" -#: git-submodule.sh:606 +#: git-submodule.sh:613 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " @@ -22968,7 +23639,7 @@ msgstr "" "Неуспешно доставяне в пътя към подмодул „${displaypath}“, опит за директно " "доставяне на „${sha1}“" -#: git-submodule.sh:612 +#: git-submodule.sh:619 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -22977,80 +23648,80 @@ msgstr "" "Подмодулът в пътя „$displaypath“ е доставен, но не съдържа обекта със сума\n" "„${sha1}“. Директното доставяне на това подаване е неуспешно." -#: git-submodule.sh:619 +#: git-submodule.sh:626 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "" "Неуспешно изтегляне на версия „${sha1}“ в пътя към подмодул „${displaypath}“'" -#: git-submodule.sh:620 +#: git-submodule.sh:627 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Път към подмодул „${displaypath}“: изтеглена е версия „${sha1}“" -#: git-submodule.sh:624 +#: git-submodule.sh:631 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" "Неуспешно пребазиране на версия „${sha1}“ в пътя към подмодул " "„${displaypath}“" -#: git-submodule.sh:625 +#: git-submodule.sh:632 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Път към подмодул „${displaypath}“: пребазиране върху версия „${sha1}“" -#: git-submodule.sh:630 +#: git-submodule.sh:637 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" "Неуспешно сливане на версия „${sha1}“ в пътя към подмодул „${displaypath}“" -#: git-submodule.sh:631 +#: git-submodule.sh:638 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Път към подмодул „${displaypath}“: сливане с версия „${sha1}“" -#: git-submodule.sh:636 +#: git-submodule.sh:643 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" "Неуспешно изпълнение на командата „${command} ${sha1}“ в пътя към подмодул " "„${displaypath}“" -#: git-submodule.sh:637 +#: git-submodule.sh:644 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Път към подмодул „${displaypath}“: „${command} ${sha1}“" -#: git-submodule.sh:668 +#: git-submodule.sh:675 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "" "Неуспешна обработка на поддиректориите в пътя към подмодул „${displaypath}“" -#: git-submodule.sh:830 +#: git-submodule.sh:886 msgid "The --cached option cannot be used with the --files option" msgstr "Опциите „--cached“ и „--files“ са несъвместими" -#: git-submodule.sh:882 +#: git-submodule.sh:938 #, sh-format msgid "unexpected mode $mod_dst" msgstr "неочакван режим „${mod_dst}“" -#: git-submodule.sh:902 +#: git-submodule.sh:958 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr "" " ПРЕДУПРЕЖДЕНИЕ: „${display_name}“ не съдържа подаването „${sha1_src}“" -#: git-submodule.sh:905 +#: git-submodule.sh:961 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr "" " ПРЕДУПРЕЖДЕНИЕ: „${display_name}“ не съдържа подаването „${sha1_dst}“" -#: git-submodule.sh:908 +#: git-submodule.sh:964 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" @@ -23449,81 +24120,19 @@ msgid "Unable to determine absolute path of git directory" msgstr "Абсолютният път на работното дърво не може да се определи" #. TRANSLATORS: you can adjust this to align "git add -i" status menu -#: git-add--interactive.perl:210 +#: git-add--interactive.perl:212 #, perl-format msgid "%12s %12s %s" msgstr "%14s %14s %s" -#: git-add--interactive.perl:211 -msgid "staged" -msgstr "в индекса" - -#: git-add--interactive.perl:211 -msgid "unstaged" -msgstr "извън индекса" - -#: git-add--interactive.perl:267 git-add--interactive.perl:292 -msgid "binary" -msgstr "двоично" - -#: git-add--interactive.perl:276 git-add--interactive.perl:330 -msgid "nothing" -msgstr "нищо" - -#: git-add--interactive.perl:312 git-add--interactive.perl:327 -msgid "unchanged" -msgstr "няма промени" - -#: git-add--interactive.perl:623 -#, perl-format -msgid "added %d path\n" -msgid_plural "added %d paths\n" -msgstr[0] "%d файл добавен\n" -msgstr[1] "%d файла добавени\n" - -#: git-add--interactive.perl:626 -#, perl-format -msgid "updated %d path\n" -msgid_plural "updated %d paths\n" -msgstr[0] "%d файл обновен\n" -msgstr[1] "%d файла обновени\n" - -#: git-add--interactive.perl:629 -#, perl-format -msgid "reverted %d path\n" -msgid_plural "reverted %d paths\n" -msgstr[0] "%d файл с отменени промени\n" -msgstr[1] "%d файла с отменени промени\n" - -#: git-add--interactive.perl:632 +#: git-add--interactive.perl:634 #, perl-format msgid "touched %d path\n" msgid_plural "touched %d paths\n" msgstr[0] "%d файл засегнат\n" msgstr[1] "%d файла засегнати\n" -#: git-add--interactive.perl:641 -msgid "Update" -msgstr "Обновяване" - -#: git-add--interactive.perl:653 -msgid "Revert" -msgstr "Отмяна" - -#: git-add--interactive.perl:676 -#, perl-format -msgid "note: %s is untracked now.\n" -msgstr "БЕЛЕЖКА: „%s“ вече не се следи.\n" - -#: git-add--interactive.perl:687 -msgid "Add untracked" -msgstr "Добавяне на неследени" - -#: git-add--interactive.perl:693 -msgid "No untracked files.\n" -msgstr "Няма неследени файлове.\n" - -#: git-add--interactive.perl:1051 +#: git-add--interactive.perl:1053 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." @@ -23532,7 +24141,7 @@ msgstr "" "незабавно\n" "добавено към индекса" -#: git-add--interactive.perl:1054 +#: git-add--interactive.perl:1056 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." @@ -23541,7 +24150,7 @@ msgstr "" "незабавно\n" "скътано" -#: git-add--interactive.perl:1057 +#: git-add--interactive.perl:1059 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." @@ -23550,8 +24159,8 @@ msgstr "" "незабавно\n" "извадено от индекса." -#: git-add--interactive.perl:1060 git-add--interactive.perl:1069 -#: git-add--interactive.perl:1075 +#: git-add--interactive.perl:1062 git-add--interactive.perl:1071 +#: git-add--interactive.perl:1077 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." @@ -23560,8 +24169,8 @@ msgstr "" "незабавно\n" "набелязано за прилагане." -#: git-add--interactive.perl:1063 git-add--interactive.perl:1066 -#: git-add--interactive.perl:1072 +#: git-add--interactive.perl:1065 git-add--interactive.perl:1068 +#: git-add--interactive.perl:1074 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." @@ -23570,16 +24179,12 @@ msgstr "" "незабавно\n" "набелязано за зануляване." -#: git-add--interactive.perl:1109 +#: git-add--interactive.perl:1111 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "файлът за редактиране на парчето код не може да бъде отворен: „%s“" -#: git-add--interactive.perl:1110 -msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" -msgstr "Ръчно редактиране на парчета код — отдолу има подсказка.\n" - -#: git-add--interactive.perl:1116 +#: git-add--interactive.perl:1118 #, perl-format msgid "" "---\n" @@ -23593,38 +24198,13 @@ msgstr "" "За да пропуснете редовете започващи с „%s“ — изтрийте ги.\n" "Редовете, които започват с „%s“ ще бъдат пропуснати.\n" -#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: git-add--interactive.perl:1124 -msgid "" -"If it does not apply cleanly, you will be given an opportunity to\n" -"edit again. If all lines of the hunk are removed, then the edit is\n" -"aborted and the hunk is left unchanged.\n" -msgstr "" -"Ако е невъзможно чисто прилагане на кода, ще може пак да редактирате. Ако\n" -"изтриете всички редове от парчето код, то ще бъде оставено непроменено, а\n" -"редактирането — отказано.\n" - -#: git-add--interactive.perl:1138 +#: git-add--interactive.perl:1140 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "" "файлът за редактиране на парчето код не може да бъде отворен за четене: „%s“" -#. TRANSLATORS: do not translate [y/n] -#. The program will only accept that input -#. at this point. -#. Consider translating (saying "no" discards!) as -#. (saying "n" for "no" discards!) if the translation -#. of the word "no" does not start with n. -#: git-add--interactive.perl:1237 -msgid "" -"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " -msgstr "" -"Редактираното парче не може да се приложи. Да се продължи ли с " -"редактирането? (текущите редакции ще се отменят при отказ!): „y“ (да)/ " -"„n“ (не)? " - -#: git-add--interactive.perl:1246 +#: git-add--interactive.perl:1248 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -23638,7 +24218,7 @@ msgstr "" "a — добавяне на това и всички следващи парчета от файла в индекса\n" "d — без добавяне на това и всички следващи парчета от файла в индекса" -#: git-add--interactive.perl:1252 +#: git-add--interactive.perl:1254 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -23652,7 +24232,7 @@ msgstr "" "a — скатаване на това и всички следващи парчета от файла\n" "d — без скатаване на това и всички следващи парчета от файла" -#: git-add--interactive.perl:1258 +#: git-add--interactive.perl:1260 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -23666,7 +24246,7 @@ msgstr "" "a — изваждане на това и всички следващи парчета от файла от индекса\n" "d — без изваждане на това и всички следващи парчета от файла от индекса" -#: git-add--interactive.perl:1264 +#: git-add--interactive.perl:1266 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -23680,7 +24260,7 @@ msgstr "" "a — прилагане на това и всички следващи парчета от файла към индекса\n" "d — без прилагане на това и всички следващи парчета от файла към индекса" -#: git-add--interactive.perl:1270 git-add--interactive.perl:1288 +#: git-add--interactive.perl:1272 git-add--interactive.perl:1290 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -23697,7 +24277,7 @@ msgstr "" "d — без премахване на това и всички следващи парчета от файла от работното " "дърво" -#: git-add--interactive.perl:1276 +#: git-add--interactive.perl:1278 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -23714,7 +24294,7 @@ msgstr "" "d — без премахване на това и всички следващи парчета от файла от индекса и " "работното дърво" -#: git-add--interactive.perl:1282 +#: git-add--interactive.perl:1284 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -23731,7 +24311,7 @@ msgstr "" "d — без прилагане на това и всички следващи парчета от файла от индекса и " "работното дърво" -#: git-add--interactive.perl:1294 +#: git-add--interactive.perl:1296 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -23745,7 +24325,7 @@ msgstr "" "a — прилагане на това и всички следващи парчета от файла\n" "d — без прилагане на това и всички следващи парчета от файла" -#: git-add--interactive.perl:1309 +#: git-add--interactive.perl:1311 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -23767,237 +24347,209 @@ msgstr "" "e — ръчно редактиране на текущото парче\n" "? — извеждане не помощта\n" -#: git-add--interactive.perl:1340 +#: git-add--interactive.perl:1342 msgid "The selected hunks do not apply to the index!\n" msgstr "Избраните парчета не могат да се добавят в индекса!\n" -#: git-add--interactive.perl:1341 +#: git-add--interactive.perl:1343 msgid "Apply them to the worktree anyway? " msgstr "Да се приложат ли към работното дърво? " -#: git-add--interactive.perl:1344 +#: git-add--interactive.perl:1346 msgid "Nothing was applied.\n" msgstr "Нищо не е приложено.\n" -#: git-add--interactive.perl:1355 +#: git-add--interactive.perl:1357 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "пренебрегване на неслятото: „%s“\n" -#: git-add--interactive.perl:1364 -msgid "Only binary files changed.\n" -msgstr "Само двоични файлове са променени.\n" - -#: git-add--interactive.perl:1366 -msgid "No changes.\n" -msgstr "Няма промени.\n" - -#: git-add--interactive.perl:1374 -msgid "Patch update" -msgstr "Обновяване на кръпка" - -#: git-add--interactive.perl:1426 +#: git-add--interactive.perl:1428 #, perl-format msgid "Stage mode change [y,n,q,a,d%s,?]? " msgstr "Добавяне на промяната на правата за достъп [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1427 +#: git-add--interactive.perl:1429 #, perl-format msgid "Stage deletion [y,n,q,a,d%s,?]? " msgstr "Добавяне на изтриването [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1428 +#: git-add--interactive.perl:1430 #, perl-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "Добавяне на това парче [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1431 +#: git-add--interactive.perl:1433 #, perl-format msgid "Stash mode change [y,n,q,a,d%s,?]? " msgstr "Скатаване на промяната на правата за достъп [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1432 +#: git-add--interactive.perl:1434 #, perl-format msgid "Stash deletion [y,n,q,a,d%s,?]? " msgstr "Скатаване на изтриването [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1433 +#: git-add--interactive.perl:1435 #, perl-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "Скатаване на това парче [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1436 +#: git-add--interactive.perl:1438 #, perl-format msgid "Unstage mode change [y,n,q,a,d%s,?]? " msgstr "Изваждане на промяната на правата за достъп [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1437 +#: git-add--interactive.perl:1439 #, perl-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " msgstr "Изваждане на изтриването [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1438 +#: git-add--interactive.perl:1440 #, perl-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " msgstr "Изваждане на това парче [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1441 +#: git-add--interactive.perl:1443 #, perl-format msgid "Apply mode change to index [y,n,q,a,d%s,?]? " msgstr "" "Прилагане на промяната на правата за достъп към индекса [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1442 +#: git-add--interactive.perl:1444 #, perl-format msgid "Apply deletion to index [y,n,q,a,d%s,?]? " msgstr "Прилагане на изтриването към индекса [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1443 +#: git-add--interactive.perl:1445 #, perl-format msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " msgstr "Прилагане на това парче към индекса [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1446 git-add--interactive.perl:1461 +#: git-add--interactive.perl:1448 git-add--interactive.perl:1463 #, perl-format msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " msgstr "" "Премахване на промяната в правата за достъп от работното дърво [y,n,q,a,d" "%s,?]? " -#: git-add--interactive.perl:1447 git-add--interactive.perl:1462 +#: git-add--interactive.perl:1449 git-add--interactive.perl:1464 #, perl-format msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " msgstr "Премахване на изтриването от работното дърво [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1448 git-add--interactive.perl:1463 +#: git-add--interactive.perl:1450 git-add--interactive.perl:1465 #, perl-format msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " msgstr "Премахване на парчето от работното дърво [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1451 +#: git-add--interactive.perl:1453 #, perl-format msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Премахване на промяната в правата за достъп от индекса и работното дърво [y," "n,q,a,d%s,?]? " -#: git-add--interactive.perl:1452 +#: git-add--interactive.perl:1454 #, perl-format msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Премахване на изтриването от индекса и работното дърво [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1453 +#: git-add--interactive.perl:1455 #, perl-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " msgstr "Премахване на парчето от индекса и работното дърво [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1456 +#: git-add--interactive.perl:1458 #, perl-format msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Прилагане на промяната в правата за достъп от индекса и работното дърво [y,n," "q,a,d%s,?]? " -#: git-add--interactive.perl:1457 +#: git-add--interactive.perl:1459 #, perl-format msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Прилагане на изтриването от индекса и работното дърво [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1458 +#: git-add--interactive.perl:1460 #, perl-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " msgstr "Прилагане на парчето от индекса и работното дърво [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1466 +#: git-add--interactive.perl:1468 #, perl-format msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " msgstr "" "Прилагане на промяната в правата за достъп към работното дърво [y,n,q,a,d" "%s,?]? " -#: git-add--interactive.perl:1467 +#: git-add--interactive.perl:1469 #, perl-format msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " msgstr "Прилагане на изтриването към работното дърво [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1468 +#: git-add--interactive.perl:1470 #, perl-format msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " msgstr "Прилагане на парчето към работното дърво [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1568 +#: git-add--interactive.perl:1570 msgid "No other hunks to goto\n" msgstr "Няма други парчета\n" -#: git-add--interactive.perl:1575 -msgid "go to which hunk ( to see more)? " -msgstr "към кое парче да се придвижи (за повече варианти натиснете „enter“)? " - -#: git-add--interactive.perl:1577 -msgid "go to which hunk? " -msgstr "към кое парче да се придвижи? " - -#: git-add--interactive.perl:1586 +#: git-add--interactive.perl:1588 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Неправилен номер: „%s“\n" -#: git-add--interactive.perl:1591 +#: git-add--interactive.perl:1593 #, perl-format msgid "Sorry, only %d hunk available.\n" msgid_plural "Sorry, only %d hunks available.\n" msgstr[0] "Има само %d парче.\n" msgstr[1] "Има само %d парчета.\n" -#: git-add--interactive.perl:1617 +#: git-add--interactive.perl:1619 msgid "No other hunks to search\n" msgstr "Няма други парчета за търсене\n" -#: git-add--interactive.perl:1621 -msgid "search for regex? " -msgstr "да се търси с регулярен израз? " - -#: git-add--interactive.perl:1634 +#: git-add--interactive.perl:1636 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "Сгрешен регулярен израз „%s“: %s\n" -#: git-add--interactive.perl:1644 +#: git-add--interactive.perl:1646 msgid "No hunk matches the given pattern\n" msgstr "Никое парче не напасва на регулярния израз\n" -#: git-add--interactive.perl:1656 git-add--interactive.perl:1678 +#: git-add--interactive.perl:1658 git-add--interactive.perl:1680 msgid "No previous hunk\n" msgstr "Няма друго парче преди това\n" -#: git-add--interactive.perl:1665 git-add--interactive.perl:1684 +#: git-add--interactive.perl:1667 git-add--interactive.perl:1686 msgid "No next hunk\n" msgstr "Няма друго парче след това\n" -#: git-add--interactive.perl:1690 +#: git-add--interactive.perl:1692 msgid "Sorry, cannot split this hunk\n" msgstr "Това парче не може да бъде разделено\n" -#: git-add--interactive.perl:1696 +#: git-add--interactive.perl:1698 #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" msgstr[0] "Разделяне на %d парче.\n" msgstr[1] "Разделяне на %d парчета.\n" -#: git-add--interactive.perl:1706 +#: git-add--interactive.perl:1708 msgid "Sorry, cannot edit this hunk\n" msgstr "Това парче не може да бъде редактирано\n" -#: git-add--interactive.perl:1752 -msgid "Review diff" -msgstr "Преглед на разликата" - #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1771 +#: git-add--interactive.perl:1773 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -24018,19 +24570,19 @@ msgstr "" " и индекса\n" "add untracked — добавяне на неследените файлове към промените в индекса\n" -#: git-add--interactive.perl:1788 git-add--interactive.perl:1793 -#: git-add--interactive.perl:1796 git-add--interactive.perl:1803 -#: git-add--interactive.perl:1806 git-add--interactive.perl:1813 -#: git-add--interactive.perl:1817 git-add--interactive.perl:1823 +#: git-add--interactive.perl:1790 git-add--interactive.perl:1795 +#: git-add--interactive.perl:1798 git-add--interactive.perl:1805 +#: git-add--interactive.perl:1808 git-add--interactive.perl:1815 +#: git-add--interactive.perl:1819 git-add--interactive.perl:1825 msgid "missing --" msgstr "„--“ липсва" -#: git-add--interactive.perl:1819 +#: git-add--interactive.perl:1821 #, perl-format msgid "unknown --patch mode: %s" msgstr "неизвестна стратегия за прилагане на кръпка: „%s“" -#: git-add--interactive.perl:1825 git-add--interactive.perl:1831 +#: git-add--interactive.perl:1827 git-add--interactive.perl:1833 #, perl-format msgid "invalid argument %s, expecting --" msgstr "указан е неправилен аргумент „%s“, а се очаква „--“." diff --git a/po/ca.po b/po/ca.po index 3c878cec7359d3..3d4c11bf89625b 100644 --- a/po/ca.po +++ b/po/ca.po @@ -49,8 +49,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2019-07-30 09:59+0800\n" -"PO-Revision-Date: 2019-07-30 08:23+0200\n" +"POT-Creation-Date: 2019-12-30 08:48+0800\n" +"PO-Revision-Date: 2020-01-09 10:10+0100\n" "Last-Translator: Jordi Mas \n" "Language-Team: Catalan\n" "Language: ca\n" @@ -58,39 +58,464 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.2.1\n" +"X-Generator: Poedit 2.2.4\n" -#: advice.c:109 +#: add-interactive.c:347 +#, c-format +msgid "Huh (%s)?" +msgstr "Perdó (%s)?" + +#: add-interactive.c:500 add-interactive.c:801 sequencer.c:3216 +#: sequencer.c:3656 builtin/rebase.c:871 builtin/rebase.c:1643 +#: builtin/rebase.c:2019 builtin/rebase.c:2063 +msgid "could not read index" +msgstr "no s'ha pogut llegir l'índex" + +#: add-interactive.c:555 git-add--interactive.perl:269 +#: git-add--interactive.perl:294 +msgid "binary" +msgstr "binari" + +#: add-interactive.c:613 git-add--interactive.perl:278 +#: git-add--interactive.perl:332 +msgid "nothing" +msgstr "res" + +#: add-interactive.c:614 git-add--interactive.perl:314 +#: git-add--interactive.perl:329 +msgid "unchanged" +msgstr "sense canvis" + +#: add-interactive.c:651 git-add--interactive.perl:643 +msgid "Update" +msgstr "Actualitza" + +#: add-interactive.c:668 add-interactive.c:856 +#, c-format +msgid "could not stage '%s'" +msgstr "no s'ha pogut fer «stage» «%s»" + +#: add-interactive.c:674 add-interactive.c:863 sequencer.c:3409 +#: builtin/rebase.c:895 +msgid "could not write index" +msgstr "no s'ha pogut escriure l'índex" + +#: add-interactive.c:677 git-add--interactive.perl:628 +#, c-format, perl-format +msgid "updated %d path\n" +msgid_plural "updated %d paths\n" +msgstr[0] "actualitzat %d camí\n" +msgstr[1] "actualitzats %d camins\n" + +#: add-interactive.c:695 git-add--interactive.perl:678 +#, c-format, perl-format +msgid "note: %s is untracked now.\n" +msgstr "nota: %s està ara sense seguiment.\n" + +#: add-interactive.c:700 apply.c:4108 builtin/checkout.c:281 +#: builtin/reset.c:144 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "make_cache_entry ha fallat per al camí «%s»" + +#: add-interactive.c:730 git-add--interactive.perl:655 +msgid "Revert" +msgstr "Reverteix" + +#: add-interactive.c:746 +msgid "Could not parse HEAD^{tree}" +msgstr "No s'ha pogut analitzar HEAD^{tree}" + +#: add-interactive.c:784 git-add--interactive.perl:631 +#, c-format, perl-format +msgid "reverted %d path\n" +msgid_plural "reverted %d paths\n" +msgstr[0] "revertit %d camí\n" +msgstr[1] "revertits %d camins\n" + +#: add-interactive.c:835 git-add--interactive.perl:695 +#, c-format +msgid "No untracked files.\n" +msgstr "Sense fitxers no seguits.\n" + +#: add-interactive.c:839 git-add--interactive.perl:689 +msgid "Add untracked" +msgstr "Afegeix sense seguiment" + +#: add-interactive.c:866 git-add--interactive.perl:625 +#, c-format, perl-format +msgid "added %d path\n" +msgid_plural "added %d paths\n" +msgstr[0] "afegit %d camí\n" +msgstr[1] "afegits %d camins\n" + +#: add-interactive.c:896 +#, c-format +msgid "ignoring unmerged: %s" +msgstr "s'està ignorant allò no fusionat: %s" + +#: add-interactive.c:908 add-patch.c:1331 git-add--interactive.perl:1366 +#, c-format +msgid "Only binary files changed.\n" +msgstr "Només s'han canviat els fitxers binaris.\n" + +#: add-interactive.c:910 add-patch.c:1329 git-add--interactive.perl:1368 +#, c-format +msgid "No changes.\n" +msgstr "Sense canvis.\n" + +#: add-interactive.c:914 git-add--interactive.perl:1376 +msgid "Patch update" +msgstr "Actualització del pedaç" + +#: add-interactive.c:953 git-add--interactive.perl:1754 +msgid "Review diff" +msgstr "Reviseu les diferències" + +#: add-interactive.c:981 +msgid "show paths with changes" +msgstr "mostra els camins amb canvis" + +#: add-interactive.c:983 +msgid "add working tree state to the staged set of changes" +msgstr "" + +#: add-interactive.c:985 +msgid "revert staged set of changes back to the HEAD version" +msgstr "" + +#: add-interactive.c:987 +msgid "pick hunks and update selectively" +msgstr "selecciona els trossos i actualitza selectivament" + +#: add-interactive.c:989 +msgid "view diff between HEAD and index" +msgstr "visualitza les diferències entre HEAD i l'índex" + +#: add-interactive.c:991 +msgid "add contents of untracked files to the staged set of changes" +msgstr "" + +#: add-interactive.c:999 add-interactive.c:1048 +msgid "Prompt help:" +msgstr "Mostra ajuda:" + +#: add-interactive.c:1001 +msgid "select a single item" +msgstr "seleccioneu un únic ítem" + +#: add-interactive.c:1003 +msgid "select a range of items" +msgstr "seleccioneu un rang d'ítems" + +#: add-interactive.c:1005 +msgid "select multiple ranges" +msgstr "seleccioneu rangs múltiples" + +#: add-interactive.c:1007 add-interactive.c:1052 +msgid "select item based on unique prefix" +msgstr "seleccioneu un ítem basant-se en un prefix únic" + +#: add-interactive.c:1009 +msgid "unselect specified items" +msgstr "desselecciona els ítems especificats" + +#: add-interactive.c:1011 +msgid "choose all items" +msgstr "escolliu tots els ítems" + +#: add-interactive.c:1013 +msgid "(empty) finish selecting" +msgstr "(buit) finalitza la selecció" + +#: add-interactive.c:1050 +msgid "select a numbered item" +msgstr "seleccioneu un ítem numerat" + +#: add-interactive.c:1054 +msgid "(empty) select nothing" +msgstr "(buit) no seleccionis res" + +#: add-interactive.c:1062 builtin/clean.c:822 git-add--interactive.perl:1851 +msgid "*** Commands ***" +msgstr "*** Ordres ***" + +#: add-interactive.c:1063 builtin/clean.c:823 git-add--interactive.perl:1848 +msgid "What now" +msgstr "I ara què" + +#: add-interactive.c:1115 git-add--interactive.perl:213 +msgid "staged" +msgstr "staged" + +#: add-interactive.c:1115 git-add--interactive.perl:213 +msgid "unstaged" +msgstr "unstaged" + +#: add-interactive.c:1115 apply.c:4965 apply.c:4968 builtin/am.c:2197 +#: builtin/am.c:2200 builtin/clone.c:123 builtin/fetch.c:144 +#: builtin/merge.c:273 builtin/pull.c:209 builtin/submodule--helper.c:409 +#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1382 +#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:1878 +#: builtin/submodule--helper.c:2119 git-add--interactive.perl:213 +msgid "path" +msgstr "camí" + +#: add-interactive.c:1122 +msgid "could not refresh index" +msgstr "no s'ha pogut actualitzar l'índex" + +#: add-interactive.c:1136 builtin/clean.c:787 git-add--interactive.perl:1765 +#, c-format +msgid "Bye.\n" +msgstr "Adéu.\n" + +#: add-patch.c:15 +#, c-format +msgid "Stage mode change [y,n,a,q,d%s,?]? " +msgstr "Canvia el mode de «stage» [y,n,a,q,d%s,?]? " + +#: add-patch.c:16 +#, c-format +msgid "Stage deletion [y,n,a,q,d%s,?]? " +msgstr "Suprimeix «stage» [y,n,a,q,d%s,?]? " + +#: add-patch.c:17 +#, c-format +msgid "Stage this hunk [y,n,a,q,d%s,?]? " +msgstr "Fer un «stage» d'aquest tros [y,n,a,q,d%s,?]? " + +#: add-patch.c:111 +#, c-format +msgid "could not parse hunk header '%.*s'" +msgstr "no s'ha pogut analitzar la capçalera del tros «%.*s»" + +#: add-patch.c:130 add-patch.c:134 +#, c-format +msgid "could not parse colored hunk header '%.*s'" +msgstr "no s'ha pogut analitzar la capçalera del tros acolorida «%.*s»" + +#: add-patch.c:176 +msgid "could not parse diff" +msgstr "no s'ha pogut analitzar el diff" + +#: add-patch.c:194 +msgid "could not parse colored diff" +msgstr "no s'ha pogut analitzar el diff acolorit" + +#: add-patch.c:508 +#, c-format +msgid "" +"expected context line #%d in\n" +"%.*s" +msgstr "" +"s'esperava la línia amb contingut #%d a\n" +"%.*s" + + +#: add-patch.c:523 +#, c-format +msgid "" +"hunks do not overlap:\n" +"%.*s\n" +"\tdoes not end with:\n" +"%.*s" +msgstr "" + +#: add-patch.c:799 git-add--interactive.perl:1112 +msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" +msgstr "" +"Mode d'edició de trossos manual - vegeu més avall per una guia ràpida.\n" + +#: add-patch.c:803 +#, c-format +msgid "" +"---\n" +"To remove '%c' lines, make them ' ' lines (context).\n" +"To remove '%c' lines, delete them.\n" +"Lines starting with %c will be removed.\n" +msgstr "" +"---\n" +"Per suprimir «%c» línies, convertiu-les a ' ' (context).\n" +"Per suprimir «%c» línies, suprimiu-les.\n" +"Les línies que comencin per %c seran suprimides.\n" + +#: add-patch.c:810 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for staging.\n" +msgstr "" +"Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n" +"per «staging».\n" + +#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. +#: add-patch.c:818 git-add--interactive.perl:1126 +msgid "" +"If it does not apply cleanly, you will be given an opportunity to\n" +"edit again. If all lines of the hunk are removed, then the edit is\n" +"aborted and the hunk is left unchanged.\n" +msgstr "" +"Si no s'aplica correctament, tindreu una oportunitat per editar-lo\n" +"de nou. Si totes les línies del tros se suprimeixen, llavors l'edició " +"s'avorta\n" +"i el tros es deixa sense cap canvi.\n" + +#: add-patch.c:851 +msgid "could not parse hunk header" +msgstr "no s'ha pogut analitzar la capçalera del tros" + +#: add-patch.c:895 add-patch.c:1294 +msgid "'git apply --cached' failed" +msgstr "" + +#. TRANSLATORS: do not translate [y/n] +#. The program will only accept that input at this point. +#. Consider translating (saying "no" discards!) as +#. (saying "n" for "no" discards!) if the translation +#. of the word "no" does not start with n. +#. +#. TRANSLATORS: do not translate [y/n] +#. The program will only accept that input +#. at this point. +#. Consider translating (saying "no" discards!) as +#. (saying "n" for "no" discards!) if the translation +#. of the word "no" does not start with n. +#: add-patch.c:952 git-add--interactive.perl:1239 +msgid "" +"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +msgstr "" +"El tros editat no s'aplica. Editeu-lo de nou (si responeu \"no\" es " +"descartarà) [y/n]? " + +#: add-patch.c:1009 +msgid "" +"y - stage this hunk\n" +"n - do not stage this hunk\n" +"q - quit; do not stage this hunk or any of the remaining ones\n" +"a - stage this and all the remaining hunks\n" +"d - do not stage this hunk nor any of the remaining hunks\n" +msgstr "" +"y - fes «stage» d'aquest tros\n" +"n - no facis «stage» d'aquest tros\n" +"q - surt; no facis «stage» d'aquest tros o de cap altre restant\n" +"a - fes «stage» d'aquest tros i de tota la resta de trossos del fitxer\n" +"d - no facis «stage» d'aquest tros o de cap altre restant del fitxer\n" + +#: add-patch.c:1016 +msgid "" +"j - leave this hunk undecided, see next undecided hunk\n" +"J - leave this hunk undecided, see next hunk\n" +"k - leave this hunk undecided, see previous undecided hunk\n" +"K - leave this hunk undecided, see previous hunk\n" +"g - select a hunk to go to\n" +"/ - search for a hunk matching the given regex\n" +"s - split the current hunk into smaller hunks\n" +"e - manually edit the current hunk\n" +"? - print help\n" +msgstr "" +"j - deixa aquest tros sense decidir, veure el tros sense decidir següent\n" +"J - deixa aquest tros sense decidir, veure el tros següent\n" +"k - deixa aquest tros sense decidir, veure el tros sense decidir anterior\n" +"K - deixa aquest tros sense decidir, veure el tros anterior\n" +"g - selecciona el tros on voleu anar\n" +"/ - cerca un tros que coincideixi amb l'expressió regular donada\n" +"s - divideix el tros actual en trossos més petits\n" +"e - edita manualment el tros actual\n" +"? - mostra l'ajuda\n" + +#: add-patch.c:1137 add-patch.c:1147 +msgid "No previous hunk" +msgstr "Sense tros previ" + +#: add-patch.c:1142 add-patch.c:1152 +msgid "No next hunk" +msgstr "No hi ha tros següent" + +#: add-patch.c:1158 +msgid "No other hunks to goto" +msgstr "No hi ha altres trossos on anar-hi" + +#: add-patch.c:1169 git-add--interactive.perl:1577 +msgid "go to which hunk ( to see more)? " +msgstr "vés a quin tros ( per veure'n més)? " + +#: add-patch.c:1170 git-add--interactive.perl:1579 +msgid "go to which hunk? " +msgstr "vés a quin tros? " + +#: add-patch.c:1181 +#, c-format +msgid "Invalid number: '%s'" +msgstr "Número no vàlid: «%s»" + +#: add-patch.c:1186 +#, c-format +msgid "Sorry, only %d hunk available." +msgid_plural "Sorry, only %d hunks available." +msgstr[0] "Només %d tros disponible." +msgstr[1] "Només %d trossos disponibles." + +#: add-patch.c:1195 +msgid "No other hunks to search" +msgstr "No hi ha cap altre tros a cercar" + +#: add-patch.c:1201 git-add--interactive.perl:1623 +msgid "search for regex? " +msgstr "Cerca per expressió regular? " + +#: add-patch.c:1216 +#, c-format +msgid "Malformed search regexp %s: %s" +msgstr "Expressió regular de cerca mal formada %s: %s" + +#: add-patch.c:1233 +msgid "No hunk matches the given pattern" +msgstr "No hi ha trossos que coincideixin amb el patró donat" + +#: add-patch.c:1240 +msgid "Sorry, cannot split this hunk" +msgstr "No es pot dividir aquest tros" + +#: add-patch.c:1244 +#, c-format +msgid "Split into %d hunks." +msgstr "Divideix en %d trossos." + +#: add-patch.c:1248 +msgid "Sorry, cannot edit this hunk" +msgstr "No es pot editar aquest tros" + +#: advice.c:111 #, c-format msgid "%shint: %.*s%s\n" msgstr "%spista: %.*s%s\n" -#: advice.c:162 +#: advice.c:164 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "Fer «cherry pick» no és possible perquè teniu fitxers sense fusionar." -#: advice.c:164 +#: advice.c:166 msgid "Committing is not possible because you have unmerged files." msgstr "Cometre no és possible perquè teniu fitxers sense fusionar." -#: advice.c:166 +#: advice.c:168 msgid "Merging is not possible because you have unmerged files." msgstr "Fusionar no és possible perquè teniu fitxers sense fusionar." -#: advice.c:168 +#: advice.c:170 msgid "Pulling is not possible because you have unmerged files." msgstr "Baixar no és possible perquè teniu fitxers sense fusionar." -#: advice.c:170 +#: advice.c:172 msgid "Reverting is not possible because you have unmerged files." msgstr "Revertir no és possible perquè teniu fitxers sense fusionar." -#: advice.c:172 +#: advice.c:174 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "No és possible %s perquè teniu fitxers sense fusionar." -#: advice.c:180 +#: advice.c:182 msgid "" "Fix them up in the work tree, and then use 'git add/rm '\n" "as appropriate to mark resolution and make a commit." @@ -99,23 +524,23 @@ msgstr "" "'git add/rm ' segons sigui apropiat per a marcar la\n" "resolució i feu una comissió." -#: advice.c:188 +#: advice.c:190 msgid "Exiting because of an unresolved conflict." msgstr "S'està sortint a causa d'un conflicte no resolt." -#: advice.c:193 builtin/merge.c:1327 +#: advice.c:195 builtin/merge.c:1332 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "No heu conclòs la vostra fusió (MERGE_HEAD existeix)." -#: advice.c:195 +#: advice.c:197 msgid "Please, commit your changes before merging." msgstr "Cometeu els vostres canvis abans de fusionar." -#: advice.c:196 +#: advice.c:198 msgid "Exiting because of unfinished merge." msgstr "S'està sortint a causa d'una fusió no terminada." -#: advice.c:202 +#: advice.c:204 #, fuzzy, c-format msgid "" "Note: switching to '%s'.\n" @@ -137,7 +562,7 @@ msgid "" "false\n" "\n" msgstr "" -"Avís: s'està agafant «%s».\n" +"Avís: s'està canviant a «%s».\n" "\n" "Esteu en un estat de «HEAD separat». Podeu mirar al voltant, fer canvis\n" "experimentals i cometre'ls, i podeu descartar qualsevol comissió que feu\n" @@ -238,17 +663,7 @@ msgstr "mode no vàlid en la línia %d: %s" msgid "inconsistent header lines %d and %d" msgstr "línies de capçalera %d i %d inconsistents" -#: apply.c:1460 -#, c-format -msgid "recount: unexpected line: %.*s" -msgstr "recompte: línia inesperada: %.*s" - -#: apply.c:1529 -#, c-format -msgid "patch fragment without header at line %d: %.*s" -msgstr "fragment de pedaç sense capçalera a la línia %d: %.*s" - -#: apply.c:1551 +#: apply.c:1372 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -263,83 +678,93 @@ msgstr[1] "" "a la capçalera de git diff li manca informació de nom de fitxer en eliminar " "%d components de nom de camí inicial (línia %d)" -#: apply.c:1564 +#: apply.c:1385 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "" "a la capçalera de git diff li manca informació de nom de fitxer (línia %d)" -#: apply.c:1752 +#: apply.c:1481 +#, c-format +msgid "recount: unexpected line: %.*s" +msgstr "recompte: línia inesperada: %.*s" + +#: apply.c:1550 +#, c-format +msgid "patch fragment without header at line %d: %.*s" +msgstr "fragment de pedaç sense capçalera a la línia %d: %.*s" + +#: apply.c:1753 msgid "new file depends on old contents" msgstr "el fitxer nou depèn dels continguts antics" -#: apply.c:1754 +#: apply.c:1755 msgid "deleted file still has contents" msgstr "el fitxer suprimit encara té continguts" -#: apply.c:1788 +#: apply.c:1789 #, c-format msgid "corrupt patch at line %d" msgstr "pedaç malmès a la línia %d" -#: apply.c:1825 +#: apply.c:1826 #, c-format msgid "new file %s depends on old contents" msgstr "el fitxer nou %s depèn dels continguts antics" -#: apply.c:1827 +#: apply.c:1828 #, c-format msgid "deleted file %s still has contents" msgstr "el fitxer suprimit %s encara té continguts" -#: apply.c:1830 +#: apply.c:1831 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** advertència: el fitxer %s queda buit però no se suprimeix" -#: apply.c:1977 +#: apply.c:1978 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "pedaç binari malmès a la línia %d: %.*s" -#: apply.c:2014 +#: apply.c:2015 #, c-format msgid "unrecognized binary patch at line %d" msgstr "pedaç binari no reconegut a la línia %d" -#: apply.c:2176 +#: apply.c:2177 #, c-format msgid "patch with only garbage at line %d" msgstr "pedaç amb només escombraries a la línia %d" -#: apply.c:2262 +#: apply.c:2263 #, c-format msgid "unable to read symlink %s" msgstr "no s'ha pogut llegir l'enllaç simbòlic %s" -#: apply.c:2266 +#: apply.c:2267 #, c-format msgid "unable to open or read %s" msgstr "no s'ha pogut obrir o llegir %s" -#: apply.c:2925 +#: apply.c:2936 #, c-format msgid "invalid start of line: '%c'" msgstr "inici de línia no vàlid: «%c»" -#: apply.c:3046 +#: apply.c:3057 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "El tros #%d ha tingut èxit a %d (desplaçament d'%d línia)." msgstr[1] "El tros #%d ha tingut èxit a %d (desplaçament de %d línies)." -#: apply.c:3058 +#: apply.c:3069 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "El context s'ha reduït a (%ld/%ld) per a aplicar el fragment a %d" -#: apply.c:3064 +#: apply.c:3075 #, c-format msgid "" "while searching for:\n" @@ -348,23 +773,23 @@ msgstr "" "tot cercant:\n" "%.*s" -#: apply.c:3086 +#: apply.c:3097 #, c-format msgid "missing binary patch data for '%s'" msgstr "manquen les dades de pedaç binari de «%s»" -#: apply.c:3094 +#: apply.c:3105 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "no es pot aplicar al revés un pedaç binari sense el tros revés a «%s»" -#: apply.c:3141 +#: apply.c:3152 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" "no es pot aplicar un pedaç binari a «%s» sense la línia d'índex completa" -#: apply.c:3151 +#: apply.c:3162 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." @@ -372,289 +797,284 @@ msgstr "" "el pedaç s'aplica a «%s» (%s), el qual no coincideix amb els continguts " "actuals." -#: apply.c:3159 +#: apply.c:3170 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "el pedaç s'aplica a un «%s» buit però no és buit" -#: apply.c:3177 +#: apply.c:3188 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "no es pot llegir la postimatge %s necessària per a «%s»" -#: apply.c:3190 +#: apply.c:3201 #, c-format msgid "binary patch does not apply to '%s'" msgstr "el pedaç binari no s'aplica a «%s»" -#: apply.c:3196 +#: apply.c:3207 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "el pedaç binari a «%s» crea un resultat incorrecte (s'esperava %s, s'ha " "rebut %s)" -#: apply.c:3217 +#: apply.c:3228 #, c-format msgid "patch failed: %s:%ld" msgstr "el pedaç ha fallat: %s:%ld" -#: apply.c:3340 +#: apply.c:3351 #, c-format msgid "cannot checkout %s" msgstr "no es pot agafar %s" -#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279 +#: apply.c:3403 apply.c:3414 apply.c:3460 midx.c:61 setup.c:280 #, c-format msgid "failed to read %s" msgstr "s'ha produït un error en llegir %s" -#: apply.c:3400 +#: apply.c:3411 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "s'està llegint de «%s» més enllà d'un enllaç simbòlic" -#: apply.c:3429 apply.c:3672 +#: apply.c:3440 apply.c:3683 #, c-format msgid "path %s has been renamed/deleted" msgstr "el camí %s s'ha canviat de nom / s'ha suprimit" -#: apply.c:3515 apply.c:3687 +#: apply.c:3526 apply.c:3698 #, c-format msgid "%s: does not exist in index" msgstr "%s: no existeix en l'índex" -#: apply.c:3524 apply.c:3695 +#: apply.c:3535 apply.c:3706 #, c-format msgid "%s: does not match index" msgstr "%s: no coincideix amb l'índex" -#: apply.c:3559 +#: apply.c:3570 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" "al dipòsit li manca el blob necessari per a retrocedir a una fusió de 3 vies." -#: apply.c:3562 +#: apply.c:3573 #, c-format msgid "Falling back to three-way merge...\n" msgstr "S'està retrocedint a una fusió de 3 vies...\n" -#: apply.c:3578 apply.c:3582 +#: apply.c:3589 apply.c:3593 #, c-format msgid "cannot read the current contents of '%s'" msgstr "no es poden llegir els continguts actuals de «%s»" -#: apply.c:3594 +#: apply.c:3605 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "S'ha produït un error en retrocedir a una fusió de 3 vies...\n" -#: apply.c:3608 +#: apply.c:3619 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "S'ha aplicat el pedaç a «%s» amb conflictes.\n" -#: apply.c:3613 +#: apply.c:3624 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "S'ha aplicat el pedaç a «%s» netament.\n" -#: apply.c:3639 +#: apply.c:3650 msgid "removal patch leaves file contents" msgstr "el pedaç d'eliminació deixa els continguts dels fitxers" -#: apply.c:3712 +#: apply.c:3723 #, c-format msgid "%s: wrong type" msgstr "%s: tipus erroni" -#: apply.c:3714 +#: apply.c:3725 #, c-format msgid "%s has type %o, expected %o" msgstr "%s és del tipus %o, s'esperava %o" -#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856 -#: read-cache.c:1309 +#: apply.c:3876 apply.c:3878 read-cache.c:830 read-cache.c:856 +#: read-cache.c:1320 #, c-format msgid "invalid path '%s'" msgstr "camí no vàlid: «%s»" -#: apply.c:3923 +#: apply.c:3934 #, c-format msgid "%s: already exists in index" msgstr "%s: ja existeix en l'índex" -#: apply.c:3926 +#: apply.c:3937 #, c-format msgid "%s: already exists in working directory" msgstr "%s: ja existeix en el directori de treball" -#: apply.c:3946 +#: apply.c:3957 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "el mode nou (%o) de %s no coincideix amb el mode antic (%o)" -#: apply.c:3951 +#: apply.c:3962 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "el mode nou (%o) de %s no coincideix amb el mode antic (%o) de %s" -#: apply.c:3971 +#: apply.c:3982 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "el fitxer afectat «%s» és més enllà d'un enllaç simbòlic" -#: apply.c:3975 +#: apply.c:3986 #, c-format msgid "%s: patch does not apply" msgstr "%s: el pedaç no s'aplica" -#: apply.c:3990 +#: apply.c:4001 #, c-format msgid "Checking patch %s..." msgstr "S'està comprovant el pedaç %s..." -#: apply.c:4082 +#: apply.c:4093 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "falta la informació sha1 o és inútil per al submòdul %s" -#: apply.c:4089 +#: apply.c:4100 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "canvi de mode per a %s, el qual no està en la HEAD actual" -#: apply.c:4092 +#: apply.c:4103 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "falta informació sha1 o és inútil (%s)." -#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143 -#, c-format -msgid "make_cache_entry failed for path '%s'" -msgstr "make_cache_entry ha fallat per al camí «%s»" - -#: apply.c:4101 +#: apply.c:4112 #, c-format msgid "could not add %s to temporary index" msgstr "no s'ha pogut afegir %s a l'índex temporal" -#: apply.c:4111 +#: apply.c:4122 #, c-format msgid "could not write temporary index to %s" msgstr "no s'ha pogut escriure l'índex temporal a %s" -#: apply.c:4249 +#: apply.c:4260 #, c-format msgid "unable to remove %s from index" msgstr "no s'ha pogut eliminar %s de l'índex" -#: apply.c:4283 +#: apply.c:4294 #, c-format msgid "corrupt patch for submodule %s" msgstr "pedaç malmès per al submòdul %s" -#: apply.c:4289 +#: apply.c:4300 #, c-format msgid "unable to stat newly created file '%s'" msgstr "no s'ha pogut fer stat al fitxer novament creat «%s»" -#: apply.c:4297 +#: apply.c:4308 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" "no s'ha pogut crear un magatzem de recolzament per al fitxer novament creat " "%s" -#: apply.c:4303 apply.c:4448 +#: apply.c:4314 apply.c:4459 #, c-format msgid "unable to add cache entry for %s" msgstr "no s'ha pogut afegir una entrada de cau per a %s" -#: apply.c:4346 +#: apply.c:4357 #, c-format msgid "failed to write to '%s'" msgstr "no s'ha pogut escriure a «%s»" -#: apply.c:4350 +#: apply.c:4361 #, c-format msgid "closing file '%s'" msgstr "s'està tancant el fitxer «%s»" -#: apply.c:4420 +#: apply.c:4431 #, c-format msgid "unable to write file '%s' mode %o" msgstr "no s'ha pogut escriure el fitxer «%s» mode %o" -#: apply.c:4518 +#: apply.c:4529 #, c-format msgid "Applied patch %s cleanly." msgstr "El pedaç %s s'ha aplicat netament." -#: apply.c:4526 +#: apply.c:4537 msgid "internal error" msgstr "error intern" -#: apply.c:4529 +#: apply.c:4540 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "S'està aplicant el pedaç %%s amb %d rebuig..." msgstr[1] "S'està aplicant el pedaç %%s amb %d rebutjos..." -#: apply.c:4540 +#: apply.c:4551 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "s'està truncant el nom del fitxer .rej a %.*s.rej" -#: apply.c:4548 builtin/fetch.c:869 builtin/fetch.c:1161 +#: apply.c:4559 builtin/fetch.c:901 builtin/fetch.c:1192 #, c-format msgid "cannot open %s" msgstr "no es pot obrir %s" -#: apply.c:4562 +#: apply.c:4573 #, c-format msgid "Hunk #%d applied cleanly." msgstr "El tros #%d s'ha aplicat netament." -#: apply.c:4566 +#: apply.c:4577 #, c-format msgid "Rejected hunk #%d." msgstr "S'ha rebutjat el tros #%d." -#: apply.c:4676 +#: apply.c:4696 #, c-format msgid "Skipped patch '%s'." msgstr "S'ha omès el pedaç «%s»." -#: apply.c:4684 +#: apply.c:4704 msgid "unrecognized input" msgstr "entrada no reconeguda" -#: apply.c:4704 +#: apply.c:4724 msgid "unable to read index file" msgstr "no es pot llegir el fitxer d'índex" -#: apply.c:4859 +#: apply.c:4881 #, c-format msgid "can't open patch '%s': %s" msgstr "no es pot obrir el pedaç «%s»: %s" -#: apply.c:4886 +#: apply.c:4908 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "s'ha silenciat %d error d'espai en blanc" msgstr[1] "s'han silenciat %d errors d'espai en blanc" -#: apply.c:4892 apply.c:4907 +#: apply.c:4914 apply.c:4929 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d línia afegeix errors d'espai en blanc." msgstr[1] "%d línies afegeixen errors d'espai en blanc." -#: apply.c:4900 +#: apply.c:4922 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." @@ -663,144 +1083,135 @@ msgstr[0] "" msgstr[1] "" "S'han aplicat %d línies després d'arreglar els errors d'espai en blanc." -#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 +#: apply.c:4938 builtin/add.c:579 builtin/mv.c:301 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "No s'ha pogut escriure un fitxer d'índex nou" -#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211 -#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273 -#: builtin/pull.c:208 builtin/submodule--helper.c:407 -#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370 -#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853 -#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211 -msgid "path" -msgstr "camí" - -#: apply.c:4944 +#: apply.c:4966 msgid "don't apply changes matching the given path" msgstr "no apliquis els canvis que coincideixin amb el camí donat" -#: apply.c:4947 +#: apply.c:4969 msgid "apply changes matching the given path" msgstr "aplica els canvis que coincideixin amb el camí donat" -#: apply.c:4949 builtin/am.c:2217 +#: apply.c:4971 builtin/am.c:2206 msgid "num" msgstr "número" -#: apply.c:4950 +#: apply.c:4972 msgid "remove leading slashes from traditional diff paths" msgstr "" "elimina barres obliqües inicials dels camins de diferència " "tradicionals" -#: apply.c:4953 +#: apply.c:4975 msgid "ignore additions made by the patch" msgstr "ignora afegiments fets pel pedaç" -#: apply.c:4955 +#: apply.c:4977 msgid "instead of applying the patch, output diffstat for the input" msgstr "" "en lloc d'aplicar el pedaç, emet les estadístiques de diferència de l'entrada" -#: apply.c:4959 +#: apply.c:4981 msgid "show number of added and deleted lines in decimal notation" msgstr "mostra el nombre de línies afegides i suprimides en notació decimal" -#: apply.c:4961 +#: apply.c:4983 msgid "instead of applying the patch, output a summary for the input" msgstr "en lloc d'aplicar el pedaç, emet un resum de l'entrada" -#: apply.c:4963 +#: apply.c:4985 msgid "instead of applying the patch, see if the patch is applicable" msgstr "en lloc d'aplicar el pedaç, veges si el pedaç és aplicable" -#: apply.c:4965 +#: apply.c:4987 msgid "make sure the patch is applicable to the current index" msgstr "assegura que el pedaç sigui aplicable a l'índex actual" -#: apply.c:4967 +#: apply.c:4989 msgid "mark new files with `git add --intent-to-add`" msgstr "" -#: apply.c:4969 +#: apply.c:4991 msgid "apply a patch without touching the working tree" msgstr "aplica un pedaç sense tocar l'arbre de treball" -#: apply.c:4971 +#: apply.c:4993 msgid "accept a patch that touches outside the working area" msgstr "accepta un pedaç que toqui fora de l'àrea de treball" -#: apply.c:4974 +#: apply.c:4996 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "aplica el pedaç també (useu amb --stat/--summary/--check)" -#: apply.c:4976 +#: apply.c:4998 msgid "attempt three-way merge if a patch does not apply" msgstr "intenta una fusió de tres vies si el pedaç no s'aplica" -#: apply.c:4978 +#: apply.c:5000 msgid "build a temporary index based on embedded index information" msgstr "construeix un índex temporal basat en la informació d'índex incrustada" -#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:5003 builtin/checkout-index.c:173 builtin/ls-files.c:524 msgid "paths are separated with NUL character" msgstr "els camins se separen amb el caràcter NUL" -#: apply.c:4983 +#: apply.c:5005 msgid "ensure at least lines of context match" msgstr "assegura't que almenys línies de context coincideixin" -#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98 +#: apply.c:5006 builtin/am.c:2185 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3319 builtin/rebase.c:1421 +#: builtin/pack-objects.c:3310 builtin/rebase.c:1474 msgid "action" msgstr "acció" -#: apply.c:4985 +#: apply.c:5007 msgid "detect new or modified lines that have whitespace errors" msgstr "" "detecta les línies noves o modificades que tinguin errors d'espai en blanc" -#: apply.c:4988 apply.c:4991 +#: apply.c:5010 apply.c:5013 msgid "ignore changes in whitespace when finding context" msgstr "ignora els canvis d'espai en blanc en cercar context" -#: apply.c:4994 +#: apply.c:5016 msgid "apply the patch in reverse" msgstr "aplica el pedaç al revés" -#: apply.c:4996 +#: apply.c:5018 msgid "don't expect at least one line of context" msgstr "no esperis almenys una línia de context" -#: apply.c:4998 +#: apply.c:5020 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "deixa els trossos rebutjats en fitxers *.rej corresponents" -#: apply.c:5000 +#: apply.c:5022 msgid "allow overlapping hunks" msgstr "permet trossos encavalcants" -#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22 -#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786 -#: builtin/log.c:2085 builtin/mv.c:123 builtin/read-tree.c:128 +#: apply.c:5023 builtin/add.c:309 builtin/check-ignore.c:22 +#: builtin/commit.c:1355 builtin/count-objects.c:98 builtin/fsck.c:774 +#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "sigues detallat" -#: apply.c:5003 +#: apply.c:5025 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "tolera una línia nova incorrectament detectada al final del fitxer" -#: apply.c:5006 +#: apply.c:5028 msgid "do not trust the line counts in the hunk headers" msgstr "no confiïs en els recomptes de línia en les capçaleres dels trossos" -#: apply.c:5008 builtin/am.c:2205 +#: apply.c:5030 builtin/am.c:2194 msgid "root" msgstr "arrel" -#: apply.c:5009 +#: apply.c:5031 msgid "prepend to all filenames" msgstr "anteposa a tots els noms de fitxer" @@ -823,7 +1234,7 @@ msgstr "" msgid "git archive --remote [--exec ] --list" msgstr "git archive --remote [--exec ] --list" -#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299 +#: archive.c:372 builtin/add.c:180 builtin/add.c:555 builtin/rm.c:299 #, c-format msgid "pathspec '%s' did not match any files" msgstr "l'especificació de camí «%s» no ha coincidit amb cap fitxer" @@ -855,7 +1266,7 @@ msgstr "format" msgid "archive format" msgstr "format d'arxiu" -#: archive.c:458 builtin/log.c:1597 +#: archive.c:458 builtin/log.c:1653 msgid "prefix" msgstr "prefix" @@ -863,11 +1274,12 @@ msgstr "prefix" msgid "prepend prefix to each pathname in the archive" msgstr "anteposa el prefix a cada nom de camí en l'arxiu" -#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875 -#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134 -#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105 -#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412 -#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177 +#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866 +#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162 +#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899 +#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563 +#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123 +#: parse-options.h:190 msgid "file" msgstr "fitxer" @@ -900,7 +1312,7 @@ msgid "list supported archive formats" msgstr "llista els formats d'arxiu admesos" #: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 -#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859 +#: builtin/submodule--helper.c:1391 builtin/submodule--helper.c:1884 msgid "repo" msgstr "dipòsit" @@ -908,7 +1320,7 @@ msgstr "dipòsit" msgid "retrieve the archive from remote repository " msgstr "recupera l'arxiu del dipòsit remot " -#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707 +#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715 #: builtin/notes.c:498 msgid "command" msgstr "ordre" @@ -939,66 +1351,66 @@ msgstr "Format d'arxiu desconegut «%s»" msgid "Argument not supported for format '%s': -%d" msgstr "Paràmetre no admès per al format «%s»: -%d" -#: archive-tar.c:125 archive-zip.c:345 -#, fuzzy, c-format +#: archive-tar.c:125 archive-zip.c:350 +#, c-format msgid "cannot stream blob %s" -msgstr "no es pot emmagatzemar %s" +msgstr "no es pot transmetre el blob %s" -#: archive-tar.c:260 archive-zip.c:363 +#: archive-tar.c:266 archive-zip.c:368 #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "mode de fitxer no compatible: 0%o (SHA1: %s)" -#: archive-tar.c:287 archive-zip.c:353 +#: archive-tar.c:293 archive-zip.c:358 #, c-format msgid "cannot read %s" msgstr "no es pot llegir «%s»" -#: archive-tar.c:459 +#: archive-tar.c:465 #, c-format msgid "unable to start '%s' filter" msgstr "no s'ha pogut iniciar el filtre «%s»" -#: archive-tar.c:462 +#: archive-tar.c:468 msgid "unable to redirect descriptor" msgstr "no s'ha pogut redirigir el descriptor" -#: archive-tar.c:469 +#: archive-tar.c:475 #, c-format msgid "'%s' filter reported error" msgstr "«%s» error reportat pel filtre" -#: archive-zip.c:314 +#: archive-zip.c:319 #, c-format msgid "path is not valid UTF-8: %s" msgstr "el camí no és vàlid en UTF-8: %s" -#: archive-zip.c:318 +#: archive-zip.c:323 #, c-format msgid "path too long (%d chars, SHA1: %s): %s" msgstr "el camí és massa llarg (%d caràcters, SHA1: %s): %s" -#: archive-zip.c:474 builtin/pack-objects.c:226 builtin/pack-objects.c:229 +#: archive-zip.c:479 builtin/pack-objects.c:230 builtin/pack-objects.c:233 #, c-format msgid "deflate error (%d)" msgstr "error de deflació (%d)" -#: archive-zip.c:609 +#: archive-zip.c:614 #, c-format msgid "timestamp too large for this system: %" msgstr "marca de temps massa gran per a aquest sistema: %" -#: attr.c:211 +#: attr.c:212 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s no és un nom d'atribut vàlid" -#: attr.c:368 +#: attr.c:369 #, c-format msgid "%s not allowed: %s:%d" msgstr "%s no està permès: %s:%d" -#: attr.c:408 +#: attr.c:409 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1126,41 +1538,41 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "Bisecant: manca %d revisió a provar després d'aquesta %s\n" msgstr[1] "Bisecant: manquen %d revisions a provar després d'aquesta %s\n" -#: blame.c:2697 +#: blame.c:2700 msgid "--contents and --reverse do not blend well." msgstr "--contents i --reverse no funcionen bé juntes." -#: blame.c:2711 +#: blame.c:2714 msgid "cannot use --contents with final commit object name" msgstr "no es pot usar --contents amb el nom d'objecte de la comissió final" -#: blame.c:2732 +#: blame.c:2735 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse i --first-parent-together requereixen una última comissió " "especificada" -#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033 -#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:404 builtin/log.c:980 -#: builtin/log.c:1468 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411 -#: builtin/pack-objects.c:3142 builtin/pack-objects.c:3157 +#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:2093 +#: sequencer.c:4460 builtin/commit.c:1040 builtin/log.c:388 builtin/log.c:991 +#: builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215 builtin/merge.c:411 +#: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "la configuració del passeig per revisions ha fallat" -#: blame.c:2759 +#: blame.c:2762 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" "--reverse --first-parent junts requereixen un rang de la cadena de mares " "primeres" -#: blame.c:2770 +#: blame.c:2773 #, c-format msgid "no such path %s in %s" msgstr "no hi ha tal camí %s en %s" -#: blame.c:2781 +#: blame.c:2784 #, c-format msgid "cannot read blob %s for path %s" msgstr "no es pot llegir el blob %s per al camí %s" @@ -1324,8 +1736,8 @@ msgstr "«%s» no sembla un fitxer de farcell v2" msgid "unrecognized header: %s%s (%d)" msgstr "capçalera no reconeguda: %s%s (%d)" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024 -#: builtin/commit.c:791 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2344 sequencer.c:3108 +#: builtin/commit.c:811 #, c-format msgid "could not open '%s'" msgstr "no s'ha pogut obrir «%s»" @@ -1356,42 +1768,42 @@ msgid_plural "The bundle requires these %d refs:" msgstr[0] "El farcell requereix aquesta referència:" msgstr[1] "El farcell requereix aquestes %d referències:" -#: bundle.c:272 +#: bundle.c:273 msgid "unable to dup bundle descriptor" msgstr "no s'ha pogut duplicar el descriptor del farcell" -#: bundle.c:279 +#: bundle.c:280 msgid "Could not spawn pack-objects" msgstr "No s'ha pogut executar el pack-objects" -#: bundle.c:290 +#: bundle.c:291 msgid "pack-objects died" msgstr "El pack-objects s'ha mort" -#: bundle.c:332 +#: bundle.c:333 msgid "rev-list died" msgstr "El rev-list s'ha mort" -#: bundle.c:381 +#: bundle.c:382 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "les opcions de la llista de revisions exclouen la referència «%s»" -#: bundle.c:460 builtin/log.c:212 builtin/log.c:1749 builtin/shortlog.c:306 +#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306 #, c-format msgid "unrecognized argument: %s" msgstr "paràmetre no reconegut: %s" -#: bundle.c:468 +#: bundle.c:469 msgid "Refusing to create empty bundle." msgstr "S'està refusant crear un farcell buit." -#: bundle.c:478 +#: bundle.c:479 #, c-format msgid "cannot create '%s'" msgstr "no es pot crear «%s»" -#: bundle.c:503 +#: bundle.c:504 msgid "index-pack died" msgstr "L'index-pack s'ha mort" @@ -1400,18 +1812,18 @@ msgstr "L'index-pack s'ha mort" msgid "invalid color value: %.*s" msgstr "valor de color no vàlid: %.*s" -#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399 -#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455 +#: commit.c:51 sequencer.c:2811 builtin/am.c:354 builtin/am.c:398 +#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456 #, c-format msgid "could not parse %s" msgstr "no s'ha pogut analitzar %s" -#: commit.c:52 +#: commit.c:53 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s no és una comissió!" -#: commit.c:192 +#: commit.c:193 msgid "" "Support for /info/grafts is deprecated\n" "and will be removed in a future Git version.\n" @@ -1423,27 +1835,27 @@ msgid "" "\"git config advice.graftFileDeprecated false\"" msgstr "" -#: commit.c:1127 +#: commit.c:1152 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "La comissió %s té una signatura GPG no fiable, suposadament de %s." -#: commit.c:1130 +#: commit.c:1155 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "La comissió %s té una signatura GPG incorrecta suposadament de %s." -#: commit.c:1133 +#: commit.c:1158 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "La comissió %s no té signatura GPG." -#: commit.c:1136 +#: commit.c:1161 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "La comissió %s té una signatura GPG bona de %s\n" -#: commit.c:1390 +#: commit.c:1415 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" @@ -1454,245 +1866,266 @@ msgstr "" "la variable de configuració i18n.commitencoding a la codificació que\n" "usi el vostre projecte.\n" -#: commit-graph.c:127 +#: commit-graph.c:130 msgid "commit-graph file is too small" msgstr "" -#: commit-graph.c:192 +#: commit-graph.c:195 #, c-format msgid "commit-graph signature %X does not match signature %X" -msgstr "la signatura del graf de comissions %X no coincideix amb la signatura %X" +msgstr "" +"la signatura del graf de comissions %X no coincideix amb la signatura %X" -#: commit-graph.c:199 +#: commit-graph.c:202 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "la versió del graf de comissions %X no coincideix amb la versió %X" -#: commit-graph.c:206 +#: commit-graph.c:209 #, c-format msgid "commit-graph hash version %X does not match version %X" -msgstr "la versió del hash del graf de comissions %X no coincideix amb la versió %X" +msgstr "" +"la versió del hash del graf de comissions %X no coincideix amb la versió %X" -#: commit-graph.c:229 +#: commit-graph.c:232 msgid "commit-graph chunk lookup table entry missing; file may be incomplete" msgstr "" -#: commit-graph.c:240 +#: commit-graph.c:243 #, c-format msgid "commit-graph improper chunk offset %08x%08x" msgstr "" -#: commit-graph.c:283 +#: commit-graph.c:286 #, c-format msgid "commit-graph chunk id %08x appears multiple times" msgstr "" -#: commit-graph.c:347 +#: commit-graph.c:350 msgid "commit-graph has no base graphs chunk" msgstr "" -#: commit-graph.c:357 +#: commit-graph.c:360 msgid "commit-graph chain does not match" msgstr "la cadena del graf de comissions no coincideix" -#: commit-graph.c:404 +#: commit-graph.c:407 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "" -#: commit-graph.c:430 +#: commit-graph.c:433 msgid "unable to find all commit-graph files" msgstr "no es poden trobar tots els fitxers del graf de comissions" -#: commit-graph.c:553 commit-graph.c:613 +#: commit-graph.c:564 commit-graph.c:624 msgid "invalid commit position. commit-graph is likely corrupt" -msgstr "posició de la comissió no vàlida. Probablement el graf de comissions està malmès" +msgstr "" +"posició de la comissió no vàlida. Probablement el graf de comissions està " +"malmès" -#: commit-graph.c:574 +#: commit-graph.c:585 #, c-format msgid "could not find commit %s" msgstr "no s'ha pogut trobar la comissió %s" -#: commit-graph.c:1001 builtin/pack-objects.c:2651 +#: commit-graph.c:858 builtin/am.c:1287 +#, c-format +msgid "unable to parse commit %s" +msgstr "no s'ha pogut analitzar la comissió %s" + +#: commit-graph.c:1017 builtin/pack-objects.c:2641 #, c-format msgid "unable to get type of object %s" msgstr "no s'ha pogut obtenir el tipus de l'objecte: %s" -#: commit-graph.c:1033 +#: commit-graph.c:1049 msgid "Loading known commits in commit graph" msgstr "S'estan carregant comissions conegudes al graf de comissions" -#: commit-graph.c:1050 +#: commit-graph.c:1066 msgid "Expanding reachable commits in commit graph" msgstr "S'estan expandint les comissions abastables al graf de comissions" -#: commit-graph.c:1069 +#: commit-graph.c:1085 msgid "Clearing commit marks in commit graph" msgstr "S'estan netejant les marques de comissions al graf de comissions" -#: commit-graph.c:1088 +#: commit-graph.c:1104 msgid "Computing commit graph generation numbers" msgstr "S'estan calculant els nombres de generació del graf de comissions" -#: commit-graph.c:1162 +#: commit-graph.c:1179 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "S'estan cercant les comissions pel graf de comissions en %d paquet" msgstr[1] "S'estan cercant les comissions pel graf de comissions en %d paquets" -#: commit-graph.c:1175 +#: commit-graph.c:1192 #, c-format msgid "error adding pack %s" msgstr "error en afegir paquet %s" -#: commit-graph.c:1179 +#: commit-graph.c:1196 #, c-format msgid "error opening index for %s" msgstr "s'ha produït un error en obrir l'índex per «%s»" -#: commit-graph.c:1203 +#: commit-graph.c:1220 #, c-format msgid "Finding commits for commit graph from %d ref" msgid_plural "Finding commits for commit graph from %d refs" -msgstr[0] "S'estan cercant les comissions pel graf de comissions des de %d referència" -msgstr[1] "S'estan cercant les comissions pel graf de comissions des de %d referències" +msgstr[0] "" +"S'estan cercant les comissions pel graf de comissions des de %d referència" +msgstr[1] "" +"S'estan cercant les comissions pel graf de comissions des de %d referències" + +#: commit-graph.c:1240 +#, c-format +msgid "invalid commit object id: %s" +msgstr "identificador d'objecte de comissió no vàlid: %s" -#: commit-graph.c:1237 +#: commit-graph.c:1255 msgid "Finding commits for commit graph among packed objects" -msgstr "S'estan cercant les comissions pel graf de comissions entre els objectes empaquetats" +msgstr "" +"S'estan cercant les comissions pel graf de comissions entre els objectes " +"empaquetats" -#: commit-graph.c:1252 +#: commit-graph.c:1270 msgid "Counting distinct commits in commit graph" -msgstr "S'estant comptant les comissions diferents al graf de comissions" +msgstr "S'estan comptant les comissions diferents al graf de comissions" -#: commit-graph.c:1283 +#: commit-graph.c:1300 msgid "Finding extra edges in commit graph" msgstr "S'estan cercant les vores addicionals al graf de comissions" -#: commit-graph.c:1331 +#: commit-graph.c:1346 msgid "failed to write correct number of base graph ids" -msgstr "s'ha produït un error en escriure el nombre correcte d'ids base del graf" +msgstr "" +"s'ha produït un error en escriure el nombre correcte d'ids base del graf" -#: commit-graph.c:1364 midx.c:811 +#: commit-graph.c:1379 midx.c:814 #, c-format msgid "unable to create leading directories of %s" msgstr "no s'han pogut crear els directoris inicials de «%s»" -#: commit-graph.c:1376 builtin/index-pack.c:306 builtin/repack.c:251 +#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:248 #, c-format msgid "unable to create '%s'" msgstr "no s'ha pogut crear «%s»" -#: commit-graph.c:1436 +#: commit-graph.c:1451 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "S'està escrivint el graf de comissions en %d pas" msgstr[1] "S'està escrivint el graf de comissions en %d passos" -#: commit-graph.c:1477 +#: commit-graph.c:1492 msgid "unable to open commit-graph chain file" msgstr "no s'ha pogut obrir el fitxer d'encadenament del graf de comissions" -#: commit-graph.c:1489 +#: commit-graph.c:1504 msgid "failed to rename base commit-graph file" msgstr "no s'ha pogut canviar el nom del fitxer base del graf de comissions" -#: commit-graph.c:1509 +#: commit-graph.c:1524 msgid "failed to rename temporary commit-graph file" -msgstr "no s'ha pogut canviar el nom del fitxer temporal del graf de comissions" +msgstr "" +"no s'ha pogut canviar el nom del fitxer temporal del graf de comissions" -#: commit-graph.c:1620 +#: commit-graph.c:1635 msgid "Scanning merged commits" msgstr "S'estan escanejant les comissions fusionades" -#: commit-graph.c:1631 +#: commit-graph.c:1646 #, c-format msgid "unexpected duplicate commit id %s" msgstr "id de comissió duplicat %s no esperat" -#: commit-graph.c:1656 +#: commit-graph.c:1670 msgid "Merging commit-graph" msgstr "S'està fusionant el graf de comissions" -#: commit-graph.c:1842 +#: commit-graph.c:1860 #, c-format msgid "the commit graph format cannot write %d commits" msgstr "el format del graf de comissions no pot escriure %d comissions" -#: commit-graph.c:1853 +#: commit-graph.c:1871 msgid "too many commits to write graph" msgstr "massa comissions per escriure un graf" -#: commit-graph.c:1943 +#: commit-graph.c:1961 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" "el fitxer commit-graph (graf de comissions) té una suma de verificació " "incorrecta i probablement és corrupte" -#: commit-graph.c:1953 +#: commit-graph.c:1971 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "" -#: commit-graph.c:1963 commit-graph.c:1978 +#: commit-graph.c:1981 commit-graph.c:1996 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" -#: commit-graph.c:1970 +#: commit-graph.c:1988 #, c-format msgid "failed to parse commit %s from commit-graph" -msgstr "s'ha produït un error en analitzar la comissió %s del graf de comissions" +msgstr "" +"s'ha produït un error en analitzar la comissió %s del graf de comissions" -#: commit-graph.c:1987 +#: commit-graph.c:2006 msgid "Verifying commits in commit graph" msgstr "S'estan verificant les comissions al graf de comissions" -#: commit-graph.c:2000 +#: commit-graph.c:2020 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" -#: commit-graph.c:2007 +#: commit-graph.c:2027 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" -#: commit-graph.c:2017 +#: commit-graph.c:2037 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "" -#: commit-graph.c:2026 +#: commit-graph.c:2046 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "" -#: commit-graph.c:2039 +#: commit-graph.c:2059 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "" -#: commit-graph.c:2044 +#: commit-graph.c:2064 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" msgstr "" -#: commit-graph.c:2048 +#: commit-graph.c:2068 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" msgstr "" -#: commit-graph.c:2063 +#: commit-graph.c:2083 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "" -#: commit-graph.c:2069 +#: commit-graph.c:2089 #, c-format msgid "commit date for commit %s in commit-graph is % != %" msgstr "" @@ -1725,288 +2158,281 @@ msgid "relative config include conditionals must come from files" msgstr "" "els condicionals d'inclusió de configuració relatius han de venir de fitxers" -#: config.c:375 +#: config.c:376 #, c-format msgid "key does not contain a section: %s" msgstr "la clau no conté una secció: «%s»" -#: config.c:381 +#: config.c:382 #, c-format msgid "key does not contain variable name: %s" msgstr "la clau no conté un nom de variable: «%s»" -#: config.c:405 sequencer.c:2463 +#: config.c:406 sequencer.c:2530 #, c-format msgid "invalid key: %s" msgstr "clau no vàlida: %s" -#: config.c:411 +#: config.c:412 #, c-format msgid "invalid key (newline): %s" msgstr "clau no vàlida (línea nova): %s" -#: config.c:447 config.c:459 +#: config.c:448 config.c:460 #, c-format msgid "bogus config parameter: %s" msgstr "paràmetre de configuració erroni: %s" -#: config.c:494 +#: config.c:495 #, c-format msgid "bogus format in %s" msgstr "format erroni a %s" -#: config.c:820 +#: config.c:821 #, c-format msgid "bad config line %d in blob %s" msgstr "línia de configuració %d errònia en el blob %s" -#: config.c:824 +#: config.c:825 #, c-format msgid "bad config line %d in file %s" msgstr "línia de configuració %d errònia en el fitxer %s" -#: config.c:828 +#: config.c:829 #, c-format msgid "bad config line %d in standard input" msgstr "línia de configuració %d errònia en l'entrada estàndard" -#: config.c:832 +#: config.c:833 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "línia de configuració %d errònia en el blob de submòdul %s" -#: config.c:836 +#: config.c:837 #, c-format msgid "bad config line %d in command line %s" msgstr "línia de configuració %d errònia en la línia d'ordres %s" -#: config.c:840 +#: config.c:841 #, c-format msgid "bad config line %d in %s" msgstr "línia de configuració %d errònia en %s" -#: config.c:977 +#: config.c:978 msgid "out of range" msgstr "fora de rang" -#: config.c:977 +#: config.c:978 msgid "invalid unit" msgstr "unitat no vàlida" -#: config.c:978 +#: config.c:979 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "valor de configuració numèric erroni «%s» per «%s»: %s" -#: config.c:997 +#: config.c:998 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "valor de configuració numèric erroni «%s» per «%s» en el blob %s: %s" -#: config.c:1000 +#: config.c:1001 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "valor de configuració numèric «%s» erroni per «%s» en el fitxer %s: %s" -#: config.c:1003 +#: config.c:1004 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" "valor de configuració numèric «%s» erroni per «%s» en l'entrada estàndard: %s" -#: config.c:1006 +#: config.c:1007 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" "valor de configuració numèric «%s» erroni' per «%s» en el blob de submòdul " "%s: %s" -#: config.c:1009 +#: config.c:1010 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" "valor de configuració numèric «%s» erroni per «%s» en la línia d'ordres %s: " "%s" -#: config.c:1012 +#: config.c:1013 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "valor de configuració numèric incorrecte «%s» per «%s» en %s: %s" -#: config.c:1107 +#: config.c:1108 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "s'ha produït un error en expandir el directori d'usuari en: «%s»" -#: config.c:1116 +#: config.c:1117 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "«%s» per a «%s» no és una marca de temps vàlida" -#: config.c:1207 +#: config.c:1208 #, c-format msgid "abbrev length out of range: %d" msgstr "" -#: config.c:1221 config.c:1232 +#: config.c:1222 config.c:1233 #, c-format msgid "bad zlib compression level %d" msgstr "nivell de compressió de zlib incorrecte %d" -#: config.c:1324 +#: config.c:1325 msgid "core.commentChar should only be one character" msgstr "" -#: config.c:1357 +#: config.c:1358 #, c-format msgid "invalid mode for object creation: %s" msgstr "mode de creació d'objecte no vàlid: %s" -#: config.c:1429 +#: config.c:1430 #, c-format msgid "malformed value for %s" msgstr "valor no vàlid per a %s" -#: config.c:1455 +#: config.c:1456 #, c-format msgid "malformed value for %s: %s" msgstr "valor no vàlid per a %s: %s" -#: config.c:1456 +#: config.c:1457 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "" -#: config.c:1517 builtin/pack-objects.c:3399 +#: config.c:1518 builtin/pack-objects.c:3394 #, c-format msgid "bad pack compression level %d" msgstr "nivell de compressió de paquet %d Erroni" -#: config.c:1638 +#: config.c:1639 #, c-format msgid "unable to load config blob object '%s'" msgstr "no s'ha pogut carregar l'objecte blob de configuració «%s»" -#: config.c:1641 +#: config.c:1642 #, c-format msgid "reference '%s' does not point to a blob" msgstr "la referència «%s» no assenyala a un blob" -#: config.c:1658 +#: config.c:1659 #, c-format msgid "unable to resolve config blob '%s'" msgstr "no s'ha pogut resoldre el blob de configuració: «%s»" -#: config.c:1688 +#: config.c:1689 #, c-format msgid "failed to parse %s" msgstr "s'ha produït un error en analitzar %s" -#: config.c:1744 +#: config.c:1745 msgid "unable to parse command-line config" msgstr "no s'ha pogut analitzar la configuració de la línia d'ordres" -#: config.c:2093 +#: config.c:2096 msgid "unknown error occurred while reading the configuration files" msgstr "un error desconegut ha ocorregut en llegir els fitxers de configuració" -#: config.c:2263 +#: config.c:2266 #, c-format msgid "Invalid %s: '%s'" msgstr "%s no vàlid: «%s»" -#: config.c:2306 -#, c-format -msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" -msgstr "" -"valor «%s» a core.untrackedCache desconegut; utilitzant el valor per defecte " -"«keep»" - -#: config.c:2332 +#: config.c:2311 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "valor «%d» a splitIndex.maxPercentChange ha d'estar entre 0 i 100" -#: config.c:2378 +#: config.c:2357 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "no s'ha pogut analitzar «%s» de la configuració de la línia d'ordres" -#: config.c:2380 +#: config.c:2359 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "variable de configuració «%s» errònia en el fitxer «%s» a la línia %d" -#: config.c:2461 +#: config.c:2440 #, c-format msgid "invalid section name '%s'" msgstr "nom de secció no vàlid «%s»" -#: config.c:2493 +#: config.c:2472 #, c-format msgid "%s has multiple values" msgstr "%s té múltiples valors" -#: config.c:2522 +#: config.c:2501 #, c-format msgid "failed to write new configuration file %s" msgstr "no es pot escriure un nou fitxer de configuració %s" -#: config.c:2774 config.c:3098 +#: config.c:2753 config.c:3077 #, c-format msgid "could not lock config file %s" msgstr "no s'ha pogut blocar el fitxer de configuració %s" -#: config.c:2785 +#: config.c:2764 #, c-format msgid "opening %s" msgstr "s'està obrint %s" -#: config.c:2820 builtin/config.c:328 +#: config.c:2799 builtin/config.c:328 #, c-format msgid "invalid pattern: %s" msgstr "patró no vàlid: %s" -#: config.c:2845 +#: config.c:2824 #, c-format msgid "invalid config file %s" msgstr "fitxer de configuració no vàlid %s" -#: config.c:2858 config.c:3111 +#: config.c:2837 config.c:3090 #, c-format msgid "fstat on %s failed" msgstr "ha fallat «fstat» a %s" -#: config.c:2869 +#: config.c:2848 #, c-format msgid "unable to mmap '%s'" msgstr "no s'ha pogut fer «mmap» «%s»" -#: config.c:2878 config.c:3116 +#: config.c:2857 config.c:3095 #, c-format msgid "chmod on %s failed" msgstr "ha fallat chmod a %s" -#: config.c:2963 config.c:3213 +#: config.c:2942 config.c:3192 #, c-format msgid "could not write config file %s" msgstr "no s'ha pogut escriure el fitxer de configuració «%s»" -#: config.c:2997 +#: config.c:2976 #, c-format msgid "could not set '%s' to '%s'" msgstr "no s'ha pogut establir «%s» a «%s»" -#: config.c:2999 builtin/remote.c:782 +#: config.c:2978 builtin/remote.c:781 #, c-format msgid "could not unset '%s'" msgstr "no s'ha pogut desassignar «%s»" -#: config.c:3089 +#: config.c:3068 #, c-format msgid "invalid section name: %s" msgstr "nom de secció no vàlida: %s" -#: config.c:3256 +#: config.c:3235 #, c-format msgid "missing value for '%s'" msgstr "falta el valor per «%s»" @@ -2131,7 +2557,7 @@ msgstr "no s'ha pogut trobar %s (%s)" msgid "unknown port %s" msgstr "port desconegut %s" -#: connect.c:845 connect.c:1171 +#: connect.c:845 connect.c:1175 #, c-format msgid "strange hostname '%s' blocked" msgstr "s'ha bloquejat el nom estrany d'amfitrió «%s»" @@ -2146,58 +2572,60 @@ msgstr "s'ha bloquejat el port estrany «%s»" msgid "cannot start proxy %s" msgstr "no s'ha pogut iniciar servidor intermediari «%s»" -#: connect.c:924 +#: connect.c:928 msgid "no path specified; see 'git help pull' for valid url syntax" -msgstr "no s'ha especificat un camí; vegeu «git help pull» per la sintaxis vàlida per URL" +msgstr "" +"no s'ha especificat un camí; vegeu «git help pull» per la sintaxi vàlida per " +"URL" -#: connect.c:1119 +#: connect.c:1123 msgid "ssh variant 'simple' does not support -4" msgstr "la variant «simple» d'ssh no és compatible amb -4" -#: connect.c:1131 +#: connect.c:1135 msgid "ssh variant 'simple' does not support -6" msgstr "la variant «simple» d'ssh no és compatible amb -6" -#: connect.c:1148 +#: connect.c:1152 msgid "ssh variant 'simple' does not support setting port" msgstr "la variant «simple» d'ssh no permet definir el port" -#: connect.c:1260 +#: connect.c:1264 #, c-format msgid "strange pathname '%s' blocked" -msgstr "s'ha bloquejat el nom de fitxer extrany «%s»" +msgstr "s'ha bloquejat el nom de fitxer estrany «%s»" -#: connect.c:1307 +#: connect.c:1311 msgid "unable to fork" msgstr "no s'ha pogut bifurcar" -#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43 +#: connected.c:89 builtin/fsck.c:208 builtin/prune.c:43 msgid "Checking connectivity" msgstr "S'està comprovant la connectivitat" -#: connected.c:98 +#: connected.c:101 msgid "Could not run 'git rev-list'" msgstr "No s'ha pogut executar 'git rev-list'" -#: connected.c:118 +#: connected.c:121 msgid "failed write to rev-list" msgstr "escriptura fallada al rev-list" -#: connected.c:125 +#: connected.c:128 msgid "failed to close rev-list's stdin" msgstr "s'ha produït un error en tancar l'stdin del rev-list" -#: convert.c:193 +#: convert.c:194 #, c-format msgid "illegal crlf_action %d" msgstr "" -#: convert.c:206 +#: convert.c:207 #, c-format msgid "CRLF would be replaced by LF in %s" -msgstr "CRLF es reemplaçà per LF en %s." +msgstr "CRLF es reemplaçà per LF en %s" -#: convert.c:208 +#: convert.c:209 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" @@ -2205,14 +2633,14 @@ msgid "" msgstr "" "CRLF serà reemplaçat per LF en %s.\n" "El fitxer tindrà els seus terminadors de línia originals en el vostre " -"directori de treball." +"directori de treball" -#: convert.c:216 +#: convert.c:217 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "LF es reemplaçà per LF en %s" -#: convert.c:218 +#: convert.c:219 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" @@ -2220,18 +2648,18 @@ msgid "" msgstr "" "LF serà reemplaçat per CRLF en %s.\n" "El fitxer tindrà els seus terminadors de línia originals en el vostre " -"directori de treball." +"directori de treball" -#: convert.c:279 +#: convert.c:284 #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" msgstr "" -#: convert.c:286 +#: convert.c:291 #, c-format msgid "" -"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-" -"tree-encoding." +"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as " +"working-tree-encoding." msgstr "" #: convert.c:304 @@ -2246,117 +2674,117 @@ msgid "" "%sLE (depending on the byte order) as working-tree-encoding." msgstr "" -#: convert.c:424 convert.c:495 +#: convert.c:419 convert.c:490 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "s'ha produït un error en codificar «%s» des de %s a %s" -#: convert.c:467 +#: convert.c:462 #, c-format msgid "encoding '%s' from %s to %s and back is not the same" msgstr "codificar «%s» des de %s a %s i cap enrere no és el mateix" -#: convert.c:673 +#: convert.c:668 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "no es pot bifurcar per a executar el filtre extern «%s»" -#: convert.c:693 +#: convert.c:688 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "no es pot alimentar l'entrada al filtre extern «%s»" -#: convert.c:700 +#: convert.c:695 #, c-format msgid "external filter '%s' failed %d" msgstr "el filtre extern «%s» ha fallat %d" -#: convert.c:735 convert.c:738 +#: convert.c:730 convert.c:733 #, c-format msgid "read from external filter '%s' failed" msgstr "la lectura del filtre extern «%s» ha fallat" -#: convert.c:741 convert.c:796 +#: convert.c:736 convert.c:791 #, c-format msgid "external filter '%s' failed" msgstr "el filtre extern «%s» ha fallat" -#: convert.c:844 +#: convert.c:839 msgid "unexpected filter type" msgstr "tipus de filtre inesperat" -#: convert.c:855 +#: convert.c:850 msgid "path name too long for external filter" msgstr "" -#: convert.c:929 +#: convert.c:924 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " "been filtered" msgstr "" -#: convert.c:1228 +#: convert.c:1223 msgid "true/false are no valid working-tree-encodings" msgstr "" -#: convert.c:1398 convert.c:1432 +#: convert.c:1411 convert.c:1445 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s: el filtre de netejat «%s» ha fallat" -#: convert.c:1476 +#: convert.c:1489 #, fuzzy, c-format msgid "%s: smudge filter %s failed" msgstr "s'ha produït un error en actualitzar els fitxers" -#: date.c:137 +#: date.c:138 msgid "in the future" msgstr "en el futur" -#: date.c:143 +#: date.c:144 #, c-format msgid "% second ago" msgid_plural "% seconds ago" msgstr[0] "fa % segon" msgstr[1] "fa % segons" -#: date.c:150 +#: date.c:151 #, c-format msgid "% minute ago" msgid_plural "% minutes ago" msgstr[0] "fa % minut" msgstr[1] "fa % minuts" -#: date.c:157 +#: date.c:158 #, c-format msgid "% hour ago" msgid_plural "% hours ago" msgstr[0] "fa % hora" msgstr[1] "fa % hores" -#: date.c:164 +#: date.c:165 #, c-format msgid "% day ago" msgid_plural "% days ago" msgstr[0] "fa % dia" msgstr[1] "fa % dies" -#: date.c:170 +#: date.c:171 #, c-format msgid "% week ago" msgid_plural "% weeks ago" msgstr[0] "fa % setmana" msgstr[1] "fa % setmanes" -#: date.c:177 +#: date.c:178 #, c-format msgid "% month ago" msgid_plural "% months ago" msgstr[0] "fa % mes" msgstr[1] "fa % mesos" -#: date.c:188 +#: date.c:189 #, c-format msgid "% year" msgid_plural "% years" @@ -2364,14 +2792,14 @@ msgstr[0] "% any" msgstr[1] "% anys" #. TRANSLATORS: "%s" is " years" -#: date.c:191 +#: date.c:192 #, c-format msgid "%s, % month ago" msgid_plural "%s, % months ago" msgstr[0] "fa %s i % mes" msgstr[1] "fa %s i % mesos" -#: date.c:196 date.c:201 +#: date.c:197 date.c:202 #, c-format msgid "% year ago" msgid_plural "% years ago" @@ -2410,7 +2838,7 @@ msgstr "Marcades %d illes, fet.\n" msgid "failed to read orderfile '%s'" msgstr "s'ha produït un error en llegir el fitxer d'ordres «%s»" -#: diffcore-rename.c:544 +#: diffcore-rename.c:543 msgid "Performing inexact rename detection" msgstr "S'està realitzant una detecció inexacta de canvis de nom" @@ -2426,7 +2854,6 @@ msgstr "" "No és un dipòsit Git. Useu --no-index per a comparar dos camins fora del " "directori de treball" - #: diff.c:155 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" @@ -2475,35 +2902,35 @@ msgstr "" "S'han trobat errors en la variable de configuració 'diff.dirstat':\n" "%s" -#: diff.c:4215 +#: diff.c:4202 #, c-format msgid "external diff died, stopping at %s" msgstr "el diff external s'ha mort, s'està aturant a %s" -#: diff.c:4560 +#: diff.c:4547 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, --check i -s són mútuament excloents" -#: diff.c:4563 +#: diff.c:4550 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S and --find-object són mútuament excloents" -#: diff.c:4641 +#: diff.c:4628 msgid "--follow requires exactly one pathspec" msgstr "--follow requereix exactament una especificació de camí" -#: diff.c:4689 -#, c-format +#: diff.c:4676 +#, c-format msgid "invalid --stat value: %s" msgstr "valor --stat no vàlid: %s" -#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222 +#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209 #: parse-options.c:199 parse-options.c:203 #, c-format msgid "%s expects a numerical value" msgstr "%s espera un valor numèric" -#: diff.c:4726 +#: diff.c:4713 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -2512,499 +2939,498 @@ msgstr "" "S'ha produït un error en analitzar el paràmetre d'opció de --dirstat/-X:\n" "%s" -#: diff.c:4811 +#: diff.c:4798 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "classe de canvi «%c» desconeguda a --diff-filter=%s" -#: diff.c:4835 +#: diff.c:4822 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "valor desconegut després de ws-error-highlight=%.*s" -#: diff.c:4849 +#: diff.c:4836 #, c-format msgid "unable to resolve '%s'" msgstr "no s'ha pogut resoldre «%s»" -#: diff.c:4899 diff.c:4905 +#: diff.c:4886 diff.c:4892 #, c-format msgid "%s expects / form" msgstr "" -#: diff.c:4917 +#: diff.c:4904 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s esperava un caràcter, s'ha rebut «%s»" -#: diff.c:4938 +#: diff.c:4925 #, c-format msgid "bad --color-moved argument: %s" msgstr "paràmetre --color-moved incorrecte: %s" -#: diff.c:4957 +#: diff.c:4944 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "mode «%s» no vàlid en -color-moved-ws" -#: diff.c:4997 +#: diff.c:4984 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" msgstr "" -"l'opció diff-algorithm accepta «myers», «minimal», «patience» i " -"«histogram»" +"l'opció diff-algorithm accepta «myers», «minimal», «patience» i «histogram»" -#: diff.c:5033 diff.c:5053 +#: diff.c:5020 diff.c:5040 #, c-format msgid "invalid argument to %s" msgstr "argument no vàlid a %s" -#: diff.c:5191 +#: diff.c:5178 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "" "s'ha produït un error en analitzar el paràmetre d'opció de --submodule: «%s»" -#: diff.c:5247 +#: diff.c:5234 #, c-format msgid "bad --word-diff argument: %s" msgstr "paràmetre --word-diff incorrecte: %s" -#: diff.c:5270 +#: diff.c:5257 msgid "Diff output format options" msgstr "Opcions del format de sortida del diff" -#: diff.c:5272 diff.c:5278 +#: diff.c:5259 diff.c:5265 msgid "generate patch" msgstr "generant pedaç" -#: diff.c:5275 builtin/log.c:182 +#: diff.c:5262 builtin/log.c:173 msgid "suppress diff output" msgstr "omet la sortida de diferències" -#: diff.c:5280 diff.c:5394 diff.c:5401 +#: diff.c:5267 diff.c:5381 diff.c:5388 msgid "" msgstr "" -#: diff.c:5281 diff.c:5284 +#: diff.c:5268 diff.c:5271 msgid "generate diffs with lines context" msgstr "genera diffs amb línies de context" -#: diff.c:5286 +#: diff.c:5273 msgid "generate the diff in raw format" msgstr "genera el diff en format cru" -#: diff.c:5289 +#: diff.c:5276 msgid "synonym for '-p --raw'" msgstr "sinònim de per a «-p --raw»" -#: diff.c:5293 +#: diff.c:5280 msgid "synonym for '-p --stat'" msgstr "sinònim de per a «-p --stat»" -#: diff.c:5297 +#: diff.c:5284 msgid "machine friendly --stat" msgstr "llegible per màquina --stat" -#: diff.c:5300 +#: diff.c:5287 msgid "output only the last line of --stat" msgstr "mostra només l'última línia de --stat" -#: diff.c:5302 diff.c:5310 +#: diff.c:5289 diff.c:5297 msgid "..." msgstr "..." -#: diff.c:5303 +#: diff.c:5290 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" -#: diff.c:5307 +#: diff.c:5294 msgid "synonym for --dirstat=cumulative" msgstr "sinònim per -dirstat=cumulative" -#: diff.c:5311 +#: diff.c:5298 msgid "synonym for --dirstat=files,param1,param2..." msgstr "sinònim per --dirstat=files,param1,param2..." -#: diff.c:5315 +#: diff.c:5302 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" -#: diff.c:5318 +#: diff.c:5305 msgid "condensed summary such as creations, renames and mode changes" msgstr "" -#: diff.c:5321 +#: diff.c:5308 msgid "show only names of changed files" msgstr "mostra només els noms de fitxers canviats" -#: diff.c:5324 +#: diff.c:5311 msgid "show only names and status of changed files" msgstr "mostra només els noms i l'estat dels fitxers canviats" -#: diff.c:5326 +#: diff.c:5313 msgid "[,[,]]" msgstr "" -#: diff.c:5327 +#: diff.c:5314 msgid "generate diffstat" msgstr "genera diffstat" -#: diff.c:5329 diff.c:5332 diff.c:5335 +#: diff.c:5316 diff.c:5319 diff.c:5322 msgid "" msgstr "" -#: diff.c:5330 +#: diff.c:5317 msgid "generate diffstat with a given width" msgstr "genera diffstat amb una amplada donada" -#: diff.c:5333 +#: diff.c:5320 msgid "generate diffstat with a given name width" msgstr "genera diffstat amb un nom d'amplada donat" -#: diff.c:5336 +#: diff.c:5323 msgid "generate diffstat with a given graph width" msgstr "genera diffstat amb una amplada de graf donada" -#: diff.c:5338 +#: diff.c:5325 msgid "" msgstr "" -#: diff.c:5339 +#: diff.c:5326 msgid "generate diffstat with limited lines" msgstr "genera diffstat amb línies limitades" -#: diff.c:5342 +#: diff.c:5329 msgid "generate compact summary in diffstat" msgstr "genera un resum compacte a diffstat" -#: diff.c:5345 +#: diff.c:5332 msgid "output a binary diff that can be applied" msgstr "diff amb sortida binaria que pot ser aplicada" -#: diff.c:5348 +#: diff.c:5335 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" -#: diff.c:5350 +#: diff.c:5337 msgid "show colored diff" msgstr "mostra un diff amb colors" -#: diff.c:5351 +#: diff.c:5338 msgid "" msgstr "" -#: diff.c:5352 +#: diff.c:5339 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" msgstr "" -#: diff.c:5355 +#: diff.c:5342 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" msgstr "" -#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470 +#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457 msgid "" msgstr "" -#: diff.c:5359 +#: diff.c:5346 msgid "show the given source prefix instead of \"a/\"" msgstr "" -#: diff.c:5362 +#: diff.c:5349 msgid "show the given destination prefix instead of \"b/\"" msgstr "" -#: diff.c:5365 +#: diff.c:5352 msgid "prepend an additional prefix to every line of output" msgstr "afegir un prefix addicional per a cada línia de sortida" -#: diff.c:5368 +#: diff.c:5355 msgid "do not show any source or destination prefix" msgstr "no mostris cap prefix d'origen o destí" -#: diff.c:5371 +#: diff.c:5358 #, fuzzy msgid "show context between diff hunks up to the specified number of lines" msgstr "Crea un clon superficial truncat al nombre de revisions especificat" -#: diff.c:5375 diff.c:5380 diff.c:5385 +#: diff.c:5362 diff.c:5367 diff.c:5372 msgid "" msgstr "" -#: diff.c:5376 +#: diff.c:5363 msgid "specify the character to indicate a new line instead of '+'" -msgstr "especifiqueu el caràcter per a indicar una línia nova en comptes de «+»" +msgstr "" +"especifiqueu el caràcter per a indicar una línia nova en comptes de «+»" -#: diff.c:5381 +#: diff.c:5368 msgid "specify the character to indicate an old line instead of '-'" -msgstr "especifiqueu el caràcter per a indicar una línia antiga en comptes de «-»" +msgstr "" +"especifiqueu el caràcter per a indicar una línia antiga en comptes de «-»" -#: diff.c:5386 +#: diff.c:5373 msgid "specify the character to indicate a context instead of ' '" msgstr "especifiqueu el caràcter per a indicar context en comptes de « »" -#: diff.c:5389 +#: diff.c:5376 msgid "Diff rename options" msgstr "Opcions de canvi de nom del diff" -#: diff.c:5390 +#: diff.c:5377 msgid "[/]" msgstr "[/]" -#: diff.c:5391 +#: diff.c:5378 msgid "break complete rewrite changes into pairs of delete and create" -msgstr "divideix els canvis de reescriptura completa en parells de suprimir i crear" +msgstr "" +"divideix els canvis de reescriptura completa en parells de suprimir i crear" -#: diff.c:5395 +#: diff.c:5382 msgid "detect renames" msgstr "detecta els canvis de noms" -#: diff.c:5399 +#: diff.c:5386 msgid "omit the preimage for deletes" msgstr "omet les preimatges per les supressions" -#: diff.c:5402 +#: diff.c:5389 msgid "detect copies" msgstr "detecta còpies" -#: diff.c:5406 +#: diff.c:5393 msgid "use unmodified files as source to find copies" msgstr "usa els fitxers no modificats com a font per trobar còpies" -#: diff.c:5408 +#: diff.c:5395 msgid "disable rename detection" msgstr "inhabilita la detecció de canvis de nom" -#: diff.c:5411 +#: diff.c:5398 msgid "use empty blobs as rename source" msgstr "usa els blobs buits com a font de canvi de nom" -#: diff.c:5413 +#: diff.c:5400 msgid "continue listing the history of a file beyond renames" -msgstr "continua llistant l'històric d'un un fitxer més enllà dels canvis de nom" +msgstr "" +"continua llistant l'històric d'un un fitxer més enllà dels canvis de nom" -#: diff.c:5416 +#: diff.c:5403 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" msgstr "" -#: diff.c:5418 +#: diff.c:5405 msgid "Diff algorithm options" msgstr "Opcions d'algorisme Diff" -#: diff.c:5420 +#: diff.c:5407 msgid "produce the smallest possible diff" msgstr "produeix el diff més petit possible" -#: diff.c:5423 +#: diff.c:5410 msgid "ignore whitespace when comparing lines" msgstr "ignora els espai en blanc en comparar línies" -#: diff.c:5426 +#: diff.c:5413 msgid "ignore changes in amount of whitespace" msgstr "ignora els canvis en la quantitat d'espai en blanc" -#: diff.c:5429 +#: diff.c:5416 msgid "ignore changes in whitespace at EOL" msgstr "ignora els canvis d'espai en blanc al final de la línia" -#: diff.c:5432 +#: diff.c:5419 msgid "ignore carrier-return at the end of line" msgstr "ignora els retorns de línia al final de la línia" -#: diff.c:5435 +#: diff.c:5422 msgid "ignore changes whose lines are all blank" msgstr "ignora els canvis en línies que estan en blanc" -#: diff.c:5438 +#: diff.c:5425 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "" -#: diff.c:5441 +#: diff.c:5428 msgid "generate diff using the \"patience diff\" algorithm" msgstr "genera diff usant l'algorisme «patience diff»" -#: diff.c:5445 +#: diff.c:5432 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "genera diff usant l'algorisme «histogram diff»" -#: diff.c:5447 +#: diff.c:5434 msgid "" msgstr "" -#: diff.c:5448 +#: diff.c:5435 msgid "choose a diff algorithm" msgstr "escolliu un algorisme pel diff" -#: diff.c:5450 +#: diff.c:5437 msgid "" msgstr "" -#: diff.c:5451 +#: diff.c:5438 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "genera diff usant l'algorisme «anchored diff»" -#: diff.c:5453 diff.c:5462 diff.c:5465 +#: diff.c:5440 diff.c:5449 diff.c:5452 msgid "" msgstr "" -#: diff.c:5454 +#: diff.c:5441 msgid "show word diff, using to delimit changed words" msgstr "" -#: diff.c:5456 diff.c:5459 diff.c:5504 +#: diff.c:5443 diff.c:5446 diff.c:5491 msgid "" msgstr "" -#: diff.c:5457 +#: diff.c:5444 msgid "use to decide what a word is" msgstr "" -#: diff.c:5460 +#: diff.c:5447 msgid "equivalent to --word-diff=color --word-diff-regex=" msgstr "equivalent a --word-diff=color --word-diff-regex=" -#: diff.c:5463 +#: diff.c:5450 msgid "moved lines of code are colored differently" -msgstr "" +msgstr "les línies de codi que s'ha mogut s'acoloreixen diferent" -#: diff.c:5466 +#: diff.c:5453 msgid "how white spaces are ignored in --color-moved" -msgstr "" +msgstr "com s'ignoren els espais en blanc a --color-moved" -#: diff.c:5469 -#, fuzzy +#: diff.c:5456 msgid "Other diff options" -msgstr "Opcions genèriques" +msgstr "Altres opcions diff" -#: diff.c:5471 +#: diff.c:5458 msgid "when run from subdir, exclude changes outside and show relative paths" -msgstr "" +msgstr "quan s'executa des d'un subdirectori, exclou els canvis de fora i mostra els camins relatius" -#: diff.c:5475 +#: diff.c:5462 msgid "treat all files as text" msgstr "tracta tots els fitxers com a text" -#: diff.c:5477 +#: diff.c:5464 msgid "swap two inputs, reverse the diff" -msgstr "" +msgstr "intercanvia els dues entrada, inverteix el diff" -#: diff.c:5479 +#: diff.c:5466 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "surt amb 1 si hi ha diferències, 0 en cas contrari" -#: diff.c:5481 +#: diff.c:5468 msgid "disable all output of the program" msgstr "inhabilita totes les sortides del programa" -#: diff.c:5483 +#: diff.c:5470 msgid "allow an external diff helper to be executed" msgstr "" -#: diff.c:5485 +#: diff.c:5472 msgid "run external text conversion filters when comparing binary files" msgstr "" -#: diff.c:5487 +#: diff.c:5474 msgid "" msgstr "" -#: diff.c:5488 +#: diff.c:5475 msgid "ignore changes to submodules in the diff generation" msgstr "ignora els canvis als submòduls en la generació del diff" -#: diff.c:5491 +#: diff.c:5478 msgid "" msgstr "" -#: diff.c:5492 +#: diff.c:5479 msgid "specify how differences in submodules are shown" msgstr "especifiqueu com es mostren els canvis als submòduls" -#: diff.c:5496 +#: diff.c:5483 #, fuzzy msgid "hide 'git add -N' entries from the index" msgstr "usa .gitattributes només des de l'índex" -#: diff.c:5499 +#: diff.c:5486 msgid "treat 'git add -N' entries as real in the index" msgstr "" -#: diff.c:5501 +#: diff.c:5488 msgid "" msgstr "" -#: diff.c:5502 +#: diff.c:5489 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "" -#: diff.c:5505 +#: diff.c:5492 msgid "" "look for differences that change the number of occurrences of the specified " "regex" msgstr "" -#: diff.c:5508 -#, fuzzy +#: diff.c:5495 msgid "show all changes in the changeset with -S or -G" -msgstr "mostra els fitxers coincidents en el paginador" +msgstr "mostra tots els canvis amb el conjunt de canvis amb -S o -G" -#: diff.c:5511 -#, fuzzy +#: diff.c:5498 msgid "treat in -S as extended POSIX regular expression" -msgstr "usa les expressions regulars POSIX ampliades" +msgstr "tracta a -S com a expressió regular POSIX ampliada" -#: diff.c:5514 -#, fuzzy +#: diff.c:5501 msgid "control the order in which files appear in the output" -msgstr "mostra en la sortida els altres fitxers" +msgstr "controla l'ordre amb el qual els fitxers apareixen en la sortida" -#: diff.c:5515 -#, fuzzy +#: diff.c:5502 msgid "" -msgstr "objecte" +msgstr "" -#: diff.c:5516 +#: diff.c:5503 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "" -#: diff.c:5518 +#: diff.c:5505 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5519 +#: diff.c:5506 msgid "select files by diff type" -msgstr "seleccioneu els fitxer per tipus de diff" +msgstr "seleccioneu els fitxers per tipus de diff" -#: diff.c:5521 +#: diff.c:5508 msgid "" msgstr "" -#: diff.c:5522 +#: diff.c:5509 msgid "Output to a specific file" msgstr "Sortida a un fitxer específic" -#: diff.c:6177 +#: diff.c:6164 msgid "inexact rename detection was skipped due to too many files." -msgstr "s'ha omès la detecció de canvi de nom inexacta a causa de massa fitxers." +msgstr "" +"s'ha omès la detecció de canvi de nom inexacta a causa de massa fitxers." -#: diff.c:6180 +#: diff.c:6167 msgid "only found copies from modified paths due to too many files." msgstr "" "només s'han trobat còpies des de camins modificats a causa de massa fitxers." -#: diff.c:6183 +#: diff.c:6170 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3012,42 +3438,61 @@ msgstr "" "potser voleu establir la vostra variable %s a almenys %d i tornar a intentar " "l'ordre." -#: dir.c:537 +#: dir.c:554 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "" "l'especificació de camí «%s» no ha coincidit amb cap fitxer que git conegui" -#: dir.c:926 +#: dir.c:664 +#, c-format +msgid "unrecognized pattern: '%s'" +msgstr "patró no reconegut: «%s»" + +#: dir.c:682 dir.c:696 +#, c-format +msgid "unrecognized negative pattern: '%s'" +msgstr "patró negatiu no reconegut: «%s»" + +#: dir.c:714 +#, c-format +msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" +msgstr "" + +#: dir.c:724 +msgid "disabling cone pattern matching" +msgstr "inhabilita la coincidència de patrons «cone»" + +#: dir.c:1101 #, c-format msgid "cannot use %s as an exclude file" -msgstr "no es pot usar %s com a fitxer d'exclusió" +msgstr "no es pot usar %s com a fitxer d'exclusió" -#: dir.c:1843 +#: dir.c:2078 #, c-format msgid "could not open directory '%s'" msgstr "no s'ha pogut obrir el directori «%s»" -#: dir.c:2085 +#: dir.c:2415 msgid "failed to get kernel name and information" msgstr "s'ha produït un error en obtenir el nombre i la informació del nucli" -#: dir.c:2209 +#: dir.c:2539 msgid "untracked cache is disabled on this system or location" msgstr "" "la memòria cau no seguida està inhabilitada en aquest sistema o ubicació" -#: dir.c:3013 +#: dir.c:3343 #, c-format msgid "index file corrupt in repo %s" msgstr "el fitxer d'índex al dipòsit %s és malmès" -#: dir.c:3058 dir.c:3063 +#: dir.c:3388 dir.c:3393 #, c-format msgid "could not create directories for %s" msgstr "no s'han pogut crear directoris per %s" -#: dir.c:3092 +#: dir.c:3422 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "no s'ha pogut migrar el directori de «%s» a «%s»" @@ -3066,12 +3511,12 @@ msgstr "S'està filtrant el contingut" msgid "could not stat file '%s'" msgstr "no s'ha pogut fer «stat» sobre el fitxer «%s»" -#: environment.c:150 +#: environment.c:149 #, c-format msgid "bad git namespace path \"%s\"" msgstr "" -#: environment.c:332 +#: environment.c:331 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "no s'ha pogut establir GIT_DIR a «%s»" @@ -3081,266 +3526,268 @@ msgstr "no s'ha pogut establir GIT_DIR a «%s»" msgid "too many args to run %s" msgstr "hi ha massa arguments per a executar %s" -#: fetch-object.c:17 -msgid "Remote with no URL" -msgstr "Remot sense URL" - -#: fetch-pack.c:151 +#: fetch-pack.c:150 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: llista superficial esperada" -#: fetch-pack.c:154 +#: fetch-pack.c:153 #, fuzzy msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "git fetch-pack: llista superficial esperada" -#: fetch-pack.c:165 +#: fetch-pack.c:164 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack: s'esperava ACK/NAK, s'ha rebut un paquet de neteja" -#: fetch-pack.c:185 +#: fetch-pack.c:184 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: s'esperava ACK/NAK, s'ha rebut «%s»" -#: fetch-pack.c:196 +#: fetch-pack.c:195 msgid "unable to write to remote" msgstr "no s'ha pogut escriure al remot" -#: fetch-pack.c:258 +#: fetch-pack.c:257 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc requereix multi_ack_detailed" -#: fetch-pack.c:360 fetch-pack.c:1284 +#: fetch-pack.c:356 fetch-pack.c:1340 #, c-format msgid "invalid shallow line: %s" msgstr "línia de shallow no vàlida: %s" -#: fetch-pack.c:366 fetch-pack.c:1290 +#: fetch-pack.c:362 fetch-pack.c:1346 #, c-format msgid "invalid unshallow line: %s" msgstr "línia d'unshallow no vàlida: %s" -#: fetch-pack.c:368 fetch-pack.c:1292 +#: fetch-pack.c:364 fetch-pack.c:1348 #, c-format msgid "object not found: %s" msgstr "objecte no trobat: %s" -#: fetch-pack.c:371 fetch-pack.c:1295 +#: fetch-pack.c:367 fetch-pack.c:1351 #, c-format msgid "error in object: %s" msgstr "error en objecte: %s" -#: fetch-pack.c:373 fetch-pack.c:1297 +#: fetch-pack.c:369 fetch-pack.c:1353 #, c-format msgid "no shallow found: %s" msgstr "no s'ha trobat cap shallow: %s" -#: fetch-pack.c:376 fetch-pack.c:1301 +#: fetch-pack.c:372 fetch-pack.c:1357 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "s'esperava shallow/unshallow, s'ha rebut %s" -#: fetch-pack.c:417 +#: fetch-pack.c:414 #, c-format msgid "got %s %d %s" msgstr "s'ha rebut %s %d %s" -#: fetch-pack.c:434 +#: fetch-pack.c:431 #, c-format msgid "invalid commit %s" msgstr "comissió no vàlida %s" -#: fetch-pack.c:465 +#: fetch-pack.c:462 msgid "giving up" msgstr "s'abandona" -#: fetch-pack.c:477 progress.c:277 +#: fetch-pack.c:475 progress.c:323 msgid "done" msgstr "fet" -#: fetch-pack.c:489 +#: fetch-pack.c:487 #, c-format msgid "got %s (%d) %s" msgstr "s'ha rebut %s (%d) %s" -#: fetch-pack.c:535 +#: fetch-pack.c:533 #, c-format msgid "Marking %s as complete" msgstr "S'està marcant %s com a complet" -#: fetch-pack.c:744 +#: fetch-pack.c:754 #, c-format msgid "already have %s (%s)" msgstr "ja es té %s (%s)" -#: fetch-pack.c:783 +#: fetch-pack.c:818 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack: no s'ha pogut bifurcar del desmultiplexor de banda lateral" -#: fetch-pack.c:791 +#: fetch-pack.c:826 msgid "protocol error: bad pack header" msgstr "error de protocol: capçalera de paquet errònia" -#: fetch-pack.c:859 +#: fetch-pack.c:900 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: no es pot bifurcar de %s" -#: fetch-pack.c:875 +#: fetch-pack.c:916 #, c-format msgid "%s failed" msgstr "%s ha fallat" -#: fetch-pack.c:877 +#: fetch-pack.c:918 msgid "error in sideband demultiplexer" msgstr "error en desmultiplexor de banda lateral" -#: fetch-pack.c:908 +#: fetch-pack.c:965 #, c-format msgid "Server version is %.*s" msgstr "La versió del servidor és %.*s" -#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928 -#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944 -#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960 -#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982 +#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985 +#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001 +#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 +#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039 #, c-format msgid "Server supports %s" msgstr "El servidor accepta %s" -#: fetch-pack.c:915 +#: fetch-pack.c:972 msgid "Server does not support shallow clients" msgstr "El servidor no permet clients superficials" -#: fetch-pack.c:975 +#: fetch-pack.c:1032 msgid "Server does not support --shallow-since" msgstr "El servidor no admet --shallow-since" -#: fetch-pack.c:980 +#: fetch-pack.c:1037 msgid "Server does not support --shallow-exclude" msgstr "El servidor no admet --shallow-exclude" -#: fetch-pack.c:984 +#: fetch-pack.c:1041 msgid "Server does not support --deepen" msgstr "El servidor no admet --deepen" -#: fetch-pack.c:1001 +#: fetch-pack.c:1058 msgid "no common commits" msgstr "cap comissió en comú" -#: fetch-pack.c:1013 fetch-pack.c:1462 +#: fetch-pack.c:1070 fetch-pack.c:1536 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: l'obtenció ha fallat." -#: fetch-pack.c:1151 +#: fetch-pack.c:1209 msgid "Server does not support shallow requests" msgstr "El servidor no permet peticions superficials" -#: fetch-pack.c:1157 +#: fetch-pack.c:1216 msgid "Server supports filter" msgstr "El servidor accepta filtratge" -#: fetch-pack.c:1184 +#: fetch-pack.c:1239 msgid "unable to write request to remote" msgstr "no s'ha pogut escriure la petició al remot" -#: fetch-pack.c:1202 +#: fetch-pack.c:1257 #, c-format msgid "error reading section header '%s'" msgstr "error en llegir la capçalera de la secció «%s»" -#: fetch-pack.c:1208 +#: fetch-pack.c:1263 #, c-format msgid "expected '%s', received '%s'" msgstr "s'esperava «%s», s'ha rebut «%s»" -#: fetch-pack.c:1247 +#: fetch-pack.c:1303 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "línia de confirmació inesperada: «%s»" -#: fetch-pack.c:1252 -#, fuzzy, c-format +#: fetch-pack.c:1308 +#, c-format msgid "error processing acks: %d" -msgstr "error en llegir %s" +msgstr "s'ha produït un error en processar els acks: %d" -#: fetch-pack.c:1262 +#: fetch-pack.c:1318 msgid "expected packfile to be sent after 'ready'" msgstr "s'espera l'enviament del fitxer de paquet després de «ready»" -#: fetch-pack.c:1264 +#: fetch-pack.c:1320 msgid "expected no other sections to be sent after no 'ready'" msgstr "s'espera que cap altra seccions s'enviï després de no «ready»" -#: fetch-pack.c:1306 +#: fetch-pack.c:1362 #, c-format msgid "error processing shallow info: %d" msgstr "s'ha produït un error en processar la informació superficial: %d" -#: fetch-pack.c:1353 +#: fetch-pack.c:1409 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "s'esperava wanted-ref, s'ha rebut «%s»" -#: fetch-pack.c:1358 +#: fetch-pack.c:1414 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "wanted-ref inesperat: «%s»" -#: fetch-pack.c:1363 +#: fetch-pack.c:1419 #, c-format msgid "error processing wanted refs: %d" msgstr "s'ha produït un error en processar les referències desitjades: %d" -#: fetch-pack.c:1689 +#: fetch-pack.c:1762 msgid "no matching remote head" msgstr "no hi ha cap HEAD remot coincident" -#: fetch-pack.c:1712 builtin/clone.c:686 +#: fetch-pack.c:1785 builtin/clone.c:688 msgid "remote did not send all necessary objects" msgstr "el remot no ha enviat tots els objectes necessaris" -#: fetch-pack.c:1739 +#: fetch-pack.c:1812 #, c-format msgid "no such remote ref %s" msgstr "no existeix la referència remota %s" -#: fetch-pack.c:1742 +#: fetch-pack.c:1815 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "El servidor no permet sol·licitar objectes no anunciats %s" -#: gpg-interface.c:321 -msgid "gpg failed to sign the data" -msgstr "gpg ha fallat en signar les dades" - -#: gpg-interface.c:347 +#: gpg-interface.c:223 msgid "could not create temporary file" msgstr "no s'ha pogut crear el fitxer temporal" -#: gpg-interface.c:350 +#: gpg-interface.c:226 #, c-format msgid "failed writing detached signature to '%s'" msgstr "s'ha produït un error en escriure la signatura separada a «%s»" -#: graph.c:97 +#: gpg-interface.c:390 +msgid "gpg failed to sign the data" +msgstr "gpg ha fallat en signar les dades" + +#: graph.c:98 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "ignora el color no vàlid «%.*s» en log.graphColors" -#: grep.c:2117 +#: grep.c:668 +msgid "" +"given pattern contains NULL byte (via -f ). This is only supported " +"with -P under PCRE v2" +msgstr "" + +#: grep.c:2124 #, c-format msgid "'%s': unable to read %s" msgstr "«%s»: no s'ha pogut llegir %s" -#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82 +#: grep.c:2141 setup.c:165 builtin/clone.c:411 builtin/diff.c:82 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "s'ha produït un error en fer stat a «%s»" -#: grep.c:2145 +#: grep.c:2152 #, c-format msgid "'%s': short read" msgstr "«%s»: lectura curta" @@ -3390,7 +3837,7 @@ msgid "Low-level Commands / Interrogators" msgstr "Ordres de baix nivell / Interrogadors" #: help.c:37 -msgid "Low-level Commands / Synching Repositories" +msgid "Low-level Commands / Syncing Repositories" msgstr "Ordres de baix nivell / Sincronització de dipòsits" #: help.c:38 @@ -3485,12 +3932,12 @@ msgstr[1] "" msgid "git version []" msgstr "git version []" -#: help.c:782 +#: help.c:783 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: help.c:786 +#: help.c:787 msgid "" "\n" "Did you mean this?" @@ -3562,47 +4009,62 @@ msgstr "nom d'identitat buit (per <%s>) no és permès" msgid "name consists only of disallowed characters: %s" msgstr "el nom conté només caràcters no permesos: %s" -#: ident.c:436 builtin/commit.c:611 +#: ident.c:436 builtin/commit.c:631 #, c-format msgid "invalid date format: %s" msgstr "format de data no vàlid: %s" -#: list-objects.c:129 +#: list-objects.c:127 #, c-format msgid "entry '%s' in tree %s has tree mode, but is not a tree" msgstr "l'entrada «%s» a l'arbre %s té mode d'arbre, però no és un arbre" -#: list-objects.c:142 +#: list-objects.c:140 #, c-format msgid "entry '%s' in tree %s has blob mode, but is not a blob" msgstr "l'entrada «%s» a l'arbre %s té mode blob, però no és un blob" -#: list-objects.c:378 +#: list-objects.c:375 #, c-format msgid "unable to load root tree for commit %s" msgstr "no s'ha pogut carregar l'arrel de l'arbre per la comissió %s" -#: list-objects-filter-options.c:36 -msgid "multiple filter-specs cannot be combined" -msgstr "no es poden combinar múltiples especificacions de filtratge" +#: list-objects-filter.c:492 +#, fuzzy, c-format +msgid "unable to access sparse blob in '%s'" +msgstr "no s'ha pogut accedir a «%s»" + +#: list-objects-filter.c:495 +#, fuzzy, c-format +msgid "unable to parse sparse filter data in %s" +msgstr "no s'ha pogut llegir %s" #: list-objects-filter-options.c:58 msgid "expected 'tree:'" msgstr "s'esperava «tree:»" -#: list-objects-filter-options.c:84 +#: list-objects-filter-options.c:73 msgid "sparse:path filters support has been dropped" msgstr "" -#: list-objects-filter-options.c:94 +#: list-objects-filter-options.c:86 #, c-format msgid "invalid filter-spec '%s'" msgstr "filtre d'especificació no vàlid: «%s»" -#: list-objects-filter-options.c:158 -msgid "cannot change partial clone promisor remote" +#: list-objects-filter-options.c:102 +#, c-format +msgid "must escape char in sub-filter-spec: '%c'" +msgstr "" + +#: list-objects-filter-options.c:144 +msgid "expected something after combine:" msgstr "" +#: list-objects-filter-options.c:226 +msgid "multiple filter-specs cannot be combined" +msgstr "no es poden combinar múltiples especificacions de filtratge" + #: lockfile.c:151 #, c-format msgid "" @@ -3632,117 +4094,114 @@ msgstr "No s'ha pogut crear «%s.lock»: %s" msgid "failed to read the cache" msgstr "s'ha produït un error en llegir la memòria cau" -#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919 -#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786 +#: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908 +#: builtin/checkout.c:539 builtin/checkout.c:798 builtin/clone.c:809 #: builtin/stash.c:264 msgid "unable to write new index file" msgstr "no s'ha pogut escriure un fitxer d'índex nou" -#: merge-recursive.c:322 +#: merge-recursive.c:367 msgid "(bad commit)\n" msgstr "(comissió errònia)\n" -#: merge-recursive.c:345 +#: merge-recursive.c:390 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "addinfo_cache ha fallat per al camí «%s»; interrompent la fusió." -#: merge-recursive.c:354 +#: merge-recursive.c:399 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." -msgstr "addinfo_cache ha fallat al refrescar el camí «%s»; interrompent la fusió." - -#: merge-recursive.c:437 -msgid "error building trees" -msgstr "error en construir arbres" +msgstr "" +"addinfo_cache ha fallat al refrescar el camí «%s»; interrompent la fusió." -#: merge-recursive.c:863 +#: merge-recursive.c:885 #, c-format msgid "failed to create path '%s'%s" msgstr "s'ha produït un error en crear el camí «%s»%s" -#: merge-recursive.c:874 +#: merge-recursive.c:896 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "S'està eliminant %s per a fer espai per al subdirectori\n" -#: merge-recursive.c:888 merge-recursive.c:907 +#: merge-recursive.c:910 merge-recursive.c:929 msgid ": perhaps a D/F conflict?" msgstr ": potser un conflicte D/F?" -#: merge-recursive.c:897 +#: merge-recursive.c:919 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "s'està refusant perdre el fitxer no seguit a «%s»" -#: merge-recursive.c:938 builtin/cat-file.c:40 +#: merge-recursive.c:960 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "no es pot llegir l'objecte %s «%s»" -#: merge-recursive.c:941 +#: merge-recursive.c:965 #, c-format msgid "blob expected for %s '%s'" msgstr "blob esperat per a %s «%s»" -#: merge-recursive.c:965 +#: merge-recursive.c:990 #, c-format msgid "failed to open '%s': %s" msgstr "s'ha produït un error en obrir «%s»: %s" -#: merge-recursive.c:976 +#: merge-recursive.c:1001 #, c-format msgid "failed to symlink '%s': %s" msgstr "s'ha produït un error en fer l'enllaç simbòlic «%s»: %s" -#: merge-recursive.c:981 +#: merge-recursive.c:1006 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "no se sap què fer amb %06o %s «%s»" -#: merge-recursive.c:1177 +#: merge-recursive.c:1199 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "S'ha produït un error en fusionar el submòdul %s (no està agafat)" -#: merge-recursive.c:1184 +#: merge-recursive.c:1206 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "S'ha produït un error en fusionar el submòdul %s (no hi ha comissions)" -#: merge-recursive.c:1191 +#: merge-recursive.c:1213 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "" "S'ha produït un error en fusionar el submòdul %s (les comissions no " "segueixen merge-base)" -#: merge-recursive.c:1199 merge-recursive.c:1211 +#: merge-recursive.c:1221 merge-recursive.c:1233 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Avançament ràpid del submòdul %s a la següent comissió:" -#: merge-recursive.c:1202 merge-recursive.c:1214 +#: merge-recursive.c:1224 merge-recursive.c:1236 #, c-format msgid "Fast-forwarding submodule %s" msgstr "Avançament ràpid al submòdul %s" -#: merge-recursive.c:1237 +#: merge-recursive.c:1259 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" -#: merge-recursive.c:1241 +#: merge-recursive.c:1263 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "" "S'ha produït un error en fusionar el submòdul %s (sense avançament ràpid)" -#: merge-recursive.c:1242 +#: merge-recursive.c:1264 msgid "Found a possible merge resolution for the submodule:\n" msgstr "S'ha trobat una possible resolució de fusió pel submòdul:\n" -#: merge-recursive.c:1245 +#: merge-recursive.c:1267 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -3753,33 +4212,35 @@ msgid "" "which will accept this suggestion.\n" msgstr "" -#: merge-recursive.c:1254 +#: merge-recursive.c:1276 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "" "S'ha produït un error en fusionar el submòdul %s (s'han trobat múltiples " "fusions)" -#: merge-recursive.c:1327 +#: merge-recursive.c:1349 msgid "Failed to execute internal merge" msgstr "S'ha produït un error en executar la fusió interna" -#: merge-recursive.c:1332 +#: merge-recursive.c:1354 #, c-format msgid "Unable to add %s to database" msgstr "No s'ha pogut afegir %s a la base de dades" -#: merge-recursive.c:1364 +#: merge-recursive.c:1386 #, c-format msgid "Auto-merging %s" msgstr "S'està autofusionant %s" -#: merge-recursive.c:1387 +#: merge-recursive.c:1410 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." -msgstr "Error: s'està refusant perdre el fitxer no seguit a %s; en comptes s'ha escrit a %s." +msgstr "" +"Error: s'està refusant perdre el fitxer no seguit a %s; en comptes s'ha " +"escrit a %s." -#: merge-recursive.c:1459 +#: merge-recursive.c:1482 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3788,7 +4249,7 @@ msgstr "" "CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s " "s'ha deixat en l'arbre." -#: merge-recursive.c:1464 +#: merge-recursive.c:1487 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -3797,7 +4258,7 @@ msgstr "" "CONFLICTE: (%s/supressió): %s suprimit en %s i %s a %s en %s. La versió %s " "de %s s'ha deixat en l'arbre." -#: merge-recursive.c:1471 +#: merge-recursive.c:1494 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3806,7 +4267,7 @@ msgstr "" "CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s " "s'ha deixat en l'arbre a %s." -#: merge-recursive.c:1476 +#: merge-recursive.c:1499 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -3815,64 +4276,66 @@ msgstr "" "CONFLICTE: (%s/supressió): %s suprimit en %s i %s a %s en %s. La versió %s " "de %s s'ha deixat en l'arbre a %s." -#: merge-recursive.c:1511 +#: merge-recursive.c:1534 msgid "rename" msgstr "canvi de nom" -#: merge-recursive.c:1511 +#: merge-recursive.c:1534 msgid "renamed" msgstr "canviat de nom" -#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3093 +#: merge-recursive.c:1614 merge-recursive.c:2530 merge-recursive.c:3175 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "S'està refusant a perdre el fitxer brut a %s" -#: merge-recursive.c:1601 +#: merge-recursive.c:1624 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." -msgstr "S'està refusant perdre el fitxer no seguit a «%s», malgrat que està en mig de l'operació." +msgstr "" +"S'està refusant perdre el fitxer no seguit a «%s», malgrat que està en mig " +"de l'operació." -#: merge-recursive.c:1659 +#: merge-recursive.c:1682 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "" -"CONFLICTE (canvi de nom/afegiment): Canvi de nom %s->%s a %s. S'ha afegit %s a " -"%s" +"CONFLICTE (canvi de nom/afegiment): Canvi de nom %s->%s a %s. S'ha afegit " +"%s a %s" -#: merge-recursive.c:1690 +#: merge-recursive.c:1713 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s és un directori en %s; s'està afegint com a %s en lloc d'això" -#: merge-recursive.c:1695 +#: merge-recursive.c:1718 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "" "s'està refusant perdre el fitxer no seguit a %s; en comptes, s'està afegint " "com a %s" -#: merge-recursive.c:1714 +#: merge-recursive.c:1737 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" "\"->\"%s\" in \"%s\"%s" msgstr "" -"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom «%s»->«%s» en la " -"branca «%s» canvi de nom «%s»->«%s» en «%s»%s" +"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom «%s»->«%s» en la branca " +"«%s» canvi de nom «%s»->«%s» en «%s»%s" -#: merge-recursive.c:1719 +#: merge-recursive.c:1742 msgid " (left unresolved)" msgstr " (deixat sense resolució)" -#: merge-recursive.c:1828 +#: merge-recursive.c:1851 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "CONFLICTE (canvi de nom/canvi de nom): Canvi de nom %s->%s en %s. Canvi de " "nom %s->%s en %s" -#: merge-recursive.c:2035 +#: merge-recursive.c:2114 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -3880,330 +4343,348 @@ msgid "" "getting a majority of the files." msgstr "" -#: merge-recursive.c:2067 +#: merge-recursive.c:2146 #, c-format 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 "" -#: merge-recursive.c:2077 +#: merge-recursive.c:2156 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " "implicit directory renames tried to put these paths there: %s" msgstr "" -#: merge-recursive.c:2169 -#, fuzzy, c-format +#: merge-recursive.c:2248 +#, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" ">%s in %s" msgstr "" -"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom %s->%s en %s. Canvi de " -"nom %s->%s en %s" +"CONFLICTE (canvi de nom/canvi de nom): canvi de nom %s->%s en %s. Canvi de " +"nom de directori %s->%s en %s" -#: merge-recursive.c:2413 +#: merge-recursive.c:2493 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " "renamed." msgstr "" -"AVÍS: S'està evitant aplicar el canvi de nom %s -> %s a %s, perquè %s ell mateix ja havia canviat de nom." +"AVÍS: S'està evitant aplicar el canvi de nom %s -> %s a %s, perquè %s ell " +"mateix ja havia canviat de nom." -#: merge-recursive.c:2937 +#: merge-recursive.c:3019 #, c-format msgid "cannot read object %s" msgstr "no es pot llegir l'objecte %s" -#: merge-recursive.c:2940 +#: merge-recursive.c:3022 #, c-format msgid "object %s is not a blob" msgstr "l'objecte %s no és un blob" -#: merge-recursive.c:3004 +#: merge-recursive.c:3086 msgid "modify" msgstr "modificació" -#: merge-recursive.c:3004 +#: merge-recursive.c:3086 msgid "modified" msgstr "modificat" -#: merge-recursive.c:3016 +#: merge-recursive.c:3098 msgid "content" msgstr "contingut" -#: merge-recursive.c:3020 +#: merge-recursive.c:3102 msgid "add/add" msgstr "afegiment/afegiment" -#: merge-recursive.c:3043 +#: merge-recursive.c:3125 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "S'ha omès %s (el fusionat és igual a l'existent)" -#: merge-recursive.c:3065 git-submodule.sh:937 +#: merge-recursive.c:3147 git-submodule.sh:993 msgid "submodule" msgstr "submòdul" -#: merge-recursive.c:3066 +#: merge-recursive.c:3148 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "CONFLICTE (%s): Conflicte de fusió en %s" -#: merge-recursive.c:3096 +#: merge-recursive.c:3178 #, c-format msgid "Adding as %s instead" msgstr "S'està afegint com a %s en lloc d'això" -#: merge-recursive.c:3178 +#: merge-recursive.c:3261 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " "moving it to %s." msgstr "" -#: merge-recursive.c:3181 +#: merge-recursive.c:3264 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " "in %s, suggesting it should perhaps be moved to %s." msgstr "" -#: merge-recursive.c:3185 +#: merge-recursive.c:3268 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " "%s; moving it to %s." msgstr "" -#: merge-recursive.c:3188 +#: merge-recursive.c:3271 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " "was renamed in %s, suggesting it should perhaps be moved to %s." msgstr "" -#: merge-recursive.c:3302 +#: merge-recursive.c:3385 #, c-format msgid "Removing %s" msgstr "S'està eliminant %s" -#: merge-recursive.c:3325 +#: merge-recursive.c:3408 msgid "file/directory" msgstr "fitxer/directori" -#: merge-recursive.c:3330 +#: merge-recursive.c:3413 msgid "directory/file" msgstr "directori/fitxer" -#: merge-recursive.c:3337 +#: merge-recursive.c:3420 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "CONFLICTE (%s): Hi ha un directori amb nom %s en %s. S'està afegint %s com a " "%s" -#: merge-recursive.c:3346 +#: merge-recursive.c:3429 #, c-format msgid "Adding %s" msgstr "S'està afegint %s" -#: merge-recursive.c:3355 +#: merge-recursive.c:3438 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "CONFLICTE (afegiment/afegiment): Conflicte de fusió en %s" -#: merge-recursive.c:3393 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -" %s" -msgstr "" -"Els canvis locals als fitxers següents se sobreescriuran per la fusió:\n" -" %s" - -#: merge-recursive.c:3404 +#: merge-recursive.c:3482 msgid "Already up to date!" msgstr "Ja està al dia!" -#: merge-recursive.c:3413 +#: merge-recursive.c:3491 #, c-format msgid "merging of trees %s and %s failed" msgstr "la fusió dels arbres %s i %s ha fallat" -#: merge-recursive.c:3512 +#: merge-recursive.c:3595 msgid "Merging:" msgstr "S'està fusionant:" -#: merge-recursive.c:3525 +#: merge-recursive.c:3608 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "s'ha trobat %u avantpassat en comú:" msgstr[1] "s'han trobat %u avantpassats en comú:" -#: merge-recursive.c:3564 +#: merge-recursive.c:3658 msgid "merge returned no commit" msgstr "la fusió no ha retornat cap comissió" -#: merge-recursive.c:3630 +#: merge-recursive.c:3717 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" +"Els canvis locals als fitxers següents se sobreescriuran per la fusió:\n" +" %s" + +#: merge-recursive.c:3814 #, c-format msgid "Could not parse object '%s'" msgstr "No s'ha pogut analitzar l'objecte «%s»" -#: merge-recursive.c:3646 builtin/merge.c:698 builtin/merge.c:869 +#: merge-recursive.c:3832 builtin/merge.c:694 builtin/merge.c:874 msgid "Unable to write index." msgstr "No s'ha pogut escriure l'índex." -#: midx.c:69 +#: midx.c:68 #, c-format msgid "multi-pack-index file %s is too small" msgstr "" -#: midx.c:85 +#: midx.c:84 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "" -#: midx.c:90 +#: midx.c:89 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "" -#: midx.c:95 +#: midx.c:94 #, fuzzy, c-format msgid "hash version %u does not match" msgstr "el camí «%s» no té la seva versió" -#: midx.c:109 +#: midx.c:108 msgid "invalid chunk offset (too large)" msgstr "" -#: midx.c:133 +#: midx.c:132 msgid "terminating multi-pack-index chunk id appears earlier than expected" msgstr "" -#: midx.c:146 +#: midx.c:145 msgid "multi-pack-index missing required pack-name chunk" msgstr "" -#: midx.c:148 +#: midx.c:147 msgid "multi-pack-index missing required OID fanout chunk" msgstr "" -#: midx.c:150 +#: midx.c:149 msgid "multi-pack-index missing required OID lookup chunk" msgstr "" -#: midx.c:152 +#: midx.c:151 msgid "multi-pack-index missing required object offsets chunk" msgstr "" -#: midx.c:166 +#: midx.c:165 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "" -#: midx.c:211 +#: midx.c:210 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "" -#: midx.c:261 +#: midx.c:260 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "" -#: midx.c:289 +#: midx.c:288 msgid "error preparing packfile from multi-pack-index" msgstr "" -#: midx.c:470 +#: midx.c:472 #, fuzzy, c-format msgid "failed to add packfile '%s'" msgstr "s'ha produït un error en llegir el fitxer d'ordres «%s»" -#: midx.c:476 +#: midx.c:478 #, fuzzy, c-format msgid "failed to open pack-index '%s'" msgstr "s'ha produït un error en obrir «%s»" -#: midx.c:536 +#: midx.c:538 #, fuzzy, c-format msgid "failed to locate object %d in packfile" msgstr "s'ha produït un error en llegir l'objecte «%s»." -#: midx.c:865 +#: midx.c:842 +#, fuzzy +msgid "Adding packfiles to multi-pack-index" +msgstr "s'ha produït un error en netejar l'índex" + +#: midx.c:875 #, c-format msgid "did not see pack-file %s to drop" msgstr "" -#: midx.c:1036 +#: midx.c:973 +msgid "Writing chunks to multi-pack-index" +msgstr "" + +#: midx.c:1052 #, fuzzy, c-format msgid "failed to clear multi-pack-index at %s" msgstr "s'ha produït un error en netejar l'índex" -#: midx.c:1091 +#: midx.c:1108 msgid "Looking for referenced packfiles" msgstr "S'estan cercant fitxers de paquets referenciats" -#: midx.c:1106 +#: midx.c:1123 #, c-format msgid "" "oid fanout out of order: fanout[%d] = % > % = fanout[%d]" msgstr "" -#: midx.c:1110 -msgid "Verifying OID order in MIDX" +#: midx.c:1128 +msgid "Verifying OID order in multi-pack-index" msgstr "" -#: midx.c:1119 +#: midx.c:1137 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "" -#: midx.c:1138 +#: midx.c:1157 msgid "Sorting objects by packfile" msgstr "S'estan ordenant els objectes per fitxer de paquet" -#: midx.c:1144 +#: midx.c:1164 msgid "Verifying object offsets" msgstr "S'estan verificant els desplaçaments dels objectes" -#: midx.c:1160 +#: midx.c:1180 #, fuzzy, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "no s'ha pogut afegir una entrada de cau per a %s" -#: midx.c:1166 +#: midx.c:1186 #, fuzzy, c-format msgid "failed to load pack-index for packfile %s" msgstr "s'ha produït un error en llegir el fitxer d'ordres «%s»" -#: midx.c:1175 +#: midx.c:1195 #, c-format msgid "incorrect object offset for oid[%d] = %s: % != %" msgstr "" -#: midx.c:1350 +#: midx.c:1220 +msgid "Counting referenced objects" +msgstr "S'estan comptant els objectes referenciats" + +#: midx.c:1230 +msgid "Finding and deleting unreferenced packfiles" +msgstr "S'estan cercant i suprimint els fitxers de paquets no referenciats" + +#: midx.c:1388 msgid "could not start pack-objects" msgstr "no s'ha pogut executar el pack-objects" -#: midx.c:1369 +#: midx.c:1407 msgid "could not finish pack-objects" msgstr "no s'ha pogut finalitzar el pack-objects" -#: name-hash.c:532 +#: name-hash.c:537 #, fuzzy, c-format msgid "unable to create lazy_dir thread: %s" msgstr "no s'ha pogut crear fil: %s" -#: name-hash.c:554 +#: name-hash.c:559 #, fuzzy, c-format msgid "unable to create lazy_name thread: %s" msgstr "no s'ha pogut crear fil: %s" -#: name-hash.c:560 +#: name-hash.c:565 #, fuzzy, c-format msgid "unable to join lazy_name thread: %s" msgstr "no s'ha pogut crear fil: %s" @@ -4247,42 +4728,42 @@ msgstr "S'està refusant reescriure les notes en %s (fora de refs/notes/)" msgid "Bad %s value: '%s'" msgstr "Valor erroni de %s: «%s»" -#: object.c:54 +#: object.c:53 #, c-format msgid "invalid object type \"%s\"" msgstr "tipus d'objecte «%s» no vàlid" -#: object.c:174 +#: object.c:173 #, c-format msgid "object %s is a %s, not a %s" msgstr "l'objecte %s és %s, no pas %s" -#: object.c:234 +#: object.c:233 #, c-format msgid "object %s has unknown type id %d" msgstr "l'objecte %s té un identificador de tipus %d desconegut" -#: object.c:247 +#: object.c:246 #, c-format msgid "unable to parse object: %s" msgstr "no s'ha pogut analitzar l'objecte: %s" -#: object.c:267 object.c:278 +#: object.c:266 object.c:277 #, c-format msgid "hash mismatch %s" msgstr "" -#: packfile.c:648 +#: packfile.c:641 msgid "offset before end of packfile (broken .idx?)" msgstr "desplaçament abans de la fi del fitxer de paquet (.idx trencat?)" -#: packfile.c:1899 +#: packfile.c:1888 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "" "desplaçament abans d'inici d'índex de paquet per a %s (índex corromput?)" -#: packfile.c:1903 +#: packfile.c:1892 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" @@ -4328,26 +4809,26 @@ msgstr "" msgid "did you mean `--%s` (with two dashes ?)" msgstr "" -#: parse-options.c:859 +#: parse-options.c:860 #, c-format msgid "unknown option `%s'" msgstr "opció desconeguda «%s»" -#: parse-options.c:861 +#: parse-options.c:862 #, c-format msgid "unknown switch `%c'" msgstr "«switch» «%c» desconegut" -#: parse-options.c:863 +#: parse-options.c:864 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "opció no ascii desconeguda en la cadena: «%s»" -#: parse-options.c:887 +#: parse-options.c:888 msgid "..." msgstr "..." -#: parse-options.c:906 +#: parse-options.c:907 #, c-format msgid "usage: %s" msgstr "ús: %s" @@ -4355,21 +4836,21 @@ msgstr "ús: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:912 +#: parse-options.c:913 #, c-format msgid " or: %s" msgstr " o: %s" -#: parse-options.c:915 +#: parse-options.c:916 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:954 +#: parse-options.c:955 msgid "-NUM" msgstr "-NUM" -#: parse-options.c:968 +#: parse-options.c:969 #, c-format msgid "alias of --%s" msgstr "àlies de --%s" @@ -4394,37 +4875,37 @@ msgstr "l'opció «%s» espera «always», «auto» o «never»" msgid "malformed object name '%s'" msgstr "nom d'objecte «%s» mal format" -#: path.c:897 +#: path.c:915 #, c-format msgid "Could not make %s writable by group" msgstr "No s'ha pogut fer %s escrivible pel grup" -#: pathspec.c:128 +#: pathspec.c:130 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "" "El caràcter d'escapament «\\» no està permès com a últim caràcter en un " "valor d'un atribut" -#: pathspec.c:146 +#: pathspec.c:148 msgid "Only one 'attr:' specification is allowed." msgstr "Només es permet una especificació «attr:»." -#: pathspec.c:149 +#: pathspec.c:151 msgid "attr spec must not be empty" msgstr "una especificació d'atribut no pot estar buida" -#: pathspec.c:192 +#: pathspec.c:194 #, c-format msgid "invalid attribute name %s" msgstr "nom d'atribut no vàlid %s" -#: pathspec.c:257 +#: pathspec.c:259 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" "els paràmetres d'especificació de camí «glob» i «noglob» globals són " "incompatibles" -#: pathspec.c:264 +#: pathspec.c:266 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" @@ -4432,51 +4913,56 @@ msgstr "" "el paràmetre d'especificació de camí «literal» global és incompatible amb " "tots els altres paràmetres d'especificació de camí globals" -#: pathspec.c:304 +#: pathspec.c:306 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "paràmetre no vàlid per a la màgia d'especificació de camí «prefix»" -#: pathspec.c:325 +#: pathspec.c:327 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "Màgia d'especificació de camí no vàlida '%.*s' en «%s»" -#: pathspec.c:330 +#: pathspec.c:332 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "«)» mancant al final de la màgia d'especificació de camí en «%s»" -#: pathspec.c:368 +#: pathspec.c:370 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "Màgia d'especificació de camí no implementada «%c» en «%s»" -#: pathspec.c:427 +#: pathspec.c:429 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: «literal» i «glob» són incompatibles" -#: pathspec.c:440 +#: pathspec.c:442 #, c-format msgid "%s: '%s' is outside repository" msgstr "%s: «%s» és fora del dipòsit" -#: pathspec.c:514 +#: pathspec.c:516 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "«%s» (mnemònic: «%c»)" -#: pathspec.c:524 +#: pathspec.c:526 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "" "%s: aquesta ordre no està admesa amb la màgia d'especificació de camí: %s" -#: pathspec.c:591 +#: pathspec.c:593 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "l'especificació de camí «%s» és més enllà d'un enllaç simbòlic" +#: pathspec.c:638 +#, c-format +msgid "line is badly quoted: %s" +msgstr "" + #: pkt-line.c:92 msgid "unable to write flush packet" msgstr "no s'ha pogut escriure el paquet de buidatge" @@ -4539,33 +5025,42 @@ msgstr "S'està actualitzant l'índex" msgid "unable to create threaded lstat: %s" msgstr "no s'ha pogut crear fil: %s" -#: pretty.c:966 +#: pretty.c:981 msgid "unable to parse --pretty format" msgstr "no s'ha pogut analitzar el format --pretty" -#: range-diff.c:70 +#: promisor-remote.c:23 +msgid "Remote with no URL" +msgstr "Remot sense URL" + +#: promisor-remote.c:58 +#, c-format +msgid "promisor remote name cannot begin with '/': %s" +msgstr "" + +#: range-diff.c:75 msgid "could not start `log`" msgstr "no s'ha pogut iniciar «log»" -#: range-diff.c:72 +#: range-diff.c:77 msgid "could not read `log` output" msgstr "no s'ha pogut llegir la sortida de «log»" -#: range-diff.c:91 sequencer.c:5021 +#: range-diff.c:96 sequencer.c:5163 #, c-format msgid "could not parse commit '%s'" msgstr "no s'ha pogut analitzar la comissió «%s»" -#: range-diff.c:117 +#: range-diff.c:122 #, c-format msgid "could not parse git header '%.*s'" msgstr "no s'ha pogut llegir la capçalera de la gif «%.*s»" -#: range-diff.c:274 +#: range-diff.c:285 msgid "failed to generate diff" msgstr "s'ha produït un error en generar el diff" -#: range-diff.c:506 range-diff.c:508 +#: range-diff.c:518 range-diff.c:520 #, c-format msgid "could not parse log for '%s'" msgstr "no s'ha pogut llegir el fitxer de registre per «%s»" @@ -4582,7 +5077,8 @@ msgstr "no es pot crear un blob buit a la base de dades d'objectes" #: read-cache.c:718 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" -msgstr "%s: només pot afegir fitxers normals, enllaços simbòlics o directoris git" +msgstr "" +"%s: només pot afegir fitxers normals, enllaços simbòlics o directoris git" #: read-cache.c:723 #, fuzzy, c-format @@ -4600,20 +5096,20 @@ msgid "unable to add '%s' to index" msgstr "no s'ha pogut afegir «%s» a l'índex" #: read-cache.c:805 -#, fuzzy, c-format +#, c-format msgid "unable to stat '%s'" -msgstr "no s'ha pogut actualitzar %s" +msgstr "no s'ha pogut fer «stat» a «%s»" -#: read-cache.c:1314 -#, fuzzy, c-format +#: read-cache.c:1325 +#, c-format msgid "'%s' appears as both a file and as a directory" -msgstr "%s existeix i no és directori" +msgstr "«%s» apareix com a fitxer i com a directori" -#: read-cache.c:1499 +#: read-cache.c:1531 msgid "Refresh index" msgstr "Actualitza l'índex" -#: read-cache.c:1613 +#: read-cache.c:1646 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -4622,7 +5118,7 @@ msgstr "" "index.version està establerta, però el valor no és vàlid.\n" "S'està usant la versió %i" -#: read-cache.c:1623 +#: read-cache.c:1656 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -4631,138 +5127,138 @@ msgstr "" "GIT_INDEX_VERSION està establerta, però el valor no és vàlid.\n" "S'està usant la versió %i" -#: read-cache.c:1679 +#: read-cache.c:1712 #, c-format msgid "bad signature 0x%08x" msgstr "signatura malmesa 0x%08x" -#: read-cache.c:1682 +#: read-cache.c:1715 #, c-format msgid "bad index version %d" msgstr "versió d'índex incorrecta %d" -#: read-cache.c:1691 +#: read-cache.c:1724 msgid "bad index file sha1 signature" msgstr "signatura sha1 malmesa al fitxer d'índex" -#: read-cache.c:1721 +#: read-cache.c:1754 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "l'índex usa l'extensió %.4s, que no es pot entendre" -#: read-cache.c:1723 +#: read-cache.c:1756 #, c-format msgid "ignoring %.4s extension" msgstr "s'està ignorant l'extensió %.4s" -#: read-cache.c:1760 +#: read-cache.c:1793 #, c-format msgid "unknown index entry format 0x%08x" msgstr "Format d'entrada d'índex desconeguda «0x%08x»" -#: read-cache.c:1776 +#: read-cache.c:1809 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "camp del nom mal formatat l'index, camí a prop «%s»" -#: read-cache.c:1833 +#: read-cache.c:1866 msgid "unordered stage entries in index" msgstr "" -#: read-cache.c:1836 +#: read-cache.c:1869 #, fuzzy, c-format msgid "multiple stage entries for merged file '%s'" msgstr "nom d'identitat buit (per <%s>) no és permès" -#: read-cache.c:1839 +#: read-cache.c:1872 #, fuzzy, c-format msgid "unordered stage entries for '%s'" msgstr "no s'han pogut crear directoris per %s" -#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111 -#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467 -#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347 +#: read-cache.c:1978 read-cache.c:2266 rerere.c:565 rerere.c:599 rerere.c:1111 +#: builtin/add.c:499 builtin/check-ignore.c:178 builtin/checkout.c:470 +#: builtin/checkout.c:654 builtin/clean.c:967 builtin/commit.c:367 #: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145 -#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330 +#: builtin/reset.c:246 builtin/rm.c:271 builtin/submodule--helper.c:332 msgid "index file corrupt" msgstr "fitxer d'índex malmès" -#: read-cache.c:2087 +#: read-cache.c:2119 #, fuzzy, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "no s'ha pogut crear fil: %s" -#: read-cache.c:2100 +#: read-cache.c:2132 #, fuzzy, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "no s'ha pogut crear fil: %s" -#: read-cache.c:2133 +#: read-cache.c:2165 #, fuzzy, c-format msgid "%s: index file open failed" -msgstr "s'ha produït un error en actualitzar els fitxers" +msgstr "%s: s'ha produït un error en actualitzar els fitxers" -#: read-cache.c:2137 +#: read-cache.c:2169 #, fuzzy, c-format msgid "%s: cannot stat the open index" msgstr "no es pot llegir l'índex" -#: read-cache.c:2141 +#: read-cache.c:2173 #, c-format msgid "%s: index file smaller than expected" msgstr "%s: fitxer d'índex més petit que s'esperava" -#: read-cache.c:2145 +#: read-cache.c:2177 #, c-format msgid "%s: unable to map index file" msgstr "%s: no es pot mapar el fitxer d'índex" -#: read-cache.c:2187 +#: read-cache.c:2219 #, fuzzy, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "no s'ha pogut crear fil: %s" -#: read-cache.c:2214 +#: read-cache.c:2246 #, fuzzy, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "no s'ha pogut crear fil: %s" -#: read-cache.c:2246 -#, fuzzy, c-format +#: read-cache.c:2278 +#, c-format msgid "could not freshen shared index '%s'" -msgstr "no s'ha pogut llegir el fitxer «%s»" +msgstr "no s'ha pogut refrescar l'índex compartit «%s»" -#: read-cache.c:2293 +#: read-cache.c:2325 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "índex malmès, s'esperava %s a %s, s'ha rebut %s" -#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114 +#: read-cache.c:3021 strbuf.c:1145 wrapper.c:622 builtin/merge.c:1119 #, c-format msgid "could not close '%s'" msgstr "no s'ha pogut tancar «%s»" -#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928 +#: read-cache.c:3124 sequencer.c:2429 sequencer.c:4069 #, c-format msgid "could not stat '%s'" msgstr "no s'ha pogut fer stat a «%s»" -#: read-cache.c:3105 +#: read-cache.c:3137 #, c-format msgid "unable to open git dir: %s" msgstr "no s'ha pogut obrir el directori git: %s" -#: read-cache.c:3117 +#: read-cache.c:3149 #, c-format msgid "unable to unlink: %s" msgstr "no s'ha pogut desenllaçar: %s" -#: read-cache.c:3142 +#: read-cache.c:3174 #, fuzzy, c-format msgid "cannot fix permission bits on '%s'" msgstr "no s'ha pogut resoldre la revisió: %s" -#: read-cache.c:3291 +#: read-cache.c:3323 #, fuzzy, c-format msgid "%s: cannot drop to stage #0" msgstr "no es pot canviar de directori a %s" @@ -4863,8 +5359,8 @@ msgstr "" msgid "Note that empty commits are commented out" msgstr "Tingueu en compte que les comissions buides estan comentades" -#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447 -#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235 +#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3536 +#: sequencer.c:3562 sequencer.c:5263 builtin/fsck.c:346 builtin/rebase.c:254 #, c-format msgid "could not write '%s'" msgstr "no s'ha pogut escriure «%s»" @@ -4911,7 +5407,7 @@ msgstr "%s no apunta a un objecte vàlid" msgid "ignoring dangling symref %s" msgstr "s'està ignorant la referència trencada %s" -#: refs.c:669 ref-filter.c:2092 +#: refs.c:669 ref-filter.c:2098 #, c-format msgid "ignoring broken ref %s" msgstr "s'està ignorant la referència trencada %s" @@ -4936,14 +5432,15 @@ msgstr "la referència «%s» ja existeix" msgid "unexpected object ID when writing '%s'" msgstr "ID d'objecte no esperat en escriure «%s»" -#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913 -#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656 +#: refs.c:833 sequencer.c:405 sequencer.c:2793 sequencer.c:2997 +#: sequencer.c:3011 sequencer.c:3269 sequencer.c:5179 strbuf.c:1142 +#: wrapper.c:620 #, c-format msgid "could not write to '%s'" msgstr "no s'ha pogut escriure a «%s»" -#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715 -#: builtin/rebase.c:1003 +#: refs.c:860 strbuf.c:1140 wrapper.c:188 wrapper.c:358 builtin/am.c:714 +#: builtin/rebase.c:1031 #, c-format msgid "could not open '%s' for writing" msgstr "no s'ha pogut obrir «%s» per a escriptura" @@ -4978,21 +5475,21 @@ msgstr "s'està refusant la referència amb nom malmès «%s»" msgid "update_ref failed for ref '%s': %s" msgstr "s'ha produït un error en obrir «%s»: %s" -#: refs.c:2012 +#: refs.c:2023 #, fuzzy, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "nom d'identitat buit (per <%s>) no és permès" -#: refs.c:2044 +#: refs.c:2055 msgid "ref updates forbidden inside quarantine environment" msgstr "no està permès actualitzar les referències en un entorn de quarantena" -#: refs.c:2140 refs.c:2170 +#: refs.c:2151 refs.c:2181 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "«%s» existeix; no es pot crear «%s»" -#: refs.c:2146 refs.c:2181 +#: refs.c:2157 refs.c:2192 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "no es poden processar «%s» i «%s» a la vegada" @@ -5002,23 +5499,23 @@ msgstr "no es poden processar «%s» i «%s» a la vegada" msgid "could not remove reference %s" msgstr "no s'ha pogut eliminar la referència %s" -#: refs/files-backend.c:1248 refs/packed-backend.c:1532 -#: refs/packed-backend.c:1542 +#: refs/files-backend.c:1248 refs/packed-backend.c:1541 +#: refs/packed-backend.c:1551 #, c-format msgid "could not delete reference %s: %s" msgstr "no s'ha pogut suprimir la referència %s: %s" -#: refs/files-backend.c:1251 refs/packed-backend.c:1545 +#: refs/files-backend.c:1251 refs/packed-backend.c:1554 #, c-format msgid "could not delete references: %s" msgstr "no s'han pogut suprimir les referències: %s" #: refspec.c:137 -#, fuzzy, c-format +#, c-format msgid "invalid refspec '%s'" -msgstr "fitxer no vàlid: «%s»" +msgstr "refspec no vàlida: «%s»" -#: ref-filter.c:42 wt-status.c:1934 +#: ref-filter.c:42 wt-status.c:1938 msgid "gone" msgstr "no hi és" @@ -5037,280 +5534,280 @@ msgstr "darrere per %d" msgid "ahead %d, behind %d" msgstr "davant per %d, darrere per %d" -#: ref-filter.c:162 +#: ref-filter.c:165 #, c-format msgid "expected format: %%(color:)" msgstr "format esperat: %%(color:)" -#: ref-filter.c:164 +#: ref-filter.c:167 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "color no reconegut: %%(color:%s)" -#: ref-filter.c:186 +#: ref-filter.c:189 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "valor enter esperat pel nom de referència:lstrip=%s" -#: ref-filter.c:190 +#: ref-filter.c:193 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "valor enter esperat pel nom de referència:rstrip=%s" -#: ref-filter.c:192 +#: ref-filter.c:195 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "paràmetre %%(%s) desconegut: %s" -#: ref-filter.c:247 +#: ref-filter.c:250 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "%%(subject) no accepta paràmetres" -#: ref-filter.c:269 -#, fuzzy, c-format +#: ref-filter.c:272 +#, c-format msgid "unrecognized %%(objectsize) argument: %s" -msgstr "paràmetre %%(objectname) no reconegut: %s" +msgstr "paràmetre %%(objectsize) no reconegut: %s" -#: ref-filter.c:277 -#, fuzzy, c-format +#: ref-filter.c:280 +#, c-format msgid "%%(deltabase) does not take arguments" -msgstr "%%(objectsize) no accepta paràmetres" +msgstr "%%(deltabase) no accepta paràmetres" -#: ref-filter.c:289 +#: ref-filter.c:292 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) no accepta paràmetres" -#: ref-filter.c:298 +#: ref-filter.c:301 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) no accepta paràmetres" -#: ref-filter.c:320 +#: ref-filter.c:323 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "paràmetre %%(trailers) desconegut: %s" -#: ref-filter.c:349 +#: ref-filter.c:352 #, c-format msgid "positive value expected contents:lines=%s" msgstr "valor positiu esperat conté:lines=%s" -#: ref-filter.c:351 +#: ref-filter.c:354 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "paràmetre %%(contents) no reconegut: %s" -#: ref-filter.c:366 +#: ref-filter.c:369 #, c-format msgid "positive value expected objectname:short=%s" msgstr "valor positiu esperat nom d'objecte:curt=%s" -#: ref-filter.c:370 +#: ref-filter.c:373 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "paràmetre %%(objectname) no reconegut: %s" -#: ref-filter.c:400 +#: ref-filter.c:403 #, c-format msgid "expected format: %%(align:,)" msgstr "format esperat: %%(align:,)" -#: ref-filter.c:412 +#: ref-filter.c:415 #, c-format msgid "unrecognized position:%s" msgstr "posició no reconeguda:%s" -#: ref-filter.c:419 +#: ref-filter.c:422 #, c-format msgid "unrecognized width:%s" msgstr "amplada no reconeguda:%s" -#: ref-filter.c:428 +#: ref-filter.c:431 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "paràmetre %%(align) no reconegut: %s" -#: ref-filter.c:436 +#: ref-filter.c:439 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "amplada positiva esperada amb l'àtom %%(align)" -#: ref-filter.c:454 +#: ref-filter.c:457 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "paràmetre %%(if) no reconegut: %s" -#: ref-filter.c:556 +#: ref-filter.c:559 #, c-format msgid "malformed field name: %.*s" msgstr "nom de camp mal format: %.*s" -#: ref-filter.c:583 +#: ref-filter.c:586 #, c-format msgid "unknown field name: %.*s" msgstr "nom de camp desconegut: %.*s" -#: ref-filter.c:587 +#: ref-filter.c:590 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "" -#: ref-filter.c:711 +#: ref-filter.c:714 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "format: s'ha usat l'àtom %%(if) sense un àtom %%(then)" -#: ref-filter.c:774 +#: ref-filter.c:777 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "format: s'ha usat l'àtom %%(then) sense un àtom %%(if)" -#: ref-filter.c:776 +#: ref-filter.c:779 #, c-format msgid "format: %%(then) atom used more than once" msgstr "format: s'ha usat l'àtom %%(then) més d'un cop" -#: ref-filter.c:778 +#: ref-filter.c:781 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "format: s'ha usat l'àtom %%(then) després de %%(else)" -#: ref-filter.c:806 +#: ref-filter.c:809 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "format: s'ha usat l'àtom %%(else) sense un àtom %%(if)" -#: ref-filter.c:808 +#: ref-filter.c:811 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "format: s'ha usat l'àtom %%(else) sense un àtom %%(then)" -#: ref-filter.c:810 +#: ref-filter.c:813 #, c-format msgid "format: %%(else) atom used more than once" msgstr "format: s'ha usat l'àtom %%(else) més d'un cop" -#: ref-filter.c:825 +#: ref-filter.c:828 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "format: s'ha usat l'àtom %%(end) sense l'àtom corresponent" -#: ref-filter.c:882 +#: ref-filter.c:885 #, c-format msgid "malformed format string %s" msgstr "cadena de format mal format %s" -#: ref-filter.c:1485 -#, fuzzy, c-format +#: ref-filter.c:1488 +#, c-format msgid "no branch, rebasing %s" -msgstr "(cap branca, s'està fent «rebase» %s)" +msgstr "sense branca, s'està fent «rebase» %s" -#: ref-filter.c:1488 -#, fuzzy, c-format +#: ref-filter.c:1491 +#, c-format msgid "no branch, rebasing detached HEAD %s" -msgstr "(cap branca, s'està fent «rebase» d'un «HEAD» %s no adjuntat)" +msgstr "sense branca, s'està fent «rebase» d'un «HEAD» %s no adjuntat" -#: ref-filter.c:1491 +#: ref-filter.c:1494 #, c-format msgid "no branch, bisect started on %s" -msgstr "(cap branca, bisecció començada en %s)" +msgstr "(sense branca, bisecció començada en %s)" -#: ref-filter.c:1501 +#: ref-filter.c:1504 msgid "no branch" msgstr "sense branca" -#: ref-filter.c:1537 ref-filter.c:1743 +#: ref-filter.c:1540 ref-filter.c:1749 #, c-format msgid "missing object %s for %s" msgstr "manca l'objecte %s per a %s" -#: ref-filter.c:1547 +#: ref-filter.c:1550 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer ha fallat en %s per a %s" -#: ref-filter.c:1998 +#: ref-filter.c:2004 #, c-format msgid "malformed object at '%s'" msgstr "objecte mal format a «%s»" -#: ref-filter.c:2087 +#: ref-filter.c:2093 #, c-format msgid "ignoring ref with broken name %s" msgstr "s'està ignorant la referència amb nom malmès %s" -#: ref-filter.c:2382 +#: ref-filter.c:2389 #, c-format msgid "format: %%(end) atom missing" msgstr "format: manca l'àtom %%(end)" -#: ref-filter.c:2482 +#: ref-filter.c:2489 #, c-format msgid "option `%s' is incompatible with --merged" msgstr "l'opció «%s» és incompatible amb --merged" -#: ref-filter.c:2485 +#: ref-filter.c:2492 #, c-format msgid "option `%s' is incompatible with --no-merged" msgstr "l'opció «%s» és incompatible amb --no-merged" -#: ref-filter.c:2495 +#: ref-filter.c:2502 #, c-format msgid "malformed object name %s" msgstr "nom d'objecte %s mal format" -#: ref-filter.c:2500 +#: ref-filter.c:2507 #, c-format msgid "option `%s' must point to a commit" msgstr "l'opció «%s» ha d'apuntar a una comissió" -#: remote.c:363 +#: remote.c:366 #, c-format msgid "config remote shorthand cannot begin with '/': %s" msgstr "" -#: remote.c:410 +#: remote.c:413 msgid "more than one receivepack given, using the first" msgstr "" -#: remote.c:418 +#: remote.c:421 msgid "more than one uploadpack given, using the first" msgstr "" -#: remote.c:608 +#: remote.c:611 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "No es poden obtenir ambdós %s i %s a %s" -#: remote.c:612 +#: remote.c:615 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s generalment segueix %s, no %s" -#: remote.c:616 +#: remote.c:619 #, c-format msgid "%s tracks both %s and %s" msgstr "%s segueix ambdós %s i %s" -#: remote.c:684 +#: remote.c:687 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "" -#: remote.c:694 +#: remote.c:697 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "" -#: remote.c:1000 +#: remote.c:1003 #, fuzzy, c-format msgid "src refspec %s does not match any" msgstr "%s: no coincideix amb l'índex" -#: remote.c:1005 +#: remote.c:1008 #, c-format msgid "src refspec %s matches more than one" msgstr "" @@ -5319,7 +5816,7 @@ msgstr "" #. :" push, and "being pushed ('%s')" is #. the . #. -#: remote.c:1020 +#: remote.c:1023 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -5333,7 +5830,7 @@ msgid "" "Neither worked, so we gave up. You must fully qualify the ref." msgstr "" -#: remote.c:1040 +#: remote.c:1043 #, c-format msgid "" "The part of the refspec is a commit object.\n" @@ -5341,7 +5838,7 @@ msgid "" "'%s:refs/heads/%s'?" msgstr "" -#: remote.c:1045 +#: remote.c:1048 #, c-format msgid "" "The part of the refspec is a tag object.\n" @@ -5349,7 +5846,7 @@ msgid "" "'%s:refs/tags/%s'?" msgstr "" -#: remote.c:1050 +#: remote.c:1053 #, c-format msgid "" "The part of the refspec is a tree object.\n" @@ -5357,7 +5854,7 @@ msgid "" "'%s:refs/tags/%s'?" msgstr "" -#: remote.c:1055 +#: remote.c:1058 #, c-format msgid "" "The part of the refspec is a blob object.\n" @@ -5365,115 +5862,115 @@ msgid "" "'%s:refs/tags/%s'?" msgstr "" -#: remote.c:1091 -#, c-format +#: remote.c:1094 +#, c-format msgid "%s cannot be resolved to branch" msgstr "«%s» no es pot resoldre a una branca" -#: remote.c:1102 +#: remote.c:1105 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "no s'ha pogut suprimir «%s»: la referència remota no existeix" -#: remote.c:1114 +#: remote.c:1117 #, c-format msgid "dst refspec %s matches more than one" msgstr "" -#: remote.c:1121 +#: remote.c:1124 #, c-format msgid "dst ref %s receives from more than one src" msgstr "" -#: remote.c:1624 remote.c:1725 +#: remote.c:1627 remote.c:1728 msgid "HEAD does not point to a branch" msgstr "HEAD no assenyala cap branca" -#: remote.c:1633 +#: remote.c:1636 #, c-format msgid "no such branch: '%s'" msgstr "no existeix la branca: «%s»" -#: remote.c:1636 +#: remote.c:1639 #, c-format msgid "no upstream configured for branch '%s'" msgstr "cap font configurada per a la branca «%s»" -#: remote.c:1642 +#: remote.c:1645 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "la branca font «%s» no s'emmagatzema com a branca amb seguiment remot" -#: remote.c:1657 +#: remote.c:1660 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" "el destí de pujada «%s» en el remot «%s» no té cap branca amb seguiment remot" -#: remote.c:1669 +#: remote.c:1672 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "la branca «%s» no té cap remot al qual pujar" -#: remote.c:1679 +#: remote.c:1682 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "les especificacions de referència de «%s» no inclouen «%s»" -#: remote.c:1692 +#: remote.c:1695 msgid "push has no destination (push.default is 'nothing')" msgstr "push no té destí (push.default és «nothing)" -#: remote.c:1714 +#: remote.c:1717 msgid "cannot resolve 'simple' push to a single destination" msgstr "no es pot resoldre una pujada 'simple' a un sol destí" -#: remote.c:1840 +#: remote.c:1843 #, c-format msgid "couldn't find remote ref %s" msgstr "no s'ha pogut trobar la referència remota %s" -#: remote.c:1853 +#: remote.c:1856 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "" -#: remote.c:2016 +#: remote.c:2019 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "La vostra branca està basada en «%s», però la font no hi és.\n" -#: remote.c:2020 +#: remote.c:2023 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (useu \"git branch --unset-upstream\" per a arreglar)\n" -#: remote.c:2023 +#: remote.c:2026 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "La vostra branca està al dia amb «%s».\n" -#: remote.c:2027 +#: remote.c:2030 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "La vostra branca i «%s» es refereixen a diferents comissions.\n" -#: remote.c:2030 +#: remote.c:2033 #, c-format msgid " (use \"%s\" for details)\n" msgstr "" -#: remote.c:2034 +#: remote.c:2037 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "La vostra branca està %2$d comissió per davant de «%1$s».\n" msgstr[1] "La vostra branca està %2$d comissions per davant de «%1$s».\n" -#: remote.c:2040 +#: remote.c:2043 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (useu \"git push\" per a publicar les vostres comissions locals)\n" -#: remote.c:2043 +#: remote.c:2046 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -5485,11 +5982,11 @@ msgstr[1] "" "La vostra branca està %2$d comissions per darrere de «%1$s», i pot avançar-" "se ràpidament.\n" -#: remote.c:2051 +#: remote.c:2054 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (useu «git pull» per a actualitzar la vostra branca local)\n" -#: remote.c:2054 +#: remote.c:2057 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -5504,19 +6001,19 @@ msgstr[1] "" "La vostra branca i «%s» han divergit,\n" "i tenen %d i %d comissions distintes cada una, respectivament.\n" -#: remote.c:2064 +#: remote.c:2067 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (useu «git pull» per a fusionar la branca remota a la vostra)\n" -#: remote.c:2247 +#: remote.c:2250 #, c-format msgid "cannot parse expected object name '%s'" msgstr "no es pot analitzar el nom de l'objecte esperat «%s»" #: replace-object.c:21 -#, fuzzy, c-format +#, c-format msgid "bad replace ref name: %s" -msgstr "suprimeix les referències reemplaçades" +msgstr "nom de la referència reemplaçada incorrecte: %s" #: replace-object.c:30 #, fuzzy, c-format @@ -5524,23 +6021,22 @@ msgid "duplicate replace ref: %s" msgstr "suprimeix les referències reemplaçades" #: replace-object.c:73 -#, fuzzy, c-format +#, c-format msgid "replace depth too high for object %s" -msgstr "reemplaça l'etiqueta si existeix" +msgstr "la profunditat de reemplaçament és massa alta per l'objecte %s" #: rerere.c:217 rerere.c:226 rerere.c:229 msgid "corrupt MERGE_RR" -msgstr "" +msgstr "MERGE_RR corrupte" #: rerere.c:264 rerere.c:269 -#, fuzzy msgid "unable to write rerere record" -msgstr "no s'ha pogut escriure l'objecte de nota" +msgstr "no s'ha pogut escriure el registre «rerere»" #: rerere.c:495 -#, fuzzy, c-format +#, c-format msgid "there were errors while writing '%s' (%s)" -msgstr "error en llegir %s" +msgstr "s'han produït errors en escriure «%s» (%s)" #: rerere.c:498 #, fuzzy, c-format @@ -5548,14 +6044,14 @@ msgid "failed to flush '%s'" msgstr "s'ha produït un error en fer stat a «%s»" #: rerere.c:503 rerere.c:1039 -#, fuzzy, c-format +#, c-format msgid "could not parse conflict hunks in '%s'" -msgstr "no s'ha pogut analitzar la comissió «%s»" +msgstr "no s'han pogut analitzar els pedaços en conflicte a «%s»" #: rerere.c:684 -#, fuzzy, c-format +#, c-format msgid "failed utime() on '%s'" -msgstr "s'ha produït un error en obrir «%s»" +msgstr "s'ha produït un error en fer «failed utime()» a «%s»" #: rerere.c:694 #, fuzzy, c-format @@ -5587,8 +6083,8 @@ msgstr "no es pot fer symlink en «%s» «%s»" msgid "Recorded preimage for '%s'" msgstr "no s'ha pogut llegir el fitxer de registre «%s»" -#: rerere.c:881 submodule.c:2023 builtin/log.c:1790 -#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428 +#: rerere.c:881 submodule.c:2067 builtin/log.c:1871 +#: builtin/submodule--helper.c:1436 builtin/submodule--helper.c:1448 #, c-format msgid "could not create directory '%s'" msgstr "no s'ha pogut crear el directori «%s»" @@ -5623,64 +6119,64 @@ msgstr "no s'ha pogut llegir el fitxer de registre «%s»" msgid "unable to open rr-cache directory" msgstr "no s'ha pogut actualitzar l'arbre cau" -#: revision.c:2507 +#: revision.c:2497 msgid "your current branch appears to be broken" msgstr "la vostra branca actual sembla malmesa" -#: revision.c:2510 +#: revision.c:2500 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "la branca actual «%s» encara no té cap comissió" -#: revision.c:2710 +#: revision.c:2708 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent és incompatible amb --bisect" -#: revision.c:2714 +#: revision.c:2712 msgid "-L does not yet support diff formats besides -p and -s" msgstr "" -#: run-command.c:763 +#: run-command.c:762 msgid "open /dev/null failed" msgstr "s'ha produït un error en obrir /dev/null" -#: run-command.c:1269 +#: run-command.c:1268 #, fuzzy, c-format msgid "cannot create async thread: %s" msgstr "no s'ha pogut crear fil: %s" -#: run-command.c:1333 +#: run-command.c:1332 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" "You can disable this warning with `git config advice.ignoredHook false`." msgstr "" -#: send-pack.c:141 +#: send-pack.c:144 msgid "unexpected flush packet while reading remote unpack status" msgstr "" "paquet de neteja no esperat quan estava llegint l'estat del desempaquetament " "remot" -#: send-pack.c:143 +#: send-pack.c:146 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "no s'ha pogut analitzar l'estat del desempaquetament remot: %s" -#: send-pack.c:145 +#: send-pack.c:148 #, c-format msgid "remote unpack failed: %s" msgstr "s'ha produït un error en el desempaquetament remot: %s" -#: send-pack.c:306 +#: send-pack.c:309 msgid "failed to sign the push certificate" msgstr "s'ha produït un error en signar el certificat de pujada" -#: send-pack.c:420 +#: send-pack.c:423 msgid "the receiving end does not support --signed push" msgstr "el destí receptor no admet pujar --signed" -#: send-pack.c:422 +#: send-pack.c:425 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -5688,47 +6184,47 @@ msgstr "" "no s'està enviant una certificació de pujada perquè el destí receptor no " "admet pujar --signed" -#: send-pack.c:434 +#: send-pack.c:437 msgid "the receiving end does not support --atomic push" msgstr "el destí receptor no admet pujar --atomic" -#: send-pack.c:439 +#: send-pack.c:442 msgid "the receiving end does not support push options" msgstr "el destí receptor no admet opcions de pujada" -#: sequencer.c:187 +#: sequencer.c:189 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "mode de neteja «%s» no vàlid en la comissió del missatge" -#: sequencer.c:292 +#: sequencer.c:294 #, fuzzy, c-format msgid "could not delete '%s'" msgstr "No s'ha pogut suprimir %s" -#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369 +#: sequencer.c:313 builtin/rebase.c:781 builtin/rebase.c:1706 builtin/rm.c:369 #, c-format msgid "could not remove '%s'" msgstr "no s'ha pogut suprimir «%s»" -#: sequencer.c:321 +#: sequencer.c:323 msgid "revert" msgstr "revertir" -#: sequencer.c:323 +#: sequencer.c:325 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:325 +#: sequencer.c:327 msgid "rebase -i" msgstr "rebase -i" -#: sequencer.c:327 +#: sequencer.c:329 #, fuzzy, c-format msgid "unknown action: %d" msgstr "Acció desconeguda: %d" -#: sequencer.c:385 +#: sequencer.c:387 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add ' or 'git rm '" @@ -5736,7 +6232,7 @@ msgstr "" "després de resoldre els conflictes, marqueu els camins\n" "corregits amb 'git add ' o 'git rm '" -#: sequencer.c:388 +#: sequencer.c:390 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add ' or 'git rm '\n" @@ -5746,44 +6242,44 @@ msgstr "" "corregits amb 'git add ' o 'git rm '\n" "i cometeu el resultat amb 'git commit'" -#: sequencer.c:401 sequencer.c:2909 +#: sequencer.c:403 sequencer.c:2993 #, c-format msgid "could not lock '%s'" msgstr "no s'ha pogut bloquejar «%s»" -#: sequencer.c:408 +#: sequencer.c:410 #, c-format msgid "could not write eol to '%s'" msgstr "no s'ha pogut escriure el terminador de línia a «%s»" -#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929 -#: sequencer.c:3192 +#: sequencer.c:415 sequencer.c:2798 sequencer.c:2999 sequencer.c:3013 +#: sequencer.c:3277 #, c-format msgid "failed to finalize '%s'" msgstr "s'ha produït un error en finalitzar «%s»" -#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734 -#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763 -#: builtin/merge.c:1112 builtin/rebase.c:567 +#: sequencer.c:438 sequencer.c:1707 sequencer.c:2818 sequencer.c:3259 +#: sequencer.c:3368 builtin/am.c:244 builtin/commit.c:783 builtin/merge.c:1117 +#: builtin/rebase.c:589 #, c-format msgid "could not read '%s'" msgstr "no s'ha pogut llegir «%s»" -#: sequencer.c:462 +#: sequencer.c:464 #, c-format msgid "your local changes would be overwritten by %s." msgstr "els vostres canvis locals se sobreescriurien per %s." -#: sequencer.c:466 +#: sequencer.c:468 msgid "commit your changes or stash them to proceed." msgstr "cometeu els vostres canvis o feu un «stash» per a procedir." -#: sequencer.c:498 +#: sequencer.c:500 #, c-format msgid "%s: fast-forward" msgstr "%s: avanç ràpid" -#: sequencer.c:537 builtin/tag.c:565 +#: sequencer.c:539 builtin/tag.c:565 #, c-format msgid "Invalid cleanup mode %s" msgstr "Mode de neteja no vàlid %s" @@ -5791,70 +6287,70 @@ msgstr "Mode de neteja no vàlid %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. -#: sequencer.c:632 +#: sequencer.c:633 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: No s'ha pogut escriure un fitxer d'índex nou" -#: sequencer.c:649 +#: sequencer.c:650 msgid "unable to update cache tree" msgstr "no s'ha pogut actualitzar l'arbre cau" -#: sequencer.c:663 +#: sequencer.c:664 msgid "could not resolve HEAD commit" msgstr "no s'ha pogut resoldre la comissió HEAD" -#: sequencer.c:743 +#: sequencer.c:744 #, fuzzy, c-format msgid "no key present in '%.*s'" msgstr "no s'ha pogut analitzar «%.*s»" -#: sequencer.c:754 +#: sequencer.c:755 #, fuzzy, c-format msgid "unable to dequote value of '%s'" msgstr "No s'ha pogut afegir el resultat de fusió per a «%s»" -#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706 -#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045 +#: sequencer.c:792 wrapper.c:190 wrapper.c:360 builtin/am.c:705 +#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1074 #, c-format msgid "could not open '%s' for reading" msgstr "no s'ha pogut obrir «%s» per a lectura" -#: sequencer.c:801 +#: sequencer.c:802 msgid "'GIT_AUTHOR_NAME' already given" msgstr "Ja s'ha donat «GIT_AUTHOR_NAME»" -#: sequencer.c:806 +#: sequencer.c:807 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "Ja s'ha donat «GIT_AUTHOR_EMAIL»" -#: sequencer.c:811 +#: sequencer.c:812 msgid "'GIT_AUTHOR_DATE' already given" msgstr "Ja s'ha donat «GIT_AUTHOR_DATE»" -#: sequencer.c:815 +#: sequencer.c:816 #, c-format msgid "unknown variable '%s'" msgstr "variable «%s» desconeguda" -#: sequencer.c:820 +#: sequencer.c:821 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "falta «GIT_AUTHOR_NAME»" -#: sequencer.c:822 +#: sequencer.c:823 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "falta «GIT_AUTHOR_EMAIL»" -#: sequencer.c:824 +#: sequencer.c:825 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "falta «GIT_AUTHOR_DATE»" -#: sequencer.c:884 -#, fuzzy, c-format -msgid "invalid date format '%s' in '%s'" -msgstr "format de data no vàlid: %s" +#: sequencer.c:902 sequencer.c:1427 +#, fuzzy +msgid "malformed ident line" +msgstr "línia d'entrada mal formada: «%s»." -#: sequencer.c:901 +#: sequencer.c:925 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -5884,16 +6380,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:995 -#, fuzzy -msgid "writing root commit" -msgstr "no hi ha res a cometre\n" - -#: sequencer.c:1216 +#: sequencer.c:1218 msgid "'prepare-commit-msg' hook failed" msgstr "el lligam «prepare-commit-msg» ha fallat" -#: sequencer.c:1223 +#: sequencer.c:1224 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -5920,7 +6411,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1236 +#: sequencer.c:1237 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -5946,354 +6437,359 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1278 +#: sequencer.c:1279 msgid "couldn't look up newly created commit" msgstr "no s'ha pogut trobar la comissió novament creada" -#: sequencer.c:1280 +#: sequencer.c:1281 msgid "could not parse newly created commit" msgstr "no s'ha pogut analitzar la comissió novament creada" -#: sequencer.c:1326 +#: sequencer.c:1327 msgid "unable to resolve HEAD after creating commit" msgstr "no s'ha pogut resoldre HEAD després de crear la comissió" -#: sequencer.c:1328 +#: sequencer.c:1329 msgid "detached HEAD" msgstr "HEAD separat" -#: sequencer.c:1332 +#: sequencer.c:1333 msgid " (root-commit)" msgstr " (comissió d'arrel)" -#: sequencer.c:1353 +#: sequencer.c:1354 msgid "could not parse HEAD" msgstr "no s'ha pogut analitzar HEAD" -#: sequencer.c:1355 +#: sequencer.c:1356 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s no és una comissió!" -#: sequencer.c:1359 builtin/commit.c:1571 +#: sequencer.c:1360 sequencer.c:1458 builtin/commit.c:1569 msgid "could not parse HEAD commit" msgstr "no s'ha pogut analitzar la comissió HEAD" -#: sequencer.c:1411 sequencer.c:2004 +#: sequencer.c:1411 sequencer.c:2055 msgid "unable to parse commit author" msgstr "no s'ha pogut analitzar l'autor de la comissió" -#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684 +#: sequencer.c:1431 +#, fuzzy +msgid "corrupted author without date information" +msgstr "actualitza la informació d'estadístiques" + +#: sequencer.c:1447 builtin/am.c:1561 builtin/merge.c:684 msgid "git write-tree failed to write a tree" msgstr "git write-tree ha fallat en escriure un arbre" -#: sequencer.c:1438 sequencer.c:1499 +#: sequencer.c:1480 sequencer.c:1550 #, c-format msgid "unable to read commit message from '%s'" msgstr "no s'ha pogut llegir el missatge de comissió des de «%s»" -#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878 -#: builtin/merge.c:903 +#: sequencer.c:1516 builtin/am.c:1583 builtin/commit.c:1668 builtin/merge.c:883 +#: builtin/merge.c:908 msgid "failed to write commit object" msgstr "s'ha produït un error en escriure l'objecte de comissió" -#: sequencer.c:1526 +#: sequencer.c:1577 #, c-format msgid "could not parse commit %s" msgstr "no s'ha pogut analitzar la comissió %s" -#: sequencer.c:1531 +#: sequencer.c:1582 #, c-format msgid "could not parse parent commit %s" msgstr "no s'ha pogut analitzar la comissió pare %s" -#: sequencer.c:1605 sequencer.c:1715 +#: sequencer.c:1656 sequencer.c:1767 #, c-format msgid "unknown command: %d" msgstr "ordre desconeguda: %d" -#: sequencer.c:1662 sequencer.c:1687 +#: sequencer.c:1714 sequencer.c:1739 #, c-format msgid "This is a combination of %d commits." msgstr "Això és una combinació de %d comissions." -#: sequencer.c:1672 +#: sequencer.c:1724 msgid "need a HEAD to fixup" msgstr "cal un HEAD per reparar-ho" -#: sequencer.c:1674 sequencer.c:3219 +#: sequencer.c:1726 sequencer.c:3304 msgid "could not read HEAD" msgstr "no s'ha pogut llegir HEAD" -#: sequencer.c:1676 +#: sequencer.c:1728 msgid "could not read HEAD's commit message" msgstr "no s'ha pogut llegir el missatge de comissió de HEAD" -#: sequencer.c:1682 +#: sequencer.c:1734 #, c-format msgid "cannot write '%s'" msgstr "no es pot escriure «%s»" -#: sequencer.c:1689 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1741 git-rebase--preserve-merges.sh:496 msgid "This is the 1st commit message:" msgstr "Aquest és el 1r missatge de comissió:" -#: sequencer.c:1697 +#: sequencer.c:1749 #, c-format msgid "could not read commit message of %s" msgstr "no s'ha pogut llegir el missatge de comissió: %s" -#: sequencer.c:1704 +#: sequencer.c:1756 #, c-format msgid "This is the commit message #%d:" msgstr "Aquest és el missatge de comissió #%d:" -#: sequencer.c:1710 +#: sequencer.c:1762 #, c-format msgid "The commit message #%d will be skipped:" msgstr "El missatge de comissió núm. #%d s'ometrà:" -#: sequencer.c:1798 +#: sequencer.c:1850 msgid "your index file is unmerged." msgstr "el vostre fitxer d'índex està sense fusionar." -#: sequencer.c:1805 +#: sequencer.c:1857 #, fuzzy msgid "cannot fixup root commit" msgstr "no es pot trobar la comissió %s (%s)" -#: sequencer.c:1824 +#: sequencer.c:1876 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "la comissió %s és una fusió però no s'ha donat cap opció -m." -#: sequencer.c:1832 sequencer.c:1840 +#: sequencer.c:1884 sequencer.c:1892 #, c-format msgid "commit %s does not have parent %d" msgstr "la comissió %s no té pare %d" -#: sequencer.c:1846 +#: sequencer.c:1898 #, c-format msgid "cannot get commit message for %s" msgstr "no es pot obtenir el missatge de comissió de %s" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1865 +#: sequencer.c:1917 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: no es pot analitzar la comissió pare %s" -#: sequencer.c:1930 +#: sequencer.c:1982 #, c-format msgid "could not rename '%s' to '%s'" msgstr "no s'ha pogut canviar el nom «%s» a «%s»" -#: sequencer.c:1985 +#: sequencer.c:2037 #, c-format msgid "could not revert %s... %s" msgstr "no s'ha pogut revertir %s... %s" -#: sequencer.c:1986 +#: sequencer.c:2038 #, c-format msgid "could not apply %s... %s" msgstr "no s'ha pogut aplicar %s... %s" -#: sequencer.c:2045 +#: sequencer.c:2105 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: s'ha produït un error en llegir l'índex" -#: sequencer.c:2052 +#: sequencer.c:2112 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: s'ha produït un error en actualitzar l'índex" -#: sequencer.c:2128 +#: sequencer.c:2189 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s no accepta paràmetres: «%s»" -#: sequencer.c:2137 +#: sequencer.c:2198 #, c-format msgid "missing arguments for %s" msgstr "falten els arguments per %s" -#: sequencer.c:2174 +#: sequencer.c:2235 #, fuzzy, c-format msgid "could not parse '%.*s'" msgstr "no s'ha pogut analitzar «%s»" -#: sequencer.c:2228 +#: sequencer.c:2289 #, c-format msgid "invalid line %d: %.*s" msgstr "línia no vàlida %d: %.*s" -#: sequencer.c:2239 +#: sequencer.c:2300 #, c-format msgid "cannot '%s' without a previous commit" msgstr "No es pot «%s» sense una comissió prèvia" -#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178 -#: builtin/rebase.c:204 builtin/rebase.c:229 +#: sequencer.c:2348 builtin/rebase.c:172 builtin/rebase.c:197 +#: builtin/rebase.c:223 builtin/rebase.c:248 #, c-format msgid "could not read '%s'." msgstr "no s'ha pogut llegir «%s»." -#: sequencer.c:2323 +#: sequencer.c:2384 #, fuzzy msgid "cancelling a cherry picking in progress" msgstr "ni hi ha cap «cherry pick» ni cap reversió en curs" -#: sequencer.c:2330 +#: sequencer.c:2391 #, fuzzy msgid "cancelling a revert in progress" msgstr "ni hi ha cap «cherry pick» ni cap reversió en curs" -#: sequencer.c:2364 +#: sequencer.c:2435 msgid "please fix this using 'git rebase --edit-todo'." msgstr "corregiu-ho usant «git rebase --edit-todo»." -#: sequencer.c:2366 +#: sequencer.c:2437 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "full d'instruccions inusable: «%s»" -#: sequencer.c:2371 +#: sequencer.c:2442 msgid "no commits parsed." msgstr "no s'ha analitzat cap comissió." -#: sequencer.c:2382 +#: sequencer.c:2453 msgid "cannot cherry-pick during a revert." msgstr "no es pot fer «cherry pick» durant una reversió." -#: sequencer.c:2384 +#: sequencer.c:2455 msgid "cannot revert during a cherry-pick." msgstr "no es pot revertir durant un «cherry pick»." -#: sequencer.c:2466 +#: sequencer.c:2533 #, c-format msgid "invalid value for %s: %s" msgstr "valor no vàlid per a %s: %s" -#: sequencer.c:2553 +#: sequencer.c:2630 msgid "unusable squash-onto" msgstr "" -#: sequencer.c:2569 +#: sequencer.c:2646 #, c-format msgid "malformed options sheet: '%s'" msgstr "full d'opcions mal format: «%s»" -#: sequencer.c:2652 sequencer.c:4351 +#: sequencer.c:2736 sequencer.c:4463 msgid "empty commit set passed" msgstr "conjunt de comissions buit passat" -#: sequencer.c:2668 +#: sequencer.c:2752 #, fuzzy msgid "revert is already in progress" msgstr "un «cherry pick» o una reversió ja està en curs" -#: sequencer.c:2670 +#: sequencer.c:2754 #, fuzzy, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "intenteu \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:2673 +#: sequencer.c:2757 #, fuzzy msgid "cherry-pick is already in progress" msgstr "un «cherry pick» o una reversió ja està en curs" -#: sequencer.c:2675 +#: sequencer.c:2759 #, fuzzy, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "intenteu \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:2689 +#: sequencer.c:2773 #, c-format msgid "could not create sequencer directory '%s'" msgstr "no s'ha pogut crear el directori de seqüenciador «%s»" -#: sequencer.c:2704 +#: sequencer.c:2788 msgid "could not lock HEAD" msgstr "no s'ha pogut bloquejar HEAD" -#: sequencer.c:2764 sequencer.c:4103 +#: sequencer.c:2848 sequencer.c:4209 msgid "no cherry-pick or revert in progress" msgstr "ni hi ha cap «cherry pick» ni cap reversió en curs" -#: sequencer.c:2766 sequencer.c:2777 +#: sequencer.c:2850 sequencer.c:2861 msgid "cannot resolve HEAD" msgstr "no es pot resoldre HEAD" -#: sequencer.c:2768 sequencer.c:2812 +#: sequencer.c:2852 sequencer.c:2896 msgid "cannot abort from a branch yet to be born" msgstr "no es pot avortar des d'una branca que encara ha de nàixer" -#: sequencer.c:2798 builtin/grep.c:734 +#: sequencer.c:2882 builtin/grep.c:736 #, c-format msgid "cannot open '%s'" msgstr "no es pot obrir «%s»" -#: sequencer.c:2800 +#: sequencer.c:2884 #, c-format msgid "cannot read '%s': %s" msgstr "no es pot llegir «%s»: %s" -#: sequencer.c:2801 +#: sequencer.c:2885 msgid "unexpected end of file" msgstr "final de fitxer inesperat" -#: sequencer.c:2807 +#: sequencer.c:2891 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "el fitxer HEAD emmagatzemat abans de fer «cherry pick» «%s» és malmès" -#: sequencer.c:2818 +#: sequencer.c:2902 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "Sembla que heu mogut HEAD sense rebobinar, comproveu-ho HEAD" -#: sequencer.c:2859 +#: sequencer.c:2943 #, fuzzy msgid "no revert in progress" msgstr "No hi ha un «rebase» en curs?" -#: sequencer.c:2867 +#: sequencer.c:2951 #, fuzzy msgid "no cherry-pick in progress" msgstr "ni hi ha cap «cherry pick» ni cap reversió en curs" -#: sequencer.c:2877 +#: sequencer.c:2961 #, fuzzy msgid "failed to skip the commit" msgstr "s'ha produït un error en escriure l'objecte de comissió" -#: sequencer.c:2884 +#: sequencer.c:2968 msgid "there is nothing to skip" msgstr "" -#: sequencer.c:2887 +#: sequencer.c:2971 #, c-format msgid "" "have you committed already?\n" "try \"git %s --continue\"" msgstr "" -#: sequencer.c:3011 sequencer.c:4015 +#: sequencer.c:3095 sequencer.c:4121 #, c-format msgid "could not update %s" msgstr "no s'ha pogut actualitzar %s" -#: sequencer.c:3049 sequencer.c:3995 +#: sequencer.c:3134 sequencer.c:4101 msgid "cannot read HEAD" msgstr "No es pot llegir HEAD" -#: sequencer.c:3066 +#: sequencer.c:3151 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "no s'ha pogut copiar «%s» a «%s»" -#: sequencer.c:3074 +#: sequencer.c:3159 #, fuzzy, c-format msgid "" "You can amend the commit now, with\n" @@ -6312,27 +6808,22 @@ msgstr "" "\n" "\tgit rebase --continue" -#: sequencer.c:3084 +#: sequencer.c:3169 #, c-format msgid "Could not apply %s... %.*s" msgstr "No s'ha pogut aplicar %s... %.*s" -#: sequencer.c:3091 +#: sequencer.c:3176 #, c-format msgid "Could not merge %.*s" msgstr "No s'ha pogut fusionar %.*s" -#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633 +#: sequencer.c:3190 sequencer.c:3194 builtin/difftool.c:641 #, c-format msgid "could not copy '%s' to '%s'" msgstr "no s'ha pogut copiar «%s» a «%s»" -#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582 -#: builtin/rebase.c:1953 builtin/rebase.c:2008 -msgid "could not read index" -msgstr "no s'ha pogut llegir l'índex" - -#: sequencer.c:3136 +#: sequencer.c:3221 #, c-format msgid "" "execution failed: %s\n" @@ -6347,11 +6838,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3142 +#: sequencer.c:3227 msgid "and made changes to the index and/or the working tree\n" msgstr "i ha fet canvis a l'índex i/o l'arbre de treball\n" -#: sequencer.c:3148 +#: sequencer.c:3233 #, c-format msgid "" "execution succeeded: %s\n" @@ -6367,79 +6858,75 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:3209 +#: sequencer.c:3294 #, c-format msgid "illegal label name: '%.*s'" msgstr "nom d'etiqueta no permès: «%.*s»" -#: sequencer.c:3263 +#: sequencer.c:3348 #, fuzzy msgid "writing fake root commit" msgstr "no hi ha res a cometre\n" -#: sequencer.c:3268 +#: sequencer.c:3353 msgid "writing squash-onto" msgstr "" -#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860 +#: sequencer.c:3391 builtin/rebase.c:876 builtin/rebase.c:882 #, fuzzy, c-format msgid "failed to find tree of %s" msgstr "S'ha produït un error en cercar l'arbre de %s." -#: sequencer.c:3324 builtin/rebase.c:873 -msgid "could not write index" -msgstr "no s'ha pogut escriure l'índex" - -#: sequencer.c:3351 +#: sequencer.c:3436 #, c-format msgid "could not resolve '%s'" msgstr "no s'ha pogut resoldre «%s»" -#: sequencer.c:3379 +#: sequencer.c:3467 #, fuzzy msgid "cannot merge without a current revision" msgstr "No es pot «%s» sense una comissió prèvia" -#: sequencer.c:3401 +#: sequencer.c:3489 #, c-format msgid "unable to parse '%.*s'" msgstr "no s'ha pogut analitzar «%.*s»" -#: sequencer.c:3410 +#: sequencer.c:3498 #, c-format msgid "nothing to merge: '%.*s'" msgstr "no hi ha res per fusionar «%.*s»" -#: sequencer.c:3422 +#: sequencer.c:3510 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "" -#: sequencer.c:3437 +#: sequencer.c:3526 #, fuzzy, c-format msgid "could not get commit message of '%s'" msgstr "no s'ha pogut llegir el missatge de comissió: %s" -#: sequencer.c:3590 +#: sequencer.c:3688 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "no s'ha pogut fusionar «%.*s»" -#: sequencer.c:3606 +#: sequencer.c:3704 #, fuzzy msgid "merge: Unable to write new index file" msgstr "%s: No s'ha pogut escriure un fitxer d'índex nou" -#: sequencer.c:3675 builtin/rebase.c:711 +#: sequencer.c:3773 builtin/rebase.c:733 #, c-format msgid "Applied autostash.\n" msgstr "S'ha aplicat el «stash» automàticament.\n" -#: sequencer.c:3687 +#: sequencer.c:3785 #, c-format msgid "cannot store %s" msgstr "no es pot emmagatzemar %s" -#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113 +#: sequencer.c:3788 builtin/rebase.c:749 git-rebase--preserve-merges.sh:113 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -6450,31 +6937,31 @@ msgstr "" "Els vostres canvis estan segurs en el «stash».\n" "Podeu executar \"git stash pop\" o \"git stash drop\" en qualsevol moment.\n" -#: sequencer.c:3751 +#: sequencer.c:3849 #, fuzzy, c-format msgid "could not checkout %s" msgstr "no es pot agafar %s" -#: sequencer.c:3765 +#: sequencer.c:3863 #, fuzzy, c-format msgid "%s: not a valid OID" msgstr "«%s» no és un terme vàlid" -#: sequencer.c:3770 git-rebase--preserve-merges.sh:779 +#: sequencer.c:3868 git-rebase--preserve-merges.sh:779 msgid "could not detach HEAD" msgstr "no s'ha pogut separar HEAD" -#: sequencer.c:3785 +#: sequencer.c:3883 #, fuzzy, c-format msgid "Stopped at HEAD\n" msgstr "Aturat a %s... %.*s\n" -#: sequencer.c:3787 +#: sequencer.c:3885 #, fuzzy, c-format msgid "Stopped at %s\n" msgstr "Aturat a %s... %.*s\n" -#: sequencer.c:3795 +#: sequencer.c:3893 #, c-format msgid "" "Could not execute the todo command\n" @@ -6487,48 +6974,48 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:3877 +#: sequencer.c:3979 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Aturat a %s... %.*s\n" -#: sequencer.c:3958 +#: sequencer.c:4050 #, c-format msgid "unknown command %d" msgstr "ordre %d desconeguda" -#: sequencer.c:4003 +#: sequencer.c:4109 msgid "could not read orig-head" msgstr "No s'ha pogut llegir orig-head" -#: sequencer.c:4008 +#: sequencer.c:4114 msgid "could not read 'onto'" msgstr "no s'ha pogut llegir 'onto'" -#: sequencer.c:4022 +#: sequencer.c:4128 #, c-format msgid "could not update HEAD to %s" msgstr "no s'ha pogut actualitzar HEAD a %s" -#: sequencer.c:4115 +#: sequencer.c:4221 msgid "cannot rebase: You have unstaged changes." msgstr "No es pot fer «rebase»: teniu canvis «unstaged»." -#: sequencer.c:4124 +#: sequencer.c:4230 msgid "cannot amend non-existing commit" msgstr "no es pot esmenar una comissió no existent" -#: sequencer.c:4126 +#: sequencer.c:4232 #, c-format msgid "invalid file: '%s'" msgstr "fitxer no vàlid: «%s»" -#: sequencer.c:4128 +#: sequencer.c:4234 #, c-format msgid "invalid contents: '%s'" msgstr "contingut no vàlid: «%s»" -#: sequencer.c:4131 +#: sequencer.c:4237 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -6538,42 +7025,42 @@ msgstr "" "Teniu canvis no comesos en el vostre arbre de treball. \n" "Primer cometeu-los i després executeu 'git rebase --continue' de nou." -#: sequencer.c:4167 sequencer.c:4205 +#: sequencer.c:4273 sequencer.c:4312 #, fuzzy, c-format msgid "could not write file: '%s'" msgstr "no s'ha pogut crear el fitxer «%s»" -#: sequencer.c:4220 +#: sequencer.c:4327 msgid "could not remove CHERRY_PICK_HEAD" msgstr "No s'ha pogut eliminar CHERRY_PICK_HEAD" -#: sequencer.c:4227 +#: sequencer.c:4334 msgid "could not commit staged changes." msgstr "No s'han pogut cometre els canvis «staged»." -#: sequencer.c:4328 +#: sequencer.c:4440 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: no es pot fer «cherry pick» a %s" -#: sequencer.c:4332 +#: sequencer.c:4444 #, c-format msgid "%s: bad revision" msgstr "%s: revisió incorrecta" -#: sequencer.c:4367 +#: sequencer.c:4479 msgid "can't revert as initial commit" msgstr "no es pot revertir com a comissió inicial" -#: sequencer.c:4810 +#: sequencer.c:4952 msgid "make_script: unhandled options" msgstr "make_script: opcions no gestionades" -#: sequencer.c:4813 +#: sequencer.c:4955 msgid "make_script: error preparing revisions" msgstr "make_script: s'ha produït un error en preparar les revisions" -#: sequencer.c:4971 +#: sequencer.c:5113 msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" "continue'.\n" @@ -6582,24 +7069,24 @@ msgstr "" "Podeu arreglar això amb 'git rebase --edit-todo' i després 'git rebase --" "continue'.\n" -#: sequencer.c:5083 sequencer.c:5100 +#: sequencer.c:5226 sequencer.c:5243 msgid "nothing to do" msgstr "res a fer" -#: sequencer.c:5114 +#: sequencer.c:5257 msgid "could not skip unnecessary pick commands" msgstr "no s'han pogut ometre les ordres «picks» no necessàries" -#: sequencer.c:5197 +#: sequencer.c:5351 msgid "the script was already rearranged." msgstr "l'script ja estava endreçat." -#: setup.c:123 +#: setup.c:124 #, c-format msgid "'%s' is outside repository" msgstr "«%s» és fora del dipòsit" -#: setup.c:173 +#: setup.c:174 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -6609,7 +7096,7 @@ msgstr "" "Useu «git -- ...» per a especificar camins que no existeixin " "localment." -#: setup.c:186 +#: setup.c:187 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -6621,12 +7108,12 @@ msgstr "" "Useu «--» per a separar els camins de les revisions:\n" "'git [...] -- [...]'" -#: setup.c:235 +#: setup.c:236 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "l'opció «%s» ha de venir abans dels arguments opcionals" -#: setup.c:254 +#: setup.c:255 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -6637,94 +7124,94 @@ msgstr "" "Useu '--' per a separar els camins de les revisions:\n" "'git [...] -- [...]'" -#: setup.c:390 +#: setup.c:391 msgid "unable to set up work tree using invalid config" msgstr "" "no s'ha pogut configurar un arbre de treball utilitzant una configuració no " "vàlida" -#: setup.c:394 +#: setup.c:395 msgid "this operation must be run in a work tree" msgstr "aquesta operació s'ha d'executar en un arbre de treball" -#: setup.c:540 +#: setup.c:541 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "S'esperava una versió de dipòsit de git <= %d, s'ha trobat %d" -#: setup.c:548 +#: setup.c:549 msgid "unknown repository extensions found:" msgstr "s'han trobat extensions de dipòsit desconegudes:" -#: setup.c:567 +#: setup.c:568 #, c-format msgid "error opening '%s'" msgstr "s'ha produït un error en obrir «%s»" -#: setup.c:569 +#: setup.c:570 #, c-format msgid "too large to be a .git file: '%s'" msgstr "massa larg per a ser un fitxer .git: «%s»" -#: setup.c:571 +#: setup.c:572 #, c-format msgid "error reading %s" msgstr "error en llegir %s" -#: setup.c:573 +#: setup.c:574 #, c-format msgid "invalid gitfile format: %s" msgstr "format gitfile no vàlid: %s" -#: setup.c:575 +#: setup.c:576 #, c-format msgid "no path in gitfile: %s" msgstr "sense camí al gitfile: %s" -#: setup.c:577 +#: setup.c:578 #, c-format msgid "not a git repository: %s" msgstr "no és un dipòsit de git: %s" -#: setup.c:676 +#: setup.c:677 #, c-format msgid "'$%s' too big" msgstr "«$%s» massa gran" -#: setup.c:690 +#: setup.c:691 #, c-format msgid "not a git repository: '%s'" msgstr "no és un dipòsit de git: «%s»" -#: setup.c:719 setup.c:721 setup.c:752 +#: setup.c:720 setup.c:722 setup.c:753 #, c-format msgid "cannot chdir to '%s'" msgstr "no es pot canviar de directori a «%s»" -#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837 +#: setup.c:725 setup.c:781 setup.c:791 setup.c:830 setup.c:838 msgid "cannot come back to cwd" msgstr "no es pot tornar al directori de treball actual" -#: setup.c:851 +#: setup.c:852 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "s'ha produït un error en fer stat a «%*s%s%s»" -#: setup.c:1083 +#: setup.c:1090 msgid "Unable to read current working directory" msgstr "No s'ha pogut llegir el directori de treball actual" -#: setup.c:1092 setup.c:1098 +#: setup.c:1099 setup.c:1105 #, c-format msgid "cannot change to '%s'" msgstr "no es pot canviar a «%s»" -#: setup.c:1103 +#: setup.c:1110 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "no és un dipòsit de git (ni cap dels directoris pares): %s" -#: setup.c:1109 +#: setup.c:1116 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -6734,7 +7221,7 @@ msgstr "" "S'atura a la frontera de sistema de fitxers (GIT_DISCOVERY_ACROSS_FILESYSTEM " "no està establert)." -#: setup.c:1220 +#: setup.c:1227 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -6745,80 +7232,80 @@ msgstr "" "El propietari dels fitxers sempre ha de tenir permisos de lectura i " "escriptura." -#: setup.c:1264 +#: setup.c:1271 msgid "open /dev/null or dup failed" msgstr "s'ha produït un error en obrir /dev/null o dup" -#: setup.c:1279 +#: setup.c:1286 msgid "fork failed" msgstr "el «fork» ha fallat" -#: setup.c:1284 +#: setup.c:1291 msgid "setsid failed" msgstr "l'«stash» ha fallat" -#: sha1-file.c:453 +#: sha1-file.c:452 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "" -#: sha1-file.c:504 +#: sha1-file.c:503 #, fuzzy, c-format msgid "unable to normalize alternate object path: %s" msgstr "no s'ha pogut analitzar l'objecte: %s" -#: sha1-file.c:576 +#: sha1-file.c:575 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "" -#: sha1-file.c:583 +#: sha1-file.c:582 #, fuzzy, c-format msgid "unable to normalize object directory: %s" msgstr "no s'ha pogut analitzar l'objecte: %s" -#: sha1-file.c:626 +#: sha1-file.c:625 #, fuzzy msgid "unable to fdopen alternates lockfile" msgstr "no s'han pogut escriure els paràmetres al fitxer de configuració" -#: sha1-file.c:644 +#: sha1-file.c:643 #, fuzzy msgid "unable to read alternates file" msgstr "no es pot llegir el fitxer d'índex" -#: sha1-file.c:651 +#: sha1-file.c:650 #, fuzzy msgid "unable to move new alternates file into place" msgstr "no s'ha pogut escriure un fitxer d'índex nou" -#: sha1-file.c:686 +#: sha1-file.c:685 #, c-format msgid "path '%s' does not exist" msgstr "el camí «%s» no existeix" -#: sha1-file.c:712 +#: sha1-file.c:711 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" "Encara no se suporta el dipòsit de referència «%s» com a agafament enllaçat." -#: sha1-file.c:718 +#: sha1-file.c:717 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "el dipòsit de referència «%s» no és un dipòsit local." -#: sha1-file.c:724 +#: sha1-file.c:723 #, c-format msgid "reference repository '%s' is shallow" msgstr "el dipòsit de referència «%s» és superficial" -#: sha1-file.c:732 +#: sha1-file.c:731 #, c-format msgid "reference repository '%s' is grafted" msgstr "el dipòsit de referència «%s» és empeltat" -#: sha1-file.c:792 +#: sha1-file.c:791 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "" @@ -6828,210 +7315,210 @@ msgstr "" msgid "attempting to mmap % over limit %" msgstr "" -#: sha1-file.c:968 +#: sha1-file.c:964 msgid "mmap failed" msgstr "mmap ha fallat" -#: sha1-file.c:1132 +#: sha1-file.c:1128 #, c-format msgid "object file %s is empty" msgstr "el tipus d'objecte %s és buit" -#: sha1-file.c:1256 sha1-file.c:2395 +#: sha1-file.c:1252 sha1-file.c:2392 #, fuzzy, c-format msgid "corrupt loose object '%s'" msgstr "no s'ha pogut analitzar l'objecte «%s»" -#: sha1-file.c:1258 sha1-file.c:2399 +#: sha1-file.c:1254 sha1-file.c:2396 #, fuzzy, c-format msgid "garbage at end of loose object '%s'" msgstr "no s'ha pogut analitzar l'objecte: %s" -#: sha1-file.c:1300 +#: sha1-file.c:1296 #, fuzzy msgid "invalid object type" msgstr "el tipus d'objecte és incorrecte." -#: sha1-file.c:1384 +#: sha1-file.c:1380 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "" -#: sha1-file.c:1387 +#: sha1-file.c:1383 #, fuzzy, c-format msgid "unable to unpack %s header" msgstr "no s'ha pogut actualitzar %s" -#: sha1-file.c:1393 +#: sha1-file.c:1389 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "" -#: sha1-file.c:1396 +#: sha1-file.c:1392 #, fuzzy, c-format msgid "unable to parse %s header" msgstr "no s'ha pogut actualitzar %s" -#: sha1-file.c:1587 +#: sha1-file.c:1584 #, fuzzy, c-format msgid "failed to read object %s" msgstr "s'ha produït un error en llegir l'objecte «%s»." -#: sha1-file.c:1591 +#: sha1-file.c:1588 #, fuzzy, c-format msgid "replacement %s not found for %s" msgstr "no s'han trobat les plantilles %s" -#: sha1-file.c:1595 +#: sha1-file.c:1592 #, fuzzy, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "l'objecte local %s és malmès" -#: sha1-file.c:1599 +#: sha1-file.c:1596 #, fuzzy, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "l'objecte local %s és malmès" -#: sha1-file.c:1702 +#: sha1-file.c:1699 #, fuzzy, c-format msgid "unable to write file %s" msgstr "no s'ha pogut escriure %s" -#: sha1-file.c:1709 +#: sha1-file.c:1706 #, fuzzy, c-format msgid "unable to set permission to '%s'" msgstr "no s'ha pogut resoldre la revisió: %s" -#: sha1-file.c:1716 +#: sha1-file.c:1713 #, fuzzy msgid "file write error" msgstr "escriptura fallada al rev-list" -#: sha1-file.c:1735 +#: sha1-file.c:1732 #, fuzzy msgid "error when closing loose object file" msgstr "error en tancar el fitxer de paquet" -#: sha1-file.c:1800 +#: sha1-file.c:1797 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" -#: sha1-file.c:1802 +#: sha1-file.c:1799 #, fuzzy msgid "unable to create temporary file" msgstr "no s'ha pogut crear un índex temporal" -#: sha1-file.c:1826 +#: sha1-file.c:1823 #, fuzzy msgid "unable to write loose object file" msgstr "no s'ha pogut escriure l'objecte de nota" -#: sha1-file.c:1832 +#: sha1-file.c:1829 #, fuzzy, c-format msgid "unable to deflate new object %s (%d)" msgstr "no s'ha pogut desinflar l'objecte annexat (%d)" -#: sha1-file.c:1836 +#: sha1-file.c:1833 #, fuzzy, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "ha fallat fstat a %s" -#: sha1-file.c:1840 +#: sha1-file.c:1837 #, c-format msgid "confused by unstable object source data for %s" msgstr "" -#: sha1-file.c:1850 builtin/pack-objects.c:920 +#: sha1-file.c:1847 builtin/pack-objects.c:925 #, fuzzy, c-format msgid "failed utime() on %s" msgstr "s'ha produït un error en obrir «%s»" -#: sha1-file.c:1925 +#: sha1-file.c:1922 #, fuzzy, c-format msgid "cannot read object for %s" msgstr "no es pot llegir l'objecte %s" -#: sha1-file.c:1965 +#: sha1-file.c:1962 #, fuzzy msgid "corrupt commit" msgstr "autor corregit de la comissió" -#: sha1-file.c:1973 +#: sha1-file.c:1970 #, fuzzy msgid "corrupt tag" msgstr "informa de les etiquetes" -#: sha1-file.c:2072 +#: sha1-file.c:2069 #, fuzzy, c-format msgid "read error while indexing %s" msgstr "error en llegir %s" -#: sha1-file.c:2075 +#: sha1-file.c:2072 #, fuzzy, c-format msgid "short read while indexing %s" msgstr "no es pot llegir l'índex" -#: sha1-file.c:2148 sha1-file.c:2157 +#: sha1-file.c:2145 sha1-file.c:2154 #, fuzzy, c-format msgid "%s: failed to insert into database" msgstr "gpg ha fallat en signar les dades" -#: sha1-file.c:2163 +#: sha1-file.c:2160 #, fuzzy, c-format msgid "%s: unsupported file type" msgstr "versió d'índex no compatible %s" -#: sha1-file.c:2187 +#: sha1-file.c:2184 #, fuzzy, c-format msgid "%s is not a valid object" msgstr "«%s» no és una terme vàlid" -#: sha1-file.c:2189 +#: sha1-file.c:2186 #, fuzzy, c-format msgid "%s is not a valid '%s' object" msgstr "%s no és un objecte de «%s» vàlid" -#: sha1-file.c:2216 builtin/index-pack.c:155 +#: sha1-file.c:2213 builtin/index-pack.c:155 #, c-format msgid "unable to open %s" msgstr "no s'ha pogut obrir %s" -#: sha1-file.c:2406 sha1-file.c:2458 +#: sha1-file.c:2403 sha1-file.c:2455 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "" -#: sha1-file.c:2430 +#: sha1-file.c:2427 #, fuzzy, c-format msgid "unable to mmap %s" msgstr "no s'ha pogut obrir %s" -#: sha1-file.c:2435 +#: sha1-file.c:2432 #, fuzzy, c-format msgid "unable to unpack header of %s" msgstr "no s'ha pogut actualitzar %s" -#: sha1-file.c:2441 +#: sha1-file.c:2438 #, fuzzy, c-format msgid "unable to parse header of %s" msgstr "no s'ha pogut llegir %s" -#: sha1-file.c:2452 +#: sha1-file.c:2449 #, fuzzy, c-format msgid "unable to unpack contents of %s" msgstr "no s'ha pogut analitzar el contacte: %s" -#: sha1-name.c:490 +#: sha1-name.c:487 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "l'SHA1 %s curt és ambigu" -#: sha1-name.c:501 +#: sha1-name.c:498 msgid "The candidates are:" msgstr "Els candidats són:" -#: sha1-name.c:800 +#: sha1-name.c:797 #, fuzzy msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" @@ -7057,43 +7544,43 @@ msgstr "" "«git config advice.objectNameWarning false»" #. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c:821 +#: strbuf.c:822 #, c-format msgid "%u.%2.2u GiB" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:823 +#: strbuf.c:824 #, c-format msgid "%u.%2.2u GiB/s" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:831 +#: strbuf.c:832 #, c-format msgid "%u.%2.2u MiB" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:833 +#: strbuf.c:834 #, c-format msgid "%u.%2.2u MiB/s" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:840 +#: strbuf.c:841 #, c-format msgid "%u.%2.2u KiB" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:842 +#: strbuf.c:843 #, c-format msgid "%u.%2.2u KiB/s" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:848 +#: strbuf.c:849 #, fuzzy, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -7101,13 +7588,18 @@ msgstr[0] "%u byte" msgstr[1] "%u bytes" #. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:850 +#: strbuf.c:851 #, fuzzy, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" msgstr[0] "octets" msgstr[1] "octets" +#: strbuf.c:1149 +#, fuzzy, c-format +msgid "could not edit '%s'" +msgstr "no s'ha pogut llegir «%s»" + #: submodule.c:114 submodule.c:143 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" @@ -7143,7 +7635,7 @@ msgstr "L'especificació «%s» és en el submòdul «%.*s»" msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "l'entrada del submòdul «%s» (%s) és a %s, no és una comissió" -#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989 +#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2016 msgid "Failed to resolve HEAD as a valid ref." msgstr "S'ha produït un error en resoldre HEAD com a referència vàlida." @@ -7182,7 +7674,12 @@ msgstr "el submòdul «%s» té l'índex brut" msgid "Submodule '%s' could not be updated." msgstr "Submòduls canviats però no actualitzats:" -#: submodule.c:2007 +#: submodule.c:2027 +#, c-format +msgid "submodule git dir '%s' is inside git dir '%.*s'" +msgstr "" + +#: submodule.c:2048 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -7190,12 +7687,17 @@ msgstr "" "no està admès relocate_gitdir per al submòdul «%s» amb més d'un arbre de " "treball" -#: submodule.c:2019 submodule.c:2074 +#: submodule.c:2060 submodule.c:2119 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "no s'ha trobat el nom pel submòdul «%s»" -#: submodule.c:2026 +#: submodule.c:2064 +#, c-format +msgid "refusing to move '%s' into an existing git dir" +msgstr "" + +#: submodule.c:2071 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -7206,40 +7708,40 @@ msgstr "" "«%s» a\n" "«%s»\n" -#: submodule.c:2109 +#: submodule.c:2154 #, c-format msgid "could not recurse into submodule '%s'" msgstr "s'ha produït un error en cercar recursivament al camí de submòdul «%s»" -#: submodule.c:2153 +#: submodule.c:2198 msgid "could not start ls-files in .." msgstr "no s'ha pogut iniciar ls-files a .." -#: submodule.c:2192 +#: submodule.c:2237 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree ha retornat un codi de retorn %d no esperat" -#: submodule-config.c:232 +#: submodule-config.c:236 #, fuzzy, c-format msgid "ignoring suspicious submodule name: %s" msgstr "s'està ignorant la referència amb nom malmès %s" -#: submodule-config.c:299 +#: submodule-config.c:303 msgid "negative values not allowed for submodule.fetchjobs" msgstr "no es permeten els valors negatius a submodule.fetchjobs" -#: submodule-config.c:397 +#: submodule-config.c:401 #, c-format msgid "ignoring '%s' which may be interpreted as a command-line option: %s" msgstr "" -#: submodule-config.c:486 +#: submodule-config.c:498 #, c-format msgid "invalid value for %s" msgstr "valor no vàlid per a %s" -#: submodule-config.c:755 +#: submodule-config.c:769 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "No s'ha pogut actualitzar l'entrada de .gitmodules %s" @@ -7274,7 +7776,7 @@ msgstr "no s'ha pogut llegir el fitxer d'entrada «%s»" msgid "could not read from stdin" msgstr "no s'ha pogut llegir des de stdin" -#: trailer.c:1011 wrapper.c:701 +#: trailer.c:1011 wrapper.c:665 #, c-format msgid "could not stat %s" msgstr "no s'ha pogut fer stat a %s" @@ -7303,48 +7805,48 @@ msgstr "no s'ha pogut canviar el nom del fitxer temporal a %s" msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "Canviaria la font de «%s» a «%s» de «%s»\n" -#: transport.c:142 +#: transport.c:145 #, fuzzy, c-format msgid "could not read bundle '%s'" msgstr "no s'ha pogut llegir el fitxer «%s»" -#: transport.c:208 +#: transport.c:214 #, c-format msgid "transport: invalid depth option '%s'" msgstr "transport: opció de profunditat no vàlida «%s»" -#: transport.c:259 +#: transport.c:266 msgid "see protocol.version in 'git help config' for more details" msgstr "" -#: transport.c:260 +#: transport.c:267 msgid "server options require protocol version 2 or later" msgstr "" -#: transport.c:625 +#: transport.c:632 #, fuzzy msgid "could not parse transport.color.* config" msgstr "no s'ha pogut analitzar l'script d'autor" -#: transport.c:698 +#: transport.c:705 msgid "support for protocol v2 not implemented yet" msgstr "" -#: transport.c:825 +#: transport.c:831 #, fuzzy, c-format msgid "unknown value for config '%s': %s" msgstr "valor desconegut «%s» per a la clau «%s»" -#: transport.c:891 +#: transport.c:897 #, fuzzy, c-format msgid "transport '%s' not allowed" msgstr "no s'ha trobat la branca «%s»." -#: transport.c:945 +#: transport.c:949 msgid "git-over-rsync is no longer supported" msgstr "" -#: transport.c:1040 +#: transport.c:1044 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -7353,7 +7855,7 @@ msgstr "" "Els camins de submòdul següents contenen canvis que no\n" "es poden trobar en cap remot:\n" -#: transport.c:1044 +#: transport.c:1048 #, c-format msgid "" "\n" @@ -7379,186 +7881,191 @@ msgstr "" "\n" "per a pujar-los a un remot.\n" -#: transport.c:1052 +#: transport.c:1056 msgid "Aborting." msgstr "S'està avortant." -#: transport.c:1193 +#: transport.c:1201 #, fuzzy msgid "failed to push all needed submodules" msgstr "s'ha produït un error en cercar recursivament al submòdul «%s»" -#: transport.c:1340 transport-helper.c:645 +#: transport.c:1345 transport-helper.c:656 #, fuzzy msgid "operation not supported by protocol" msgstr "opció no admesa amb --recurse-submodules." -#: transport-helper.c:51 transport-helper.c:80 +#: transport-helper.c:61 transport-helper.c:90 #, fuzzy msgid "full write to remote helper failed" msgstr "imprimeix l'estat des de l'ajudant remot" -#: transport-helper.c:134 +#: transport-helper.c:144 #, fuzzy, c-format msgid "unable to find remote helper for '%s'" msgstr "No s'ha pogut afegir el resultat de fusió per a «%s»" -#: transport-helper.c:150 transport-helper.c:559 +#: transport-helper.c:160 transport-helper.c:570 msgid "can't dup helper output fd" msgstr "" -#: transport-helper.c:201 +#: transport-helper.c:211 #, c-format msgid "" "unknown mandatory capability %s; this remote helper probably needs newer " "version of Git" msgstr "" -#: transport-helper.c:207 +#: transport-helper.c:217 msgid "this remote helper should implement refspec capability" msgstr "" -#: transport-helper.c:274 transport-helper.c:414 +#: transport-helper.c:284 transport-helper.c:424 #, fuzzy, c-format msgid "%s unexpectedly said: '%s'" msgstr "blob esperat per a %s «%s»" -#: transport-helper.c:403 +#: transport-helper.c:413 #, c-format msgid "%s also locked %s" msgstr "%s també ha bloquejat %s" -#: transport-helper.c:481 +#: transport-helper.c:492 #, fuzzy msgid "couldn't run fast-import" msgstr "no s'ha pogut executar «stash»." -#: transport-helper.c:504 +#: transport-helper.c:515 #, fuzzy msgid "error while running fast-import" msgstr "error en tancar el fitxer de paquet" -#: transport-helper.c:533 transport-helper.c:1105 +#: transport-helper.c:544 transport-helper.c:1133 #, fuzzy, c-format msgid "could not read ref %s" msgstr "No s'ha pogut llegir la referència %s" -#: transport-helper.c:578 +#: transport-helper.c:589 #, fuzzy, c-format msgid "unknown response to connect: %s" msgstr "opció desconeguda: %s\n" -#: transport-helper.c:600 +#: transport-helper.c:611 msgid "setting remote service path not supported by protocol" msgstr "" -#: transport-helper.c:602 +#: transport-helper.c:613 #, fuzzy msgid "invalid remote service path" msgstr "referència no vàlida: %s" -#: transport-helper.c:648 +#: transport-helper.c:659 #, c-format msgid "can't connect to subservice %s" msgstr "" -#: transport-helper.c:720 +#: transport-helper.c:735 #, fuzzy, c-format msgid "expected ok/error, helper said '%s'" msgstr "blob esperat per a %s «%s»" -#: transport-helper.c:773 +#: transport-helper.c:788 #, fuzzy, c-format msgid "helper reported unexpected status of %s" msgstr "ls-tree ha retornat un codi de retorn %d no esperat" -#: transport-helper.c:834 +#: transport-helper.c:849 #, fuzzy, c-format msgid "helper %s does not support dry-run" msgstr "El servidor no admet --deepen" -#: transport-helper.c:837 +#: transport-helper.c:852 #, fuzzy, c-format msgid "helper %s does not support --signed" msgstr "El servidor no admet --shallow-since" -#: transport-helper.c:840 +#: transport-helper.c:855 #, fuzzy, c-format msgid "helper %s does not support --signed=if-asked" msgstr "el destí receptor no admet pujar --signed" -#: transport-helper.c:847 +#: transport-helper.c:860 +#, fuzzy, c-format +msgid "helper %s does not support --atomic" +msgstr "El servidor no admet --shallow-since" + +#: transport-helper.c:866 #, fuzzy, c-format msgid "helper %s does not support 'push-option'" msgstr "el destí receptor no admet opcions de pujada" -#: transport-helper.c:945 +#: transport-helper.c:964 msgid "remote-helper doesn't support push; refspec needed" msgstr "" -#: transport-helper.c:950 +#: transport-helper.c:969 #, fuzzy, c-format msgid "helper %s does not support 'force'" msgstr "El servidor no admet --deepen" -#: transport-helper.c:997 +#: transport-helper.c:1016 #, fuzzy msgid "couldn't run fast-export" msgstr "no s'ha pogut executar «stash»." -#: transport-helper.c:1002 +#: transport-helper.c:1021 #, fuzzy msgid "error while running fast-export" msgstr "error en tancar el fitxer de paquet" -#: transport-helper.c:1027 +#: transport-helper.c:1046 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" "Perhaps you should specify a branch such as 'master'.\n" msgstr "" -#: transport-helper.c:1091 +#: transport-helper.c:1119 #, fuzzy, c-format msgid "malformed response in ref list: %s" msgstr "full d'opcions mal format: «%s»" -#: transport-helper.c:1244 +#: transport-helper.c:1271 #, fuzzy, c-format msgid "read(%s) failed" msgstr "%s ha fallat" -#: transport-helper.c:1271 +#: transport-helper.c:1298 #, fuzzy, c-format msgid "write(%s) failed" msgstr "%s ha fallat" -#: transport-helper.c:1320 +#: transport-helper.c:1347 #, fuzzy, c-format msgid "%s thread failed" msgstr "%s ha fallat" -#: transport-helper.c:1324 +#: transport-helper.c:1351 #, fuzzy, c-format msgid "%s thread failed to join: %s" msgstr "s'ha produït un error en obrir «%s»" -#: transport-helper.c:1343 transport-helper.c:1347 +#: transport-helper.c:1370 transport-helper.c:1374 #, c-format msgid "can't start thread for copying data: %s" msgstr "" -#: transport-helper.c:1384 +#: transport-helper.c:1411 #, c-format msgid "%s process failed to wait" msgstr "" -#: transport-helper.c:1388 +#: transport-helper.c:1415 #, fuzzy, c-format msgid "%s process failed" msgstr "%s ha fallat" -#: transport-helper.c:1406 transport-helper.c:1415 +#: transport-helper.c:1433 transport-helper.c:1442 msgid "can't start thread for copying data" msgstr "" @@ -7574,11 +8081,16 @@ msgstr "mode mal format en entrada d'arbre" msgid "empty filename in tree entry" msgstr "nom de fitxer buit en una entrada d'arbre" -#: tree-walk.c:118 +#: tree-walk.c:48 +#, c-format +msgid "filename in tree entry contains backslash: '%s'" +msgstr "" + +#: tree-walk.c:124 msgid "too-short tree file" msgstr "fitxer d'arbre massa curt" -#: unpack-trees.c:111 +#: unpack-trees.c:110 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -7588,7 +8100,7 @@ msgstr "" "agafar:\n" "%%sCometeu els vostres canvis o feu «stash» abans de canviar de branca." -#: unpack-trees.c:113 +#: unpack-trees.c:112 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -7598,7 +8110,7 @@ msgstr "" "agafar:\n" "%%s" -#: unpack-trees.c:116 +#: unpack-trees.c:115 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -7608,7 +8120,7 @@ msgstr "" "fusionar:\n" "%%sCometeu els vostres canvis o feu «stash» abans de fusionar." -#: unpack-trees.c:118 +#: unpack-trees.c:117 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -7618,7 +8130,7 @@ msgstr "" "fusionar:\n" "%%s" -#: unpack-trees.c:121 +#: unpack-trees.c:120 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -7627,7 +8139,7 @@ msgstr "" "Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n" "%%sCometeu els vostres canvis o feu «stash» abans de %s." -#: unpack-trees.c:123 +#: unpack-trees.c:122 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -7636,7 +8148,7 @@ msgstr "" "Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n" "%%s" -#: unpack-trees.c:128 +#: unpack-trees.c:127 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -7645,7 +8157,7 @@ msgstr "" "En actualitzar els directoris següents perdria fitxers no seguits en el:\n" "%s" -#: unpack-trees.c:132 +#: unpack-trees.c:131 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -7655,7 +8167,7 @@ msgstr "" "agafar:\n" "%%sMoveu-los o elimineu-los abans de canviar de branca." -#: unpack-trees.c:134 +#: unpack-trees.c:133 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -7665,7 +8177,7 @@ msgstr "" "agafar:\n" "%%s" -#: unpack-trees.c:137 +#: unpack-trees.c:136 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -7675,7 +8187,7 @@ msgstr "" "fusionar:\n" "%%sMoveu-los o elimineu-los abans de fusionar." -#: unpack-trees.c:139 +#: unpack-trees.c:138 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -7685,7 +8197,7 @@ msgstr "" "fusionar:\n" "%%s" -#: unpack-trees.c:142 +#: unpack-trees.c:141 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -7694,7 +8206,7 @@ msgstr "" "Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n" "%%sMoveu-los o elimineu-los abans de %s." -#: unpack-trees.c:144 +#: unpack-trees.c:143 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -7703,7 +8215,7 @@ msgstr "" "Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n" "%%s" -#: unpack-trees.c:150 +#: unpack-trees.c:149 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -7714,7 +8226,7 @@ msgstr "" "agafar:\n" "%%sMoveu-los o elimineu-los abans de canviar de branca." -#: unpack-trees.c:152 +#: unpack-trees.c:151 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -7725,7 +8237,7 @@ msgstr "" "agafar:\n" "%%s" -#: unpack-trees.c:155 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -7735,7 +8247,7 @@ msgstr "" "fusionar:\n" "%%sMoveu-los o elimineu-los abans de fusionar." -#: unpack-trees.c:157 +#: unpack-trees.c:156 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -7745,7 +8257,7 @@ msgstr "" "fusionar:\n" "%%s" -#: unpack-trees.c:160 +#: unpack-trees.c:159 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -7755,7 +8267,7 @@ msgstr "" "%s:\n" "%%sMoveu-los o elimineu-los abans de %s." -#: unpack-trees.c:162 +#: unpack-trees.c:161 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -7765,12 +8277,12 @@ msgstr "" "%s:\n" "%%s" -#: unpack-trees.c:170 +#: unpack-trees.c:169 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "L'entrada «%s» encavalca amb «%s». No es pot vincular." -#: unpack-trees.c:173 +#: unpack-trees.c:172 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up to date:\n" @@ -7780,7 +8292,7 @@ msgstr "" "dia:\n" "%s" -#: unpack-trees.c:175 +#: unpack-trees.c:174 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -7791,7 +8303,7 @@ msgstr "" "actualitzar l'agafament parcial:\n" "%s" -#: unpack-trees.c:177 +#: unpack-trees.c:176 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -7802,7 +8314,7 @@ msgstr "" "l'agafament parcial:\n" "%s" -#: unpack-trees.c:179 +#: unpack-trees.c:178 #, c-format msgid "" "Cannot update submodule:\n" @@ -7811,22 +8323,27 @@ msgstr "" "No es pot actualitzar el submòdul:\n" "%s" -#: unpack-trees.c:256 +#: unpack-trees.c:255 #, c-format msgid "Aborting\n" msgstr "S'està avortant\n" -#: unpack-trees.c:318 +#: unpack-trees.c:317 msgid "Updating files" msgstr "S'estan actualitzant els fitxers" -#: unpack-trees.c:350 +#: unpack-trees.c:349 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" "colliding group is in the working tree:\n" msgstr "" +#: unpack-trees.c:1441 +#, fuzzy +msgid "Updating index flags" +msgstr "S'estan actualitzant els fitxers" + #: urlmatch.c:163 msgid "invalid URL scheme name or missing '://' suffix" msgstr "l'esquema d'URL no és vàlid o li manca el sufix '://'" @@ -7856,7 +8373,7 @@ msgstr "número de port no vàlid" msgid "invalid '..' path segment" msgstr "segment de camí '..' no vàlid" -#: worktree.c:258 builtin/am.c:2095 +#: worktree.c:258 builtin/am.c:2084 #, c-format msgid "failed to read '%s'" msgstr "s'ha produït un error en llegir «%s»" @@ -7886,17 +8403,17 @@ msgstr "«%s» no és un fitxer .git, codi d'error %d" msgid "'%s' does not point back to '%s'" msgstr "«%s» no assenyala de tornada a «%s»" -#: wrapper.c:223 wrapper.c:393 +#: wrapper.c:186 wrapper.c:356 #, c-format msgid "could not open '%s' for reading and writing" msgstr "no s'ha pogut obrir «%s» per a lectura i escriptura" -#: wrapper.c:424 wrapper.c:624 +#: wrapper.c:387 wrapper.c:588 #, c-format msgid "unable to access '%s'" msgstr "no s'ha pogut accedir a «%s»" -#: wrapper.c:632 +#: wrapper.c:596 msgid "unable to get current working directory" msgstr "no s'ha pogut obtenir el directori de treball actual" @@ -8237,86 +8754,96 @@ msgstr "" "\")" #: wt-status.c:1437 +#, fuzzy +msgid " (use \"git cherry-pick --skip\" to skip this patch)" +msgstr " (useu \"git am --skip\" per a ometre aquest pedaç)" + +#: wt-status.c:1439 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (useu \"git cherry-pick --abort\" per a cancel·lar l'operació de «cherry " "pick»)" -#: wt-status.c:1447 +#: wt-status.c:1449 #, fuzzy msgid "Revert currently in progress." msgstr "avorta la fusió en curs actual" -#: wt-status.c:1450 +#: wt-status.c:1452 #, c-format msgid "You are currently reverting commit %s." msgstr "Actualment esteu revertint la comissió %s." -#: wt-status.c:1456 +#: wt-status.c:1458 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (arregleu els conflictes i executeu \"git revert --continue\")" -#: wt-status.c:1459 +#: wt-status.c:1461 #, fuzzy msgid " (run \"git revert --continue\" to continue)" msgstr " (arregleu els conflictes i executeu \"git revert --continue\")" -#: wt-status.c:1462 +#: wt-status.c:1464 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" " (tots els conflictes estan arreglats: executeu \"git revert --continue\")" -#: wt-status.c:1464 +#: wt-status.c:1466 +#, fuzzy +msgid " (use \"git revert --skip\" to skip this patch)" +msgstr " (useu \"git rebase --skip\" per a ometre aquest pedaç)" + +#: wt-status.c:1468 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" " (useu \"git revert --abort\" per a cancel·lar l'operació de reversió)" -#: wt-status.c:1474 +#: wt-status.c:1478 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Actualment esteu bisecant, heu començat des de la branca «%s»." -#: wt-status.c:1478 +#: wt-status.c:1482 msgid "You are currently bisecting." msgstr "Actualment esteu bisecant." -#: wt-status.c:1481 +#: wt-status.c:1485 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (useu \"git bisect reset\" per a tornar a la branca original)" -#: wt-status.c:1690 +#: wt-status.c:1694 msgid "On branch " msgstr "En la branca " -#: wt-status.c:1697 +#: wt-status.c:1701 msgid "interactive rebase in progress; onto " msgstr "«rebase» interactiu en curs; sobre " -#: wt-status.c:1699 +#: wt-status.c:1703 msgid "rebase in progress; onto " msgstr "«rebase» en curs; sobre " -#: wt-status.c:1709 +#: wt-status.c:1713 msgid "Not currently on any branch." msgstr "Actualment no s'és en cap branca." -#: wt-status.c:1726 +#: wt-status.c:1730 msgid "Initial commit" msgstr "Comissió inicial" -#: wt-status.c:1727 +#: wt-status.c:1731 msgid "No commits yet" msgstr "No s'ha fet cap comissió encara" -#: wt-status.c:1741 +#: wt-status.c:1745 msgid "Untracked files" msgstr "Fitxers no seguits" -#: wt-status.c:1743 +#: wt-status.c:1747 msgid "Ignored files" msgstr "Fitxers ignorats" -#: wt-status.c:1747 +#: wt-status.c:1751 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -8328,31 +8855,31 @@ msgstr "" "oblidar-vos d'afegir fitxers nous vosaltres mateixos (vegeu\n" "'git help status')." -#: wt-status.c:1753 +#: wt-status.c:1757 #, c-format msgid "Untracked files not listed%s" msgstr "Els fitxers no seguits no estan llistats%s" -#: wt-status.c:1755 +#: wt-status.c:1759 msgid " (use -u option to show untracked files)" msgstr " (useu l'opció -u per a mostrar els fitxers no seguits)" -#: wt-status.c:1761 +#: wt-status.c:1765 msgid "No changes" msgstr "Sense canvis" -#: wt-status.c:1766 +#: wt-status.c:1770 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "no hi ha canvis afegits a cometre (useu \"git add\" o \"git commit -a\")\n" -#: wt-status.c:1769 +#: wt-status.c:1773 #, c-format msgid "no changes added to commit\n" msgstr "no hi ha canvis afegits a cometre\n" -#: wt-status.c:1772 +#: wt-status.c:1776 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -8361,192 +8888,197 @@ msgstr "" "no hi ha res afegit a cometre però hi ha fitxers no seguits (useu \"git add" "\" per a seguir-los)\n" -#: wt-status.c:1775 +#: wt-status.c:1779 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "no hi ha res afegit a cometre però hi ha fitxers no seguits\n" -#: wt-status.c:1778 +#: wt-status.c:1782 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "no hi ha res a cometre (creeu/copieu fitxers i useu \"git add\" per a seguir-" "los)\n" -#: wt-status.c:1781 wt-status.c:1786 +#: wt-status.c:1785 wt-status.c:1790 #, c-format msgid "nothing to commit\n" msgstr "no hi ha res a cometre\n" -#: wt-status.c:1784 +#: wt-status.c:1788 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "no hi ha res a cometre (useu -u per a mostrar els fitxers no seguits)\n" -#: wt-status.c:1788 +#: wt-status.c:1792 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "no hi ha res a cometre, l'arbre de treball està net\n" -#: wt-status.c:1901 +#: wt-status.c:1905 msgid "No commits yet on " msgstr "No s'ha fet cap comissió encara a " -#: wt-status.c:1905 +#: wt-status.c:1909 msgid "HEAD (no branch)" msgstr "HEAD (sense branca)" -#: wt-status.c:1936 +#: wt-status.c:1940 msgid "different" msgstr "diferent" -#: wt-status.c:1938 wt-status.c:1946 +#: wt-status.c:1942 wt-status.c:1950 msgid "behind " msgstr "darrere " -#: wt-status.c:1941 wt-status.c:1944 +#: wt-status.c:1945 wt-status.c:1948 msgid "ahead " msgstr "davant per " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2466 +#: wt-status.c:2470 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "no es pot %s: Teniu canvis «unstaged»." -#: wt-status.c:2472 +#: wt-status.c:2476 msgid "additionally, your index contains uncommitted changes." msgstr "addicionalment, el vostre índex conté canvis sense cometre." -#: wt-status.c:2474 +#: wt-status.c:2478 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "no es pot %s: El vostre índex conté canvis sense cometre." -#: builtin/add.c:25 +#: compat/precompose_utf8.c:58 builtin/clone.c:455 +#, c-format +msgid "failed to unlink '%s'" +msgstr "s'ha produït un error en desenllaçar «%s»" + +#: builtin/add.c:26 msgid "git add [] [--] ..." msgstr "git add [] [--] ..." -#: builtin/add.c:84 +#: builtin/add.c:87 #, c-format msgid "unexpected diff status %c" msgstr "estat de diff inesperat %c" -#: builtin/add.c:89 builtin/commit.c:288 +#: builtin/add.c:92 builtin/commit.c:288 msgid "updating files failed" msgstr "s'ha produït un error en actualitzar els fitxers" -#: builtin/add.c:99 +#: builtin/add.c:102 #, c-format msgid "remove '%s'\n" msgstr "elimina «%s»\n" -#: builtin/add.c:174 +#: builtin/add.c:177 msgid "Unstaged changes after refreshing the index:" msgstr "Canvis «unstaged» després d'actualitzar l'índex:" -#: builtin/add.c:234 builtin/rev-parse.c:896 +#: builtin/add.c:252 builtin/rev-parse.c:899 msgid "Could not read the index" msgstr "No s'ha pogut llegir l'índex" -#: builtin/add.c:245 +#: builtin/add.c:263 #, c-format msgid "Could not open '%s' for writing." msgstr "No s'ha pogut obrir «%s» per a escriptura." -#: builtin/add.c:249 +#: builtin/add.c:267 msgid "Could not write patch" msgstr "No s'ha pogut escriure el pedaç" -#: builtin/add.c:252 +#: builtin/add.c:270 msgid "editing patch failed" msgstr "l'edició del pedaç ha fallat" -#: builtin/add.c:255 +#: builtin/add.c:273 #, c-format msgid "Could not stat '%s'" msgstr "No s'ha pogut fer stat a «%s»" -#: builtin/add.c:257 +#: builtin/add.c:275 msgid "Empty patch. Aborted." msgstr "El pedaç és buit. S'ha avortat." -#: builtin/add.c:262 +#: builtin/add.c:280 #, c-format msgid "Could not apply '%s'" msgstr "No s'ha pogut aplicar «%s»" -#: builtin/add.c:270 +#: builtin/add.c:288 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Els camins següents s'ignoren per un dels vostres fitxers .gitignore:\n" -#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124 -#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560 -#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165 +#: builtin/add.c:308 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124 +#: builtin/prune-packed.c:56 builtin/pull.c:223 builtin/push.c:548 +#: builtin/remote.c:1344 builtin/rm.c:241 builtin/send-pack.c:165 msgid "dry run" msgstr "marxa en sec" -#: builtin/add.c:293 +#: builtin/add.c:311 msgid "interactive picking" msgstr "recull interactiu" -#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306 +#: builtin/add.c:312 builtin/checkout.c:1482 builtin/reset.c:307 msgid "select hunks interactively" msgstr "selecciona els trossos interactivament" -#: builtin/add.c:295 +#: builtin/add.c:313 msgid "edit current diff and apply" msgstr "edita la diferència actual i aplica-la" -#: builtin/add.c:296 +#: builtin/add.c:314 msgid "allow adding otherwise ignored files" msgstr "permet afegir fitxers que d'altra manera s'ignoren" -#: builtin/add.c:297 +#: builtin/add.c:315 msgid "update tracked files" msgstr "actualitza els fitxers seguits" -#: builtin/add.c:298 +#: builtin/add.c:316 msgid "renormalize EOL of tracked files (implies -u)" msgstr "" -#: builtin/add.c:299 +#: builtin/add.c:317 msgid "record only the fact that the path will be added later" msgstr "registra només el fet que el camí s'afegirà més tard" -#: builtin/add.c:300 +#: builtin/add.c:318 msgid "add changes from all tracked and untracked files" msgstr "afegeix els canvis de tots els fitxers seguits i no seguits" -#: builtin/add.c:303 +#: builtin/add.c:321 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" "ignora els camins eliminats en l'arbre de treball (el mateix que --no-all)" -#: builtin/add.c:305 +#: builtin/add.c:323 msgid "don't add, only refresh the index" msgstr "no afegeixis, només actualitza l'índex" -#: builtin/add.c:306 +#: builtin/add.c:324 msgid "just skip files which cannot be added because of errors" msgstr "només omet els fitxers que no es poden afegir a causa d'errors" -#: builtin/add.c:307 +#: builtin/add.c:325 msgid "check if - even missing - files are ignored in dry run" msgstr "" "comproveu si els fitxers - fins i tot els absents - s'ignoren en marxa en sec" -#: builtin/add.c:309 builtin/update-index.c:1001 +#: builtin/add.c:327 builtin/update-index.c:1004 msgid "override the executable bit of the listed files" msgstr "passa per alt el bit executable dels fitxers llistats" -#: builtin/add.c:311 +#: builtin/add.c:329 msgid "warn when adding an embedded repository" msgstr "avisa'm quan s'afegeixi un dipòsit incrustat" -#: builtin/add.c:326 +#: builtin/add.c:347 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -8577,151 +9109,168 @@ msgstr "" "\n" "Vegeu \"git help submodule\" per a més informació." -#: builtin/add.c:354 +#: builtin/add.c:375 #, c-format msgid "adding embedded git repository: %s" msgstr "s'està afegint un dipòsit incrustat: %s" -#: builtin/add.c:372 +#: builtin/add.c:393 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "Useu -f si realment els voleu afegir.\n" -#: builtin/add.c:379 +#: builtin/add.c:400 msgid "adding files failed" msgstr "l'afegiment de fitxers ha fallat" -#: builtin/add.c:419 +#: builtin/add.c:428 builtin/commit.c:348 +#, fuzzy +msgid "--pathspec-from-file is incompatible with --interactive/--patch" +msgstr "--first-parent és incompatible amb --bisect" + +#: builtin/add.c:434 +#, fuzzy +msgid "--pathspec-from-file is incompatible with --edit" +msgstr "--first-parent és incompatible amb --bisect" + +#: builtin/add.c:446 msgid "-A and -u are mutually incompatible" msgstr "-A i -u són mútuament incompatibles" -#: builtin/add.c:426 +#: builtin/add.c:449 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "L'opció --ignore-missing només es pot usar juntament amb --dry-run" -#: builtin/add.c:430 +#: builtin/add.c:453 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "el paràmetre --chmod «%s» ha de ser o -x o +x" -#: builtin/add.c:445 +#: builtin/add.c:471 builtin/checkout.c:1648 builtin/commit.c:354 +#: builtin/reset.c:327 +#, fuzzy +msgid "--pathspec-from-file is incompatible with pathspec arguments" +msgstr "--patch és incompatible amb --{hard,mixed,soft}" + +#: builtin/add.c:478 builtin/checkout.c:1660 builtin/commit.c:360 +#: builtin/reset.c:333 +msgid "--pathspec-file-nul requires --pathspec-from-file" +msgstr "" + +#: builtin/add.c:482 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "No s'ha especificat res, no s'ha afegit res.\n" -#: builtin/add.c:446 +#: builtin/add.c:483 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Potser volíeu dir «git add .»?\n" -#: builtin/am.c:348 +#: builtin/am.c:347 msgid "could not parse author script" msgstr "no s'ha pogut analitzar l'script d'autor" -#: builtin/am.c:432 +#: builtin/am.c:431 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "s'ha suprimit «%s» pel lligam applypatch-msg" -#: builtin/am.c:474 +#: builtin/am.c:473 #, c-format msgid "Malformed input line: '%s'." msgstr "Línia d'entrada mal formada: «%s»." -#: builtin/am.c:512 +#: builtin/am.c:511 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "S'ha produït un error en copiar les notes de «%s» a «%s»" -#: builtin/am.c:538 +#: builtin/am.c:537 msgid "fseek failed" msgstr "fseek ha fallat" -#: builtin/am.c:726 +#: builtin/am.c:725 #, c-format msgid "could not parse patch '%s'" msgstr "no s'ha pogut analitzar el pedaç «%s»" -#: builtin/am.c:791 +#: builtin/am.c:790 msgid "Only one StGIT patch series can be applied at once" msgstr "Només una sèrie de pedaços StGIT es pot aplicar a la vegada" -#: builtin/am.c:839 +#: builtin/am.c:838 msgid "invalid timestamp" msgstr "marca de temps no vàlida" -#: builtin/am.c:844 builtin/am.c:856 +#: builtin/am.c:843 builtin/am.c:855 msgid "invalid Date line" msgstr "línia Date no vàlida" -#: builtin/am.c:851 +#: builtin/am.c:850 msgid "invalid timezone offset" msgstr "desplaçament de zona de temps no vàlid" -#: builtin/am.c:944 +#: builtin/am.c:943 msgid "Patch format detection failed." msgstr "La detecció de format de pedaç ha fallat." -#: builtin/am.c:949 builtin/clone.c:407 +#: builtin/am.c:948 builtin/clone.c:409 #, c-format msgid "failed to create directory '%s'" msgstr "s'ha produït un error en crear el directori «%s»" -#: builtin/am.c:954 +#: builtin/am.c:953 msgid "Failed to split patches." msgstr "S'ha produït un error en dividir els pedaços." -#: builtin/am.c:1084 builtin/commit.c:374 -msgid "unable to write index file" -msgstr "no s'ha pogut escriure el fitxer d'índex" - -#: builtin/am.c:1098 +#: builtin/am.c:1084 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Quan hàgiu resolt aquest problema, executeu \"%s --continue\"." -#: builtin/am.c:1099 +#: builtin/am.c:1085 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "" "Si preferiu ometre aquest pedaç, executeu \"%s --skip\" en lloc d'això." -#: builtin/am.c:1100 +#: builtin/am.c:1086 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "Per a restaurar la branca original i deixar d'apedaçar, executeu \"%s --abort" "\"." -#: builtin/am.c:1183 +#: builtin/am.c:1169 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" -#: builtin/am.c:1211 +#: builtin/am.c:1197 msgid "Patch is empty." msgstr "El pedaç està buit." -#: builtin/am.c:1277 +#: builtin/am.c:1262 +#, fuzzy, c-format +msgid "missing author line in commit %s" +msgstr "Manca el nom de branca; proveu -b" + +#: builtin/am.c:1265 #, c-format msgid "invalid ident line: %.*s" msgstr "línia d'identitat no vàlida: %.*s" -#: builtin/am.c:1299 -#, c-format -msgid "unable to parse commit %s" -msgstr "no s'ha pogut analitzar la comissió %s" - -#: builtin/am.c:1496 +#: builtin/am.c:1484 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Al dipòsit li manquen els blobs necessaris per a retrocedir a una fusió de 3 " "vies." -#: builtin/am.c:1498 +#: builtin/am.c:1486 msgid "Using index info to reconstruct a base tree..." msgstr "S'està usant la informació d'índex per a reconstruir un arbre base..." -#: builtin/am.c:1517 +#: builtin/am.c:1505 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -8729,24 +9278,24 @@ msgstr "" "Heu editat el vostre pedaç a mà?\n" "No s'aplica als blobs recordats en el seu índex." -#: builtin/am.c:1523 +#: builtin/am.c:1511 msgid "Falling back to patching base and 3-way merge..." msgstr "S'està retrocedint a apedaçar la base i una fusió de 3 vies..." -#: builtin/am.c:1549 +#: builtin/am.c:1537 msgid "Failed to merge in the changes." msgstr "S'ha produït un error en fusionar els canvis." -#: builtin/am.c:1581 +#: builtin/am.c:1569 msgid "applying to an empty history" msgstr "s'està aplicant a una història buida" -#: builtin/am.c:1628 builtin/am.c:1632 +#: builtin/am.c:1616 builtin/am.c:1620 #, c-format msgid "cannot resume: %s does not exist." msgstr "no es pot reprendre: %s no existeix." -#: builtin/am.c:1650 +#: builtin/am.c:1638 msgid "Commit Body is:" msgstr "El cos de la comissió és:" @@ -8754,37 +9303,41 @@ msgstr "El cos de la comissió és:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1660 +#: builtin/am.c:1648 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" "Voleu aplicar-lo? [y]es/[n]o/[e]dita/[v]isualitza el pedaç/[a]ccepta'ls " "tots: " -#: builtin/am.c:1710 +#: builtin/am.c:1695 builtin/commit.c:394 +msgid "unable to write index file" +msgstr "no s'ha pogut escriure el fitxer d'índex" + +#: builtin/am.c:1699 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Índex brut: no es poden aplicar pedaços (bruts: %s)" -#: builtin/am.c:1750 builtin/am.c:1818 +#: builtin/am.c:1739 builtin/am.c:1807 #, c-format msgid "Applying: %.*s" msgstr "S'està aplicant: %.*s" -#: builtin/am.c:1767 +#: builtin/am.c:1756 msgid "No changes -- Patch already applied." msgstr "Sense canvis -- El pedaç ja s'ha aplicat." -#: builtin/am.c:1773 +#: builtin/am.c:1762 #, c-format msgid "Patch failed at %s %.*s" msgstr "El pedaç ha fallat a %s %.*s" -#: builtin/am.c:1777 +#: builtin/am.c:1766 msgid "Use 'git am --show-current-patch' to see the failed patch" msgstr "" -#: builtin/am.c:1821 +#: builtin/am.c:1810 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -8794,7 +9347,7 @@ msgstr "" "Si no hi ha res per fer «stage», probablement alguna altra cosa ja ha\n" "introduït els mateixos canvis; potser voleu ometre aquest pedaç." -#: builtin/am.c:1828 +#: builtin/am.c:1817 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -8807,17 +9360,17 @@ msgstr "" "Podeu executar `git rm` en un fitxer per acceptar \"suprimit per ells\" pel " "fitxer." -#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329 -#: builtin/reset.c:337 +#: builtin/am.c:1924 builtin/am.c:1928 builtin/am.c:1940 builtin/reset.c:346 +#: builtin/reset.c:354 #, c-format msgid "Could not parse object '%s'." msgstr "No s'ha pogut analitzar l'objecte «%s»." -#: builtin/am.c:1987 +#: builtin/am.c:1976 msgid "failed to clean index" msgstr "s'ha produït un error en netejar l'índex" -#: builtin/am.c:2031 +#: builtin/am.c:2020 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -8825,144 +9378,144 @@ msgstr "" "Sembla que heu mogut HEAD després de l'última fallada de 'am'.\n" "No s'està rebobinant a ORIG_HEAD" -#: builtin/am.c:2128 +#: builtin/am.c:2117 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Valor no vàlid per a --patch-format: %s" -#: builtin/am.c:2164 +#: builtin/am.c:2153 msgid "git am [] [( | )...]" msgstr "git am [] [( | )...]" -#: builtin/am.c:2165 +#: builtin/am.c:2154 msgid "git am [] (--continue | --skip | --abort)" msgstr "git am [] (--continue | --skip | --abort)" -#: builtin/am.c:2171 +#: builtin/am.c:2160 msgid "run interactively" msgstr "executa interactivament" -#: builtin/am.c:2173 +#: builtin/am.c:2162 msgid "historical option -- no-op" msgstr "opció històrica -- no-op" -#: builtin/am.c:2175 +#: builtin/am.c:2164 msgid "allow fall back on 3way merging if needed" msgstr "permet retrocedir a una fusió de 3 vies si és necessari" -#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58 -#: builtin/repack.c:307 builtin/stash.c:806 +#: builtin/am.c:2165 builtin/init-db.c:494 builtin/prune-packed.c:58 +#: builtin/repack.c:304 builtin/stash.c:811 msgid "be quiet" msgstr "silenciós" -#: builtin/am.c:2178 +#: builtin/am.c:2167 msgid "add a Signed-off-by line to the commit message" msgstr "afegeix una línia «Signed-off-by» al missatge de comissió" -#: builtin/am.c:2181 +#: builtin/am.c:2170 msgid "recode into utf8 (default)" msgstr "recodifica en utf8 (per defecte)" -#: builtin/am.c:2183 +#: builtin/am.c:2172 msgid "pass -k flag to git-mailinfo" msgstr "passa l'indicador -k a git-mailinfo" -#: builtin/am.c:2185 +#: builtin/am.c:2174 msgid "pass -b flag to git-mailinfo" msgstr "passa l'indicador -b a git-mailinfo" -#: builtin/am.c:2187 +#: builtin/am.c:2176 msgid "pass -m flag to git-mailinfo" msgstr "passa l'indicador -m a git-mailinfo" -#: builtin/am.c:2189 +#: builtin/am.c:2178 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "passa l'indicador --keep-cr a git-mailsplit per al format mbox" -#: builtin/am.c:2192 +#: builtin/am.c:2181 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "no passis l'indicador --keep-cr a git-mailsplit independent d'am.keepcr" -#: builtin/am.c:2195 +#: builtin/am.c:2184 msgid "strip everything before a scissors line" msgstr "elimina tot abans d'una línia de tisores" -#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206 -#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218 -#: builtin/am.c:2224 +#: builtin/am.c:2186 builtin/am.c:2189 builtin/am.c:2192 builtin/am.c:2195 +#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207 +#: builtin/am.c:2213 msgid "pass it through git-apply" msgstr "passa-ho a través de git-apply" -#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671 -#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249 -#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418 -#: builtin/repack.c:318 builtin/repack.c:322 builtin/repack.c:324 +#: builtin/am.c:2203 builtin/commit.c:1386 builtin/fmt-merge-msg.c:673 +#: builtin/fmt-merge-msg.c:676 builtin/grep.c:883 builtin/merge.c:249 +#: builtin/pull.c:160 builtin/pull.c:219 builtin/rebase.c:1469 +#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321 #: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403 -#: parse-options.h:141 parse-options.h:162 parse-options.h:312 +#: parse-options.h:154 parse-options.h:175 parse-options.h:316 msgid "n" msgstr "n" -#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38 -#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:39 +#: builtin/am.c:2209 builtin/branch.c:661 builtin/for-each-ref.c:38 +#: builtin/replace.c:555 builtin/tag.c:437 builtin/verify-tag.c:38 msgid "format" msgstr "format" -#: builtin/am.c:2221 +#: builtin/am.c:2210 msgid "format the patch(es) are in" msgstr "el format en el qual estan els pedaços" -#: builtin/am.c:2227 +#: builtin/am.c:2216 msgid "override error message when patch failure occurs" msgstr "passa per alt el missatge d'error si falla l'aplicació del pedaç" -#: builtin/am.c:2229 +#: builtin/am.c:2218 msgid "continue applying patches after resolving a conflict" msgstr "segueix aplicant pedaços després de resoldre un conflicte" -#: builtin/am.c:2232 +#: builtin/am.c:2221 msgid "synonyms for --continue" msgstr "sinònims de --continue" -#: builtin/am.c:2235 +#: builtin/am.c:2224 msgid "skip the current patch" msgstr "omet el pedaç actual" -#: builtin/am.c:2238 +#: builtin/am.c:2227 msgid "restore the original branch and abort the patching operation." msgstr "restaura la branca original i avorta l'operació d'apedaçament." -#: builtin/am.c:2241 +#: builtin/am.c:2230 msgid "abort the patching operation but keep HEAD where it is." msgstr "" -#: builtin/am.c:2244 +#: builtin/am.c:2233 msgid "show the patch being applied." msgstr "mostra el pedaç que s'està aplicant." -#: builtin/am.c:2248 +#: builtin/am.c:2237 msgid "lie about committer date" msgstr "menteix sobre la data del comitent" -#: builtin/am.c:2250 +#: builtin/am.c:2239 msgid "use current timestamp for author date" msgstr "usa el marc de temps actual per la data d'autor" -#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511 -#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489 -#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418 +#: builtin/am.c:2241 builtin/commit-tree.c:120 builtin/commit.c:1507 +#: builtin/merge.c:286 builtin/pull.c:194 builtin/rebase.c:509 +#: builtin/rebase.c:1513 builtin/revert.c:117 builtin/tag.c:418 msgid "key-id" msgstr "ID de clau" -#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460 +#: builtin/am.c:2242 builtin/rebase.c:510 builtin/rebase.c:1514 msgid "GPG-sign commits" msgstr "signa les comissions amb GPG" -#: builtin/am.c:2256 +#: builtin/am.c:2245 msgid "(internal use for git-rebase)" msgstr "(ús intern per a git-rebase)" -#: builtin/am.c:2274 +#: builtin/am.c:2263 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -8970,18 +9523,18 @@ msgstr "" "Fa molt que l'opció -b/--binary no ha fet res, i\n" "s'eliminarà. No l'useu més." -#: builtin/am.c:2281 +#: builtin/am.c:2270 msgid "failed to read the index" msgstr "S'ha produït un error en llegir l'índex" -#: builtin/am.c:2296 +#: builtin/am.c:2285 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" "un directori de «rebase» anterior %s encara existeix però s'ha donat una " "bústia." -#: builtin/am.c:2320 +#: builtin/am.c:2309 #, c-format msgid "" "Stray %s directory found.\n" @@ -8990,11 +9543,11 @@ msgstr "" "S'ha trobat un directori %s extraviat.\n" "Useu \"git am --abort\" per a eliminar-lo." -#: builtin/am.c:2326 +#: builtin/am.c:2315 msgid "Resolve operation not in progress, we are not resuming." msgstr "Una operació de resolució no està en curs; no reprenem." -#: builtin/am.c:2336 +#: builtin/am.c:2325 msgid "interactive mode requires patches on the command line" msgstr "" @@ -9116,7 +9669,7 @@ msgstr "No estem bisecant." msgid "'%s' is not a valid commit" msgstr "«%s» no és un terme vàlid" -#: builtin/bisect--helper.c:174 +#: builtin/bisect--helper.c:172 #, fuzzy, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset '." @@ -9124,28 +9677,28 @@ msgstr "" "No s'ha pogut agafar la HEAD original '$branch'.\n" "Proveu 'git bisect reset '." -#: builtin/bisect--helper.c:215 +#: builtin/bisect--helper.c:216 #, fuzzy, c-format msgid "Bad bisect_write argument: %s" msgstr "Paràmetre bisect_write incorrecte: $state" -#: builtin/bisect--helper.c:220 +#: builtin/bisect--helper.c:221 #, fuzzy, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "no es pot canviar el significat del terme «%s»" -#: builtin/bisect--helper.c:232 +#: builtin/bisect--helper.c:233 #, fuzzy, c-format msgid "couldn't open the file '%s'" msgstr "no s'ha pogut crear el fitxer «%s»" -#: builtin/bisect--helper.c:258 +#: builtin/bisect--helper.c:259 #, fuzzy, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "" "Ordre no vàlida: actualment esteu en una bisecció $TERM_BAD/$TERM_GOOD." -#: builtin/bisect--helper.c:285 +#: builtin/bisect--helper.c:286 #, fuzzy, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -9154,7 +9707,7 @@ msgstr "" "Cal donar-me almenys una revisió $bad_syn i una $good_syn.\n" "(Podeu usar \"git bisect $bad_syn\" i \"git bisect $good_syn\" per això.)" -#: builtin/bisect--helper.c:289 +#: builtin/bisect--helper.c:290 #, fuzzy, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -9165,7 +9718,7 @@ msgstr "" "Després cal donar-me almenys una revisió $good_syn i una $bad_syn.\n" "(Podeu usar \"git bisect $bad_syn\" i \"git bisect $good_syn\" per això.)" -#: builtin/bisect--helper.c:321 +#: builtin/bisect--helper.c:322 #, fuzzy, c-format msgid "bisecting only with a %s commit" msgstr "Advertència: bisecant amb només comissió $TERM_BAD." @@ -9174,22 +9727,22 @@ msgstr "Advertència: bisecant amb només comissió $TERM_BAD." #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:329 +#: builtin/bisect--helper.c:330 msgid "Are you sure [Y/n]? " msgstr "N'esteu segur [Y/n]? " -#: builtin/bisect--helper.c:376 +#: builtin/bisect--helper.c:377 msgid "no terms defined" msgstr "cap terme definit" -#: builtin/bisect--helper.c:379 +#: builtin/bisect--helper.c:380 #, c-format msgid "" "Your current terms are %s for the old state\n" "and %s for the new state.\n" msgstr "" -#: builtin/bisect--helper.c:389 +#: builtin/bisect--helper.c:390 #, fuzzy, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -9198,288 +9751,284 @@ msgstr "" "paràmetre no vàlid $arg per a 'git bisect terms'.\n" "Les opcions admeses són: --term-good|--term-old i --term-bad|--term-new." -#: builtin/bisect--helper.c:475 +#: builtin/bisect--helper.c:476 #, fuzzy, c-format msgid "unrecognized option: '%s'" msgstr "posició no reconeguda:%s" -#: builtin/bisect--helper.c:479 +#: builtin/bisect--helper.c:480 #, fuzzy, c-format msgid "'%s' does not appear to be a valid revision" msgstr "'$arg' no sembla una revisió vàlida" -#: builtin/bisect--helper.c:511 +#: builtin/bisect--helper.c:512 #, fuzzy msgid "bad HEAD - I need a HEAD" msgstr "HEAD incorrecte - Cal un HEAD" -#: builtin/bisect--helper.c:526 +#: builtin/bisect--helper.c:527 #, fuzzy, c-format msgid "checking out '%s' failed. Try 'git bisect start '." msgstr "" "L'agafament de '$start_head' ha fallat. Proveu 'git bisect reset '." -#: builtin/bisect--helper.c:547 +#: builtin/bisect--helper.c:548 msgid "won't bisect on cg-seek'ed tree" msgstr "no es bisecarà en un arbre en el qual s'ha fet cg-seek" -#: builtin/bisect--helper.c:550 +#: builtin/bisect--helper.c:551 #, fuzzy msgid "bad HEAD - strange symbolic ref" msgstr "HEAD incorrecte - referència simbòlica estranya" -#: builtin/bisect--helper.c:574 +#: builtin/bisect--helper.c:575 #, fuzzy, c-format msgid "invalid ref: '%s'" msgstr "fitxer no vàlid: «%s»" -#: builtin/bisect--helper.c:630 +#: builtin/bisect--helper.c:631 msgid "perform 'git bisect next'" msgstr "realitza 'git bisect next'" -#: builtin/bisect--helper.c:632 +#: builtin/bisect--helper.c:633 msgid "write the terms to .git/BISECT_TERMS" msgstr "escriu els termes a .git/BISECT_TERMS" -#: builtin/bisect--helper.c:634 +#: builtin/bisect--helper.c:635 msgid "cleanup the bisection state" msgstr "neteja l'estat de la bisecció" -#: builtin/bisect--helper.c:636 +#: builtin/bisect--helper.c:637 msgid "check for expected revs" msgstr "comprova les revisions esperades" -#: builtin/bisect--helper.c:638 +#: builtin/bisect--helper.c:639 #, fuzzy msgid "reset the bisection state" msgstr "neteja l'estat de la bisecció" -#: builtin/bisect--helper.c:640 +#: builtin/bisect--helper.c:641 #, fuzzy msgid "write out the bisection state in BISECT_LOG" msgstr "neteja l'estat de la bisecció" -#: builtin/bisect--helper.c:642 +#: builtin/bisect--helper.c:643 #, fuzzy msgid "check and set terms in a bisection state" msgstr "neteja l'estat de la bisecció" -#: builtin/bisect--helper.c:644 +#: builtin/bisect--helper.c:645 msgid "check whether bad or good terms exist" msgstr "" -#: builtin/bisect--helper.c:646 +#: builtin/bisect--helper.c:647 #, fuzzy msgid "print out the bisect terms" msgstr "imprimeix només les etiquetes de l'objecte" -#: builtin/bisect--helper.c:648 +#: builtin/bisect--helper.c:649 msgid "start the bisect session" msgstr "" -#: builtin/bisect--helper.c:650 +#: builtin/bisect--helper.c:651 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "actualitza BISECT_HEAD en lloc d'agafar la comissió actual" -#: builtin/bisect--helper.c:652 +#: builtin/bisect--helper.c:653 msgid "no log for BISECT_WRITE" msgstr "" -#: builtin/bisect--helper.c:669 +#: builtin/bisect--helper.c:670 msgid "--write-terms requires two arguments" msgstr "--write-terms requereix dos paràmetres" -#: builtin/bisect--helper.c:673 +#: builtin/bisect--helper.c:674 msgid "--bisect-clean-state requires no arguments" msgstr "--bisect-clean-state no accepta paràmetres" -#: builtin/bisect--helper.c:680 +#: builtin/bisect--helper.c:681 #, fuzzy msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-clean-state no accepta paràmetres" -#: builtin/bisect--helper.c:684 +#: builtin/bisect--helper.c:685 #, fuzzy msgid "--bisect-write requires either 4 or 5 arguments" msgstr "--bisect-clean-state no accepta paràmetres" -#: builtin/bisect--helper.c:690 +#: builtin/bisect--helper.c:691 #, fuzzy msgid "--check-and-set-terms requires 3 arguments" msgstr "--bisect-clean-state no accepta paràmetres" -#: builtin/bisect--helper.c:696 +#: builtin/bisect--helper.c:697 #, fuzzy msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-clean-state no accepta paràmetres" -#: builtin/bisect--helper.c:702 +#: builtin/bisect--helper.c:703 #, fuzzy msgid "--bisect-terms requires 0 or 1 argument" msgstr "--write-terms requereix dos paràmetres" -#: builtin/blame.c:32 +#: builtin/blame.c:31 msgid "git blame [] [] [] [--] " msgstr "git blame [] [] [] [--] fitxer" -#: builtin/blame.c:37 +#: builtin/blame.c:36 msgid " are documented in git-rev-list(1)" msgstr "es documenten les en git-rev-list(1)" -#: builtin/blame.c:410 +#: builtin/blame.c:409 #, fuzzy, c-format msgid "expecting a color: %s" msgstr "respecta els colors del format" -#: builtin/blame.c:417 +#: builtin/blame.c:416 msgid "must end with a color" msgstr "" -#: builtin/blame.c:730 +#: builtin/blame.c:729 #, fuzzy, c-format msgid "invalid color '%s' in color.blame.repeatedLines" msgstr "ignora el color no vàlid «%.*s» en log.graphColors" -#: builtin/blame.c:748 +#: builtin/blame.c:747 #, fuzzy msgid "invalid value for blame.coloring" msgstr "valor no vàlid per a --missing" -#: builtin/blame.c:823 +#: builtin/blame.c:822 #, fuzzy, c-format msgid "cannot find revision %s to ignore" msgstr "no s'ha pogut resoldre la revisió: %s" -#: builtin/blame.c:845 +#: builtin/blame.c:844 msgid "Show blame entries as we find them, incrementally" msgstr "Mostra les entrades «blame» mentre les trobem, incrementalment" -#: builtin/blame.c:846 +#: builtin/blame.c:845 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" "Mostra un SHA-1 en blanc per les comissions de frontera (Per defecte: " "desactivat)" -#: builtin/blame.c:847 +#: builtin/blame.c:846 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" "No tractis les comissions d'arrel com a límits (Per defecte: desactivat)" -#: builtin/blame.c:848 +#: builtin/blame.c:847 msgid "Show work cost statistics" msgstr "Mostra les estadístiques de preu de treball" -#: builtin/blame.c:849 +#: builtin/blame.c:848 msgid "Force progress reporting" msgstr "Força l'informe de progrés" -#: builtin/blame.c:850 +#: builtin/blame.c:849 msgid "Show output score for blame entries" msgstr "Mostra la puntuació de sortida de les entrades «blame»" -#: builtin/blame.c:851 +#: builtin/blame.c:850 msgid "Show original filename (Default: auto)" msgstr "Mostra el nom de fitxer original (Per defecte: automàtic)" -#: builtin/blame.c:852 +#: builtin/blame.c:851 msgid "Show original linenumber (Default: off)" msgstr "Mostra el número de línia original (Per defecte: desactivat)" -#: builtin/blame.c:853 +#: builtin/blame.c:852 msgid "Show in a format designed for machine consumption" msgstr "Presenta en un format dissenyat per consumpció per màquina" -#: builtin/blame.c:854 +#: builtin/blame.c:853 msgid "Show porcelain format with per-line commit information" msgstr "Mostra el format de porcellana amb informació de comissió per línia" -#: builtin/blame.c:855 +#: builtin/blame.c:854 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" "Usa el mateix mode de sortida que git-annotate (Per defecte: desactivat)" -#: builtin/blame.c:856 +#: builtin/blame.c:855 msgid "Show raw timestamp (Default: off)" msgstr "Mostra la marca de temps crua (Per defecte: desactivat)" -#: builtin/blame.c:857 +#: builtin/blame.c:856 msgid "Show long commit SHA1 (Default: off)" msgstr "Mostra l'SHA1 de comissió llarg (Per defecte: desactivat)" -#: builtin/blame.c:858 +#: builtin/blame.c:857 msgid "Suppress author name and timestamp (Default: off)" msgstr "Omet el nom d'autor i la marca de temps (Per defecte: desactivat)" -#: builtin/blame.c:859 +#: builtin/blame.c:858 msgid "Show author email instead of name (Default: off)" msgstr "" "Mostra l'adreça electrònica de l'autor en lloc del nom (Per defecte: " "desactivat)" -#: builtin/blame.c:860 +#: builtin/blame.c:859 msgid "Ignore whitespace differences" msgstr "Ignora les diferències d'espai en blanc" -#: builtin/blame.c:861 builtin/log.c:1646 +#: builtin/blame.c:860 builtin/log.c:1702 msgid "rev" msgstr "rev" -#: builtin/blame.c:861 +#: builtin/blame.c:860 #, fuzzy msgid "Ignore when blaming" msgstr "ignora l'índex en comprovar" -#: builtin/blame.c:862 +#: builtin/blame.c:861 #, fuzzy msgid "Ignore revisions from " msgstr "llegiu el missatge des d'un fitxer" -#: builtin/blame.c:863 +#: builtin/blame.c:862 msgid "color redundant metadata from previous line differently" msgstr "" -#: builtin/blame.c:864 +#: builtin/blame.c:863 msgid "color lines by age" msgstr "" -#: builtin/blame.c:871 -msgid "Use an experimental heuristic to improve diffs" -msgstr "Usa un heurístic experimental per a millorar les diferències" - -#: builtin/blame.c:873 +#: builtin/blame.c:864 msgid "Spend extra cycles to find better match" msgstr "Gasta cicles extres per a trobar una coincidència millor" -#: builtin/blame.c:874 +#: builtin/blame.c:865 msgid "Use revisions from instead of calling git-rev-list" msgstr "Usa les revisions de en lloc d'invocar git-rev-list" -#: builtin/blame.c:875 +#: builtin/blame.c:866 msgid "Use 's contents as the final image" msgstr "Usa els continguts de com a la imatge final" -#: builtin/blame.c:876 builtin/blame.c:877 +#: builtin/blame.c:867 builtin/blame.c:868 msgid "score" msgstr "puntuació" -#: builtin/blame.c:876 +#: builtin/blame.c:867 msgid "Find line copies within and across files" msgstr "Troba còpies de línia dins i a través dels fitxers" -#: builtin/blame.c:877 +#: builtin/blame.c:868 msgid "Find line movements within and across files" msgstr "Troba moviments de línia dins i a través dels fitxers" -#: builtin/blame.c:878 +#: builtin/blame.c:869 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:878 +#: builtin/blame.c:869 msgid "Process only line range n,m, counting from 1" msgstr "Processa només el rang de línies n,m, comptant des d'1" -#: builtin/blame.c:929 +#: builtin/blame.c:921 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" "no es pot usar --progress amb els formats --incremental o de porcellana" @@ -9492,18 +10041,18 @@ msgstr "" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:980 +#: builtin/blame.c:972 msgid "4 years, 11 months ago" msgstr "fa 4 anys i 11 mesos" -#: builtin/blame.c:1087 +#: builtin/blame.c:1079 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "el fitxer %s té només %lu línia" msgstr[1] "el fitxer %s té només %lu línies" -#: builtin/blame.c:1133 +#: builtin/blame.c:1125 msgid "Blaming lines" msgstr "S'està fent un «blame»" @@ -9719,7 +10268,7 @@ msgstr "configura el mode de seguiment (vegeu git-pull(1))" msgid "do not use" msgstr "no usar" -#: builtin/branch.c:626 builtin/rebase.c:485 +#: builtin/branch.c:626 builtin/rebase.c:505 msgid "upstream" msgstr "font" @@ -9728,7 +10277,8 @@ msgid "change the upstream info" msgstr "canvia la informació de font" #: builtin/branch.c:627 -msgid "Unset the upstream info" +#, fuzzy +msgid "unset the upstream info" msgstr "Desassigna la informació de font" #: builtin/branch.c:628 @@ -9827,11 +10377,11 @@ msgid "sorting and filtering are case insensitive" msgstr "l'ordenació i el filtratge distingeixen entre majúscules i minúscules" #: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438 -#: builtin/verify-tag.c:39 +#: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "format a usar en la sortida" -#: builtin/branch.c:684 builtin/clone.c:761 +#: builtin/branch.c:684 builtin/clone.c:784 msgid "HEAD not found below refs/heads!" msgstr "HEAD no trobat sota refs/heads!" @@ -9920,20 +10470,68 @@ msgstr "" "L'opció --set-upstream ja no està suportada. Useu en comptes --track o --set-" "upstream-to." -#: builtin/bundle.c:45 -#, c-format -msgid "%s is okay\n" -msgstr "%s està bé\n" +#: builtin/bundle.c:15 builtin/bundle.c:23 +#, fuzzy +msgid "git bundle create [] " +msgstr "git remote add [] " + +#: builtin/bundle.c:16 builtin/bundle.c:28 +#, fuzzy +msgid "git bundle verify [] " +msgstr "git rm [] [--] ..." + +#: builtin/bundle.c:17 builtin/bundle.c:33 +msgid "git bundle list-heads [...]" +msgstr "" + +#: builtin/bundle.c:18 builtin/bundle.c:38 +msgid "git bundle unbundle [...]" +msgstr "" + +#: builtin/bundle.c:66 builtin/pack-objects.c:3228 +msgid "do not show progress meter" +msgstr "no mostris l'indicador de progrés" -#: builtin/bundle.c:58 +#: builtin/bundle.c:68 builtin/pack-objects.c:3230 +msgid "show progress meter" +msgstr "mostra l'indicador de progrés" + +#: builtin/bundle.c:70 builtin/pack-objects.c:3232 +msgid "show progress meter during object writing phase" +msgstr "mostra l'indicador de progrés durant la fase d'escriptura d'objectes" + +#: builtin/bundle.c:73 builtin/pack-objects.c:3235 +msgid "similar to --all-progress when progress meter is shown" +msgstr "similar a --all-progress quan l'indicador de progrés es mostra" + +#: builtin/bundle.c:93 msgid "Need a repository to create a bundle." msgstr "Cal un dipòsit per a fer un farcell." -#: builtin/bundle.c:62 +#: builtin/bundle.c:104 +#, fuzzy +msgid "do not show bundle details" +msgstr "no mostris les etiquetes pelades" + +#: builtin/bundle.c:119 +#, c-format +msgid "%s is okay\n" +msgstr "%s està bé\n" + +#: builtin/bundle.c:160 msgid "Need a repository to unbundle." msgstr "Cal un dipòsit per a desfer un farcell." -#: builtin/cat-file.c:594 +#: builtin/bundle.c:168 builtin/remote.c:1609 +msgid "be verbose; must be placed before a subcommand" +msgstr "sigues detallat; s'ha de col·locar abans d'un subordre" + +#: builtin/bundle.c:190 builtin/remote.c:1640 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "Subordre desconeguda: %s" + +#: builtin/cat-file.c:595 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | | --textconv | --filters) [--path=] " @@ -9941,7 +10539,7 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | | --textconv | --filters [--path=]) " -#: builtin/cat-file.c:595 +#: builtin/cat-file.c:596 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" @@ -9949,75 +10547,75 @@ msgstr "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" -#: builtin/cat-file.c:616 +#: builtin/cat-file.c:617 #, fuzzy msgid "only one batch option may be specified" msgstr "Cap nom de branca especificat" -#: builtin/cat-file.c:634 +#: builtin/cat-file.c:635 msgid " can be one of: blob, tree, commit, tag" msgstr " pot ser un de: blob, tree, commit, tag" -#: builtin/cat-file.c:635 +#: builtin/cat-file.c:636 msgid "show object type" msgstr "mostra el tipus de l'objecte" -#: builtin/cat-file.c:636 +#: builtin/cat-file.c:637 msgid "show object size" msgstr "mostra la mida de l'objecte" -#: builtin/cat-file.c:638 +#: builtin/cat-file.c:639 msgid "exit with zero when there's no error" msgstr "surt amb zero quan no hi ha error" -#: builtin/cat-file.c:639 +#: builtin/cat-file.c:640 msgid "pretty-print object's content" msgstr "imprimeix bellament el contingut de l'objecte" -#: builtin/cat-file.c:641 +#: builtin/cat-file.c:642 msgid "for blob objects, run textconv on object's content" msgstr "en els objectes de blob, executa textconv en el contingut de l'objecte" -#: builtin/cat-file.c:643 +#: builtin/cat-file.c:644 msgid "for blob objects, run filters on object's content" msgstr "" "en els objectes de blob, executa els filtres en el contingut de l'objecte" -#: builtin/cat-file.c:644 git-submodule.sh:936 +#: builtin/cat-file.c:645 git-submodule.sh:992 msgid "blob" msgstr "blob" -#: builtin/cat-file.c:645 +#: builtin/cat-file.c:646 msgid "use a specific path for --textconv/--filters" msgstr "usa un camí específic per a --textconv/--filters" -#: builtin/cat-file.c:647 +#: builtin/cat-file.c:648 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "permet que -s i -t funcionin amb objectes trencats/malmesos" -#: builtin/cat-file.c:648 +#: builtin/cat-file.c:649 msgid "buffer --batch output" msgstr "posa la sortida de --batch en memòria intermèdia" -#: builtin/cat-file.c:650 +#: builtin/cat-file.c:651 msgid "show info and content of objects fed from the standard input" msgstr "" "mostra la informació i contingut dels objectes rebuts de l'entrada estàndard" -#: builtin/cat-file.c:654 +#: builtin/cat-file.c:655 msgid "show info about objects fed from the standard input" msgstr "mostra informació sobre els objectes rebuts de l'entrada estàndard" -#: builtin/cat-file.c:658 +#: builtin/cat-file.c:659 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" "segueix els enllaços simbòlics en l'arbre (s'usa amb --batch o --batch-check)" -#: builtin/cat-file.c:660 +#: builtin/cat-file.c:661 msgid "show all objects with --batch or --batch-check" msgstr "mostra tots els objectes amb --batch o --batch-check" -#: builtin/cat-file.c:662 +#: builtin/cat-file.c:663 msgid "do not order --batch-all-objects output" msgstr "" @@ -10045,8 +10643,8 @@ msgstr "llegeix els noms de fitxer de stdin" msgid "terminate input and output records by a NUL character" msgstr "acaba els registres d'entrada i de sortida amb un caràcter NUL" -#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538 -#: builtin/worktree.c:507 +#: builtin/check-ignore.c:21 builtin/checkout.c:1435 builtin/gc.c:537 +#: builtin/worktree.c:506 msgid "suppress progress reporting" msgstr "omet els informes de progrés" @@ -10137,9 +10735,9 @@ msgid "write the content to temporary files" msgstr "escriu el contingut a fitxers temporals" #: builtin/checkout-index.c:178 builtin/column.c:31 -#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376 -#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857 -#: builtin/worktree.c:680 +#: builtin/submodule--helper.c:1385 builtin/submodule--helper.c:1388 +#: builtin/submodule--helper.c:1396 builtin/submodule--helper.c:1882 +#: builtin/worktree.c:679 msgid "string" msgstr "cadena" @@ -10169,156 +10767,149 @@ msgstr "git checkout [] " msgid "git restore [] [--source=] ..." msgstr "git checkout [] [] -- ..." -#: builtin/checkout.c:172 builtin/checkout.c:211 +#: builtin/checkout.c:175 builtin/checkout.c:214 #, c-format msgid "path '%s' does not have our version" msgstr "el camí «%s» no té la nostra versió" -#: builtin/checkout.c:174 builtin/checkout.c:213 +#: builtin/checkout.c:177 builtin/checkout.c:216 #, c-format msgid "path '%s' does not have their version" msgstr "el camí «%s» no té la seva versió" -#: builtin/checkout.c:190 +#: builtin/checkout.c:193 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "el camí «%s» no té totes les versions necessàries" -#: builtin/checkout.c:240 +#: builtin/checkout.c:243 #, c-format msgid "path '%s' does not have necessary versions" msgstr "el camí «%s» no té les versions necessàries" -#: builtin/checkout.c:258 +#: builtin/checkout.c:261 #, c-format msgid "path '%s': cannot merge" msgstr "camí «%s»: no es pot fusionar" -#: builtin/checkout.c:274 +#: builtin/checkout.c:277 #, c-format msgid "Unable to add merge result for '%s'" msgstr "No s'ha pogut afegir el resultat de fusió per a «%s»" -#: builtin/checkout.c:374 +#: builtin/checkout.c:377 #, fuzzy, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "etiqueta de fusió incorrecta en la comissió «%s»" msgstr[1] "etiqueta de fusió incorrecta en la comissió «%s»" -#: builtin/checkout.c:379 +#: builtin/checkout.c:382 #, fuzzy, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "actualitzat %d camí\n" msgstr[1] "actualitzats %d camins\n" -#: builtin/checkout.c:386 +#: builtin/checkout.c:389 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "S'ha actualitzat un camí des de l'índex" msgstr[1] "S'ha actualitzat %d camins des de l'índex" -#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415 -#: builtin/checkout.c:419 +#: builtin/checkout.c:412 builtin/checkout.c:415 builtin/checkout.c:418 +#: builtin/checkout.c:422 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "«%s» no es pot usar amb actualització de camins" -#: builtin/checkout.c:422 builtin/checkout.c:425 +#: builtin/checkout.c:425 builtin/checkout.c:428 #, c-format msgid "'%s' cannot be used with %s" msgstr "«%s» no es pot usar amb %s" -#: builtin/checkout.c:429 +#: builtin/checkout.c:432 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "No es poden actualitzar els camins i canviar a la branca «%s» a la vegada." -#: builtin/checkout.c:433 +#: builtin/checkout.c:436 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "" -#: builtin/checkout.c:437 +#: builtin/checkout.c:440 #, fuzzy, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "«%s» no es pot usar amb «%s»" -#: builtin/checkout.c:442 builtin/checkout.c:447 +#: builtin/checkout.c:445 builtin/checkout.c:450 #, fuzzy, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "%s: %s no es pot usar amb %s" -#: builtin/checkout.c:506 builtin/checkout.c:513 +#: builtin/checkout.c:509 builtin/checkout.c:516 #, c-format msgid "path '%s' is unmerged" msgstr "el camí «%s» està sense fusionar" -#: builtin/checkout.c:679 +#: builtin/checkout.c:682 builtin/sparse-checkout.c:82 msgid "you need to resolve your current index first" msgstr "heu de primer resoldre el vostre índex actual" -#: builtin/checkout.c:729 +#: builtin/checkout.c:732 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" "%s" msgstr "" -#: builtin/checkout.c:736 -#, fuzzy, c-format -msgid "staged changes in the following files may be lost: %s" -msgstr "" -"Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n" -"%%s" - -#: builtin/checkout.c:833 +#: builtin/checkout.c:835 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "No es pot fer reflog per a «%s»: %s\n" -#: builtin/checkout.c:875 +#: builtin/checkout.c:877 msgid "HEAD is now at" msgstr "HEAD ara és a" -#: builtin/checkout.c:879 builtin/clone.c:714 +#: builtin/checkout.c:881 builtin/clone.c:716 msgid "unable to update HEAD" msgstr "no s'ha pogut actualitzar HEAD" -#: builtin/checkout.c:883 +#: builtin/checkout.c:885 #, c-format msgid "Reset branch '%s'\n" msgstr "Restableix la branca «%s»\n" -#: builtin/checkout.c:886 +#: builtin/checkout.c:888 #, c-format msgid "Already on '%s'\n" msgstr "Ja en «%s»\n" -#: builtin/checkout.c:890 +#: builtin/checkout.c:892 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "S'ha canviat i restablert a la branca «%s»\n" -#: builtin/checkout.c:892 builtin/checkout.c:1289 +#: builtin/checkout.c:894 builtin/checkout.c:1291 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "S'ha canviat a la branca nova «%s»\n" -#: builtin/checkout.c:894 +#: builtin/checkout.c:896 #, c-format msgid "Switched to branch '%s'\n" msgstr "S'ha canviat a la branca «%s»\n" -#: builtin/checkout.c:945 +#: builtin/checkout.c:947 #, c-format msgid " ... and %d more.\n" msgstr " ... i %d més.\n" -#: builtin/checkout.c:951 +#: builtin/checkout.c:953 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -10341,7 +10932,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:970 +#: builtin/checkout.c:972 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -10368,217 +10959,213 @@ msgstr[1] "" " git branch %s\n" "\n" -#: builtin/checkout.c:1005 +#: builtin/checkout.c:1007 msgid "internal error in revision walk" msgstr "error intern en el passeig per revisions" -#: builtin/checkout.c:1009 +#: builtin/checkout.c:1011 msgid "Previous HEAD position was" msgstr "La posició de HEAD anterior era" -#: builtin/checkout.c:1049 builtin/checkout.c:1284 +#: builtin/checkout.c:1051 builtin/checkout.c:1286 msgid "You are on a branch yet to be born" msgstr "Sou en una branca que encara ha de néixer" -#: builtin/checkout.c:1176 +#: builtin/checkout.c:1178 #, fuzzy msgid "only one reference expected" msgstr "s'esperava només una referència, s'han donat %d." -#: builtin/checkout.c:1193 +#: builtin/checkout.c:1195 #, c-format msgid "only one reference expected, %d given." msgstr "s'esperava només una referència, s'han donat %d." -#: builtin/checkout.c:1230 +#: builtin/checkout.c:1232 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" "Please use -- (and optionally --no-guess) to disambiguate" msgstr "" -#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456 +#: builtin/checkout.c:1245 builtin/worktree.c:290 builtin/worktree.c:455 #, c-format msgid "invalid reference: %s" msgstr "referència no vàlida: %s" -#: builtin/checkout.c:1256 builtin/checkout.c:1618 +#: builtin/checkout.c:1258 builtin/checkout.c:1622 #, c-format msgid "reference is not a tree: %s" msgstr "la referència no és un arbre: %s" -#: builtin/checkout.c:1303 +#: builtin/checkout.c:1305 #, fuzzy, c-format msgid "a branch is expected, got tag '%s'" msgstr "no es pot llegir l'objecte %s «%s»" -#: builtin/checkout.c:1305 +#: builtin/checkout.c:1307 #, fuzzy, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "" "La branca «%s» està configurada per a seguir la branca remota «%s» de «%s»." -#: builtin/checkout.c:1306 builtin/checkout.c:1314 +#: builtin/checkout.c:1308 builtin/checkout.c:1316 #, fuzzy, c-format msgid "a branch is expected, got '%s'" msgstr "s'esperava shallow/unshallow, s'ha rebut %s" -#: builtin/checkout.c:1309 +#: builtin/checkout.c:1311 #, fuzzy, c-format msgid "a branch is expected, got commit '%s'" msgstr "La vostra branca està al dia amb «%s».\n" -#: builtin/checkout.c:1325 +#: builtin/checkout.c:1327 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1329 +#: builtin/checkout.c:1331 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1333 +#: builtin/checkout.c:1335 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1337 +#: builtin/checkout.c:1339 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1341 +#: builtin/checkout.c:1343 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1345 +#: builtin/checkout.c:1347 #, fuzzy msgid "you are switching branch while bisecting" msgstr "Actualment esteu bisecant." -#: builtin/checkout.c:1352 +#: builtin/checkout.c:1354 msgid "paths cannot be used with switching branches" msgstr "els camins no es poden usar amb canvi de branca" -#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363 +#: builtin/checkout.c:1357 builtin/checkout.c:1361 builtin/checkout.c:1365 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "«%s» no es pot usar amb canvi de branca" -#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373 -#: builtin/checkout.c:1378 builtin/checkout.c:1383 +#: builtin/checkout.c:1369 builtin/checkout.c:1372 builtin/checkout.c:1375 +#: builtin/checkout.c:1380 builtin/checkout.c:1385 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "«%s» no es pot usar amb «%s»" -#: builtin/checkout.c:1380 +#: builtin/checkout.c:1382 #, fuzzy, c-format msgid "'%s' cannot take " msgstr "«%s» no es pot usar amb actualització de camins" -#: builtin/checkout.c:1388 +#: builtin/checkout.c:1390 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "No es pot canviar la branca a la no comissió «%s»" -#: builtin/checkout.c:1395 +#: builtin/checkout.c:1397 #, fuzzy msgid "missing branch or commit argument" msgstr "Manca el nom de branca; proveu -b" -#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151 -#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575 +#: builtin/checkout.c:1439 builtin/clone.c:91 builtin/commit-graph.c:52 +#: builtin/commit-graph.c:113 builtin/fetch.c:167 builtin/merge.c:285 +#: builtin/multi-pack-index.c:27 builtin/pull.c:138 builtin/push.c:563 #: builtin/send-pack.c:174 msgid "force progress reporting" msgstr "força l'informe de progrés" -#: builtin/checkout.c:1438 +#: builtin/checkout.c:1440 msgid "perform a 3-way merge with the new branch" msgstr "realitza una fusió de 3 vies amb la branca nova" -#: builtin/checkout.c:1439 builtin/log.c:1634 parse-options.h:318 +#: builtin/checkout.c:1441 builtin/log.c:1690 parse-options.h:322 msgid "style" msgstr "estil" -#: builtin/checkout.c:1440 +#: builtin/checkout.c:1442 msgid "conflict style (merge or diff3)" msgstr "estil de conflicte (fusió o diff3)" -#: builtin/checkout.c:1452 builtin/worktree.c:504 +#: builtin/checkout.c:1454 builtin/worktree.c:503 msgid "detach HEAD at named commit" msgstr "separa HEAD a la comissió anomenada" -#: builtin/checkout.c:1453 +#: builtin/checkout.c:1455 msgid "set upstream info for new branch" msgstr "estableix la informació de font de la branca nova" -#: builtin/checkout.c:1455 +#: builtin/checkout.c:1457 msgid "force checkout (throw away local modifications)" msgstr "agafa a la força (descarta qualsevol modificació local)" -#: builtin/checkout.c:1457 +#: builtin/checkout.c:1459 msgid "new-branch" msgstr "branca-nova" -#: builtin/checkout.c:1457 +#: builtin/checkout.c:1459 msgid "new unparented branch" msgstr "branca òrfena nova" -#: builtin/checkout.c:1459 builtin/merge.c:288 +#: builtin/checkout.c:1461 builtin/merge.c:288 msgid "update ignored files (default)" msgstr "actualitza els fitxers ignorats (per defecte)" -#: builtin/checkout.c:1462 +#: builtin/checkout.c:1464 msgid "do not check if another worktree is holding the given ref" msgstr "no comprovis si altre arbre de treball té la referència donada" -#: builtin/checkout.c:1475 +#: builtin/checkout.c:1477 msgid "checkout our version for unmerged files" msgstr "agafa la versió nostra dels fitxers sense fusionar" -#: builtin/checkout.c:1478 +#: builtin/checkout.c:1480 msgid "checkout their version for unmerged files" msgstr "agafa la versió seva dels fitxers sense fusionar" -#: builtin/checkout.c:1482 +#: builtin/checkout.c:1484 msgid "do not limit pathspecs to sparse entries only" msgstr "no limitis les especificacions de camí només a entrades disperses" -#: builtin/checkout.c:1533 +#: builtin/checkout.c:1537 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B i --orphan són mútuament excloents" -#: builtin/checkout.c:1536 +#: builtin/checkout.c:1540 #, fuzzy msgid "-p and --overlay are mutually exclusive" msgstr "-n i -k són mútuament excloents." -#: builtin/checkout.c:1573 +#: builtin/checkout.c:1577 msgid "--track needs a branch name" msgstr "--track necessita un nom de branca" -#: builtin/checkout.c:1578 +#: builtin/checkout.c:1582 #, fuzzy msgid "missing branch name; try -b" msgstr "Manca el nom de branca; proveu -b" -#: builtin/checkout.c:1611 +#: builtin/checkout.c:1615 #, fuzzy, c-format msgid "could not resolve %s" msgstr "no s'ha pogut resoldre «%s»" -#: builtin/checkout.c:1623 -#, fuzzy -msgid "you must specify path(s) to restore" -msgstr "Heu d'especificar un directori." - #: builtin/checkout.c:1631 msgid "invalid path specification" msgstr "especificació de camí no vàlida" @@ -10595,7 +11182,17 @@ msgstr "" msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach no accepta un paràmetre de camí «%s»" -#: builtin/checkout.c:1646 +#: builtin/checkout.c:1651 +#, fuzzy +msgid "--pathspec-from-file is incompatible with --detach" +msgstr "--first-parent és incompatible amb --bisect" + +#: builtin/checkout.c:1654 builtin/reset.c:324 +#, fuzzy +msgid "--pathspec-from-file is incompatible with --patch" +msgstr "--first-parent és incompatible amb --bisect" + +#: builtin/checkout.c:1665 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -10603,7 +11200,12 @@ msgstr "" "git checkout: --ours/--theirs, --force i --merge són incompatibles en\n" "agafar de l'índex." -#: builtin/checkout.c:1666 +#: builtin/checkout.c:1670 +#, fuzzy +msgid "you must specify path(s) to restore" +msgstr "Heu d'especificar un directori." + +#: builtin/checkout.c:1689 #, c-format msgid "" "'%s' matched more than one remote tracking branch.\n" @@ -10620,75 +11222,75 @@ msgid "" "checkout.defaultRemote=origin in your config." msgstr "" -#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733 -#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169 -#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502 +#: builtin/checkout.c:1714 builtin/checkout.c:1716 builtin/checkout.c:1765 +#: builtin/checkout.c:1767 builtin/clone.c:121 builtin/remote.c:169 +#: builtin/remote.c:171 builtin/worktree.c:499 builtin/worktree.c:501 msgid "branch" msgstr "branca" -#: builtin/checkout.c:1692 +#: builtin/checkout.c:1715 msgid "create and checkout a new branch" msgstr "crea i agafa una branca nova" -#: builtin/checkout.c:1694 +#: builtin/checkout.c:1717 msgid "create/reset and checkout a branch" msgstr "crea/restableix i agafa una branca" -#: builtin/checkout.c:1695 +#: builtin/checkout.c:1718 msgid "create reflog for new branch" msgstr "crea un registre de referència per a la branca nova" -#: builtin/checkout.c:1697 +#: builtin/checkout.c:1720 #, fuzzy msgid "second guess 'git checkout ' (default)" msgstr "dubta 'git checkout '" -#: builtin/checkout.c:1698 +#: builtin/checkout.c:1721 #, fuzzy msgid "use overlay mode (default)" msgstr "poda les referències soltes (per defecte)" -#: builtin/checkout.c:1734 +#: builtin/checkout.c:1766 #, fuzzy msgid "create and switch to a new branch" msgstr "crea i agafa una branca nova" -#: builtin/checkout.c:1736 +#: builtin/checkout.c:1768 #, fuzzy msgid "create/reset and switch to a branch" msgstr "crea/restableix i agafa una branca" -#: builtin/checkout.c:1738 +#: builtin/checkout.c:1770 #, fuzzy msgid "second guess 'git switch '" msgstr "dubta 'git checkout '" -#: builtin/checkout.c:1740 +#: builtin/checkout.c:1772 #, fuzzy msgid "throw away local modifications" msgstr "agafa a la força (descarta qualsevol modificació local)" -#: builtin/checkout.c:1772 +#: builtin/checkout.c:1804 #, fuzzy -msgid "where the checkout from" +msgid "which tree-ish to checkout from" msgstr "llegeix l'objecte des de stdin" -#: builtin/checkout.c:1774 +#: builtin/checkout.c:1806 #, fuzzy msgid "restore the index" msgstr "S'ha produït un error en llegir l'índex" -#: builtin/checkout.c:1776 +#: builtin/checkout.c:1808 #, fuzzy msgid "restore the working tree (default)" msgstr "Mostra l'estat de l'arbre de treball" -#: builtin/checkout.c:1778 +#: builtin/checkout.c:1810 #, fuzzy msgid "ignore unmerged entries" msgstr "s'està ignorant %s no fusionat\n" -#: builtin/checkout.c:1779 +#: builtin/checkout.c:1811 msgid "use overlay mode" msgstr "" @@ -10728,7 +11330,7 @@ msgstr "s'ha produït un error en eliminar %s" msgid "could not lstat %s\n" msgstr "no s'ha pogut fer stat a %s" -#: builtin/clean.c:300 git-add--interactive.perl:593 +#: builtin/clean.c:301 git-add--interactive.perl:595 #, c-format msgid "" "Prompt help:\n" @@ -10741,7 +11343,7 @@ msgstr "" "foo - selecciona un ítem basat en un prefix únic\n" " - (buit) no seleccionis res\n" -#: builtin/clean.c:304 git-add--interactive.perl:602 +#: builtin/clean.c:305 git-add--interactive.perl:604 #, c-format msgid "" "Prompt help:\n" @@ -10762,38 +11364,33 @@ msgstr "" "* - tria tots els ítems\n" " - (buit) finalitza la selecció\n" -#: builtin/clean.c:520 git-add--interactive.perl:568 -#: git-add--interactive.perl:573 +#: builtin/clean.c:521 git-add--interactive.perl:570 +#: git-add--interactive.perl:575 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Perdó (%s)?\n" -#: builtin/clean.c:662 +#: builtin/clean.c:663 #, c-format msgid "Input ignore patterns>> " msgstr "Introduïu els patrons a ignorar>> " -#: builtin/clean.c:699 +#: builtin/clean.c:700 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "ADVERTÈNCIA: No es poden trobar ítems que coincideixin amb: %s" -#: builtin/clean.c:720 +#: builtin/clean.c:721 msgid "Select items to delete" msgstr "Selecciona els ítems a suprimir" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:761 +#: builtin/clean.c:762 #, c-format msgid "Remove %s [y/N]? " msgstr "Voleu eliminar %s [y/N]? " -#: builtin/clean.c:786 git-add--interactive.perl:1763 -#, c-format -msgid "Bye.\n" -msgstr "Adéu.\n" - -#: builtin/clean.c:794 +#: builtin/clean.c:795 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -10811,64 +11408,56 @@ msgstr "" "help - aquesta pantalla\n" "? - ajuda de selecció de l'avís" -#: builtin/clean.c:821 git-add--interactive.perl:1849 -msgid "*** Commands ***" -msgstr "*** Ordres ***" - -#: builtin/clean.c:822 git-add--interactive.perl:1846 -msgid "What now" -msgstr "I ara què" - -#: builtin/clean.c:830 +#: builtin/clean.c:831 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Eliminaria l'ítem següent:" msgstr[1] "Eliminaria els ítems següents:" -#: builtin/clean.c:846 +#: builtin/clean.c:847 msgid "No more files to clean, exiting." msgstr "No hi ha més fitxers a netejar; s'està sortint." -#: builtin/clean.c:908 +#: builtin/clean.c:909 msgid "do not print names of files removed" msgstr "no imprimeixis els noms dels fitxers eliminats" -#: builtin/clean.c:910 +#: builtin/clean.c:911 msgid "force" msgstr "força" -#: builtin/clean.c:911 +#: builtin/clean.c:912 msgid "interactive cleaning" msgstr "neteja interactiva" -#: builtin/clean.c:913 +#: builtin/clean.c:914 msgid "remove whole directories" msgstr "elimina directoris sencers" -#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548 -#: builtin/grep.c:899 builtin/log.c:186 builtin/log.c:188 -#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415 +#: builtin/clean.c:915 builtin/describe.c:548 builtin/describe.c:550 +#: builtin/grep.c:901 builtin/log.c:177 builtin/log.c:179 +#: builtin/ls-files.c:557 builtin/name-rev.c:464 builtin/name-rev.c:466 #: builtin/show-ref.c:179 msgid "pattern" msgstr "patró" -#: builtin/clean.c:915 +#: builtin/clean.c:916 msgid "add to ignore rules" msgstr "afegiu per a ignorar les regles" -#: builtin/clean.c:916 +#: builtin/clean.c:917 msgid "remove ignored files, too" msgstr "elimina els fitxers ignorats, també" -#: builtin/clean.c:918 +#: builtin/clean.c:919 msgid "remove only ignored files" msgstr "elimina només els fitxers ignorats" -#: builtin/clean.c:936 +#: builtin/clean.c:937 msgid "-x and -X cannot be used together" msgstr "-x i -X no es poden usar junts" -#: builtin/clean.c:940 +#: builtin/clean.c:941 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -10876,7 +11465,7 @@ msgstr "" "clean.requireForce està establerta en cert i ni -i, -n ni -f s'han indicat; " "refusant netejar" -#: builtin/clean.c:943 +#: builtin/clean.c:944 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -10884,7 +11473,7 @@ msgstr "" "clean.requireForce és per defecte cert i ni -i, -n ni -f s'han indicat; " "refusant netejar" -#: builtin/clone.c:46 +#: builtin/clone.c:45 msgid "git clone [] [--] []" msgstr "git clone [] [--] []" @@ -10932,18 +11521,18 @@ msgstr "directori-de-plantilla" msgid "directory from which templates will be used" msgstr "directori des del qual s'usaran les plantilles" -#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380 -#: builtin/submodule--helper.c:1860 +#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1392 +#: builtin/submodule--helper.c:1885 msgid "reference repository" msgstr "dipòsit de referència" -#: builtin/clone.c:118 builtin/submodule--helper.c:1382 -#: builtin/submodule--helper.c:1862 +#: builtin/clone.c:118 builtin/submodule--helper.c:1394 +#: builtin/submodule--helper.c:1887 msgid "use --reference only while cloning" msgstr "usa --reference només en clonar" #: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46 -#: builtin/pack-objects.c:3308 builtin/repack.c:330 +#: builtin/pack-objects.c:3294 builtin/repack.c:327 msgid "name" msgstr "nom" @@ -10959,8 +11548,8 @@ msgstr "agafa en lloc de la HEAD del remot" msgid "path to git-upload-pack on the remote" msgstr "camí a git-upload-pack en el remot" -#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838 -#: builtin/pull.c:226 +#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:840 +#: builtin/pull.c:227 msgid "depth" msgstr "profunditat" @@ -10968,7 +11557,7 @@ msgstr "profunditat" msgid "create a shallow clone of that depth" msgstr "crea un clon superficial de tal profunditat" -#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3297 +#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3283 msgid "time" msgstr "hora" @@ -10976,12 +11565,12 @@ msgstr "hora" msgid "create a shallow clone since a specific time" msgstr "crea un clon superficial des d'una hora específica" -#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179 -#: builtin/rebase.c:1395 +#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195 +#: builtin/rebase.c:1445 msgid "revision" msgstr "revisió" -#: builtin/clone.c:130 builtin/fetch.c:157 +#: builtin/clone.c:130 builtin/fetch.c:173 msgid "deepen history of shallow clone, excluding rev" msgstr "aprofundeix la història d'un clon superficial, excloent una revisió" @@ -11014,23 +11603,23 @@ msgstr "clau=valor" msgid "set config inside the new repository" msgstr "estableix la configuració dins del dipòsit nou" -#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 -#: builtin/push.c:585 builtin/send-pack.c:172 +#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76 +#: builtin/push.c:573 builtin/send-pack.c:172 msgid "server-specific" msgstr "específic al servidor" -#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 -#: builtin/push.c:585 builtin/send-pack.c:173 +#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76 +#: builtin/push.c:573 builtin/send-pack.c:173 msgid "option to transmit" msgstr "opció a transmetre" -#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239 -#: builtin/push.c:586 +#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:240 +#: builtin/push.c:574 msgid "use IPv4 addresses only" msgstr "usa només adreces IPv4" -#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242 -#: builtin/push.c:588 +#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:243 +#: builtin/push.c:576 msgid "use IPv6 addresses only" msgstr "usa només adreces IPv6" @@ -11039,7 +11628,11 @@ msgstr "usa només adreces IPv6" msgid "any cloned submodules will use their remote-tracking branch" msgstr "qualsevol submòdul clonat serà superficial" -#: builtin/clone.c:285 +#: builtin/clone.c:151 +msgid "initialize sparse-checkout file to include only files at root" +msgstr "" + +#: builtin/clone.c:287 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -11047,47 +11640,42 @@ msgstr "" "No s'ha pogut endevinar cap nom de directori.\n" "Especifiqueu un directori en la línia d'ordres" -#: builtin/clone.c:338 +#: builtin/clone.c:340 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: No s'ha pogut afegir un alternatiu per a «%s»: %s\n" -#: builtin/clone.c:411 +#: builtin/clone.c:413 #, c-format msgid "%s exists and is not a directory" msgstr "%s existeix i no és directori" -#: builtin/clone.c:428 +#: builtin/clone.c:430 #, fuzzy, c-format msgid "failed to start iterator over '%s'" msgstr "no s'ha pogut escriure a «%s»" -#: builtin/clone.c:453 -#, c-format -msgid "failed to unlink '%s'" -msgstr "s'ha produït un error en desenllaçar «%s»" - -#: builtin/clone.c:458 +#: builtin/clone.c:460 #, c-format msgid "failed to create link '%s'" msgstr "s'ha produït un error en crear l'enllaç «%s»" -#: builtin/clone.c:462 +#: builtin/clone.c:464 #, c-format msgid "failed to copy file to '%s'" msgstr "s'ha produït un error en copiar el fitxer a «%s»" -#: builtin/clone.c:467 +#: builtin/clone.c:469 #, fuzzy, c-format msgid "failed to iterate over '%s'" msgstr "s'ha produït un error en eliminar «%s»" -#: builtin/clone.c:492 +#: builtin/clone.c:494 #, c-format msgid "done.\n" msgstr "fet.\n" -#: builtin/clone.c:506 +#: builtin/clone.c:508 #, fuzzy msgid "" "Clone succeeded, but checkout failed.\n" @@ -11099,97 +11687,102 @@ msgstr "" "'git status' i tornar a intentar l'agafament amb\n" "'git checkout -f HEAD'\n" -#: builtin/clone.c:583 +#: builtin/clone.c:585 #, c-format msgid "Could not find remote branch %s to clone." msgstr "No s'ha pogut trobar la branca remota %s per a clonar." -#: builtin/clone.c:702 +#: builtin/clone.c:704 #, c-format msgid "unable to update %s" msgstr "no s'ha pogut actualitzar %s" #: builtin/clone.c:752 +#, fuzzy +msgid "failed to initialize sparse-checkout" +msgstr "s'ha produït un error en finalitzar «%s»" + +#: builtin/clone.c:775 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "la HEAD remot es refereix a una referència que no existeix; no s'ha pogut " "agafar.\n" -#: builtin/clone.c:783 +#: builtin/clone.c:806 msgid "unable to checkout working tree" msgstr "no s'ha pogut agafar l'arbre de treball" -#: builtin/clone.c:833 +#: builtin/clone.c:856 msgid "unable to write parameters to config file" msgstr "no s'han pogut escriure els paràmetres al fitxer de configuració" -#: builtin/clone.c:896 +#: builtin/clone.c:919 msgid "cannot repack to clean up" msgstr "no es pot reempaquetar per a netejar" -#: builtin/clone.c:898 +#: builtin/clone.c:921 msgid "cannot unlink temporary alternates file" msgstr "no es pot desenllaçar el fitxer d'alternatives temporal" -#: builtin/clone.c:938 builtin/receive-pack.c:1950 +#: builtin/clone.c:959 builtin/receive-pack.c:1948 msgid "Too many arguments." msgstr "Hi ha massa paràmetres." -#: builtin/clone.c:942 +#: builtin/clone.c:963 msgid "You must specify a repository to clone." msgstr "Heu d'especificar un dipòsit per a clonar." -#: builtin/clone.c:955 +#: builtin/clone.c:976 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "les opcions --bare i --origin %s són incompatibles." -#: builtin/clone.c:958 +#: builtin/clone.c:979 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare i --separate-git-dir són incompatibles." -#: builtin/clone.c:971 +#: builtin/clone.c:992 #, c-format msgid "repository '%s' does not exist" msgstr "el dipòsit «%s» no existeix" -#: builtin/clone.c:977 builtin/fetch.c:1653 +#: builtin/clone.c:998 builtin/fetch.c:1787 #, c-format msgid "depth %s is not a positive number" msgstr "la profunditat %s no és nombre positiu" -#: builtin/clone.c:987 +#: builtin/clone.c:1008 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "el camí destí «%s» ja existeix i no és un directori buit." -#: builtin/clone.c:997 +#: builtin/clone.c:1018 #, c-format msgid "working tree '%s' already exists." msgstr "l'arbre de treball «%s» ja existeix." -#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264 -#: builtin/worktree.c:303 builtin/worktree.c:335 +#: builtin/clone.c:1033 builtin/clone.c:1054 builtin/difftool.c:271 +#: builtin/log.c:1866 builtin/worktree.c:302 builtin/worktree.c:334 #, c-format msgid "could not create leading directories of '%s'" msgstr "no s'han pogut crear els directoris inicials de «%s»" -#: builtin/clone.c:1017 +#: builtin/clone.c:1038 #, c-format msgid "could not create work tree dir '%s'" msgstr "no s'ha pogut crear el directori d'arbre de treball «%s»" -#: builtin/clone.c:1037 +#: builtin/clone.c:1058 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "S'està clonant al dipòsit nu «%s»...\n" -#: builtin/clone.c:1039 +#: builtin/clone.c:1060 #, c-format msgid "Cloning into '%s'...\n" msgstr "S'està clonant a «%s»...\n" -#: builtin/clone.c:1063 +#: builtin/clone.c:1084 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -11197,38 +11790,38 @@ msgstr "" "clone --recursive no és compatible amb ambdós --reference i --reference-if-" "able" -#: builtin/clone.c:1124 +#: builtin/clone.c:1148 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth s'ignora en els clons locals; useu file:// en lloc d'això." -#: builtin/clone.c:1126 +#: builtin/clone.c:1150 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" "--shallow-since s'ignora en els clons locals; useu file:// en lloc d'això." -#: builtin/clone.c:1128 +#: builtin/clone.c:1152 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" "--shallow-exclude s'ignora en els clons locals; useu file:// en lloc d'això." -#: builtin/clone.c:1130 +#: builtin/clone.c:1154 msgid "--filter is ignored in local clones; use file:// instead." msgstr "--filter s'ignora en els clons locals; useu file:// en lloc d'això." -#: builtin/clone.c:1133 +#: builtin/clone.c:1157 msgid "source repository is shallow, ignoring --local" msgstr "el dipòsit font és superficial, s'està ignorant --local" -#: builtin/clone.c:1138 +#: builtin/clone.c:1162 msgid "--local is ignored" msgstr "--local s'ignora" -#: builtin/clone.c:1215 builtin/clone.c:1223 +#: builtin/clone.c:1237 builtin/clone.c:1245 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "La branca remota %s no es troba en la font %s" -#: builtin/clone.c:1226 +#: builtin/clone.c:1248 msgid "You appear to have cloned an empty repository." msgstr "Sembla que heu clonat un dipòsit buit." @@ -11275,7 +11868,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "suprimeix les referències reemplaçades" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:542 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526 #, fuzzy, c-format msgid "not a valid object name %s" msgstr "no és un nom d'objecte vàlid: %s" @@ -11305,13 +11898,13 @@ msgstr "pare" msgid "id of a parent commit object" msgstr "s'ha produït un error en escriure l'objecte de comissió" -#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460 +#: builtin/commit-tree.c:114 builtin/commit.c:1496 builtin/merge.c:270 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1469 #: builtin/tag.c:412 msgid "message" msgstr "missatge" -#: builtin/commit-tree.c:115 builtin/commit.c:1500 +#: builtin/commit-tree.c:115 builtin/commit.c:1496 msgid "commit message" msgstr "missatge de comissió" @@ -11320,8 +11913,8 @@ msgstr "missatge de comissió" msgid "read commit log message from file" msgstr "llegiu el missatge des d'un fitxer" -#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287 -#: builtin/pull.c:194 builtin/revert.c:118 +#: builtin/commit-tree.c:121 builtin/commit.c:1508 builtin/merge.c:287 +#: builtin/pull.c:195 builtin/revert.c:118 msgid "GPG sign commit" msgstr "signa la comissió amb GPG" @@ -11390,57 +11983,66 @@ msgstr "" msgid "failed to unpack HEAD tree object" msgstr "s'ha produït un error en desempaquetar l'objecte d'arbre HEAD" -#: builtin/commit.c:356 +#: builtin/commit.c:351 +#, fuzzy +msgid "--pathspec-from-file with -a does not make sense" +msgstr "-a no té sentit amb camins." + +#: builtin/commit.c:364 +msgid "No paths with --include/--only does not make sense." +msgstr "--include/--only no té sentit sense camí." + +#: builtin/commit.c:376 msgid "unable to create temporary index" msgstr "no s'ha pogut crear un índex temporal" -#: builtin/commit.c:362 +#: builtin/commit.c:382 msgid "interactive add failed" msgstr "l'afegiment interactiu ha fallat" -#: builtin/commit.c:376 +#: builtin/commit.c:396 msgid "unable to update temporary index" msgstr "no s'ha pogut actualitzar l'índex temporal" -#: builtin/commit.c:378 +#: builtin/commit.c:398 msgid "Failed to update main cache tree" msgstr "S'ha produït un error en actualitzar l'arbre principal de memòria cau" -#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472 +#: builtin/commit.c:423 builtin/commit.c:446 builtin/commit.c:492 msgid "unable to write new_index file" msgstr "no s'ha pogut escriure el fitxer new_index" -#: builtin/commit.c:455 +#: builtin/commit.c:475 msgid "cannot do a partial commit during a merge." msgstr "no es pot fer una comissió parcial durant una fusió." -#: builtin/commit.c:457 +#: builtin/commit.c:477 msgid "cannot do a partial commit during a cherry-pick." msgstr "no es pot fer una comissió parcial durant un «cherry pick»." -#: builtin/commit.c:465 +#: builtin/commit.c:485 msgid "cannot read the index" msgstr "no es pot llegir l'índex" -#: builtin/commit.c:484 +#: builtin/commit.c:504 msgid "unable to write temporary index file" msgstr "no s'ha pogut escriure un fitxer d'índex temporal" -#: builtin/commit.c:582 +#: builtin/commit.c:602 #, c-format msgid "commit '%s' lacks author header" msgstr "a la comissió «%s» li manca la capçalera d'autor" -#: builtin/commit.c:584 +#: builtin/commit.c:604 #, c-format msgid "commit '%s' has malformed author line" msgstr "la comissió «%s» té una línia d'autor mal formada" -#: builtin/commit.c:603 +#: builtin/commit.c:623 msgid "malformed --author parameter" msgstr "paràmetre --author mal format" -#: builtin/commit.c:656 +#: builtin/commit.c:676 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -11448,38 +12050,38 @@ msgstr "" "no es pot seleccionar un caràcter de comentari que\n" "no sigui usat en el missatge de comissió actual" -#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072 +#: builtin/commit.c:714 builtin/commit.c:747 builtin/commit.c:1092 #, c-format msgid "could not lookup commit %s" msgstr "no s'ha pogut trobar la comissió %s" -#: builtin/commit.c:706 builtin/shortlog.c:319 +#: builtin/commit.c:726 builtin/shortlog.c:319 #, c-format msgid "(reading log message from standard input)\n" msgstr "(s'està llegint el missatge de registre des de l'entrada estàndard)\n" -#: builtin/commit.c:708 +#: builtin/commit.c:728 msgid "could not read log from standard input" msgstr "no s'ha pogut llegir el registre des de l'entrada estàndard" -#: builtin/commit.c:712 +#: builtin/commit.c:732 #, c-format msgid "could not read log file '%s'" msgstr "no s'ha pogut llegir el fitxer de registre «%s»" -#: builtin/commit.c:743 builtin/commit.c:759 +#: builtin/commit.c:763 builtin/commit.c:779 msgid "could not read SQUASH_MSG" msgstr "no s'ha pogut llegir SQUASH_MSG" -#: builtin/commit.c:750 +#: builtin/commit.c:770 msgid "could not read MERGE_MSG" msgstr "no s'ha pogut llegir MERGE_MSG" -#: builtin/commit.c:810 +#: builtin/commit.c:830 msgid "could not write commit template" msgstr "no s'ha pogut escriure la plantilla de comissió" -#: builtin/commit.c:829 +#: builtin/commit.c:849 #, c-format msgid "" "\n" @@ -11494,7 +12096,7 @@ msgstr "" "\t%s\n" "i intenteu-ho de nou.\n" -#: builtin/commit.c:834 +#: builtin/commit.c:854 #, c-format msgid "" "\n" @@ -11509,7 +12111,7 @@ msgstr "" "\t%s\n" "i intenteu-ho de nou.\n" -#: builtin/commit.c:847 +#: builtin/commit.c:867 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -11519,7 +12121,7 @@ msgstr "" "S'ignoraran les línies que comencin amb «%c», i un missatge de\n" "comissió buit avorta la comissió.\n" -#: builtin/commit.c:855 +#: builtin/commit.c:875 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -11531,146 +12133,142 @@ msgstr "" "vosaltres\n" "mateixos si voleu. Un missatge buit avorta la comissió.\n" -#: builtin/commit.c:872 +#: builtin/commit.c:892 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAutor: %.*s <%.*s>" -#: builtin/commit.c:880 +#: builtin/commit.c:900 #, c-format msgid "%sDate: %s" msgstr "%sData: %s" -#: builtin/commit.c:887 +#: builtin/commit.c:907 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sComitent: %.*s <%.*s>" -#: builtin/commit.c:905 +#: builtin/commit.c:925 msgid "Cannot read index" msgstr "No es pot llegir l'índex" -#: builtin/commit.c:972 +#: builtin/commit.c:992 msgid "Error building trees" msgstr "Error en construir arbres" -#: builtin/commit.c:986 builtin/tag.c:275 +#: builtin/commit.c:1006 builtin/tag.c:275 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Especifiqueu el missatge usant l'opció -m o l'opció -F.\n" -#: builtin/commit.c:1030 +#: builtin/commit.c:1050 #, c-format msgid "--author '%s' is not 'Name ' and matches no existing author" msgstr "" "--author «%s» no és «Nom » i no coincideix amb\n" "cap autor existent" -#: builtin/commit.c:1044 +#: builtin/commit.c:1064 #, c-format msgid "Invalid ignored mode '%s'" msgstr "mode ignorat no vàlid «%s»" -#: builtin/commit.c:1062 builtin/commit.c:1304 +#: builtin/commit.c:1082 builtin/commit.c:1322 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Mode de fitxers no seguits no vàlid «%s»" -#: builtin/commit.c:1102 +#: builtin/commit.c:1122 msgid "--long and -z are incompatible" msgstr "--long i -z són incompatibles" -#: builtin/commit.c:1146 +#: builtin/commit.c:1166 msgid "Using both --reset-author and --author does not make sense" msgstr "Usar ambdós --reset-author i --author no té sentit" -#: builtin/commit.c:1155 +#: builtin/commit.c:1175 msgid "You have nothing to amend." msgstr "No teniu res a esmenar." -#: builtin/commit.c:1158 +#: builtin/commit.c:1178 msgid "You are in the middle of a merge -- cannot amend." msgstr "Esteu enmig d'una fusió -- no es pot esmenar." -#: builtin/commit.c:1160 +#: builtin/commit.c:1180 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Esteu enmig d'un «cherry pick» -- no es pot esmenar." -#: builtin/commit.c:1163 +#: builtin/commit.c:1183 msgid "Options --squash and --fixup cannot be used together" msgstr "Les opcions --squash i --fixup no es poden usar juntes" -#: builtin/commit.c:1173 +#: builtin/commit.c:1193 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Només un de -c/-C/-F/--fixup es pot usar." -#: builtin/commit.c:1175 +#: builtin/commit.c:1195 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "L'opció -m no es pot combinar amb -c/-C/-F/." -#: builtin/commit.c:1183 +#: builtin/commit.c:1203 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author només es pot usar amb -C, -c o --amend." -#: builtin/commit.c:1200 +#: builtin/commit.c:1220 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "Només un de --include/--only/--all/--interactive/--patch es pot usar." -#: builtin/commit.c:1202 -msgid "No paths with --include/--only does not make sense." -msgstr "--include/--only no té sentit sense camí." - -#: builtin/commit.c:1208 +#: builtin/commit.c:1226 #, fuzzy, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "-a no té sentit amb camins." -#: builtin/commit.c:1339 builtin/commit.c:1523 +#: builtin/commit.c:1357 builtin/commit.c:1519 msgid "show status concisely" msgstr "mostra l'estat concisament" -#: builtin/commit.c:1341 builtin/commit.c:1525 +#: builtin/commit.c:1359 builtin/commit.c:1521 msgid "show branch information" msgstr "mostra la informació de branca" -#: builtin/commit.c:1343 +#: builtin/commit.c:1361 msgid "show stash information" msgstr "mostra la informació de «stash»" -#: builtin/commit.c:1345 builtin/commit.c:1527 +#: builtin/commit.c:1363 builtin/commit.c:1523 msgid "compute full ahead/behind values" msgstr "" -#: builtin/commit.c:1347 +#: builtin/commit.c:1365 msgid "version" msgstr "versió" -#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561 -#: builtin/worktree.c:651 +#: builtin/commit.c:1365 builtin/commit.c:1525 builtin/push.c:549 +#: builtin/worktree.c:650 msgid "machine-readable output" msgstr "sortida llegible per màquina" -#: builtin/commit.c:1350 builtin/commit.c:1531 +#: builtin/commit.c:1368 builtin/commit.c:1527 msgid "show status in long format (default)" msgstr "mostra l'estat en format llarg (per defecte)" -#: builtin/commit.c:1353 builtin/commit.c:1534 +#: builtin/commit.c:1371 builtin/commit.c:1530 msgid "terminate entries with NUL" msgstr "acaba les entrades amb NUL" -#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537 -#: builtin/fast-export.c:1125 builtin/fast-export.c:1128 -#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332 +#: builtin/commit.c:1373 builtin/commit.c:1377 builtin/commit.c:1533 +#: builtin/fast-export.c:1153 builtin/fast-export.c:1156 +#: builtin/fast-export.c:1159 builtin/rebase.c:1525 parse-options.h:336 msgid "mode" msgstr "mode" -#: builtin/commit.c:1356 builtin/commit.c:1537 +#: builtin/commit.c:1374 builtin/commit.c:1533 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "mostra els fitxers no seguits, modes opcionals: all, normal, no. (Per " "defecte: all)" -#: builtin/commit.c:1360 +#: builtin/commit.c:1378 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -11678,11 +12276,11 @@ msgstr "" "mostra els fitxers ignorats, modes opcionals: traditional, matching, no. " "(Per defecte: traditional, matching, no.)" -#: builtin/commit.c:1362 parse-options.h:179 +#: builtin/commit.c:1380 parse-options.h:192 msgid "when" msgstr "quan" -#: builtin/commit.c:1363 +#: builtin/commit.c:1381 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -11690,173 +12288,173 @@ msgstr "" "ignora els canvis als submòduls, opcional quan: all, dirty, untracked. (Per " "defecte: all)" -#: builtin/commit.c:1365 +#: builtin/commit.c:1383 msgid "list untracked files in columns" msgstr "mostra els fitxers no seguits en columnes" -#: builtin/commit.c:1366 +#: builtin/commit.c:1384 msgid "do not detect renames" msgstr "no detectis canvis de noms" -#: builtin/commit.c:1368 +#: builtin/commit.c:1386 msgid "detect renames, optionally set similarity index" msgstr "detecta canvis de noms, i opcionalment estableix un índex de semblança" -#: builtin/commit.c:1388 +#: builtin/commit.c:1406 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "" -#: builtin/commit.c:1493 +#: builtin/commit.c:1489 msgid "suppress summary after successful commit" msgstr "omet el resum després d'una comissió reeixida" -#: builtin/commit.c:1494 +#: builtin/commit.c:1490 msgid "show diff in commit message template" msgstr "mostra la diferència en la plantilla de missatge de comissió" -#: builtin/commit.c:1496 +#: builtin/commit.c:1492 msgid "Commit message options" msgstr "Opcions de missatge de comissió" -#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414 +#: builtin/commit.c:1493 builtin/merge.c:274 builtin/tag.c:414 msgid "read message from file" msgstr "llegiu el missatge des d'un fitxer" -#: builtin/commit.c:1498 +#: builtin/commit.c:1494 msgid "author" msgstr "autor" -#: builtin/commit.c:1498 +#: builtin/commit.c:1494 msgid "override author for commit" msgstr "autor corregit de la comissió" -#: builtin/commit.c:1499 builtin/gc.c:539 +#: builtin/commit.c:1495 builtin/gc.c:538 msgid "date" msgstr "data" -#: builtin/commit.c:1499 +#: builtin/commit.c:1495 msgid "override date for commit" msgstr "data corregida de la comissió" -#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503 -#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92 +#: builtin/commit.c:1497 builtin/commit.c:1498 builtin/commit.c:1499 +#: builtin/commit.c:1500 parse-options.h:328 ref-filter.h:92 msgid "commit" msgstr "comissió" -#: builtin/commit.c:1501 +#: builtin/commit.c:1497 msgid "reuse and edit message from specified commit" msgstr "reusa i edita el missatge de la comissió especificada" -#: builtin/commit.c:1502 +#: builtin/commit.c:1498 msgid "reuse message from specified commit" msgstr "reusa el missatge de la comissió especificada" -#: builtin/commit.c:1503 +#: builtin/commit.c:1499 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "usa el missatge formatat de «squash» automàtic per a corregir la comissió " "especificada" -#: builtin/commit.c:1504 +#: builtin/commit.c:1500 msgid "use autosquash formatted message to squash specified commit" msgstr "" "usa el missatge formatat de «squash» automàtic per a «squash» a la comissió " "especificada" -#: builtin/commit.c:1505 +#: builtin/commit.c:1501 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "l'autor de la comissió ja sóc jo (s'usa amb -C/-c/--amend)" -#: builtin/commit.c:1506 builtin/log.c:1581 builtin/merge.c:289 -#: builtin/pull.c:163 builtin/revert.c:110 +#: builtin/commit.c:1502 builtin/log.c:1634 builtin/merge.c:289 +#: builtin/pull.c:164 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "afegeix Signed-off-by:" -#: builtin/commit.c:1507 +#: builtin/commit.c:1503 msgid "use specified template file" msgstr "usa el fitxer de plantilla especificat" -#: builtin/commit.c:1508 +#: builtin/commit.c:1504 msgid "force edit of commit" msgstr "força l'edició de la comissió" -#: builtin/commit.c:1510 +#: builtin/commit.c:1506 msgid "include status in commit message template" msgstr "inclou l'estat en la plantilla de missatge de comissió" -#: builtin/commit.c:1515 +#: builtin/commit.c:1511 msgid "Commit contents options" msgstr "Opcions dels continguts de les comissions" -#: builtin/commit.c:1516 +#: builtin/commit.c:1512 msgid "commit all changed files" msgstr "comet tots els fitxers canviats" -#: builtin/commit.c:1517 +#: builtin/commit.c:1513 msgid "add specified files to index for commit" msgstr "afegeix els fitxers especificats a l'índex per a cometre" -#: builtin/commit.c:1518 +#: builtin/commit.c:1514 msgid "interactively add files" msgstr "afegeix els fitxers interactivament" -#: builtin/commit.c:1519 +#: builtin/commit.c:1515 msgid "interactively add changes" msgstr "afegeix els canvis interactivament" -#: builtin/commit.c:1520 +#: builtin/commit.c:1516 msgid "commit only specified files" msgstr "comet només els fitxers especificats" -#: builtin/commit.c:1521 +#: builtin/commit.c:1517 msgid "bypass pre-commit and commit-msg hooks" msgstr "evita els lligams de precomissió i missatge de comissió" -#: builtin/commit.c:1522 +#: builtin/commit.c:1518 msgid "show what would be committed" msgstr "mostra què es cometria" -#: builtin/commit.c:1535 +#: builtin/commit.c:1531 msgid "amend previous commit" msgstr "esmena la comissió anterior" -#: builtin/commit.c:1536 +#: builtin/commit.c:1532 msgid "bypass post-rewrite hook" msgstr "evita el lligam de post escriptura" -#: builtin/commit.c:1541 +#: builtin/commit.c:1539 msgid "ok to record an empty change" msgstr "està bé registrar un canvi buit" -#: builtin/commit.c:1543 +#: builtin/commit.c:1541 msgid "ok to record a change with an empty message" msgstr "està bé registrar un canvi amb missatge buit" -#: builtin/commit.c:1616 +#: builtin/commit.c:1614 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Fitxer MERGE_HEAD malmès (%s)" -#: builtin/commit.c:1623 +#: builtin/commit.c:1621 msgid "could not read MERGE_MODE" msgstr "no s'ha pogut llegir MERGE_MODE" -#: builtin/commit.c:1642 +#: builtin/commit.c:1640 #, c-format msgid "could not read commit message: %s" msgstr "no s'ha pogut llegir el missatge de comissió: %s" -#: builtin/commit.c:1649 +#: builtin/commit.c:1647 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "S'està avortant la comissió a causa d'un missatge de comissió buit.\n" -#: builtin/commit.c:1654 +#: builtin/commit.c:1652 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "S'està avortant la comissió; no heu editat el missatge.\n" -#: builtin/commit.c:1688 +#: builtin/commit.c:1686 #, fuzzy msgid "" "repository has been updated, but unable to write\n" @@ -11868,74 +12466,66 @@ msgstr "" "que no s'hagi excedit la quota, i després feu \n" "«git reset HEAD» per a recuperar-ho." -#: builtin/commit-graph.c:11 -msgid "git commit-graph [--object-dir ]" -msgstr "" - -#: builtin/commit-graph.c:12 builtin/commit-graph.c:24 -msgid "git commit-graph read [--object-dir ]" -msgstr "" - -#: builtin/commit-graph.c:13 builtin/commit-graph.c:19 -msgid "git commit-graph verify [--object-dir ] [--shallow]" +#: builtin/commit-graph.c:11 builtin/commit-graph.c:17 +msgid "" +"git commit-graph verify [--object-dir ] [--shallow] [--[no-]progress]" msgstr "" -#: builtin/commit-graph.c:14 builtin/commit-graph.c:29 +#: builtin/commit-graph.c:12 builtin/commit-graph.c:22 msgid "" "git commit-graph write [--object-dir ] [--append|--split] [--" -"reachable|--stdin-packs|--stdin-commits] " +"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] " msgstr "" -#: builtin/commit-graph.c:54 builtin/commit-graph.c:100 -#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163 -#: builtin/log.c:1601 +#: builtin/commit-graph.c:48 builtin/commit-graph.c:103 +#: builtin/commit-graph.c:187 builtin/fetch.c:179 builtin/log.c:1657 msgid "dir" msgstr "directori" -#: builtin/commit-graph.c:55 builtin/commit-graph.c:101 -#: builtin/commit-graph.c:162 builtin/commit-graph.c:238 +#: builtin/commit-graph.c:49 builtin/commit-graph.c:104 +#: builtin/commit-graph.c:188 msgid "The object directory to store the graph" msgstr "" -#: builtin/commit-graph.c:57 +#: builtin/commit-graph.c:51 msgid "if the commit-graph is split, only verify the tip file" msgstr "" -#: builtin/commit-graph.c:73 builtin/commit-graph.c:116 +#: builtin/commit-graph.c:73 t/helper/test-read-graph.c:23 #, fuzzy, c-format msgid "Could not open commit-graph '%s'" msgstr "no s'ha pogut analitzar la comissió «%s»" -#: builtin/commit-graph.c:164 +#: builtin/commit-graph.c:106 msgid "start walk at all refs" msgstr "" -#: builtin/commit-graph.c:166 +#: builtin/commit-graph.c:108 msgid "scan pack-indexes listed by stdin for commits" msgstr "" -#: builtin/commit-graph.c:168 +#: builtin/commit-graph.c:110 msgid "start walk at commits listed by stdin" msgstr "" -#: builtin/commit-graph.c:170 +#: builtin/commit-graph.c:112 msgid "include all commits already in the commit-graph file" msgstr "" -#: builtin/commit-graph.c:172 +#: builtin/commit-graph.c:115 #, fuzzy msgid "allow writing an incremental commit-graph file" msgstr "Escriu i verifica els fitxers commit-graph de Git" -#: builtin/commit-graph.c:174 builtin/commit-graph.c:178 +#: builtin/commit-graph.c:117 builtin/commit-graph.c:121 msgid "maximum number of commits in a non-base split commit-graph" msgstr "" -#: builtin/commit-graph.c:176 +#: builtin/commit-graph.c:119 msgid "maximum ratio between two levels of a split commit-graph" msgstr "" -#: builtin/commit-graph.c:191 +#: builtin/commit-graph.c:137 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "" @@ -12251,57 +12841,57 @@ msgstr "git count-objects [-v] [-H | --human-readable]" msgid "print sizes in human readable format" msgstr "imprimeix les mides en un format llegible pels humans" -#: builtin/describe.c:27 +#: builtin/describe.c:26 msgid "git describe [] [...]" msgstr "git describe [] [...]" -#: builtin/describe.c:28 +#: builtin/describe.c:27 msgid "git describe [] --dirty" msgstr "git describe [] --dirty" -#: builtin/describe.c:63 +#: builtin/describe.c:62 msgid "head" msgstr "davant per" -#: builtin/describe.c:63 +#: builtin/describe.c:62 msgid "lightweight" msgstr "lleuger" -#: builtin/describe.c:63 +#: builtin/describe.c:62 msgid "annotated" msgstr "anotat" -#: builtin/describe.c:273 +#: builtin/describe.c:275 #, c-format msgid "annotated tag %s not available" msgstr "l'etiqueta anotada %s no és disponible" -#: builtin/describe.c:277 +#: builtin/describe.c:279 #, c-format msgid "annotated tag %s has no embedded name" msgstr "l'etiqueta anotada %s no té nom incrustat" -#: builtin/describe.c:279 +#: builtin/describe.c:281 #, c-format msgid "tag '%s' is really '%s' here" msgstr "l'etiqueta «%s» realment és «%s» aquí" -#: builtin/describe.c:323 +#: builtin/describe.c:325 #, c-format msgid "no tag exactly matches '%s'" msgstr "cap etiqueta coincideix exactament amb «%s»" -#: builtin/describe.c:325 +#: builtin/describe.c:327 #, c-format msgid "No exact match on refs or tags, searching to describe\n" msgstr "" -#: builtin/describe.c:379 +#: builtin/describe.c:381 #, c-format msgid "finished search at %s\n" msgstr "s'ha finalitzat la cerca a %s\n" -#: builtin/describe.c:405 +#: builtin/describe.c:407 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -12310,7 +12900,7 @@ msgstr "" "Cap etiqueta anotada pot descriure «%s».\n" "No obstant, hi havia etiquetes no anotades: proveu --tags." -#: builtin/describe.c:409 +#: builtin/describe.c:411 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -12319,12 +12909,12 @@ msgstr "" "Cap etiqueta pot descriure «%s».\n" "Proveu --always, o creeu algunes etiquetes." -#: builtin/describe.c:439 +#: builtin/describe.c:441 #, c-format msgid "traversed %lu commits\n" msgstr "%lu comissions travessades\n" -#: builtin/describe.c:442 +#: builtin/describe.c:444 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -12333,90 +12923,90 @@ msgstr "" "s'han trobat més de %i etiquetes: s'han llistat les %i més recents\n" "s'ha renunciat la cerca a %s\n" -#: builtin/describe.c:510 +#: builtin/describe.c:512 #, c-format msgid "describe %s\n" msgstr "descriu %s\n" -#: builtin/describe.c:513 +#: builtin/describe.c:515 #, c-format msgid "Not a valid object name %s" msgstr "%s no és un nom d'objecte vàlid" -#: builtin/describe.c:521 +#: builtin/describe.c:523 #, c-format msgid "%s is neither a commit nor blob" msgstr "%s no és una comissió o un blob" -#: builtin/describe.c:535 +#: builtin/describe.c:537 msgid "find the tag that comes after the commit" msgstr "troba l'etiqueta que vingui després de la comissió" -#: builtin/describe.c:536 +#: builtin/describe.c:538 msgid "debug search strategy on stderr" msgstr "estratègia de cerca de depuració en stderr" -#: builtin/describe.c:537 +#: builtin/describe.c:539 msgid "use any ref" msgstr "usa qualsevol referència" -#: builtin/describe.c:538 +#: builtin/describe.c:540 msgid "use any tag, even unannotated" msgstr "usa qualsevol etiqueta, fins i tot aquelles sense anotar" -#: builtin/describe.c:539 +#: builtin/describe.c:541 msgid "always use long format" msgstr "sempre usa el format llarg" -#: builtin/describe.c:540 +#: builtin/describe.c:542 msgid "only follow first parent" msgstr "només segueix la primera mare" -#: builtin/describe.c:543 +#: builtin/describe.c:545 msgid "only output exact matches" msgstr "emet només coincidències exactes" -#: builtin/describe.c:545 +#: builtin/describe.c:547 msgid "consider most recent tags (default: 10)" msgstr "considera les etiquetes més recents (per defecte: 10)" -#: builtin/describe.c:547 +#: builtin/describe.c:549 msgid "only consider tags matching " msgstr "només considera les etiquetes que coincideixen amb " -#: builtin/describe.c:549 +#: builtin/describe.c:551 msgid "do not consider tags matching " msgstr "no consideris les etiquetes que no coincideixen amb " -#: builtin/describe.c:551 builtin/name-rev.c:422 +#: builtin/describe.c:553 builtin/name-rev.c:473 msgid "show abbreviated commit object as fallback" msgstr "mostra l'objecte de comissió abreviat com a sistema alternatiu" -#: builtin/describe.c:552 builtin/describe.c:555 +#: builtin/describe.c:554 builtin/describe.c:557 msgid "mark" msgstr "marca" -#: builtin/describe.c:553 +#: builtin/describe.c:555 msgid "append on dirty working tree (default: \"-dirty\")" msgstr "annexa en l'arbre de treball brut (per defecte: \"-dirty\")" -#: builtin/describe.c:556 +#: builtin/describe.c:558 msgid "append on broken working tree (default: \"-broken\")" msgstr "annexa en l'arbre de treball brut (per defecte: \"-broken\")" -#: builtin/describe.c:574 +#: builtin/describe.c:576 msgid "--long is incompatible with --abbrev=0" msgstr "--long és incompatible amb --abbrev=0" -#: builtin/describe.c:603 +#: builtin/describe.c:605 msgid "No names found, cannot describe anything." msgstr "No s'ha trobat cap nom, no es pot descriure res." -#: builtin/describe.c:654 +#: builtin/describe.c:656 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty és incompatible amb les comissions" -#: builtin/describe.c:656 +#: builtin/describe.c:658 msgid "--broken is incompatible with commit-ishes" msgstr "--broken és incompatible amb les comissions" @@ -12453,27 +13043,27 @@ msgstr "s'ha donat l'objecte no gestionat «%s»." msgid "git difftool [] [ []] [--] [...]" msgstr "git difftool [] [ []] [--] [...]" -#: builtin/difftool.c:253 +#: builtin/difftool.c:260 #, c-format msgid "failed: %d" msgstr "ha fallat: %d" -#: builtin/difftool.c:295 +#: builtin/difftool.c:302 #, c-format msgid "could not read symlink %s" msgstr "no s'ha pogut llegir l'enllaç simbòlic %s" -#: builtin/difftool.c:297 +#: builtin/difftool.c:304 #, c-format msgid "could not read symlink file %s" msgstr "no s'ha pogut llegir el fitxer d'enllaç simbòlic %s" -#: builtin/difftool.c:305 +#: builtin/difftool.c:312 #, c-format msgid "could not read object %s for symlink %s" msgstr "No es pot llegir l'objecte %s per l'enllaç simbòlic %s" -#: builtin/difftool.c:406 +#: builtin/difftool.c:413 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -12481,54 +13071,54 @@ msgstr "" "els formats de diff combinats ('-c' and '--cc') no són admesos \n" "en el mode diff per directoris ('-d' and '--dir-diff')." -#: builtin/difftool.c:626 +#: builtin/difftool.c:634 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "s'han modificat ambdós fitxers: «%s» i «%s»." -#: builtin/difftool.c:628 +#: builtin/difftool.c:636 msgid "working tree file has been left." msgstr "s'ha deixat un fitxer de l'arbre de treball." -#: builtin/difftool.c:639 +#: builtin/difftool.c:647 #, c-format msgid "temporary files exist in '%s'." msgstr "existeix un fitxer temporal a «%s»." -#: builtin/difftool.c:640 +#: builtin/difftool.c:648 msgid "you may want to cleanup or recover these." msgstr "podeu netejar o recuperar-los." -#: builtin/difftool.c:689 +#: builtin/difftool.c:697 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "utilitza `diff.guitool` en comptes de `diff.tool`" -#: builtin/difftool.c:691 +#: builtin/difftool.c:699 msgid "perform a full-directory diff" msgstr "fes un diff de tot el directori" -#: builtin/difftool.c:693 +#: builtin/difftool.c:701 msgid "do not prompt before launching a diff tool" msgstr "no preguntis abans d'executar l'eina diff" -#: builtin/difftool.c:698 +#: builtin/difftool.c:706 msgid "use symlinks in dir-diff mode" msgstr "utilitza enllaços simbòlics en mode dir-diff" -#: builtin/difftool.c:699 +#: builtin/difftool.c:707 msgid "tool" msgstr "eina" -#: builtin/difftool.c:700 +#: builtin/difftool.c:708 msgid "use the specified diff tool" msgstr "utilitza l'eina de diff especificada" -#: builtin/difftool.c:702 +#: builtin/difftool.c:710 msgid "print a list of diff tools that may be used with `--tool`" msgstr "" "imprimeix una llista de totes les eines diff que podeu usar amb `--tool`" -#: builtin/difftool.c:705 +#: builtin/difftool.c:713 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -12536,31 +13126,31 @@ msgstr "" "fes que 'git-difftool' surti quan l'eina de diff invocada torna un codi de " "sortida diferent de zero" -#: builtin/difftool.c:708 +#: builtin/difftool.c:716 msgid "specify a custom command for viewing diffs" msgstr "especifiqueu un ordre personalitzat per veure diffs" -#: builtin/difftool.c:709 +#: builtin/difftool.c:717 msgid "passed to `diff`" msgstr "passa-ho a «diff»" -#: builtin/difftool.c:724 +#: builtin/difftool.c:732 msgid "difftool requires worktree or --no-index" msgstr "difftool requereix worktree o --no-index" -#: builtin/difftool.c:731 +#: builtin/difftool.c:739 msgid "--dir-diff is incompatible with --no-index" msgstr "--dir-diff és incompatible amb --no-index" -#: builtin/difftool.c:734 +#: builtin/difftool.c:742 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "--gui, --tool and --extcmd són mútuament excloents" -#: builtin/difftool.c:742 +#: builtin/difftool.c:750 msgid "no given for --tool=" msgstr "no s'ha proporcionat per --tool=" -#: builtin/difftool.c:749 +#: builtin/difftool.c:757 msgid "no given for --extcmd=" msgstr "no s'ha proporcionat per --extcmd=" @@ -12596,156 +13186,182 @@ msgstr "" msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [opcions-de-llista-de-revisions]" -#: builtin/fast-export.c:1124 +#: builtin/fast-export.c:852 +msgid "Error: Cannot export nested tags unless --mark-tags is specified." +msgstr "" + +#: builtin/fast-export.c:1152 msgid "show progress after objects" msgstr "mostra el progrés després de objectes" -#: builtin/fast-export.c:1126 +#: builtin/fast-export.c:1154 msgid "select handling of signed tags" msgstr "selecciona la gestió de les etiquetes signades" -#: builtin/fast-export.c:1129 +#: builtin/fast-export.c:1157 msgid "select handling of tags that tag filtered objects" msgstr "selecciona la gestió de les etiquetes que etiquetin objectes filtrats" -#: builtin/fast-export.c:1132 +#: builtin/fast-export.c:1160 #, fuzzy msgid "select handling of commit messages in an alternate encoding" msgstr "selecciona la gestió de les etiquetes que etiquetin objectes filtrats" -#: builtin/fast-export.c:1135 +#: builtin/fast-export.c:1163 msgid "Dump marks to this file" msgstr "Bolca les marques a aquest fitxer" -#: builtin/fast-export.c:1137 +#: builtin/fast-export.c:1165 msgid "Import marks from this file" msgstr "Importa les marques d'aquest fitxer" -#: builtin/fast-export.c:1139 +#: builtin/fast-export.c:1169 +#, fuzzy +msgid "Import marks from this file if it exists" +msgstr "Importa les marques d'aquest fitxer" + +#: builtin/fast-export.c:1171 msgid "Fake a tagger when tags lack one" msgstr "Fingeix un etiquetador quan els en manca un a les etiquetes" -#: builtin/fast-export.c:1141 +#: builtin/fast-export.c:1173 msgid "Output full tree for each commit" msgstr "Imprimeix l'arbre complet de cada comissió" -#: builtin/fast-export.c:1143 +#: builtin/fast-export.c:1175 msgid "Use the done feature to terminate the stream" msgstr "Usa la característica done per a acabar el corrent" -#: builtin/fast-export.c:1144 +#: builtin/fast-export.c:1176 msgid "Skip output of blob data" msgstr "Omet l'emissió de dades de blob" -#: builtin/fast-export.c:1145 builtin/log.c:1649 +#: builtin/fast-export.c:1177 builtin/log.c:1705 msgid "refspec" msgstr "especificació de referència" -#: builtin/fast-export.c:1146 +#: builtin/fast-export.c:1178 msgid "Apply refspec to exported refs" msgstr "Aplica l'especificació de referència a les referències exportades" -#: builtin/fast-export.c:1147 +#: builtin/fast-export.c:1179 msgid "anonymize output" msgstr "anonimitza la sortida" -#: builtin/fast-export.c:1149 +#: builtin/fast-export.c:1181 msgid "Reference parents which are not in fast-export stream by object id" msgstr "" -#: builtin/fast-export.c:1151 +#: builtin/fast-export.c:1183 msgid "Show original object ids of blobs/commits" msgstr "" -#: builtin/fetch.c:30 +#: builtin/fast-export.c:1185 +msgid "Label tags with mark ids" +msgstr "" + +#: builtin/fast-export.c:1220 +msgid "Cannot pass both --import-marks and --import-marks-if-exists" +msgstr "" + +#: builtin/fetch.c:34 msgid "git fetch [] [ [...]]" msgstr "git fetch [] [ [...]]" -#: builtin/fetch.c:31 +#: builtin/fetch.c:35 msgid "git fetch [] " msgstr "git fetch [] " -#: builtin/fetch.c:32 +#: builtin/fetch.c:36 msgid "git fetch --multiple [] [( | )...]" msgstr "git fetch --multiple [] [( | )...]" -#: builtin/fetch.c:33 +#: builtin/fetch.c:37 msgid "git fetch --all []" msgstr "git fetch --all []" -#: builtin/fetch.c:125 builtin/pull.c:203 +#: builtin/fetch.c:116 +msgid "fetch.parallel cannot be negative" +msgstr "" + +#: builtin/fetch.c:139 builtin/pull.c:204 msgid "fetch from all remotes" msgstr "obtén de tots els remots" -#: builtin/fetch.c:127 builtin/pull.c:206 +#: builtin/fetch.c:141 builtin/pull.c:248 +#, fuzzy +msgid "set upstream for git pull/fetch" +msgstr "estableix la font per a git pull/status" + +#: builtin/fetch.c:143 builtin/pull.c:207 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "annexa a .git/FETCH_HEAD en lloc de sobreescriure" -#: builtin/fetch.c:129 builtin/pull.c:209 +#: builtin/fetch.c:145 builtin/pull.c:210 msgid "path to upload pack on remote end" msgstr "camí al qual pujar el paquet al costat remot" -#: builtin/fetch.c:130 +#: builtin/fetch.c:146 msgid "force overwrite of local reference" msgstr "força la sobreescriptura de la referència local" -#: builtin/fetch.c:132 +#: builtin/fetch.c:148 msgid "fetch from multiple remotes" msgstr "obtén de múltiples remots" -#: builtin/fetch.c:134 builtin/pull.c:213 +#: builtin/fetch.c:150 builtin/pull.c:214 msgid "fetch all tags and associated objects" msgstr "obtén totes les etiquetes i tots els objectes associats" -#: builtin/fetch.c:136 +#: builtin/fetch.c:152 msgid "do not fetch all tags (--no-tags)" msgstr "no obtinguis les etiquetes (--no-tags)" -#: builtin/fetch.c:138 +#: builtin/fetch.c:154 msgid "number of submodules fetched in parallel" msgstr "nombre de submòduls obtinguts en paral·lel" -#: builtin/fetch.c:140 builtin/pull.c:216 +#: builtin/fetch.c:156 builtin/pull.c:217 msgid "prune remote-tracking branches no longer on remote" msgstr "poda les branques amb seguiment remot que ja no estiguin en el remot" -#: builtin/fetch.c:142 +#: builtin/fetch.c:158 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" -#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140 +#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:141 msgid "on-demand" msgstr "sota demanda" -#: builtin/fetch.c:144 +#: builtin/fetch.c:160 msgid "control recursive fetching of submodules" msgstr "controla l'obtenció recursiva de submòduls" -#: builtin/fetch.c:148 builtin/pull.c:224 +#: builtin/fetch.c:164 builtin/pull.c:225 msgid "keep downloaded pack" msgstr "retén el paquet baixat" -#: builtin/fetch.c:150 +#: builtin/fetch.c:166 msgid "allow updating of HEAD ref" msgstr "permet l'actualització de la referència HEAD" -#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227 +#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:228 msgid "deepen history of shallow clone" msgstr "aprofundeix la història d'un clon superficial" -#: builtin/fetch.c:155 +#: builtin/fetch.c:171 msgid "deepen history of shallow repository based on time" msgstr "aprofundeix la història d'un clon superficial basat en temps" -#: builtin/fetch.c:161 builtin/pull.c:230 +#: builtin/fetch.c:177 builtin/pull.c:231 msgid "convert to a complete repository" msgstr "converteix en un dipòsit complet" -#: builtin/fetch.c:164 +#: builtin/fetch.c:180 msgid "prepend this to submodule path output" msgstr "anteposa això a la sortida de camí del submòdul" -#: builtin/fetch.c:167 +#: builtin/fetch.c:183 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -12753,190 +13369,211 @@ msgstr "" "per defecte per a l'obtenció recursiva de submòduls (prioritat més baixa que " "els fitxers de configuració)" -#: builtin/fetch.c:171 builtin/pull.c:233 +#: builtin/fetch.c:187 builtin/pull.c:234 msgid "accept refs that update .git/shallow" msgstr "accepta les referències que actualitzin .git/shallow" -#: builtin/fetch.c:172 builtin/pull.c:235 +#: builtin/fetch.c:188 builtin/pull.c:236 msgid "refmap" msgstr "mapa de referències" -#: builtin/fetch.c:173 builtin/pull.c:236 +#: builtin/fetch.c:189 builtin/pull.c:237 msgid "specify fetch refmap" msgstr "mostra el mapa de referències d'obtenció" -#: builtin/fetch.c:180 +#: builtin/fetch.c:196 msgid "report that we have only objects reachable from this object" msgstr "" -#: builtin/fetch.c:183 +#: builtin/fetch.c:199 #, fuzzy msgid "run 'gc --auto' after fetching" msgstr "poda els remots després d'obtenir-los" -#: builtin/fetch.c:185 builtin/pull.c:245 +#: builtin/fetch.c:201 builtin/pull.c:246 msgid "check for forced-updates on all updated branches" msgstr "" -#: builtin/fetch.c:491 +#: builtin/fetch.c:203 +#, fuzzy +msgid "write the commit-graph after fetching" +msgstr "poda els remots després d'obtenir-los" + +#: builtin/fetch.c:513 msgid "Couldn't find remote ref HEAD" msgstr "No s'ha pogut trobar la referència HEAD remota" -#: builtin/fetch.c:630 +#: builtin/fetch.c:653 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "la configuració fetch.output conté un valor no vàlid %s" -#: builtin/fetch.c:728 +#: builtin/fetch.c:751 #, c-format msgid "object %s not found" msgstr "objecte %s no trobat" -#: builtin/fetch.c:732 +#: builtin/fetch.c:755 msgid "[up to date]" msgstr "[al dia]" -#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833 +#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856 msgid "[rejected]" msgstr "[rebutjat]" -#: builtin/fetch.c:746 +#: builtin/fetch.c:769 msgid "can't fetch in current branch" msgstr "no es pot obtenir en la branca actual" -#: builtin/fetch.c:756 +#: builtin/fetch.c:779 msgid "[tag update]" msgstr "[actualització d'etiqueta]" -#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816 -#: builtin/fetch.c:828 +#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839 +#: builtin/fetch.c:851 msgid "unable to update local ref" msgstr "no s'ha pogut actualitzar la referència local" -#: builtin/fetch.c:761 +#: builtin/fetch.c:784 msgid "would clobber existing tag" msgstr "" -#: builtin/fetch.c:783 +#: builtin/fetch.c:806 msgid "[new tag]" msgstr "[etiqueta nova]" -#: builtin/fetch.c:786 +#: builtin/fetch.c:809 msgid "[new branch]" msgstr "[branca nova]" -#: builtin/fetch.c:789 +#: builtin/fetch.c:812 msgid "[new ref]" msgstr "[referència nova]" -#: builtin/fetch.c:828 +#: builtin/fetch.c:851 msgid "forced update" msgstr "actualització forçada" -#: builtin/fetch.c:833 +#: builtin/fetch.c:856 msgid "non-fast-forward" msgstr "sense avanç ràpid" -#: builtin/fetch.c:879 -#, c-format -msgid "%s did not send all necessary objects\n" -msgstr "%s no ha enviat tots els objectes necessaris\n" - -#: builtin/fetch.c:900 -#, c-format -msgid "reject %s because shallow roots are not allowed to be updated" +#: builtin/fetch.c:877 +msgid "" +"Fetch normally indicates which branches had a forced update,\n" +"but that check has been disabled. To re-enable, use '--show-forced-updates'\n" +"flag or run 'git config fetch.showForcedUpdates true'." msgstr "" -"rebutja %s perquè no es permet que les arrels superficials s'actualitzin" -#: builtin/fetch.c:991 builtin/fetch.c:1124 -#, c-format -msgid "From %.*s\n" -msgstr "De %.*s\n" - -#: builtin/fetch.c:1002 +#: builtin/fetch.c:881 #, c-format msgid "" -"some local refs could not be updated; try running\n" -" 'git remote prune %s' to remove any old, conflicting branches" +"It took %.2f seconds to check forced updates. You can use\n" +"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates " +"false'\n" +" to avoid this check.\n" msgstr "" -"algunes referències locals no s'han pogut actualitzar;\n" -" intenteu executar 'git remote prune %s' per a eliminar\n" -" qualsevol branca antiga o conflictiva" -#: builtin/fetch.c:1008 -msgid "" -"Fetch normally indicates which branches had a forced update, but that check " -"has been disabled." -msgstr "" +#: builtin/fetch.c:911 +#, c-format +msgid "%s did not send all necessary objects\n" +msgstr "%s no ha enviat tots els objectes necessaris\n" -#: builtin/fetch.c:1009 -msgid "" -"To re-enable, use '--show-forced-updates' flag or run 'git config fetch." -"showForcedUpdates true'." +#: builtin/fetch.c:932 +#, c-format +msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" +"rebutja %s perquè no es permet que les arrels superficials s'actualitzin" -#: builtin/fetch.c:1011 +#: builtin/fetch.c:1017 builtin/fetch.c:1155 #, c-format -msgid "" -"It took %.2f seconds to check forced updates. You can use '--no-show-forced-" -"updates'\n" -msgstr "" +msgid "From %.*s\n" +msgstr "De %.*s\n" -#: builtin/fetch.c:1013 +#: builtin/fetch.c:1028 +#, c-format msgid "" -"or run 'git config fetch.showForcedUpdates false' to avoid this check.\n" +"some local refs could not be updated; try running\n" +" 'git remote prune %s' to remove any old, conflicting branches" msgstr "" +"algunes referències locals no s'han pogut actualitzar;\n" +" intenteu executar 'git remote prune %s' per a eliminar\n" +" qualsevol branca antiga o conflictiva" -#: builtin/fetch.c:1094 +#: builtin/fetch.c:1125 #, c-format msgid " (%s will become dangling)" msgstr " (%s es tornarà penjant)" -#: builtin/fetch.c:1095 +#: builtin/fetch.c:1126 #, c-format msgid " (%s has become dangling)" msgstr " (%s s'ha tornat penjant)" -#: builtin/fetch.c:1127 +#: builtin/fetch.c:1158 msgid "[deleted]" msgstr "[suprimit]" -#: builtin/fetch.c:1128 builtin/remote.c:1036 +#: builtin/fetch.c:1159 builtin/remote.c:1035 msgid "(none)" msgstr "(cap)" -#: builtin/fetch.c:1151 +#: builtin/fetch.c:1182 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "S'està refusant obtenir en la branca actual %s d'un dipòsit no nu" -#: builtin/fetch.c:1170 +#: builtin/fetch.c:1201 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "L'opció «%s» amb valor «%s» no és vàlida per a %s" -#: builtin/fetch.c:1173 +#: builtin/fetch.c:1204 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "S'ignora l'opció «%s» per a %s\n" -#: builtin/fetch.c:1477 +#: builtin/fetch.c:1412 +msgid "multiple branches detected, incompatible with --set-upstream" +msgstr "" + +#: builtin/fetch.c:1427 +#, fuzzy +msgid "not setting upstream for a remote remote-tracking branch" +msgstr "la branca font «%s» no s'emmagatzema com a branca amb seguiment remot" + +#: builtin/fetch.c:1429 +#, fuzzy +msgid "not setting upstream for a remote tag" +msgstr "estableix la font per a git pull/status" + +#: builtin/fetch.c:1431 +#, fuzzy +msgid "unknown branch type" +msgstr "tipus d'objecte desconegut %d" + +#: builtin/fetch.c:1433 +msgid "" +"no source branch found.\n" +"you need to specify exactly one branch with the --set-upstream option." +msgstr "" + +#: builtin/fetch.c:1559 builtin/fetch.c:1622 #, c-format msgid "Fetching %s\n" msgstr "S'està obtenint %s\n" -#: builtin/fetch.c:1479 builtin/remote.c:100 +#: builtin/fetch.c:1569 builtin/fetch.c:1624 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "No s'ha pogut obtenir %s" -#: builtin/fetch.c:1525 -msgid "" -"--filter can only be used with the remote configured in extensions." -"partialClone" -msgstr "" +#: builtin/fetch.c:1581 +#, fuzzy, c-format +msgid "could not fetch '%s' (exit code: %d)\n" +msgstr "no s'ha pogut establir «%s» a «%s»" -#: builtin/fetch.c:1549 +#: builtin/fetch.c:1684 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -12944,44 +13581,44 @@ msgstr "" "Cap dipòsit remot especificat. Especifiqueu un URL o\n" "un nom remot del qual es deuen obtenir les revisions noves." -#: builtin/fetch.c:1586 +#: builtin/fetch.c:1721 msgid "You need to specify a tag name." msgstr "Necessiteu especificar un nom d'etiqueta." -#: builtin/fetch.c:1637 +#: builtin/fetch.c:1771 msgid "Negative depth in --deepen is not supported" msgstr "No s'admet una profunditat negativa en --deepen" -#: builtin/fetch.c:1639 +#: builtin/fetch.c:1773 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen i --depth són mútuament excloents" -#: builtin/fetch.c:1644 +#: builtin/fetch.c:1778 msgid "--depth and --unshallow cannot be used together" msgstr "--depth i --unshallow no es poden usar junts" -#: builtin/fetch.c:1646 +#: builtin/fetch.c:1780 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow en un dipòsit complet no té sentit" -#: builtin/fetch.c:1662 +#: builtin/fetch.c:1796 msgid "fetch --all does not take a repository argument" msgstr "fetch --all no accepta un paràmetre de dipòsit" -#: builtin/fetch.c:1664 +#: builtin/fetch.c:1798 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all no té sentit amb especificacions de referència" -#: builtin/fetch.c:1673 +#: builtin/fetch.c:1807 #, c-format msgid "No such remote or remote group: %s" msgstr "No existeix un remot ni un grup remot: %s" -#: builtin/fetch.c:1680 +#: builtin/fetch.c:1814 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Obtenir un grup i especificar referències no té sentit" -#: builtin/fetch.c:1696 +#: builtin/fetch.c:1832 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -12993,23 +13630,23 @@ msgid "" msgstr "" "git fmt-merge-msg [-m ] [--log[=] | --no-log] [--file ]" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:674 msgid "populate log with at most entries from shortlog" msgstr "emplena el registre amb entrades del registre curt com a màxim" -#: builtin/fmt-merge-msg.c:675 +#: builtin/fmt-merge-msg.c:677 msgid "alias for --log (deprecated)" msgstr "àlies per --log (en desús)" -#: builtin/fmt-merge-msg.c:678 +#: builtin/fmt-merge-msg.c:680 msgid "text" msgstr "text" -#: builtin/fmt-merge-msg.c:679 +#: builtin/fmt-merge-msg.c:681 msgid "use as start of message" msgstr "usa com a inici de missatge" -#: builtin/fmt-merge-msg.c:680 +#: builtin/fmt-merge-msg.c:682 msgid "file to read from" msgstr "fitxer del qual llegir" @@ -13075,249 +13712,249 @@ msgstr "imprimeix només les referències que continguin la comissió" msgid "print only refs which don't contain the commit" msgstr "imprimeix només les referències que no continguin la comissió" -#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161 +#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148 msgid "unknown" msgstr "desconegut" #. TRANSLATORS: e.g. error in tree 01bfda: -#: builtin/fsck.c:120 builtin/fsck.c:136 +#: builtin/fsck.c:100 builtin/fsck.c:120 #, c-format msgid "error in %s %s: %s" msgstr "error en %s %s: %s" #. TRANSLATORS: e.g. warning in tree 01bfda: -#: builtin/fsck.c:131 +#: builtin/fsck.c:114 #, c-format msgid "warning in %s %s: %s" msgstr "" -#: builtin/fsck.c:157 builtin/fsck.c:159 +#: builtin/fsck.c:143 builtin/fsck.c:146 #, c-format msgid "broken link from %7s %s" msgstr "" -#: builtin/fsck.c:168 +#: builtin/fsck.c:155 msgid "wrong object type in link" msgstr "tipus d'objecte incorrecte en l'enllaç" -#: builtin/fsck.c:184 +#: builtin/fsck.c:171 #, c-format msgid "" "broken link from %7s %s\n" " to %7s %s" msgstr "" -#: builtin/fsck.c:295 +#: builtin/fsck.c:282 #, c-format msgid "missing %s %s" msgstr "manca %s %s" -#: builtin/fsck.c:321 +#: builtin/fsck.c:309 #, c-format msgid "unreachable %s %s" msgstr "inabastable %s %s" -#: builtin/fsck.c:340 +#: builtin/fsck.c:329 #, fuzzy, c-format msgid "dangling %s %s" msgstr "S'estan actualitzant %s..%s\n" -#: builtin/fsck.c:349 +#: builtin/fsck.c:339 #, fuzzy msgid "could not create lost-found" msgstr "no s'ha pogut crear el fitxer «%s»" -#: builtin/fsck.c:360 +#: builtin/fsck.c:350 #, c-format msgid "could not finish '%s'" msgstr "no s'ha pogut finalitzar «%s»" -#: builtin/fsck.c:377 +#: builtin/fsck.c:367 #, c-format msgid "Checking %s" msgstr "S'està comprovant %s" -#: builtin/fsck.c:415 +#: builtin/fsck.c:405 #, c-format msgid "Checking connectivity (%d objects)" msgstr "S'està comprovant la connectivitat (%d objectes)" -#: builtin/fsck.c:434 +#: builtin/fsck.c:424 #, c-format msgid "Checking %s %s" msgstr "S'està comprovant %s %s" -#: builtin/fsck.c:438 +#: builtin/fsck.c:429 msgid "broken links" msgstr "enllaços trencats" -#: builtin/fsck.c:447 +#: builtin/fsck.c:438 #, c-format msgid "root %s" msgstr "arrel %s" -#: builtin/fsck.c:455 +#: builtin/fsck.c:446 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "" -#: builtin/fsck.c:484 +#: builtin/fsck.c:475 #, c-format msgid "%s: object corrupt or missing" msgstr "%s: objecte corrupte o no trobat" -#: builtin/fsck.c:509 +#: builtin/fsck.c:500 #, c-format msgid "%s: invalid reflog entry %s" msgstr " %s: entrada de referència no vàlida %s" -#: builtin/fsck.c:523 +#: builtin/fsck.c:514 #, fuzzy, c-format msgid "Checking reflog %s->%s" msgstr "S'està comprovant el canvi de nom de «%s» a «%s»\n" -#: builtin/fsck.c:557 +#: builtin/fsck.c:548 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s: punter sha1 no vàlid: %s" -#: builtin/fsck.c:564 +#: builtin/fsck.c:555 #, c-format msgid "%s: not a commit" msgstr "%s: no és una comissió" -#: builtin/fsck.c:619 +#: builtin/fsck.c:609 msgid "notice: No default references" msgstr "avís: no hi ha referències per defecte" -#: builtin/fsck.c:634 +#: builtin/fsck.c:624 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s: objecte corrupte o no trobat: %s" -#: builtin/fsck.c:647 +#: builtin/fsck.c:637 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s: no s'ha pogut analitzar l'objecte: %s" -#: builtin/fsck.c:667 +#: builtin/fsck.c:657 #, c-format msgid "bad sha1 file: %s" msgstr "fitxer sha1 malmès: %s" -#: builtin/fsck.c:682 +#: builtin/fsck.c:672 msgid "Checking object directory" msgstr "S'està comprovant el directori d'objecte" -#: builtin/fsck.c:685 +#: builtin/fsck.c:675 msgid "Checking object directories" msgstr "S'estan comprovant els directoris d'objecte" -#: builtin/fsck.c:700 +#: builtin/fsck.c:690 #, c-format msgid "Checking %s link" msgstr "S'està comprovant l'enllaç %s" -#: builtin/fsck.c:705 builtin/index-pack.c:842 +#: builtin/fsck.c:695 builtin/index-pack.c:842 #, c-format msgid "invalid %s" msgstr "%s no vàlid" -#: builtin/fsck.c:712 +#: builtin/fsck.c:702 #, fuzzy, c-format msgid "%s points to something strange (%s)" msgstr "%s - no és una cosa que puguem fusionar" -#: builtin/fsck.c:718 +#: builtin/fsck.c:708 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "" -#: builtin/fsck.c:722 +#: builtin/fsck.c:712 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "" -#: builtin/fsck.c:734 +#: builtin/fsck.c:724 msgid "Checking cache tree" msgstr "S'està comprovant l'arbre de la memòria cau" -#: builtin/fsck.c:739 +#: builtin/fsck.c:729 #, fuzzy, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "S'ha produït un error en actualitzar l'arbre principal de memòria cau" -#: builtin/fsck.c:750 +#: builtin/fsck.c:738 msgid "non-tree in cache-tree" msgstr "" -#: builtin/fsck.c:781 +#: builtin/fsck.c:769 msgid "git fsck [] [...]" msgstr "git fsck [] [...]" -#: builtin/fsck.c:787 +#: builtin/fsck.c:775 msgid "show unreachable objects" msgstr "mostra els objectes inabastables" -#: builtin/fsck.c:788 +#: builtin/fsck.c:776 msgid "show dangling objects" msgstr "mostra els objectes penjants" -#: builtin/fsck.c:789 +#: builtin/fsck.c:777 msgid "report tags" msgstr "informa de les etiquetes" -#: builtin/fsck.c:790 +#: builtin/fsck.c:778 msgid "report root nodes" msgstr "informa dels nodes d'arrel" -#: builtin/fsck.c:791 +#: builtin/fsck.c:779 msgid "make index objects head nodes" msgstr "fes els objectes d'índex nodes de cap" -#: builtin/fsck.c:792 +#: builtin/fsck.c:780 msgid "make reflogs head nodes (default)" msgstr "fes que els registres de referències siguin nodes de cap (per defecte)" -#: builtin/fsck.c:793 +#: builtin/fsck.c:781 msgid "also consider packs and alternate objects" msgstr "també considera els paquets i els objectes alternatius" -#: builtin/fsck.c:794 +#: builtin/fsck.c:782 msgid "check only connectivity" msgstr "comprova només la connectivitat" -#: builtin/fsck.c:795 +#: builtin/fsck.c:783 msgid "enable more strict checking" msgstr "habilita la comprovació més estricta" -#: builtin/fsck.c:797 +#: builtin/fsck.c:785 msgid "write dangling objects in .git/lost-found" msgstr "escriu objectes penjants a .git/lost-found" -#: builtin/fsck.c:798 builtin/prune.c:132 +#: builtin/fsck.c:786 builtin/prune.c:132 msgid "show progress" msgstr "mostra el progrés" -#: builtin/fsck.c:799 +#: builtin/fsck.c:787 msgid "show verbose names for reachable objects" msgstr "mostra els noms detallats dels objectes abastables" -#: builtin/fsck.c:859 builtin/index-pack.c:225 +#: builtin/fsck.c:846 builtin/index-pack.c:225 msgid "Checking objects" msgstr "S'estan comprovant els objectes" -#: builtin/fsck.c:887 +#: builtin/fsck.c:874 #, fuzzy, c-format msgid "%s: object missing" msgstr "mostra la mida de l'objecte" -#: builtin/fsck.c:899 +#: builtin/fsck.c:885 #, fuzzy, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "s'esperava shallow/unshallow, s'ha rebut %s" -#: builtin/gc.c:34 +#: builtin/gc.c:35 msgid "git gc []" msgstr "git gc []" @@ -13331,17 +13968,17 @@ msgstr "S'ha produït un error en fer fstat %s: %s" msgid "failed to parse '%s' value '%s'" msgstr "s'ha produït un error en moure «%s» a «%s»" -#: builtin/gc.c:476 builtin/init-db.c:55 +#: builtin/gc.c:475 builtin/init-db.c:55 #, c-format msgid "cannot stat '%s'" msgstr "no es pot fer stat en «%s»" -#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529 +#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529 #, c-format msgid "cannot read '%s'" msgstr "no es pot llegir «%s»" -#: builtin/gc.c:492 +#: builtin/gc.c:491 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -13356,62 +13993,62 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:540 +#: builtin/gc.c:539 msgid "prune unreferenced objects" msgstr "poda objectes sense referència" -#: builtin/gc.c:542 +#: builtin/gc.c:541 msgid "be more thorough (increased runtime)" msgstr "sigues més exhaustiu (el temps d'execució augmenta)" -#: builtin/gc.c:543 +#: builtin/gc.c:542 msgid "enable auto-gc mode" msgstr "habilita el mode de recollida d'escombraries automàtica" -#: builtin/gc.c:546 +#: builtin/gc.c:545 msgid "force running gc even if there may be another gc running" msgstr "força l'execució de gc encara que hi pugui haver un altre gc executant" -#: builtin/gc.c:549 +#: builtin/gc.c:548 msgid "repack all other packs except the largest pack" msgstr "" -#: builtin/gc.c:566 +#: builtin/gc.c:565 #, fuzzy, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "No s'ha pogut analitzar el valor gc.logexpiry %s" -#: builtin/gc.c:577 +#: builtin/gc.c:576 #, fuzzy, c-format msgid "failed to parse prune expiry value %s" msgstr "No s'ha pogut analitzar el valor gc.logexpiry %s" -#: builtin/gc.c:597 +#: builtin/gc.c:596 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" "S'està empaquetant el dipòsit automàticament en el rerefons per a un " "rendiment òptim.\n" -#: builtin/gc.c:599 +#: builtin/gc.c:598 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "" "S'està empaquetant automàticament el dipòsit per a un rendiment òptim.\n" -#: builtin/gc.c:600 +#: builtin/gc.c:599 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Vegeu «git help gc» per a neteja manual.\n" -#: builtin/gc.c:640 +#: builtin/gc.c:639 #, c-format msgid "" "gc is already running on machine '%s' pid % (use --force if not)" msgstr "" "gc ja s'està executant en la màquina «%s» pid % (useu --force si no)" -#: builtin/gc.c:695 +#: builtin/gc.c:694 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -13437,262 +14074,262 @@ msgstr "s'ha especificat un nombre de fils no vàlid (%d) per a %s" #. grep.threads #. #: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727 -#: builtin/pack-objects.c:2722 +#: builtin/pack-objects.c:2708 #, c-format msgid "no threads support, ignoring %s" msgstr "no hi ha suport de fils, s'està ignorant %s" -#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633 +#: builtin/grep.c:467 builtin/grep.c:592 builtin/grep.c:635 #, c-format msgid "unable to read tree (%s)" msgstr "no s'ha pogut llegir l'arbre (%s)" -#: builtin/grep.c:648 +#: builtin/grep.c:650 #, c-format msgid "unable to grep from object of type %s" msgstr "no es pot fer grep des d'un objecte de tipus %s" -#: builtin/grep.c:714 +#: builtin/grep.c:716 #, c-format msgid "switch `%c' expects a numerical value" msgstr "l'opció «%c» espera un valor numèric" -#: builtin/grep.c:813 +#: builtin/grep.c:815 msgid "search in index instead of in the work tree" msgstr "cerca en l'índex en lloc de l'arbre de treball" -#: builtin/grep.c:815 +#: builtin/grep.c:817 msgid "find in contents not managed by git" msgstr "cerca en continguts no gestionats per git" -#: builtin/grep.c:817 +#: builtin/grep.c:819 msgid "search in both tracked and untracked files" msgstr "cerca tant en fitxers seguits com en no seguits" -#: builtin/grep.c:819 +#: builtin/grep.c:821 msgid "ignore files specified via '.gitignore'" msgstr "ignora els fitxers especificats mitjançant '.gitignore'" -#: builtin/grep.c:821 +#: builtin/grep.c:823 msgid "recursively search in each submodule" msgstr "cerca recursivament a cada submòdul" -#: builtin/grep.c:824 +#: builtin/grep.c:826 msgid "show non-matching lines" msgstr "mostra les línies no coincidents" -#: builtin/grep.c:826 +#: builtin/grep.c:828 msgid "case insensitive matching" msgstr "coincidència insensible a majúscula i minúscula" -#: builtin/grep.c:828 +#: builtin/grep.c:830 msgid "match patterns only at word boundaries" msgstr "coincideix amb els patrons només als límits de paraula" -#: builtin/grep.c:830 +#: builtin/grep.c:832 msgid "process binary files as text" msgstr "processa els fitxers binaris com a text" -#: builtin/grep.c:832 +#: builtin/grep.c:834 msgid "don't match patterns in binary files" msgstr "no coincideixis amb els patrons en els fitxers binaris" -#: builtin/grep.c:835 +#: builtin/grep.c:837 msgid "process binary files with textconv filters" msgstr "processa els fitxers binaris amb filtres de textconv" -#: builtin/grep.c:837 +#: builtin/grep.c:839 msgid "search in subdirectories (default)" msgstr "cerca als subdirectories (per defecte)" -#: builtin/grep.c:839 +#: builtin/grep.c:841 msgid "descend at most levels" msgstr "descendeix com a màxim nivells" -#: builtin/grep.c:843 +#: builtin/grep.c:845 msgid "use extended POSIX regular expressions" msgstr "usa les expressions regulars POSIX ampliades" -#: builtin/grep.c:846 +#: builtin/grep.c:848 msgid "use basic POSIX regular expressions (default)" msgstr "usa les expressions regulars POSIX bàsiques (per defecte)" -#: builtin/grep.c:849 +#: builtin/grep.c:851 msgid "interpret patterns as fixed strings" msgstr "interpreta els patrons com a cadenes fixes" -#: builtin/grep.c:852 +#: builtin/grep.c:854 msgid "use Perl-compatible regular expressions" msgstr "usa les expressions regulars compatibles amb Perl" -#: builtin/grep.c:855 +#: builtin/grep.c:857 msgid "show line numbers" msgstr "mostra els números de línia" -#: builtin/grep.c:856 +#: builtin/grep.c:858 msgid "show column number of first match" msgstr "mostra el nombre de columna de la primera coincidència" -#: builtin/grep.c:857 +#: builtin/grep.c:859 msgid "don't show filenames" msgstr "no mostris els noms de fitxer" -#: builtin/grep.c:858 +#: builtin/grep.c:860 msgid "show filenames" msgstr "mostra els noms de fitxer" -#: builtin/grep.c:860 +#: builtin/grep.c:862 msgid "show filenames relative to top directory" msgstr "mostra els noms de fitxer relatius al directori superior" -#: builtin/grep.c:862 +#: builtin/grep.c:864 msgid "show only filenames instead of matching lines" msgstr "mostra només els noms de fitxer en lloc de les línies coincidents" -#: builtin/grep.c:864 +#: builtin/grep.c:866 msgid "synonym for --files-with-matches" msgstr "sinònim de --files-with-matches" -#: builtin/grep.c:867 +#: builtin/grep.c:869 msgid "show only the names of files without match" msgstr "mostra només els noms dels fitxers sense coincidència" -#: builtin/grep.c:869 +#: builtin/grep.c:871 msgid "print NUL after filenames" msgstr "imprimeix NUL després dels noms de fitxer" -#: builtin/grep.c:872 +#: builtin/grep.c:874 msgid "show only matching parts of a line" msgstr "mostra només les parts de coincidents de la línia" -#: builtin/grep.c:874 +#: builtin/grep.c:876 msgid "show the number of matches instead of matching lines" msgstr "mostra el nombre de coincidències en lloc de les línies coincidents" -#: builtin/grep.c:875 +#: builtin/grep.c:877 msgid "highlight matches" msgstr "ressalta les coincidències" -#: builtin/grep.c:877 +#: builtin/grep.c:879 msgid "print empty line between matches from different files" msgstr "imprimeix una línia buida entre coincidències de fitxers distints" -#: builtin/grep.c:879 +#: builtin/grep.c:881 msgid "show filename only once above matches from same file" msgstr "" "mostra el nom de fitxer només una vegada a dalt de les coincidències del " "mateix fitxer" -#: builtin/grep.c:882 +#: builtin/grep.c:884 msgid "show context lines before and after matches" msgstr "mostra línies de context abans i després d'una coincidència" -#: builtin/grep.c:885 +#: builtin/grep.c:887 msgid "show context lines before matches" msgstr "mostra línies de context abans d'una coincidència" -#: builtin/grep.c:887 +#: builtin/grep.c:889 msgid "show context lines after matches" msgstr "mostra línies de context després d'una coincidència" -#: builtin/grep.c:889 +#: builtin/grep.c:891 msgid "use worker threads" msgstr "usa fils de treball" -#: builtin/grep.c:890 +#: builtin/grep.c:892 msgid "shortcut for -C NUM" msgstr "drecera per -C NUM" -#: builtin/grep.c:893 +#: builtin/grep.c:895 msgid "show a line with the function name before matches" msgstr "mostra una línia amb el nom de funció abans de les coincidències" -#: builtin/grep.c:895 +#: builtin/grep.c:897 msgid "show the surrounding function" msgstr "mostra la funció circumdant" -#: builtin/grep.c:898 +#: builtin/grep.c:900 msgid "read patterns from file" msgstr "llegeix els patrons des d'un fitxer" -#: builtin/grep.c:900 +#: builtin/grep.c:902 msgid "match " msgstr "coincideix amb " -#: builtin/grep.c:902 +#: builtin/grep.c:904 msgid "combine patterns specified with -e" msgstr "combina els patrons especificats amb -e" -#: builtin/grep.c:914 +#: builtin/grep.c:916 msgid "indicate hit with exit status without output" msgstr "indica coincidència amb estat de sortida sense sortida textual" -#: builtin/grep.c:916 +#: builtin/grep.c:918 msgid "show only matches from files that match all patterns" msgstr "" "mostra només les coincidències dels fitxers que coincideixin amb tots els " "patrons" -#: builtin/grep.c:918 +#: builtin/grep.c:920 msgid "show parse tree for grep expression" msgstr "mostra l'arbre d'anàlisi de l'expressió grep" -#: builtin/grep.c:922 +#: builtin/grep.c:924 msgid "pager" msgstr "paginador" -#: builtin/grep.c:922 +#: builtin/grep.c:924 msgid "show matching files in the pager" msgstr "mostra els fitxers coincidents en el paginador" -#: builtin/grep.c:926 +#: builtin/grep.c:928 msgid "allow calling of grep(1) (ignored by this build)" msgstr "permet la invocació de grep(1) (ignorat per aquesta compilació)" -#: builtin/grep.c:990 +#: builtin/grep.c:992 msgid "no pattern given" msgstr "no s'ha donat cap patró" -#: builtin/grep.c:1026 +#: builtin/grep.c:1028 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index o --untracked no es pot usar amb revisions" -#: builtin/grep.c:1034 +#: builtin/grep.c:1036 #, c-format msgid "unable to resolve revision: %s" msgstr "no s'ha pogut resoldre la revisió: %s" -#: builtin/grep.c:1065 +#: builtin/grep.c:1067 msgid "invalid option combination, ignoring --threads" msgstr "combinació d'opcions no vàlida, s'està ignorant --threads" -#: builtin/grep.c:1068 builtin/pack-objects.c:3405 +#: builtin/grep.c:1070 builtin/pack-objects.c:3400 msgid "no threads support, ignoring --threads" msgstr "no hi ha suport de fils, s'està ignorant --threads" -#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2719 +#: builtin/grep.c:1073 builtin/index-pack.c:1531 builtin/pack-objects.c:2705 #, c-format msgid "invalid number of threads specified (%d)" msgstr "s'ha especificat un nombre de fils no vàlid (%d)" -#: builtin/grep.c:1094 +#: builtin/grep.c:1096 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager només funciona en l'arbre de treball" -#: builtin/grep.c:1117 +#: builtin/grep.c:1119 msgid "option not supported with --recurse-submodules" msgstr "opció no admesa amb --recurse-submodules." -#: builtin/grep.c:1123 +#: builtin/grep.c:1125 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached o --untracked no es pot usar amb --no-index." -#: builtin/grep.c:1129 +#: builtin/grep.c:1131 #, fuzzy msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard no es pot usar per als continguts seguits." -#: builtin/grep.c:1137 +#: builtin/grep.c:1139 #, fuzzy msgid "both --cached and trees are given" msgstr "s'han donat ambdós --caches i arbres." @@ -13881,11 +14518,11 @@ msgstr "error de lectura d'entrada" msgid "used more bytes than were available" msgstr "s'han usat més octets que hi havia disponibles" -#: builtin/index-pack.c:288 builtin/pack-objects.c:600 +#: builtin/index-pack.c:288 builtin/pack-objects.c:604 msgid "pack too large for current definition of off_t" msgstr "paquet massa gran per a la definició actual d'off_t" -#: builtin/index-pack.c:291 builtin/unpack-objects.c:94 +#: builtin/index-pack.c:291 builtin/unpack-objects.c:95 msgid "pack exceeds maximum allowed size" msgstr "el paquet supera la mida màxima permesa" @@ -13949,8 +14586,8 @@ msgstr "hi ha una inconsistència seriosa d'inflació" msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "S'HA TROBAT UNA COL·LISIÓ SHA1 AMB %s !" -#: builtin/index-pack.c:738 builtin/pack-objects.c:153 -#: builtin/pack-objects.c:213 builtin/pack-objects.c:307 +#: builtin/index-pack.c:738 builtin/pack-objects.c:157 +#: builtin/pack-objects.c:217 builtin/pack-objects.c:311 #, c-format msgid "unable to read %s" msgstr "no s'ha pogut llegir %s" @@ -14012,7 +14649,7 @@ msgstr "confusió més enllà de la bogeria en parse_pack_objects()" msgid "Resolving deltas" msgstr "S'estan resolent les diferències" -#: builtin/index-pack.c:1205 builtin/pack-objects.c:2491 +#: builtin/index-pack.c:1205 builtin/pack-objects.c:2481 #, c-format msgid "unable to create thread: %s" msgstr "no s'ha pogut crear fil: %s" @@ -14077,7 +14714,7 @@ msgstr "no es pot emmagatzemar el fitxer empaquetat" msgid "cannot store index file" msgstr "no es pot emmagatzemar el fitxer d'índex" -#: builtin/index-pack.c:1525 builtin/pack-objects.c:2730 +#: builtin/index-pack.c:1525 builtin/pack-objects.c:2716 #, c-format msgid "bad pack.indexversion=%" msgstr "pack.indexversion=% incorrecte" @@ -14128,7 +14765,7 @@ msgstr "--stdin requereix un dipòsit git" msgid "--verify with no packfile name given" msgstr "s'ha donat --verify sense nom de fitxer de paquet" -#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580 +#: builtin/index-pack.c:1833 builtin/unpack-objects.c:581 #, fuzzy msgid "fsck error in pack objects" msgstr "error en objecte: %s" @@ -14312,139 +14949,132 @@ msgstr "--trailer amb --only-input no té sentit" msgid "no input file given for in-place editing" msgstr "no s'ha donat cap fitxer d'entrada per a edició in situ" -#: builtin/log.c:55 +#: builtin/log.c:56 msgid "git log [] [] [[--] ...]" msgstr "git log [] [] [[--] ...]" -#: builtin/log.c:56 +#: builtin/log.c:57 msgid "git show [] ..." msgstr "git show [] ..." -#: builtin/log.c:109 +#: builtin/log.c:110 #, c-format msgid "invalid --decorate option: %s" msgstr "opció --decorate no vàlida: %s" -#: builtin/log.c:160 -msgid "" -"log.mailmap is not set; its implicit value will change in an\n" -"upcoming release. To squelch this message and preserve current\n" -"behaviour, set the log.mailmap configuration value to false.\n" -"\n" -"To squelch this message and adopt the new behaviour now, set the\n" -"log.mailmap configuration value to true.\n" -"\n" -"See 'git help config' and search for 'log.mailmap' for further information." -msgstr "" - -#: builtin/log.c:183 +#: builtin/log.c:174 msgid "show source" msgstr "mostra la font" -#: builtin/log.c:184 +#: builtin/log.c:175 msgid "Use mail map file" msgstr "Usa el fitxer de mapa de correu" -#: builtin/log.c:186 +#: builtin/log.c:177 msgid "only decorate refs that match " msgstr "només decora les referències que coincideixin amb " -#: builtin/log.c:188 +#: builtin/log.c:179 msgid "do not decorate refs that match " msgstr "no decoris les referències que coincideixen amb " -#: builtin/log.c:189 +#: builtin/log.c:180 msgid "decorate options" msgstr "opcions de decoració" -#: builtin/log.c:192 +#: builtin/log.c:183 msgid "Process line range n,m in file, counting from 1" msgstr "Processa el rang de línies n,m en el fitxer, comptant des d'1" -#: builtin/log.c:297 +#: builtin/log.c:281 #, c-format msgid "Final output: %d %s\n" msgstr "Sortida final: %d %s\n" -#: builtin/log.c:551 +#: builtin/log.c:535 #, c-format msgid "git show %s: bad file" msgstr "git show %s: fitxer incorrecte" -#: builtin/log.c:566 builtin/log.c:660 +#: builtin/log.c:550 builtin/log.c:645 #, fuzzy, c-format msgid "could not read object %s" msgstr "No es pot llegir l'objecte %s" -#: builtin/log.c:685 +#: builtin/log.c:670 #, fuzzy, c-format msgid "unknown type: %d" msgstr "Tipus desconegut: %d" -#: builtin/log.c:808 +#: builtin/log.c:814 +#, c-format +msgid "%s: invalid cover from description mode" +msgstr "" + +#: builtin/log.c:821 msgid "format.headers without value" msgstr "format.headers sense valor" -#: builtin/log.c:925 +#: builtin/log.c:936 msgid "name of output directory is too long" msgstr "el nom del directori de sortida és massa llarg" -#: builtin/log.c:941 +#: builtin/log.c:952 #, fuzzy, c-format msgid "cannot open patch file %s" msgstr "No es pot obrir el fitxer de pedaç %s" -#: builtin/log.c:958 +#: builtin/log.c:969 #, fuzzy msgid "need exactly one range" msgstr "Cal exactament un rang." -#: builtin/log.c:968 +#: builtin/log.c:979 #, fuzzy msgid "not a range" msgstr "No és un rang." -#: builtin/log.c:1091 +#: builtin/log.c:1143 #, fuzzy msgid "cover letter needs email format" msgstr "La carta de presentació necessita el format de correu electrònic" -#: builtin/log.c:1097 +#: builtin/log.c:1149 #, fuzzy msgid "failed to create cover-letter file" msgstr "S'ha produït un error en crear els fitxers de sortida" -#: builtin/log.c:1176 +#: builtin/log.c:1228 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to boig: %s" -#: builtin/log.c:1203 +#: builtin/log.c:1255 msgid "git format-patch [] [ | ]" msgstr "git format-patch [] [ | ]" -#: builtin/log.c:1261 +#: builtin/log.c:1313 #, fuzzy msgid "two output directories?" msgstr "Hi ha dos directoris de sortida?" -#: builtin/log.c:1372 builtin/log.c:2116 builtin/log.c:2118 builtin/log.c:2130 +#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211 #, fuzzy, c-format msgid "unknown commit %s" msgstr "Comissió desconeguda %s" -#: builtin/log.c:1382 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "s'ha produït un error en resoldre «%s» com a referència vàlida" -#: builtin/log.c:1387 +#: builtin/log.c:1439 #, fuzzy msgid "could not find exact merge base" msgstr "No s'ha pogut trobar la base exacta de fusió." -#: builtin/log.c:1391 +#: builtin/log.c:1443 #, fuzzy msgid "" "failed to get upstream, if you want to record base commit automatically,\n" @@ -14457,274 +15087,282 @@ msgstr "" "seguir una branca remota. O podeu especificar la comissió base manualment\n" "amb --base=." -#: builtin/log.c:1411 +#: builtin/log.c:1463 #, fuzzy msgid "failed to find exact merge base" msgstr "S'ha produït un error en trobar la base exacta de fusió." -#: builtin/log.c:1422 +#: builtin/log.c:1474 msgid "base commit should be the ancestor of revision list" msgstr "la comissió base ha de ser l'avantpassat de la llista de revisions" -#: builtin/log.c:1426 +#: builtin/log.c:1478 msgid "base commit shouldn't be in revision list" msgstr "la comissió base no ha de ser en la llista de revisions" -#: builtin/log.c:1479 +#: builtin/log.c:1531 msgid "cannot get patch id" msgstr "no es pot obtenir l'id del pedaç" -#: builtin/log.c:1531 +#: builtin/log.c:1583 #, fuzzy msgid "failed to infer range-diff ranges" msgstr "s'ha produït un error en executar «%s»" -#: builtin/log.c:1576 +#: builtin/log.c:1629 msgid "use [PATCH n/m] even with a single patch" msgstr "usa [PATCH n/m] fins i tot amb un sol pedaç" -#: builtin/log.c:1579 +#: builtin/log.c:1632 msgid "use [PATCH] even with multiple patches" msgstr "usa [PATCH] fins i tot amb múltiples pedaços" -#: builtin/log.c:1583 +#: builtin/log.c:1636 msgid "print patches to standard out" msgstr "imprimeix els pedaços a la sortida estàndard" -#: builtin/log.c:1585 +#: builtin/log.c:1638 msgid "generate a cover letter" msgstr "genera una carta de presentació" -#: builtin/log.c:1587 +#: builtin/log.c:1640 msgid "use simple number sequence for output file names" msgstr "usa una seqüència de números per als noms dels fitxers de sortida" -#: builtin/log.c:1588 +#: builtin/log.c:1641 msgid "sfx" msgstr "sufix" -#: builtin/log.c:1589 +#: builtin/log.c:1642 msgid "use instead of '.patch'" msgstr "usa en lloc de '.patch'" -#: builtin/log.c:1591 +#: builtin/log.c:1644 msgid "start numbering patches at instead of 1" msgstr "comença numerant els pedaços a en lloc d'1" -#: builtin/log.c:1593 +#: builtin/log.c:1646 msgid "mark the series as Nth re-roll" msgstr "marca la sèrie com a l'enèsima llançada" -#: builtin/log.c:1595 +#: builtin/log.c:1648 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Usa [RFC PATCH] en lloc de [PATCH]" -#: builtin/log.c:1598 +#: builtin/log.c:1651 +msgid "cover-from-description-mode" +msgstr "" + +#: builtin/log.c:1652 +msgid "generate parts of a cover letter based on a branch's description" +msgstr "" + +#: builtin/log.c:1654 msgid "Use [] instead of [PATCH]" msgstr "Usa [] en lloc de [PATCH]" -#: builtin/log.c:1601 +#: builtin/log.c:1657 msgid "store resulting files in " msgstr "emmagatzema els fitxers resultants a " -#: builtin/log.c:1604 +#: builtin/log.c:1660 msgid "don't strip/add [PATCH]" msgstr "no despullis/afegeixis [PATCH]" -#: builtin/log.c:1607 +#: builtin/log.c:1663 msgid "don't output binary diffs" msgstr "no emetis diferències binàries" -#: builtin/log.c:1609 +#: builtin/log.c:1665 msgid "output all-zero hash in From header" msgstr "emet un hash de tots zeros en la capçalera From" -#: builtin/log.c:1611 +#: builtin/log.c:1667 msgid "don't include a patch matching a commit upstream" msgstr "no incloguis pedaços que coincideixin amb comissions a la font" -#: builtin/log.c:1613 +#: builtin/log.c:1669 msgid "show patch format instead of default (patch + stat)" msgstr "" "mostra el format de pedaç en lloc del per defecte (pedaç + estadístiques)" -#: builtin/log.c:1615 +#: builtin/log.c:1671 msgid "Messaging" msgstr "Missatgeria" -#: builtin/log.c:1616 +#: builtin/log.c:1672 msgid "header" msgstr "capçalera" -#: builtin/log.c:1617 +#: builtin/log.c:1673 msgid "add email header" msgstr "afegeix una capçalera de correu electrònic" -#: builtin/log.c:1618 builtin/log.c:1620 +#: builtin/log.c:1674 builtin/log.c:1676 msgid "email" msgstr "correu electrònic" -#: builtin/log.c:1618 +#: builtin/log.c:1674 msgid "add To: header" msgstr "afegeix la capçalera To:" -#: builtin/log.c:1620 +#: builtin/log.c:1676 msgid "add Cc: header" msgstr "afegeix la capçalera Cc:" -#: builtin/log.c:1622 +#: builtin/log.c:1678 msgid "ident" msgstr "identitat" -#: builtin/log.c:1623 +#: builtin/log.c:1679 msgid "set From address to (or committer ident if absent)" msgstr "" "estableix l'adreça From a (o la identitat del comitent si manca)" -#: builtin/log.c:1625 +#: builtin/log.c:1681 msgid "message-id" msgstr "ID de missatge" -#: builtin/log.c:1626 +#: builtin/log.c:1682 msgid "make first mail a reply to " msgstr "fes que el primer missatge sigui una resposta a " -#: builtin/log.c:1627 builtin/log.c:1630 +#: builtin/log.c:1683 builtin/log.c:1686 msgid "boundary" msgstr "límit" -#: builtin/log.c:1628 +#: builtin/log.c:1684 msgid "attach the patch" msgstr "adjunta el pedaç" -#: builtin/log.c:1631 +#: builtin/log.c:1687 msgid "inline the patch" msgstr "posa el pedaç en el cos" -#: builtin/log.c:1635 +#: builtin/log.c:1691 msgid "enable message threading, styles: shallow, deep" msgstr "habilita l'enfilada de missatges, estils: shallow, deep" -#: builtin/log.c:1637 +#: builtin/log.c:1693 msgid "signature" msgstr "signatura" -#: builtin/log.c:1638 +#: builtin/log.c:1694 msgid "add a signature" msgstr "afegeix una signatura" -#: builtin/log.c:1639 +#: builtin/log.c:1695 msgid "base-commit" msgstr "comissió base" -#: builtin/log.c:1640 +#: builtin/log.c:1696 msgid "add prerequisite tree info to the patch series" msgstr "afegeix la informació d'arbre requerida a la sèrie de pedaços" -#: builtin/log.c:1642 +#: builtin/log.c:1698 msgid "add a signature from a file" msgstr "afegeix una signatura des d'un fitxer" -#: builtin/log.c:1643 +#: builtin/log.c:1699 msgid "don't print the patch filenames" msgstr "no imprimeixis els noms de fitxer del pedaç" -#: builtin/log.c:1645 +#: builtin/log.c:1701 msgid "show progress while generating patches" msgstr "mostra el progrés durant la generació de pedaços" -#: builtin/log.c:1647 +#: builtin/log.c:1703 msgid "show changes against in cover letter or single patch" msgstr "" -#: builtin/log.c:1650 +#: builtin/log.c:1706 msgid "show changes against in cover letter or single patch" msgstr "" -#: builtin/log.c:1652 +#: builtin/log.c:1708 msgid "percentage by which creation is weighted" msgstr "" -#: builtin/log.c:1727 +#: builtin/log.c:1792 #, c-format msgid "invalid ident line: %s" msgstr "línia d'identitat no vàlida: %s" -#: builtin/log.c:1742 +#: builtin/log.c:1807 #, fuzzy msgid "-n and -k are mutually exclusive" msgstr "-n i -k són mútuament excloents." -#: builtin/log.c:1744 +#: builtin/log.c:1809 #, fuzzy msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc i -k són mútuament excloents." -#: builtin/log.c:1752 +#: builtin/log.c:1817 msgid "--name-only does not make sense" msgstr "--name-only no té sentit" -#: builtin/log.c:1754 +#: builtin/log.c:1819 msgid "--name-status does not make sense" msgstr "--name-status no té sentit" -#: builtin/log.c:1756 +#: builtin/log.c:1821 msgid "--check does not make sense" msgstr "--check no té sentit" -#: builtin/log.c:1788 +#: builtin/log.c:1854 msgid "standard output, or directory, which one?" msgstr "sortida estàndard o directori, quin dels dos?" -#: builtin/log.c:1877 +#: builtin/log.c:1958 msgid "--interdiff requires --cover-letter or single patch" msgstr "" -#: builtin/log.c:1881 +#: builtin/log.c:1962 msgid "Interdiff:" msgstr "" -#: builtin/log.c:1882 +#: builtin/log.c:1963 #, c-format msgid "Interdiff against v%d:" msgstr "" -#: builtin/log.c:1888 +#: builtin/log.c:1969 msgid "--creation-factor requires --range-diff" msgstr "" -#: builtin/log.c:1892 +#: builtin/log.c:1973 msgid "--range-diff requires --cover-letter or single patch" msgstr "" -#: builtin/log.c:1900 +#: builtin/log.c:1981 msgid "Range-diff:" msgstr "" -#: builtin/log.c:1901 +#: builtin/log.c:1982 #, c-format msgid "Range-diff against v%d:" msgstr "" -#: builtin/log.c:1912 +#: builtin/log.c:1993 #, c-format msgid "unable to read signature file '%s'" msgstr "no s'ha pogut llegir el fitxer de signatura «%s»" -#: builtin/log.c:1948 +#: builtin/log.c:2029 msgid "Generating patches" msgstr "S'estan generant els pedaços" -#: builtin/log.c:1992 +#: builtin/log.c:2073 #, fuzzy msgid "failed to create output files" msgstr "S'ha produït un error en crear els fitxers de sortida" -#: builtin/log.c:2051 +#: builtin/log.c:2132 msgid "git cherry [-v] [ [ []]]" msgstr "git cherry [-v] [ [ []]]" -#: builtin/log.c:2105 +#: builtin/log.c:2186 #, c-format msgid "" "Could not find a tracked remote branch, please specify manually.\n" @@ -14853,7 +15491,7 @@ msgstr "" msgid "do not print remote URL" msgstr "no imprimeixis l'URL remot" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1518 msgid "exec" msgstr "executable" @@ -14963,33 +15601,33 @@ msgstr "Les estratègies disponibles són:" msgid "Available custom strategies are:" msgstr "Les estratègies personalitzades disponibles són:" -#: builtin/merge.c:244 builtin/pull.c:151 +#: builtin/merge.c:244 builtin/pull.c:152 msgid "do not show a diffstat at the end of the merge" msgstr "no mostris les estadístiques de diferència al final de la fusió" -#: builtin/merge.c:247 builtin/pull.c:154 +#: builtin/merge.c:247 builtin/pull.c:155 msgid "show a diffstat at the end of the merge" msgstr "mostra les estadístiques de diferència al final de la fusió" -#: builtin/merge.c:248 builtin/pull.c:157 +#: builtin/merge.c:248 builtin/pull.c:158 msgid "(synonym to --stat)" msgstr "(sinònim de --stat)" -#: builtin/merge.c:250 builtin/pull.c:160 +#: builtin/merge.c:250 builtin/pull.c:161 msgid "add (at most ) entries from shortlog to merge commit message" msgstr "" "afegeix (com a màxim ) entrades del registre curt al missatge de comissió " "de fusió" -#: builtin/merge.c:253 builtin/pull.c:166 +#: builtin/merge.c:253 builtin/pull.c:167 msgid "create a single commit instead of doing a merge" msgstr "crea una única comissió en lloc de fusionar" -#: builtin/merge.c:255 builtin/pull.c:169 +#: builtin/merge.c:255 builtin/pull.c:170 msgid "perform a commit if the merge succeeds (default)" msgstr "realitza una comissió si la fusió té èxit (per defecte)" -#: builtin/merge.c:257 builtin/pull.c:172 +#: builtin/merge.c:257 builtin/pull.c:173 msgid "edit message before committing" msgstr "edita el missatge abans de cometre" @@ -14997,28 +15635,28 @@ msgstr "edita el missatge abans de cometre" msgid "allow fast-forward (default)" msgstr "permet l'avanç ràpid (per defecte)" -#: builtin/merge.c:261 builtin/pull.c:179 +#: builtin/merge.c:261 builtin/pull.c:180 msgid "abort if fast-forward is not possible" msgstr "avorta si l'avanç ràpid no és possible" -#: builtin/merge.c:265 builtin/pull.c:182 +#: builtin/merge.c:265 builtin/pull.c:183 msgid "verify that the named commit has a valid GPG signature" msgstr "verifica que la comissió anomenada tingui una signatura GPG vàlida" -#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186 -#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114 +#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:187 +#: builtin/rebase.c:512 builtin/rebase.c:1531 builtin/revert.c:114 msgid "strategy" msgstr "estratègia" -#: builtin/merge.c:267 builtin/pull.c:187 +#: builtin/merge.c:267 builtin/pull.c:188 msgid "merge strategy to use" msgstr "estratègia de fusió a usar" -#: builtin/merge.c:268 builtin/pull.c:190 +#: builtin/merge.c:268 builtin/pull.c:191 msgid "option=value" msgstr "opció=valor" -#: builtin/merge.c:269 builtin/pull.c:191 +#: builtin/merge.c:269 builtin/pull.c:192 msgid "option for selected merge strategy" msgstr "opció per a l'estratègia de fusió seleccionada" @@ -15039,13 +15677,14 @@ msgstr "restableix HEAD, l'índex i l'arbre de treball" msgid "continue the current in-progress merge" msgstr "continua la fusió en curs actual" -#: builtin/merge.c:284 builtin/pull.c:198 +#: builtin/merge.c:284 builtin/pull.c:199 msgid "allow merging unrelated histories" msgstr "permet fusionar històries no relacionades" #: builtin/merge.c:290 -msgid "verify commit-msg hook" -msgstr "verifica el lligam de missatge de comissió" +#, fuzzy +msgid "bypass pre-merge-commit and commit-msg hooks" +msgstr "evita els lligams de precomissió i missatge de comissió" #: builtin/merge.c:307 msgid "could not run stash." @@ -15088,32 +15727,32 @@ msgstr "«%s» no assenyala una comissió" msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Cadena branch.%s.mergeoptions incorrecta: %s" -#: builtin/merge.c:708 +#: builtin/merge.c:705 msgid "Not handling anything other than two heads merge." msgstr "No s'està gestionant res a part de la fusió de dos caps." -#: builtin/merge.c:722 +#: builtin/merge.c:719 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Opció desconeguda de merge-recursive: -X%s" -#: builtin/merge.c:737 +#: builtin/merge.c:734 #, c-format msgid "unable to write %s" msgstr "no s'ha pogut escriure %s" -#: builtin/merge.c:789 +#: builtin/merge.c:786 #, c-format msgid "Could not read from '%s'" msgstr "No s'ha pogut llegir de «%s»" -#: builtin/merge.c:798 +#: builtin/merge.c:795 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "No s'està cometent la fusió; useu 'git commit' per a completar la fusió.\n" -#: builtin/merge.c:804 +#: builtin/merge.c:801 #, fuzzy msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -15127,12 +15766,12 @@ msgstr "" "S'ignoraran les línies que comencin amb «%c», i un missatge buit\n" "avorta la comissió.\n" -#: builtin/merge.c:809 +#: builtin/merge.c:806 #, fuzzy msgid "An empty message aborts the commit.\n" msgstr "edita el missatge abans de cometre" -#: builtin/merge.c:812 +#: builtin/merge.c:809 #, fuzzy, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" @@ -15142,75 +15781,75 @@ msgstr "" "S'ignoraran les línies que comencin amb «%c», i un missatge de\n" "comissió buit avorta la comissió.\n" -#: builtin/merge.c:853 +#: builtin/merge.c:862 msgid "Empty commit message." msgstr "El missatge de comissió és buit." -#: builtin/merge.c:872 +#: builtin/merge.c:877 #, c-format msgid "Wonderful.\n" msgstr "Meravellós.\n" -#: builtin/merge.c:933 +#: builtin/merge.c:938 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "La fusió automàtica ha fallat; arregleu els conflictes i després cometeu el " "resultat.\n" -#: builtin/merge.c:972 +#: builtin/merge.c:977 msgid "No current branch." msgstr "No hi ha cap branca actual." -#: builtin/merge.c:974 +#: builtin/merge.c:979 msgid "No remote for the current branch." msgstr "No hi ha cap remot per a la branca actual." -#: builtin/merge.c:976 +#: builtin/merge.c:981 msgid "No default upstream defined for the current branch." msgstr "No hi ha cap font per defecte definida per a la branca actual." -#: builtin/merge.c:981 +#: builtin/merge.c:986 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "No hi ha cap branca amb seguiment remot per a %s de %s" -#: builtin/merge.c:1038 +#: builtin/merge.c:1043 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Valor incorrecte «%s» en l'entorn «%s»" -#: builtin/merge.c:1141 +#: builtin/merge.c:1146 #, c-format msgid "not something we can merge in %s: %s" msgstr "no és quelcom que puguem fusionar en %s: %s" -#: builtin/merge.c:1175 +#: builtin/merge.c:1180 msgid "not something we can merge" msgstr "no és quelcom que puguem fusionar" -#: builtin/merge.c:1278 +#: builtin/merge.c:1283 msgid "--abort expects no arguments" msgstr "--abort no accepta paràmetres" -#: builtin/merge.c:1282 +#: builtin/merge.c:1287 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "No hi ha fusió a avortar (manca MERGE_HEAD)." -#: builtin/merge.c:1291 +#: builtin/merge.c:1296 #, fuzzy msgid "--quit expects no arguments" msgstr "--abort no accepta paràmetres" -#: builtin/merge.c:1304 +#: builtin/merge.c:1309 msgid "--continue expects no arguments" msgstr "--continue no accepta paràmetres" -#: builtin/merge.c:1308 +#: builtin/merge.c:1313 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "No hi ha cap fusió en curs (manca MERGE_HEAD)." -#: builtin/merge.c:1324 +#: builtin/merge.c:1329 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -15218,7 +15857,7 @@ msgstr "" "No heu conclòs la vostra fusió (MERGE_HEAD existeix).\n" "Cometeu els vostres canvis abans de fusionar." -#: builtin/merge.c:1331 +#: builtin/merge.c:1336 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -15226,99 +15865,99 @@ msgstr "" "No heu conclòs el vostre «cherry pick» (CHERRY_PICK_HEAD existeix).\n" "Cometeu els vostres canvis abans de fusionar." -#: builtin/merge.c:1334 +#: builtin/merge.c:1339 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "No heu conclòs el vostre «cherry pick» (CHERRY_PICK_HEAD existeix)." -#: builtin/merge.c:1348 +#: builtin/merge.c:1353 msgid "You cannot combine --squash with --no-ff." msgstr "No podeu combinar --squash amb --no-ff." -#: builtin/merge.c:1350 +#: builtin/merge.c:1355 #, fuzzy msgid "You cannot combine --squash with --commit." msgstr "No podeu combinar --squash amb --no-ff." -#: builtin/merge.c:1366 +#: builtin/merge.c:1371 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" "No hi ha una comissió especificada i merge.defaultToUpstream no està " "establert." -#: builtin/merge.c:1383 +#: builtin/merge.c:1388 msgid "Squash commit into empty head not supported yet" msgstr "Una comissió «squash» a un HEAD buit encara no es permet" -#: builtin/merge.c:1385 +#: builtin/merge.c:1390 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Una comissió no d'avanç ràpid no té sentit a un HEAD buit" -#: builtin/merge.c:1390 +#: builtin/merge.c:1395 #, c-format msgid "%s - not something we can merge" msgstr "%s - no és una cosa que puguem fusionar" -#: builtin/merge.c:1392 +#: builtin/merge.c:1397 msgid "Can merge only exactly one commit into empty head" msgstr "Es pot fusionar només una comissió a un HEAD buit" -#: builtin/merge.c:1471 +#: builtin/merge.c:1476 msgid "refusing to merge unrelated histories" msgstr "s'està refusant fusionar històries no relacionades" -#: builtin/merge.c:1480 +#: builtin/merge.c:1485 msgid "Already up to date." msgstr "Ja està al dia." -#: builtin/merge.c:1490 +#: builtin/merge.c:1495 #, c-format msgid "Updating %s..%s\n" msgstr "S'estan actualitzant %s..%s\n" -#: builtin/merge.c:1532 +#: builtin/merge.c:1537 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "S'està intentant una fusió molt trivial en l'índex...\n" -#: builtin/merge.c:1539 +#: builtin/merge.c:1544 #, c-format msgid "Nope.\n" msgstr "No.\n" -#: builtin/merge.c:1564 +#: builtin/merge.c:1569 msgid "Already up to date. Yeeah!" msgstr "Ja està al dia. Estupend!" -#: builtin/merge.c:1570 +#: builtin/merge.c:1575 msgid "Not possible to fast-forward, aborting." msgstr "No és possible avançar ràpidament, s'està avortant." -#: builtin/merge.c:1593 builtin/merge.c:1658 +#: builtin/merge.c:1598 builtin/merge.c:1663 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "S'està rebobinant l'arbre a la pristina...\n" -#: builtin/merge.c:1597 +#: builtin/merge.c:1602 #, c-format msgid "Trying merge strategy %s...\n" msgstr "S'està intentant l'estratègia de fusió %s...\n" -#: builtin/merge.c:1649 +#: builtin/merge.c:1654 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Cap estratègia de fusió ha gestionat la fusió.\n" -#: builtin/merge.c:1651 +#: builtin/merge.c:1656 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "L'estratègia de fusió %s ha fallat.\n" -#: builtin/merge.c:1660 +#: builtin/merge.c:1665 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "S'està usant el %s per a preparar la resolució a mà.\n" -#: builtin/merge.c:1672 +#: builtin/merge.c:1677 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -15406,33 +16045,33 @@ msgstr "no avisis de conflictes" msgid "set labels for file1/orig-file/file2" msgstr "estableix les etiquetes per a fitxer1/fitxer-original/fitxer2" -#: builtin/merge-recursive.c:46 +#: builtin/merge-recursive.c:47 #, c-format msgid "unknown option %s" msgstr "opció desconeguda %s" -#: builtin/merge-recursive.c:52 +#: builtin/merge-recursive.c:53 #, c-format msgid "could not parse object '%s'" msgstr "no s'ha pogut analitzar l'objecte «%s»" -#: builtin/merge-recursive.c:56 +#: builtin/merge-recursive.c:57 #, c-format msgid "cannot handle more than %d base. Ignoring %s." msgid_plural "cannot handle more than %d bases. Ignoring %s." msgstr[0] "no es pot gestionar més d'%d base. S'està ignorant %s." msgstr[1] "no es poden gestionar més de %d bases. S'està ignorant %s." -#: builtin/merge-recursive.c:64 +#: builtin/merge-recursive.c:65 msgid "not handling anything other than two heads merge." msgstr "no s'està gestionant res a part de la fusió de dos caps." -#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72 +#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76 #, c-format msgid "could not resolve ref '%s'" msgstr "no s'ha pogut resoldre la referència «%s»" -#: builtin/merge-recursive.c:78 +#: builtin/merge-recursive.c:82 #, c-format msgid "Merging %s with %s\n" msgstr "S'està fusionant %s amb %s\n" @@ -15455,29 +16094,29 @@ msgstr "permet la creació de més d'un arbre" #: builtin/multi-pack-index.c:9 msgid "" -"git multi-pack-index [--object-dir=] (write|verify|expire|repack --" -"batch-size=)" +"git multi-pack-index [] (write|verify|expire|repack --batch-" +"size=)" msgstr "" -#: builtin/multi-pack-index.c:23 +#: builtin/multi-pack-index.c:26 msgid "object directory containing set of packfile and pack-index pairs" msgstr "" -#: builtin/multi-pack-index.c:25 +#: builtin/multi-pack-index.c:29 msgid "" "during repack, collect pack-files of smaller size into a batch that is " "larger than this size" msgstr "" -#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67 +#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67 msgid "too many arguments" msgstr "hi ha massa paràmetres" -#: builtin/multi-pack-index.c:52 +#: builtin/multi-pack-index.c:60 msgid "--batch-size option is only for 'repack' subcommand" msgstr "" -#: builtin/multi-pack-index.c:61 +#: builtin/multi-pack-index.c:69 #, fuzzy, c-format msgid "unrecognized subcommand: %s" msgstr "subordre desconeguda: %s" @@ -15571,52 +16210,52 @@ msgstr "%s, origen=%s, destí=%s" msgid "Renaming %s to %s\n" msgstr "S'està canviant el nom de %s a %s\n" -#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:520 +#: builtin/mv.c:277 builtin/remote.c:716 builtin/repack.c:518 #, c-format msgid "renaming '%s' failed" msgstr "el canvi del nom de «%s» ha fallat" -#: builtin/name-rev.c:352 +#: builtin/name-rev.c:403 msgid "git name-rev [] ..." msgstr "git name-rev [] ..." -#: builtin/name-rev.c:353 +#: builtin/name-rev.c:404 msgid "git name-rev [] --all" msgstr "git name-rev [] --all" -#: builtin/name-rev.c:354 +#: builtin/name-rev.c:405 msgid "git name-rev [] --stdin" msgstr "git name-rev [] --stdin" -#: builtin/name-rev.c:411 +#: builtin/name-rev.c:462 msgid "print only names (no SHA-1)" msgstr "imprimeix només els noms (sense SHA-1)" -#: builtin/name-rev.c:412 +#: builtin/name-rev.c:463 msgid "only use tags to name the commits" msgstr "només usa les etiquetes per a anomenar les comissions" -#: builtin/name-rev.c:414 +#: builtin/name-rev.c:465 msgid "only use refs matching " msgstr "només usa les referències que coincideixin amb " -#: builtin/name-rev.c:416 +#: builtin/name-rev.c:467 msgid "ignore refs matching " msgstr "ignora les referències que coincideixin amb " -#: builtin/name-rev.c:418 +#: builtin/name-rev.c:469 msgid "list all commits reachable from all refs" msgstr "llista totes les comissions abastables de totes les referències" -#: builtin/name-rev.c:419 +#: builtin/name-rev.c:470 msgid "read from stdin" msgstr "llegeix de stdin" -#: builtin/name-rev.c:420 +#: builtin/name-rev.c:471 msgid "allow to print `undefined` names (default)" msgstr "permet imprimir els noms `undefined` (per defecte)" -#: builtin/name-rev.c:426 +#: builtin/name-rev.c:477 msgid "dereference tags in the input (internal use)" msgstr "desreferencia les etiquetes en l'entrada (ús intern)" @@ -16019,7 +16658,7 @@ msgstr "l'intent d'eliminar una nota no existent no és un error" msgid "read object names from the standard input" msgstr "llegeix els noms d'objecte des de l'entrada estàndard" -#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165 +#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164 msgid "do not remove, show only" msgstr "no eliminis, només mostra" @@ -16035,7 +16674,7 @@ msgstr "referència de notes" msgid "use notes from " msgstr "usa les notes de " -#: builtin/notes.c:1034 builtin/stash.c:1598 +#: builtin/notes.c:1034 builtin/stash.c:1607 #, c-format msgid "unknown subcommand: %s" msgstr "subordre desconeguda: %s" @@ -16054,391 +16693,380 @@ msgstr "" "git pack-objects [...] [< | < " "]" -#: builtin/pack-objects.c:424 +#: builtin/pack-objects.c:428 #, fuzzy, c-format msgid "bad packed object CRC for %s" msgstr "ignora els objectes empaquetats" -#: builtin/pack-objects.c:435 +#: builtin/pack-objects.c:439 #, fuzzy, c-format msgid "corrupt packed object for %s" msgstr "ignora els objectes empaquetats" -#: builtin/pack-objects.c:566 +#: builtin/pack-objects.c:570 #, fuzzy, c-format msgid "recursive delta detected for object %s" msgstr "no s'ha rebut l'objecte esperat %s" -#: builtin/pack-objects.c:777 +#: builtin/pack-objects.c:781 #, c-format msgid "ordered %u objects, expected %" msgstr "" -#: builtin/pack-objects.c:790 +#: builtin/pack-objects.c:794 #, fuzzy, c-format msgid "packfile is invalid: %s" msgstr "%s no vàlid" -#: builtin/pack-objects.c:794 +#: builtin/pack-objects.c:798 #, fuzzy, c-format msgid "unable to open packfile for reuse: %s" msgstr "no s'ha pogut obrir o llegir %s" -#: builtin/pack-objects.c:798 +#: builtin/pack-objects.c:802 #, fuzzy msgid "unable to seek in reused packfile" msgstr "no es pot llegir el fitxer d'índex" -#: builtin/pack-objects.c:809 +#: builtin/pack-objects.c:813 #, fuzzy msgid "unable to read from reused packfile" msgstr "no es pot llegir el fitxer d'índex" -#: builtin/pack-objects.c:837 +#: builtin/pack-objects.c:841 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "s'està inhabilitant l'escriptura de mapes de bits, es divideixen els paquets " "a causa de pack.packSizeLimit" -#: builtin/pack-objects.c:850 +#: builtin/pack-objects.c:854 msgid "Writing objects" msgstr "S'estan escrivint els objectes" -#: builtin/pack-objects.c:912 builtin/update-index.c:89 +#: builtin/pack-objects.c:917 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "s'ha produït un error en fer stat a %s" -#: builtin/pack-objects.c:965 +#: builtin/pack-objects.c:970 #, c-format msgid "wrote % objects while expecting %" msgstr "" -#: builtin/pack-objects.c:1161 +#: builtin/pack-objects.c:1164 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "s'està inhabilitant l'escriptura de mapes de bits, perquè alguns objectes no " "s'empaqueten" -#: builtin/pack-objects.c:1591 +#: builtin/pack-objects.c:1592 #, fuzzy, c-format msgid "delta base offset overflow in pack for %s" msgstr "el desplaçament de base de diferències està fora de límits" -#: builtin/pack-objects.c:1600 +#: builtin/pack-objects.c:1601 #, fuzzy, c-format msgid "delta base offset out of bound for %s" msgstr "el desplaçament de base de diferències està fora de límits" -#: builtin/pack-objects.c:1869 +#: builtin/pack-objects.c:1870 msgid "Counting objects" msgstr "S'estan comptant els objectes" -#: builtin/pack-objects.c:1999 +#: builtin/pack-objects.c:2000 #, fuzzy, c-format msgid "unable to get size of %s" msgstr "no s'ha pogut moure %s a %s" -#: builtin/pack-objects.c:2014 +#: builtin/pack-objects.c:2015 #, fuzzy, c-format msgid "unable to parse object header of %s" msgstr "no s'ha pogut analitzar l'objecte: %s" -#: builtin/pack-objects.c:2084 builtin/pack-objects.c:2100 -#: builtin/pack-objects.c:2110 +#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2101 +#: builtin/pack-objects.c:2111 #, fuzzy, c-format msgid "object %s cannot be read" msgstr "objecte %s no trobat" -#: builtin/pack-objects.c:2087 builtin/pack-objects.c:2114 +#: builtin/pack-objects.c:2088 builtin/pack-objects.c:2115 #, c-format msgid "object %s inconsistent object length (% vs %)" msgstr "" -#: builtin/pack-objects.c:2124 +#: builtin/pack-objects.c:2125 msgid "suboptimal pack - out of memory" msgstr "" -#: builtin/pack-objects.c:2450 +#: builtin/pack-objects.c:2440 #, c-format msgid "Delta compression using up to %d threads" msgstr "" -#: builtin/pack-objects.c:2582 +#: builtin/pack-objects.c:2572 #, fuzzy, c-format msgid "unable to pack objects reachable from tag %s" msgstr "inclou els objectes abastables de qualsevol referència" -#: builtin/pack-objects.c:2669 +#: builtin/pack-objects.c:2659 msgid "Compressing objects" msgstr "S'estan comprimint els objectes" -#: builtin/pack-objects.c:2675 +#: builtin/pack-objects.c:2665 msgid "inconsistency with delta count" msgstr "" -#: builtin/pack-objects.c:2756 +#: builtin/pack-objects.c:2742 #, c-format msgid "" "expected edge object ID, got garbage:\n" " %s" msgstr "" -#: builtin/pack-objects.c:2762 +#: builtin/pack-objects.c:2748 #, c-format msgid "" "expected object ID, got garbage:\n" " %s" msgstr "" -#: builtin/pack-objects.c:2860 +#: builtin/pack-objects.c:2846 msgid "invalid value for --missing" msgstr "valor no vàlid per a --missing" -#: builtin/pack-objects.c:2919 builtin/pack-objects.c:3027 +#: builtin/pack-objects.c:2905 builtin/pack-objects.c:3013 #, fuzzy msgid "cannot open pack index" msgstr "no es pot fer pread en el fitxer de paquet" -#: builtin/pack-objects.c:2950 +#: builtin/pack-objects.c:2936 #, c-format msgid "loose object at %s could not be examined" msgstr "" -#: builtin/pack-objects.c:3035 +#: builtin/pack-objects.c:3021 #, fuzzy msgid "unable to force loose object" msgstr "no s'ha pogut escriure l'objecte de nota" -#: builtin/pack-objects.c:3127 +#: builtin/pack-objects.c:3113 #, fuzzy, c-format msgid "not a rev '%s'" msgstr "no es pot llegir «%s»" -#: builtin/pack-objects.c:3130 +#: builtin/pack-objects.c:3116 #, c-format msgid "bad revision '%s'" msgstr "revisió incorrecte «%s»" -#: builtin/pack-objects.c:3155 +#: builtin/pack-objects.c:3141 msgid "unable to add recent objects" msgstr "no s'han pogut afegir els objectes recents" -#: builtin/pack-objects.c:3208 +#: builtin/pack-objects.c:3194 #, c-format msgid "unsupported index version %s" msgstr "versió d'índex no compatible %s" -#: builtin/pack-objects.c:3212 +#: builtin/pack-objects.c:3198 #, c-format msgid "bad index version '%s'" msgstr "versió d'índex incorrecta «%s»" -#: builtin/pack-objects.c:3242 -msgid "do not show progress meter" -msgstr "no mostris l'indicador de progrés" - -#: builtin/pack-objects.c:3244 -msgid "show progress meter" -msgstr "mostra l'indicador de progrés" - -#: builtin/pack-objects.c:3246 -msgid "show progress meter during object writing phase" -msgstr "mostra l'indicador de progrés durant la fase d'escriptura d'objectes" - -#: builtin/pack-objects.c:3249 -msgid "similar to --all-progress when progress meter is shown" -msgstr "similar a --all-progress quan l'indicador de progrés es mostra" - -#: builtin/pack-objects.c:3250 +#: builtin/pack-objects.c:3236 msgid "[,]" msgstr "[,]" -#: builtin/pack-objects.c:3251 +#: builtin/pack-objects.c:3237 msgid "write the pack index file in the specified idx format version" msgstr "" "escriu el fitxer d'índex de paquet en la versió de format d'índex " "especificada" -#: builtin/pack-objects.c:3254 +#: builtin/pack-objects.c:3240 msgid "maximum size of each output pack file" msgstr "mida màxima de cada fitxer empaquetat de sortida" -#: builtin/pack-objects.c:3256 +#: builtin/pack-objects.c:3242 msgid "ignore borrowed objects from alternate object store" msgstr "ignora els objectes prestats d'un emmagatzematge d'objectes alternatiu" -#: builtin/pack-objects.c:3258 +#: builtin/pack-objects.c:3244 msgid "ignore packed objects" msgstr "ignora els objectes empaquetats" -#: builtin/pack-objects.c:3260 +#: builtin/pack-objects.c:3246 msgid "limit pack window by objects" msgstr "limita la finestra d'empaquetament per objectes" -#: builtin/pack-objects.c:3262 +#: builtin/pack-objects.c:3248 msgid "limit pack window by memory in addition to object limit" msgstr "" "limita la finestra d'empaquetament per memòria a més del límit d'objectes" -#: builtin/pack-objects.c:3264 +#: builtin/pack-objects.c:3250 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" "longitud màxima de la cadena de diferències permesa en el paquet resultant" -#: builtin/pack-objects.c:3266 +#: builtin/pack-objects.c:3252 msgid "reuse existing deltas" msgstr "reusa les diferències existents" -#: builtin/pack-objects.c:3268 +#: builtin/pack-objects.c:3254 msgid "reuse existing objects" msgstr "reusa els objectes existents" -#: builtin/pack-objects.c:3270 +#: builtin/pack-objects.c:3256 msgid "use OFS_DELTA objects" msgstr "usa objectes OFS_DELTA" -#: builtin/pack-objects.c:3272 +#: builtin/pack-objects.c:3258 msgid "use threads when searching for best delta matches" msgstr "usa fils en cercar les millores coincidències de diferències" -#: builtin/pack-objects.c:3274 +#: builtin/pack-objects.c:3260 msgid "do not create an empty pack output" msgstr "no creïs una emissió de paquet buida" -#: builtin/pack-objects.c:3276 +#: builtin/pack-objects.c:3262 msgid "read revision arguments from standard input" msgstr "llegeix els paràmetres de revisió des de l'entrada estàndard" -#: builtin/pack-objects.c:3278 +#: builtin/pack-objects.c:3264 msgid "limit the objects to those that are not yet packed" msgstr "limita els objectes als quals encara no s'hagin empaquetat" -#: builtin/pack-objects.c:3281 +#: builtin/pack-objects.c:3267 msgid "include objects reachable from any reference" msgstr "inclou els objectes abastables de qualsevol referència" -#: builtin/pack-objects.c:3284 +#: builtin/pack-objects.c:3270 msgid "include objects referred by reflog entries" msgstr "" "inclou els objectes als quals facin referència les entrades del registre de " "referències" -#: builtin/pack-objects.c:3287 +#: builtin/pack-objects.c:3273 msgid "include objects referred to by the index" msgstr "inclou els objectes als quals faci referència l'índex" -#: builtin/pack-objects.c:3290 +#: builtin/pack-objects.c:3276 msgid "output pack to stdout" msgstr "emet el paquet a stdout" -#: builtin/pack-objects.c:3292 +#: builtin/pack-objects.c:3278 msgid "include tag objects that refer to objects to be packed" msgstr "" "inclou els objectes d'etiqueta que facin referència als objectes a empaquetar" -#: builtin/pack-objects.c:3294 +#: builtin/pack-objects.c:3280 msgid "keep unreachable objects" msgstr "retén els objectes inabastables" -#: builtin/pack-objects.c:3296 +#: builtin/pack-objects.c:3282 msgid "pack loose unreachable objects" msgstr "empaqueta els objectes inabastables solts" -#: builtin/pack-objects.c:3298 +#: builtin/pack-objects.c:3284 msgid "unpack unreachable objects newer than