diff --git a/po/TEAMS b/po/TEAMS index 2fc21adc9a..677cece102 100644 --- a/po/TEAMS +++ b/po/TEAMS @@ -42,6 +42,10 @@ Leader: Gwan-gyeong Mun Members: Changwoo Ryu Sihyeon Jang +Language: pl (Polish) +Repository: https://github.com/Arusekk/git-po +Leader: Arusekk + Language: pt_PT (Portuguese - Portugal) Repository: https://github.com/git-l10n-pt-PT/git-po/ Leader: Daniel Santos diff --git a/po/bg.po b/po/bg.po index c2af08224f..d73e84c8f8 100644 --- a/po/bg.po +++ b/po/bg.po @@ -148,6 +148,7 @@ # end packet пакет за край # identity самоличност, информация за # boundary commit гранично подаване +# integrate (changes) внасяне (на промени) # ------------------------ # „$var“ - може да не сработва за shell има gettext и eval_gettext - проверка - намират се лесно по „$ # ------------------------ @@ -164,10 +165,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.29\n" +"Project-Id-Version: git 2.30\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2020-10-10 09:32+0800\n" -"PO-Revision-Date: 2020-10-11 15:00+0200\n" +"POT-Creation-Date: 2020-12-21 07:10+0800\n" +"PO-Revision-Date: 2020-12-22 17:48+0100\n" "Last-Translator: Alexander Shopov \n" "Language-Team: Bulgarian \n" "Language: bg\n" @@ -176,200 +177,200 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: add-interactive.c:368 +#: add-interactive.c:376 #, c-format msgid "Huh (%s)?" msgstr "Неуспешен анализ — „%s“." -#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3250 -#: sequencer.c:3698 sequencer.c:3840 builtin/rebase.c:1526 -#: builtin/rebase.c:1944 +#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3284 +#: sequencer.c:3735 sequencer.c:3890 builtin/rebase.c:1532 +#: builtin/rebase.c:1955 msgid "could not read index" msgstr "индексът не може да бъде прочетен" -#: add-interactive.c:576 git-add--interactive.perl:269 +#: add-interactive.c:584 git-add--interactive.perl:269 #: git-add--interactive.perl:294 msgid "binary" msgstr "двоично" -#: add-interactive.c:634 git-add--interactive.perl:278 +#: add-interactive.c:642 git-add--interactive.perl:278 #: git-add--interactive.perl:332 msgid "nothing" msgstr "нищо" -#: add-interactive.c:635 git-add--interactive.perl:314 +#: add-interactive.c:643 git-add--interactive.perl:314 #: git-add--interactive.perl:329 msgid "unchanged" msgstr "няма промени" -#: add-interactive.c:672 git-add--interactive.perl:643 +#: add-interactive.c:680 git-add--interactive.perl:641 msgid "Update" msgstr "Обновяване" -#: add-interactive.c:689 add-interactive.c:877 +#: add-interactive.c:697 add-interactive.c:885 #, c-format msgid "could not stage '%s'" msgstr "неуспешно добавяне в индекса на „%s“" -#: add-interactive.c:695 add-interactive.c:884 reset.c:89 sequencer.c:3444 +#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3478 msgid "could not write index" msgstr "индексът не може да бъде записан" -#: add-interactive.c:698 git-add--interactive.perl:628 +#: add-interactive.c:706 git-add--interactive.perl:626 #, 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:716 git-add--interactive.perl:678 +#: add-interactive.c:724 git-add--interactive.perl:676 #, c-format, perl-format msgid "note: %s is untracked now.\n" msgstr "БЕЛЕЖКА: „%s“ вече не се следи.\n" -#: add-interactive.c:721 apply.c:4127 builtin/checkout.c:295 +#: add-interactive.c:729 apply.c:4125 builtin/checkout.c:295 #: builtin/reset.c:145 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "неуспешно създаване на запис в кеша чрез „make_cache_entry“ за „%s“" -#: add-interactive.c:751 git-add--interactive.perl:655 +#: add-interactive.c:759 git-add--interactive.perl:653 msgid "Revert" msgstr "Отмяна" -#: add-interactive.c:767 +#: add-interactive.c:775 msgid "Could not parse HEAD^{tree}" msgstr "Указателят „HEAD^{tree}“ не може да бъде анализиран" -#: add-interactive.c:805 git-add--interactive.perl:631 +#: add-interactive.c:813 git-add--interactive.perl:629 #, 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:856 git-add--interactive.perl:695 +#: add-interactive.c:864 git-add--interactive.perl:693 #, c-format msgid "No untracked files.\n" msgstr "Няма неследени файлове.\n" -#: add-interactive.c:860 git-add--interactive.perl:689 +#: add-interactive.c:868 git-add--interactive.perl:687 msgid "Add untracked" msgstr "Добавяне на неследени" -#: add-interactive.c:887 git-add--interactive.perl:625 +#: add-interactive.c:895 git-add--interactive.perl:623 #, 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:917 +#: add-interactive.c:925 #, c-format msgid "ignoring unmerged: %s" msgstr "пренебрегване на неслятото: „%s“" -#: add-interactive.c:929 add-patch.c:1738 git-add--interactive.perl:1371 +#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369 #, c-format msgid "Only binary files changed.\n" msgstr "Само двоични файлове са променени.\n" -#: add-interactive.c:931 add-patch.c:1736 git-add--interactive.perl:1373 +#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371 #, c-format msgid "No changes.\n" msgstr "Няма промени.\n" -#: add-interactive.c:935 git-add--interactive.perl:1381 +#: add-interactive.c:943 git-add--interactive.perl:1379 msgid "Patch update" msgstr "Обновяване на кръпка" -#: add-interactive.c:974 git-add--interactive.perl:1794 +#: add-interactive.c:982 git-add--interactive.perl:1792 msgid "Review diff" msgstr "Преглед на разликата" -#: add-interactive.c:1002 +#: add-interactive.c:1010 msgid "show paths with changes" msgstr "извеждане на пътищата с промени" -#: add-interactive.c:1004 +#: add-interactive.c:1012 msgid "add working tree state to the staged set of changes" msgstr "добавяне на състоянието на работното дърво към промените в индекса" -#: add-interactive.c:1006 +#: add-interactive.c:1014 msgid "revert staged set of changes back to the HEAD version" msgstr "връщане на състоянието на индекса към соченото от „HEAD“" -#: add-interactive.c:1008 +#: add-interactive.c:1016 msgid "pick hunks and update selectively" msgstr "интерактивни избор и промяна на парчета код" -#: add-interactive.c:1010 +#: add-interactive.c:1018 msgid "view diff between HEAD and index" msgstr "разлика между соченото от „HEAD“ и индекса" -#: add-interactive.c:1012 +#: add-interactive.c:1020 msgid "add contents of untracked files to the staged set of changes" msgstr "добавяне на съдържанието на неследените файлове към индекса" -#: add-interactive.c:1020 add-interactive.c:1069 +#: add-interactive.c:1028 add-interactive.c:1077 msgid "Prompt help:" msgstr "Помощ:" -#: add-interactive.c:1022 +#: add-interactive.c:1030 msgid "select a single item" msgstr "избор на eдин елемент" -#: add-interactive.c:1024 +#: add-interactive.c:1032 msgid "select a range of items" msgstr "избор на поредица от елементи" -#: add-interactive.c:1026 +#: add-interactive.c:1034 msgid "select multiple ranges" msgstr "избор на няколко поредици от елементи" -#: add-interactive.c:1028 add-interactive.c:1073 +#: add-interactive.c:1036 add-interactive.c:1081 msgid "select item based on unique prefix" msgstr "избор на базата на уникален префикс" -#: add-interactive.c:1030 +#: add-interactive.c:1038 msgid "unselect specified items" msgstr "изваждане на указаното от избора" -#: add-interactive.c:1032 +#: add-interactive.c:1040 msgid "choose all items" msgstr "избор на всички елементи" -#: add-interactive.c:1034 +#: add-interactive.c:1042 msgid "(empty) finish selecting" msgstr "(празно) приключване на избирането" -#: add-interactive.c:1071 +#: add-interactive.c:1079 msgid "select a numbered item" msgstr "избор на номериран елемент" -#: add-interactive.c:1075 +#: add-interactive.c:1083 msgid "(empty) select nothing" msgstr "(празно) без избор на нищо" -#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1891 +#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896 msgid "*** Commands ***" msgstr "●●● Команди ●●●" -#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1888 +#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893 msgid "What now" msgstr "Избор на следващо действие" -#: add-interactive.c:1136 git-add--interactive.perl:213 +#: add-interactive.c:1144 git-add--interactive.perl:213 msgid "staged" msgstr "в индекса" -#: add-interactive.c:1136 git-add--interactive.perl:213 +#: add-interactive.c:1144 git-add--interactive.perl:213 msgid "unstaged" msgstr "извън индекса" -#: add-interactive.c:1136 apply.c:4984 apply.c:4987 builtin/am.c:2270 -#: builtin/am.c:2273 builtin/bugreport.c:133 builtin/clone.c:123 -#: builtin/fetch.c:147 builtin/merge.c:275 builtin/pull.c:190 +#: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257 +#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124 +#: builtin/fetch.c:147 builtin/merge.c:284 builtin/pull.c:190 #: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818 #: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326 #: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572 @@ -377,32 +378,32 @@ msgstr "извън индекса" msgid "path" msgstr "път" -#: add-interactive.c:1143 +#: add-interactive.c:1151 msgid "could not refresh index" msgstr "индексът не може да бъде обновен" # -#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1805 +#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803 #, c-format msgid "Bye.\n" msgstr "Изход.\n" -#: add-patch.c:34 git-add--interactive.perl:1433 +#: add-patch.c:34 git-add--interactive.perl:1431 #, c-format, perl-format msgid "Stage mode change [y,n,q,a,d%s,?]? " msgstr "Добавяне на промяната на правата за достъп [y,n,q,a,d%s,?]? " -#: add-patch.c:35 git-add--interactive.perl:1434 +#: add-patch.c:35 git-add--interactive.perl:1432 #, c-format, perl-format msgid "Stage deletion [y,n,q,a,d%s,?]? " msgstr "Добавяне на изтриването [y,n,q,a,d%s,?]? " -#: add-patch.c:36 git-add--interactive.perl:1435 +#: add-patch.c:36 git-add--interactive.perl:1433 #, c-format, perl-format msgid "Stage addition [y,n,q,a,d%s,?]? " msgstr "Добавяне на добавянето [y,n,q,a,d%s,?]? " -#: add-patch.c:37 git-add--interactive.perl:1436 +#: add-patch.c:37 git-add--interactive.perl:1434 #, c-format, perl-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "Добавяне на това парче [y,n,q,a,d%s,?]? " @@ -429,22 +430,22 @@ msgstr "" "a — добавяне на това и всички следващи парчета от файла в индекса\n" "d — без добавяне на това и всички следващи парчета от файла в индекса\n" -#: add-patch.c:56 git-add--interactive.perl:1439 +#: add-patch.c:56 git-add--interactive.perl:1437 #, c-format, perl-format msgid "Stash mode change [y,n,q,a,d%s,?]? " msgstr "Скатаване на промяната на правата за достъп [y,n,q,a,d%s,?]? " -#: add-patch.c:57 git-add--interactive.perl:1440 +#: add-patch.c:57 git-add--interactive.perl:1438 #, c-format, perl-format msgid "Stash deletion [y,n,q,a,d%s,?]? " msgstr "Скатаване на изтриването [y,n,q,a,d%s,?]? " -#: add-patch.c:58 git-add--interactive.perl:1441 +#: add-patch.c:58 git-add--interactive.perl:1439 #, c-format, perl-format msgid "Stash addition [y,n,q,a,d%s,?]? " msgstr "Скатаване на добавянето [y,n,q,a,d%s,?]? " -#: add-patch.c:59 git-add--interactive.perl:1442 +#: add-patch.c:59 git-add--interactive.perl:1440 #, c-format, perl-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "Скатаване на това парче [y,n,q,a,d%s,?]? " @@ -471,22 +472,22 @@ msgstr "" "a — скатаване на това и всички следващи парчета от файла\n" "d — без скатаване на това и всички следващи парчета от файла\n" -#: add-patch.c:80 git-add--interactive.perl:1445 +#: add-patch.c:80 git-add--interactive.perl:1443 #, c-format, perl-format msgid "Unstage mode change [y,n,q,a,d%s,?]? " msgstr "Изваждане на промяната на правата за достъп [y,n,q,a,d%s,?]? " -#: add-patch.c:81 git-add--interactive.perl:1446 +#: add-patch.c:81 git-add--interactive.perl:1444 #, c-format, perl-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " msgstr "Изваждане на изтриването [y,n,q,a,d%s,?]? " -#: add-patch.c:82 git-add--interactive.perl:1447 +#: add-patch.c:82 git-add--interactive.perl:1445 #, c-format, perl-format msgid "Unstage addition [y,n,q,a,d%s,?]? " msgstr "Изваждане на добавянето [y,n,q,a,d%s,?]? " -#: add-patch.c:83 git-add--interactive.perl:1448 +#: add-patch.c:83 git-add--interactive.perl:1446 #, c-format, perl-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " msgstr "Изваждане на това парче [y,n,q,a,d%s,?]? " @@ -513,23 +514,23 @@ msgstr "" "a — изваждане на това и всички следващи парчета от файла от индекса\n" "d — без изваждане на това и всички следващи парчета от файла от индекса\n" -#: add-patch.c:103 git-add--interactive.perl:1451 +#: add-patch.c:103 git-add--interactive.perl:1449 #, c-format, perl-format msgid "Apply mode change to index [y,n,q,a,d%s,?]? " msgstr "" "Прилагане на промяната на правата за достъп към индекса [y,n,q,a,d%s,?]? " -#: add-patch.c:104 git-add--interactive.perl:1452 +#: add-patch.c:104 git-add--interactive.perl:1450 #, c-format, perl-format msgid "Apply deletion to index [y,n,q,a,d%s,?]? " msgstr "Прилагане на изтриването към индекса [y,n,q,a,d%s,?]? " -#: add-patch.c:105 git-add--interactive.perl:1453 +#: add-patch.c:105 git-add--interactive.perl:1451 #, c-format, perl-format msgid "Apply addition to index [y,n,q,a,d%s,?]? " msgstr "Прилагане на добавянето към индекса [y,n,q,a,d%s,?]? " -#: add-patch.c:106 git-add--interactive.perl:1454 +#: add-patch.c:106 git-add--interactive.perl:1452 #, c-format, perl-format msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " msgstr "Прилагане на това парче към индекса [y,n,q,a,d%s,?]? " @@ -556,28 +557,28 @@ msgstr "" "a — прилагане на това и всички следващи парчета от файла към индекса\n" "d — без прилагане на това и всички следващи парчета от файла към индекса\n" -#: add-patch.c:126 git-add--interactive.perl:1457 -#: git-add--interactive.perl:1475 +#: add-patch.c:126 git-add--interactive.perl:1455 +#: git-add--interactive.perl:1473 #, c-format, perl-format msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " msgstr "" "Премахване на промяната в правата за достъп от работното дърво [y,n,q,a,d" "%s,?]? " -#: add-patch.c:127 git-add--interactive.perl:1458 -#: git-add--interactive.perl:1476 +#: add-patch.c:127 git-add--interactive.perl:1456 +#: git-add--interactive.perl:1474 #, c-format, perl-format msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " msgstr "Премахване на изтриването от работното дърво [y,n,q,a,d%s,?]? " -#: add-patch.c:128 git-add--interactive.perl:1459 -#: git-add--interactive.perl:1477 +#: add-patch.c:128 git-add--interactive.perl:1457 +#: git-add--interactive.perl:1475 #, c-format, perl-format msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " msgstr "Премахване на добавянето от работното дърво [y,n,q,a,d%s,?]? " -#: add-patch.c:129 git-add--interactive.perl:1460 -#: git-add--interactive.perl:1478 +#: add-patch.c:129 git-add--interactive.perl:1458 +#: git-add--interactive.perl:1476 #, c-format, perl-format msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " msgstr "Премахване на парчето от работното дърво [y,n,q,a,d%s,?]? " @@ -607,26 +608,26 @@ msgstr "" "d — без премахване на това и всички следващи парчета от файла от работното " "дърво\n" -#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463 +#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461 #, c-format, perl-format msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Премахване на промяната в правата за достъп от индекса и работното дърво [y," "n,q,a,d%s,?]? " -#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464 +#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462 #, c-format, perl-format msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Премахване на изтриването от индекса и работното дърво [y,n,q,a,d%s,?]? " -#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465 +#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463 #, c-format, perl-format msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Премахване на добавянето от индекса и работното дърво [y,n,q,a,d%s,?]? " -#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466 +#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464 #, c-format, perl-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " msgstr "Премахване на парчето от индекса и работното дърво [y,n,q,a,d%s,?]? " @@ -648,25 +649,25 @@ msgstr "" "d — без премахване на това и всички следващи парчета от файла от индекса и " "работното дърво\n" -#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469 +#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467 #, c-format, perl-format msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Прилагане на промяната в правата за достъп от индекса и работното дърво [y,n," "q,a,d%s,?]? " -#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470 +#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468 #, c-format, perl-format msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Прилагане на изтриването от индекса и работното дърво [y,n,q,a,d%s,?]? " -#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471 +#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469 #, c-format, perl-format msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " msgstr "Прилагане на добавянето от индекса и работното дърво [y,n,q,a,d%s,?]? " -#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472 +#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470 #, c-format, perl-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " msgstr "Прилагане на парчето от индекса и работното дърво [y,n,q,a,d%s,?]? " @@ -737,7 +738,7 @@ msgstr "" "Обработените редове на изхода на ползвания филтър, трябва\n" "да се отнасят едно към едно спрямо редовете на входа." -#: add-patch.c:785 +#: add-patch.c:790 #, c-format msgid "" "expected context line #%d in\n" @@ -746,7 +747,7 @@ msgstr "" "очаква се ред №%d от контекста в\n" "%.*s" -#: add-patch.c:800 +#: add-patch.c:805 #, c-format msgid "" "hunks do not overlap:\n" @@ -759,11 +760,11 @@ msgstr "" " не завършва с:\n" "%.*s" -#: add-patch.c:1076 git-add--interactive.perl:1117 +#: add-patch.c:1081 git-add--interactive.perl:1115 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "Ръчно редактиране на парчета код — отдолу има подсказка.\n" -#: add-patch.c:1080 +#: add-patch.c:1085 #, c-format msgid "" "---\n" @@ -778,7 +779,7 @@ msgstr "" "Редовете, които започват с „%c“ ще бъдат пропуснати.\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:1094 git-add--interactive.perl:1131 +#: add-patch.c:1099 git-add--interactive.perl:1129 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" @@ -788,11 +789,11 @@ msgstr "" "изтриете всички редове от парчето код, то ще бъде оставено непроменено, а\n" "редактирането — отказано.\n" -#: add-patch.c:1127 +#: add-patch.c:1132 msgid "could not parse hunk header" msgstr "заглавната част парчето не може да се анализира" -#: add-patch.c:1172 +#: add-patch.c:1177 msgid "'git apply --cached' failed" msgstr "неуспешно изпълнение на „git apply --cached“" @@ -808,7 +809,7 @@ msgstr "неуспешно изпълнение на „git apply --cached“" #. 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:1241 git-add--interactive.perl:1244 +#: add-patch.c:1246 git-add--interactive.perl:1242 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" @@ -816,19 +817,19 @@ msgstr "" "редактирането? (текущите редакции ще се отменят при отказ!): „y“ (да)/ " "„n“ (не)? " -#: add-patch.c:1284 +#: add-patch.c:1289 msgid "The selected hunks do not apply to the index!" msgstr "Избраните парчета не могат да се добавят в индекса!" -#: add-patch.c:1285 git-add--interactive.perl:1348 +#: add-patch.c:1290 git-add--interactive.perl:1346 msgid "Apply them to the worktree anyway? " msgstr "Да се приложат ли към работното дърво? " -#: add-patch.c:1292 git-add--interactive.perl:1351 +#: add-patch.c:1297 git-add--interactive.perl:1349 msgid "Nothing was applied.\n" msgstr "Нищо не е приложено.\n" -#: add-patch.c:1349 +#: add-patch.c:1354 msgid "" "j - leave this hunk undecided, see next undecided hunk\n" "J - leave this hunk undecided, see next hunk\n" @@ -850,73 +851,73 @@ msgstr "" "e — ръчно редактиране на текущото парче\n" "? — извеждане не помощта\n" -#: add-patch.c:1511 add-patch.c:1521 +#: add-patch.c:1516 add-patch.c:1526 msgid "No previous hunk" msgstr "Няма друго парче преди това" -#: add-patch.c:1516 add-patch.c:1526 +#: add-patch.c:1521 add-patch.c:1531 msgid "No next hunk" msgstr "Няма друго парче след това" -#: add-patch.c:1532 +#: add-patch.c:1537 msgid "No other hunks to goto" msgstr "Няма други парчета" -#: add-patch.c:1543 git-add--interactive.perl:1608 +#: add-patch.c:1548 git-add--interactive.perl:1606 msgid "go to which hunk ( to see more)? " msgstr "към кое парче да се придвижи (за повече варианти натиснете „enter“)? " -#: add-patch.c:1544 git-add--interactive.perl:1610 +#: add-patch.c:1549 git-add--interactive.perl:1608 msgid "go to which hunk? " msgstr "към кое парче да се придвижи? " -#: add-patch.c:1555 +#: add-patch.c:1560 #, c-format msgid "Invalid number: '%s'" msgstr "Неправилен номер: „%s“" -#: add-patch.c:1560 +#: add-patch.c:1565 #, c-format msgid "Sorry, only %d hunk available." msgid_plural "Sorry, only %d hunks available." msgstr[0] "Има само %d парче." msgstr[1] "Има само %d парчета." -#: add-patch.c:1569 +#: add-patch.c:1574 msgid "No other hunks to search" msgstr "Няма други парчета за търсене" -#: add-patch.c:1575 git-add--interactive.perl:1663 +#: add-patch.c:1580 git-add--interactive.perl:1661 msgid "search for regex? " msgstr "да се търси с регулярен израз? " -#: add-patch.c:1590 +#: add-patch.c:1595 #, c-format msgid "Malformed search regexp %s: %s" msgstr "Сгрешен регулярен израз „%s“: %s" -#: add-patch.c:1607 +#: add-patch.c:1612 msgid "No hunk matches the given pattern" msgstr "Никое парче не напасва на регулярния израз" -#: add-patch.c:1614 +#: add-patch.c:1619 msgid "Sorry, cannot split this hunk" msgstr "Това парче не може да бъде разделено" -#: add-patch.c:1618 +#: add-patch.c:1623 #, c-format msgid "Split into %d hunks." msgstr "Разделяне на %d парчета." -#: add-patch.c:1622 +#: add-patch.c:1627 msgid "Sorry, cannot edit this hunk" msgstr "Това парче не може да бъде редактирано" -#: add-patch.c:1674 +#: add-patch.c:1679 msgid "'git apply' failed" msgstr "неуспешно изпълнение на „git apply“" -#: advice.c:140 +#: advice.c:143 #, c-format msgid "" "\n" @@ -926,37 +927,37 @@ msgstr "" "За да изключите това предупреждение, изпълнете:\n" " git config advice.%s false" -#: advice.c:156 +#: advice.c:159 #, c-format msgid "%shint: %.*s%s\n" msgstr "%sподсказка: %.*s%s\n" -#: advice.c:247 +#: advice.c:250 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "Отбирането на подавания е блокирано от неслети файлове." -#: advice.c:249 +#: advice.c:252 msgid "Committing is not possible because you have unmerged files." msgstr "Подаването е блокирано от неслети файлове." -#: advice.c:251 +#: advice.c:254 msgid "Merging is not possible because you have unmerged files." msgstr "Сливането е блокирано от неслети файлове." -#: advice.c:253 +#: advice.c:256 msgid "Pulling is not possible because you have unmerged files." msgstr "Издърпването е блокирано от неслети файлове." -#: advice.c:255 +#: advice.c:258 msgid "Reverting is not possible because you have unmerged files." msgstr "Отмяната е блокирана от неслети файлове." -#: advice.c:257 +#: advice.c:260 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "Действието „%s“ е блокирано от неслети файлове." -#: advice.c:265 +#: advice.c:268 msgid "" "Fix them up in the work tree, and then use 'git add/rm '\n" "as appropriate to mark resolution and make a commit." @@ -964,23 +965,23 @@ msgstr "" "Редактирайте ги в работното дърво, и тогава ползвайте „git add/rm ФАЙЛ“,\n" "за да отбележите коригирането им. След това извършете подаването." -#: advice.c:273 +#: advice.c:276 msgid "Exiting because of an unresolved conflict." msgstr "Изход от програмата заради некоригиран конфликт." -#: advice.c:278 builtin/merge.c:1349 +#: advice.c:281 builtin/merge.c:1369 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Не сте завършили сливане. (Указателят „MERGE_HEAD“ съществува)." -#: advice.c:280 +#: advice.c:283 msgid "Please, commit your changes before merging." msgstr "Промените трябва да се подадат преди сливане." -#: advice.c:281 +#: advice.c:284 msgid "Exiting because of unfinished merge." msgstr "Изход от програмата заради незавършено сливане." -#: advice.c:287 +#: advice.c:290 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -1284,7 +1285,7 @@ msgstr "неуспешно прилагане на кръпка: „%s:%ld“" msgid "cannot checkout %s" msgstr "„%s“ не може да се изтегли" -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:72 setup.c:308 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:73 setup.c:308 #, c-format msgid "failed to read %s" msgstr "файлът „%s“ не може да бъде прочетен" @@ -1304,7 +1305,7 @@ msgstr "обектът с път „%s“ е преименуван или из msgid "%s: does not exist in index" msgstr "„%s“ не съществува в индекса" -#: apply.c:3537 apply.c:3708 apply.c:3953 +#: apply.c:3537 apply.c:3708 apply.c:3952 #, c-format msgid "%s: does not match index" msgstr "„%s“ не съответства на индекса" @@ -1365,174 +1366,174 @@ msgstr "неправилен път: „%s“" msgid "%s: already exists in index" msgstr "„%s“: вече съществува в индекса" -#: apply.c:3956 +#: apply.c:3954 #, c-format msgid "%s: already exists in working directory" msgstr "„%s“: вече съществува в работното дърво" -#: apply.c:3976 +#: apply.c:3974 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "новите права за достъп (%o) на „%s“ не съвпадат със старите (%o)" -#: apply.c:3981 +#: apply.c:3979 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" "новите права за достъп (%o) на „%s“ не съвпадат със старите (%o) на „%s“" -#: apply.c:4001 +#: apply.c:3999 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "засегнатият файл „%s“ е след символна връзка" -#: apply.c:4005 +#: apply.c:4003 #, c-format msgid "%s: patch does not apply" msgstr "Кръпката „%s“ не може да бъде приложена" -#: apply.c:4020 +#: apply.c:4018 #, c-format msgid "Checking patch %s..." msgstr "Проверяване на кръпката „%s“…" -#: apply.c:4112 +#: apply.c:4110 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "" "информацията за сумата по SHA1 за подмодула липсва или не е достатъчна (%s)." -#: apply.c:4119 +#: apply.c:4117 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "смяна на режима на достъпа на „%s“, който не е в текущия връх „HEAD“" -#: apply.c:4122 +#: apply.c:4120 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "информацията за сумата по SHA1 липсва или не е достатъчна (%s)." -#: apply.c:4131 +#: apply.c:4129 #, c-format msgid "could not add %s to temporary index" msgstr "„%s“ не може да се добави към временния индекс" -#: apply.c:4141 +#: apply.c:4139 #, c-format msgid "could not write temporary index to %s" msgstr "временният индекс не може да се запази в „%s“" -#: apply.c:4279 +#: apply.c:4277 #, c-format msgid "unable to remove %s from index" msgstr "„%s“ не може да се извади от индекса" -#: apply.c:4313 +#: apply.c:4311 #, c-format msgid "corrupt patch for submodule %s" msgstr "повредена кръпка за модула „%s“" -#: apply.c:4319 +#: apply.c:4317 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" "не може да се получи информация чрез „stat“ за новосъздадения файл „%s“" -#: apply.c:4327 +#: apply.c:4325 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" "не може да се за създаде мястото за съхранение на новосъздадения файл „%s“" -#: apply.c:4333 apply.c:4478 +#: apply.c:4331 apply.c:4476 #, c-format msgid "unable to add cache entry for %s" msgstr "не може да се добави запис в кеша за „%s“" -#: apply.c:4376 builtin/bisect--helper.c:537 +#: apply.c:4374 builtin/bisect--helper.c:524 #, c-format msgid "failed to write to '%s'" msgstr "в „%s“ не може да се пише" -#: apply.c:4380 +#: apply.c:4378 #, c-format msgid "closing file '%s'" msgstr "затваряне на файла „%s“" -#: apply.c:4450 +#: apply.c:4448 #, c-format msgid "unable to write file '%s' mode %o" msgstr "файлът „%s“ не може да се запише с режим на достъп „%o“" -#: apply.c:4548 +#: apply.c:4546 #, c-format msgid "Applied patch %s cleanly." msgstr "Кръпката „%s“ бе приложена чисто." -#: apply.c:4556 +#: apply.c:4554 msgid "internal error" msgstr "вътрешна грешка" -#: apply.c:4559 +#: apply.c:4557 #, 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:4570 +#: apply.c:4568 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "съкращаване на името на файла с отхвърлените парчета на „ %.*s.rej“" -#: apply.c:4578 builtin/fetch.c:927 builtin/fetch.c:1228 +#: apply.c:4576 builtin/fetch.c:927 builtin/fetch.c:1228 #, c-format msgid "cannot open %s" msgstr "„%s“ не може да бъде отворен" -#: apply.c:4592 +#: apply.c:4590 #, c-format msgid "Hunk #%d applied cleanly." msgstr "%d-то парче бе успешно приложено." -#: apply.c:4596 +#: apply.c:4594 #, c-format msgid "Rejected hunk #%d." msgstr "%d-то парче бе отхвърлено." -#: apply.c:4715 +#: apply.c:4718 #, c-format msgid "Skipped patch '%s'." msgstr "Пропусната кръпка: „%s“" -#: apply.c:4723 +#: apply.c:4726 msgid "unrecognized input" msgstr "непознат вход" -#: apply.c:4743 +#: apply.c:4746 msgid "unable to read index file" msgstr "индексът не може да бъде записан" -#: apply.c:4900 +#: apply.c:4903 #, c-format msgid "can't open patch '%s': %s" msgstr "кръпката „%s“ не може да бъде отворена: %s" -#: apply.c:4927 +#: apply.c:4930 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "пренебрегната е %d грешка в знаците за интервали" msgstr[1] "пренебрегнати са %d грешки в знаците за интервали" -#: apply.c:4933 apply.c:4948 +#: apply.c:4936 apply.c:4951 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d ред добавя грешки в знаците за интервали." msgstr[1] "%d реда добавят грешки в знаците за интервали." -#: apply.c:4941 +#: apply.c:4944 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." @@ -1541,135 +1542,135 @@ msgstr[0] "" msgstr[1] "" "Добавени са %d реда след корекцията на грешките в знаците за интервали." -#: apply.c:4957 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406 +#: apply.c:4960 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406 msgid "Unable to write new index file" msgstr "Новият индекс не може да бъде записан" -#: apply.c:4985 +#: apply.c:4988 msgid "don't apply changes matching the given path" msgstr "без прилагане на промените напасващи на дадения път" -#: apply.c:4988 +#: apply.c:4991 msgid "apply changes matching the given path" msgstr "прилагане на промените напасващи на дадения път" -#: apply.c:4990 builtin/am.c:2279 +#: apply.c:4993 builtin/am.c:2266 msgid "num" msgstr "БРОЙ" -#: apply.c:4991 +#: apply.c:4994 msgid "remove leading slashes from traditional diff paths" msgstr "премахване на този БРОЙ водещи елементи от пътищата в разликата" -#: apply.c:4994 +#: apply.c:4997 msgid "ignore additions made by the patch" msgstr "игнориране на редовете добавени от тази кръпка" -#: apply.c:4996 +#: apply.c:4999 msgid "instead of applying the patch, output diffstat for the input" msgstr "извеждане на статистика на промените без прилагане на кръпката" -#: apply.c:5000 +#: apply.c:5003 msgid "show number of added and deleted lines in decimal notation" msgstr "извеждане на броя на добавените и изтритите редове" -#: apply.c:5002 +#: apply.c:5005 msgid "instead of applying the patch, output a summary for the input" msgstr "извеждане на статистика на входните данни без прилагане на кръпката" -#: apply.c:5004 +#: apply.c:5007 msgid "instead of applying the patch, see if the patch is applicable" msgstr "проверка дали кръпката може да се приложи, без действително прилагане" -#: apply.c:5006 +#: apply.c:5009 msgid "make sure the patch is applicable to the current index" msgstr "проверка дали кръпката може да бъде приложена към текущия индекс" -#: apply.c:5008 +#: apply.c:5011 msgid "mark new files with `git add --intent-to-add`" msgstr "отбелязване на новите файлове с „git add --intent-to-add“" -#: apply.c:5010 +#: apply.c:5013 msgid "apply a patch without touching the working tree" msgstr "прилагане на кръпката без промяна на работното дърво" -#: apply.c:5012 +#: apply.c:5015 msgid "accept a patch that touches outside the working area" msgstr "прилагане на кръпка, която променя и файлове извън работното дърво" -#: apply.c:5015 +#: apply.c:5018 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" "кръпката да бъде приложена. Опцията се комбинира с „--check“/„--stat“/„--" "summary“" -#: apply.c:5017 +#: apply.c:5020 msgid "attempt three-way merge if a patch does not apply" msgstr "пробване с тройно сливане, ако кръпката не може да се приложи директно" -#: apply.c:5019 +#: apply.c:5022 msgid "build a temporary index based on embedded index information" msgstr "" "създаване на временен индекс на база на включената информация за индекса" -#: apply.c:5022 builtin/checkout-index.c:173 builtin/ls-files.c:525 +#: apply.c:5025 builtin/checkout-index.c:182 builtin/ls-files.c:525 msgid "paths are separated with NUL character" msgstr "разделяне на пътищата с нулевия знак „NUL“" -#: apply.c:5024 +#: apply.c:5027 msgid "ensure at least lines of context match" msgstr "да се осигури контекст от поне такъв БРОЙ съвпадащи редове" -#: apply.c:5025 builtin/am.c:2258 builtin/interpret-trailers.c:98 +#: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3562 builtin/rebase.c:1340 +#: builtin/pack-objects.c:3562 builtin/rebase.c:1346 msgid "action" msgstr "действие" -#: apply.c:5026 +#: apply.c:5029 msgid "detect new or modified lines that have whitespace errors" msgstr "засичане на нови или променени редове с грешки в знаците за интервали" -#: apply.c:5029 apply.c:5032 +#: apply.c:5032 apply.c:5035 msgid "ignore changes in whitespace when finding context" msgstr "" "игнориране на промените в знаците за интервали при откриване на контекста" -#: apply.c:5035 +#: apply.c:5038 msgid "apply the patch in reverse" msgstr "прилагане на кръпката в обратна посока" -#: apply.c:5037 +#: apply.c:5040 msgid "don't expect at least one line of context" msgstr "без изискване на дори и един ред контекст" -#: apply.c:5039 +#: apply.c:5042 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "оставяне на отхвърлените парчета във файлове с разширение „.rej“" -#: apply.c:5041 +#: apply.c:5044 msgid "allow overlapping hunks" msgstr "позволяване на застъпващи се парчета" -#: apply.c:5042 builtin/add.c:329 builtin/check-ignore.c:22 +#: apply.c:5045 builtin/add.c:329 builtin/check-ignore.c:22 #: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775 -#: builtin/log.c:2270 builtin/mv.c:123 builtin/read-tree.c:128 +#: builtin/log.c:2287 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "повече подробности" -#: apply.c:5044 +#: apply.c:5047 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "пренебрегване на неправилно липсващ знак за нов ред в края на файл" -#: apply.c:5047 +#: apply.c:5050 msgid "do not trust the line counts in the hunk headers" msgstr "без доверяване на номерата на редовете в заглавните части на парчетата" -#: apply.c:5049 builtin/am.c:2267 +#: apply.c:5052 builtin/am.c:2254 msgid "root" msgstr "НАЧАЛНА_ДИРЕКТОРИЯ" -#: apply.c:5050 +#: apply.c:5053 msgid "prepend to all filenames" msgstr "добавяне на тази НАЧАЛНА_ДИРЕКТОРИЯ към имената на всички файлове" @@ -1683,16 +1684,16 @@ msgstr "обектът-BLOB „%s“ не може да бъде обработ msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "неподдържани права за достъп до файл: 0%o (SHA1: %s)" -#: archive-tar.c:449 +#: archive-tar.c:450 #, c-format msgid "unable to start '%s' filter" msgstr "филтърът „%s“ не може да бъде стартиран" -#: archive-tar.c:452 +#: archive-tar.c:453 msgid "unable to redirect descriptor" msgstr "дескрипторът не може да бъде пренасочен" -#: archive-tar.c:459 +#: archive-tar.c:460 #, c-format msgid "'%s' filter reported error" msgstr "филтърът „%s“ върна грешка" @@ -1741,9 +1742,9 @@ msgstr "git archive --remote ХРАНИЛИЩЕ [--exec КОМАНДА] --list" msgid "cannot read %s" msgstr "обектът „%s“ не може да бъде прочетен" -#: archive.c:345 sequencer.c:445 sequencer.c:1706 sequencer.c:2852 -#: sequencer.c:3293 sequencer.c:3402 builtin/am.c:263 builtin/commit.c:786 -#: builtin/merge.c:1124 +#: archive.c:345 sequencer.c:459 sequencer.c:1736 sequencer.c:2886 +#: sequencer.c:3327 sequencer.c:3436 builtin/am.c:249 builtin/commit.c:786 +#: builtin/merge.c:1138 #, c-format msgid "could not read '%s'" msgstr "файлът „%s“ не може да бъде прочетен" @@ -1782,118 +1783,110 @@ msgstr "Файлът „%s“ липсва" msgid "Not a regular file: %s" msgstr "„%s“ не е обикновен файл" -#: archive.c:553 +#: archive.c:555 msgid "fmt" msgstr "ФОРМАТ" -#: archive.c:553 +#: archive.c:555 msgid "archive format" msgstr "ФОРМАТ на архива" -#: archive.c:554 builtin/log.c:1760 +#: archive.c:556 builtin/log.c:1765 msgid "prefix" msgstr "ПРЕФИКС" -#: archive.c:555 +#: archive.c:557 msgid "prepend prefix to each pathname in the archive" msgstr "добавяне на този ПРЕФИКС към всеки път в архива" -#: archive.c:556 archive.c:559 builtin/blame.c:884 builtin/blame.c:888 -#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:133 -#: builtin/fast-export.c:1208 builtin/fast-export.c:1210 -#: builtin/fast-export.c:1214 builtin/grep.c:908 builtin/hash-object.c:105 +#: archive.c:558 archive.c:561 builtin/blame.c:886 builtin/blame.c:890 +#: builtin/blame.c:891 builtin/commit-tree.c:117 builtin/config.c:135 +#: builtin/fast-export.c:1207 builtin/fast-export.c:1209 +#: builtin/fast-export.c:1213 builtin/grep.c:919 builtin/hash-object.c:105 #: builtin/ls-files.c:561 builtin/ls-files.c:564 builtin/notes.c:412 #: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190 msgid "file" msgstr "ФАЙЛ" -#: archive.c:557 +#: archive.c:559 msgid "add untracked file to archive" msgstr "добавяне на неследените файлове към архива" -#: archive.c:560 builtin/archive.c:90 +#: archive.c:562 builtin/archive.c:90 msgid "write the archive to this file" msgstr "запазване на архива в този ФАЙЛ" -#: archive.c:562 +#: archive.c:564 msgid "read .gitattributes in working directory" msgstr "изчитане на „.gitattributes“ в работната директория" -#: archive.c:563 +#: archive.c:565 msgid "report archived files on stderr" msgstr "извеждане на архивираните файлове на стандартната грешка" -#: archive.c:564 -msgid "store only" -msgstr "съхранение без компресиране" +#: archive.c:567 +msgid "set compression level" +msgstr "задаване на нивото на компресиране" -#: archive.c:565 -msgid "compress faster" -msgstr "бързо компресиране" - -#: archive.c:573 -msgid "compress better" -msgstr "добро компресиране" - -#: archive.c:576 +#: archive.c:570 msgid "list supported archive formats" msgstr "извеждане на списъка с поддържаните формати" -#: archive.c:578 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 +#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117 #: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335 msgid "repo" msgstr "хранилище" -#: archive.c:579 builtin/archive.c:92 +#: archive.c:573 builtin/archive.c:92 msgid "retrieve the archive from remote repository " msgstr "получаване на архива от отдалеченото ХРАНИЛИЩЕ" -#: archive.c:580 builtin/archive.c:93 builtin/difftool.c:715 +#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714 #: builtin/notes.c:498 msgid "command" msgstr "команда" -#: archive.c:581 builtin/archive.c:94 +#: archive.c:575 builtin/archive.c:94 msgid "path to the remote git-upload-archive command" msgstr "път към отдалечената команда „git-upload-archive“" -#: archive.c:588 +#: archive.c:582 msgid "Unexpected option --remote" msgstr "Неочаквана опция „--remote“" -#: archive.c:590 +#: archive.c:584 msgid "Option --exec can only be used together with --remote" msgstr "Опцията „--exec“ изисква „--remote“" -#: archive.c:592 +#: archive.c:586 msgid "Unexpected option --output" msgstr "Неочаквана опция „--output“" -#: archive.c:594 +#: archive.c:588 msgid "Options --add-file and --remote cannot be used together" msgstr "Опциите „--add-file“ и „--remote“ са несъвместими" -#: archive.c:616 +#: archive.c:610 #, c-format msgid "Unknown archive format '%s'" msgstr "Непознат формат на архив: „%s“" -#: archive.c:623 +#: archive.c:619 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "Аргументът не се поддържа за форма̀та „%s“: -%d" -#: attr.c:212 +#: attr.c:202 #, c-format msgid "%.*s is not a valid attribute name" msgstr "„%.*s“ е неправилно име за атрибут" -#: attr.c:369 +#: attr.c:359 #, c-format msgid "%s not allowed: %s:%d" msgstr "%s: командата не е позволена: „%s:%d“" -#: attr.c:409 +#: attr.c:399 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1901,22 +1894,22 @@ msgstr "" "Отрицателните шаблони се игнорират в атрибутите на git.\n" "Ако ви трябва начална удивителна, ползвайте „\\!“." -#: bisect.c:476 +#: bisect.c:489 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Неправилно цитирано съдържание във файла „%s“: %s" -#: bisect.c:686 +#: bisect.c:699 #, c-format msgid "We cannot bisect more!\n" msgstr "Повече не може да се търси двоично!\n" -#: bisect.c:753 +#: bisect.c:766 #, c-format msgid "Not a valid commit name %s" msgstr "Неправилно име на подаване „%s“" -#: bisect.c:778 +#: bisect.c:791 #, c-format msgid "" "The merge base %s is bad.\n" @@ -1925,7 +1918,7 @@ msgstr "" "Неправилна база за сливане: %s.\n" "Следователно грешката е коригирана между „%s“ и [%s].\n" -#: bisect.c:783 +#: bisect.c:796 #, c-format msgid "" "The merge base %s is new.\n" @@ -1934,7 +1927,7 @@ msgstr "" "Нова база за сливане: %s.\n" "Свойството е променено между „%s“ и [%s].\n" -#: bisect.c:788 +#: bisect.c:801 #, c-format msgid "" "The merge base %s is %s.\n" @@ -1943,7 +1936,7 @@ msgstr "" "Базата за сливане „%s“ е %s.\n" "Следователно първото %s подаване е между „%s“ и [%s].\n" -#: bisect.c:796 +#: bisect.c:809 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1954,7 +1947,7 @@ msgstr "" "Двоичното търсене с git bisect няма да работи правилно.\n" "Дали не сте объркали указателите „%s“ и „%s“?\n" -#: bisect.c:809 +#: bisect.c:822 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1965,36 +1958,36 @@ msgstr "" "Не може да сме сигурни, че първото %s подаване е между „%s“ и „%s“.\n" "Двоичното търсене продължава." -#: bisect.c:848 +#: bisect.c:861 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Двоично търсене: трябва да се провери база за сливане\n" -#: bisect.c:898 +#: bisect.c:911 #, c-format msgid "a %s revision is needed" msgstr "необходима е версия „%s“" -#: bisect.c:928 builtin/notes.c:177 builtin/tag.c:255 +#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:255 #, c-format msgid "could not create file '%s'" msgstr "файлът „%s“ не може да бъде създаден" -#: bisect.c:974 builtin/merge.c:150 +#: bisect.c:987 builtin/merge.c:152 #, c-format msgid "could not read file '%s'" msgstr "файлът „%s“ не може да бъде прочетен" -#: bisect.c:1014 +#: bisect.c:1027 msgid "reading bisect refs failed" msgstr "неуспешно прочитане на указателите за двоично търсене" -#: bisect.c:1044 +#: bisect.c:1057 #, c-format msgid "%s was both %s and %s\n" msgstr "„%s“ e както „%s“, така и „%s“\n" -#: bisect.c:1053 +#: bisect.c:1066 #, c-format msgid "" "No testable commit found.\n" @@ -2003,7 +1996,7 @@ msgstr "" "Липсва подходящо за тестване подаване.\n" "Проверете параметрите за пътищата.\n" -#: bisect.c:1082 +#: bisect.c:1095 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -2013,48 +2006,48 @@ msgstr[1] "(приблизително %d стъпки)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1088 +#: bisect.c:1101 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "Двоично търсене: остава %d версия след тази %s\n" msgstr[1] "Двоично търсене: остават %d версии след тази %s\n" -#: blame.c:2778 +#: blame.c:2777 msgid "--contents and --reverse do not blend well." msgstr "Опциите „--contents“ и „--reverse“ са несъвместими" -#: blame.c:2792 +#: blame.c:2791 msgid "cannot use --contents with final commit object name" msgstr "Опцията „--contents“ е несъвместима с име на обект от крайно подаване" -#: blame.c:2813 +#: blame.c:2812 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "Едновременното задаване на опциите „--reverse“ и „--first-parent“ изисква " "указването на крайно подаване" -#: blame.c:2822 bundle.c:213 ref-filter.c:2264 remote.c:2020 sequencer.c:2105 -#: sequencer.c:4606 submodule.c:855 builtin/commit.c:1045 builtin/log.c:404 -#: builtin/log.c:1020 builtin/log.c:1622 builtin/log.c:2029 builtin/log.c:2319 -#: builtin/merge.c:414 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395 -#: builtin/shortlog.c:320 +#: blame.c:2821 bundle.c:213 ref-filter.c:2272 remote.c:2031 sequencer.c:2138 +#: sequencer.c:4633 submodule.c:855 builtin/commit.c:1045 builtin/log.c:409 +#: builtin/log.c:1023 builtin/log.c:1625 builtin/log.c:2046 builtin/log.c:2336 +#: builtin/merge.c:423 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395 +#: builtin/shortlog.c:267 msgid "revision walk setup failed" msgstr "неуспешно настройване на обхождането на версиите" -#: blame.c:2840 +#: blame.c:2839 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" "Едновременното задаване на опциите „--reverse“ и „--first-parent“ изисква " "указването на диапазон по веригата на първите наследници" -#: blame.c:2851 +#: blame.c:2850 #, c-format msgid "no such path %s in %s" msgstr "няма път на име „%s“ в „%s“" -#: blame.c:2862 +#: blame.c:2861 #, c-format msgid "cannot read blob %s for path %s" msgstr "обектът-BLOB „%s“ в пътя %s не може да бъде прочетен" @@ -2217,7 +2210,7 @@ msgstr "Файлът „%s“ не изглежда да е пратка на gi msgid "unrecognized header: %s%s (%d)" msgstr "непозната заглавна част: %s%s (%d)" -#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2357 sequencer.c:3142 +#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2390 sequencer.c:3176 #: builtin/commit.c:814 #, c-format msgid "could not open '%s'" @@ -2281,7 +2274,7 @@ msgstr "неподдържана версия на индекса %d" msgid "cannot write bundle version %d with algorithm %s" msgstr "пратка %d не може да се запише с алгоритъм %s" -#: bundle.c:522 builtin/log.c:207 builtin/log.c:1918 builtin/shortlog.c:461 +#: bundle.c:522 builtin/log.c:209 builtin/log.c:1927 builtin/shortlog.c:408 #, c-format msgid "unrecognized argument: %s" msgstr "непознат аргумент: %s" @@ -2304,7 +2297,7 @@ msgstr "Командата „git index-pack“ не завърши успешн msgid "invalid color value: %.*s" msgstr "неправилна стойност за цвят: %.*s" -#: commit-graph.c:188 midx.c:46 +#: commit-graph.c:188 midx.c:47 msgid "invalid hash version" msgstr "неправилна версия на контролна сума" @@ -2370,185 +2363,177 @@ msgstr "" msgid "could not find commit %s" msgstr "подаването „%s“ не може да бъде открито" -#: commit-graph.c:1042 builtin/am.c:1306 +#: commit-graph.c:1036 builtin/am.c:1292 #, c-format msgid "unable to parse commit %s" msgstr "подаването не може да бъде анализирано: %s" -#: commit-graph.c:1265 builtin/pack-objects.c:2864 +#: commit-graph.c:1252 builtin/pack-objects.c:2864 #, c-format msgid "unable to get type of object %s" msgstr "видът на обекта „%s“ не може да бъде определен" -#: commit-graph.c:1301 +#: commit-graph.c:1283 msgid "Loading known commits in commit graph" msgstr "Зареждане на познатите подавания в гра̀фа с подаванията" -#: commit-graph.c:1318 +#: commit-graph.c:1300 msgid "Expanding reachable commits in commit graph" msgstr "Разширяване на достижимите подавания в гра̀фа" -#: commit-graph.c:1338 +#: commit-graph.c:1320 msgid "Clearing commit marks in commit graph" msgstr "Изчистване на отбелязванията на подаванията в гра̀фа с подаванията" -#: commit-graph.c:1357 +#: commit-graph.c:1339 msgid "Computing commit graph generation numbers" msgstr "Изчисляване на номерата на поколенията в гра̀фа с подаванията" -#: commit-graph.c:1424 +#: commit-graph.c:1406 msgid "Computing commit changed paths Bloom filters" msgstr "Изчисляване на филтрите на Блум на пътищата с промяна при подаването" -#: commit-graph.c:1501 +#: commit-graph.c:1483 msgid "Collecting referenced commits" msgstr "Събиране на свързаните подавания" -#: commit-graph.c:1526 +#: commit-graph.c:1508 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "Откриване на подаванията в гра̀фа в %d пакетен файл" msgstr[1] "Откриване на подаванията в гра̀фа в %d пакетни файла" -#: commit-graph.c:1539 +#: commit-graph.c:1521 #, c-format msgid "error adding pack %s" msgstr "грешка при добавяне на пакетен файл „%s“" -#: commit-graph.c:1543 +#: commit-graph.c:1525 #, c-format msgid "error opening index for %s" msgstr "грешка при отваряне на индекса на „%s“" -#: commit-graph.c:1582 +#: commit-graph.c:1562 msgid "Finding commits for commit graph among packed objects" msgstr "Откриване на подаванията в гра̀фа измежду пакетираните обекти" -#: commit-graph.c:1597 -msgid "Counting distinct commits in commit graph" -msgstr "Преброяване на различните подавания в гра̀фа" - -#: commit-graph.c:1629 +#: commit-graph.c:1580 msgid "Finding extra edges in commit graph" msgstr "Откриване на още върхове в гра̀фа с подаванията" -#: commit-graph.c:1678 +#: commit-graph.c:1628 msgid "failed to write correct number of base graph ids" msgstr "правилният брой на базовите идентификатори не може да се запише" -#: commit-graph.c:1720 midx.c:826 +#: commit-graph.c:1670 midx.c:819 #, c-format msgid "unable to create leading directories of %s" msgstr "родителските директории на „%s“ не могат да бъдат създадени" -#: commit-graph.c:1733 +#: commit-graph.c:1683 msgid "unable to create temporary graph layer" msgstr "не може да бъде създаден временен слой за гра̀фа с подаванията" -#: commit-graph.c:1738 +#: commit-graph.c:1688 #, c-format msgid "unable to adjust shared permissions for '%s'" msgstr "правата за споделен достъп до „%s“ не могат да бъдат зададени" -#: commit-graph.c:1808 +#: commit-graph.c:1758 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "Запазване на гра̀фа с подаванията в %d пас" msgstr[1] "Запазване на гра̀фа с подаванията в %d паса" -#: commit-graph.c:1853 +#: commit-graph.c:1803 msgid "unable to open commit-graph chain file" msgstr "файлът с веригата на гра̀фа с подаванията не може да се отвори" -#: commit-graph.c:1869 +#: commit-graph.c:1819 msgid "failed to rename base commit-graph file" msgstr "основният файл на гра̀фа с подаванията не може да бъде преименуван" -#: commit-graph.c:1889 +#: commit-graph.c:1839 msgid "failed to rename temporary commit-graph file" msgstr "временният файл на гра̀фа с подаванията не може да бъде преименуван" -#: commit-graph.c:2015 +#: commit-graph.c:1965 msgid "Scanning merged commits" msgstr "Търсене на подаванията със сливания" -#: commit-graph.c:2026 -#, c-format -msgid "unexpected duplicate commit id %s" -msgstr "неочакван, повтарящ се идентификатор на подаване: %s" - -#: commit-graph.c:2049 +#: commit-graph.c:2009 msgid "Merging commit-graph" msgstr "Сливане на гра̀фа с подаванията" -#: commit-graph.c:2259 -#, c-format -msgid "the commit graph format cannot write %d commits" -msgstr "форматът на гра̀фа с подаванията не може да запише %d подавания" +#: commit-graph.c:2115 +msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" +msgstr "" +"опит за запис на гра̀фа с подаванията, но настройката „core.commitGraph“ е " +"изключена" -#: commit-graph.c:2270 +#: commit-graph.c:2214 msgid "too many commits to write graph" msgstr "прекалено много подавания за записване на гра̀фа" -#: commit-graph.c:2363 +#: commit-graph.c:2307 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "графът с подаванията е с грешна сума за проверка — вероятно е повреден" -#: commit-graph.c:2373 +#: commit-graph.c:2317 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "" "неправилна подредба на обектите по идентификатор в гра̀фа с подаванията: „%s“ " "е преди „%s“, а не трябва" -#: commit-graph.c:2383 commit-graph.c:2398 +#: commit-graph.c:2327 commit-graph.c:2342 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" "неправилна стойност за откъс в гра̀фа с подаванията: fanout[%d] = %u, а " "трябва да е %u" -#: commit-graph.c:2390 +#: commit-graph.c:2334 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "подаване „%s“ в гра̀фа с подаванията не може да се анализира" -#: commit-graph.c:2408 +#: commit-graph.c:2352 msgid "Verifying commits in commit graph" msgstr "Проверка на подаванията в гра̀фа" -#: commit-graph.c:2423 +#: commit-graph.c:2367 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" "подаване „%s“ в базата от данни към гра̀фа с подаванията не може да се " "анализира" -#: commit-graph.c:2430 +#: commit-graph.c:2374 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" "идентификаторът на обект за кореновото дърво за подаване „%s“ в гра̀фа с " "подаванията е „%s“, а трябва да е „%s“" -#: commit-graph.c:2440 +#: commit-graph.c:2384 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "списъкът с родители на „%s“ в гра̀фа с подаванията е прекалено дълъг" -#: commit-graph.c:2449 +#: commit-graph.c:2393 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "родителят на „%s“ в гра̀фа с подаванията е „%s“, а трябва да е „%s“" -#: commit-graph.c:2463 +#: commit-graph.c:2407 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "списъкът с родители на „%s“ в гра̀фа с подаванията е прекалено къс" -#: commit-graph.c:2468 +#: commit-graph.c:2412 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" @@ -2556,7 +2541,7 @@ msgstr "" "номерът на поколението на подаване „%s“ в гра̀фа с подаванията е 0, а другаде " "не е" -#: commit-graph.c:2472 +#: commit-graph.c:2416 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" @@ -2564,22 +2549,22 @@ msgstr "" "номерът на поколението на подаване „%s“ в гра̀фа с подаванията не е 0, а " "другаде е" -#: commit-graph.c:2488 +#: commit-graph.c:2432 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "" "номерът на поколението на подаване „%s“ в гра̀фа с подаванията е %u, а " "другаде е %u" -#: commit-graph.c:2494 +#: commit-graph.c:2438 #, c-format msgid "commit date for commit %s in commit-graph is % != %" msgstr "" "датата на подаване на „%s“ в гра̀фа с подаванията е %, а трябва да е " "%" -#: commit.c:52 sequencer.c:2845 builtin/am.c:373 builtin/am.c:417 -#: builtin/am.c:1385 builtin/am.c:2031 builtin/replace.c:457 +#: commit.c:52 sequencer.c:2879 builtin/am.c:359 builtin/am.c:403 +#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457 #, c-format msgid "could not parse %s" msgstr "„%s“ не може да се анализира" @@ -2686,7 +2671,7 @@ msgstr "ключът не съдържа раздел: „%s“" msgid "key does not contain variable name: %s" msgstr "ключът не съдържа име на променлива: „%s“" -#: config.c:408 sequencer.c:2547 +#: config.c:408 sequencer.c:2580 #, c-format msgid "invalid key: %s" msgstr "неправилен ключ: „%s“" @@ -2881,77 +2866,77 @@ msgstr "неразпозната стойност „%s“ от командни msgid "bad config variable '%s' in file '%s' at line %d" msgstr "неправилна настройка „%s“ във файла „%s“ на ред №%d" -#: config.c:2470 +#: config.c:2473 #, c-format msgid "invalid section name '%s'" msgstr "неправилно име на раздел: „%s“" -#: config.c:2502 +#: config.c:2505 #, c-format msgid "%s has multiple values" msgstr "зададени са няколко стойности за „%s“" -#: config.c:2531 +#: config.c:2534 #, c-format msgid "failed to write new configuration file %s" msgstr "новият конфигурационен файл „%s“ не може да бъде запазен" -#: config.c:2783 config.c:3107 +#: config.c:2786 config.c:3112 #, c-format msgid "could not lock config file %s" msgstr "конфигурационният файл „%s“ не може да бъде заключен" -#: config.c:2794 +#: config.c:2797 #, c-format msgid "opening %s" msgstr "отваряне на „%s“" -#: config.c:2829 builtin/config.c:354 +#: config.c:2834 builtin/config.c:361 #, c-format msgid "invalid pattern: %s" msgstr "неправилен шаблон: %s" -#: config.c:2854 +#: config.c:2859 #, c-format msgid "invalid config file %s" msgstr "неправилен конфигурационен файл: „%s“" -#: config.c:2867 config.c:3120 +#: config.c:2872 config.c:3125 #, c-format msgid "fstat on %s failed" msgstr "неуспешно изпълнение на „fstat“ върху „%s“" -#: config.c:2878 +#: config.c:2883 #, c-format msgid "unable to mmap '%s'" msgstr "неуспешно изпълнение на „mmap“ върху „%s“" -#: config.c:2887 config.c:3125 +#: config.c:2892 config.c:3130 #, c-format msgid "chmod on %s failed" msgstr "неуспешна смяна на права с „chmod“ върху „%s“" -#: config.c:2972 config.c:3222 +#: config.c:2977 config.c:3227 #, c-format msgid "could not write config file %s" msgstr "конфигурационният файл „%s“ не може да бъде записан" -#: config.c:3006 +#: config.c:3011 #, c-format msgid "could not set '%s' to '%s'" msgstr "„%s“ не може да се зададе да е „%s“" -#: config.c:3008 builtin/remote.c:656 builtin/remote.c:850 builtin/remote.c:858 +#: config.c:3013 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 #, c-format msgid "could not unset '%s'" msgstr "„%s“ не може да се премахне" -#: config.c:3098 +#: config.c:3103 #, c-format msgid "invalid section name: %s" msgstr "неправилно име на раздел: %s" -#: config.c:3265 +#: config.c:3270 #, c-format msgid "missing value for '%s'" msgstr "липсва стойност за „%s“" @@ -3404,6 +3389,26 @@ msgstr "" msgid "Marked %d islands, done.\n" msgstr "Отбелязани са %d групи, работата приключи.\n" +#: diff-lib.c:534 +msgid "--merge-base does not work with ranges" +msgstr "опцията „--merge-base“ не работи с диапазони" + +#: diff-lib.c:536 +msgid "--merge-base only works with commits" +msgstr "опцията „--merge-base“ работи само с подавания" + +#: diff-lib.c:553 +msgid "unable to get HEAD" +msgstr "Указателят „HEAD“ не може да бъде получен" + +#: diff-lib.c:560 +msgid "no merge base found" +msgstr "липсва база за сливане" + +#: diff-lib.c:562 +msgid "multiple merge bases found" +msgstr "много бази за сливане" + #: diff-no-index.c:238 msgid "git diff --no-index [] " msgstr "git diff --no-index [ОПЦИЯ…] ПЪТ ПЪТ" @@ -3472,38 +3477,38 @@ msgstr "" "Грешки в настройката „diff.dirstat“:\n" "%s" -#: diff.c:4269 +#: diff.c:4276 #, c-format msgid "external diff died, stopping at %s" msgstr "" "външната програма за разлики завърши неуспешно. Спиране на работата при „%s“" -#: diff.c:4618 +#: diff.c:4625 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "" "Опциите „--name-only“, „--name-status“, „--check“ и „-s“ са несъвместими " "една с друга" -#: diff.c:4621 +#: diff.c:4628 msgid "-G, -S and --find-object are mutually exclusive" msgstr "Опциите „-G“, „-S“ и „--find-object“ са несъвместими една с друга" -#: diff.c:4699 +#: diff.c:4707 msgid "--follow requires exactly one pathspec" msgstr "Опцията „--follow“ изисква точно един път" -#: diff.c:4747 +#: diff.c:4755 #, c-format msgid "invalid --stat value: %s" msgstr "неправилна стойност за „--stat“: %s" -#: diff.c:4752 diff.c:4757 diff.c:4762 diff.c:4767 diff.c:5279 +#: diff.c:4760 diff.c:4765 diff.c:4770 diff.c:4775 diff.c:5303 #: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 #, c-format msgid "%s expects a numerical value" msgstr "опцията „%s“ очаква число за аргумент" -#: diff.c:4784 +#: diff.c:4792 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3512,44 +3517,44 @@ msgstr "" "Неразпознат параметър към опцията „--dirstat/-X“:\n" "%s" -#: diff.c:4869 +#: diff.c:4877 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "непознат вид промяна: „%c“ в „--diff-filter=%s“" -#: diff.c:4893 +#: diff.c:4901 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "непозната стойност след „ws-error-highlight=%.*s“" -#: diff.c:4907 +#: diff.c:4915 #, c-format msgid "unable to resolve '%s'" msgstr "„%s“ не може да се открие" -#: diff.c:4957 diff.c:4963 +#: diff.c:4965 diff.c:4971 #, c-format msgid "%s expects / form" msgstr "" "опцията „%s“ изисква стойности за МИНИМАЛЕН_%%_ПРОМЯНА_ЗА_ИЗТОЧНИК_/" "МАКСИМАЛЕН_%%_ПРОМЯНА_ЗА_ЗАМЯНА от" -#: diff.c:4975 +#: diff.c:4983 #, c-format msgid "%s expects a character, got '%s'" msgstr "опцията „%s“ изисква знак, а не: „%s“" -#: diff.c:4996 +#: diff.c:5004 #, c-format msgid "bad --color-moved argument: %s" msgstr "неправилен аргумент за „--color-moved“: „%s“" -#: diff.c:5015 +#: diff.c:5023 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "неправилен режим „%s“ за „ --color-moved-ws“" -#: diff.c:5055 +#: diff.c:5063 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -3558,153 +3563,158 @@ msgstr "" "Майерс), „minimal“ (минимизиране на разликите), „patience“ (пасианс) и " "„histogram“ (хистограмен)" -#: diff.c:5091 diff.c:5111 +#: diff.c:5099 diff.c:5119 #, c-format msgid "invalid argument to %s" msgstr "неправилен аргумент към „%s“" -#: diff.c:5248 +#: diff.c:5223 +#, c-format +msgid "invalid regex given to -I: '%s'" +msgstr "неправилен регулярен израз подаден към „-I“: „%s“" + +#: diff.c:5272 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "неразпознат параметър към опцията „--submodule“: „%s“" -#: diff.c:5304 +#: diff.c:5328 #, c-format msgid "bad --word-diff argument: %s" msgstr "неправилен аргумент към „--word-diff“: „%s“" -#: diff.c:5327 +#: diff.c:5351 msgid "Diff output format options" msgstr "Формат на изхода за разликите" -#: diff.c:5329 diff.c:5335 +#: diff.c:5353 diff.c:5359 msgid "generate patch" msgstr "създаване на кръпки" -#: diff.c:5332 builtin/log.c:176 +#: diff.c:5356 builtin/log.c:178 msgid "suppress diff output" msgstr "без извеждане на разликите" -#: diff.c:5337 diff.c:5451 diff.c:5458 +#: diff.c:5361 diff.c:5475 diff.c:5482 msgid "" msgstr "БРОЙ" -#: diff.c:5338 diff.c:5341 +#: diff.c:5362 diff.c:5365 msgid "generate diffs with lines context" msgstr "файловете с разлики да са с контекст с такъв БРОЙ редове" -#: diff.c:5343 +#: diff.c:5367 msgid "generate the diff in raw format" msgstr "файловете с разлики да са в суров формат" -#: diff.c:5346 +#: diff.c:5370 msgid "synonym for '-p --raw'" msgstr "псевдоним на „-p --stat“" -#: diff.c:5350 +#: diff.c:5374 msgid "synonym for '-p --stat'" msgstr "псевдоним на „-p --stat“" -#: diff.c:5354 +#: diff.c:5378 msgid "machine friendly --stat" msgstr "„--stat“ във формат за четене от програма" -#: diff.c:5357 +#: diff.c:5381 msgid "output only the last line of --stat" msgstr "извеждане само на последния ред на „--stat“" -#: diff.c:5359 diff.c:5367 +#: diff.c:5383 diff.c:5391 msgid "..." msgstr "ПАРАМЕТЪР_1, ПАРАМЕТЪР_2, …" -#: diff.c:5360 +#: diff.c:5384 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "извеждане на разпределението на промените за всяка поддиректория" -#: diff.c:5364 +#: diff.c:5388 msgid "synonym for --dirstat=cumulative" msgstr "псевдоним на „--dirstat=cumulative“" -#: diff.c:5368 +#: diff.c:5392 msgid "synonym for --dirstat=files,param1,param2..." msgstr "псевдоним на „--dirstat=ФАЙЛОВЕ,ПАРАМЕТЪР_1,ПАРАМЕТЪР_2,…“" -#: diff.c:5372 +#: diff.c:5396 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" "предупреждаване, ако промените водят до маркери за конфликт или грешки в " "празните знаци" -#: diff.c:5375 +#: diff.c:5399 msgid "condensed summary such as creations, renames and mode changes" msgstr "" "съкратено резюме на създадените, преименуваните и файловете с промяна на " "режима на достъп" -#: diff.c:5378 +#: diff.c:5402 msgid "show only names of changed files" msgstr "извеждане само на имената на променените файлове" -#: diff.c:5381 +#: diff.c:5405 msgid "show only names and status of changed files" msgstr "извеждане само на имената и статистиката за променените файлове" -#: diff.c:5383 +#: diff.c:5407 msgid "[,[,]]" msgstr "ШИРОЧИНА[,ИМЕ-ШИРОЧИНА[,БРОЙ]]" -#: diff.c:5384 +#: diff.c:5408 msgid "generate diffstat" msgstr "извеждане на статистика за промените" -#: diff.c:5386 diff.c:5389 diff.c:5392 +#: diff.c:5410 diff.c:5413 diff.c:5416 msgid "" msgstr "ШИРОЧИНА" -#: diff.c:5387 +#: diff.c:5411 msgid "generate diffstat with a given width" msgstr "статистика с такава ШИРОЧИНА за промените" -#: diff.c:5390 +#: diff.c:5414 msgid "generate diffstat with a given name width" msgstr "статистика за промените с такава ШИРОЧИНА на имената" -#: diff.c:5393 +#: diff.c:5417 msgid "generate diffstat with a given graph width" msgstr "статистика за промените с такава ШИРОЧИНА на гра̀фа" -#: diff.c:5395 +#: diff.c:5419 msgid "" msgstr "БРОЙ" -#: diff.c:5396 +#: diff.c:5420 msgid "generate diffstat with limited lines" msgstr "ограничаване на БРОя на редовете в статистиката за промените" -#: diff.c:5399 +#: diff.c:5423 msgid "generate compact summary in diffstat" msgstr "кратко резюме в статистиката за промените" -#: diff.c:5402 +#: diff.c:5426 msgid "output a binary diff that can be applied" msgstr "извеждане на двоична разлика във вид за прилагане" -#: diff.c:5405 +#: diff.c:5429 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" "показване на пълните имена на обекти в редовете за индекса при вариантите " "преди и след промяната" -#: diff.c:5407 +#: diff.c:5431 msgid "show colored diff" msgstr "разлики в цвят" -#: diff.c:5408 +#: diff.c:5432 msgid "" msgstr "ВИД" -#: diff.c:5409 +#: diff.c:5433 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" @@ -3712,7 +3722,7 @@ msgstr "" "грешките в празните знаци да се указват в редовете за контекста, вариантите " "преди и след разликата," -#: diff.c:5412 +#: diff.c:5436 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -3720,257 +3730,261 @@ msgstr "" "без преименуване на пътищата. Да се използват нулеви байтове за разделители " "на полета в изхода при ползване на опцията „--raw“ или „--numstat“" -#: diff.c:5415 diff.c:5418 diff.c:5421 diff.c:5527 +#: diff.c:5439 diff.c:5442 diff.c:5445 diff.c:5554 msgid "" msgstr "ПРЕФИКС" -#: diff.c:5416 +#: diff.c:5440 msgid "show the given source prefix instead of \"a/\"" msgstr "префикс вместо „a/“ за източник" -#: diff.c:5419 +#: diff.c:5443 msgid "show the given destination prefix instead of \"b/\"" msgstr "префикс вместо „b/“ за цел" -#: diff.c:5422 +#: diff.c:5446 msgid "prepend an additional prefix to every line of output" msgstr "добавяне на допълнителен префикс за всеки ред на изхода" -#: diff.c:5425 +#: diff.c:5449 msgid "do not show any source or destination prefix" msgstr "без префикс за източника и целта" -#: diff.c:5428 +#: diff.c:5452 msgid "show context between diff hunks up to the specified number of lines" msgstr "" "извеждане на контекст между последователните парчета с разлики от указания " "БРОЙ редове" -#: diff.c:5432 diff.c:5437 diff.c:5442 +#: diff.c:5456 diff.c:5461 diff.c:5466 msgid "" msgstr "ЗНАК" -#: diff.c:5433 +#: diff.c:5457 msgid "specify the character to indicate a new line instead of '+'" msgstr "знак вместо „+“ за нов вариант на ред" -#: diff.c:5438 +#: diff.c:5462 msgid "specify the character to indicate an old line instead of '-'" msgstr "знак вместо „-“ за стар вариант на ред" -#: diff.c:5443 +#: diff.c:5467 msgid "specify the character to indicate a context instead of ' '" msgstr "знак вместо „ “ за контекст" -#: diff.c:5446 +#: diff.c:5470 msgid "Diff rename options" msgstr "Настройки за разлики с преименуване" -#: diff.c:5447 +#: diff.c:5471 msgid "[/]" msgstr "МИНИМАЛЕН_%_ПРОМЯНА_ЗА_ИЗТОЧНИК[/МАКСИМАЛEН_%_ПРОМЯНА_ЗА_ЗАМЯНА]" -#: diff.c:5448 +#: diff.c:5472 msgid "break complete rewrite changes into pairs of delete and create" msgstr "" "заместване на пълните промени с последователност от изтриване и създаване" -#: diff.c:5452 +#: diff.c:5476 msgid "detect renames" msgstr "засичане на преименуванията" -#: diff.c:5456 +#: diff.c:5480 msgid "omit the preimage for deletes" msgstr "без предварителен вариант при изтриване" -#: diff.c:5459 +#: diff.c:5483 msgid "detect copies" msgstr "засичане на копиранията" -#: diff.c:5463 +#: diff.c:5487 msgid "use unmodified files as source to find copies" msgstr "търсене на копирано и от непроменените файлове" -#: diff.c:5465 +#: diff.c:5489 msgid "disable rename detection" msgstr "без търсене на преименувания" -#: diff.c:5468 +#: diff.c:5492 msgid "use empty blobs as rename source" msgstr "празни обекти като източник при преименувания" -#: diff.c:5470 +#: diff.c:5494 msgid "continue listing the history of a file beyond renames" msgstr "" "продължаване на извеждането на историята — без отрязването при преименувания " "на файл" -#: diff.c:5473 +#: diff.c:5497 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" msgstr "" "без засичане на преименувания/копирания, ако броят им надвишава тази стойност" -#: diff.c:5475 +#: diff.c:5499 msgid "Diff algorithm options" msgstr "Опции към алгоритъма за разлики" -#: diff.c:5477 +#: diff.c:5501 msgid "produce the smallest possible diff" msgstr "търсене на възможно най-малка разлика" -#: diff.c:5480 +#: diff.c:5504 msgid "ignore whitespace when comparing lines" msgstr "без промени в празните знаци при сравняване на редове" -#: diff.c:5483 +#: diff.c:5507 msgid "ignore changes in amount of whitespace" msgstr "без промени в празните знаци" -#: diff.c:5486 +#: diff.c:5510 msgid "ignore changes in whitespace at EOL" msgstr "без промени в празните знаци в края на редовете" -#: diff.c:5489 +#: diff.c:5513 msgid "ignore carrier-return at the end of line" msgstr "без промени в знаците за край на ред" -#: diff.c:5492 +#: diff.c:5516 msgid "ignore changes whose lines are all blank" msgstr "без промени в редовете, които са изцяло от празни знаци" -#: diff.c:5495 +#: diff.c:5518 diff.c:5540 diff.c:5543 diff.c:5588 +msgid "" +msgstr "РЕГУЛЯРЕН_ИЗРАЗ" + +#: diff.c:5519 +msgid "ignore changes whose all lines match " +msgstr "без промени в редовете, които напасват РЕГУЛЯРНия_ИЗРАЗ" + +#: diff.c:5522 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "" "евристика за преместване на границите на парчетата за улесняване на четенето" -#: diff.c:5498 +#: diff.c:5525 msgid "generate diff using the \"patience diff\" algorithm" msgstr "разлика чрез алгоритъм за подредба като пасианс" -#: diff.c:5502 +#: diff.c:5529 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "разлика по хистограмния алгоритъм" -#: diff.c:5504 +#: diff.c:5531 msgid "" msgstr "АЛГОРИТЪМ" -#: diff.c:5505 +#: diff.c:5532 msgid "choose a diff algorithm" msgstr "избор на АЛГОРИТЪМа за разлики" -#: diff.c:5507 +#: diff.c:5534 msgid "" msgstr "ТЕКСТ" -#: diff.c:5508 +#: diff.c:5535 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "разлика чрез алгоритъма със закотвяне" -#: diff.c:5510 diff.c:5519 diff.c:5522 +#: diff.c:5537 diff.c:5546 diff.c:5549 msgid "" msgstr "РЕЖИМ" -#: diff.c:5511 +#: diff.c:5538 msgid "show word diff, using to delimit changed words" msgstr "" "разлика по думи, като се ползва този РЕЖИМ за отделянето на променените думи" -#: diff.c:5513 diff.c:5516 diff.c:5561 -msgid "" -msgstr "РЕГУЛЯРЕН_ИЗРАЗ" - -#: diff.c:5514 +#: diff.c:5541 msgid "use to decide what a word is" msgstr "РЕГУЛЯРЕН_ИЗРАЗ за разделяне по думи" -#: diff.c:5517 +#: diff.c:5544 msgid "equivalent to --word-diff=color --word-diff-regex=" msgstr "псевдоним на „--word-diff=color --word-diff-regex=РЕГУЛЯРЕН_ИЗРАЗ“" -#: diff.c:5520 +#: diff.c:5547 msgid "moved lines of code are colored differently" msgstr "различен цвят за извеждане на преместените редове" -#: diff.c:5523 +#: diff.c:5550 msgid "how white spaces are ignored in --color-moved" msgstr "" "режим за прескачането на празните знаци при задаването на „--color-moved“" -#: diff.c:5526 +#: diff.c:5553 msgid "Other diff options" msgstr "Други опции за разлики" -#: diff.c:5528 +#: diff.c:5555 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" "при изпълнение от поддиректория да се пренебрегват разликите извън нея и да " "се ползват относителни пътища" -#: diff.c:5532 +#: diff.c:5559 msgid "treat all files as text" msgstr "обработка на всички файлове като текстови" -#: diff.c:5534 +#: diff.c:5561 msgid "swap two inputs, reverse the diff" msgstr "размяна на двата входа — обръщане на разликата" -#: diff.c:5536 +#: diff.c:5563 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "" "завършване с код за състояние 1 при наличието на разлики, а в противен " "случай — с 0" -#: diff.c:5538 +#: diff.c:5565 msgid "disable all output of the program" msgstr "без всякакъв изход от програмата" -#: diff.c:5540 +#: diff.c:5567 msgid "allow an external diff helper to be executed" msgstr "позволяване на изпълнение на външна помощна програма за разлики" -#: diff.c:5542 +#: diff.c:5569 msgid "run external text conversion filters when comparing binary files" msgstr "" "изпълнение на външни програми-филтри при сравнението на двоични файлове" -#: diff.c:5544 +#: diff.c:5571 msgid "" msgstr "КОГА" -#: diff.c:5545 +#: diff.c:5572 msgid "ignore changes to submodules in the diff generation" msgstr "игнориране на промените в подмодулите при извеждането на разликите" -#: diff.c:5548 +#: diff.c:5575 msgid "" msgstr "ФОРМАТ" -#: diff.c:5549 +#: diff.c:5576 msgid "specify how differences in submodules are shown" msgstr "начин за извеждане на промените в подмодулите" -#: diff.c:5553 +#: diff.c:5580 msgid "hide 'git add -N' entries from the index" msgstr "без включване в индекса на записите, добавени с „git add -N“" -#: diff.c:5556 +#: diff.c:5583 msgid "treat 'git add -N' entries as real in the index" msgstr "включване в индекса на записите, добавени с „git add -N“" -#: diff.c:5558 +#: diff.c:5585 msgid "" msgstr "НИЗ" -#: diff.c:5559 +#: diff.c:5586 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "търсене на разлики, които променят броя на поява на указаните низове" -#: diff.c:5562 +#: diff.c:5589 msgid "" "look for differences that change the number of occurrences of the specified " "regex" @@ -3978,57 +3992,57 @@ msgstr "" "търсене на разлики, които променят броя на поява на низовете, които напасват " "на регулярния израз" -#: diff.c:5565 +#: diff.c:5592 msgid "show all changes in the changeset with -S or -G" msgstr "извеждане на всички промени с „-G“/„-S“" -#: diff.c:5568 +#: diff.c:5595 msgid "treat in -S as extended POSIX regular expression" msgstr "НИЗът към „-S“ да се тълкува като разширен регулярен израз по POSIX" -#: diff.c:5571 +#: diff.c:5598 msgid "control the order in which files appear in the output" msgstr "управление на подредбата на файловете в изхода" -#: diff.c:5572 +#: diff.c:5599 msgid "" msgstr "ИДЕНТИФИКАТОР_НА_ОБЕКТ" -#: diff.c:5573 +#: diff.c:5600 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "търсене на разлики, които променят броя на поява на указания обект" -#: diff.c:5575 +#: diff.c:5602 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)…[*]]" -#: diff.c:5576 +#: diff.c:5603 msgid "select files by diff type" msgstr "избор на файловете по вид разлика" -#: diff.c:5578 +#: diff.c:5605 msgid "" msgstr "ФАЙЛ" -#: diff.c:5579 +#: diff.c:5606 msgid "Output to a specific file" msgstr "Изход към указания файл" -#: diff.c:6236 +#: diff.c:6263 msgid "inexact rename detection was skipped due to too many files." msgstr "" "търсенето на преименувания на обекти съчетани с промени се прескача поради " "многото файлове." -#: diff.c:6239 +#: diff.c:6266 msgid "only found copies from modified paths due to too many files." msgstr "" "установени са само точните копия на променените пътища поради многото " "файлове." -#: diff.c:6242 +#: diff.c:6269 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -4132,249 +4146,249 @@ msgstr "GIT_DIR не може да се зададе да е „%s“" msgid "too many args to run %s" msgstr "прекалено много аргументи за изпълнение „%s“" -#: fetch-pack.c:176 +#: fetch-pack.c:177 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: очаква се плитък списък" -#: fetch-pack.c:179 +#: fetch-pack.c:180 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "git fetch-pack: след плитък списък се очаква изчистващ пакет „flush“" -#: fetch-pack.c:190 +#: fetch-pack.c:191 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "" "git fetch-pack: очаква се „ACK“/„NAK“, а бе получен изчистващ пакет „flush“" -#: fetch-pack.c:210 +#: fetch-pack.c:211 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: очаква се „ACK“/„NAK“, а бе получено „%s“" -#: fetch-pack.c:221 +#: fetch-pack.c:222 msgid "unable to write to remote" msgstr "невъзможно писане към отдалечено хранилище" -#: fetch-pack.c:282 +#: fetch-pack.c:283 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "опцията „--stateless-rpc“ изисква „multi_ack_detailed“" -#: fetch-pack.c:375 fetch-pack.c:1397 +#: fetch-pack.c:378 fetch-pack.c:1406 #, c-format msgid "invalid shallow line: %s" msgstr "неправилен плитък ред: „%s“" -#: fetch-pack.c:381 fetch-pack.c:1403 +#: fetch-pack.c:384 fetch-pack.c:1412 #, c-format msgid "invalid unshallow line: %s" msgstr "неправилен неплитък ред: „%s“" -#: fetch-pack.c:383 fetch-pack.c:1405 +#: fetch-pack.c:386 fetch-pack.c:1414 #, c-format msgid "object not found: %s" msgstr "обектът „%s“ липсва" -#: fetch-pack.c:386 fetch-pack.c:1408 +#: fetch-pack.c:389 fetch-pack.c:1417 #, c-format msgid "error in object: %s" msgstr "грешка в обекта: „%s“" -#: fetch-pack.c:388 fetch-pack.c:1410 +#: fetch-pack.c:391 fetch-pack.c:1419 #, c-format msgid "no shallow found: %s" msgstr "не е открит плитък обект: %s" -#: fetch-pack.c:391 fetch-pack.c:1414 +#: fetch-pack.c:394 fetch-pack.c:1423 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "очаква се плитък или не обект, а бе получено: „%s“" -#: fetch-pack.c:431 +#: fetch-pack.c:434 #, c-format msgid "got %s %d %s" msgstr "получено бе %s %d %s" -#: fetch-pack.c:448 +#: fetch-pack.c:451 #, c-format msgid "invalid commit %s" msgstr "неправилно подаване: „%s“" -#: fetch-pack.c:479 +#: fetch-pack.c:482 msgid "giving up" msgstr "преустановяване" -#: fetch-pack.c:492 progress.c:339 +#: fetch-pack.c:495 progress.c:339 msgid "done" msgstr "действието завърши" -#: fetch-pack.c:504 +#: fetch-pack.c:507 #, c-format msgid "got %s (%d) %s" msgstr "получено бе %s (%d) %s" -#: fetch-pack.c:540 +#: fetch-pack.c:543 #, c-format msgid "Marking %s as complete" msgstr "Отбелязване на „%s“ като пълно" -#: fetch-pack.c:755 +#: fetch-pack.c:758 #, c-format msgid "already have %s (%s)" msgstr "вече има „%s“ (%s)" -#: fetch-pack.c:824 +#: fetch-pack.c:827 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack: не може да се създаде процес за демултиплексора" -#: fetch-pack.c:832 +#: fetch-pack.c:835 msgid "protocol error: bad pack header" msgstr "протоколна грешка: неправилна заглавна част на пакет" -#: fetch-pack.c:916 +#: fetch-pack.c:919 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: не може да се създаде процес за „%s“" -#: fetch-pack.c:933 +#: fetch-pack.c:937 #, c-format msgid "%s failed" msgstr "неуспешно изпълнение на „%s“" -#: fetch-pack.c:935 +#: fetch-pack.c:939 msgid "error in sideband demultiplexer" msgstr "грешка в демултиплексора" -#: fetch-pack.c:978 +#: fetch-pack.c:982 #, c-format msgid "Server version is %.*s" msgstr "Версията на сървъра е: %.*s" -#: fetch-pack.c:983 fetch-pack.c:989 fetch-pack.c:992 fetch-pack.c:998 -#: fetch-pack.c:1002 fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014 -#: fetch-pack.c:1018 fetch-pack.c:1022 fetch-pack.c:1026 fetch-pack.c:1030 -#: fetch-pack.c:1036 fetch-pack.c:1042 fetch-pack.c:1047 fetch-pack.c:1052 +#: fetch-pack.c:990 fetch-pack.c:996 fetch-pack.c:999 fetch-pack.c:1005 +#: fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 fetch-pack.c:1021 +#: fetch-pack.c:1025 fetch-pack.c:1029 fetch-pack.c:1033 fetch-pack.c:1037 +#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1054 fetch-pack.c:1059 #, c-format msgid "Server supports %s" msgstr "Сървърът поддържа „%s“" -#: fetch-pack.c:985 +#: fetch-pack.c:992 msgid "Server does not support shallow clients" msgstr "Сървърът не поддържа плитки клиенти" -#: fetch-pack.c:1045 +#: fetch-pack.c:1052 msgid "Server does not support --shallow-since" msgstr "Сървърът не поддържа опцията „--shallow-since“" -#: fetch-pack.c:1050 +#: fetch-pack.c:1057 msgid "Server does not support --shallow-exclude" msgstr "Сървърът не поддържа опцията „--shallow-exclude“" -#: fetch-pack.c:1054 +#: fetch-pack.c:1061 msgid "Server does not support --deepen" msgstr "Сървърът не поддържа опцията „--deepen“" -#: fetch-pack.c:1056 +#: fetch-pack.c:1063 msgid "Server does not support this repository's object format" msgstr "Сървърът не поддържа форма̀та на обектите на това хранилище" -#: fetch-pack.c:1069 +#: fetch-pack.c:1076 msgid "no common commits" msgstr "няма общи подавания" -#: fetch-pack.c:1081 fetch-pack.c:1619 +#: fetch-pack.c:1088 fetch-pack.c:1628 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: неуспешно доставяне." -#: fetch-pack.c:1205 +#: fetch-pack.c:1214 #, c-format msgid "mismatched algorithms: client %s; server %s" msgstr "различни алгоритми — на клиента: „%s“, на сървъра: „%s“" -#: fetch-pack.c:1209 +#: fetch-pack.c:1218 #, c-format msgid "the server does not support algorithm '%s'" msgstr "сървърът не поддържа алгоритъм „%s“" -#: fetch-pack.c:1229 +#: fetch-pack.c:1238 msgid "Server does not support shallow requests" msgstr "Сървърът не поддържа плитки заявки" -#: fetch-pack.c:1236 +#: fetch-pack.c:1245 msgid "Server supports filter" msgstr "Сървърът поддържа филтри" -#: fetch-pack.c:1275 +#: fetch-pack.c:1284 msgid "unable to write request to remote" msgstr "невъзможно писане към отдалечено хранилище" -#: fetch-pack.c:1293 +#: fetch-pack.c:1302 #, c-format msgid "error reading section header '%s'" msgstr "грешка при прочитане на заглавната част на раздел „%s“" -#: fetch-pack.c:1299 +#: fetch-pack.c:1308 #, c-format msgid "expected '%s', received '%s'" msgstr "очаква се „%s“, а бе получено „%s“" -#: fetch-pack.c:1360 +#: fetch-pack.c:1369 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "неочакван ред за потвърждение: „%s“" -#: fetch-pack.c:1365 +#: fetch-pack.c:1374 #, c-format msgid "error processing acks: %d" msgstr "грешка при обработка на потвържденията: %d" -#: fetch-pack.c:1375 +#: fetch-pack.c:1384 msgid "expected packfile to be sent after 'ready'" msgstr "" "очакваше се пакетният файл да бъде изпратен след отговор за готовност (ready)" -#: fetch-pack.c:1377 +#: fetch-pack.c:1386 msgid "expected no other sections to be sent after no 'ready'" msgstr "" "очакваше се след липса на отговор за готовност (ready) да не се се пращат " "други раздели" -#: fetch-pack.c:1419 +#: fetch-pack.c:1428 #, c-format msgid "error processing shallow info: %d" msgstr "грешка при обработка на информация за дълбочината/плиткостта: %d" -#: fetch-pack.c:1466 +#: fetch-pack.c:1475 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "очаква се искан указател, а бе получено: „%s“" -#: fetch-pack.c:1471 +#: fetch-pack.c:1480 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "неочакван искан указател: „%s“" -#: fetch-pack.c:1476 +#: fetch-pack.c:1485 #, c-format msgid "error processing wanted refs: %d" msgstr "грешка при обработката на исканите указатели: %d" -#: fetch-pack.c:1506 +#: fetch-pack.c:1515 msgid "git fetch-pack: expected response end packet" msgstr "git fetch-pack: очаква се пакет за край на отговора" -#: fetch-pack.c:1887 +#: fetch-pack.c:1897 msgid "no matching remote head" msgstr "не може да бъде открит подходящ връх от отдалеченото хранилище" -#: fetch-pack.c:1910 builtin/clone.c:692 +#: fetch-pack.c:1920 builtin/clone.c:693 msgid "remote did not send all necessary objects" msgstr "отдалеченото хранилище не изпрати всички необходими обекти." -#: fetch-pack.c:1937 +#: fetch-pack.c:1947 #, c-format msgid "no such remote ref %s" msgstr "такъв отдалечен указател няма: %s" -#: fetch-pack.c:1940 +#: fetch-pack.c:1950 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Сървърът не позволява заявка за необявен обект „%s“" @@ -4397,7 +4411,7 @@ msgstr "Програмата „gpg“ не подписа данните." msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "прескачане на неправилния цвят „%.*s“ в „log.graphColors“" -#: grep.c:668 +#: grep.c:640 msgid "" "given pattern contains NULL byte (via -f ). This is only supported " "with -P under PCRE v2" @@ -4405,18 +4419,18 @@ msgstr "" "зададеният шаблон съдържа нулев знак (идва от -f „ФАЙЛ“). Това се поддържа " "в комбинация с „-P“ само при ползването на „PCRE v2“" -#: grep.c:2128 +#: grep.c:2100 #, c-format msgid "'%s': unable to read %s" msgstr "„%s“: файлът сочен от „%s“ не може да бъде прочетен" -#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:89 +#: grep.c:2117 setup.c:176 builtin/clone.c:412 builtin/diff.c:89 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "не може да бъде получена информация чрез „stat“ за „%s“" -#: grep.c:2156 +#: grep.c:2128 #, c-format msgid "'%s': short read" msgstr "„%s“: изчитането върна по-малко байтове от очакваното" @@ -4507,7 +4521,7 @@ msgstr "Външни команди" msgid "Command aliases" msgstr "Псевдоними на командите" -#: help.c:513 +#: help.c:527 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -4516,36 +4530,36 @@ msgstr "" "Изглежда, че „%s“ е команда на git, но тя не може да\n" "бъде изпълнена. Вероятно пакетът „git-%s“ е повреден." -#: help.c:572 +#: help.c:543 help.c:631 +#, c-format +msgid "git: '%s' is not a git command. See 'git --help'." +msgstr "git: „%s“ не е команда на git. Погледнете изхода от „git --help“." + +#: help.c:591 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Странно, изглежда, че на системата ви няма нито една команда на git." -#: help.c:594 +#: help.c:613 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "" "ПРЕДУПРЕЖДЕНИЕ: Пробвахте да изпълните команда на Git на име „%s“, а такава " "не съществува." -#: help.c:599 +#: help.c:618 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "" "Изпълнението автоматично продължава, като се счита, че имате предвид „%s“." -#: help.c:604 +#: help.c:623 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "" "Изпълнението автоматично ще продължи след %0.1f сек., като се счита, че " "имате предвид „%s“." -#: help.c:612 -#, c-format -msgid "git: '%s' is not a git command. See 'git --help'." -msgstr "git: „%s“ не е команда на git. Погледнете изхода от „git --help“." - -#: help.c:616 +#: help.c:635 msgid "" "\n" "The most similar command is" @@ -4559,16 +4573,16 @@ msgstr[1] "" "\n" "Най-близките команди са" -#: help.c:656 +#: help.c:675 msgid "git version []" msgstr "git version [ОПЦИЯ…]" -#: help.c:711 +#: help.c:730 #, c-format msgid "%s: %s - %s" msgstr "%s: %s — %s" -#: help.c:715 +#: help.c:734 msgid "" "\n" "Did you mean this?" @@ -4738,6 +4752,20 @@ msgstr "Файлът-ключалка „%s.lock“ не може да бъде msgid "expected flush after ls-refs arguments" msgstr "след аргументите към „ls-refs“ се очаква изчистване на буферите" +#: merge-ort-wrappers.c:13 merge-recursive.c:3672 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" +"Сливането ще презапише локалните промени на тези файлове:\n" +" %s" + +#: merge-ort-wrappers.c:33 merge-recursive.c:3436 +#, c-format +msgid "Already up to date!" +msgstr "Вече е обновено!" + #: merge-recursive.c:356 msgid "(bad commit)\n" msgstr "(лошо подаване)\n" @@ -5140,10 +5168,6 @@ msgstr "Добавяне на „%s“" msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "КОНФЛИКТ (добавяне/добавяне): Конфликт при сливане на „%s“" -#: merge-recursive.c:3436 -msgid "Already up to date!" -msgstr "Вече е обновено!" - #: merge-recursive.c:3445 #, c-format msgid "merging of trees %s and %s failed" @@ -5164,21 +5188,12 @@ msgstr[1] "открити са %u общи предшественици:" msgid "merge returned no commit" msgstr "сливането не върна подаване" -#: merge-recursive.c:3672 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -" %s" -msgstr "" -"Сливането ще презапише локалните промени на тези файлове:\n" -" %s" - #: merge-recursive.c:3769 #, c-format msgid "Could not parse object '%s'" msgstr "Неуспешен анализ на обекта „%s“" -#: merge-recursive.c:3787 builtin/merge.c:702 builtin/merge.c:881 +#: merge-recursive.c:3787 builtin/merge.c:711 builtin/merge.c:895 msgid "Unable to write index." msgstr "Индексът не може да бъде прочетен" @@ -5186,131 +5201,125 @@ msgstr "Индексът не може да бъде прочетен" msgid "failed to read the cache" msgstr "кешът не може да бъде прочетен" -#: merge.c:109 rerere.c:720 builtin/am.c:1896 builtin/am.c:1930 -#: builtin/checkout.c:560 builtin/checkout.c:816 builtin/clone.c:816 +#: merge.c:109 rerere.c:720 builtin/am.c:1883 builtin/am.c:1917 +#: builtin/checkout.c:573 builtin/checkout.c:829 builtin/clone.c:817 #: builtin/stash.c:265 msgid "unable to write new index file" msgstr "неуспешно записване на новия индекс" -#: midx.c:79 +#: midx.c:80 #, c-format msgid "multi-pack-index file %s is too small" msgstr "файлът с индекса за множество пакети „%s“ е твърде малък" -#: midx.c:95 +#: midx.c:96 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "отпечатъкът на индекса за множество пакети 0x%08x не съвпада с 0x%08x" -#: midx.c:100 +#: midx.c:101 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "непозната версия на индекс за множество пакети — %d" -#: midx.c:105 +#: midx.c:106 #, c-format msgid "multi-pack-index hash version %u does not match version %u" msgstr "" "версията на контролната сума на индекса за множество пакети %u не съвпада с " "%u" -#: midx.c:122 +#: midx.c:123 msgid "invalid chunk offset (too large)" msgstr "неправилно (прекалено голямо) отместване на откъс" -#: midx.c:146 +#: midx.c:147 msgid "terminating multi-pack-index chunk id appears earlier than expected" msgstr "" "идентификаторът за краен откъс на индекс за множество пакети се явява по-" "рано от очакваното" -#: midx.c:159 +#: midx.c:160 msgid "multi-pack-index missing required pack-name chunk" msgstr "липсва откъс (pack-name) от индекс за множество пакети" -#: midx.c:161 +#: midx.c:162 msgid "multi-pack-index missing required OID fanout chunk" msgstr "липсва откъс (OID fanout) от индекс за множество пакети" -#: midx.c:163 +#: midx.c:164 msgid "multi-pack-index missing required OID lookup chunk" msgstr "липсва откъс (OID lookup) от индекс за множество пакети" -#: midx.c:165 +#: midx.c:166 msgid "multi-pack-index missing required object offsets chunk" msgstr "липсва откъс за отместванията на обекти от индекс за множество пакети" -#: midx.c:179 +#: midx.c:180 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "" "неправилна подредба на имената в индекс за множество пакети: „%s“ се появи " "преди „%s“" -#: midx.c:222 +#: midx.c:223 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "" "неправилен идентификатор на пакет (pack-int-id): %u (от общо %u пакети)" -#: midx.c:272 +#: midx.c:273 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "" "индексът за множество пакети съдържа 64-битови отмествания, но размерът на " "„off_t“ е недостатъчен" -#: midx.c:300 -msgid "error preparing packfile from multi-pack-index" -msgstr "" -"грешка при създаването на пакетен файл на базата на индекс за множество " -"пакети" - -#: midx.c:485 +#: midx.c:480 #, c-format msgid "failed to add packfile '%s'" msgstr "пакетният файл „%s“ не може да бъде добавен" -#: midx.c:491 +#: midx.c:486 #, c-format msgid "failed to open pack-index '%s'" msgstr "индексът за пакети „%s“ не може да бъде отворен" -#: midx.c:551 +#: midx.c:546 #, c-format msgid "failed to locate object %d in packfile" msgstr "обект %d в пакетния файл липсва" -#: midx.c:853 +#: midx.c:846 msgid "Adding packfiles to multi-pack-index" msgstr "Добавяне на пакетни файлове към индекс за множество пакети" -#: midx.c:886 +#: midx.c:879 #, c-format msgid "did not see pack-file %s to drop" msgstr "пакетният файл за триене „%s“ не може да се открие" -#: midx.c:938 +#: midx.c:931 msgid "no pack files to index." msgstr "няма пакетни файлове за индексиране" -#: midx.c:990 +#: midx.c:982 msgid "Writing chunks to multi-pack-index" msgstr "Запис на откъси към индекс за множество пакети" -#: midx.c:1068 +#: midx.c:1060 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "индексът за множество пакети не може да бъде изчистен при „%s“" -#: midx.c:1124 +#: midx.c:1116 msgid "multi-pack-index file exists, but failed to parse" msgstr "файлът с индекса за множество пакети, но не може да бъде анализиран" -#: midx.c:1132 +#: midx.c:1124 msgid "Looking for referenced packfiles" msgstr "Търсене на указаните пакетни файлове" -#: midx.c:1147 +#: midx.c:1139 #, c-format msgid "" "oid fanout out of order: fanout[%d] = % > % = fanout[%d]" @@ -5318,58 +5327,58 @@ msgstr "" "неправилна подредба на откъси (OID fanout): fanout[%d] = % > " "% = fanout[%d]" -#: midx.c:1152 +#: midx.c:1144 msgid "the midx contains no oid" msgstr "във файла с индекса за множество пакети няма идентификатори на обекти" -#: midx.c:1161 +#: midx.c:1153 msgid "Verifying OID order in multi-pack-index" msgstr "" "Проверка на подредбата на идентификатори на обекти във файл с индекс към " "множество пакетни файлове" -#: midx.c:1170 +#: midx.c:1162 #, 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:1190 +#: midx.c:1182 msgid "Sorting objects by packfile" msgstr "Подредба на обектите по пакетни файлове" -#: midx.c:1197 +#: midx.c:1189 msgid "Verifying object offsets" msgstr "Проверка на отместването на обекти" -#: midx.c:1213 +#: midx.c:1205 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "записът в пакета за обекта oid[%d] = %s не може да бъде зареден" -#: midx.c:1219 +#: midx.c:1211 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "индексът на пакета „%s“ не може да бъде зареден" -#: midx.c:1228 +#: midx.c:1220 #, c-format msgid "incorrect object offset for oid[%d] = %s: % != %" msgstr "неправилно отместване на обект за oid[%d] = %s: % != %" -#: midx.c:1253 +#: midx.c:1245 msgid "Counting referenced objects" msgstr "Преброяване на свързаните обекти" -#: midx.c:1263 +#: midx.c:1255 msgid "Finding and deleting unreferenced packfiles" msgstr "Търсене и изтриване на несвързаните пакетни файлове" -#: midx.c:1454 +#: midx.c:1446 msgid "could not start pack-objects" msgstr "командата „pack-objects“ не може да бъде стартирана" -#: midx.c:1474 +#: midx.c:1466 msgid "could not finish pack-objects" msgstr "командата „pack-objects“ не може да бъде завършена" @@ -5466,19 +5475,19 @@ msgstr "разлика в контролната сума: „%s“" msgid "unable to get size of %s" msgstr "размерът на „%s“ не може да бъде получен" -#: packfile.c:630 +#: packfile.c:615 msgid "offset before end of packfile (broken .idx?)" msgstr "" "отместване преди края на пакетния файл (възможно е индексът да е повреден)" -#: packfile.c:1922 +#: packfile.c:1907 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "" "отместване преди началото на индекса на пакетния файл „%s“ (възможно е " "индексът да е повреден)" -#: packfile.c:1926 +#: packfile.c:1911 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" @@ -5730,7 +5739,7 @@ msgstr "протоколна грешка: неправилeн знак за д msgid "protocol error: bad line length %d" msgstr "протоколна грешка: неправилна дължина на ред: %d" -#: pkt-line.c:373 sideband.c:150 +#: pkt-line.c:373 sideband.c:165 #, c-format msgid "remote error: %s" msgstr "отдалечена грешка: %s" @@ -5781,7 +5790,7 @@ msgid "could not read `log` output" msgstr "" "изходът от командата за журнала с подавания „log“ не може да се прочете" -#: range-diff.c:98 sequencer.c:5283 +#: range-diff.c:98 sequencer.c:5310 #, c-format msgid "could not parse commit '%s'" msgstr "подаването „%s“ не може да бъде анализирано" @@ -5800,11 +5809,11 @@ msgstr "" msgid "could not parse git header '%.*s'" msgstr "заглавната част на git „%.*s“ не може да се анализира" -#: range-diff.c:301 +#: range-diff.c:299 msgid "failed to generate diff" msgstr "неуспешно търсене на разлика" -#: range-diff.c:534 range-diff.c:536 +#: range-diff.c:532 range-diff.c:534 #, c-format msgid "could not parse log for '%s'" msgstr "журналът с подаванията на „%s“ не може да бъде анализиран" @@ -5925,8 +5934,8 @@ msgstr "неподредени записи за „%s“" #: read-cache.c:1971 read-cache.c:2262 rerere.c:565 rerere.c:599 rerere.c:1111 #: submodule.c:1628 builtin/add.c:538 builtin/check-ignore.c:181 -#: builtin/checkout.c:489 builtin/checkout.c:675 builtin/clean.c:991 -#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507 +#: builtin/checkout.c:502 builtin/checkout.c:688 builtin/clean.c:991 +#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:507 #: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290 #: builtin/submodule--helper.c:332 msgid "index file corrupt" @@ -5984,12 +5993,12 @@ msgstr "споделеният индекс „%s“ не може да се о msgid "broken index, expect %s in %s, got %s" msgstr "грешки в индекса — в „%2$s“ се очаква „%1$s“, а бе получено „%3$s“" -#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1126 +#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1140 #, c-format msgid "could not close '%s'" msgstr "„%s“ не може да се затвори" -#: read-cache.c:3120 sequencer.c:2446 sequencer.c:4185 +#: read-cache.c:3120 sequencer.c:2479 sequencer.c:4231 #, c-format msgid "could not stat '%s'" msgstr "неуспешно изпълнение на „stat“ върху „%s“" @@ -6128,14 +6137,14 @@ msgstr "" "Ако изтриете всичко, пребазирането ще бъде преустановено.\n" "\n" -#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3571 -#: sequencer.c:3597 sequencer.c:5389 builtin/fsck.c:347 builtin/rebase.c:264 +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3607 +#: sequencer.c:3633 sequencer.c:5416 builtin/fsck.c:347 builtin/rebase.c:270 #, c-format msgid "could not write '%s'" msgstr "„%s“ не може да се запише" -#: rebase-interactive.c:116 builtin/rebase.c:196 builtin/rebase.c:222 -#: builtin/rebase.c:246 +#: rebase-interactive.c:116 builtin/rebase.c:202 builtin/rebase.c:228 +#: builtin/rebase.c:252 #, c-format msgid "could not write '%s'." msgstr "„%s“ не може да се запише." @@ -6166,9 +6175,9 @@ msgstr "" "предупреждение)\n" "или „error“ (считане за грешка).\n" -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2361 -#: builtin/rebase.c:182 builtin/rebase.c:207 builtin/rebase.c:233 -#: builtin/rebase.c:258 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2394 +#: builtin/rebase.c:188 builtin/rebase.c:213 builtin/rebase.c:239 +#: builtin/rebase.c:264 #, c-format msgid "could not read '%s'." msgstr "от „%s“ не може да се чете." @@ -6363,61 +6372,61 @@ msgstr "формат: лексемата %%(end) е използвана без msgid "malformed format string %s" msgstr "неправилен форматиращ низ „%s“" -#: ref-filter.c:1541 +#: ref-filter.c:1549 #, c-format msgid "no branch, rebasing %s" msgstr "извън клон, пребазиране на „%s“" -#: ref-filter.c:1544 +#: ref-filter.c:1552 #, c-format msgid "no branch, rebasing detached HEAD %s" msgstr "извън клон, пребазиране на несвързан указател „HEAD“ при „%s“" -#: ref-filter.c:1547 +#: ref-filter.c:1555 #, c-format msgid "no branch, bisect started on %s" msgstr "извън клон, двоично търсене от „%s“" -#: ref-filter.c:1557 +#: ref-filter.c:1565 msgid "no branch" msgstr "извън клон" -#: ref-filter.c:1591 ref-filter.c:1800 +#: ref-filter.c:1599 ref-filter.c:1808 #, c-format msgid "missing object %s for %s" msgstr "обектът „%s“ липсва за „%s“" -#: ref-filter.c:1601 +#: ref-filter.c:1609 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "неуспешно анализиране чрез „parse_object_buffer“ на „%s“ за „%s“" -#: ref-filter.c:2054 +#: ref-filter.c:2062 #, c-format msgid "malformed object at '%s'" msgstr "обект със сгрешен формат при „%s“" -#: ref-filter.c:2143 +#: ref-filter.c:2151 #, c-format msgid "ignoring ref with broken name %s" msgstr "игнориране на указателя с грешно име „%s“" -#: ref-filter.c:2148 refs.c:657 +#: ref-filter.c:2156 refs.c:676 #, c-format msgid "ignoring broken ref %s" msgstr "игнориране на повредения указател „%s“" -#: ref-filter.c:2464 +#: ref-filter.c:2472 #, c-format msgid "format: %%(end) atom missing" msgstr "грешка във форма̀та: липсва лексемата %%(end)" -#: ref-filter.c:2563 +#: ref-filter.c:2571 #, c-format msgid "malformed object name %s" msgstr "неправилно име на обект „%s“" -#: ref-filter.c:2568 +#: ref-filter.c:2576 #, c-format msgid "option `%s' must point to a commit" msgstr "опцията „%s“ не сочи към подаване" @@ -6427,65 +6436,90 @@ msgstr "опцията „%s“ не сочи към подаване" msgid "%s does not point to a valid object!" msgstr "„%s“ не сочи към позволен обект!" -#: refs.c:572 +#: refs.c:566 +#, c-format +msgid "" +"Using '%s' as the name for the initial branch. This default branch name\n" +"is subject to change. To configure the initial branch name to use in all\n" +"of your new repositories, which will suppress this warning, call:\n" +"\n" +"\tgit config --global init.defaultBranch \n" +"\n" +"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n" +"'development'. The just-created branch can be renamed via this command:\n" +"\n" +"\tgit branch -m \n" +msgstr "" +"Първоначалният клон ще се казва „%s“. Това може да се промени. Можете да " +"зададете\n" +"настройката и да спрете това съобщение. За това изпълнете:\n" +"\n" +" git config --global init.defaultBranch ИМЕ\n" +"\n" +"Често ползвани варианти вместо „master“ са „main“, „trunk“ и „development“.\n" +"За да преименувата току що създаден клон, изпълнете:\n" +"\n" +" git branch -m ИМЕ\n" + +#: refs.c:588 #, c-format msgid "could not retrieve `%s`" msgstr "„%s“ не може да бъде получен" -#: refs.c:579 +#: refs.c:598 #, c-format msgid "invalid branch name: %s = %s" msgstr "неправилно име на клон: „%s = %s“" -#: refs.c:655 +#: refs.c:674 #, c-format msgid "ignoring dangling symref %s" msgstr "игнориране на указател на обект извън клон „%s“" -#: refs.c:892 +#: refs.c:911 #, c-format msgid "log for ref %s has gap after %s" msgstr "има пропуски в журнала с подаванията за указателя „%s“ след „%s“" -#: refs.c:898 +#: refs.c:917 #, c-format msgid "log for ref %s unexpectedly ended on %s" msgstr "журналът с подаванията за указателя „%s“ свършва неочаквано след „%s“" -#: refs.c:957 +#: refs.c:976 #, c-format msgid "log for %s is empty" msgstr "журналът с подаванията за указателя „%s“ е празен" -#: refs.c:1049 +#: refs.c:1068 #, c-format msgid "refusing to update ref with bad name '%s'" msgstr "указател не може да се обнови с грешно име „%s“" -#: refs.c:1120 +#: refs.c:1139 #, c-format msgid "update_ref failed for ref '%s': %s" msgstr "неуспешно обновяване на указателя „%s“: %s" -#: refs.c:1944 +#: refs.c:1963 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "не са позволени повече от една промени на указателя „%s“" -#: refs.c:2024 +#: refs.c:2043 msgid "ref updates forbidden inside quarantine environment" msgstr "обновяванията на указатели са забранени в среди под карантина" -#: refs.c:2035 +#: refs.c:2054 msgid "ref updates aborted by hook" msgstr "обновяванията на указатели са преустановени от кука" -#: refs.c:2135 refs.c:2165 +#: refs.c:2154 refs.c:2184 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "„%s“ съществува, не може да се създаде „%s“" -#: refs.c:2141 refs.c:2176 +#: refs.c:2160 refs.c:2195 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "невъзможно е едновременно да се обработват „%s“ и „%s“" @@ -6506,7 +6540,7 @@ msgstr "Указателят „%s“ не може да бъде изтрит: msgid "could not delete references: %s" msgstr "Указателите не може да бъдат изтрити: %s" -#: refspec.c:167 +#: refspec.c:170 #, c-format msgid "invalid refspec '%s'" msgstr "неправилен указател: „%s“" @@ -6652,96 +6686,96 @@ msgstr "" "указателят на версия-цел „%s“ съответства и ще получава от повече от един " "източник" -#: remote.c:1703 remote.c:1804 +#: remote.c:1714 remote.c:1815 msgid "HEAD does not point to a branch" msgstr "Указателят „HEAD“ не сочи към клон" -#: remote.c:1712 +#: remote.c:1723 #, c-format msgid "no such branch: '%s'" msgstr "няма клон на име „%s“" -#: remote.c:1715 +#: remote.c:1726 #, c-format msgid "no upstream configured for branch '%s'" msgstr "не е зададен клон-източник за клона „%s“" -#: remote.c:1721 +#: remote.c:1732 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "клонът-източник „%s“ не е съхранен като следящ клон" -#: remote.c:1736 +#: remote.c:1747 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" "липсва локален следящ клон за местоположението за изтласкване „%s“ в " "хранилището „%s“" -#: remote.c:1748 +#: remote.c:1759 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "няма информация клонът „%s“ да следи някой друг" -#: remote.c:1758 +#: remote.c:1769 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "указателят за изтласкване на „%s“ не включва „%s“" -#: remote.c:1771 +#: remote.c:1782 msgid "push has no destination (push.default is 'nothing')" msgstr "указателят за изтласкване не включва цел („push.default“ е „nothing“)" -#: remote.c:1793 +#: remote.c:1804 msgid "cannot resolve 'simple' push to a single destination" msgstr "простото (simple) изтласкване не съответства на една цел" -#: remote.c:1922 +#: remote.c:1933 #, c-format msgid "couldn't find remote ref %s" msgstr "отдалеченият указател „%s“ не може да бъде открит" -#: remote.c:1935 +#: remote.c:1946 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "• прескачане на неочаквания локален указател „%s“" -#: remote.c:2098 +#: remote.c:2109 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Този клон следи „%s“, но следеният клон е изтрит.\n" -#: remote.c:2102 +#: remote.c:2113 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (за да коригирате това, използвайте „git branch --unset-upstream“)\n" -#: remote.c:2105 +#: remote.c:2116 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Клонът е обновен към „%s“.\n" -#: remote.c:2109 +#: remote.c:2120 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "Клонът ви и „%s“ сочат към различни подавания.\n" -#: remote.c:2112 +#: remote.c:2123 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (за повече информация ползвайте „%s“)\n" -#: remote.c:2116 +#: remote.c:2127 #, 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] "Клонът ви е с %2$d подаване пред „%1$s“.\n" msgstr[1] "Клонът ви е с %2$d подавания пред „%1$s“.\n" -#: remote.c:2122 +#: remote.c:2133 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (публикувайте локалните си промени чрез „git push“)\n" -#: remote.c:2125 +#: remote.c:2136 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -6749,11 +6783,11 @@ msgid_plural "" msgstr[0] "Клонът ви е с %2$d подаване зад „%1$s“ и може да бъде превъртян.\n" msgstr[1] "Клонът ви е с %2$d подавания зад „%1$s“ и може да бъде превъртян.\n" -#: remote.c:2133 +#: remote.c:2144 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (обновете локалния си клон чрез „git pull“)\n" -#: remote.c:2136 +#: remote.c:2147 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -6768,11 +6802,11 @@ msgstr[1] "" "Текущият клон се е отделил от „%s“,\n" "двата имат съответно по %d и %d несъвпадащи подавания.\n" -#: remote.c:2146 +#: remote.c:2157 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (слейте отдалечения клон в локалния чрез „git pull“)\n" -#: remote.c:2337 +#: remote.c:2349 #, c-format msgid "cannot parse expected object name '%s'" msgstr "очакваното име на обект „%s“ не може да бъде анализирано" @@ -6853,7 +6887,7 @@ msgstr "излишният обект „%s“ не може да се изтр msgid "Recorded preimage for '%s'" msgstr "Предварителният вариант на „%s“ е запазен" -#: rerere.c:881 submodule.c:2082 builtin/log.c:1975 +#: rerere.c:881 submodule.c:2082 builtin/log.c:1992 #: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890 #, c-format msgid "could not create directory '%s'" @@ -6892,45 +6926,45 @@ msgstr "директорията „rr-cache“ не може да се отво msgid "could not determine HEAD revision" msgstr "не може да се определи към какво да сочи указателят „HEAD“" -#: reset.c:70 reset.c:76 sequencer.c:3426 +#: reset.c:70 reset.c:76 sequencer.c:3460 #, c-format msgid "failed to find tree of %s" msgstr "дървото, сочено от „%s“, не може да бъде открито" -#: revision.c:2344 +#: revision.c:2336 msgid "--unpacked= no longer supported" msgstr "опцията „--unpacked=ПАКЕТЕН_ФАЙЛ“ вече не се поддържа" -#: revision.c:2364 +#: revision.c:2356 #, c-format msgid "unknown value for --diff-merges: %s" msgstr "непозната стойност за опцията „--diff-merges“: „%s“" -#: revision.c:2702 +#: revision.c:2694 msgid "your current branch appears to be broken" msgstr "Текущият клон е повреден" -#: revision.c:2705 +#: revision.c:2697 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "Текущият клон „%s“ е без подавания " -#: revision.c:2915 +#: revision.c:2907 msgid "-L does not yet support diff formats besides -p and -s" msgstr "" "опцията „-L“ поддържа единствено форматирането на разликите според опциите „-" "p“ и „-s“" -#: run-command.c:763 +#: run-command.c:764 msgid "open /dev/null failed" msgstr "неуспешно отваряне на „/dev/null“" -#: run-command.c:1270 +#: run-command.c:1271 #, c-format msgid "cannot create async thread: %s" msgstr "не може да се създаде асинхронна нишка: %s" -#: run-command.c:1334 +#: run-command.c:1335 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -6940,37 +6974,37 @@ msgstr "" "За да изключите това предупреждение, изпълнете:\n" " git config advice.ignoredHook false" -#: send-pack.c:145 +#: send-pack.c:146 msgid "unexpected flush packet while reading remote unpack status" msgstr "" "неочакван изчистващ пакет „flush“ при изчитане на състоянието от " "отдалеченото разпакетиране" -#: send-pack.c:147 +#: send-pack.c:148 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "" "състоянието от отдалеченото разпакетиране не може да бъде анализирано: %s" -#: send-pack.c:149 +#: send-pack.c:150 #, c-format msgid "remote unpack failed: %s" msgstr "неуспешно отдалечено разпакетиране: %s" -#: send-pack.c:372 +#: send-pack.c:374 msgid "failed to sign the push certificate" msgstr "сертификатът за изтласкване не може да бъде подписан" -#: send-pack.c:460 +#: send-pack.c:467 msgid "the receiving end does not support this repository's hash algorithm" msgstr "" "отсрещната страна не поддържа алгоритъма за контролни суми на това хранилище" -#: send-pack.c:469 +#: send-pack.c:476 msgid "the receiving end does not support --signed push" msgstr "отсрещната страна не поддържа изтласкване с опцията „--signed“" -#: send-pack.c:471 +#: send-pack.c:478 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -6978,47 +7012,47 @@ msgstr "" "отсрещната страна не поддържа изтласкване с опцията „--signed“, затова не се " "използва сертификат" -#: send-pack.c:483 +#: send-pack.c:490 msgid "the receiving end does not support --atomic push" msgstr "получаващата страна не поддържа изтласкване с опцията „--atomic“" -#: send-pack.c:488 +#: send-pack.c:495 msgid "the receiving end does not support push options" msgstr "отсрещната страна не поддържа опции при изтласкване" -#: sequencer.c:194 +#: sequencer.c:195 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "несъществуващ режим на изчистване „%s“ на съобщение при подаване" -#: sequencer.c:308 +#: sequencer.c:323 #, c-format msgid "could not delete '%s'" msgstr "„%s“ не може да бъде изтрит" -#: sequencer.c:329 builtin/rebase.c:749 builtin/rebase.c:1590 builtin/rm.c:385 +#: sequencer.c:343 builtin/rebase.c:755 builtin/rebase.c:1596 builtin/rm.c:385 #, c-format msgid "could not remove '%s'" msgstr "„%s“ не може да бъде изтрит" -#: sequencer.c:339 +#: sequencer.c:353 msgid "revert" msgstr "отмяна" -#: sequencer.c:341 +#: sequencer.c:355 msgid "cherry-pick" msgstr "отбиране" -#: sequencer.c:343 +#: sequencer.c:357 msgid "rebase" msgstr "пребазиране" -#: sequencer.c:345 +#: sequencer.c:359 #, c-format msgid "unknown action: %d" msgstr "неизвестно действие: %d" -#: sequencer.c:404 +#: sequencer.c:418 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add ' or 'git rm '" @@ -7026,7 +7060,7 @@ msgstr "" "след коригирането на конфликтите, отбележете съответните\n" "пътища с „git add ПЪТ…“ или „git rm ПЪТ…“." -#: sequencer.c:407 +#: sequencer.c:421 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add ' or 'git rm '\n" @@ -7036,43 +7070,43 @@ msgstr "" "пътища с „git add ПЪТ…“ или „git rm ПЪТ…“, след което\n" "подайте резултата с командата „git commit'“." -#: sequencer.c:420 sequencer.c:3028 +#: sequencer.c:434 sequencer.c:3062 #, c-format msgid "could not lock '%s'" msgstr "„%s“ не може да се заключи" -#: sequencer.c:422 sequencer.c:2827 sequencer.c:3032 sequencer.c:3046 -#: sequencer.c:3303 sequencer.c:5299 strbuf.c:1168 wrapper.c:631 +#: sequencer.c:436 sequencer.c:2861 sequencer.c:3066 sequencer.c:3080 +#: sequencer.c:3337 sequencer.c:5326 strbuf.c:1168 wrapper.c:631 #, c-format msgid "could not write to '%s'" msgstr "в „%s“ не може да се пише" -#: sequencer.c:427 +#: sequencer.c:441 #, c-format msgid "could not write eol to '%s'" msgstr "краят на ред не може да се запише в „%s“" -#: sequencer.c:432 sequencer.c:2832 sequencer.c:3034 sequencer.c:3048 -#: sequencer.c:3311 +#: sequencer.c:446 sequencer.c:2866 sequencer.c:3068 sequencer.c:3082 +#: sequencer.c:3345 #, c-format msgid "failed to finalize '%s'" msgstr "„%s“ не може да се завърши" -#: sequencer.c:471 +#: sequencer.c:485 #, c-format msgid "your local changes would be overwritten by %s." msgstr "локалните ви промени ще бъдат презаписани при %s." -#: sequencer.c:475 +#: sequencer.c:489 msgid "commit your changes or stash them to proceed." msgstr "подайте или скатайте промените, за да продължите" -#: sequencer.c:507 +#: sequencer.c:521 #, c-format msgid "%s: fast-forward" msgstr "%s: превъртане" -#: sequencer.c:546 builtin/tag.c:566 +#: sequencer.c:560 builtin/tag.c:566 #, c-format msgid "Invalid cleanup mode %s" msgstr "Несъществуващ режим на изчистване „%s“" @@ -7080,65 +7114,65 @@ msgstr "Несъществуващ режим на изчистване „%s“ #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase". #. -#: sequencer.c:640 +#: sequencer.c:670 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: новият индекс не може да бъде запазен" -#: sequencer.c:657 +#: sequencer.c:687 msgid "unable to update cache tree" msgstr "дървото на кеша не може да бъде обновено" -#: sequencer.c:671 +#: sequencer.c:701 msgid "could not resolve HEAD commit" msgstr "подаването, сочено от указателя „HEAD“, не може да бъде открито" -#: sequencer.c:751 +#: sequencer.c:781 #, c-format msgid "no key present in '%.*s'" msgstr "в „%.*s“ няма ключове" -#: sequencer.c:762 +#: sequencer.c:792 #, c-format msgid "unable to dequote value of '%s'" msgstr "цитирането на стойността на „%s“ не може да бъде изчистено" -#: sequencer.c:799 wrapper.c:201 wrapper.c:371 builtin/am.c:724 -#: builtin/am.c:816 builtin/merge.c:1121 builtin/rebase.c:902 +#: sequencer.c:829 wrapper.c:201 wrapper.c:371 builtin/am.c:710 +#: builtin/am.c:802 builtin/merge.c:1135 builtin/rebase.c:908 #, c-format msgid "could not open '%s' for reading" msgstr "файлът не може да бъде прочетен: „%s“" -#: sequencer.c:809 +#: sequencer.c:839 msgid "'GIT_AUTHOR_NAME' already given" msgstr "настройката за автор „GIT_AUTHOR_NAME“ вече е зададена" -#: sequencer.c:814 +#: sequencer.c:844 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "настройката за е-поща „GIT_AUTHOR_EMAIL“ вече е зададена" -#: sequencer.c:819 +#: sequencer.c:849 msgid "'GIT_AUTHOR_DATE' already given" msgstr "настройката за дата „GIT_AUTHOR_DATE“ вече е зададена" -#: sequencer.c:823 +#: sequencer.c:853 #, c-format msgid "unknown variable '%s'" msgstr "непозната променлива „%s“" -#: sequencer.c:828 +#: sequencer.c:858 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "настройката за автор „GIT_AUTHOR_NAME“ липсва" -#: sequencer.c:830 +#: sequencer.c:860 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "настройката за е-поща „GIT_AUTHOR_EMAIL“ липсва" -#: sequencer.c:832 +#: sequencer.c:862 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "настройката за дата „GIT_AUTHOR_DATE“ липсва" -#: sequencer.c:897 +#: sequencer.c:927 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -7167,13 +7201,13 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:1178 +#: sequencer.c:1208 msgid "'prepare-commit-msg' hook failed" msgstr "" "неуспешно изпълнение на куката при промяна на съобщението при подаване " "(prepare-commit-msg)" -#: sequencer.c:1184 +#: sequencer.c:1214 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -7202,7 +7236,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1197 +#: sequencer.c:1227 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -7228,351 +7262,351 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1239 +#: sequencer.c:1269 msgid "couldn't look up newly created commit" msgstr "току що създаденото подаване не може да бъде открито" -#: sequencer.c:1241 +#: sequencer.c:1271 msgid "could not parse newly created commit" msgstr "току що създаденото подаване не може да бъде анализирано" -#: sequencer.c:1287 +#: sequencer.c:1317 msgid "unable to resolve HEAD after creating commit" msgstr "" "състоянието сочено от указателя „HEAD“ не може да бъде открито след " "подаването" -#: sequencer.c:1289 +#: sequencer.c:1319 msgid "detached HEAD" msgstr "несвързан връх „HEAD“" -#: sequencer.c:1293 +#: sequencer.c:1323 msgid " (root-commit)" msgstr " (начално подаване)" -#: sequencer.c:1314 +#: sequencer.c:1344 msgid "could not parse HEAD" msgstr "указателят „HEAD“ не може да бъде анализиран" -#: sequencer.c:1316 +#: sequencer.c:1346 #, c-format msgid "HEAD %s is not a commit!" msgstr "указателят „HEAD“ „%s“ сочи към нещо, което не е подаване!" -#: sequencer.c:1320 sequencer.c:1395 builtin/commit.c:1577 +#: sequencer.c:1350 sequencer.c:1425 builtin/commit.c:1577 msgid "could not parse HEAD commit" msgstr "върховото подаване „HEAD“ не може да бъде прочетено" -#: sequencer.c:1373 sequencer.c:2067 +#: sequencer.c:1403 sequencer.c:2100 msgid "unable to parse commit author" msgstr "авторът на подаването не може да бъде анализиран" -#: sequencer.c:1384 builtin/am.c:1580 builtin/merge.c:692 +#: sequencer.c:1414 builtin/am.c:1566 builtin/merge.c:701 msgid "git write-tree failed to write a tree" msgstr "Командата „git write-tree“ не успя да запише обект-дърво" -#: sequencer.c:1417 sequencer.c:1535 +#: sequencer.c:1447 sequencer.c:1565 #, c-format msgid "unable to read commit message from '%s'" msgstr "съобщението за подаване не може да бъде прочетено от „%s“" -#: sequencer.c:1446 sequencer.c:1478 +#: sequencer.c:1476 sequencer.c:1508 #, c-format msgid "invalid author identity '%s'" msgstr "неправилна самоличност за автор: „%s“" -#: sequencer.c:1452 +#: sequencer.c:1482 msgid "corrupt author: missing date information" msgstr "повредена информация за автор: липсва дата" -#: sequencer.c:1491 builtin/am.c:1606 builtin/commit.c:1678 builtin/merge.c:890 -#: builtin/merge.c:915 +#: sequencer.c:1521 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:904 +#: builtin/merge.c:929 t/helper/test-fast-rebase.c:78 msgid "failed to write commit object" msgstr "обектът за подаването не може да бъде записан" -#: sequencer.c:1518 sequencer.c:4237 +#: sequencer.c:1548 sequencer.c:4283 t/helper/test-fast-rebase.c:198 #, c-format msgid "could not update %s" msgstr "„%s“ не може да се обнови" -#: sequencer.c:1567 +#: sequencer.c:1597 #, c-format msgid "could not parse commit %s" msgstr "подаването „%s“ не може да бъде анализирано" -#: sequencer.c:1572 +#: sequencer.c:1602 #, c-format msgid "could not parse parent commit %s" msgstr "родителското подаване „%s“ не може да бъде анализирано" -#: sequencer.c:1655 sequencer.c:1766 +#: sequencer.c:1685 sequencer.c:1796 #, c-format msgid "unknown command: %d" msgstr "непозната команда: %d" -#: sequencer.c:1713 sequencer.c:1738 +#: sequencer.c:1743 sequencer.c:1768 #, c-format msgid "This is a combination of %d commits." msgstr "Това е обединение от %d подавания" -#: sequencer.c:1723 +#: sequencer.c:1753 msgid "need a HEAD to fixup" msgstr "За вкарване в предходното подаване ви трябва указател „HEAD“" -#: sequencer.c:1725 sequencer.c:3338 +#: sequencer.c:1755 sequencer.c:3372 msgid "could not read HEAD" msgstr "указателят „HEAD“ не може да се прочете" -#: sequencer.c:1727 +#: sequencer.c:1757 msgid "could not read HEAD's commit message" msgstr "" "съобщението за подаване към указателя „HEAD“ не може да бъде прочетено: %s" -#: sequencer.c:1733 +#: sequencer.c:1763 #, c-format msgid "cannot write '%s'" msgstr "„%s“ не може да се запази" -#: sequencer.c:1740 git-rebase--preserve-merges.sh:486 +#: sequencer.c:1770 git-rebase--preserve-merges.sh:486 msgid "This is the 1st commit message:" msgstr "Това е 1-то съобщение при подаване:" -#: sequencer.c:1748 +#: sequencer.c:1778 #, c-format msgid "could not read commit message of %s" msgstr "съобщението за подаване към „%s“ не може да бъде прочетено" -#: sequencer.c:1755 +#: sequencer.c:1785 #, c-format msgid "This is the commit message #%d:" msgstr "Това е съобщение при подаване №%d:" -#: sequencer.c:1761 +#: sequencer.c:1791 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Съобщение при подаване №%d ще бъде прескочено:" -#: sequencer.c:1849 +#: sequencer.c:1879 msgid "your index file is unmerged." msgstr "индексът не е слят." -#: sequencer.c:1856 +#: sequencer.c:1886 msgid "cannot fixup root commit" msgstr "началното подаване не може да се вкара в предходното му" -#: sequencer.c:1875 +#: sequencer.c:1905 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "подаването „%s“ е сливане, но не е дадена опцията „-m“" -#: sequencer.c:1883 sequencer.c:1891 +#: sequencer.c:1913 sequencer.c:1921 #, c-format msgid "commit %s does not have parent %d" msgstr "подаването „%s“ няма родител %d" -#: sequencer.c:1897 +#: sequencer.c:1927 #, 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:1916 +#: sequencer.c:1946 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: неразпозната стойност за родителското подаване „%s“" -#: sequencer.c:1981 +#: sequencer.c:2011 #, c-format msgid "could not rename '%s' to '%s'" msgstr "„%s“ не може да се преименува на „%s“" -#: sequencer.c:2038 +#: sequencer.c:2071 #, c-format msgid "could not revert %s... %s" msgstr "подаването „%s“… не може да бъде отменено: „%s“" -#: sequencer.c:2039 +#: sequencer.c:2072 #, c-format msgid "could not apply %s... %s" msgstr "подаването „%s“… не може да бъде приложено: „%s“" -#: sequencer.c:2059 +#: sequencer.c:2092 #, c-format msgid "dropping %s %s -- patch contents already upstream\n" msgstr "прескачане на %s %s — кръпката вече е приложена\n" -#: sequencer.c:2117 +#: sequencer.c:2150 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: неуспешно изчитане на индекса" -#: sequencer.c:2124 +#: sequencer.c:2157 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: неуспешно обновяване на индекса" -#: sequencer.c:2201 +#: sequencer.c:2234 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "„%s“ не приема аргументи: „%s“" -#: sequencer.c:2210 +#: sequencer.c:2243 #, c-format msgid "missing arguments for %s" msgstr "„%s“ изисква аргументи" -#: sequencer.c:2241 +#: sequencer.c:2274 #, c-format msgid "could not parse '%s'" msgstr "„%s“ не може да се анализира" -#: sequencer.c:2302 +#: sequencer.c:2335 #, c-format msgid "invalid line %d: %.*s" msgstr "неправилен ред %d: %.*s" -#: sequencer.c:2313 +#: sequencer.c:2346 #, c-format msgid "cannot '%s' without a previous commit" msgstr "Без предишно подаване не може да се изпълни „%s“" -#: sequencer.c:2399 +#: sequencer.c:2432 msgid "cancelling a cherry picking in progress" msgstr "преустановяване на извършваното в момента отбиране на подавания" -#: sequencer.c:2408 +#: sequencer.c:2441 msgid "cancelling a revert in progress" msgstr "преустановяване на извършваното в момента отмяна на подаване" -#: sequencer.c:2452 +#: sequencer.c:2485 msgid "please fix this using 'git rebase --edit-todo'." msgstr "коригирайте това чрез „git rebase --edit-todo“." -#: sequencer.c:2454 +#: sequencer.c:2487 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "неизползваем файл с описание на предстоящите действия: „%s“" -#: sequencer.c:2459 +#: sequencer.c:2492 msgid "no commits parsed." msgstr "никое от подаванията не може да се разпознае." -#: sequencer.c:2470 +#: sequencer.c:2503 msgid "cannot cherry-pick during a revert." msgstr "" "по време на отмяна на подаване не може да се извърши отбиране на подаване." -#: sequencer.c:2472 +#: sequencer.c:2505 msgid "cannot revert during a cherry-pick." msgstr "по време на отбиране не може да се извърши отмяна на подаване." -#: sequencer.c:2550 +#: sequencer.c:2583 #, c-format msgid "invalid value for %s: %s" msgstr "неправилна стойност за „%s“: „%s“" -#: sequencer.c:2657 +#: sequencer.c:2690 msgid "unusable squash-onto" msgstr "подаването, в което другите да се вкарат, не може да се използва" -#: sequencer.c:2677 +#: sequencer.c:2710 #, c-format msgid "malformed options sheet: '%s'" msgstr "неправилен файл с опции: „%s“" -#: sequencer.c:2769 sequencer.c:4609 +#: sequencer.c:2803 sequencer.c:4636 msgid "empty commit set passed" msgstr "зададено е празно множество от подавания" -#: sequencer.c:2786 +#: sequencer.c:2820 msgid "revert is already in progress" msgstr "в момента вече се извършва отмяна на подавания" -#: sequencer.c:2788 +#: sequencer.c:2822 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "използвайте „git cherry-pick (--continue | %s--abort | --quit)“" -#: sequencer.c:2791 +#: sequencer.c:2825 msgid "cherry-pick is already in progress" msgstr "в момента вече се извършва отбиране на подавания" -#: sequencer.c:2793 +#: sequencer.c:2827 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "използвайте „git cherry-pick (--continue | %s--abort | --quit)“" -#: sequencer.c:2807 +#: sequencer.c:2841 #, c-format msgid "could not create sequencer directory '%s'" msgstr "" "директорията за определянето на последователността „%s“ не може да бъде " "създадена" -#: sequencer.c:2822 +#: sequencer.c:2856 msgid "could not lock HEAD" msgstr "указателят „HEAD“ не може да се заключи" -#: sequencer.c:2882 sequencer.c:4325 +#: sequencer.c:2916 sequencer.c:4371 msgid "no cherry-pick or revert in progress" msgstr "" "в момента не се извършва отбиране на подавания или пребазиране на клона" -#: sequencer.c:2884 sequencer.c:2895 +#: sequencer.c:2918 sequencer.c:2929 msgid "cannot resolve HEAD" msgstr "Подаването сочено от указателя „HEAD“ не може да бъде открито" -#: sequencer.c:2886 sequencer.c:2930 +#: sequencer.c:2920 sequencer.c:2964 msgid "cannot abort from a branch yet to be born" msgstr "" "действието не може да бъде преустановено, когато сте на клон, който тепърва " "предстои да бъде създаден" -#: sequencer.c:2916 builtin/grep.c:745 +#: sequencer.c:2950 builtin/grep.c:756 #, c-format msgid "cannot open '%s'" msgstr "„%s“ не може да бъде отворен" -#: sequencer.c:2918 +#: sequencer.c:2952 #, c-format msgid "cannot read '%s': %s" msgstr "„%s“ не може да бъде прочетен: %s" -#: sequencer.c:2919 +#: sequencer.c:2953 msgid "unexpected end of file" msgstr "неочакван край на файл" -#: sequencer.c:2925 +#: sequencer.c:2959 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" "запазеният преди започването на отбирането файл за указателя „HEAD“ — „%s“ е " "повреден" -#: sequencer.c:2936 +#: sequencer.c:2970 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" "Изглежда указателят „HEAD“ е променен. Проверете към какво сочи.\n" "Не се правят промени." -#: sequencer.c:2977 +#: sequencer.c:3011 msgid "no revert in progress" msgstr "в момента не тече пребазиране" -#: sequencer.c:2986 +#: sequencer.c:3020 msgid "no cherry-pick in progress" msgstr "в момента не се извършва отбиране на подавания" -#: sequencer.c:2996 +#: sequencer.c:3030 msgid "failed to skip the commit" msgstr "неуспешно прескачане на подаването" -#: sequencer.c:3003 +#: sequencer.c:3037 msgid "there is nothing to skip" msgstr "няма какво да се прескочи" -#: sequencer.c:3006 +#: sequencer.c:3040 #, c-format msgid "" "have you committed already?\n" @@ -7582,16 +7616,16 @@ msgstr "" "\n" " git %s --continue" -#: sequencer.c:3168 sequencer.c:4217 +#: sequencer.c:3202 sequencer.c:4263 msgid "cannot read HEAD" msgstr "указателят „HEAD“ не може да бъде прочетен" -#: sequencer.c:3185 +#: sequencer.c:3219 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "„%s“ не може да се копира като „%s“" -#: sequencer.c:3193 +#: sequencer.c:3227 #, c-format msgid "" "You can amend the commit now, with\n" @@ -7610,27 +7644,27 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:3203 +#: sequencer.c:3237 #, c-format msgid "Could not apply %s... %.*s" msgstr "Подаването „%s“… не може да бъде приложено: „%.*s“" -#: sequencer.c:3210 +#: sequencer.c:3244 #, c-format msgid "Could not merge %.*s" msgstr "Невъзможно сливане на „%.*s“" -#: sequencer.c:3224 sequencer.c:3228 builtin/difftool.c:641 +#: sequencer.c:3258 sequencer.c:3262 builtin/difftool.c:640 #, c-format msgid "could not copy '%s' to '%s'" msgstr "„%s“ не може да се копира като „%s“" -#: sequencer.c:3240 +#: sequencer.c:3274 #, c-format msgid "Executing: %s\n" msgstr "В момента се изпълнява: %s\n" -#: sequencer.c:3255 +#: sequencer.c:3289 #, c-format msgid "" "execution failed: %s\n" @@ -7645,11 +7679,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3261 +#: sequencer.c:3295 msgid "and made changes to the index and/or the working tree\n" msgstr "и променѝ индекса и/или работното дърво\n" -#: sequencer.c:3267 +#: sequencer.c:3301 #, c-format msgid "" "execution succeeded: %s\n" @@ -7666,90 +7700,90 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3328 +#: sequencer.c:3362 #, c-format msgid "illegal label name: '%.*s'" msgstr "неправилно име на етикет: „%.*s“" -#: sequencer.c:3382 +#: sequencer.c:3416 msgid "writing fake root commit" msgstr "запазване на фалшиво начално подаване" -#: sequencer.c:3387 +#: sequencer.c:3421 msgid "writing squash-onto" msgstr "запазване на подаването, в което другите да се вкарат" -#: sequencer.c:3471 +#: sequencer.c:3505 #, c-format msgid "could not resolve '%s'" msgstr "„%s“ не може да бъде открит" -#: sequencer.c:3502 +#: sequencer.c:3538 msgid "cannot merge without a current revision" msgstr "без текущо подаване не може да се слива" -#: sequencer.c:3524 +#: sequencer.c:3560 #, c-format msgid "unable to parse '%.*s'" msgstr "„%.*s“ не може да се анализира" -#: sequencer.c:3533 +#: sequencer.c:3569 #, c-format msgid "nothing to merge: '%.*s'" msgstr "няма нищо за сливане: „%.*s“" -#: sequencer.c:3545 +#: sequencer.c:3581 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "върху начално подаване не може да се извърши множествено сливане" -#: sequencer.c:3561 +#: sequencer.c:3597 #, c-format msgid "could not get commit message of '%s'" msgstr "съобщението за подаване към „%s“ не може да бъде получено" -#: sequencer.c:3730 +#: sequencer.c:3780 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "сливането на „%.*s“ не може даже да започне" -#: sequencer.c:3746 +#: sequencer.c:3796 msgid "merge: Unable to write new index file" msgstr "сливане: новият индекс не може да бъде запазен" -#: sequencer.c:3820 +#: sequencer.c:3870 msgid "Cannot autostash" msgstr "Не може да се скатае автоматично" -#: sequencer.c:3823 +#: sequencer.c:3873 #, c-format msgid "Unexpected stash response: '%s'" msgstr "Неочакван резултат при скатаване: „%s“" -#: sequencer.c:3829 +#: sequencer.c:3879 #, c-format msgid "Could not create directory for '%s'" msgstr "Директорията за „%s“ не може да бъде създадена" -#: sequencer.c:3832 +#: sequencer.c:3882 #, c-format msgid "Created autostash: %s\n" msgstr "Автоматично скатано: „%s“\n" -#: sequencer.c:3836 +#: sequencer.c:3886 msgid "could not reset --hard" msgstr "неуспешно изпълнение на „git reset --hard“" -#: sequencer.c:3861 +#: sequencer.c:3911 #, c-format msgid "Applied autostash.\n" msgstr "Автоматично скатаното е приложено.\n" -#: sequencer.c:3873 +#: sequencer.c:3923 #, c-format msgid "cannot store %s" msgstr "„%s“ не може да бъде запазен" -#: sequencer.c:3876 +#: sequencer.c:3926 #, c-format msgid "" "%s\n" @@ -7761,34 +7795,29 @@ msgstr "" "„git stash pop“ или да ги изхвърлите чрез „git stash drop“, когато " "поискате.\n" -#: sequencer.c:3881 +#: sequencer.c:3931 msgid "Applying autostash resulted in conflicts." msgstr "Конфликти при прилагането на автоматично скатаното." -#: sequencer.c:3882 +#: sequencer.c:3932 msgid "Autostash exists; creating a new stash entry." msgstr "Вече има запис за автоматично скатано, затова се създава нов запис." -#: sequencer.c:3974 -#, c-format -msgid "%s: not a valid OID" -msgstr "„%s“ е неправилен идентификатор на обект" - -#: sequencer.c:3979 git-rebase--preserve-merges.sh:769 +#: sequencer.c:4025 git-rebase--preserve-merges.sh:769 msgid "could not detach HEAD" msgstr "указателят „HEAD“ не може да се отдели" -#: sequencer.c:3994 +#: sequencer.c:4040 #, c-format msgid "Stopped at HEAD\n" msgstr "Бе спряно при „HEAD“\n" -#: sequencer.c:3996 +#: sequencer.c:4042 #, c-format msgid "Stopped at %s\n" msgstr "Бе спряно при „%s“\n" -#: sequencer.c:4004 +#: sequencer.c:4050 #, c-format msgid "" "Could not execute the todo command\n" @@ -7811,58 +7840,58 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:4050 +#: sequencer.c:4096 #, c-format msgid "Rebasing (%d/%d)%s" msgstr "Пребазиране (%d/%d)%s" -#: sequencer.c:4095 +#: sequencer.c:4141 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Спиране при „%s“… %.*s\n" -#: sequencer.c:4166 +#: sequencer.c:4212 #, c-format msgid "unknown command %d" msgstr "непозната команда %d" -#: sequencer.c:4225 +#: sequencer.c:4271 msgid "could not read orig-head" msgstr "указателят за „orig-head“ не може да се прочете" -#: sequencer.c:4230 +#: sequencer.c:4276 msgid "could not read 'onto'" msgstr "указателят за „onto“ не може да се прочете" -#: sequencer.c:4244 +#: sequencer.c:4290 #, c-format msgid "could not update HEAD to %s" msgstr "„HEAD“ не може да бъде обновен до „%s“" -#: sequencer.c:4304 +#: sequencer.c:4350 #, c-format msgid "Successfully rebased and updated %s.\n" msgstr "Успешно пребазиране и обновяване на „%s“.\n" -#: sequencer.c:4337 +#: sequencer.c:4383 msgid "cannot rebase: You have unstaged changes." msgstr "не може да пребазирате, защото има промени, които не са в индекса." -#: sequencer.c:4346 +#: sequencer.c:4392 msgid "cannot amend non-existing commit" msgstr "несъществуващо подаване не може да се поправи" -#: sequencer.c:4348 +#: sequencer.c:4394 #, c-format msgid "invalid file: '%s'" msgstr "неправилен файл: „%s“" -#: sequencer.c:4350 +#: sequencer.c:4396 #, c-format msgid "invalid contents: '%s'" msgstr "неправилно съдържание: „%s“" -#: sequencer.c:4353 +#: sequencer.c:4399 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -7872,55 +7901,50 @@ msgstr "" "В работното дърво има неподадени промени. Първо ги подайте, а след това\n" "отново изпълнете „git rebase --continue“." -#: sequencer.c:4389 sequencer.c:4428 +#: sequencer.c:4435 sequencer.c:4474 #, c-format msgid "could not write file: '%s'" msgstr "файлът „%s“ не може да бъде записан" -#: sequencer.c:4444 +#: sequencer.c:4490 msgid "could not remove CHERRY_PICK_HEAD" msgstr "указателят „CHERRY_PICK_HEAD“ не може да бъде изтрит" -#: sequencer.c:4451 +#: sequencer.c:4497 msgid "could not commit staged changes." msgstr "промените в индекса не могат да бъдат подадени." -#: sequencer.c:4477 -#, c-format -msgid "invalid committer '%s'" -msgstr "неправилен подаващ: „%s“" - -#: sequencer.c:4586 +#: sequencer.c:4613 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: не може да се отбере „%s“" -#: sequencer.c:4590 +#: sequencer.c:4617 #, c-format msgid "%s: bad revision" msgstr "%s: неправилна версия" -#: sequencer.c:4625 +#: sequencer.c:4652 msgid "can't revert as initial commit" msgstr "първоначалното подаване не може да бъде отменено" -#: sequencer.c:5102 +#: sequencer.c:5129 msgid "make_script: unhandled options" msgstr "make_script: неподдържани опции" -#: sequencer.c:5105 +#: sequencer.c:5132 msgid "make_script: error preparing revisions" msgstr "make_script: грешка при подготовката на версии" -#: sequencer.c:5347 sequencer.c:5364 +#: sequencer.c:5374 sequencer.c:5391 msgid "nothing to do" msgstr "няма какво да се прави" -#: sequencer.c:5383 +#: sequencer.c:5410 msgid "could not skip unnecessary pick commands" msgstr "излишните команди за отбиране не бяха прескочени" -#: sequencer.c:5480 +#: sequencer.c:5504 msgid "the script was already rearranged." msgstr "скриптът вече е преподреден." @@ -8095,265 +8119,265 @@ msgstr "неуспешно създаване на процес чрез „fork msgid "setsid failed" msgstr "неуспешно изпълнение на „setsid“" -#: sha1-file.c:470 +#: sha1-file.c:480 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "" "директорията за обекти „%s“ не съществува, проверете „.git/objects/info/" "alternates“" -#: sha1-file.c:521 +#: sha1-file.c:531 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "алтернативният път към обекти не може да бъде нормализиран: „%s“" -#: sha1-file.c:593 +#: sha1-file.c:603 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "" "%s: алтернативните хранилища за обекти се пренебрегват поради прекалено " "дълбоко влагане" -#: sha1-file.c:600 +#: sha1-file.c:610 #, c-format msgid "unable to normalize object directory: %s" msgstr "директорията за обекти „%s“ не може да бъде нормализирана" -#: sha1-file.c:643 +#: sha1-file.c:653 msgid "unable to fdopen alternates lockfile" msgstr "заключващият файл за алтернативите не може да се отвори с „fdopen“" -#: sha1-file.c:661 +#: sha1-file.c:671 msgid "unable to read alternates file" msgstr "файлът с алтернативите не може да бъде прочетен" -#: sha1-file.c:668 +#: sha1-file.c:678 msgid "unable to move new alternates file into place" msgstr "новият файл с алтернативите не може да бъде преместен на мястото му" -#: sha1-file.c:703 +#: sha1-file.c:713 #, c-format msgid "path '%s' does not exist" msgstr "пътят „%s“ не съществува." -#: sha1-file.c:724 +#: sha1-file.c:734 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "все още не се поддържа еталонно хранилище „%s“ като свързано." -#: sha1-file.c:730 +#: sha1-file.c:740 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "еталонното хранилище „%s“ не е локално" -#: sha1-file.c:736 +#: sha1-file.c:746 #, c-format msgid "reference repository '%s' is shallow" msgstr "еталонното хранилище „%s“ е плитко" -#: sha1-file.c:744 +#: sha1-file.c:754 #, c-format msgid "reference repository '%s' is grafted" msgstr "еталонното хранилище „%s“ е с присаждане" -#: sha1-file.c:804 +#: sha1-file.c:814 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "неправилен ред при анализа на алтернативните указатели: „%s“" -#: sha1-file.c:954 +#: sha1-file.c:964 #, c-format msgid "attempting to mmap % over limit %" msgstr "" "неуспешен опит за „mmap“ %, което е над позволеното %" -#: sha1-file.c:975 +#: sha1-file.c:985 msgid "mmap failed" msgstr "неуспешно изпълнение на „mmap“" -#: sha1-file.c:1139 +#: sha1-file.c:1149 #, c-format msgid "object file %s is empty" msgstr "файлът с обектите „%s“ е празен" -#: sha1-file.c:1274 sha1-file.c:2467 +#: sha1-file.c:1284 sha1-file.c:2477 #, c-format msgid "corrupt loose object '%s'" msgstr "непакетираният обект „%s“ е повреден" -#: sha1-file.c:1276 sha1-file.c:2471 +#: sha1-file.c:1286 sha1-file.c:2481 #, c-format msgid "garbage at end of loose object '%s'" msgstr "грешни данни в края на непакетирания обект „%s“" -#: sha1-file.c:1318 +#: sha1-file.c:1328 msgid "invalid object type" msgstr "неправилен вид обект" -#: sha1-file.c:1402 +#: sha1-file.c:1412 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "" "заглавната част „%s“ не може да се разпакетира с опцията „--allow-unknown-" "type“" -#: sha1-file.c:1405 +#: sha1-file.c:1415 #, c-format msgid "unable to unpack %s header" msgstr "заглавната част на „%s“ не може да бъде разпакетирана" -#: sha1-file.c:1411 +#: sha1-file.c:1421 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "" "заглавната част „%s“ не може да се анализира с опцията „--allow-unknown-type“" -#: sha1-file.c:1414 +#: sha1-file.c:1424 #, c-format msgid "unable to parse %s header" msgstr "заглавната част на „%s“ не може да бъде анализирана" -#: sha1-file.c:1641 +#: sha1-file.c:1651 #, c-format msgid "failed to read object %s" msgstr "обектът „%s“ не може да бъде прочетен" -#: sha1-file.c:1645 +#: sha1-file.c:1655 #, c-format msgid "replacement %s not found for %s" msgstr "заместителят „%s“ на „%s“ не може да бъде открит" -#: sha1-file.c:1649 +#: sha1-file.c:1659 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "непакетираният обект „%s“ (в „%s“) е повреден" -#: sha1-file.c:1653 +#: sha1-file.c:1663 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "пакетираният обект „%s“ (в „%s“) е повреден" -#: sha1-file.c:1758 +#: sha1-file.c:1768 #, c-format msgid "unable to write file %s" msgstr "файлът „%s“ не може да бъде записан" -#: sha1-file.c:1765 +#: sha1-file.c:1775 #, c-format msgid "unable to set permission to '%s'" msgstr "правата за достъп до „%s“ не могат да бъдат зададени" -#: sha1-file.c:1772 +#: sha1-file.c:1782 msgid "file write error" msgstr "грешка при запис на файл" -#: sha1-file.c:1792 +#: sha1-file.c:1802 msgid "error when closing loose object file" msgstr "грешка при затварянето на файла с непакетиран обект" -#: sha1-file.c:1857 +#: sha1-file.c:1867 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" "няма права за добавяне на обект към базата от данни на хранилището „%s“" -#: sha1-file.c:1859 +#: sha1-file.c:1869 msgid "unable to create temporary file" msgstr "не може да бъде създаден временен файл" -#: sha1-file.c:1883 +#: sha1-file.c:1893 msgid "unable to write loose object file" msgstr "грешка при записа на файла с непакетиран обект" -#: sha1-file.c:1889 +#: sha1-file.c:1899 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "новият обект „%s“ не може да се компресира с „deflate“: %d" -#: sha1-file.c:1893 +#: sha1-file.c:1903 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "неуспешно приключване на „deflate“ върху „%s“: %d" -#: sha1-file.c:1897 +#: sha1-file.c:1907 #, c-format msgid "confused by unstable object source data for %s" msgstr "грешка поради нестабилния източник данни за обектите „%s“" -#: sha1-file.c:1907 builtin/pack-objects.c:1086 +#: sha1-file.c:1917 builtin/pack-objects.c:1086 #, c-format msgid "failed utime() on %s" msgstr "неуспешно задаване на време на достъп/създаване чрез „utime“ на „%s“" -#: sha1-file.c:1984 +#: sha1-file.c:1994 #, c-format msgid "cannot read object for %s" msgstr "обектът за „%s“ не може да се прочете" -#: sha1-file.c:2035 +#: sha1-file.c:2045 msgid "corrupt commit" msgstr "повредено подаване" -#: sha1-file.c:2043 +#: sha1-file.c:2053 msgid "corrupt tag" msgstr "повреден етикет" -#: sha1-file.c:2143 +#: sha1-file.c:2153 #, c-format msgid "read error while indexing %s" msgstr "грешка при четене по време на индексиране на „%s“" -#: sha1-file.c:2146 +#: sha1-file.c:2156 #, c-format msgid "short read while indexing %s" msgstr "непълно прочитане по време на индексиране на „%s“" -#: sha1-file.c:2219 sha1-file.c:2229 +#: sha1-file.c:2229 sha1-file.c:2239 #, c-format msgid "%s: failed to insert into database" msgstr "„%s“ не може да се вмъкне в базата от данни" -#: sha1-file.c:2235 +#: sha1-file.c:2245 #, c-format msgid "%s: unsupported file type" msgstr "неподдържан вид файл: „%s“" -#: sha1-file.c:2259 +#: sha1-file.c:2269 #, c-format msgid "%s is not a valid object" msgstr "„%s“ е неправилен обект" -#: sha1-file.c:2261 +#: sha1-file.c:2271 #, c-format msgid "%s is not a valid '%s' object" msgstr "„%s“ е неправилен обект от вид „%s“" -#: sha1-file.c:2288 builtin/index-pack.c:192 +#: sha1-file.c:2298 builtin/index-pack.c:192 #, c-format msgid "unable to open %s" msgstr "обектът „%s“ не може да бъде отворен" -#: sha1-file.c:2478 sha1-file.c:2531 +#: sha1-file.c:2488 sha1-file.c:2541 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "неправилна контролна сума за „%s“ (трябва да е %s)" -#: sha1-file.c:2502 +#: sha1-file.c:2512 #, c-format msgid "unable to mmap %s" msgstr "неуспешно изпълнение на „mmap“ върху „%s“" -#: sha1-file.c:2507 +#: sha1-file.c:2517 #, c-format msgid "unable to unpack header of %s" msgstr "заглавната част на „%s“ не може да бъде разпакетирана" -#: sha1-file.c:2513 +#: sha1-file.c:2523 #, c-format msgid "unable to parse header of %s" msgstr "заглавната част на „%s“ не може да бъде анализирана" -#: sha1-file.c:2524 +#: sha1-file.c:2534 #, c-format msgid "unable to unpack contents of %s" msgstr "съдържанието на „%s“ не може да бъде разпакетирано" @@ -8509,8 +8533,8 @@ msgid_plural "%u bytes/s" msgstr[0] "%u байт/сек." msgstr[1] "%u байта/сек." -#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:733 -#: builtin/rebase.c:858 +#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719 +#: builtin/rebase.c:864 #, c-format msgid "could not open '%s' for writing" msgstr "„%s“ не може да бъде отворен за запис" @@ -8609,7 +8633,7 @@ msgstr "" msgid "process for submodule '%s' failed" msgstr "процесът за подмодула „%s“ завърши неуспешно" -#: submodule.c:1156 builtin/branch.c:678 builtin/submodule--helper.c:2469 +#: submodule.c:1156 builtin/branch.c:680 builtin/submodule--helper.c:2469 msgid "Failed to resolve HEAD as a valid ref." msgstr "Не може да се открие към какво сочи указателят „HEAD“" @@ -8747,7 +8771,7 @@ msgstr "неуспешно изпълнение на завършващата к msgid "unknown value '%s' for key '%s'" msgstr "непозната стойност „%s“ за настройката „%s“" -#: trailer.c:537 trailer.c:542 builtin/remote.c:298 builtin/remote.c:323 +#: trailer.c:537 trailer.c:542 builtin/remote.c:299 builtin/remote.c:324 #, c-format msgid "more than one %s" msgstr "стойността „%s“ се повтаря в настройките" @@ -8838,7 +8862,7 @@ msgstr "неуспешно изпълнение на бързо внасяне" msgid "error while running fast-import" msgstr "грешка при изпълнението на бързо внасяне" -#: transport-helper.c:549 transport-helper.c:1226 +#: transport-helper.c:549 transport-helper.c:1236 #, c-format msgid "could not read ref %s" msgstr "указателят „%s“ не може да се прочете" @@ -8856,7 +8880,7 @@ msgstr "протоколът не поддържа задаването на п msgid "invalid remote service path" msgstr "неправилен път на отдалечената услуга" -#: transport-helper.c:661 transport.c:1428 +#: transport-helper.c:661 transport.c:1446 msgid "operation not supported by protocol" msgstr "опцията не се поддържа от протокола" @@ -8875,58 +8899,63 @@ msgid "expected ok/error, helper said '%s'" msgstr "" "очаква се или успех, или грешка, но насрещната помощна програма върна „%s“" -#: transport-helper.c:841 +#: transport-helper.c:845 #, c-format msgid "helper reported unexpected status of %s" msgstr "насрещната помощна програма завърши с неочакван изходен код: „%s“" -#: transport-helper.c:924 +#: transport-helper.c:928 #, c-format msgid "helper %s does not support dry-run" msgstr "насрещната помощна програма „%s“ не поддържа проби „dry-run“" -#: transport-helper.c:927 +#: transport-helper.c:931 #, c-format msgid "helper %s does not support --signed" msgstr "насрещната помощна програма „%s“ не поддържа опцията „--signed“" -#: transport-helper.c:930 +#: transport-helper.c:934 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "" "насрещната помощна програма „%s“ не поддържа опцията „--signed=if-asked“" -#: transport-helper.c:935 +#: transport-helper.c:939 #, c-format msgid "helper %s does not support --atomic" msgstr "насрещната помощна програма „%s“ не поддържа опцията „--atomic“" -#: transport-helper.c:941 +#: transport-helper.c:943 +#, c-format +msgid "helper %s does not support --%s" +msgstr "насрещната помощна програма „%s“ не поддържа опцията „%s“" + +#: transport-helper.c:950 #, c-format msgid "helper %s does not support 'push-option'" msgstr "насрещната помощна програма „%s“ не поддържа опции за изтласкване" -#: transport-helper.c:1040 +#: transport-helper.c:1050 msgid "remote-helper doesn't support push; refspec needed" msgstr "" "насрещната помощна програма не поддържа изтласкване. Необходимо е " "изброяване на указателите" -#: transport-helper.c:1045 +#: transport-helper.c:1055 #, c-format msgid "helper %s does not support 'force'" msgstr "" "насрещната помощна програма не поддържа „%s“ поддържа опцията „--force“" -#: transport-helper.c:1092 +#: transport-helper.c:1102 msgid "couldn't run fast-export" msgstr "не може да се извърши бързо изнасяне" -#: transport-helper.c:1097 +#: transport-helper.c:1107 msgid "error while running fast-export" msgstr "грешка при изпълнението на командата за бързо изнасяне" -#: transport-helper.c:1122 +#: transport-helper.c:1132 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -8935,52 +8964,52 @@ msgstr "" "Няма общи указатели, не са указани никакви указатели —\n" "нищо няма да бъде направено. Пробвайте да укажете клон.\n" -#: transport-helper.c:1203 +#: transport-helper.c:1213 #, c-format msgid "unsupported object format '%s'" msgstr "обект с неподдържан формат „%s“" -#: transport-helper.c:1212 +#: transport-helper.c:1222 #, c-format msgid "malformed response in ref list: %s" msgstr "неправилен отговор в списъка с указатели: „%s“" -#: transport-helper.c:1364 +#: transport-helper.c:1374 #, c-format msgid "read(%s) failed" msgstr "неуспешно четене на „%s“" -#: transport-helper.c:1391 +#: transport-helper.c:1401 #, c-format msgid "write(%s) failed" msgstr "неуспешен запис в „%s“" -#: transport-helper.c:1440 +#: transport-helper.c:1450 #, c-format msgid "%s thread failed" msgstr "неуспешно изпълнение на нишката „%s“" -#: transport-helper.c:1444 +#: transport-helper.c:1454 #, c-format msgid "%s thread failed to join: %s" msgstr "завършването на нишката „%s“ не може да се изчака: „%s“" -#: transport-helper.c:1463 transport-helper.c:1467 +#: transport-helper.c:1473 transport-helper.c:1477 #, c-format msgid "can't start thread for copying data: %s" msgstr "неуспешно стартиране на нишка за копиране на данните: „%s“" -#: transport-helper.c:1504 +#: transport-helper.c:1514 #, c-format msgid "%s process failed to wait" msgstr "процесът на „%s“ не успя да изчака чрез „waitpid“" -#: transport-helper.c:1508 +#: transport-helper.c:1518 #, c-format msgid "%s process failed" msgstr "неуспешно изпълнение на „%s“" -#: transport-helper.c:1526 transport-helper.c:1535 +#: transport-helper.c:1536 transport-helper.c:1545 msgid "can't start thread for copying data" msgstr "неуспешно стартиране на нишка за копиране на данните" @@ -9008,29 +9037,29 @@ msgstr "" msgid "server options require protocol version 2 or later" msgstr "опциите на сървъра изискват поне версия 2 на протокола" -#: transport.c:712 +#: transport.c:727 msgid "could not parse transport.color.* config" msgstr "стойността на настройката „transport.color.*“ не може да се разпознае" -#: transport.c:785 +#: transport.c:802 msgid "support for protocol v2 not implemented yet" msgstr "протокол версия 2 все още не се поддържа" -#: transport.c:919 +#: transport.c:936 #, c-format msgid "unknown value for config '%s': %s" msgstr "непозната стойност за настройката „%s“: „%s“" -#: transport.c:985 +#: transport.c:1002 #, c-format msgid "transport '%s' not allowed" msgstr "преносът по „%s“ не е позволен" -#: transport.c:1038 +#: transport.c:1055 msgid "git-over-rsync is no longer supported" msgstr "командата „git-over-rsync“ вече не се поддържа" -#: transport.c:1140 +#: transport.c:1157 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -9039,7 +9068,7 @@ msgstr "" "Следните пътища за подмодули съдържат промени,\n" "които липсват от всички отдалечени хранилища:\n" -#: transport.c:1144 +#: transport.c:1161 #, c-format msgid "" "\n" @@ -9064,11 +9093,11 @@ msgstr "" " git push\n" "\n" -#: transport.c:1152 +#: transport.c:1169 msgid "Aborting." msgstr "Преустановяване на действието." -#: transport.c:1297 +#: transport.c:1315 msgid "failed to push all needed submodules" msgstr "неуспешно изтласкване на всички необходими подмодули" @@ -9341,7 +9370,7 @@ msgstr "" msgid "Updating index flags" msgstr "Обновяване на флаговете на индекса" -#: upload-pack.c:1516 +#: upload-pack.c:1550 msgid "expected flush after fetch arguments" msgstr "след аргументите на „fetch“ се очаква изчистване на буферите" @@ -9378,7 +9407,7 @@ msgstr "неправилна част от пътя „..“" msgid "Fetching objects" msgstr "Доставяне на обектите" -#: worktree.c:236 builtin/am.c:2116 +#: worktree.c:236 builtin/am.c:2103 #, c-format msgid "failed to read '%s'" msgstr "„%s“ не може да бъде прочетен" @@ -9903,7 +9932,7 @@ msgid "" "new files yourself (see 'git help status')." msgstr "" "Бяха необходими %.2f секунди за изброяването на неследените файлове.\n" -"Добавянето на опцията „-uno“ към командата „git status“, ще ускори\n" +"Добавянето на опцията „-uno“ към командата „git status“ ще ускори\n" "изпълнението, но ще трябва да добавяте новите файлове ръчно.\n" "За повече подробности погледнете „git status help“." @@ -10005,7 +10034,7 @@ msgstr "освен това в индекса има неподадени про msgid "cannot %s: Your index contains uncommitted changes." msgstr "не може да извършите „%s“, защото в индекса има неподадени промени." -#: compat/precompose_utf8.c:58 builtin/clone.c:456 +#: compat/precompose_utf8.c:58 builtin/clone.c:457 #, c-format msgid "failed to unlink '%s'" msgstr "неуспешно изтриване на „%s“" @@ -10032,7 +10061,7 @@ msgstr "изтриване на „%s“\n" msgid "Unstaged changes after refreshing the index:" msgstr "Промени, които и след обновяването на индекса не са добавени към него:" -#: builtin/add.c:272 builtin/rev-parse.c:904 +#: builtin/add.c:272 builtin/rev-parse.c:908 msgid "Could not read the index" msgstr "Индексът не може да бъде прочетен" @@ -10069,8 +10098,8 @@ msgstr "" "Следните пътища ще бъдат игнорирани според някой от файловете „.gitignore“:\n" #: builtin/add.c:328 builtin/clean.c:904 builtin/fetch.c:166 builtin/mv.c:124 -#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:538 -#: builtin/remote.c:1422 builtin/rm.c:242 builtin/send-pack.c:184 +#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559 +#: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190 msgid "dry run" msgstr "пробно изпълнение" @@ -10078,7 +10107,7 @@ msgstr "пробно изпълнение" msgid "interactive picking" msgstr "интерактивно отбиране на промени" -#: builtin/add.c:332 builtin/checkout.c:1529 builtin/reset.c:308 +#: builtin/add.c:332 builtin/checkout.c:1547 builtin/reset.c:308 msgid "select hunks interactively" msgstr "интерактивен избор на парчета код" @@ -10213,14 +10242,14 @@ msgstr "Опцията „--ignore-missing“ изисква „--dry-run“" msgid "--chmod param '%s' must be either -x or +x" msgstr "параметърът към „--chmod“ — „%s“ може да е или „-x“, или „+x“" -#: builtin/add.c:507 builtin/checkout.c:1697 builtin/commit.c:351 -#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1503 +#: builtin/add.c:507 builtin/checkout.c:1715 builtin/commit.c:351 +#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1502 msgid "--pathspec-from-file is incompatible with pathspec arguments" msgstr "" "опцията „--pathspec-from-file“ е несъвместима с аргументи, указващи пътища" -#: builtin/add.c:514 builtin/checkout.c:1709 builtin/commit.c:357 -#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1509 +#: builtin/add.c:514 builtin/checkout.c:1727 builtin/commit.c:357 +#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1508 msgid "--pathspec-file-nul requires --pathspec-from-file" msgstr "опцията „--pathspec-file-nul“ изисква опция „--pathspec-from-file“" @@ -10240,115 +10269,110 @@ msgstr "" "\n" " git config advice.addEmptyPathspec false" -#: builtin/am.c:160 -#, c-format -msgid "invalid committer: %s" -msgstr "неправилен подаващ: „%s“" - -#: builtin/am.c:366 +#: builtin/am.c:352 msgid "could not parse author script" msgstr "скриптът за автор не може да се анализира" -#: builtin/am.c:450 +#: builtin/am.c:436 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "„%s“ бе изтрит от куката „applypatch-msg“" -#: builtin/am.c:492 +#: builtin/am.c:478 #, c-format msgid "Malformed input line: '%s'." msgstr "Даденият входен ред е с неправилен формат: „%s“." -#: builtin/am.c:530 +#: builtin/am.c:516 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Бележката не може да се копира от „%s“ към „%s“" -#: builtin/am.c:556 +#: builtin/am.c:542 msgid "fseek failed" msgstr "неуспешно изпълнение на „fseek“" -#: builtin/am.c:744 +#: builtin/am.c:730 #, c-format msgid "could not parse patch '%s'" msgstr "кръпката „%s“ не може да се анализира" -#: builtin/am.c:809 +#: builtin/am.c:795 msgid "Only one StGIT patch series can be applied at once" msgstr "" "Само една поредица от кръпки от „StGIT“ може да бъде прилагана в даден момент" -#: builtin/am.c:857 +#: builtin/am.c:843 msgid "invalid timestamp" msgstr "неправилна стойност за време" -#: builtin/am.c:862 builtin/am.c:874 +#: builtin/am.c:848 builtin/am.c:860 msgid "invalid Date line" msgstr "неправилен ред за дата „Date“" -#: builtin/am.c:869 +#: builtin/am.c:855 msgid "invalid timezone offset" msgstr "неправилно отместване на часовия пояс" -#: builtin/am.c:962 +#: builtin/am.c:948 msgid "Patch format detection failed." msgstr "Форматът на кръпката не може да бъде определен." -#: builtin/am.c:967 builtin/clone.c:409 +#: builtin/am.c:953 builtin/clone.c:410 #, c-format msgid "failed to create directory '%s'" msgstr "директорията „%s“ не може да бъде създадена" -#: builtin/am.c:972 +#: builtin/am.c:958 msgid "Failed to split patches." msgstr "Кръпките не могат да бъдат разделени." -#: builtin/am.c:1103 +#: builtin/am.c:1089 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "След коригирането на този проблем изпълнете „%s --continue“." -#: builtin/am.c:1104 +#: builtin/am.c:1090 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Ако предпочитате да прескочите тази кръпка, изпълнете „%s --skip“." -#: builtin/am.c:1105 +#: builtin/am.c:1091 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "За да се върнете към първоначалното състояние, изпълнете „%s --abort“." -#: builtin/am.c:1188 +#: builtin/am.c:1174 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" "Кръпката е пратена с форматиране „format=flowed“. Празните знаци в края на " "редовете може да се загубят." -#: builtin/am.c:1216 +#: builtin/am.c:1202 msgid "Patch is empty." msgstr "Кръпката е празна." -#: builtin/am.c:1281 +#: builtin/am.c:1267 #, c-format msgid "missing author line in commit %s" msgstr "липсва ред за авторство в подаването „%s“" -#: builtin/am.c:1284 +#: builtin/am.c:1270 #, c-format msgid "invalid ident line: %.*s" msgstr "грешен ред с идентичност: %.*s" -#: builtin/am.c:1503 +#: builtin/am.c:1489 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "В хранилището липсват необходимите обекти-BLOB, за да се премине към тройно " "сливане." -#: builtin/am.c:1505 +#: builtin/am.c:1491 msgid "Using index info to reconstruct a base tree..." msgstr "Базовото дърво се реконструира от информацията в индекса…" -#: builtin/am.c:1524 +#: builtin/am.c:1510 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -10356,24 +10380,24 @@ msgstr "" "Кръпката не може да се приложи към обектите-BLOB в индекса.\n" "Да не би да сте я редактирали на ръка?" -#: builtin/am.c:1530 +#: builtin/am.c:1516 msgid "Falling back to patching base and 3-way merge..." msgstr "Преминаване към прилагане на кръпка към базата и тройно сливане…" -#: builtin/am.c:1556 +#: builtin/am.c:1542 msgid "Failed to merge in the changes." msgstr "Неуспешно сливане на промените." -#: builtin/am.c:1588 +#: builtin/am.c:1574 msgid "applying to an empty history" msgstr "прилагане върху празна история" -#: builtin/am.c:1639 builtin/am.c:1643 +#: builtin/am.c:1626 builtin/am.c:1630 #, c-format msgid "cannot resume: %s does not exist." msgstr "не може да се продължи — „%s“ не съществува." -#: builtin/am.c:1661 +#: builtin/am.c:1648 msgid "Commit Body is:" msgstr "Тялото на кръпката за прилагане е:" @@ -10381,45 +10405,45 @@ msgstr "Тялото на кръпката за прилагане е:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1671 +#: builtin/am.c:1658 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" "Прилагане? „y“ — да/„n“ — не/„e“ — редактиране/„v“ — преглед/„a“ — приемане " "на всичко:" -#: builtin/am.c:1717 builtin/commit.c:395 +#: builtin/am.c:1704 builtin/commit.c:395 msgid "unable to write index file" msgstr "индексът не може да бъде записан" -#: builtin/am.c:1721 +#: builtin/am.c:1708 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "" "Индексът не е чист: кръпките не могат да бъдат приложени (замърсени са: %s)" -#: builtin/am.c:1761 builtin/am.c:1829 +#: builtin/am.c:1748 builtin/am.c:1816 #, c-format msgid "Applying: %.*s" msgstr "Прилагане: %.*s" -#: builtin/am.c:1778 +#: builtin/am.c:1765 msgid "No changes -- Patch already applied." msgstr "Без промени — кръпката вече е приложена." -#: builtin/am.c:1784 +#: builtin/am.c:1771 #, c-format msgid "Patch failed at %s %.*s" msgstr "Неуспешно прилагане на кръпка при %s %.*s“" -#: builtin/am.c:1788 +#: builtin/am.c:1775 msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "" "За да видите неуспешно приложени кръпки, използвайте:\n" "\n" " git am --show-current-patch=diff" -#: builtin/am.c:1832 +#: builtin/am.c:1819 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -10429,7 +10453,7 @@ msgstr "" "Ако няма друга промяна за включване в индекса, най-вероятно някоя друга\n" "кръпка е довела до същите промени и в такъв случай просто пропуснете тази." -#: builtin/am.c:1839 +#: builtin/am.c:1826 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -10440,17 +10464,17 @@ msgstr "" "След корекция на конфликтите изпълнете „git add“ върху поправените файлове.\n" "За да приемете „изтрити от тях“, изпълнете „git rm“ върху изтритите файлове." -#: builtin/am.c:1946 builtin/am.c:1950 builtin/am.c:1962 builtin/reset.c:347 +#: builtin/am.c:1933 builtin/am.c:1937 builtin/am.c:1949 builtin/reset.c:347 #: builtin/reset.c:355 #, c-format msgid "Could not parse object '%s'." msgstr "„%s“ не е разпознат като обект." -#: builtin/am.c:1998 +#: builtin/am.c:1985 msgid "failed to clean index" msgstr "индексът не може да бъде изчистен" -#: builtin/am.c:2042 +#: builtin/am.c:2029 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -10461,162 +10485,162 @@ msgstr "" "сочи към\n" "„ORIG_HEAD“" -#: builtin/am.c:2149 +#: builtin/am.c:2136 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Неправилна стойност за „--patch-format“: „%s“" -#: builtin/am.c:2191 +#: builtin/am.c:2178 #, c-format msgid "Invalid value for --show-current-patch: %s" msgstr "Неправилна стойност за „--show-current-patch“: „%s“" -#: builtin/am.c:2195 +#: builtin/am.c:2182 #, c-format msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" msgstr "" "опциите „--show-current-patch=%s“ и „--show-current-patch=%s“ са несъвместими" -#: builtin/am.c:2226 +#: builtin/am.c:2213 msgid "git am [] [( | )...]" msgstr "git am [ОПЦИЯ…] [(ФАЙЛ_С_ПОЩА|ДИРЕКТОРИЯ_С_ПОЩА)…]" -#: builtin/am.c:2227 +#: builtin/am.c:2214 msgid "git am [] (--continue | --skip | --abort)" msgstr "git am [ОПЦИЯ…] (--continue | --quit | --abort)" -#: builtin/am.c:2233 +#: builtin/am.c:2220 msgid "run interactively" msgstr "интерактивна работа" -#: builtin/am.c:2235 +#: builtin/am.c:2222 msgid "historical option -- no-op" msgstr "изоставена опция, съществува по исторически причини, нищо не прави" -#: builtin/am.c:2237 +#: builtin/am.c:2224 msgid "allow fall back on 3way merging if needed" msgstr "да се преминава към тройно сливане при нужда." -#: builtin/am.c:2238 builtin/init-db.c:558 builtin/prune-packed.c:16 -#: builtin/repack.c:309 builtin/stash.c:816 +#: builtin/am.c:2225 builtin/init-db.c:560 builtin/prune-packed.c:16 +#: builtin/repack.c:335 builtin/stash.c:815 msgid "be quiet" msgstr "без извеждане на информация" -#: builtin/am.c:2240 -msgid "add a Signed-off-by line to the commit message" -msgstr "добавяне на ред за подпис „Signed-off-by“ в съобщението за подаване" +#: builtin/am.c:2227 +msgid "add a Signed-off-by trailer to the commit message" +msgstr "добавяне на епилог за подпис „Signed-off-by“ в съобщението за подаване" -#: builtin/am.c:2243 +#: builtin/am.c:2230 msgid "recode into utf8 (default)" msgstr "прекодиране в UTF-8 (стандартно)" -#: builtin/am.c:2245 +#: builtin/am.c:2232 msgid "pass -k flag to git-mailinfo" msgstr "подаване на опцията „-k“ на командата „git-mailinfo“" -#: builtin/am.c:2247 +#: builtin/am.c:2234 msgid "pass -b flag to git-mailinfo" msgstr "подаване на опцията „-b“ на командата „git-mailinfo“" -#: builtin/am.c:2249 +#: builtin/am.c:2236 msgid "pass -m flag to git-mailinfo" msgstr "подаване на опцията „-m“ на командата „git-mailinfo“" -#: builtin/am.c:2251 +#: builtin/am.c:2238 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "" "подаване на опцията „--keep-cr“ на командата „git-mailsplit“ за формат „mbox“" -#: builtin/am.c:2254 +#: builtin/am.c:2241 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "без подаване на опцията „--keep-cr“ на командата „git-mailsplit“ независимо " "от „am.keepcr“" -#: builtin/am.c:2257 +#: builtin/am.c:2244 msgid "strip everything before a scissors line" msgstr "пропускане на всичко преди реда за отрязване" -#: builtin/am.c:2259 builtin/am.c:2262 builtin/am.c:2265 builtin/am.c:2268 -#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280 -#: builtin/am.c:2286 +#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255 +#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267 +#: builtin/am.c:2273 msgid "pass it through git-apply" msgstr "прекарване през „git-apply“" -#: builtin/am.c:2276 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17 -#: builtin/fmt-merge-msg.c:20 builtin/grep.c:892 builtin/merge.c:251 +#: builtin/am.c:2263 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:903 builtin/merge.c:260 #: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 -#: builtin/rebase.c:1335 builtin/repack.c:320 builtin/repack.c:324 -#: builtin/repack.c:326 builtin/show-branch.c:650 builtin/show-ref.c:172 +#: builtin/rebase.c:1341 builtin/repack.c:346 builtin/repack.c:350 +#: builtin/repack.c:352 builtin/show-branch.c:650 builtin/show-ref.c:172 #: builtin/tag.c:404 parse-options.h:154 parse-options.h:175 #: parse-options.h:316 msgid "n" msgstr "БРОЙ" -#: builtin/am.c:2282 builtin/branch.c:659 builtin/bugreport.c:135 +#: builtin/am.c:2269 builtin/branch.c:661 builtin/bugreport.c:136 #: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:438 #: builtin/verify-tag.c:38 msgid "format" msgstr "ФОРМАТ" -#: builtin/am.c:2283 +#: builtin/am.c:2270 msgid "format the patch(es) are in" msgstr "формат на кръпките" -#: builtin/am.c:2289 +#: builtin/am.c:2276 msgid "override error message when patch failure occurs" msgstr "избрано от вас съобщение за грешка при прилагане на кръпки" -#: builtin/am.c:2291 +#: builtin/am.c:2278 msgid "continue applying patches after resolving a conflict" msgstr "продължаване на прилагането на кръпки след коригирането на конфликт" -#: builtin/am.c:2294 +#: builtin/am.c:2281 msgid "synonyms for --continue" msgstr "псевдоними на „--continue“" -#: builtin/am.c:2297 +#: builtin/am.c:2284 msgid "skip the current patch" msgstr "прескачане на текущата кръпка" -#: builtin/am.c:2300 +#: builtin/am.c:2287 msgid "restore the original branch and abort the patching operation." msgstr "" "възстановяване на първоначалното състояние на клона и преустановяване на " "прилагането на кръпката." -#: builtin/am.c:2303 +#: builtin/am.c:2290 msgid "abort the patching operation but keep HEAD where it is." msgstr "" "преустановяване на прилагането на кръпката без промяна към кое сочи „HEAD“." -#: builtin/am.c:2307 +#: builtin/am.c:2294 msgid "show the patch being applied" msgstr "показване на прилаганата кръпка" -#: builtin/am.c:2312 +#: builtin/am.c:2299 msgid "lie about committer date" msgstr "дата за подаване различна от първоначалната" -#: builtin/am.c:2314 +#: builtin/am.c:2301 msgid "use current timestamp for author date" msgstr "използване на текущото време като това за автор" -#: builtin/am.c:2316 builtin/commit-tree.c:120 builtin/commit.c:1515 -#: builtin/merge.c:288 builtin/pull.c:175 builtin/rebase.c:530 -#: builtin/rebase.c:1388 builtin/revert.c:117 builtin/tag.c:419 +#: builtin/am.c:2303 builtin/commit-tree.c:120 builtin/commit.c:1515 +#: builtin/merge.c:297 builtin/pull.c:175 builtin/rebase.c:536 +#: builtin/rebase.c:1394 builtin/revert.c:117 builtin/tag.c:419 msgid "key-id" msgstr "ИДЕНТИФИКАТОР_НА_КЛЮЧ" -#: builtin/am.c:2317 builtin/rebase.c:531 builtin/rebase.c:1389 +#: builtin/am.c:2304 builtin/rebase.c:537 builtin/rebase.c:1395 msgid "GPG-sign commits" msgstr "подписване на подаванията с GPG" -#: builtin/am.c:2320 +#: builtin/am.c:2307 msgid "(internal use for git-rebase)" msgstr "(ползва се вътрешно за „git-rebase“)" -#: builtin/am.c:2338 +#: builtin/am.c:2325 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." @@ -10624,18 +10648,18 @@ msgstr "" "Опциите „-b“/„--binary“ отдавна не правят нищо и\n" "ще бъдат премахнати в бъдеще. Не ги ползвайте." -#: builtin/am.c:2345 +#: builtin/am.c:2332 msgid "failed to read the index" msgstr "неуспешно изчитане на индекса" -#: builtin/am.c:2360 +#: builtin/am.c:2347 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" "предишната директория за пребазиране „%s“ все още съществува, а е зададен " "файл „mbox“." -#: builtin/am.c:2384 +#: builtin/am.c:2371 #, c-format msgid "" "Stray %s directory found.\n" @@ -10644,11 +10668,11 @@ msgstr "" "Открита е излишна директория „%s“.\n" "Можете да я изтриете с командата „git am --abort“." -#: builtin/am.c:2390 +#: builtin/am.c:2377 msgid "Resolve operation not in progress, we are not resuming." msgstr "В момента не тече операция по коригиране и няма как да се продължи." -#: builtin/am.c:2400 +#: builtin/am.c:2387 msgid "interactive mode requires patches on the command line" msgstr "интерактивният режим изисква кръпки на командния ред" @@ -10688,39 +10712,27 @@ msgid "git archive: expected a flush" msgstr "git archive: очакваше се изчистване на буферите чрез „flush“" #: builtin/bisect--helper.c:23 -msgid "git bisect--helper --next-all" -msgstr "git bisect--helper --next-all" - -#: builtin/bisect--helper.c:24 -msgid "git bisect--helper --write-terms " -msgstr "git bisect--helper --write-terms ЛОШО ДОБРО" - -#: builtin/bisect--helper.c:25 -msgid "git bisect--helper --bisect-clean-state" -msgstr "git bisect--helper --bisect-clean-state" - -#: builtin/bisect--helper.c:26 msgid "git bisect--helper --bisect-reset []" msgstr "git bisect--helper --bisect-reset [ПОДАВАНЕ]" -#: builtin/bisect--helper.c:27 +#: builtin/bisect--helper.c:24 msgid "" "git bisect--helper --bisect-write [--no-log] " "" msgstr "" "git bisect--helper --bisect-write [--no-log] СЪСТОЯНИЕ ВЕРСИЯ ДОБРО ЛОШО" -#: builtin/bisect--helper.c:28 +#: builtin/bisect--helper.c:25 msgid "" "git bisect--helper --bisect-check-and-set-terms " "" msgstr "git bisect--helper --bisect-check-and-set-terms КОМАНДА ДОБРО" -#: builtin/bisect--helper.c:29 +#: builtin/bisect--helper.c:26 msgid "git bisect--helper --bisect-next-check []" msgstr "git bisect--helper --bisect-next-check ЛОШО ДОБРО УПРАВЛЯВАЩА_ДУМА" -#: builtin/bisect--helper.c:30 +#: builtin/bisect--helper.c:27 msgid "" "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" "term-new]" @@ -10728,7 +10740,7 @@ msgstr "" "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" "term-new]" -#: builtin/bisect--helper.c:31 +#: builtin/bisect--helper.c:28 msgid "" "git bisect--helper --bisect-start [--term-{new,bad}= --term-{old,good}" "=] [--no-checkout] [--first-parent] [ [...]] [--] " @@ -10737,58 +10749,62 @@ msgstr "" "git bisect--helper --bisect-start [--term-{new,bad}=ЛОШО --term-{old,good}" "=ДОБРО] [--no-checkout] [--first-parent] [ЛОШО [ДОБРО…]] [--] [ПЪТ…]" -#: builtin/bisect--helper.c:33 +#: builtin/bisect--helper.c:30 msgid "git bisect--helper --bisect-next" msgstr "git bisect--helper --bisect-next" -#: builtin/bisect--helper.c:34 +#: builtin/bisect--helper.c:31 msgid "git bisect--helper --bisect-auto-next" msgstr "git bisect--helper --bisect-auto-next" -#: builtin/bisect--helper.c:35 -msgid "git bisect--helper --bisect-autostart" -msgstr "git bisect--helper --bisect-autostart" +#: builtin/bisect--helper.c:32 +msgid "git bisect--helper --bisect-state (bad|new) []" +msgstr "git bisect--helper --bisect-reset (ЛОШО) [ВЕРСИЯ]" -#: builtin/bisect--helper.c:97 +#: builtin/bisect--helper.c:33 +msgid "git bisect--helper --bisect-state (good|old) [...]" +msgstr "git bisect--helper --bisect-reset (ДОБРО) [ВЕРСИЯ…]" + +#: builtin/bisect--helper.c:108 #, c-format msgid "cannot open file '%s' in mode '%s'" msgstr "файлът „%s“ не може да се отвори в режим „%s“" -#: builtin/bisect--helper.c:104 +#: builtin/bisect--helper.c:115 #, c-format msgid "could not write to file '%s'" msgstr "във файла „%s“ не може да се пише" -#: builtin/bisect--helper.c:143 +#: builtin/bisect--helper.c:154 #, c-format msgid "'%s' is not a valid term" msgstr "„%s“ е неправилна управляваща дума" -#: builtin/bisect--helper.c:147 +#: builtin/bisect--helper.c:158 #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "„%s“ е вградена команда и не може да се използва като управляваща дума" -#: builtin/bisect--helper.c:157 +#: builtin/bisect--helper.c:168 #, c-format msgid "can't change the meaning of the term '%s'" msgstr "не може да смените значението на управляващата дума „%s“" -#: builtin/bisect--helper.c:167 +#: builtin/bisect--helper.c:178 msgid "please use two different terms" msgstr "използвайте две различни управляващи думи" -#: builtin/bisect--helper.c:207 +#: builtin/bisect--helper.c:194 #, c-format msgid "We are not bisecting.\n" msgstr "В момента не се извършва двоично търсене.\n" -#: builtin/bisect--helper.c:215 +#: builtin/bisect--helper.c:202 #, c-format msgid "'%s' is not a valid commit" msgstr "„%s“ не е подаване" -#: builtin/bisect--helper.c:224 +#: builtin/bisect--helper.c:211 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset '." @@ -10796,27 +10812,27 @@ msgstr "" "първоначално указаното „%s“ в указателя „HEAD“ не може да бъде\n" "изтеглено. Пробвайте да изпълните командата „git bisect reset ПОДАВАНЕ“." -#: builtin/bisect--helper.c:268 +#: builtin/bisect--helper.c:255 #, c-format msgid "Bad bisect_write argument: %s" msgstr "Неправилен аргумент на функцията „bisect_write“: „%s“" -#: builtin/bisect--helper.c:273 +#: builtin/bisect--helper.c:260 #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "идентификаторът на обект на версия „%s“ не може да бъде получен" -#: builtin/bisect--helper.c:285 +#: builtin/bisect--helper.c:272 #, c-format msgid "couldn't open the file '%s'" msgstr "файлът „%s“ не може да бъде отворен" -#: builtin/bisect--helper.c:311 +#: builtin/bisect--helper.c:298 #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "Неправилна команда: в момента се изпълнява двоично търсене по %s/%s." -#: builtin/bisect--helper.c:338 +#: builtin/bisect--helper.c:325 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -10825,7 +10841,7 @@ msgstr "" "Трябва да зададете поне една „%s“ и една „%s“ версия. (Това може да се\n" "направи съответно и чрез командите „git bisect %s“ и „git bisect %s“.)" -#: builtin/bisect--helper.c:342 +#: builtin/bisect--helper.c:329 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -10836,7 +10852,7 @@ msgstr "" "Трябва да зададете поне една „%s“ и една „%s“ версия. (Това може да се\n" "направи съответно и чрез командите „git bisect %s“ и „git bisect %s“.)" -#: builtin/bisect--helper.c:362 +#: builtin/bisect--helper.c:349 #, c-format msgid "bisecting only with a %s commit" msgstr "двоично търсене само по „%s“ подаване." @@ -10845,15 +10861,15 @@ msgstr "двоично търсене само по „%s“ подаване." #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:370 +#: builtin/bisect--helper.c:357 msgid "Are you sure [Y/n]? " msgstr "Да се продължи ли? „Y“ — ДА, „n“ — не" -#: builtin/bisect--helper.c:431 +#: builtin/bisect--helper.c:418 msgid "no terms defined" msgstr "не са указани управляващи думи" -#: builtin/bisect--helper.c:434 +#: builtin/bisect--helper.c:421 #, c-format msgid "" "Your current terms are %s for the old state\n" @@ -10862,7 +10878,7 @@ msgstr "" "Текущите управляващи думи са: %s за старото състояние\n" "и %s за новото състояние.\n" -#: builtin/bisect--helper.c:444 +#: builtin/bisect--helper.c:431 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -10871,56 +10887,56 @@ msgstr "" "на „git bisect terms“ е подаден неправилен аргумент „%s“\n" "Поддържат се опциите „--term-good“/„--term-old“ и „--term-bad„/„--term-new“." -#: builtin/bisect--helper.c:511 +#: builtin/bisect--helper.c:498 msgid "revision walk setup failed\n" msgstr "неуспешно настройване на обхождането на версиите\n" -#: builtin/bisect--helper.c:533 +#: builtin/bisect--helper.c:520 #, c-format msgid "could not open '%s' for appending" msgstr "файлът „%s“ не може да се отвори за добавяне" -#: builtin/bisect--helper.c:651 builtin/bisect--helper.c:664 +#: builtin/bisect--helper.c:639 builtin/bisect--helper.c:652 msgid "'' is not a valid term" msgstr "„“ е неправилна управляваща дума" -#: builtin/bisect--helper.c:674 +#: builtin/bisect--helper.c:662 #, c-format msgid "unrecognized option: '%s'" msgstr "непозната опция: %s" -#: builtin/bisect--helper.c:678 +#: builtin/bisect--helper.c:666 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "„%s“ не изглежда като указател към версия" -#: builtin/bisect--helper.c:709 +#: builtin/bisect--helper.c:697 msgid "bad HEAD - I need a HEAD" msgstr "Неправилен указател „HEAD“" -#: builtin/bisect--helper.c:724 +#: builtin/bisect--helper.c:712 #, c-format msgid "checking out '%s' failed. Try 'git bisect start '." msgstr "" "Неуспешно преминаване към „%s“. Изпълнете командата „git bisect start " "СЪЩЕСТВУВАЩ_КЛОН“." -#: builtin/bisect--helper.c:745 +#: builtin/bisect--helper.c:733 msgid "won't bisect on cg-seek'ed tree" msgstr "" "не може да се търси двоично, когато е изпълнена командата „cg-seek“ от " "„cogito“" -#: builtin/bisect--helper.c:748 +#: builtin/bisect--helper.c:736 msgid "bad HEAD - strange symbolic ref" msgstr "Неправилен указател „HEAD“ — необичаен символен указател" -#: builtin/bisect--helper.c:775 +#: builtin/bisect--helper.c:756 #, c-format msgid "invalid ref: '%s'" msgstr "неправилен указател: „%s“" -#: builtin/bisect--helper.c:827 +#: builtin/bisect--helper.c:814 msgid "You need to start by \"git bisect start\"\n" msgstr "Започнете като изпълните командата „git bisect start“\n" @@ -10928,109 +10944,95 @@ msgstr "Започнете като изпълните командата „git #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:838 +#: builtin/bisect--helper.c:825 msgid "Do you want me to do it for you [Y/n]? " msgstr "Да се извърши ли автоматично? „Y“ — ДА, „n“ — не" -#: builtin/bisect--helper.c:866 -msgid "perform 'git bisect next'" -msgstr "извършване на „git bisect next“" +#: builtin/bisect--helper.c:843 +msgid "Please call `--bisect-state` with at least one argument" +msgstr "Опцията „--bisect-state“ изисква поне един аргумент" -#: builtin/bisect--helper.c:868 -msgid "write the terms to .git/BISECT_TERMS" -msgstr "запазване на управляващите думи в „“.git/BISECT_TERMS„“" +#: builtin/bisect--helper.c:856 +#, c-format +msgid "'git bisect %s' can take only one argument." +msgstr "Командата „git bisect %s“ приема само един аргумент." -#: builtin/bisect--helper.c:870 -msgid "cleanup the bisection state" -msgstr "изчистване на състоянието на двоичното търсене" +#: builtin/bisect--helper.c:868 builtin/bisect--helper.c:879 +#, c-format +msgid "Bad rev input: %s" +msgstr "Неправилна версия: „%s“" -#: builtin/bisect--helper.c:872 -msgid "check for expected revs" -msgstr "проверка за очакваните версии" - -#: builtin/bisect--helper.c:874 +#: builtin/bisect--helper.c:924 msgid "reset the bisection state" msgstr "изчистване на състоянието на двоичното търсене" -#: builtin/bisect--helper.c:876 +#: builtin/bisect--helper.c:926 msgid "write out the bisection state in BISECT_LOG" msgstr "запис на състоянието на двоичното търсене в „BISECT_LOG“" -#: builtin/bisect--helper.c:878 +#: builtin/bisect--helper.c:928 msgid "check and set terms in a bisection state" msgstr "" "проверка и задаване на управляващи думи към състоянието на двоичното търсене" -#: builtin/bisect--helper.c:880 +#: builtin/bisect--helper.c:930 msgid "check whether bad or good terms exist" msgstr "проверка дали съществуват одобряващи/отхвърлящи управляващи думи" -#: builtin/bisect--helper.c:882 +#: builtin/bisect--helper.c:932 msgid "print out the bisect terms" msgstr "извеждане на управляващите думи" -#: builtin/bisect--helper.c:884 +#: builtin/bisect--helper.c:934 msgid "start the bisect session" msgstr "начало на двоично търсене" -#: builtin/bisect--helper.c:886 +#: builtin/bisect--helper.c:936 msgid "find the next bisection commit" msgstr "откриване на следващото подаване при двоично търсене" -#: builtin/bisect--helper.c:888 +#: builtin/bisect--helper.c:938 msgid "verify the next bisection state then checkout the next bisection commit" msgstr "" "проверка на следващото състояние и преминаване към следващото подаване при " "двоично търсене" -#: builtin/bisect--helper.c:890 -msgid "start the bisection if it has not yet been started" -msgstr "начало на двоично търсене, ако вече не е почнало" +#: builtin/bisect--helper.c:940 +msgid "mark the state of ref (or refs)" +msgstr "задаване на състоянието на указателя/ите" -#: builtin/bisect--helper.c:892 +#: builtin/bisect--helper.c:942 msgid "no log for BISECT_WRITE" msgstr "липсва запис за „BISECT_WRITE“" -#: builtin/bisect--helper.c:910 -msgid "--write-terms requires two arguments" -msgstr "опцията „--write-terms“ изисква точно 2 аргумента" - -#: builtin/bisect--helper.c:914 -msgid "--bisect-clean-state requires no arguments" -msgstr "опцията „--bisect-clean-state“ не приема аргументи" - -#: builtin/bisect--helper.c:921 +#: builtin/bisect--helper.c:957 msgid "--bisect-reset requires either no argument or a commit" msgstr "опцията „--bisect-reset“ изисква или 0 аргументи, или 1 — подаване" -#: builtin/bisect--helper.c:925 +#: builtin/bisect--helper.c:961 msgid "--bisect-write requires either 4 or 5 arguments" msgstr "опцията „--bisect-write“ изисква 4 или 5 аргумента" -#: builtin/bisect--helper.c:931 +#: builtin/bisect--helper.c:967 msgid "--check-and-set-terms requires 3 arguments" msgstr "опцията „--check-and-set-terms“ изисква 3 аргумента" -#: builtin/bisect--helper.c:937 +#: builtin/bisect--helper.c:973 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "опцията „--bisect-next-check“ изисква 2 или 3 аргумента" -#: builtin/bisect--helper.c:943 +#: builtin/bisect--helper.c:979 msgid "--bisect-terms requires 0 or 1 argument" msgstr "опцията „--bisect-terms“ изисква 0 или 1 аргумента" -#: builtin/bisect--helper.c:952 +#: builtin/bisect--helper.c:988 msgid "--bisect-next requires 0 arguments" msgstr "опцията „--bisect-next“ не приема аргументи" -#: builtin/bisect--helper.c:958 +#: builtin/bisect--helper.c:994 msgid "--bisect-auto-next requires 0 arguments" msgstr "опцията „--bisect-auto-next“ не приема аргументи" -#: builtin/bisect--helper.c:964 -msgid "--bisect-autostart does not accept arguments" -msgstr "опцията „--bisect-autostart“ не приема аргументи" - #: builtin/blame.c:32 msgid "git blame [] [] [] [--] " msgstr "git blame [ОПЦИЯ…] [ОПЦИЯ_ЗА_ВЕРСИЯТА…] [ВЕРСИЯ] [--] ФАЙЛ" @@ -11057,147 +11059,146 @@ msgstr "неправилен цвят „%s“ в „color.blame.repeatedLines msgid "invalid value for blame.coloring" msgstr "неправилна стойност за „blame.coloring“" -#: builtin/blame.c:845 +#: builtin/blame.c:847 #, c-format msgid "cannot find revision %s to ignore" msgstr "версията за прескачане „%s“ не може да бъде открита" -#: builtin/blame.c:867 +#: builtin/blame.c:869 msgid "Show blame entries as we find them, incrementally" msgstr "Извеждане на авторството с намирането му, последователно" -#: builtin/blame.c:868 +#: builtin/blame.c:870 msgid "Do not show object names of boundary commits (Default: off)" msgstr "" "Без извеждане на имената на обектите за граничните подавания (стандартно " "опцията е изключена)" -#: builtin/blame.c:869 +#: builtin/blame.c:871 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" "Началните подавания да не се считат за гранични (стандартно опцията е " "изключена)" -#: builtin/blame.c:870 +#: builtin/blame.c:872 msgid "Show work cost statistics" msgstr "Извеждане на статистика за извършените действия" -#: builtin/blame.c:871 +#: builtin/blame.c:873 msgid "Force progress reporting" msgstr "Принудително извеждане на напредъка" -#: builtin/blame.c:872 +#: builtin/blame.c:874 msgid "Show output score for blame entries" msgstr "Извеждане на допълнителна информация за определянето на авторството" -#: builtin/blame.c:873 +#: builtin/blame.c:875 msgid "Show original filename (Default: auto)" msgstr "" "Извеждане на първоначалното име на файл (стандартно това е автоматично)" -#: builtin/blame.c:874 +#: builtin/blame.c:876 msgid "Show original linenumber (Default: off)" msgstr "" "Извеждане на първоначалният номер на ред (стандартно опцията е изключена)" -#: builtin/blame.c:875 +#: builtin/blame.c:877 msgid "Show in a format designed for machine consumption" msgstr "Извеждане във формат за по-нататъшна обработка" -#: builtin/blame.c:876 +#: builtin/blame.c:878 msgid "Show porcelain format with per-line commit information" msgstr "" "Извеждане във формат за команди от потребителско ниво с информация на всеки " "ред" -#: builtin/blame.c:877 +#: builtin/blame.c:879 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" "Използване на същия формат като „git-annotate“ (стандартно опцията е " "изключена)" -#: builtin/blame.c:878 +#: builtin/blame.c:880 msgid "Show raw timestamp (Default: off)" msgstr "Извеждане на неформатирани времена (стандартно опцията е изключена)" -#: builtin/blame.c:879 +#: builtin/blame.c:881 msgid "Show long commit SHA1 (Default: off)" msgstr "Извеждане на пълните суми по SHA1 (стандартно опцията е изключена)" -#: builtin/blame.c:880 +#: builtin/blame.c:882 msgid "Suppress author name and timestamp (Default: off)" msgstr "Без име на автор и време на промяна (стандартно опцията е изключена)" -#: builtin/blame.c:881 +#: builtin/blame.c:883 msgid "Show author email instead of name (Default: off)" msgstr "" "Извеждане на е-пощата на автора, а не името му (стандартно опцията е " "изключена)" -#: builtin/blame.c:882 +#: builtin/blame.c:884 msgid "Ignore whitespace differences" msgstr "Без разлики в знаците за интервали" -#: builtin/blame.c:883 builtin/log.c:1808 +#: builtin/blame.c:885 builtin/log.c:1813 msgid "rev" msgstr "ВЕРС" -#: builtin/blame.c:883 +#: builtin/blame.c:885 msgid "Ignore when blaming" msgstr "Прескачане на ВЕРСията при извеждане на авторството" -#: builtin/blame.c:884 +#: builtin/blame.c:886 msgid "Ignore revisions from " msgstr "Прескачане на версиите указани във ФАЙЛа при извеждане на авторството" -#: builtin/blame.c:885 +#: builtin/blame.c:887 msgid "color redundant metadata from previous line differently" msgstr "" "оцветяване на повтарящите се метаданни от предишния ред в различен цвят" -#: builtin/blame.c:886 +#: builtin/blame.c:888 msgid "color lines by age" msgstr "оцветяване на редовете по възраст" -#: builtin/blame.c:887 +#: builtin/blame.c:889 msgid "Spend extra cycles to find better match" msgstr "Допълнителни изчисления за по-добри резултати" -#: builtin/blame.c:888 +#: builtin/blame.c:890 msgid "Use revisions from instead of calling git-rev-list" msgstr "Изчитане на версиите от ФАЙЛ, а не чрез изпълнение на „git-rev-list“" -#: builtin/blame.c:889 +#: builtin/blame.c:891 msgid "Use 's contents as the final image" msgstr "Използване на съдържанието на ФАЙЛа като крайно положение" -#: builtin/blame.c:890 builtin/blame.c:891 +#: builtin/blame.c:892 builtin/blame.c:893 msgid "score" msgstr "напасване на редовете" -#: builtin/blame.c:890 +#: builtin/blame.c:892 msgid "Find line copies within and across files" msgstr "" "Търсене на копирани редове както в рамките на един файл, така и от един файл " "към друг" -#: builtin/blame.c:891 +#: builtin/blame.c:893 msgid "Find line movements within and across files" msgstr "" "Търсене на преместени редове както в рамките на един файл, така и от един " "файл към друг" -#: builtin/blame.c:892 -msgid "n,m" -msgstr "n,m" +#: builtin/blame.c:894 +msgid "range" +msgstr "диапазон" -#: builtin/blame.c:892 -msgid "Process only line range n,m, counting from 1" +#: builtin/blame.c:895 +msgid "Process only line range , or function :" msgstr "" -"Информация само за редовете в диапазона от n до m включително. Броенето " -"започва от 1" +"Информация само за редовете в диапазона НАЧАЛО,КРАЙ или само на :ФУНКЦИЯта" -#: builtin/blame.c:944 +#: builtin/blame.c:947 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" "опцията „--progress“ е несъвместима с „--incremental“ и форма̀та на командите " @@ -11211,18 +11212,18 @@ msgstr "" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:995 +#: builtin/blame.c:998 msgid "4 years, 11 months ago" msgstr "преди 4 години и 11 месеца" -#: builtin/blame.c:1110 +#: builtin/blame.c:1114 #, 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:1156 +#: builtin/blame.c:1159 msgid "Blaming lines" msgstr "Редове с авторство" @@ -11370,38 +11371,38 @@ msgstr "" msgid "Invalid branch name: '%s'" msgstr "Неправилно име на клон: „%s“" -#: builtin/branch.c:542 +#: builtin/branch.c:544 msgid "Branch rename failed" msgstr "Неуспешно преименуване на клон" -#: builtin/branch.c:544 +#: builtin/branch.c:546 msgid "Branch copy failed" msgstr "Неуспешно копиране на клон" -#: builtin/branch.c:548 +#: builtin/branch.c:550 #, c-format msgid "Created a copy of a misnamed branch '%s'" msgstr "Клонът с неправилно име „%s“ е копиран" -#: builtin/branch.c:551 +#: builtin/branch.c:553 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Клонът с неправилно име „%s“ е преименуван" -#: builtin/branch.c:557 +#: builtin/branch.c:559 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "Клонът е преименуван на „%s“, но указателят „HEAD“ не е обновен" -#: builtin/branch.c:566 +#: builtin/branch.c:568 msgid "Branch is renamed, but update of config-file failed" msgstr "Клонът е преименуван, но конфигурационният файл не е обновен" -#: builtin/branch.c:568 +#: builtin/branch.c:570 msgid "Branch is copied, but update of config-file failed" msgstr "Клонът е копиран, но конфигурационният файл не е обновен" -#: builtin/branch.c:584 +#: builtin/branch.c:586 #, c-format msgid "" "Please edit the description for the branch\n" @@ -11412,183 +11413,183 @@ msgstr "" " %s\n" "Редовете, които започват с „%c“, ще бъдат пропуснати.\n" -#: builtin/branch.c:618 +#: builtin/branch.c:620 msgid "Generic options" msgstr "Общи настройки" -#: builtin/branch.c:620 +#: builtin/branch.c:622 msgid "show hash and subject, give twice for upstream branch" msgstr "" "извеждане на контролната сума и темата. Повтарянето на опцията прибавя " "отдалечените клони" -#: builtin/branch.c:621 +#: builtin/branch.c:623 msgid "suppress informational messages" msgstr "без информационни съобщения" -#: builtin/branch.c:622 +#: builtin/branch.c:624 msgid "set up tracking mode (see git-pull(1))" msgstr "задаване на режима на следене (виж git-pull(1))" -#: builtin/branch.c:624 +#: builtin/branch.c:626 msgid "do not use" msgstr "да не се ползва" -#: builtin/branch.c:626 builtin/rebase.c:526 +#: builtin/branch.c:628 builtin/rebase.c:532 msgid "upstream" msgstr "клон-източник" -#: builtin/branch.c:626 +#: builtin/branch.c:628 msgid "change the upstream info" msgstr "смяна на клона-източник" -#: builtin/branch.c:627 +#: builtin/branch.c:629 msgid "unset the upstream info" msgstr "изчистване на информацията за клон-източник" -#: builtin/branch.c:628 +#: builtin/branch.c:630 msgid "use colored output" msgstr "цветен изход" -#: builtin/branch.c:629 +#: builtin/branch.c:631 msgid "act on remote-tracking branches" msgstr "действие върху следящите клони" -#: builtin/branch.c:631 builtin/branch.c:633 +#: builtin/branch.c:633 builtin/branch.c:635 msgid "print only branches that contain the commit" msgstr "извеждане само на клоните, които съдържат това ПОДАВАНЕ" -#: builtin/branch.c:632 builtin/branch.c:634 +#: builtin/branch.c:634 builtin/branch.c:636 msgid "print only branches that don't contain the commit" msgstr "извеждане само на клоните, които не съдържат това ПОДАВАНЕ" -#: builtin/branch.c:637 +#: builtin/branch.c:639 msgid "Specific git-branch actions:" msgstr "Специални действия на „git-branch“:" -#: builtin/branch.c:638 +#: builtin/branch.c:640 msgid "list both remote-tracking and local branches" msgstr "извеждане както на следящите, така и на локалните клони" -#: builtin/branch.c:640 +#: builtin/branch.c:642 msgid "delete fully merged branch" msgstr "изтриване на клони, които са напълно слети" -#: builtin/branch.c:641 +#: builtin/branch.c:643 msgid "delete branch (even if not merged)" msgstr "изтриване и на клони, които не са напълно слети" -#: builtin/branch.c:642 +#: builtin/branch.c:644 msgid "move/rename a branch and its reflog" msgstr "" "преместване/преименуване на клон и принадлежащият му журнал на указателите" -#: builtin/branch.c:643 +#: builtin/branch.c:645 msgid "move/rename a branch, even if target exists" msgstr "преместване/преименуване на клон, дори ако има вече клон с такова име" -#: builtin/branch.c:644 +#: builtin/branch.c:646 msgid "copy a branch and its reflog" msgstr "копиране на клон и принадлежащия му журнал на указателите" -#: builtin/branch.c:645 +#: builtin/branch.c:647 msgid "copy a branch, even if target exists" msgstr "копиране на клон, дори ако има вече клон с такова име" -#: builtin/branch.c:646 +#: builtin/branch.c:648 msgid "list branch names" msgstr "извеждане на имената на клоните" -#: builtin/branch.c:647 +#: builtin/branch.c:649 msgid "show current branch name" msgstr "извеждане на името на текущия клон" -#: builtin/branch.c:648 +#: builtin/branch.c:650 msgid "create the branch's reflog" msgstr "създаване на журнала на указателите на клона" -#: builtin/branch.c:650 +#: builtin/branch.c:652 msgid "edit the description for the branch" msgstr "редактиране на описанието на клона" -#: builtin/branch.c:651 +#: builtin/branch.c:653 msgid "force creation, move/rename, deletion" msgstr "принудително създаване, преместване, преименуване, изтриване" -#: builtin/branch.c:652 +#: builtin/branch.c:654 msgid "print only branches that are merged" msgstr "извеждане само на слетите клони" -#: builtin/branch.c:653 +#: builtin/branch.c:655 msgid "print only branches that are not merged" msgstr "извеждане само на неслетите клони" -#: builtin/branch.c:654 +#: builtin/branch.c:656 msgid "list branches in columns" msgstr "извеждане по колони" -#: builtin/branch.c:656 builtin/for-each-ref.c:42 builtin/notes.c:415 +#: builtin/branch.c:658 builtin/for-each-ref.c:42 builtin/notes.c:415 #: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584 #: builtin/tag.c:434 msgid "object" msgstr "ОБЕКТ" -#: builtin/branch.c:657 +#: builtin/branch.c:659 msgid "print only branches of the object" msgstr "извеждане само на клоните на ОБЕКТА" -#: builtin/branch.c:658 builtin/for-each-ref.c:48 builtin/tag.c:441 +#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:441 msgid "sorting and filtering are case insensitive" msgstr "подредбата и филтрирането третират еднакво малките и главните букви" -#: builtin/branch.c:659 builtin/for-each-ref.c:38 builtin/tag.c:439 +#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:439 #: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "ФОРМАТ за изхода" -#: builtin/branch.c:682 builtin/clone.c:789 +#: builtin/branch.c:684 builtin/clone.c:790 msgid "HEAD not found below refs/heads!" msgstr "В директорията „refs/heads“ липсва файл „HEAD“" -#: builtin/branch.c:706 +#: builtin/branch.c:708 msgid "--column and --verbose are incompatible" msgstr "Опциите „--column“ и „--verbose“ са несъвместими" -#: builtin/branch.c:721 builtin/branch.c:775 builtin/branch.c:784 +#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786 msgid "branch name required" msgstr "Необходимо е име на клон" -#: builtin/branch.c:751 +#: builtin/branch.c:753 msgid "Cannot give description to detached HEAD" msgstr "Не може да зададете описание на несвързан „HEAD“" -#: builtin/branch.c:756 +#: builtin/branch.c:758 msgid "cannot edit description of more than one branch" msgstr "Не може да редактирате описанието на повече от един клон едновременно" -#: builtin/branch.c:763 +#: builtin/branch.c:765 #, c-format msgid "No commit on branch '%s' yet." msgstr "В клона „%s“ все още няма подавания." -#: builtin/branch.c:766 +#: builtin/branch.c:768 #, c-format msgid "No branch named '%s'." msgstr "Липсва клон на име „%s“." -#: builtin/branch.c:781 +#: builtin/branch.c:783 msgid "too many branches for a copy operation" msgstr "прекалено много клони за копиране" -#: builtin/branch.c:790 +#: builtin/branch.c:792 msgid "too many arguments for a rename operation" msgstr "прекалено много аргументи към командата за преименуване" -#: builtin/branch.c:795 +#: builtin/branch.c:797 msgid "too many arguments to set new upstream" msgstr "прекалено много аргументи към командата за следене" -#: builtin/branch.c:799 +#: builtin/branch.c:801 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -11596,31 +11597,31 @@ msgstr "" "Следеното от „HEAD“ не може да се зададе да е „%s“, защото то не сочи към " "никой клон." -#: builtin/branch.c:802 builtin/branch.c:825 +#: builtin/branch.c:804 builtin/branch.c:827 #, c-format msgid "no such branch '%s'" msgstr "Няма клон на име „%s“." -#: builtin/branch.c:806 +#: builtin/branch.c:808 #, c-format msgid "branch '%s' does not exist" msgstr "Не съществува клон на име „%s“." -#: builtin/branch.c:819 +#: builtin/branch.c:821 msgid "too many arguments to unset upstream" msgstr "прекалено много аргументи към командата за спиране на следене" -#: builtin/branch.c:823 +#: builtin/branch.c:825 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "Следеното от „HEAD“ не може да махне, защото то не сочи към никой клон." -#: builtin/branch.c:829 +#: builtin/branch.c:831 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Няма информация клонът „%s“ да следи някой друг" -#: builtin/branch.c:839 +#: builtin/branch.c:841 msgid "" "The -a, and -r, options to 'git branch' do not take a branch name.\n" "Did you mean to use: -a|-r --list ?" @@ -11628,7 +11629,7 @@ msgstr "" "Опциите „-a“ и „-r“ на „git branch“ са несъвместими с име на клон.\n" "Пробвайте с: „-a|-r --list ШАБЛОН“" -#: builtin/branch.c:843 +#: builtin/branch.c:845 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -11697,38 +11698,38 @@ msgstr "" "Разгледайте останалата част от доклада за грешка по-долу.\n" "Може да изтриете редовете, които не искате да споделите.\n" -#: builtin/bugreport.c:134 +#: builtin/bugreport.c:135 msgid "specify a destination for the bugreport file" msgstr "укажете файла, в който да се запази докладът за грешка" -#: builtin/bugreport.c:136 +#: builtin/bugreport.c:137 msgid "specify a strftime format suffix for the filename" msgstr "укажете суфикса на файла във формат за „strftime“" -#: builtin/bugreport.c:158 +#: builtin/bugreport.c:159 #, c-format msgid "could not create leading directories for '%s'" msgstr "родителските директории на „%s“ не могат да бъдат създадени" -#: builtin/bugreport.c:165 +#: builtin/bugreport.c:166 msgid "System Info" msgstr "Информация за системата" -#: builtin/bugreport.c:168 +#: builtin/bugreport.c:169 msgid "Enabled Hooks" msgstr "Включени куки" -#: builtin/bugreport.c:175 +#: builtin/bugreport.c:176 #, c-format msgid "couldn't create a new file at '%s'" msgstr "новият файл „%s“ не може да бъде създаден" -#: builtin/bugreport.c:178 +#: builtin/bugreport.c:179 #, c-format msgid "unable to write to %s" msgstr "в „%s“ не може да се пише" -#: builtin/bugreport.c:188 +#: builtin/bugreport.c:189 #, c-format msgid "Created new report at '%s'.\n" msgstr "Новият доклад е създаден в „%s“.\n" @@ -11787,11 +11788,11 @@ msgstr "Пратката „%s“ е наред\n" msgid "Need a repository to unbundle." msgstr "За приемането на пратка е необходимо хранилище." -#: builtin/bundle.c:171 builtin/remote.c:1687 +#: builtin/bundle.c:171 builtin/remote.c:1700 msgid "be verbose; must be placed before a subcommand" msgstr "повече подробности. Поставя се пред подкоманда" -#: builtin/bundle.c:193 builtin/remote.c:1718 +#: builtin/bundle.c:193 builtin/remote.c:1731 #, c-format msgid "Unknown subcommand: %s" msgstr "Непозната подкоманда: %s" @@ -11912,7 +11913,7 @@ msgstr "изчитане на имената на файловете от ста msgid "terminate input and output records by a NUL character" msgstr "разделяне на входните и изходните записи с нулевия знак „NUL“" -#: builtin/check-ignore.c:21 builtin/checkout.c:1482 builtin/gc.c:538 +#: builtin/check-ignore.c:21 builtin/checkout.c:1500 builtin/gc.c:541 #: builtin/worktree.c:561 msgid "suppress progress reporting" msgstr "без показване на напредъка" @@ -11966,54 +11967,54 @@ msgstr "контактът не може да бъде анализиран: %s" msgid "no contacts specified" msgstr "не са указани контакти" -#: builtin/checkout-index.c:131 +#: builtin/checkout-index.c:139 msgid "git checkout-index [] [--] [...]" msgstr "git checkout-index [ОПЦИЯ…] [--] [ФАЙЛ…]" -#: builtin/checkout-index.c:148 +#: builtin/checkout-index.c:156 msgid "stage should be between 1 and 3 or all" msgstr "етапът трябва да е „1“, „2“, „3“ или „all“ (всички)" -#: builtin/checkout-index.c:164 +#: builtin/checkout-index.c:173 msgid "check out all files in the index" msgstr "изтегляне на всички файлове в индекса" -#: builtin/checkout-index.c:165 +#: builtin/checkout-index.c:174 msgid "force overwrite of existing files" msgstr "презаписване на файловете, дори и да съществуват" -#: builtin/checkout-index.c:167 +#: builtin/checkout-index.c:176 msgid "no warning for existing files and files not in index" msgstr "без предупреждения при липсващи файлове и файлове не в индекса" -#: builtin/checkout-index.c:169 +#: builtin/checkout-index.c:178 msgid "don't checkout new files" msgstr "без изтегляне на нови файлове" -#: builtin/checkout-index.c:171 +#: builtin/checkout-index.c:180 msgid "update stat information in the index file" msgstr "обновяване на информацията получена чрез „stat“ за файловете в индекса" -#: builtin/checkout-index.c:175 +#: builtin/checkout-index.c:184 msgid "read list of paths from the standard input" msgstr "изчитане на пътищата от стандартния вход" -#: builtin/checkout-index.c:177 +#: builtin/checkout-index.c:186 msgid "write the content to temporary files" msgstr "записване на съдържанието във временни файлове" -#: builtin/checkout-index.c:178 builtin/column.c:31 +#: builtin/checkout-index.c:187 builtin/column.c:31 #: builtin/submodule--helper.c:1824 builtin/submodule--helper.c:1827 #: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333 -#: builtin/worktree.c:754 +#: builtin/worktree.c:757 msgid "string" msgstr "НИЗ" -#: builtin/checkout-index.c:179 +#: builtin/checkout-index.c:188 msgid "when creating files, prepend " msgstr "при създаването на нови файлове да се добавя префикса НИЗ" -#: builtin/checkout-index.c:181 +#: builtin/checkout-index.c:190 msgid "copy out the files from named stage" msgstr "копиране на файловете от това състояние на сливане" @@ -12116,16 +12117,16 @@ msgstr "опцията „%s“ е задължителна, когато „%s msgid "'%s' or '%s' cannot be used with %s" msgstr "опцията „%3$s“ е несъвместима както с „%1$s“, така и с „%2$s“" -#: builtin/checkout.c:528 builtin/checkout.c:535 +#: builtin/checkout.c:541 builtin/checkout.c:548 #, c-format msgid "path '%s' is unmerged" msgstr "пътят „%s“ не е слят" -#: builtin/checkout.c:703 +#: builtin/checkout.c:716 msgid "you need to resolve your current index first" msgstr "първо трябва да коригирате индекса си" -#: builtin/checkout.c:757 +#: builtin/checkout.c:770 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -12135,50 +12136,50 @@ msgstr "" "индекса:\n" "%s" -#: builtin/checkout.c:853 +#: builtin/checkout.c:866 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Журналът на указателите за „%s“ не може да се проследи: %s\n" -#: builtin/checkout.c:895 +#: builtin/checkout.c:908 msgid "HEAD is now at" msgstr "Указателят „HEAD“ в момента сочи към" -#: builtin/checkout.c:899 builtin/clone.c:720 +#: builtin/checkout.c:912 builtin/clone.c:721 t/helper/test-fast-rebase.c:202 msgid "unable to update HEAD" msgstr "Указателят „HEAD“ не може да бъде обновен" -#: builtin/checkout.c:903 +#: builtin/checkout.c:916 #, c-format msgid "Reset branch '%s'\n" msgstr "Зануляване на клона „%s“\n" -#: builtin/checkout.c:906 +#: builtin/checkout.c:919 #, c-format msgid "Already on '%s'\n" msgstr "Вече сте на „%s“\n" -#: builtin/checkout.c:910 +#: builtin/checkout.c:923 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Преминаване към клона „%s“ и зануляване на промените\n" -#: builtin/checkout.c:912 builtin/checkout.c:1338 +#: builtin/checkout.c:925 builtin/checkout.c:1356 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Преминахте към новия клон „%s“\n" -#: builtin/checkout.c:914 +#: builtin/checkout.c:927 #, c-format msgid "Switched to branch '%s'\n" msgstr "Преминахте към клона „%s“\n" -#: builtin/checkout.c:965 +#: builtin/checkout.c:978 #, c-format msgid " ... and %d more.\n" msgstr "… и още %d.\n" -#: builtin/checkout.c:971 +#: builtin/checkout.c:984 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -12200,7 +12201,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:990 +#: builtin/checkout.c:1003 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -12227,19 +12228,19 @@ msgstr[1] "" " git branch ИМЕ_НА_НОВИЯ_КЛОН %s\n" "\n" -#: builtin/checkout.c:1025 +#: builtin/checkout.c:1038 msgid "internal error in revision walk" msgstr "вътрешна грешка при обхождането на версиите" -#: builtin/checkout.c:1029 +#: builtin/checkout.c:1042 msgid "Previous HEAD position was" msgstr "Преди това „HEAD“ сочеше към" -#: builtin/checkout.c:1069 builtin/checkout.c:1333 +#: builtin/checkout.c:1082 builtin/checkout.c:1351 msgid "You are on a branch yet to be born" msgstr "В момента сте на клон, който все още не е създаден" -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1164 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -12248,7 +12249,7 @@ msgstr "" "„%s“ може да е както локален файл, така и следящ клон. За уточняване\n" "ползвайте разделителя „--“ (и евентуално опцията „--no-guess“)" -#: builtin/checkout.c:1153 +#: builtin/checkout.c:1171 msgid "" "If you meant to check out a remote tracking branch on, e.g. 'origin',\n" "you can do so by fully qualifying the name with the --track option:\n" @@ -12270,51 +12271,51 @@ msgstr "" "\n" " checkout.defaultRemote=origin" -#: builtin/checkout.c:1163 +#: builtin/checkout.c:1181 #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "„%s“ напасва с множество (%d) отдалечени клони" -#: builtin/checkout.c:1229 +#: builtin/checkout.c:1247 msgid "only one reference expected" msgstr "очаква се само един указател" -#: builtin/checkout.c:1246 +#: builtin/checkout.c:1264 #, c-format msgid "only one reference expected, %d given." msgstr "очаква се един указател, а сте подали %d." -#: builtin/checkout.c:1292 builtin/worktree.c:342 builtin/worktree.c:510 +#: builtin/checkout.c:1310 builtin/worktree.c:342 builtin/worktree.c:510 #, c-format msgid "invalid reference: %s" msgstr "неправилен указател: %s" -#: builtin/checkout.c:1305 builtin/checkout.c:1671 +#: builtin/checkout.c:1323 builtin/checkout.c:1689 #, c-format msgid "reference is not a tree: %s" msgstr "указателят не сочи към обект-дърво: %s" -#: builtin/checkout.c:1352 +#: builtin/checkout.c:1370 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "очаква се клон, а не етикет — „%s“" -#: builtin/checkout.c:1354 +#: builtin/checkout.c:1372 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "очаква се локален, а не отдалечен клон — „%s“" -#: builtin/checkout.c:1355 builtin/checkout.c:1363 +#: builtin/checkout.c:1373 builtin/checkout.c:1381 #, c-format msgid "a branch is expected, got '%s'" msgstr "очаква се клон, а не „%s“" -#: builtin/checkout.c:1358 +#: builtin/checkout.c:1376 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "очаква се клон, а не подаване — „%s“" -#: builtin/checkout.c:1374 +#: builtin/checkout.c:1392 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -12322,7 +12323,7 @@ msgstr "" "по време на сливане не може да преминете към друг клон.\n" "Пробвайте с „git merge --quit“ или „git worktree add“." -#: builtin/checkout.c:1378 +#: builtin/checkout.c:1396 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -12331,7 +12332,7 @@ msgstr "" "клон.\n" "Пробвайте с „git am --quit“ или „git worktree add“." -#: builtin/checkout.c:1382 +#: builtin/checkout.c:1400 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -12339,7 +12340,7 @@ msgstr "" "по време на пребазиране не може да преминете към друг клон.\n" "Пробвайте с „git rebase --quit“ или „git worktree add“." -#: builtin/checkout.c:1386 +#: builtin/checkout.c:1404 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -12347,7 +12348,7 @@ msgstr "" "по време на отбиране на подавания не може да преминете към друг клон.\n" "Пробвайте с „git cherry-pick --quit“ или „git worktree add“." -#: builtin/checkout.c:1390 +#: builtin/checkout.c:1408 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -12355,146 +12356,146 @@ msgstr "" "по време на отмяна на подавания не може да преминете към друг клон.\n" "Пробвайте с „git revert --quit“ или „git worktree add“." -#: builtin/checkout.c:1394 +#: builtin/checkout.c:1412 msgid "you are switching branch while bisecting" msgstr "преминаване към друг клон по време на двоично търсене" -#: builtin/checkout.c:1401 +#: builtin/checkout.c:1419 msgid "paths cannot be used with switching branches" msgstr "задаването на път е несъвместимо с преминаването от един клон към друг" -#: builtin/checkout.c:1404 builtin/checkout.c:1408 builtin/checkout.c:1412 +#: builtin/checkout.c:1422 builtin/checkout.c:1426 builtin/checkout.c:1430 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "опцията „%s“ е несъвместима с преминаването от един клон към друг" -#: builtin/checkout.c:1416 builtin/checkout.c:1419 builtin/checkout.c:1422 -#: builtin/checkout.c:1427 builtin/checkout.c:1432 +#: builtin/checkout.c:1434 builtin/checkout.c:1437 builtin/checkout.c:1440 +#: builtin/checkout.c:1445 builtin/checkout.c:1450 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "опцията „%s“ е несъвместима с „%s“" -#: builtin/checkout.c:1429 +#: builtin/checkout.c:1447 #, c-format msgid "'%s' cannot take " msgstr "опцията „%s“ е несъвместима със задаването на НАЧАЛО" -#: builtin/checkout.c:1437 +#: builtin/checkout.c:1455 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" "За да преминете към клон, подайте указател, който сочи към подаване. „%s“ " "не е такъв" -#: builtin/checkout.c:1444 +#: builtin/checkout.c:1462 msgid "missing branch or commit argument" msgstr "липсва аргумент — клон или подаване" -#: builtin/checkout.c:1486 builtin/clone.c:91 builtin/commit-graph.c:84 -#: builtin/commit-graph.c:222 builtin/fetch.c:172 builtin/merge.c:287 -#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:551 -#: builtin/send-pack.c:192 +#: builtin/checkout.c:1504 builtin/clone.c:92 builtin/commit-graph.c:84 +#: builtin/commit-graph.c:222 builtin/fetch.c:172 builtin/merge.c:296 +#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:575 +#: builtin/send-pack.c:198 msgid "force progress reporting" msgstr "извеждане на напредъка" -#: builtin/checkout.c:1487 +#: builtin/checkout.c:1505 msgid "perform a 3-way merge with the new branch" msgstr "извършване на тройно сливане с новия клон" -#: builtin/checkout.c:1488 builtin/log.c:1795 parse-options.h:322 +#: builtin/checkout.c:1506 builtin/log.c:1800 parse-options.h:322 msgid "style" msgstr "СТИЛ" -#: builtin/checkout.c:1489 +#: builtin/checkout.c:1507 msgid "conflict style (merge or diff3)" msgstr "действие при конфликт (сливане или тройна разлика)" -#: builtin/checkout.c:1501 builtin/worktree.c:558 +#: builtin/checkout.c:1519 builtin/worktree.c:558 msgid "detach HEAD at named commit" msgstr "отделяне на указателя „HEAD“ към указаното подаване" -#: builtin/checkout.c:1502 +#: builtin/checkout.c:1520 msgid "set upstream info for new branch" msgstr "задаване на кой клон бива следен при създаването на новия клон" -#: builtin/checkout.c:1504 +#: builtin/checkout.c:1522 msgid "force checkout (throw away local modifications)" msgstr "принудително изтегляне (вашите промени ще бъдат занулени)" -#: builtin/checkout.c:1506 +#: builtin/checkout.c:1524 msgid "new-branch" msgstr "НОВ_КЛОН" -#: builtin/checkout.c:1506 +#: builtin/checkout.c:1524 msgid "new unparented branch" msgstr "нов клон без родител" -#: builtin/checkout.c:1508 builtin/merge.c:291 +#: builtin/checkout.c:1526 builtin/merge.c:300 msgid "update ignored files (default)" msgstr "обновяване на игнорираните файлове (стандартно)" -#: builtin/checkout.c:1511 +#: builtin/checkout.c:1529 msgid "do not check if another worktree is holding the given ref" msgstr "без проверка дали друго работно дърво държи указателя" -#: builtin/checkout.c:1524 +#: builtin/checkout.c:1542 msgid "checkout our version for unmerged files" msgstr "изтегляне на вашата версия на неслетите файлове" -#: builtin/checkout.c:1527 +#: builtin/checkout.c:1545 msgid "checkout their version for unmerged files" msgstr "изтегляне на чуждата версия на неслетите файлове" -#: builtin/checkout.c:1531 +#: builtin/checkout.c:1549 msgid "do not limit pathspecs to sparse entries only" msgstr "без ограничаване на изброените пътища само до частично изтеглените" -#: builtin/checkout.c:1586 +#: builtin/checkout.c:1604 #, c-format msgid "-%c, -%c and --orphan are mutually exclusive" msgstr "Опциите „-%c“, „-%c“ и „--orphan“ са несъвместими една с друга" -#: builtin/checkout.c:1590 +#: builtin/checkout.c:1608 msgid "-p and --overlay are mutually exclusive" msgstr "опциите „-p“ и „--overlay“ са несъвместими" -#: builtin/checkout.c:1627 +#: builtin/checkout.c:1645 msgid "--track needs a branch name" msgstr "опцията „--track“ изисква име на клон" -#: builtin/checkout.c:1632 +#: builtin/checkout.c:1650 #, c-format msgid "missing branch name; try -%c" msgstr "липсва име на клон, използвайте опцията „-%c“" -#: builtin/checkout.c:1664 +#: builtin/checkout.c:1682 #, c-format msgid "could not resolve %s" msgstr "„%s“ не може да бъде открит" -#: builtin/checkout.c:1680 +#: builtin/checkout.c:1698 msgid "invalid path specification" msgstr "указан е неправилен път" -#: builtin/checkout.c:1687 +#: builtin/checkout.c:1705 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "„%s“ не е подаване, затова от него не може да се създаде клон „%s“" -#: builtin/checkout.c:1691 +#: builtin/checkout.c:1709 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: опцията „--detach“ не приема аргумент-път „%s“" -#: builtin/checkout.c:1700 +#: builtin/checkout.c:1718 msgid "--pathspec-from-file is incompatible with --detach" msgstr "опциите „--pathspec-from-file“ и „--detach“ са несъвместими" -#: builtin/checkout.c:1703 builtin/reset.c:325 builtin/stash.c:1500 +#: builtin/checkout.c:1721 builtin/reset.c:325 builtin/stash.c:1499 msgid "--pathspec-from-file is incompatible with --patch" msgstr "опциите „--pathspec-from-file“ и „--patch“ са несъвместими" -#: builtin/checkout.c:1716 +#: builtin/checkout.c:1734 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -12502,74 +12503,74 @@ msgstr "" "git checkout: опциите „--ours“/„--theirs“, „--force“ и „--merge“\n" "са несъвместими с изтегляне от индекса." -#: builtin/checkout.c:1721 +#: builtin/checkout.c:1739 msgid "you must specify path(s) to restore" msgstr "трябва да укажете поне един път за възстановяване" -#: builtin/checkout.c:1747 builtin/checkout.c:1749 builtin/checkout.c:1798 -#: builtin/checkout.c:1800 builtin/clone.c:121 builtin/remote.c:170 +#: builtin/checkout.c:1765 builtin/checkout.c:1767 builtin/checkout.c:1816 +#: builtin/checkout.c:1818 builtin/clone.c:122 builtin/remote.c:170 #: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:554 #: builtin/worktree.c:556 msgid "branch" msgstr "клон" -#: builtin/checkout.c:1748 +#: builtin/checkout.c:1766 msgid "create and checkout a new branch" msgstr "създаване и преминаване към нов клон" -#: builtin/checkout.c:1750 +#: builtin/checkout.c:1768 msgid "create/reset and checkout a branch" msgstr "създаване/зануляване на клон и преминаване към него" -#: builtin/checkout.c:1751 +#: builtin/checkout.c:1769 msgid "create reflog for new branch" msgstr "създаване на журнал на указателите за нов клон" -#: builtin/checkout.c:1753 +#: builtin/checkout.c:1771 msgid "second guess 'git checkout ' (default)" msgstr "" "опит за отгатване на име на клон след неуспешен опит с „git checkout " "НЕСЪЩЕСТВУВАЩ_КЛОН“ (стандартно)" -#: builtin/checkout.c:1754 +#: builtin/checkout.c:1772 msgid "use overlay mode (default)" msgstr "използване на припокриващ режим (стандартно)" -#: builtin/checkout.c:1799 +#: builtin/checkout.c:1817 msgid "create and switch to a new branch" msgstr "създаване и преминаване към нов клон" -#: builtin/checkout.c:1801 +#: builtin/checkout.c:1819 msgid "create/reset and switch to a branch" msgstr "създаване/зануляване на клон и преминаване към него" -#: builtin/checkout.c:1803 +#: builtin/checkout.c:1821 msgid "second guess 'git switch '" msgstr "" "опит за отгатване на име на клон след неуспешен опит с „git switch " "НЕСЪЩЕСТВУВАЩ_КЛОН“" -#: builtin/checkout.c:1805 +#: builtin/checkout.c:1823 msgid "throw away local modifications" msgstr "зануляване на локалните промени" -#: builtin/checkout.c:1839 +#: builtin/checkout.c:1857 msgid "which tree-ish to checkout from" msgstr "към кой указател към дърво да се премине" -#: builtin/checkout.c:1841 +#: builtin/checkout.c:1859 msgid "restore the index" msgstr "възстановяване на индекса" -#: builtin/checkout.c:1843 +#: builtin/checkout.c:1861 msgid "restore the working tree (default)" msgstr "възстановяване на работното дърво (стандартно)" -#: builtin/checkout.c:1845 +#: builtin/checkout.c:1863 msgid "ignore unmerged entries" msgstr "пренебрегване на неслетите елементи" -#: builtin/checkout.c:1846 +#: builtin/checkout.c:1864 msgid "use overlay mode" msgstr "използване на припокриващ режим" @@ -12608,7 +12609,7 @@ msgstr "файлът „%s“ не може да бъде изтрит" msgid "could not lstat %s\n" msgstr "не може да се получи информация чрез „lstat“ за „%s“\n" -#: builtin/clean.c:302 git-add--interactive.perl:595 +#: builtin/clean.c:302 git-add--interactive.perl:593 #, c-format msgid "" "Prompt help:\n" @@ -12621,7 +12622,7 @@ msgstr "" "ПРЕФИКС — избор на единствен обект по този уникален префикс\n" " — (празно) нищо да не се избира\n" -#: builtin/clean.c:306 git-add--interactive.perl:604 +#: builtin/clean.c:306 git-add--interactive.perl:602 #, c-format msgid "" "Prompt help:\n" @@ -12642,8 +12643,8 @@ msgstr "" "* — избиране на всички обекти\n" " — (празно) завършване на избирането\n" -#: builtin/clean.c:521 git-add--interactive.perl:570 -#: git-add--interactive.perl:575 +#: builtin/clean.c:521 git-add--interactive.perl:568 +#: git-add--interactive.perl:573 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Неправилен избор (%s).\n" @@ -12713,7 +12714,7 @@ msgid "remove whole directories" msgstr "изтриване на цели директории" #: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 -#: builtin/grep.c:910 builtin/log.c:181 builtin/log.c:183 +#: builtin/grep.c:921 builtin/log.c:183 builtin/log.c:185 #: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" @@ -12756,168 +12757,168 @@ msgstr "опциите „-x“ и „-X“ са несъвместими" msgid "git clone [] [--] []" msgstr "git clone [ОПЦИЯ…] [--] ХРАНИЛИЩЕ [ДИРЕКТОРИЯ]" -#: builtin/clone.c:93 +#: builtin/clone.c:94 msgid "don't create a checkout" msgstr "без създаване на работно дърво" -#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:553 +#: builtin/clone.c:95 builtin/clone.c:97 builtin/init-db.c:555 msgid "create a bare repository" msgstr "създаване на голо хранилище" -#: builtin/clone.c:98 +#: builtin/clone.c:99 msgid "create a mirror repository (implies bare)" msgstr "" "създаване на хранилище-огледало (включва опцията „--bare“ за голо хранилище)" -#: builtin/clone.c:100 +#: builtin/clone.c:101 msgid "to clone from a local repository" msgstr "клониране от локално хранилище" -#: builtin/clone.c:102 +#: builtin/clone.c:103 msgid "don't use local hardlinks, always copy" msgstr "без твърди връзки, файловете винаги да се копират" -#: builtin/clone.c:104 +#: builtin/clone.c:105 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:110 +#: builtin/clone.c:111 msgid "number of submodules cloned in parallel" msgstr "брой подмодули, клонирани паралелно" -#: builtin/clone.c:111 builtin/init-db.c:550 +#: builtin/clone.c:112 builtin/init-db.c:552 msgid "template-directory" msgstr "директория с шаблони" -#: builtin/clone.c:112 builtin/init-db.c:551 +#: builtin/clone.c:113 builtin/init-db.c:553 msgid "directory from which templates will be used" msgstr "директория, която съдържа шаблоните, които да се ползват" -#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1831 +#: builtin/clone.c:115 builtin/clone.c:117 builtin/submodule--helper.c:1831 #: builtin/submodule--helper.c:2336 msgid "reference repository" msgstr "еталонно хранилище" -#: builtin/clone.c:118 builtin/submodule--helper.c:1833 +#: builtin/clone.c:119 builtin/submodule--helper.c:1833 #: builtin/submodule--helper.c:2338 msgid "use --reference only while cloning" msgstr "опцията „--reference“ може да се използва само при клониране" -#: builtin/clone.c:119 builtin/column.c:27 builtin/init-db.c:561 -#: builtin/merge-file.c:46 builtin/pack-objects.c:3546 builtin/repack.c:332 +#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:563 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3546 builtin/repack.c:358 msgid "name" msgstr "ИМЕ" -#: builtin/clone.c:120 +#: builtin/clone.c:121 msgid "use instead of 'origin' to track upstream" msgstr "използване на това ИМЕ вместо „origin“ при проследяване на клони" -#: builtin/clone.c:122 +#: builtin/clone.c:123 msgid "checkout instead of the remote's HEAD" msgstr "изтегляне на този КЛОН, а не соченият от отдалечения указател „HEAD“" -#: builtin/clone.c:124 +#: builtin/clone.c:125 msgid "path to git-upload-pack on the remote" msgstr "път към командата „git-upload-pack“ на отдалеченото хранилище" -#: builtin/clone.c:125 builtin/fetch.c:173 builtin/grep.c:849 +#: builtin/clone.c:126 builtin/fetch.c:173 builtin/grep.c:860 #: builtin/pull.c:208 msgid "depth" msgstr "ДЪЛБОЧИНА" -#: builtin/clone.c:126 +#: builtin/clone.c:127 msgid "create a shallow clone of that depth" msgstr "плитко клониране до тази ДЪЛБОЧИНА" -#: builtin/clone.c:127 builtin/fetch.c:175 builtin/pack-objects.c:3535 +#: builtin/clone.c:128 builtin/fetch.c:175 builtin/pack-objects.c:3535 #: builtin/pull.c:211 msgid "time" msgstr "ВРЕМЕ" -#: builtin/clone.c:128 +#: builtin/clone.c:129 msgid "create a shallow clone since a specific time" msgstr "плитко клониране до момент във времето" -#: builtin/clone.c:129 builtin/fetch.c:177 builtin/fetch.c:200 -#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1311 +#: builtin/clone.c:130 builtin/fetch.c:177 builtin/fetch.c:200 +#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1317 msgid "revision" msgstr "ВЕРСИЯ" -#: builtin/clone.c:130 builtin/fetch.c:178 builtin/pull.c:215 +#: builtin/clone.c:131 builtin/fetch.c:178 builtin/pull.c:215 msgid "deepen history of shallow clone, excluding rev" msgstr "задълбочаване на историята на плитко хранилище до изключващ указател" -#: builtin/clone.c:132 builtin/submodule--helper.c:1843 +#: builtin/clone.c:133 builtin/submodule--helper.c:1843 #: builtin/submodule--helper.c:2352 msgid "clone only one branch, HEAD or --branch" msgstr "" "клониране само на един клон — или сочения от отдалечения „HEAD“, или изрично " "зададения с „--branch“" -#: builtin/clone.c:134 +#: builtin/clone.c:135 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "" "без клониране на етикети, като последващите доставяния няма да ги следят" -#: builtin/clone.c:136 +#: builtin/clone.c:137 msgid "any cloned submodules will be shallow" msgstr "всички клонирани подмодули ще са плитки" -#: builtin/clone.c:137 builtin/init-db.c:559 +#: builtin/clone.c:138 builtin/init-db.c:561 msgid "gitdir" msgstr "СЛУЖЕБНА_ДИРЕКТОРИЯ" -#: builtin/clone.c:138 builtin/init-db.c:560 +#: builtin/clone.c:139 builtin/init-db.c:562 msgid "separate git dir from working tree" msgstr "отделна СЛУЖЕБНА_ДИРЕКТОРИЯ за git извън работното дърво" -#: builtin/clone.c:139 +#: builtin/clone.c:140 msgid "key=value" msgstr "КЛЮЧ=СТОЙНОСТ" -#: builtin/clone.c:140 +#: builtin/clone.c:141 msgid "set config inside the new repository" msgstr "задаване на настройките на новото хранилище" -#: builtin/clone.c:142 builtin/fetch.c:195 builtin/ls-remote.c:76 -#: builtin/pull.c:230 builtin/push.c:560 builtin/send-pack.c:190 +#: builtin/clone.c:143 builtin/fetch.c:195 builtin/ls-remote.c:76 +#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196 msgid "server-specific" msgstr "специфични за сървъра" -#: builtin/clone.c:142 builtin/fetch.c:195 builtin/ls-remote.c:76 -#: builtin/pull.c:231 builtin/push.c:560 builtin/send-pack.c:191 +#: builtin/clone.c:143 builtin/fetch.c:195 builtin/ls-remote.c:76 +#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197 msgid "option to transmit" msgstr "опция за пренос" -#: builtin/clone.c:143 builtin/fetch.c:196 builtin/pull.c:234 -#: builtin/push.c:561 +#: builtin/clone.c:144 builtin/fetch.c:196 builtin/pull.c:234 +#: builtin/push.c:585 msgid "use IPv4 addresses only" msgstr "само адреси IPv4" -#: builtin/clone.c:145 builtin/fetch.c:198 builtin/pull.c:237 -#: builtin/push.c:563 +#: builtin/clone.c:146 builtin/fetch.c:198 builtin/pull.c:237 +#: builtin/push.c:587 msgid "use IPv6 addresses only" msgstr "само адреси IPv6" -#: builtin/clone.c:149 +#: builtin/clone.c:150 msgid "any cloned submodules will use their remote-tracking branch" msgstr "всички клонирани подмодули ще ползват следящите си клони" -#: builtin/clone.c:151 +#: builtin/clone.c:152 msgid "initialize sparse-checkout file to include only files at root" msgstr "" "инициализиране на файла за частично изтегляне („.git/info/sparse-checkout“) " "да съдържа само файловете в основната директория" -#: builtin/clone.c:287 +#: builtin/clone.c:288 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -12925,43 +12926,43 @@ msgstr "" "Името на директорията не може да бъде отгатнато.\n" "Задайте директорията изрично на командния ред" -#: builtin/clone.c:340 +#: builtin/clone.c:341 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "" "ПРЕДУПРЕЖДЕНИЕ: не може да се добави алтернативен източник на „%s“: %s\n" -#: builtin/clone.c:413 +#: builtin/clone.c:414 #, c-format msgid "%s exists and is not a directory" msgstr "„%s“ съществува и не е директория" -#: builtin/clone.c:431 +#: builtin/clone.c:432 #, c-format msgid "failed to start iterator over '%s'" msgstr "неуспешно итериране по „%s“" -#: builtin/clone.c:462 +#: builtin/clone.c:463 #, c-format msgid "failed to create link '%s'" msgstr "връзката „%s“ не може да бъде създадена" -#: builtin/clone.c:466 +#: builtin/clone.c:467 #, c-format msgid "failed to copy file to '%s'" msgstr "файлът не може да бъде копиран като „%s“" -#: builtin/clone.c:471 +#: builtin/clone.c:472 #, c-format msgid "failed to iterate over '%s'" msgstr "неуспешно итериране по „%s“" -#: builtin/clone.c:498 +#: builtin/clone.c:499 #, c-format msgid "done.\n" msgstr "действието завърши.\n" -#: builtin/clone.c:512 +#: builtin/clone.c:513 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -12974,108 +12975,108 @@ msgstr "" "\n" " git restore --source=HEAD :/\n" -#: builtin/clone.c:589 +#: builtin/clone.c:590 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" "Клонът „%s“ от отдалеченото хранилище, което клонирате,\n" "и който следва да бъде изтеглен, не съществува." -#: builtin/clone.c:708 +#: builtin/clone.c:709 #, c-format msgid "unable to update %s" msgstr "обектът „%s“ не може да бъде обновен" -#: builtin/clone.c:756 +#: builtin/clone.c:757 msgid "failed to initialize sparse-checkout" msgstr "частичното изтегляне не може да се инициализира" -#: builtin/clone.c:779 +#: builtin/clone.c:780 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "указателят „HEAD“ от отдалеченото хранилище сочи към нещо,\n" "което не съществува. Не може да се изтегли определен клон.\n" -#: builtin/clone.c:811 +#: builtin/clone.c:812 msgid "unable to checkout working tree" msgstr "работното дърво не може да бъде подготвено" -#: builtin/clone.c:868 +#: builtin/clone.c:887 msgid "unable to write parameters to config file" msgstr "настройките не могат да бъдат записани в конфигурационния файл" -#: builtin/clone.c:931 +#: builtin/clone.c:950 msgid "cannot repack to clean up" msgstr "не може да се извърши пакетиране за изчистване на файловете" -#: builtin/clone.c:933 +#: builtin/clone.c:952 msgid "cannot unlink temporary alternates file" msgstr "временният файл за алтернативни обекти не може да бъде изтрит" -#: builtin/clone.c:970 builtin/receive-pack.c:2434 +#: builtin/clone.c:992 builtin/receive-pack.c:2493 msgid "Too many arguments." msgstr "Прекалено много аргументи." -#: builtin/clone.c:974 +#: builtin/clone.c:996 msgid "You must specify a repository to clone." msgstr "Трябва да укажете кое хранилище искате да клонирате." -#: builtin/clone.c:987 +#: builtin/clone.c:1009 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "опциите „--bare“ и „--origin %s“ са несъвместими." -#: builtin/clone.c:990 +#: builtin/clone.c:1012 msgid "--bare and --separate-git-dir are incompatible." msgstr "опциите „--bare“ и „--separate-git-dir“ са несъвместими." -#: builtin/clone.c:1006 +#: builtin/clone.c:1025 #, c-format msgid "repository '%s' does not exist" msgstr "не съществува хранилище „%s“" -#: builtin/clone.c:1010 builtin/fetch.c:1841 +#: builtin/clone.c:1029 builtin/fetch.c:1841 #, c-format msgid "depth %s is not a positive number" msgstr "дълбочината трябва да е положително цяло число, а не „%s“" -#: builtin/clone.c:1020 +#: builtin/clone.c:1039 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "целевият път „%s“ съществува и не е празна директория." -#: builtin/clone.c:1026 +#: builtin/clone.c:1045 #, c-format msgid "repository path '%s' already exists and is not an empty directory." msgstr "пътят в хранилището „%s“ съществува и не е празна директория." -#: builtin/clone.c:1040 +#: builtin/clone.c:1059 #, c-format msgid "working tree '%s' already exists." msgstr "в „%s“ вече съществува работно дърво." -#: builtin/clone.c:1055 builtin/clone.c:1076 builtin/difftool.c:271 -#: builtin/log.c:1970 builtin/worktree.c:354 builtin/worktree.c:386 +#: builtin/clone.c:1074 builtin/clone.c:1095 builtin/difftool.c:271 +#: builtin/log.c:1987 builtin/worktree.c:354 builtin/worktree.c:386 #, c-format msgid "could not create leading directories of '%s'" msgstr "родителските директории на „%s“ не могат да бъдат създадени" -#: builtin/clone.c:1060 +#: builtin/clone.c:1079 #, c-format msgid "could not create work tree dir '%s'" msgstr "работното дърво в „%s“ не може да бъде създадено." -#: builtin/clone.c:1080 +#: builtin/clone.c:1099 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Клониране и създаване на голо хранилище в „%s“…\n" -#: builtin/clone.c:1082 +#: builtin/clone.c:1101 #, c-format msgid "Cloning into '%s'...\n" msgstr "Клониране и създаване на хранилище в „%s“…\n" -#: builtin/clone.c:1106 +#: builtin/clone.c:1125 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -13083,44 +13084,49 @@ msgstr "" "Опцията „--recursive“ е несъвместима с опциите „--reference“ и „--reference-" "if-able“" -#: builtin/clone.c:1170 +#: builtin/clone.c:1169 builtin/remote.c:200 builtin/remote.c:705 +#, c-format +msgid "'%s' is not a valid remote name" +msgstr "„%s“ е неправилно име за отдалечено хранилище" + +#: builtin/clone.c:1210 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" "При локално клониране опцията „--depth“ се прескача. Ползвайте схемата " "„file://“." -#: builtin/clone.c:1172 +#: builtin/clone.c:1212 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" "При локално клониране опцията „--shallow-since“ се прескача. Ползвайте " "схемата „file://“." -#: builtin/clone.c:1174 +#: builtin/clone.c:1214 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" "При локално клониране опцията „--shallow-exclude“ се прескача. Ползвайте " "схемата „file://“." -#: builtin/clone.c:1176 +#: builtin/clone.c:1216 msgid "--filter is ignored in local clones; use file:// instead." msgstr "" "При локално клониране опцията „--filter“ се прескача. Ползвайте схемата " "„file://“." -#: builtin/clone.c:1179 +#: builtin/clone.c:1219 msgid "source repository is shallow, ignoring --local" msgstr "клонираното хранилище е плитко, затова опцията „--local“ се прескача" -#: builtin/clone.c:1184 +#: builtin/clone.c:1224 msgid "--local is ignored" msgstr "опцията „--local“ се прескача" -#: builtin/clone.c:1268 builtin/clone.c:1276 +#: builtin/clone.c:1311 builtin/clone.c:1319 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Отдалеченият клон „%s“ липсва в клонираното хранилище „%s“" -#: builtin/clone.c:1279 +#: builtin/clone.c:1322 msgid "You appear to have cloned an empty repository." msgstr "Изглежда клонирахте празно хранилище." @@ -13179,7 +13185,7 @@ msgid "could not find object directory matching %s" msgstr "директорията с обекти, която отговаря на „%s“, не може да бъде открита" #: builtin/commit-graph.c:80 builtin/commit-graph.c:210 -#: builtin/commit-graph.c:316 builtin/fetch.c:184 builtin/log.c:1764 +#: builtin/commit-graph.c:316 builtin/fetch.c:184 builtin/log.c:1769 msgid "dir" msgstr "директория" @@ -13279,7 +13285,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "прескачане на повтарящ се родител: „%s“" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:546 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:555 #, c-format msgid "not a valid object name %s" msgstr "неправилно име на обект: „%s“" @@ -13307,8 +13313,8 @@ msgstr "родител" msgid "id of a parent commit object" msgstr "ИДЕНТИФИКАТОР на обекта за подаването-родител" -#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:272 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1471 +#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:281 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1470 #: builtin/tag.c:413 msgid "message" msgstr "СЪОБЩЕНИЕ" @@ -13321,7 +13327,7 @@ msgstr "СЪОБЩЕНИЕ при подаване" msgid "read commit log message from file" msgstr "изчитане на съобщението за подаване от ФАЙЛ" -#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:289 +#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:298 #: builtin/pull.c:176 builtin/revert.c:118 msgid "GPG sign commit" msgstr "подписване на подаването с GPG" @@ -13484,7 +13490,7 @@ msgstr "" msgid "could not lookup commit %s" msgstr "следното подаване не може да бъде открито: %s" -#: builtin/commit.c:729 builtin/shortlog.c:478 +#: builtin/commit.c:729 builtin/shortlog.c:425 #, c-format msgid "(reading log message from standard input)\n" msgstr "(изчитане на съобщението за подаване от стандартния вход)\n" @@ -13678,8 +13684,8 @@ msgstr "изчисляване на точните стойности напре msgid "version" msgstr "версия" -#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:539 -#: builtin/worktree.c:722 +#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:560 +#: builtin/worktree.c:725 msgid "machine-readable output" msgstr "формат на изхода за четене от програма" @@ -13692,8 +13698,8 @@ msgid "terminate entries with NUL" msgstr "разделяне на елементите с нулевия знак „NUL“" #: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541 -#: builtin/fast-export.c:1199 builtin/fast-export.c:1202 -#: builtin/fast-export.c:1205 builtin/rebase.c:1400 parse-options.h:336 +#: builtin/fast-export.c:1198 builtin/fast-export.c:1201 +#: builtin/fast-export.c:1204 builtin/rebase.c:1406 parse-options.h:336 msgid "mode" msgstr "РЕЖИМ" @@ -13754,7 +13760,7 @@ msgstr "добавяне на разликата към шаблона за съ msgid "Commit message options" msgstr "Опции за съобщението при подаване" -#: builtin/commit.c:1501 builtin/merge.c:276 builtin/tag.c:415 +#: builtin/commit.c:1501 builtin/merge.c:285 builtin/tag.c:415 msgid "read message from file" msgstr "взимане на съобщението от ФАЙЛ" @@ -13766,7 +13772,7 @@ msgstr "АВТОР" msgid "override author for commit" msgstr "задаване на АВТОР за подаването" -#: builtin/commit.c:1503 builtin/gc.c:539 +#: builtin/commit.c:1503 builtin/gc.c:542 msgid "date" msgstr "ДАТА" @@ -13804,10 +13810,10 @@ msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" "смяна на автора да съвпада с подаващия (използва се с „-C“/„-c“/„--amend“)" -#: builtin/commit.c:1510 builtin/log.c:1741 builtin/merge.c:292 +#: builtin/commit.c:1510 builtin/log.c:1744 builtin/merge.c:301 #: builtin/pull.c:145 builtin/revert.c:110 -msgid "add Signed-off-by:" -msgstr "добавяне на поле за подпис — „Signed-off-by:“" +msgid "add a Signed-off-by trailer" +msgstr "добавяне на епилог за подпис „Signed-off-by“" #: builtin/commit.c:1511 msgid "use specified template file" @@ -13911,223 +13917,226 @@ msgstr "" msgid "git config []" msgstr "git config [ОПЦИЯ…]" -#: builtin/config.c:107 builtin/env--helper.c:27 +#: builtin/config.c:109 builtin/env--helper.c:27 #, c-format msgid "unrecognized --type argument, %s" msgstr "непознат аргумент към „--type“: %s" -#: builtin/config.c:119 +#: builtin/config.c:121 msgid "only one type at a time" msgstr "само по един вид" -#: builtin/config.c:128 +#: builtin/config.c:130 msgid "Config file location" msgstr "Местоположение на конфигурационния файл" -#: builtin/config.c:129 +#: builtin/config.c:131 msgid "use global config file" msgstr "използване на глобалния конфигурационен файл" -#: builtin/config.c:130 +#: builtin/config.c:132 msgid "use system config file" msgstr "използване на системния конфигурационен файл" -#: builtin/config.c:131 +#: builtin/config.c:133 msgid "use repository config file" msgstr "използване на конфигурационния файл на хранилището" -#: builtin/config.c:132 +#: builtin/config.c:134 msgid "use per-worktree config file" msgstr "използване на конфигурационния файл на работното копие" -#: builtin/config.c:133 +#: builtin/config.c:135 msgid "use given config file" msgstr "използване на зададения конфигурационен ФАЙЛ" -#: builtin/config.c:134 +#: builtin/config.c:136 msgid "blob-id" msgstr "ИДЕНТИФИКАТОР" -#: builtin/config.c:134 +#: builtin/config.c:136 msgid "read config from given blob object" msgstr "" "изчитане на конфигурацията от BLOB с този ИДЕНТИФИКАТОР на съдържанието" -#: builtin/config.c:135 +#: builtin/config.c:137 msgid "Action" msgstr "Действие" -#: builtin/config.c:136 -msgid "get value: name [value-regex]" -msgstr "извеждане на стойност: ИМЕ [РЕГУЛЯРЕН_ИЗРАЗ_ЗА_СТОЙНОСТТА]" - -#: builtin/config.c:137 -msgid "get all values: key [value-regex]" -msgstr "извеждане на всички стойности: ключ [РЕГУЛЯРЕН_ИЗРАЗ_ЗА_СТОЙНОСТТА]" - #: builtin/config.c:138 -msgid "get values for regexp: name-regex [value-regex]" -msgstr "" -"извеждане на стойностите за РЕГУЛЯРНия_ИЗРАЗ: РЕГУЛЯРЕН_ИЗРАЗ_ЗА_ИМЕТО " -"[РЕГУЛЯРЕН_ИЗРАЗ_ЗА_СТОЙНОСТТА]" +msgid "get value: name [value-pattern]" +msgstr "извеждане на стойност: ИМЕ [ШАБЛОН_ЗА_СТОЙНОСТТА]" #: builtin/config.c:139 +msgid "get all values: key [value-pattern]" +msgstr "извеждане на всички стойности: ключ [ШАБЛОН_ЗА_СТОЙНОСТТА]" + +#: builtin/config.c:140 +msgid "get values for regexp: name-regex [value-pattern]" +msgstr "" +"извеждане на стойностите за РЕГУЛЯРНия_ИЗРАЗ: РЕГУЛЯРЕН_ИЗРАЗ_ЗА_ИМЕТО " +"[ШАБЛОН_ЗА_СТОЙНОСТТА]" + +#: builtin/config.c:141 msgid "get value specific for the URL: section[.var] URL" msgstr "извеждане на стойността за указания адрес: РАЗДЕЛ[.ПРОМЕНЛИВА] АДРЕС" -#: builtin/config.c:140 -msgid "replace all matching variables: name value [value_regex]" +#: builtin/config.c:142 +msgid "replace all matching variables: name value [value-pattern]" msgstr "" -"замяна на всички съвпадащи променливи: ИМЕ СТОЙНОСТ " -"[РЕГУЛЯРЕН_ИЗРАЗ_ЗА_СТОЙНОСТТА]" +"замяна на всички съвпадащи променливи: ИМЕ СТОЙНОСТ [ШАБЛОН_ЗА_СТОЙНОСТТА]" -#: builtin/config.c:141 +#: builtin/config.c:143 msgid "add a new variable: name value" msgstr "добавяне на нова променлива: ИМЕ СТОЙНОСТ" -#: builtin/config.c:142 -msgid "remove a variable: name [value-regex]" -msgstr "изтриване на променлива: ИМЕ [РЕГУЛЯРЕН_ИЗРАЗ_ЗА_СТОЙНОСТТА]" - -#: builtin/config.c:143 -msgid "remove all matches: name [value-regex]" -msgstr "изтриване на всички съвпадащи: ИМЕ [РЕГУЛЯРЕН_ИЗРАЗ_ЗА_СТОЙНОСТТА]" - #: builtin/config.c:144 +msgid "remove a variable: name [value-pattern]" +msgstr "изтриване на променлива: ИМЕ [ШАБЛОН_ЗА_СТОЙНОСТТА]" + +#: builtin/config.c:145 +msgid "remove all matches: name [value-pattern]" +msgstr "изтриване на всички съвпадащи: ИМЕ [ШАБЛОН_ЗА_СТОЙНОСТТА]" + +#: builtin/config.c:146 msgid "rename section: old-name new-name" msgstr "преименуване на раздел: СТАРО_ИМЕ НОВО_ИМЕ" -#: builtin/config.c:145 +#: builtin/config.c:147 msgid "remove a section: name" msgstr "изтриване на раздел: ИМЕ" -#: builtin/config.c:146 +#: builtin/config.c:148 msgid "list all" msgstr "изброяване на всички" -#: builtin/config.c:147 +#: builtin/config.c:149 +msgid "use string equality when comparing values to 'value-pattern'" +msgstr "дословно равенство при сравняване със ШАБЛОН_ЗА_СТОЙНОСТ" + +#: builtin/config.c:150 msgid "open an editor" msgstr "отваряне на редактор" -#: builtin/config.c:148 +#: builtin/config.c:151 msgid "find the color configured: slot [default]" msgstr "извеждане на зададения цвят: номер [стандартно]" -#: builtin/config.c:149 +#: builtin/config.c:152 msgid "find the color setting: slot [stdout-is-tty]" msgstr "извеждане на зададения цвят: номер (стандартният изход е терминал)" -#: builtin/config.c:150 +#: builtin/config.c:153 msgid "Type" msgstr "Вид" -#: builtin/config.c:151 builtin/env--helper.c:43 +#: builtin/config.c:154 builtin/env--helper.c:43 msgid "value is given this type" msgstr "стойността е от този вид" -#: builtin/config.c:152 +#: builtin/config.c:155 msgid "value is \"true\" or \"false\"" msgstr "СТОЙНОСТТА е „true“ (истина) или „false“ (лъжа̀)" -#: builtin/config.c:153 +#: builtin/config.c:156 msgid "value is decimal number" msgstr "СТОЙНОСТТА е цяло, десетично число" -#: builtin/config.c:154 +#: builtin/config.c:157 msgid "value is --bool or --int" msgstr "СТОЙНОСТТА е „--bool“ (булева) или „--int“ (десетично цяло число)" -#: builtin/config.c:155 +#: builtin/config.c:158 msgid "value is --bool or string" msgstr "СТОЙНОСТТА е „--bool“ (булева) или низ" -#: builtin/config.c:156 +#: builtin/config.c:159 msgid "value is a path (file or directory name)" msgstr "СТОЙНОСТТА е път (до файл или директория)" -#: builtin/config.c:157 +#: builtin/config.c:160 msgid "value is an expiry date" msgstr "стойността е период на валидност/запазване" -#: builtin/config.c:158 +#: builtin/config.c:161 msgid "Other" msgstr "Други" -#: builtin/config.c:159 +#: builtin/config.c:162 msgid "terminate values with NUL byte" msgstr "разделяне на стойностите с нулевия знак „NUL“" -#: builtin/config.c:160 +#: builtin/config.c:163 msgid "show variable names only" msgstr "извеждане на имената на променливите" -#: builtin/config.c:161 +#: builtin/config.c:164 msgid "respect include directives on lookup" msgstr "при търсене да се уважат и директивите за включване" -#: builtin/config.c:162 +#: builtin/config.c:165 msgid "show origin of config (file, standard input, blob, command line)" msgstr "" "извеждане на мястото на задаване на настройката (файл, стандартен вход, " "обект-BLOB, команден ред)" -#: builtin/config.c:163 +#: builtin/config.c:166 msgid "show scope of config (worktree, local, global, system, command)" msgstr "" "извеждане на обхвата на настройката „worktree“ (работно дърво), " "„local“ (хранилище), „global“ (потребител), „system“ (система), " "„command“ (команда)" -#: builtin/config.c:164 builtin/env--helper.c:45 +#: builtin/config.c:167 builtin/env--helper.c:45 msgid "value" msgstr "СТОЙНОСТ" -#: builtin/config.c:164 +#: builtin/config.c:167 msgid "with --get, use default value when missing entry" msgstr "с „--get“ се използва стандартна СТОЙНОСТ при липсваща" -#: builtin/config.c:178 +#: builtin/config.c:181 #, c-format msgid "wrong number of arguments, should be %d" msgstr "неправилен брой аргументи, трябва да е точно %d" -#: builtin/config.c:180 +#: builtin/config.c:183 #, c-format msgid "wrong number of arguments, should be from %d to %d" msgstr "неправилен брой аргументи, трябва да е от %d до %d включително" -#: builtin/config.c:334 +#: builtin/config.c:339 #, c-format msgid "invalid key pattern: %s" msgstr "неправилен шаблон за ключ: „%s“" -#: builtin/config.c:370 +#: builtin/config.c:377 #, c-format msgid "failed to format default config value: %s" msgstr "неуспешно форматиране на стандартната стойност на настройка: %s" -#: builtin/config.c:434 +#: builtin/config.c:441 #, c-format msgid "cannot parse color '%s'" msgstr "„%s“ не може да се анализира като цвят" -#: builtin/config.c:476 +#: builtin/config.c:483 msgid "unable to parse default color value" msgstr "неразпозната стойност на стандартния цвят" -#: builtin/config.c:529 builtin/config.c:789 +#: builtin/config.c:536 builtin/config.c:833 msgid "not in a git directory" msgstr "не е в директория под Git" -#: builtin/config.c:532 +#: builtin/config.c:539 msgid "writing to stdin is not supported" msgstr "не се поддържа записване в стандартния вход" -#: builtin/config.c:535 +#: builtin/config.c:542 msgid "writing config blobs is not supported" msgstr "обекти-BLOB в настройките не се поддържат" -#: builtin/config.c:620 +#: builtin/config.c:627 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -14142,27 +14151,27 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:644 +#: builtin/config.c:652 msgid "only one config file at a time" msgstr "само по един конфигурационен файл" -#: builtin/config.c:650 +#: builtin/config.c:658 msgid "--local can only be used inside a git repository" msgstr "„--local“ може да се използва само в хранилище" -#: builtin/config.c:652 +#: builtin/config.c:660 msgid "--blob can only be used inside a git repository" msgstr "„--blob“ може да се използва само в хранилище" -#: builtin/config.c:654 +#: builtin/config.c:662 msgid "--worktree can only be used inside a git repository" msgstr "„--worktree“ може да се използва само в хранилище" -#: builtin/config.c:676 +#: builtin/config.c:684 msgid "$HOME not set" msgstr "променливата „HOME“ не е зададена" -#: builtin/config.c:700 +#: builtin/config.c:708 msgid "" "--worktree cannot be used with multiple working trees unless the config\n" "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" @@ -14173,20 +14182,20 @@ msgstr "" "повече информация вижте раздела „CONFIGURATION FILE“ в\n" "„git help worktree“" -#: builtin/config.c:735 +#: builtin/config.c:743 msgid "--get-color and variable type are incoherent" msgstr "опцията „--get-color“ не съответства на вида на променливата" -#: builtin/config.c:740 +#: builtin/config.c:748 msgid "only one action at a time" msgstr "само по едно действие" -#: builtin/config.c:753 +#: builtin/config.c:761 msgid "--name-only is only applicable to --list or --get-regexp" msgstr "" "опцията „--name-only“ е приложима само към опциите „--list“ и „--get-regexp“" -#: builtin/config.c:759 +#: builtin/config.c:767 msgid "" "--show-origin is only applicable to --get, --get-all, --get-regexp, and --" "list" @@ -14194,33 +14203,37 @@ msgstr "" "опцията „--show-origin“ е приложима само към опциите „--get“, „--get-all“, " "„--get-regexp“ и „--list“" -#: builtin/config.c:765 +#: builtin/config.c:773 msgid "--default is only applicable to --get" msgstr "опцията „--default“ е приложима само към опцията „--get“" -#: builtin/config.c:778 +#: builtin/config.c:806 +msgid "--fixed-value only applies with 'value-pattern'" +msgstr "опцията „--fixed-value“ е приложима само със ШАБЛОН_ЗА_СТОЙНОСТ" + +#: builtin/config.c:822 #, c-format msgid "unable to read config file '%s'" msgstr "конфигурационният файл „%s“ не може да бъде прочетен" -#: builtin/config.c:781 +#: builtin/config.c:825 msgid "error processing config file(s)" msgstr "грешка при обработката на конфигурационен файл" -#: builtin/config.c:791 +#: builtin/config.c:835 msgid "editing stdin is not supported" msgstr "не се поддържа редактиране на стандартния вход" -#: builtin/config.c:793 +#: builtin/config.c:837 msgid "editing blobs is not supported" msgstr "не се поддържа редактиране на обекти-BLOB" -#: builtin/config.c:807 +#: builtin/config.c:851 #, c-format msgid "cannot create configuration file %s" msgstr "конфигурационният файл „%s“ не може да бъде създаден" -#: builtin/config.c:820 +#: builtin/config.c:864 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -14230,7 +14243,7 @@ msgstr "" "За да промените „%s“, ползвайте регулярен израз или опциите „--add“ и „--" "replace-all“." -#: builtin/config.c:894 builtin/config.c:905 +#: builtin/config.c:943 builtin/config.c:954 #, c-format msgid "no such section: %s" msgstr "такъв раззел няма: %s" @@ -14273,6 +14286,13 @@ msgid "credential-cache unavailable; no unix socket support" msgstr "" "кешът с идентификациите е недостъпен — липсва поддръжка на гнезда на unix" +#: builtin/credential-store.c:66 +#, c-format +msgid "unable to get credential storage lock in %d ms" +msgstr "" +"ключалката на хранилището на идентификациите не бе получена в рамките на %d " +"ms" + #: builtin/describe.c:26 msgid "git describe [] [...]" msgstr "git describe [ОПЦИЯ…] [УКАЗАТЕЛ_КЪМ_ПОДАВАНЕ…]" @@ -14440,41 +14460,49 @@ msgstr "опцията „--dirty“ е несъвместима с указат msgid "--broken is incompatible with commit-ishes" msgstr "опцията „--broken“ е несъвместима с указател към подаване" +#: builtin/diff-tree.c:155 +msgid "--stdin and --merge-base are mutually exclusive" +msgstr "опциите „-stdin“ и „--merge-base“ са несъвместими" + +#: builtin/diff-tree.c:157 +msgid "--merge-base only works with two commits" +msgstr "опцията „--merge-base“ изисква точно две подавания" + #: builtin/diff.c:91 #, c-format msgid "'%s': not a regular file or symlink" msgstr "„%s“: не е нито обикновен файл, нито символна връзка" -#: builtin/diff.c:241 +#: builtin/diff.c:258 #, c-format msgid "invalid option: %s" msgstr "неправилна опция: %s" -#: builtin/diff.c:358 +#: builtin/diff.c:375 #, c-format msgid "%s...%s: no merge base" msgstr "„%s..%s“: липсва база за сливане" -#: builtin/diff.c:468 +#: builtin/diff.c:485 msgid "Not a git repository" msgstr "Не е хранилище на Git" -#: builtin/diff.c:513 +#: builtin/diff.c:530 builtin/grep.c:681 #, c-format msgid "invalid object '%s' given." msgstr "зададен е неправилен обект „%s“." -#: builtin/diff.c:524 +#: builtin/diff.c:541 #, c-format msgid "more than two blobs given: '%s'" msgstr "зададени са повече от 2 обекта-BLOB: „%s“" -#: builtin/diff.c:529 +#: builtin/diff.c:546 #, c-format msgid "unhandled object '%s' given." msgstr "зададен е неподдържан обект „%s“." -#: builtin/diff.c:563 +#: builtin/diff.c:580 #, c-format msgid "%s...%s: multiple merge bases, using %s" msgstr "%s...%s: много бази за сливане, ще се ползва „%s“" @@ -14503,7 +14531,7 @@ msgstr "файлът, сочен от символната връзка „%s“ msgid "could not read object %s for symlink %s" msgstr "обектът „%s“ за символната връзка „%s“ не може да бъде прочетен" -#: builtin/difftool.c:413 +#: builtin/difftool.c:412 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -14511,55 +14539,55 @@ msgstr "" "комбинираните формати на разликите („-c“ и „--cc“) не се поддържат\n" "в режима за разлики върху директории („-d“ и „--dir-diff“)." -#: builtin/difftool.c:634 +#: builtin/difftool.c:633 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "и двата файла са променени: „%s“ и „%s“." -#: builtin/difftool.c:636 +#: builtin/difftool.c:635 msgid "working tree file has been left." msgstr "работното дърво е изоставено." -#: builtin/difftool.c:647 +#: builtin/difftool.c:646 #, c-format msgid "temporary files exist in '%s'." msgstr "в „%s“ има временни файлове." -#: builtin/difftool.c:648 +#: builtin/difftool.c:647 msgid "you may want to cleanup or recover these." msgstr "възможно е да ги изчистите или възстановите" -#: builtin/difftool.c:697 +#: builtin/difftool.c:696 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "използвайте „diff.guitool“ вместо „diff.tool“" -#: builtin/difftool.c:699 +#: builtin/difftool.c:698 msgid "perform a full-directory diff" msgstr "разлика по директории" -#: builtin/difftool.c:701 +#: builtin/difftool.c:700 msgid "do not prompt before launching a diff tool" msgstr "стартиране на ПРОГРАМАта за разлики без предупреждение" -#: builtin/difftool.c:706 +#: builtin/difftool.c:705 msgid "use symlinks in dir-diff mode" msgstr "следване на символните връзки при разлика по директории" -#: builtin/difftool.c:707 +#: builtin/difftool.c:706 msgid "tool" msgstr "ПРОГРАМА" -#: builtin/difftool.c:708 +#: builtin/difftool.c:707 msgid "use the specified diff tool" msgstr "използване на указаната ПРОГРАМА" -#: builtin/difftool.c:710 +#: builtin/difftool.c:709 msgid "print a list of diff tools that may be used with `--tool`" msgstr "" "извеждане на списък с всички ПРОГРАМи, които може да се ползват с опцията „--" "tool“" -#: builtin/difftool.c:713 +#: builtin/difftool.c:712 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -14567,31 +14595,31 @@ msgstr "" "„git-difftool“ да спре работа, когато стартираната ПРОГРАМА завърши с " "ненулев код" -#: builtin/difftool.c:716 +#: builtin/difftool.c:715 msgid "specify a custom command for viewing diffs" msgstr "команда за разглеждане на разлики" -#: builtin/difftool.c:717 +#: builtin/difftool.c:716 msgid "passed to `diff`" msgstr "подава се към „diff“" -#: builtin/difftool.c:732 +#: builtin/difftool.c:731 msgid "difftool requires worktree or --no-index" msgstr "„git-difftool“ изисква работно дърво или опцията „--no-index“" -#: builtin/difftool.c:739 +#: builtin/difftool.c:738 msgid "--dir-diff is incompatible with --no-index" msgstr "опциите „--dir-diff“ и „--no-index“ са несъвместими" -#: builtin/difftool.c:742 +#: builtin/difftool.c:741 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "опциите „--gui“, „--tool“ и „--extcmd“ са несъвместими една с друга" -#: builtin/difftool.c:750 +#: builtin/difftool.c:749 msgid "no given for --tool=" msgstr "не е зададена програма за „--tool=ПРОГРАМА“" -#: builtin/difftool.c:757 +#: builtin/difftool.c:756 msgid "no given for --extcmd=" msgstr "не е зададена команда за „--extcmd=КОМАНДА“" @@ -14636,122 +14664,122 @@ msgid "Error: Cannot export nested tags unless --mark-tags is specified." msgstr "" "Грешка: непреките етикети не се изнасят, освен ако не зададете „--mark-tags“." -#: builtin/fast-export.c:1178 +#: builtin/fast-export.c:1177 msgid "--anonymize-map token cannot be empty" msgstr "опцията „--anonymize-map“ изисква аргумент" -#: builtin/fast-export.c:1198 +#: builtin/fast-export.c:1197 msgid "show progress after objects" msgstr "Съобщение за напредъка на всеки такъв БРОЙ обекта" -#: builtin/fast-export.c:1200 +#: builtin/fast-export.c:1199 msgid "select handling of signed tags" msgstr "Как да се обработват подписаните етикети" -#: builtin/fast-export.c:1203 +#: builtin/fast-export.c:1202 msgid "select handling of tags that tag filtered objects" msgstr "Как да се обработват етикетите на филтрираните обекти" -#: builtin/fast-export.c:1206 +#: builtin/fast-export.c:1205 msgid "select handling of commit messages in an alternate encoding" msgstr "" "как да се обработват съобщенията за подаване, които са в друго кодиране" -#: builtin/fast-export.c:1209 +#: builtin/fast-export.c:1208 msgid "Dump marks to this file" msgstr "Запазване на маркерите в този ФАЙЛ" -#: builtin/fast-export.c:1211 +#: builtin/fast-export.c:1210 msgid "Import marks from this file" msgstr "Внасяне на маркерите от този ФАЙЛ" -#: builtin/fast-export.c:1215 +#: builtin/fast-export.c:1214 msgid "Import marks from this file if it exists" msgstr "Внасяне на маркерите от този ФАЙЛ, ако съществува" -#: builtin/fast-export.c:1217 +#: builtin/fast-export.c:1216 msgid "Fake a tagger when tags lack one" msgstr "Да се използва изкуствено име на човек при липса на задаващ етикета" -#: builtin/fast-export.c:1219 +#: builtin/fast-export.c:1218 msgid "Output full tree for each commit" msgstr "Извеждане на цялото дърво за всяко подаване" -#: builtin/fast-export.c:1221 +#: builtin/fast-export.c:1220 msgid "Use the done feature to terminate the stream" msgstr "Използване на маркер за завършване на потока" -#: builtin/fast-export.c:1222 +#: builtin/fast-export.c:1221 msgid "Skip output of blob data" msgstr "Без извеждане на съдържанието на обектите-BLOB" -#: builtin/fast-export.c:1223 builtin/log.c:1811 +#: builtin/fast-export.c:1222 builtin/log.c:1816 msgid "refspec" msgstr "УКАЗАТЕЛ_НА_ВЕРСИЯ" -#: builtin/fast-export.c:1224 +#: builtin/fast-export.c:1223 msgid "Apply refspec to exported refs" msgstr "Прилагане на УКАЗАТЕЛя_НА_ВЕРСИЯ към изнесените указатели" -#: builtin/fast-export.c:1225 +#: builtin/fast-export.c:1224 msgid "anonymize output" msgstr "анонимизиране на извежданата информация" -#: builtin/fast-export.c:1226 +#: builtin/fast-export.c:1225 msgid "from:to" msgstr "ОТ:КЪМ" -#: builtin/fast-export.c:1227 +#: builtin/fast-export.c:1226 msgid "convert to in anonymized output" msgstr "заместване ОТ със КЪМ в анонимизирания изход" -#: builtin/fast-export.c:1230 +#: builtin/fast-export.c:1229 msgid "Reference parents which are not in fast-export stream by object id" msgstr "" "Указване на родителите, които не са в потока на бързо изнасяне, с " "идентификатор на обект" -#: builtin/fast-export.c:1232 +#: builtin/fast-export.c:1231 msgid "Show original object ids of blobs/commits" msgstr "Извеждане на първоначалните идентификатори на обектите BLOB/подавяния" -#: builtin/fast-export.c:1234 +#: builtin/fast-export.c:1233 msgid "Label tags with mark ids" msgstr "Задаване на идентификатори на маркери на етикетите" -#: builtin/fast-export.c:1257 +#: builtin/fast-export.c:1256 msgid "--anonymize-map without --anonymize does not make sense" msgstr "опцията „--anonymize-map“ изисква „--anonymize“" -#: builtin/fast-export.c:1272 +#: builtin/fast-export.c:1271 msgid "Cannot pass both --import-marks and --import-marks-if-exists" msgstr "опциите „--import-marks“ и „--import-marks-if-exists“ са несъвместими" -#: builtin/fast-import.c:3086 +#: builtin/fast-import.c:3088 #, c-format msgid "Missing from marks for submodule '%s'" msgstr "Липсват маркери „от“ за подмодула „%s“" -#: builtin/fast-import.c:3088 +#: builtin/fast-import.c:3090 #, c-format msgid "Missing to marks for submodule '%s'" msgstr "Липсват маркери „до“ за подмодула „%s“" -#: builtin/fast-import.c:3223 +#: builtin/fast-import.c:3225 #, c-format msgid "Expected 'mark' command, got %s" msgstr "Очаква се команда „mark“, а бе получена: „%s“" -#: builtin/fast-import.c:3228 +#: builtin/fast-import.c:3230 #, c-format msgid "Expected 'to' command, got %s" msgstr "Очаква се команда „to“, а бе получена: „%s“" -#: builtin/fast-import.c:3320 +#: builtin/fast-import.c:3322 msgid "Expected format name:filename for submodule rewrite option" msgstr "Опцията за презапис на подмодул изисква формат: име:име_на_файл" -#: builtin/fast-import.c:3374 +#: builtin/fast-import.c:3377 #, c-format msgid "feature '%s' forbidden in input without --allow-unsafe-features" msgstr "„%s“ изисква изричното задаване на опцията „--allow-unsafe-features“" @@ -15029,7 +15057,7 @@ msgstr " (обектът „%s“ вече е извън клон)" msgid "[deleted]" msgstr "[изтрит]" -#: builtin/fetch.c:1195 builtin/remote.c:1113 +#: builtin/fetch.c:1195 builtin/remote.c:1118 msgid "(none)" msgstr "(нищо)" @@ -15234,6 +15262,22 @@ msgstr "извеждане само на указателите, които съ msgid "print only refs which don't contain the commit" msgstr "извеждане само на указателите, които не съдържат това ПОДАВАНЕ" +#: builtin/for-each-repo.c:9 +msgid "git for-each-repo --config= " +msgstr "git for-each-repo --config=НАСТРОЙКА АРГУМЕНТ…" + +#: builtin/for-each-repo.c:37 +msgid "config" +msgstr "настройка" + +#: builtin/for-each-repo.c:38 +msgid "config key storing a list of repository paths" +msgstr "настройка, която съдържа списък с пътища към хранилища" + +#: builtin/for-each-repo.c:46 +msgid "missing --config=" +msgstr "липсва --config=НАСТРОЙКА" + #: builtin/fsck.c:69 builtin/fsck.c:148 builtin/fsck.c:149 msgid "unknown" msgstr "непознат" @@ -15478,31 +15522,31 @@ msgstr "„%s“: липсващ обект" msgid "invalid parameter: expected sha1, got '%s'" msgstr "неправилен параметър: очаква се SHA1, а бе получено: „%s“" -#: builtin/gc.c:36 +#: builtin/gc.c:39 msgid "git gc []" msgstr "git gc [ОПЦИЯ…]" -#: builtin/gc.c:91 +#: builtin/gc.c:94 #, c-format msgid "Failed to fstat %s: %s" msgstr "Неуспешно изпълнение на „fstat“ върху „%s“: %s" -#: builtin/gc.c:127 +#: builtin/gc.c:130 #, c-format msgid "failed to parse '%s' value '%s'" msgstr "стойността на „%s“ — „%s“ не може да се анализира" -#: builtin/gc.c:476 builtin/init-db.c:58 +#: builtin/gc.c:479 builtin/init-db.c:58 #, c-format msgid "cannot stat '%s'" msgstr "не може да се получи информация чрез „stat“ за директорията „%s“" -#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:530 +#: builtin/gc.c:488 builtin/notes.c:240 builtin/tag.c:530 #, c-format msgid "cannot read '%s'" msgstr "файлът „%s“ не може да бъде прочетен" -#: builtin/gc.c:492 +#: builtin/gc.c:495 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -15519,58 +15563,58 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:540 +#: builtin/gc.c:543 msgid "prune unreferenced objects" msgstr "окастряне на обектите, към които нищо не сочи" -#: builtin/gc.c:542 +#: builtin/gc.c:545 msgid "be more thorough (increased runtime)" msgstr "изчерпателно търсене на боклука (за сметка на повече време работа)" -#: builtin/gc.c:543 +#: builtin/gc.c:546 msgid "enable auto-gc mode" msgstr "включване на автоматичното събиране на боклука (auto-gc)" -#: builtin/gc.c:546 +#: builtin/gc.c:549 msgid "force running gc even if there may be another gc running" msgstr "" "изрично стартиране на събирането на боклука, дори и ако вече работи друго " "събиране" -#: builtin/gc.c:549 +#: builtin/gc.c:552 msgid "repack all other packs except the largest pack" msgstr "препакетиране на всичко без най-големия пакет" -#: builtin/gc.c:566 +#: builtin/gc.c:569 #, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "неразпозната стойност на „gc.logexpiry“ %s" -#: builtin/gc.c:577 +#: builtin/gc.c:580 #, c-format msgid "failed to parse prune expiry value %s" msgstr "неразпозната стойност на периода за окастряне: %s" -#: builtin/gc.c:597 +#: builtin/gc.c:600 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" "Автоматично пакетиране на заден фон на хранилището за по-добра " "производителност.\n" -#: builtin/gc.c:599 +#: builtin/gc.c:602 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Автоматично пакетиране на хранилището за по-добра производителност.\n" -#: builtin/gc.c:600 +#: builtin/gc.c:603 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "" "Погледнете ръководството за повече информация как да изпълните „git help " "gc“.\n" -#: builtin/gc.c:640 +#: builtin/gc.c:643 #, c-format msgid "" "gc is already running on machine '%s' pid % (use --force if not)" @@ -15579,62 +15623,148 @@ msgstr "" "процеса: % (ако сте сигурни, че това не е вярно, това използвайте\n" "опцията „--force“)" -#: builtin/gc.c:695 +#: builtin/gc.c:698 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" "Има прекалено много недостижими, непакетирани обекти.\n" "Използвайте „git prune“, за да ги окастрите." -#: builtin/gc.c:705 -msgid "git maintenance run [--auto] [--[no-]quiet] [--task=]" -msgstr "git maintenance run [--auto] [--[no-]quiet] [--task=ЗАДАЧА]" +#: builtin/gc.c:708 +msgid "" +"git maintenance run [--auto] [--[no-]quiet] [--task=] [--schedule]" +msgstr "" +"git maintenance run [--auto] [--[no-]quiet] [--task=ЗАДАЧА] [--schedule]" -#: builtin/gc.c:812 +#: builtin/gc.c:738 +msgid "--no-schedule is not allowed" +msgstr "опцията „--no-schedule“ не е позволена" + +#: builtin/gc.c:743 +#, c-format +msgid "unrecognized --schedule argument '%s'" +msgstr "непознат аргумент към „--schedule“: %s" + +#: builtin/gc.c:862 msgid "failed to write commit-graph" msgstr "графът с подаванията не може да бъде записан" -#: builtin/gc.c:905 +#: builtin/gc.c:901 +msgid "failed to fill remotes" +msgstr "неуспешно попълване на следящите клони" + +#: builtin/gc.c:1024 +msgid "failed to start 'git pack-objects' process" +msgstr "процесът за командата „git pack-objects“ не може да бъде стартиран" + +#: builtin/gc.c:1041 +msgid "failed to finish 'git pack-objects' process" +msgstr "процесът за командата „git pack-objects“ не може да завърши" + +#: builtin/gc.c:1093 +msgid "failed to write multi-pack-index" +msgstr "индексът за множество пакети не може да бъде записан" + +#: builtin/gc.c:1111 +msgid "'git multi-pack-index expire' failed" +msgstr "неуспешно изпълнение на „git multi-pack-index expire“" + +#: builtin/gc.c:1172 +msgid "'git multi-pack-index repack' failed" +msgstr "неуспешно изпълнение на „git multi-pack-index repack“" + +#: builtin/gc.c:1181 +msgid "" +"skipping incremental-repack task because core.multiPackIndex is disabled" +msgstr "" +"задачата „incremental-repack“ се прескача, защото настройката „core." +"multiPackIndex“ е изключена" + +#: builtin/gc.c:1279 #, c-format msgid "lock file '%s' exists, skipping maintenance" msgstr "заключващият файл „%s“ съществува. Действието се прескача" -#: builtin/gc.c:932 +#: builtin/gc.c:1309 #, c-format msgid "task '%s' failed" msgstr "неуспешно изпълнение на задачата „%s“" -#: builtin/gc.c:979 +#: builtin/gc.c:1389 #, c-format msgid "'%s' is not a valid task" msgstr "„%s“ не е правилна задача" -#: builtin/gc.c:984 +#: builtin/gc.c:1394 #, c-format msgid "task '%s' cannot be selected multiple times" msgstr "задачата „%s“ не може да се избере повече от веднъж" -#: builtin/gc.c:999 +#: builtin/gc.c:1409 msgid "run tasks based on the state of the repository" msgstr "изпълняване на задачи според състоянието на хранилището" -#: builtin/gc.c:1001 +#: builtin/gc.c:1410 +msgid "frequency" +msgstr "честота" + +#: builtin/gc.c:1411 +msgid "run tasks based on frequency" +msgstr "изпълняване на задачи по график" + +#: builtin/gc.c:1414 msgid "do not report progress or other information over stderr" msgstr "без извеждане на напредъка и друга информация на стандартния изход" -#: builtin/gc.c:1002 +#: builtin/gc.c:1415 msgid "task" msgstr "задача" -#: builtin/gc.c:1003 +#: builtin/gc.c:1416 msgid "run a specific task" msgstr "изпълнение на определена задача" -#: builtin/gc.c:1026 -msgid "git maintenance run []" -msgstr "git maintenance run [ОПЦИЯ…]" +#: builtin/gc.c:1433 +msgid "use at most one of --auto and --schedule=" +msgstr "" +"може да се указва максимум една от опциите „--auto“ и „--schedule=ЧЕСТОТА“" -#: builtin/gc.c:1037 +#: builtin/gc.c:1467 +msgid "failed to run 'git config'" +msgstr "неуспешно изпълнение на „git config“" + +#: builtin/gc.c:1512 +msgid "another process is scheduling background maintenance" +msgstr "друг процес задава поддръжката на заден фон" + +#: builtin/gc.c:1525 +msgid "failed to run 'crontab -l'; your system might not support 'cron'" +msgstr "" +"неуспешно изпълнение на „crontab -l“. Системата ви може да не поддържа " +"„cron“" + +#: builtin/gc.c:1544 +msgid "failed to run 'crontab'; your system might not support 'cron'" +msgstr "" +"неуспешно изпълнение на „crontab“. Системата ви може да не поддържа „cron“" + +#: builtin/gc.c:1550 +msgid "failed to open stdin of 'crontab'" +msgstr "стандартният вход на „crontab“ не може да се отвори" + +#: builtin/gc.c:1592 +msgid "'crontab' died" +msgstr "процесът на „crontab“ умря" + +#: builtin/gc.c:1605 +msgid "failed to add repo to global config" +msgstr "неуспешно добавяне на хранилище към файла с глобални настройки" + +#: builtin/gc.c:1615 +msgid "git maintenance []" +msgstr "git maintenance ПОДКОМАНДА [ОПЦИЯ…]" + +#: builtin/gc.c:1634 #, c-format msgid "invalid subcommand: %s" msgstr "неправилна подкоманда: „%s“" @@ -15673,255 +15803,255 @@ msgstr "дървото не може да бъде прочетено (%s)" msgid "unable to grep from object of type %s" msgstr "не може да се изпълни „grep“ от обект от вида %s" -#: builtin/grep.c:725 +#: builtin/grep.c:736 #, c-format msgid "switch `%c' expects a numerical value" msgstr "опцията „%c“ очаква число за аргумент" -#: builtin/grep.c:824 +#: builtin/grep.c:835 msgid "search in index instead of in the work tree" msgstr "търсене в индекса, а не в работното дърво" -#: builtin/grep.c:826 +#: builtin/grep.c:837 msgid "find in contents not managed by git" msgstr "търсене и във файловете, които не са под управлението на git" -#: builtin/grep.c:828 +#: builtin/grep.c:839 msgid "search in both tracked and untracked files" msgstr "търсене и в следените, и в неследените файлове" -#: builtin/grep.c:830 +#: builtin/grep.c:841 msgid "ignore files specified via '.gitignore'" msgstr "игнориране на файловете указани в „.gitignore“" -#: builtin/grep.c:832 +#: builtin/grep.c:843 msgid "recursively search in each submodule" msgstr "рекурсивно търсене във всички подмодули" -#: builtin/grep.c:835 +#: builtin/grep.c:846 msgid "show non-matching lines" msgstr "извеждане на редовете, които не съвпадат" -#: builtin/grep.c:837 +#: builtin/grep.c:848 msgid "case insensitive matching" msgstr "без значение на регистъра на буквите (главни/малки)" -#: builtin/grep.c:839 +#: builtin/grep.c:850 msgid "match patterns only at word boundaries" msgstr "напасване на шаблоните само по границите на думите" -#: builtin/grep.c:841 +#: builtin/grep.c:852 msgid "process binary files as text" msgstr "обработване на двоичните файлове като текстови" -#: builtin/grep.c:843 +#: builtin/grep.c:854 msgid "don't match patterns in binary files" msgstr "прескачане на двоичните файлове" -#: builtin/grep.c:846 +#: builtin/grep.c:857 msgid "process binary files with textconv filters" msgstr "" "обработване на двоичните файлове чрез филтри за преобразуване към текст" -#: builtin/grep.c:848 +#: builtin/grep.c:859 msgid "search in subdirectories (default)" msgstr "търсене в поддиректориите (стандартно)" -#: builtin/grep.c:850 +#: builtin/grep.c:861 msgid "descend at most levels" msgstr "навлизане максимално на тази ДЪЛБОЧИНА в дървото" -#: builtin/grep.c:854 +#: builtin/grep.c:865 msgid "use extended POSIX regular expressions" msgstr "разширени регулярни изрази по POSIX" -#: builtin/grep.c:857 +#: builtin/grep.c:868 msgid "use basic POSIX regular expressions (default)" msgstr "основни регулярни изрази по POSIX (стандартно)" -#: builtin/grep.c:860 +#: builtin/grep.c:871 msgid "interpret patterns as fixed strings" msgstr "шаблоните са дословни низове" -#: builtin/grep.c:863 +#: builtin/grep.c:874 msgid "use Perl-compatible regular expressions" msgstr "регулярни изрази на Perl" -#: builtin/grep.c:866 +#: builtin/grep.c:877 msgid "show line numbers" msgstr "извеждане на номерата на редовете" -#: builtin/grep.c:867 +#: builtin/grep.c:878 msgid "show column number of first match" msgstr "извеждане на номера на колоната на първото напасване" -#: builtin/grep.c:868 +#: builtin/grep.c:879 msgid "don't show filenames" msgstr "без извеждане на имената на файловете" -#: builtin/grep.c:869 +#: builtin/grep.c:880 msgid "show filenames" msgstr "извеждане на имената на файловете" -#: builtin/grep.c:871 +#: builtin/grep.c:882 msgid "show filenames relative to top directory" msgstr "" "извеждане на относителните имена на файловете спрямо основната директория на " "хранилището" -#: builtin/grep.c:873 +#: builtin/grep.c:884 msgid "show only filenames instead of matching lines" msgstr "извеждане само на имената на файловете без напасващите редове" -#: builtin/grep.c:875 +#: builtin/grep.c:886 msgid "synonym for --files-with-matches" msgstr "псевдоним на „--files-with-matches“" -#: builtin/grep.c:878 +#: builtin/grep.c:889 msgid "show only the names of files without match" msgstr "" "извеждане само на имената на файловете, които не съдържат ред, напасващ на " "шаблона" -#: builtin/grep.c:880 +#: builtin/grep.c:891 msgid "print NUL after filenames" msgstr "извеждане на нулевия знак „NUL“ след всяко име на файл" -#: builtin/grep.c:883 +#: builtin/grep.c:894 msgid "show only matching parts of a line" msgstr "извеждане само на частите на редовете, които съвпадат" -#: builtin/grep.c:885 +#: builtin/grep.c:896 msgid "show the number of matches instead of matching lines" msgstr "извеждане на броя на съвпаденията вместо напасващите редове" -#: builtin/grep.c:886 +#: builtin/grep.c:897 msgid "highlight matches" msgstr "оцветяване на напасванията" -#: builtin/grep.c:888 +#: builtin/grep.c:899 msgid "print empty line between matches from different files" msgstr "извеждане на празен ред между напасванията от различни файлове" -#: builtin/grep.c:890 +#: builtin/grep.c:901 msgid "show filename only once above matches from same file" msgstr "" "извеждане на името на файла само веднъж за всички напасвания от този файл" -#: builtin/grep.c:893 +#: builtin/grep.c:904 msgid "show context lines before and after matches" msgstr "извеждане на такъв БРОЙ редове преди и след напасванията" -#: builtin/grep.c:896 +#: builtin/grep.c:907 msgid "show context lines before matches" msgstr "извеждане на такъв БРОЙ редове преди напасванията" -#: builtin/grep.c:898 +#: builtin/grep.c:909 msgid "show context lines after matches" msgstr "извеждане на такъв БРОЙ редове след напасванията" -#: builtin/grep.c:900 +#: builtin/grep.c:911 msgid "use worker threads" msgstr "използване на такъв БРОЙ работещи нишки" -#: builtin/grep.c:901 +#: builtin/grep.c:912 msgid "shortcut for -C NUM" msgstr "псевдоним на „-C БРОЙ“" -#: builtin/grep.c:904 +#: builtin/grep.c:915 msgid "show a line with the function name before matches" msgstr "извеждане на ред с името на функцията, в която е напаснат шаблона" -#: builtin/grep.c:906 +#: builtin/grep.c:917 msgid "show the surrounding function" msgstr "извеждане на обхващащата функция" -#: builtin/grep.c:909 +#: builtin/grep.c:920 msgid "read patterns from file" msgstr "изчитане на шаблоните от ФАЙЛ" -#: builtin/grep.c:911 +#: builtin/grep.c:922 msgid "match " msgstr "напасване на ШАБЛОН" -#: builtin/grep.c:913 +#: builtin/grep.c:924 msgid "combine patterns specified with -e" msgstr "комбиниране на шаблоните указани с опцията „-e“" -#: builtin/grep.c:925 +#: builtin/grep.c:936 msgid "indicate hit with exit status without output" msgstr "" "без извеждане на стандартния изход. Изходният код указва наличието на " "напасване" -#: builtin/grep.c:927 +#: builtin/grep.c:938 msgid "show only matches from files that match all patterns" msgstr "" "извеждане на редове само от файловете, които напасват на всички шаблони" -#: builtin/grep.c:929 +#: builtin/grep.c:940 msgid "show parse tree for grep expression" msgstr "извеждане на дървото за анализ на регулярния израз" -#: builtin/grep.c:933 +#: builtin/grep.c:944 msgid "pager" msgstr "програма за преглед по страници" -#: builtin/grep.c:933 +#: builtin/grep.c:944 msgid "show matching files in the pager" msgstr "извеждане на съвпадащите файлове в програма за преглед по страници" -#: builtin/grep.c:937 +#: builtin/grep.c:948 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" "позволяване на стартирането на grep(1) (текущият компилат пренебрегва тази " "опция)" -#: builtin/grep.c:1004 +#: builtin/grep.c:1014 msgid "no pattern given" msgstr "не сте задали шаблон" -#: builtin/grep.c:1040 +#: builtin/grep.c:1050 msgid "--no-index or --untracked cannot be used with revs" msgstr "опциите „--cached“ и „--untracked“ са несъвместими с версии." -#: builtin/grep.c:1048 +#: builtin/grep.c:1058 #, c-format msgid "unable to resolve revision: %s" msgstr "версията „%s“ не може бъде открита" -#: builtin/grep.c:1078 +#: builtin/grep.c:1088 msgid "--untracked not supported with --recurse-submodules" msgstr "опциите „--untracked“ и „--recurse-submodules“ са несъвместими" -#: builtin/grep.c:1082 +#: builtin/grep.c:1092 msgid "invalid option combination, ignoring --threads" msgstr "неправилна комбинация от опции, „--threads“ ще се пренебрегне" -#: builtin/grep.c:1085 builtin/pack-objects.c:3655 +#: builtin/grep.c:1095 builtin/pack-objects.c:3655 msgid "no threads support, ignoring --threads" msgstr "липсва поддръжка за нишки. „--threads“ ще се пренебрегне" -#: builtin/grep.c:1088 builtin/index-pack.c:1573 builtin/pack-objects.c:2933 +#: builtin/grep.c:1098 builtin/index-pack.c:1573 builtin/pack-objects.c:2933 #, c-format msgid "invalid number of threads specified (%d)" msgstr "зададен е неправилен брой нишки: %d" -#: builtin/grep.c:1122 +#: builtin/grep.c:1132 msgid "--open-files-in-pager only works on the worktree" msgstr "опцията „--open-files-in-pager“ изисква търсене в работното дърво" -#: builtin/grep.c:1148 +#: builtin/grep.c:1158 msgid "--cached or --untracked cannot be used with --no-index" msgstr "опциите „--cached“ и „--untracked“ са несъвместими с „--no-index“" -#: builtin/grep.c:1154 +#: builtin/grep.c:1164 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "" "опциите „--(no-)exclude-standard“ са несъвместими с търсене по следени " "файлове" -#: builtin/grep.c:1162 +#: builtin/grep.c:1172 msgid "both --cached and trees are given" msgstr "опцията „--cached“ е несъвместима със задаване на дърво" @@ -16117,7 +16247,7 @@ msgstr "пакетният файл е прекалено голям за тек msgid "pack exceeds maximum allowed size" msgstr "пакетният файл надвишава максималния възможен размер" -#: builtin/index-pack.c:342 builtin/repack.c:254 +#: builtin/index-pack.c:342 builtin/repack.c:286 #, c-format msgid "unable to create '%s'" msgstr "пакетният файл „%s“ не може да бъде създаден" @@ -16355,7 +16485,7 @@ msgstr "Процесът не може да се върне към предиш msgid "bad %s" msgstr "неправилна стойност „%s“" -#: builtin/index-pack.c:1806 builtin/init-db.c:391 builtin/init-db.c:623 +#: builtin/index-pack.c:1806 builtin/init-db.c:392 builtin/init-db.c:625 #, c-format msgid "unknown hash algorithm '%s'" msgstr "непознат алгоритъм за контролни суми „%s“" @@ -16420,59 +16550,59 @@ msgstr "няма шаблони в „%s“" msgid "not copying templates from '%s': %s" msgstr "шаблоните няма да бъдат копирани от „%s“: „%s“" -#: builtin/init-db.c:274 +#: builtin/init-db.c:275 #, c-format msgid "invalid initial branch name: '%s'" msgstr "неправилно име на първоначалния клон: „%s“" -#: builtin/init-db.c:366 +#: builtin/init-db.c:367 #, c-format msgid "unable to handle file type %d" msgstr "файлове от вид %d не се поддържат" -#: builtin/init-db.c:369 +#: builtin/init-db.c:370 #, c-format msgid "unable to move %s to %s" msgstr "„%s“ не може да се премести в „%s“" -#: builtin/init-db.c:385 +#: builtin/init-db.c:386 msgid "attempt to reinitialize repository with different hash" msgstr "" "опит за повторно задаване на първото подаване в хранилището с различна " "контролна сума" -#: builtin/init-db.c:409 builtin/init-db.c:412 +#: builtin/init-db.c:410 builtin/init-db.c:413 #, c-format msgid "%s already exists" msgstr "Директорията „%s“ вече съществува" -#: builtin/init-db.c:443 +#: builtin/init-db.c:445 #, c-format msgid "re-init: ignored --initial-branch=%s" msgstr "re-init: „--initial-branch=%s“ се пропуска" -#: builtin/init-db.c:474 +#: builtin/init-db.c:476 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "" "Инициализиране наново на съществуващо, споделено хранилище на Git в „%s%s“\n" -#: builtin/init-db.c:475 +#: builtin/init-db.c:477 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "Инициализиране наново на съществуващо хранилище на Git в „%s%s“\n" -#: builtin/init-db.c:479 +#: builtin/init-db.c:481 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "Инициализиране на празно, споделено хранилище на Git в „%s%s“\n" -#: builtin/init-db.c:480 +#: builtin/init-db.c:482 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "Инициализиране на празно хранилище на Git в „%s%s“\n" -#: builtin/init-db.c:529 +#: builtin/init-db.c:531 msgid "" "git init [-q | --quiet] [--bare] [--template=] [--" "shared[=]] []" @@ -16480,43 +16610,43 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=ДИРЕКТОРИЯ_С_ШАБЛОНИ] [--" "shared[=ПРАВА]] [ДИРЕКТОРИЯ]" -#: builtin/init-db.c:555 +#: builtin/init-db.c:557 msgid "permissions" msgstr "права" -#: builtin/init-db.c:556 +#: builtin/init-db.c:558 msgid "specify that the git repository is to be shared amongst several users" msgstr "" "указване, че хранилището на Git ще бъде споделено от повече от един " "потребител" -#: builtin/init-db.c:562 +#: builtin/init-db.c:564 msgid "override the name of the initial branch" msgstr "задаване на името на първоначалния клон" -#: builtin/init-db.c:563 builtin/verify-pack.c:74 +#: builtin/init-db.c:565 builtin/verify-pack.c:74 msgid "hash" msgstr "алгоритъм" -#: builtin/init-db.c:564 builtin/show-index.c:22 builtin/verify-pack.c:75 +#: builtin/init-db.c:566 builtin/show-index.c:22 builtin/verify-pack.c:75 msgid "specify the hash algorithm to use" msgstr "указване на алгоритъм за контролна сума" -#: builtin/init-db.c:571 +#: builtin/init-db.c:573 msgid "--separate-git-dir and --bare are mutually exclusive" msgstr "опциите „--separate-git-dir“ и „--bare“ са несъвместими" -#: builtin/init-db.c:600 builtin/init-db.c:605 +#: builtin/init-db.c:602 builtin/init-db.c:607 #, c-format msgid "cannot mkdir %s" msgstr "директорията „%s“ не може да бъде създадена" -#: builtin/init-db.c:609 builtin/init-db.c:664 +#: builtin/init-db.c:611 builtin/init-db.c:666 #, c-format msgid "cannot chdir to %s" msgstr "не може да се влезе в директорията „%s“" -#: builtin/init-db.c:636 +#: builtin/init-db.c:638 #, c-format msgid "" "%s (or --work-tree=) not allowed without specifying %s (or --git-" @@ -16525,12 +16655,12 @@ msgstr "" "%s (или --work-tree=ДИРЕКТОРИЯ) изисква указването на %s (или --git-" "dir=ДИРЕКТОРИЯ)" -#: builtin/init-db.c:688 +#: builtin/init-db.c:690 #, c-format msgid "Cannot access work tree '%s'" msgstr "Работното дърво в „%s“ е недостъпно" -#: builtin/init-db.c:693 +#: builtin/init-db.c:695 msgid "--separate-git-dir incompatible with bare repository" msgstr "опцията „--separate-git-dir“ е несъвместима с голо хранилище" @@ -16598,130 +16728,132 @@ msgstr "опцията „--trailer“ е несъвместима с „--name- msgid "no input file given for in-place editing" msgstr "не е зададен входен файл за редактиране на място" -#: builtin/log.c:56 +#: builtin/log.c:58 msgid "git log [] [] [[--] ...]" msgstr "git log [ОПЦИЯ…] [ДИАПАЗОН_НА_ВЕРСИИТЕ] [[--] ПЪТ…]" -#: builtin/log.c:57 +#: builtin/log.c:59 msgid "git show [] ..." msgstr "git show [ОПЦИЯ…] ОБЕКТ…" -#: builtin/log.c:110 +#: builtin/log.c:112 #, c-format msgid "invalid --decorate option: %s" msgstr "неправилна опция „--decorate“: %s" -#: builtin/log.c:177 +#: builtin/log.c:179 msgid "show source" msgstr "извеждане на изходния код" -#: builtin/log.c:178 +#: builtin/log.c:180 msgid "Use mail map file" msgstr "" "Използване на файл за съответствията на имената и адресите на е-поща („." "mailmap“)" -#: builtin/log.c:181 +#: builtin/log.c:183 msgid "only decorate refs that match " msgstr "специален формат само на указателите напасващи на ШАБЛОНа" -#: builtin/log.c:183 +#: builtin/log.c:185 msgid "do not decorate refs that match " msgstr "без специален формат на указателите напасващи на ШАБЛОНа" -#: builtin/log.c:184 +#: builtin/log.c:186 msgid "decorate options" msgstr "настройки на форма̀та на извежданата информация" -#: builtin/log.c:187 -msgid "Process line range n,m in file, counting from 1" +#: builtin/log.c:189 +msgid "" +"Trace the evolution of line range , or function : in " +"" msgstr "" -"Обработване само на редовете във файла в диапазона от n до m включително. " -"Броенето започва от 1" +"Проследяване на еволюцията на диапазона от редове НАЧАЛО,КРАЙ или :ФУНКЦИЯта " +"във ФАЙЛа" -#: builtin/log.c:297 +#: builtin/log.c:212 +msgid "-L: cannot be used with pathspec" +msgstr "опцията „-LДИАПАЗОН:ФАЙЛ“ не може да се ползва с път" + +#: builtin/log.c:302 #, c-format msgid "Final output: %d %s\n" msgstr "Резултат: %d %s\n" -#: builtin/log.c:555 +#: builtin/log.c:564 #, c-format msgid "git show %s: bad file" msgstr "git show %s: повреден файл" -#: builtin/log.c:570 builtin/log.c:665 +#: builtin/log.c:579 builtin/log.c:674 #, c-format msgid "could not read object %s" msgstr "обектът не може да бъде прочетен: %s" -#: builtin/log.c:690 +#: builtin/log.c:699 #, c-format msgid "unknown type: %d" msgstr "неизвестен вид: %d" -#: builtin/log.c:839 +#: builtin/log.c:848 #, c-format msgid "%s: invalid cover from description mode" msgstr "%s: неправилно придружаващо писмо от режима на описание" -#: builtin/log.c:846 +#: builtin/log.c:855 msgid "format.headers without value" msgstr "не е зададена стойност на „format.headers“" -#: builtin/log.c:965 -msgid "name of output directory is too long" -msgstr "прекалено дълго име на директорията за изходната информация" - -#: builtin/log.c:981 +#: builtin/log.c:984 #, c-format msgid "cannot open patch file %s" msgstr "файлът-кръпка „%s“ не може да бъде отворен" -#: builtin/log.c:998 +#: builtin/log.c:1001 msgid "need exactly one range" msgstr "трябва да зададете точно един диапазон" -#: builtin/log.c:1008 +#: builtin/log.c:1011 msgid "not a range" msgstr "не е диапазон" -#: builtin/log.c:1172 +#: builtin/log.c:1175 msgid "cover letter needs email format" msgstr "придружаващото писмо трябва да е форматирано като е-писмо" -#: builtin/log.c:1178 +#: builtin/log.c:1181 msgid "failed to create cover-letter file" msgstr "неуспешно създаване на придружаващо писмо" -#: builtin/log.c:1259 +#: builtin/log.c:1262 #, c-format msgid "insane in-reply-to: %s" msgstr "неправилен формат на заглавната част за отговор „in-reply-to“: %s" -#: builtin/log.c:1286 +#: builtin/log.c:1289 msgid "git format-patch [] [ | ]" msgstr "git format-patch [ОПЦИЯ…] [ОТ | ДИАПАЗОН_НА_ВЕРСИИТЕ]" -#: builtin/log.c:1344 +#: builtin/log.c:1347 msgid "two output directories?" msgstr "може да укажете максимум една директория за изход" -#: builtin/log.c:1495 builtin/log.c:2301 builtin/log.c:2303 builtin/log.c:2315 +#: builtin/log.c:1498 builtin/log.c:2318 builtin/log.c:2320 builtin/log.c:2332 #, c-format msgid "unknown commit %s" msgstr "непознато подаване: „%s“" -#: builtin/log.c:1506 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1509 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:1515 +#: builtin/log.c:1518 msgid "could not find exact merge base" msgstr "точната база за сливане не може да бъде открита" -#: builtin/log.c:1525 +#: builtin/log.c:1528 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" @@ -16731,298 +16863,303 @@ msgstr "" "зададете, използвайте „git branch --set-upstream-to“.\n" "Можете ръчно да зададете базово подаване чрез „--base=“." -#: builtin/log.c:1548 +#: builtin/log.c:1551 msgid "failed to find exact merge base" msgstr "точната база при сливане не може да бъде открита" -#: builtin/log.c:1565 +#: builtin/log.c:1568 msgid "base commit should be the ancestor of revision list" msgstr "базовото подаване трябва да е предшественикът на списъка с версиите" -#: builtin/log.c:1575 +#: builtin/log.c:1578 msgid "base commit shouldn't be in revision list" msgstr "базовото подаване не може да е в списъка с версиите" -#: builtin/log.c:1633 +#: builtin/log.c:1636 msgid "cannot get patch id" msgstr "идентификаторът на кръпката не може да бъде получен" -#: builtin/log.c:1690 +#: builtin/log.c:1693 msgid "failed to infer range-diff origin of current series" msgstr "" "неуспешно определяне на началото на диапазонната разлика на текущата поредица" -#: builtin/log.c:1692 +#: builtin/log.c:1695 #, c-format msgid "using '%s' as range-diff origin of current series" msgstr "" "„%s“ се ползва като началото на диапазонната разлика на текущата поредица" -#: builtin/log.c:1736 +#: builtin/log.c:1739 msgid "use [PATCH n/m] even with a single patch" msgstr "номерация „[PATCH n/m]“ дори и при единствена кръпка" -#: builtin/log.c:1739 +#: builtin/log.c:1742 msgid "use [PATCH] even with multiple patches" msgstr "номерация „[PATCH]“ дори и при множество кръпки" -#: builtin/log.c:1743 +#: builtin/log.c:1746 msgid "print patches to standard out" msgstr "извеждане на кръпките на стандартния изход" -#: builtin/log.c:1745 +#: builtin/log.c:1748 msgid "generate a cover letter" msgstr "създаване на придружаващо писмо" -#: builtin/log.c:1747 +#: builtin/log.c:1750 msgid "use simple number sequence for output file names" msgstr "проста числова последователност за имената на файловете-кръпки" -#: builtin/log.c:1748 +#: builtin/log.c:1751 msgid "sfx" msgstr "ЗНАЦИ" -#: builtin/log.c:1749 +#: builtin/log.c:1752 msgid "use instead of '.patch'" msgstr "използване на тези ЗНАЦИ за суфикс вместо „.patch“" -#: builtin/log.c:1751 +#: builtin/log.c:1754 msgid "start numbering patches at instead of 1" msgstr "номерирането на кръпките да започва от този БРОЙ, а не с 1" -#: builtin/log.c:1753 +#: builtin/log.c:1756 msgid "mark the series as Nth re-roll" msgstr "отбелязване, че това е N-тата поредна редакция на поредицата от кръпки" -#: builtin/log.c:1755 +#: builtin/log.c:1758 +msgid "max length of output filename" +msgstr "максимална дължина на име на всеки пакетен файл" + +#: builtin/log.c:1760 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Използване на „[RFC PATCH]“ вместо „[PATCH]“" -#: builtin/log.c:1758 +#: builtin/log.c:1763 msgid "cover-from-description-mode" msgstr "режим-придружаващо-писмо-по-описание" -#: builtin/log.c:1759 +#: builtin/log.c:1764 msgid "generate parts of a cover letter based on a branch's description" msgstr "" "генериране на частите на придружаващото писмо на базата на описанието на " "клона" -#: builtin/log.c:1761 +#: builtin/log.c:1766 msgid "Use [] instead of [PATCH]" msgstr "Използване на този „[ПРЕФИКС]“ вместо „[PATCH]“" -#: builtin/log.c:1764 +#: builtin/log.c:1769 msgid "store resulting files in " msgstr "запазване на изходните файлове в тази ДИРЕКТОРИЯ" -#: builtin/log.c:1767 +#: builtin/log.c:1772 msgid "don't strip/add [PATCH]" msgstr "без добавяне/махане на префикса „[PATCH]“" -#: builtin/log.c:1770 +#: builtin/log.c:1775 msgid "don't output binary diffs" msgstr "без извеждане на разлики между двоични файлове" -#: builtin/log.c:1772 +#: builtin/log.c:1777 msgid "output all-zero hash in From header" msgstr "в заглавната част „From:“ (от) контролната сума да е само от нули" -#: builtin/log.c:1774 +#: builtin/log.c:1779 msgid "don't include a patch matching a commit upstream" msgstr "без кръпки, които присъстват в следения клон" -#: builtin/log.c:1776 +#: builtin/log.c:1781 msgid "show patch format instead of default (patch + stat)" msgstr "" "извеждане във формат за кръпки, а на в стандартния (кръпка и статистика)" -#: builtin/log.c:1778 +#: builtin/log.c:1783 msgid "Messaging" msgstr "Опции при изпращане" -#: builtin/log.c:1779 +#: builtin/log.c:1784 msgid "header" msgstr "ЗАГЛАВНА_ЧАСТ" -#: builtin/log.c:1780 +#: builtin/log.c:1785 msgid "add email header" msgstr "добавяне на тази ЗАГЛАВНА_ЧАСТ" -#: builtin/log.c:1781 builtin/log.c:1782 +#: builtin/log.c:1786 builtin/log.c:1787 msgid "email" msgstr "Е-ПОЩА" -#: builtin/log.c:1781 +#: builtin/log.c:1786 msgid "add To: header" msgstr "добавяне на заглавна част „To:“ (до)" -#: builtin/log.c:1782 +#: builtin/log.c:1787 msgid "add Cc: header" msgstr "добавяне на заглавна част „Cc:“ (и до)" -#: builtin/log.c:1783 +#: builtin/log.c:1788 msgid "ident" msgstr "ИДЕНТИЧНОСТ" -#: builtin/log.c:1784 +#: builtin/log.c:1789 msgid "set From address to (or committer ident if absent)" msgstr "" "задаване на адреса в заглавната част „From“ (от) да е тази ИДЕНТИЧНОСТ. Ако " "не е зададена такава, се взима адреса на подаващия" -#: builtin/log.c:1786 +#: builtin/log.c:1791 msgid "message-id" msgstr "ИДЕНТИФИКАТОР_НА_СЪОБЩЕНИЕ" -#: builtin/log.c:1787 +#: builtin/log.c:1792 msgid "make first mail a reply to " msgstr "" "първото съобщение да е в отговор на е-писмото с този " "ИДЕНТИФИКАТОР_НА_СЪОБЩЕНИЕ" -#: builtin/log.c:1788 builtin/log.c:1791 +#: builtin/log.c:1793 builtin/log.c:1796 msgid "boundary" msgstr "граница" -#: builtin/log.c:1789 +#: builtin/log.c:1794 msgid "attach the patch" msgstr "прикрепяне на кръпката" -#: builtin/log.c:1792 +#: builtin/log.c:1797 msgid "inline the patch" msgstr "включване на кръпката в текста на писмата" -#: builtin/log.c:1796 +#: builtin/log.c:1801 msgid "enable message threading, styles: shallow, deep" msgstr "" "използване на нишки за съобщенията. СТИЛът е „shallow“ (плитък) или " "„deep“ (дълбок)" -#: builtin/log.c:1798 +#: builtin/log.c:1803 msgid "signature" msgstr "подпис" -#: builtin/log.c:1799 +#: builtin/log.c:1804 msgid "add a signature" msgstr "добавяне на поле за подпис" -#: builtin/log.c:1800 +#: builtin/log.c:1805 msgid "base-commit" msgstr "БАЗОВО_ПОДАВАНЕ" -#: builtin/log.c:1801 +#: builtin/log.c:1806 msgid "add prerequisite tree info to the patch series" msgstr "добавяне на необходимото БАЗово дърво към поредицата от кръпки" -#: builtin/log.c:1804 +#: builtin/log.c:1809 msgid "add a signature from a file" msgstr "добавяне на подпис от файл" -#: builtin/log.c:1805 +#: builtin/log.c:1810 msgid "don't print the patch filenames" msgstr "без извеждане на имената на кръпките" -#: builtin/log.c:1807 +#: builtin/log.c:1812 msgid "show progress while generating patches" msgstr "извеждане на напредъка във фазата на създаване на кръпките" -#: builtin/log.c:1809 +#: builtin/log.c:1814 msgid "show changes against in cover letter or single patch" msgstr "" "показване на промените спрямо ВЕРСията в придружаващото писмо или единствена " "кръпка" -#: builtin/log.c:1812 +#: builtin/log.c:1817 msgid "show changes against in cover letter or single patch" msgstr "" "показване на промените спрямо указателя на ВЕРСията в придружаващото писмо " "или единствена кръпка" -#: builtin/log.c:1814 +#: builtin/log.c:1819 msgid "percentage by which creation is weighted" msgstr "процент за претегляне при оценка на създаването" -#: builtin/log.c:1896 +#: builtin/log.c:1905 #, c-format msgid "invalid ident line: %s" msgstr "грешна идентичност: %s" -#: builtin/log.c:1911 +#: builtin/log.c:1920 msgid "-n and -k are mutually exclusive" msgstr "опциите „-n“ и „-k“ са несъвместими" -#: builtin/log.c:1913 +#: builtin/log.c:1922 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "опциите „--subject-prefix“/„-rfc“ и „-k“ са несъвместими" -#: builtin/log.c:1921 +#: builtin/log.c:1930 msgid "--name-only does not make sense" msgstr "опцията „--name-only“ е несъвместима с генерирането на кръпки" -#: builtin/log.c:1923 +#: builtin/log.c:1932 msgid "--name-status does not make sense" msgstr "опцията „--name-status“ е несъвместима с генерирането на кръпки" -#: builtin/log.c:1925 +#: builtin/log.c:1934 msgid "--check does not make sense" msgstr "опцията „--check“ е несъвместима с генерирането на кръпки" -#: builtin/log.c:1958 -msgid "standard output, or directory, which one?" +#: builtin/log.c:1956 +msgid "--stdout, --output, and --output-directory are mutually exclusive" msgstr "" -"изходът може да или стандартният, или да е в директория, но не и двете." +"Опциите „--stdout“, „--output“ и „--output-directory“ са несъвместими една с " +"друга" -#: builtin/log.c:2062 +#: builtin/log.c:2079 msgid "--interdiff requires --cover-letter or single patch" msgstr "" "опцията „--interdiff“ изисква опция „--cover-letter“ или единствена кръпка" -#: builtin/log.c:2066 +#: builtin/log.c:2083 msgid "Interdiff:" msgstr "Разлика в разликите:" -#: builtin/log.c:2067 +#: builtin/log.c:2084 #, c-format msgid "Interdiff against v%d:" msgstr "Разлика в разликите спрямо v%d:" -#: builtin/log.c:2073 +#: builtin/log.c:2090 msgid "--creation-factor requires --range-diff" msgstr "опцията „--creation-factor“ изисква опция „--range-diff“" -#: builtin/log.c:2077 +#: builtin/log.c:2094 msgid "--range-diff requires --cover-letter or single patch" msgstr "" "опцията „--range-diff“ изисква опция „--cover-letter“ или единствена кръпка" -#: builtin/log.c:2085 +#: builtin/log.c:2102 msgid "Range-diff:" msgstr "Диапазонна разлика:" -#: builtin/log.c:2086 +#: builtin/log.c:2103 #, c-format msgid "Range-diff against v%d:" msgstr "Диапазонна разлика спрямо v%d:" -#: builtin/log.c:2097 +#: builtin/log.c:2114 #, c-format msgid "unable to read signature file '%s'" msgstr "файлът „%s“ с подпис не може да бъде прочетен" -#: builtin/log.c:2133 +#: builtin/log.c:2150 msgid "Generating patches" msgstr "Създаване на кръпки" -#: builtin/log.c:2177 +#: builtin/log.c:2194 msgid "failed to create output files" msgstr "неуспешно създаване на изходни файлове" -#: builtin/log.c:2236 +#: builtin/log.c:2253 msgid "git cherry [-v] [ [ []]]" msgstr "git cherry [-v] [ОТДАЛЕЧЕН_КЛОН [ВРЪХ [ПРЕДЕЛ]]]" -#: builtin/log.c:2290 +#: builtin/log.c:2307 #, c-format msgid "" "Could not find a tracked remote branch, please specify manually.\n" @@ -17150,7 +17287,7 @@ msgstr "" msgid "do not print remote URL" msgstr "без извеждане на адресите на отдалечените хранилища" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1392 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1398 msgid "exec" msgstr "КОМАНДА" @@ -17337,196 +17474,196 @@ msgstr "указателят „%s“ не може да бъде изтрит" msgid "Merging %s with %s\n" msgstr "Сливане на „%s“ с „%s“\n" -#: builtin/merge.c:56 +#: builtin/merge.c:57 msgid "git merge [] [...]" msgstr "git merge [ОПЦИЯ…] [ПОДАВАНЕ…]" -#: builtin/merge.c:57 +#: builtin/merge.c:58 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:58 +#: builtin/merge.c:59 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:120 +#: builtin/merge.c:122 msgid "switch `m' requires a value" msgstr "опцията „-m“ изисква стойност" -#: builtin/merge.c:143 +#: builtin/merge.c:145 #, c-format msgid "option `%s' requires a value" msgstr "опцията „%s“ изисква стойност" -#: builtin/merge.c:189 +#: builtin/merge.c:198 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Няма такава стратегия за сливане: „%s“.\n" -#: builtin/merge.c:190 +#: builtin/merge.c:199 #, c-format msgid "Available strategies are:" msgstr "Наличните стратегии са:" -#: builtin/merge.c:195 +#: builtin/merge.c:204 #, c-format msgid "Available custom strategies are:" msgstr "Допълнителните стратегии са:" -#: builtin/merge.c:246 builtin/pull.c:133 +#: builtin/merge.c:255 builtin/pull.c:133 msgid "do not show a diffstat at the end of the merge" msgstr "без извеждане на статистиката след завършване на сливане" -#: builtin/merge.c:249 builtin/pull.c:136 +#: builtin/merge.c:258 builtin/pull.c:136 msgid "show a diffstat at the end of the merge" msgstr "извеждане на статистиката след завършване на сливане" -#: builtin/merge.c:250 builtin/pull.c:139 +#: builtin/merge.c:259 builtin/pull.c:139 msgid "(synonym to --stat)" msgstr "(псевдоним на „--stat“)" -#: builtin/merge.c:252 builtin/pull.c:142 +#: builtin/merge.c:261 builtin/pull.c:142 msgid "add (at most ) entries from shortlog to merge commit message" msgstr "" "добавяне (на максимум такъв БРОЙ) записи от съкратения журнал в съобщението " "за подаване" -#: builtin/merge.c:255 builtin/pull.c:148 +#: builtin/merge.c:264 builtin/pull.c:148 msgid "create a single commit instead of doing a merge" msgstr "създаване на едно подаване вместо извършване на сливане" -#: builtin/merge.c:257 builtin/pull.c:151 +#: builtin/merge.c:266 builtin/pull.c:151 msgid "perform a commit if the merge succeeds (default)" msgstr "извършване на подаване при успешно сливане (стандартно действие)" -#: builtin/merge.c:259 builtin/pull.c:154 +#: builtin/merge.c:268 builtin/pull.c:154 msgid "edit message before committing" msgstr "редактиране на съобщението преди подаване" -#: builtin/merge.c:261 +#: builtin/merge.c:270 msgid "allow fast-forward (default)" msgstr "позволяване на превъртане (стандартно действие)" -#: builtin/merge.c:263 builtin/pull.c:161 +#: builtin/merge.c:272 builtin/pull.c:161 msgid "abort if fast-forward is not possible" msgstr "преустановяване, ако превъртането е невъзможно" -#: builtin/merge.c:267 builtin/pull.c:164 +#: builtin/merge.c:276 builtin/pull.c:164 msgid "verify that the named commit has a valid GPG signature" msgstr "проверка, че указаното подаване е с правилен подпис на GPG" -#: builtin/merge.c:268 builtin/notes.c:787 builtin/pull.c:168 -#: builtin/rebase.c:533 builtin/rebase.c:1406 builtin/revert.c:114 +#: builtin/merge.c:277 builtin/notes.c:787 builtin/pull.c:168 +#: builtin/rebase.c:539 builtin/rebase.c:1412 builtin/revert.c:114 msgid "strategy" msgstr "СТРАТЕГИЯ" -#: builtin/merge.c:269 builtin/pull.c:169 +#: builtin/merge.c:278 builtin/pull.c:169 msgid "merge strategy to use" msgstr "СТРАТЕГИЯ за сливане, която да се ползва" -#: builtin/merge.c:270 builtin/pull.c:172 +#: builtin/merge.c:279 builtin/pull.c:172 msgid "option=value" msgstr "ОПЦИЯ=СТОЙНОСТ" -#: builtin/merge.c:271 builtin/pull.c:173 +#: builtin/merge.c:280 builtin/pull.c:173 msgid "option for selected merge strategy" msgstr "ОПЦИЯ за избраната стратегия за сливане" -#: builtin/merge.c:273 +#: builtin/merge.c:282 msgid "merge commit message (for a non-fast-forward merge)" msgstr "СЪОБЩЕНИЕ при подаването със сливане (при същински сливания)" -#: builtin/merge.c:280 +#: builtin/merge.c:289 msgid "abort the current in-progress merge" msgstr "преустановяване на текущото сливане" -#: builtin/merge.c:282 +#: builtin/merge.c:291 msgid "--abort but leave index and working tree alone" msgstr "преустановяване без промяна на индекса и работното дърво" -#: builtin/merge.c:284 +#: builtin/merge.c:293 msgid "continue the current in-progress merge" msgstr "продължаване на текущото сливане" -#: builtin/merge.c:286 builtin/pull.c:180 +#: builtin/merge.c:295 builtin/pull.c:180 msgid "allow merging unrelated histories" msgstr "позволяване на сливане на независими истории" -#: builtin/merge.c:293 +#: builtin/merge.c:302 msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "" "без изпълнение на куките преди подаване и сливане и при промяна на " "съобщението за подаване (pre-merge-commit и commit-msg)" -#: builtin/merge.c:310 +#: builtin/merge.c:319 msgid "could not run stash." msgstr "не може да се извърши скатаване" -#: builtin/merge.c:315 +#: builtin/merge.c:324 msgid "stash failed" msgstr "неуспешно скатаване" -#: builtin/merge.c:320 +#: builtin/merge.c:329 #, c-format msgid "not a valid object: %s" msgstr "неправилен обект: „%s“" -#: builtin/merge.c:342 builtin/merge.c:359 +#: builtin/merge.c:351 builtin/merge.c:368 msgid "read-tree failed" msgstr "неуспешно прочитане на обект-дърво" -#: builtin/merge.c:389 +#: builtin/merge.c:398 msgid " (nothing to squash)" msgstr " (няма какво да се вкара)" -#: builtin/merge.c:400 +#: builtin/merge.c:409 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Вкарано подаване — указателят „HEAD“ няма да бъде обновен\n" -#: builtin/merge.c:450 +#: builtin/merge.c:459 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "" "Липсва съобщение при подаване — указателят „HEAD“ няма да бъде обновен\n" -#: builtin/merge.c:501 +#: builtin/merge.c:510 #, c-format msgid "'%s' does not point to a commit" msgstr "„%s“ не сочи към подаване" -#: builtin/merge.c:588 +#: builtin/merge.c:597 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Неправилен низ за настройката „branch.%s.mergeoptions“: „%s“" -#: builtin/merge.c:713 +#: builtin/merge.c:723 msgid "Not handling anything other than two heads merge." msgstr "Поддържа се само сливане на точно две истории." -#: builtin/merge.c:726 +#: builtin/merge.c:736 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Непозната опция за рекурсивното сливане „merge-recursive“: „-X%s“" -#: builtin/merge.c:741 +#: builtin/merge.c:755 t/helper/test-fast-rebase.c:209 #, c-format msgid "unable to write %s" msgstr "„%s“ не може да бъде записан" -#: builtin/merge.c:793 +#: builtin/merge.c:807 #, c-format msgid "Could not read from '%s'" msgstr "От „%s“ не може да се чете" -#: builtin/merge.c:802 +#: builtin/merge.c:816 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Сливането няма да бъде подадено. За завършването му и подаването му " "използвайте командата „git commit“.\n" -#: builtin/merge.c:808 +#: builtin/merge.c:822 msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" @@ -17535,11 +17672,11 @@ msgstr "" "В съобщението при подаване добавете информация за причината за\n" "сливането, особено ако сливате обновен отдалечен клон в тематичен клон.\n" -#: builtin/merge.c:813 +#: builtin/merge.c:827 msgid "An empty message aborts the commit.\n" msgstr "Празно съобщение предотвратява подаването.\n" -#: builtin/merge.c:816 +#: builtin/merge.c:830 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" @@ -17548,76 +17685,76 @@ msgstr "" "Редовете, които започват с „%c“, ще бъдат пропуснати, а празно\n" "съобщение преустановява подаването.\n" -#: builtin/merge.c:869 +#: builtin/merge.c:883 msgid "Empty commit message." msgstr "Празно съобщение при подаване." -#: builtin/merge.c:884 +#: builtin/merge.c:898 #, c-format msgid "Wonderful.\n" msgstr "Първият етап на сливането завърши.\n" -#: builtin/merge.c:945 +#: builtin/merge.c:959 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Неуспешно автоматично сливане — коригирайте конфликтите и подайте " "резултата.\n" -#: builtin/merge.c:984 +#: builtin/merge.c:998 msgid "No current branch." msgstr "Няма текущ клон." -#: builtin/merge.c:986 +#: builtin/merge.c:1000 msgid "No remote for the current branch." msgstr "Текущият клон не следи никой." -#: builtin/merge.c:988 +#: builtin/merge.c:1002 msgid "No default upstream defined for the current branch." msgstr "Текущият клон не следи никой клон." -#: builtin/merge.c:993 +#: builtin/merge.c:1007 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Никой клон не следи клона „%s“ от хранилището „%s“" -#: builtin/merge.c:1050 +#: builtin/merge.c:1064 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Неправилна стойност „%s“ в средата „%s“" -#: builtin/merge.c:1153 +#: builtin/merge.c:1167 #, c-format msgid "not something we can merge in %s: %s" msgstr "не може да се слее в „%s“: %s" -#: builtin/merge.c:1187 +#: builtin/merge.c:1201 msgid "not something we can merge" msgstr "не може да се слее" -#: builtin/merge.c:1291 +#: builtin/merge.c:1311 msgid "--abort expects no arguments" msgstr "опцията „--abort“ не приема аргументи" -#: builtin/merge.c:1295 +#: builtin/merge.c:1315 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" "Не може да преустановите сливане, защото в момента не се извършва такова " "(липсва указател „MERGE_HEAD“)." -#: builtin/merge.c:1313 +#: builtin/merge.c:1333 msgid "--quit expects no arguments" msgstr "опцията „--quit“ не приема аргументи" -#: builtin/merge.c:1326 +#: builtin/merge.c:1346 msgid "--continue expects no arguments" msgstr "опцията „--continue“ не приема аргументи" -#: builtin/merge.c:1330 +#: builtin/merge.c:1350 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "В момента не се извършва сливане (липсва указател „MERGE_HEAD“)." -#: builtin/merge.c:1346 +#: builtin/merge.c:1366 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17625,7 +17762,7 @@ msgstr "" "Не сте завършили сливане. (Указателят „MERGE_HEAD“ съществува).\n" "Подайте промените си, преди да започнете ново сливане." -#: builtin/merge.c:1353 +#: builtin/merge.c:1373 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17633,103 +17770,103 @@ msgstr "" "Не сте завършили отбиране на подаване (указателят „CHERRY_PICK_HEAD“\n" "съществува). Подайте промените си, преди да започнете ново сливане." -#: builtin/merge.c:1356 +#: builtin/merge.c:1376 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" "Не сте завършили отбиране на подаване (указателят „CHERRY_PICK_HEAD“\n" "съществува)." -#: builtin/merge.c:1370 +#: builtin/merge.c:1390 msgid "You cannot combine --squash with --no-ff." msgstr "Опцията „--squash“ е несъвместима с „--no-ff“." -#: builtin/merge.c:1372 +#: builtin/merge.c:1392 msgid "You cannot combine --squash with --commit." msgstr "Опцията „--squash“ е несъвместима с „--commit“." -#: builtin/merge.c:1388 +#: builtin/merge.c:1408 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" "Не е указано подаване и настройката „merge.defaultToUpstream“ не е зададена." -#: builtin/merge.c:1405 +#: builtin/merge.c:1425 msgid "Squash commit into empty head not supported yet" msgstr "Вкарване на подаване във връх без история все още не се поддържа" -#: builtin/merge.c:1407 +#: builtin/merge.c:1427 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" "Понеже върхът е без история, всички сливания са превъртания, не може да се " "извърши същинско сливане изисквано от опцията „--no-ff“" -#: builtin/merge.c:1412 +#: builtin/merge.c:1432 #, c-format msgid "%s - not something we can merge" msgstr "„%s“ — не е нещо, което може да се слее" -#: builtin/merge.c:1414 +#: builtin/merge.c:1434 msgid "Can merge only exactly one commit into empty head" msgstr "Можете да слеете точно едно подаване във връх без история" -#: builtin/merge.c:1495 +#: builtin/merge.c:1515 msgid "refusing to merge unrelated histories" msgstr "независими истории не може да се слеят" -#: builtin/merge.c:1504 +#: builtin/merge.c:1524 msgid "Already up to date." msgstr "Вече е обновено." -#: builtin/merge.c:1514 +#: builtin/merge.c:1534 #, c-format msgid "Updating %s..%s\n" msgstr "Обновяване „%s..%s“\n" -#: builtin/merge.c:1560 +#: builtin/merge.c:1580 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Проба със сливане в рамките на индекса…\n" -#: builtin/merge.c:1567 +#: builtin/merge.c:1587 #, c-format msgid "Nope.\n" msgstr "Неуспешно сливане.\n" -#: builtin/merge.c:1592 +#: builtin/merge.c:1612 msgid "Already up to date. Yeeah!" msgstr "Вече е обновено!" -#: builtin/merge.c:1598 +#: builtin/merge.c:1618 msgid "Not possible to fast-forward, aborting." msgstr "Не може да се извърши превъртане, преустановяване на действието." -#: builtin/merge.c:1626 builtin/merge.c:1691 +#: builtin/merge.c:1646 builtin/merge.c:1711 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Привеждане на дървото към първоначалното…\n" -#: builtin/merge.c:1630 +#: builtin/merge.c:1650 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Пробване със стратегията за сливане „%s“…\n" -#: builtin/merge.c:1682 +#: builtin/merge.c:1702 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Никоя стратегия за сливане не може да извърши сливането.\n" -#: builtin/merge.c:1684 +#: builtin/merge.c:1704 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Неуспешно сливане със стратегия „%s“.\n" -#: builtin/merge.c:1693 +#: builtin/merge.c:1713 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" "Ползва се стратегията „%s“, която ще подготви дървото за коригиране на " "ръка.\n" -#: builtin/merge.c:1707 +#: builtin/merge.c:1727 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -17880,7 +18017,7 @@ msgstr "%s, обект: „%s“, цел: „%s“" msgid "Renaming %s to %s\n" msgstr "Преименуване на „%s“ на „%s“\n" -#: builtin/mv.c:280 builtin/remote.c:782 builtin/repack.c:518 +#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:484 #, c-format msgid "renaming '%s' failed" msgstr "неуспешно преименуване на „%s“" @@ -18349,7 +18486,7 @@ msgstr "УКАЗАТЕЛ_ЗА_БЕЛЕЖКА" msgid "use notes from " msgstr "да се използва бележката сочена от този УКАЗАТЕЛ_ЗА_БЕЛЕЖКА" -#: builtin/notes.c:1034 builtin/stash.c:1605 +#: builtin/notes.c:1034 builtin/stash.c:1604 #, c-format msgid "unknown subcommand: %s" msgstr "непозната подкоманда: %s" @@ -18814,7 +18951,7 @@ msgstr "Опции при сливане" msgid "incorporate changes by rebasing rather than merging" msgstr "внасяне на промените чрез пребазиране, а не чрез сливане" -#: builtin/pull.c:158 builtin/rebase.c:484 builtin/revert.c:126 +#: builtin/pull.c:158 builtin/rebase.c:490 builtin/revert.c:126 msgid "allow fast-forward" msgstr "позволяване на превъртания" @@ -18902,15 +19039,15 @@ msgstr "" "Понеже това не е хранилището по подразбиране на текущия клон, трябва\n" "да укажете отдалечения клон на командния ред." -#: builtin/pull.c:469 builtin/rebase.c:1240 git-parse-remote.sh:73 +#: builtin/pull.c:469 builtin/rebase.c:1246 msgid "You are not currently on a branch." msgstr "Извън всички клони." -#: builtin/pull.c:471 builtin/pull.c:486 git-parse-remote.sh:79 +#: builtin/pull.c:471 builtin/pull.c:486 msgid "Please specify which branch you want to rebase against." msgstr "Укажете върху кой клон искате да пребазирате." -#: builtin/pull.c:473 builtin/pull.c:488 git-parse-remote.sh:82 +#: builtin/pull.c:473 builtin/pull.c:488 msgid "Please specify which branch you want to merge with." msgstr "Укажете кой клон искате да слеете." @@ -18919,20 +19056,19 @@ msgid "See git-pull(1) for details." msgstr "За повече информация погледнете ръководството „git-pull(1)“" #: builtin/pull.c:476 builtin/pull.c:482 builtin/pull.c:491 -#: builtin/rebase.c:1246 git-parse-remote.sh:64 +#: builtin/rebase.c:1252 msgid "" msgstr "ОТДАЛЕЧЕНО_ХРАНИЛИЩЕ" #: builtin/pull.c:476 builtin/pull.c:491 builtin/pull.c:496 -#: git-parse-remote.sh:65 msgid "" msgstr "КЛОН" -#: builtin/pull.c:484 builtin/rebase.c:1238 git-parse-remote.sh:75 +#: builtin/pull.c:484 builtin/rebase.c:1244 msgid "There is no tracking information for the current branch." msgstr "Текущият клон не следи никой." -#: builtin/pull.c:493 git-parse-remote.sh:95 +#: builtin/pull.c:493 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" @@ -18953,23 +19089,23 @@ msgstr "" msgid "unable to access commit %s" msgstr "недостъпно подаване: %s" -#: builtin/pull.c:894 +#: builtin/pull.c:915 msgid "ignoring --verify-signatures for rebase" msgstr "без „--verify-signatures“ при пребазиране" -#: builtin/pull.c:954 +#: builtin/pull.c:972 msgid "Updating an unborn branch with changes added to the index." msgstr "Обновяване на все още несъздаден клон с промените от индекса" -#: builtin/pull.c:958 +#: builtin/pull.c:976 msgid "pull with rebase" msgstr "издърпване с пребазиране" -#: builtin/pull.c:959 +#: builtin/pull.c:977 msgid "please commit or stash them." msgstr "трябва да подадете или скатаете промените." -#: builtin/pull.c:984 +#: builtin/pull.c:1002 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -18979,7 +19115,7 @@ msgstr "" "доставянето обнови върха на текущия клон. Работното\n" "ви копие бе превъртяно от подаване „%s“." -#: builtin/pull.c:990 +#: builtin/pull.c:1008 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -18996,15 +19132,15 @@ msgstr "" " git reset --hard\n" "за връщане към нормално състояние." -#: builtin/pull.c:1005 +#: builtin/pull.c:1023 msgid "Cannot merge multiple branches into empty head." msgstr "Не може да сливате множество клони в празен върхов указател." -#: builtin/pull.c:1009 +#: builtin/pull.c:1027 msgid "Cannot rebase onto multiple branches." msgstr "Не може да пребазирате върху повече от един клон." -#: builtin/pull.c:1017 +#: builtin/pull.c:1041 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "пребазирането е невъзможно заради локално записаните промени по подмодулите" @@ -19173,102 +19309,118 @@ msgstr "" "указател, който вече сочи към обект, който не е подаване, както и тепърва\n" "да го промените да сочи към подобен обект.\n" -#: builtin/push.c:351 +#: builtin/push.c:294 +msgid "" +"Updates were rejected because the tip of the remote-tracking\n" +"branch has been updated since the last checkout. You may want\n" +"to integrate those changes locally (e.g., 'git pull ...')\n" +"before forcing an update.\n" +msgstr "" +"Обновяването е отхвърлено, защото върхът на следящия клон е обновяван след\n" +"последното изтегляне. Внесете отдалечените промени (напр. с командата\n" +"„git pull…“), преди отново принудително да изтласкате промените.\n" + +#: builtin/push.c:364 #, c-format msgid "Pushing to %s\n" msgstr "Изтласкване към „%s“\n" -#: builtin/push.c:358 +#: builtin/push.c:371 #, c-format msgid "failed to push some refs to '%s'" msgstr "част от указателите не бяха изтласкани към „%s“" -#: builtin/push.c:532 +#: builtin/push.c:553 msgid "repository" msgstr "хранилище" -#: builtin/push.c:533 builtin/send-pack.c:183 +#: builtin/push.c:554 builtin/send-pack.c:189 msgid "push all refs" msgstr "изтласкване на всички указатели" -#: builtin/push.c:534 builtin/send-pack.c:185 +#: builtin/push.c:555 builtin/send-pack.c:191 msgid "mirror all refs" msgstr "огледално копие на всички указатели" -#: builtin/push.c:536 +#: builtin/push.c:557 msgid "delete refs" msgstr "изтриване на указателите" -#: builtin/push.c:537 +#: builtin/push.c:558 msgid "push tags (can't be used with --all or --mirror)" msgstr "изтласкване на етикетите (несъвместимо с опциите „--all“ и „--mirror“)" -#: builtin/push.c:540 builtin/send-pack.c:186 +#: builtin/push.c:561 builtin/send-pack.c:192 msgid "force updates" msgstr "принудително обновяване" -#: builtin/push.c:541 builtin/send-pack.c:198 +#: builtin/push.c:562 builtin/send-pack.c:204 msgid ":" msgstr "ИМЕ_НА_УКАЗАТЕЛ:ОЧАКВАНА_СТОЙНОСТ" -#: builtin/push.c:542 builtin/send-pack.c:199 +#: builtin/push.c:563 builtin/send-pack.c:205 msgid "require old value of ref to be at this value" msgstr "УКАЗАТЕЛят трябва първоначално да е с тази ОЧАКВАНА_СТОЙНОСТ" -#: builtin/push.c:545 +#: builtin/push.c:566 builtin/send-pack.c:208 +msgid "require remote updates to be integrated locally" +msgstr "" +"изискване обновяванията в отдалечените хранилища да се внасят и в локалното" + +#: builtin/push.c:569 msgid "control recursive pushing of submodules" msgstr "управление на рекурсивното изтласкване на подмодулите" -#: builtin/push.c:546 builtin/send-pack.c:193 +#: builtin/push.c:570 builtin/send-pack.c:199 msgid "use thin pack" msgstr "използване на съкратени пакети" -#: builtin/push.c:547 builtin/push.c:548 builtin/send-pack.c:180 -#: builtin/send-pack.c:181 +#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186 +#: builtin/send-pack.c:187 msgid "receive pack program" msgstr "програма за получаването на пакети" -#: builtin/push.c:549 +#: builtin/push.c:573 msgid "set upstream for git pull/status" msgstr "задаване на отдалеченото хранилище за командите „git pull/status“" -#: builtin/push.c:552 +#: builtin/push.c:576 msgid "prune locally removed refs" msgstr "окастряне на указателите, които са премахнати от локалното хранилище" -#: builtin/push.c:554 +#: builtin/push.c:578 msgid "bypass pre-push hook" msgstr "без изпълнение на куката преди изтласкване (pre-push)" -#: builtin/push.c:555 +#: builtin/push.c:579 msgid "push missing but relevant tags" msgstr "" "изтласкване на липсващите в отдалеченото хранилище, но свързани с текущото " "изтласкване, етикети" -#: builtin/push.c:557 builtin/send-pack.c:187 +#: builtin/push.c:581 builtin/send-pack.c:193 msgid "GPG sign the push" msgstr "подписване на изтласкването с GPG" -#: builtin/push.c:559 builtin/send-pack.c:194 +#: builtin/push.c:583 builtin/send-pack.c:200 msgid "request atomic transaction on remote side" msgstr "изискване на атомарни операции от отсрещната страна" -#: builtin/push.c:577 +#: builtin/push.c:601 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "" "опцията „--delete“ е несъвместима с опциите „--all“, „--mirror“ и „--tags“" -#: builtin/push.c:579 +#: builtin/push.c:603 msgid "--delete doesn't make sense without any refs" msgstr "опцията „--delete“ изисква поне един указател на версия" -#: builtin/push.c:599 +#: builtin/push.c:623 #, c-format msgid "bad repository '%s'" msgstr "неправилно указано хранилище „%s“" -#: builtin/push.c:600 +#: builtin/push.c:624 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -19290,27 +19442,27 @@ msgstr "" "\n" " git push ИМЕ\n" -#: builtin/push.c:615 +#: builtin/push.c:639 msgid "--all and --tags are incompatible" msgstr "опциите „--all“ и „--tags“ са несъвместими" -#: builtin/push.c:617 +#: builtin/push.c:641 msgid "--all can't be combined with refspecs" msgstr "опцията „--all“ е несъвместима с указването на версия" -#: builtin/push.c:621 +#: builtin/push.c:645 msgid "--mirror and --tags are incompatible" msgstr "опциите „--mirror“ и „--tags“ са несъвместими" -#: builtin/push.c:623 +#: builtin/push.c:647 msgid "--mirror can't be combined with refspecs" msgstr "опцията „--mirror“ е несъвместима с указването на версия" -#: builtin/push.c:626 +#: builtin/push.c:650 msgid "--all and --mirror are incompatible" msgstr "опциите „--all“ и „--mirror“ са несъвместими" -#: builtin/push.c:630 +#: builtin/push.c:657 msgid "push options must not have new line characters" msgstr "опциите за изтласкване не трябва да съдържат знак за нов ред" @@ -19456,197 +19608,197 @@ msgstr "" msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:187 builtin/rebase.c:211 builtin/rebase.c:238 +#: builtin/rebase.c:193 builtin/rebase.c:217 builtin/rebase.c:244 #, c-format msgid "unusable todo list: '%s'" msgstr "неуспешно изтриване на списъка за изпълнение: „%s“" -#: builtin/rebase.c:304 +#: builtin/rebase.c:310 #, c-format msgid "could not create temporary %s" msgstr "не може да се създаде временна директория „%s“" -#: builtin/rebase.c:310 +#: builtin/rebase.c:316 msgid "could not mark as interactive" msgstr "невъзможно задаване на интерактивна работа" -#: builtin/rebase.c:364 +#: builtin/rebase.c:369 msgid "could not generate todo list" msgstr "файлът с командите не може да се генерира" -#: builtin/rebase.c:405 +#: builtin/rebase.c:411 msgid "a base commit must be provided with --upstream or --onto" msgstr "опциите „--upstream“ и „--onto“ изискват базово подаване" -#: builtin/rebase.c:474 +#: builtin/rebase.c:480 msgid "git rebase--interactive []" msgstr "git rebase--interactive [ОПЦИЯ…]" -#: builtin/rebase.c:487 builtin/rebase.c:1382 +#: builtin/rebase.c:493 builtin/rebase.c:1388 msgid "keep commits which start empty" msgstr "запазванe на първоначално празните подавания" -#: builtin/rebase.c:491 builtin/revert.c:128 +#: builtin/rebase.c:497 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "позволяване на празни съобщения при подаване" -#: builtin/rebase.c:493 +#: builtin/rebase.c:499 msgid "rebase merge commits" msgstr "пребазиране на подаванията със сливания" -#: builtin/rebase.c:495 +#: builtin/rebase.c:501 msgid "keep original branch points of cousins" msgstr "" "запазване на първоначалните точки на разклоняване на сестринските клони" -#: builtin/rebase.c:497 +#: builtin/rebase.c:503 msgid "move commits that begin with squash!/fixup!" msgstr "преместване на подаванията, които започват със „squash!“/“fixup!“" -#: builtin/rebase.c:498 +#: builtin/rebase.c:504 msgid "sign commits" msgstr "подписване на подаванията" -#: builtin/rebase.c:500 builtin/rebase.c:1321 +#: builtin/rebase.c:506 builtin/rebase.c:1327 msgid "display a diffstat of what changed upstream" msgstr "извеждане на статистика с промените в следения клон" -#: builtin/rebase.c:502 +#: builtin/rebase.c:508 msgid "continue rebase" msgstr "продължаване на пребазирането" -#: builtin/rebase.c:504 +#: builtin/rebase.c:510 msgid "skip commit" msgstr "прескачане на подаване" -#: builtin/rebase.c:505 +#: builtin/rebase.c:511 msgid "edit the todo list" msgstr "редактиране на списъка с команди за изпълнение" -#: builtin/rebase.c:507 +#: builtin/rebase.c:513 msgid "show the current patch" msgstr "извеждане на текущата кръпка" -#: builtin/rebase.c:510 +#: builtin/rebase.c:516 msgid "shorten commit ids in the todo list" msgstr "съкратени идентификатори в списъка за изпълнение" -#: builtin/rebase.c:512 +#: builtin/rebase.c:518 msgid "expand commit ids in the todo list" msgstr "пълни идентификатори в списъка за изпълнение" -#: builtin/rebase.c:514 +#: builtin/rebase.c:520 msgid "check the todo list" msgstr "проверка на списъка за изпълнение" -#: builtin/rebase.c:516 +#: builtin/rebase.c:522 msgid "rearrange fixup/squash lines" msgstr "" "преподреждане на редовете за вкарване на подаванията подаванията в " "предходните им със и без смени на съобщението" -#: builtin/rebase.c:518 +#: builtin/rebase.c:524 msgid "insert exec commands in todo list" msgstr "вмъкване на командите за изпълнение в списъка за изпълнение" -#: builtin/rebase.c:519 +#: builtin/rebase.c:525 msgid "onto" msgstr "върху" -#: builtin/rebase.c:522 +#: builtin/rebase.c:528 msgid "restrict-revision" msgstr "ограничена версия" -#: builtin/rebase.c:522 +#: builtin/rebase.c:528 msgid "restrict revision" msgstr "ограничена версия" -#: builtin/rebase.c:524 +#: builtin/rebase.c:530 msgid "squash-onto" msgstr "подаване, в което другите да се вкарат" -#: builtin/rebase.c:525 +#: builtin/rebase.c:531 msgid "squash onto" msgstr "подаване, в което другите да се вкарат" -#: builtin/rebase.c:527 +#: builtin/rebase.c:533 msgid "the upstream commit" msgstr "подаване на източника" -#: builtin/rebase.c:529 +#: builtin/rebase.c:535 msgid "head-name" msgstr "име на върха" -#: builtin/rebase.c:529 +#: builtin/rebase.c:535 msgid "head name" msgstr "име на върха" -#: builtin/rebase.c:534 +#: builtin/rebase.c:540 msgid "rebase strategy" msgstr "стратегия на пребазиране" -#: builtin/rebase.c:535 +#: builtin/rebase.c:541 msgid "strategy-opts" msgstr "опции на стратегията" -#: builtin/rebase.c:536 +#: builtin/rebase.c:542 msgid "strategy options" msgstr "опции на стратегията" -#: builtin/rebase.c:537 +#: builtin/rebase.c:543 msgid "switch-to" msgstr "преминаване към" -#: builtin/rebase.c:538 +#: builtin/rebase.c:544 msgid "the branch or commit to checkout" msgstr "клонът, към който да се премине" -#: builtin/rebase.c:539 +#: builtin/rebase.c:545 msgid "onto-name" msgstr "име на база" -#: builtin/rebase.c:539 +#: builtin/rebase.c:545 msgid "onto name" msgstr "име на база" -#: builtin/rebase.c:540 +#: builtin/rebase.c:546 msgid "cmd" msgstr "команда" -#: builtin/rebase.c:540 +#: builtin/rebase.c:546 msgid "the command to run" msgstr "команда за изпълнение" -#: builtin/rebase.c:543 builtin/rebase.c:1415 +#: builtin/rebase.c:549 builtin/rebase.c:1421 msgid "automatically re-schedule any `exec` that fails" msgstr "" "автоматично подаване за повторно изпълнение на командите завършили с неуспех" -#: builtin/rebase.c:559 +#: builtin/rebase.c:565 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "опциите „--[no-]rebase-cousins“ изискват опцията „--rebase-merges“" -#: builtin/rebase.c:575 +#: builtin/rebase.c:581 #, c-format msgid "%s requires the merge backend" msgstr "„%s“ изисква пребазиране" -#: builtin/rebase.c:618 +#: builtin/rebase.c:624 #, c-format msgid "could not get 'onto': '%s'" msgstr "не може да се премине към новата база, зададена с „onto“: „%s“" -#: builtin/rebase.c:635 +#: builtin/rebase.c:641 #, c-format msgid "invalid orig-head: '%s'" msgstr "неправилен указател към първоначален връх „orig-head“: „%s“" -#: builtin/rebase.c:660 +#: builtin/rebase.c:666 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "неправилната стойност на „allow_rerere_autoupdate“ се прескача: „%s“" -#: builtin/rebase.c:805 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:811 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" @@ -19660,7 +19812,7 @@ msgstr "" "За да откажете пребазирането и да се върнете към първоначалното състояние,\n" "изпълнете „git rebase --abort“." -#: builtin/rebase.c:888 +#: builtin/rebase.c:894 #, c-format msgid "" "\n" @@ -19678,7 +19830,7 @@ msgstr "" "\n" "В резултат те не могат да се пребазират." -#: builtin/rebase.c:1214 +#: builtin/rebase.c:1220 #, c-format msgid "" "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" @@ -19687,7 +19839,7 @@ msgstr "" "неправилна стойност „%s“: вариантите са „drop“ (прескачане), " "„keep“ (запазване) и „ask“ (питане)" -#: builtin/rebase.c:1232 +#: builtin/rebase.c:1238 #, c-format msgid "" "%s\n" @@ -19704,7 +19856,7 @@ msgstr "" " git rebase КЛОН\n" "\n" -#: builtin/rebase.c:1248 +#: builtin/rebase.c:1254 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -19717,155 +19869,154 @@ msgstr "" "\n" " git branch --set-upstream-to=%s/КЛОН %s\n" -#: builtin/rebase.c:1278 +#: builtin/rebase.c:1284 msgid "exec commands cannot contain newlines" msgstr "командите за изпълнение не може да съдържат нови редове" -#: builtin/rebase.c:1282 +#: builtin/rebase.c:1288 msgid "empty exec command" msgstr "празна команда за изпълнение" -#: builtin/rebase.c:1312 +#: builtin/rebase.c:1318 msgid "rebase onto given branch instead of upstream" msgstr "пребазиране върху зададения, а не следения клон" -#: builtin/rebase.c:1314 +#: builtin/rebase.c:1320 msgid "use the merge-base of upstream and branch as the current base" msgstr "за текуща база да се ползва базата за сливане на клона и следеното" -#: builtin/rebase.c:1316 +#: builtin/rebase.c:1322 msgid "allow pre-rebase hook to run" msgstr "позволяване на куката преди пребазиране да се изпълни" -#: builtin/rebase.c:1318 +#: builtin/rebase.c:1324 msgid "be quiet. implies --no-stat" msgstr "без извеждане на информация. Включва опцията „--no-stat“" -#: builtin/rebase.c:1324 +#: builtin/rebase.c:1330 msgid "do not show diffstat of what changed upstream" msgstr "без извеждане на статистика с промените в следения клон" -#: builtin/rebase.c:1327 -msgid "add a Signed-off-by: line to each commit" -msgstr "" -"добавяне на ред за подпис „Signed-off-by“ в съобщението на всяко подаване" +#: builtin/rebase.c:1333 +msgid "add a Signed-off-by trailer to each commit" +msgstr "добавяне на епилог за подпис „Signed-off-by“ към всяко подаване" -#: builtin/rebase.c:1330 +#: builtin/rebase.c:1336 msgid "make committer date match author date" msgstr "датата на подаващия да отговаря на датата на автора" -#: builtin/rebase.c:1332 +#: builtin/rebase.c:1338 msgid "ignore author date and use current date" msgstr "да се ползва днешна дата, а не тази на автора" -#: builtin/rebase.c:1334 +#: builtin/rebase.c:1340 msgid "synonym of --reset-author-date" msgstr "псевдоним на „--reset-author-date“" -#: builtin/rebase.c:1336 builtin/rebase.c:1340 +#: builtin/rebase.c:1342 builtin/rebase.c:1346 msgid "passed to 'git apply'" msgstr "подава се на командата „git apply“" -#: builtin/rebase.c:1338 +#: builtin/rebase.c:1344 msgid "ignore changes in whitespace" msgstr "без промени в празните знаци" -#: builtin/rebase.c:1342 builtin/rebase.c:1345 +#: builtin/rebase.c:1348 builtin/rebase.c:1351 msgid "cherry-pick all commits, even if unchanged" msgstr "отбиране на всички подавания дори да няма промени" -#: builtin/rebase.c:1347 +#: builtin/rebase.c:1353 msgid "continue" msgstr "продължаване" -#: builtin/rebase.c:1350 +#: builtin/rebase.c:1356 msgid "skip current patch and continue" msgstr "прескачане на текущата кръпка и продължаване" -#: builtin/rebase.c:1352 +#: builtin/rebase.c:1358 msgid "abort and check out the original branch" msgstr "преустановяване и възстановяване на първоначалния клон" -#: builtin/rebase.c:1355 +#: builtin/rebase.c:1361 msgid "abort but keep HEAD where it is" msgstr "преустановяване без промяна към какво сочи „HEAD“" -#: builtin/rebase.c:1356 +#: builtin/rebase.c:1362 msgid "edit the todo list during an interactive rebase" msgstr "редактиране на файла с команди при интерактивно пребазиране" -#: builtin/rebase.c:1359 +#: builtin/rebase.c:1365 msgid "show the patch file being applied or merged" msgstr "показване на кръпката, която се прилага или слива" -#: builtin/rebase.c:1362 +#: builtin/rebase.c:1368 msgid "use apply strategies to rebase" msgstr "при пребазиране да се ползва стратегия с прилагане" -#: builtin/rebase.c:1366 +#: builtin/rebase.c:1372 msgid "use merging strategies to rebase" msgstr "при пребазиране да се ползва стратегия със сливане" -#: builtin/rebase.c:1370 +#: builtin/rebase.c:1376 msgid "let the user edit the list of commits to rebase" msgstr "" "позволяване на потребителя да редактира списъка с подавания за пребазиране" -#: builtin/rebase.c:1374 +#: builtin/rebase.c:1380 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "(ОСТАРЯЛО) пресъздаване на сливанията вместо да се прескачат" -#: builtin/rebase.c:1379 +#: builtin/rebase.c:1385 msgid "how to handle commits that become empty" msgstr "как да се обработват оказалите се празни подавания" -#: builtin/rebase.c:1386 +#: builtin/rebase.c:1392 msgid "move commits that begin with squash!/fixup! under -i" msgstr "" "преместване на подаванията, които започват със „squash!“/“fixup!“ при „-i“" -#: builtin/rebase.c:1393 +#: builtin/rebase.c:1399 msgid "add exec lines after each commit of the editable list" msgstr "" "добавяне на редове с команди за изпълнение след всяко подаване в " "редактирания списък" -#: builtin/rebase.c:1397 +#: builtin/rebase.c:1403 msgid "allow rebasing commits with empty messages" msgstr "позволяване на пребазиране на подавания с празни съобщения" -#: builtin/rebase.c:1401 +#: builtin/rebase.c:1407 msgid "try to rebase merges instead of skipping them" msgstr "опит за пребазиране на сливанията вместо те да се прескачат" -#: builtin/rebase.c:1404 +#: builtin/rebase.c:1410 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "" "за доуточняването на следения клон, използвайте:\n" "\n" " git merge-base --fork-point" -#: builtin/rebase.c:1406 +#: builtin/rebase.c:1412 msgid "use the given merge strategy" msgstr "използване на зададената стратегията на сливане" -#: builtin/rebase.c:1408 builtin/revert.c:115 +#: builtin/rebase.c:1414 builtin/revert.c:115 msgid "option" msgstr "опция" -#: builtin/rebase.c:1409 +#: builtin/rebase.c:1415 msgid "pass the argument through to the merge strategy" msgstr "аргументът да се подаде на стратегията за сливане" -#: builtin/rebase.c:1412 +#: builtin/rebase.c:1418 msgid "rebase all reachable commits up to the root(s)" msgstr "пребазиране на всички достижими подавания до началното им подаване" -#: builtin/rebase.c:1417 +#: builtin/rebase.c:1423 msgid "apply all changes, even those already present upstream" msgstr "прилагане на всички промени, дори и наличните вече в следеното" -#: builtin/rebase.c:1434 +#: builtin/rebase.c:1440 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -19873,45 +20024,45 @@ msgstr "" "поддръжката на „rebase.useBuiltin“ е премахната.\n" "За повече информация вижте „git help config“." -#: builtin/rebase.c:1440 +#: builtin/rebase.c:1446 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "" "Изглежда, че сега се прилагат кръпки чрез командата „git-am“. Не може да " "пребазирате в момента." -#: builtin/rebase.c:1481 +#: builtin/rebase.c:1487 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "" "Опцията „--preserve-merges“ е остаряла. Ползвайте „--rebase-merges“ вместо " "нея." -#: builtin/rebase.c:1486 +#: builtin/rebase.c:1492 msgid "cannot combine '--keep-base' with '--onto'" msgstr "опциите „--keep-base“ и „--onto“ са несъвместими" -#: builtin/rebase.c:1488 +#: builtin/rebase.c:1494 msgid "cannot combine '--keep-base' with '--root'" msgstr "опциите „--keep-base“ и „--root“ са несъвместими" -#: builtin/rebase.c:1492 +#: builtin/rebase.c:1498 msgid "cannot combine '--root' with '--fork-point'" msgstr "опциите „--root“ и „--fork-point“ са несъвместими" -#: builtin/rebase.c:1495 +#: builtin/rebase.c:1501 msgid "No rebase in progress?" msgstr "Изглежда в момента не тече пребазиране" -#: builtin/rebase.c:1499 +#: builtin/rebase.c:1505 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "Опцията „--edit-todo“ е достъпна само по време на интерактивно пребазиране." -#: builtin/rebase.c:1522 +#: builtin/rebase.c:1528 t/helper/test-fast-rebase.c:123 msgid "Cannot read HEAD" msgstr "Указателят „HEAD“ не може да бъде прочетен" -#: builtin/rebase.c:1534 +#: builtin/rebase.c:1540 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -19919,16 +20070,16 @@ msgstr "" "Трябва да редактирате всички конфликти при сливането. След това\n" "отбележете коригирането им чрез командата „git add“" -#: builtin/rebase.c:1553 +#: builtin/rebase.c:1559 msgid "could not discard worktree changes" msgstr "промените в работното дърво не могат да бъдат занулени" -#: builtin/rebase.c:1572 +#: builtin/rebase.c:1578 #, c-format msgid "could not move back to %s" msgstr "връщането към „%s“ е невъзможно" -#: builtin/rebase.c:1618 +#: builtin/rebase.c:1624 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -19949,138 +20100,138 @@ msgstr "" "за\n" "да не загубите случайно промени.\n" -#: builtin/rebase.c:1646 +#: builtin/rebase.c:1652 msgid "switch `C' expects a numerical value" msgstr "опцията „C“ очаква число за аргумент" -#: builtin/rebase.c:1688 +#: builtin/rebase.c:1694 #, c-format msgid "Unknown mode: %s" msgstr "Неизвестна стратегия: „%s“" -#: builtin/rebase.c:1727 +#: builtin/rebase.c:1733 msgid "--strategy requires --merge or --interactive" msgstr "" "опцията „--strategy“ изисква някоя от опциите „--merge“ или „--interactive“" -#: builtin/rebase.c:1757 +#: builtin/rebase.c:1763 msgid "cannot combine apply options with merge options" msgstr "опциите за „apply“ са несъвместими с опциите за сливане" -#: builtin/rebase.c:1770 +#: builtin/rebase.c:1776 #, c-format msgid "Unknown rebase backend: %s" msgstr "Непозната реализация на пребазиране: %s" -#: builtin/rebase.c:1795 +#: builtin/rebase.c:1806 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "" "опцията „--reschedule-failed-exec“ изисква някоя от опциите „--exec“ или „--" "interactive“" -#: builtin/rebase.c:1815 +#: builtin/rebase.c:1826 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "опциите „--preserve-merges“ и „--rebase-merges“ са несъвместими" -#: builtin/rebase.c:1819 +#: builtin/rebase.c:1830 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" "ГРЕШКА: опциите „--preserve-merges“ и „--reschedule-failed-exec“ са " "несъвместими" -#: builtin/rebase.c:1843 +#: builtin/rebase.c:1854 #, c-format msgid "invalid upstream '%s'" msgstr "неправилен следен клон: „%s“" -#: builtin/rebase.c:1849 +#: builtin/rebase.c:1860 msgid "Could not create new root commit" msgstr "Не може да се създаде ново начално подаване" -#: builtin/rebase.c:1875 +#: builtin/rebase.c:1886 #, c-format msgid "'%s': need exactly one merge base with branch" msgstr "„%s“: изисква се точно една база за сливане с клона" -#: builtin/rebase.c:1878 +#: builtin/rebase.c:1889 #, c-format msgid "'%s': need exactly one merge base" msgstr "„%s“: изисква се точно една база за пребазиране" -#: builtin/rebase.c:1886 +#: builtin/rebase.c:1897 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "Указателят „%s“ не сочи към подаване" -#: builtin/rebase.c:1912 +#: builtin/rebase.c:1923 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "ФАТАЛНА ГРЕШКА: не съществува клон „%s“" -#: builtin/rebase.c:1920 builtin/submodule--helper.c:40 +#: builtin/rebase.c:1931 builtin/submodule--helper.c:40 #: builtin/submodule--helper.c:2414 #, c-format msgid "No such ref: %s" msgstr "Такъв указател няма: %s" -#: builtin/rebase.c:1931 +#: builtin/rebase.c:1942 msgid "Could not resolve HEAD to a revision" msgstr "Подаването, сочено от указателя „HEAD“, не може да бъде открито" -#: builtin/rebase.c:1952 +#: builtin/rebase.c:1963 msgid "Please commit or stash them." msgstr "Промените трябва или да се подадат, или да се скатаят." -#: builtin/rebase.c:1988 +#: builtin/rebase.c:1999 #, c-format msgid "could not switch to %s" msgstr "не може да се премине към „%s“" -#: builtin/rebase.c:1999 +#: builtin/rebase.c:2010 msgid "HEAD is up to date." msgstr "Указателят „HEAD“ е напълно актуален." -#: builtin/rebase.c:2001 +#: builtin/rebase.c:2012 #, c-format msgid "Current branch %s is up to date.\n" msgstr "Текущият клон „%s“ е напълно актуален.\n" -#: builtin/rebase.c:2009 +#: builtin/rebase.c:2020 msgid "HEAD is up to date, rebase forced." msgstr "Указателят „HEAD“ е напълно актуален — принудително пребазиране" -#: builtin/rebase.c:2011 +#: builtin/rebase.c:2022 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "Текущият клон „%s“ е напълно актуален — принудително пребазиране\n" -#: builtin/rebase.c:2019 +#: builtin/rebase.c:2030 msgid "The pre-rebase hook refused to rebase." msgstr "Куката за изпълнение преди пребазиране отхвърли пребазирането." -#: builtin/rebase.c:2026 +#: builtin/rebase.c:2037 #, c-format msgid "Changes to %s:\n" msgstr "Промените в „%s“:\n" -#: builtin/rebase.c:2029 +#: builtin/rebase.c:2040 #, c-format msgid "Changes from %s to %s:\n" msgstr "Промените от „%s“ към „%s“:\n" -#: builtin/rebase.c:2054 +#: builtin/rebase.c:2065 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" "Първо, указателят „HEAD“ започва да сочи към базата, върху която " "пребазирате…\n" -#: builtin/rebase.c:2063 +#: builtin/rebase.c:2074 msgid "Could not detach HEAD" msgstr "Указателят „HEAD“ не може да се отделѝ" -#: builtin/rebase.c:2072 +#: builtin/rebase.c:2083 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Превъртане на „%s“ към „%s“.\n" @@ -20089,7 +20240,7 @@ msgstr "Превъртане на „%s“ към „%s“.\n" msgid "git receive-pack " msgstr "git receive-pack ДИРЕКТОРИЯ_НА_GIT" -#: builtin/receive-pack.c:1224 +#: builtin/receive-pack.c:1276 msgid "" "By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" @@ -20122,7 +20273,7 @@ msgstr "" "За да заглушите това съобщение, като запазите стандартното поведение,\n" "задайте настройката „receive.denyCurrentBranch“ да е „refuse“ (отказ)." -#: builtin/receive-pack.c:1244 +#: builtin/receive-pack.c:1296 msgid "" "By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" @@ -20143,11 +20294,11 @@ msgstr "" "За да заглушите това съобщение, задайте настройката\n" "„receive.denyDeleteCurrent“ да е „refuse“ (отказ)." -#: builtin/receive-pack.c:2422 +#: builtin/receive-pack.c:2481 msgid "quiet" msgstr "без извеждане на информация" -#: builtin/receive-pack.c:2436 +#: builtin/receive-pack.c:2495 msgid "You must specify a directory." msgstr "Трябва да укажете директория." @@ -20347,40 +20498,35 @@ msgstr "" "указването на следени клони е смислено само за отдалечени хранилища, от " "които се доставя" -#: builtin/remote.c:195 builtin/remote.c:697 +#: builtin/remote.c:195 builtin/remote.c:700 #, c-format msgid "remote %s already exists." msgstr "вече съществува отдалечено хранилище с име „%s“." -#: builtin/remote.c:199 builtin/remote.c:701 -#, c-format -msgid "'%s' is not a valid remote name" -msgstr "„%s“ е неправилно име за отдалечено хранилище" - -#: builtin/remote.c:239 +#: builtin/remote.c:240 #, c-format msgid "Could not setup master '%s'" msgstr "Основният клон „%s“ не може да бъде настроен" -#: builtin/remote.c:354 +#: builtin/remote.c:355 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "Обектите за доставяне за указателя „%s“ не могат да бъдат получени" -#: builtin/remote.c:453 builtin/remote.c:461 +#: builtin/remote.c:454 builtin/remote.c:462 msgid "(matching)" msgstr "(съвпадащи)" -#: builtin/remote.c:465 +#: builtin/remote.c:466 msgid "(delete)" msgstr "(за изтриване)" -#: builtin/remote.c:654 +#: builtin/remote.c:655 #, c-format msgid "could not set '%s'" msgstr "„%s“ не може да се зададе" -#: builtin/remote.c:659 +#: builtin/remote.c:660 #, c-format msgid "" "The %s configuration remote.pushDefault in:\n" @@ -20391,17 +20537,17 @@ msgstr "" " %s:%d\n" "използва отдалечено хранилище, което вече не съществува: „%s“" -#: builtin/remote.c:690 builtin/remote.c:833 builtin/remote.c:941 +#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:946 #, c-format msgid "No such remote: '%s'" msgstr "Няма отдалечено хранилище на име „%s“" -#: builtin/remote.c:707 +#: builtin/remote.c:710 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Разделът „%s“ в настройките не може да бъде преименуван на „%s“" -#: builtin/remote.c:727 +#: builtin/remote.c:730 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -20412,17 +20558,17 @@ msgstr "" " %s\n" " Променете настройките ръчно, ако е необходимо." -#: builtin/remote.c:767 +#: builtin/remote.c:770 #, c-format msgid "deleting '%s' failed" msgstr "неуспешно изтриване на „%s“" -#: builtin/remote.c:801 +#: builtin/remote.c:804 #, c-format msgid "creating '%s' failed" msgstr "неуспешно създаване на „%s“" -#: builtin/remote.c:877 +#: builtin/remote.c:882 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -20436,121 +20582,121 @@ msgstr[1] "" "Бележка: Няколко клона извън йерархията „refs/remotes/“ не бяха изтрити.\n" "Изтрийте ги чрез командата:" -#: builtin/remote.c:891 +#: builtin/remote.c:896 #, c-format msgid "Could not remove config section '%s'" msgstr "Разделът „%s“ в настройките не може да бъде изтрит" -#: builtin/remote.c:994 +#: builtin/remote.c:999 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " нов (следващото доставяне ще го разположи в „remotes/%s“)" -#: builtin/remote.c:997 +#: builtin/remote.c:1002 msgid " tracked" msgstr " следен" -#: builtin/remote.c:999 +#: builtin/remote.c:1004 msgid " stale (use 'git remote prune' to remove)" msgstr " стар (изтрийте чрез „git remote prune“)" -#: builtin/remote.c:1001 +#: builtin/remote.c:1006 msgid " ???" msgstr " неясно състояние" # CHECK -#: builtin/remote.c:1042 +#: builtin/remote.c:1047 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "" "неправилен клон за сливане „%s“. Невъзможно е да пребазирате върху повече " "от 1 клон" -#: builtin/remote.c:1051 +#: builtin/remote.c:1056 #, c-format msgid "rebases interactively onto remote %s" msgstr "интерактивно пребазиране върху отдалечения клон „%s“" -#: builtin/remote.c:1053 +#: builtin/remote.c:1058 #, c-format msgid "rebases interactively (with merges) onto remote %s" msgstr "интерактивно пребазиране (със сливания) върху отдалечения клон „%s“" -#: builtin/remote.c:1056 +#: builtin/remote.c:1061 #, c-format msgid "rebases onto remote %s" msgstr "пребазиране върху отдалечения клон „%s“" -#: builtin/remote.c:1060 +#: builtin/remote.c:1065 #, c-format msgid " merges with remote %s" msgstr " сливане с отдалечения клон „%s“" -#: builtin/remote.c:1063 +#: builtin/remote.c:1068 #, c-format msgid "merges with remote %s" msgstr "сливане с отдалечения клон „%s“" -#: builtin/remote.c:1066 +#: builtin/remote.c:1071 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s и с отдалечения клон „%s“\n" -#: builtin/remote.c:1109 +#: builtin/remote.c:1114 msgid "create" msgstr "създаден" -#: builtin/remote.c:1112 +#: builtin/remote.c:1117 msgid "delete" msgstr "изтрит" -#: builtin/remote.c:1116 +#: builtin/remote.c:1121 msgid "up to date" msgstr "актуален" -#: builtin/remote.c:1119 +#: builtin/remote.c:1124 msgid "fast-forwardable" msgstr "може да се превърти" -#: builtin/remote.c:1122 +#: builtin/remote.c:1127 msgid "local out of date" msgstr "локалният е изостанал" -#: builtin/remote.c:1129 +#: builtin/remote.c:1134 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s принудително изтласква към %-*s (%s)" -#: builtin/remote.c:1132 +#: builtin/remote.c:1137 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s изтласква към %-*s (%s)" -#: builtin/remote.c:1136 +#: builtin/remote.c:1141 #, c-format msgid " %-*s forces to %s" msgstr " %-*s принудително изтласква към %s" -#: builtin/remote.c:1139 +#: builtin/remote.c:1144 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s изтласква към %s" -#: builtin/remote.c:1207 +#: builtin/remote.c:1212 msgid "do not query remotes" msgstr "без заявки към отдалечените хранилища" -#: builtin/remote.c:1234 +#: builtin/remote.c:1239 #, c-format msgid "* remote %s" msgstr "● отдалечено хранилище „%s“" -#: builtin/remote.c:1235 +#: builtin/remote.c:1240 #, c-format msgid " Fetch URL: %s" msgstr " Адрес за доставяне: %s" -#: builtin/remote.c:1236 builtin/remote.c:1252 builtin/remote.c:1391 +#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396 msgid "(no URL)" msgstr "(без адрес)" @@ -20558,25 +20704,25 @@ msgstr "(без адрес)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1250 builtin/remote.c:1252 +#: builtin/remote.c:1255 builtin/remote.c:1257 #, c-format msgid " Push URL: %s" msgstr " Адрес за изтласкване: %s" -#: builtin/remote.c:1254 builtin/remote.c:1256 builtin/remote.c:1258 +#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263 #, c-format msgid " HEAD branch: %s" msgstr " клон сочен от HEAD: %s" -#: builtin/remote.c:1254 +#: builtin/remote.c:1259 msgid "(not queried)" msgstr "(без проверка)" -#: builtin/remote.c:1256 +#: builtin/remote.c:1261 msgid "(unknown)" msgstr "(непознат)" -#: builtin/remote.c:1260 +#: builtin/remote.c:1265 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" @@ -20585,153 +20731,153 @@ msgstr "" "хранилище\n" " не е еднозначен и е някой от следните):\n" -#: builtin/remote.c:1272 +#: builtin/remote.c:1277 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Отдалечен клон:%s" msgstr[1] " Отдалечени клони:%s" -#: builtin/remote.c:1275 builtin/remote.c:1301 +#: builtin/remote.c:1280 builtin/remote.c:1306 msgid " (status not queried)" msgstr " (състоянието не бе проверено)" -#: builtin/remote.c:1284 +#: builtin/remote.c:1289 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:1292 +#: builtin/remote.c:1297 msgid " Local refs will be mirrored by 'git push'" msgstr " Локалните указатели ще бъдат пренесени чрез „ push“" -#: builtin/remote.c:1298 +#: builtin/remote.c:1303 #, 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:1319 +#: builtin/remote.c:1324 msgid "set refs/remotes//HEAD according to remote" msgstr "задаване на refs/remotes/ИМЕ/HEAD според отдалеченото хранилище" -#: builtin/remote.c:1321 +#: builtin/remote.c:1326 msgid "delete refs/remotes//HEAD" msgstr "изтриване на refs/remotes/ИМЕ/HEAD" -#: builtin/remote.c:1336 +#: builtin/remote.c:1341 msgid "Cannot determine remote HEAD" msgstr "Не може да се установи отдалеченият връх" -#: builtin/remote.c:1338 +#: builtin/remote.c:1343 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" "Множество клони с върхове. Изберете изрично някой от тях чрез командата:" -#: builtin/remote.c:1348 +#: builtin/remote.c:1353 #, c-format msgid "Could not delete %s" msgstr "„%s“ не може да бъде изтрит" -#: builtin/remote.c:1356 +#: builtin/remote.c:1361 #, c-format msgid "Not a valid ref: %s" msgstr "Неправилен указател: %s" -#: builtin/remote.c:1358 +#: builtin/remote.c:1363 #, c-format msgid "Could not setup %s" msgstr "„%s“ не може да се настрои" -#: builtin/remote.c:1376 +#: builtin/remote.c:1381 #, c-format msgid " %s will become dangling!" msgstr "„%s“ ще се превърне в обект извън клоните!" -#: builtin/remote.c:1377 +#: builtin/remote.c:1382 #, c-format msgid " %s has become dangling!" msgstr "„%s“ се превърна в обект извън клоните!" -#: builtin/remote.c:1387 +#: builtin/remote.c:1392 #, c-format msgid "Pruning %s" msgstr "Окастряне на „%s“" -#: builtin/remote.c:1388 +#: builtin/remote.c:1393 #, c-format msgid "URL: %s" msgstr "адрес: %s" -#: builtin/remote.c:1404 +#: builtin/remote.c:1409 #, c-format msgid " * [would prune] %s" msgstr " ● [ще бъде окастрено] %s" -#: builtin/remote.c:1407 +#: builtin/remote.c:1412 #, c-format msgid " * [pruned] %s" msgstr " ● [окастрено] %s" -#: builtin/remote.c:1452 +#: builtin/remote.c:1457 msgid "prune remotes after fetching" msgstr "окастряне на огледалата на отдалечените хранилища след доставяне" -#: builtin/remote.c:1515 builtin/remote.c:1569 builtin/remote.c:1637 +#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647 #, c-format msgid "No such remote '%s'" msgstr "Няма отдалечено хранилище на име „%s“" -#: builtin/remote.c:1531 +#: builtin/remote.c:1539 msgid "add branch" msgstr "добавяне на клон" -#: builtin/remote.c:1538 +#: builtin/remote.c:1546 msgid "no remote specified" msgstr "не е указано отдалечено хранилище" -#: builtin/remote.c:1555 +#: builtin/remote.c:1563 msgid "query push URLs rather than fetch URLs" msgstr "запитване към адресите за изтласкване, а не за доставяне" -#: builtin/remote.c:1557 +#: builtin/remote.c:1565 msgid "return all URLs" msgstr "извеждане на всички адреси" -#: builtin/remote.c:1585 +#: builtin/remote.c:1595 #, c-format msgid "no URLs configured for remote '%s'" msgstr "не е зададен адрес за отдалеченото хранилище „%s“" -#: builtin/remote.c:1611 +#: builtin/remote.c:1621 msgid "manipulate push URLs" msgstr "промяна на адресите за изтласкване" -#: builtin/remote.c:1613 +#: builtin/remote.c:1623 msgid "add URL" msgstr "добавяне на адреси" -#: builtin/remote.c:1615 +#: builtin/remote.c:1625 msgid "delete URLs" msgstr "изтриване на адреси" -#: builtin/remote.c:1622 +#: builtin/remote.c:1632 msgid "--add --delete doesn't make sense" msgstr "опциите „--add“ и „--delete“ са несъвместими" -#: builtin/remote.c:1661 +#: builtin/remote.c:1673 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Неправилен (стар) формат за адрес: %s" -#: builtin/remote.c:1669 +#: builtin/remote.c:1681 #, c-format msgid "No such URL found: %s" msgstr "Такъв адрес не е открит: %s" -#: builtin/remote.c:1671 +#: builtin/remote.c:1683 msgid "Will not delete all non-push URLs" msgstr "Никой от адресите, които не са за изтласкване, няма да се изтрие" @@ -20754,141 +20900,128 @@ msgstr "" "командата „pack-objects“ не може да се стартира за препакетирането на " "гарантиращите обекти" -#: builtin/repack.c:236 builtin/repack.c:421 +#: builtin/repack.c:268 builtin/repack.c:447 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" "repack: от „pack-objects“ се изискват редове само с пълни шестнайсетични " "указатели." -#: builtin/repack.c:260 +#: builtin/repack.c:295 msgid "could not finish pack-objects to repack promisor objects" msgstr "" "командата „pack-objects“ не може да завърши за препакетирането на " "гарантиращите обекти" -#: builtin/repack.c:297 +#: builtin/repack.c:323 msgid "pack everything in a single pack" msgstr "пакетиране на всичко в пакет" -#: builtin/repack.c:299 +#: builtin/repack.c:325 msgid "same as -a, and turn unreachable objects loose" msgstr "" "същото като опцията „-a“. Допълнително — недостижимите обекти да станат " "непакетирани" -#: builtin/repack.c:302 +#: builtin/repack.c:328 msgid "remove redundant packs, and run git-prune-packed" msgstr "" "премахване на ненужните пакетирани файлове и изпълнение на командата „git-" "prune-packed“" -#: builtin/repack.c:304 +#: builtin/repack.c:330 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "подаване на опцията „--no-reuse-delta“ на командата „git-pack-objects“" -#: builtin/repack.c:306 +#: builtin/repack.c:332 msgid "pass --no-reuse-object to git-pack-objects" msgstr "" "подаване на опцията „--no-reuse-object“ на командата „git-pack-objects“" -#: builtin/repack.c:308 +#: builtin/repack.c:334 msgid "do not run git-update-server-info" msgstr "без изпълнение на командата „git-update-server-info“" -#: builtin/repack.c:311 +#: builtin/repack.c:337 msgid "pass --local to git-pack-objects" msgstr "подаване на опцията „--local“ на командата „git-pack-objects“" -#: builtin/repack.c:313 +#: builtin/repack.c:339 msgid "write bitmap index" msgstr "създаване и записване на индекси на база битови маски" -#: builtin/repack.c:315 +#: builtin/repack.c:341 msgid "pass --delta-islands to git-pack-objects" msgstr "подаване на опцията „--delta-islands“ на командата „git-pack-objects“" -#: builtin/repack.c:316 +#: builtin/repack.c:342 msgid "approxidate" msgstr "евристична дата" -#: builtin/repack.c:317 +#: builtin/repack.c:343 msgid "with -A, do not loosen objects older than this" msgstr "" "при комбинирането с опцията „-A“ — без разпакетиране на обектите по стари от " "това" -#: builtin/repack.c:319 +#: builtin/repack.c:345 msgid "with -a, repack unreachable objects" msgstr "с „-a“ — препакетиране на недостижимите обекти" -#: builtin/repack.c:321 +#: builtin/repack.c:347 msgid "size of the window used for delta compression" msgstr "размер на прозореца за делта компресията" -#: builtin/repack.c:322 builtin/repack.c:328 +#: builtin/repack.c:348 builtin/repack.c:354 msgid "bytes" msgstr "байтове" -#: builtin/repack.c:323 +#: builtin/repack.c:349 msgid "same as the above, but limit memory size instead of entries count" msgstr "" "същото като горната опция, но ограничението да е по размер на паметта, а не " "по броя на обектите" -#: builtin/repack.c:325 +#: builtin/repack.c:351 msgid "limits the maximum delta depth" msgstr "ограничаване на максималната дълбочина на делтата" -#: builtin/repack.c:327 +#: builtin/repack.c:353 msgid "limits the maximum number of threads" msgstr "ограничаване на максималния брой нишки" -#: builtin/repack.c:329 +#: builtin/repack.c:355 msgid "maximum size of each packfile" msgstr "максимален размер на всеки пакет" -#: builtin/repack.c:331 +#: builtin/repack.c:357 msgid "repack objects in packs marked with .keep" msgstr "препакетиране на обектите в пакети белязани с „.keep“" -#: builtin/repack.c:333 +#: builtin/repack.c:359 msgid "do not repack this pack" msgstr "без препакетиране на този пакет" -#: builtin/repack.c:343 +#: builtin/repack.c:369 msgid "cannot delete packs in a precious-objects repo" msgstr "пакетите в хранилище с важни обекти не може да се трият" -#: builtin/repack.c:347 +#: builtin/repack.c:373 msgid "--keep-unreachable and -A are incompatible" msgstr "Опциите „--keep-unreachable“ и „-A“ са несъвместими" -#: builtin/repack.c:430 +#: builtin/repack.c:456 msgid "Nothing new to pack." msgstr "Нищо ново за пакетиране" #: builtin/repack.c:486 #, c-format -msgid "" -"WARNING: Some packs in use have been renamed by\n" -"WARNING: prefixing old- to their name, in order to\n" -"WARNING: replace them with the new version of the\n" -"WARNING: file. But the operation failed, and the\n" -"WARNING: attempt to rename them back to their\n" -"WARNING: original names also failed.\n" -"WARNING: Please rename them in %s manually:\n" -msgstr "" -"ПРЕДУПРЕЖДЕНИЕ: За да бъдат заменени с нови версии, някои\n" -"ПРЕДУПРЕЖДЕНИЕ: пакетни файлове бяха преименувани, като към\n" -"ПРЕДУПРЕЖДЕНИЕ: имената им бе добавен префиксът „old-“.\n" -"ПРЕДУПРЕЖДЕНИЕ: Тази операция бе неуспешна, както и обратната\n" -"ПРЕДУПРЕЖДЕНИЕ: ѝ — за връщането на първоначалните имена.\n" -"ПРЕДУПРЕЖДЕНИЕ: Преименувайте файловете в „%s“ ръчно:\n" +msgid "missing required file: %s" +msgstr "липсва задължителния файл „%s“" -#: builtin/repack.c:534 +#: builtin/repack.c:488 #, c-format -msgid "failed to remove '%s'" -msgstr "директорията „%s“ не може да бъде изтрита" +msgid "could not unlink: %s" +msgstr "неуспешно изтриване на „%s“" #: builtin/replace.c:22 msgid "git replace [-f] " @@ -21219,8 +21352,8 @@ msgstr "Указателят „HEAD“ сочи към „%s“" msgid "Cannot do a %s reset in the middle of a merge." msgstr "Не може да се извърши %s зануляване по време на сливане." -#: builtin/reset.c:295 builtin/stash.c:520 builtin/stash.c:595 -#: builtin/stash.c:619 +#: builtin/reset.c:295 builtin/stash.c:520 builtin/stash.c:594 +#: builtin/stash.c:618 msgid "be quiet, only report errors" msgstr "по-малко подробности, да се извеждат само грешките" @@ -21432,11 +21565,11 @@ msgstr "запазване на първоначално празните под msgid "keep redundant, empty commits" msgstr "запазване на излишните, празни подавания" -#: builtin/revert.c:232 +#: builtin/revert.c:239 msgid "revert failed" msgstr "неуспешна отмяна" -#: builtin/revert.c:245 +#: builtin/revert.c:252 msgid "cherry-pick failed" msgstr "неуспешно отбиране" @@ -21542,78 +21675,78 @@ msgstr "" "pack=ПАКЕТ] [--verbose] [--thin] [--atomic] [ХОСТ:]ДИРЕКТОРИЯ [УКАЗАТЕЛ…]\n" " опцията „--all“ и изричното посочване на УКАЗАТЕЛ са взаимно несъвместими." -#: builtin/send-pack.c:182 +#: builtin/send-pack.c:188 msgid "remote name" msgstr "име на отдалечено хранилище" -#: builtin/send-pack.c:195 +#: builtin/send-pack.c:201 msgid "use stateless RPC protocol" msgstr "използване на протокол без запазване на състоянието за RPC" -#: builtin/send-pack.c:196 +#: builtin/send-pack.c:202 msgid "read refs from stdin" msgstr "четене на указателите от стандартния вход" -#: builtin/send-pack.c:197 +#: builtin/send-pack.c:203 msgid "print status from remote helper" msgstr "извеждане на състоянието от отдалечената помощна функция" -#: builtin/shortlog.c:15 +#: builtin/shortlog.c:16 msgid "git shortlog [] [] [[--] ...]" msgstr "git shortlog [ОПЦИЯ…] [ДИАПАЗОН_НА_ВЕРСИИТЕ] [[--] [ПЪТ…]]" -#: builtin/shortlog.c:16 +#: builtin/shortlog.c:17 msgid "git log --pretty=short | git shortlog []" msgstr "git log --pretty=short | git shortlog [ОПЦИЯ…]" -#: builtin/shortlog.c:134 +#: builtin/shortlog.c:135 msgid "using multiple --group options with stdin is not supported" msgstr "повече от една опции „--group“ са несъвместими със стандартния вход" -#: builtin/shortlog.c:144 +#: builtin/shortlog.c:145 msgid "using --group=trailer with stdin is not supported" msgstr "опцията „--group=trailer“ е несъвместима със стандартния вход" -#: builtin/shortlog.c:388 +#: builtin/shortlog.c:335 #, c-format msgid "unknown group type: %s" msgstr "неизвестен вид група: %s" -#: builtin/shortlog.c:416 +#: builtin/shortlog.c:363 msgid "Group by committer rather than author" msgstr "Групиране по подаващ, а не по автор" -#: builtin/shortlog.c:419 +#: builtin/shortlog.c:366 msgid "sort output according to the number of commits per author" msgstr "подредба на подаванията по броя подавания от автор" -#: builtin/shortlog.c:421 +#: builtin/shortlog.c:368 msgid "Suppress commit descriptions, only provides commit count" msgstr "Без описания на подаванията — да се показва само броя подавания" -#: builtin/shortlog.c:423 +#: builtin/shortlog.c:370 msgid "Show the email address of each author" msgstr "Извеждане на адреса на е-поща за всеки автор" -#: builtin/shortlog.c:424 +#: builtin/shortlog.c:371 msgid "[,[,]]" msgstr "<ШИРОЧИНА>[,<ОТСТЪП_1>[,<ОТСТЪП_2>]]" -#: builtin/shortlog.c:425 +#: builtin/shortlog.c:372 msgid "Linewrap output" msgstr "" "Пренасяне на редовете до тази обща ШИРОЧИНА (76), с ОТСТЪП_1 (6) за първия " "ред и ОТСТЪП_2 (9) за останалите" -#: builtin/shortlog.c:427 +#: builtin/shortlog.c:374 msgid "field" msgstr "поле" -#: builtin/shortlog.c:428 +#: builtin/shortlog.c:375 msgid "Group by field" msgstr "Групиране по поле" -#: builtin/shortlog.c:456 +#: builtin/shortlog.c:403 msgid "too many arguments given outside repository" msgstr "прекалено много аргументи извън хранилище" @@ -21984,7 +22117,7 @@ msgid "could not generate diff %s^!." msgstr "файлът с разликите „%s^!“ не може да се генерира" #: builtin/stash.c:422 -msgid "conflicts in index.Try without --index." +msgid "conflicts in index. Try without --index." msgstr "" "в индекса има конфликти. Пробвайте да изпълните командата без опцията „--" "index“." @@ -22006,120 +22139,120 @@ msgstr "Сливане на „%s“ с „%s“" msgid "Index was not unstashed." msgstr "Индексът не е изваден от скатаното." -#: builtin/stash.c:522 builtin/stash.c:621 +#: builtin/stash.c:522 builtin/stash.c:620 msgid "attempt to recreate the index" msgstr "опит за повторно създаване на индекса" -#: builtin/stash.c:555 +#: builtin/stash.c:566 #, c-format msgid "Dropped %s (%s)" msgstr "Изтрито: „%s“ (%s)" -#: builtin/stash.c:558 +#: builtin/stash.c:569 #, 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 +#: builtin/stash.c:632 msgid "The stash entry is kept in case you need it again." msgstr "Скатаното е запазено в случай, че ви потрябва отново." -#: builtin/stash.c:656 +#: builtin/stash.c:655 msgid "No branch name specified" msgstr "Не е указано име на клон" -#: builtin/stash.c:800 builtin/stash.c:837 +#: builtin/stash.c:799 builtin/stash.c:836 #, c-format msgid "Cannot update %s with %s" msgstr "Указателят „%s“ не може да бъде обновен да сочи към „%s“" -#: builtin/stash.c:818 builtin/stash.c:1472 builtin/stash.c:1537 +#: builtin/stash.c:817 builtin/stash.c:1471 builtin/stash.c:1536 msgid "stash message" msgstr "съобщение при скатаване" -#: builtin/stash.c:828 +#: builtin/stash.c:827 msgid "\"git stash store\" requires one argument" msgstr "командата „git stash store“ изисква точно един аргумент-ПОДАВАНЕ" -#: builtin/stash.c:1043 +#: builtin/stash.c:1042 msgid "No changes selected" msgstr "Не са избрани никакви промени" -#: builtin/stash.c:1143 +#: builtin/stash.c:1142 msgid "You do not have the initial commit yet" msgstr "Все още липсва първоначално подаване" -#: builtin/stash.c:1170 +#: builtin/stash.c:1169 msgid "Cannot save the current index state" msgstr "Състоянието на текущия индекс не може да бъде запазено" -#: builtin/stash.c:1179 +#: builtin/stash.c:1178 msgid "Cannot save the untracked files" msgstr "Неследените файлове не могат да се запазят" -#: builtin/stash.c:1190 builtin/stash.c:1199 +#: builtin/stash.c:1189 builtin/stash.c:1198 msgid "Cannot save the current worktree state" msgstr "Състоянието на работното дърво не може да бъде запазено" -#: builtin/stash.c:1227 +#: builtin/stash.c:1226 msgid "Cannot record working tree state" msgstr "Състоянието на работното дърво не може да бъде запазено" -#: builtin/stash.c:1276 +#: builtin/stash.c:1275 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "Опцията „--patch“ е несъвместима с „--include-untracked“ и „--all“" -#: builtin/stash.c:1292 +#: builtin/stash.c:1291 msgid "Did you forget to 'git add'?" msgstr "Пробвайте да използвате „git add“" -#: builtin/stash.c:1307 +#: builtin/stash.c:1306 msgid "No local changes to save" msgstr "Няма никакви локални промени за скатаване" -#: builtin/stash.c:1314 +#: builtin/stash.c:1313 msgid "Cannot initialize stash" msgstr "Скатаването не може да стартира" -#: builtin/stash.c:1329 +#: builtin/stash.c:1328 msgid "Cannot save the current status" msgstr "Текущото състояние не може да бъде запазено" -#: builtin/stash.c:1334 +#: builtin/stash.c:1333 #, c-format msgid "Saved working directory and index state %s" msgstr "Състоянието на работната директория и индекса e запазено: „%s“" -#: builtin/stash.c:1424 +#: builtin/stash.c:1423 msgid "Cannot remove worktree changes" msgstr "Промените в работното дърво не могат да бъдат занулени" -#: builtin/stash.c:1463 builtin/stash.c:1528 +#: builtin/stash.c:1462 builtin/stash.c:1527 msgid "keep index" msgstr "запазване на индекса" -#: builtin/stash.c:1465 builtin/stash.c:1530 +#: builtin/stash.c:1464 builtin/stash.c:1529 msgid "stash in patch mode" msgstr "скатаване в режим за кръпки" -#: builtin/stash.c:1466 builtin/stash.c:1531 +#: builtin/stash.c:1465 builtin/stash.c:1530 msgid "quiet mode" msgstr "без извеждане на информация" -#: builtin/stash.c:1468 builtin/stash.c:1533 +#: builtin/stash.c:1467 builtin/stash.c:1532 msgid "include untracked files in stash" msgstr "скатаване и на неследените файлове" -#: builtin/stash.c:1470 builtin/stash.c:1535 +#: builtin/stash.c:1469 builtin/stash.c:1534 msgid "include ignore files" msgstr "скатаване и на игнорираните файлове" -#: builtin/stash.c:1570 +#: builtin/stash.c:1569 msgid "" "the stash.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -22264,7 +22397,7 @@ msgstr "неуспешно рекурсивно обхождане на подм #: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623 msgid "Suppress submodule status output" -msgstr "Заглушаване на изхода за състоянието на подмодула" +msgstr "Без изход за състоянието на подмодула" #: builtin/submodule--helper.c:887 msgid "" @@ -22633,7 +22766,7 @@ msgstr "git submodule--helper config --unset ИМЕ" msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2665 git-submodule.sh:151 +#: builtin/submodule--helper.c:2665 git-submodule.sh:150 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "файлът „.gitmodules“ трябва да е в работното дърво" @@ -22671,7 +22804,7 @@ msgstr "необходимо е една от опциите „--branch“ и msgid "--branch and --default are mutually exclusive" msgstr "опциите „--branch“ и „--default“ са несъвместими" -#: builtin/submodule--helper.c:2792 git.c:438 git.c:710 +#: builtin/submodule--helper.c:2792 git.c:438 git.c:711 #, c-format msgid "%s doesn't support --super-prefix" msgstr "„%s“ не поддържа опцията „--super-prefix“" @@ -22701,11 +22834,11 @@ msgstr "изтриване на символен указател" msgid "shorten ref output" msgstr "кратка информация за указателя" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499 msgid "reason" msgstr "причина" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499 msgid "reason of the update" msgstr "причина за обновяването" @@ -22853,7 +22986,7 @@ msgstr "използване на друг ключ за подписванет msgid "replace the tag if exists" msgstr "замяна на етикета, ако съществува" -#: builtin/tag.c:422 builtin/update-ref.c:492 +#: builtin/tag.c:422 builtin/update-ref.c:505 msgid "create a reflog" msgstr "създаване на журнал на указателите" @@ -23225,21 +23358,21 @@ msgstr "git update-ref [ОПЦИЯ…] ИМЕ_НА_УКАЗАТЕЛ НОВА_С msgid "git update-ref [] --stdin [-z]" msgstr "git update-ref [ОПЦИЯ…] --stdin [-z]" -#: builtin/update-ref.c:487 +#: builtin/update-ref.c:500 msgid "delete the reference" msgstr "изтриване на указателя" -#: builtin/update-ref.c:489 +#: builtin/update-ref.c:502 msgid "update not the one it points to" msgstr "обновяване на ИМЕто_НА_УКАЗАТЕЛя, а не това, към което сочи" -#: builtin/update-ref.c:490 +#: builtin/update-ref.c:503 msgid "stdin has NUL-terminated arguments" msgstr "" "някои от елементите подадени на стандартния вход завършват с нулевия знак " "„NUL“" -#: builtin/update-ref.c:491 +#: builtin/update-ref.c:504 msgid "read updates from stdin" msgstr "изчитане на указателите от стандартния вход" @@ -23332,7 +23465,7 @@ msgstr "git worktree remove [ОПЦИЯ…] [ДЪРВО]" msgid "git worktree unlock " msgstr "git worktree unlock [ПЪТ]" -#: builtin/worktree.c:60 builtin/worktree.c:970 +#: builtin/worktree.c:60 builtin/worktree.c:973 #, c-format msgid "failed to delete '%s'" msgstr "неуспешно изтриване на „%s“" @@ -23471,57 +23604,57 @@ msgstr "Опциите „-b“, „-B“ и „--detach“ са несъвме msgid "--[no-]track can only be used if a new branch is created" msgstr "„--[no-]track“ може да се използва само при създаването на нов клон" -#: builtin/worktree.c:755 +#: builtin/worktree.c:758 msgid "reason for locking" msgstr "причина за заключване" -#: builtin/worktree.c:767 builtin/worktree.c:800 builtin/worktree.c:874 -#: builtin/worktree.c:998 +#: builtin/worktree.c:770 builtin/worktree.c:803 builtin/worktree.c:877 +#: builtin/worktree.c:1001 #, c-format msgid "'%s' is not a working tree" msgstr "„%s“ не е работно дърво" -#: builtin/worktree.c:769 builtin/worktree.c:802 +#: builtin/worktree.c:772 builtin/worktree.c:805 msgid "The main working tree cannot be locked or unlocked" msgstr "Основното дърво не може да се отключи или заключи" -#: builtin/worktree.c:774 +#: builtin/worktree.c:777 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "„%s“ вече е заключено, защото „%s“" -#: builtin/worktree.c:776 +#: builtin/worktree.c:779 #, c-format msgid "'%s' is already locked" msgstr "„%s“ вече е заключено" -#: builtin/worktree.c:804 +#: builtin/worktree.c:807 #, c-format msgid "'%s' is not locked" msgstr "„%s“ не е заключено" -#: builtin/worktree.c:845 +#: builtin/worktree.c:848 msgid "working trees containing submodules cannot be moved or removed" msgstr "" "не може да местите или изтривате работни дървета, в които има подмодули" -#: builtin/worktree.c:853 +#: builtin/worktree.c:856 msgid "force move even if worktree is dirty or locked" msgstr "" "принудително преместване, дори работното дърво да не е чисто или да е " "заключено" -#: builtin/worktree.c:876 builtin/worktree.c:1000 +#: builtin/worktree.c:879 builtin/worktree.c:1003 #, c-format msgid "'%s' is a main working tree" msgstr "„%s“ е основно работно дърво" -#: builtin/worktree.c:881 +#: builtin/worktree.c:884 #, c-format msgid "could not figure out destination name from '%s'" msgstr "името на целта не може да се определи от „%s“" -#: builtin/worktree.c:894 +#: builtin/worktree.c:897 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -23530,7 +23663,7 @@ msgstr "" "не може да преместите заключено работно дърво, причина за заключването: %s\n" "или го отключете, или го преместете принудително с „move -f -f“" -#: builtin/worktree.c:896 +#: builtin/worktree.c:899 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -23538,41 +23671,41 @@ msgstr "" "не може да преместите заключено работно дърво:\n" "или го отключете, или го преместете принудително с „move -f -f“" -#: builtin/worktree.c:899 +#: builtin/worktree.c:902 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "" "проверките са неуспешни, работното дърво не може да бъде преместено: %s" -#: builtin/worktree.c:904 +#: builtin/worktree.c:907 #, c-format msgid "failed to move '%s' to '%s'" msgstr "„%s“ не може да се премести в „%s“" -#: builtin/worktree.c:950 +#: builtin/worktree.c:953 #, c-format msgid "failed to run 'git status' on '%s'" -msgstr "не може да изпълни „git status“ върху „%s“" +msgstr "неуспешно изпълнение на „git status“ върху „%s“" -#: builtin/worktree.c:954 +#: builtin/worktree.c:957 #, c-format msgid "'%s' contains modified or untracked files, use --force to delete it" msgstr "" "„%s“ съдържа променени или нови файлове, за принудително изтриване е " "необходима опцията „--force“" -#: builtin/worktree.c:959 +#: builtin/worktree.c:962 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "" "командата „git status“ не може да се изпълни за „%s“, код за грешка: %d" -#: builtin/worktree.c:982 +#: builtin/worktree.c:985 msgid "force removal even if worktree is dirty or locked" msgstr "" "принудително изтриване, дори работното дърво да не е чисто или да е заключено" -#: builtin/worktree.c:1005 +#: builtin/worktree.c:1008 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -23581,7 +23714,7 @@ msgstr "" "не може да изтриете заключено работно дърво, причина за заключването: %s\n" "или го отключете, или го изтрийте принудително с „remove -f -f“" -#: builtin/worktree.c:1007 +#: builtin/worktree.c:1010 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -23589,17 +23722,17 @@ msgstr "" "не може да изтриете заключено работно дърво:\n" "или го отключете, или го изтрийте принудително с „remove -f -f“" -#: builtin/worktree.c:1010 +#: builtin/worktree.c:1013 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "проверките са неуспешни, работното дърво не може да бъде изтрито: %s" -#: builtin/worktree.c:1034 +#: builtin/worktree.c:1037 #, c-format msgid "repair: %s: %s" msgstr "поправяне: %s: „%s“" -#: builtin/worktree.c:1037 +#: builtin/worktree.c:1040 #, c-format msgid "error: %s: %s" msgstr "грешка: %s: „%s“" @@ -23629,6 +23762,14 @@ msgstr "опцията „--packfile“ изисква валидна контр msgid "not a git repository" msgstr "не е хранилище на Git" +#: t/helper/test-fast-rebase.c:141 +msgid "unhandled options" +msgstr "неподдържани опции" + +#: t/helper/test-fast-rebase.c:146 +msgid "error preparing revisions" +msgstr "грешка при подготовката на версии" + #: t/helper/test-reach.c:154 #, c-format msgid "commit %s is not marked reachable" @@ -23746,17 +23887,17 @@ msgstr "неизвестна грешка при запис на стандар msgid "close failed on standard output" msgstr "грешка при затваряне на стандартния изход" -#: git.c:819 +#: git.c:820 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "зацикляне в псевдонимите: заместванията на „%s“ не приключват:%s" -#: git.c:869 +#: git.c:870 #, c-format msgid "cannot handle %s as a builtin" msgstr "„%s“ не може да се обработи като вградена команда" -#: git.c:882 +#: git.c:883 #, c-format msgid "" "usage: %s\n" @@ -23765,14 +23906,14 @@ msgstr "" "употреба: %s\n" "\n" -#: git.c:902 +#: git.c:903 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "" "неуспешно заместване на псевдонима „%s“ — резултатът „%s“ не е команда на " "git\n" -#: git.c:914 +#: git.c:915 #, c-format msgid "failed to run command '%s': %s\n" msgstr "командата „%s“ не може да се изпълни: %s\n" @@ -23829,143 +23970,143 @@ msgstr "" " ● заявен адрес: %s\n" " ● пренасочване: %s" -#: remote-curl.c:174 +#: remote-curl.c:183 #, c-format msgid "invalid quoting in push-option value: '%s'" msgstr "" "неправилно екраниране или цитиране в стойността към опция за изтласкване: " "„%s“" -#: remote-curl.c:298 +#: remote-curl.c:307 #, c-format msgid "%sinfo/refs not valid: is this a git repository?" msgstr "„%sinfo/refs“ е неизползваемо, проверете дали е хранилище на git" -#: remote-curl.c:399 +#: remote-curl.c:408 msgid "invalid server response; expected service, got flush packet" msgstr "" "неправилен отговор от сървъра: очакваше се услуга, а бе получен изчистващ " "пакет „flush“" -#: remote-curl.c:430 +#: remote-curl.c:439 #, c-format msgid "invalid server response; got '%s'" msgstr "неправилен отговор от сървъра, бе получено: „%s“" -#: remote-curl.c:490 +#: remote-curl.c:499 #, c-format msgid "repository '%s' not found" msgstr "хранилището „%s“ липсва" -#: remote-curl.c:494 +#: remote-curl.c:503 #, c-format msgid "Authentication failed for '%s'" msgstr "Неуспешна идентификация към „%s“" -#: remote-curl.c:498 +#: remote-curl.c:507 #, c-format msgid "unable to access '%s': %s" msgstr "няма достъп до „%s“: %s" -#: remote-curl.c:504 +#: remote-curl.c:513 #, c-format msgid "redirecting to %s" msgstr "пренасочване към „%s“" -#: remote-curl.c:633 +#: remote-curl.c:642 msgid "shouldn't have EOF when not gentle on EOF" msgstr "получен е EOF, в режим без поддръжка за това" -#: remote-curl.c:645 +#: remote-curl.c:654 msgid "remote server sent stateless separator" msgstr "отдалеченият сървър изпрати разделител без запазване на състоянието" -#: remote-curl.c:715 +#: remote-curl.c:724 msgid "unable to rewind rpc post data - try increasing http.postBuffer" msgstr "" "данните за POST не могат да се прочетат наново, пробвайте да увеличите " "настройката „http.postBuffer“" -#: remote-curl.c:745 +#: remote-curl.c:754 #, c-format msgid "remote-curl: bad line length character: %.4s" msgstr "remote-curl: неправилeн знак за дължина на ред: %.4s" -#: remote-curl.c:747 +#: remote-curl.c:756 msgid "remote-curl: unexpected response end packet" msgstr "remote-curl: неочакван пакет за край на отговор" -#: remote-curl.c:823 +#: remote-curl.c:832 #, c-format msgid "RPC failed; %s" msgstr "Неуспешно отдалечено извикване. %s" -#: remote-curl.c:863 +#: remote-curl.c:872 msgid "cannot handle pushes this big" msgstr "толкова големи изтласквания не може да се изпълнят" -#: remote-curl.c:978 +#: remote-curl.c:987 #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "" "заявката не може да бъде декомпресирана, грешка от „zlib“ при " "декомпресиране: %d" -#: remote-curl.c:982 +#: remote-curl.c:991 #, c-format msgid "cannot deflate request; zlib end error %d" msgstr "" "заявката не може да бъде декомпресирана; грешка от „zlib“ при завършване: %d<" -#: remote-curl.c:1032 +#: remote-curl.c:1041 #, c-format msgid "%d bytes of length header were received" msgstr "получени са %d байта от заглавна част" -#: remote-curl.c:1034 +#: remote-curl.c:1043 #, c-format msgid "%d bytes of body are still expected" msgstr "очакват се още %d байта от тялото на отговора" -#: remote-curl.c:1123 +#: remote-curl.c:1132 msgid "dumb http transport does not support shallow capabilities" msgstr "опростеният транспорт по http не поддържа плитки клиенти" -#: remote-curl.c:1138 +#: remote-curl.c:1147 msgid "fetch failed." msgstr "неуспешно доставяне." -#: remote-curl.c:1184 +#: remote-curl.c:1193 msgid "cannot fetch by sha1 over smart http" msgstr "умният вариант на http не може да доставя по SHA1" -#: remote-curl.c:1228 remote-curl.c:1234 +#: remote-curl.c:1237 remote-curl.c:1243 #, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "протоколна грешка: очаква се SHA1 или указател, а бе получено: „%s“" -#: remote-curl.c:1246 remote-curl.c:1361 +#: remote-curl.c:1255 remote-curl.c:1373 #, c-format msgid "http transport does not support %s" msgstr "транспортът по http не поддържа „%s“" -#: remote-curl.c:1282 +#: remote-curl.c:1291 msgid "git-http-push failed" msgstr "неуспешно изпълнение на „git-http-push“" -#: remote-curl.c:1467 +#: remote-curl.c:1479 msgid "remote-curl: usage: git remote-curl []" msgstr "remote-curl: употреба: git remote-curl ХРАНИЛИЩЕ [АДРЕС]" -#: remote-curl.c:1499 +#: remote-curl.c:1511 msgid "remote-curl: error reading command stream from git" msgstr "remote-curl: грешка при изчитането на потока команди от git" -#: remote-curl.c:1506 +#: remote-curl.c:1518 msgid "remote-curl: fetch attempted without a local repo" msgstr "remote-curl: опит за доставяне без локално хранилище" -#: remote-curl.c:1547 +#: remote-curl.c:1559 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl: непозната команда „%s“ от git" @@ -24253,177 +24394,176 @@ msgid "Output information on each ref" msgstr "Извеждане на информацията за всеки указател" #: command-list.h:99 +msgid "Run a Git command on a list of repositories" +msgstr "Изпълняване на команда на git за всяко хранилище от списъка" + +#: command-list.h:100 msgid "Prepare patches for e-mail submission" msgstr "Подготвяне на кръпки за изпращане по е-поща" -#: command-list.h:100 +#: command-list.h:101 msgid "Verifies the connectivity and validity of the objects in the database" msgstr "Проверка на обектите и връзките тях в базата от данни за обектите" -#: command-list.h:101 +#: command-list.h:102 msgid "Cleanup unnecessary files and optimize the local repository" msgstr "Изчистване на ненужните файлове и оптимизиране на локалното хранилище" -#: command-list.h:102 +#: command-list.h:103 msgid "Extract commit ID from an archive created using git-archive" msgstr "Извеждане на идентификатора на подаване от архив на „git-archive“" -#: command-list.h:103 +#: command-list.h:104 msgid "Print lines matching a pattern" msgstr "Извеждане на редовете напасващи на шаблон" -#: command-list.h:104 +#: command-list.h:105 msgid "A portable graphical interface to Git" msgstr "Графичен интерфейс към Git" -#: command-list.h:105 +#: command-list.h:106 msgid "Compute object ID and optionally creates a blob from a file" msgstr "" "Изчисляване на идентификатор на обект и евентуално създаване на обект-BLOB " "от файл" -#: command-list.h:106 +#: command-list.h:107 msgid "Display help information about Git" msgstr "Извеждане на помощта за Git" -#: command-list.h:107 +#: command-list.h:108 msgid "Server side implementation of Git over HTTP" msgstr "Сървърна реализация на Git по HTTP" -#: command-list.h:108 +#: command-list.h:109 msgid "Download from a remote Git repository via HTTP" msgstr "Изтегляне на отдалечено хранилище по HTTP" -#: command-list.h:109 +#: command-list.h:110 msgid "Push objects over HTTP/DAV to another repository" msgstr "Изтласкване на обекти по HTTP/DAV към друго хранилище" -#: command-list.h:110 +#: command-list.h:111 msgid "Send a collection of patches from stdin to an IMAP folder" msgstr "Изпращане на поредица от кръпки на стандартния вход към папка по IMAP" -#: command-list.h:111 +#: command-list.h:112 msgid "Build pack index file for an existing packed archive" msgstr "Създаване на пакетен индекс за съществуващ пакетиран архив" -#: command-list.h:112 +#: command-list.h:113 msgid "Create an empty Git repository or reinitialize an existing one" msgstr "Създаване на празно хранилище на Git или зануляване на съществуващо" -#: command-list.h:113 +#: command-list.h:114 msgid "Instantly browse your working repository in gitweb" msgstr "Незабавно разглеждане на работното ви хранилище чрез „gitweb“" -#: command-list.h:114 +#: command-list.h:115 msgid "Add or parse structured information in commit messages" msgstr "" "Добавяне или обработка на структурирана информация в съобщенията при подаване" -#: command-list.h:115 +#: command-list.h:116 msgid "The Git repository browser" msgstr "Разглеждане на хранилище на Git" -#: command-list.h:116 +#: command-list.h:117 msgid "Show commit logs" msgstr "Извеждане на журнала с подаванията" -#: command-list.h:117 +#: command-list.h:118 msgid "Show information about files in the index and the working tree" msgstr "Извеждане на информация за файловете в индекса и работното дърво" -#: command-list.h:118 +#: command-list.h:119 msgid "List references in a remote repository" msgstr "Извеждане на указателите в отдалечено хранилище" -#: command-list.h:119 +#: command-list.h:120 msgid "List the contents of a tree object" msgstr "Извеждане на съдържанието на обект-дърво" -#: command-list.h:120 +#: command-list.h:121 msgid "Extracts patch and authorship from a single e-mail message" msgstr "Изваждане на кръпка и авторството от е-писмо" -#: command-list.h:121 +#: command-list.h:122 msgid "Simple UNIX mbox splitter program" msgstr "Проста програма за разделяне на файлове във формат UNIX mbox" -#: command-list.h:122 +#: command-list.h:123 msgid "Run tasks to optimize Git repository data" msgstr "Изпълнение на задачи за оптимизиране на хранилището на Git" -#: command-list.h:123 +#: command-list.h:124 msgid "Join two or more development histories together" msgstr "Сливане на две или повече поредици/истории от промени" -#: command-list.h:124 +#: command-list.h:125 msgid "Find as good common ancestors as possible for a merge" msgstr "Откриване на най-подходящите общи предшественици за сливане" -#: command-list.h:125 +#: command-list.h:126 msgid "Run a three-way file merge" msgstr "Изпълнение на тройно сливане" -#: command-list.h:126 +#: command-list.h:127 msgid "Run a merge for files needing merging" msgstr "Сливане на файловете, които се нуждаят от това" -#: command-list.h:127 +#: command-list.h:128 msgid "The standard helper program to use with git-merge-index" msgstr "Стандартната помощна програма за „git-merge-index“" -#: command-list.h:128 +#: command-list.h:129 msgid "Run merge conflict resolution tools to resolve merge conflicts" msgstr "Изпълнение на програмите за коригиране на конфликтите при сливане" -#: command-list.h:129 +#: command-list.h:130 msgid "Show three-way merge without touching index" msgstr "Извеждане на тройно сливане без промяна на индекса" -#: command-list.h:130 +#: command-list.h:131 msgid "Write and verify multi-pack-indexes" msgstr "Запис и проверка на индексите за множество пакети" -#: command-list.h:131 +#: command-list.h:132 msgid "Creates a tag object" msgstr "Създаване на обект-етикет" -#: command-list.h:132 +#: command-list.h:133 msgid "Build a tree-object from ls-tree formatted text" msgstr "Създаване на обект-дърво от текст във формат „ls-tree“" -#: command-list.h:133 +#: command-list.h:134 msgid "Move or rename a file, a directory, or a symlink" msgstr "Преместване или преименуване на файл, директория или символна връзка" -#: command-list.h:134 +#: command-list.h:135 msgid "Find symbolic names for given revs" msgstr "Откриване на имената дадени на версия" -#: command-list.h:135 +#: command-list.h:136 msgid "Add or inspect object notes" msgstr "Добавяне или преглед на бележки към обект" -#: command-list.h:136 +#: command-list.h:137 msgid "Import from and submit to Perforce repositories" msgstr "Внасяне и подаване към хранилища на Perforce" -#: command-list.h:137 +#: command-list.h:138 msgid "Create a packed archive of objects" msgstr "Създаване на пакетиран архив от обекти" -#: command-list.h:138 +#: command-list.h:139 msgid "Find redundant pack files" msgstr "Намиране на повтарящи се пакетни файлове" -#: command-list.h:139 +#: command-list.h:140 msgid "Pack heads and tags for efficient repository access" msgstr "Пакетиране на върховете и етикетите за бърз достъп до хранилище" -#: command-list.h:140 -msgid "Routines to help parsing remote repository access parameters" -msgstr "" -"Помощни програми за анализа на параметрите за достъп до отдалечено хранилище" - #: command-list.h:141 msgid "Compute unique ID for a patch" msgstr "Генериране на уникален идентификатор на кръпка" @@ -24733,52 +24873,37 @@ msgstr "Въвеждащ урок за Git" msgid "An overview of recommended workflows with Git" msgstr "Общ преглед на препоръчваните начини за работа с Git" -#: git-bisect.sh:79 +#: git-bisect.sh:48 #, sh-format msgid "Bad rev input: $arg" msgstr "Неправилна версия: „${arg}“" -#: git-bisect.sh:99 -#, sh-format -msgid "Bad rev input: $bisected_head" -msgstr "Неправилна версия: „$bisected_head“" - -#: git-bisect.sh:108 -#, sh-format -msgid "Bad rev input: $rev" -msgstr "Неправилна версия: „${rev}“" - -#: git-bisect.sh:117 -#, sh-format -msgid "'git bisect $TERM_BAD' can take only one argument." -msgstr "Командата „git bisect ${TERM_BAD}“ приема само един аргумент." - -#: git-bisect.sh:149 +#: git-bisect.sh:82 msgid "No logfile given" msgstr "Не е зададен журнален файл" -#: git-bisect.sh:150 +#: git-bisect.sh:83 #, sh-format msgid "cannot read $file for replaying" msgstr "" "Журналният файл „${file}“ не може да бъде прочетен, за да се изпълнят " "командите от него наново" -#: git-bisect.sh:173 +#: git-bisect.sh:105 msgid "?? what are you talking about?" msgstr "" "Непозната команда. Възможните варианти са: „start“, „good“, „bad“, „skip“" -#: git-bisect.sh:183 +#: git-bisect.sh:115 msgid "bisect run failed: no command provided." msgstr "неуспешно двоично търсене, не е зададена команда." -#: git-bisect.sh:188 +#: git-bisect.sh:120 #, sh-format msgid "running $command" msgstr "изпълнение на командата „${command}“" -#: git-bisect.sh:195 +#: git-bisect.sh:127 #, sh-format msgid "" "bisect run failed:\n" @@ -24788,24 +24913,24 @@ msgstr "" "изходният код от командата „${command}“ е ${res} — това е извън интервала " "[0, 128)" -#: git-bisect.sh:221 +#: git-bisect.sh:152 msgid "bisect run cannot continue any more" msgstr "двоичното търсене не може да продължи" -#: git-bisect.sh:227 +#: git-bisect.sh:158 #, sh-format msgid "" "bisect run failed:\n" -"'bisect_state $state' exited with error code $res" +"'bisect-state $state' exited with error code $res" msgstr "" "неуспешно двоично търсене:\n" -"функцията „bisect_state ${state}“ завърши с код за грешка ${res}" +"функцията „bisect-state ${state}“ завърши с код за грешка ${res}" -#: git-bisect.sh:234 +#: git-bisect.sh:165 msgid "bisect run success" msgstr "успешно двоично търсене" -#: git-bisect.sh:242 +#: git-bisect.sh:173 msgid "We are not bisecting." msgstr "В момента не се извършва двоично търсене." @@ -24847,52 +24972,52 @@ msgstr "Опит за просто сливане с „$pretty_name“" msgid "Simple merge did not work, trying automatic merge." msgstr "Простото сливане не сработи, пробва се автоматично сливане." -#: git-submodule.sh:180 +#: git-submodule.sh:179 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" "Относителен път може да се ползва само от основната директория на работното " "дърво" -#: git-submodule.sh:190 +#: git-submodule.sh:189 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "" "адрес на хранилище: „${repo}“ трябва или да е абсолютен, или да започва с " "„./“ или „../“" -#: git-submodule.sh:209 +#: git-submodule.sh:208 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "„${sm_path}“ вече съществува в индекса" -#: git-submodule.sh:212 +#: git-submodule.sh:211 #, sh-format msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "„${sm_path}“ вече съществува в индекса и не е подмодул" -#: git-submodule.sh:219 +#: git-submodule.sh:218 #, sh-format msgid "'$sm_path' does not have a commit checked out" msgstr "в „${sm_path}“ не е изтеглено подаване" -#: git-submodule.sh:250 +#: git-submodule.sh:249 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "Добавяне на съществуващото хранилище в „${sm_path}“ към индекса" -#: git-submodule.sh:252 +#: git-submodule.sh:251 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "„${sm_path}“ съществува, а не е хранилище на Git" -#: git-submodule.sh:260 +#: git-submodule.sh:259 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" "Открита е локална директория на Git — „${sm_name}“, която сочи към " "отдалечените хранилища:" -#: git-submodule.sh:262 +#: git-submodule.sh:261 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -24909,37 +25034,37 @@ msgstr "" "правилното хранилище или ако не знаете какво означава това, използвайте\n" "друго име като аргумент към опцията „--name“." -#: git-submodule.sh:268 +#: git-submodule.sh:267 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "Активиране на локалното хранилище за подмодула „${sm_name}“ наново." -#: git-submodule.sh:280 +#: git-submodule.sh:279 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Подмодулът „${sm_path}“ не може да бъде изтеглен" -#: git-submodule.sh:285 +#: git-submodule.sh:284 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Неуспешно добавяне на подмодула „${sm_path}“" -#: git-submodule.sh:294 +#: git-submodule.sh:293 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Неуспешно регистриране на подмодула „${sm_path}“" -#: git-submodule.sh:567 +#: git-submodule.sh:568 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "Текущата версия за подмодула в „${displaypath}“ липсва" -#: git-submodule.sh:577 +#: git-submodule.sh:578 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Неуспешно доставяне в пътя към подмодул „${sm_path}“" -#: git-submodule.sh:582 +#: git-submodule.sh:583 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -24948,7 +25073,7 @@ msgstr "" "Текущата версия „${remote_name}/${branch}“ в пътя към подмодул „${sm_path}“ " "липсва" -#: git-submodule.sh:600 +#: git-submodule.sh:601 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " @@ -24957,7 +25082,7 @@ msgstr "" "Неуспешно доставяне в пътя към подмодул „${displaypath}“, опит за директно " "доставяне на „${sha1}“" -#: git-submodule.sh:606 +#: git-submodule.sh:607 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -24966,63 +25091,58 @@ msgstr "" "Подмодулът в пътя „$displaypath“ е доставен, но не съдържа обекта със сума\n" "„${sha1}“. Директното доставяне на това подаване е неуспешно." -#: git-submodule.sh:613 +#: git-submodule.sh:614 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "" "Неуспешно изтегляне на версия „${sha1}“ в пътя към подмодул „${displaypath}“'" -#: git-submodule.sh:614 +#: git-submodule.sh:615 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Път към подмодул „${displaypath}“: изтеглена е версия „${sha1}“" -#: git-submodule.sh:618 +#: git-submodule.sh:619 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" "Неуспешно пребазиране на версия „${sha1}“ в пътя към подмодул " "„${displaypath}“" -#: git-submodule.sh:619 +#: git-submodule.sh:620 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Път към подмодул „${displaypath}“: пребазиране върху версия „${sha1}“" -#: git-submodule.sh:624 +#: git-submodule.sh:625 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" "Неуспешно сливане на версия „${sha1}“ в пътя към подмодул „${displaypath}“" -#: git-submodule.sh:625 +#: git-submodule.sh:626 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Път към подмодул „${displaypath}“: сливане с версия „${sha1}“" -#: git-submodule.sh:630 +#: git-submodule.sh:631 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" "Неуспешно изпълнение на командата „${command} ${sha1}“ в пътя към подмодул " "„${displaypath}“" -#: git-submodule.sh:631 +#: git-submodule.sh:632 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Път към подмодул „${displaypath}“: „${command} ${sha1}“" -#: git-submodule.sh:662 +#: git-submodule.sh:663 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "" "Неуспешна обработка на поддиректориите в пътя към подмодул „${displaypath}“" -#: git-parse-remote.sh:89 -#, sh-format -msgid "See git-${cmd}(1) for details." -msgstr "За повече информация погледнете ръководството на „git-${cmd}(1)“" - #: git-rebase--preserve-merges.sh:109 msgid "Applied autostash." msgstr "Автоматично скатаното е приложено." @@ -25429,14 +25549,14 @@ msgstr "Абсолютният път на работното дърво не м msgid "%12s %12s %s" msgstr "%14s %14s %s" -#: git-add--interactive.perl:634 +#: git-add--interactive.perl:632 #, 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:1058 +#: git-add--interactive.perl:1056 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." @@ -25445,7 +25565,7 @@ msgstr "" "незабавно\n" "добавено към индекса" -#: git-add--interactive.perl:1061 +#: git-add--interactive.perl:1059 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." @@ -25454,7 +25574,7 @@ msgstr "" "незабавно\n" "скътано" -#: git-add--interactive.perl:1064 +#: git-add--interactive.perl:1062 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." @@ -25463,8 +25583,8 @@ msgstr "" "незабавно\n" "извадено от индекса." -#: git-add--interactive.perl:1067 git-add--interactive.perl:1076 -#: git-add--interactive.perl:1082 +#: git-add--interactive.perl:1065 git-add--interactive.perl:1074 +#: git-add--interactive.perl:1080 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." @@ -25473,8 +25593,8 @@ msgstr "" "незабавно\n" "набелязано за прилагане." -#: git-add--interactive.perl:1070 git-add--interactive.perl:1073 -#: git-add--interactive.perl:1079 +#: git-add--interactive.perl:1068 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 discarding." @@ -25483,12 +25603,12 @@ msgstr "" "незабавно\n" "набелязано за зануляване." -#: git-add--interactive.perl:1116 +#: git-add--interactive.perl:1114 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "файлът за редактиране на парчето код не може да бъде отворен: „%s“" -#: git-add--interactive.perl:1123 +#: git-add--interactive.perl:1121 #, perl-format msgid "" "---\n" @@ -25502,13 +25622,13 @@ msgstr "" "За да пропуснете редовете започващи с „%s“ — изтрийте ги.\n" "Редовете, които започват с „%s“ ще бъдат пропуснати.\n" -#: git-add--interactive.perl:1145 +#: git-add--interactive.perl:1143 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "" "файлът за редактиране на парчето код не може да бъде отворен за четене: „%s“" -#: git-add--interactive.perl:1253 +#: git-add--interactive.perl:1251 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -25522,7 +25642,7 @@ msgstr "" "a — добавяне на това и всички следващи парчета от файла в индекса\n" "d — без добавяне на това и всички следващи парчета от файла в индекса" -#: git-add--interactive.perl:1259 +#: git-add--interactive.perl:1257 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -25536,7 +25656,7 @@ msgstr "" "a — скатаване на това и всички следващи парчета от файла\n" "d — без скатаване на това и всички следващи парчета от файла" -#: git-add--interactive.perl:1265 +#: git-add--interactive.perl:1263 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -25550,7 +25670,7 @@ msgstr "" "a — изваждане на това и всички следващи парчета от файла от индекса\n" "d — без изваждане на това и всички следващи парчета от файла от индекса" -#: git-add--interactive.perl:1271 +#: git-add--interactive.perl:1269 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -25564,7 +25684,7 @@ msgstr "" "a — прилагане на това и всички следващи парчета от файла към индекса\n" "d — без прилагане на това и всички следващи парчета от файла към индекса" -#: git-add--interactive.perl:1277 git-add--interactive.perl:1295 +#: git-add--interactive.perl:1275 git-add--interactive.perl:1293 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -25581,7 +25701,7 @@ msgstr "" "d — без премахване на това и всички следващи парчета от файла от работното " "дърво" -#: git-add--interactive.perl:1283 +#: git-add--interactive.perl:1281 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -25598,7 +25718,7 @@ msgstr "" "d — без премахване на това и всички следващи парчета от файла от индекса и " "работното дърво" -#: git-add--interactive.perl:1289 +#: git-add--interactive.perl:1287 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -25615,7 +25735,7 @@ msgstr "" "d — без прилагане на това и всички следващи парчета от файла от индекса и " "работното дърво" -#: git-add--interactive.perl:1301 +#: git-add--interactive.perl:1299 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -25629,7 +25749,7 @@ msgstr "" "a — прилагане на това и всички следващи парчета от файла\n" "d — без прилагане на това и всички следващи парчета от файла" -#: git-add--interactive.perl:1316 +#: git-add--interactive.perl:1314 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -25651,92 +25771,92 @@ msgstr "" "e — ръчно редактиране на текущото парче\n" "? — извеждане не помощта\n" -#: git-add--interactive.perl:1347 +#: git-add--interactive.perl:1345 msgid "The selected hunks do not apply to the index!\n" msgstr "Избраните парчета не могат да се добавят в индекса!\n" -#: git-add--interactive.perl:1362 +#: git-add--interactive.perl:1360 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "пренебрегване на неслятото: „%s“\n" -#: git-add--interactive.perl:1481 +#: git-add--interactive.perl:1479 #, 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:1482 +#: git-add--interactive.perl:1480 #, perl-format msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " msgstr "Прилагане на изтриването към работното дърво [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1483 +#: git-add--interactive.perl:1481 #, perl-format msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " msgstr "Прилагане на добавянето към работното дърво [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1484 +#: git-add--interactive.perl:1482 #, 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:1601 +#: git-add--interactive.perl:1599 msgid "No other hunks to goto\n" msgstr "Няма други парчета\n" -#: git-add--interactive.perl:1619 +#: git-add--interactive.perl:1617 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Неправилен номер: „%s“\n" -#: git-add--interactive.perl:1624 +#: git-add--interactive.perl:1622 #, 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:1659 +#: git-add--interactive.perl:1657 msgid "No other hunks to search\n" msgstr "Няма други парчета за търсене\n" -#: git-add--interactive.perl:1676 +#: git-add--interactive.perl:1674 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "Сгрешен регулярен израз „%s“: %s\n" -#: git-add--interactive.perl:1686 +#: git-add--interactive.perl:1684 msgid "No hunk matches the given pattern\n" msgstr "Никое парче не напасва на регулярния израз\n" -#: git-add--interactive.perl:1698 git-add--interactive.perl:1720 +#: git-add--interactive.perl:1696 git-add--interactive.perl:1718 msgid "No previous hunk\n" msgstr "Няма друго парче преди това\n" -#: git-add--interactive.perl:1707 git-add--interactive.perl:1726 +#: git-add--interactive.perl:1705 git-add--interactive.perl:1724 msgid "No next hunk\n" msgstr "Няма друго парче след това\n" -#: git-add--interactive.perl:1732 +#: git-add--interactive.perl:1730 msgid "Sorry, cannot split this hunk\n" msgstr "Това парче не може да бъде разделено\n" -#: git-add--interactive.perl:1738 +#: git-add--interactive.perl:1736 #, 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:1748 +#: git-add--interactive.perl:1746 msgid "Sorry, cannot edit this hunk\n" msgstr "Това парче не може да бъде редактирано\n" #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1813 +#: git-add--interactive.perl:1811 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -25757,19 +25877,19 @@ msgstr "" " и индекса\n" "add untracked — добавяне на неследените файлове към промените в индекса\n" -#: git-add--interactive.perl:1830 git-add--interactive.perl:1835 -#: git-add--interactive.perl:1838 git-add--interactive.perl:1845 -#: git-add--interactive.perl:1848 git-add--interactive.perl:1855 -#: git-add--interactive.perl:1859 git-add--interactive.perl:1865 +#: git-add--interactive.perl:1828 git-add--interactive.perl:1840 +#: git-add--interactive.perl:1843 git-add--interactive.perl:1850 +#: git-add--interactive.perl:1853 git-add--interactive.perl:1860 +#: git-add--interactive.perl:1864 git-add--interactive.perl:1870 msgid "missing --" msgstr "„--“ липсва" -#: git-add--interactive.perl:1861 +#: git-add--interactive.perl:1866 #, perl-format msgid "unknown --patch mode: %s" msgstr "неизвестна стратегия за прилагане на кръпка: „%s“" -#: git-add--interactive.perl:1867 git-add--interactive.perl:1873 +#: git-add--interactive.perl:1872 git-add--interactive.perl:1878 #, perl-format msgid "invalid argument %s, expecting --" msgstr "указан е неправилен аргумент „%s“, а се очаква „--“." diff --git a/po/ca.po b/po/ca.po index 17392473fb..2131ed7fa3 100644 --- a/po/ca.po +++ b/po/ca.po @@ -11,6 +11,7 @@ # amend | esmenar # bundle | farcell # broken | malmès +# chunk | fragment # delta | diferència # deprecated | en desús # dry | simulació @@ -50,7 +51,7 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2020-10-06 09:14+0800\n" +"POT-Creation-Date: 2020-12-15 16:27+0800\n" "PO-Revision-Date: 2020-05-28 18:14+0200\n" "Last-Translator: Jordi Mas \n" "Language-Team: Catalan\n" @@ -61,200 +62,200 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.3.1\n" -#: add-interactive.c:368 +#: add-interactive.c:376 #, c-format msgid "Huh (%s)?" msgstr "Perdó (%s)?" -#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3250 -#: sequencer.c:3698 sequencer.c:3840 builtin/rebase.c:1526 -#: builtin/rebase.c:1944 +#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3284 +#: sequencer.c:3735 sequencer.c:3890 builtin/rebase.c:1532 +#: builtin/rebase.c:1955 msgid "could not read index" msgstr "no s'ha pogut llegir l'índex" -#: add-interactive.c:576 git-add--interactive.perl:269 +#: add-interactive.c:584 git-add--interactive.perl:269 #: git-add--interactive.perl:294 msgid "binary" msgstr "binari" -#: add-interactive.c:634 git-add--interactive.perl:278 +#: add-interactive.c:642 git-add--interactive.perl:278 #: git-add--interactive.perl:332 msgid "nothing" msgstr "res" -#: add-interactive.c:635 git-add--interactive.perl:314 +#: add-interactive.c:643 git-add--interactive.perl:314 #: git-add--interactive.perl:329 msgid "unchanged" msgstr "sense canvis" -#: add-interactive.c:672 git-add--interactive.perl:643 +#: add-interactive.c:680 git-add--interactive.perl:641 msgid "Update" msgstr "Actualitza" -#: add-interactive.c:689 add-interactive.c:877 +#: add-interactive.c:697 add-interactive.c:885 #, c-format msgid "could not stage '%s'" msgstr "no s'ha pogut fer «stage» «%s»" -#: add-interactive.c:695 add-interactive.c:884 reset.c:89 sequencer.c:3444 +#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3478 msgid "could not write index" msgstr "no s'ha pogut escriure l'índex" -#: add-interactive.c:698 git-add--interactive.perl:628 +#: add-interactive.c:706 git-add--interactive.perl:626 #, 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:716 git-add--interactive.perl:678 +#: add-interactive.c:724 git-add--interactive.perl:676 #, c-format, perl-format msgid "note: %s is untracked now.\n" msgstr "nota: %s està ara sense seguiment.\n" -#: add-interactive.c:721 apply.c:4127 builtin/checkout.c:295 +#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:295 #: builtin/reset.c:145 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry ha fallat per al camí «%s»" -#: add-interactive.c:751 git-add--interactive.perl:655 +#: add-interactive.c:759 git-add--interactive.perl:653 msgid "Revert" msgstr "Reverteix" -#: add-interactive.c:767 +#: add-interactive.c:775 msgid "Could not parse HEAD^{tree}" msgstr "No s'ha pogut analitzar HEAD^{tree}" -#: add-interactive.c:805 git-add--interactive.perl:631 +#: add-interactive.c:813 git-add--interactive.perl:629 #, 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:856 git-add--interactive.perl:695 +#: add-interactive.c:864 git-add--interactive.perl:693 #, c-format msgid "No untracked files.\n" msgstr "Sense fitxers no seguits.\n" -#: add-interactive.c:860 git-add--interactive.perl:689 +#: add-interactive.c:868 git-add--interactive.perl:687 msgid "Add untracked" msgstr "Afegeix sense seguiment" -#: add-interactive.c:887 git-add--interactive.perl:625 +#: add-interactive.c:895 git-add--interactive.perl:623 #, 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:917 +#: add-interactive.c:925 #, c-format msgid "ignoring unmerged: %s" msgstr "s'està ignorant allò no fusionat: %s" -#: add-interactive.c:929 add-patch.c:1738 git-add--interactive.perl:1371 +#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369 #, c-format msgid "Only binary files changed.\n" msgstr "Només s'han canviat els fitxers binaris.\n" -#: add-interactive.c:931 add-patch.c:1736 git-add--interactive.perl:1373 +#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371 #, c-format msgid "No changes.\n" msgstr "Sense canvis.\n" -#: add-interactive.c:935 git-add--interactive.perl:1381 +#: add-interactive.c:943 git-add--interactive.perl:1379 msgid "Patch update" msgstr "Actualització del pedaç" -#: add-interactive.c:974 git-add--interactive.perl:1794 +#: add-interactive.c:982 git-add--interactive.perl:1792 msgid "Review diff" msgstr "Reviseu les diferències" -#: add-interactive.c:1002 +#: add-interactive.c:1010 msgid "show paths with changes" msgstr "mostra els camins amb canvis" -#: add-interactive.c:1004 +#: add-interactive.c:1012 msgid "add working tree state to the staged set of changes" msgstr "afegeix l'estat de l'arbre de treball al conjunt de canvis «staged»" -#: add-interactive.c:1006 +#: add-interactive.c:1014 msgid "revert staged set of changes back to the HEAD version" msgstr "reverteix el conjunt de canvis «staged» a la versió HEAD" -#: add-interactive.c:1008 +#: add-interactive.c:1016 msgid "pick hunks and update selectively" msgstr "selecciona els trossos i actualitza selectivament" -#: add-interactive.c:1010 +#: add-interactive.c:1018 msgid "view diff between HEAD and index" msgstr "visualitza les diferències entre HEAD i l'índex" -#: add-interactive.c:1012 +#: add-interactive.c:1020 msgid "add contents of untracked files to the staged set of changes" msgstr "afegeix contingut de fitxers no seguits al conjunt de canvis «staged»" -#: add-interactive.c:1020 add-interactive.c:1069 +#: add-interactive.c:1028 add-interactive.c:1077 msgid "Prompt help:" msgstr "Mostra ajuda:" -#: add-interactive.c:1022 +#: add-interactive.c:1030 msgid "select a single item" msgstr "seleccioneu un únic ítem" -#: add-interactive.c:1024 +#: add-interactive.c:1032 msgid "select a range of items" msgstr "seleccioneu un rang d'ítems" -#: add-interactive.c:1026 +#: add-interactive.c:1034 msgid "select multiple ranges" msgstr "seleccioneu rangs múltiples" -#: add-interactive.c:1028 add-interactive.c:1073 +#: add-interactive.c:1036 add-interactive.c:1081 msgid "select item based on unique prefix" msgstr "seleccioneu un ítem basant-se en un prefix únic" -#: add-interactive.c:1030 +#: add-interactive.c:1038 msgid "unselect specified items" msgstr "desselecciona els ítems especificats" -#: add-interactive.c:1032 +#: add-interactive.c:1040 msgid "choose all items" msgstr "trieu tots els ítems" -#: add-interactive.c:1034 +#: add-interactive.c:1042 msgid "(empty) finish selecting" msgstr "(buit) finalitza la selecció" -#: add-interactive.c:1071 +#: add-interactive.c:1079 msgid "select a numbered item" msgstr "seleccioneu un ítem numerat" -#: add-interactive.c:1075 +#: add-interactive.c:1083 msgid "(empty) select nothing" msgstr "(buit) no seleccionis res" -#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1891 +#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896 msgid "*** Commands ***" msgstr "*** Ordres ***" -#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1888 +#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893 msgid "What now" msgstr "I ara què" -#: add-interactive.c:1136 git-add--interactive.perl:213 +#: add-interactive.c:1144 git-add--interactive.perl:213 msgid "staged" msgstr "staged" -#: add-interactive.c:1136 git-add--interactive.perl:213 +#: add-interactive.c:1144 git-add--interactive.perl:213 msgid "unstaged" msgstr "unstaged" -#: add-interactive.c:1136 apply.c:4984 apply.c:4987 builtin/am.c:2270 -#: builtin/am.c:2273 builtin/bugreport.c:133 builtin/clone.c:123 -#: builtin/fetch.c:147 builtin/merge.c:275 builtin/pull.c:190 +#: add-interactive.c:1144 apply.c:4989 apply.c:4992 builtin/am.c:2257 +#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124 +#: builtin/fetch.c:147 builtin/merge.c:284 builtin/pull.c:190 #: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818 #: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326 #: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572 @@ -262,42 +263,42 @@ msgstr "unstaged" msgid "path" msgstr "camí" -#: add-interactive.c:1143 +#: add-interactive.c:1151 msgid "could not refresh index" msgstr "no s'ha pogut actualitzar l'índex" -#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1805 +#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803 #, c-format msgid "Bye.\n" -msgstr "Adéu.\n" +msgstr "Adeu.\n" -#: add-patch.c:34 git-add--interactive.perl:1433 +#: add-patch.c:34 git-add--interactive.perl:1431 #, c-format, perl-format msgid "Stage mode change [y,n,q,a,d%s,?]? " msgstr "Canvia el mode de «stage» [y,n,q,a,d%s,?]? " -#: add-patch.c:35 git-add--interactive.perl:1434 +#: add-patch.c:35 git-add--interactive.perl:1432 #, c-format, perl-format msgid "Stage deletion [y,n,q,a,d%s,?]? " msgstr "Suprimeix «stage» [y,n,q,a,d%s,?]? " -#: add-patch.c:36 git-add--interactive.perl:1435 -#, fuzzy, c-format, perl-format +#: add-patch.c:36 git-add--interactive.perl:1433 +#, c-format, perl-format msgid "Stage addition [y,n,q,a,d%s,?]? " -msgstr "Suprimeix «stage» [y,n,q,a,d%s,?]? " +msgstr "Afegeix a «stage» [y,n,q,a,d%s,?]? " -#: add-patch.c:37 git-add--interactive.perl:1436 +#: add-patch.c:37 git-add--interactive.perl:1434 #, c-format, perl-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "Fer un «stage» d'aquest tros [y,n,q,a,d%s,?]? " #: add-patch.c:39 msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"staging." +"If the patch applies cleanly, the edited hunk will immediately be marked for" +" staging." msgstr "" -"Si el pedaç s'aplica netament, el tros editat es marcarà immediatament per a " -"«staging»." +"Si el pedaç s'aplica netament, el tros editat es marcarà immediatament per a" +" «staging»." #: add-patch.c:42 msgid "" @@ -313,30 +314,30 @@ msgstr "" "a - fes «stage» d'aquest tros i de tota la resta de trossos del fitxer\n" "d - no facis «stage» d'aquest tros ni de cap altre restant del fitxer\n" -#: add-patch.c:56 git-add--interactive.perl:1439 +#: add-patch.c:56 git-add--interactive.perl:1437 #, c-format, perl-format msgid "Stash mode change [y,n,q,a,d%s,?]? " msgstr "Canvia el mode de «stash» [y,n,q,a,d%s,?]? " -#: add-patch.c:57 git-add--interactive.perl:1440 +#: add-patch.c:57 git-add--interactive.perl:1438 #, c-format, perl-format msgid "Stash deletion [y,n,q,a,d%s,?]? " msgstr "Suprimeix «stash» [y,n,q,a,d%s,?]? " -#: add-patch.c:58 git-add--interactive.perl:1441 -#, fuzzy, c-format, perl-format +#: add-patch.c:58 git-add--interactive.perl:1439 +#, c-format, perl-format msgid "Stash addition [y,n,q,a,d%s,?]? " -msgstr "Suprimeix «stash» [y,n,q,a,d%s,?]? " +msgstr "Afegeix a «stash» [y,n,q,a,d%s,?]? " -#: add-patch.c:59 git-add--interactive.perl:1442 +#: add-patch.c:59 git-add--interactive.perl:1440 #, c-format, perl-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "Fer un «stash» d'aquest tros [y,n,q,a,d%s,?]? " #: add-patch.c:61 msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"stashing." +"If the patch applies cleanly, the edited hunk will immediately be marked for" +" stashing." msgstr "" "Si el pedaç s'aplica de forma neta, el tros editat es marcarà immediatament " "per a «stashing»." @@ -355,33 +356,33 @@ msgstr "" "a - fes «stash» d'aquest tros i de tota la resta de trossos del fitxer\n" "d - no facis «stash» d'aquest tros ni de cap altre restant del fitxer\n" -#: add-patch.c:80 git-add--interactive.perl:1445 +#: add-patch.c:80 git-add--interactive.perl:1443 #, c-format, perl-format msgid "Unstage mode change [y,n,q,a,d%s,?]? " msgstr "Canvia el mode de «unstage» [y,n,q,a,d%s,?]? " -#: add-patch.c:81 git-add--interactive.perl:1446 +#: add-patch.c:81 git-add--interactive.perl:1444 #, c-format, perl-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " msgstr "Suprimeix «Unstage» [y,n,q,a,d%s,?]? " -#: add-patch.c:82 git-add--interactive.perl:1447 -#, fuzzy, c-format, perl-format +#: add-patch.c:82 git-add--interactive.perl:1445 +#, c-format, perl-format msgid "Unstage addition [y,n,q,a,d%s,?]? " -msgstr "Suprimeix «Unstage» [y,n,q,a,d%s,?]? " +msgstr "Afegeix a «unstage» [y,n,q,a,d%s,?]? " -#: add-patch.c:83 git-add--interactive.perl:1448 +#: add-patch.c:83 git-add--interactive.perl:1446 #, c-format, perl-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " msgstr "Fer un «unstage» d'aquest tros [y,n,q,a,d%s,?]? " #: add-patch.c:85 msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"unstaging." +"If the patch applies cleanly, the edited hunk will immediately be marked for" +" unstaging." msgstr "" -"Si el pedaç s'aplica netament, el tros editat es marcarà immediatament per a " -"«unstaging»." +"Si el pedaç s'aplica netament, el tros editat es marcarà immediatament per a" +" «unstaging»." #: add-patch.c:88 msgid "" @@ -397,30 +398,30 @@ msgstr "" "a - fes «unstage» d'aquest tros i de tota la resta de trossos del fitxer\n" "d - no facis «unstage» d'aquest tros ni de cap altre restant del fitxer\n" -#: add-patch.c:103 git-add--interactive.perl:1451 +#: add-patch.c:103 git-add--interactive.perl:1449 #, c-format, perl-format msgid "Apply mode change to index [y,n,q,a,d%s,?]? " msgstr "Aplica el canvi de mode a l'índex [y,n,q,a,d%s,?]? " -#: add-patch.c:104 git-add--interactive.perl:1452 +#: add-patch.c:104 git-add--interactive.perl:1450 #, c-format, perl-format msgid "Apply deletion to index [y,n,q,a,d%s,?]? " msgstr "Aplica la supressió a l'índex [y,n,q,a,d%s,?]? " -#: add-patch.c:105 git-add--interactive.perl:1453 -#, fuzzy, c-format, perl-format +#: add-patch.c:105 git-add--interactive.perl:1451 +#, c-format, perl-format msgid "Apply addition to index [y,n,q,a,d%s,?]? " -msgstr "Aplica la supressió a l'índex [y,n,q,a,d%s,?]? " +msgstr "Aplica l'addició a l'índex [y,n,q,a,d%s,?]? " -#: add-patch.c:106 git-add--interactive.perl:1454 +#: add-patch.c:106 git-add--interactive.perl:1452 #, c-format, perl-format msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " msgstr "Aplica aquest tros a l'índex [y,n,q,a,d%s,?]? " #: add-patch.c:108 add-patch.c:176 add-patch.c:221 msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"applying." +"If the patch applies cleanly, the edited hunk will immediately be marked for" +" applying." msgstr "" "Si el pedaç s'aplica netament, el tros editat es marcarà immediatament per " "aplicar-lo." @@ -439,37 +440,37 @@ msgstr "" "a - aplica aquest tros i tots els trossos posteriors en el fitxer\n" "d - no apliquis aquest tros ni cap dels trossos posteriors en el fitxer\n" -#: add-patch.c:126 git-add--interactive.perl:1457 -#: git-add--interactive.perl:1475 +#: add-patch.c:126 git-add--interactive.perl:1455 +#: git-add--interactive.perl:1473 #, c-format, perl-format msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " msgstr "Descarta el canvi de mode de l'arbre de treball [y,n,q,a,d%s,?]? " -#: add-patch.c:127 git-add--interactive.perl:1458 -#: git-add--interactive.perl:1476 +#: add-patch.c:127 git-add--interactive.perl:1456 +#: git-add--interactive.perl:1474 #, c-format, perl-format msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " msgstr "Descarta suprimir de l'arbre de treball [y,n,q,a,d%s,?]? " -#: add-patch.c:128 git-add--interactive.perl:1459 -#: git-add--interactive.perl:1477 -#, fuzzy, c-format, perl-format +#: add-patch.c:128 git-add--interactive.perl:1457 +#: git-add--interactive.perl:1475 +#, c-format, perl-format msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " -msgstr "Descarta suprimir de l'arbre de treball [y,n,q,a,d%s,?]? " +msgstr "Descarta l'addició de l'arbre de treball [y,n,q,a,d%s,?]? " -#: add-patch.c:129 git-add--interactive.perl:1460 -#: git-add--interactive.perl:1478 +#: add-patch.c:129 git-add--interactive.perl:1458 +#: git-add--interactive.perl:1476 #, c-format, perl-format msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " msgstr "Descarta aquest tros de l'arbre de treball [y,n,q,a,d%s,?]? " #: add-patch.c:131 add-patch.c:154 add-patch.c:199 msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"discarding." +"If the patch applies cleanly, the edited hunk will immediately be marked for" +" discarding." msgstr "" -"Si el pedaç s'aplica netament, el tros editat es marcarà immediatament per a " -"ser descartat." +"Si el pedaç s'aplica netament, el tros editat es marcarà immediatament per a" +" ser descartat." #: add-patch.c:134 add-patch.c:202 msgid "" @@ -485,24 +486,26 @@ msgstr "" "a - descarta aquest tros i tots els trossos posteriors en el fitxer\n" "d - no descartis aquest tros ni cap dels trossos posteriors en el fitxer\n" -#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463 +#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461 #, c-format, perl-format msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " msgstr "" -"Descarta el canvi de mode de l'índex i de l'arbre de treball [y,n,q,a,d" -"%s,?]? " +"Descarta el canvi de mode de l'índex i de l'arbre de treball " +"[y,n,q,a,d%s,?]? " -#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464 +#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462 #, c-format, perl-format msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " -msgstr "Descarta suprimir de l'índex i de l'arbre de treball [y,n,q,a,d%s,?]? " +msgstr "" +"Descarta suprimir de l'índex i de l'arbre de treball [y,n,q,a,d%s,?]? " -#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465 -#, fuzzy, c-format, perl-format +#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463 +#, c-format, perl-format msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " -msgstr "Descarta suprimir de l'índex i de l'arbre de treball [y,n,q,a,d%s,?]? " +msgstr "" +"Descarta l'addició de l'índex i de l'arbre de treball [y,n,q,a,d%s,?]? " -#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466 +#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464 #, c-format, perl-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " msgstr "" @@ -522,23 +525,24 @@ msgstr "" "a - descarta aquest tros i tots els trossos posteriors en el fitxer\n" "d - no descartis aquest tros ni cap dels trossos posteriors en el fitxer\n" -#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469 +#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467 #, c-format, perl-format msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Aplica el canvi de mode a l'índex i a l'arbre de treball [y,n,q,a,d%s,?]? " -#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470 +#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468 #, c-format, perl-format msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " -msgstr "Aplica la supressió a l'índex i a l'arbre de treball [y,n,q,a,d%s,?]? " +msgstr "" +"Aplica la supressió a l'índex i a l'arbre de treball [y,n,q,a,d%s,?]? " -#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471 -#, fuzzy, c-format, perl-format +#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469 +#, c-format, perl-format msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " -msgstr "Aplica la supressió a l'índex i a l'arbre de treball [y,n,q,a,d%s,?]? " +msgstr "Aplica l'addició a l'índex i a l'arbre de treball [y,n,q,a,d%s,?]? " -#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472 +#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470 #, c-format, perl-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " msgstr "Aplica aquest tros a l'índex i a l'arbre de treball [y,n,q,a,d%s,?]? " @@ -606,7 +610,7 @@ msgstr "" "El filtre ha de mantenir una correspondència d'un a un\n" "entre les línies d'entrada i sortida." -#: add-patch.c:785 +#: add-patch.c:790 #, c-format msgid "" "expected context line #%d in\n" @@ -615,7 +619,7 @@ msgstr "" "s'esperava la línia amb contingut #%d a\n" "%.*s" -#: add-patch.c:800 +#: add-patch.c:805 #, c-format msgid "" "hunks do not overlap:\n" @@ -628,12 +632,12 @@ msgstr "" "\tno acaben amb:\n" "%.*s" -#: add-patch.c:1076 git-add--interactive.perl:1117 +#: add-patch.c:1081 git-add--interactive.perl:1115 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:1080 +#: add-patch.c:1085 #, c-format msgid "" "---\n" @@ -647,7 +651,7 @@ msgstr "" "Les línies que comencin per %c s'eliminaran.\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:1094 git-add--interactive.perl:1131 +#: add-patch.c:1099 git-add--interactive.perl:1129 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" @@ -657,11 +661,11 @@ msgstr "" "de nou. Si s'eliminen totes les línies del tros, llavors l'edició s'avorta\n" "i el tros es deixa sense cap canvi.\n" -#: add-patch.c:1127 +#: add-patch.c:1132 msgid "could not parse hunk header" msgstr "no s'ha pogut analitzar la capçalera del tros" -#: add-patch.c:1172 +#: add-patch.c:1177 msgid "'git apply --cached' failed" msgstr "«git apply --cached» ha fallat" @@ -670,33 +674,33 @@ msgstr "«git apply --cached» ha fallat" #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. -#. #. 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:1241 git-add--interactive.perl:1244 +#: add-patch.c:1246 git-add--interactive.perl:1242 msgid "" -"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +"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:1284 +#: add-patch.c:1289 msgid "The selected hunks do not apply to the index!" msgstr "Els trossos seleccionats no s'apliquen a l'índex!" -#: add-patch.c:1285 git-add--interactive.perl:1348 +#: add-patch.c:1290 git-add--interactive.perl:1346 msgid "Apply them to the worktree anyway? " msgstr "Voleu aplicar-los igualment a l'arbre de treball? " -#: add-patch.c:1292 git-add--interactive.perl:1351 +#: add-patch.c:1297 git-add--interactive.perl:1349 msgid "Nothing was applied.\n" msgstr "No s'ha aplicat res.\n" -#: add-patch.c:1349 +#: add-patch.c:1354 msgid "" "j - leave this hunk undecided, see next undecided hunk\n" "J - leave this hunk undecided, see next hunk\n" @@ -718,110 +722,112 @@ msgstr "" "e - edita manualment el tros actual\n" "? - mostra l'ajuda\n" -#: add-patch.c:1511 add-patch.c:1521 +#: add-patch.c:1516 add-patch.c:1526 msgid "No previous hunk" msgstr "Sense tros previ" -#: add-patch.c:1516 add-patch.c:1526 +#: add-patch.c:1521 add-patch.c:1531 msgid "No next hunk" msgstr "No hi ha tros següent" -#: add-patch.c:1532 +#: add-patch.c:1537 msgid "No other hunks to goto" msgstr "No hi ha altres trossos on anar-hi" -#: add-patch.c:1543 git-add--interactive.perl:1608 +#: add-patch.c:1548 git-add--interactive.perl:1606 msgid "go to which hunk ( to see more)? " -msgstr "vés a quin tros ( per a veure'n més)? " +msgstr "ves a quin tros ( per a veure'n més)? " -#: add-patch.c:1544 git-add--interactive.perl:1610 +#: add-patch.c:1549 git-add--interactive.perl:1608 msgid "go to which hunk? " -msgstr "vés a quin tros? " +msgstr "ves a quin tros? " -#: add-patch.c:1555 +#: add-patch.c:1560 #, c-format msgid "Invalid number: '%s'" msgstr "Número no vàlid: «%s»" -#: add-patch.c:1560 +#: add-patch.c:1565 #, 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:1569 +#: add-patch.c:1574 msgid "No other hunks to search" msgstr "No hi ha cap altre tros a cercar" -#: add-patch.c:1575 git-add--interactive.perl:1663 +#: add-patch.c:1580 git-add--interactive.perl:1661 msgid "search for regex? " msgstr "cerca per expressió regular? " -#: add-patch.c:1590 +#: add-patch.c:1595 #, c-format msgid "Malformed search regexp %s: %s" msgstr "Expressió regular de cerca mal formada %s: %s" -#: add-patch.c:1607 +#: add-patch.c:1612 msgid "No hunk matches the given pattern" msgstr "No hi ha trossos que coincideixin amb el patró donat" -#: add-patch.c:1614 +#: add-patch.c:1619 msgid "Sorry, cannot split this hunk" msgstr "No es pot dividir aquest tros" -#: add-patch.c:1618 +#: add-patch.c:1623 #, c-format msgid "Split into %d hunks." msgstr "Divideix en %d trossos." -#: add-patch.c:1622 +#: add-patch.c:1627 msgid "Sorry, cannot edit this hunk" msgstr "No es pot editar aquest tros" -#: add-patch.c:1674 +#: add-patch.c:1679 msgid "'git apply' failed" msgstr "«git apply» ha fallat" -#: advice.c:140 +#: advice.c:143 #, c-format msgid "" "\n" "Disable this message with \"git config advice.%s false\"" msgstr "" +"\n" +"Desactiva aquest missatge amb «git config advice.%s false»" -#: advice.c:156 +#: advice.c:159 #, c-format msgid "%shint: %.*s%s\n" msgstr "%spista: %.*s%s\n" -#: advice.c:247 +#: advice.c:250 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:249 +#: advice.c:252 msgid "Committing is not possible because you have unmerged files." msgstr "Cometre no és possible perquè teniu fitxers sense fusionar." -#: advice.c:251 +#: advice.c:254 msgid "Merging is not possible because you have unmerged files." msgstr "Fusionar no és possible perquè teniu fitxers sense fusionar." -#: advice.c:253 +#: advice.c:256 msgid "Pulling is not possible because you have unmerged files." msgstr "Baixar no és possible perquè teniu fitxers sense fusionar." -#: advice.c:255 +#: advice.c:258 msgid "Reverting is not possible because you have unmerged files." msgstr "Revertir no és possible perquè teniu fitxers sense fusionar." -#: advice.c:257 +#: advice.c:260 #, 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:265 +#: advice.c:268 msgid "" "Fix them up in the work tree, and then use 'git add/rm '\n" "as appropriate to mark resolution and make a commit." @@ -830,23 +836,23 @@ msgstr "" "«git add/rm » segons sigui apropiat per a marcar la\n" "resolució i feu una comissió." -#: advice.c:273 +#: advice.c:276 msgid "Exiting because of an unresolved conflict." msgstr "S'està sortint a causa d'un conflicte no resolt." -#: advice.c:278 builtin/merge.c:1349 +#: advice.c:281 builtin/merge.c:1369 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "No heu conclòs la vostra fusió (MERGE_HEAD existeix)." -#: advice.c:280 +#: advice.c:283 msgid "Please, commit your changes before merging." msgstr "Cometeu els vostres canvis abans de fusionar." -#: advice.c:281 +#: advice.c:284 msgid "Exiting because of unfinished merge." msgstr "S'està sortint a causa d'una fusió no terminada." -#: advice.c:287 +#: advice.c:290 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -864,8 +870,7 @@ msgid "" "\n" " git switch -\n" "\n" -"Turn off this advice by setting config variable advice.detachedHead to " -"false\n" +"Turn off this advice by setting config variable advice.detachedHead to false\n" "\n" msgstr "" "Avís: s'està canviant a «%s».\n" @@ -883,8 +888,7 @@ msgstr "" "\n" " git switch -\n" "\n" -"Desactiveu aquest consell configurant la variable advice.detachedHead a " -"«false»\n" +"Desactiveu aquest consell configurant la variable advice.detachedHead a «false»\n" "\n" #: alias.c:50 @@ -979,11 +983,11 @@ msgstr "línies de capçalera %d i %d inconsistents" #: apply.c:1372 #, c-format msgid "" -"git diff header lacks filename information when removing %d leading pathname " -"component (line %d)" +"git diff header lacks filename information when removing %d leading pathname" +" component (line %d)" msgid_plural "" -"git diff header lacks filename information when removing %d leading pathname " -"components (line %d)" +"git diff header lacks filename information when removing %d leading pathname" +" components (line %d)" msgstr[0] "" "a la capçalera de git diff li manca informació de nom de fitxer en eliminar " "%d component de nom de camí inicial (línia %d)" @@ -1142,7 +1146,7 @@ msgstr "el pedaç ha fallat: %s:%ld" msgid "cannot checkout %s" msgstr "no es pot agafar %s" -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:72 setup.c:308 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:73 setup.c:308 #, c-format msgid "failed to read %s" msgstr "s'ha produït un error en llegir %s" @@ -1170,7 +1174,8 @@ msgstr "%s: no coincideix amb l'índex" #: apply.c:3572 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." +"al dipòsit li manca el blob necessari per a retrocedir a una fusió de 3 " +"vies." #: apply.c:3575 #, c-format @@ -1304,7 +1309,7 @@ msgstr "" msgid "unable to add cache entry for %s" msgstr "no s'ha pogut afegir una entrada de cau per a %s" -#: apply.c:4376 builtin/bisect--helper.c:537 +#: apply.c:4376 builtin/bisect--helper.c:524 #, c-format msgid "failed to write to '%s'" msgstr "no s'ha pogut escriure a «%s»" @@ -1355,39 +1360,39 @@ msgstr "El tros #%d s'ha aplicat netament." msgid "Rejected hunk #%d." msgstr "S'ha rebutjat el tros #%d." -#: apply.c:4715 +#: apply.c:4720 #, c-format msgid "Skipped patch '%s'." msgstr "S'ha omès el pedaç «%s»." -#: apply.c:4723 +#: apply.c:4728 msgid "unrecognized input" msgstr "entrada no reconeguda" -#: apply.c:4743 +#: apply.c:4748 msgid "unable to read index file" msgstr "no es pot llegir el fitxer d'índex" -#: apply.c:4900 +#: apply.c:4905 #, c-format msgid "can't open patch '%s': %s" msgstr "no es pot obrir el pedaç «%s»: %s" -#: apply.c:4927 +#: apply.c:4932 #, 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:4933 apply.c:4948 +#: apply.c:4938 apply.c:4953 #, 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:4941 +#: apply.c:4946 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." @@ -1396,135 +1401,137 @@ msgstr[0] "" msgstr[1] "" "S'han aplicat %d línies després d'arreglar els errors d'espai en blanc." -#: apply.c:4957 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406 +#: apply.c:4962 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406 msgid "Unable to write new index file" msgstr "No s'ha pogut escriure un fitxer d'índex nou" -#: apply.c:4985 +#: apply.c:4990 msgid "don't apply changes matching the given path" msgstr "no apliquis els canvis que coincideixin amb el camí donat" -#: apply.c:4988 +#: apply.c:4993 msgid "apply changes matching the given path" msgstr "aplica els canvis que coincideixin amb el camí donat" -#: apply.c:4990 builtin/am.c:2279 +#: apply.c:4995 builtin/am.c:2266 msgid "num" msgstr "número" -#: apply.c:4991 +#: apply.c:4996 msgid "remove leading slashes from traditional diff paths" msgstr "" "elimina barres obliqües inicials dels camins de diferència " "tradicionals" -#: apply.c:4994 +#: apply.c:4999 msgid "ignore additions made by the patch" msgstr "ignora afegiments fets pel pedaç" -#: apply.c:4996 +#: apply.c:5001 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" +"en lloc d'aplicar el pedaç, emet les estadístiques de diferència de " +"l'entrada" -#: apply.c:5000 +#: apply.c:5005 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:5002 +#: apply.c:5007 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:5004 +#: apply.c:5009 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:5006 +#: apply.c:5011 msgid "make sure the patch is applicable to the current index" msgstr "assegura que el pedaç sigui aplicable a l'índex actual" -#: apply.c:5008 +#: apply.c:5013 msgid "mark new files with `git add --intent-to-add`" msgstr "marca els fitxers nous amb «git add --intent-to-add»" -#: apply.c:5010 +#: apply.c:5015 msgid "apply a patch without touching the working tree" msgstr "aplica un pedaç sense tocar l'arbre de treball" -#: apply.c:5012 +#: apply.c:5017 msgid "accept a patch that touches outside the working area" msgstr "accepta un pedaç que toqui fora de l'àrea de treball" -#: apply.c:5015 +#: apply.c:5020 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "aplica el pedaç també (useu amb --stat/--summary/--check)" -#: apply.c:5017 +#: apply.c:5022 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:5019 +#: apply.c:5024 msgid "build a temporary index based on embedded index information" -msgstr "construeix un índex temporal basat en la informació d'índex incrustada" +msgstr "" +"construeix un índex temporal basat en la informació d'índex incrustada" -#: apply.c:5022 builtin/checkout-index.c:173 builtin/ls-files.c:525 +#: apply.c:5027 builtin/checkout-index.c:182 builtin/ls-files.c:525 msgid "paths are separated with NUL character" msgstr "els camins se separen amb el caràcter NUL" -#: apply.c:5024 +#: apply.c:5029 msgid "ensure at least lines of context match" msgstr "assegura't que almenys línies de context coincideixin" -#: apply.c:5025 builtin/am.c:2258 builtin/interpret-trailers.c:98 +#: apply.c:5030 builtin/am.c:2245 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3562 builtin/rebase.c:1340 +#: builtin/pack-objects.c:3562 builtin/rebase.c:1346 msgid "action" msgstr "acció" -#: apply.c:5026 +#: apply.c:5031 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:5029 apply.c:5032 +#: apply.c:5034 apply.c:5037 msgid "ignore changes in whitespace when finding context" msgstr "ignora els canvis d'espai en blanc en cercar context" -#: apply.c:5035 +#: apply.c:5040 msgid "apply the patch in reverse" msgstr "aplica el pedaç al revés" -#: apply.c:5037 +#: apply.c:5042 msgid "don't expect at least one line of context" msgstr "no esperis almenys una línia de context" -#: apply.c:5039 +#: apply.c:5044 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "deixa els trossos rebutjats en fitxers *.rej corresponents" -#: apply.c:5041 +#: apply.c:5046 msgid "allow overlapping hunks" msgstr "permet trossos encavalcants" -#: apply.c:5042 builtin/add.c:329 builtin/check-ignore.c:22 +#: apply.c:5047 builtin/add.c:329 builtin/check-ignore.c:22 #: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775 -#: builtin/log.c:2270 builtin/mv.c:123 builtin/read-tree.c:128 +#: builtin/log.c:2287 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "sigues detallat" -#: apply.c:5044 +#: apply.c:5049 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:5047 +#: apply.c:5052 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:5049 builtin/am.c:2267 +#: apply.c:5054 builtin/am.c:2254 msgid "root" msgstr "arrel" -#: apply.c:5050 +#: apply.c:5055 msgid "prepend to all filenames" msgstr "anteposa a tots els noms de fitxer" @@ -1538,16 +1545,16 @@ msgstr "no es pot transmetre el blob %s" msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "mode de fitxer no compatible: 0%o (SHA1: %s)" -#: archive-tar.c:449 +#: archive-tar.c:450 #, c-format msgid "unable to start '%s' filter" msgstr "no s'ha pogut iniciar el filtre «%s»" -#: archive-tar.c:452 +#: archive-tar.c:453 msgid "unable to redirect descriptor" msgstr "no s'ha pogut redirigir el descriptor" -#: archive-tar.c:459 +#: archive-tar.c:460 #, c-format msgid "'%s' filter reported error" msgstr "«%s» error reportat pel filtre" @@ -1582,7 +1589,8 @@ msgstr "git archive --list" #: archive.c:16 msgid "" -"git archive --remote [--exec ] [] [...]" +"git archive --remote [--exec ] [] " +"[...]" msgstr "" "git archive --remote [--exec ] [] " "[...]" @@ -1596,9 +1604,9 @@ msgstr "git archive --remote [--exec ] --list" msgid "cannot read %s" msgstr "no es pot llegir «%s»" -#: archive.c:345 sequencer.c:445 sequencer.c:1706 sequencer.c:2852 -#: sequencer.c:3293 sequencer.c:3402 builtin/am.c:263 builtin/commit.c:786 -#: builtin/merge.c:1124 +#: archive.c:345 sequencer.c:459 sequencer.c:1736 sequencer.c:2886 +#: sequencer.c:3327 sequencer.c:3436 builtin/am.c:249 builtin/commit.c:786 +#: builtin/merge.c:1138 #, c-format msgid "could not read '%s'" msgstr "no s'ha pogut llegir «%s»" @@ -1628,129 +1636,119 @@ msgid "current working directory is untracked" msgstr "no se segueix el directori de treball actual" #: archive.c:526 -#, fuzzy, c-format +#, c-format msgid "File not found: %s" -msgstr "objecte no trobat: %s" +msgstr "Fitxer no trobat: %s" #: archive.c:528 -#, fuzzy, c-format +#, c-format msgid "Not a regular file: %s" -msgstr "no és un registre de referència" +msgstr "No és un fitxer normal: %s" -#: archive.c:553 +#: archive.c:555 msgid "fmt" msgstr "format" -#: archive.c:553 +#: archive.c:555 msgid "archive format" msgstr "format d'arxiu" -#: archive.c:554 builtin/log.c:1760 +#: archive.c:556 builtin/log.c:1765 msgid "prefix" msgstr "prefix" -#: archive.c:555 +#: archive.c:557 msgid "prepend prefix to each pathname in the archive" msgstr "anteposa el prefix a cada nom de camí en l'arxiu" -#: archive.c:556 archive.c:559 builtin/blame.c:884 builtin/blame.c:888 -#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:133 +#: archive.c:558 archive.c:561 builtin/blame.c:886 builtin/blame.c:890 +#: builtin/blame.c:891 builtin/commit-tree.c:117 builtin/config.c:135 #: builtin/fast-export.c:1208 builtin/fast-export.c:1210 -#: builtin/fast-export.c:1214 builtin/grep.c:908 builtin/hash-object.c:105 +#: builtin/fast-export.c:1214 builtin/grep.c:919 builtin/hash-object.c:105 #: builtin/ls-files.c:561 builtin/ls-files.c:564 builtin/notes.c:412 #: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190 msgid "file" msgstr "fitxer" -#: archive.c:557 -#, fuzzy +#: archive.c:559 msgid "add untracked file to archive" -msgstr "inclou els fitxers no seguits a «stash»" +msgstr "inclou els fitxers no seguits a l'arxiu" -#: archive.c:560 builtin/archive.c:90 +#: archive.c:562 builtin/archive.c:90 msgid "write the archive to this file" msgstr "escriu l'arxiu a aquest fitxer" -#: archive.c:562 +#: archive.c:564 msgid "read .gitattributes in working directory" msgstr "llegeix .gitattributes en el directori de treball" -#: archive.c:563 +#: archive.c:565 msgid "report archived files on stderr" msgstr "informa de fitxers arxivats en stderr" -#: archive.c:564 -msgid "store only" -msgstr "només emmagatzema" +#: archive.c:567 +msgid "set compression level" +msgstr "estableix el nivell de compressió" -#: archive.c:565 -msgid "compress faster" -msgstr "comprimeix més ràpidament" - -#: archive.c:573 -msgid "compress better" -msgstr "comprimeix millor" - -#: archive.c:576 +#: archive.c:570 msgid "list supported archive formats" msgstr "llista els formats d'arxiu admesos" -#: archive.c:578 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 +#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117 #: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335 msgid "repo" msgstr "dipòsit" -#: archive.c:579 builtin/archive.c:92 +#: archive.c:573 builtin/archive.c:92 msgid "retrieve the archive from remote repository " msgstr "recupera l'arxiu del dipòsit remot " -#: archive.c:580 builtin/archive.c:93 builtin/difftool.c:715 +#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714 #: builtin/notes.c:498 msgid "command" msgstr "ordre" -#: archive.c:581 builtin/archive.c:94 +#: archive.c:575 builtin/archive.c:94 msgid "path to the remote git-upload-archive command" msgstr "camí a l'ordre git-upload-archive remota" -#: archive.c:588 +#: archive.c:582 msgid "Unexpected option --remote" msgstr "Opció inesperada --remote" -#: archive.c:590 +#: archive.c:584 msgid "Option --exec can only be used together with --remote" msgstr "L'opció --exec només es pot usar juntament amb --remote" -#: archive.c:592 +#: archive.c:586 msgid "Unexpected option --output" msgstr "Opció inesperada --output" -#: archive.c:594 -#, fuzzy +#: archive.c:588 msgid "Options --add-file and --remote cannot be used together" -msgstr "Les opcions --squash i --fixup no es poden usar juntes" +msgstr "Les opcions --add-file i --remote no es poden usar juntes" -#: archive.c:616 +#: archive.c:610 #, c-format msgid "Unknown archive format '%s'" msgstr "Format d'arxiu desconegut «%s»" -#: archive.c:623 +#: archive.c:619 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "Argument no admès per al format «%s»: -%d" -#: attr.c:212 +#: attr.c:202 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s no és un nom d'atribut vàlid" -#: attr.c:369 +#: attr.c:359 #, c-format msgid "%s not allowed: %s:%d" msgstr "%s no està permès: %s:%d" -#: attr.c:409 +#: attr.c:399 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1758,22 +1756,22 @@ msgstr "" "Els patrons negatius s'ignoren en els atributs de git\n" "Useu «\\!» per exclamació capdavantera literal." -#: bisect.c:476 +#: bisect.c:489 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Comentari amb cometes errònies en el fitxer «%s»: %s" -#: bisect.c:686 +#: bisect.c:699 #, c-format msgid "We cannot bisect more!\n" msgstr "No podem bisecar més!\n" -#: bisect.c:753 +#: bisect.c:766 #, c-format msgid "Not a valid commit name %s" msgstr "No és un nom de comissió vàlid %s" -#: bisect.c:778 +#: bisect.c:791 #, c-format msgid "" "The merge base %s is bad.\n" @@ -1782,7 +1780,7 @@ msgstr "" "La base de fusió %s és errònia.\n" "Això vol dir que el defecte s'ha arreglat entre %s i [%s].\n" -#: bisect.c:783 +#: bisect.c:796 #, c-format msgid "" "The merge base %s is new.\n" @@ -1791,7 +1789,7 @@ msgstr "" "La base de fusió %s és nova.\n" "La propietat s'ha canviat entre %s i [%s].\n" -#: bisect.c:788 +#: bisect.c:801 #, c-format msgid "" "The merge base %s is %s.\n" @@ -1800,7 +1798,7 @@ msgstr "" "La base de fusió %s és %s.\n" "Això vol dir que la primera comissió «%s» és entre %s i [%s].\n" -#: bisect.c:796 +#: bisect.c:809 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1811,7 +1809,7 @@ msgstr "" "git bisect no pot funcionar correctament en aquest cas.\n" "Potser heu confós les revisions %s i %s?\n" -#: bisect.c:809 +#: bisect.c:822 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1819,40 +1817,39 @@ msgid "" "We continue anyway." msgstr "" "s'ha d'ometre la base de fusió entre %s i [%s].\n" -"Llavors, no podem estar segurs que la primera comissió %s sigui entre %s i " -"%s.\n" +"Llavors, no podem estar segurs que la primera comissió %s sigui entre %s i %s.\n" "Continuem de totes maneres." -#: bisect.c:848 +#: bisect.c:861 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Bisecant: s'ha de provar una base de fusió\n" -#: bisect.c:898 +#: bisect.c:911 #, c-format msgid "a %s revision is needed" msgstr "es necessita una revisió %s" -#: bisect.c:928 builtin/notes.c:177 builtin/tag.c:255 +#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:255 #, c-format msgid "could not create file '%s'" msgstr "no s'ha pogut crear el fitxer «%s»" -#: bisect.c:974 builtin/merge.c:150 +#: bisect.c:987 builtin/merge.c:152 #, c-format msgid "could not read file '%s'" msgstr "no s'ha pogut llegir el fitxer «%s»" -#: bisect.c:1014 +#: bisect.c:1027 msgid "reading bisect refs failed" msgstr "la lectura de les referències de bisecció ha fallat" -#: bisect.c:1044 +#: bisect.c:1057 #, c-format msgid "%s was both %s and %s\n" msgstr "%s era ambdós %s i %s\n" -#: bisect.c:1053 +#: bisect.c:1066 #, c-format msgid "" "No testable commit found.\n" @@ -1861,7 +1858,7 @@ msgstr "" "No s'ha trobat cap comissió comprovable.\n" "Potser heu començat amb paràmetres de camí incorrectes?\n" -#: bisect.c:1082 +#: bisect.c:1095 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1870,49 +1867,48 @@ msgstr[1] "(aproximadament %d passos)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. -#. -#: bisect.c:1088 +#: bisect.c:1101 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" 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:2778 +#: blame.c:2777 msgid "--contents and --reverse do not blend well." msgstr "--contents i --reverse no funcionen bé juntes." -#: blame.c:2792 +#: blame.c:2791 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:2813 +#: blame.c:2812 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse i --first-parent-together requereixen una última comissió " "especificada" -#: blame.c:2822 bundle.c:213 ref-filter.c:2264 remote.c:2020 sequencer.c:2105 -#: sequencer.c:4606 submodule.c:855 builtin/commit.c:1045 builtin/log.c:404 -#: builtin/log.c:1020 builtin/log.c:1622 builtin/log.c:2029 builtin/log.c:2319 -#: builtin/merge.c:414 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395 -#: builtin/shortlog.c:320 +#: blame.c:2821 bundle.c:213 ref-filter.c:2272 remote.c:2031 sequencer.c:2138 +#: sequencer.c:4633 submodule.c:855 builtin/commit.c:1045 builtin/log.c:409 +#: builtin/log.c:1023 builtin/log.c:1625 builtin/log.c:2046 builtin/log.c:2336 +#: builtin/merge.c:423 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395 +#: builtin/shortlog.c:267 msgid "revision walk setup failed" msgstr "la configuració del passeig per revisions ha fallat" -#: blame.c:2840 +#: blame.c:2839 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:2851 +#: blame.c:2850 #, c-format msgid "no such path %s in %s" msgstr "no hi ha tal camí %s en %s" -#: blame.c:2862 +#: blame.c:2861 #, c-format msgid "cannot read blob %s for path %s" msgstr "no es pot llegir el blob %s per al camí %s" @@ -1983,7 +1979,8 @@ msgstr "" #: branch.c:110 #, c-format msgid "Branch '%s' set up to track local ref '%s'." -msgstr "La branca «%s» està configurada per a seguir la referència local «%s»." +msgstr "" +"La branca «%s» està configurada per a seguir la referència local «%s»." #: branch.c:119 msgid "Unable to write upstream branch configuration" @@ -2010,7 +2007,8 @@ msgstr "No es pot actualitzar la branca actual a la força." #: branch.c:233 #, c-format -msgid "Cannot setup tracking information; starting point '%s' is not a branch." +msgid "" +"Cannot setup tracking information; starting point '%s' is not a branch." msgstr "" "No es pot configurar la informació de seguiment; el punt inicial «%s» no és " "una branca." @@ -2067,26 +2065,26 @@ msgid "HEAD of working tree %s is not updated" msgstr "HEAD de l'arbre de treball %s no està actualitzat" #: bundle.c:41 -#, fuzzy, c-format +#, c-format msgid "unrecognized bundle hash algorithm: %s" -msgstr "variable «%s» desconeguda" +msgstr "Algoritme de hash del farcell desconegut: %s" #: bundle.c:45 -#, fuzzy, c-format +#, c-format msgid "unknown capability '%s'" -msgstr "variable «%s» desconeguda" +msgstr "funcionalitat «%s» desconeguda" #: bundle.c:71 -#, fuzzy, c-format +#, c-format msgid "'%s' does not look like a v2 or v3 bundle file" -msgstr "«%s» no sembla un fitxer de farcell v2" +msgstr "«%s» no sembla un fitxer de farcell v2 o v3" #: bundle.c:110 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "capçalera no reconeguda: %s%s (%d)" -#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2357 sequencer.c:3142 +#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2390 sequencer.c:3176 #: builtin/commit.c:814 #, c-format msgid "could not open '%s'" @@ -2140,16 +2138,16 @@ 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:498 -#, fuzzy, c-format +#, c-format msgid "unsupported bundle version %d" -msgstr "versió d'índex no compatible %s" +msgstr "versió del farcell no compatible %d" #: bundle.c:500 #, c-format msgid "cannot write bundle version %d with algorithm %s" -msgstr "" +msgstr "no es pot escriure la versió %d amb l'algorisme %s" -#: bundle.c:522 builtin/log.c:207 builtin/log.c:1918 builtin/shortlog.c:461 +#: bundle.c:522 builtin/log.c:209 builtin/log.c:1927 builtin/shortlog.c:408 #, c-format msgid "unrecognized argument: %s" msgstr "argument no reconegut: %s" @@ -2172,10 +2170,9 @@ msgstr "L'index-pack s'ha mort" msgid "invalid color value: %.*s" msgstr "valor de color no vàlid: %.*s" -#: commit-graph.c:188 midx.c:46 -#, fuzzy +#: commit-graph.c:188 midx.c:47 msgid "invalid hash version" -msgstr "especificació de camí no vàlida" +msgstr "especificació de hash no vàlida" #: commit-graph.c:246 msgid "commit-graph file is too small" @@ -2199,23 +2196,25 @@ msgstr "" "la versió del hash del graf de comissions %X no coincideix amb la versió %X" #: commit-graph.c:342 -#, fuzzy, c-format +#, c-format msgid "commit-graph file is too small to hold %u chunks" -msgstr "el fitxer del graf de comissions és massa petit" +msgstr "" +"el fitxer del graf de comissions és massa petit per guardar %u fragments" #: commit-graph.c:361 #, c-format msgid "commit-graph improper chunk offset %08x%08x" -msgstr "desplaçament %08x%08x del gràfic de comissions incorrecte" +msgstr "desplaçament %08x%08x del fragment del graf de comissions incorrecte" #: commit-graph.c:433 #, c-format msgid "commit-graph chunk id %08x appears multiple times" -msgstr "id %08x del graf de comissions apareix múltiples vegades" +msgstr "" +"el fragment amb id %08x del graf de comissions apareix múltiples vegades" #: commit-graph.c:499 msgid "commit-graph has no base graphs chunk" -msgstr "el graf de comissions no té grafs de base" +msgstr "el fragment del graf de comissions no té grafs de base" #: commit-graph.c:509 msgid "commit-graph chain does not match" @@ -2242,7 +2241,7 @@ msgstr "" msgid "could not find commit %s" msgstr "no s'ha pogut trobar la comissió %s" -#: commit-graph.c:1042 builtin/am.c:1306 +#: commit-graph.c:1042 builtin/am.c:1292 #, c-format msgid "unable to parse commit %s" msgstr "no s'ha pogut analitzar la comissió %s" @@ -2274,16 +2273,16 @@ msgstr "" "S'estan calculant els canvis les rutes de la comissió en els filtres Bloom" #: commit-graph.c:1501 -#, fuzzy msgid "Collecting referenced commits" -msgstr "S'estan comptant els objectes referenciats" +msgstr "S'estan recollint els objectes referenciats" #: commit-graph.c:1526 #, 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" +msgstr[1] "" +"S'estan cercant les comissions pel graf de comissions en %d paquets" #: commit-graph.c:1539 #, c-format @@ -2314,7 +2313,7 @@ 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" -#: commit-graph.c:1720 midx.c:826 +#: commit-graph.c:1720 midx.c:819 #, c-format msgid "unable to create leading directories of %s" msgstr "no s'han pogut crear els directoris inicials de «%s»" @@ -2352,112 +2351,116 @@ msgstr "" msgid "Scanning merged commits" msgstr "S'estan escanejant les comissions fusionades" -#: commit-graph.c:2026 -#, c-format -msgid "unexpected duplicate commit id %s" -msgstr "id de comissió duplicat %s no esperat" - -#: commit-graph.c:2049 +#: commit-graph.c:2059 msgid "Merging commit-graph" msgstr "S'està fusionant el graf de comissions" -#: commit-graph.c:2259 +#: commit-graph.c:2165 +msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" +msgstr "" +"s'està intentant escriure un graf de comissions, però «core.commitGraph» " +"està desactivat" + +#: commit-graph.c:2274 #, 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:2270 +#: commit-graph.c:2285 msgid "too many commits to write graph" msgstr "massa comissions per escriure un graf" -#: commit-graph.c:2363 +#: commit-graph.c:2378 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:2373 +#: commit-graph.c:2388 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "el gràfic de comissions té una ordre OID incorrecta; %s llavors %s" -#: commit-graph.c:2383 commit-graph.c:2398 +#: commit-graph.c:2398 commit-graph.c:2413 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" -"el graf de comissions té un valor de «fanout» incorrecte: fanout[%d] = %u != " -"%u" +"el graf de comissions té un valor de «fanout» incorrecte: fanout[%d] = %u !=" +" %u" -#: commit-graph.c:2390 +#: commit-graph.c:2405 #, 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" -#: commit-graph.c:2408 +#: commit-graph.c:2423 msgid "Verifying commits in commit graph" msgstr "S'estan verificant les comissions al graf de comissions" -#: commit-graph.c:2423 +#: commit-graph.c:2438 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" "no s'han pogut analitzar la comissió %s de la base de dades d'objectes per " "al graf de comissions" -#: commit-graph.c:2430 +#: commit-graph.c:2445 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" -"OID de l'arbre arrel per a comissions %s en el graf de comissions és %s != %s" +"OID de l'arbre arrel per a comissions %s en el graf de comissions és %s != " +"%s" -#: commit-graph.c:2440 +#: commit-graph.c:2455 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "" "la llista de pares del graf de comissions per a la comissió %s és massa " "llarga" -#: commit-graph.c:2449 +#: commit-graph.c:2464 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "el pare pel graf de comissions %s és %s != %s" -#: commit-graph.c:2463 +#: commit-graph.c:2478 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "la llista pare del graf de comissions per %s acaba aviat" -#: commit-graph.c:2468 +#: commit-graph.c:2483 #, c-format msgid "" -"commit-graph has generation number zero for commit %s, but non-zero elsewhere" +"commit-graph has generation number zero for commit %s, but non-zero " +"elsewhere" msgstr "" -"El graf de comissions té nombre de generació zero per a la comissió %s, però " -"té no zero en altres llocs" +"El graf de comissions té nombre de generació zero per a la comissió %s, però" +" té no zero en altres llocs" -#: commit-graph.c:2472 +#: commit-graph.c:2487 #, c-format msgid "" -"commit-graph has non-zero generation number for commit %s, but zero elsewhere" +"commit-graph has non-zero generation number for commit %s, but zero " +"elsewhere" msgstr "" "El graf de comissions té un nombre de generació diferent de zero per a " "comissió %s però té zero en altres llocs" -#: commit-graph.c:2488 +#: commit-graph.c:2503 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "La generació del graf de comissions per la comissió %s és %u != %u" -#: commit-graph.c:2494 +#: commit-graph.c:2509 #, c-format msgid "commit date for commit %s in commit-graph is % != %" msgstr "" "La data d'enviament per a la comissió %s en el graf de comissions és " "% != %" -#: commit.c:52 sequencer.c:2845 builtin/am.c:373 builtin/am.c:417 -#: builtin/am.c:1385 builtin/am.c:2031 builtin/replace.c:457 +#: commit.c:52 sequencer.c:2879 builtin/am.c:359 builtin/am.c:403 +#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457 #, c-format msgid "could not parse %s" msgstr "no s'ha pogut analitzar %s" @@ -2478,6 +2481,12 @@ msgid "" "Turn this message off by running\n" "\"git config advice.graftFileDeprecated false\"" msgstr "" +"La compatibilitat amb /info/grafts és obsoleta\n" +"i s'eliminarà en una futura versió del Git.\n" +"\n" +"Si us plau useu «git replace --convert-graft-file»\n" +"per convertir els grafs en substitució de referències. Desactiveu aquest missatge executant\n" +"«git config advice.graftFileDeprecated false»" #: commit.c:1172 #, c-format @@ -2553,7 +2562,7 @@ msgstr "la clau no conté una secció: «%s»" msgid "key does not contain variable name: %s" msgstr "la clau no conté un nom de variable: «%s»" -#: config.c:408 sequencer.c:2547 +#: config.c:408 sequencer.c:2580 #, c-format msgid "invalid key: %s" msgstr "clau no vàlida: %s" @@ -2624,13 +2633,15 @@ msgstr "valor de configuració numèric erroni «%s» per «%s» en el blob %s: #: config.c:1016 #, 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" +msgstr "" +"valor de configuració numèric «%s» erroni per «%s» en el fitxer %s: %s" #: config.c:1019 #, 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" +"valor de configuració numèric «%s» erroni per «%s» en l'entrada estàndard: " +"%s" #: config.c:1022 #, c-format @@ -2691,15 +2702,15 @@ msgid "malformed value for %s: %s" msgstr "valor no vàlid per a %s: %s" #: config.c:1472 -#, fuzzy msgid "must be one of nothing, matching, simple, upstream or current" msgstr "" -"ha de ser un dels elements que no coincideixen amb la font simple o l'actual" +"ha de ser un dels elements següents: nothing, matching, simple, upstream o " +"current" #: config.c:1533 builtin/pack-objects.c:3649 #, c-format msgid "bad pack compression level %d" -msgstr "nivell de compressió de paquet %d Erroni" +msgstr "nivell de compressió de paquet %d erroni" #: config.c:1655 #, c-format @@ -2727,7 +2738,8 @@ msgstr "no s'ha pogut analitzar la configuració de la línia d'ordres" #: config.c:2122 msgid "unknown error occurred while reading the configuration files" -msgstr "un error desconegut ha ocorregut en llegir els fitxers de configuració" +msgstr "" +"un error desconegut ha ocorregut en llegir els fitxers de configuració" #: config.c:2296 #, c-format @@ -2749,77 +2761,78 @@ msgstr "no s'ha pogut analitzar «%s» de la configuració de la línia d'ordres 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:2470 +#: config.c:2473 #, c-format msgid "invalid section name '%s'" msgstr "nom de secció no vàlid «%s»" -#: config.c:2502 +#: config.c:2505 #, c-format msgid "%s has multiple values" msgstr "%s té múltiples valors" -#: config.c:2531 +#: config.c:2534 #, c-format msgid "failed to write new configuration file %s" msgstr "no es pot escriure un nou fitxer de configuració %s" -#: config.c:2783 config.c:3107 +#: config.c:2786 config.c:3112 #, c-format msgid "could not lock config file %s" msgstr "no s'ha pogut blocar el fitxer de configuració %s" -#: config.c:2794 +#: config.c:2797 #, c-format msgid "opening %s" msgstr "s'està obrint %s" -#: config.c:2829 builtin/config.c:354 +#: config.c:2834 builtin/config.c:361 #, c-format msgid "invalid pattern: %s" msgstr "patró no vàlid: %s" -#: config.c:2854 +#: config.c:2859 #, c-format msgid "invalid config file %s" msgstr "fitxer de configuració no vàlid %s" -#: config.c:2867 config.c:3120 +#: config.c:2872 config.c:3125 #, c-format msgid "fstat on %s failed" msgstr "ha fallat «fstat» a %s" -#: config.c:2878 +#: config.c:2883 #, c-format msgid "unable to mmap '%s'" msgstr "no s'ha pogut fer «mmap» «%s»" -#: config.c:2887 config.c:3125 +#: config.c:2892 config.c:3130 #, c-format msgid "chmod on %s failed" msgstr "ha fallat chmod a %s" -#: config.c:2972 config.c:3222 +#: config.c:2977 config.c:3227 #, c-format msgid "could not write config file %s" msgstr "no s'ha pogut escriure el fitxer de configuració «%s»" -#: config.c:3006 +#: config.c:3011 #, c-format msgid "could not set '%s' to '%s'" msgstr "no s'ha pogut establir «%s» a «%s»" -#: config.c:3008 builtin/remote.c:656 builtin/remote.c:850 builtin/remote.c:858 +#: config.c:3013 builtin/remote.c:657 builtin/remote.c:855 +#: builtin/remote.c:863 #, c-format msgid "could not unset '%s'" msgstr "no s'ha pogut desassignar «%s»" -#: config.c:3098 +#: config.c:3103 #, c-format msgid "invalid section name: %s" msgstr "nom de secció no vàlida: %s" -#: config.c:3265 +#: config.c:3270 #, c-format msgid "missing value for '%s'" msgstr "falta el valor per «%s»" @@ -2885,7 +2898,7 @@ msgstr "s'ha produït un error de protocol: no s'esperava «%s»" #: connect.c:473 #, c-format msgid "unknown object format '%s' specified by server" -msgstr "" +msgstr "format d'objecte «%s» especificat pel servidor desconegut" #: connect.c:500 #, c-format @@ -2897,9 +2910,8 @@ msgid "expected flush after ref listing" msgstr "s'esperava una neteja després del llistat de referències" #: connect.c:507 -#, fuzzy msgid "expected response end packet after ref listing" -msgstr "s'esperava una neteja després del llistat de referències" +msgstr "s'esperava un final de resposta després del llistat de referències" #: connect.c:640 #, c-format @@ -2972,8 +2984,8 @@ msgstr "no s'ha pogut iniciar servidor intermediari «%s»" #: connect.c:1024 msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "" -"no s'ha especificat un camí; vegeu «git help pull» per la sintaxi vàlida per " -"URL" +"no s'ha especificat un camí; vegeu «git help pull» per la sintaxi vàlida per" +" URL" #: connect.c:1219 msgid "ssh variant 'simple' does not support -4" @@ -3029,8 +3041,7 @@ msgid "" "The file will have its original line endings in your working directory" msgstr "" "CRLF serà reemplaçat per LF en %s.\n" -"El fitxer tindrà els seus terminadors de línia originals en el vostre " -"directori de treball" +"El fitxer tindrà els seus terminadors de línia originals en el vostre directori de treball" #: convert.c:217 #, c-format @@ -3044,8 +3055,7 @@ msgid "" "The file will have its original line endings in your working directory" msgstr "" "LF serà reemplaçat per CRLF en %s.\n" -"El fitxer tindrà els seus terminadors de línia originals en el vostre " -"directori de treball" +"El fitxer tindrà els seus terminadors de línia originals en el vostre directori de treball" #: convert.c:284 #, c-format @@ -3058,8 +3068,8 @@ msgid "" "The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as " "working-tree-encoding." msgstr "" -"El fitxer «%s» conté una marca d'ordre de byte (BOM). Utilitzeu UTF-%.*s com " -"a codificacions d'arbre de treball." +"El fitxer «%s» conté una marca d'ordre de byte (BOM). Utilitzeu UTF-%.*s com" +" a codificacions d'arbre de treball." #: convert.c:304 #, c-format @@ -3069,11 +3079,12 @@ msgstr "La BOM és necessària en «%s» si està codificada com a %s" #: convert.c:306 #, c-format msgid "" -"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" -"%sLE (depending on the byte order) as working-tree-encoding." +"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or " +"UTF-%sLE (depending on the byte order) as working-tree-encoding." msgstr "" -"Falta una marca d'ordre de byte (BOM) al fitxer «%s». Useu UTF-%sBE o UTF-" -"%sLE (depenent de l'ordre de byte) com a codificacions d'arbre de treball." +"Falta una marca d'ordre de byte (BOM) al fitxer «%s». Useu UTF-%sBE o " +"UTF-%sLE (depenent de l'ordre de byte) com a codificacions d'arbre de " +"treball." #: convert.c:419 convert.c:490 #, c-format @@ -3124,8 +3135,8 @@ msgid "" "external filter '%s' is not available anymore although not all paths have " "been filtered" msgstr "" -"el filtre extern «%s» ja no està disponible encara que no s'han filtrat tots " -"els camins" +"el filtre extern «%s» ja no està disponible encara que no s'han filtrat tots" +" els camins" #: convert.c:1240 msgid "true/false are no valid working-tree-encodings" @@ -3137,27 +3148,29 @@ msgid "%s: clean filter '%s' failed" msgstr "%s: el filtre de netejat «%s» ha fallat" #: convert.c:1508 -#, fuzzy, c-format +#, c-format msgid "%s: smudge filter %s failed" -msgstr "percentatges Ha fallat el filtre de l'esborronat" +msgstr "%s: ha fallat el filtre smudge %s" #: credential.c:96 #, c-format msgid "skipping credential lookup for key: credential.%s" -msgstr "" +msgstr "s'està ometent la cerca de credencials per una clau: credential.%s" #: credential.c:112 msgid "refusing to work with credential missing host field" msgstr "" +"s'ha rebutjat treballar amb credencials que no tenen el camp d'amfitrió" #: credential.c:114 msgid "refusing to work with credential missing protocol field" msgstr "" +"s'ha rebutjat treballar amb credencials que no tenen el camp de protocol" #: credential.c:394 #, c-format msgid "url contains a newline in its %s component: %s" -msgstr "" +msgstr "url conté una línia nova en %s component: %s" #: credential.c:438 #, c-format @@ -3264,6 +3277,26 @@ msgstr "" msgid "Marked %d islands, done.\n" msgstr "Marcades %d illes, fet.\n" +#: diff-lib.c:534 +msgid "--merge-base does not work with ranges" +msgstr "--merge-base no funciona amb intervals" + +#: diff-lib.c:536 +msgid "--merge-base only works with commits" +msgstr "--merge-base només funciona amb comissions" + +#: diff-lib.c:553 +msgid "unable to get HEAD" +msgstr "no s'ha pogut obtenir HEAD" + +#: diff-lib.c:560 +msgid "no merge base found" +msgstr "no s'ha trobat una base de fusió" + +#: diff-lib.c:562 +msgid "multiple merge bases found" +msgstr "s'han trobat múltiples bases de fusió" + #: diff-no-index.c:238 msgid "git diff --no-index [] " msgstr "git diff --no-index [] " @@ -3297,22 +3330,22 @@ msgstr "" "«zebra», «dimmed-zebra» o «plain»" #: diff.c:325 -#, fuzzy, c-format +#, c-format msgid "" -"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', " -"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'" +"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change'," +" 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'" msgstr "" -"el mode «%s» de «color-moved-ws» és «ignore-space-change» «ignore-space-at-" -"eol» «ignore-all-space» «allow-indentation-change»" +"el mode «%s» de «color-moved-ws» és desconegut, els valor possibles són " +"«ignore-space-change», «ignore-space-at-eol», «ignore-all-space», «allow-" +"indentation-change»." #: diff.c:333 -#, fuzzy msgid "" "color-moved-ws: allow-indentation-change cannot be combined with other " "whitespace modes" msgstr "" -"color-moved-ws allow-indentation-change no es pot combinar amb altres modes " -"d'espai en blanc" +"color-moved-ws: allow-indentation-change no es pot combinar amb altres modes" +" d'espai en blanc" #: diff.c:410 #, c-format @@ -3329,35 +3362,35 @@ msgstr "" "S'han trobat errors en la variable de configuració «diff.dirstat»:\n" "%s" -#: diff.c:4269 +#: diff.c:4276 #, c-format msgid "external diff died, stopping at %s" msgstr "el diff external s'ha mort, s'està aturant a %s" -#: diff.c:4618 +#: diff.c:4625 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:4621 +#: diff.c:4628 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S and --find-object són mútuament excloents" -#: diff.c:4699 +#: diff.c:4706 msgid "--follow requires exactly one pathspec" msgstr "--follow requereix exactament una especificació de camí" -#: diff.c:4747 +#: diff.c:4754 #, c-format msgid "invalid --stat value: %s" msgstr "valor --stat no vàlid: %s" -#: diff.c:4752 diff.c:4757 diff.c:4762 diff.c:4767 diff.c:5279 +#: diff.c:4759 diff.c:4764 diff.c:4769 diff.c:4774 diff.c:5302 #: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 #, c-format msgid "%s expects a numerical value" msgstr "%s espera un valor numèric" -#: diff.c:4784 +#: diff.c:4791 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3366,195 +3399,199 @@ msgstr "" "S'ha produït un error en analitzar el paràmetre d'opció de --dirstat/-X:\n" "%s" -#: diff.c:4869 +#: diff.c:4876 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "classe de canvi «%c» desconeguda a --diff-filter=%s" -#: diff.c:4893 +#: diff.c:4900 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "valor desconegut després de ws-error-highlight=%.*s" -#: diff.c:4907 +#: diff.c:4914 #, c-format msgid "unable to resolve '%s'" msgstr "no s'ha pogut resoldre «%s»" -#: diff.c:4957 diff.c:4963 +#: diff.c:4964 diff.c:4970 #, c-format msgid "%s expects / form" msgstr "%s espera una forma /" -#: diff.c:4975 +#: diff.c:4982 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s esperava un caràcter, s'ha rebut «%s»" -#: diff.c:4996 +#: diff.c:5003 #, c-format msgid "bad --color-moved argument: %s" msgstr "argument --color-moved incorrecte: %s" -#: diff.c:5015 +#: diff.c:5022 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "mode «%s» no vàlid en --color-moved-ws" -#: diff.c:5055 -msgid "" -"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " -"\"histogram\"" +#: diff.c:5062 +msgid "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and \"histogram\"" msgstr "" "l'opció diff-algorithm accepta «myers», «minimal», «patience» i «histogram»" -#: diff.c:5091 diff.c:5111 +#: diff.c:5098 diff.c:5118 #, c-format msgid "invalid argument to %s" msgstr "argument no vàlid a %s" -#: diff.c:5248 +#: diff.c:5222 +#, c-format +msgid "invalid regex given to -I: '%s'" +msgstr "expressió regular donada a -I: no vàlida: «%s»" + +#: diff.c:5271 #, 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:5304 +#: diff.c:5327 #, c-format msgid "bad --word-diff argument: %s" msgstr "argument --word-diff incorrecte: %s" -#: diff.c:5327 +#: diff.c:5350 msgid "Diff output format options" msgstr "Opcions del format de sortida del diff" -#: diff.c:5329 diff.c:5335 +#: diff.c:5352 diff.c:5358 msgid "generate patch" msgstr "generant pedaç" -#: diff.c:5332 builtin/log.c:176 +#: diff.c:5355 builtin/log.c:178 msgid "suppress diff output" msgstr "omet la sortida de diferències" -#: diff.c:5337 diff.c:5451 diff.c:5458 +#: diff.c:5360 diff.c:5474 diff.c:5481 msgid "" msgstr "" -#: diff.c:5338 diff.c:5341 +#: diff.c:5361 diff.c:5364 msgid "generate diffs with lines context" msgstr "genera diffs amb línies de context" -#: diff.c:5343 +#: diff.c:5366 msgid "generate the diff in raw format" msgstr "genera el diff en format cru" -#: diff.c:5346 +#: diff.c:5369 msgid "synonym for '-p --raw'" msgstr "sinònim de «-p --raw»" -#: diff.c:5350 +#: diff.c:5373 msgid "synonym for '-p --stat'" msgstr "sinònim de «-p --stat»" -#: diff.c:5354 +#: diff.c:5377 msgid "machine friendly --stat" msgstr "llegible per màquina --stat" -#: diff.c:5357 +#: diff.c:5380 msgid "output only the last line of --stat" msgstr "mostra només l'última línia de --stat" -#: diff.c:5359 diff.c:5367 +#: diff.c:5382 diff.c:5390 msgid "..." msgstr "..." -#: diff.c:5360 +#: diff.c:5383 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" "genera la distribució de la quantitat relativa de canvis per a cada " "subdirectori" -#: diff.c:5364 +#: diff.c:5387 msgid "synonym for --dirstat=cumulative" msgstr "sinònim de --dirstat=cumulative" -#: diff.c:5368 +#: diff.c:5391 msgid "synonym for --dirstat=files,param1,param2..." msgstr "sinònim de --dirstat=files,param1,param2..." -#: diff.c:5372 +#: diff.c:5395 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" "avisa si els canvis introdueixen marcadors en conflicte o errors d'espai en " "blanc" -#: diff.c:5375 +#: diff.c:5398 msgid "condensed summary such as creations, renames and mode changes" msgstr "resum condensat com ara creacions, canvis de nom i mode" -#: diff.c:5378 +#: diff.c:5401 msgid "show only names of changed files" msgstr "mostra només els noms de fitxers canviats" -#: diff.c:5381 +#: diff.c:5404 msgid "show only names and status of changed files" msgstr "mostra només els noms i l'estat dels fitxers canviats" -#: diff.c:5383 +#: diff.c:5406 msgid "[,[,]]" msgstr "[[,]]" -#: diff.c:5384 +#: diff.c:5407 msgid "generate diffstat" msgstr "genera diffstat" -#: diff.c:5386 diff.c:5389 diff.c:5392 +#: diff.c:5409 diff.c:5412 diff.c:5415 msgid "" msgstr "" -#: diff.c:5387 +#: diff.c:5410 msgid "generate diffstat with a given width" msgstr "genera diffstat amb una amplada donada" -#: diff.c:5390 +#: diff.c:5413 msgid "generate diffstat with a given name width" msgstr "genera diffstat amb un nom d'amplada donat" -#: diff.c:5393 +#: diff.c:5416 msgid "generate diffstat with a given graph width" msgstr "genera diffstat amb una amplada de graf donada" -#: diff.c:5395 +#: diff.c:5418 msgid "" msgstr "" -#: diff.c:5396 +#: diff.c:5419 msgid "generate diffstat with limited lines" msgstr "genera diffstat amb línies limitades" -#: diff.c:5399 +#: diff.c:5422 msgid "generate compact summary in diffstat" msgstr "genera un resum compacte a diffstat" -#: diff.c:5402 +#: diff.c:5425 msgid "output a binary diff that can be applied" msgstr "diff amb sortida binària que pot ser aplicada" -#: diff.c:5405 +#: diff.c:5428 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" -"mostra els noms complets dels objectes pre i post-imatge a les línies «index»" +"mostra els noms complets dels objectes pre i post-imatge a les línies " +"«index»" -#: diff.c:5407 +#: diff.c:5430 msgid "show colored diff" msgstr "mostra un diff amb colors" -#: diff.c:5408 +#: diff.c:5431 msgid "" msgstr "" -#: diff.c:5409 +#: diff.c:5432 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" @@ -3562,261 +3599,263 @@ msgstr "" "ressalta els errors d'espai en blanc a les línies «context», «old» o «new» " "al diff" -#: diff.c:5412 -#, fuzzy +#: diff.c:5435 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" msgstr "" -"no munge noms de camí i utilitza NULs com a terminadors de camp de sortida " -"en --raw o --numstat" +"no consolidis els noms de camí i utilitza NULs com a terminadors de camp de " +"sortida en --raw o --numstat" -#: diff.c:5415 diff.c:5418 diff.c:5421 diff.c:5527 +#: diff.c:5438 diff.c:5441 diff.c:5444 diff.c:5553 msgid "" msgstr "" -#: diff.c:5416 +#: diff.c:5439 msgid "show the given source prefix instead of \"a/\"" msgstr "mostra el prefix d'origen donat en lloc de «a/»" -#: diff.c:5419 +#: diff.c:5442 msgid "show the given destination prefix instead of \"b/\"" msgstr "mostra el prefix de destinació indicat en lloc de «b/»" -#: diff.c:5422 +#: diff.c:5445 msgid "prepend an additional prefix to every line of output" msgstr "afegir un prefix addicional per a cada línia de sortida" -#: diff.c:5425 +#: diff.c:5448 msgid "do not show any source or destination prefix" msgstr "no mostris cap prefix d'origen o destí" -#: diff.c:5428 +#: diff.c:5451 msgid "show context between diff hunks up to the specified number of lines" msgstr "" "mostra el context entre trossos de diferència fins al nombre especificat de " "línies" -#: diff.c:5432 diff.c:5437 diff.c:5442 +#: diff.c:5455 diff.c:5460 diff.c:5465 msgid "" msgstr "" -#: diff.c:5433 +#: diff.c:5456 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 «+»" -#: diff.c:5438 +#: diff.c:5461 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 «-»" -#: diff.c:5443 +#: diff.c:5466 msgid "specify the character to indicate a context instead of ' '" msgstr "especifiqueu el caràcter per a indicar context en comptes de « »" -#: diff.c:5446 +#: diff.c:5469 msgid "Diff rename options" msgstr "Opcions de canvi de nom del diff" -#: diff.c:5447 +#: diff.c:5470 msgid "[/]" msgstr "[/]" -#: diff.c:5448 +#: diff.c:5471 msgid "break complete rewrite changes into pairs of delete and create" msgstr "" "divideix els canvis de reescriptura completa en parells de suprimir i crear" -#: diff.c:5452 +#: diff.c:5475 msgid "detect renames" msgstr "detecta els canvis de noms" -#: diff.c:5456 +#: diff.c:5479 msgid "omit the preimage for deletes" msgstr "omet les preimatges per les supressions" -#: diff.c:5459 +#: diff.c:5482 msgid "detect copies" msgstr "detecta còpies" -#: diff.c:5463 +#: diff.c:5486 msgid "use unmodified files as source to find copies" msgstr "usa els fitxers no modificats com a font per trobar còpies" -#: diff.c:5465 +#: diff.c:5488 msgid "disable rename detection" msgstr "inhabilita la detecció de canvis de nom" -#: diff.c:5468 +#: diff.c:5491 msgid "use empty blobs as rename source" msgstr "usa els blobs buits com a font de canvi de nom" -#: diff.c:5470 +#: diff.c:5493 msgid "continue listing the history of a file beyond renames" msgstr "continua llistant l'històric d'un fitxer més enllà dels canvis de nom" -#: diff.c:5473 +#: diff.c:5496 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" msgstr "" -"Evita la detecció de canvi de nom/còpia si el nombre d'objectius de canvi de " -"nom/còpia supera el límit indicat" +"Evita la detecció de canvi de nom/còpia si el nombre d'objectius de canvi de" +" nom/còpia supera el límit indicat" -#: diff.c:5475 +#: diff.c:5498 msgid "Diff algorithm options" msgstr "Opcions de l'algorisme Diff" -#: diff.c:5477 +#: diff.c:5500 msgid "produce the smallest possible diff" msgstr "produeix el diff més petit possible" -#: diff.c:5480 +#: diff.c:5503 msgid "ignore whitespace when comparing lines" msgstr "ignora els espais en blanc en comparar línies" -#: diff.c:5483 +#: diff.c:5506 msgid "ignore changes in amount of whitespace" msgstr "ignora els canvis en la quantitat d'espai en blanc" -#: diff.c:5486 +#: diff.c:5509 msgid "ignore changes in whitespace at EOL" msgstr "ignora els canvis d'espai en blanc al final de la línia" -#: diff.c:5489 +#: diff.c:5512 msgid "ignore carrier-return at the end of line" msgstr "ignora els retorns de línia al final de la línia" -#: diff.c:5492 +#: diff.c:5515 msgid "ignore changes whose lines are all blank" msgstr "ignora els canvis en línies que estan en blanc" -#: diff.c:5495 +#: diff.c:5517 diff.c:5539 diff.c:5542 diff.c:5587 +msgid "" +msgstr "" + +#: diff.c:5518 +msgid "ignore changes whose all lines match " +msgstr "ignora els canvis en les línies que coincideixen amb " + +#: diff.c:5521 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "" "heurística per a desplaçar els límits del tros de diferència per a una " "lectura fàcil" -#: diff.c:5498 +#: diff.c:5524 msgid "generate diff using the \"patience diff\" algorithm" msgstr "genera diff usant l'algorisme «patience diff»" -#: diff.c:5502 +#: diff.c:5528 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "genera diff usant l'algorisme «histogram diff»" -#: diff.c:5504 +#: diff.c:5530 msgid "" msgstr "" -#: diff.c:5505 +#: diff.c:5531 msgid "choose a diff algorithm" msgstr "trieu un algorisme per al diff" -#: diff.c:5507 +#: diff.c:5533 msgid "" msgstr "" -#: diff.c:5508 +#: diff.c:5534 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "genera diff usant l'algorisme «anchored diff»" -#: diff.c:5510 diff.c:5519 diff.c:5522 +#: diff.c:5536 diff.c:5545 diff.c:5548 msgid "" msgstr "" -#: diff.c:5511 -#, fuzzy +#: diff.c:5537 msgid "show word diff, using to delimit changed words" msgstr "" "mostra el diff de paraules usant per delimitar les paraules " "modificades" -#: diff.c:5513 diff.c:5516 diff.c:5561 -msgid "" -msgstr "" - -#: diff.c:5514 +#: diff.c:5540 msgid "use to decide what a word is" msgstr "utilitza per a decidir què és una paraula" -#: diff.c:5517 +#: diff.c:5543 msgid "equivalent to --word-diff=color --word-diff-regex=" msgstr "equivalent a --word-diff=color --word-diff-regex=" -#: diff.c:5520 +#: diff.c:5546 msgid "moved lines of code are colored differently" msgstr "les línies de codi que s'ha mogut s'acoloreixen diferent" -#: diff.c:5523 +#: diff.c:5549 msgid "how white spaces are ignored in --color-moved" msgstr "com s'ignoren els espais en blanc a --color-moved" -#: diff.c:5526 +#: diff.c:5552 msgid "Other diff options" msgstr "Altres opcions diff" -#: diff.c:5528 +#: diff.c:5554 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" -"quan s'executa des d'un subdirectori, exclou els canvis de fora i mostra els " -"camins relatius" +"quan s'executa des d'un subdirectori, exclou els canvis de fora i mostra els" +" camins relatius" -#: diff.c:5532 +#: diff.c:5558 msgid "treat all files as text" msgstr "tracta tots els fitxers com a text" -#: diff.c:5534 +#: diff.c:5560 msgid "swap two inputs, reverse the diff" msgstr "intercanvia les dues entrades, inverteix el diff" -#: diff.c:5536 +#: diff.c:5562 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:5538 +#: diff.c:5564 msgid "disable all output of the program" msgstr "inhabilita totes les sortides del programa" -#: diff.c:5540 +#: diff.c:5566 msgid "allow an external diff helper to be executed" msgstr "permet executar un ajudant de diff extern" -#: diff.c:5542 +#: diff.c:5568 msgid "run external text conversion filters when comparing binary files" msgstr "" "executa els filtres externs de conversió de text en comparar fitxers binaris" -#: diff.c:5544 +#: diff.c:5570 msgid "" msgstr "" -#: diff.c:5545 +#: diff.c:5571 msgid "ignore changes to submodules in the diff generation" msgstr "ignora els canvis als submòduls en la generació del diff" -#: diff.c:5548 +#: diff.c:5574 msgid "" msgstr "" -#: diff.c:5549 +#: diff.c:5575 msgid "specify how differences in submodules are shown" msgstr "especifiqueu com es mostren els canvis als submòduls" -#: diff.c:5553 +#: diff.c:5579 msgid "hide 'git add -N' entries from the index" msgstr "amaga les entrades «git add -N» de l'índex" -#: diff.c:5556 +#: diff.c:5582 msgid "treat 'git add -N' entries as real in the index" msgstr "tracta les entrades «git add -N» com a reals a l'índex" -#: diff.c:5558 +#: diff.c:5584 msgid "" msgstr "" -#: diff.c:5559 +#: diff.c:5585 msgid "" "look for differences that change the number of occurrences of the specified " "string" @@ -3824,7 +3863,7 @@ msgstr "" "cerca les diferències que canvien el nombre d'ocurrències de la cadena " "especificada" -#: diff.c:5562 +#: diff.c:5588 msgid "" "look for differences that change the number of occurrences of the specified " "regex" @@ -3832,23 +3871,23 @@ msgstr "" "cerca les diferències que canvien el nombre d'ocurrències de l'expressió " "regular especificada" -#: diff.c:5565 +#: diff.c:5591 msgid "show all changes in the changeset with -S or -G" msgstr "mostra tots els canvis amb el conjunt de canvis amb -S o -G" -#: diff.c:5568 +#: diff.c:5594 msgid "treat in -S as extended POSIX regular expression" msgstr "tracta a -S com a expressió regular POSIX ampliada" -#: diff.c:5571 +#: diff.c:5597 msgid "control the order in which files appear in the output" msgstr "controla l'ordre amb el qual els fitxers apareixen en la sortida" -#: diff.c:5572 +#: diff.c:5598 msgid "" msgstr "" -#: diff.c:5573 +#: diff.c:5599 msgid "" "look for differences that change the number of occurrences of the specified " "object" @@ -3856,39 +3895,39 @@ msgstr "" "cerca les diferències que canvien el nombre d'ocurrències de l'objecte " "especificat" -#: diff.c:5575 +#: diff.c:5601 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5576 +#: diff.c:5602 msgid "select files by diff type" msgstr "seleccioneu els fitxers per tipus de diff" -#: diff.c:5578 +#: diff.c:5604 msgid "" msgstr "" -#: diff.c:5579 +#: diff.c:5605 msgid "Output to a specific file" msgstr "Sortida a un fitxer específic" -#: diff.c:6236 +#: diff.c:6262 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." -#: diff.c:6239 +#: diff.c:6265 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:6242 +#: diff.c:6268 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "" -"potser voleu establir la vostra variable %s a almenys %d i tornar a intentar " -"l'ordre." +"potser voleu establir la vostra variable %s a almenys %d i tornar a intentar" +" l'ordre." #: diffcore-order.c:24 #, c-format @@ -3989,250 +4028,248 @@ 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-pack.c:176 +#: fetch-pack.c:177 msgid "git fetch-pack: expected shallow list" -msgstr "git fetch-pack: llista superficial esperada" +msgstr "git fetch-pack: llista shallow esperada" -#: fetch-pack.c:179 -#, fuzzy +#: fetch-pack.c:180 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "" -"git fetch-pack s'esperava un paquet de buidatge després d'una llista " -"superficial" +"git fetch-pack: s'esperava un paquet de buidatge després d'una llista " +"shallow" -#: fetch-pack.c:190 +#: fetch-pack.c:191 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 buidatge" -#: fetch-pack.c:210 +#: fetch-pack.c:211 #, 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:221 +#: fetch-pack.c:222 msgid "unable to write to remote" msgstr "no s'ha pogut escriure al remot" -#: fetch-pack.c:282 +#: fetch-pack.c:283 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc requereix multi_ack_detailed" -#: fetch-pack.c:375 fetch-pack.c:1397 +#: fetch-pack.c:378 fetch-pack.c:1406 #, c-format msgid "invalid shallow line: %s" msgstr "línia de shallow no vàlida: %s" -#: fetch-pack.c:381 fetch-pack.c:1403 +#: fetch-pack.c:384 fetch-pack.c:1412 #, c-format msgid "invalid unshallow line: %s" msgstr "línia d'unshallow no vàlida: %s" -#: fetch-pack.c:383 fetch-pack.c:1405 +#: fetch-pack.c:386 fetch-pack.c:1414 #, c-format msgid "object not found: %s" msgstr "objecte no trobat: %s" -#: fetch-pack.c:386 fetch-pack.c:1408 +#: fetch-pack.c:389 fetch-pack.c:1417 #, c-format msgid "error in object: %s" msgstr "error en objecte: %s" -#: fetch-pack.c:388 fetch-pack.c:1410 +#: fetch-pack.c:391 fetch-pack.c:1419 #, c-format msgid "no shallow found: %s" msgstr "no s'ha trobat cap shallow: %s" -#: fetch-pack.c:391 fetch-pack.c:1414 +#: fetch-pack.c:394 fetch-pack.c:1423 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "s'esperava shallow/unshallow, s'ha rebut %s" -#: fetch-pack.c:431 +#: fetch-pack.c:434 #, c-format msgid "got %s %d %s" msgstr "s'ha rebut %s %d %s" -#: fetch-pack.c:448 +#: fetch-pack.c:451 #, c-format msgid "invalid commit %s" msgstr "comissió no vàlida %s" -#: fetch-pack.c:479 +#: fetch-pack.c:482 msgid "giving up" msgstr "s'abandona" -#: fetch-pack.c:492 progress.c:339 +#: fetch-pack.c:495 progress.c:339 msgid "done" msgstr "fet" -#: fetch-pack.c:504 +#: fetch-pack.c:507 #, c-format msgid "got %s (%d) %s" msgstr "s'ha rebut %s (%d) %s" -#: fetch-pack.c:540 +#: fetch-pack.c:543 #, c-format msgid "Marking %s as complete" msgstr "S'està marcant %s com a complet" -#: fetch-pack.c:755 +#: fetch-pack.c:758 #, c-format msgid "already have %s (%s)" msgstr "ja es té %s (%s)" -#: fetch-pack.c:824 +#: fetch-pack.c:827 msgid "fetch-pack: unable to fork off sideband demultiplexer" -msgstr "fetch-pack: no s'ha pogut bifurcar del desmultiplexor de banda lateral" +msgstr "" +"fetch-pack: no s'ha pogut bifurcar del desmultiplexor de banda lateral" -#: fetch-pack.c:832 +#: fetch-pack.c:835 msgid "protocol error: bad pack header" msgstr "error de protocol: capçalera de paquet errònia" -#: fetch-pack.c:916 +#: fetch-pack.c:919 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: no es pot bifurcar de %s" -#: fetch-pack.c:933 +#: fetch-pack.c:937 #, c-format msgid "%s failed" msgstr "%s ha fallat" -#: fetch-pack.c:935 +#: fetch-pack.c:939 msgid "error in sideband demultiplexer" msgstr "error en desmultiplexor de banda lateral" -#: fetch-pack.c:978 +#: fetch-pack.c:982 #, c-format msgid "Server version is %.*s" msgstr "La versió del servidor és %.*s" -#: fetch-pack.c:983 fetch-pack.c:989 fetch-pack.c:992 fetch-pack.c:998 -#: fetch-pack.c:1002 fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014 -#: fetch-pack.c:1018 fetch-pack.c:1022 fetch-pack.c:1026 fetch-pack.c:1030 -#: fetch-pack.c:1036 fetch-pack.c:1042 fetch-pack.c:1047 fetch-pack.c:1052 +#: fetch-pack.c:990 fetch-pack.c:996 fetch-pack.c:999 fetch-pack.c:1005 +#: fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 fetch-pack.c:1021 +#: fetch-pack.c:1025 fetch-pack.c:1029 fetch-pack.c:1033 fetch-pack.c:1037 +#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1054 fetch-pack.c:1059 #, c-format msgid "Server supports %s" msgstr "El servidor accepta %s" -#: fetch-pack.c:985 +#: fetch-pack.c:992 msgid "Server does not support shallow clients" msgstr "El servidor no permet clients superficials" -#: fetch-pack.c:1045 +#: fetch-pack.c:1052 msgid "Server does not support --shallow-since" msgstr "El servidor no admet --shallow-since" -#: fetch-pack.c:1050 +#: fetch-pack.c:1057 msgid "Server does not support --shallow-exclude" msgstr "El servidor no admet --shallow-exclude" -#: fetch-pack.c:1054 +#: fetch-pack.c:1061 msgid "Server does not support --deepen" msgstr "El servidor no admet --deepen" -#: fetch-pack.c:1056 -#, fuzzy +#: fetch-pack.c:1063 msgid "Server does not support this repository's object format" -msgstr "El servidor no permet sol·licituds superficials" +msgstr "El servidor no és compatible amb el format d'objecte d'aquest dipòsit" -#: fetch-pack.c:1069 +#: fetch-pack.c:1076 msgid "no common commits" msgstr "cap comissió en comú" -#: fetch-pack.c:1081 fetch-pack.c:1619 +#: fetch-pack.c:1088 fetch-pack.c:1628 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: l'obtenció ha fallat." -#: fetch-pack.c:1205 +#: fetch-pack.c:1214 #, c-format msgid "mismatched algorithms: client %s; server %s" -msgstr "" +msgstr "algoritmes no coincidents: client %s; servidor %s" -#: fetch-pack.c:1209 -#, fuzzy, c-format +#: fetch-pack.c:1218 +#, c-format msgid "the server does not support algorithm '%s'" -msgstr "el servidor no és compatible amb «%s»" +msgstr "el servidor no és compatible amb l'algorisme «%s»" -#: fetch-pack.c:1229 +#: fetch-pack.c:1238 msgid "Server does not support shallow requests" msgstr "El servidor no permet sol·licituds superficials" -#: fetch-pack.c:1236 +#: fetch-pack.c:1245 msgid "Server supports filter" msgstr "El servidor accepta filtratge" -#: fetch-pack.c:1275 +#: fetch-pack.c:1284 msgid "unable to write request to remote" msgstr "no s'ha pogut escriure la sol·licitud al remot" -#: fetch-pack.c:1293 +#: fetch-pack.c:1302 #, c-format msgid "error reading section header '%s'" msgstr "error en llegir la capçalera de la secció «%s»" -#: fetch-pack.c:1299 +#: fetch-pack.c:1308 #, c-format msgid "expected '%s', received '%s'" msgstr "s'esperava «%s», s'ha rebut «%s»" -#: fetch-pack.c:1360 +#: fetch-pack.c:1369 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "línia de confirmació inesperada: «%s»" -#: fetch-pack.c:1365 +#: fetch-pack.c:1374 #, c-format msgid "error processing acks: %d" msgstr "s'ha produït un error en processar els acks: %d" -#: fetch-pack.c:1375 +#: fetch-pack.c:1384 msgid "expected packfile to be sent after 'ready'" msgstr "s'esperava l'enviament del fitxer de paquet després de «ready»" -#: fetch-pack.c:1377 +#: fetch-pack.c:1386 msgid "expected no other sections to be sent after no 'ready'" msgstr "s'esperava que no s'enviés cap altra secció després de no «ready»" -#: fetch-pack.c:1419 +#: fetch-pack.c:1428 #, c-format msgid "error processing shallow info: %d" msgstr "s'ha produït un error en processar la informació superficial: %d" -#: fetch-pack.c:1466 +#: fetch-pack.c:1475 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "s'esperava wanted-ref, s'ha rebut «%s»" -#: fetch-pack.c:1471 +#: fetch-pack.c:1480 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "wanted-ref inesperat: «%s»" -#: fetch-pack.c:1476 +#: fetch-pack.c:1485 #, 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:1506 -#, fuzzy +#: fetch-pack.c:1515 msgid "git fetch-pack: expected response end packet" -msgstr "git fetch-pack: llista superficial esperada" +msgstr "git fetch-pack: s'esperava un paquet de final de resposta" -#: fetch-pack.c:1887 +#: fetch-pack.c:1897 msgid "no matching remote head" msgstr "no hi ha cap HEAD remot coincident" -#: fetch-pack.c:1910 builtin/clone.c:692 +#: fetch-pack.c:1920 builtin/clone.c:693 msgid "remote did not send all necessary objects" msgstr "el remot no ha enviat tots els objectes necessaris" -#: fetch-pack.c:1937 +#: fetch-pack.c:1947 #, c-format msgid "no such remote ref %s" msgstr "no existeix la referència remota %s" -#: fetch-pack.c:1940 +#: fetch-pack.c:1950 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "El servidor no permet sol·licitar objectes no anunciats %s" @@ -4255,26 +4292,26 @@ msgstr "gpg ha fallat en signar les dades" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "ignora el color no vàlid «%.*s» en log.graphColors" -#: grep.c:668 +#: grep.c:640 msgid "" "given pattern contains NULL byte (via -f ). This is only supported " "with -P under PCRE v2" msgstr "" -"el patró indicat conté byte NULL (via -f ). Això només és compatible " -"amb -P sota PCRE v2" +"el patró indicat conté byte NULL (via -f ). Això només és compatible" +" amb -P sota PCRE v2" -#: grep.c:2128 +#: grep.c:2100 #, c-format msgid "'%s': unable to read %s" msgstr "«%s»: no s'ha pogut llegir %s" -#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:89 +#: grep.c:2117 setup.c:176 builtin/clone.c:412 builtin/diff.c:89 #: 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:2156 +#: grep.c:2128 #, c-format msgid "'%s': short read" msgstr "«%s»: lectura curta" @@ -4331,43 +4368,42 @@ msgstr "Ordres de baix nivell / Sincronització de dipòsits" msgid "Low-level Commands / Internal Helpers" msgstr "Ordres de baix nivell / Ajudants interns" -#: help.c:298 +#: help.c:300 #, c-format msgid "available git commands in '%s'" msgstr "ordres de git disponibles en «%s»" -#: help.c:305 +#: help.c:307 msgid "git commands available from elsewhere on your $PATH" msgstr "ordres de git disponibles d'altres llocs en el vostre $PATH" -#: help.c:314 +#: help.c:316 msgid "These are common Git commands used in various situations:" msgstr "" "Aquestes són ordres del Git habitualment usades en diverses situacions:" -#: help.c:363 git.c:99 +#: help.c:365 git.c:99 #, c-format msgid "unsupported command listing type '%s'" msgstr "tipus de llistat de l'ordre no compatible «%s»" -#: help.c:403 -#, fuzzy +#: help.c:405 msgid "The Git concept guides are:" -msgstr "Les guies de Git comunes són:" +msgstr "Les guies de Git de conceptes són:" -#: help.c:427 +#: help.c:429 msgid "See 'git help ' to read about a specific subcommand" msgstr "Vegeu «git help » per llegir sobre una subordre específica" -#: help.c:432 +#: help.c:434 msgid "External commands" msgstr "Ordres externes" -#: help.c:447 +#: help.c:449 msgid "Command aliases" msgstr "Àlies d'ordres" -#: help.c:511 +#: help.c:527 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -4376,33 +4412,33 @@ msgstr "" "«%s» sembla una ordre de git, però no hem pogut\n" "executar-la. Pot ser que git-%s estigui malmès?" -#: help.c:570 +#: help.c:543 help.c:631 +#, c-format +msgid "git: '%s' is not a git command. See 'git --help'." +msgstr "git: «%s» no és una ordre de git. Vegeu «git --help»." + +#: help.c:591 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Ai. El vostre sistema no informa de cap ordre de Git." -#: help.c:592 +#: help.c:613 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "" "ADVERTÈNCIA: Heu invocat una ordre de Git amb nom «%s», la qual no existeix." -#: help.c:597 +#: help.c:618 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "El procés continuarà, pressuposant que volíeu dir «%s»." -#: help.c:602 +#: help.c:623 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "" "El procés continuarà en %0.1f segons, pressuposant que volíeu dir «%s»." -#: help.c:610 -#, c-format -msgid "git: '%s' is not a git command. See 'git --help'." -msgstr "git: «%s» no és una ordre de git. Vegeu «git --help»." - -#: help.c:614 +#: help.c:635 msgid "" "\n" "The most similar command is" @@ -4416,16 +4452,16 @@ msgstr[1] "" "\n" "Les ordres més similars són" -#: help.c:654 +#: help.c:675 msgid "git version []" msgstr "git version []" -#: help.c:709 +#: help.c:730 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: help.c:713 +#: help.c:734 msgid "" "\n" "Did you mean this?" @@ -4441,11 +4477,11 @@ msgstr[1] "" #: ident.c:353 msgid "Author identity unknown\n" -msgstr "" +msgstr "Identitat de l'autor desconeguda\n" #: ident.c:356 msgid "Committer identity unknown\n" -msgstr "" +msgstr "Es desconeix la identitat del comitent\n" #: ident.c:362 msgid "" @@ -4515,9 +4551,8 @@ msgid "expected 'tree:'" msgstr "s'esperava «tree:»" #: list-objects-filter-options.c:96 -#, fuzzy msgid "sparse:path filters support has been dropped" -msgstr "s'ha eliminat la implementació de filtres sparsepath" +msgstr "sparse: s'ha eliminat la implementació de filtres de camí sparse" #: list-objects-filter-options.c:109 #, c-format @@ -4525,23 +4560,23 @@ msgid "invalid filter-spec '%s'" msgstr "filtre d'especificació no vàlid: «%s»" #: list-objects-filter-options.c:125 -#, fuzzy, c-format +#, c-format msgid "must escape char in sub-filter-spec: '%c'" -msgstr "ha d'escapar el caràcter en el subfiltratge '%c'" +msgstr "cal escapar el caràcter en el sub-filter-spec «%c»" #: list-objects-filter-options.c:167 -#, fuzzy msgid "expected something after combine:" -msgstr "s'esperava alguna cosa després de combinar" +msgstr "s'esperava alguna cosa després de combinar:" #: list-objects-filter-options.c:249 msgid "multiple filter-specs cannot be combined" msgstr "no es poden combinar múltiples especificacions de filtratge" #: list-objects-filter-options.c:361 -#, fuzzy msgid "unable to upgrade repository format to support partial clone" -msgstr "no s'ha pogut analitzar la cadena de format" +msgstr "" +"no s'ha pogut actualitzar el format del dipòsit perquè sigui compatible amb " +"un clonatge parcial" #: list-objects-filter.c:492 #, c-format @@ -4594,9 +4629,22 @@ msgid "Unable to create '%s.lock': %s" msgstr "No s'ha pogut crear «%s.lock»: %s" #: ls-refs.c:109 -#, fuzzy msgid "expected flush after ls-refs arguments" -msgstr "s'esperava una neteja després del llistat de referències" +msgstr "s'esperava una neteja després dels arguments ls-refs" + +#: merge-ort-wrappers.c:13 merge-recursive.c:3672 +#, 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-ort-wrappers.c:33 merge-recursive.c:3436 +#, c-format +msgid "Already up to date!" +msgstr "Ja està al dia!" #: merge-recursive.c:356 msgid "(bad commit)\n" @@ -4665,7 +4713,8 @@ msgstr "S'ha produït un error en fusionar el submòdul %s (no està agafat)" #: merge-recursive.c:1198 #, 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)" +msgstr "" +"S'ha produït un error en fusionar el submòdul %s (no hi ha comissions)" #: merge-recursive.c:1205 #, c-format @@ -4688,7 +4737,8 @@ msgstr "Avançament ràpid al submòdul %s" #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" -"Ha fallat en fusionar el submòdul %s (no s'ha trobat les comissions següents)" +"Ha fallat en fusionar el submòdul %s (no s'ha trobat les comissions " +"següents)" #: merge-recursive.c:1255 #, c-format @@ -4701,7 +4751,7 @@ 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:1259 -#, fuzzy, c-format +#, c-format msgid "" "If this is correct simply add it to the index for example\n" "by using:\n" @@ -4710,9 +4760,12 @@ msgid "" "\n" "which will accept this suggestion.\n" msgstr "" -"Si això és correcte simplement afegiu-ho a l'índex per exemple utilitzant " -"git update-index --cacheinfo 160000 per cents \"%s\" que acceptaran aquest " -"suggeriment.\n" +"Si això és correcte simplement afegiu-ho a l'índex per exemple\n" +"utilitzant:\n" +"\n" +" git update-index --cacheinfo 160000 %s «%s»\n" +"\n" +"que acceptarà aquest suggeriment.\n" #: merge-recursive.c:1268 #, c-format @@ -4820,8 +4873,8 @@ msgstr "" #: merge-recursive.c:1708 #, c-format msgid "" -"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" -"\"->\"%s\" in \"%s\"%s" +"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename " +"\"%s\"->\"%s\" in \"%s\"%s" msgstr "" "CONFLICTE (canvi de nom/canvi de nom): Canvi de nom «%s»->«%s» en la branca " "«%s» canvi de nom «%s»->«%s» en «%s»%s" @@ -4838,40 +4891,40 @@ msgstr "" "nom %s->%s en %s" #: merge-recursive.c:2068 -#, fuzzy, c-format +#, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " "directory %s was renamed to multiple other directories, with no destination " "getting a majority of the files." msgstr "" -"CONFLICT (divisió de canvi de nom de directori) Onclear on col·locar-los " -"perquè els nivells de directori s'han reanomenat a múltiples altres " -"directoris sense destinació obtenint la majoria dels fitxers." +"CONFLICTE (divisió de canvi de nom de directori): no està clar on col·locar %s " +"perquè el directori %s s'han canviat de nom a múltiples altres " +"directoris, sense una destinació per a la majoria dels fitxers." #: merge-recursive.c:2100 -#, fuzzy, c-format +#, 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 "" -"CONFLICT (implicit dir rename) El fitxer/directori existent at%s en forma de " -"directori implícit reanomena(s) posant-hi els camins següents." +"CONFLICTE (canvi del nom del directori implícit): el fitxer o directori existent a %s en forma de" +" canvi del nom del directori implícit, posant-hi els camins següents a: %s." #: merge-recursive.c:2110 -#, fuzzy, c-format +#, 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 "" -"CONFLICT (nom abreujat reanomena) No es pot assignar més d'un camí als " -"percentatges; noms de directori implícits s'ha intentat posar aquests camins " -"segons" +"CONFLICT (canvi del nom del directori implícit) no es pot assignar més d'un camí a " +"%s; els canvis del nom del directori implícits han intentat posar aquests camins a: %s" +" segons" #: merge-recursive.c:2202 #, c-format msgid "" -"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" -">%s in %s" +"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 de directori %s->%s en %s" @@ -4942,8 +4995,8 @@ msgstr "" #: merge-recursive.c:3218 #, fuzzy, 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." +"CONFLICT (file location): %s added in %s inside a directory that was renamed" +" in %s, suggesting it should perhaps be moved to %s." msgstr "" "CONFLICT (ubicació de l'arxiu) els percentatges afegits dins d'un directori " "que va ser rebatejat en percentatges suggerint que potser hauria de ser " @@ -4952,8 +5005,8 @@ msgstr "" #: merge-recursive.c:3222 #, fuzzy, c-format msgid "" -"Path updated: %s renamed to %s in %s, inside a directory that was renamed in " -"%s; moving it to %s." +"Path updated: %s renamed to %s in %s, inside a directory that was renamed in" +" %s; moving it to %s." msgstr "" "El camí va actualitzar els percentatges de canvi de nom a percentatges " "d'incens dins d'un directori que es va canviar de nom en percentatges, " @@ -4984,10 +5037,11 @@ msgstr "directori/fitxer" #: merge-recursive.c:3374 #, c-format -msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" +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" +"CONFLICTE (%s): Hi ha un directori amb nom %s en %s. S'està afegint %s com a" +" %s" #: merge-recursive.c:3383 #, c-format @@ -4999,10 +5053,6 @@ msgstr "S'està afegint %s" msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "CONFLICTE (afegiment/afegiment): Conflicte de fusió en %s" -#: merge-recursive.c:3436 -msgid "Already up to date!" -msgstr "Ja està al dia!" - #: merge-recursive.c:3445 #, c-format msgid "merging of trees %s and %s failed" @@ -5023,21 +5073,12 @@ msgstr[1] "s'han trobat %u avantpassats en comú:" msgid "merge returned no commit" msgstr "la fusió no ha retornat cap comissió" -#: merge-recursive.c:3672 -#, 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:3769 #, c-format msgid "Could not parse object '%s'" msgstr "No s'ha pogut analitzar l'objecte «%s»" -#: merge-recursive.c:3787 builtin/merge.c:702 builtin/merge.c:881 +#: merge-recursive.c:3787 builtin/merge.c:711 builtin/merge.c:895 msgid "Unable to write index." msgstr "No s'ha pogut escriure l'índex." @@ -5045,194 +5086,185 @@ msgstr "No s'ha pogut escriure l'índex." msgid "failed to read the cache" msgstr "s'ha produït un error en llegir la memòria cau" -#: merge.c:109 rerere.c:720 builtin/am.c:1896 builtin/am.c:1930 -#: builtin/checkout.c:560 builtin/checkout.c:816 builtin/clone.c:816 +#: merge.c:109 rerere.c:720 builtin/am.c:1883 builtin/am.c:1917 +#: builtin/checkout.c:573 builtin/checkout.c:829 builtin/clone.c:817 #: builtin/stash.c:265 msgid "unable to write new index file" msgstr "no s'ha pogut escriure un fitxer d'índex nou" -#: midx.c:79 +#: midx.c:80 #, fuzzy, c-format msgid "multi-pack-index file %s is too small" msgstr "l'índex múltiple és massa petit" -#: midx.c:95 +#: midx.c:96 #, fuzzy, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "" "signatura d'índex múltiple 0x%08x no coincideix amb la signatura 0x%08x" -#: midx.c:100 +#: midx.c:101 #, fuzzy, c-format msgid "multi-pack-index version %d not recognized" msgstr "multi-index no reconegut" -#: midx.c:105 +#: midx.c:106 #, fuzzy, c-format msgid "multi-pack-index hash version %u does not match version %u" msgstr "" "la versió del hash del graf de comissions %X no coincideix amb la versió %X" -#: midx.c:122 -#, fuzzy +#: midx.c:123 msgid "invalid chunk offset (too large)" -msgstr "desplaçament no vàlid (massa gran)" +msgstr "desplaçament del fragment no vàlid (massa gran)" -#: midx.c:146 +#: midx.c:147 #, fuzzy msgid "terminating multi-pack-index chunk id appears earlier than expected" msgstr "" "s'ha acabat l'identificador de fragment multi-index apareix abans del que " "s'esperava" -#: midx.c:159 -#, fuzzy +#: midx.c:160 msgid "multi-pack-index missing required pack-name chunk" -msgstr "multi-index falta un fragment de nom de paquet" +msgstr "Falta un fragment de nom de paquet necessari al multi-index" -#: midx.c:161 -#, fuzzy +#: midx.c:162 msgid "multi-pack-index missing required OID fanout chunk" -msgstr "multi-index falta un tros de ventilador OID requerit" +msgstr "falta un fragment «fanout» OID necessari al multi-pack-index" -#: midx.c:163 -#, fuzzy +#: midx.c:164 msgid "multi-pack-index missing required OID lookup chunk" -msgstr "multi-index falta el fragment de cerca OID necessari" +msgstr "falta un fragment de cerca «fanout» OID necessari al multi-pack-index" -#: midx.c:165 -#, fuzzy +#: midx.c:166 msgid "multi-pack-index missing required object offsets chunk" -msgstr "multi-index falta el tros d'objecte necessari" +msgstr "falta un fragment necessari dels desplaçaments al multi-pack-index" -#: midx.c:179 +#: midx.c:180 #, fuzzy, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "noms de paquet d'índex múltiple fora de l'ordre «%s» abans de «%s»" -#: midx.c:222 -#, fuzzy, c-format +#: midx.c:223 +#, c-format msgid "bad pack-int-id: %u (%u total packs)" -msgstr "pack-int-id%u incorrecte (%u total packs)" +msgstr "pack-int-id: %u incorrecte (%u paquets en total)" -#: midx.c:272 +#: midx.c:273 #, fuzzy msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "" "multi-index emmagatzema un desplaçament de 64 bits però deft és massa petit" -#: midx.c:300 -#, fuzzy -msgid "error preparing packfile from multi-pack-index" -msgstr "error en preparar el fitxer de paquet des d'un índex múltiple" - -#: midx.c:485 -#, fuzzy, c-format +#: midx.c:480 +#, c-format msgid "failed to add packfile '%s'" msgstr "no s'ha pogut afegir el fitxer de paquet «%s»" -#: midx.c:491 -#, fuzzy, c-format +#: midx.c:486 +#, c-format msgid "failed to open pack-index '%s'" msgstr "no s'ha pogut obrir l'índex del paquet «%s»" -#: midx.c:551 -#, fuzzy, c-format +#: midx.c:546 +#, c-format msgid "failed to locate object %d in packfile" -msgstr "no s'ha pogut localitzar l'objecte en el fitxer de paquet" +msgstr "no s'ha pogut localitzar l'objecte %d en el fitxer de paquet" -#: midx.c:853 +#: midx.c:846 #, fuzzy msgid "Adding packfiles to multi-pack-index" msgstr "Afegint fitxers de paquets a multi-index" -#: midx.c:886 +#: midx.c:879 #, fuzzy, c-format msgid "did not see pack-file %s to drop" msgstr "no s'han vist caure els paquets del fitxer" -#: midx.c:938 +#: midx.c:931 msgid "no pack files to index." msgstr "no hi ha fitxers empaquetats a indexar." -#: midx.c:990 +#: midx.c:982 #, fuzzy msgid "Writing chunks to multi-pack-index" msgstr "Escrivint trossos a multi-index" -#: midx.c:1068 +#: midx.c:1060 #, fuzzy, c-format msgid "failed to clear multi-pack-index at %s" msgstr "no s'han pogut netejar els percentatges multi-paquet" -#: midx.c:1124 +#: midx.c:1116 #, fuzzy msgid "multi-pack-index file exists, but failed to parse" msgstr "l'índex múltiple és massa petit" -#: midx.c:1132 +#: midx.c:1124 msgid "Looking for referenced packfiles" msgstr "S'estan cercant fitxers empaquetats referenciats" -#: midx.c:1147 +#: midx.c:1139 #, fuzzy, c-format msgid "" "oid fanout out of order: fanout[%d] = % > % = fanout[%d]" msgstr "" "od fanout fora de l'ordre fanout[%d] = % > % = fanout[%d]" -#: midx.c:1152 +#: midx.c:1144 +#, fuzzy msgid "the midx contains no oid" -msgstr "" +msgstr "el midx no conté cap oide" -#: midx.c:1161 +#: midx.c:1153 #, fuzzy msgid "Verifying OID order in multi-pack-index" msgstr "Verificant l'ordre OID en multi-index" -#: midx.c:1170 +#: midx.c:1162 #, fuzzy, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "oid lookup fora d'ordre oid[%d] = per cents >= %s = oid[%d]" -#: midx.c:1190 +#: midx.c:1182 msgid "Sorting objects by packfile" msgstr "S'estan ordenant els objectes per fitxer de paquet" -#: midx.c:1197 +#: midx.c:1189 msgid "Verifying object offsets" msgstr "S'estan verificant els desplaçaments dels objectes" -#: midx.c:1213 +#: midx.c:1205 #, fuzzy, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "" "no s'ha pogut carregar l'entrada del paquet per a oid[%d] = percentatges" -#: midx.c:1219 +#: midx.c:1211 #, fuzzy, c-format msgid "failed to load pack-index for packfile %s" -msgstr "no s'ha pogut carregar l'índex del paquet per als fitxers del paquet" +msgstr "no s'ha pogut carregar l'índex del paquet per al fitxer de paquet %s" -#: midx.c:1228 +#: midx.c:1220 #, fuzzy, c-format msgid "incorrect object offset for oid[%d] = %s: % != %" msgstr "" "desplaçament incorrecte de l'objecte per a oid[%d] =%s% !=%" -#: midx.c:1253 +#: midx.c:1245 msgid "Counting referenced objects" msgstr "S'estan comptant els objectes referenciats" -#: midx.c:1263 +#: midx.c:1255 msgid "Finding and deleting unreferenced packfiles" msgstr "S'estan cercant i suprimint els fitxers de paquets no referenciats" -#: midx.c:1454 +#: midx.c:1446 msgid "could not start pack-objects" msgstr "no s'ha pogut iniciar el pack-objects" -#: midx.c:1474 +#: midx.c:1466 msgid "could not finish pack-objects" msgstr "no s'ha pogut finalitzar el pack-objects" @@ -5255,12 +5287,10 @@ msgstr "no s'ha pogut unir als fil per cents de nom mandrós" #, c-format msgid "" "You have not concluded your previous notes merge (%s exists).\n" -"Please, use 'git notes merge --commit' or 'git notes merge --abort' to " -"commit/abort the previous merge before you start a new notes merge." +"Please, use 'git notes merge --commit' or 'git notes merge --abort' to commit/abort the previous merge before you start a new notes merge." msgstr "" "No heu acabat la vostra fusió de notes prèvia (%s existeix).\n" -"Useu «git notes merge --commit» o «git notes merge --abort» per a cometre/" -"avortar la fusió prèvia abans de començar una fusió de notes nova." +"Useu «git notes merge --commit» o «git notes merge --abort» per a cometre/avortar la fusió prèvia abans de començar una fusió de notes nova." #: notes-merge.c:284 #, c-format @@ -5284,7 +5314,6 @@ msgstr "S'està refusant reescriure les notes en %s (fora de refs/notes/)" #. TRANSLATORS: The first %s is the name of #. the environment variable, the second %s is #. its value. -#. #: notes-utils.c:145 #, c-format msgid "Bad %s value: '%s'" @@ -5320,17 +5349,17 @@ msgstr "el resum no coincideix %s" msgid "unable to get size of %s" msgstr "no s'ha pogut obtenir la mida de %s" -#: packfile.c:630 +#: packfile.c:615 msgid "offset before end of packfile (broken .idx?)" msgstr "desplaçament abans de la fi del fitxer de paquet (.idx trencat?)" -#: packfile.c:1922 +#: packfile.c:1907 #, 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:1926 +#: packfile.c:1911 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" @@ -5427,7 +5456,6 @@ msgstr "ús: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. -#. #: parse-options.c:915 #, c-format msgid " or: %s" @@ -5583,7 +5611,7 @@ msgstr "error de protocol: caràcter de longitud de línia erroni: %.4s" msgid "protocol error: bad line length %d" msgstr "error de protocol: longitud de línia errònia %d" -#: pkt-line.c:373 sideband.c:150 +#: pkt-line.c:373 sideband.c:165 #, c-format msgid "remote error: %s" msgstr "error remot: %s" @@ -5593,9 +5621,9 @@ msgid "Refreshing index" msgstr "S'està actualitzant l'índex" #: preload-index.c:138 -#, fuzzy, c-format +#, c-format msgid "unable to create threaded lstat: %s" -msgstr "no s'han pogut crear lstat per fil" +msgstr "no s'han pogut crear lstat amb fils %s" #: pretty.c:983 msgid "unable to parse --pretty format" @@ -5603,20 +5631,20 @@ msgstr "no s'ha pogut analitzar el format --pretty" #: promisor-remote.c:30 msgid "promisor-remote: unable to fork off fetch subprocess" -msgstr "" +msgstr "promisor-remote no es pot bifurcar obtenint el subprocés" #: promisor-remote.c:35 promisor-remote.c:37 msgid "promisor-remote: could not write to fetch subprocess" -msgstr "" +msgstr "promisor-remote no s'ha pogut escriure per obtenir el subprocés" #: promisor-remote.c:41 msgid "promisor-remote: could not close stdin to fetch subprocess" -msgstr "" +msgstr "promisor-remote no s'ha pogut tancar stdin per obtenir el subprocés" #: promisor-remote.c:53 -#, fuzzy, c-format +#, c-format msgid "promisor remote name cannot begin with '/': %s" -msgstr "el nom remot «promisor» no pot començar amb «/» per cents" +msgstr "el nom remot «promisor» no pot començar amb «/»: %s" #: prune-packed.c:35 msgid "Removing duplicate objects" @@ -5630,31 +5658,33 @@ msgstr "no s'ha pogut iniciar «log»" msgid "could not read `log` output" msgstr "no s'ha pogut llegir la sortida de «log»" -#: range-diff.c:98 sequencer.c:5283 +#: range-diff.c:98 sequencer.c:5310 #, c-format msgid "could not parse commit '%s'" msgstr "no s'ha pogut analitzar la comissió «%s»" #: range-diff.c:112 -#, c-format +#, fuzzy, c-format msgid "" "could not parse first line of `log` output: did not start with 'commit ': " "'%s'" msgstr "" +"no s'ha pogut analitzar la primera línia de la sortida `log` no s'ha iniciat" +" amb 'commit '%s'" #: range-diff.c:137 #, 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:301 +#: range-diff.c:299 msgid "failed to generate diff" msgstr "s'ha produït un error en generar el diff" -#: range-diff.c:534 range-diff.c:536 +#: range-diff.c:532 range-diff.c:534 #, c-format msgid "could not parse log for '%s'" -msgstr "no s'ha pogut llegir el fitxer de registre per «%s»" +msgstr "no s'ha pogut llegir el fitxer de registre per a «%s»" #: read-cache.c:682 #, c-format @@ -5750,7 +5780,7 @@ msgstr "format d'entrada d'índex desconeguda «0x%08x»" #: read-cache.c:1802 #, c-format msgid "malformed name field in the index, near path '%s'" -msgstr "camp del nom mal formatat l'index, camí a prop «%s»" +msgstr "camp del nom mal formatat l'índex, camí a prop «%s»" #: read-cache.c:1859 #, fuzzy @@ -5769,32 +5799,32 @@ msgstr "entrades d'etapa no ordenades per «%s»" #: read-cache.c:1971 read-cache.c:2262 rerere.c:565 rerere.c:599 rerere.c:1111 #: submodule.c:1628 builtin/add.c:538 builtin/check-ignore.c:181 -#: builtin/checkout.c:489 builtin/checkout.c:675 builtin/clean.c:991 -#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507 +#: builtin/checkout.c:502 builtin/checkout.c:688 builtin/clean.c:991 +#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:507 #: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290 #: builtin/submodule--helper.c:332 msgid "index file corrupt" msgstr "fitxer d'índex malmès" #: read-cache.c:2115 -#, fuzzy, c-format +#, c-format msgid "unable to create load_cache_entries thread: %s" -msgstr "no s'ha pogut crear loadcacheentries fil%s" +msgstr "no s'ha pogut crear fil «load_cache_entries»: %s" #: read-cache.c:2128 -#, fuzzy, c-format +#, c-format msgid "unable to join load_cache_entries thread: %s" -msgstr "no s'ha pogut unir a «loadcacheentries» fil%s" +msgstr "no s'ha pogut unir al fil «load_cache_entries»: %s" #: read-cache.c:2161 -#, fuzzy, c-format +#, c-format msgid "%s: index file open failed" -msgstr "ha fallat l'obertura del fitxer d'índex de percentatges" +msgstr "%s: ha fallat l'obertura del fitxer d'índex" #: read-cache.c:2165 -#, fuzzy, c-format +#, c-format msgid "%s: cannot stat the open index" -msgstr "percentatges no poden fer «stat» a l'índex obert" +msgstr "%s: no es pot fer «stat» a l'índex obert" #: read-cache.c:2169 #, c-format @@ -5826,12 +5856,12 @@ msgstr "no s'ha pogut refrescar l'índex compartit «%s»" 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:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1126 +#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1140 #, c-format msgid "could not close '%s'" msgstr "no s'ha pogut tancar «%s»" -#: read-cache.c:3120 sequencer.c:2446 sequencer.c:4185 +#: read-cache.c:3120 sequencer.c:2479 sequencer.c:4231 #, c-format msgid "could not stat '%s'" msgstr "no s'ha pogut fer stat a «%s»" @@ -5858,12 +5888,10 @@ msgstr "els percentatges no poden descendir a l'escenari #0" #: rebase-interactive.c:11 msgid "" -"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" -"continue'.\n" +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.\n" "Or you can abort the rebase with 'git rebase --abort'.\n" msgstr "" -"Podeu arreglar-ho amb «git rebase --edit-todo» i després «git rebase --" -"continue».\n" +"Podeu arreglar-ho amb «git rebase --edit-todo» i després «git rebase --continue».\n" "O bé, podeu avortar el «rebase» amb «git rebase --abort».\n" #: rebase-interactive.c:33 @@ -5875,7 +5903,6 @@ msgstr "" "ignorant." #: rebase-interactive.c:42 -#, fuzzy msgid "" "\n" "Commands:\n" @@ -5898,35 +5925,29 @@ msgid "" msgstr "" "\n" "Ordres:\n" -" p, pick = usa la comissió\n" -" r, reword = usa la comissió, però edita el missatge de comissió\n" -" e, edit = usa la comissió, però atura't per a esmenar\n" -" s, squash = usa la comissió, però fusiona-la a la comissió " -"prèvia\n" -" f, fixup = com a «squash», però descarta el missatge de registre " -"d'aquesta comissió\n" -"x, exec = executa l'ordre (la resta de la línia) usant " -"l'intèrpret d'ordres\n" -"b, break = atura't aquí (continua fent «rebase» després amb «git rebase --" -"continue»)\n" +"p, pick = usa la comissió\n" +"r, reword = usa la comissió, però edita el missatge de comissió\n" +"e, edit = usa la comissió, però atura't per a esmenar-la\n" +"s, squash = usa la comissió, però fusiona-la a la comissió prèvia\n" +"f, fixup = com a «squash», però descarta el missatge de registre d'aquesta comissió\n" +"x, exec = executa l'ordre (la resta de la línia) usant l'intèrpret d'ordres\n" +"b, break = atura't aquí (continua fent «rebase» després amb «git rebase --continue»)\n" "d, drop = elimina la comissió\n" "l, label = etiqueta la HEAD actual amb un nom\n" -"t, reset = reinicia HEAD a una etiqueta \n" +"t, reset = reinicia HEAD a una etiqueta\n" "m, merge [-C | -c ] [# ]\n" ". crea una comissió de fusió usant el missatge de la comissió\n" -". de fusió original (o línia única, si no hi ha cap comissió de fusió " -"original\n" -". especificada). Useu -c per a reescriure el missatge de " -"publicació.\n" +". de fusió original (o línia única, si no hi ha cap comissió de fusió original\n" +". especificada). Useu -c per a reescriure el missatge de la comissió.\n" "\n" "Es pot canviar l'ordre d'aquestes línies; s'executen de dalt a baix.\n" #: rebase-interactive.c:63 -#, c-format +#, c-format, fuzzy msgid "Rebase %s onto %s (%d command)" msgid_plural "Rebase %s onto %s (%d commands)" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Rebase %s en un 1% (ordred)" +msgstr[1] "Rebase de percentatges sobre els percentatges (ordresd)" #: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218 msgid "" @@ -5934,8 +5955,7 @@ msgid "" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" msgstr "" "\n" -"No elimineu cap línia. Useu «drop» explícitament per a eliminar una " -"comissió.\n" +"No elimineu cap línia. Useu «drop» explícitament per a eliminar una comissió.\n" #: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222 msgid "" @@ -5969,14 +5989,14 @@ msgstr "" "No obstant, si elimineu tot, s'avortarà el «rebase».\n" "\n" -#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3571 -#: sequencer.c:3597 sequencer.c:5389 builtin/fsck.c:347 builtin/rebase.c:264 +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3607 +#: sequencer.c:3633 sequencer.c:5416 builtin/fsck.c:347 builtin/rebase.c:270 #, c-format msgid "could not write '%s'" msgstr "no s'ha pogut escriure «%s»" -#: rebase-interactive.c:116 builtin/rebase.c:196 builtin/rebase.c:222 -#: builtin/rebase.c:246 +#: rebase-interactive.c:116 builtin/rebase.c:202 builtin/rebase.c:228 +#: builtin/rebase.c:252 #, c-format msgid "could not write '%s'." msgstr "no s'ha pogut escriure a «%s»." @@ -5987,8 +6007,7 @@ msgid "" "Warning: some commits may have been dropped accidentally.\n" "Dropped commits (newer to older):\n" msgstr "" -"Advertència: pot ser que algunes comissions s'hagin descartat " -"accidentalment.\n" +"Advertència: pot ser que algunes comissions s'hagin descartat accidentalment.\n" "Les comissions descartades (més nova a més vella):\n" #: rebase-interactive.c:200 @@ -5996,21 +6015,18 @@ msgstr "" msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" "\n" -"Use 'git config rebase.missingCommitsCheck' to change the level of " -"warnings.\n" +"Use 'git config rebase.missingCommitsCheck' to change the level of warnings.\n" "The possible behaviours are: ignore, warn, error.\n" "\n" msgstr "" -"Per a evitar aquest missatge, useu «drop» per a eliminar explícitament una " -"comissió.\n" +"Per a evitar aquest missatge, useu «drop» per a eliminar explícitament una comissió.\n" "\n" -"Useu «git config rebase.missingCommitsCheck» per a canviar el nivell " -"d'advertències.\n" +"Useu «git config rebase.missingCommitsCheck» per a canviar el nivell d'advertències.\n" "Els comportaments possibles són: ignore, warn, error.\n" -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2361 -#: builtin/rebase.c:182 builtin/rebase.c:207 builtin/rebase.c:233 -#: builtin/rebase.c:258 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2394 +#: builtin/rebase.c:188 builtin/rebase.c:213 builtin/rebase.c:239 +#: builtin/rebase.c:264 #, c-format msgid "could not read '%s'." msgstr "no s'ha pogut llegir «%s»." @@ -6080,9 +6096,9 @@ msgid "%%(body) does not take arguments" msgstr "%%(body) no accepta arguments" #: ref-filter.c:309 -#, fuzzy, c-format +#, c-format msgid "unrecognized %%(subject) argument: %s" -msgstr "argument %%(objectsize) no reconegut: %s" +msgstr "argument %%(subject) no reconegut: %s" #: ref-filter.c:330 #, c-format @@ -6100,14 +6116,14 @@ msgid "unrecognized %%(contents) argument: %s" msgstr "argument %%(contents) no reconegut: %s" #: ref-filter.c:380 -#, fuzzy, c-format +#, c-format msgid "positive value expected '%s' in %%(%s)" -msgstr "valor positiu esperat conté:lines=%s" +msgstr "valor positiu esperat «%s» a %%(%s)" #: ref-filter.c:384 -#, fuzzy, c-format +#, c-format msgid "unrecognized argument '%s' in %%(%s)" -msgstr "argument no reconegut: %s" +msgstr "argument no reconegut «%s» a %%(%s)" #: ref-filter.c:398 #, fuzzy, c-format @@ -6155,11 +6171,11 @@ msgid "unknown field name: %.*s" msgstr "nom de camp desconegut: %.*s" #: ref-filter.c:615 -#, fuzzy, c-format +#, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "" -"no és un dipòsit git però el camp '%.*s' requereix accés a les dades de " +"no és un dipòsit, git però el camp «%.*s» requereix accés a les dades de " "l'objecte" #: ref-filter.c:739 @@ -6207,61 +6223,61 @@ msgstr "format: s'ha usat l'àtom %%(end) sense l'àtom corresponent" msgid "malformed format string %s" msgstr "cadena de format mal format %s" -#: ref-filter.c:1541 +#: ref-filter.c:1549 #, c-format msgid "no branch, rebasing %s" msgstr "sense branca, s'està fent «rebase» %s" -#: ref-filter.c:1544 +#: ref-filter.c:1552 #, c-format msgid "no branch, rebasing detached HEAD %s" msgstr "sense branca, s'està fent «rebase» d'un «HEAD» %s no adjuntat" -#: ref-filter.c:1547 +#: ref-filter.c:1555 #, c-format msgid "no branch, bisect started on %s" msgstr "(sense branca, bisecció començada en %s)" -#: ref-filter.c:1557 +#: ref-filter.c:1565 msgid "no branch" msgstr "sense branca" -#: ref-filter.c:1591 ref-filter.c:1800 +#: ref-filter.c:1599 ref-filter.c:1808 #, c-format msgid "missing object %s for %s" msgstr "manca l'objecte %s per a %s" -#: ref-filter.c:1601 +#: ref-filter.c:1609 #, 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:2054 +#: ref-filter.c:2062 #, c-format msgid "malformed object at '%s'" msgstr "objecte mal format a «%s»" -#: ref-filter.c:2143 +#: ref-filter.c:2151 #, c-format msgid "ignoring ref with broken name %s" msgstr "s'està ignorant la referència amb nom malmès %s" -#: ref-filter.c:2148 refs.c:657 +#: ref-filter.c:2156 refs.c:660 #, c-format msgid "ignoring broken ref %s" msgstr "s'està ignorant la referència trencada %s" -#: ref-filter.c:2464 +#: ref-filter.c:2472 #, c-format msgid "format: %%(end) atom missing" msgstr "format: manca l'àtom %%(end)" -#: ref-filter.c:2563 +#: ref-filter.c:2571 #, c-format msgid "malformed object name %s" msgstr "nom d'objecte %s mal format" -#: ref-filter.c:2568 +#: ref-filter.c:2576 #, c-format msgid "option `%s' must point to a commit" msgstr "l'opció «%s» ha d'apuntar a una comissió" @@ -6271,65 +6287,66 @@ msgstr "l'opció «%s» ha d'apuntar a una comissió" msgid "%s does not point to a valid object!" msgstr "%s no apunta a un objecte vàlid" -#: refs.c:572 -#, fuzzy, c-format +#: refs.c:575 +#, c-format msgid "could not retrieve `%s`" -msgstr "no es poden resoldre els percentatges" +msgstr "no s'ha pogut recuperar «%s»" -#: refs.c:579 -#, fuzzy, c-format +#: refs.c:582 +#, c-format msgid "invalid branch name: %s = %s" -msgstr "Nom de branca no vàlid: «%s»" +msgstr "nom de branca no vàlida: %s = %s" -#: refs.c:655 +#: refs.c:658 #, fuzzy, c-format msgid "ignoring dangling symref %s" msgstr "ignorant symref per sota" -#: refs.c:892 +#: refs.c:895 #, fuzzy, c-format msgid "log for ref %s has gap after %s" -msgstr "log for ref%s have gap després de percentatges" +msgstr "registre per a ref %s have gap després de percentatges" -#: refs.c:898 +#: refs.c:901 #, fuzzy, c-format msgid "log for ref %s unexpectedly ended on %s" msgstr "registre per als ref%s inesperadament ha acabat en percentatges" -#: refs.c:957 -#, fuzzy, c-format +#: refs.c:960 +#, c-format msgid "log for %s is empty" -msgstr "el registre dels percentatges és buit" +msgstr "el registre per a %s és buit" -#: refs.c:1049 +#: refs.c:1052 #, c-format msgid "refusing to update ref with bad name '%s'" msgstr "s'està refusant la referència amb nom malmès «%s»" -#: refs.c:1120 +#: refs.c:1123 #, fuzzy, c-format msgid "update_ref failed for ref '%s': %s" msgstr "ha fallat updateref per al ref '%s'%s" -#: refs.c:1944 -#, fuzzy, c-format +#: refs.c:1947 +#, c-format msgid "multiple updates for ref '%s' not allowed" -msgstr "no es permeten múltiples actualitzacions per a ref '%s'" +msgstr "no es permeten múltiples actualitzacions per a la referència «%s»" -#: refs.c:2024 +#: refs.c:2027 msgid "ref updates forbidden inside quarantine environment" msgstr "no està permès actualitzar les referències en un entorn de quarantena" -#: refs.c:2035 +#: refs.c:2038 +#, fuzzy msgid "ref updates aborted by hook" -msgstr "" +msgstr "les actualitzacions de referències s'han avortat per ganxo" -#: refs.c:2135 refs.c:2165 +#: refs.c:2138 refs.c:2168 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "«%s» existeix; no es pot crear «%s»" -#: refs.c:2141 refs.c:2176 +#: refs.c:2144 refs.c:2179 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "no es poden processar «%s» i «%s» a la vegada" @@ -6350,7 +6367,7 @@ msgstr "no s'ha pogut suprimir la referència %s: %s" msgid "could not delete references: %s" msgstr "no s'han pogut suprimir les referències: %s" -#: refspec.c:167 +#: refspec.c:170 #, c-format msgid "invalid refspec '%s'" msgstr "refspec no vàlida: «%s»" @@ -6361,14 +6378,12 @@ msgid "config remote shorthand cannot begin with '/': %s" msgstr "config remote abreviation no pot començar amb «/» per cents" #: remote.c:399 -#, fuzzy msgid "more than one receivepack given, using the first" -msgstr "més d'un paquet de recepció donat usant el primer" +msgstr "més d'un paquet de recepció donat, usant el primer" #: remote.c:407 -#, fuzzy msgid "more than one uploadpack given, using the first" -msgstr "s'ha especificat més d'un paquet de càrrega utilitzant el primer" +msgstr "més d'un paquet de càrrega donat, usant el primer" #: remote.c:590 #, c-format @@ -6408,7 +6423,6 @@ msgstr "l'especificació de referència de src %s coincideix amb més d'un" #. TRANSLATORS: "matches '%s'%" is the part of "git push #. :" push, and "being pushed ('%s')" is #. the . -#. #: remote.c:1093 #, fuzzy, c-format msgid "" @@ -6424,9 +6438,9 @@ msgid "" msgstr "" "La destinació que heu proporcionat no és un nom de referència complet (és a " "dir començant per \"refs/\"). Hem intentat endevinar el que voleu dir amb - " -"Buscant una referència que coincideixi amb '%s' al costat remot. - Comprovar " -"si el ser empès ('%s') és una referència a \"refs/{headtags}/\". Si és " -"així afegirem un refs/{headstags que no ha funcionat completament." +"Buscant una referència que coincideixi amb '%s' al costat remot. - Comprovar" +" si el ser empès ('%s') és una referència a \"refs/{headtags}/\". Si " +"és així afegirem un refs/{headstags que no ha funcionat completament." #: remote.c:1113 #, fuzzy, c-format @@ -6488,95 +6502,96 @@ msgstr "dst les especificacions de rendiment coincideixen més d'un" msgid "dst ref %s receives from more than one src" msgstr "dst ref%s rep de més d'un src" -#: remote.c:1703 remote.c:1804 +#: remote.c:1714 remote.c:1815 msgid "HEAD does not point to a branch" msgstr "HEAD no assenyala cap branca" -#: remote.c:1712 +#: remote.c:1723 #, c-format msgid "no such branch: '%s'" msgstr "no existeix la branca: «%s»" -#: remote.c:1715 +#: remote.c:1726 #, c-format msgid "no upstream configured for branch '%s'" msgstr "cap font configurada per a la branca «%s»" -#: remote.c:1721 +#: remote.c:1732 #, 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:1736 +#: remote.c:1747 #, 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" +"el destí de pujada «%s» en el remot «%s» no té cap branca amb seguiment " +"remot" -#: remote.c:1748 +#: remote.c:1759 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "la branca «%s» no té cap remot al qual pujar" -#: remote.c:1758 +#: remote.c:1769 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "les especificacions de referència de «%s» no inclouen «%s»" -#: remote.c:1771 +#: remote.c:1782 msgid "push has no destination (push.default is 'nothing')" msgstr "push no té destí (push.default és «nothing»)" -#: remote.c:1793 +#: remote.c:1804 msgid "cannot resolve 'simple' push to a single destination" msgstr "no es pot resoldre una pujada «simple» a un sol destí" -#: remote.c:1922 +#: remote.c:1933 #, c-format msgid "couldn't find remote ref %s" msgstr "no s'ha pogut trobar la referència remota %s" -#: remote.c:1935 -#, fuzzy, c-format +#: remote.c:1946 +#, c-format msgid "* Ignoring funny ref '%s' locally" -msgstr "* Ignorant les referències divertides «%s» localment" +msgstr "* S'estan ignorant les referències «%s» localment" -#: remote.c:2098 +#: remote.c:2109 #, 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:2102 +#: remote.c:2113 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (useu «git branch --unset-upstream» per a arreglar-ho)\n" -#: remote.c:2105 +#: remote.c:2116 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "La vostra branca està al dia amb «%s».\n" -#: remote.c:2109 +#: remote.c:2120 #, 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:2112 +#: remote.c:2123 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (useu «%s» per a detalls)\n" -#: remote.c:2116 +#: remote.c:2127 #, 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:2122 +#: remote.c:2133 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (useu «git push» per a publicar les vostres comissions locals)\n" -#: remote.c:2125 +#: remote.c:2136 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -6588,11 +6603,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:2133 +#: remote.c:2144 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (useu «git pull» per a actualitzar la vostra branca local)\n" -#: remote.c:2136 +#: remote.c:2147 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -6607,11 +6622,11 @@ msgstr[1] "" "La vostra branca i «%s» han divergit,\n" "i tenen %d i %d comissions distintes cada una, respectivament.\n" -#: remote.c:2146 +#: remote.c:2157 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (useu «git pull» per a fusionar la branca remota amb la vostra)\n" -#: remote.c:2337 +#: remote.c:2348 #, c-format msgid "cannot parse expected object name '%s'" msgstr "no es pot analitzar el nom de l'objecte esperat «%s»" @@ -6685,25 +6700,25 @@ msgid "cannot unlink stray '%s'" msgstr "no es pot desenllaçar «%s» extraviats" #: rerere.c:807 -#, fuzzy, c-format +#, c-format msgid "Recorded preimage for '%s'" -msgstr "Imatge prèvia registrada per «%s»" +msgstr "Imatge prèvia registrada per a «%s»" -#: rerere.c:881 submodule.c:2082 builtin/log.c:1975 +#: rerere.c:881 submodule.c:2082 builtin/log.c:1992 #: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890 #, c-format msgid "could not create directory '%s'" msgstr "no s'ha pogut crear el directori «%s»" #: rerere.c:1057 -#, fuzzy, c-format +#, c-format msgid "failed to update conflicted state in '%s'" -msgstr "no s'ha pogut actualitzar l'estat en conflicte a «%s»" +msgstr "ha fallat en actualitzar l'estat en conflicte a «%s»" #: rerere.c:1068 rerere.c:1075 -#, fuzzy, c-format +#, c-format msgid "no remembered resolution for '%s'" -msgstr "no hi ha cap resolució recordada per «%s»" +msgstr "no hi ha cap resolució recordada per a «%s»" #: rerere.c:1077 #, c-format @@ -6711,14 +6726,14 @@ msgid "cannot unlink '%s'" msgstr "no es pot fer «unlink» de «%s»" #: rerere.c:1087 -#, fuzzy, c-format +#, c-format msgid "Updated preimage for '%s'" msgstr "Imatge prèvia actualitzada per a «%s»" #: rerere.c:1096 -#, fuzzy, c-format +#, c-format msgid "Forgot resolution for '%s'\n" -msgstr "He oblidat la resolució per «%s»" +msgstr "S'ha oblidat la resolució per a «%s»\n" #: rerere.c:1199 msgid "unable to open rr-cache directory" @@ -6728,44 +6743,43 @@ msgstr "no s'ha pogut obrir el directori rr-cache" msgid "could not determine HEAD revision" msgstr "no s'ha pogut determinar la revisió de HEAD" -#: reset.c:70 reset.c:76 sequencer.c:3426 +#: reset.c:70 reset.c:76 sequencer.c:3460 #, c-format msgid "failed to find tree of %s" msgstr "s'ha produït un error en cercar l'arbre de %s" -#: revision.c:2344 -#, fuzzy +#: revision.c:2336 msgid "--unpacked= no longer supported" -msgstr "git-over-rsync ja no és compatible" +msgstr "--unpacked= ja no s'ha admet" -#: revision.c:2364 -#, fuzzy, c-format +#: revision.c:2356 +#, c-format msgid "unknown value for --diff-merges: %s" -msgstr "valor desconegut per config «%s»%s" +msgstr "valor desconegut per a --diff-merges: %s" -#: revision.c:2702 +#: revision.c:2694 msgid "your current branch appears to be broken" msgstr "la vostra branca actual sembla malmesa" -#: revision.c:2705 +#: revision.c:2697 #, 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:2915 +#: revision.c:2907 msgid "-L does not yet support diff formats besides -p and -s" msgstr "-L no és encara compatible amb formats que no siguin «-p» o «-s»" -#: run-command.c:763 +#: run-command.c:764 msgid "open /dev/null failed" msgstr "s'ha produït un error en obrir /dev/null" -#: run-command.c:1270 +#: run-command.c:1271 #, c-format msgid "cannot create async thread: %s" msgstr "no s'ha pogut crear fil «async»: %s" -#: run-command.c:1334 +#: run-command.c:1335 #, fuzzy, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -6774,85 +6788,84 @@ msgstr "" "El ganxo «%s» s'ha ignorat perquè no s'ha establert com a executable. Podeu " "desactivar aquest avís amb `git config aconsell.ignoredHook false`." -#: send-pack.c:145 +#: send-pack.c:146 msgid "unexpected flush packet while reading remote unpack status" msgstr "" "paquet de buidatge no esperat quan estava llegint l'estat del " "desempaquetament remot" -#: send-pack.c:147 +#: send-pack.c:148 #, 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:149 +#: send-pack.c:150 #, c-format msgid "remote unpack failed: %s" msgstr "s'ha produït un error en el desempaquetament remot: %s" -#: send-pack.c:372 +#: send-pack.c:374 msgid "failed to sign the push certificate" msgstr "s'ha produït un error en signar el certificat de pujada" -#: send-pack.c:460 +#: send-pack.c:467 #, fuzzy msgid "the receiving end does not support this repository's hash algorithm" msgstr "el destí receptor no admet opcions de pujada" -#: send-pack.c:469 +#: send-pack.c:476 msgid "the receiving end does not support --signed push" msgstr "el destí receptor no admet pujar --signed" -#: send-pack.c:471 +#: send-pack.c:478 msgid "" -"not sending a push certificate since the receiving end does not support --" -"signed push" +"not sending a push certificate since the receiving end does not support " +"--signed push" msgstr "" "no s'està enviant una certificació de pujada perquè el destí receptor no " "admet pujar --signed" -#: send-pack.c:483 +#: send-pack.c:490 msgid "the receiving end does not support --atomic push" msgstr "el destí receptor no admet pujar --atomic" -#: send-pack.c:488 +#: send-pack.c:495 msgid "the receiving end does not support push options" msgstr "el destí receptor no admet opcions de pujada" -#: sequencer.c:194 +#: sequencer.c:195 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "mode de neteja «%s» no vàlid en la comissió del missatge" -#: sequencer.c:308 +#: sequencer.c:323 #, c-format msgid "could not delete '%s'" msgstr "no s'ha pogut suprimir «%s»" -#: sequencer.c:329 builtin/rebase.c:749 builtin/rebase.c:1590 builtin/rm.c:385 +#: sequencer.c:343 builtin/rebase.c:755 builtin/rebase.c:1596 builtin/rm.c:385 #, c-format msgid "could not remove '%s'" msgstr "no s'ha pogut eliminar «%s»" -#: sequencer.c:339 +#: sequencer.c:353 msgid "revert" msgstr "revertir" -#: sequencer.c:341 +#: sequencer.c:355 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:343 -#, fuzzy +#: sequencer.c:357 msgid "rebase" msgstr "rebase" -#: sequencer.c:345 +#: sequencer.c:359 #, c-format msgid "unknown action: %d" msgstr "acció desconeguda: %d" -#: sequencer.c:404 +#: sequencer.c:418 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add ' or 'git rm '" @@ -6860,7 +6873,7 @@ msgstr "" "després de resoldre els conflictes, marqueu els camins\n" "corregits amb «git add » o «git rm »" -#: sequencer.c:407 +#: sequencer.c:421 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add ' or 'git rm '\n" @@ -6870,109 +6883,108 @@ msgstr "" "corregits amb «git add » o «git rm »\n" "i cometeu el resultat amb «git commit»" -#: sequencer.c:420 sequencer.c:3028 +#: sequencer.c:434 sequencer.c:3062 #, c-format msgid "could not lock '%s'" msgstr "no s'ha pogut bloquejar «%s»" -#: sequencer.c:422 sequencer.c:2827 sequencer.c:3032 sequencer.c:3046 -#: sequencer.c:3303 sequencer.c:5299 strbuf.c:1168 wrapper.c:631 +#: sequencer.c:436 sequencer.c:2861 sequencer.c:3066 sequencer.c:3080 +#: sequencer.c:3337 sequencer.c:5326 strbuf.c:1168 wrapper.c:631 #, c-format msgid "could not write to '%s'" msgstr "no s'ha pogut escriure a «%s»" -#: sequencer.c:427 +#: sequencer.c:441 #, c-format msgid "could not write eol to '%s'" msgstr "no s'ha pogut escriure el terminador de línia a «%s»" -#: sequencer.c:432 sequencer.c:2832 sequencer.c:3034 sequencer.c:3048 -#: sequencer.c:3311 +#: sequencer.c:446 sequencer.c:2866 sequencer.c:3068 sequencer.c:3082 +#: sequencer.c:3345 #, c-format msgid "failed to finalize '%s'" msgstr "s'ha produït un error en finalitzar «%s»" -#: sequencer.c:471 +#: sequencer.c:485 #, c-format msgid "your local changes would be overwritten by %s." msgstr "els vostres canvis locals se sobreescriurien per %s." -#: sequencer.c:475 +#: sequencer.c:489 msgid "commit your changes or stash them to proceed." msgstr "cometeu els vostres canvis o feu un «stash» per a procedir." -#: sequencer.c:507 +#: sequencer.c:521 #, c-format msgid "%s: fast-forward" msgstr "%s: avanç ràpid" -#: sequencer.c:546 builtin/tag.c:566 +#: sequencer.c:560 builtin/tag.c:566 #, c-format msgid "Invalid cleanup mode %s" msgstr "Mode de neteja no vàlid %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase". -#. -#: sequencer.c:640 +#: sequencer.c:670 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: No s'ha pogut escriure un fitxer d'índex nou" -#: sequencer.c:657 +#: sequencer.c:687 msgid "unable to update cache tree" msgstr "no s'ha pogut actualitzar l'arbre cau" -#: sequencer.c:671 +#: sequencer.c:701 msgid "could not resolve HEAD commit" msgstr "no s'ha pogut resoldre la comissió HEAD" -#: sequencer.c:751 +#: sequencer.c:781 #, c-format msgid "no key present in '%.*s'" msgstr "no hi ha una clau a «%.*s»" -#: sequencer.c:762 +#: sequencer.c:792 #, fuzzy, c-format msgid "unable to dequote value of '%s'" msgstr "no s'ha pogut delinear el valor de cometes de «%s»" -#: sequencer.c:799 wrapper.c:201 wrapper.c:371 builtin/am.c:724 -#: builtin/am.c:816 builtin/merge.c:1121 builtin/rebase.c:902 +#: sequencer.c:829 wrapper.c:201 wrapper.c:371 builtin/am.c:710 +#: builtin/am.c:802 builtin/merge.c:1135 builtin/rebase.c:908 #, c-format msgid "could not open '%s' for reading" msgstr "no s'ha pogut obrir «%s» per a lectura" -#: sequencer.c:809 +#: sequencer.c:839 msgid "'GIT_AUTHOR_NAME' already given" msgstr "Ja s'ha donat «GIT_AUTHOR_NAME»" -#: sequencer.c:814 +#: sequencer.c:844 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "Ja s'ha donat «GIT_AUTHOR_EMAIL»" -#: sequencer.c:819 +#: sequencer.c:849 msgid "'GIT_AUTHOR_DATE' already given" msgstr "Ja s'ha donat «GIT_AUTHOR_DATE»" -#: sequencer.c:823 +#: sequencer.c:853 #, c-format msgid "unknown variable '%s'" msgstr "variable «%s» desconeguda" -#: sequencer.c:828 +#: sequencer.c:858 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "falta «GIT_AUTHOR_NAME»" -#: sequencer.c:830 +#: sequencer.c:860 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "falta «GIT_AUTHOR_EMAIL»" -#: sequencer.c:832 +#: sequencer.c:862 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "falta «GIT_AUTHOR_DATE»" -#: sequencer.c:897 +#: sequencer.c:927 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -6989,8 +7001,7 @@ msgid "" " git rebase --continue\n" msgstr "" "teniu canvis «staged» en el vostre arbre de treball\n" -"Si aquests canvis estan pensats per fer «squash» a la comissió prèvia, " -"executeu:\n" +"Si aquests canvis estan pensats per fer «squash» a la comissió prèvia, executeu:\n" "\n" " git commit --amend %s\n" "\n" @@ -7002,11 +7013,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:1178 +#: sequencer.c:1208 msgid "'prepare-commit-msg' hook failed" msgstr "el lligam «prepare-commit-msg» ha fallat" -#: sequencer.c:1184 +#: sequencer.c:1214 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -7033,7 +7044,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1197 +#: sequencer.c:1227 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -7059,355 +7070,356 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1239 +#: sequencer.c:1269 msgid "couldn't look up newly created commit" msgstr "no s'ha pogut trobar la comissió novament creada" -#: sequencer.c:1241 +#: sequencer.c:1271 msgid "could not parse newly created commit" msgstr "no s'ha pogut analitzar la comissió novament creada" -#: sequencer.c:1287 +#: sequencer.c:1317 msgid "unable to resolve HEAD after creating commit" msgstr "no s'ha pogut resoldre HEAD després de crear la comissió" -#: sequencer.c:1289 +#: sequencer.c:1319 msgid "detached HEAD" msgstr "HEAD separat" -#: sequencer.c:1293 +#: sequencer.c:1323 msgid " (root-commit)" msgstr " (comissió arrel)" -#: sequencer.c:1314 +#: sequencer.c:1344 msgid "could not parse HEAD" msgstr "no s'ha pogut analitzar HEAD" -#: sequencer.c:1316 +#: sequencer.c:1346 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s no és una comissió!" -#: sequencer.c:1320 sequencer.c:1395 builtin/commit.c:1577 +#: sequencer.c:1350 sequencer.c:1425 builtin/commit.c:1577 msgid "could not parse HEAD commit" msgstr "no s'ha pogut analitzar la comissió HEAD" -#: sequencer.c:1373 sequencer.c:2067 +#: sequencer.c:1403 sequencer.c:2100 msgid "unable to parse commit author" msgstr "no s'ha pogut analitzar l'autor de la comissió" -#: sequencer.c:1384 builtin/am.c:1580 builtin/merge.c:692 +#: sequencer.c:1414 builtin/am.c:1566 builtin/merge.c:701 msgid "git write-tree failed to write a tree" msgstr "git write-tree ha fallat en escriure un arbre" -#: sequencer.c:1417 sequencer.c:1535 +#: sequencer.c:1447 sequencer.c:1565 #, 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:1446 sequencer.c:1478 -#, fuzzy, c-format +#: sequencer.c:1476 sequencer.c:1508 +#, c-format msgid "invalid author identity '%s'" -msgstr "camí no vàlid: «%s»" +msgstr "identitat d'autor no vàlida: «%s»" -#: sequencer.c:1452 +#: sequencer.c:1482 msgid "corrupt author: missing date information" -msgstr "" +msgstr "autor malmès: falta la informació de la data" -#: sequencer.c:1491 builtin/am.c:1606 builtin/commit.c:1678 builtin/merge.c:890 -#: builtin/merge.c:915 +#: sequencer.c:1521 builtin/am.c:1593 builtin/commit.c:1678 +#: builtin/merge.c:904 builtin/merge.c:929 t/helper/test-fast-rebase.c:78 msgid "failed to write commit object" msgstr "s'ha produït un error en escriure l'objecte de comissió" -#: sequencer.c:1518 sequencer.c:4237 +#: sequencer.c:1548 sequencer.c:4283 t/helper/test-fast-rebase.c:198 #, c-format msgid "could not update %s" msgstr "no s'ha pogut actualitzar %s" -#: sequencer.c:1567 +#: sequencer.c:1597 #, c-format msgid "could not parse commit %s" msgstr "no s'ha pogut analitzar la comissió %s" -#: sequencer.c:1572 +#: sequencer.c:1602 #, c-format msgid "could not parse parent commit %s" msgstr "no s'ha pogut analitzar la comissió pare %s" -#: sequencer.c:1655 sequencer.c:1766 +#: sequencer.c:1685 sequencer.c:1796 #, c-format msgid "unknown command: %d" msgstr "ordre desconeguda: %d" -#: sequencer.c:1713 sequencer.c:1738 +#: sequencer.c:1743 sequencer.c:1768 #, c-format msgid "This is a combination of %d commits." msgstr "Això és una combinació de %d comissions." -#: sequencer.c:1723 +#: sequencer.c:1753 msgid "need a HEAD to fixup" msgstr "cal un HEAD per reparar-ho" -#: sequencer.c:1725 sequencer.c:3338 +#: sequencer.c:1755 sequencer.c:3372 msgid "could not read HEAD" msgstr "no s'ha pogut llegir HEAD" -#: sequencer.c:1727 +#: sequencer.c:1757 msgid "could not read HEAD's commit message" msgstr "no s'ha pogut llegir el missatge de comissió de HEAD" -#: sequencer.c:1733 +#: sequencer.c:1763 #, c-format msgid "cannot write '%s'" msgstr "no es pot escriure «%s»" -#: sequencer.c:1740 git-rebase--preserve-merges.sh:486 +#: sequencer.c:1770 git-rebase--preserve-merges.sh:486 msgid "This is the 1st commit message:" msgstr "Aquest és el 1r missatge de comissió:" -#: sequencer.c:1748 +#: sequencer.c:1778 #, c-format msgid "could not read commit message of %s" msgstr "no s'ha pogut llegir el missatge de comissió: %s" -#: sequencer.c:1755 +#: sequencer.c:1785 #, c-format msgid "This is the commit message #%d:" msgstr "Aquest és el missatge de comissió #%d:" -#: sequencer.c:1761 +#: sequencer.c:1791 #, c-format msgid "The commit message #%d will be skipped:" msgstr "El missatge de comissió núm. #%d s'ometrà:" -#: sequencer.c:1849 +#: sequencer.c:1879 msgid "your index file is unmerged." msgstr "el vostre fitxer d'índex està sense fusionar." -#: sequencer.c:1856 +#: sequencer.c:1886 msgid "cannot fixup root commit" msgstr "no es pot arreglar la comissió arrel" -#: sequencer.c:1875 +#: sequencer.c:1905 #, 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:1883 sequencer.c:1891 +#: sequencer.c:1913 sequencer.c:1921 #, c-format msgid "commit %s does not have parent %d" msgstr "la comissió %s no té pare %d" -#: sequencer.c:1897 +#: sequencer.c:1927 #, 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:1916 +#: sequencer.c:1946 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: no es pot analitzar la comissió pare %s" -#: sequencer.c:1981 +#: sequencer.c:2011 #, c-format msgid "could not rename '%s' to '%s'" msgstr "no s'ha pogut canviar el nom «%s» a «%s»" -#: sequencer.c:2038 +#: sequencer.c:2071 #, c-format msgid "could not revert %s... %s" msgstr "no s'ha pogut revertir %s... %s" -#: sequencer.c:2039 +#: sequencer.c:2072 #, c-format msgid "could not apply %s... %s" msgstr "no s'ha pogut aplicar %s... %s" -#: sequencer.c:2059 +#: sequencer.c:2092 #, fuzzy, c-format msgid "dropping %s %s -- patch contents already upstream\n" msgstr "" "deixant anar per cents per cents -- el contingut del pedaç ja s'ha avançat" -#: sequencer.c:2117 +#: sequencer.c:2150 #, 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:2124 +#: sequencer.c:2157 #, 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:2201 +#: sequencer.c:2234 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s no accepta arguments: «%s»" -#: sequencer.c:2210 +#: sequencer.c:2243 #, c-format msgid "missing arguments for %s" msgstr "falten els arguments per a %s" -#: sequencer.c:2241 +#: sequencer.c:2274 #, c-format msgid "could not parse '%s'" msgstr "no s'ha pogut analitzar «%s»" -#: sequencer.c:2302 +#: sequencer.c:2335 #, c-format msgid "invalid line %d: %.*s" msgstr "línia no vàlida %d: %.*s" -#: sequencer.c:2313 +#: sequencer.c:2346 #, c-format msgid "cannot '%s' without a previous commit" msgstr "no es pot «%s» sense una comissió prèvia" -#: sequencer.c:2399 +#: sequencer.c:2432 msgid "cancelling a cherry picking in progress" msgstr "s'està cancel·lant un «cherry pick» en curs" -#: sequencer.c:2408 +#: sequencer.c:2441 msgid "cancelling a revert in progress" msgstr "s'està cancel·lant la reversió en curs" -#: sequencer.c:2452 +#: sequencer.c:2485 msgid "please fix this using 'git rebase --edit-todo'." msgstr "corregiu-ho usant «git rebase --edit-todo»." -#: sequencer.c:2454 +#: sequencer.c:2487 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "full d'instruccions inusable: «%s»" -#: sequencer.c:2459 +#: sequencer.c:2492 msgid "no commits parsed." msgstr "no s'ha analitzat cap comissió." -#: sequencer.c:2470 +#: sequencer.c:2503 msgid "cannot cherry-pick during a revert." msgstr "no es pot fer «cherry pick» durant una reversió." -#: sequencer.c:2472 +#: sequencer.c:2505 msgid "cannot revert during a cherry-pick." msgstr "no es pot revertir durant un «cherry pick»." -#: sequencer.c:2550 +#: sequencer.c:2583 #, c-format msgid "invalid value for %s: %s" msgstr "valor no vàlid per a %s: %s" -#: sequencer.c:2657 +#: sequencer.c:2690 msgid "unusable squash-onto" msgstr "«squash-onto» no usable" -#: sequencer.c:2677 +#: sequencer.c:2710 #, c-format msgid "malformed options sheet: '%s'" msgstr "full d'opcions mal format: «%s»" -#: sequencer.c:2769 sequencer.c:4609 +#: sequencer.c:2803 sequencer.c:4636 msgid "empty commit set passed" msgstr "conjunt de comissions buit passat" -#: sequencer.c:2786 +#: sequencer.c:2820 msgid "revert is already in progress" msgstr "una reversió ja està en curs" -#: sequencer.c:2788 +#: sequencer.c:2822 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "intenteu «git revert (--continue | %s--abort | --quit)»" -#: sequencer.c:2791 +#: sequencer.c:2825 msgid "cherry-pick is already in progress" msgstr "un «cherry pick» ja està en curs" -#: sequencer.c:2793 +#: sequencer.c:2827 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "intenteu «git cherry-pick (--continue | %s--abort | --quit)»" -#: sequencer.c:2807 +#: sequencer.c:2841 #, c-format msgid "could not create sequencer directory '%s'" msgstr "no s'ha pogut crear el directori de seqüenciador «%s»" -#: sequencer.c:2822 +#: sequencer.c:2856 msgid "could not lock HEAD" msgstr "no s'ha pogut bloquejar HEAD" -#: sequencer.c:2882 sequencer.c:4325 +#: sequencer.c:2916 sequencer.c:4371 msgid "no cherry-pick or revert in progress" msgstr "ni hi ha cap «cherry pick» ni cap reversió en curs" -#: sequencer.c:2884 sequencer.c:2895 +#: sequencer.c:2918 sequencer.c:2929 msgid "cannot resolve HEAD" msgstr "no es pot resoldre HEAD" -#: sequencer.c:2886 sequencer.c:2930 +#: sequencer.c:2920 sequencer.c:2964 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:2916 builtin/grep.c:745 +#: sequencer.c:2950 builtin/grep.c:756 #, c-format msgid "cannot open '%s'" msgstr "no es pot obrir «%s»" -#: sequencer.c:2918 +#: sequencer.c:2952 #, c-format msgid "cannot read '%s': %s" msgstr "no es pot llegir «%s»: %s" -#: sequencer.c:2919 +#: sequencer.c:2953 msgid "unexpected end of file" msgstr "final de fitxer inesperat" -#: sequencer.c:2925 +#: sequencer.c:2959 #, 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:2936 +#: sequencer.c:2970 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:2977 +#: sequencer.c:3011 msgid "no revert in progress" msgstr "no hi ha cap reversió en curs" -#: sequencer.c:2986 +#: sequencer.c:3020 msgid "no cherry-pick in progress" msgstr "ni hi ha cap «cherry pick» en curs" -#: sequencer.c:2996 +#: sequencer.c:3030 msgid "failed to skip the commit" msgstr "s'ha produït un error en ometre la comissió" -#: sequencer.c:3003 +#: sequencer.c:3037 msgid "there is nothing to skip" msgstr "no hi ha res a ometre" -#: sequencer.c:3006 -#, fuzzy, c-format +#: sequencer.c:3040 +#, c-format msgid "" "have you committed already?\n" "try \"git %s --continue\"" -msgstr "ja ho heu fet? proveu \"git perds --continue\"" +msgstr "heu fet ja una comissió?\n" +"proveu «git %s --continue»" -#: sequencer.c:3168 sequencer.c:4217 +#: sequencer.c:3202 sequencer.c:4263 msgid "cannot read HEAD" msgstr "no es pot llegir HEAD" -#: sequencer.c:3185 +#: sequencer.c:3219 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "no s'ha pogut copiar «%s» a «%s»" -#: sequencer.c:3193 +#: sequencer.c:3227 #, c-format msgid "" "You can amend the commit now, with\n" @@ -7426,27 +7438,27 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:3203 +#: sequencer.c:3237 #, c-format msgid "Could not apply %s... %.*s" msgstr "No s'ha pogut aplicar %s... %.*s" -#: sequencer.c:3210 +#: sequencer.c:3244 #, c-format msgid "Could not merge %.*s" msgstr "No s'ha pogut fusionar %.*s" -#: sequencer.c:3224 sequencer.c:3228 builtin/difftool.c:641 +#: sequencer.c:3258 sequencer.c:3262 builtin/difftool.c:640 #, c-format msgid "could not copy '%s' to '%s'" msgstr "no s'ha pogut copiar «%s» a «%s»" -#: sequencer.c:3240 -#, fuzzy, c-format +#: sequencer.c:3274 +#, c-format msgid "Executing: %s\n" -msgstr "S'està executant: $rest" +msgstr "S'està executant: %s\n" -#: sequencer.c:3255 +#: sequencer.c:3289 #, c-format msgid "" "execution failed: %s\n" @@ -7461,11 +7473,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3261 +#: sequencer.c:3295 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:3267 +#: sequencer.c:3301 #, c-format msgid "" "execution succeeded: %s\n" @@ -7481,132 +7493,125 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:3328 +#: sequencer.c:3362 #, c-format msgid "illegal label name: '%.*s'" msgstr "nom d'etiqueta no permès: «%.*s»" -#: sequencer.c:3382 +#: sequencer.c:3416 msgid "writing fake root commit" msgstr "s'està escrivint una comissió arrel falsa" -#: sequencer.c:3387 +#: sequencer.c:3421 msgid "writing squash-onto" msgstr "s'està escrivint «squash-onto»" -#: sequencer.c:3471 +#: sequencer.c:3505 #, c-format msgid "could not resolve '%s'" msgstr "no s'ha pogut resoldre «%s»" -#: sequencer.c:3502 +#: sequencer.c:3538 msgid "cannot merge without a current revision" msgstr "no es pot fusionar sense una revisió actual" -#: sequencer.c:3524 +#: sequencer.c:3560 #, c-format msgid "unable to parse '%.*s'" msgstr "no s'ha pogut analitzar «%.*s»" -#: sequencer.c:3533 +#: sequencer.c:3569 #, c-format msgid "nothing to merge: '%.*s'" msgstr "no hi ha res per fusionar «%.*s»" -#: sequencer.c:3545 +#: sequencer.c:3581 #, fuzzy msgid "octopus merge cannot be executed on top of a [new root]" msgstr "" "no es pot executar la fusió del pop a la part superior d'una [arrel nova]" -#: sequencer.c:3561 +#: sequencer.c:3597 #, c-format msgid "could not get commit message of '%s'" msgstr "no s'ha pogut llegir el missatge de comissió de «%s»" -#: sequencer.c:3730 +#: sequencer.c:3780 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "no s'ha pogut fusionar «%.*s»" -#: sequencer.c:3746 +#: sequencer.c:3796 msgid "merge: Unable to write new index file" msgstr "fusió: no s'ha pogut escriure un fitxer d'índex nou" -#: sequencer.c:3820 +#: sequencer.c:3870 msgid "Cannot autostash" -msgstr "No es pot emmagatzemar automàticament" +msgstr "no es pot fer un «stash» automàticament" -#: sequencer.c:3823 -#, fuzzy, c-format +#: sequencer.c:3873 +#, c-format msgid "Unexpected stash response: '%s'" -msgstr "Resposta inesperada «%s» de «stash»" +msgstr "Resposta de «stash» inesperada: «%s»" -#: sequencer.c:3829 -#, fuzzy, c-format +#: sequencer.c:3879 +#, c-format msgid "Could not create directory for '%s'" msgstr "No s'ha pogut crear el directori per a «%s»" -#: sequencer.c:3832 -#, fuzzy, c-format +#: sequencer.c:3882 +#, c-format msgid "Created autostash: %s\n" -msgstr "Percentatges creats automàticament" +msgstr "S'ha creat un «stash» automàticament: %s\n" -#: sequencer.c:3836 -#, fuzzy +#: sequencer.c:3886 msgid "could not reset --hard" -msgstr "no s'ha pogut restablir --hard" +msgstr "no s'ha pogut fer reset --hard" -#: sequencer.c:3861 +#: sequencer.c:3911 #, c-format msgid "Applied autostash.\n" msgstr "S'ha aplicat el «stash» automàticament.\n" -#: sequencer.c:3873 +#: sequencer.c:3923 #, c-format msgid "cannot store %s" msgstr "no es pot emmagatzemar %s" -#: sequencer.c:3876 -#, fuzzy, c-format +#: sequencer.c:3926 +#, c-format msgid "" "%s\n" "Your changes are safe in the stash.\n" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" -"L'aplicació del «stash» automàtic ha resultat en conflictes.\n" +"%s\n" "Els vostres canvis estan segurs en el «stash».\n" -"Podeu executar \"git stash pop\" o \"git stash drop\" en qualsevol moment.\n" +"Podeu executar «git stash pop» o «git stash drop» en qualsevol moment.\n" -#: sequencer.c:3881 -#, fuzzy +#: sequencer.c:3931 msgid "Applying autostash resulted in conflicts." -msgstr "S'ha aplicat el pedaç a «%s» amb conflictes.\n" +msgstr "L'aplicació del «stash» automàticament ha donat conflictes." -#: sequencer.c:3882 +#: sequencer.c:3932 msgid "Autostash exists; creating a new stash entry." -msgstr "" +msgstr "El «stash» automàtic ja existeix; s'està creant una entrada «stash» nova." -#: sequencer.c:3974 -#, c-format -msgid "%s: not a valid OID" -msgstr "%s: no és un OID vàlid" - -#: sequencer.c:3979 git-rebase--preserve-merges.sh:769 +#: sequencer.c:4025 git-rebase--preserve-merges.sh:769 msgid "could not detach HEAD" msgstr "no s'ha pogut separar HEAD" -#: sequencer.c:3994 +#: sequencer.c:4040 #, c-format msgid "Stopped at HEAD\n" msgstr "Aturat a HEAD\n" -#: sequencer.c:3996 +#: sequencer.c:4042 #, c-format msgid "Stopped at %s\n" msgstr "Aturat a %s\n" -#: sequencer.c:4004 +#: sequencer.c:4050 #, fuzzy, c-format msgid "" "Could not execute the todo command\n" @@ -7622,58 +7627,58 @@ msgstr "" "editar l'ordre abans de continuar editeu primer la llista de tasques " "pendents git rebase --edit-todo git rebase --continue" -#: sequencer.c:4050 -#, c-format +#: sequencer.c:4096 +#, fuzzy, c-format msgid "Rebasing (%d/%d)%s" -msgstr "" +msgstr "S'estan reubicant (%d/%d)%s" -#: sequencer.c:4095 +#: sequencer.c:4141 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Aturat a %s... %.*s\n" -#: sequencer.c:4166 +#: sequencer.c:4212 #, c-format msgid "unknown command %d" msgstr "ordre %d desconeguda" -#: sequencer.c:4225 +#: sequencer.c:4271 msgid "could not read orig-head" msgstr "no s'ha pogut llegir orig-head" -#: sequencer.c:4230 +#: sequencer.c:4276 msgid "could not read 'onto'" msgstr "no s'ha pogut llegir «onto»" -#: sequencer.c:4244 +#: sequencer.c:4290 #, c-format msgid "could not update HEAD to %s" msgstr "no s'ha pogut actualitzar HEAD a %s" -#: sequencer.c:4304 -#, fuzzy, c-format +#: sequencer.c:4350 +#, c-format msgid "Successfully rebased and updated %s.\n" -msgstr "S'ha fet «rebase» i actualitzat $head_name amb èxit." +msgstr "S'ha fet «rebase» i actualitzat %s amb èxit.\n" -#: sequencer.c:4337 +#: sequencer.c:4383 msgid "cannot rebase: You have unstaged changes." msgstr "No es pot fer «rebase»: teniu canvis «unstaged»." -#: sequencer.c:4346 +#: sequencer.c:4392 msgid "cannot amend non-existing commit" msgstr "no es pot esmenar una comissió no existent" -#: sequencer.c:4348 +#: sequencer.c:4394 #, c-format msgid "invalid file: '%s'" msgstr "fitxer no vàlid: «%s»" -#: sequencer.c:4350 +#: sequencer.c:4396 #, c-format msgid "invalid contents: '%s'" msgstr "contingut no vàlid: «%s»" -#: sequencer.c:4353 +#: sequencer.c:4399 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -7683,55 +7688,50 @@ msgstr "" "Teniu canvis no comesos en el vostre arbre de treball. \n" "Cometeu-los primer i després executeu «git rebase --continue» de nou." -#: sequencer.c:4389 sequencer.c:4428 +#: sequencer.c:4435 sequencer.c:4474 #, c-format msgid "could not write file: '%s'" msgstr "no s'ha pogut escriure el fitxer: «%s»" -#: sequencer.c:4444 +#: sequencer.c:4490 msgid "could not remove CHERRY_PICK_HEAD" msgstr "No s'ha pogut eliminar CHERRY_PICK_HEAD" -#: sequencer.c:4451 +#: sequencer.c:4497 msgid "could not commit staged changes." msgstr "no s'han pogut cometre els canvis «staged»." -#: sequencer.c:4477 -#, fuzzy, c-format -msgid "invalid committer '%s'" -msgstr "comissió no vàlida %s" - -#: sequencer.c:4586 +#: sequencer.c:4613 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: no es pot fer «cherry pick» a %s" -#: sequencer.c:4590 +#: sequencer.c:4617 #, c-format msgid "%s: bad revision" msgstr "%s: revisió incorrecta" -#: sequencer.c:4625 +#: sequencer.c:4652 msgid "can't revert as initial commit" msgstr "no es pot revertir com a comissió inicial" -#: sequencer.c:5102 +#: sequencer.c:5129 msgid "make_script: unhandled options" msgstr "make_script: opcions no gestionades" -#: sequencer.c:5105 +#: sequencer.c:5132 msgid "make_script: error preparing revisions" msgstr "make_script: s'ha produït un error en preparar les revisions" -#: sequencer.c:5347 sequencer.c:5364 +#: sequencer.c:5374 sequencer.c:5391 msgid "nothing to do" msgstr "res a fer" -#: sequencer.c:5383 +#: sequencer.c:5410 msgid "could not skip unnecessary pick commands" msgstr "no s'han pogut ometre les ordres «picks» no necessàries" -#: sequencer.c:5480 +#: sequencer.c:5504 msgid "the script was already rearranged." msgstr "l'script ja estava endreçat." @@ -7747,8 +7747,7 @@ msgid "" "Use 'git -- ...' to specify paths that do not exist locally." msgstr "" "%s: no hi ha tal camí en l'arbre de treball.\n" -"Useu «git -- ...» per a especificar camins que no existeixin " -"localment." +"Useu «git -- ...» per a especificar camins que no existeixin localment." #: setup.c:198 #, c-format @@ -7757,8 +7756,7 @@ msgid "" "Use '--' to separate paths from revisions, like this:\n" "'git [...] -- [...]'" msgstr "" -"argument ambigu «%s»: revisió no coneguda o el camí no és en l'arbre de " -"treball.\n" +"argument ambigu «%s»: revisió no coneguda o el camí no és en l'arbre de treball.\n" "Useu «--» per a separar els camins de les revisions:\n" "«git [...] -- [...]»" @@ -7877,8 +7875,7 @@ msgid "" "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." msgstr "" "no és un dipòsit de git (ni cap pare fins al punt de muntatge %s)\n" -"S'atura a la frontera de sistema de fitxers (GIT_DISCOVERY_ACROSS_FILESYSTEM " -"no està establert)." +"S'atura a la frontera de sistema de fitxers (GIT_DISCOVERY_ACROSS_FILESYSTEM no està establert)." #: setup.c:1362 #, c-format @@ -7886,10 +7883,8 @@ msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" "The owner of files must always have read and write permissions." msgstr "" -"hi ha un problema amb el valor de mode de fitxer core.sharedRepository " -"(0%.3o).\n" -"El propietari dels fitxers sempre ha de tenir permisos de lectura i " -"escriptura." +"hi ha un problema amb el valor de mode de fitxer core.sharedRepository (0%.3o).\n" +"El propietari dels fitxers sempre ha de tenir permisos de lectura i escriptura." #: setup.c:1409 msgid "open /dev/null or dup failed" @@ -7903,264 +7898,265 @@ msgstr "el «fork» ha fallat" msgid "setsid failed" msgstr "«setsid» ha fallat" -#: sha1-file.c:470 +#: sha1-file.c:480 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "" -"no existeix el directori d'objecte %s; comproveu .git/objects/info/alternates" +"no existeix el directori d'objecte %s; comproveu " +".git/objects/info/alternates" -#: sha1-file.c:521 +#: sha1-file.c:531 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "no s'ha pogut normalitzar el camí a l'objecte alternatiu: %s" -#: sha1-file.c:593 +#: sha1-file.c:603 #, fuzzy, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "" "percentatges ignorant botigues alternatives d'objectes imbricació massa " "profunda" -#: sha1-file.c:600 +#: sha1-file.c:610 #, c-format msgid "unable to normalize object directory: %s" msgstr "no s'ha pogut normalitzar el directori de l'objecte: %s" -#: sha1-file.c:643 +#: sha1-file.c:653 #, fuzzy msgid "unable to fdopen alternates lockfile" msgstr "no s'ha pogut obrir el fitxer de bloqueig alternatiu «fdopen»" -#: sha1-file.c:661 +#: sha1-file.c:671 msgid "unable to read alternates file" msgstr "no es pot llegir el fitxer «alternates»" -#: sha1-file.c:668 +#: sha1-file.c:678 msgid "unable to move new alternates file into place" msgstr "no s'ha pogut moure el nou fitxer «alternates» al lloc" -#: sha1-file.c:703 +#: sha1-file.c:713 #, c-format msgid "path '%s' does not exist" msgstr "el camí «%s» no existeix" -#: sha1-file.c:724 +#: sha1-file.c:734 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" "encara no s'admet el dipòsit de referència «%s» com a agafament enllaçat." -#: sha1-file.c:730 +#: sha1-file.c:740 #, 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:736 +#: sha1-file.c:746 #, c-format msgid "reference repository '%s' is shallow" msgstr "el dipòsit de referència «%s» és superficial" -#: sha1-file.c:744 +#: sha1-file.c:754 #, c-format msgid "reference repository '%s' is grafted" msgstr "el dipòsit de referència «%s» és empeltat" -#: sha1-file.c:804 +#: sha1-file.c:814 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "" "línia no vàlida quan s'analitzaven les referències de l'«alternate»: %s" -#: sha1-file.c:954 +#: sha1-file.c:964 #, fuzzy, c-format msgid "attempting to mmap % over limit %" msgstr "intentar mmap % més del límit " -#: sha1-file.c:975 +#: sha1-file.c:985 msgid "mmap failed" msgstr "mmap ha fallat" -#: sha1-file.c:1139 +#: sha1-file.c:1149 #, c-format msgid "object file %s is empty" msgstr "el tipus d'objecte %s és buit" -#: sha1-file.c:1274 sha1-file.c:2467 +#: sha1-file.c:1284 sha1-file.c:2477 #, c-format msgid "corrupt loose object '%s'" msgstr "objecte solt corrupte «%s»" -#: sha1-file.c:1276 sha1-file.c:2471 +#: sha1-file.c:1286 sha1-file.c:2481 #, c-format msgid "garbage at end of loose object '%s'" msgstr "brossa al final de l'objecte solt «%s»" -#: sha1-file.c:1318 +#: sha1-file.c:1328 msgid "invalid object type" msgstr "tipus d'objecte és incorrecte" -#: sha1-file.c:1402 +#: sha1-file.c:1412 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "no s'ha pogut desempaquetar la capçalera %s amb --allow-unknown-type" -#: sha1-file.c:1405 +#: sha1-file.c:1415 #, c-format msgid "unable to unpack %s header" msgstr "no s'ha pogut desempaquetar la capçalera %s" -#: sha1-file.c:1411 +#: sha1-file.c:1421 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "no s'ha pogut analitzar la capçalera %s amb --allow-unknown-type" -#: sha1-file.c:1414 +#: sha1-file.c:1424 #, c-format msgid "unable to parse %s header" msgstr "no s'ha pogut analitzar la capçalera %s" -#: sha1-file.c:1641 +#: sha1-file.c:1651 #, c-format msgid "failed to read object %s" msgstr "s'ha produït un error en llegir l'objecte %s" -#: sha1-file.c:1645 +#: sha1-file.c:1655 #, c-format msgid "replacement %s not found for %s" msgstr "no s'ha trobat el reemplaçament %s per a %s" -#: sha1-file.c:1649 +#: sha1-file.c:1659 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "l'objecte solt %s (emmagatzemat a %s) és corrupte" -#: sha1-file.c:1653 +#: sha1-file.c:1663 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "l'objecte empaquetat %s (emmagatzemat a %s) és corrupte" -#: sha1-file.c:1758 +#: sha1-file.c:1768 #, c-format msgid "unable to write file %s" msgstr "no s'ha pogut escriure al fitxer %s" -#: sha1-file.c:1765 +#: sha1-file.c:1775 #, c-format msgid "unable to set permission to '%s'" msgstr "no s'ha pogut establir el permís a «%s»" -#: sha1-file.c:1772 +#: sha1-file.c:1782 msgid "file write error" msgstr "s'ha produït un error en escriure al fitxer" -#: sha1-file.c:1792 +#: sha1-file.c:1802 msgid "error when closing loose object file" msgstr "error en tancar el fitxer d'objecte solt" -#: sha1-file.c:1857 +#: sha1-file.c:1867 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" -"permisos insuficients per a afegir un objecte a la base de dades del dipòsit " -"%s" +"permisos insuficients per a afegir un objecte a la base de dades del dipòsit" +" %s" -#: sha1-file.c:1859 +#: sha1-file.c:1869 msgid "unable to create temporary file" msgstr "no s'ha pogut crear un fitxer temporal" -#: sha1-file.c:1883 +#: sha1-file.c:1893 msgid "unable to write loose object file" msgstr "no s'ha pogut escriure el fitxer d'objecte solt" -#: sha1-file.c:1889 +#: sha1-file.c:1899 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "no s'ha pogut desinflar l'object nou %s (%d)" -#: sha1-file.c:1893 +#: sha1-file.c:1903 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "ha fallat deflateEnd a l'objecte %s(%d)" -#: sha1-file.c:1897 +#: sha1-file.c:1907 #, c-format msgid "confused by unstable object source data for %s" msgstr "confós per la font de dades inestable de l'objecte per a %s" -#: sha1-file.c:1907 builtin/pack-objects.c:1086 -#, fuzzy, c-format +#: sha1-file.c:1917 builtin/pack-objects.c:1086 +#, c-format msgid "failed utime() on %s" -msgstr "ha fallat utime() sobre els percentatges" +msgstr "ha fallat utime() a %s" -#: sha1-file.c:1984 -#, fuzzy, c-format +#: sha1-file.c:1994 +#, c-format msgid "cannot read object for %s" -msgstr "no es pot llegir l'objecte per un percentatge" +msgstr "no es pot llegir l'objecte per a %s" -#: sha1-file.c:2035 +#: sha1-file.c:2045 msgid "corrupt commit" msgstr "comissió corrupta" -#: sha1-file.c:2043 +#: sha1-file.c:2053 msgid "corrupt tag" msgstr "etiqueta corrupta" -#: sha1-file.c:2143 -#, fuzzy, c-format +#: sha1-file.c:2153 +#, c-format msgid "read error while indexing %s" -msgstr "error de lectura mentre s'indexaven els percentatges" +msgstr "error de lectura mentre s'indexava %s" -#: sha1-file.c:2146 -#, fuzzy, c-format +#: sha1-file.c:2156 +#, c-format msgid "short read while indexing %s" -msgstr "lectura curta mentre s'indexen els percentatges" +msgstr "lectura curta mentre s'indexa %s" -#: sha1-file.c:2219 sha1-file.c:2229 -#, fuzzy, c-format +#: sha1-file.c:2229 sha1-file.c:2239 +#, c-format msgid "%s: failed to insert into database" -msgstr "percentatges no s'han pogut inserir a la base de dades" +msgstr "%s: no s'han pogut inserir a la base de dades" -#: sha1-file.c:2235 -#, fuzzy, c-format +#: sha1-file.c:2245 +#, c-format msgid "%s: unsupported file type" -msgstr "percentatges tipus de fitxer no suportat" +msgstr "%s: tipus de fitxer no suportat" -#: sha1-file.c:2259 -#, fuzzy, c-format +#: sha1-file.c:2269 +#, c-format msgid "%s is not a valid object" -msgstr "els percentatges no són un objecte vàlid" +msgstr "%s no és un objecte vàlid" -#: sha1-file.c:2261 -#, fuzzy, c-format +#: sha1-file.c:2271 +#, c-format msgid "%s is not a valid '%s' object" msgstr "%s no és un objecte de «%s» vàlid" -#: sha1-file.c:2288 builtin/index-pack.c:197 +#: sha1-file.c:2298 builtin/index-pack.c:192 #, c-format msgid "unable to open %s" msgstr "no s'ha pogut obrir %s" -#: sha1-file.c:2478 sha1-file.c:2531 +#: sha1-file.c:2488 sha1-file.c:2541 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "no coincideix la suma per a %s (s'esperava %s)" -#: sha1-file.c:2502 +#: sha1-file.c:2512 #, c-format msgid "unable to mmap %s" msgstr "no s'ha pogut fer «mmap» %s" -#: sha1-file.c:2507 +#: sha1-file.c:2517 #, c-format msgid "unable to unpack header of %s" msgstr "no s'ha pogut desempaquetar la capçalera de %s" -#: sha1-file.c:2513 +#: sha1-file.c:2523 #, c-format msgid "unable to parse header of %s" msgstr "no s'ha pogut analitzar la capçalera de %s" -#: sha1-file.c:2524 +#: sha1-file.c:2534 #, c-format msgid "unable to unpack contents of %s" msgstr "no s'han pogut desempaquetar els continguts de %s" @@ -8199,14 +8195,14 @@ msgstr "" "«git config advice.objectNameWarning false»" #: sha1-name.c:916 -#, fuzzy, c-format +#, c-format msgid "log for '%.*s' only goes back to %s" -msgstr "log per «%.*s» només retorna als percentatges" +msgstr "registre per a «%.*s» només retorna a %s" #: sha1-name.c:924 -#, fuzzy, c-format +#, c-format msgid "log for '%.*s' only has %d entries" -msgstr "log per a «%.*s» només té entrades per cent" +msgstr "registre per a «%.*s» només té %d entrades" #: sha1-name.c:1702 #, fuzzy, c-format @@ -8219,7 +8215,8 @@ msgid "" "path '%s' exists, but not '%s'\n" "hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" msgstr "" -"path '%s' existeix però no insinuacions '%s' vol dir '%.*s%s' aka '%.*s./%s'?" +"path '%s' existeix però no insinuacions '%s' vol dir '%.*s%s' aka " +"'%.*s./%s'?" #: sha1-name.c:1717 #, fuzzy, c-format @@ -8316,8 +8313,8 @@ msgid_plural "%u bytes/s" msgstr[0] "%u byte/s" msgstr[1] "%u bytes/s" -#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:733 -#: builtin/rebase.c:858 +#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719 +#: builtin/rebase.c:864 #, c-format msgid "could not open '%s' for writing" msgstr "no s'ha pogut obrir «%s» per a escriptura" @@ -8340,8 +8337,8 @@ msgstr "no es permeten els valors negatius a submodule.fetchjobs" #, fuzzy, c-format msgid "ignoring '%s' which may be interpreted as a command-line option: %s" msgstr "" -"ignorant \"%s\" que poden interpretar-se com una opció de línia d'ordres per " -"cent" +"ignorant \"%s\" que poden interpretar-se com una opció de línia d'ordres per" +" cent" #: submodule-config.c:499 #, c-format @@ -8384,9 +8381,9 @@ msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "L'especificació «%s» és en el submòdul «%.*s»" #: submodule.c:434 -#, fuzzy, c-format +#, c-format msgid "bad --ignore-submodules argument: %s" -msgstr "argument incorrecte --ignore-submodules percentatges" +msgstr "argument incorrecte --ignore-submodules: %s" #: submodule.c:816 #, fuzzy, c-format @@ -8408,11 +8405,11 @@ msgid "" "Could not run 'git rev-list --not --remotes -n 1' command in " "submodule %s" msgstr "" -"No s'ha pogut executar l'ordre «git rev-list --not --remotes -n 1» " -"en el submòdul %s" +"No s'ha pogut executar l'ordre «git rev-list --not --remotes -n 1»" +" en el submòdul %s" #: submodule.c:1127 -#, fuzzy, c-format +#, c-format msgid "process for submodule '%s' failed" msgstr "ha fallat el procés per al submòdul «%s»" @@ -8482,10 +8479,10 @@ msgstr "No s'ha pogut desassignar el paràmetre core.worktree al submòdul «%s #: submodule.c:1859 submodule.c:2169 #, 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»" +msgstr "" +"s'ha produït un error en cercar recursivament al camí de submòdul «%s»" #: submodule.c:1880 -#, fuzzy msgid "could not reset submodule index" msgstr "no s'ha pogut restablir l'índex del submòdul" @@ -8553,7 +8550,7 @@ msgstr "l'execució de l'ordre de remolc «%s» ha fallat" msgid "unknown value '%s' for key '%s'" msgstr "valor desconegut «%s» per a la clau «%s»" -#: trailer.c:537 trailer.c:542 builtin/remote.c:298 builtin/remote.c:323 +#: trailer.c:537 trailer.c:542 builtin/remote.c:299 builtin/remote.c:324 #, c-format msgid "more than one %s" msgstr "més d'un %s" @@ -8597,7 +8594,6 @@ msgid "could not rename temporary file to %s" msgstr "no s'ha pogut canviar el nom del fitxer temporal a %s" #: transport-helper.c:62 transport-helper.c:91 -#, fuzzy msgid "full write to remote helper failed" msgstr "l'escriptura completa a l'ajudant remot ha fallat" @@ -8633,7 +8629,7 @@ msgstr "deien inesperadament \"%s\"" #: transport-helper.c:417 #, c-format msgid "%s also locked %s" -msgstr "%s també ha bloquejat %s" +msgstr "%s també està bloquejat %s" #: transport-helper.c:497 msgid "couldn't run fast-import" @@ -8644,7 +8640,7 @@ msgstr "no s'ha pogut executar «fast-import»" msgid "error while running fast-import" msgstr "error en executar la importació ràpida" -#: transport-helper.c:549 transport-helper.c:1226 +#: transport-helper.c:549 transport-helper.c:1236 #, c-format msgid "could not read ref %s" msgstr "no s'ha pogut llegir la referència %s" @@ -8664,7 +8660,7 @@ msgstr "el protocol no permet establir el camí del servei remot" msgid "invalid remote service path" msgstr "el camí del servei remot no és vàlid" -#: transport-helper.c:661 transport.c:1428 +#: transport-helper.c:661 transport.c:1446 msgid "operation not supported by protocol" msgstr "opció no admesa pel protocol" @@ -8674,66 +8670,72 @@ msgid "can't connect to subservice %s" msgstr "no es pot connectar al subservei %s" #: transport-helper.c:745 +#, fuzzy msgid "'option' without a matching 'ok/error' directive" -msgstr "" +msgstr "'option' sense una directiva 'ok/error' coincident" #: transport-helper.c:788 #, fuzzy, c-format msgid "expected ok/error, helper said '%s'" msgstr "s'esperava un ajudant d'error/OK ha dit \"%s\"" -#: transport-helper.c:841 +#: transport-helper.c:845 #, fuzzy, c-format msgid "helper reported unexpected status of %s" msgstr "l'ajudant ha informat d'un estat inesperat dels percentatges" -#: transport-helper.c:924 +#: transport-helper.c:928 #, fuzzy, c-format msgid "helper %s does not support dry-run" msgstr "els ajudants no donen suport a l'execució seca" -#: transport-helper.c:927 +#: transport-helper.c:931 #, fuzzy, c-format msgid "helper %s does not support --signed" msgstr "els ajudants per cents no són compatibles --signed" -#: transport-helper.c:930 +#: transport-helper.c:934 #, fuzzy, c-format msgid "helper %s does not support --signed=if-asked" msgstr "l'ajudant per cents no admet --signed=if-asked" -#: transport-helper.c:935 +#: transport-helper.c:939 #, fuzzy, c-format msgid "helper %s does not support --atomic" msgstr "els ajudants no admeten --atomic" -#: transport-helper.c:941 +#: transport-helper.c:943 +#, fuzzy, c-format +msgid "helper %s does not support --%s" +msgstr "els ajudants per cents no són compatibles --signed" + +#: transport-helper.c:950 #, fuzzy, c-format msgid "helper %s does not support 'push-option'" msgstr "els ajudants no donen suport a «push-option»" -#: transport-helper.c:1040 +#: transport-helper.c:1050 #, fuzzy msgid "remote-helper doesn't support push; refspec needed" msgstr "" "remot-helper no permet prémer; es necessiten especificacions de referència" -#: transport-helper.c:1045 +#: transport-helper.c:1055 #, fuzzy, c-format msgid "helper %s does not support 'force'" msgstr "els ajudants no donen suport a «force»" -#: transport-helper.c:1092 +#: transport-helper.c:1102 #, fuzzy msgid "couldn't run fast-export" msgstr "no s'ha pogut executar «fast-export»" -#: transport-helper.c:1097 +#: transport-helper.c:1107 #, fuzzy msgid "error while running fast-export" msgstr "error en executar l'exportació ràpida" -#: transport-helper.c:1122 +#: transport-helper.c:1132 #, fuzzy, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -8742,53 +8744,52 @@ msgstr "" "No hi ha referències en comú i no n'hi ha cap especificat. Potser hauríeu " "d'especificar una branca com ara «master»." -#: transport-helper.c:1203 +#: transport-helper.c:1213 #, fuzzy, c-format msgid "unsupported object format '%s'" msgstr "objecte mal format a «%s»" -#: transport-helper.c:1212 +#: transport-helper.c:1222 #, fuzzy, c-format msgid "malformed response in ref list: %s" msgstr "resposta mal formada en la llista de referències" -#: transport-helper.c:1364 +#: transport-helper.c:1374 #, fuzzy, c-format msgid "read(%s) failed" msgstr "ha fallat read(%)" -#: transport-helper.c:1391 +#: transport-helper.c:1401 #, fuzzy, c-format msgid "write(%s) failed" msgstr "ha fallat write(%)" -#: transport-helper.c:1440 +#: transport-helper.c:1450 #, fuzzy, c-format msgid "%s thread failed" msgstr "ha fallat el fil per cents" -#: transport-helper.c:1444 +#: transport-helper.c:1454 #, fuzzy, c-format msgid "%s thread failed to join: %s" msgstr "el fil per cents no s'ha pogut unir als percentatges" -#: transport-helper.c:1463 transport-helper.c:1467 -#, fuzzy, c-format +#: transport-helper.c:1473 transport-helper.c:1477 +#, c-format msgid "can't start thread for copying data: %s" -msgstr "no es pot iniciar el fil per copiar dades per cent" +msgstr "no es pot iniciar el fil per copiar les dades: %s" -#: transport-helper.c:1504 -#, fuzzy, c-format +#: transport-helper.c:1514 +#, c-format msgid "%s process failed to wait" -msgstr "el procés de percentatges no ha pogut esperar" +msgstr "el procés %s no ha pogut esperar" -#: transport-helper.c:1508 -#, fuzzy, c-format +#: transport-helper.c:1518 +#, c-format msgid "%s process failed" -msgstr "el procés de percentatges ha fallat" +msgstr "el procés %s ha fallat" -#: transport-helper.c:1526 transport-helper.c:1535 -#, fuzzy +#: transport-helper.c:1536 transport-helper.c:1545 msgid "can't start thread for copying data" msgstr "no es pot iniciar el fil per copiar dades" @@ -8798,7 +8799,7 @@ msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "Canviaria la font de «%s» a «%s» de «%s»\n" #: transport.c:145 -#, fuzzy, c-format +#, c-format msgid "could not read bundle '%s'" msgstr "no s'ha pogut llegir el paquet «%s»" @@ -8817,32 +8818,32 @@ msgstr "vegeu protocol.version a «git help config» per a més detalls" msgid "server options require protocol version 2 or later" msgstr "les opcions del servidor requereixen el protocol versió 2 o posterior" -#: transport.c:712 +#: transport.c:727 #, fuzzy msgid "could not parse transport.color.* config" msgstr "no s'ha pogut analitzar la configuració de transport.color.*" -#: transport.c:785 +#: transport.c:802 #, fuzzy msgid "support for protocol v2 not implemented yet" msgstr "encara no s'ha implementat la implementació del protocol v2" -#: transport.c:919 +#: transport.c:936 #, fuzzy, c-format msgid "unknown value for config '%s': %s" msgstr "valor desconegut per config «%s»%s" -#: transport.c:985 +#: transport.c:1002 #, c-format msgid "transport '%s' not allowed" msgstr "no es permet el transport «%s»" -#: transport.c:1038 +#: transport.c:1055 #, fuzzy msgid "git-over-rsync is no longer supported" msgstr "git-over-rsync ja no és compatible" -#: transport.c:1140 +#: transport.c:1157 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -8851,7 +8852,7 @@ msgstr "" "Els camins de submòdul següents contenen canvis que no\n" "es poden trobar en cap remot:\n" -#: transport.c:1144 +#: transport.c:1161 #, c-format msgid "" "\n" @@ -8877,11 +8878,11 @@ msgstr "" "\n" "per a pujar-los a un remot.\n" -#: transport.c:1152 +#: transport.c:1169 msgid "Aborting." msgstr "S'està avortant." -#: transport.c:1297 +#: transport.c:1315 #, fuzzy msgid "failed to push all needed submodules" msgstr "no s'ha pogut prémer tots els submòduls necessaris" @@ -8908,8 +8909,7 @@ msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%sPlease commit your changes or stash them before you switch branches." msgstr "" -"Els vostres canvis locals als fitxers següents se sobreescriurien per " -"agafar:\n" +"Els vostres canvis locals als fitxers següents se sobreescriurien per agafar:\n" "%%sCometeu els vostres canvis o feu «stash» abans de canviar de branca." #: unpack-trees.c:115 @@ -8918,8 +8918,7 @@ msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%s" msgstr "" -"Els vostres canvis locals als fitxers següents se sobreescriurien per " -"agafar:\n" +"Els vostres canvis locals als fitxers següents se sobreescriurien per agafar:\n" "%%s" #: unpack-trees.c:118 @@ -8928,8 +8927,7 @@ msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%sPlease commit your changes or stash them before you merge." msgstr "" -"Els vostres canvis locals als fitxers següents se sobreescriurien per " -"fusionar:\n" +"Els vostres canvis locals als fitxers següents se sobreescriurien per fusionar:\n" "%%sCometeu els vostres canvis o feu «stash» abans de fusionar." #: unpack-trees.c:120 @@ -8938,8 +8936,7 @@ msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%s" msgstr "" -"Els vostres canvis locals als fitxers següents se sobreescriurien per " -"fusionar:\n" +"Els vostres canvis locals als fitxers següents se sobreescriurien per fusionar:\n" "%%s" #: unpack-trees.c:123 @@ -8975,8 +8972,7 @@ msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%sPlease move or remove them before you switch branches." msgstr "" -"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per " -"agafar:\n" +"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per agafar:\n" "%%sMoveu-los o elimineu-los abans de canviar de branca." #: unpack-trees.c:136 @@ -8985,8 +8981,7 @@ msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%s" msgstr "" -"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per " -"agafar:\n" +"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per agafar:\n" "%%s" #: unpack-trees.c:139 @@ -8995,8 +8990,7 @@ msgid "" "The following untracked working tree files would be removed by merge:\n" "%%sPlease move or remove them before you merge." msgstr "" -"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per " -"fusionar:\n" +"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per fusionar:\n" "%%sMoveu-los o elimineu-los abans de fusionar." #: unpack-trees.c:141 @@ -9005,8 +8999,7 @@ msgid "" "The following untracked working tree files would be removed by merge:\n" "%%s" msgstr "" -"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per " -"fusionar:\n" +"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per fusionar:\n" "%%s" #: unpack-trees.c:144 @@ -9030,23 +9023,19 @@ msgstr "" #: unpack-trees.c:152 #, c-format msgid "" -"The following untracked working tree files would be overwritten by " -"checkout:\n" +"The following untracked working tree files would be overwritten by checkout:\n" "%%sPlease move or remove them before you switch branches." msgstr "" -"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per " -"agafar:\n" +"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per agafar:\n" "%%sMoveu-los o elimineu-los abans de canviar de branca." #: unpack-trees.c:154 #, c-format msgid "" -"The following untracked working tree files would be overwritten by " -"checkout:\n" +"The following untracked working tree files would be overwritten by checkout:\n" "%%s" msgstr "" -"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per " -"agafar:\n" +"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per agafar:\n" "%%s" #: unpack-trees.c:157 @@ -9055,8 +9044,7 @@ msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%sPlease move or remove them before you merge." msgstr "" -"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per " -"fusionar:\n" +"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per fusionar:\n" "%%sMoveu-los o elimineu-los abans de fusionar." #: unpack-trees.c:159 @@ -9065,8 +9053,7 @@ msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%s" msgstr "" -"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per " -"fusionar:\n" +"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per fusionar:\n" "%%s" #: unpack-trees.c:162 @@ -9075,8 +9062,7 @@ msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%sPlease move or remove them before you %s." msgstr "" -"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per " -"%s:\n" +"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per %s:\n" "%%sMoveu-los o elimineu-los abans de %s." #: unpack-trees.c:164 @@ -9085,8 +9071,7 @@ msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%s" msgstr "" -"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per " -"%s:\n" +"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per %s:\n" "%%s" #: unpack-trees.c:172 @@ -9104,28 +9089,29 @@ msgstr "" "%s" #: unpack-trees.c:178 -#, c-format +#, fuzzy, c-format msgid "" -"The following paths are not up to date and were left despite sparse " -"patterns:\n" +"The following paths are not up to date and were left despite sparse patterns:\n" "%s" msgstr "" +"Els camins següents no estan actualitzats i es van deixar a pesar que s'han " +"dispersat els percentatges" #: unpack-trees.c:180 #, fuzzy, c-format msgid "" "The following paths are unmerged and were left despite sparse patterns:\n" "%s" -msgstr "" -"Els camins següents s'ignoren per un dels vostres fitxers .gitignore:\n" +msgstr "Els camins següents s'ignoren per un dels vostres fitxers .gitignore:\n" #: unpack-trees.c:182 -#, c-format +#, fuzzy, c-format msgid "" -"The following paths were already present and thus not updated despite sparse " -"patterns:\n" +"The following paths were already present and thus not updated despite sparse patterns:\n" "%s" msgstr "" +"Els camins següents ja estaven presents i, per tant, no s'han actualitzat " +"malgrat els patrons escassos." #: unpack-trees.c:262 #, c-format @@ -9133,11 +9119,13 @@ msgid "Aborting\n" msgstr "S'està avortant\n" #: unpack-trees.c:289 -#, c-format +#, fuzzy, c-format msgid "" "After fixing the above paths, you may want to run `git sparse-checkout " "reapply`.\n" msgstr "" +"Després de corregir els camins anteriors és possible que vulgueu executar " +"`git sparse-checkout reapply`." #: unpack-trees.c:350 msgid "Updating files" @@ -9160,7 +9148,7 @@ msgstr "" msgid "Updating index flags" msgstr "Actualitzant els indicadors d’índex" -#: upload-pack.c:1516 +#: upload-pack.c:1550 #, fuzzy msgid "expected flush after fetch arguments" msgstr "s'esperava una neteja després de les capacitats" @@ -9195,11 +9183,10 @@ msgid "invalid '..' path segment" msgstr "segment de camí «..» no vàlid" #: walker.c:170 -#, fuzzy msgid "Fetching objects" -msgstr "Obtenint objectes" +msgstr "S'estan obtenint objectes" -#: worktree.c:236 builtin/am.c:2116 +#: worktree.c:236 builtin/am.c:2103 #, c-format msgid "failed to read '%s'" msgstr "s'ha produït un error en llegir «%s»" @@ -9231,46 +9218,41 @@ msgid "'%s' does not point back to '%s'" msgstr "«%s» no assenyala de tornada a «%s»" #: worktree.c:587 -#, fuzzy msgid "not a directory" -msgstr "no és en un directori git" +msgstr "no és en un directori" #: worktree.c:596 -#, fuzzy msgid ".git is not a file" -msgstr "git show %s: fitxer incorrecte" +msgstr ".git no és un fitxer" #: worktree.c:598 msgid ".git file broken" -msgstr "" +msgstr "fitxer .git malmès" #: worktree.c:600 -#, fuzzy msgid ".git file incorrect" -msgstr "fitxer d'índex malmès" +msgstr "fitxer .git malmès" #: worktree.c:670 #, fuzzy msgid "not a valid path" -msgstr "%s: no és un OID vàlid" +msgstr "no és un camí vàlid" #: worktree.c:676 -#, fuzzy msgid "unable to locate repository; .git is not a file" -msgstr "no s'ha pogut crear un fitxer temporal" +msgstr "no s'ha pogut trobar el dipòsit; .git no és un fitxer" #: worktree.c:679 -#, fuzzy msgid "unable to locate repository; .git file broken" -msgstr "no s'ha pogut crear un fitxer temporal" +msgstr "no s'ha pogut trobar el dipòsit; el fitxer .git està malmès" #: worktree.c:685 msgid "gitdir unreadable" -msgstr "" +msgstr "gitdir illegible" #: worktree.c:689 msgid "gitdir incorrect" -msgstr "" +msgstr "gitdir incorrecte" #: wrapper.c:197 wrapper.c:367 #, c-format @@ -9336,8 +9318,7 @@ msgstr " (useu «git add/rm ...» per a actualitzar què es cometrà)" #: wt-status.c:241 #, fuzzy -msgid "" -" (use \"git restore ...\" to discard changes in working directory)" +msgid " (use \"git restore ...\" to discard changes in working directory)" msgstr "" "(useu \"git restore \" per descartar els canvis en el directori de " "treball)" @@ -9454,8 +9435,8 @@ msgid "" "It took %.2f seconds to compute the branch ahead/behind values.\n" "You can use '--no-ahead-behind' to avoid this.\n" msgstr "" -"S'ha trigat un 2%f segons a calcular la branca endavant/darrere dels valors. " -"Podeu utilitzar «--no-perhead-behind» per evitar-ho." +"S'ha trigat un 2%f segons a calcular la branca endavant/darrere dels valors." +" Podeu utilitzar «--no-perhead-behind» per evitar-ho." #: wt-status.c:1140 msgid "You have unmerged paths." @@ -9543,7 +9524,8 @@ msgstr "Actualment esteu fent «rebase»." #: wt-status.c:1367 msgid " (fix conflicts and then run \"git rebase --continue\")" -msgstr " (arregleu els conflictes i després executeu «git rebase --continue»)" +msgstr "" +" (arregleu els conflictes i després executeu «git rebase --continue»)" #: wt-status.c:1369 msgid " (use \"git rebase --skip\" to skip this patch)" @@ -9592,8 +9574,7 @@ msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (useu «git commit --amend» per a esmenar la comissió actual)" #: wt-status.c:1404 -msgid "" -" (use \"git rebase --continue\" once you are satisfied with your changes)" +msgid " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (useu «git rebase --continue» una vegada que estigueu satisfet amb els " "vostres canvis)" @@ -9618,8 +9599,8 @@ msgstr " (executeu «git cherry-pick --continue» per a continuar)" #: wt-status.c:1431 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" -" (tots els conflictes estan arreglats: executeu «git cherry-pick --" -"continue»)" +" (tots els conflictes estan arreglats: executeu «git cherry-pick " +"--continue»)" #: wt-status.c:1433 msgid " (use \"git cherry-pick --skip\" to skip this patch)" @@ -9675,9 +9656,10 @@ 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:1492 -#, c-format +#, fuzzy, c-format msgid "You are in a sparse checkout with %d%% of tracked files present." msgstr "" +"Esteu en una baixada del pagament amb un 1% d'arxius seguits presents." #: wt-status.c:1731 msgid "On branch " @@ -9775,8 +9757,7 @@ msgstr "no hi ha res a cometre\n" #: wt-status.c:1830 #, 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" +msgstr "no hi ha res a cometre (useu -u per a mostrar els fitxers no seguits)\n" #: wt-status.c:1835 #, c-format @@ -9818,7 +9799,7 @@ msgstr "addicionalment, el vostre índex conté canvis sense cometre." msgid "cannot %s: Your index contains uncommitted changes." msgstr "no es pot %s: El vostre índex conté canvis sense cometre." -#: compat/precompose_utf8.c:58 builtin/clone.c:456 +#: compat/precompose_utf8.c:58 builtin/clone.c:457 #, c-format msgid "failed to unlink '%s'" msgstr "s'ha produït un error en desenllaçar «%s»" @@ -9845,7 +9826,7 @@ msgstr "elimina «%s»\n" msgid "Unstaged changes after refreshing the index:" msgstr "Canvis «unstaged» després d'actualitzar l'índex:" -#: builtin/add.c:272 builtin/rev-parse.c:904 +#: builtin/add.c:272 builtin/rev-parse.c:908 msgid "Could not read the index" msgstr "No s'ha pogut llegir l'índex" @@ -9878,12 +9859,11 @@ msgstr "No s'ha pogut aplicar «%s»" #: builtin/add.c:308 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" +msgstr "Els camins següents s'ignoren per un dels vostres fitxers .gitignore:\n" #: builtin/add.c:328 builtin/clean.c:904 builtin/fetch.c:166 builtin/mv.c:124 -#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:538 -#: builtin/remote.c:1422 builtin/rm.c:242 builtin/send-pack.c:184 +#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559 +#: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190 msgid "dry run" msgstr "marxa en sec" @@ -9891,7 +9871,7 @@ msgstr "marxa en sec" msgid "interactive picking" msgstr "recull interactiu" -#: builtin/add.c:332 builtin/checkout.c:1529 builtin/reset.c:308 +#: builtin/add.c:332 builtin/checkout.c:1547 builtin/reset.c:308 msgid "select hunks interactively" msgstr "selecciona els trossos interactivament" @@ -9936,7 +9916,8 @@ msgstr "només omet els fitxers que no es poden afegir a causa d'errors" #: builtin/add.c:345 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" +"comproveu si els fitxers - fins i tot els absents - s'ignoren en marxa en " +"sec" #: builtin/add.c:347 builtin/update-index.c:1004 msgid "override the executable bit of the listed files" @@ -9949,7 +9930,7 @@ msgstr "avisa'm quan s'afegeixi un dipòsit incrustat" #: builtin/add.c:351 #, fuzzy msgid "backend for `git stash -p`" -msgstr "backend per a `git stash -p`" +msgstr "backend per a «git stash -p»" #: builtin/add.c:369 #, c-format @@ -10024,14 +10005,14 @@ msgstr "L'opció --ignore-missing només es pot usar juntament amb --dry-run" 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:507 builtin/checkout.c:1697 builtin/commit.c:351 -#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1503 +#: builtin/add.c:507 builtin/checkout.c:1715 builtin/commit.c:351 +#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1502 #, fuzzy msgid "--pathspec-from-file is incompatible with pathspec arguments" msgstr "--pathspec-from-file és incompatible amb els arguments de «pathspec»" -#: builtin/add.c:514 builtin/checkout.c:1709 builtin/commit.c:357 -#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1509 +#: builtin/add.c:514 builtin/checkout.c:1727 builtin/commit.c:357 +#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1508 #, fuzzy msgid "--pathspec-file-nul requires --pathspec-from-file" msgstr "--pathspec-file-nul requereix --pathspec-from-file" @@ -10051,116 +10032,112 @@ msgstr "" "Potser voleu dir «git add .»? Voleu desactivar aquest missatge executant " "«git config aconsell.addEmptyPathspec false»" -#: builtin/am.c:160 -#, fuzzy, c-format -msgid "invalid committer: %s" -msgstr "comissió no vàlida %s" - -#: builtin/am.c:366 +#: builtin/am.c:352 msgid "could not parse author script" msgstr "no s'ha pogut analitzar l'script d'autor" -#: builtin/am.c:450 +#: builtin/am.c:436 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "s'ha suprimit «%s» pel lligam applypatch-msg" -#: builtin/am.c:492 +#: builtin/am.c:478 #, c-format msgid "Malformed input line: '%s'." msgstr "Línia d'entrada mal formada: «%s»." -#: builtin/am.c:530 +#: builtin/am.c:516 #, 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:556 +#: builtin/am.c:542 msgid "fseek failed" msgstr "fseek ha fallat" -#: builtin/am.c:744 +#: builtin/am.c:730 #, c-format msgid "could not parse patch '%s'" msgstr "no s'ha pogut analitzar el pedaç «%s»" -#: builtin/am.c:809 +#: builtin/am.c:795 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:857 +#: builtin/am.c:843 msgid "invalid timestamp" msgstr "marca de temps no vàlida" -#: builtin/am.c:862 builtin/am.c:874 +#: builtin/am.c:848 builtin/am.c:860 msgid "invalid Date line" msgstr "línia Date no vàlida" -#: builtin/am.c:869 +#: builtin/am.c:855 msgid "invalid timezone offset" -msgstr "desplaçament de zona de temps no vàlid" +msgstr "desplaçament del fus horari no vàlid" -#: builtin/am.c:962 +#: builtin/am.c:948 msgid "Patch format detection failed." msgstr "La detecció de format de pedaç ha fallat." -#: builtin/am.c:967 builtin/clone.c:409 +#: builtin/am.c:953 builtin/clone.c:410 #, c-format msgid "failed to create directory '%s'" msgstr "s'ha produït un error en crear el directori «%s»" -#: builtin/am.c:972 +#: builtin/am.c:958 msgid "Failed to split patches." msgstr "S'ha produït un error en dividir els pedaços." -#: builtin/am.c:1103 +#: builtin/am.c:1089 #, 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:1104 +#: builtin/am.c:1090 #, 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:1105 +#: builtin/am.c:1091 #, 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»." +"Per a restaurar la branca original i deixar d'apedaçar, executeu «%s " +"--abort»." -#: builtin/am.c:1188 +#: builtin/am.c:1174 #, fuzzy -msgid "Patch sent with format=flowed; space at the end of lines might be lost." +msgid "" +"Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" "Pedaç enviat amb format=flux; es pot perdre espai al final de les línies." -#: builtin/am.c:1216 +#: builtin/am.c:1202 msgid "Patch is empty." msgstr "El pedaç està buit." -#: builtin/am.c:1281 +#: builtin/am.c:1267 #, fuzzy, c-format msgid "missing author line in commit %s" msgstr "manca la línia d'autor a les comissions" -#: builtin/am.c:1284 +#: builtin/am.c:1270 #, c-format msgid "invalid ident line: %.*s" msgstr "línia d'identitat no vàlida: %.*s" -#: builtin/am.c:1503 +#: builtin/am.c:1489 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." +"Al dipòsit li manquen els blobs necessaris per a retrocedir a una fusió de 3" +" vies." -#: builtin/am.c:1505 +#: builtin/am.c:1491 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:1524 +#: builtin/am.c:1510 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -10168,67 +10145,67 @@ msgstr "" "Heu editat el vostre pedaç a mà?\n" "No s'aplica als blobs recordats en el seu índex." -#: builtin/am.c:1530 +#: builtin/am.c:1516 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:1556 +#: builtin/am.c:1542 msgid "Failed to merge in the changes." msgstr "S'ha produït un error en fusionar els canvis." -#: builtin/am.c:1588 +#: builtin/am.c:1574 msgid "applying to an empty history" msgstr "s'està aplicant a una història buida" -#: builtin/am.c:1639 builtin/am.c:1643 +#: builtin/am.c:1626 builtin/am.c:1630 #, c-format msgid "cannot resume: %s does not exist." msgstr "no es pot reprendre: %s no existeix." -#: builtin/am.c:1661 +#: builtin/am.c:1648 msgid "Commit Body is:" msgstr "El cos de la comissió és:" #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] #. in your translation. The program will only accept English #. input at this point. -#. -#: builtin/am.c:1671 +#: builtin/am.c:1658 #, 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:1717 builtin/commit.c:395 +#: builtin/am.c:1704 builtin/commit.c:395 msgid "unable to write index file" msgstr "no s'ha pogut escriure el fitxer d'índex" -#: builtin/am.c:1721 +#: builtin/am.c:1708 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Índex brut: no es poden aplicar pedaços (bruts: %s)" -#: builtin/am.c:1761 builtin/am.c:1829 +#: builtin/am.c:1748 builtin/am.c:1816 #, c-format msgid "Applying: %.*s" msgstr "S'està aplicant: %.*s" -#: builtin/am.c:1778 +#: builtin/am.c:1765 msgid "No changes -- Patch already applied." msgstr "Sense canvis -- El pedaç ja s'ha aplicat." -#: builtin/am.c:1784 +#: builtin/am.c:1771 #, c-format msgid "Patch failed at %s %.*s" msgstr "El pedaç ha fallat a %s %.*s" -#: builtin/am.c:1788 +#: builtin/am.c:1775 #, fuzzy msgid "Use 'git am --show-current-patch=diff' to see the failed patch" -msgstr "Utilitzeu 'git am --show-current-patch=diff' per veure el pedaç fallit" +msgstr "" +"Utilitzeu 'git am --show-current-patch=diff' per veure el pedaç fallit" -#: builtin/am.c:1832 +#: builtin/am.c:1819 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -10238,30 +10215,27 @@ 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:1839 +#: builtin/am.c:1826 msgid "" "You still have unmerged paths in your index.\n" -"You should 'git add' each file with resolved conflicts to mark them as " -"such.\n" +"You should 'git add' each file with resolved conflicts to mark them as such.\n" "You might run `git rm` on a file to accept \"deleted by them\" for it." msgstr "" "Encara teniu camins sense fusionar a l'índex.\n" -"Heu de fer «git add» a cada fitxer amb conflictes resolts per a marcar-los " -"com a tal.\n" -"Podeu executar «git rm» en un fitxer per a acceptar «suprimit per ells» pel " -"fitxer." +"Heu de fer «git add» a cada fitxer amb conflictes resolts per a marcar-los com a tal.\n" +"Podeu executar «git rm» en un fitxer per a acceptar «suprimit per ells» pel fitxer." -#: builtin/am.c:1946 builtin/am.c:1950 builtin/am.c:1962 builtin/reset.c:347 +#: builtin/am.c:1933 builtin/am.c:1937 builtin/am.c:1949 builtin/reset.c:347 #: builtin/reset.c:355 #, c-format msgid "Could not parse object '%s'." msgstr "No s'ha pogut analitzar l'objecte «%s»." -#: builtin/am.c:1998 +#: builtin/am.c:1985 msgid "failed to clean index" msgstr "s'ha produït un error en netejar l'índex" -#: builtin/am.c:2042 +#: builtin/am.c:2029 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -10269,158 +10243,159 @@ 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:2149 +#: builtin/am.c:2136 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Valor no vàlid per a --patch-format: %s" -#: builtin/am.c:2191 +#: builtin/am.c:2178 #, fuzzy, c-format msgid "Invalid value for --show-current-patch: %s" msgstr "Valor no vàlid per --show-current-patch%s" -#: builtin/am.c:2195 +#: builtin/am.c:2182 #, fuzzy, c-format msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" msgstr "--show-current-patch=%s és incompatible amb --show-current-patch=%s" -#: builtin/am.c:2226 +#: builtin/am.c:2213 msgid "git am [] [( | )...]" msgstr "git am [] [( | )...]" -#: builtin/am.c:2227 +#: builtin/am.c:2214 msgid "git am [] (--continue | --skip | --abort)" msgstr "git am [] (--continue | --skip | --abort)" -#: builtin/am.c:2233 +#: builtin/am.c:2220 msgid "run interactively" msgstr "executa interactivament" -#: builtin/am.c:2235 +#: builtin/am.c:2222 msgid "historical option -- no-op" msgstr "opció històrica -- no-op" -#: builtin/am.c:2237 +#: builtin/am.c:2224 msgid "allow fall back on 3way merging if needed" msgstr "permet retrocedir a una fusió de 3 vies si és necessari" -#: builtin/am.c:2238 builtin/init-db.c:558 builtin/prune-packed.c:16 -#: builtin/repack.c:309 builtin/stash.c:816 +#: builtin/am.c:2225 builtin/init-db.c:558 builtin/prune-packed.c:16 +#: builtin/repack.c:335 builtin/stash.c:815 msgid "be quiet" msgstr "silenciós" -#: builtin/am.c:2240 -msgid "add a Signed-off-by line to the commit message" +#: builtin/am.c:2227 +#, fuzzy +msgid "add a Signed-off-by trailer to the commit message" msgstr "afegeix una línia «Signed-off-by» al missatge de comissió" -#: builtin/am.c:2243 +#: builtin/am.c:2230 msgid "recode into utf8 (default)" msgstr "recodifica en utf8 (per defecte)" -#: builtin/am.c:2245 +#: builtin/am.c:2232 msgid "pass -k flag to git-mailinfo" msgstr "passa l'indicador -k a git-mailinfo" -#: builtin/am.c:2247 +#: builtin/am.c:2234 msgid "pass -b flag to git-mailinfo" msgstr "passa l'indicador -b a git-mailinfo" -#: builtin/am.c:2249 +#: builtin/am.c:2236 msgid "pass -m flag to git-mailinfo" msgstr "passa l'indicador -m a git-mailinfo" -#: builtin/am.c:2251 +#: builtin/am.c:2238 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:2254 +#: builtin/am.c:2241 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:2257 +#: builtin/am.c:2244 msgid "strip everything before a scissors line" msgstr "elimina tot abans d'una línia de tisores" -#: builtin/am.c:2259 builtin/am.c:2262 builtin/am.c:2265 builtin/am.c:2268 -#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280 -#: builtin/am.c:2286 +#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255 +#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267 +#: builtin/am.c:2273 msgid "pass it through git-apply" msgstr "passa-ho a través de git-apply" -#: builtin/am.c:2276 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17 -#: builtin/fmt-merge-msg.c:20 builtin/grep.c:892 builtin/merge.c:251 +#: builtin/am.c:2263 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:903 builtin/merge.c:260 #: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 -#: builtin/rebase.c:1335 builtin/repack.c:320 builtin/repack.c:324 -#: builtin/repack.c:326 builtin/show-branch.c:650 builtin/show-ref.c:172 +#: builtin/rebase.c:1341 builtin/repack.c:346 builtin/repack.c:350 +#: builtin/repack.c:352 builtin/show-branch.c:650 builtin/show-ref.c:172 #: builtin/tag.c:404 parse-options.h:154 parse-options.h:175 #: parse-options.h:316 msgid "n" msgstr "n" -#: builtin/am.c:2282 builtin/branch.c:659 builtin/bugreport.c:135 +#: builtin/am.c:2269 builtin/branch.c:659 builtin/bugreport.c:136 #: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:438 #: builtin/verify-tag.c:38 msgid "format" msgstr "format" -#: builtin/am.c:2283 +#: builtin/am.c:2270 msgid "format the patch(es) are in" msgstr "el format en el qual estan els pedaços" -#: builtin/am.c:2289 +#: builtin/am.c:2276 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:2291 +#: builtin/am.c:2278 msgid "continue applying patches after resolving a conflict" msgstr "segueix aplicant pedaços després de resoldre un conflicte" -#: builtin/am.c:2294 +#: builtin/am.c:2281 msgid "synonyms for --continue" msgstr "sinònims de --continue" -#: builtin/am.c:2297 +#: builtin/am.c:2284 msgid "skip the current patch" msgstr "omet el pedaç actual" -#: builtin/am.c:2300 +#: builtin/am.c:2287 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:2303 +#: builtin/am.c:2290 #, fuzzy msgid "abort the patching operation but keep HEAD where it is." msgstr "avorta l'operació de pedaç però manté HEAD on és." -#: builtin/am.c:2307 +#: builtin/am.c:2294 #, fuzzy msgid "show the patch being applied" msgstr "mostra el pedaç que s'està aplicant" -#: builtin/am.c:2312 +#: builtin/am.c:2299 msgid "lie about committer date" msgstr "menteix sobre la data del comitent" -#: builtin/am.c:2314 +#: builtin/am.c:2301 msgid "use current timestamp for author date" msgstr "usa el marc de temps actual per la data d'autor" -#: builtin/am.c:2316 builtin/commit-tree.c:120 builtin/commit.c:1515 -#: builtin/merge.c:288 builtin/pull.c:175 builtin/rebase.c:530 -#: builtin/rebase.c:1388 builtin/revert.c:117 builtin/tag.c:419 +#: builtin/am.c:2303 builtin/commit-tree.c:120 builtin/commit.c:1515 +#: builtin/merge.c:297 builtin/pull.c:175 builtin/rebase.c:536 +#: builtin/rebase.c:1394 builtin/revert.c:117 builtin/tag.c:419 msgid "key-id" msgstr "ID de clau" -#: builtin/am.c:2317 builtin/rebase.c:531 builtin/rebase.c:1389 +#: builtin/am.c:2304 builtin/rebase.c:537 builtin/rebase.c:1395 msgid "GPG-sign commits" msgstr "signa les comissions amb GPG" -#: builtin/am.c:2320 +#: builtin/am.c:2307 msgid "(internal use for git-rebase)" msgstr "(ús intern per a git-rebase)" -#: builtin/am.c:2338 +#: builtin/am.c:2325 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." @@ -10428,18 +10403,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:2345 +#: builtin/am.c:2332 msgid "failed to read the index" msgstr "S'ha produït un error en llegir l'índex" -#: builtin/am.c:2360 +#: builtin/am.c:2347 #, 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:2384 +#: builtin/am.c:2371 #, c-format msgid "" "Stray %s directory found.\n" @@ -10448,11 +10423,11 @@ msgstr "" "S'ha trobat un directori %s extraviat.\n" "Useu «git am --abort» per a eliminar-lo." -#: builtin/am.c:2390 +#: builtin/am.c:2377 msgid "Resolve operation not in progress, we are not resuming." msgstr "Una operació de resolució no està en curs; no reprenem." -#: builtin/am.c:2400 +#: builtin/am.c:2387 #, fuzzy msgid "interactive mode requires patches on the command line" msgstr "el mode interactiu requereix pedaços a la línia d'ordres" @@ -10492,23 +10467,10 @@ msgid "git archive: expected a flush" msgstr "git archive: s'esperava una neteja" #: builtin/bisect--helper.c:23 -#, fuzzy -msgid "git bisect--helper --next-all" -msgstr "git bisect--helper --next-all [--no-checkout]" - -#: builtin/bisect--helper.c:24 -msgid "git bisect--helper --write-terms " -msgstr "git bisect--helper --write-terms " - -#: builtin/bisect--helper.c:25 -msgid "git bisect--helper --bisect-clean-state" -msgstr "git bisect--helper --bisect-clean-state" - -#: builtin/bisect--helper.c:26 msgid "git bisect--helper --bisect-reset []" msgstr "git bisect--helper --bisect-reset []" -#: builtin/bisect--helper.c:27 +#: builtin/bisect--helper.c:24 #, fuzzy msgid "" "git bisect--helper --bisect-write [--no-log] " @@ -10517,7 +10479,7 @@ msgstr "" "git bisect--helper --bisect-write [--no-log] " "" -#: builtin/bisect--helper.c:28 +#: builtin/bisect--helper.c:25 #, fuzzy msgid "" "git bisect--helper --bisect-check-and-set-terms " @@ -10526,85 +10488,90 @@ msgstr "" "git bisect--helper --bisect-check-and-set-terms " "" -#: builtin/bisect--helper.c:29 +#: builtin/bisect--helper.c:26 #, fuzzy msgid "git bisect--helper --bisect-next-check []" msgstr "git bisect--helper --bisect-next-check []" +#: builtin/bisect--helper.c:27 +#, fuzzy +msgid "" +"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | " +"--term-new]" +msgstr "" +"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | " +"--term-bad | --term-new]" + +#: builtin/bisect--helper.c:28 +#, fuzzy +msgid "" +"git bisect--helper --bisect-start [--term-{new,bad}= " +"--term-{old,good}=] [--no-checkout] [--first-parent] [ " +"[...]] [--] [...]" +msgstr "" +"git bisect--helper --bisect-start [---term-{oldgood}= " +"--term-{newbad}=][--no-checkout] [ []] [-] []" + #: builtin/bisect--helper.c:30 #, fuzzy -msgid "" -"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" -"term-new]" -msgstr "" -"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" -"term-bad | --term-new]" - -#: builtin/bisect--helper.c:31 -#, fuzzy -msgid "" -"git bisect--helper --bisect-start [--term-{new,bad}= --term-{old,good}" -"=] [--no-checkout] [--first-parent] [ [...]] [--] " -"[...]" -msgstr "" -"git bisect--helper --bisect-start [---term-{oldgood}= --term-{newbad}" -"=][--no-checkout] [ []] [-] []" - -#: builtin/bisect--helper.c:33 -#, fuzzy msgid "git bisect--helper --bisect-next" msgstr "git bisect--helper --bisect-clean-state" -#: builtin/bisect--helper.c:34 +#: builtin/bisect--helper.c:31 #, fuzzy msgid "git bisect--helper --bisect-auto-next" msgstr "git bisect--helper --bisect-clean-state" -#: builtin/bisect--helper.c:35 +#: builtin/bisect--helper.c:32 #, fuzzy -msgid "git bisect--helper --bisect-autostart" -msgstr "git bisect--helper --bisect-clean-state" +msgid "git bisect--helper --bisect-state (bad|new) []" +msgstr "git bisect--helper --bisect-reset []" -#: builtin/bisect--helper.c:97 +#: builtin/bisect--helper.c:33 +#, fuzzy +msgid "git bisect--helper --bisect-state (good|old) [...]" +msgstr "git bisect--helper --bisect-reset []" + +#: builtin/bisect--helper.c:108 #, fuzzy, c-format msgid "cannot open file '%s' in mode '%s'" msgstr "no es pot copiar «%s» a «%s»" -#: builtin/bisect--helper.c:104 +#: builtin/bisect--helper.c:115 #, fuzzy, c-format msgid "could not write to file '%s'" msgstr "no s'ha pogut escriure el fitxer: «%s»" -#: builtin/bisect--helper.c:143 +#: builtin/bisect--helper.c:154 #, c-format msgid "'%s' is not a valid term" msgstr "«%s» no és un terme vàlid" -#: builtin/bisect--helper.c:147 +#: builtin/bisect--helper.c:158 #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "no es pot usar l'ordre interna «%s» com a terme" -#: builtin/bisect--helper.c:157 +#: builtin/bisect--helper.c:168 #, c-format msgid "can't change the meaning of the term '%s'" msgstr "no es pot canviar el significat del terme «%s»" -#: builtin/bisect--helper.c:167 +#: builtin/bisect--helper.c:178 msgid "please use two different terms" msgstr "useu dos termes distintes" -#: builtin/bisect--helper.c:207 +#: builtin/bisect--helper.c:194 #, fuzzy, c-format msgid "We are not bisecting.\n" msgstr "No estem bisecant." -#: builtin/bisect--helper.c:215 +#: builtin/bisect--helper.c:202 #, c-format msgid "'%s' is not a valid commit" msgstr "«%s» no és una comissió vàlida" -#: builtin/bisect--helper.c:224 +#: builtin/bisect--helper.c:211 #, fuzzy, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset '." @@ -10612,27 +10579,27 @@ msgstr "" "no s'ha pogut comprovar l'original HEAD «%s». Proveu «git bisect reset " "»." -#: builtin/bisect--helper.c:268 +#: builtin/bisect--helper.c:255 #, fuzzy, c-format msgid "Bad bisect_write argument: %s" msgstr "Arguments de bisectriu incorrectes" -#: builtin/bisect--helper.c:273 +#: builtin/bisect--helper.c:260 #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "no s'ha pogut obtenir l'oid de la revisió «%s»" -#: builtin/bisect--helper.c:285 +#: builtin/bisect--helper.c:272 #, fuzzy, c-format msgid "couldn't open the file '%s'" msgstr "no s'ha pogut obrir el fitxer «%s»" -#: builtin/bisect--helper.c:311 +#: builtin/bisect--helper.c:298 #, fuzzy, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "Ordre no vàlida esteu actualment en un percentatge/%s bisect" -#: builtin/bisect--helper.c:338 +#: builtin/bisect--helper.c:325 #, fuzzy, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -10641,7 +10608,7 @@ msgstr "" "Heu de donar-me com a mínim un per cents i un per cents de revisió. Podeu " "utilitzar «git bisectrius» i «git bisectris» per a això." -#: builtin/bisect--helper.c:342 +#: builtin/bisect--helper.c:329 #, fuzzy, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -10649,10 +10616,9 @@ msgid "" "You can use \"git bisect %s\" and \"git bisect %s\" for that." msgstr "" "Heu de començar per «git bisect start». \n" -"Després heu de donar-me com a mínim un per cents i per cents revisió. Podeu " -"utilitzar «git bisect %s» i «git bisect %s» per a això." +"Després heu de donar-me com a mínim un per cents i per cents revisió. Podeu utilitzar «git bisect %s» i «git bisect %s» per a això." -#: builtin/bisect--helper.c:362 +#: builtin/bisect--helper.c:349 #, c-format msgid "bisecting only with a %s commit" msgstr "bisecant amb només una comissió %s" @@ -10660,16 +10626,15 @@ msgstr "bisecant amb només una comissió %s" #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. -#. -#: builtin/bisect--helper.c:370 +#: builtin/bisect--helper.c:357 msgid "Are you sure [Y/n]? " msgstr "N'esteu segur [Y/n]? " -#: builtin/bisect--helper.c:431 +#: builtin/bisect--helper.c:418 msgid "no terms defined" msgstr "cap terme definit" -#: builtin/bisect--helper.c:434 +#: builtin/bisect--helper.c:421 #, fuzzy, c-format msgid "" "Your current terms are %s for the old state\n" @@ -10678,7 +10643,7 @@ msgstr "" "Els seus actuals termes són percentatges per al vell Estat i percentatges " "per al nou Estat." -#: builtin/bisect--helper.c:444 +#: builtin/bisect--helper.c:431 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -10687,56 +10652,56 @@ msgstr "" "argument no vàlid %s per a «git bisect terms».\n" "Les opcions admeses són: --term-good|--term-old i --term-bad|--term-new." -#: builtin/bisect--helper.c:511 +#: builtin/bisect--helper.c:498 #, fuzzy msgid "revision walk setup failed\n" msgstr "la configuració del passeig per revisions ha fallat" -#: builtin/bisect--helper.c:533 +#: builtin/bisect--helper.c:520 #, fuzzy, c-format msgid "could not open '%s' for appending" msgstr "no s'ha pogut obrir «%s» per a lectura" -#: builtin/bisect--helper.c:651 builtin/bisect--helper.c:664 +#: builtin/bisect--helper.c:639 builtin/bisect--helper.c:652 #, fuzzy msgid "'' is not a valid term" msgstr "«%s» no és un terme vàlid" -#: builtin/bisect--helper.c:674 +#: builtin/bisect--helper.c:662 #, c-format msgid "unrecognized option: '%s'" msgstr "opció no reconeguda: «%s»" -#: builtin/bisect--helper.c:678 +#: builtin/bisect--helper.c:666 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "«%s» no sembla ser una revisió vàlida" -#: builtin/bisect--helper.c:709 +#: builtin/bisect--helper.c:697 msgid "bad HEAD - I need a HEAD" msgstr "HEAD incorrecte - Cal un HEAD" -#: builtin/bisect--helper.c:724 +#: builtin/bisect--helper.c:712 #, c-format msgid "checking out '%s' failed. Try 'git bisect start '." msgstr "" "l'agafament de «%s» ha fallat. Proveu «git bisect start »." -#: builtin/bisect--helper.c:745 +#: builtin/bisect--helper.c:733 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:748 +#: builtin/bisect--helper.c:736 #, fuzzy msgid "bad HEAD - strange symbolic ref" msgstr "HEAD incorrecte - referència simbòlica estranya" -#: builtin/bisect--helper.c:775 +#: builtin/bisect--helper.c:756 #, fuzzy, c-format msgid "invalid ref: '%s'" msgstr "ref '%s' no és vàlid" -#: builtin/bisect--helper.c:827 +#: builtin/bisect--helper.c:814 #, fuzzy msgid "You need to start by \"git bisect start\"\n" msgstr "Cal començar per «git bisect start»" @@ -10744,122 +10709,108 @@ msgstr "Cal començar per «git bisect start»" #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. -#. -#: builtin/bisect--helper.c:838 +#: builtin/bisect--helper.c:825 msgid "Do you want me to do it for you [Y/n]? " msgstr "Voleu que ho faci per vostè [Y/n]? " -#: builtin/bisect--helper.c:866 -msgid "perform 'git bisect next'" -msgstr "realitza «git bisect next»" +#: builtin/bisect--helper.c:843 +#, fuzzy +msgid "Please call `--bisect-state` with at least one argument" +msgstr "Si us plau crideu `--bisect-state` amb almenys un argument" -#: builtin/bisect--helper.c:868 -msgid "write the terms to .git/BISECT_TERMS" -msgstr "escriu els termes a .git/BISECT_TERMS" +#: builtin/bisect--helper.c:856 +#, fuzzy, c-format +msgid "'git bisect %s' can take only one argument." +msgstr "«git bisect $TERM_BAD» pot acceptar només un argument." -#: builtin/bisect--helper.c:870 -msgid "cleanup the bisection state" -msgstr "neteja l'estat de la bisecció" +#: builtin/bisect--helper.c:868 builtin/bisect--helper.c:879 +#, fuzzy, c-format +msgid "Bad rev input: %s" +msgstr "Introducció de revisió errònia: $arg" -#: builtin/bisect--helper.c:872 -msgid "check for expected revs" -msgstr "comprova les revisions esperades" - -#: builtin/bisect--helper.c:874 +#: builtin/bisect--helper.c:924 #, fuzzy msgid "reset the bisection state" msgstr "restableix l'estat de la bisecció" -#: builtin/bisect--helper.c:876 +#: builtin/bisect--helper.c:926 #, fuzzy msgid "write out the bisection state in BISECT_LOG" msgstr "escriu l'estat de la bisecció a BISECTLOG" -#: builtin/bisect--helper.c:878 +#: builtin/bisect--helper.c:928 #, fuzzy msgid "check and set terms in a bisection state" msgstr "comprova i defineix els termes en un estat de bisecció" -#: builtin/bisect--helper.c:880 +#: builtin/bisect--helper.c:930 #, fuzzy msgid "check whether bad or good terms exist" msgstr "comprova si existeixen termes incorrectes o bons" -#: builtin/bisect--helper.c:882 +#: builtin/bisect--helper.c:932 #, fuzzy msgid "print out the bisect terms" msgstr "imprimeix els termes de la bisectriu" -#: builtin/bisect--helper.c:884 +#: builtin/bisect--helper.c:934 #, fuzzy msgid "start the bisect session" msgstr "inicia la sessió bisect" -#: builtin/bisect--helper.c:886 +#: builtin/bisect--helper.c:936 #, fuzzy msgid "find the next bisection commit" msgstr "no es pot esmenar una comissió no existent" -#: builtin/bisect--helper.c:888 -msgid "verify the next bisection state then checkout the next bisection commit" -msgstr "" - -#: builtin/bisect--helper.c:890 -msgid "start the bisection if it has not yet been started" -msgstr "" - -#: builtin/bisect--helper.c:892 +#: builtin/bisect--helper.c:938 #, fuzzy +msgid "" +"verify the next bisection state then checkout the next bisection commit" +msgstr "" +"Verifica el següent estat de bisecció després agafa la següent comissió de " +"bisecció" + +#: builtin/bisect--helper.c:940 +#, fuzzy +msgid "mark the state of ref (or refs)" +msgstr "marca l'estat de ref (o refs)" + +#: builtin/bisect--helper.c:942 msgid "no log for BISECT_WRITE" -msgstr "no hi ha registre per BISECTWRITE" +msgstr "no hi ha registre per a BISECT_WRITE" -#: builtin/bisect--helper.c:910 -msgid "--write-terms requires two arguments" -msgstr "--write-terms requereix dos arguments" - -#: builtin/bisect--helper.c:914 -msgid "--bisect-clean-state requires no arguments" -msgstr "--bisect-clean-state no requereix cap argument" - -#: builtin/bisect--helper.c:921 +#: builtin/bisect--helper.c:957 #, fuzzy msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-reset no requereix cap argument ni una comissió" -#: builtin/bisect--helper.c:925 +#: builtin/bisect--helper.c:961 #, fuzzy msgid "--bisect-write requires either 4 or 5 arguments" msgstr "--bisect-write requereix 4 o 5 arguments" -#: builtin/bisect--helper.c:931 +#: builtin/bisect--helper.c:967 #, fuzzy msgid "--check-and-set-terms requires 3 arguments" msgstr "--check-and-set-terms requereix 3 arguments" -#: builtin/bisect--helper.c:937 +#: builtin/bisect--helper.c:973 #, fuzzy msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-next-check requereix 2 o 3 arguments" -#: builtin/bisect--helper.c:943 -#, fuzzy +#: builtin/bisect--helper.c:979 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms requereix 0 o 1 argument" -#: builtin/bisect--helper.c:952 -#, fuzzy +#: builtin/bisect--helper.c:988 msgid "--bisect-next requires 0 arguments" -msgstr "--bisect-next-check requereix 2 o 3 arguments" +msgstr "--bisect-next no requereix cap argument" -#: builtin/bisect--helper.c:958 -#, fuzzy +#: builtin/bisect--helper.c:994 msgid "--bisect-auto-next requires 0 arguments" -msgstr "--bisect-terms requereix 0 o 1 argument" - -#: builtin/bisect--helper.c:964 -#, fuzzy -msgid "--bisect-autostart does not accept arguments" -msgstr "--bisect-clean-state no requereix cap argument" +msgstr "--bisect-auto-next no requereix cap argument" #: builtin/blame.c:32 msgid "git blame [] [] [] [--] " @@ -10870,158 +10821,157 @@ msgid " are documented in git-rev-list(1)" msgstr "es documenten les en git-rev-list(1)" #: builtin/blame.c:410 -#, fuzzy, c-format +#, c-format msgid "expecting a color: %s" -msgstr "esperant un color per cent" +msgstr "s'esperava un color: %s" #: builtin/blame.c:417 -#, fuzzy msgid "must end with a color" msgstr "ha d'acabar amb un color" #: builtin/blame.c:730 -#, fuzzy, c-format +#, c-format msgid "invalid color '%s' in color.blame.repeatedLines" -msgstr "color «%s» no vàlid en color.blame.repeatLines" +msgstr "color «%s» no vàlid en «color.blame.repeatedLines»" #: builtin/blame.c:748 -#, fuzzy msgid "invalid value for blame.coloring" -msgstr "valor no vàlid per a «tage.coloring»" +msgstr "valor no vàlid per a «blame.coloring»" -#: builtin/blame.c:845 -#, fuzzy, c-format +#: builtin/blame.c:847 +#, c-format msgid "cannot find revision %s to ignore" -msgstr "no s'han pogut trobar els revisors per ignorar" +msgstr "no s'ha pogut trobar la revisió %s per ignorar" -#: builtin/blame.c:867 +#: builtin/blame.c:869 msgid "Show blame entries as we find them, incrementally" msgstr "Mostra les entrades «blame» mentre les trobem, incrementalment" -#: builtin/blame.c:868 +#: builtin/blame.c:870 #, fuzzy msgid "Do not show object names of boundary commits (Default: off)" msgstr "" "Mostra un SHA-1 en blanc per les comissions de frontera (Per defecte: " "desactivat)" -#: builtin/blame.c:869 +#: builtin/blame.c:871 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:870 +#: builtin/blame.c:872 msgid "Show work cost statistics" msgstr "Mostra les estadístiques de preu de treball" -#: builtin/blame.c:871 +#: builtin/blame.c:873 msgid "Force progress reporting" msgstr "Força l'informe de progrés" -#: builtin/blame.c:872 +#: builtin/blame.c:874 msgid "Show output score for blame entries" msgstr "Mostra la puntuació de sortida de les entrades «blame»" -#: builtin/blame.c:873 +#: builtin/blame.c:875 msgid "Show original filename (Default: auto)" msgstr "Mostra el nom de fitxer original (Per defecte: automàtic)" -#: builtin/blame.c:874 +#: builtin/blame.c:876 msgid "Show original linenumber (Default: off)" msgstr "Mostra el número de línia original (Per defecte: desactivat)" -#: builtin/blame.c:875 +#: builtin/blame.c:877 msgid "Show in a format designed for machine consumption" msgstr "Presenta en un format dissenyat per consumpció per màquina" -#: builtin/blame.c:876 +#: builtin/blame.c:878 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:877 +#: builtin/blame.c:879 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:878 +#: builtin/blame.c:880 msgid "Show raw timestamp (Default: off)" msgstr "Mostra la marca de temps crua (Per defecte: desactivat)" -#: builtin/blame.c:879 +#: builtin/blame.c:881 msgid "Show long commit SHA1 (Default: off)" msgstr "Mostra l'SHA1 de comissió llarg (Per defecte: desactivat)" -#: builtin/blame.c:880 +#: builtin/blame.c:882 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:881 +#: builtin/blame.c:883 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:882 +#: builtin/blame.c:884 msgid "Ignore whitespace differences" msgstr "Ignora les diferències d'espai en blanc" -#: builtin/blame.c:883 builtin/log.c:1808 +#: builtin/blame.c:885 builtin/log.c:1813 msgid "rev" msgstr "rev" -#: builtin/blame.c:883 +#: builtin/blame.c:885 #, fuzzy msgid "Ignore when blaming" msgstr "Ignora en culpar" -#: builtin/blame.c:884 -#, fuzzy -msgid "Ignore revisions from " -msgstr "Ignora les revisions des de " - -#: builtin/blame.c:885 -#, fuzzy -msgid "color redundant metadata from previous line differently" -msgstr "color les metadades redundants de la línia anterior de manera diferent" - #: builtin/blame.c:886 -#, fuzzy -msgid "color lines by age" -msgstr "línies de color per edat" +msgid "Ignore revisions from " +msgstr "Ignora les revisions de " #: builtin/blame.c:887 +#, fuzzy +msgid "color redundant metadata from previous line differently" +msgstr "" +"color les metadades redundants de la línia anterior de manera diferent" + +#: builtin/blame.c:888 +#, fuzzy +msgid "color lines by age" +msgstr "coloreja les línies per edat" + +#: builtin/blame.c:889 msgid "Spend extra cycles to find better match" msgstr "Gasta cicles extres per a trobar una coincidència millor" -#: builtin/blame.c:888 +#: builtin/blame.c:890 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:889 +#: builtin/blame.c:891 msgid "Use 's contents as the final image" msgstr "Usa els continguts de com a la imatge final" -#: builtin/blame.c:890 builtin/blame.c:891 +#: builtin/blame.c:892 builtin/blame.c:893 msgid "score" msgstr "puntuació" -#: builtin/blame.c:890 +#: builtin/blame.c:892 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:891 +#: builtin/blame.c:893 msgid "Find line movements within and across files" msgstr "Troba moviments de línia dins i a través dels fitxers" -#: builtin/blame.c:892 -msgid "n,m" -msgstr "n,m" +#: builtin/blame.c:894 +msgid "range" +msgstr "rang" -#: builtin/blame.c:892 -msgid "Process only line range n,m, counting from 1" +#: builtin/blame.c:895 +#, fuzzy +msgid "Process only line range , or function :" msgstr "Processa només el rang de línies n,m, comptant des d'1" -#: builtin/blame.c:944 +#: builtin/blame.c:947 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" "no es pot usar --progress amb els formats --incremental o de porcellana" @@ -11033,24 +10983,22 @@ msgstr "" #. among various forms of relative timestamps, but #. your language may need more or fewer display #. columns. -#. -#: builtin/blame.c:995 +#: builtin/blame.c:998 msgid "4 years, 11 months ago" msgstr "fa 4 anys i 11 mesos" -#: builtin/blame.c:1110 +#: builtin/blame.c:1114 #, 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:1156 +#: builtin/blame.c:1159 msgid "Blaming lines" msgstr "S'està fent un «blame»" #: builtin/branch.c:29 -#, fuzzy msgid "git branch [] [-r | -a] [--merged] [--no-merged]" msgstr "git branch [] [-r | -a] [--merged | --no-merged]" @@ -11164,14 +11112,13 @@ msgid "unable to parse format string" msgstr "no s'ha pogut analitzar la cadena de format" #: builtin/branch.c:460 -#, fuzzy msgid "could not resolve HEAD" msgstr "no s'ha pogut resoldre HEAD" #: builtin/branch.c:466 -#, fuzzy, c-format +#, c-format msgid "HEAD (%s) points outside of refs/heads/" -msgstr "HEAD (%) punts fora de les referències/caps/" +msgstr "HEAD (%s) apunta fora de refs/heads/" #: builtin/branch.c:481 #, c-format @@ -11262,7 +11209,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:526 +#: builtin/branch.c:626 builtin/rebase.c:532 msgid "upstream" msgstr "font" @@ -11328,7 +11275,6 @@ msgid "list branch names" msgstr "llista els noms de branca" #: builtin/branch.c:647 -#, fuzzy msgid "show current branch name" msgstr "mostra el nom de la branca actual" @@ -11375,7 +11321,7 @@ msgstr "l'ordenació i el filtratge distingeixen entre majúscules i minúscules msgid "format to use for the output" msgstr "format a usar en la sortida" -#: builtin/branch.c:682 builtin/clone.c:789 +#: builtin/branch.c:682 builtin/clone.c:790 msgid "HEAD not found below refs/heads!" msgstr "HEAD no trobat sota refs/heads!" @@ -11422,7 +11368,8 @@ msgstr "hi ha massa arguments per a establir una nova font" msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" -"no s'ha pogut establir la font de HEAD com a %s quan no assenyala cap branca." +"no s'ha pogut establir la font de HEAD com a %s quan no assenyala cap " +"branca." #: builtin/branch.c:802 builtin/branch.c:825 #, c-format @@ -11454,8 +11401,8 @@ msgid "" "The -a, and -r, options to 'git branch' do not take a branch name.\n" "Did you mean to use: -a|-r --list ?" msgstr "" -"Les opcions -a i -r a «git branch» no prenen un nom de branca. Voleu usar -" -"a|-r --list ?" +"Les opcions -a i -r a «git branch» no prenen un nom de branca. Voleu usar " +"-a|-r --list ?" #: builtin/branch.c:843 msgid "" @@ -11466,22 +11413,21 @@ msgstr "" "upstream-to»." #: builtin/bugreport.c:15 -#, fuzzy msgid "git version:\n" -msgstr "versió" +msgstr "versió de git:\n" #: builtin/bugreport.c:21 #, c-format msgid "uname() failed with error '%s' (%d)\n" -msgstr "" +msgstr "uname() ha fallat amb l'error «%s» (%d)\n" #: builtin/bugreport.c:31 msgid "compiler info: " -msgstr "" +msgstr "informació del compilador: " #: builtin/bugreport.c:34 msgid "libc info: " -msgstr "" +msgstr "Informació de la libc: " #: builtin/bugreport.c:80 #, fuzzy @@ -11490,9 +11436,10 @@ msgstr "no és un dipòsit de git: %s" #: builtin/bugreport.c:90 msgid "git bugreport [-o|--output-directory ] [-s|--suffix ]" -msgstr "" +msgstr "git bugreport [-o|--output-directory ] [-s|--suffix ]" #: builtin/bugreport.c:97 +#, fuzzy msgid "" "Thank you for filling out a Git bug report!\n" "Please answer the following questions to help us understand your issue.\n" @@ -11510,40 +11457,48 @@ msgid "" "Please review the rest of the bug report below.\n" "You can delete any lines you don't wish to share.\n" msgstr "" +"Gràcies per emplenar un informe d'error del Git! Responeu les següents " +"preguntes per ajudar-nos a entendre el vostre problema. Què heu fet abans " +"que passés l'error? (Pas per reproduir el vostre problema) Què espereu que " +"passi? (Comportament explotat) Què ha passat? (Comportament real) Què és " +"diferent entre el que s'esperava i què ha passat? Qualsevol altra cosa que " +"vulgueu afegir Reviseu la resta de l'informe d'error de sota. Podeu eliminar" +" qualsevol línia que vulgueu." -#: builtin/bugreport.c:134 +#: builtin/bugreport.c:135 msgid "specify a destination for the bugreport file" -msgstr "" +msgstr "especifiqueu una destinació per al fitxer d'informe d'error" -#: builtin/bugreport.c:136 +#: builtin/bugreport.c:137 +#, fuzzy msgid "specify a strftime format suffix for the filename" -msgstr "" +msgstr "especifiqueu un sufix de format strftime per al nom de fitxer" -#: builtin/bugreport.c:158 +#: builtin/bugreport.c:159 #, fuzzy, c-format msgid "could not create leading directories for '%s'" msgstr "no s'han pogut crear els directoris inicials de «%s»" -#: builtin/bugreport.c:165 +#: builtin/bugreport.c:166 msgid "System Info" -msgstr "" +msgstr "Informació del sistema" -#: builtin/bugreport.c:168 +#: builtin/bugreport.c:169 #, fuzzy msgid "Enabled Hooks" msgstr "no s'ha pogut bifurcar" -#: builtin/bugreport.c:175 +#: builtin/bugreport.c:176 #, fuzzy, c-format msgid "couldn't create a new file at '%s'" msgstr "no s'ha pogut crear el fitxer «%s»" -#: builtin/bugreport.c:178 -#, fuzzy, c-format +#: builtin/bugreport.c:179 +#, c-format msgid "unable to write to %s" -msgstr "no s'ha pogut escriure %s" +msgstr "no s'ha pogut escriure a %s" -#: builtin/bugreport.c:188 +#: builtin/bugreport.c:189 #, fuzzy, c-format msgid "Created new report at '%s'.\n" msgstr "S'ha netejat el directori «%s»\n" @@ -11585,8 +11540,9 @@ 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:76 +#, fuzzy msgid "specify bundle format version" -msgstr "" +msgstr "especifica la versió del format del paquet" #: builtin/bundle.c:96 msgid "Need a repository to create a bundle." @@ -11606,22 +11562,22 @@ msgstr "%s està bé\n" msgid "Need a repository to unbundle." msgstr "Cal un dipòsit per a desfer un farcell." -#: builtin/bundle.c:171 builtin/remote.c:1687 +#: builtin/bundle.c:171 builtin/remote.c:1700 msgid "be verbose; must be placed before a subcommand" msgstr "sigues detallat; s'ha de col·locar abans d'una subordre" -#: builtin/bundle.c:193 builtin/remote.c:1718 +#: builtin/bundle.c:193 builtin/remote.c:1731 #, c-format msgid "Unknown subcommand: %s" msgstr "Subordre desconeguda: %s" #: builtin/cat-file.c:598 msgid "" -"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" -"p | | --textconv | --filters) [--path=] " +"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | " +"-p | | --textconv | --filters) [--path=] " msgstr "" -"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" -"p | | --textconv | --filters [--path=]) " +"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | " +"-p | | --textconv | --filters [--path=]) " #: builtin/cat-file.c:599 #, fuzzy @@ -11629,8 +11585,8 @@ msgid "" "git cat-file (--batch[=] | --batch-check[=]) [--follow-" "symlinks] [--textconv | --filters]" msgstr "" -"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" -"filters]" +"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | " +"--filters]" #: builtin/cat-file.c:620 #, fuzzy @@ -11659,7 +11615,8 @@ msgstr "imprimeix bellament el contingut de l'objecte" #: builtin/cat-file.c:645 msgid "for blob objects, run textconv on object's content" -msgstr "en els objectes de blob, executa textconv en el contingut de l'objecte" +msgstr "" +"en els objectes de blob, executa textconv en el contingut de l'objecte" #: builtin/cat-file.c:647 msgid "for blob objects, run filters on object's content" @@ -11694,7 +11651,8 @@ msgstr "mostra informació sobre els objectes rebuts de l'entrada estàndard" #: builtin/cat-file.c:662 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)" +"segueix els enllaços simbòlics en l'arbre (s'usa amb --batch o --batch-" +"check)" #: builtin/cat-file.c:664 msgid "show all objects with --batch or --batch-check" @@ -11729,7 +11687,7 @@ 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:1482 builtin/gc.c:538 +#: builtin/check-ignore.c:21 builtin/checkout.c:1500 builtin/gc.c:541 #: builtin/worktree.c:561 msgid "suppress progress reporting" msgstr "omet els informes de progrés" @@ -11783,55 +11741,55 @@ msgstr "no s'ha pogut analitzar el contacte: %s" msgid "no contacts specified" msgstr "no hi ha contactes especificats" -#: builtin/checkout-index.c:131 +#: builtin/checkout-index.c:139 msgid "git checkout-index [] [--] [...]" msgstr "git checkout-index [] [--] [...]" -#: builtin/checkout-index.c:148 +#: builtin/checkout-index.c:156 msgid "stage should be between 1 and 3 or all" msgstr "«stage» ha de ser entre 1 i 3 o all" -#: builtin/checkout-index.c:164 +#: builtin/checkout-index.c:173 msgid "check out all files in the index" msgstr "agafa tots els fitxers en l'índex" -#: builtin/checkout-index.c:165 +#: builtin/checkout-index.c:174 msgid "force overwrite of existing files" msgstr "força la sobreescriptura de fitxers existents" -#: builtin/checkout-index.c:167 +#: builtin/checkout-index.c:176 msgid "no warning for existing files and files not in index" msgstr "" "cap advertència per a fitxers existents i fitxers que no siguin a l'índex" -#: builtin/checkout-index.c:169 +#: builtin/checkout-index.c:178 msgid "don't checkout new files" msgstr "no agafis fitxers nous" -#: builtin/checkout-index.c:171 +#: builtin/checkout-index.c:180 msgid "update stat information in the index file" msgstr "actualitza la informació d'estadístiques en el fitxer d'índex" -#: builtin/checkout-index.c:175 +#: builtin/checkout-index.c:184 msgid "read list of paths from the standard input" msgstr "llegeix la llista de camins des de l'entrada estàndard" -#: builtin/checkout-index.c:177 +#: builtin/checkout-index.c:186 msgid "write the content to temporary files" msgstr "escriu el contingut a fitxers temporals" -#: builtin/checkout-index.c:178 builtin/column.c:31 +#: builtin/checkout-index.c:187 builtin/column.c:31 #: builtin/submodule--helper.c:1824 builtin/submodule--helper.c:1827 #: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333 -#: builtin/worktree.c:754 +#: builtin/worktree.c:757 msgid "string" msgstr "cadena" -#: builtin/checkout-index.c:179 +#: builtin/checkout-index.c:188 msgid "when creating files, prepend " msgstr "en crear fitxers, anteposa " -#: builtin/checkout-index.c:181 +#: builtin/checkout-index.c:190 msgid "copy out the files from named stage" msgstr "copia els fitxers des de «stage» amb nom" @@ -11844,14 +11802,12 @@ msgid "git checkout [] [] -- ..." msgstr "git checkout [] [] -- ..." #: builtin/checkout.c:37 -#, fuzzy msgid "git switch [] []" -msgstr "git interruptor [] []" +msgstr "git switch [] []" #: builtin/checkout.c:42 -#, fuzzy msgid "git restore [] [--source=] ..." -msgstr "git restore [] [--source=] " +msgstr "git restore [] [--source=] ..." #: builtin/checkout.c:188 builtin/checkout.c:227 #, c-format @@ -11884,18 +11840,18 @@ msgid "Unable to add merge result for '%s'" msgstr "No s'ha pogut afegir el resultat de fusió per a «%s»" #: builtin/checkout.c:396 -#, c-format +#, c-format, fuzzy msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Conflicte de fusió recreat en un 1%" +msgstr[1] "Conflictes de fusió recreats en un 1%" #: builtin/checkout.c:401 -#, c-format +#, c-format, fuzzy msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Camí actualitzat d'un 1% des d'un 1%" +msgstr[1] "Camins actualitzats a un 1% des d'un 1%" #: builtin/checkout.c:408 #, c-format @@ -11922,7 +11878,7 @@ msgstr "" "No es poden actualitzar els camins i canviar a la branca «%s» a la vegada." #: builtin/checkout.c:455 -#, fuzzy, c-format +#, c-format msgid "neither '%s' or '%s' is specified" msgstr "no s'ha especificat ni «%s» ni «%s»" @@ -11932,20 +11888,20 @@ msgid "'%s' must be used when '%s' is not specified" msgstr "«%s» s'ha d'utilitzar quan no s'especifica «%s»" #: builtin/checkout.c:464 builtin/checkout.c:469 -#, fuzzy, c-format +#, c-format msgid "'%s' or '%s' cannot be used with %s" -msgstr "\"%s\" o \"%s\" no poden utilitzar-se amb percentatges" +msgstr "«%s» o «%s» no poden utilitzar-se amb %s" -#: builtin/checkout.c:528 builtin/checkout.c:535 +#: builtin/checkout.c:541 builtin/checkout.c:548 #, c-format msgid "path '%s' is unmerged" msgstr "el camí «%s» està sense fusionar" -#: builtin/checkout.c:703 +#: builtin/checkout.c:716 msgid "you need to resolve your current index first" msgstr "heu de primer resoldre el vostre índex actual" -#: builtin/checkout.c:757 +#: builtin/checkout.c:770 #, fuzzy, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -11954,50 +11910,50 @@ msgstr "" "no es poden continuar amb els canvis «staged» als fitxers següents " "percentatges" -#: builtin/checkout.c:853 +#: builtin/checkout.c:866 #, 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:895 +#: builtin/checkout.c:908 msgid "HEAD is now at" msgstr "HEAD ara és a" -#: builtin/checkout.c:899 builtin/clone.c:720 +#: builtin/checkout.c:912 builtin/clone.c:721 t/helper/test-fast-rebase.c:202 msgid "unable to update HEAD" msgstr "no s'ha pogut actualitzar HEAD" -#: builtin/checkout.c:903 +#: builtin/checkout.c:916 #, c-format msgid "Reset branch '%s'\n" msgstr "Restableix la branca «%s»\n" -#: builtin/checkout.c:906 +#: builtin/checkout.c:919 #, c-format msgid "Already on '%s'\n" msgstr "Ja esteu en «%s»\n" -#: builtin/checkout.c:910 +#: builtin/checkout.c:923 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "S'ha canviat i restablert a la branca «%s»\n" -#: builtin/checkout.c:912 builtin/checkout.c:1338 +#: builtin/checkout.c:925 builtin/checkout.c:1356 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "S'ha canviat a la branca nova «%s»\n" -#: builtin/checkout.c:914 +#: builtin/checkout.c:927 #, c-format msgid "Switched to branch '%s'\n" msgstr "S'ha canviat a la branca «%s»\n" -#: builtin/checkout.c:965 +#: builtin/checkout.c:978 #, c-format msgid " ... and %d more.\n" msgstr " ... i %d més.\n" -#: builtin/checkout.c:971 +#: builtin/checkout.c:984 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -12020,7 +11976,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:990 +#: builtin/checkout.c:1003 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -12047,19 +12003,19 @@ msgstr[1] "" " git branch %s\n" "\n" -#: builtin/checkout.c:1025 +#: builtin/checkout.c:1038 msgid "internal error in revision walk" msgstr "error intern en el passeig per revisions" -#: builtin/checkout.c:1029 +#: builtin/checkout.c:1042 msgid "Previous HEAD position was" msgstr "La posició de HEAD anterior era" -#: builtin/checkout.c:1069 builtin/checkout.c:1333 +#: builtin/checkout.c:1082 builtin/checkout.c:1351 msgid "You are on a branch yet to be born" msgstr "Sou en una branca que encara ha de néixer" -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1164 #, fuzzy, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -12068,7 +12024,7 @@ msgstr "" "\"%s\" podria ser tant un fitxer local com una branca de seguiment. Si us " "plau useu -- (i opcionalment --no-gues) per a desambiguar" -#: builtin/checkout.c:1153 +#: builtin/checkout.c:1171 #, fuzzy msgid "" "If you meant to check out a remote tracking branch on, e.g. 'origin',\n" @@ -12081,57 +12037,56 @@ msgid "" "checkout.defaultRemote=origin in your config." msgstr "" "Si voleu comprovar una branca de seguiment remota p. ex. «origen» podeu fer-" -"ho classificant completament el nom amb l'opció --track git checkout --track " -"origin/ Si voleu tenir sempre agafades d'un ambigu preferiu un " -"remot p. ex. el paràmetre remot 'origin' considereu agafar." -"defaultRemote=origin a la vostra configuració." +"ho classificant completament el nom amb l'opció --track git checkout --track" +" origin/ Si voleu tenir sempre agafades d'un ambigu preferiu un" +" remot p. ex. el paràmetre remot 'origin' considereu " +"agafar.defaultRemote=origin a la vostra configuració." -#: builtin/checkout.c:1163 -#, fuzzy, c-format +#: builtin/checkout.c:1181 +#, c-format msgid "'%s' matched multiple (%d) remote tracking branches" -msgstr "'%s' coincideixen múltiples (%) branques de seguiment remotes" +msgstr "«%s» coincideixen múltiples (%d) branques de seguiment remotes" -#: builtin/checkout.c:1229 -#, fuzzy +#: builtin/checkout.c:1247 msgid "only one reference expected" msgstr "només s'esperava una referència" -#: builtin/checkout.c:1246 +#: builtin/checkout.c:1264 #, c-format msgid "only one reference expected, %d given." msgstr "s'esperava només una referència, s'han donat %d." -#: builtin/checkout.c:1292 builtin/worktree.c:342 builtin/worktree.c:510 +#: builtin/checkout.c:1310 builtin/worktree.c:342 builtin/worktree.c:510 #, c-format msgid "invalid reference: %s" msgstr "referència no vàlida: %s" -#: builtin/checkout.c:1305 builtin/checkout.c:1671 +#: builtin/checkout.c:1323 builtin/checkout.c:1689 #, c-format msgid "reference is not a tree: %s" msgstr "la referència no és un arbre: %s" -#: builtin/checkout.c:1352 -#, fuzzy, c-format +#: builtin/checkout.c:1370 +#, c-format msgid "a branch is expected, got tag '%s'" -msgstr "s'espera una branca amb l'etiqueta «%s»" +msgstr "s'espera una branca, s'ha obtingut l'etiqueta «%s»" -#: builtin/checkout.c:1354 -#, fuzzy, c-format +#: builtin/checkout.c:1372 +#, c-format msgid "a branch is expected, got remote branch '%s'" -msgstr "s'espera una branca amb la branca remota «%s»" +msgstr "s'espera una branca, s'ha obtingut la branca remota «%s»" -#: builtin/checkout.c:1355 builtin/checkout.c:1363 -#, fuzzy, c-format +#: builtin/checkout.c:1373 builtin/checkout.c:1381 +#, c-format msgid "a branch is expected, got '%s'" -msgstr "s'espera que una branca tingui «%s»" +msgstr "s'espera una branca, s'ha obtingut «%s»" -#: builtin/checkout.c:1358 -#, fuzzy, c-format +#: builtin/checkout.c:1376 +#, c-format msgid "a branch is expected, got commit '%s'" -msgstr "s'espera que una branca tingui la comissió «%s»" +msgstr "s'espera una branca, s'ha obtingut la comissió «%s»" -#: builtin/checkout.c:1374 +#: builtin/checkout.c:1392 #, fuzzy msgid "" "cannot switch branch while merging\n" @@ -12140,25 +12095,25 @@ msgstr "" "no es pot canviar de branca mentre es fusiona «git merge --quit» o «git " "worktree add»." -#: builtin/checkout.c:1378 +#: builtin/checkout.c:1396 #, fuzzy msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." msgstr "" -"no es pot canviar de branca al mig d'una sessió am Considereu \"git am --quit" -"\" o \"git worktree add\"." +"no es pot canviar de branca al mig d'una sessió am Considereu \"git am " +"--quit\" o \"git worktree add\"." -#: builtin/checkout.c:1382 +#: builtin/checkout.c:1400 #, fuzzy msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." msgstr "" -"no es pot canviar de branca mentre es rebase considera «git rebase --quit» o " -"«git worktree add»." +"no es pot canviar de branca mentre es rebase considera «git rebase --quit» o" +" «git worktree add»." -#: builtin/checkout.c:1386 +#: builtin/checkout.c:1404 #, fuzzy msgid "" "cannot switch branch while cherry-picking\n" @@ -12167,160 +12122,155 @@ msgstr "" "no es pot canviar de branca mentre «cherry pick» considera «git cherry-pick " "--quit» o «git worktree add»." -#: builtin/checkout.c:1390 -#, fuzzy +#: builtin/checkout.c:1408 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." msgstr "" -"no es pot canviar de branca mentre s'està revertint Considera \"git revert --" -"quit\" o \"git worktree add\"." +"no es pot canviar de branca mentre s'està revertint\n" +"Considereu «git revert --quit» o «git worktree add»." -#: builtin/checkout.c:1394 +#: builtin/checkout.c:1412 #, fuzzy msgid "you are switching branch while bisecting" msgstr "s'està canviant la branca mentre es bisect" -#: builtin/checkout.c:1401 +#: builtin/checkout.c:1419 msgid "paths cannot be used with switching branches" msgstr "els camins no es poden usar amb canvi de branca" -#: builtin/checkout.c:1404 builtin/checkout.c:1408 builtin/checkout.c:1412 +#: builtin/checkout.c:1422 builtin/checkout.c:1426 builtin/checkout.c:1430 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "«%s» no es pot usar amb canvi de branca" -#: builtin/checkout.c:1416 builtin/checkout.c:1419 builtin/checkout.c:1422 -#: builtin/checkout.c:1427 builtin/checkout.c:1432 +#: builtin/checkout.c:1434 builtin/checkout.c:1437 builtin/checkout.c:1440 +#: builtin/checkout.c:1445 builtin/checkout.c:1450 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "«%s» no es pot usar amb «%s»" -#: builtin/checkout.c:1429 -#, fuzzy, c-format +#: builtin/checkout.c:1447 +#, c-format msgid "'%s' cannot take " -msgstr "'%s' no pot prendre " +msgstr "«%s» no pot prendre " -#: builtin/checkout.c:1437 +#: builtin/checkout.c:1455 #, 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:1444 -#, fuzzy +#: builtin/checkout.c:1462 msgid "missing branch or commit argument" msgstr "manca branca o argument de comissió" -#: builtin/checkout.c:1486 builtin/clone.c:91 builtin/commit-graph.c:84 -#: builtin/commit-graph.c:222 builtin/fetch.c:172 builtin/merge.c:287 -#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:551 -#: builtin/send-pack.c:192 +#: builtin/checkout.c:1504 builtin/clone.c:92 builtin/commit-graph.c:84 +#: builtin/commit-graph.c:222 builtin/fetch.c:172 builtin/merge.c:296 +#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:575 +#: builtin/send-pack.c:198 msgid "force progress reporting" msgstr "força l'informe de progrés" -#: builtin/checkout.c:1487 +#: builtin/checkout.c:1505 msgid "perform a 3-way merge with the new branch" msgstr "realitza una fusió de 3 vies amb la branca nova" -#: builtin/checkout.c:1488 builtin/log.c:1795 parse-options.h:322 +#: builtin/checkout.c:1506 builtin/log.c:1800 parse-options.h:322 msgid "style" msgstr "estil" -#: builtin/checkout.c:1489 +#: builtin/checkout.c:1507 msgid "conflict style (merge or diff3)" msgstr "estil de conflicte (fusió o diff3)" -#: builtin/checkout.c:1501 builtin/worktree.c:558 +#: builtin/checkout.c:1519 builtin/worktree.c:558 msgid "detach HEAD at named commit" msgstr "separa HEAD a la comissió anomenada" -#: builtin/checkout.c:1502 +#: builtin/checkout.c:1520 msgid "set upstream info for new branch" msgstr "estableix la informació de font de la branca nova" -#: builtin/checkout.c:1504 +#: builtin/checkout.c:1522 msgid "force checkout (throw away local modifications)" msgstr "agafa a la força (descarta qualsevol modificació local)" -#: builtin/checkout.c:1506 +#: builtin/checkout.c:1524 msgid "new-branch" msgstr "branca-nova" -#: builtin/checkout.c:1506 +#: builtin/checkout.c:1524 msgid "new unparented branch" msgstr "branca òrfena nova" -#: builtin/checkout.c:1508 builtin/merge.c:291 +#: builtin/checkout.c:1526 builtin/merge.c:300 msgid "update ignored files (default)" msgstr "actualitza els fitxers ignorats (per defecte)" -#: builtin/checkout.c:1511 +#: builtin/checkout.c:1529 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:1524 +#: builtin/checkout.c:1542 msgid "checkout our version for unmerged files" msgstr "agafa la versió nostra dels fitxers sense fusionar" -#: builtin/checkout.c:1527 +#: builtin/checkout.c:1545 msgid "checkout their version for unmerged files" msgstr "agafa la versió seva dels fitxers sense fusionar" -#: builtin/checkout.c:1531 +#: builtin/checkout.c:1549 msgid "do not limit pathspecs to sparse entries only" msgstr "no limitis les especificacions de camí només a entrades disperses" -#: builtin/checkout.c:1586 -#, fuzzy, c-format +#: builtin/checkout.c:1604 +#, c-format msgid "-%c, -%c and --orphan are mutually exclusive" -msgstr "-b, -B i --orphan són mútuament excloents" +msgstr "-%c, -%c i --orphan són mútuament excloents" -#: builtin/checkout.c:1590 -#, fuzzy +#: builtin/checkout.c:1608 msgid "-p and --overlay are mutually exclusive" msgstr "-p i --overlay són mútuament excloents" -#: builtin/checkout.c:1627 +#: builtin/checkout.c:1645 msgid "--track needs a branch name" msgstr "--track necessita un nom de branca" -#: builtin/checkout.c:1632 -#, fuzzy, c-format +#: builtin/checkout.c:1650 +#, c-format msgid "missing branch name; try -%c" -msgstr "falta el nom de la branca; proveu -b" +msgstr "falta el nom de la branca; proveu -%c" -#: builtin/checkout.c:1664 -#, fuzzy, c-format +#: builtin/checkout.c:1682 +#, c-format msgid "could not resolve %s" -msgstr "no es poden resoldre els percentatges" +msgstr "no es pot resoldre %s" -#: builtin/checkout.c:1680 +#: builtin/checkout.c:1698 msgid "invalid path specification" msgstr "especificació de camí no vàlida" -#: builtin/checkout.c:1687 +#: builtin/checkout.c:1705 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "" "«%s» no és una comissió i la branca «%s» no es pot crear a partir d'aquesta " "comissió" -#: builtin/checkout.c:1691 +#: builtin/checkout.c:1709 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach no accepta un argument de camí «%s»" -#: builtin/checkout.c:1700 -#, fuzzy +#: builtin/checkout.c:1718 msgid "--pathspec-from-file is incompatible with --detach" msgstr "--pathspec-from-file és incompatible amb --detach" -#: builtin/checkout.c:1703 builtin/reset.c:325 builtin/stash.c:1500 -#, fuzzy +#: builtin/checkout.c:1721 builtin/reset.c:325 builtin/stash.c:1499 msgid "--pathspec-from-file is incompatible with --patch" msgstr "--pathspec-from-file és incompatible amb --patch" -#: builtin/checkout.c:1716 +#: builtin/checkout.c:1734 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -12328,84 +12278,75 @@ msgstr "" "git checkout: --ours/--theirs, --force i --merge són incompatibles en\n" "agafar de l'índex." -#: builtin/checkout.c:1721 -#, fuzzy +#: builtin/checkout.c:1739 msgid "you must specify path(s) to restore" -msgstr "heu d'especificar camins per restaurar" +msgstr "heu d'especificar el camí o camins a restaurar" -#: builtin/checkout.c:1747 builtin/checkout.c:1749 builtin/checkout.c:1798 -#: builtin/checkout.c:1800 builtin/clone.c:121 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:554 -#: builtin/worktree.c:556 +#: builtin/checkout.c:1765 builtin/checkout.c:1767 builtin/checkout.c:1816 +#: builtin/checkout.c:1818 builtin/clone.c:122 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2719 +#: builtin/worktree.c:554 builtin/worktree.c:556 msgid "branch" msgstr "branca" -#: builtin/checkout.c:1748 +#: builtin/checkout.c:1766 msgid "create and checkout a new branch" msgstr "crea i agafa una branca nova" -#: builtin/checkout.c:1750 +#: builtin/checkout.c:1768 msgid "create/reset and checkout a branch" msgstr "crea/restableix i agafa una branca" -#: builtin/checkout.c:1751 +#: builtin/checkout.c:1769 msgid "create reflog for new branch" msgstr "crea un registre de referència per a la branca nova" -#: builtin/checkout.c:1753 +#: builtin/checkout.c:1771 #, fuzzy msgid "second guess 'git checkout ' (default)" msgstr "segon conjectura «git checkout » (per defecte)" -#: builtin/checkout.c:1754 -#, fuzzy +#: builtin/checkout.c:1772 msgid "use overlay mode (default)" -msgstr "utilitza el mode superposició (per defecte)" +msgstr "utilitza el mode de superposició (per defecte)" -#: builtin/checkout.c:1799 -#, fuzzy +#: builtin/checkout.c:1817 msgid "create and switch to a new branch" msgstr "crea i canvia a una branca nova" -#: builtin/checkout.c:1801 -#, fuzzy +#: builtin/checkout.c:1819 msgid "create/reset and switch to a branch" -msgstr "crea/reestableix i canvia a una branca" +msgstr "crea/restableix i canvia a una branca" -#: builtin/checkout.c:1803 +#: builtin/checkout.c:1821 #, fuzzy msgid "second guess 'git switch '" msgstr "segon conjectura «git switch »" -#: builtin/checkout.c:1805 -#, fuzzy +#: builtin/checkout.c:1823 msgid "throw away local modifications" -msgstr "rebutjar modificacions locals" +msgstr "descarta les modificacions locals" -#: builtin/checkout.c:1839 +#: builtin/checkout.c:1857 #, fuzzy msgid "which tree-ish to checkout from" msgstr "de quin arbre agafar" -#: builtin/checkout.c:1841 -#, fuzzy +#: builtin/checkout.c:1859 msgid "restore the index" msgstr "restaura l'índex" -#: builtin/checkout.c:1843 -#, fuzzy +#: builtin/checkout.c:1861 msgid "restore the working tree (default)" msgstr "restaura l'arbre de treball (per defecte)" -#: builtin/checkout.c:1845 -#, fuzzy +#: builtin/checkout.c:1863 msgid "ignore unmerged entries" msgstr "ignora les entrades sense fusionar" -#: builtin/checkout.c:1846 -#, fuzzy +#: builtin/checkout.c:1864 msgid "use overlay mode" -msgstr "utilitza el mode superposició" +msgstr "utilitza el mode de superposició" #: builtin/clean.c:29 msgid "" @@ -12439,11 +12380,11 @@ msgid "failed to remove %s" msgstr "s'ha produït un error en eliminar %s" #: builtin/clean.c:38 -#, fuzzy, c-format +#, c-format msgid "could not lstat %s\n" -msgstr "no s'han pogut lstat%s" +msgstr "no s'ha pogut fer lstat %s\n" -#: builtin/clean.c:302 git-add--interactive.perl:595 +#: builtin/clean.c:302 git-add--interactive.perl:593 #, c-format msgid "" "Prompt help:\n" @@ -12456,7 +12397,7 @@ msgstr "" "foo - selecciona un ítem basat en un prefix únic\n" " - (buit) no seleccionis res\n" -#: builtin/clean.c:306 git-add--interactive.perl:604 +#: builtin/clean.c:306 git-add--interactive.perl:602 #, c-format msgid "" "Prompt help:\n" @@ -12477,8 +12418,8 @@ msgstr "" "* - tria tots els ítems\n" " - (buit) finalitza la selecció\n" -#: builtin/clean.c:521 git-add--interactive.perl:570 -#: git-add--interactive.perl:575 +#: builtin/clean.c:521 git-add--interactive.perl:568 +#: git-add--interactive.perl:573 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Perdó (%s)?\n" @@ -12548,7 +12489,7 @@ msgid "remove whole directories" msgstr "elimina directoris sencers" #: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 -#: builtin/grep.c:910 builtin/log.c:181 builtin/log.c:183 +#: builtin/grep.c:921 builtin/log.c:183 builtin/log.c:185 #: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" @@ -12568,8 +12509,8 @@ msgstr "elimina només els fitxers ignorats" #: builtin/clean.c:929 msgid "" -"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " -"clean" +"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to" +" clean" msgstr "" "clean.requireForce està establerta en cert i ni -i, -n ni -f s'han indicat; " "refusant netejar" @@ -12590,167 +12531,166 @@ msgstr "-x i -X no es poden usar junts" msgid "git clone [] [--] []" msgstr "git clone [] [--] []" -#: builtin/clone.c:93 +#: builtin/clone.c:94 msgid "don't create a checkout" msgstr "no facis cap agafament" -#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:553 +#: builtin/clone.c:95 builtin/clone.c:97 builtin/init-db.c:553 msgid "create a bare repository" msgstr "crea un dipòsit nu" -#: builtin/clone.c:98 +#: builtin/clone.c:99 msgid "create a mirror repository (implies bare)" msgstr "crea un dipòsit mirall (implica bare)" -#: builtin/clone.c:100 +#: builtin/clone.c:101 msgid "to clone from a local repository" msgstr "per a clonar des d'un dipòsit local" -#: builtin/clone.c:102 +#: builtin/clone.c:103 msgid "don't use local hardlinks, always copy" msgstr "no usis enllaços durs locals, sempre copia" -#: builtin/clone.c:104 +#: builtin/clone.c:105 msgid "setup as shared repository" msgstr "configura com a dipòsit compartit" -#: builtin/clone.c:106 +#: builtin/clone.c:107 msgid "pathspec" msgstr "especificació de camí" -#: builtin/clone.c:106 +#: builtin/clone.c:107 msgid "initialize submodules in the clone" msgstr "inicialitza els submòduls en el clon" -#: builtin/clone.c:110 +#: builtin/clone.c:111 msgid "number of submodules cloned in parallel" msgstr "nombre de submòduls clonats en paral·lel" -#: builtin/clone.c:111 builtin/init-db.c:550 +#: builtin/clone.c:112 builtin/init-db.c:550 msgid "template-directory" msgstr "directori-de-plantilla" -#: builtin/clone.c:112 builtin/init-db.c:551 +#: builtin/clone.c:113 builtin/init-db.c:551 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:1831 +#: builtin/clone.c:115 builtin/clone.c:117 builtin/submodule--helper.c:1831 #: builtin/submodule--helper.c:2336 msgid "reference repository" msgstr "dipòsit de referència" -#: builtin/clone.c:118 builtin/submodule--helper.c:1833 +#: builtin/clone.c:119 builtin/submodule--helper.c:1833 #: builtin/submodule--helper.c:2338 msgid "use --reference only while cloning" msgstr "usa --reference només en clonar" -#: builtin/clone.c:119 builtin/column.c:27 builtin/init-db.c:561 -#: builtin/merge-file.c:46 builtin/pack-objects.c:3546 builtin/repack.c:332 +#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:561 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3546 builtin/repack.c:358 msgid "name" msgstr "nom" -#: builtin/clone.c:120 +#: builtin/clone.c:121 msgid "use instead of 'origin' to track upstream" msgstr "usa en lloc d'«origin» per a seguir la font" -#: builtin/clone.c:122 +#: builtin/clone.c:123 msgid "checkout instead of the remote's HEAD" msgstr "agafa en lloc de la HEAD del remot" -#: builtin/clone.c:124 +#: builtin/clone.c:125 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:173 builtin/grep.c:849 +#: builtin/clone.c:126 builtin/fetch.c:173 builtin/grep.c:860 #: builtin/pull.c:208 msgid "depth" msgstr "profunditat" -#: builtin/clone.c:126 +#: builtin/clone.c:127 msgid "create a shallow clone of that depth" msgstr "crea un clon superficial de tal profunditat" -#: builtin/clone.c:127 builtin/fetch.c:175 builtin/pack-objects.c:3535 +#: builtin/clone.c:128 builtin/fetch.c:175 builtin/pack-objects.c:3535 #: builtin/pull.c:211 msgid "time" msgstr "hora" -#: builtin/clone.c:128 +#: builtin/clone.c:129 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:177 builtin/fetch.c:200 -#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1311 +#: builtin/clone.c:130 builtin/fetch.c:177 builtin/fetch.c:200 +#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1317 msgid "revision" msgstr "revisió" -#: builtin/clone.c:130 builtin/fetch.c:178 builtin/pull.c:215 +#: builtin/clone.c:131 builtin/fetch.c:178 builtin/pull.c:215 msgid "deepen history of shallow clone, excluding rev" msgstr "aprofundeix la història d'un clon superficial, excloent una revisió" -#: builtin/clone.c:132 builtin/submodule--helper.c:1843 +#: builtin/clone.c:133 builtin/submodule--helper.c:1843 #: builtin/submodule--helper.c:2352 msgid "clone only one branch, HEAD or --branch" msgstr "clona només una branca, HEAD o --branch" -#: builtin/clone.c:134 +#: builtin/clone.c:135 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "" "no cloneu cap etiqueta, i feu que els «fetch» següents no els segueixen" -#: builtin/clone.c:136 +#: builtin/clone.c:137 msgid "any cloned submodules will be shallow" msgstr "qualsevol submòdul clonat serà superficial" -#: builtin/clone.c:137 builtin/init-db.c:559 +#: builtin/clone.c:138 builtin/init-db.c:559 msgid "gitdir" msgstr "directori de git" -#: builtin/clone.c:138 builtin/init-db.c:560 +#: builtin/clone.c:139 builtin/init-db.c:560 msgid "separate git dir from working tree" msgstr "separa el directori de git de l'arbre de treball" -#: builtin/clone.c:139 +#: builtin/clone.c:140 msgid "key=value" msgstr "clau=valor" -#: builtin/clone.c:140 +#: builtin/clone.c:141 msgid "set config inside the new repository" msgstr "estableix la configuració dins del dipòsit nou" -#: builtin/clone.c:142 builtin/fetch.c:195 builtin/ls-remote.c:76 -#: builtin/pull.c:230 builtin/push.c:560 builtin/send-pack.c:190 +#: builtin/clone.c:143 builtin/fetch.c:195 builtin/ls-remote.c:76 +#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196 msgid "server-specific" msgstr "específic al servidor" -#: builtin/clone.c:142 builtin/fetch.c:195 builtin/ls-remote.c:76 -#: builtin/pull.c:231 builtin/push.c:560 builtin/send-pack.c:191 +#: builtin/clone.c:143 builtin/fetch.c:195 builtin/ls-remote.c:76 +#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197 msgid "option to transmit" msgstr "opció a transmetre" -#: builtin/clone.c:143 builtin/fetch.c:196 builtin/pull.c:234 -#: builtin/push.c:561 +#: builtin/clone.c:144 builtin/fetch.c:196 builtin/pull.c:234 +#: builtin/push.c:585 msgid "use IPv4 addresses only" msgstr "usa només adreces IPv4" -#: builtin/clone.c:145 builtin/fetch.c:198 builtin/pull.c:237 -#: builtin/push.c:563 +#: builtin/clone.c:146 builtin/fetch.c:198 builtin/pull.c:237 +#: builtin/push.c:587 msgid "use IPv6 addresses only" msgstr "usa només adreces IPv6" -#: builtin/clone.c:149 -#, fuzzy +#: builtin/clone.c:150 msgid "any cloned submodules will use their remote-tracking branch" -msgstr "qualsevol submòdul clonat utilitzarà la seva branca de seguiment remot" +msgstr "" +"qualsevol submòdul clonat utilitzarà la seva branca de seguiment remot" -#: builtin/clone.c:151 -#, fuzzy +#: builtin/clone.c:152 msgid "initialize sparse-checkout file to include only files at root" msgstr "" -"inicialitza el fitxer «sparse-checkout» per incloure només els fitxers a " +"inicialitza el fitxer «sparse-checkout» per a incloure només els fitxers a " "l'arrel" -#: builtin/clone.c:287 +#: builtin/clone.c:288 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -12758,42 +12698,42 @@ msgstr "" "No s'ha pogut endevinar cap nom de directori.\n" "Especifiqueu un directori en la línia d'ordres" -#: builtin/clone.c:340 +#: builtin/clone.c:341 #, 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:413 +#: builtin/clone.c:414 #, c-format msgid "%s exists and is not a directory" msgstr "%s existeix i no és directori" -#: builtin/clone.c:431 +#: builtin/clone.c:432 #, fuzzy, c-format msgid "failed to start iterator over '%s'" msgstr "no s'ha pogut iniciar l'iterador per sobre de «%s»" -#: builtin/clone.c:462 +#: builtin/clone.c:463 #, c-format msgid "failed to create link '%s'" msgstr "s'ha produït un error en crear l'enllaç «%s»" -#: builtin/clone.c:466 +#: builtin/clone.c:467 #, 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:471 -#, fuzzy, c-format +#: builtin/clone.c:472 +#, c-format msgid "failed to iterate over '%s'" msgstr "no s'ha pogut iterar sobre «%s»" -#: builtin/clone.c:498 +#: builtin/clone.c:499 #, c-format msgid "done.\n" msgstr "fet.\n" -#: builtin/clone.c:512 +#: builtin/clone.c:513 #, fuzzy msgid "" "Clone succeeded, but checkout failed.\n" @@ -12801,178 +12741,156 @@ msgid "" "and retry with 'git restore --source=HEAD :/'\n" msgstr "" "El clonatge ha tingut èxit però ha fallat. Podeu inspeccionar el que s'ha " -"comprovat amb «git status» i tornar-ho a provar amb «git restore --" -"source=HEAD /»" +"comprovat amb «git status» i tornar-ho a provar amb «git restore " +"--source=HEAD /»" -#: builtin/clone.c:589 +#: builtin/clone.c:590 #, 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:708 +#: builtin/clone.c:709 #, c-format msgid "unable to update %s" msgstr "no s'ha pogut actualitzar %s" -#: builtin/clone.c:756 -#, fuzzy +#: builtin/clone.c:757 msgid "failed to initialize sparse-checkout" msgstr "no s'ha pogut inicialitzar «sparse-checkout»" -#: builtin/clone.c:779 +#: builtin/clone.c:780 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:811 +#: builtin/clone.c:812 msgid "unable to checkout working tree" msgstr "no s'ha pogut agafar l'arbre de treball" -#: builtin/clone.c:868 +#: builtin/clone.c:887 msgid "unable to write parameters to config file" msgstr "no s'han pogut escriure els paràmetres al fitxer de configuració" -#: builtin/clone.c:931 +#: builtin/clone.c:950 msgid "cannot repack to clean up" msgstr "no es pot reempaquetar per a netejar" -#: builtin/clone.c:933 +#: builtin/clone.c:952 msgid "cannot unlink temporary alternates file" msgstr "no es pot desenllaçar el fitxer d'alternatives temporal" -#: builtin/clone.c:970 builtin/receive-pack.c:2434 +#: builtin/clone.c:992 builtin/receive-pack.c:2493 msgid "Too many arguments." msgstr "Hi ha massa arguments." -#: builtin/clone.c:974 +#: builtin/clone.c:996 msgid "You must specify a repository to clone." msgstr "Heu d'especificar un dipòsit per a clonar." -#: builtin/clone.c:987 +#: builtin/clone.c:1009 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "les opcions --bare i --origin %s són incompatibles." -#: builtin/clone.c:990 +#: builtin/clone.c:1012 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare i --separate-git-dir són incompatibles." -#: builtin/clone.c:1006 +#: builtin/clone.c:1025 #, c-format msgid "repository '%s' does not exist" msgstr "el dipòsit «%s» no existeix" -#: builtin/clone.c:1010 builtin/fetch.c:1841 +#: builtin/clone.c:1029 builtin/fetch.c:1841 #, c-format msgid "depth %s is not a positive number" msgstr "la profunditat %s no és un nombre positiu" -#: builtin/clone.c:1020 +#: builtin/clone.c:1039 #, 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:1026 -#, fuzzy, c-format +#: builtin/clone.c:1045 +#, c-format msgid "repository 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:1040 +#: builtin/clone.c:1059 #, c-format msgid "working tree '%s' already exists." msgstr "l'arbre de treball «%s» ja existeix." -#: builtin/clone.c:1055 builtin/clone.c:1076 builtin/difftool.c:271 -#: builtin/log.c:1970 builtin/worktree.c:354 builtin/worktree.c:386 +#: builtin/clone.c:1074 builtin/clone.c:1095 builtin/difftool.c:271 +#: builtin/log.c:1987 builtin/worktree.c:354 builtin/worktree.c:386 #, c-format msgid "could not create leading directories of '%s'" msgstr "no s'han pogut crear els directoris inicials de «%s»" -#: builtin/clone.c:1060 +#: builtin/clone.c:1079 #, 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:1080 +#: builtin/clone.c:1099 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "S'està clonant al dipòsit nu «%s»...\n" -#: builtin/clone.c:1082 +#: builtin/clone.c:1101 #, c-format msgid "Cloning into '%s'...\n" msgstr "S'està clonant a «%s»...\n" -#: builtin/clone.c:1106 +#: builtin/clone.c:1125 msgid "" -"clone --recursive is not compatible with both --reference and --reference-if-" -"able" +"clone --recursive is not compatible with both --reference and --reference-" +"if-able" msgstr "" "clone --recursive no és compatible amb ambdós --reference i --reference-if-" "able" -#: builtin/clone.c:1170 +#: builtin/clone.c:1169 builtin/remote.c:200 builtin/remote.c:705 +#, c-format +msgid "'%s' is not a valid remote name" +msgstr "«%s» no és un nom de remot vàlid" + +#: builtin/clone.c:1210 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:1172 +#: builtin/clone.c:1212 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:1174 +#: builtin/clone.c:1214 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:1176 +#: builtin/clone.c:1216 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:1179 +#: builtin/clone.c:1219 msgid "source repository is shallow, ignoring --local" msgstr "el dipòsit font és superficial, s'està ignorant --local" -#: builtin/clone.c:1184 +#: builtin/clone.c:1224 msgid "--local is ignored" msgstr "--local s'ignora" -#: builtin/clone.c:1268 builtin/clone.c:1276 +#: builtin/clone.c:1308 builtin/clone.c:1316 #, 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:1279 +#: builtin/clone.c:1319 msgid "You appear to have cloned an empty repository." msgstr "Sembla que heu clonat un dipòsit buit." -#: builtin/credential-cache.c:154 -msgid "credential-cache unavailable; no unix socket support" -msgstr "" - -#: builtin/credential-cache--daemon.c:226 -#, c-format -msgid "" -"The permissions on your socket directory are too loose; other\n" -"users may be able to read your cached credentials. Consider running:\n" -"\n" -"\tchmod 0700 %s" -msgstr "" -"Els permisos en el vostre directori de sòcol són massa liberals;\n" -"pot ser que altres usuaris poden llegir les vostres credencials.\n" -"Considereu executar:\n" -"\n" -"\tchmod 0700 %s" - -#: builtin/credential-cache--daemon.c:275 -msgid "print debugging messages to stderr" -msgstr "imprimeix els missatges de depuració a stderr" - -#: builtin/credential-cache--daemon.c:315 -msgid "credential-cache--daemon unavailable; no unix socket support" -msgstr "" - #: builtin/column.c:10 msgid "git column []" msgstr "git column []" @@ -13006,49 +12924,47 @@ msgid "--command must be the first argument" msgstr "--command ha de ser el primer argument" #: builtin/commit-graph.c:13 builtin/commit-graph.c:22 -#, fuzzy msgid "" -"git commit-graph verify [--object-dir ] [--shallow] [--[no-]progress]" +"git commit-graph verify [--object-dir ] [--shallow] " +"[--[no-]progress]" msgstr "" -"git commit-graph verify [--object-dir ] [--shallow] [--[no-]progress]" +"git commit-graph verify [--object-dir ] [--shallow] " +"[--[no-]progress]" #: builtin/commit-graph.c:14 builtin/commit-graph.c:27 -#, fuzzy msgid "" -"git commit-graph write [--object-dir ] [--append] [--" -"split[=]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" -"paths] [--[no-]max-new-filters ] [--[no-]progress] " +"git commit-graph write [--object-dir ] [--append] " +"[--split[=]] [--reachable|--stdin-packs|--stdin-commits] " +"[--changed-paths] [--[no-]max-new-filters ] [--[no-]progress] " msgstr "" -"git commit-graph write [--object-dir ] [--append|--split] [---" -"reachable|--stdin-packs|---stdin-commits] [-no-]progress] " +"git commit-graph write [--object-dir ] [--append] " +"[--split[=]] [--reachable|--stdin-packs|--stdin-commits] " +"[--changed-paths] [--[no-]max-new-filters ] [--[no-]progress] " #: builtin/commit-graph.c:64 -#, fuzzy, c-format +#, c-format msgid "could not find object directory matching %s" -msgstr "" -"no s'ha pogut trobar el directori de l'objecte que coincideixi amb els " -"percentatges" +msgstr "no s'ha pogut trobar el directori de l'objecte que coincideixi amb %s" #: builtin/commit-graph.c:80 builtin/commit-graph.c:210 -#: builtin/commit-graph.c:316 builtin/fetch.c:184 builtin/log.c:1764 +#: builtin/commit-graph.c:316 builtin/fetch.c:184 builtin/log.c:1769 msgid "dir" msgstr "directori" #: builtin/commit-graph.c:81 builtin/commit-graph.c:211 #: builtin/commit-graph.c:317 -#, fuzzy msgid "The object directory to store the graph" -msgstr "El directori d'objectes per emmagatzemar el gràfic" +msgstr "El directori d'objectes per a emmagatzemar el gràfic" #: builtin/commit-graph.c:83 -#, fuzzy msgid "if the commit-graph is split, only verify the tip file" msgstr "" -"si el graf de comissions està dividit només verifica el fitxer de consell" +"si el graf de comissions està dividit només, verifica el fitxer de consell" #: builtin/commit-graph.c:106 -#, fuzzy, c-format +#, c-format msgid "Could not open commit-graph '%s'" msgstr "No s'ha pogut obrir el graf de comissions «%s»" @@ -13065,36 +12981,32 @@ msgstr "" "percentatges d'escombraries" #: builtin/commit-graph.c:160 -#, fuzzy, c-format +#, c-format msgid "invalid object: %s" msgstr "no és un objecte vàlid: %s" #: builtin/commit-graph.c:213 -#, fuzzy msgid "start walk at all refs" msgstr "comença a caminar en totes les referències" #: builtin/commit-graph.c:215 -#, fuzzy msgid "scan pack-indexes listed by stdin for commits" -msgstr "explora els índexs del paquet llistats per stdin" +msgstr "explora els índexs del paquet llistats per a stdin per a comissions" #: builtin/commit-graph.c:217 #, fuzzy msgid "start walk at commits listed by stdin" -msgstr "comença a caminar a les comissions llistades per l'entrada estàndard" +msgstr "comença a caminar a les comissions llistades per a stdin" #: builtin/commit-graph.c:219 -#, fuzzy msgid "include all commits already in the commit-graph file" -msgstr "inclou totes les publicacions ja al fitxer del graf de comissions" +msgstr "inclou ja totes les comissions al fitxer del graf de comissions" #: builtin/commit-graph.c:221 msgid "enable computation for changed paths" -msgstr "" +msgstr "habilita la computació per als camins canviats" #: builtin/commit-graph.c:224 -#, fuzzy msgid "allow writing an incremental commit-graph file" msgstr "permet escriure un fitxer de graf de comissions incrementals" @@ -13104,14 +13016,12 @@ msgid "maximum number of commits in a non-base split commit-graph" msgstr "nombre màxim de comissions en un graf de comissions no basat" #: builtin/commit-graph.c:230 -#, fuzzy msgid "maximum ratio between two levels of a split commit-graph" -msgstr "ràtio màxim entre dos nivells d'un graf de comissions dividit" +msgstr "ràtio màxima entre dos nivells d'un graf de comissions dividit" #: builtin/commit-graph.c:232 -#, fuzzy msgid "only expire files older than a given date-time" -msgstr "fes caducar els objectes més vells que " +msgstr "fes caducar els objectes més antics que l'hora i data donades" #: builtin/commit-graph.c:234 #, fuzzy @@ -13126,54 +13036,51 @@ msgstr "usa com a màxim un dels --reachable --stdin-commits o --stdin-packs" #: builtin/commit-graph.c:287 msgid "Collecting commits from input" -msgstr "" +msgstr "S'estan recollint les comissions de l'entrada" #: builtin/commit-tree.c:18 -#, fuzzy msgid "" "git commit-tree [(-p )...] [-S[]] [(-m )...] [(-F " ")...] " msgstr "" -"git commit-tree [(-p )] [-S[]] [(-m )] [(-F )] " -"" +"git commit-tree [(-p )...] [-S[]] [(-m )...] [(-F " +")...] " #: builtin/commit-tree.c:31 -#, fuzzy, c-format +#, c-format msgid "duplicate parent %s ignored" -msgstr "s'han ignorat els progenitors duplicats" +msgstr "s'han ignorat el pare %s duplicat" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:546 -#, fuzzy, c-format +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:555 +#, c-format msgid "not a valid object name %s" -msgstr "no és un nom d'objecte vàlid per cent" +msgstr "no és un nom d'objecte vàlid %s" #: builtin/commit-tree.c:93 -#, fuzzy, c-format +#, c-format msgid "git commit-tree: failed to open '%s'" -msgstr "git commit-tree ha fallat en obrir «%s»" +msgstr "git commit-tree: ha fallat en obrir «%s»" #: builtin/commit-tree.c:96 -#, fuzzy, c-format +#, c-format msgid "git commit-tree: failed to read '%s'" -msgstr "git commit-tree ha fallat en llegir '%s'" +msgstr "git commit-tree: ha fallat en llegir «%s»" #: builtin/commit-tree.c:98 -#, fuzzy, c-format +#, c-format msgid "git commit-tree: failed to close '%s'" -msgstr "git commit-tree ha fallat en tancar «%s»" +msgstr "git commit-tree: ha fallat en tancar «%s»" #: builtin/commit-tree.c:111 -#, fuzzy msgid "parent" msgstr "pare" #: builtin/commit-tree.c:112 -#, fuzzy msgid "id of a parent commit object" msgstr "id d'un objecte de comissió pare" -#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:272 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1471 +#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:281 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1470 #: builtin/tag.c:413 msgid "message" msgstr "missatge" @@ -13183,24 +13090,21 @@ msgid "commit message" msgstr "missatge de comissió" #: builtin/commit-tree.c:118 -#, fuzzy msgid "read commit log message from file" -msgstr "llegeix el missatge de registre de publicació des d'un fitxer" +msgstr "llegeix el missatge de registre de comissió des d'un fitxer" -#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:289 +#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:298 #: builtin/pull.c:176 builtin/revert.c:118 msgid "GPG sign commit" msgstr "signa la comissió amb GPG" #: builtin/commit-tree.c:133 -#, fuzzy msgid "must give exactly one tree" msgstr "ha de donar exactament un arbre" #: builtin/commit-tree.c:140 -#, fuzzy msgid "git commit-tree: failed to read" -msgstr "git commit-tree ha fallat en llegir" +msgstr "git commit-tree: ha fallat en llegir" #: builtin/commit.c:41 msgid "git commit [] [--] ..." @@ -13228,8 +13132,7 @@ msgid "" " git commit --allow-empty\n" "\n" msgstr "" -"El «cherry pick» previ està ara buit, possiblement a causa de resolució de " -"conflictes.\n" +"El «cherry pick» previ està ara buit, possiblement a causa de resolució de conflictes.\n" "Si el voleu cometre de totes maneres, useu:\n" "\n" " git commit --allow-empty\n" @@ -13257,8 +13160,8 @@ msgid "" "\n" msgstr "" "i després utilitzeu git cherry-pick --continue per tornar a seleccionar les " -"comissions restants. Si voleu ometre aquesta publicació utilitzeu git cherry-" -"pick --skip" +"comissions restants. Si voleu ometre aquesta publicació utilitzeu git " +"cherry-pick --skip" #: builtin/commit.c:312 msgid "failed to unpack HEAD tree object" @@ -13301,9 +13204,8 @@ 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:480 -#, fuzzy msgid "cannot do a partial commit during a rebase." -msgstr "no es pot fer una comissió parcial durant una fusió." +msgstr "no es pot fer una comissió parcial durant un «rebase»." #: builtin/commit.c:488 msgid "cannot read the index" @@ -13340,7 +13242,7 @@ msgstr "" msgid "could not lookup commit %s" msgstr "no s'ha pogut cercar la comissió %s" -#: builtin/commit.c:729 builtin/shortlog.c:478 +#: builtin/commit.c:729 builtin/shortlog.c:425 #, 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" @@ -13367,7 +13269,6 @@ msgid "could not write commit template" msgstr "no s'ha pogut escriure la plantilla de comissió" #: builtin/commit.c:853 -#, fuzzy msgid "" "\n" "It looks like you may be committing a merge.\n" @@ -13377,12 +13278,11 @@ msgid "" msgstr "" "\n" "Sembla que podeu estar cometent una fusió.\n" -"Si això no és correcte, elimineu el fitxer\n" -"\t%s\n" +"Si això no és correcte, executeu\n" +"\tgit update-ref -d MERGE_HEAD\n" "i intenteu-ho de nou.\n" #: builtin/commit.c:858 -#, fuzzy msgid "" "\n" "It looks like you may be committing a cherry-pick.\n" @@ -13392,8 +13292,8 @@ msgid "" msgstr "" "\n" "Sembla que podeu estar cometent un «cherry pick».\n" -"Si això no és correcte, elimineu el fitxer\n" -"\t%s\n" +"Si això no és correcte, executeu\n" +"\tgit update-ref -d CHERRY_PICK_HEAD\n" "i intenteu-ho de nou.\n" #: builtin/commit.c:868 @@ -13414,8 +13314,7 @@ msgid "" "An empty message aborts the commit.\n" msgstr "" "Introduïu el missatge de comissió dels vostres canvis.\n" -"Es mantindran les línies que comencin amb «%c»; podeu eliminar-les " -"vosaltres\n" +"Es mantindran les línies que comencin amb «%c»; podeu eliminar-les vosaltres\n" "mateixos si voleu. Un missatge buit avorta la comissió.\n" #: builtin/commit.c:893 @@ -13533,8 +13432,8 @@ msgstr "calcula els valors complets endavant/darrere" msgid "version" msgstr "versió" -#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:539 -#: builtin/worktree.c:722 +#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:560 +#: builtin/worktree.c:725 msgid "machine-readable output" msgstr "sortida llegible per màquina" @@ -13548,7 +13447,7 @@ msgstr "acaba les entrades amb NUL" #: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541 #: builtin/fast-export.c:1199 builtin/fast-export.c:1202 -#: builtin/fast-export.c:1205 builtin/rebase.c:1400 parse-options.h:336 +#: builtin/fast-export.c:1205 builtin/rebase.c:1406 parse-options.h:336 msgid "mode" msgstr "mode" @@ -13588,7 +13487,8 @@ msgstr "no detectis canvis de noms" #: builtin/commit.c:1395 msgid "detect renames, optionally set similarity index" -msgstr "detecta canvis de noms, i opcionalment estableix un índex de semblança" +msgstr "" +"detecta canvis de noms, i opcionalment estableix un índex de semblança" #: builtin/commit.c:1415 #, fuzzy @@ -13607,7 +13507,7 @@ msgstr "mostra la diferència en la plantilla de missatge de comissió" msgid "Commit message options" msgstr "Opcions de missatge de comissió" -#: builtin/commit.c:1501 builtin/merge.c:276 builtin/tag.c:415 +#: builtin/commit.c:1501 builtin/merge.c:285 builtin/tag.c:415 msgid "read message from file" msgstr "llegiu el missatge des d'un fitxer" @@ -13619,7 +13519,7 @@ msgstr "autor" msgid "override author for commit" msgstr "autor corregit de la comissió" -#: builtin/commit.c:1503 builtin/gc.c:539 +#: builtin/commit.c:1503 builtin/gc.c:542 msgid "date" msgstr "data" @@ -13656,9 +13556,10 @@ msgstr "" 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:1510 builtin/log.c:1741 builtin/merge.c:292 +#: builtin/commit.c:1510 builtin/log.c:1744 builtin/merge.c:301 #: builtin/pull.c:145 builtin/revert.c:110 -msgid "add Signed-off-by:" +#, fuzzy +msgid "add a Signed-off-by trailer" msgstr "afegeix Signed-off-by:" #: builtin/commit.c:1511 @@ -13753,230 +13654,233 @@ msgid "" "not exceeded, and then \"git restore --staged :/\" to recover." msgstr "" "s'ha actualitzat el repositori però no s'ha pogut escriure el fitxer " -"newindex. Comproveu que el disc no està ple i que la quota no s'ha excedit i " -"després «git restitueix --staged /» per recuperar-se." +"newindex. Comproveu que el disc no està ple i que la quota no s'ha excedit i" +" després «git restitueix --staged /» per recuperar-se." #: builtin/config.c:11 msgid "git config []" msgstr "git config []" -#: builtin/config.c:107 builtin/env--helper.c:27 +#: builtin/config.c:109 builtin/env--helper.c:27 #, c-format msgid "unrecognized --type argument, %s" msgstr "argument --type no reconegut, %s" -#: builtin/config.c:119 +#: builtin/config.c:121 msgid "only one type at a time" msgstr "només un tipus cada cop" -#: builtin/config.c:128 +#: builtin/config.c:130 msgid "Config file location" msgstr "Ubicació del fitxer de configuració" -#: builtin/config.c:129 +#: builtin/config.c:131 msgid "use global config file" msgstr "usa el fitxer de configuració global" -#: builtin/config.c:130 +#: builtin/config.c:132 msgid "use system config file" msgstr "usa el fitxer de configuració del sistema" -#: builtin/config.c:131 +#: builtin/config.c:133 msgid "use repository config file" msgstr "usa el fitxer de configuració del dipòsit" -#: builtin/config.c:132 +#: builtin/config.c:134 msgid "use per-worktree config file" msgstr "usa un fitxer de configuració per dipòsit" -#: builtin/config.c:133 +#: builtin/config.c:135 msgid "use given config file" msgstr "usa el fitxer de configuració donat" -#: builtin/config.c:134 +#: builtin/config.c:136 msgid "blob-id" msgstr "ID de blob" -#: builtin/config.c:134 +#: builtin/config.c:136 msgid "read config from given blob object" msgstr "llegeix la configuració de l'objecte de blob donat" -#: builtin/config.c:135 +#: builtin/config.c:137 msgid "Action" msgstr "Acció" -#: builtin/config.c:136 -msgid "get value: name [value-regex]" -msgstr "obtén valor: nom [regex-de-valors]" - -#: builtin/config.c:137 -msgid "get all values: key [value-regex]" -msgstr "obtén tots els valors: clau [regex-de-valors]" - #: builtin/config.c:138 -msgid "get values for regexp: name-regex [value-regex]" -msgstr "obtén valors de regexp: regex-de-noms [regex-de-valors]" +msgid "get value: name [value-pattern]" +msgstr "obtén valor: nom [value-pattern]" #: builtin/config.c:139 +msgid "get all values: key [value-pattern]" +msgstr "obtén tots els valors: clau [value-pattern]" + +#: builtin/config.c:140 +msgid "get values for regexp: name-regex [value-pattern]" +msgstr "obtén valors de regexp: name-regex [value-pattern]" + +#: builtin/config.c:141 msgid "get value specific for the URL: section[.var] URL" msgstr "obtén el valor específic per a l'URL: secció[.variable] URL" -#: builtin/config.c:140 -msgid "replace all matching variables: name value [value_regex]" -msgstr "" -"reemplaça totes les variables que coincideixen: nom valor [regex_de_valors]" +#: builtin/config.c:142 +msgid "replace all matching variables: name value [value-pattern]" +msgstr "reemplaça totes les variables que coincideixen: nom valor [value-pattern]" -#: builtin/config.c:141 +#: builtin/config.c:143 msgid "add a new variable: name value" msgstr "afegeix una variable nova: nom valor" -#: builtin/config.c:142 -msgid "remove a variable: name [value-regex]" -msgstr "elimina una variable: nom [regex-de-valors]" - -#: builtin/config.c:143 -msgid "remove all matches: name [value-regex]" -msgstr "elimina totes les coincidències: nom [regex-de-valors]" - #: builtin/config.c:144 +msgid "remove a variable: name [value-pattern]" +msgstr "elimina una variable: nom [value-pattern]" + +#: builtin/config.c:145 +msgid "remove all matches: name [value-pattern]" +msgstr "elimina totes les coincidències: nom [value-pattern]" + +#: builtin/config.c:146 msgid "rename section: old-name new-name" msgstr "canvia el nom de secció: nom-antic nom-nou" -#: builtin/config.c:145 +#: builtin/config.c:147 msgid "remove a section: name" msgstr "elimina una secció: nom" -#: builtin/config.c:146 +#: builtin/config.c:148 msgid "list all" msgstr "llista tots" -#: builtin/config.c:147 +#: builtin/config.c:149 +msgid "use string equality when comparing values to 'value-pattern'" +msgstr "usa la igualtat de les cadenes quan es comparen els valors amb «value-pattern»" + +#: builtin/config.c:150 msgid "open an editor" msgstr "obre un editor" -#: builtin/config.c:148 +#: builtin/config.c:151 msgid "find the color configured: slot [default]" msgstr "troba el color configurat: ranura [per defecte]" -#: builtin/config.c:149 +#: builtin/config.c:152 msgid "find the color setting: slot [stdout-is-tty]" msgstr "troba el paràmetre de color: ranura [stdout-és-tty]" -#: builtin/config.c:150 +#: builtin/config.c:153 msgid "Type" msgstr "Tipus" -#: builtin/config.c:151 builtin/env--helper.c:43 +#: builtin/config.c:154 builtin/env--helper.c:43 msgid "value is given this type" msgstr "el valor té donat aquest tipus" -#: builtin/config.c:152 +#: builtin/config.c:155 msgid "value is \"true\" or \"false\"" msgstr "el valor és «true» o «false»" -#: builtin/config.c:153 +#: builtin/config.c:156 msgid "value is decimal number" msgstr "el valor és un nombre decimal" -#: builtin/config.c:154 +#: builtin/config.c:157 msgid "value is --bool or --int" msgstr "el valor és --bool o --int" -#: builtin/config.c:155 -#, fuzzy +#: builtin/config.c:158 msgid "value is --bool or string" -msgstr "el valor és --bool o --int" +msgstr "el valor és --bool o string" -#: builtin/config.c:156 +#: builtin/config.c:159 msgid "value is a path (file or directory name)" msgstr "el valor és un camí (nom de fitxer o directori)" -#: builtin/config.c:157 +#: builtin/config.c:160 msgid "value is an expiry date" msgstr "el valor és una data de venciment" -#: builtin/config.c:158 +#: builtin/config.c:161 msgid "Other" msgstr "Altre" -#: builtin/config.c:159 +#: builtin/config.c:162 msgid "terminate values with NUL byte" msgstr "acaba els valors amb un octet NUL" -#: builtin/config.c:160 +#: builtin/config.c:163 msgid "show variable names only" msgstr "mostra només els noms de variable" -#: builtin/config.c:161 +#: builtin/config.c:164 msgid "respect include directives on lookup" msgstr "respecta les directives d'inclusió en cercar" -#: builtin/config.c:162 +#: builtin/config.c:165 msgid "show origin of config (file, standard input, blob, command line)" msgstr "" "mostra l'origen de la configuració (fitxer, entrada estàndard, blob, línia " "d'ordres)" -#: builtin/config.c:163 +#: builtin/config.c:166 #, fuzzy msgid "show scope of config (worktree, local, global, system, command)" msgstr "" "mostra l'abast de la configuració (arbre de treball ordre local global del " "sistema)" -#: builtin/config.c:164 builtin/env--helper.c:45 +#: builtin/config.c:167 builtin/env--helper.c:45 msgid "value" msgstr "valor" -#: builtin/config.c:164 +#: builtin/config.c:167 #, fuzzy msgid "with --get, use default value when missing entry" msgstr "amb --get utilitza el valor per defecte quan falta una entrada" -#: builtin/config.c:178 +#: builtin/config.c:181 #, fuzzy, c-format msgid "wrong number of arguments, should be %d" msgstr "el nombre d'arguments és erroni" -#: builtin/config.c:180 +#: builtin/config.c:183 #, fuzzy, c-format msgid "wrong number of arguments, should be from %d to %d" msgstr "el nombre d'arguments hauria de passar d'un percentatge a un altre." -#: builtin/config.c:334 +#: builtin/config.c:339 #, c-format msgid "invalid key pattern: %s" msgstr "patró de la clau no vàlid: %s" -#: builtin/config.c:370 +#: builtin/config.c:377 #, c-format msgid "failed to format default config value: %s" msgstr "" -"s'ha produït un error en formatar el valor per defecte de la configuració: %s" +"s'ha produït un error en formatar el valor per defecte de la configuració: " +"%s" -#: builtin/config.c:434 +#: builtin/config.c:441 #, c-format msgid "cannot parse color '%s'" msgstr "no es pot analitzar el color «%s»" -#: builtin/config.c:476 +#: builtin/config.c:483 msgid "unable to parse default color value" msgstr "no s'ha pogut analitzar el valor de color per defecte" -#: builtin/config.c:529 builtin/config.c:789 +#: builtin/config.c:536 builtin/config.c:833 msgid "not in a git directory" msgstr "no és en un directori git" -#: builtin/config.c:532 +#: builtin/config.c:539 msgid "writing to stdin is not supported" msgstr "no s'admet escriure a stdin" -#: builtin/config.c:535 +#: builtin/config.c:542 #, fuzzy msgid "writing config blobs is not supported" msgstr "no es poden escriure els blobs de configuració" -#: builtin/config.c:620 +#: builtin/config.c:627 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -13991,28 +13895,28 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:644 +#: builtin/config.c:652 msgid "only one config file at a time" msgstr "només un fitxer de configuració cada cop" -#: builtin/config.c:650 +#: builtin/config.c:658 msgid "--local can only be used inside a git repository" msgstr "--local només es pot usar dins d'un dipòsit git" -#: builtin/config.c:652 +#: builtin/config.c:660 msgid "--blob can only be used inside a git repository" msgstr "--blob només es pot usar dins d'un dipòsit git" -#: builtin/config.c:654 +#: builtin/config.c:662 #, fuzzy msgid "--worktree can only be used inside a git repository" msgstr "--blob només es pot usar dins d'un dipòsit git" -#: builtin/config.c:676 +#: builtin/config.c:684 msgid "$HOME not set" msgstr "$HOME no està establerta" -#: builtin/config.c:700 +#: builtin/config.c:708 #, fuzzy msgid "" "--worktree cannot be used with multiple working trees unless the config\n" @@ -14023,52 +13927,57 @@ msgstr "" "l'extensió de configuració worktreeConfig estigui habilitada. Llegiu la " "secció «CONFIGURATION FITXER» a «git help worktree» per als detalls" -#: builtin/config.c:735 +#: builtin/config.c:743 msgid "--get-color and variable type are incoherent" msgstr "--get-color i el tipus de variable són incoherents" -#: builtin/config.c:740 +#: builtin/config.c:748 msgid "only one action at a time" msgstr "només una acció cada cop" -#: builtin/config.c:753 +#: builtin/config.c:761 msgid "--name-only is only applicable to --list or --get-regexp" msgstr "--name-only només és aplicable a --list o --get-regexp" -#: builtin/config.c:759 +#: builtin/config.c:767 msgid "" -"--show-origin is only applicable to --get, --get-all, --get-regexp, and --" -"list" +"--show-origin is only applicable to --get, --get-all, --get-regexp, and " +"--list" msgstr "" "--show-origin només és aplicable a --get, --get-all, --get-regexp, i --list" -#: builtin/config.c:765 +#: builtin/config.c:773 msgid "--default is only applicable to --get" msgstr "--default només és aplicable a --get" -#: builtin/config.c:778 +#: builtin/config.c:806 +#, fuzzy +msgid "--fixed-value only applies with 'value-pattern'" +msgstr "--fixed-value només s'aplica amb 'value-pattern'" + +#: builtin/config.c:822 #, c-format msgid "unable to read config file '%s'" msgstr "no s'ha pogut llegir el fitxer de configuració «%s»" -#: builtin/config.c:781 +#: builtin/config.c:825 msgid "error processing config file(s)" msgstr "s'ha produït un error en processar els fitxers de configuració" -#: builtin/config.c:791 +#: builtin/config.c:835 msgid "editing stdin is not supported" msgstr "no hi ha compatibilitat per a l'edició a stdin" -#: builtin/config.c:793 +#: builtin/config.c:837 msgid "editing blobs is not supported" msgstr "no hi ha compatibilitat per l'edició de blobs" -#: builtin/config.c:807 +#: builtin/config.c:851 #, c-format msgid "cannot create configuration file %s" msgstr "no es pot crear el fitxer de configuració %s" -#: builtin/config.c:820 +#: builtin/config.c:864 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -14077,7 +13986,7 @@ msgstr "" "no es poden sobreescriure múltiples valors amb un sol valor\n" " Useu una expressió regular, --add o --replace-all per a canviar %s." -#: builtin/config.c:894 builtin/config.c:905 +#: builtin/config.c:943 builtin/config.c:954 #, c-format msgid "no such section: %s" msgstr "no existeix la secció: %s" @@ -14090,6 +13999,41 @@ 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/credential-cache--daemon.c:226 +#, c-format +msgid "" +"The permissions on your socket directory are too loose; other\n" +"users may be able to read your cached credentials. Consider running:\n" +"\n" +"\tchmod 0700 %s" +msgstr "" +"Els permisos en el vostre directori de sòcol són massa liberals;\n" +"pot ser que altres usuaris poden llegir les vostres credencials.\n" +"Considereu executar:\n" +"\n" +"\tchmod 0700 %s" + +#: builtin/credential-cache--daemon.c:275 +msgid "print debugging messages to stderr" +msgstr "imprimeix els missatges de depuració a stderr" + +#: builtin/credential-cache--daemon.c:315 +#, fuzzy +msgid "credential-cache--daemon unavailable; no unix socket support" +msgstr "" +"credencial-cache-daemon no disponible; no hi ha compatibilitat amb sòcols " +"unix" + +#: builtin/credential-cache.c:154 +msgid "credential-cache unavailable; no unix socket support" +msgstr "" +"credencial-cache no disponible; no hi ha compatibilitat amb els sòcols d'unix" + +#: builtin/credential-store.c:66 +#, fuzzy, c-format +msgid "unable to get credential storage lock in %d ms" +msgstr "no s'ha pogut obtenir el directori de treball actual" + #: builtin/describe.c:26 msgid "git describe [] [...]" msgstr "git describe [] [...]" @@ -14116,9 +14060,9 @@ msgid "annotated tag %s not available" msgstr "l'etiqueta anotada %s no és disponible" #: builtin/describe.c:281 -#, fuzzy, c-format +#, c-format msgid "tag '%s' is externally known as '%s'" -msgstr "l'etiqueta «%s» realment és «%s» aquí" +msgstr "l'etiqueta «%s» es coneix externament com a «%s»" #: builtin/describe.c:328 #, c-format @@ -14126,11 +14070,11 @@ msgid "no tag exactly matches '%s'" msgstr "cap etiqueta coincideix exactament amb «%s»" #: builtin/describe.c:330 -#, fuzzy, c-format +#, c-format msgid "No exact match on refs or tags, searching to describe\n" msgstr "" -"No hi ha cap coincidència exacta en la cerca de referències o etiquetes per " -"descriure" +"No hi ha cap coincidència exacta en la cerca de referències o etiquetes per a " +"descriure\n" #: builtin/describe.c:397 #, c-format @@ -14256,44 +14200,54 @@ msgstr "--dirty és incompatible amb les comissions" msgid "--broken is incompatible with commit-ishes" msgstr "--broken és incompatible amb les comissions" +#: builtin/diff-tree.c:155 +#, fuzzy +msgid "--stdin and --merge-base are mutually exclusive" +msgstr "-p i --overlay són mútuament excloents" + +#: builtin/diff-tree.c:157 +#, fuzzy +msgid "--merge-base only works with two commits" +msgstr "--merge-base només funciona amb dues comissions" + #: builtin/diff.c:91 #, c-format msgid "'%s': not a regular file or symlink" msgstr "«%s»: no és ni fitxer regular ni enllaç simbòlic" -#: builtin/diff.c:241 +#: builtin/diff.c:258 #, c-format msgid "invalid option: %s" msgstr "opció no vàlida: %s" -#: builtin/diff.c:358 -#, fuzzy, c-format +#: builtin/diff.c:375 +#, c-format msgid "%s...%s: no merge base" -msgstr "'%s' necessita exactament una base de fusió" +msgstr "%s...%s: sense una base de fusió" -#: builtin/diff.c:468 +#: builtin/diff.c:485 msgid "Not a git repository" msgstr "No és un dipòsit de git" -#: builtin/diff.c:513 +#: builtin/diff.c:530 builtin/grep.c:681 #, c-format msgid "invalid object '%s' given." msgstr "s'ha donat un objecte no vàlid «%s»." -#: builtin/diff.c:524 +#: builtin/diff.c:541 #, c-format msgid "more than two blobs given: '%s'" msgstr "s'ha donat més de dos blobs: «%s»" -#: builtin/diff.c:529 +#: builtin/diff.c:546 #, c-format msgid "unhandled object '%s' given." msgstr "s'ha donat l'objecte no gestionat «%s»." -#: builtin/diff.c:563 +#: builtin/diff.c:580 #, c-format msgid "%s...%s: multiple merge bases, using %s" -msgstr "" +msgstr "%s...%s: múltiples bases de fusió, utilitzant %s" #: builtin/difftool.c:30 msgid "git difftool [] [ []] [--] [...]" @@ -14319,7 +14273,7 @@ msgstr "no s'ha pogut llegir el fitxer d'enllaç simbòlic %s" 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:413 +#: builtin/difftool.c:412 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -14327,86 +14281,86 @@ msgstr "" "els formats de diff combinats («-c» i «--cc») no s'admeten\n" "en el mode diff per directoris («-d» i «--dir-diff»)." -#: builtin/difftool.c:634 +#: builtin/difftool.c:633 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "s'han modificat ambdós fitxers: «%s» i «%s»." -#: builtin/difftool.c:636 +#: builtin/difftool.c:635 msgid "working tree file has been left." msgstr "s'ha deixat un fitxer de l'arbre de treball." -#: builtin/difftool.c:647 +#: builtin/difftool.c:646 #, c-format msgid "temporary files exist in '%s'." msgstr "existeix un fitxer temporal a «%s»." -#: builtin/difftool.c:648 +#: builtin/difftool.c:647 msgid "you may want to cleanup or recover these." msgstr "podeu netejar o recuperar-los." -#: builtin/difftool.c:697 +#: builtin/difftool.c:696 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "usa «diff.guitool» en lloc de «diff.tool»" -#: builtin/difftool.c:699 +#: builtin/difftool.c:698 msgid "perform a full-directory diff" msgstr "fes un diff de tot el directori" -#: builtin/difftool.c:701 +#: builtin/difftool.c:700 msgid "do not prompt before launching a diff tool" msgstr "no preguntis abans d'executar l'eina diff" -#: builtin/difftool.c:706 +#: builtin/difftool.c:705 msgid "use symlinks in dir-diff mode" msgstr "utilitza enllaços simbòlics en mode dir-diff" -#: builtin/difftool.c:707 +#: builtin/difftool.c:706 msgid "tool" msgstr "eina" -#: builtin/difftool.c:708 +#: builtin/difftool.c:707 msgid "use the specified diff tool" msgstr "utilitza l'eina de diff especificada" -#: builtin/difftool.c:710 +#: builtin/difftool.c:709 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:713 +#: builtin/difftool.c:712 msgid "" -"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " -"code" +"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit" +" code" msgstr "" "fes que «git-difftool» surti quan l'eina de diff invocada torna un codi de " "sortida diferent de zero" -#: builtin/difftool.c:716 +#: builtin/difftool.c:715 msgid "specify a custom command for viewing diffs" msgstr "especifiqueu una ordre personalitzada per veure diffs" -#: builtin/difftool.c:717 +#: builtin/difftool.c:716 msgid "passed to `diff`" msgstr "passa-ho a «diff»" -#: builtin/difftool.c:732 +#: builtin/difftool.c:731 msgid "difftool requires worktree or --no-index" msgstr "difftool requereix worktree o --no-index" -#: builtin/difftool.c:739 +#: builtin/difftool.c:738 msgid "--dir-diff is incompatible with --no-index" msgstr "--dir-diff és incompatible amb --no-index" -#: builtin/difftool.c:742 +#: builtin/difftool.c:741 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "--gui, --tool and --extcmd són mútuament excloents" -#: builtin/difftool.c:750 +#: builtin/difftool.c:749 msgid "no given for --tool=" msgstr "no s'ha proporcionat l' per a --tool=" -#: builtin/difftool.c:757 +#: builtin/difftool.c:756 msgid "no given for --extcmd=" msgstr "no s'ha proporcionat l' per a --extcmd=" @@ -14430,14 +14384,15 @@ msgstr "silenciós només utilitza el valor gitenv*() com a codi de sortida" #: builtin/env--helper.c:67 #, fuzzy, c-format -msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" +msgid "" +"option `--default' expects a boolean value with `--type=bool`, not `%s`" msgstr "`--default' espera un valor booleà amb `-type=bool` no `%s`" #: builtin/env--helper.c:82 #, fuzzy, c-format msgid "" -"option `--default' expects an unsigned long value with `--type=ulong`, not `" -"%s`" +"option `--default' expects an unsigned long value with `--type=ulong`, not " +"`%s`" msgstr "" "`--default' espera un valor llarg sense signe amb `-type=ulong` no `%s`" @@ -14449,12 +14404,13 @@ msgstr "git fast-export [opcions-de-llista-de-revisions]" #, fuzzy msgid "Error: Cannot export nested tags unless --mark-tags is specified." msgstr "" -"Error no es poden exportar les etiquetes niades a menys que s'especifiqui --" -"mark-tags." +"Error no es poden exportar les etiquetes niades a menys que s'especifiqui " +"--mark-tags." #: builtin/fast-export.c:1178 +#, fuzzy msgid "--anonymize-map token cannot be empty" -msgstr "" +msgstr "--anonymize-map token no pot estar buit" #: builtin/fast-export.c:1198 msgid "show progress after objects" @@ -14484,7 +14440,6 @@ msgid "Import marks from this file" msgstr "Importa les marques d'aquest fitxer" #: builtin/fast-export.c:1215 -#, fuzzy msgid "Import marks from this file if it exists" msgstr "Importa marques d'aquest fitxer si existeix" @@ -14504,7 +14459,7 @@ msgstr "Usa la característica done per a acabar el corrent" msgid "Skip output of blob data" msgstr "Omet l'emissió de dades de blob" -#: builtin/fast-export.c:1223 builtin/log.c:1811 +#: builtin/fast-export.c:1223 builtin/log.c:1816 msgid "refspec" msgstr "especificació de referència" @@ -14517,12 +14472,13 @@ msgid "anonymize output" msgstr "anonimitza la sortida" #: builtin/fast-export.c:1226 +#, fuzzy msgid "from:to" -msgstr "" +msgstr "des de" #: builtin/fast-export.c:1227 msgid "convert to in anonymized output" -msgstr "" +msgstr "converteix a en una sortida anònima" #: builtin/fast-export.c:1230 #, fuzzy @@ -14539,7 +14495,7 @@ msgstr "Mostra els ID dels objectes originals dels blobs/commits" #: builtin/fast-export.c:1234 #, fuzzy msgid "Label tags with mark ids" -msgstr "Etiquetes amb identificadors de marca" +msgstr "Etiquetes amb els identificadors de marca" #: builtin/fast-export.c:1257 #, fuzzy @@ -14551,31 +14507,34 @@ msgstr "--trailer amb --only-input no té sentit" msgid "Cannot pass both --import-marks and --import-marks-if-exists" msgstr "No es poden passar tant --import-marks com --import-marks-if-exists" -#: builtin/fast-import.c:3086 +#: builtin/fast-import.c:3088 #, fuzzy, c-format msgid "Missing from marks for submodule '%s'" msgstr "Subjecting submodule '%s'" -#: builtin/fast-import.c:3088 +#: builtin/fast-import.c:3090 #, fuzzy, c-format msgid "Missing to marks for submodule '%s'" msgstr "s'ha produït un error en actualitzar el remot pel submòdul «%s»" -#: builtin/fast-import.c:3223 +#: builtin/fast-import.c:3225 #, c-format msgid "Expected 'mark' command, got %s" msgstr "S'esperava l'ordre «mark», s'ha rebut %s" -#: builtin/fast-import.c:3228 +#: builtin/fast-import.c:3230 #, c-format msgid "Expected 'to' command, got %s" msgstr "S'esperava l'ordre «to», s'ha rebut «%s»" -#: builtin/fast-import.c:3320 +#: builtin/fast-import.c:3322 +#, fuzzy msgid "Expected format name:filename for submodule rewrite option" msgstr "" +"S'esperava un nom de fitxer de format per a l'opció de reescriptura de " +"submòdul" -#: builtin/fast-import.c:3374 +#: builtin/fast-import.c:3377 #, fuzzy, c-format msgid "feature '%s' forbidden in input without --allow-unsafe-features" msgstr "" @@ -14697,8 +14656,8 @@ msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" msgstr "" -"per defecte per a l'obtenció recursiva de submòduls (prioritat més baixa que " -"els fitxers de configuració)" +"per defecte per a l'obtenció recursiva de submòduls (prioritat més baixa que" +" els fitxers de configuració)" #: builtin/fetch.c:192 builtin/pull.c:224 msgid "accept refs that update .git/shallow" @@ -14725,7 +14684,8 @@ msgstr "executa «gc --auto» després d'obtenir" #: builtin/fetch.c:208 builtin/pull.c:243 msgid "check for forced-updates on all updated branches" msgstr "" -"comprova si hi ha actualitzacions forçades a totes les branques actualitzades" +"comprova si hi ha actualitzacions forçades a totes les branques " +"actualitzades" #: builtin/fetch.c:210 msgid "write the commit-graph after fetching" @@ -14805,20 +14765,19 @@ msgid "" msgstr "" "L'obtenció normalment indica quines branques tenien una actualització " "forçada però aquesta comprovació s'ha desactivat. Per tornar a habilitar " -"utilitzeu l'indicador «--show-forced-updates» o executeu «git config fetch." -"showForcedUpdates true»." +"utilitzeu l'indicador «--show-forced-updates» o executeu «git config " +"fetch.showForcedUpdates true»." #: builtin/fetch.c:905 #, fuzzy, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" -"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates " -"false'\n" +"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates false'\n" " to avoid this check.\n" msgstr "" "S'ha trigat segons de 9% a comprovar les actualitzacions forçoses. Podeu " -"utilitzar «--no-show-forced-updates» o executar «git config fetch." -"showForcedUpdates false» per evitar aquesta comprovació." +"utilitzar «--no-show-forced-updates» o executar «git config " +"fetch.showForcedUpdates false» per evitar aquesta comprovació." #: builtin/fetch.c:939 #, c-format @@ -14860,7 +14819,7 @@ msgstr " (%s s'ha tornat penjant)" msgid "[deleted]" msgstr "[suprimit]" -#: builtin/fetch.c:1195 builtin/remote.c:1113 +#: builtin/fetch.c:1195 builtin/remote.c:1118 msgid "(none)" msgstr "(cap)" @@ -14966,11 +14925,11 @@ msgstr "Obtenir un grup i especificar referències no té sentit" #: builtin/fetch.c:1887 msgid "" -"--filter can only be used with the remote configured in extensions." -"partialclone" +"--filter can only be used with the remote configured in " +"extensions.partialclone" msgstr "" -"--filter només es pot utilitzar amb el remot configurat en extensions." -"partialclone" +"--filter només es pot utilitzar amb el remot configurat en " +"extensions.partialclone" #: builtin/fetch.c:1891 #, fuzzy @@ -15066,6 +15025,23 @@ 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/for-each-repo.c:9 +msgid "git for-each-repo --config= " +msgstr "git for-each-repo --config= " + +#: builtin/for-each-repo.c:37 +msgid "config" +msgstr "config" + +#: builtin/for-each-repo.c:38 +#, fuzzy +msgid "config key storing a list of repository paths" +msgstr "clau de configuració emmagatzemant una llista de camins de repositori" + +#: builtin/for-each-repo.c:46 +msgid "missing --config=" +msgstr "falta --config=" + #: builtin/fsck.c:69 builtin/fsck.c:148 builtin/fsck.c:149 msgid "unknown" msgstr "desconegut" @@ -15209,7 +15185,7 @@ msgstr "S'estan comprovant els directoris d'objecte" msgid "Checking %s link" msgstr "S'està comprovant l'enllaç %s" -#: builtin/fsck.c:696 builtin/index-pack.c:871 +#: builtin/fsck.c:696 builtin/index-pack.c:865 #, c-format msgid "invalid %s" msgstr "%s no vàlid" @@ -15269,7 +15245,8 @@ msgstr "fes els objectes d'índex nodes de cap" #: builtin/fsck.c:781 msgid "make reflogs head nodes (default)" -msgstr "fes que els registres de referències siguin nodes de cap (per defecte)" +msgstr "" +"fes que els registres de referències siguin nodes de cap (per defecte)" #: builtin/fsck.c:782 msgid "also consider packs and alternate objects" @@ -15295,7 +15272,7 @@ msgstr "mostra el progrés" msgid "show verbose names for reachable objects" msgstr "mostra els noms detallats dels objectes abastables" -#: builtin/fsck.c:847 builtin/index-pack.c:267 +#: builtin/fsck.c:847 builtin/index-pack.c:261 msgid "Checking objects" msgstr "S'estan comprovant els objectes" @@ -15309,31 +15286,31 @@ msgstr "%s: falta l'objecte" msgid "invalid parameter: expected sha1, got '%s'" msgstr "paràmetre no vàlid: s'esperava sha1, s'ha obtingut «%s»" -#: builtin/gc.c:36 +#: builtin/gc.c:39 msgid "git gc []" msgstr "git gc []" -#: builtin/gc.c:91 +#: builtin/gc.c:94 #, c-format msgid "Failed to fstat %s: %s" msgstr "S'ha produït un error en fer fstat %s: %s" -#: builtin/gc.c:127 +#: builtin/gc.c:130 #, c-format msgid "failed to parse '%s' value '%s'" msgstr "no s'ha pogut analitzar «%s» valor «%s»" -#: builtin/gc.c:476 builtin/init-db.c:58 +#: builtin/gc.c:479 builtin/init-db.c:58 #, 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:530 +#: builtin/gc.c:488 builtin/notes.c:240 builtin/tag.c:530 #, c-format msgid "cannot read '%s'" msgstr "no es pot llegir «%s»" -#: builtin/gc.c:492 +#: builtin/gc.c:495 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -15348,121 +15325,222 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:540 +#: builtin/gc.c:543 msgid "prune unreferenced objects" msgstr "poda objectes sense referència" -#: builtin/gc.c:542 +#: builtin/gc.c:545 msgid "be more thorough (increased runtime)" msgstr "sigues més exhaustiu (el temps d'execució augmenta)" -#: builtin/gc.c:543 +#: builtin/gc.c:546 msgid "enable auto-gc mode" msgstr "habilita el mode de recollida d'escombraries automàtica" -#: builtin/gc.c:546 -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 +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:552 #, fuzzy msgid "repack all other packs except the largest pack" msgstr "reempaqueta tots els altres paquets excepte el paquet més gran" -#: builtin/gc.c:566 +#: builtin/gc.c:569 #, fuzzy, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "no s'ha pogut analitzar el valor de gc.logexpiry dels percentatges" -#: builtin/gc.c:577 +#: builtin/gc.c:580 #, fuzzy, c-format msgid "failed to parse prune expiry value %s" msgstr "no s'ha pogut analitzar el valor de venciment de la poda per cent" -#: builtin/gc.c:597 +#: builtin/gc.c:600 #, 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:602 #, 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:603 #, 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:643 #, 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)" +"gc ja s'està executant en la màquina «%s» pid % (useu --force si " +"no)" -#: builtin/gc.c:695 +#: builtin/gc.c:698 msgid "" -"There are too many unreachable loose objects; run 'git prune' to remove them." +"There are too many unreachable loose objects; run 'git prune' to remove " +"them." msgstr "" -"Hi ha massa objectes solts inabastables; executeu «git prune» per a eliminar-" -"los." +"Hi ha massa objectes solts inabastables; executeu «git prune» per a " +"eliminar-los." -#: builtin/gc.c:705 -msgid "git maintenance run [--auto] [--[no-]quiet] [--task=]" -msgstr "" +#: builtin/gc.c:708 +msgid "" +"git maintenance run [--auto] [--[no-]quiet] [--task=] [--schedule]" +msgstr +"git maintenance run [--auto] [--[no-]quiet] [--task=] [--schedule]" -#: builtin/gc.c:812 +#: builtin/gc.c:738 +msgid "--no-schedule is not allowed" +msgstr "--no-schedule no està permès" + +#: builtin/gc.c:743 +#, c-format +msgid "unrecognized --schedule argument '%s'" +msgstr "argument --schedule no reconegut, «%s»" + +#: builtin/gc.c:862 #, fuzzy msgid "failed to write commit-graph" msgstr "s'ha produït un error en escriure l'objecte de comissió" -#: builtin/gc.c:905 -#, c-format -msgid "lock file '%s' exists, skipping maintenance" +#: builtin/gc.c:901 +msgid "failed to fill remotes" +msgstr "s'ha produït un error en omplir els remots" + +#: builtin/gc.c:1024 +#, fuzzy +msgid "failed to start 'git pack-objects' process" +msgstr "no s'ha pogut iniciar el pack-objects" + +#: builtin/gc.c:1041 +#, fuzzy +msgid "failed to finish 'git pack-objects' process" +msgstr "no s'ha pogut finalitzar el pack-objects" + +#: builtin/gc.c:1093 +#, fuzzy +msgid "failed to write multi-pack-index" +msgstr "no s'han pogut netejar els percentatges multi-paquet" + +#: builtin/gc.c:1111 +#, fuzzy +msgid "'git multi-pack-index expire' failed" +msgstr "l'índex múltiple és massa petit" + +#: builtin/gc.c:1172 +#, fuzzy +msgid "'git multi-pack-index repack' failed" +msgstr "no s'ha pogut carregar l'índex del paquet per al fitxer de paquet %s" + +#: builtin/gc.c:1181 +#, fuzzy +msgid "" +"skipping incremental-repack task because core.multiPackIndex is disabled" msgstr "" +"s'està ometent la tasca de reempaquetar incremental perquè " +"core.multiPackIndex està desactivat" -#: builtin/gc.c:932 +#: builtin/gc.c:1279 #, fuzzy, c-format -msgid "task '%s' failed" -msgstr "s'ha produït un error en escriure «%s»" +msgid "lock file '%s' exists, skipping maintenance" +msgstr "el fitxer de bloqueig «%s» existeix s'omet el manteniment" -#: builtin/gc.c:979 +#: builtin/gc.c:1309 +#, c-format +msgid "task '%s' failed" +msgstr "la tasca «%s» ha fallat" + +#: builtin/gc.c:1389 #, fuzzy, c-format msgid "'%s' is not a valid task" msgstr "«%s» no és un terme vàlid" -#: builtin/gc.c:984 +#: builtin/gc.c:1394 #, fuzzy, c-format msgid "task '%s' cannot be selected multiple times" msgstr "«%s» no es pot usar amb %s" -#: builtin/gc.c:999 +#: builtin/gc.c:1409 +#, fuzzy msgid "run tasks based on the state of the repository" -msgstr "" +msgstr "executa les tasques basades en l'estat del dipòsit" -#: builtin/gc.c:1001 +#: builtin/gc.c:1410 +msgid "frequency" +msgstr "freqüència" + +#: builtin/gc.c:1411 +msgid "run tasks based on frequency" +msgstr "executa les tasques basant-se en freqüència" + +#: builtin/gc.c:1414 +#, fuzzy msgid "do not report progress or other information over stderr" -msgstr "" +msgstr "no informeu sobre el progrés o altra informació sobre stderr" -#: builtin/gc.c:1002 +#: builtin/gc.c:1415 msgid "task" -msgstr "" +msgstr "tasca" -#: builtin/gc.c:1003 -#, fuzzy +#: builtin/gc.c:1416 msgid "run a specific task" -msgstr "cap camí especificat" +msgstr "executa una tasca específica" -#: builtin/gc.c:1026 +#: builtin/gc.c:1433 #, fuzzy -msgid "git maintenance run []" -msgstr "git notes prune []" +msgid "use at most one of --auto and --schedule=" +msgstr "usa com a màxim un de --auto i --schedule=" -#: builtin/gc.c:1037 +#: builtin/gc.c:1467 +#, fuzzy +msgid "failed to run 'git config'" +msgstr "no s'ha pogut executar «git status» a «%s»" + +#: builtin/gc.c:1512 +#, fuzzy +msgid "another process is scheduling background maintenance" +msgstr "un altre procés és planificar el manteniment en segon pla" + +#: builtin/gc.c:1525 +#, fuzzy +msgid "failed to run 'crontab -l'; your system might not support 'cron'" +msgstr "" +"no s'ha pogut executar «crontab -l»; el vostre sistema podria no admetre " +"«cron»" + +#: builtin/gc.c:1544 +#, fuzzy +msgid "failed to run 'crontab'; your system might not support 'cron'" +msgstr "" +"no s'ha pogut executar «crontab»; el vostre sistema podria no admetre «cron»" + +#: builtin/gc.c:1550 +#, fuzzy +msgid "failed to open stdin of 'crontab'" +msgstr "s'ha produït un error en obrir «%s»" + +#: builtin/gc.c:1592 +msgid "'crontab' died" +msgstr "«crontab» ha mort" + +#: builtin/gc.c:1605 +#, fuzzy +msgid "failed to add repo to global config" +msgstr "no s'ha pogut afegir el fitxer de paquet «%s»" + +#: builtin/gc.c:1615 +msgid "git maintenance []" +msgstr "git maintenance []" + +#: builtin/gc.c:1634 #, fuzzy, c-format msgid "invalid subcommand: %s" msgstr "comissió no vàlida %s" @@ -15484,8 +15562,7 @@ msgstr "s'ha especificat un nombre de fils no vàlid (%d) per a %s" #. TRANSLATORS: %s is the configuration #. variable for tweaking threads, currently #. grep.threads -#. -#: builtin/grep.c:287 builtin/index-pack.c:1581 builtin/index-pack.c:1771 +#: builtin/grep.c:287 builtin/index-pack.c:1576 builtin/index-pack.c:1766 #: builtin/pack-objects.c:2936 #, c-format msgid "no threads support, ignoring %s" @@ -15501,247 +15578,248 @@ msgstr "no s'ha pogut llegir l'arbre (%s)" 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:725 +#: builtin/grep.c:736 #, c-format msgid "switch `%c' expects a numerical value" msgstr "l'opció «%c» espera un valor numèric" -#: builtin/grep.c:824 +#: builtin/grep.c:835 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:826 +#: builtin/grep.c:837 msgid "find in contents not managed by git" msgstr "cerca en continguts no gestionats per git" -#: builtin/grep.c:828 +#: builtin/grep.c:839 msgid "search in both tracked and untracked files" msgstr "cerca tant en fitxers seguits com en no seguits" -#: builtin/grep.c:830 +#: builtin/grep.c:841 msgid "ignore files specified via '.gitignore'" msgstr "ignora els fitxers especificats mitjançant «.gitignore»" -#: builtin/grep.c:832 +#: builtin/grep.c:843 msgid "recursively search in each submodule" msgstr "cerca recursivament a cada submòdul" -#: builtin/grep.c:835 +#: builtin/grep.c:846 msgid "show non-matching lines" msgstr "mostra les línies no coincidents" -#: builtin/grep.c:837 +#: builtin/grep.c:848 msgid "case insensitive matching" msgstr "coincidència insensible a majúscula i minúscula" -#: builtin/grep.c:839 +#: builtin/grep.c:850 msgid "match patterns only at word boundaries" msgstr "coincideix amb els patrons només als límits de paraula" -#: builtin/grep.c:841 +#: builtin/grep.c:852 msgid "process binary files as text" msgstr "processa els fitxers binaris com a text" -#: builtin/grep.c:843 +#: builtin/grep.c:854 msgid "don't match patterns in binary files" msgstr "no coincideixis amb els patrons en els fitxers binaris" -#: builtin/grep.c:846 +#: builtin/grep.c:857 msgid "process binary files with textconv filters" msgstr "processa els fitxers binaris amb filtres de textconv" -#: builtin/grep.c:848 +#: builtin/grep.c:859 msgid "search in subdirectories (default)" msgstr "cerca als subdirectoris (per defecte)" -#: builtin/grep.c:850 +#: builtin/grep.c:861 msgid "descend at most levels" msgstr "descendeix com a màxim nivells" -#: builtin/grep.c:854 +#: builtin/grep.c:865 msgid "use extended POSIX regular expressions" msgstr "usa les expressions regulars POSIX ampliades" -#: builtin/grep.c:857 +#: builtin/grep.c:868 msgid "use basic POSIX regular expressions (default)" msgstr "usa les expressions regulars POSIX bàsiques (per defecte)" -#: builtin/grep.c:860 +#: builtin/grep.c:871 msgid "interpret patterns as fixed strings" msgstr "interpreta els patrons com a cadenes fixes" -#: builtin/grep.c:863 +#: builtin/grep.c:874 msgid "use Perl-compatible regular expressions" msgstr "usa les expressions regulars compatibles amb Perl" -#: builtin/grep.c:866 +#: builtin/grep.c:877 msgid "show line numbers" msgstr "mostra els números de línia" -#: builtin/grep.c:867 +#: builtin/grep.c:878 msgid "show column number of first match" msgstr "mostra el nombre de columna de la primera coincidència" -#: builtin/grep.c:868 +#: builtin/grep.c:879 msgid "don't show filenames" msgstr "no mostris els noms de fitxer" -#: builtin/grep.c:869 +#: builtin/grep.c:880 msgid "show filenames" msgstr "mostra els noms de fitxer" -#: builtin/grep.c:871 +#: builtin/grep.c:882 msgid "show filenames relative to top directory" msgstr "mostra els noms de fitxer relatius al directori superior" -#: builtin/grep.c:873 +#: builtin/grep.c:884 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:875 +#: builtin/grep.c:886 msgid "synonym for --files-with-matches" msgstr "sinònim de --files-with-matches" -#: builtin/grep.c:878 +#: builtin/grep.c:889 msgid "show only the names of files without match" msgstr "mostra només els noms dels fitxers sense coincidència" -#: builtin/grep.c:880 +#: builtin/grep.c:891 msgid "print NUL after filenames" msgstr "imprimeix NUL després dels noms de fitxer" -#: builtin/grep.c:883 +#: builtin/grep.c:894 msgid "show only matching parts of a line" msgstr "mostra només les parts de coincidents de la línia" -#: builtin/grep.c:885 +#: builtin/grep.c:896 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:886 +#: builtin/grep.c:897 msgid "highlight matches" msgstr "ressalta les coincidències" -#: builtin/grep.c:888 +#: builtin/grep.c:899 msgid "print empty line between matches from different files" msgstr "imprimeix una línia buida entre coincidències de fitxers distints" -#: builtin/grep.c:890 +#: builtin/grep.c:901 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:893 +#: builtin/grep.c:904 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:896 +#: builtin/grep.c:907 msgid "show context lines before matches" msgstr "mostra línies de context abans d'una coincidència" -#: builtin/grep.c:898 +#: builtin/grep.c:909 msgid "show context lines after matches" msgstr "mostra línies de context després d'una coincidència" -#: builtin/grep.c:900 +#: builtin/grep.c:911 msgid "use worker threads" msgstr "usa fils de treball" -#: builtin/grep.c:901 +#: builtin/grep.c:912 msgid "shortcut for -C NUM" msgstr "drecera per -C NUM" -#: builtin/grep.c:904 +#: builtin/grep.c:915 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:906 +#: builtin/grep.c:917 msgid "show the surrounding function" msgstr "mostra la funció circumdant" -#: builtin/grep.c:909 +#: builtin/grep.c:920 msgid "read patterns from file" msgstr "llegeix els patrons des d'un fitxer" -#: builtin/grep.c:911 +#: builtin/grep.c:922 msgid "match " msgstr "coincideix amb " -#: builtin/grep.c:913 +#: builtin/grep.c:924 msgid "combine patterns specified with -e" msgstr "combina els patrons especificats amb -e" -#: builtin/grep.c:925 +#: builtin/grep.c:936 msgid "indicate hit with exit status without output" msgstr "indica coincidència amb estat de sortida sense sortida textual" -#: builtin/grep.c:927 +#: builtin/grep.c:938 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:929 +#: builtin/grep.c:940 msgid "show parse tree for grep expression" msgstr "mostra l'arbre d'anàlisi de l'expressió grep" -#: builtin/grep.c:933 +#: builtin/grep.c:944 msgid "pager" msgstr "paginador" -#: builtin/grep.c:933 +#: builtin/grep.c:944 msgid "show matching files in the pager" msgstr "mostra els fitxers coincidents en el paginador" -#: builtin/grep.c:937 +#: builtin/grep.c:948 msgid "allow calling of grep(1) (ignored by this build)" msgstr "permet la invocació de grep(1) (ignorat per aquesta compilació)" -#: builtin/grep.c:1004 +#: builtin/grep.c:1014 msgid "no pattern given" msgstr "no s'ha donat cap patró" -#: builtin/grep.c:1040 +#: builtin/grep.c:1050 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index o --untracked no es pot usar amb revisions" -#: builtin/grep.c:1048 +#: builtin/grep.c:1058 #, c-format msgid "unable to resolve revision: %s" msgstr "no s'ha pogut resoldre la revisió: %s" -#: builtin/grep.c:1078 +#: builtin/grep.c:1088 msgid "--untracked not supported with --recurse-submodules" msgstr "--untracked no s'admet amb --recurse-submodules" -#: builtin/grep.c:1082 +#: builtin/grep.c:1092 msgid "invalid option combination, ignoring --threads" msgstr "combinació d'opcions no vàlida, s'està ignorant --threads" -#: builtin/grep.c:1085 builtin/pack-objects.c:3655 +#: builtin/grep.c:1095 builtin/pack-objects.c:3655 msgid "no threads support, ignoring --threads" msgstr "no s'admeten fils, s'ignorarà --threads" -#: builtin/grep.c:1088 builtin/index-pack.c:1578 builtin/pack-objects.c:2933 +#: builtin/grep.c:1098 builtin/index-pack.c:1573 builtin/pack-objects.c:2933 #, c-format msgid "invalid number of threads specified (%d)" msgstr "s'ha especificat un nombre de fils no vàlid (%d)" -#: builtin/grep.c:1122 +#: builtin/grep.c:1132 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:1148 +#: builtin/grep.c:1158 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached o --untracked no es pot usar amb --no-index" -#: builtin/grep.c:1154 +#: builtin/grep.c:1164 #, fuzzy msgid "--[no-]exclude-standard cannot be used for tracked contents" -msgstr "--[no-]exclude-standard no es pot utilitzar per als continguts seguits" +msgstr "" +"--[no-]exclude-standard no es pot utilitzar per als continguts seguits" -#: builtin/grep.c:1162 +#: builtin/grep.c:1172 #, fuzzy msgid "both --cached and trees are given" msgstr "es donen ambdós --cached i arbres" @@ -15751,8 +15829,8 @@ msgid "" "git hash-object [-t ] [-w] [--path= | --no-filters] [--stdin] " "[--] ..." msgstr "" -"git hash-object [-t ] [-w] [--path= | --no-filters] [--stdin] " -"[--] ..." +"git hash-object [-t ] [-w] [--path= | --no-filters] [--stdin]" +" [--] ..." #: builtin/hash-object.c:86 msgid "git hash-object --stdin-paths" @@ -15798,7 +15876,6 @@ msgid "print list of useful guides" msgstr "imprimeix la llista de guies útils" #: builtin/help.c:50 -#, fuzzy msgid "print all configuration variable names" msgstr "imprimeix tots els noms de les variables de configuració" @@ -15815,7 +15892,6 @@ msgid "show info page" msgstr "mostra la pàgina d'informació" #: builtin/help.c:57 -#, fuzzy msgid "print command description" msgstr "imprimeix la descripció de l'ordre" @@ -15897,96 +15973,96 @@ msgstr "ús: %s%s" msgid "'git help config' for more information" msgstr "'git help config' per a més informació" -#: builtin/index-pack.c:227 +#: builtin/index-pack.c:221 #, c-format msgid "object type mismatch at %s" msgstr "hi ha una discordança de tipus d'objecte a %s" -#: builtin/index-pack.c:247 +#: builtin/index-pack.c:241 #, c-format msgid "did not receive expected object %s" msgstr "no s'ha rebut l'objecte esperat %s" -#: builtin/index-pack.c:250 +#: builtin/index-pack.c:244 #, c-format msgid "object %s: expected type %s, found %s" msgstr "objecte %s: s'esperava el tipus %s, s'ha trobat %s" -#: builtin/index-pack.c:300 +#: builtin/index-pack.c:294 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "no es pot omplir %d octet" msgstr[1] "no es pot omplir %d octets" -#: builtin/index-pack.c:310 +#: builtin/index-pack.c:304 msgid "early EOF" msgstr "EOF prematur" -#: builtin/index-pack.c:311 +#: builtin/index-pack.c:305 msgid "read error on input" msgstr "error de lectura d'entrada" -#: builtin/index-pack.c:323 +#: builtin/index-pack.c:317 msgid "used more bytes than were available" msgstr "s'han usat més octets que hi havia disponibles" -#: builtin/index-pack.c:330 builtin/pack-objects.c:619 +#: builtin/index-pack.c:324 builtin/pack-objects.c:619 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:333 builtin/unpack-objects.c:95 +#: builtin/index-pack.c:327 builtin/unpack-objects.c:95 msgid "pack exceeds maximum allowed size" msgstr "el paquet supera la mida màxima permesa" -#: builtin/index-pack.c:348 builtin/repack.c:254 +#: builtin/index-pack.c:342 builtin/repack.c:286 #, c-format msgid "unable to create '%s'" msgstr "no s'ha pogut crear «%s»" -#: builtin/index-pack.c:354 +#: builtin/index-pack.c:348 #, c-format msgid "cannot open packfile '%s'" msgstr "no es pot obrir el fitxer de paquet «%s»" -#: builtin/index-pack.c:368 +#: builtin/index-pack.c:362 msgid "pack signature mismatch" msgstr "hi ha una discordança de signatura de paquet" -#: builtin/index-pack.c:370 +#: builtin/index-pack.c:364 #, c-format msgid "pack version % unsupported" msgstr "la versió de paquet % no és compatible" -#: builtin/index-pack.c:388 +#: builtin/index-pack.c:382 #, c-format msgid "pack has bad object at offset %: %s" msgstr "el paquet té un objecte incorrecte a la posició %: %s" -#: builtin/index-pack.c:494 +#: builtin/index-pack.c:488 #, c-format msgid "inflate returned %d" msgstr "la inflació ha retornat %d" -#: builtin/index-pack.c:543 +#: builtin/index-pack.c:537 msgid "offset value overflow for delta base object" msgstr "" "desbordament de valor de desplaçament per a l'objecte base de diferències" -#: builtin/index-pack.c:551 +#: builtin/index-pack.c:545 msgid "delta base offset is out of bound" msgstr "el desplaçament de base de diferències està fora de límits" -#: builtin/index-pack.c:559 +#: builtin/index-pack.c:553 #, c-format msgid "unknown object type %d" msgstr "tipus d'objecte desconegut %d" -#: builtin/index-pack.c:590 +#: builtin/index-pack.c:584 msgid "cannot pread pack file" msgstr "no es pot fer pread en el fitxer empaquetat" -#: builtin/index-pack.c:592 +#: builtin/index-pack.c:586 #, c-format msgid "premature end of pack file, % byte missing" msgid_plural "premature end of pack file, % bytes missing" @@ -15994,207 +16070,204 @@ msgstr[0] "el final del fitxer empaquetat és prematur, manca % octet" msgstr[1] "" "el final del fitxer empaquetat és prematur, manquen % octets" -#: builtin/index-pack.c:618 +#: builtin/index-pack.c:612 msgid "serious inflate inconsistency" msgstr "hi ha una inconsistència seriosa d'inflació" -#: builtin/index-pack.c:763 builtin/index-pack.c:769 builtin/index-pack.c:793 -#: builtin/index-pack.c:832 builtin/index-pack.c:841 +#: builtin/index-pack.c:757 builtin/index-pack.c:763 builtin/index-pack.c:787 +#: builtin/index-pack.c:826 builtin/index-pack.c:835 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "S'HA TROBAT UNA COL·LISIÓ SHA1 AMB %s !" -#: builtin/index-pack.c:766 builtin/pack-objects.c:171 +#: builtin/index-pack.c:760 builtin/pack-objects.c:171 #: builtin/pack-objects.c:231 builtin/pack-objects.c:326 #, c-format msgid "unable to read %s" msgstr "no s'ha pogut llegir %s" -#: builtin/index-pack.c:830 +#: builtin/index-pack.c:824 #, c-format msgid "cannot read existing object info %s" msgstr "no es pot llegir la informació d'objecte existent %s" -#: builtin/index-pack.c:838 +#: builtin/index-pack.c:832 #, c-format msgid "cannot read existing object %s" msgstr "no es pot llegir l'objecte existent %s" -#: builtin/index-pack.c:852 +#: builtin/index-pack.c:846 #, c-format msgid "invalid blob object %s" msgstr "objecte de blob no vàlid %s" -#: builtin/index-pack.c:855 builtin/index-pack.c:874 -#, fuzzy +#: builtin/index-pack.c:849 builtin/index-pack.c:868 msgid "fsck error in packed object" msgstr "fsck error en un objecte empaquetat" -#: builtin/index-pack.c:876 +#: builtin/index-pack.c:870 #, c-format msgid "Not all child objects of %s are reachable" msgstr "No tots els objectes fills de %s són abastables" -#: builtin/index-pack.c:940 builtin/index-pack.c:987 +#: builtin/index-pack.c:931 builtin/index-pack.c:978 msgid "failed to apply delta" msgstr "s'ha produït un error en aplicar la diferència" -#: builtin/index-pack.c:1166 +#: builtin/index-pack.c:1161 msgid "Receiving objects" msgstr "S'estan rebent objectes" -#: builtin/index-pack.c:1166 +#: builtin/index-pack.c:1161 msgid "Indexing objects" msgstr "S'estan indexant objectes" -#: builtin/index-pack.c:1200 +#: builtin/index-pack.c:1195 msgid "pack is corrupted (SHA1 mismatch)" msgstr "el paquet és malmès (discordança SHA1)" -#: builtin/index-pack.c:1205 +#: builtin/index-pack.c:1200 msgid "cannot fstat packfile" msgstr "no es pot fer fstat en el fitxer de paquet" -#: builtin/index-pack.c:1208 +#: builtin/index-pack.c:1203 msgid "pack has junk at the end" msgstr "el paquet té brossa al seu final" -#: builtin/index-pack.c:1220 +#: builtin/index-pack.c:1215 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "confusió més enllà de la bogeria en parse_pack_objects()" -#: builtin/index-pack.c:1243 +#: builtin/index-pack.c:1238 msgid "Resolving deltas" msgstr "S'estan resolent les diferències" -#: builtin/index-pack.c:1254 builtin/pack-objects.c:2697 +#: builtin/index-pack.c:1249 builtin/pack-objects.c:2697 #, c-format msgid "unable to create thread: %s" msgstr "no s'ha pogut crear fil: %s" -#: builtin/index-pack.c:1287 +#: builtin/index-pack.c:1282 msgid "confusion beyond insanity" msgstr "confusió més enllà de la bogeria" -#: builtin/index-pack.c:1293 +#: builtin/index-pack.c:1288 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "s'ha completat amb %d objecte local" msgstr[1] "s'ha completat amb %d objectes locals" -#: builtin/index-pack.c:1305 +#: builtin/index-pack.c:1300 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Suma de verificació final no esperada per a %s (corrupció de disc?)" -#: builtin/index-pack.c:1309 +#: builtin/index-pack.c:1304 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "El paquet té %d diferència no resolta" msgstr[1] "El paquet té %d diferències no resoltes" -#: builtin/index-pack.c:1333 +#: builtin/index-pack.c:1328 #, c-format msgid "unable to deflate appended object (%d)" msgstr "no s'ha pogut desinflar l'objecte annexat (%d)" -#: builtin/index-pack.c:1429 +#: builtin/index-pack.c:1424 #, c-format msgid "local object %s is corrupt" msgstr "l'objecte local %s és malmès" -#: builtin/index-pack.c:1449 +#: builtin/index-pack.c:1444 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "el nom del fitxer de paquet «%s» no acaba amb «.pack»" -#: builtin/index-pack.c:1474 +#: builtin/index-pack.c:1469 #, c-format msgid "cannot write %s file '%s'" msgstr "no es pot escriure «%s» al fitxer «%s»" -#: builtin/index-pack.c:1482 +#: builtin/index-pack.c:1477 #, fuzzy, c-format msgid "cannot close written %s file '%s'" msgstr "no s'ha pogut tancar l'arxiu «%s» per escrit" -#: builtin/index-pack.c:1506 +#: builtin/index-pack.c:1501 msgid "error while closing pack file" msgstr "error en tancar el fitxer empaquetat" -#: builtin/index-pack.c:1520 +#: builtin/index-pack.c:1515 msgid "cannot store pack file" msgstr "no es pot emmagatzemar el fitxer empaquetat" -#: builtin/index-pack.c:1528 +#: builtin/index-pack.c:1523 msgid "cannot store index file" msgstr "no es pot emmagatzemar el fitxer d'índex" -#: builtin/index-pack.c:1572 builtin/pack-objects.c:2944 +#: builtin/index-pack.c:1567 builtin/pack-objects.c:2944 #, c-format msgid "bad pack.indexversion=%" msgstr "pack.indexversion=% incorrecte" -#: builtin/index-pack.c:1636 +#: builtin/index-pack.c:1631 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "No es pot obrir el fitxer empaquetat existent «%s»" -#: builtin/index-pack.c:1638 +#: builtin/index-pack.c:1633 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "No es pot obrir el fitxer d'índex de paquets existent de «%s»" -#: builtin/index-pack.c:1686 +#: builtin/index-pack.c:1681 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "sense diferències: %d objecte" msgstr[1] "sense diferències: %d objectes" -#: builtin/index-pack.c:1693 +#: builtin/index-pack.c:1688 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "longitud de cadena = %d: %lu objecte" msgstr[1] "longitud de cadena = %d: %lu objectes" -#: builtin/index-pack.c:1733 +#: builtin/index-pack.c:1728 msgid "Cannot come back to cwd" msgstr "No es pot tornar al directori de treball actual" -#: builtin/index-pack.c:1782 builtin/index-pack.c:1785 -#: builtin/index-pack.c:1801 builtin/index-pack.c:1805 +#: builtin/index-pack.c:1777 builtin/index-pack.c:1780 +#: builtin/index-pack.c:1796 builtin/index-pack.c:1800 #, c-format msgid "bad %s" msgstr "%s incorrecte" -#: builtin/index-pack.c:1811 builtin/init-db.c:391 builtin/init-db.c:623 -#, fuzzy, c-format +#: builtin/index-pack.c:1806 builtin/init-db.c:391 builtin/init-db.c:623 +#, c-format msgid "unknown hash algorithm '%s'" -msgstr "variable «%s» desconeguda" +msgstr "algorisme hash desconegut «%s»" -#: builtin/index-pack.c:1826 +#: builtin/index-pack.c:1821 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin no es pot usar sense --stdin" -#: builtin/index-pack.c:1828 +#: builtin/index-pack.c:1823 msgid "--stdin requires a git repository" msgstr "--stdin requereix un dipòsit git" -#: builtin/index-pack.c:1830 -#, fuzzy +#: builtin/index-pack.c:1825 msgid "--object-format cannot be used with --stdin" -msgstr "--fix-thin no es pot usar sense --stdin" +msgstr "--object-format no es pot usar sense --stdin" -#: builtin/index-pack.c:1836 +#: builtin/index-pack.c:1831 msgid "--verify with no packfile name given" msgstr "s'ha donat --verify sense nom de fitxer de paquet" -#: builtin/index-pack.c:1897 builtin/unpack-objects.c:582 -#, fuzzy +#: builtin/index-pack.c:1892 builtin/unpack-objects.c:582 msgid "fsck error in pack objects" msgstr "error fsck als objectes del paquet" @@ -16229,9 +16302,9 @@ msgid "ignoring template %s" msgstr "s'està ignorant la plantilla %s" #: builtin/init-db.c:124 -#, fuzzy, c-format +#, c-format msgid "templates not found in %s" -msgstr "plantilles no trobades en percentatges" +msgstr "plantilles no trobades a %s" #: builtin/init-db.c:139 #, c-format @@ -16239,9 +16312,9 @@ msgid "not copying templates from '%s': %s" msgstr "no s'estan copiant plantilles de «%s»: %s" #: builtin/init-db.c:274 -#, fuzzy, c-format +#, c-format msgid "invalid initial branch name: '%s'" -msgstr "Nom de branca no vàlid: «%s»" +msgstr "nom de branca inicial no vàlid: «%s»" #: builtin/init-db.c:366 #, c-format @@ -16254,8 +16327,9 @@ msgid "unable to move %s to %s" msgstr "no s'ha pogut moure %s a %s" #: builtin/init-db.c:385 +#, fuzzy msgid "attempt to reinitialize repository with different hash" -msgstr "" +msgstr "s'ha intentat reinicialitzar el dipòsit amb un hash diferent" #: builtin/init-db.c:409 builtin/init-db.c:412 #, c-format @@ -16263,9 +16337,9 @@ msgid "%s already exists" msgstr "%s ja existeix" #: builtin/init-db.c:443 -#, c-format +#, fuzzy, c-format msgid "re-init: ignored --initial-branch=%s" -msgstr "" +msgstr "reinicialització ignorada --initial-branch=%" #: builtin/init-db.c:474 #, c-format @@ -16289,11 +16363,11 @@ msgstr "S'ha inicialitzat un dipòsit buit del Git en %s%s\n" #: builtin/init-db.c:529 msgid "" -"git init [-q | --quiet] [--bare] [--template=] [--" -"shared[=]] []" +"git init [-q | --quiet] [--bare] [--template=] " +"[--shared[=]] []" msgstr "" -"git init [-q | --quiet] [--bare] [--template=] [--" -"shared[=]] []" +"git init [-q | --quiet] [--bare] [--template=] " +"[--shared[=]] []" #: builtin/init-db.c:555 msgid "permissions" @@ -16309,18 +16383,16 @@ msgid "override the name of the initial branch" msgstr "passa per alt el bit executable dels fitxers llistats" #: builtin/init-db.c:563 builtin/verify-pack.c:74 -#, fuzzy msgid "hash" msgstr "hash" #: builtin/init-db.c:564 builtin/show-index.c:22 builtin/verify-pack.c:75 msgid "specify the hash algorithm to use" -msgstr "" +msgstr "especifiqueu l'algorisme de resum a usar" #: builtin/init-db.c:571 -#, fuzzy msgid "--separate-git-dir and --bare are mutually exclusive" -msgstr "--deepen i --depth són mútuament excloents" +msgstr "--separate-git-dir i --bare són mútuament excloents" #: builtin/init-db.c:600 builtin/init-db.c:605 #, c-format @@ -16349,7 +16421,7 @@ msgstr "No es pot accedir a l'arbre de treball «%s»" #: builtin/init-db.c:693 #, fuzzy msgid "--separate-git-dir incompatible with bare repository" -msgstr "--first-parent és incompatible amb --bisect" +msgstr "--separate-git-dir és incompatible amb --bisect" #: builtin/interpret-trailers.c:16 msgid "" @@ -16396,7 +16468,6 @@ msgid "set parsing options" msgstr "estableix les opcions d'anàlisi" #: builtin/interpret-trailers.c:110 -#, fuzzy msgid "do not treat --- specially" msgstr "no tractis --- especialment" @@ -16416,132 +16487,134 @@ 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:56 +#: builtin/log.c:58 msgid "git log [] [] [[--] ...]" msgstr "git log [] [] [[--] ...]" -#: builtin/log.c:57 +#: builtin/log.c:59 msgid "git show [] ..." msgstr "git show [] ..." -#: builtin/log.c:110 +#: builtin/log.c:112 #, c-format msgid "invalid --decorate option: %s" msgstr "opció --decorate no vàlida: %s" -#: builtin/log.c:177 +#: builtin/log.c:179 msgid "show source" msgstr "mostra la font" -#: builtin/log.c:178 +#: builtin/log.c:180 msgid "Use mail map file" msgstr "Usa el fitxer de mapa de correu" -#: builtin/log.c:181 +#: builtin/log.c:183 msgid "only decorate refs that match " msgstr "només decora les referències que coincideixin amb " -#: builtin/log.c:183 +#: builtin/log.c:185 msgid "do not decorate refs that match " msgstr "no decoris les referències que coincideixen amb " -#: builtin/log.c:184 +#: builtin/log.c:186 msgid "decorate options" msgstr "opcions de decoració" -#: builtin/log.c:187 -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:189 +#, fuzzy +msgid "" +"Trace the evolution of line range , or function : in " +"" +msgstr "" +"Traça l'evolució del rang de línia , or funcions : in " +"{8771193" -#: builtin/log.c:297 +#: builtin/log.c:212 +#, fuzzy +msgid "-L: cannot be used with pathspec" +msgstr "%s: %s no es pot usar amb %s" + +#: builtin/log.c:302 #, c-format msgid "Final output: %d %s\n" msgstr "Sortida final: %d %s\n" -#: builtin/log.c:555 +#: builtin/log.c:564 #, c-format msgid "git show %s: bad file" msgstr "git show %s: fitxer incorrecte" -#: builtin/log.c:570 builtin/log.c:665 -#, fuzzy, c-format +#: builtin/log.c:579 builtin/log.c:674 +#, c-format msgid "could not read object %s" -msgstr "no s'ha pogut llegir l'objecte per cent" +msgstr "no s'ha pogut llegir l'objecte %s" -#: builtin/log.c:690 -#, fuzzy, c-format +#: builtin/log.c:699 +#, c-format msgid "unknown type: %d" -msgstr "tipus desconegut" +msgstr "tipus desconegut: %d" -#: builtin/log.c:839 -#, fuzzy, c-format +#: builtin/log.c:848 +#, c-format msgid "%s: invalid cover from description mode" -msgstr "percentatges de cobertura no vàlida des del mode descripció" +msgstr "%s: cobertura no vàlida des del mode descripció" -#: builtin/log.c:846 +#: builtin/log.c:855 msgid "format.headers without value" msgstr "format.headers sense valor" -#: builtin/log.c:965 -msgid "name of output directory is too long" -msgstr "el nom del directori de sortida és massa llarg" - -#: builtin/log.c:981 -#, fuzzy, c-format +#: builtin/log.c:984 +#, c-format msgid "cannot open patch file %s" -msgstr "no s'han pogut obrir els fitxers de pedaç" +msgstr "no s'ha pogut obrir el fitxer de pedaç %s" -#: builtin/log.c:998 -#, fuzzy +#: builtin/log.c:1001 msgid "need exactly one range" msgstr "necessita exactament un interval" -#: builtin/log.c:1008 -#, fuzzy +#: builtin/log.c:1011 msgid "not a range" msgstr "no és un interval" -#: builtin/log.c:1172 +#: builtin/log.c:1175 #, fuzzy msgid "cover letter needs email format" msgstr "la lletra de la portada necessita un format de correu electrònic" -#: builtin/log.c:1178 +#: builtin/log.c:1181 #, fuzzy msgid "failed to create cover-letter file" msgstr "no s'ha pogut crear el fitxer de portada" -#: builtin/log.c:1259 +#: builtin/log.c:1262 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to boig: %s" -#: builtin/log.c:1286 +#: builtin/log.c:1289 msgid "git format-patch [] [ | ]" msgstr "git format-patch [] [ | ]" -#: builtin/log.c:1344 -#, fuzzy +#: builtin/log.c:1347 msgid "two output directories?" msgstr "dos directoris de sortida?" -#: builtin/log.c:1495 builtin/log.c:2301 builtin/log.c:2303 builtin/log.c:2315 -#, fuzzy, c-format +#: builtin/log.c:1498 builtin/log.c:2318 builtin/log.c:2320 builtin/log.c:2332 +#, c-format msgid "unknown commit %s" -msgstr "percentatge de comissió desconegut" +msgstr "comissió desconeguda %s" -#: builtin/log.c:1506 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1509 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:1515 -#, fuzzy +#: builtin/log.c:1518 msgid "could not find exact merge base" msgstr "no s'ha pogut trobar la base exacta de la fusió" -#: builtin/log.c:1525 +#: builtin/log.c:1528 #, fuzzy msgid "" "failed to get upstream, if you want to record base commit automatically,\n" @@ -16550,306 +16623,307 @@ msgid "" msgstr "" "no s'ha pogut obtenir la font si voleu registrar la comissió base " "automàticament si us plau useu la branca git --set-upstream-to per al " -"seguiment d'una branca remota. O podeu especificar la comissió base per --" -"base= manualment" +"seguiment d'una branca remota. O podeu especificar la comissió base per " +"--base= manualment" -#: builtin/log.c:1548 -#, fuzzy +#: builtin/log.c:1551 msgid "failed to find exact merge base" msgstr "no s'ha pogut trobar la base exacta de la fusió" -#: builtin/log.c:1565 +#: builtin/log.c:1568 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:1575 +#: builtin/log.c:1578 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:1633 +#: builtin/log.c:1636 msgid "cannot get patch id" msgstr "no es pot obtenir l'id del pedaç" -#: builtin/log.c:1690 +#: builtin/log.c:1693 #, fuzzy msgid "failed to infer range-diff origin of current series" msgstr "no s'ha pogut inferir l'interval-diferències" -#: builtin/log.c:1692 -#, c-format +#: builtin/log.c:1695 +#, fuzzy, c-format msgid "using '%s' as range-diff origin of current series" -msgstr "" +msgstr "utilitzant «%s» com a origen de rang-diferencia de la sèrie actual" -#: builtin/log.c:1736 +#: builtin/log.c:1739 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:1739 +#: builtin/log.c:1742 msgid "use [PATCH] even with multiple patches" msgstr "usa [PATCH] fins i tot amb múltiples pedaços" -#: builtin/log.c:1743 +#: builtin/log.c:1746 msgid "print patches to standard out" msgstr "imprimeix els pedaços a la sortida estàndard" -#: builtin/log.c:1745 +#: builtin/log.c:1748 msgid "generate a cover letter" msgstr "genera una carta de presentació" -#: builtin/log.c:1747 +#: builtin/log.c:1750 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:1748 +#: builtin/log.c:1751 msgid "sfx" msgstr "sufix" -#: builtin/log.c:1749 +#: builtin/log.c:1752 msgid "use instead of '.patch'" msgstr "usa en lloc de «.patch»" -#: builtin/log.c:1751 +#: builtin/log.c:1754 msgid "start numbering patches at instead of 1" msgstr "comença numerant els pedaços a en lloc d'1" -#: builtin/log.c:1753 +#: builtin/log.c:1756 msgid "mark the series as Nth re-roll" msgstr "marca la sèrie com a l'enèsima llançada" -#: builtin/log.c:1755 +#: builtin/log.c:1758 +#, fuzzy +msgid "max length of output filename" +msgstr "mida màxima de cada fitxer empaquetat de sortida" + +#: builtin/log.c:1760 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Usa [RFC PATCH] en lloc de [PATCH]" -#: builtin/log.c:1758 +#: builtin/log.c:1763 #, fuzzy msgid "cover-from-description-mode" msgstr "preferences-from-description-mode" -#: builtin/log.c:1759 +#: builtin/log.c:1764 #, fuzzy msgid "generate parts of a cover letter based on a branch's description" msgstr "" "genera parts d'una lletra de portada basant-se en la descripció d'una branca" -#: builtin/log.c:1761 +#: builtin/log.c:1766 msgid "Use [] instead of [PATCH]" msgstr "Usa [] en lloc de [PATCH]" -#: builtin/log.c:1764 +#: builtin/log.c:1769 msgid "store resulting files in " msgstr "emmagatzema els fitxers resultants a " -#: builtin/log.c:1767 +#: builtin/log.c:1772 msgid "don't strip/add [PATCH]" msgstr "no despullis/afegeixis [PATCH]" -#: builtin/log.c:1770 +#: builtin/log.c:1775 msgid "don't output binary diffs" msgstr "no emetis diferències binàries" -#: builtin/log.c:1772 +#: builtin/log.c:1777 msgid "output all-zero hash in From header" msgstr "emet un hash de tots zeros en la capçalera From" -#: builtin/log.c:1774 +#: builtin/log.c:1779 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:1776 +#: builtin/log.c:1781 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:1778 +#: builtin/log.c:1783 msgid "Messaging" msgstr "Missatgeria" -#: builtin/log.c:1779 +#: builtin/log.c:1784 msgid "header" msgstr "capçalera" -#: builtin/log.c:1780 +#: builtin/log.c:1785 msgid "add email header" msgstr "afegeix una capçalera de correu electrònic" -#: builtin/log.c:1781 builtin/log.c:1782 +#: builtin/log.c:1786 builtin/log.c:1787 msgid "email" msgstr "correu electrònic" -#: builtin/log.c:1781 +#: builtin/log.c:1786 msgid "add To: header" msgstr "afegeix la capçalera To:" -#: builtin/log.c:1782 +#: builtin/log.c:1787 msgid "add Cc: header" msgstr "afegeix la capçalera Cc:" -#: builtin/log.c:1783 +#: builtin/log.c:1788 msgid "ident" msgstr "identitat" -#: builtin/log.c:1784 +#: builtin/log.c:1789 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:1786 +#: builtin/log.c:1791 msgid "message-id" msgstr "ID de missatge" -#: builtin/log.c:1787 +#: builtin/log.c:1792 msgid "make first mail a reply to " msgstr "fes que el primer missatge sigui una resposta a " -#: builtin/log.c:1788 builtin/log.c:1791 +#: builtin/log.c:1793 builtin/log.c:1796 msgid "boundary" msgstr "límit" -#: builtin/log.c:1789 +#: builtin/log.c:1794 msgid "attach the patch" msgstr "adjunta el pedaç" -#: builtin/log.c:1792 +#: builtin/log.c:1797 msgid "inline the patch" msgstr "posa el pedaç en el cos" -#: builtin/log.c:1796 +#: builtin/log.c:1801 msgid "enable message threading, styles: shallow, deep" msgstr "habilita l'enfilada de missatges, estils: shallow, deep" -#: builtin/log.c:1798 +#: builtin/log.c:1803 msgid "signature" msgstr "signatura" -#: builtin/log.c:1799 +#: builtin/log.c:1804 msgid "add a signature" msgstr "afegeix una signatura" -#: builtin/log.c:1800 +#: builtin/log.c:1805 msgid "base-commit" msgstr "comissió base" -#: builtin/log.c:1801 +#: builtin/log.c:1806 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:1804 +#: builtin/log.c:1809 msgid "add a signature from a file" msgstr "afegeix una signatura des d'un fitxer" -#: builtin/log.c:1805 +#: builtin/log.c:1810 msgid "don't print the patch filenames" msgstr "no imprimeixis els noms de fitxer del pedaç" -#: builtin/log.c:1807 +#: builtin/log.c:1812 msgid "show progress while generating patches" msgstr "mostra el progrés durant la generació de pedaços" -#: builtin/log.c:1809 +#: builtin/log.c:1814 #, fuzzy msgid "show changes against in cover letter or single patch" msgstr "" "mostra els canvis contra a la lletra de la portada o a un sol pedaç" -#: builtin/log.c:1812 +#: builtin/log.c:1817 #, fuzzy msgid "show changes against in cover letter or single patch" msgstr "" -"mostra els canvis contra a la lletra de la portada o a un sol pedaç" +"mostra els canvis contra a la lletra de la portada o a un sol " +"pedaç" -#: builtin/log.c:1814 +#: builtin/log.c:1819 #, fuzzy msgid "percentage by which creation is weighted" msgstr "percentatge pel qual la creació és ponderada" -#: builtin/log.c:1896 +#: builtin/log.c:1905 #, c-format msgid "invalid ident line: %s" msgstr "línia d'identitat no vàlida: %s" -#: builtin/log.c:1911 -#, fuzzy +#: builtin/log.c:1920 msgid "-n and -k are mutually exclusive" msgstr "-n i -k són mútuament excloents" -#: builtin/log.c:1913 -#, fuzzy +#: builtin/log.c:1922 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc i -k són mútuament excloents" -#: builtin/log.c:1921 +#: builtin/log.c:1930 msgid "--name-only does not make sense" msgstr "--name-only no té sentit" -#: builtin/log.c:1923 +#: builtin/log.c:1932 msgid "--name-status does not make sense" msgstr "--name-status no té sentit" -#: builtin/log.c:1925 +#: builtin/log.c:1934 msgid "--check does not make sense" msgstr "--check no té sentit" -#: builtin/log.c:1958 -msgid "standard output, or directory, which one?" -msgstr "sortida estàndard o directori, quin dels dos?" - -#: builtin/log.c:2062 +#: builtin/log.c:1956 #, fuzzy +msgid "--stdout, --output, and --output-directory are mutually exclusive" +msgstr "-b, -B i --detach són mútuament excloents" + +#: builtin/log.c:2079 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff requereix --cover-letter o un sol pedaç" -#: builtin/log.c:2066 -#, fuzzy +#: builtin/log.c:2083 msgid "Interdiff:" -msgstr "Interdiff" +msgstr "Interdiff:" -#: builtin/log.c:2067 -#, fuzzy, c-format +#: builtin/log.c:2084 +#, c-format msgid "Interdiff against v%d:" -msgstr "Interdiff contra v%d" +msgstr "Interdiff contra v%d:" -#: builtin/log.c:2073 -#, fuzzy +#: builtin/log.c:2090 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor requereix --range-diff" -#: builtin/log.c:2077 -#, fuzzy +#: builtin/log.c:2094 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff requereix --cover-letter o un sol pedaç" -#: builtin/log.c:2085 +#: builtin/log.c:2102 #, fuzzy msgid "Range-diff:" msgstr "Diferència-interval" -#: builtin/log.c:2086 +#: builtin/log.c:2103 #, fuzzy, c-format msgid "Range-diff against v%d:" msgstr "Diferència de l'interval contra el v%d" -#: builtin/log.c:2097 +#: builtin/log.c:2114 #, c-format msgid "unable to read signature file '%s'" msgstr "no s'ha pogut llegir el fitxer de signatura «%s»" -#: builtin/log.c:2133 +#: builtin/log.c:2150 msgid "Generating patches" msgstr "S'estan generant els pedaços" -#: builtin/log.c:2177 +#: builtin/log.c:2194 #, fuzzy msgid "failed to create output files" msgstr "no s'han pogut crear els fitxers de sortida" -#: builtin/log.c:2236 +#: builtin/log.c:2253 msgid "git cherry [-v] [ [ []]]" msgstr "git cherry [-v] [ [ []]]" -#: builtin/log.c:2290 +#: builtin/log.c:2307 #, c-format msgid "" -"Could not find a tracked remote branch, please specify manually.\n" +"Could not find a tracked remote branch, please specify " +"manually.\n" msgstr "" "No s'ha pogut trobar una branca remota seguida. Especifiqueu " "manualment.\n" @@ -16975,7 +17049,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:1392 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1398 msgid "exec" msgstr "executable" @@ -17088,15 +17162,16 @@ msgstr "és la primera un avantpassat de l'altre?" #: builtin/merge-base.c:151 msgid "find where forked from reflog of " msgstr "" -"troba on s'ha bifurcat del registre de referències de " +"troba on s'ha bifurcat del registre de referències de " +"" #: builtin/merge-file.c:9 msgid "" "git merge-file [] [-L [-L [-L ]]] " " " msgstr "" -"git merge-file [] [-L [-L [-L ]]] " -" " +"git merge-file [] [-L [-L [-L ]]] " +" " #: builtin/merge-file.c:35 msgid "send results to standard output" @@ -17161,194 +17236,193 @@ msgstr "no s'ha pogut resoldre la referència «%s»" msgid "Merging %s with %s\n" msgstr "S'està fusionant %s amb %s\n" -#: builtin/merge.c:56 +#: builtin/merge.c:57 msgid "git merge [] [...]" msgstr "git merge [] [...]" -#: builtin/merge.c:57 +#: builtin/merge.c:58 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:58 +#: builtin/merge.c:59 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:120 +#: builtin/merge.c:122 msgid "switch `m' requires a value" msgstr "l'opció «m» requereix un valor" -#: builtin/merge.c:143 -#, fuzzy, c-format +#: builtin/merge.c:145 +#, c-format msgid "option `%s' requires a value" -msgstr "l'opció `%s' requereix un valor" +msgstr "l'opció «%s» requereix un valor" -#: builtin/merge.c:189 +#: builtin/merge.c:198 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "No s'ha pogut trobar l'estratègia de fusió «%s».\n" -#: builtin/merge.c:190 +#: builtin/merge.c:199 #, c-format msgid "Available strategies are:" msgstr "Les estratègies disponibles són:" -#: builtin/merge.c:195 +#: builtin/merge.c:204 #, c-format msgid "Available custom strategies are:" msgstr "Les estratègies personalitzades disponibles són:" -#: builtin/merge.c:246 builtin/pull.c:133 +#: builtin/merge.c:255 builtin/pull.c:133 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:249 builtin/pull.c:136 +#: builtin/merge.c:258 builtin/pull.c:136 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:250 builtin/pull.c:139 +#: builtin/merge.c:259 builtin/pull.c:139 msgid "(synonym to --stat)" msgstr "(sinònim de --stat)" -#: builtin/merge.c:252 builtin/pull.c:142 +#: builtin/merge.c:261 builtin/pull.c:142 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ó" +"afegeix (com a màxim ) entrades del registre curt al missatge de comissió" +" de fusió" -#: builtin/merge.c:255 builtin/pull.c:148 +#: builtin/merge.c:264 builtin/pull.c:148 msgid "create a single commit instead of doing a merge" msgstr "crea una única comissió en lloc de fusionar" -#: builtin/merge.c:257 builtin/pull.c:151 +#: builtin/merge.c:266 builtin/pull.c:151 msgid "perform a commit if the merge succeeds (default)" msgstr "realitza una comissió si la fusió té èxit (per defecte)" -#: builtin/merge.c:259 builtin/pull.c:154 +#: builtin/merge.c:268 builtin/pull.c:154 msgid "edit message before committing" msgstr "edita el missatge abans de cometre" -#: builtin/merge.c:261 +#: builtin/merge.c:270 msgid "allow fast-forward (default)" msgstr "permet l'avanç ràpid (per defecte)" -#: builtin/merge.c:263 builtin/pull.c:161 +#: builtin/merge.c:272 builtin/pull.c:161 msgid "abort if fast-forward is not possible" msgstr "avorta si l'avanç ràpid no és possible" -#: builtin/merge.c:267 builtin/pull.c:164 +#: builtin/merge.c:276 builtin/pull.c:164 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:268 builtin/notes.c:787 builtin/pull.c:168 -#: builtin/rebase.c:533 builtin/rebase.c:1406 builtin/revert.c:114 +#: builtin/merge.c:277 builtin/notes.c:787 builtin/pull.c:168 +#: builtin/rebase.c:539 builtin/rebase.c:1412 builtin/revert.c:114 msgid "strategy" msgstr "estratègia" -#: builtin/merge.c:269 builtin/pull.c:169 +#: builtin/merge.c:278 builtin/pull.c:169 msgid "merge strategy to use" msgstr "estratègia de fusió a usar" -#: builtin/merge.c:270 builtin/pull.c:172 +#: builtin/merge.c:279 builtin/pull.c:172 msgid "option=value" msgstr "opció=valor" -#: builtin/merge.c:271 builtin/pull.c:173 +#: builtin/merge.c:280 builtin/pull.c:173 msgid "option for selected merge strategy" msgstr "opció per a l'estratègia de fusió seleccionada" -#: builtin/merge.c:273 +#: builtin/merge.c:282 msgid "merge commit message (for a non-fast-forward merge)" msgstr "missatge de comissió de fusió (per a una fusió no d'avanç ràpid)" -#: builtin/merge.c:280 +#: builtin/merge.c:289 msgid "abort the current in-progress merge" msgstr "avorta la fusió en curs actual" -#: builtin/merge.c:282 -#, fuzzy +#: builtin/merge.c:291 msgid "--abort but leave index and working tree alone" -msgstr "--abort però deixa l'índex i l'arbre de treball sols" +msgstr "--abort però deixa l'índex i l'arbre de treball intactes" -#: builtin/merge.c:284 +#: builtin/merge.c:293 msgid "continue the current in-progress merge" msgstr "continua la fusió en curs actual" -#: builtin/merge.c:286 builtin/pull.c:180 +#: builtin/merge.c:295 builtin/pull.c:180 msgid "allow merging unrelated histories" msgstr "permet fusionar històries no relacionades" -#: builtin/merge.c:293 +#: builtin/merge.c:302 #, fuzzy msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "evita els ganxos pre-combinació i missatge de comissió" -#: builtin/merge.c:310 +#: builtin/merge.c:319 msgid "could not run stash." msgstr "no s'ha pogut executar «stash»." -#: builtin/merge.c:315 +#: builtin/merge.c:324 msgid "stash failed" msgstr "l'«stash» ha fallat" -#: builtin/merge.c:320 +#: builtin/merge.c:329 #, c-format msgid "not a valid object: %s" msgstr "no és un objecte vàlid: %s" -#: builtin/merge.c:342 builtin/merge.c:359 +#: builtin/merge.c:351 builtin/merge.c:368 msgid "read-tree failed" msgstr "read-tree ha fallat" -#: builtin/merge.c:389 +#: builtin/merge.c:398 msgid " (nothing to squash)" msgstr " (res a fer «squash»)" -#: builtin/merge.c:400 +#: builtin/merge.c:409 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Comissió «squash» -- no s'està actualitzant HEAD\n" -#: builtin/merge.c:450 +#: builtin/merge.c:459 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Cap missatge de fusió -- no s'està actualitzant HEAD\n" -#: builtin/merge.c:501 +#: builtin/merge.c:510 #, c-format msgid "'%s' does not point to a commit" msgstr "«%s» no assenyala una comissió" -#: builtin/merge.c:588 +#: builtin/merge.c:597 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Cadena branch.%s.mergeoptions incorrecta: %s" -#: builtin/merge.c:713 +#: builtin/merge.c:723 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:726 +#: builtin/merge.c:736 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Opció desconeguda de merge-recursive: -X%s" -#: builtin/merge.c:741 +#: builtin/merge.c:755 t/helper/test-fast-rebase.c:209 #, c-format msgid "unable to write %s" msgstr "no s'ha pogut escriure %s" -#: builtin/merge.c:793 +#: builtin/merge.c:807 #, c-format msgid "Could not read from '%s'" msgstr "No s'ha pogut llegir de «%s»" -#: builtin/merge.c:802 +#: builtin/merge.c:816 #, 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:808 +#: builtin/merge.c:822 #, fuzzy msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -17359,88 +17433,87 @@ msgstr "" "necessària especialment si fusiona una font actualitzada en una branca de " "tema." -#: builtin/merge.c:813 -#, fuzzy +#: builtin/merge.c:827 msgid "An empty message aborts the commit.\n" -msgstr "Un missatge buit avorta la publicació." +msgstr "Un missatge buit interromp la comissió.\n" -#: builtin/merge.c:816 -#, fuzzy, c-format +#: builtin/merge.c:830 +#, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "" "Les línies que comencen amb «%c» seran ignorades i un missatge buit " -"interromp la publicació." +"interromp la comissió.\n" -#: builtin/merge.c:869 +#: builtin/merge.c:883 msgid "Empty commit message." msgstr "El missatge de comissió és buit." -#: builtin/merge.c:884 +#: builtin/merge.c:898 #, c-format msgid "Wonderful.\n" msgstr "Meravellós.\n" -#: builtin/merge.c:945 +#: builtin/merge.c:959 #, 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:984 +#: builtin/merge.c:998 msgid "No current branch." msgstr "No hi ha cap branca actual." -#: builtin/merge.c:986 +#: builtin/merge.c:1000 msgid "No remote for the current branch." msgstr "No hi ha cap remot per a la branca actual." -#: builtin/merge.c:988 +#: builtin/merge.c:1002 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:993 +#: builtin/merge.c:1007 #, 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:1050 +#: builtin/merge.c:1064 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Valor incorrecte «%s» en l'entorn «%s»" -#: builtin/merge.c:1153 +#: builtin/merge.c:1167 #, c-format msgid "not something we can merge in %s: %s" msgstr "no és quelcom que puguem fusionar en %s: %s" -#: builtin/merge.c:1187 +#: builtin/merge.c:1201 msgid "not something we can merge" msgstr "no és quelcom que puguem fusionar" -#: builtin/merge.c:1291 +#: builtin/merge.c:1311 msgid "--abort expects no arguments" msgstr "--abort no espera cap argument" -#: builtin/merge.c:1295 +#: builtin/merge.c:1315 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "No hi ha fusió a avortar (manca MERGE_HEAD)." -#: builtin/merge.c:1313 +#: builtin/merge.c:1333 msgid "--quit expects no arguments" msgstr "--quit no espera cap argument" -#: builtin/merge.c:1326 +#: builtin/merge.c:1346 msgid "--continue expects no arguments" msgstr "--continue no espera cap argument" -#: builtin/merge.c:1330 +#: builtin/merge.c:1350 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "No hi ha cap fusió en curs (manca MERGE_HEAD)." -#: builtin/merge.c:1346 +#: builtin/merge.c:1366 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17448,7 +17521,7 @@ msgstr "" "No heu conclòs la vostra fusió (MERGE_HEAD existeix).\n" "Cometeu els vostres canvis abans de fusionar." -#: builtin/merge.c:1353 +#: builtin/merge.c:1373 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17456,99 +17529,98 @@ msgstr "" "No heu conclòs el vostre «cherry pick» (CHERRY_PICK_HEAD existeix).\n" "Cometeu els vostres canvis abans de fusionar." -#: builtin/merge.c:1356 +#: builtin/merge.c:1376 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:1370 +#: builtin/merge.c:1390 msgid "You cannot combine --squash with --no-ff." msgstr "No podeu combinar --squash amb --no-ff." -#: builtin/merge.c:1372 -#, fuzzy +#: builtin/merge.c:1392 msgid "You cannot combine --squash with --commit." msgstr "No podeu combinar --squash amb --commit." -#: builtin/merge.c:1388 +#: builtin/merge.c:1408 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:1405 +#: builtin/merge.c:1425 msgid "Squash commit into empty head not supported yet" msgstr "Una comissió «squash» a un HEAD buit encara no es permet" -#: builtin/merge.c:1407 +#: builtin/merge.c:1427 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:1412 +#: builtin/merge.c:1432 #, c-format msgid "%s - not something we can merge" msgstr "%s - no és una cosa que puguem fusionar" -#: builtin/merge.c:1414 +#: builtin/merge.c:1434 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:1495 +#: builtin/merge.c:1515 msgid "refusing to merge unrelated histories" msgstr "s'està refusant fusionar històries no relacionades" -#: builtin/merge.c:1504 +#: builtin/merge.c:1524 msgid "Already up to date." msgstr "Ja està al dia." -#: builtin/merge.c:1514 +#: builtin/merge.c:1534 #, c-format msgid "Updating %s..%s\n" msgstr "S'estan actualitzant %s..%s\n" -#: builtin/merge.c:1560 +#: builtin/merge.c:1580 #, 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:1567 +#: builtin/merge.c:1587 #, c-format msgid "Nope.\n" msgstr "No.\n" -#: builtin/merge.c:1592 +#: builtin/merge.c:1612 msgid "Already up to date. Yeeah!" msgstr "Ja està al dia. Estupend!" -#: builtin/merge.c:1598 +#: builtin/merge.c:1618 msgid "Not possible to fast-forward, aborting." msgstr "No és possible avançar ràpidament, s'està avortant." -#: builtin/merge.c:1626 builtin/merge.c:1691 +#: builtin/merge.c:1646 builtin/merge.c:1711 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "S'està rebobinant l'arbre a la pristina...\n" -#: builtin/merge.c:1630 +#: builtin/merge.c:1650 #, c-format msgid "Trying merge strategy %s...\n" msgstr "S'està intentant l'estratègia de fusió %s...\n" -#: builtin/merge.c:1682 +#: builtin/merge.c:1702 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Cap estratègia de fusió ha gestionat la fusió.\n" -#: builtin/merge.c:1684 +#: builtin/merge.c:1704 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "L'estratègia de fusió %s ha fallat.\n" -#: builtin/merge.c:1693 +#: builtin/merge.c:1713 #, 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:1707 +#: builtin/merge.c:1727 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -17572,12 +17644,11 @@ msgid "allow creation of more than one tree" msgstr "permet la creació de més d'un arbre" #: builtin/multi-pack-index.c:9 -#, fuzzy msgid "" "git multi-pack-index [] (write|verify|expire|repack --batch-" "size=)" msgstr "" -"git multi-pack-index [] (write|verify|expire|repack --batch-" +"git multi-pack-index [] (write|verify|expire|repack --batch-" "size=)" #: builtin/multi-pack-index.c:26 @@ -17668,7 +17739,7 @@ msgstr "no està sota control de versions" #: builtin/mv.c:227 msgid "conflicted" -msgstr "" +msgstr "en conflicte" #: builtin/mv.c:230 msgid "destination exists" @@ -17701,7 +17772,7 @@ 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:280 builtin/remote.c:782 builtin/repack.c:518 +#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:484 #, c-format msgid "renaming '%s' failed" msgstr "el canvi del nom de «%s» ha fallat" @@ -17757,8 +17828,8 @@ msgstr "git notes [--ref ] [llista []]" #: builtin/notes.c:29 msgid "" -"git notes [--ref ] add [-f] [--allow-empty] [-m | -F " -"| (-c | -C) ] []" +"git notes [--ref ] add [-f] [--allow-empty] [-m | -F " +" | (-c | -C) ] []" msgstr "" "git notes [--ref ] add [-f] [--allow-empty] [-m " " | -F | (-c | -C) ] []" @@ -17770,8 +17841,8 @@ msgstr "" #: builtin/notes.c:31 msgid "" -"git notes [--ref ] append [--allow-empty] [-m | -F | " -"(-c | -C) ] []" +"git notes [--ref ] append [--allow-empty] [-m | -F |" +" (-c | -C) ] []" msgstr "" "git notes [--ref ] append [--allow-empty] [-m " " | -F | (-c | -C) ] []" @@ -17930,7 +18001,6 @@ msgstr "s'ha produït un error en copiar les notes de «%s» a «%s»" #. TRANSLATORS: the first %s will be replaced by a git #. notes command: 'add', 'merge', 'remove', etc. -#. #: builtin/notes.c:356 #, c-format msgid "refusing to %s notes in %s (outside of refs/notes/)" @@ -18006,8 +18076,8 @@ msgstr "hi ha massa pocs paràmetres" #: builtin/notes.c:538 #, c-format msgid "" -"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " -"existing notes" +"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite" +" existing notes" msgstr "" "No es poden copiar les notes. S'han trobat notes existents de l'objecte %s. " "Useu «-f» per a sobreescriure les notes existents" @@ -18074,11 +18144,11 @@ msgstr "Opcions de fusió" #: builtin/notes.c:788 msgid "" -"resolve notes conflicts using the given strategy (manual/ours/theirs/union/" -"cat_sort_uniq)" +"resolve notes conflicts using the given strategy " +"(manual/ours/theirs/union/cat_sort_uniq)" msgstr "" -"resol els conflictes de nota usant l'estratègia donada (manual/ours/theirs/" -"union/cat_sort_uniq)" +"resol els conflictes de nota usant l'estratègia donada " +"(manual/ours/theirs/union/cat_sort_uniq)" #: builtin/notes.c:790 msgid "Committing unmerged notes" @@ -18124,9 +18194,9 @@ msgstr "" #: builtin/notes.c:878 #, c-format msgid "" -"Automatic notes merge failed. Fix conflicts in %s and commit the result with " -"'git notes merge --commit', or abort the merge with 'git notes merge --" -"abort'.\n" +"Automatic notes merge failed. Fix conflicts in %s and commit the result with" +" 'git notes merge --commit', or abort the merge with 'git notes merge " +"--abort'.\n" msgstr "" "La fusió de notes automàtica ha fallat. Arregleu els conflictes en %s i " "cometeu el resultat amb «git notes merge --commit», o avorteu la fusió amb " @@ -18166,7 +18236,7 @@ msgstr "referència de notes" msgid "use notes from " msgstr "usa les notes de " -#: builtin/notes.c:1034 builtin/stash.c:1605 +#: builtin/notes.c:1034 builtin/stash.c:1604 #, c-format msgid "unknown subcommand: %s" msgstr "subordre desconeguda: %s" @@ -18208,8 +18278,8 @@ msgstr "s'esperava un objecte d'un 1% " #: builtin/pack-objects.c:1004 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" +"s'està inhabilitant l'escriptura de mapes de bits, es divideixen els paquets" +" a causa de pack.packSizeLimit" #: builtin/pack-objects.c:1017 msgid "Writing objects" @@ -18223,13 +18293,14 @@ msgstr "s'ha produït un error en fer stat a %s" #: builtin/pack-objects.c:1131 #, fuzzy, c-format msgid "wrote % objects while expecting %" -msgstr "va escriure% objectes mentre s'esperava un percentatge" +msgstr "" +"va escriure% objectes mentre s'esperava un percentatge" #: builtin/pack-objects.c:1348 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" +"s'està inhabilitant l'escriptura de mapes de bits, perquè alguns objectes no" +" s'empaqueten" #: builtin/pack-objects.c:1796 #, fuzzy, c-format @@ -18288,17 +18359,21 @@ msgid "inconsistency with delta count" msgstr "inconsistència amb el comptador de diferències" #: builtin/pack-objects.c:2961 -#, c-format +#, fuzzy, c-format msgid "" -"value of uploadpack.blobpackfileuri must be of the form ' ' (got '%s')" +"value of uploadpack.blobpackfileuri must be of the form ' " +" ' (got '%s')" msgstr "" +"el valor de uppack.blobpackfileuri ha de ser de la forma ' " +" ' (gotat '%s')" #: builtin/pack-objects.c:2964 -#, c-format +#, fuzzy, c-format msgid "" "object already configured in another uploadpack.blobpackfileuri (got '%s')" msgstr "" +"l'objecte ja està configurat en un altre uploadpack.blobpackfileuri (gotat " +"'%')" #: builtin/pack-objects.c:2993 #, fuzzy, c-format @@ -18310,11 +18385,13 @@ msgstr "" "percentatges d'escombraries" #: builtin/pack-objects.c:2999 -#, fuzzy, c-format +#, c-format msgid "" "expected object ID, got garbage:\n" " %s" -msgstr "s'esperava un ID d'objecte amb brossa" +msgstr "" +"s'esperava un ID d'objecte, s'ha rebut brossa:\n" +" %s" #: builtin/pack-objects.c:3097 msgid "invalid value for --missing" @@ -18375,7 +18452,8 @@ msgstr "mida màxima de cada fitxer empaquetat de sortida" #: builtin/pack-objects.c:3494 msgid "ignore borrowed objects from alternate object store" -msgstr "ignora els objectes prestats d'un emmagatzematge d'objectes alternatiu" +msgstr "" +"ignora els objectes prestats d'un emmagatzematge d'objectes alternatiu" #: builtin/pack-objects.c:3496 msgid "ignore packed objects" @@ -18444,7 +18522,8 @@ msgstr "emet el paquet a stdout" #: builtin/pack-objects.c:3530 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" +"inclou els objectes d'etiqueta que facin referència als objectes a " +"empaquetar" #: builtin/pack-objects.c:3532 msgid "keep unreachable objects" @@ -18518,12 +18597,15 @@ msgid "respect islands during delta compression" msgstr "respecta les illes durant la compressió delta" #: builtin/pack-objects.c:3570 +#, fuzzy msgid "protocol" -msgstr "" +msgstr "protocol" #: builtin/pack-objects.c:3571 +#, fuzzy msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" msgstr "" +"exclou qualsevol uppack.blobpackfileuri configurat amb aquest protocol" #: builtin/pack-objects.c:3600 #, fuzzy, c-format @@ -18573,8 +18655,8 @@ msgid "" "Total % (delta %), reused % (delta %), pack-" "reused %" msgstr "" -"Total% (delta %) reutilitzat% (delta %) pack-" -"reutilitzat%" +"Total% (delta %) reutilitzat% (delta %) " +"pack-reutilitzat%" #: builtin/pack-refs.c:8 msgid "git pack-refs []" @@ -18634,7 +18716,7 @@ msgstr "Opcions relacionades amb fusionar" msgid "incorporate changes by rebasing rather than merging" msgstr "incorpora els canvis fent «rebase» en lloc de fusionar" -#: builtin/pull.c:158 builtin/rebase.c:484 builtin/revert.c:126 +#: builtin/pull.c:158 builtin/rebase.c:490 builtin/revert.c:126 msgid "allow fast-forward" msgstr "permet l'avanç ràpid" @@ -18670,12 +18752,23 @@ msgid "" " git config pull.rebase true # rebase\n" " git config pull.ff only # fast-forward only\n" "\n" -"You can replace \"git config\" with \"git config --global\" to set a " -"default\n" +"You can replace \"git config\" with \"git config --global\" to set a default\n" "preference for all repositories. You can also pass --rebase, --no-rebase,\n" "or --ff-only on the command line to override the configured default per\n" "invocation.\n" msgstr "" +"Baixar sense especificar com conciliar branques divergents està\n" +"desaconsellat. Podeu desactivar aquest missatge executant una de les següents\n" +"comandes abans de la propera baixada:\n" +"\n" +" git config pull.rebase false # merge (estratègia per defecte)\n" +" git config pull.rebase true # rebase\n" +" git config pull.ff only # només fast-forward\n" +"\n" +"Podeu reemplaçar «git config» per «git config --global» per a establir una preferència\n" +"per defecte per a tots els dipòsits. Podeu també usar -rebase, --no-rebase,\n" +"o --ff-only en la línia d'ordres per sobreescriure el valor per defecte configuratW\n" +"en aquesta execució.\n" #: builtin/pull.c:458 msgid "" @@ -18689,7 +18782,8 @@ msgstr "" msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" -"No hi ha candidats per a fusionar entre les referències que acabeu d'obtenir." +"No hi ha candidats per a fusionar entre les referències que acabeu " +"d'obtenir." #: builtin/pull.c:461 msgid "" @@ -18710,15 +18804,15 @@ msgstr "" "Perquè aquest no és el remot configurat per defecte per a la vostra\n" "branca actual, heu d'especificar una branca en la línia d'ordres." -#: builtin/pull.c:469 builtin/rebase.c:1240 git-parse-remote.sh:73 +#: builtin/pull.c:469 builtin/rebase.c:1246 msgid "You are not currently on a branch." msgstr "Actualment no sou en cap branca." -#: builtin/pull.c:471 builtin/pull.c:486 git-parse-remote.sh:79 +#: builtin/pull.c:471 builtin/pull.c:486 msgid "Please specify which branch you want to rebase against." msgstr "Especifiqueu sobre quina branca voleu fer «rebase»." -#: builtin/pull.c:473 builtin/pull.c:488 git-parse-remote.sh:82 +#: builtin/pull.c:473 builtin/pull.c:488 msgid "Please specify which branch you want to merge with." msgstr "Especifiqueu amb quina branca voleu fusionar." @@ -18727,25 +18821,24 @@ msgid "See git-pull(1) for details." msgstr "Vegeu git-pull(1) per a més informació." #: builtin/pull.c:476 builtin/pull.c:482 builtin/pull.c:491 -#: builtin/rebase.c:1246 git-parse-remote.sh:64 +#: builtin/rebase.c:1252 msgid "" msgstr "" #: builtin/pull.c:476 builtin/pull.c:491 builtin/pull.c:496 -#: git-parse-remote.sh:65 msgid "" msgstr "" -#: builtin/pull.c:484 builtin/rebase.c:1238 git-parse-remote.sh:75 +#: builtin/pull.c:484 builtin/rebase.c:1244 msgid "There is no tracking information for the current branch." msgstr "No hi ha cap informació de seguiment per a la branca actual." -#: builtin/pull.c:493 git-parse-remote.sh:95 +#: builtin/pull.c:493 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" -"Si voleu establir informació de seguiment per a aquesta branca, podeu fer-ho " -"amb:" +"Si voleu establir informació de seguiment per a aquesta branca, podeu fer-ho" +" amb:" #: builtin/pull.c:498 #, c-format @@ -18761,24 +18854,24 @@ msgstr "" msgid "unable to access commit %s" msgstr "no s'ha pogut accedir a la comissió %s" -#: builtin/pull.c:894 +#: builtin/pull.c:915 msgid "ignoring --verify-signatures for rebase" msgstr "s'està ignorant --verify-signatures en fer «rebase»" -#: builtin/pull.c:954 +#: builtin/pull.c:972 msgid "Updating an unborn branch with changes added to the index." msgstr "" "S'està actualitzant una branca no nascuda amb canvis afegits a l'índex." -#: builtin/pull.c:958 +#: builtin/pull.c:976 msgid "pull with rebase" msgstr "baixar fent «rebase»" -#: builtin/pull.c:959 +#: builtin/pull.c:977 msgid "please commit or stash them." msgstr "cometeu-los o emmagatzemeu-los." -#: builtin/pull.c:984 +#: builtin/pull.c:1002 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -18789,7 +18882,7 @@ msgstr "" "s'està avançant ràpidament el vostre arbre de treball des de\n" "la comissió %s." -#: builtin/pull.c:990 +#: builtin/pull.c:1008 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -18800,22 +18893,21 @@ msgid "" "to recover." msgstr "" "No es pot avançar ràpidament el vostre arbre de treball.\n" -"Després d'assegurar que hàgiu desat qualsevol cosa preciosa de la sortida " -"de\n" +"Després d'assegurar que hàgiu desat qualsevol cosa preciosa de la sortida de\n" "$ git diff %s\n" "executeu\n" "$ git reset --hard\n" "per a recuperar." -#: builtin/pull.c:1005 +#: builtin/pull.c:1023 msgid "Cannot merge multiple branches into empty head." msgstr "No es poden fusionar múltiples branques a un HEAD buit." -#: builtin/pull.c:1009 +#: builtin/pull.c:1027 msgid "Cannot rebase onto multiple branches." msgstr "No es pot fer «rebase» sobre múltiples branques." -#: builtin/pull.c:1017 +#: builtin/pull.c:1041 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "no es pot fer «rebase» amb modificacions als submòduls enregistrades " @@ -18839,8 +18931,7 @@ msgid "" "To choose either option permanently, see push.default in 'git help config'." msgstr "" "\n" -"Per a triar qualsevol opció permanentment, vegeu push.default a «git help " -"config»." +"Per a triar qualsevol opció permanentment, vegeu push.default a «git help config»." #: builtin/push.c:167 #, c-format @@ -18897,7 +18988,8 @@ msgstr "" #: builtin/push.c:202 #, c-format -msgid "The current branch %s has multiple upstream branches, refusing to push." +msgid "" +"The current branch %s has multiple upstream branches, refusing to push." msgstr "" "La branca actual %s té múltiples branques fonts, s'està refusant pujar." @@ -18913,8 +19005,7 @@ msgstr "" "quina branca remota." #: builtin/push.c:260 -msgid "" -"You didn't specify any refspecs to push, and push.default is \"nothing\"." +msgid "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "No heu especificat cap especificació de referència a pujar, i push.default " "és «nothing»." @@ -18929,8 +19020,7 @@ msgstr "" "S'han rebutjat les actualitzacions perquè el punt de la vostra branca\n" "actual està darrere de la seva branca remota corresponent. Integreu\n" "els canvis remots (per exemple, «git pull ...») abans de pujar de nou.\n" -"Vegeu la «Nota sobre avanços ràpids» a «git push --help» per a més " -"informació." +"Vegeu la «Nota sobre avanços ràpids» a «git push --help» per a més informació." #: builtin/push.c:273 msgid "" @@ -18943,8 +19033,7 @@ msgstr "" "està darrere de la seva branca remota corresponent. Agafeu aquesta\n" "branca i integreu els canvis remots (per exemple, «git pull ...»)\n" "abans de pujar de nou.\n" -"Vegeu la «Nota sobre avanços ràpids» a «git push --help» per a més " -"informació." +"Vegeu la «Nota sobre avanços ràpids» a «git push --help» per a més informació." #: builtin/push.c:279 msgid "" @@ -18959,13 +19048,13 @@ msgstr "" "que ha pujat a la mateixa referència. Pot ser que primer vulgueu\n" "integrar els canvis remots (per exemple, «git pull ...») abans de\n" "pujar de nou.\n" -"Vegeu la «Nota sobre avanços ràpids» a «git push --help» per a més " -"informació." +"Vegeu la «Nota sobre avanços ràpids» a «git push --help» per a més informació." #: builtin/push.c:286 msgid "Updates were rejected because the tag already exists in the remote." msgstr "" -"S'han rebutjat les actualitzacions perquè l'etiqueta ja existeix en el remot." +"S'han rebutjat les actualitzacions perquè l'etiqueta ja existeix en el " +"remot." #: builtin/push.c:289 msgid "" @@ -18978,103 +19067,120 @@ msgstr "" "fer que assenyali un objecte no de comissió, sense usar l'opció\n" "«--force».\n" -#: builtin/push.c:351 +#: builtin/push.c:294 +#, fuzzy +msgid "" +"Updates were rejected because the tip of the remote-tracking\n" +"branch has been updated since the last checkout. You may want\n" +"to integrate those changes locally (e.g., 'git pull ...')\n" +"before forcing an update.\n" +msgstr "" +"S'han rebutjat les actualitzacions perquè el punt de la vostra branca\n" +"actual està darrere de la seva branca remota corresponent. Integreu\n" +"els canvis remots (per exemple, «git pull ...») abans de pujar de nou.\n" +"Vegeu la «Nota sobre avanços ràpids» a «git push --help» per a més informació." + +#: builtin/push.c:364 #, c-format msgid "Pushing to %s\n" msgstr "S'està pujant a %s\n" -#: builtin/push.c:358 +#: builtin/push.c:371 #, c-format msgid "failed to push some refs to '%s'" msgstr "s'ha produït un error en pujar algunes referències a «%s»" -#: builtin/push.c:532 +#: builtin/push.c:553 msgid "repository" msgstr "dipòsit" -#: builtin/push.c:533 builtin/send-pack.c:183 +#: builtin/push.c:554 builtin/send-pack.c:189 msgid "push all refs" msgstr "puja totes les referències" -#: builtin/push.c:534 builtin/send-pack.c:185 +#: builtin/push.c:555 builtin/send-pack.c:191 msgid "mirror all refs" msgstr "reflecteix totes les referències" -#: builtin/push.c:536 +#: builtin/push.c:557 msgid "delete refs" msgstr "suprimeix les referències" -#: builtin/push.c:537 +#: builtin/push.c:558 msgid "push tags (can't be used with --all or --mirror)" msgstr "puja les etiquetes (no es pot usar amb --all o --mirror)" -#: builtin/push.c:540 builtin/send-pack.c:186 +#: builtin/push.c:561 builtin/send-pack.c:192 msgid "force updates" msgstr "força les actualitzacions" -#: builtin/push.c:541 builtin/send-pack.c:198 +#: builtin/push.c:562 builtin/send-pack.c:204 msgid ":" msgstr ":" -#: builtin/push.c:542 builtin/send-pack.c:199 +#: builtin/push.c:563 builtin/send-pack.c:205 msgid "require old value of ref to be at this value" msgstr "requereix que el valor antic de la referència sigui d'aquest valor" -#: builtin/push.c:545 +#: builtin/push.c:566 builtin/send-pack.c:208 +#, fuzzy +msgid "require remote updates to be integrated locally" +msgstr "requereix que les actualitzacions remotes s'integrin localment" + +#: builtin/push.c:569 msgid "control recursive pushing of submodules" msgstr "controla la pujada recursiva dels submòduls" -#: builtin/push.c:546 builtin/send-pack.c:193 +#: builtin/push.c:570 builtin/send-pack.c:199 msgid "use thin pack" msgstr "usa el paquet prim" -#: builtin/push.c:547 builtin/push.c:548 builtin/send-pack.c:180 -#: builtin/send-pack.c:181 +#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186 +#: builtin/send-pack.c:187 msgid "receive pack program" msgstr "programa que rep els paquets" -#: builtin/push.c:549 +#: builtin/push.c:573 msgid "set upstream for git pull/status" msgstr "estableix la font per a git pull/status" -#: builtin/push.c:552 +#: builtin/push.c:576 msgid "prune locally removed refs" msgstr "poda les referències eliminades localment" -#: builtin/push.c:554 +#: builtin/push.c:578 msgid "bypass pre-push hook" msgstr "evita el lligam de prepujada" -#: builtin/push.c:555 +#: builtin/push.c:579 msgid "push missing but relevant tags" msgstr "puja les etiquetes absents però rellevants" -#: builtin/push.c:557 builtin/send-pack.c:187 +#: builtin/push.c:581 builtin/send-pack.c:193 msgid "GPG sign the push" msgstr "signa la pujada amb GPG" -#: builtin/push.c:559 builtin/send-pack.c:194 +#: builtin/push.c:583 builtin/send-pack.c:200 msgid "request atomic transaction on remote side" msgstr "demana una transacció atòmica al costat remot" -#: builtin/push.c:577 +#: builtin/push.c:601 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete és incompatible amb --all, --mirror i --tags" -#: builtin/push.c:579 +#: builtin/push.c:603 msgid "--delete doesn't make sense without any refs" msgstr "--delete no té sentit sense referències" -#: builtin/push.c:599 +#: builtin/push.c:623 #, c-format msgid "bad repository '%s'" msgstr "dipòsit incorrecte «%s»" -#: builtin/push.c:600 +#: builtin/push.c:624 msgid "" "No configured push destination.\n" -"Either specify the URL from the command-line or configure a remote " -"repository using\n" +"Either specify the URL from the command-line or configure a remote repository using\n" "\n" " git remote add \n" "\n" @@ -19083,8 +19189,7 @@ msgid "" " git push \n" msgstr "" "No hi ha cap destí de pujada configurat.\n" -"Especifiqueu l'URL des de la línia d'ordres o bé configureu un dipòsit remot " -"fent servir\n" +"Especifiqueu l'URL des de la línia d'ordres o bé configureu un dipòsit remot fent servir\n" "\n" " git remote add \n" "\n" @@ -19092,27 +19197,27 @@ msgstr "" "\n" " git push \n" -#: builtin/push.c:615 +#: builtin/push.c:639 msgid "--all and --tags are incompatible" msgstr "--all i --tags són incompatibles" -#: builtin/push.c:617 +#: builtin/push.c:641 msgid "--all can't be combined with refspecs" msgstr "--all no es pot combinar amb especificacions de referència" -#: builtin/push.c:621 +#: builtin/push.c:645 msgid "--mirror and --tags are incompatible" msgstr "--mirror i --tags són incompatibles" -#: builtin/push.c:623 +#: builtin/push.c:647 msgid "--mirror can't be combined with refspecs" msgstr "--mirror no es pot combinar amb especificacions de referència" -#: builtin/push.c:626 +#: builtin/push.c:650 msgid "--all and --mirror are incompatible" msgstr "--all i --mirror són incompatibles" -#: builtin/push.c:630 +#: builtin/push.c:657 msgid "push options must not have new line characters" msgstr "les opcions de pujada no han de tenir caràcters de línia nova" @@ -19167,13 +19272,13 @@ msgstr "calen dos rangs de comissió" #: builtin/read-tree.c:41 msgid "" -"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=) " -"[-u [--exclude-per-directory=] | -i]] [--no-sparse-checkout] [--" -"index-output=] (--empty | [ []])" +"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=)" +" [-u [--exclude-per-directory=] | -i]] [--no-sparse-checkout] " +"[--index-output=] (--empty | [ []])" msgstr "" -"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=) " -"[-u [--exclude-per-directory=] | -i]] [--no-sparse-checkout] [--" -"index-output=] (--empty | [ []])" +"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=)" +" [-u [--exclude-per-directory=] | -i]] [--no-sparse-checkout] " +"[--index-output=] (--empty | [ []])" #: builtin/read-tree.c:124 msgid "write resulting index to " @@ -19261,238 +19366,238 @@ msgstr "" #: builtin/rebase.c:37 #, fuzzy msgid "" -"git rebase [-i] [options] [--exec ] [--onto ] --root []" +"git rebase [-i] [options] [--exec ] [--onto ] --root " +"[]" msgstr "" -"git rebase [-i] [opcions] [--exec ] [--onto ] --root []" +"git rebase [-i] [opcions] [--exec ] [--onto ] --root " +"[]" #: builtin/rebase.c:39 msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:187 builtin/rebase.c:211 builtin/rebase.c:238 +#: builtin/rebase.c:193 builtin/rebase.c:217 builtin/rebase.c:244 #, c-format msgid "unusable todo list: '%s'" msgstr "llista per a fer inestable: «%s»" -#: builtin/rebase.c:304 +#: builtin/rebase.c:310 #, c-format msgid "could not create temporary %s" msgstr "no s'ha pogut crear el fitxer temporal %s" -#: builtin/rebase.c:310 +#: builtin/rebase.c:316 msgid "could not mark as interactive" msgstr "no s'ha pogut marcar com a interactiu" -#: builtin/rebase.c:364 +#: builtin/rebase.c:369 msgid "could not generate todo list" msgstr "no s'ha pogut generar la llista per a fer" -#: builtin/rebase.c:405 +#: builtin/rebase.c:411 #, fuzzy msgid "a base commit must be provided with --upstream or --onto" msgstr "s'ha de proporcionar una comissió base amb --upstream o --onto" -#: builtin/rebase.c:474 +#: builtin/rebase.c:480 msgid "git rebase--interactive []" msgstr "git rebase--interactive []" -#: builtin/rebase.c:487 builtin/rebase.c:1382 +#: builtin/rebase.c:493 builtin/rebase.c:1388 +#, fuzzy msgid "keep commits which start empty" -msgstr "" +msgstr "manté les comissions que comencen en blanc" -#: builtin/rebase.c:491 builtin/revert.c:128 +#: builtin/rebase.c:497 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "permet les comissions amb missatges buits" -#: builtin/rebase.c:493 +#: builtin/rebase.c:499 msgid "rebase merge commits" msgstr "fes «rebase» de les comissions de fusió" -#: builtin/rebase.c:495 +#: builtin/rebase.c:501 #, fuzzy msgid "keep original branch points of cousins" msgstr "mantén els punts de branca originals dels cosins" -#: builtin/rebase.c:497 +#: builtin/rebase.c:503 #, fuzzy msgid "move commits that begin with squash!/fixup!" msgstr "mou les comissions que comencen amb squash!/fixup!" -#: builtin/rebase.c:498 +#: builtin/rebase.c:504 msgid "sign commits" msgstr "signa les comissions" -#: builtin/rebase.c:500 builtin/rebase.c:1321 +#: builtin/rebase.c:506 builtin/rebase.c:1327 #, fuzzy msgid "display a diffstat of what changed upstream" msgstr "mostra un «diffstat» de la font que ha canviat" -#: builtin/rebase.c:502 +#: builtin/rebase.c:508 msgid "continue rebase" msgstr "continua el «rebase»" -#: builtin/rebase.c:504 +#: builtin/rebase.c:510 msgid "skip commit" msgstr "omet la comissió" -#: builtin/rebase.c:505 +#: builtin/rebase.c:511 msgid "edit the todo list" msgstr "edita la llista a fer" -#: builtin/rebase.c:507 +#: builtin/rebase.c:513 msgid "show the current patch" msgstr "mostra el pedaç actual" -#: builtin/rebase.c:510 +#: builtin/rebase.c:516 msgid "shorten commit ids in the todo list" msgstr "escurça els ids de les comissions en la llista per a fer" -#: builtin/rebase.c:512 +#: builtin/rebase.c:518 msgid "expand commit ids in the todo list" msgstr "expandeix els ids de les comissions en la llista per a fer" -#: builtin/rebase.c:514 +#: builtin/rebase.c:520 msgid "check the todo list" msgstr "comprova la llista a fer" -#: builtin/rebase.c:516 +#: builtin/rebase.c:522 msgid "rearrange fixup/squash lines" msgstr "reorganitza les línies «fixup/pick»" -#: builtin/rebase.c:518 +#: builtin/rebase.c:524 msgid "insert exec commands in todo list" msgstr "expandeix les ordres exec en la llista per a fer" -#: builtin/rebase.c:519 +#: builtin/rebase.c:525 #, fuzzy msgid "onto" msgstr "sobre" -#: builtin/rebase.c:522 +#: builtin/rebase.c:528 #, fuzzy msgid "restrict-revision" msgstr "revisió restringida" -#: builtin/rebase.c:522 +#: builtin/rebase.c:528 #, fuzzy msgid "restrict revision" msgstr "restringeix la revisió" -#: builtin/rebase.c:524 +#: builtin/rebase.c:530 #, fuzzy msgid "squash-onto" msgstr "squash-onto" -#: builtin/rebase.c:525 +#: builtin/rebase.c:531 #, fuzzy msgid "squash onto" msgstr "carabassa a" -#: builtin/rebase.c:527 +#: builtin/rebase.c:533 #, fuzzy msgid "the upstream commit" msgstr "la comissió principal" -#: builtin/rebase.c:529 +#: builtin/rebase.c:535 #, fuzzy msgid "head-name" msgstr "nom-cap" -#: builtin/rebase.c:529 +#: builtin/rebase.c:535 #, fuzzy msgid "head name" msgstr "nom del cap" -#: builtin/rebase.c:534 +#: builtin/rebase.c:540 #, fuzzy msgid "rebase strategy" msgstr "estratègia de rebase" -#: builtin/rebase.c:535 +#: builtin/rebase.c:541 #, fuzzy msgid "strategy-opts" msgstr "opcions estratègiques" -#: builtin/rebase.c:536 +#: builtin/rebase.c:542 #, fuzzy msgid "strategy options" msgstr "opcions d'estratègia" -#: builtin/rebase.c:537 +#: builtin/rebase.c:543 #, fuzzy msgid "switch-to" msgstr "canvia a" -#: builtin/rebase.c:538 +#: builtin/rebase.c:544 #, fuzzy msgid "the branch or commit to checkout" msgstr "la branca o entrega a agafar" -#: builtin/rebase.c:539 +#: builtin/rebase.c:545 #, fuzzy msgid "onto-name" msgstr "ont-name" -#: builtin/rebase.c:539 +#: builtin/rebase.c:545 #, fuzzy msgid "onto name" msgstr "al nom" -#: builtin/rebase.c:540 +#: builtin/rebase.c:546 #, fuzzy msgid "cmd" msgstr "cmd" -#: builtin/rebase.c:540 +#: builtin/rebase.c:546 msgid "the command to run" msgstr "l'ordre a executar" -#: builtin/rebase.c:543 builtin/rebase.c:1415 +#: builtin/rebase.c:549 builtin/rebase.c:1421 #, fuzzy msgid "automatically re-schedule any `exec` that fails" msgstr "torna a planificar automàticament qualsevol `exec` que falli" -#: builtin/rebase.c:559 +#: builtin/rebase.c:565 #, fuzzy msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "--[no-]rebase-cosins no té cap efecte sense --rebase-merges" -#: builtin/rebase.c:575 +#: builtin/rebase.c:581 #, fuzzy, c-format msgid "%s requires the merge backend" msgstr "%s requereix un «rebase» interactiu" -#: builtin/rebase.c:618 +#: builtin/rebase.c:624 #, fuzzy, c-format msgid "could not get 'onto': '%s'" msgstr "no s'ha pogut obtenir «onto» «%s»" -#: builtin/rebase.c:635 +#: builtin/rebase.c:641 #, fuzzy, c-format msgid "invalid orig-head: '%s'" msgstr "orig-head '%s' no és vàlid" -#: builtin/rebase.c:660 +#: builtin/rebase.c:666 #, fuzzy, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "s'ignorarà allowrerereautoupdate «%s» no vàlid" -#: builtin/rebase.c:805 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:811 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" "You can instead skip this commit: run \"git rebase --skip\".\n" -"To abort and get back to the state before \"git rebase\", run \"git rebase --" -"abort\"." +"To abort and get back to the state before \"git rebase\", run \"git rebase --abort\"." msgstr "" "Resoleu tots els conflictes manualment, marqueu-los com a resolts amb\n" -"«git add/rm », llavors executeu «git rebase --" -"continue».\n" +"«git add/rm », llavors executeu «git rebase --continue».\n" "Podeu en comptes ometre aquesta comissió: executeu «git rebase --skip».\n" -"Per a avortar i tornar a l'estat anterior abans de l'ordre «git rebase», " -"executeu «git rebase --abort»." +"Per a avortar i tornar a l'estat anterior abans de l'ordre «git rebase», executeu «git rebase --abort»." -#: builtin/rebase.c:888 +#: builtin/rebase.c:894 #, fuzzy, c-format msgid "" "\n" @@ -19506,16 +19611,14 @@ msgstr "" "git va trobar un error en preparar els pedaços per a tornar a reproduir " "aquests revisions per cent. Com a resultat git no pot refer-los." -#: builtin/rebase.c:1214 +#: builtin/rebase.c:1220 #, fuzzy, c-format -msgid "" -"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" -"\"." +msgid "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask\"." msgstr "" "no es reconeix el tipus buit «%s»; els valors vàlids són «drop» «keep» i " "«ask»." -#: builtin/rebase.c:1232 +#: builtin/rebase.c:1238 #, c-format msgid "" "%s\n" @@ -19532,7 +19635,7 @@ msgstr "" " git rebase ''\n" "\n" -#: builtin/rebase.c:1248 +#: builtin/rebase.c:1254 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -19540,219 +19643,212 @@ msgid "" " git branch --set-upstream-to=%s/ %s\n" "\n" msgstr "" -"Si voleu establir informació de seguiment per a aquesta branca, podeu fer-ho " -"amb:\n" +"Si voleu establir informació de seguiment per a aquesta branca, podeu fer-ho amb:\n" "\n" " git branch --set-upstream-to=%s/ %s\n" "\n" -#: builtin/rebase.c:1278 +#: builtin/rebase.c:1284 #, fuzzy msgid "exec commands cannot contain newlines" msgstr "les ordres exec no poden contenir línies noves" -#: builtin/rebase.c:1282 -#, fuzzy +#: builtin/rebase.c:1288 msgid "empty exec command" msgstr "ordre exec buida" -#: builtin/rebase.c:1312 +#: builtin/rebase.c:1318 msgid "rebase onto given branch instead of upstream" msgstr "fes un «rebase» en la branca donada en comptes de la font" -#: builtin/rebase.c:1314 +#: builtin/rebase.c:1320 #, fuzzy msgid "use the merge-base of upstream and branch as the current base" msgstr "utilitza la base de fusió de la font i la branca com a base actual" -#: builtin/rebase.c:1316 +#: builtin/rebase.c:1322 msgid "allow pre-rebase hook to run" msgstr "permet al lligam pre-rebase executar-se" -#: builtin/rebase.c:1318 +#: builtin/rebase.c:1324 msgid "be quiet. implies --no-stat" msgstr "silenciós. Implica --no-stat" -#: builtin/rebase.c:1324 +#: builtin/rebase.c:1330 #, fuzzy msgid "do not show diffstat of what changed upstream" msgstr "no mostris «diffstat» de quina font ha canviat" -#: builtin/rebase.c:1327 +#: builtin/rebase.c:1333 #, fuzzy -msgid "add a Signed-off-by: line to each commit" +msgid "add a Signed-off-by trailer to each commit" msgstr "afegeix una línia signada per cada entrega" -#: builtin/rebase.c:1330 +#: builtin/rebase.c:1336 #, fuzzy msgid "make committer date match author date" msgstr "Agrupa per «comitter» en comptes de per autor" -#: builtin/rebase.c:1332 +#: builtin/rebase.c:1338 msgid "ignore author date and use current date" -msgstr "" +msgstr "ignora la data de l'autor i utilitza la data actual" -#: builtin/rebase.c:1334 -#, fuzzy +#: builtin/rebase.c:1340 msgid "synonym of --reset-author-date" -msgstr "sinònim de --files-with-matches" +msgstr "sinònim de --reset-author-date" -#: builtin/rebase.c:1336 builtin/rebase.c:1340 +#: builtin/rebase.c:1342 builtin/rebase.c:1346 msgid "passed to 'git apply'" msgstr "passa-ho a «git-apply»" -#: builtin/rebase.c:1338 -#, fuzzy +#: builtin/rebase.c:1344 msgid "ignore changes in whitespace" -msgstr "ignora els canvis d'espai en blanc al final de la línia" +msgstr "ignora els canvis d'espais en blanc" -#: builtin/rebase.c:1342 builtin/rebase.c:1345 +#: builtin/rebase.c:1348 builtin/rebase.c:1351 msgid "cherry-pick all commits, even if unchanged" msgstr "«cherry pick» totes les comissions, inclús les no canviades" -#: builtin/rebase.c:1347 +#: builtin/rebase.c:1353 msgid "continue" msgstr "continua" -#: builtin/rebase.c:1350 +#: builtin/rebase.c:1356 msgid "skip current patch and continue" msgstr "omet el pedaç actual i continua" -#: builtin/rebase.c:1352 +#: builtin/rebase.c:1358 msgid "abort and check out the original branch" msgstr "interromp i agafa la branca original" -#: builtin/rebase.c:1355 +#: builtin/rebase.c:1361 msgid "abort but keep HEAD where it is" msgstr "interromp però manté HEAD on és" -#: builtin/rebase.c:1356 +#: builtin/rebase.c:1362 msgid "edit the todo list during an interactive rebase" msgstr "edita la llista de coses a fer durant un «rebase» interactiu" -#: builtin/rebase.c:1359 +#: builtin/rebase.c:1365 msgid "show the patch file being applied or merged" msgstr "mostra el pedaç que s'està aplicant o fusionant" -#: builtin/rebase.c:1362 -#, fuzzy +#: builtin/rebase.c:1368 msgid "use apply strategies to rebase" msgstr "utilitza estratègies d'aplicació per fer «rebase»" -#: builtin/rebase.c:1366 -#, fuzzy +#: builtin/rebase.c:1372 msgid "use merging strategies to rebase" msgstr "utilitza estratègies de fusió per fer «rebase»" -#: builtin/rebase.c:1370 -#, fuzzy +#: builtin/rebase.c:1376 msgid "let the user edit the list of commits to rebase" -msgstr "permet a l'usuari editar la llista de «commits» a «rebase»" +msgstr "permet a l'usuari editar la llista de comissions a fer «rebase»" -#: builtin/rebase.c:1374 -#, fuzzy +#: builtin/rebase.c:1380 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" -msgstr "(DEPRECATED) intenta recrear fusions en lloc d'ignorar-les" +msgstr "(EN DESÚS) intenta recrear fusions en lloc d'ignorar-les" -#: builtin/rebase.c:1379 -#, fuzzy +#: builtin/rebase.c:1385 msgid "how to handle commits that become empty" msgstr "com gestionar les comissions que queden buides" -#: builtin/rebase.c:1386 +#: builtin/rebase.c:1392 #, fuzzy msgid "move commits that begin with squash!/fixup! under -i" msgstr "mou les comissions que comencen amb squash!/fixup! sota -i" -#: builtin/rebase.c:1393 +#: builtin/rebase.c:1399 #, fuzzy msgid "add exec lines after each commit of the editable list" -msgstr "afegeix línies d'exec després de cada publicació de la llista editable" +msgstr "" +"afegeix línies d'exec després de cada publicació de la llista editable" -#: builtin/rebase.c:1397 +#: builtin/rebase.c:1403 #, fuzzy msgid "allow rebasing commits with empty messages" msgstr "permet tornar a basar les comissions amb missatges buits" -#: builtin/rebase.c:1401 +#: builtin/rebase.c:1407 #, fuzzy msgid "try to rebase merges instead of skipping them" msgstr "intenta fer «rebase» de les fusions en lloc d'omissió" -#: builtin/rebase.c:1404 +#: builtin/rebase.c:1410 #, fuzzy msgid "use 'merge-base --fork-point' to refine upstream" msgstr "usa «merge-base --fork-point» per refinar la font" -#: builtin/rebase.c:1406 +#: builtin/rebase.c:1412 msgid "use the given merge strategy" msgstr "utilitza l'estratègia de fusió donada" -#: builtin/rebase.c:1408 builtin/revert.c:115 +#: builtin/rebase.c:1414 builtin/revert.c:115 msgid "option" msgstr "opció" -#: builtin/rebase.c:1409 +#: builtin/rebase.c:1415 msgid "pass the argument through to the merge strategy" msgstr "passa l'argument a l'estratègia de fusió" -#: builtin/rebase.c:1412 +#: builtin/rebase.c:1418 msgid "rebase all reachable commits up to the root(s)" msgstr "fes «rebase» de totes les comissions accessibles fins a l'arrel" -#: builtin/rebase.c:1417 +#: builtin/rebase.c:1423 +#, fuzzy msgid "apply all changes, even those already present upstream" msgstr "" +"aplica tots els canvis fins i tot els que ja estan a la font principal" -#: builtin/rebase.c:1434 +#: builtin/rebase.c:1440 #, fuzzy msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." msgstr "" -"s'ha eliminat el suport «rebase.useBuiltin»! Per a més detalls vegeu la seva " -"entrada a «git help config»." +"s'ha eliminat el suport «rebase.useBuiltin»! Per a més detalls vegeu la seva" +" entrada a «git help config»." -#: builtin/rebase.c:1440 +#: builtin/rebase.c:1446 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "Sembla que «git am» està en curs. No es pot fer «rebase»." -#: builtin/rebase.c:1481 -#, fuzzy +#: builtin/rebase.c:1487 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "" "git rebase --preserve-merges està en desús. Utilitzeu --rebase-merges en " "lloc seu." -#: builtin/rebase.c:1486 +#: builtin/rebase.c:1492 #, fuzzy msgid "cannot combine '--keep-base' with '--onto'" msgstr "no es pot combinar «--keep-base» amb «--onto»" -#: builtin/rebase.c:1488 +#: builtin/rebase.c:1494 #, fuzzy msgid "cannot combine '--keep-base' with '--root'" msgstr "no es pot combinar «--keep-base» amb «--root»" -#: builtin/rebase.c:1492 +#: builtin/rebase.c:1498 #, fuzzy msgid "cannot combine '--root' with '--fork-point'" msgstr "no es pot combinar «--keep-base» amb «--root»" -#: builtin/rebase.c:1495 +#: builtin/rebase.c:1501 msgid "No rebase in progress?" msgstr "No hi ha un «rebase» en curs?" -#: builtin/rebase.c:1499 +#: builtin/rebase.c:1505 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "L'acció --edit-todo només es pot usar durant un «rebase» interactiu." -#: builtin/rebase.c:1522 +#: builtin/rebase.c:1528 t/helper/test-fast-rebase.c:123 msgid "Cannot read HEAD" msgstr "No es pot llegir HEAD" -#: builtin/rebase.c:1534 +#: builtin/rebase.c:1540 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -19760,16 +19856,16 @@ msgstr "" "Heu d'editar tots els conflictes de fusió i després\n" "marcar-los com a resolts fent servir git add" -#: builtin/rebase.c:1553 +#: builtin/rebase.c:1559 msgid "could not discard worktree changes" msgstr "no s'han pogut descartar els canvis de l'arbre de treball" -#: builtin/rebase.c:1572 +#: builtin/rebase.c:1578 #, c-format msgid "could not move back to %s" msgstr "no s'ha pogut tornar a %s" -#: builtin/rebase.c:1618 +#: builtin/rebase.c:1624 #, fuzzy, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -19785,139 +19881,139 @@ msgstr "" "d'un altre rebase. Si és així, si us plau, provi-ho si no és així, si us " "plau inciti-me." -#: builtin/rebase.c:1646 +#: builtin/rebase.c:1652 msgid "switch `C' expects a numerical value" msgstr "«switch» «c» espera un valor numèric" -#: builtin/rebase.c:1688 +#: builtin/rebase.c:1694 #, c-format msgid "Unknown mode: %s" msgstr "Mode desconegut: %s" -#: builtin/rebase.c:1727 +#: builtin/rebase.c:1733 msgid "--strategy requires --merge or --interactive" msgstr "--strategy requereix --merge o --interactive" -#: builtin/rebase.c:1757 +#: builtin/rebase.c:1763 #, fuzzy msgid "cannot combine apply options with merge options" msgstr "no es poden combinar les opcions d'aplicació amb les opcions de fusió" -#: builtin/rebase.c:1770 +#: builtin/rebase.c:1776 #, fuzzy, c-format msgid "Unknown rebase backend: %s" msgstr "Rebase de system%s desconegut" -#: builtin/rebase.c:1795 +#: builtin/rebase.c:1806 #, fuzzy msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "--reschedulo-failed-exec requereix --exec o --interactive" -#: builtin/rebase.c:1815 +#: builtin/rebase.c:1826 #, fuzzy msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "no es poden combinar «--preserve-merges» amb «--rebase-merges»" -#: builtin/rebase.c:1819 +#: builtin/rebase.c:1830 #, fuzzy msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" "error no es pot combinar «--preserve-merges» amb «--reschedule-failed-exec»" -#: builtin/rebase.c:1843 +#: builtin/rebase.c:1854 #, c-format msgid "invalid upstream '%s'" msgstr "font no vàlida: «%s»" -#: builtin/rebase.c:1849 +#: builtin/rebase.c:1860 msgid "Could not create new root commit" msgstr "No s'ha pogut crear una comissió arrel nova" -#: builtin/rebase.c:1875 +#: builtin/rebase.c:1886 #, fuzzy, c-format msgid "'%s': need exactly one merge base with branch" msgstr "'%s' necessita exactament una base de fusió amb branca" -#: builtin/rebase.c:1878 +#: builtin/rebase.c:1889 #, fuzzy, c-format msgid "'%s': need exactly one merge base" msgstr "'%s' necessita exactament una base de fusió" -#: builtin/rebase.c:1886 +#: builtin/rebase.c:1897 #, fuzzy, c-format msgid "Does not point to a valid commit '%s'" msgstr "No apunta a una comissió vàlida «%s»" -#: builtin/rebase.c:1912 +#: builtin/rebase.c:1923 #, fuzzy, c-format msgid "fatal: no such branch/commit '%s'" msgstr "fatal no existeix aquesta branca/commit «%s»" -#: builtin/rebase.c:1920 builtin/submodule--helper.c:40 +#: builtin/rebase.c:1931 builtin/submodule--helper.c:40 #: builtin/submodule--helper.c:2414 #, c-format msgid "No such ref: %s" msgstr "No hi ha tal referència: %s" -#: builtin/rebase.c:1931 +#: builtin/rebase.c:1942 #, fuzzy msgid "Could not resolve HEAD to a revision" msgstr "No s'ha pogut resoldre HEAD a una revisió" -#: builtin/rebase.c:1952 +#: builtin/rebase.c:1963 msgid "Please commit or stash them." msgstr "Cometeu-los o emmagatzemeu-los." -#: builtin/rebase.c:1988 +#: builtin/rebase.c:1999 #, c-format msgid "could not switch to %s" msgstr "no s'ha pogut commutar a %s" -#: builtin/rebase.c:1999 +#: builtin/rebase.c:2010 msgid "HEAD is up to date." msgstr "HEAD està al dia." -#: builtin/rebase.c:2001 +#: builtin/rebase.c:2012 #, c-format msgid "Current branch %s is up to date.\n" msgstr "La branca actual %s està al dia.\n" -#: builtin/rebase.c:2009 +#: builtin/rebase.c:2020 msgid "HEAD is up to date, rebase forced." msgstr "La branca actual està al dia, «rebase» forçat." -#: builtin/rebase.c:2011 +#: builtin/rebase.c:2022 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "La branca actual %s està al dia; «rebase» forçat.\n" -#: builtin/rebase.c:2019 +#: builtin/rebase.c:2030 msgid "The pre-rebase hook refused to rebase." msgstr "El lligam pre-«rebase» ha refusat a fer «rebase»." -#: builtin/rebase.c:2026 +#: builtin/rebase.c:2037 #, c-format msgid "Changes to %s:\n" msgstr "Canvis a %s:\n" -#: builtin/rebase.c:2029 +#: builtin/rebase.c:2040 #, c-format msgid "Changes from %s to %s:\n" msgstr "Canvis de %s a %s:\n" -#: builtin/rebase.c:2054 +#: builtin/rebase.c:2065 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" "Primer, s'està rebobinant HEAD per a reproduir el vostre treball al " "damunt...\n" -#: builtin/rebase.c:2063 +#: builtin/rebase.c:2074 msgid "Could not detach HEAD" msgstr "No s'ha pogut separar HEAD" -#: builtin/rebase.c:2072 +#: builtin/rebase.c:2083 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Avanç ràpid %s a %s.\n" @@ -19926,7 +20022,7 @@ msgstr "Avanç ràpid %s a %s.\n" msgid "git receive-pack " msgstr "git receive-pack " -#: builtin/receive-pack.c:1224 +#: builtin/receive-pack.c:1276 msgid "" "By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" @@ -19957,7 +20053,7 @@ msgstr "" "per defecte, establiu la variable de configuració\n" "«receive.denyCurrentBranch» a «refuse»." -#: builtin/receive-pack.c:1244 +#: builtin/receive-pack.c:1296 msgid "" "By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" @@ -19979,23 +20075,23 @@ msgstr "" "\n" "Per a silenciar aquest missatge, podeu establir-la a «refuse»." -#: builtin/receive-pack.c:2422 +#: builtin/receive-pack.c:2481 msgid "quiet" msgstr "silenciós" -#: builtin/receive-pack.c:2436 +#: builtin/receive-pack.c:2495 msgid "You must specify a directory." msgstr "Heu d'especificar un directori." #: builtin/reflog.c:17 msgid "" -"git reflog expire [--expire=